@evolu/common 8.0.0-next.2 → 8.0.0-next.4

package/dist/src/Worker.js

@@ -1,9 +1,61 @@
 /**
- * Platform-agnostic Worker abstractions.
+ * Typed, disposable worker and messaging primitives.
  *
  * @module
  */
-import { assert } from "./Assert.js";
+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;
+});
+import { assert, assertNotDisposed } from "./Assert.js";
 import { testWaitForMacrotask } from "./Test.js";
 /**
  * Creates an in-memory {@link Worker}.
@@ -38,30 +90,55 @@ export const createSharedWorker = (initWorker) => {
  * support. Message delivery is asynchronous in-process.
  */
 export const createMessageChannel = () => {
-    const state1 = {
-        handler: null,
-        queue: [],
-        flushScheduled: false,
-    };
-    const state2 = {
-        handler: null,
-        queue: [],
-        flushScheduled: false,
-    };
-    const native1 = createNativeMessagePortToken();
-    const native2 = createNativeMessagePortToken();
-    const port1 = createTestPort(state1, state2, native1);
-    const port2 = createTestPort(state2, state1, native2);
-    nativePortRegistry.set(native1, port1);
-    nativePortRegistry.set(native2, port2);
-    return {
-        port1,
-        port2,
-        [Symbol.dispose]: () => {
-            port1[Symbol.dispose]();
-            port2[Symbol.dispose]();
-        },
-    };
+    const env_1 = { stack: [], error: void 0, hasError: false };
+    try {
+        const state1 = {
+            handler: null,
+            queue: [],
+            flushScheduled: false,
+            flushTimeoutId: null,
+            ownerCount: 0,
+            pendingTransferCount: 0,
+        };
+        const state2 = {
+            handler: null,
+            queue: [],
+            flushScheduled: false,
+            flushTimeoutId: null,
+            ownerCount: 0,
+            pendingTransferCount: 0,
+        };
+        const native1 = createNativeMessagePortToken();
+        const native2 = createNativeMessagePortToken();
+        const port1Registration = {
+            receive: state1,
+            peerReceive: state2,
+            native: native1,
+        };
+        const port2Registration = {
+            receive: state2,
+            peerReceive: state1,
+            native: native2,
+        };
+        const disposer = __addDisposableResource(env_1, new DisposableStack(), false);
+        const port1 = disposer.use(createTestPort(port1Registration));
+        const port2 = disposer.use(createTestPort(port2Registration));
+        const disposables = disposer.move();
+        nativePortRegistry.set(native1, port1Registration);
+        nativePortRegistry.set(native2, port2Registration);
+        return {
+            port1,
+            port2,
+            [Symbol.dispose]: () => disposables.dispose(),
+        };
+    }
+    catch (e_1) {
+        env_1.error = e_1;
+        env_1.hasError = true;
+    }
+    finally {
+        __disposeResources(env_1);
+    }
 };
 /**
  * Creates an in-memory {@link MessagePort} from a native token.
@@ -70,10 +147,72 @@ export const createMessageChannel = () => {
  * support. Message delivery through returned ports is asynchronous in-process.
  */
 export const createMessagePort = (nativePort) => {
-    const pair = nativePortRegistry.get(nativePort);
-    assert(pair, "Unknown native port — did you transfer it?");
-    return pair;
+    const registration = nativePortRegistry.get(nativePort);
+    assert(registration, "Unknown native port — did you transfer it?");
+    return createTestPort(registration);
 };
