Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,13 @@ export function isWorkerLike(guest: Guest): guest is WorkerLike {
return isNodeWorker(guest) || (typeof Worker !== "undefined" && guest instanceof Worker);
}

// `SharedWorker` is unavailable on mobile Safari, in-app WebViews, and
// hardened browser modes. Bare `instanceof SharedWorker` throws ReferenceError
// in those runtimes; gate the check with `typeof`.
export function isSharedWorker(guest: Guest): guest is SharedWorker {
return typeof SharedWorker !== "undefined" && guest instanceof SharedWorker;
}

export function addEventListener(target: Target, event: string, handler: EventListenerOrEventListenerObject) {
if (isNodeWorker(target)) {
target.on(event, handler);
Expand Down
5 changes: 3 additions & 2 deletions src/host.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
getOriginFromURL,
isNodeEnv,
isNodeWorker,
isSharedWorker,
isWorkerLike,
postMessageToTarget,
removeEventListener,
Expand Down Expand Up @@ -50,15 +51,15 @@ function connect(guest: Guest, schema: Schema = {}): Promise<Connection> {
const guestIsWorker = isWorkerLike(guest);

const listenTo =
guestIsWorker || isNodeEnv() ? (guest as Worker) : guest instanceof SharedWorker ? guest.port : window;
guestIsWorker || isNodeEnv() ? (guest as Worker) : isSharedWorker(guest) ? guest.port : window;

return new Promise((resolve) => {
const connectionID = generateId();

// on handshake request
function handleHandshake(event: any) {
const sendTo =
guestIsWorker || isNodeEnv() ? (guest as Worker) : guest instanceof SharedWorker ? guest.port : event.source;
guestIsWorker || isNodeEnv() ? (guest as Worker) : isSharedWorker(guest) ? guest.port : event.source;

if (!guestIsWorker && !isNodeEnv() && !isValidTarget(guest, event)) return;

Expand Down
34 changes: 34 additions & 0 deletions tests/messaging.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,40 @@ describe("isNodeWorker and isWorkerLike", () => {
});
});

describe("isSharedWorker", () => {
afterEach(() => {
vi.resetModules();
});

it("returns false (without throwing) when SharedWorker is not defined", async () => {
const original = (globalThis as any).SharedWorker;
delete (globalThis as any).SharedWorker;
try {
const helpers = await loadHelpers();
expect(() => helpers.isSharedWorker({} as any)).not.toThrow();
expect(helpers.isSharedWorker({} as any)).toBe(false);
} finally {
if (original !== undefined) {
(globalThis as any).SharedWorker = original;
}
}
});

it("detects SharedWorker instances when the global is present", async () => {
class FakeSharedWorker {
port = {};
}
(globalThis as any).SharedWorker = FakeSharedWorker as any;
try {
const helpers = await loadHelpers();
expect(helpers.isSharedWorker(new FakeSharedWorker() as any)).toBe(true);
expect(helpers.isSharedWorker({} as any)).toBe(false);
} finally {
delete (globalThis as any).SharedWorker;
}
});
});

describe("generateId", () => {
it("creates ids of requested length", async () => {
const helpers = await loadHelpers();
Expand Down
Loading