Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add localhost support for agent and boot urls #147

Merged
merged 1 commit into from
Mar 25, 2024
Merged

fix: add localhost support for agent and boot urls #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/pages/background/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ export const isValidUrl = (str: string) => {
}
};

export const getBootUrl = (url: string) => {
return url.includes("localhost") || url.includes("127.0.0.1")
? "http://127.0.0.1:3903"
: url;
};

export const getCurrentTab = (): Promise<chrome.tabs.Tab> => {
return new Promise((resolve) => {
chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
Expand Down
5 changes: 3 additions & 2 deletions src/pages/popup/Popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
WEB_APP_PERMS,
configService,
} from "@pages/background/services/config";
import { isValidUrl } from "@pages/background/utils";
import { isValidUrl, getBootUrl } from "@pages/background/utils";
import { ThemeProvider, styled } from "styled-components";
import { LocaleProvider } from "@src/_locales";
import { default as defaultVendor } from "@src/config/vendor.json";
Expand Down Expand Up @@ -126,6 +126,7 @@ export default function Popup(): JSX.Element {
if (!urlObject || !urlObject?.origin) return;
setIsLoading(true);

const bootUrl = getBootUrl(urlObject.origin);
const { data, error } = await chrome.runtime.sendMessage<
IMessage<IBootAndConnect>
>({
Expand All @@ -134,7 +135,7 @@ export default function Popup(): JSX.Element {
data: {
passcode,
agentUrl,
bootUrl: urlObject.origin,
bootUrl,
},
});

Expand Down
5 changes: 3 additions & 2 deletions src/screens/config/config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
import { useIntl } from "react-intl";
import { configService } from "@pages/background/services/config";
import { useLocale, languageCodeMap } from "@src/_locales";
import { isValidUrl, setActionIcon } from "@pages/background/utils";
import { isValidUrl, getBootUrl, setActionIcon } from "@pages/background/utils";
import { Box, Button, Dropdown, Input, Text, Flex } from "@components/ui";

const langMap = Object.entries(languageCodeMap).map((s) => ({
Expand Down Expand Up @@ -57,7 +57,8 @@ export function Config(props: any): JSX.Element {
}
if (urlObject && urlObject?.origin) {
try {
await (await fetch(`${urlObject?.origin}/health`)).json();
const bootUrl = getBootUrl(urlObject.origin);
await (await fetch(`${bootUrl}/health`)).json();
} catch (error) {
setAgentUrlError(invalidAgentUrlMsg);
return true;
Expand Down
5 changes: 3 additions & 2 deletions src/screens/permission/permission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
WEB_APP_PERMS,
configService,
} from "@pages/background/services/config";
import { isValidUrl, setActionIcon } from "@pages/background/utils";
import { isValidUrl, getBootUrl, setActionIcon } from "@pages/background/utils";
import { Box, Card, Button, Text, Flex } from "@components/ui";
import { IMessage } from "@config/types";

Expand Down Expand Up @@ -49,7 +49,8 @@ export function Permission({
}
if (urlObject && urlObject?.origin) {
try {
await (await fetch(`${urlObject?.origin}/health`)).json();
const bootUrl = getBootUrl(urlObject.origin);
await (await fetch(`${bootUrl}/health`)).json();
} catch (error) {
return true;
}
Expand Down