+/**
+ * Creates an in-memory {@link BroadcastChannel}.
+ *
+ * This is a memory-only fallback for platforms without native BroadcastChannel
+ * support. Message delivery is asynchronous in-process.
+ */
+export const createBroadcastChannel = (name) => {
+    const env_2 = { stack: [], error: void 0, hasError: false };
+    try {
+        let onMessageHandler = null;
+        const dispatch = (message) => {
+            onMessageHandler?.(message);
+        };
+        let dispatches = broadcastChannelDispatchesByName.get(name);
+        if (!dispatches) {
+            dispatches = new Set();
+            broadcastChannelDispatchesByName.set(name, dispatches);
+        }
+        dispatches.add(dispatch);
+        const disposer = __addDisposableResource(env_2, new DisposableStack(), false);
+        disposer.defer(() => {
+            onMessageHandler = null;
+            dispatches.delete(dispatch);
+            if (dispatches.size === 0)
+                broadcastChannelDispatchesByName.delete(name);
+        });
+        const disposables = disposer.move();
+        return {
+            postMessage: (message) => {
+                assertNotDisposed(disposables);
+                const dispatches = broadcastChannelDispatchesByName.get(name);
+                assert(dispatches, "Expected broadcast channel dispatches");
+                for (const otherDispatch of [...dispatches]) {
+                    if (otherDispatch === dispatch)
+                        continue;
+                    globalThis.setTimeout(() => {
+                        if (!dispatches.has(otherDispatch))
+                            return;
+                        otherDispatch(message);
+                    }, 0);
+                }
+            },
+            get onMessage() {
+                return disposables.disposed ? null : onMessageHandler;
+            },
+            set onMessage(fn) {
+                if (disposables.disposed)
+                    return;
+                onMessageHandler = fn;
+            },
+            [Symbol.dispose]: () => disposables.dispose(),
+        };
+    }
+    catch (e_2) {
+        env_2.error = e_2;
+        env_2.hasError = true;
+    }
+    finally {
+        __disposeResources(env_2);
+    }
+};
+const broadcastChannelDispatchesByName = new Map();
 /**
  * Creates a connected {@link TestWorker} for testing.
  *
@@ -110,25 +249,62 @@ export const testCreateSharedWorker = () => {
  * {@link testCreateMessagePort} can look them up by their native token.
  */
 export const testCreateMessageChannel = () => {
-    const channel = createMessageChannel();
-    let disposed = false;
-    return {
-        port1: channel.port1,
-        port2: channel.port2,
-        isDisposed: () => disposed,
-        [Symbol.dispose]: () => {
-            disposed = true;
-            channel[Symbol.dispose]();
-        },
-    };
+    const env_3 = { stack: [], error: void 0, hasError: false };
+    try {
+        const disposer = __addDisposableResource(env_3, new DisposableStack(), false);
+        const channel = disposer.use(createMessageChannel());
+        const disposables = disposer.move();
+        return {
+            port1: channel.port1,
+            port2: channel.port2,
+            isDisposed: () => disposables.disposed,
+            [Symbol.dispose]: () => disposables.dispose(),
+        };
+    }
+    catch (e_3) {
+        env_3.error = e_3;
+        env_3.hasError = true;
+    }
+    finally {
+        __disposeResources(env_3);
+    }
 };
 /** Creates an in-memory {@link CreateMessagePort} for testing. */
 export const testCreateMessagePort = (nativePort) => createMessagePort(nativePort);
+/** Creates an in-memory {@link BroadcastChannel} for testing. */
+export const testCreateBroadcastChannel = (name) => {
+    const env_4 = { stack: [], error: void 0, hasError: false };
+    try {
+        const disposer = __addDisposableResource(env_4, new DisposableStack(), false);
+        const channel = disposer.use(createBroadcastChannel(name));
+        const disposables = disposer.move();
+        return {
+            postMessage: channel.postMessage,
+            get onMessage() {
+                return channel.onMessage;
+            },
+            set onMessage(value) {
+                channel.onMessage = value;
+            },
+            isDisposed: () => disposables.disposed,
+            [Symbol.dispose]: () => disposables.dispose(),
+        };
+    }
+    catch (e_4) {
+        env_4.error = e_4;
+        env_4.hasError = true;
+    }
+    finally {
+        __disposeResources(env_4);
+    }
+};
 /**
- * Waits long enough for multi-hop in-memory worker message delivery in tests.
+ * Waits the minimal time necessary for in-memory worker message delivery in
+ * tests.
  *
- * Some flows require several queued macrotasks across worker/message-port
- * boundaries; this helper advances that pipeline deterministically.
+ * This is better than `vi.waitFor` when a test only needs to flush the known
+ * in-memory worker/message-port pipeline. It encodes that transport boundary
+ * once, avoids polling, and keeps worker-focused tests fast and explicit.
  */
 export const testWaitForWorkerMessage = async () => {
     await testWaitForMacrotask();
@@ -184,43 +360,90 @@ const createMemorySharedWorkerPair = () => {
     };
     return { worker, self, connect };
 };
