Browse Source

adjust setupPart timings and extension message preload

pull/819/head
mrjvs 2 years ago
parent
commit
a91e2b6e2e
  1. 13
      src/backend/extension/messaging.ts
  2. 2
      src/pages/parts/settings/SetupPart.tsx

13
src/backend/extension/messaging.ts

@ -6,13 +6,22 @@ import {
import { isAllowedExtensionVersion } from "@/backend/extension/compatibility"; import { isAllowedExtensionVersion } from "@/backend/extension/compatibility";
import { ExtensionMakeRequestResponse } from "@/backend/extension/plasmo"; import { ExtensionMakeRequestResponse } from "@/backend/extension/plasmo";
// for some reason, about 500 ms is needed after
// page load before the extension starts responding properly
const isExtensionReady = new Promise<void>((resolve) => {
setTimeout(() => {
resolve();
}, 500);
});
let activeExtension = false; let activeExtension = false;
function sendMessage<MessageKey extends keyof MessagesMetadata>( async function sendMessage<MessageKey extends keyof MessagesMetadata>(
message: MessageKey, message: MessageKey,
payload: MessagesMetadata[MessageKey]["req"] | undefined = undefined, payload: MessagesMetadata[MessageKey]["req"] | undefined = undefined,
timeout: number = -1, timeout: number = -1,
) { ) {
await isExtensionReady;
return new Promise<MessagesMetadata[MessageKey]["res"] | null>((resolve) => { return new Promise<MessagesMetadata[MessageKey]["res"] | null>((resolve) => {
if (timeout >= 0) setTimeout(() => resolve(null), timeout); if (timeout >= 0) setTimeout(() => resolve(null), timeout);
sendToBackgroundViaRelay< sendToBackgroundViaRelay<
@ -54,7 +63,7 @@ export async function sendPage(
export async function extensionInfo(): Promise< export async function extensionInfo(): Promise<
MessagesMetadata["hello"]["res"] | null MessagesMetadata["hello"]["res"] | null
> { > {
const message = await sendMessage("hello", undefined, 300); const message = await sendMessage("hello", undefined, 500);
return message; return message;
} }

2
src/pages/parts/settings/SetupPart.tsx

@ -29,7 +29,7 @@ type SetupData = {
function testProxy(url: string) { function testProxy(url: string) {
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
setTimeout(() => reject(new Error("Timed out!")), 1000); setTimeout(() => reject(new Error("Timed out!")), 3000);
singularProxiedFetch(url, testUrl, {}) singularProxiedFetch(url, testUrl, {})
.then((res) => { .then((res) => {
if (res.url !== testUrl) return reject(new Error("Not a proxy")); if (res.url !== testUrl) return reject(new Error("Not a proxy"));

Loading…
Cancel
Save