mercuryworkshop-mirror/bare-mux
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/bare-mux.git synced 2025-05-16 15:40:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

test all ports when trying to get one in sw

Browse source
This commit is contained in:
Toshit Chawda 2024-07-12 16:18:36 -07:00
parent 1ca0514fc2
commit 66f0cc1ed0
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/connection.ts
View file

@ -39,10 +39,19 @@ export type BroadcastMessage = {
async function searchForPort(): Promise<MessagePort> { async function searchForPort(): Promise<MessagePort> {
// @ts-expect-error // @ts-expect-error
const clients: SWClient[] = await self.clients.matchAll({ type: "window", includeUncontrolled: true }); const clients: SWClient[] = await self.clients.matchAll({ type: "window", includeUncontrolled: true });
const promise: Promise<MessagePort> = Promise.race([...clients.map((x: SWClient) => tryGetPort(x)), new Promise((_, reject) => setTimeout(reject, 1000, new Error("")))]) as Promise<MessagePort>; const promises: Promise<MessagePort>[] = clients.map(async (x: SWClient) => {
const port = await tryGetPort(x);
await testPort(port);
return port;
});
const promise: Promise<MessagePort> = Promise.race([Promise.any(promises), new Promise((_, reject) => setTimeout(reject, 1000, new TypeError("timeout")))]) as Promise<MessagePort>;
try { try {
return await promise; return await promise;
} catch { } catch(err) {
if (err instanceof AggregateError) {
console.error("bare-mux: failed to get a bare-mux SharedWorker MessagePort as all clients returned an invalid MessagePort.");
return;
}
console.warn("bare-mux: failed to get a bare-mux SharedWorker MessagePort within 1s, retrying"); console.warn("bare-mux: failed to get a bare-mux SharedWorker MessagePort within 1s, retrying");
return await searchForPort(); return await searchForPort();
} }
@ -58,6 +67,20 @@ function tryGetPort(client: SWClient): Promise<MessagePort> {
}); });
} }
function testPort(port: MessagePort): Promise<void> {
const pingChannel = new MessageChannel();
const pingPromise: Promise<void> = new Promise((resolve, reject) => {
pingChannel.port1.onmessage = event => {
if (event.data.type === "pong") {
resolve();
}
};
setTimeout(reject, 1500);
});
port.postMessage(<WorkerRequest>{ message: { type: "ping" }, port: pingChannel.port2 }, [pingChannel.port2]);
return pingPromise;
}
function createPort(path: string, registerHandlers: boolean): MessagePort { function createPort(path: string, registerHandlers: boolean): MessagePort {
const worker = new SharedWorker(path, "bare-mux-worker"); const worker = new SharedWorker(path, "bare-mux-worker");
if (registerHandlers) { if (registerHandlers) {
@ -122,18 +145,8 @@ export class WorkerConnection {
async sendMessage(message: WorkerMessage, transferable?: Transferable[]): Promise<WorkerResponse> { async sendMessage(message: WorkerMessage, transferable?: Transferable[]): Promise<WorkerResponse> {
if (this.port instanceof Promise) this.port = await this.port; if (this.port instanceof Promise) this.port = await this.port;
const pingChannel = new MessageChannel();
const pingPromise: Promise<void> = new Promise((resolve, reject) => {
pingChannel.port1.onmessage = event => {
if (event.data.type === "pong") {
resolve();
}
};
setTimeout(reject, 1500);
});
this.port.postMessage(<WorkerRequest>{ message: { type: "ping" }, port: pingChannel.port2 }, [pingChannel.port2]);
try { try {
await pingPromise; await testPort(this.port);
} catch { } catch {
console.warn("bare-mux: Failed to get a ping response from the worker within 1.5s. Assuming port is dead."); console.warn("bare-mux: Failed to get a ping response from the worker within 1.5s. Assuming port is dead.");
this.createChannel(); this.createChannel();