-const createPort = (receive, peerReceive, native) => {
-    const scheduleFlush = (state) => {
-        if (state.flushScheduled)
-            return;
-        state.flushScheduled = true;
-        // Native worker messages are task-queued; use macrotask timing.
-        setTimeout(() => {
-            state.flushScheduled = false;
-            const handler = state.handler;
-            if (!handler)
+const createPort = ({ receive, peerReceive, native, }) => {
+    const env_5 = { stack: [], error: void 0, hasError: false };
+    try {
+        const disposer = __addDisposableResource(env_5, new DisposableStack(), false);
+        if (receive.pendingTransferCount > 0)
+            receive.pendingTransferCount -= 1;
+        else
+            receive.ownerCount += 1;
+        disposer.defer(() => {
+            receive.ownerCount -= 1;
+            if (receive.ownerCount > 0)
                 return;
-            for (const message of state.queue.splice(0)) {
-                handler(message);
+            nativePortRegistry.delete(native);
+            if (receive.flushTimeoutId != null) {
+                globalThis.clearTimeout(receive.flushTimeoutId);
+                receive.flushTimeoutId = null;
             }
-        }, 0);
-    };
-    return {
-        postMessage: (message) => {
-            peerReceive.queue.push(message);
-            scheduleFlush(peerReceive);
-        },
-        get onMessage() {
-            return receive.handler;
-        },
-        set onMessage(fn) {
-            receive.handler = fn;
-            if (fn)
-                scheduleFlush(receive);
-        },
-        native,
-        [Symbol.dispose]: () => {
             receive.handler = null;
             receive.flushScheduled = false;
-        },
-    };
+            receive.queue.length = 0;
+        });
+        const disposables = disposer.move();
+        const scheduleFlush = (state) => {
+            if (state.flushScheduled || state.ownerCount === 0)
+                return;
+            state.flushScheduled = true;
+            // Native worker messages are task-queued; use macrotask timing.
+            state.flushTimeoutId = globalThis.setTimeout(() => {
+                state.flushTimeoutId = null;
+                state.flushScheduled = false;
+                if (state.ownerCount === 0)
+                    return;
+                const firstHandler = state.handler;
+                if (!firstHandler)
+                    return;
+                for (const message of state.queue.splice(0)) {
+                    const handler = state.handler;
+                    if (!handler)
+                        return;
+                    handler(message);
+                }
+            }, 0);
+        };
+        return {
+            postMessage: (message, transfer) => {
+                if (disposables.disposed ||
+                    receive.ownerCount === 0 ||
+                    peerReceive.ownerCount === 0)
+                    return;
+                for (const transferable of transfer ?? []) {
+                    if (transferable instanceof globalThis.ArrayBuffer)
+                        continue;
+                    const registration = nativePortRegistry.get(transferable);
+                    if (!registration)
+                        continue;
+                    registration.receive.ownerCount += 1;
+                    registration.receive.pendingTransferCount += 1;
+                }
+                peerReceive.queue.push(message);
+                scheduleFlush(peerReceive);
+            },
+            get onMessage() {
+                return disposables.disposed ? null : receive.handler;
+            },
+            set onMessage(fn) {
+                if (disposables.disposed || receive.ownerCount === 0)
+                    return;
+                receive.handler = fn;
+                if (fn)
+                    scheduleFlush(receive);
+            },
+            native,
+            [Symbol.dispose]: () => disposables.dispose(),
+        };
+    }
+    catch (e_5) {
+        env_5.error = e_5;
+        env_5.hasError = true;
+    }
+    finally {
+        __disposeResources(env_5);
+    }
 };
-const createTestPort = (receive, peerReceive, native) => createPort(receive, peerReceive, native);
+const createTestPort = (registration) => createPort(registration);
 const createNativeMessagePortToken = () => ({});
 /**
  * Registry mapping native port tokens to their in-memory port counterparts.

package/dist/src/index.d.ts

@@ -16,6 +16,7 @@ export * from "./Eq.js";
 export * from "./Error.js";
 export * from "./Function.js";
 export * from "./Identicon.js";
+export * from "./LockManager.js";
 export * from "./Lookup.js";
 export * from "./Microtask.js";
 export * from "./Number.js";

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAG5B,YAAY,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC9D,YAAY,EACV,YAAY,EACZ,KAAK,EACL,WAAW,EACX,SAAS,EACT,UAAU,GACX,MAAM,wBAAwB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EACjB,SAAS,EACT,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,GAAG,GACT,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,YAAY,EACV,mBAAmB,EACnB,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,eAAe,EACf,cAAc,EACd,yBAAyB,EACzB,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAIV,SAAS,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,SAAS,EACT,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,4BAA4B,CAAC;AACpC,YAAY,EACV,cAAc,EACd,6BAA6B,EAC7B,mBAAmB,EACnB,cAAc,EACd,4BAA4B,GAC7B,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAG5B,YAAY,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC9D,YAAY,EACV,YAAY,EACZ,KAAK,EACL,WAAW,EACX,SAAS,EACT,UAAU,GACX,MAAM,wBAAwB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EACjB,SAAS,EACT,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,GAAG,GACT,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,YAAY,EACV,mBAAmB,EACnB,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,eAAe,EACf,cAAc,EACd,yBAAyB,EACzB,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAIV,SAAS,GACV,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,SAAS,EACT,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,4BAA4B,CAAC;AACpC,YAAY,EACV,cAAc,EACd,6BAA6B,EAC7B,mBAAmB,EACnB,cAAc,EACd,4BAA4B,GAC7B,MAAM,4BAA4B,CAAC"}

package/dist/src/index.js

@@ -16,6 +16,7 @@ export * from "./Eq.js";
 export * from "./Error.js";
 export * from "./Function.js";
 export * from "./Identicon.js";
+export * from "./LockManager.js";
 export * from "./Lookup.js";
 export * from "./Microtask.js";
 export * from "./Number.js";

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

@@ -5,14 +5,15 @@
  */
 import type { ConsoleLevel } from "../Console.js";
 import { EncryptionKey } from "../Crypto.js";
+import type { LockManagerDep } from "../LockManager.js";
 import type { CreateSqliteDriverDep, SqliteSchema } from "../Sqlite.js";
-import { type LeaderLockDep, type Task } from "../Task.js";
+import { type Task } from "../Task.js";
 import type { Name } from "../Type.js";
-import type { NativeMessagePort, Worker, WorkerDeps, WorkerSelf } from "../Worker.js";
+import type { CreateBroadcastChannelDep, NativeMessagePort, Worker, WorkerDeps, WorkerSelf } from "../Worker.js";
 import type { DbWorkerInput, DbWorkerOutput } from "./Shared.js";
 export type DbWorker = Worker<DbWorkerInit>;
 export interface DbWorkerInit {
-    readonly type: "Init";
+    readonly type: "DbWorkerInit";
     readonly name: Name;
     readonly consoleLevel: ConsoleLevel;
     readonly sqliteSchema: SqliteSchema;
@@ -24,6 +25,6 @@ export type CreateDbWorker = () => DbWorker;
 export interface CreateDbWorkerDep {
     readonly createDbWorker: CreateDbWorker;
 }
-export type DbWorkerDeps = WorkerDeps & LeaderLockDep & CreateSqliteDriverDep;
+export type DbWorkerDeps = WorkerDeps & CreateBroadcastChannelDep & LockManagerDep & CreateSqliteDriverDep;
 export declare const startDbWorker: (self: WorkerSelf<DbWorkerInit>) => Task<void, never, DbWorkerDeps>;
 //# sourceMappingURL=Db.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Db.d.ts","sourceRoot":"","sources":["../../../src/local-first/Db.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EACL,aAAa,EAGd,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EACV,qBAAqB,EAGrB,YAAY,EACb,MAAM,cAAc,CAAC;AAUtB,OAAO,EAAY,KAAK,aAAa,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAErE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,KAAK,EACV,iBAAiB,EACjB,MAAM,EACN,UAAU,EACV,UAAU,EACX,MAAM,cAAc,CAAC;AAqBtB,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA8BjE,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAE5C,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;CACjE;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC;AAE5C,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;CACzC;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,aAAa,GAAG,qBAAqB,CAAC;AAE9E,eAAO,MAAM,aAAa,GACvB,MAAM,UAAU,CAAC,YAAY,CAAC,KAAG,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CAoO/D,CAAC"}
+{"version":3,"file":"Db.d.ts","sourceRoot":"","sources":["../../../src/local-first/Db.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EACL,aAAa,EAGd,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIxD,OAAO,KAAK,EACV,qBAAqB,EAGrB,YAAY,EACb,MAAM,cAAc,CAAC;AAUtB,OAAO,EAAY,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,KAAK,EACV,yBAAyB,EACzB,iBAAiB,EACjB,MAAM,EACN,UAAU,EACV,UAAU,EACX,MAAM,cAAc,CAAC;AAqBtB,OAAO,KAAK,EAEV,aAAa,EACb,cAAc,EAGf,MAAM,aAAa,CAAC;AA+BrB,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAE5C,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;CACjE;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC;AAE5C,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;CACzC;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,GACnC,yBAAyB,GACzB,cAAc,GACd,qBAAqB,CAAC;AAExB,eAAO,MAAM,aAAa,GACvB,MAAM,UAAU,CAAC,YAAY,CAAC,KAAG,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CA8O/D,CAAC"}

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

@@ -59,6 +59,7 @@ import { appendToArray, firstInArray, } from "../Array.js";
 import { assert, assertNonEmptyReadonlyArray, assertType } from "../Assert.js";
 import { EncryptionKey, } from "../Crypto.js";
 import { exhaustiveCheck, lazyFalse, lazyVoid } from "../Function.js";
+import { acquireLeaderLock } from "../LockManager.js";
 import { createRecord, getProperty, objectToEntries } from "../Object.js";
 import { ok } from "../Result.js";
 import { booleanToSqliteBoolean, createSqlite, sql, SqliteBoolean, sqliteBooleanToBoolean, sqliteQueryStringToSqliteQuery, SqliteValue, } from "../Sqlite.js";
@@ -68,16 +69,18 @@ import { Id, IdBytes, idBytesToId, idToIdBytes, onePositiveInt, } from "../Type.
 import { ownerIdBytesToOwnerId, ownerIdToOwnerIdBytes } from "./Owner.js";
 import { applyProtocolMessageAsClient, createProtocolMessageForSync, decryptAndDecodeDbChange, encodeAndEncryptDbChange, protocolVersion, SubscriptionFlags, } from "./Protocol.js";
 import { ensureSqliteSchema, getEvoluSqliteSchema, systemColumns, } from "./Schema.js";
+import { consoleEntryOrErrorBroadcastChannelName } from "./Shared.js";
 import { createBaseSqliteStorage, createBaseSqliteStorageTables, DbChange, getTimestampInsertStrategy, readOwnerUsageOrDefault, updateOwnerUsage, } from "./Storage.js";
 import { createInitialTimestamp, defaultTimestampMaxDrift, receiveTimestamp, sendTimestamp, TimestampBytes, timestampBytesToTimestamp, timestampToTimestampBytes, } from "./Timestamp.js";
-export const startDbWorker = (self) => async (_run) => {
+export const startDbWorker = (self) => async (run) => {
     const env_1 = { stack: [], error: void 0, hasError: false };
     try {
-        const stack = __addDisposableResource(env_1, new AsyncDisposableStack(), true);
-        const run = stack.use(_run.create());
-        const { deps } = run;
+        const disposer = __addDisposableResource(env_1, new AsyncDisposableStack(), true);
+        disposer.use(self);
+        const dbWorkerRun = disposer.use(run.create());
+        const { deps } = dbWorkerRun;
         let initialized = false;
-        const initMessage = await run.orThrow(callback(({ ok }) => {
+        const initMessage = await dbWorkerRun.orThrow(callback(({ ok }) => {
             self.onMessage = (message) => {
                 assert(!initialized, "DbWorker must be initialized only once");
                 initialized = true;
@@ -86,24 +89,29 @@ export const startDbWorker = (self) => async (_run) => {
         }));
         const console = deps.console.child(initMessage.name).child("DbWorker");
         console.setLevel(initMessage.consoleLevel);
-        console.info("start DbWorker");
-        const port = stack.use(deps.createMessagePort(initMessage.port));
-        stack.defer(deps.consoleStoreOutputEntry.subscribe(() => {
+        const port = disposer.use(deps.createMessagePort(initMessage.port));
+        const consoleEntryOrErrorBroadcastChannel = disposer.use(deps.createBroadcastChannel(consoleEntryOrErrorBroadcastChannelName));
+        disposer.defer(deps.consoleStoreOutputEntry.subscribe(() => {
             const entry = deps.consoleStoreOutputEntry.get();
             if (entry)
-                port.postMessage({ type: "OnConsoleEntry", entry });
+                consoleEntryOrErrorBroadcastChannel.postMessage({
+                    type: "ConsoleEntry",
+                    entry,
+                });
         }));
-        stack.use(await run.orThrow(deps.leaderLock.lock(initMessage.name)));
-        if (stack.disposed)
-            return ok();
+        console.debug("createDbWorker");
+        disposer.use(await dbWorkerRun.orThrow(acquireLeaderLock(initMessage.name)));
         port.postMessage({ type: "LeaderAcquired", name: initMessage.name });
-        const sqlite = stack.use(await run.orThrow(createSqlite(initMessage.name, initMessage.memoryOnly
+        const sqlite = disposer.use(await dbWorkerRun.orThrow(createSqlite(initMessage.name, initMessage.memoryOnly
             ? { mode: "memory" }
             : { mode: "encrypted", encryptionKey: initMessage.encryptionKey })));
         console.debug("SQLite created");
-        const baseSqliteStorage = createBaseSqliteStorage({ sqlite, ...run.deps });
+        const baseSqliteStorage = createBaseSqliteStorage({
+            sqlite,
+            ...dbWorkerRun.deps,
+        });
         const dbDeps = {
-            ...run.deps,
+            ...dbWorkerRun.deps,
             sqlite,
             sqliteSchema: initMessage.sqliteSchema,
             baseSqliteStorage,
@@ -120,27 +128,22 @@ export const startDbWorker = (self) => async (_run) => {
         });
         const storage = createClientStorage({ ...dbDeps, clock })({
             onError: (error) => {
-                port.postMessage({ type: "OnError", error });
+                consoleEntryOrErrorBroadcastChannel.postMessage({
+                    type: "Error",
+                    error,
+                });
             },
         });
-        // TODO: Call on dispose message.
-        const _moved = stack.move();
-        const runWithStorage = run.addDeps({ storage });
-        /**
-         * SharedWorker retries until some leader replies, so this worker must
-         * ignore callback IDs it already completed.
-         *
-         * The Set intentionally lives for one leader's lifetime. If that leader tab
-         * closes, retries go to a new leader with a fresh Set. Revisit this only if
-         * memory pressure shows up; even millions of short callback IDs are
-         * acceptable here, and naive eviction could let a still-retried request run
-         * again.
-         */
-        const processedRequestIds = new Set();
-        port.onMessage = ({ callbackId, request }) => {
-            if (processedRequestIds.has(callbackId))
+        const disposables = disposer.move();
+        const dbWorkerRunWithStorage = dbWorkerRun.addDeps({ storage });
+        port.onMessage = (input) => {
+            if (input.type === "Dispose") {
+                if (!disposables.disposed)
+                    console.debug("disposeDbWorker");
+                void disposables.disposeAsync();
                 return;
-            processedRequestIds.add(callbackId);
+            }
+            const { callbackId, request } = input;
             const postQueuedResponse = (response) => {
                 port.postMessage({ type: "OnQueuedResponse", callbackId, response }, response.type === "ForEvolu" && response.message.type === "Export"
                     ? [response.message.file.buffer]
@@ -152,12 +155,15 @@ export const startDbWorker = (self) => async (_run) => {
                         case "Mutate": {
                             const result = handleMutation({ ...dbDeps, clock })(request.message);
                             if (!result.ok) {
-                                port.postMessage({ type: "OnError", error: result.error });
+                                consoleEntryOrErrorBroadcastChannel.postMessage({
+                                    type: "Error",
+                                    error: result.error,
+                                });
                             }
                             else {
                                 postQueuedResponse({
                                     type: "ForEvolu",
-                                    evoluPortId: request.evoluPortId,
+                                    id: request.id,
                                     message: result.value,
                                 });
                             }
@@ -166,7 +172,7 @@ export const startDbWorker = (self) => async (_run) => {
                         case "Query":
                             postQueuedResponse({
                                 type: "ForEvolu",
-                                evoluPortId: request.evoluPortId,
+                                id: request.id,
                                 message: {
                                     type: "Query",
                                     rowsByQuery: loadQueries(dbDeps)(request.message.queries),
@@ -176,7 +182,7 @@ export const startDbWorker = (self) => async (_run) => {
                         case "Export":
                             postQueuedResponse({
                                 type: "ForEvolu",
-                                evoluPortId: request.evoluPortId,
+                                id: request.id,
                                 message: {
                                     type: "Export",
                                     file: dbDeps.sqlite.export(),
@@ -211,7 +217,7 @@ export const startDbWorker = (self) => async (_run) => {
                         }
                         case "ApplySyncMessage": {
                             const { owner, inputMessage } = request.message;
-                            runWithStorage(async (run) => {
+                            dbWorkerRunWithStorage(async (run) => {
                                 storage.setRequestContext(owner.encryptionKey);
                                 const result = await run(applyProtocolMessageAsClient(inputMessage, {
                                     writeKey: owner.writeKey,