cojson-transport-ws 0.15.8 → 0.15.10

package/dist/tests/webSocket.integration.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=webSocket.integration.test.d.ts.map

package/dist/tests/webSocket.integration.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webSocket.integration.test.d.ts","sourceRoot":"","sources":["../../src/tests/webSocket.integration.test.ts"],"names":[],"mappings":""}

package/dist/tests/{integration.test.js → webSocket.integration.test.js}

@@ -67,7 +67,10 @@ describe("WebSocket Peer Integration", () => {
         // Verify data reached the server
         const serverNode = server.localNode;
         const serverMap = await serverNode.load(map.id);
-        expect(serverMap.get("testKey")).toBe("testValue");
+        if (serverMap === "unavailable") {
+            throw new Error("Server map is unavailable");
+        }
+        expect(serverMap.get("testKey")?.toString()).toBe("testValue");
     });
     test("should handle disconnection and cleanup", async () => {
         const clientAgent = crypto.newRandomAgentSecret();
@@ -113,5 +116,28 @@ describe("WebSocket Peer Integration", () => {
         });
         expect(ws.readyState).toBe(WebSocket.CLOSED);
     });
+    test("calling terminate on the server should close the connection", async () => {
+        const ws = new WebSocket(syncServerUrl);
+        let disconnectCalled = false;
+        createWebSocketPeer({
+            id: "test-client",
+            websocket: ws,
+            role: "server",
+            onClose: () => {
+                disconnectCalled = true;
+            },
+        });
+        await waitFor(() => {
+            expect(server.wss.clients.size).toBe(1);
+        });
+        const peerOnServer = server.localNode.syncManager.getPeers()[0];
+        for (const client of server.wss.clients) {
+            client.terminate();
+        }
+        await waitFor(() => {
+            expect(disconnectCalled).toBe(true);
+        });
+        expect(peerOnServer?.closed).toBe(true);
+    });
 });
-//# sourceMappingURL=integration.test.js.map
+//# sourceMappingURL=webSocket.integration.test.js.map

package/dist/tests/webSocket.integration.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webSocket.integration.test.js","sourceRoot":"","sources":["../../src/tests/webSocket.integration.test.ts"],"names":[],"mappings":"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"}

package/dist/utils.d.ts

@@ -0,0 +1,8 @@
+import type { AnyWebSocket } from "./types.js";
+export declare const BUFFER_LIMIT = 100000;
+export declare const BUFFER_LIMIT_POLLING_INTERVAL = 10;
+export declare function isWebSocketOpen(websocket: AnyWebSocket): boolean;
+export declare function hasWebSocketTooMuchBufferedData(websocket: AnyWebSocket): boolean;
+export declare function waitForWebSocketOpen(websocket: AnyWebSocket): Promise<void>;
+export declare function waitForWebSocketBufferedAmount(websocket: AnyWebSocket): Promise<void>;
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,eAAO,MAAM,YAAY,SAAU,CAAC;AACpC,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAEhD,wBAAgB,eAAe,CAAC,SAAS,EAAE,YAAY,WAEtD;AAED,wBAAgB,+BAA+B,CAAC,SAAS,EAAE,YAAY,WAEtE;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,YAAY,iBAQ3D;AAED,wBAAsB,8BAA8B,CAAC,SAAS,EAAE,YAAY,iBAM3E"}

package/dist/utils.js

