cojson-transport-ws 0.7.35-guest-auth.5 → 0.7.35

package/.turbo/turbo-build.log

@@ -1,8 +1,8 @@
 
-> cojson-transport-ws@0.7.35-unique.2 build /Users/anselm/jazz/jazz/packages/cojson-transport-ws
+> cojson-transport-ws@0.7.34 build /Users/anselm/jazz/jazz/packages/cojson-transport-ws
 > npm run lint && rm -rf ./dist && tsc --sourceMap --outDir dist
 
 
-> cojson-transport-ws@0.7.35-unique.2 lint
+> cojson-transport-ws@0.7.34 lint
 > eslint . --ext ts,tsx
 

package/CHANGELOG.md

@@ -1,18 +1,13 @@
 # cojson-transport-nodejs-ws
 
-## 0.7.35-guest-auth.5
+## 0.7.35
 
 ### Patch Changes
 
--   Updated dependencies
-    -   cojson@0.7.35-guest-auth.5
-
-## 0.7.35-unique.2
-
-### Patch Changes
-
--   Updated dependencies
-    -   cojson@0.7.35-unique.2
+-   f350e90: Added a priority system for the sync messages
+-   Updated dependencies [35bbcd9]
+-   Updated dependencies [f350e90]
+    -   cojson@0.7.35
 
 ## 0.7.34
 

package/dist/createWebSocketPeer.test.js

