@evolu/web 3.0.0-next.0 → 3.0.0-next.1

package/dist/src/local-first/Db.worker.js

@@ -4,13 +4,13 @@ installPolyfills();
 import { createRandomBytes } from "@evolu/common";
 import { startDbWorker } from "@evolu/common/local-first";
 import { createWasmSqliteDriver } from "../Sqlite.js";
-import { createLeaderLock, createRun } from "../Task.js";
+import { createRun } from "../Task.js";
 import { createWorkerDeps, createWorkerSelf } from "../Worker.js";
 // TODO: Disposal.
 const run = createRun({
     ...createWorkerDeps(),
     createSqliteDriver: createWasmSqliteDriver,
-    leaderLock: createLeaderLock(),
+    lockManager: globalThis.navigator.locks,
     randomBytes: createRandomBytes(),
 });
 run(startDbWorker(createWorkerSelf(self)));

package/dist/src/local-first/Evolu.d.ts

@@ -1,5 +1,11 @@
-import type { ConsoleDep } from "@evolu/common";
+import { type ConsoleDep } from "@evolu/common";
 import type { EvoluDeps } from "@evolu/common/local-first";
+export interface SharedWorkerUnsupported {
+    readonly type: "SharedWorkerUnsupported";
+}
+export interface SharedWorkerUnsupportedDep {
+    readonly onSharedWorkerUnsupported: () => void;
+}
 /** Creates Evolu dependencies for the web platform. */
-export declare const createEvoluDeps: (deps?: Partial<ConsoleDep>) => EvoluDeps;
+export declare const createEvoluDeps: (deps?: Partial<ConsoleDep> & Partial<SharedWorkerUnsupportedDep>) => EvoluDeps;
 //# sourceMappingURL=Evolu.d.ts.map