@@ -0,0 +1,24 @@
+export const BUFFER_LIMIT = 100000;
+export const BUFFER_LIMIT_POLLING_INTERVAL = 10;
+export function isWebSocketOpen(websocket) {
+    return websocket.readyState === 1;
+}
+export function hasWebSocketTooMuchBufferedData(websocket) {
+    return websocket.bufferedAmount > BUFFER_LIMIT && isWebSocketOpen(websocket);
+}
+export function waitForWebSocketOpen(websocket) {
+    return new Promise((resolve) => {
+        if (websocket.readyState === 1) {
+            resolve();
+        }
+        else {
+            websocket.addEventListener("open", () => resolve(), { once: true });
+        }
+    });
+}
+export async function waitForWebSocketBufferedAmount(websocket) {
+    while (hasWebSocketTooMuchBufferedData(websocket)) {
+        await new Promise((resolve) => setTimeout(resolve, BUFFER_LIMIT_POLLING_INTERVAL));
+    }
+}
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,YAAY,GAAG,MAAO,CAAC;AACpC,MAAM,CAAC,MAAM,6BAA6B,GAAG,EAAE,CAAC;AAEhD,MAAM,UAAU,eAAe,CAAC,SAAuB;IACrD,OAAO,SAAS,CAAC,UAAU,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,SAAuB;IACrE,OAAO,SAAS,CAAC,cAAc,GAAG,YAAY,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,SAAuB;IAC1D,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QACnC,IAAI,SAAS,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;QACZ,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACtE,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,SAAuB;IAC1E,OAAO,+BAA+B,CAAC,SAAS,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAClC,UAAU,CAAC,OAAO,EAAE,6BAA6B,CAAC,CACnD,CAAC;IACJ,CAAC;AACH,CAAC"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "cojson-transport-ws",
   "type": "module",
