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

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

@@ -1 +1 @@
-{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../../src/Worker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../../src/Worker.ts"],"names":[],"mappings":"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"}

package/dist/src/Worker.js

@@ -42,18 +42,34 @@ export const createMessageChannel = () => {
         handler: null,
         queue: [],
         flushScheduled: false,
+        refCount: 0,
+        pendingTransferCount: 0,
+        closed: false,
     };
     const state2 = {
         handler: null,
         queue: [],
         flushScheduled: false,
+        refCount: 0,
+        pendingTransferCount: 0,
+        closed: 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);
+    const port1Registration = {
+        receive: state1,
+        peerReceive: state2,
+        native: native1,
+    };
+    const port2Registration = {
+        receive: state2,
+        peerReceive: state1,
+        native: native2,
+    };
+    const port1 = createTestPort(port1Registration);
+    const port2 = createTestPort(port2Registration);
+    nativePortRegistry.set(native1, port1Registration);
+    nativePortRegistry.set(native2, port2Registration);
     return {
         port1,
         port2,
@@ -70,9 +86,9 @@ 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 a connected {@link TestWorker} for testing.
@@ -184,14 +200,20 @@ const createMemorySharedWorkerPair = () => {
     };
     return { worker, self, connect };
 };
-const createPort = (receive, peerReceive, native) => {
+const createPort = ({ receive, peerReceive, native, }) => {
+    if (receive.pendingTransferCount > 0)
+        receive.pendingTransferCount -= 1;
+    receive.refCount += 1;
+    let isDisposed = false;
     const scheduleFlush = (state) => {
-        if (state.flushScheduled)
+        if (state.flushScheduled || state.closed)
             return;
         state.flushScheduled = true;
         // Native worker messages are task-queued; use macrotask timing.
         setTimeout(() => {
             state.flushScheduled = false;
+            if (state.closed)
+                return;
             const handler = state.handler;
             if (!handler)
                 return;
@@ -201,26 +223,47 @@ const createPort = (receive, peerReceive, native) => {
         }, 0);
     };
     return {
-        postMessage: (message) => {
+        postMessage: (message, transfer) => {
+            for (const transferable of transfer ?? []) {
+                if (transferable instanceof globalThis.ArrayBuffer)
+                    continue;
+                const registration = nativePortRegistry.get(transferable);
+                if (!registration)
+                    continue;
+                registration.receive.pendingTransferCount += 1;
+                registration.receive.closed = false;
+            }
+            if (peerReceive.closed)
+                return;
             peerReceive.queue.push(message);
             scheduleFlush(peerReceive);
         },
         get onMessage() {
-            return receive.handler;
+            return isDisposed ? null : receive.handler;
         },
         set onMessage(fn) {
+            if (isDisposed || receive.closed)
+                return;
             receive.handler = fn;
             if (fn)
                 scheduleFlush(receive);
         },
         native,
         [Symbol.dispose]: () => {
+            if (isDisposed)
+                return;
+            isDisposed = true;
+            receive.refCount -= 1;
+            if (receive.refCount > 0 || receive.pendingTransferCount > 0)
+                return;
+            receive.closed = true;
             receive.handler = null;
             receive.flushScheduled = false;
+            receive.queue.length = 0;
         },
     };
 };
-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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/common",
-  "version": "8.0.0-next.2",
+  "version": "8.0.0-next.3",
   "description": "TypeScript library and local-first platform",
   "keywords": [
     "evolu",

package/src/Worker.ts

@@ -250,21 +250,38 @@ export const createMessageChannel: CreateMessageChannel = <
     handler: null,
     queue: [],
     flushScheduled: false,
+    refCount: 0,
+    pendingTransferCount: 0,
+    closed: false,
   };
   const state2: PortState<Input> = {
     handler: null,
     queue: [],
     flushScheduled: false,
+    refCount: 0,
+    pendingTransferCount: 0,
+    closed: false,
   };
 
   const native1 = createNativeMessagePortToken<Input, Output>();
   const native2 = createNativeMessagePortToken<Output, Input>();
 
-  const port1 = createTestPort<Input, Output>(state1, state2, native1);
-  const port2 = createTestPort<Output, Input>(state2, state1, native2);
+  const port1Registration: PortRegistration<Input, Output> = {
+    receive: state1,
+    peerReceive: state2,
+    native: native1,
+  };
+  const port2Registration: PortRegistration<Output, Input> = {
+    receive: state2,
+    peerReceive: state1,
+    native: native2,
+  };
 
-  nativePortRegistry.set(native1, port1);
-  nativePortRegistry.set(native2, port2);
+  const port1 = createTestPort(port1Registration);
+  const port2 = createTestPort(port2Registration);
+
+  nativePortRegistry.set(native1, port1Registration);
+  nativePortRegistry.set(native2, port2Registration);
 
   return {
     port1,
@@ -285,9 +302,9 @@ export const createMessageChannel: CreateMessageChannel = <
 export const createMessagePort: CreateMessagePort = <Input, Output = never>(
   nativePort: NativeMessagePort<Input, Output>,
 ): MessagePort<Input, Output> => {
-  const pair = nativePortRegistry.get(nativePort);
-  assert(pair, "Unknown native port — did you transfer it?");
-  return pair as MessagePort<Input, Output>;
+  const registration = nativePortRegistry.get(nativePort);
+  assert(registration, "Unknown native port — did you transfer it?");
+  return createTestPort(registration as PortRegistration<Input, Output>);
 };
 
 /**
@@ -481,20 +498,34 @@ interface PortState<T> {
   handler: ((message: T) => void) | null;
   readonly queue: Array<T>;
   flushScheduled: boolean;
+  refCount: number;
+  pendingTransferCount: number;
+  closed: boolean;
 }
 
-const createPort = <Input, Output>(
-  receive: PortState<Output>,
-  peerReceive: PortState<Input>,
-  native: NativeMessagePort<Input, Output>,
-): MessagePort<Input, Output> => {
+interface PortRegistration<Input, Output> {
+  readonly receive: PortState<Output>;
+  readonly peerReceive: PortState<Input>;
+  readonly native: NativeMessagePort<Input, Output>;
+}
+
+const createPort = <Input, Output>({
+  receive,
+  peerReceive,
+  native,
+}: PortRegistration<Input, Output>): MessagePort<Input, Output> => {
+  if (receive.pendingTransferCount > 0) receive.pendingTransferCount -= 1;
+  receive.refCount += 1;
+  let isDisposed = false;
+
   const scheduleFlush = (state: PortState<any>): void => {
-    if (state.flushScheduled) return;
+    if (state.flushScheduled || state.closed) return;
     state.flushScheduled = true;
 
     // Native worker messages are task-queued; use macrotask timing.
     setTimeout(() => {
       state.flushScheduled = false;
+      if (state.closed) return;
 
       const handler = state.handler;
       if (!handler) return;
@@ -506,30 +537,48 @@ const createPort = <Input, Output>(
   };
 
   return {
-    postMessage: (message) => {
+    postMessage: (message, transfer) => {
+      for (const transferable of transfer ?? []) {
+        if (transferable instanceof globalThis.ArrayBuffer) continue;
+
+        const registration = nativePortRegistry.get(transferable);
+        if (!registration) continue;
+
+        registration.receive.pendingTransferCount += 1;
+        registration.receive.closed = false;
+      }
+
+      if (peerReceive.closed) return;
       peerReceive.queue.push(message);
       scheduleFlush(peerReceive);
     },
     get onMessage() {
-      return receive.handler;
+      return isDisposed ? null : receive.handler;
     },
     set onMessage(fn) {
+      if (isDisposed || receive.closed) return;
       receive.handler = fn;
       if (fn) scheduleFlush(receive);
     },
     native,
     [Symbol.dispose]: () => {
+      if (isDisposed) return;
+      isDisposed = true;
+
+      receive.refCount -= 1;
+      if (receive.refCount > 0 || receive.pendingTransferCount > 0) return;
+
+      receive.closed = true;
       receive.handler = null;
       receive.flushScheduled = false;
+      receive.queue.length = 0;
     },
   };
 };
 
 const createTestPort = <Input, Output>(
-  receive: PortState<Output>,
-  peerReceive: PortState<Input>,
-  native: NativeMessagePort<Input, Output>,
-): MessagePort<Input, Output> => createPort(receive, peerReceive, native);
+  registration: PortRegistration<Input, Output>,
+): MessagePort<Input, Output> => createPort(registration);
 
 const createNativeMessagePortToken = <Input, Output>(): NativeMessagePort<
   Input,
@@ -548,5 +597,5 @@ const createNativeMessagePortToken = <Input, Output>(): NativeMessagePort<
  */
 const nativePortRegistry = new WeakMap<
   NativeMessagePort<any, any>,
-  MessagePort<any, any>
+  PortRegistration<any, any>
 >();