package/dist/src/local-first/Evolu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Evolu.d.ts","sourceRoot":"","sources":["../../../src/local-first/Evolu.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAGV,SAAS,EAEV,MAAM,2BAA2B,CAAC;AAgBnC,uDAAuD;AACvD,eAAO,MAAM,eAAe,GAAI,OAAM,OAAO,CAAC,UAAU,CAAM,KAAG,SAqBhE,CAAC"}
+{"version":3,"file":"Evolu.d.ts","sourceRoot":"","sources":["../../../src/local-first/Evolu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EAIV,SAAS,EAGV,MAAM,2BAA2B,CAAC;AAkBnC,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;CAC1C;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,yBAAyB,EAAE,MAAM,IAAI,CAAC;CAChD;AAED,uDAAuD;AACvD,eAAO,MAAM,eAAe,GAC1B,OAAM,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAM,KACnE,SAkEF,CAAC"}

package/dist/src/local-first/Evolu.js

@@ -1,24 +1,56 @@
+import { exhaustiveCheck } from "@evolu/common";
 import { createEvoluDeps as createCommonEvoluDeps } from "@evolu/common/local-first";
 import { reloadApp } from "../Platform.js";
-import { createMessageChannel, createSharedWorker, createWorker, } from "../Worker.js";
-// // TODO: Redesign.
-// // eslint-disable-next-line evolu/require-pure-annotation
-// export const localAuth = createLocalAuth({
-//   randomBytes: createRandomBytes(),
-//   secureStorage: createWebAuthnStore({ randomBytes: createRandomBytes() }),
-// });
+import { createBroadcastChannel, createMessageChannel, createSharedWorker, createWorker, installOneTabSharedWorkerPolyfill, } from "../Worker.js";
 /** Creates Evolu dependencies for the web platform. */
 export const createEvoluDeps = (deps = {}) => {
+    installOneTabSharedWorkerPolyfill();
     const createDbWorker = () => createWorker(new Worker(new URL("Db.worker.js", import.meta.url), {
         type: "module",
     }));
-    const sharedWorker = createSharedWorker(new SharedWorker(new URL("Shared.worker.js", import.meta.url), {
+    const webSharedWorker = createSharedWorker(new SharedWorker(new URL("Shared.worker.js", import.meta.url), {
         type: "module",
     }));
+    let onSharedWorkerMessage = null;
+    const sharedWorker = {
+        ...webSharedWorker,
+        port: {
+            ...webSharedWorker.port,
+            get onMessage() {
+                return onSharedWorkerMessage;
+            },
+            set onMessage(fn) {
+                onSharedWorkerMessage = fn;
+                webSharedWorker.port.onMessage = fn
+                    ? (message) => {
+                        switch (message.type) {
+                            case "DbWorkerInit": {
+                                fn(message);
+                                break;
+                            }
+                            case "SharedWorkerUnsupported": {
+                                if (deps.onSharedWorkerUnsupported) {
+                                    deps.onSharedWorkerUnsupported();
+                                }
+                                else {
+                                    globalThis.alert("This browser supports Evolu in one tab only. Close this tab and use the already open tab.");
+                                }
+                                break;
+                            }
+                            default:
+                                exhaustiveCheck(message);
+                        }
+                    }
+                    : null;
+            },
+        },
+    };
     return createCommonEvoluDeps({
         ...deps,
         createDbWorker,
+        createBroadcastChannel,
         createMessageChannel,
+        lockManager: globalThis.navigator.locks,
         reloadApp,
         sharedWorker,
     });

package/dist/src/local-first/Shared.worker.js

@@ -1,13 +1,94 @@
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while (r = env.stack.pop()) {
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                    }
+                    else s |= 1;
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
 /// <reference lib="webworker" />
 import { installPolyfills } from "@evolu/common/polyfills";
 installPolyfills();
-import { createWebSocket } from "@evolu/common";
+import { createWebSocket, ok } from "@evolu/common";
 import { initSharedWorker } from "@evolu/common/local-first";
 import { createRun } from "../Task.js";
-import { createSharedWorkerSelf, createWorkerDeps } from "../Worker.js";
+import { createOneTabSharedWorkerSelfPolyfill, createSharedWorkerSelf, createWorkerDeps, } from "../Worker.js";
 // No disposal (`await using`) is needed — a SharedWorker lives forever.
 const run = createRun({
     ...createWorkerDeps(),
     createWebSocket,
+    lockManager: globalThis.navigator.locks,
+});
+void run(async (run) => {
+    const env_1 = { stack: [], error: void 0, hasError: false };
+    try {
+        if ("onconnect" in self) {
+            void run(initSharedWorker(createSharedWorkerSelf(self)));
+            return ok();
+        }
+        const workerSelf = __addDisposableResource(env_1, createOneTabSharedWorkerSelfPolyfill(self), false);
+        await globalThis.navigator.locks.request("evolu-one-tab-sharedworker-polyfill", { ifAvailable: true, mode: "exclusive" }, async (lock) => {
+            if (!lock) {
+                const message = {
+                    type: "SharedWorkerUnsupported",
+                };
+                self.postMessage(message);
+                return;
+            }
+            void run(initSharedWorker(workerSelf));
+            await Promise.withResolvers().promise;
+        });
+        return ok();
+    }
+    catch (e_1) {
+        env_1.error = e_1;
+        env_1.hasError = true;
+    }
+    finally {
+        __disposeResources(env_1);
+    }
 });
-run(initSharedWorker(createSharedWorkerSelf(self)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/web",
-  "version": "3.0.0-next.0",
+  "version": "3.0.0-next.1",
   "description": "Evolu for web",
   "keywords": [
     "evolu",
@@ -8,7 +8,10 @@
   ],
   "author": "Daniel Steigerwald <daniel@steigerwald.cz>",
   "license": "MIT",
-  "repository": "evoluhq/evolu",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/evoluhq/evolu.git"
+  },
   "bugs": {
     "url": "https://github.com/evoluhq/evolu/issues"
   },
@@ -27,22 +30,18 @@
     "src/**",
     "README.md"
   ],
-  "scripts": {
-    "build": "tsc --build tsconfig.build.json",
-    "prepack": "npm run build",
-    "format": "prettier --write \"src/*.{ts,tsx,md}\""
-  },
   "dependencies": {
     "@evolu/sqlite-wasm": "2.2.4",
     "idb-keyval": "^6.2.2"
   },
   "devDependencies": {
-    "@evolu/common": "8.0.0-next.0",
-    "@evolu/typescript-config": "*",
+    "@types/node": "^24.10.9",
     "@types/sharedworker": "^0.0.221",
     "@types/web-locks-api": "^0.0.5",
-    "typescript": "^5.9.3",
-    "user-agent-data-types": "^0.4.2"
+    "typescript": "^6",
+    "user-agent-data-types": "^0.4.2",
+    "@evolu/common": "8.0.0-next.5",
+    "@evolu/typescript-config": "0.0.2"
   },
   "peerDependencies": {
     "@evolu/common": "^8.0.0-next.0"
@@ -53,5 +52,9 @@
   "engines": {
     "node": ">=24.0.0"
   },
-  "sideEffects": false
-}
+  "sideEffects": false,
+  "scripts": {
+    "build": "tsc --build tsconfig.build.json",
+    "format": "prettier --write \"src/*.{ts,tsx,md}\""
+  }
+}

package/src/Sqlite.ts

@@ -3,6 +3,7 @@ import { bytesToHex, createPreparedStatementsCache, ok } from "@evolu/common";
 import sqlite3InitModule, {
   type Database,
   type PreparedStatement,
+  type SAHPoolUtil,
 } from "@evolu/sqlite-wasm";
 
 // @ts-expect-error Missing types.
@@ -23,26 +24,51 @@ globalThis.sqlite3ApiConfig = {
 // Init ASAP.
 const sqlite3Promise = sqlite3InitModule();
 
+const fileName = "evolu1.db";
+
 export const createWasmSqliteDriver: CreateSqliteDriver =
   (name, options) => async () => {
     const sqlite3 = await sqlite3Promise;
-    // This is used to make OPFS default vfs for multipleciphers
-    // @ts-expect-error Missing types (update @evolu/sqlite-wasm types)
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    sqlite3.capi.sqlite3mc_vfs_create("opfs", 1);
 
-    const stack = new globalThis.DisposableStack();
+    using disposer = new DisposableStack();
+    const useDatabase = (database: Database): Database =>
+      disposer.adopt(database, (database) => {
+        database.close();
+      });
+
+    let deleteDatabaseFile = false;
+    const createOpfsSAHPoolVfs = async (
+      options: Parameters<typeof sqlite3.installOpfsSAHPoolVfs>[0],
+    ): Promise<SAHPoolUtil> => {
+      const pool = await sqlite3.installOpfsSAHPoolVfs(options);
+      if (pool.isPaused()) await pool.unpauseVfs();
+      disposer.defer(() => {
+        if (deleteDatabaseFile) pool.unlink(`/${fileName}`);
+        pool.pauseVfs();
+      });
+      return pool;
+    };
+
     let db: Database;
+
     switch (options?.mode) {
       case "memory":
-        db = new sqlite3.oo1.DB(":memory:");
+        db = useDatabase(new sqlite3.oo1.DB(":memory:"));
         break;
+
       case "encrypted": {
-        const pool = await sqlite3.installOpfsSAHPoolVfs({
+        // MultipleCiphers encryption requires its VFS wrapper for OPFS SAH-pool.
+        // @ts-expect-error Missing types (update @evolu/sqlite-wasm types)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+        sqlite3.capi.sqlite3mc_vfs_create("opfs", 1);
+        const pool = await createOpfsSAHPoolVfs({
           directory: `.${name}`,
         });
-        db = new pool.OpfsSAHPoolDb(
-          "file:evolu1.db?vfs=multipleciphers-opfs-sahpool",
+        db = useDatabase(
+          new pool.OpfsSAHPoolDb(
+            // SQLite normalizes this URI filename to SAH-pool path "/evolu1.db".
+            `file:${fileName}?vfs=multipleciphers-opfs-sahpool`,
+          ),
         );
         db.exec(`
           PRAGMA cipher = 'sqlcipher';
@@ -50,17 +76,14 @@ export const createWasmSqliteDriver: CreateSqliteDriver =
         `);
         break;
       }
+
       default: {
-        const pool = await sqlite3.installOpfsSAHPoolVfs({ name });
-        db = new pool.OpfsSAHPoolDb("file:evolu1.db");
+        const pool = await createOpfsSAHPoolVfs({ name });
+        db = useDatabase(new pool.OpfsSAHPoolDb(`file:${fileName}`));
       }
     }
 
-    db = stack.adopt(db, (db) => {
-      db.close();
-    });
-
-    const cache = stack.use(
+    const cache = disposer.use(
       createPreparedStatementsCache<PreparedStatement>(
         (sql) => db.prepare(sql),
         (statement) => {
@@ -69,6 +92,8 @@ export const createWasmSqliteDriver: CreateSqliteDriver =
       ),
     );
 
+    const disposables = disposer.move();
+
     return ok({
       exec: (query) => {
         const prepared = cache.get(query);
@@ -101,9 +126,13 @@ export const createWasmSqliteDriver: CreateSqliteDriver =
 
       export: () => sqlite3.capi.sqlite3_js_db_export(db),
 
+      deleteDatabase: () => {
+        deleteDatabaseFile = true;
+        disposables.dispose();
+      },
+
       [Symbol.dispose]: () => {
-        // poolUtil.unlink?
-        stack.dispose();
+        disposables.dispose();
       },
     });
   };

package/src/Task.ts

@@ -7,46 +7,11 @@
 import {
   createRun as createCommonRun,
   createUnknownError,
-  ok,
   type CreateRun,
-  type LeaderLock,
   type Run,
-  type RunDeps,
+  type RunDefaultDeps,
 } from "@evolu/common";
 
-/**
- * Creates a {@link LeaderLock} backed by the Web Locks API.
- *
- * Waiting for the browser lock is intentionally unabortable. If a caller starts
- * waiting and its {@link Run} or fiber is later aborted, the underlying Web
- * Locks request keeps waiting until the browser grants the lock. Only the
- * returned lease releases it.
- */
-export const createLeaderLock = (): LeaderLock => ({
-  lock: (name) => async () => {
-    const acquired = Promise.withResolvers<void>();
-    const release = Promise.withResolvers<void>();
-
-    void globalThis.navigator.locks.request(
-      `evolu-leaderlock-${name}`,
-      { mode: "exclusive" },
-      async () => {
-        acquired.resolve();
-        await release.promise;
-      },
-    );
-
-    await acquired.promise;
-
-    return ok({
-      [Symbol.asyncDispose]: async () => {
-        release.resolve();
-        return Promise.resolve();
-      },
-    });
-  },
-});
-
 /**
  * Creates {@link Run} for the browser with global error handling.
  *
@@ -63,14 +28,14 @@ export const createLeaderLock = (): LeaderLock => ({
  * });
  *
  * await using run = createRun({ console });
- * await using stack = new AsyncDisposableStack();
+ * await using disposer = new AsyncDisposableStack();
  *
- * stack.use(await run.orThrow(startApp()));
+ * disposer.use(await run.orThrow(startApp()));
  * ```
  */
-export const createRun: CreateRun<RunDeps> = <D>(
+export const createRun: CreateRun<RunDefaultDeps> = <D>(
   deps?: D,
-): Run<RunDeps & D> => {
+): Run<RunDefaultDeps & D> => {
   const run = createCommonRun(deps);
   const console = run.deps.console.child("global");
 

package/src/Worker.ts

@@ -1,4 +1,8 @@
 import type {
+  BroadcastChannel,
+  CreateBroadcastChannel,
+  CreateBroadcastChannelDep,
+  CreateMessageChannelDep,
   CreateMessagePort,
   MessageChannel,
   MessagePort,
@@ -10,14 +14,49 @@ import type {
   WorkerDeps,
   WorkerSelf,
 } from "@evolu/common";
-import { assert, createConsole, createConsoleStoreOutput } from "@evolu/common";
+import {
+  assert,
+  assertNotDisposed,
+  createConsole,
+  createConsoleStoreOutput,
+} from "@evolu/common";
 
 /** Creates a {@link Worker} from a Web Worker. */
 export const createWorker = <Input, Output>(
   nativeWorker: globalThis.Worker,
 ): Worker<Input, Output> => wrap(nativeWorker);
 
-/** Creates an Evolu {@link SharedWorker} from a Web SharedWorker. */
+/**
+ * Installs a one-tab SharedWorker polyfill backed by a Web Worker.
+ *
+ * Use it before constructing a SharedWorker in browsers without native
+ * SharedWorker support.
+ */
+export const installOneTabSharedWorkerPolyfill = (): void => {
+  if (typeof globalThis.SharedWorker === "function") return;
+
+  Object.defineProperty(globalThis, "SharedWorker", {
+    configurable: true,
+    writable: true,
+    value: class {
+      readonly port: globalThis.MessagePort;
+
+      constructor(scriptURL: string | URL, options?: WorkerOptions) {
+        this.port = new globalThis.Worker(
+          scriptURL,
+          options,
+        ) as unknown as globalThis.MessagePort;
+      }
+    },
+  });
+};
+
+/**
+ * Creates a {@link SharedWorker} from a Web SharedWorker.
+ *
+ * Call {@link installOneTabSharedWorkerPolyfill} first to support browsers
+ * without native SharedWorker support.
+ */
 export const createSharedWorker = <Input, Output = never>(
   nativeSharedWorker: globalThis.SharedWorker,
 ): SharedWorker<Input, Output> => {
@@ -44,14 +83,16 @@ export const createMessageChannel = <Input, Output = never>(): MessageChannel<
   Output
 > => {
   const channel = new globalThis.MessageChannel();
-  const stack = new DisposableStack();
+  using disposer = new DisposableStack();
+
+  const port1 = disposer.use(wrap<Input, Output>(channel.port1));
+  const port2 = disposer.use(wrap<Output, Input>(channel.port2));
+  const disposables = disposer.move();
 
   return {
-    port1: stack.use(wrap<Input, Output>(channel.port1)),
-    port2: stack.use(wrap<Output, Input>(channel.port2)),
-    [Symbol.dispose]: () => {
-      stack.dispose();
-    },
+    port1,
+    port2,
+    [Symbol.dispose]: () => disposables.dispose(),
   };
 };
 
@@ -63,6 +104,45 @@ export const createMessageChannel = <Input, Output = never>(): MessageChannel<
 export const createMessagePort: CreateMessagePort = (nativePort) =>
   wrap(nativePort as unknown as globalThis.MessagePort);
 
+/** Creates an Evolu {@link BroadcastChannel} from a Web BroadcastChannel. */
+export const createBroadcastChannel: CreateBroadcastChannel = <
+  Input,
+  Output = Input,
+>(
+  name: string,
+): BroadcastChannel<Input, Output> => {
+  const nativeBroadcastChannel = new globalThis.BroadcastChannel(name);
+  using disposer = new DisposableStack();
+
+  disposer.defer(() => {
+    nativeBroadcastChannel.onmessage = null;
+    nativeBroadcastChannel.close();
+  });
+
+  const disposables = disposer.move();
+  let onMessageHandler: ((message: Output) => void) | null = null;
+
+  return {
+    postMessage: (message) => {
+      assertNotDisposed(disposables);
+      nativeBroadcastChannel.postMessage(message);
+    },
+    get onMessage() {
+      return disposables.disposed ? null : onMessageHandler;
+    },
+    set onMessage(fn) {
+      if (disposables.disposed) return;
+      onMessageHandler = fn;
+      nativeBroadcastChannel.onmessage = fn
+        ? (event: MessageEvent<Output>) => {
+            fn(event.data);
+          }
+        : null;
+    },
+    [Symbol.dispose]: () => disposables.dispose(),
+  };
+};
+
 /**
  * Creates an Evolu {@link WorkerSelf} from a Web `DedicatedWorkerGlobalScope`
  * (`self` inside a dedicated worker).
@@ -99,14 +179,102 @@ export const createSharedWorkerSelf = <Input, Output = never>(
   return self;
 };
 
+/**
+ * Creates a one-tab {@link SharedWorkerSelf} polyfill for browsers without
+ * native SharedWorker support.
+ *
+ * Delivers one synthetic `onConnect` port, queues startup messages until
+ * `onMessage` is set, and does not share state across tabs.
+ */
+export const createOneTabSharedWorkerSelfPolyfill = <Input, Output = never>(
+  nativeSelf: globalThis.DedicatedWorkerGlobalScope,
+): SharedWorkerSelf<Input, Output> => {
+  using disposer = new DisposableStack();
+
+  let onConnectHandler: ((port: MessagePort<Output, Input>) => void) | null =
+    null;
+  let onMessageHandler: ((message: Input) => void) | null = null;
+  const messages: Array<Input> = [];
+  let connected = false;
+
+  disposer.defer(() => {
+    messages.length = 0;
+    onConnectHandler = null;
+    onMessageHandler = null;
+    nativeSelf.onmessage = null;
+    nativeSelf.close();
+  });
+
+  const disposables = disposer.move();
+
+  nativeSelf.onmessage = (event: MessageEvent<Input>) => {
+    if (disposables.disposed) return;
+
+    const handler = onMessageHandler;
+    if (handler) handler(event.data);
+    else messages.push(event.data);
+  };
+
+  const flushMessages = (): void => {
+    for (const message of messages.splice(0)) {
+      const handler = onMessageHandler;
+      if (!handler) return;
+      handler(message);
+    }
+  };
+
+  const port: MessagePort<Output, Input> = {
+    postMessage: (message, transfer) => {
+      if (disposables.disposed) return;
+      if (transfer == null) nativeSelf.postMessage(message);
+      else nativeSelf.postMessage(message, [...transfer]);
+    },
+
+    get onMessage() {
+      return disposables.disposed ? null : onMessageHandler;
+    },
+    set onMessage(fn) {
+      if (disposables.disposed) return;
+      onMessageHandler = fn;
+      if (fn) flushMessages();
+    },
+
+    native: nativeSelf as unknown as NativeMessagePort<Output, Input>,
+
+    [Symbol.dispose]: () => disposables.dispose(),
+  };
+
+  const connect = (): void => {
+    if (connected || !onConnectHandler) return;
+    connected = true;
+    onConnectHandler(port);
+  };
+
+  return {
+    get onConnect() {
+      return onConnectHandler;
+    },
+    set onConnect(fn) {
+      if (disposables.disposed) return;
+      onConnectHandler = fn;
+      connect();
+    },
+    [Symbol.dispose]: () => disposables.dispose(),
+  };
+};
+
 /** Creates deps shared by web worker entry points. */
-export const createWorkerDeps = (): WorkerDeps => {
+export const createWorkerDeps = (): WorkerDeps &
+  CreateBroadcastChannelDep &
+  CreateMessageChannelDep => {
   const consoleStoreOutput = createConsoleStoreOutput();
   const console = createConsole({ output: consoleStoreOutput });
 
   return {
     console,
     consoleStoreOutputEntry: consoleStoreOutput.entry,
+    createBroadcastChannel,
+    createMessageChannel,
     createMessagePort,
   };
 };
@@ -144,7 +312,7 @@ const wrap = <Input, Output>(
 
     [Symbol.dispose]: () => {
       native.onmessage = null;
-      if (native instanceof globalThis.Worker) native.terminate();
+      if ("terminate" in native) native.terminate();
       else native.close();
     },
   };