-  "version": "0.15.8",
+  "version": "0.15.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "cojson": "0.15.8"
+    "cojson": "0.15.10"
   },
   "devDependencies": {
     "typescript": "5.6.2",

package/src/BatchedOutgoingMessages.ts

@@ -1,21 +1,106 @@
-import type { SyncMessage } from "cojson";
+import type { DisconnectedError, SyncMessage } from "cojson";
+import type { Peer } from "cojson";
+import {
+  type CojsonInternalTypes,
+  PriorityBasedMessageQueue,
+  cojsonInternals,
+  logger,
+} from "cojson";
 import { addMessageToBacklog } from "./serialization.js";
+import type { AnyWebSocket } from "./types.js";
+import {
+  hasWebSocketTooMuchBufferedData,
+  isWebSocketOpen,
+  waitForWebSocketBufferedAmount,
+  waitForWebSocketOpen,
+} from "./utils.js";
+
+const { CO_VALUE_PRIORITY } = cojsonInternals;
 
 export const MAX_OUTGOING_MESSAGES_CHUNK_BYTES = 25_000;
 
-export class BatchedOutgoingMessages {
+export class BatchedOutgoingMessages
+  implements CojsonInternalTypes.OutgoingPeerChannel
+{
   private backlog = "";
-  private timeout: ReturnType<typeof setTimeout> | null = null;
+  private queue: PriorityBasedMessageQueue;
+  private processing = false;
+  private closed = false;
 
-  constructor(private send: (messages: string) => void) {}
+  constructor(
+    private websocket: AnyWebSocket,
+    private batching: boolean,
+    peerRole: Peer["role"],
+  ) {
+    this.queue = new PriorityBasedMessageQueue(
+      CO_VALUE_PRIORITY.HIGH,
+      "outgoing",
+      {
+        peerRole: peerRole,
+      },
+    );
+  }
 
-  push(msg: SyncMessage) {
-    const payload = addMessageToBacklog(this.backlog, msg);
+  push(msg: SyncMessage | DisconnectedError) {
+    if (msg === "Disconnected") {
+      this.close();
+      return;
+    }
+
+    this.queue.push(msg);
 
-    if (this.timeout) {
-      clearTimeout(this.timeout);
+    if (this.processing) {
+      return;
     }
 
+    this.processQueue().catch((e) => {
+      logger.error("Error while processing sendMessage queue", { err: e });
+    });
+  }
+
+  private async processQueue() {
+    const { websocket } = this;
+
+    this.processing = true;
+
+    // Delay the initiation of the queue processing to accumulate messages
+    // before sending them, in order to do prioritization and batching
+    await new Promise<void>((resolve) => setTimeout(resolve, 5));
+
+    let msg = this.queue.pull();
+
+    while (msg) {
+      if (this.closed) {
+        return;
+      }
+
+      if (!isWebSocketOpen(websocket)) {
+        await waitForWebSocketOpen(websocket);
+      }
+
+      if (hasWebSocketTooMuchBufferedData(websocket)) {
+        await waitForWebSocketBufferedAmount(websocket);
+      }
+
+      if (isWebSocketOpen(websocket)) {
+        this.processMessage(msg);
+
+        msg = this.queue.pull();
+      }
+    }
+
+    this.sendMessagesInBulk();
+    this.processing = false;
+  }
+
+  processMessage(msg: SyncMessage) {
+    if (!this.batching) {
+      this.websocket.send(JSON.stringify(msg));
+      return;
+    }
+
+    const payload = addMessageToBacklog(this.backlog, msg);
+
     const maxChunkSizeReached =
       payload.length >= MAX_OUTGOING_MESSAGES_CHUNK_BYTES;
     const backlogExists = this.backlog.length > 0;
@@ -23,26 +108,49 @@ export class BatchedOutgoingMessages {
     if (maxChunkSizeReached && backlogExists) {
       this.sendMessagesInBulk();
       this.backlog = addMessageToBacklog("", msg);
-      this.timeout = setTimeout(() => {
-        this.sendMessagesInBulk();
-      }, 0);
     } else if (maxChunkSizeReached) {
       this.backlog = payload;
       this.sendMessagesInBulk();
     } else {
       this.backlog = payload;
-      this.timeout = setTimeout(() => {
-        this.sendMessagesInBulk();
-      }, 0);
     }
   }
 
   sendMessagesInBulk() {
-    this.send(this.backlog);
-    this.backlog = "";
+    if (this.backlog.length > 0 && isWebSocketOpen(this.websocket)) {
+      this.websocket.send(this.backlog);
+      this.backlog = "";
+    }
+  }
+
+  setBatching(enabled: boolean) {
+    this.batching = enabled;
+  }
+
+  private closeListeners = new Set<() => void>();
+  onClose(callback: () => void) {
+    this.closeListeners.add(callback);
   }
 
   close() {
+    if (this.closed) {
+      return;
+    }
+
+    let msg = this.queue.pull();
+
+    while (msg) {
+      this.processMessage(msg);
+      msg = this.queue.pull();
+    }
+
+    this.closed = true;
     this.sendMessagesInBulk();
+
+    for (const listener of this.closeListeners) {
+      listener();
+    }
+
+    this.closeListeners.clear();
   }
 }

package/src/createWebSocketPeer.ts

@@ -1,17 +1,9 @@
-import {
-  type DisconnectedError,
-  type Peer,
-  type PingTimeoutError,
-  type SyncMessage,
-  cojsonInternals,
-  logger,
-} from "cojson";
+import { type Peer, type SyncMessage, cojsonInternals, logger } from "cojson";
 import { BatchedOutgoingMessages } from "./BatchedOutgoingMessages.js";
 import { deserializeMessages } from "./serialization.js";
 import type { AnyWebSocket } from "./types.js";
 
-export const BUFFER_LIMIT = 100_000;
-export const BUFFER_LIMIT_POLLING_INTERVAL = 10;
+const { ConnectedPeerChannel } = cojsonInternals;
 
 export type CreateWebSocketPeerOpts = {
   id: string;
@@ -52,70 +44,6 @@ function createPingTimeoutListener(
   };
 }
 
-function waitForWebSocketOpen(websocket: AnyWebSocket) {
-  return new Promise<void>((resolve) => {
-    if (websocket.readyState === 1) {
-      resolve();
-    } else {
-      websocket.addEventListener("open", () => resolve(), { once: true });
-    }
-  });
-}
-
-function createOutgoingMessagesManager(
-  websocket: AnyWebSocket,
-  batchingByDefault: boolean,
-) {
-  let closed = false;
-  const outgoingMessages = new BatchedOutgoingMessages((messages) => {
-    if (websocket.readyState === 1) {
-      websocket.send(messages);
-    }
-  });
-
-  let batchingEnabled = batchingByDefault;
-
-  async function sendMessage(msg: SyncMessage) {
-    if (closed) {
-      return Promise.reject(new Error("WebSocket closed"));
-    }
-
-    if (websocket.readyState !== 1) {
-      await waitForWebSocketOpen(websocket);
-    }
-
-    while (
-      websocket.bufferedAmount > BUFFER_LIMIT &&
-      websocket.readyState === 1
-    ) {
-      await new Promise<void>((resolve) =>
-        setTimeout(resolve, BUFFER_LIMIT_POLLING_INTERVAL),
-      );
-    }
-
-    if (websocket.readyState !== 1) {
-      return;
-    }
-
-    if (!batchingEnabled) {
-      websocket.send(JSON.stringify(msg));
-    } else {
-      outgoingMessages.push(msg);
-    }
-  }
-
-  return {
-    sendMessage,
-    setBatchingEnabled(enabled: boolean) {
-      batchingEnabled = enabled;
-    },
-    close() {
-      closed = true;
-      outgoingMessages.close();
-    },
-  };
-}
-
 function createClosedEventEmitter(callback = () => {}) {
   let disconnected = false;
 
@@ -137,17 +65,11 @@ export function createWebSocketPeer({
   onSuccess,
   onClose,
 }: CreateWebSocketPeerOpts): Peer {
-  const incoming = new cojsonInternals.Channel<
-    SyncMessage | DisconnectedError | PingTimeoutError
-  >();
+  const incoming = new ConnectedPeerChannel();
   const emitClosedEvent = createClosedEventEmitter(onClose);
 
   function handleClose() {
-    incoming
-      .push("Disconnected")
-      .catch((e) =>
-        logger.error("Error while pushing disconnect msg", { err: e }),
-      );
+    incoming.push("Disconnected");
     emitClosedEvent();
   }
 
@@ -166,18 +88,19 @@ export function createWebSocketPeer({
     expectPings,
     pingTimeout,
     () => {
-      incoming
-        .push("PingTimeout")
-        .catch((e) =>
-          logger.error("Error while pushing ping timeout", { err: e }),
-        );
+      incoming.push("Disconnected");
+      logger.error("Ping timeout from peer", {
+        peerId: id,
+        peerRole: role,
+      });
       emitClosedEvent();
     },
   );
 
-  const outgoingMessages = createOutgoingMessagesManager(
+  const outgoing = new BatchedOutgoingMessages(
     websocket,
     batchingByDefault,
+    role,
   );
   let isFirstMessage = true;
 
@@ -206,50 +129,42 @@ export function createWebSocketPeer({
 
     if (messages.length > 1) {
       // If more than one message is received, the other peer supports batching
-      outgoingMessages.setBatchingEnabled(true);
+      outgoing.setBatching(true);
     }
 
     for (const msg of messages) {
       if (msg && "action" in msg) {
-        incoming
-          .push(msg)
-          .catch((e) =>
-            logger.error("Error while pushing incoming msg", { err: e }),
-          );
+        incoming.push(msg);
       }
     }
   }
 
   websocket.addEventListener("message", handleIncomingMsg);
 
+  outgoing.onClose(() => {
+    websocket.removeEventListener("message", handleIncomingMsg);
+    websocket.removeEventListener("close", handleClose);
+    pingTimeoutListener.clear();
+    emitClosedEvent();
+
+    if (websocket.readyState === 0) {
+      websocket.addEventListener(
+        "open",
+        function handleClose() {
+          websocket.close();
+        },
+        { once: true },
+      );
+    } else if (websocket.readyState === 1) {
+      websocket.close();
+    }
+  });
+
   return {
     id,
     incoming,
-    outgoing: {
-      push: outgoingMessages.sendMessage,
-      close() {
-        outgoingMessages.close();
-
-        websocket.removeEventListener("message", handleIncomingMsg);
-        websocket.removeEventListener("close", handleClose);
-        pingTimeoutListener.clear();
-        emitClosedEvent();
-
-        if (websocket.readyState === 0) {
-          websocket.addEventListener(
-            "open",
-            function handleClose() {
-              websocket.close();
-            },
-            { once: true },
-          );
-        } else if (websocket.readyState === 1) {
-          websocket.close();
-        }
-      },
-    },
+    outgoing,
     role,
-    crashOnClose: false,
     deletePeerStateOnClose,
   };
 }