@@ -0,0 +1,108 @@
+import { describe, test, expect, vi } from "vitest";
+import { BUFFER_LIMIT, BUFFER_LIMIT_POLLING_INTERVAL, createWebSocketPeer } from "./index.js";
+const g = globalThis;
+function setup() {
+    const listeners = new Map();
+    const mockWebSocket = {
+        readyState: 1,
+        addEventListener: vi.fn().mockImplementation((type, listener) => {
+            listeners.set(type, listener);
+        }),
+        close: vi.fn(),
+        send: vi.fn(),
+    };
+    const peer = createWebSocketPeer({
+        id: "test-peer",
+        websocket: mockWebSocket,
+        role: "client",
+    });
+    return { mockWebSocket, peer, listeners };
+}
+describe("createWebSocketPeer", () => {
+    test("should create a peer with correct properties", () => {
+        const { peer } = setup();
+        expect(peer).toHaveProperty("id", "test-peer");
+        expect(peer).toHaveProperty("incoming");
+        expect(peer).toHaveProperty("outgoing");
+        expect(peer).toHaveProperty("role", "client");
+        expect(peer).toHaveProperty("crashOnClose", false);
+    });
+    test("should handle ping messages", async () => {
+        const { listeners } = setup();
+        const pingMessage = { type: "ping", time: Date.now(), dc: "test-dc" };
+        const messageEvent = new MessageEvent("message", { data: JSON.stringify(pingMessage) });
+        const messageHandler = listeners.get("message");
+        messageHandler?.(messageEvent);
+        // Check if the ping was recorded in the global jazzPings array
+        expect(g.jazzPings?.length).toBeGreaterThan(0);
+        expect(g.jazzPings?.at(-1)).toMatchObject({
+            sent: pingMessage.time,
+            dc: pingMessage.dc,
+        });
+    });
+    test("should handle disconnection", async () => {
+        expect.assertions(1);
+        const { listeners, peer } = setup();
+        const incoming = peer.incoming;
+        const pushSpy = vi.spyOn(incoming, "push");
+        const closeHandler = listeners.get("close");
+        closeHandler?.(new MessageEvent("close"));
+        expect(pushSpy).toHaveBeenCalledWith("Disconnected");
+    });
+    test("should handle ping timeout", async () => {
+        vi.useFakeTimers();
+        const { listeners, peer } = setup();
+        const incoming = peer.incoming;
+        const pushSpy = vi.spyOn(incoming, "push");
+        const messageHandler = listeners.get("message");
+        messageHandler?.(new MessageEvent("message", { data: "{}" }));
+        await vi.advanceTimersByTimeAsync(10000);
+        expect(pushSpy).toHaveBeenCalledWith("PingTimeout");
+        vi.useRealTimers();
+    });
+    test("should send outgoing messages", async () => {
+        const { peer, mockWebSocket } = setup();
+        const testMessage = { action: "known", id: "co_ztest", header: false, sessions: {} };
+        const promise = peer.outgoing.push(testMessage);
+        await new Promise(queueMicrotask);
+        expect(mockWebSocket.send).toHaveBeenCalledWith(JSON.stringify(testMessage));
+        await expect(promise).resolves.toBeUndefined();
+    });
+    test("should stop sending messages when the websocket is closed", async () => {
+        const { peer, mockWebSocket } = setup();
+        mockWebSocket.send.mockImplementation(() => {
+            mockWebSocket.readyState = 0;
+        });
+        const message1 = { action: "known", id: "co_ztest", header: false, sessions: {} };
+        const message2 = { action: "content", id: "co_zlow", new: {}, priority: 1 };
+        void peer.outgoing.push(message1);
+        void peer.outgoing.push(message2);
+        await new Promise(queueMicrotask);
+        expect(mockWebSocket.send).toHaveBeenNthCalledWith(1, JSON.stringify(message1));
+        expect(mockWebSocket.send).not.toHaveBeenNthCalledWith(2, JSON.stringify(message2));
+    });
+    test("should wait for the buffer to be under BUFFER_LIMIT before sending more messages", async () => {
+        vi.useFakeTimers();
+        const { peer, mockWebSocket } = setup();
+        mockWebSocket.send.mockImplementation(() => {
+            mockWebSocket.bufferedAmount = BUFFER_LIMIT + 1;
+        });
+        const message1 = { action: "known", id: "co_ztest", header: false, sessions: {} };
+        const message2 = { action: "content", id: "co_zlow", new: {}, priority: 1 };
+        void peer.outgoing.push(message1);
+        void peer.outgoing.push(message2);
+        await new Promise(queueMicrotask);
+        expect(mockWebSocket.send).toHaveBeenNthCalledWith(1, JSON.stringify(message1));
+        expect(mockWebSocket.send).not.toHaveBeenNthCalledWith(2, JSON.stringify(message2));
+        mockWebSocket.bufferedAmount = 0;
+        await vi.advanceTimersByTimeAsync(BUFFER_LIMIT_POLLING_INTERVAL + 1);
+        expect(mockWebSocket.send).toHaveBeenNthCalledWith(2, JSON.stringify(message2));
+        vi.useRealTimers();
+    });
+    test("should close the websocket connection", () => {
+        const { mockWebSocket, peer } = setup();
+        peer.outgoing.close();
+        expect(mockWebSocket.close).toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=createWebSocketPeer.test.js.map

package/dist/createWebSocketPeer.test.js.map

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

package/dist/index.js

@@ -1,5 +1,7 @@
 import { cojsonInternals, } from "cojson";
 const g = globalThis;
+export const BUFFER_LIMIT = 100000;
+export const BUFFER_LIMIT_POLLING_INTERVAL = 10;
 export function createWebSocketPeer({ id, websocket, role, expectPings = true, }) {
     const incoming = new cojsonInternals.Channel();
     websocket.addEventListener("close", function handleClose() {
@@ -41,23 +43,23 @@ export function createWebSocketPeer({ id, websocket, role, expectPings = true, }
             websocket.addEventListener("open", resolve, { once: true });
         }
     });
+    async function pushMessage(msg) {
+        if (websocket.readyState !== 1) {
+            await websocketOpen;
+        }
+        while (websocket.bufferedAmount > BUFFER_LIMIT && websocket.readyState === 1) {
+            await new Promise((resolve) => setTimeout(resolve, BUFFER_LIMIT_POLLING_INTERVAL));
+        }
+        if (websocket.readyState !== 1) {
+            return;
+        }
+        websocket.send(JSON.stringify(msg));
+    }
     return {
         id,
         incoming,
         outgoing: {
-            async push(msg) {
-                await websocketOpen;
-                if (websocket.readyState === 1) {
-                    while (websocket.bufferedAmount > 1000000) {
-                        await new Promise((resolve) => setTimeout(resolve, 100));
-                        if (websocket.readyState !== 1) {
-                            console.log("WebSocket closed while buffering", id, websocket.bufferedAmount);
-                            return;
-                        }
-                    }
-                    websocket.send(JSON.stringify(msg));
-                }
-            },
+            push: pushMessage,
             close() {
                 console.log("Trying to close", id, websocket.readyState);
                 if (websocket.readyState === 0) {

package/dist/index.js.map

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

package/dist/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "cojson-transport-ws",
   "type": "module",
-  "version": "0.7.35-guest-auth.5",
+  "version": "0.7.35",
   "main": "dist/index.js",
   "types": "src/index.ts",
   "license": "MIT",
   "dependencies": {
-    "typescript": "^5.1.6",
-    "cojson": "0.7.35-guest-auth.5"
+    "typescript": "^5.3.3",
+    "cojson": "0.7.35"
   },
   "devDependencies": {
     "@types/ws": "^8.5.5"

package/src/createWebSocketPeer.test.ts

@@ -0,0 +1,166 @@
+import { describe, test, expect, vi, Mocked } from "vitest";
+import { BUFFER_LIMIT, BUFFER_LIMIT_POLLING_INTERVAL, createWebSocketPeer } from "./index.js";
+import { AnyWebSocket, PingMsg } from "./types.js";
+import { SyncMessage } from "cojson";
+import { Channel } from "cojson/src/streamUtils";
+
+const g: typeof globalThis & {
+    jazzPings?: {
+        received: number;
+        sent: number;
+        dc: string;
+    }[];
+} = globalThis;
+
+function setup() {
+    const listeners = new Map<string, (event: MessageEvent) => void>();
+
+    const mockWebSocket = {
+        readyState: 1,
+        addEventListener: vi.fn().mockImplementation((type, listener) => {
+            listeners.set(type, listener);
+        }),
+        close: vi.fn(),
+        send: vi.fn(),
+    } as unknown as Mocked<AnyWebSocket>;
+
+    const peer = createWebSocketPeer({
+        id: "test-peer",
+        websocket: mockWebSocket,
+        role: "client",
+    });
+
+    return { mockWebSocket, peer, listeners };
+}
+
+describe("createWebSocketPeer", () => {
+    test("should create a peer with correct properties", () => {
+        const { peer } = setup();
+
+        expect(peer).toHaveProperty("id", "test-peer");
+        expect(peer).toHaveProperty("incoming");
+        expect(peer).toHaveProperty("outgoing");
+        expect(peer).toHaveProperty("role", "client");
+        expect(peer).toHaveProperty("crashOnClose", false);
+    });
+
+    test("should handle ping messages", async () => {
+        const { listeners } = setup();
+
+        const pingMessage: PingMsg = { type: "ping", time: Date.now(), dc: "test-dc" };
+        const messageEvent = new MessageEvent("message", { data: JSON.stringify(pingMessage) });
+
+        const messageHandler = listeners.get("message");
+
+        messageHandler?.(messageEvent);
+
+        // Check if the ping was recorded in the global jazzPings array
+        expect(g.jazzPings?.length).toBeGreaterThan(0);
+        expect(g.jazzPings?.at(-1)).toMatchObject({
+            sent: pingMessage.time,
+            dc: pingMessage.dc,
+        });
+    });
+
+    test("should handle disconnection", async () => {
+        expect.assertions(1);
+
+        const { listeners, peer } = setup();
+
+        const incoming = peer.incoming as Channel<SyncMessage | "Disconnected" | "PingTimeout">;
+        const pushSpy = vi.spyOn(incoming, "push");
+
+        const closeHandler = listeners.get("close");
+
+        closeHandler?.(new MessageEvent("close"));
+
+        expect(pushSpy).toHaveBeenCalledWith("Disconnected");
+    });
+
+    test("should handle ping timeout", async () => {
+        vi.useFakeTimers();
+        const { listeners, peer } = setup();
+
+        const incoming = peer.incoming as Channel<SyncMessage | "Disconnected" | "PingTimeout">;
+        const pushSpy = vi.spyOn(incoming, "push");
+
+        const messageHandler = listeners.get("message");
+
+        messageHandler?.(new MessageEvent("message", { data: "{}" }));
+
+        await vi.advanceTimersByTimeAsync(10_000);
+
+        expect(pushSpy).toHaveBeenCalledWith("PingTimeout");
+
+        vi.useRealTimers();
+    });
+
+    test("should send outgoing messages", async () => {
+        const { peer, mockWebSocket } = setup();
+
+        const testMessage: SyncMessage = { action: "known", id: "co_ztest", header: false, sessions: {} };
+        const promise = peer.outgoing.push(testMessage);
+
+        await new Promise<void>(queueMicrotask);
+
+        expect(mockWebSocket.send).toHaveBeenCalledWith(JSON.stringify(testMessage));
+        await expect(promise).resolves.toBeUndefined();
+    });
+
+
+
+    test("should stop sending messages when the websocket is closed", async () => {
+        const { peer, mockWebSocket } = setup();
+
+        mockWebSocket.send.mockImplementation(() => {
+            mockWebSocket.readyState = 0;
+        });
+
+        const message1: SyncMessage = { action: "known", id: "co_ztest", header: false, sessions: {} };
+        const message2: SyncMessage = { action: "content", id: "co_zlow", new: {}, priority: 1 };
+        
+        void peer.outgoing.push(message1);
+        void peer.outgoing.push(message2);
+
+        await new Promise<void>(queueMicrotask);
+
+        expect(mockWebSocket.send).toHaveBeenNthCalledWith(1, JSON.stringify(message1));
+        expect(mockWebSocket.send).not.toHaveBeenNthCalledWith(2, JSON.stringify(message2));
+    });
+
+    test("should wait for the buffer to be under BUFFER_LIMIT before sending more messages", async () => {
+        vi.useFakeTimers();
+        const { peer, mockWebSocket } = setup();
+
+        mockWebSocket.send.mockImplementation(() => {
+            mockWebSocket.bufferedAmount = BUFFER_LIMIT + 1;
+        });
+
+        const message1: SyncMessage = { action: "known", id: "co_ztest", header: false, sessions: {} };
+        const message2: SyncMessage = { action: "content", id: "co_zlow", new: {}, priority: 1 };
+        
+        void peer.outgoing.push(message1);
+        void peer.outgoing.push(message2);
+
+        await new Promise<void>(queueMicrotask);
+
+        expect(mockWebSocket.send).toHaveBeenNthCalledWith(1, JSON.stringify(message1));
+        expect(mockWebSocket.send).not.toHaveBeenNthCalledWith(2, JSON.stringify(message2));
+
+        mockWebSocket.bufferedAmount = 0;
+
+        await vi.advanceTimersByTimeAsync(BUFFER_LIMIT_POLLING_INTERVAL + 1);
+
+        expect(mockWebSocket.send).toHaveBeenNthCalledWith(2, JSON.stringify(message2));
+
+        vi.useRealTimers();
+    });
+
+    test("should close the websocket connection", () => {
+        const { mockWebSocket, peer } = setup();
+
+        peer.outgoing.close();
+
+        expect(mockWebSocket.close).toHaveBeenCalled();
+    });
+});

package/src/index.ts

@@ -5,34 +5,9 @@ import {
     SyncMessage,
     cojsonInternals,
 } from "cojson";
+import { AnyWebSocket, PingMsg } from "./types.js";
 
-interface WebsocketEvents {
-    close: { code: number; reason: string };
-    message: { data: unknown };
-    open: void;
-}
-interface PingMsg {
-    time: number;
-    dc: string;
-}
-
-interface AnyWebSocket {
-    addEventListener<K extends keyof WebsocketEvents>(
-        type: K,
-        listener: (event: WebsocketEvents[K]) => void,
-        options?: { once: boolean },
-    ): void;
-    removeEventListener<K extends keyof WebsocketEvents>(
-        type: K,
-        listener: (event: WebsocketEvents[K]) => void,
-    ): void;
-    close(): void;
-    send(data: string): void;
-    readyState: number;
-    bufferedAmount: number;
-}
-
-const g: typeof globalThis & {
+ const g: typeof globalThis & {
     jazzPings?: {
         received: number;
         sent: number;
@@ -40,6 +15,9 @@ const g: typeof globalThis & {
     }[];
 } = globalThis;
 
+export const BUFFER_LIMIT = 100_000;
+export const BUFFER_LIMIT_POLLING_INTERVAL = 10;
+
 export function createWebSocketPeer({
     id,
     websocket,
@@ -68,6 +46,7 @@ export function createWebSocketPeer({
     websocket.addEventListener("message", function handleIncomingMsg(event) {
         const msg = JSON.parse(event.data as string);
         pingTimeout && clearTimeout(pingTimeout);
+
         if (msg?.type === "ping") {
             const ping = msg as PingMsg;
             g.jazzPings ||= [];
@@ -102,31 +81,37 @@ export function createWebSocketPeer({
         }
     });
 
+    async function pushMessage(msg: SyncMessage) {
+        if (websocket.readyState !== 1) {
+            await websocketOpen;
+        }
+
+        while (websocket.bufferedAmount > BUFFER_LIMIT && websocket.readyState === 1) {
+            await new Promise<void>((resolve) => setTimeout(resolve, BUFFER_LIMIT_POLLING_INTERVAL));
+        }
+
+        if (websocket.readyState !== 1) {
+            return;
+        }
+
+        websocket.send(JSON.stringify(msg));
+    }
+
     return {
         id,
         incoming,
         outgoing: {
-            async push(msg) {
-                await websocketOpen;
-                if (websocket.readyState === 1) {
-                    while (websocket.bufferedAmount > 1_000_000) {
-                        await new Promise((resolve) =>
-                            setTimeout(resolve, 100),
-                        );
-                        if (websocket.readyState !== 1) {
-                            console.log("WebSocket closed while buffering", id, websocket.bufferedAmount);
-                            return;
-                        }
-                    }
-                    websocket.send(JSON.stringify(msg));
-                }
-            },
+            push: pushMessage,
             close() {
-                console.log("Trying to close", id, websocket.readyState)
+                console.log("Trying to close", id, websocket.readyState);
                 if (websocket.readyState === 0) {
-                    websocket.addEventListener("open", function handleClose() {
-                        websocket.close();
-                    }, { once: true });
+                    websocket.addEventListener(
+                        "open",
+                        function handleClose() {
+                            websocket.close();
+                        },
+                        { once: true },
+                    );
                 } else if (websocket.readyState == 1) {
                     websocket.close();
                 }

package/src/types.ts

@@ -0,0 +1,28 @@
+
+export interface WebsocketEvents {
+    close: { code: number; reason: string; };
+    message: { data: unknown; };
+    open: void;
+}
+
+export interface PingMsg {
+    type: "ping";
+    time: number;
+    dc: string;
+}
+
+export interface AnyWebSocket {
+    addEventListener<K extends keyof WebsocketEvents>(
+        type: K,
+        listener: (event: WebsocketEvents[K]) => void,
+        options?: { once: boolean; }
+    ): void;
+    removeEventListener<K extends keyof WebsocketEvents>(
+        type: K,
+        listener: (event: WebsocketEvents[K]) => void
+    ): void;
+    close(): void;
+    send(data: string): void;
+    readyState: number;
+    bufferedAmount: number;
+}