cojson-transport-ws 0.7.18 → 0.7.23

package/.turbo/turbo-build.log

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

package/.turbo/turbo-lint.log

@@ -0,0 +1,4 @@
+
+> cojson-transport-ws@0.7.18 lint /Users/anselm/jazz/jazz/packages/cojson-transport-ws
+> eslint . --ext ts,tsx
+

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # cojson-transport-nodejs-ws
 
+## 0.7.23
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.23
+
+## 0.7.22
+
+### Patch Changes
+
+-   Increase disconnect timeout for now
+
 ## 0.7.18
 
 ### Patch Changes

package/dist/index.js

@@ -1,59 +1,46 @@
 import { DisconnectedError, PingTimeoutError } from "cojson";
-import { Either, Stream, Queue, Effect, Exit } from "effect";
+import { Stream, Queue, Effect, Console } from "effect";
+const g = globalThis;
 export function createWebSocketPeer(options) {
     return Effect.gen(function* () {
         const ws = options.websocket;
-        const incoming = yield* Queue.unbounded();
+        const ws_ = ws;
         const outgoing = yield* Queue.unbounded();
-        ws.addEventListener("close", (event) => {
-            void Effect.runPromiseExit(Queue.offer(incoming, Either.left(new DisconnectedError(`${event.code}: ${event.reason}`)))).then((e) => {
-                if (Exit.isFailure(e) && !Exit.isInterrupted(e)) {
-                    console.warn("Failed closing ws", e);
-                }
-            });
-        });
-        let pingTimeout;
-        ws.addEventListener("message", (event) => {
-            const msg = JSON.parse(event.data);
-            if (pingTimeout) {
-                clearTimeout(pingTimeout);
-            }
-            pingTimeout = setTimeout(() => {
-                console.debug("Ping timeout");
-                void Effect.runPromise(Queue.offer(incoming, Either.left(new PingTimeoutError())));
-                try {
-                    ws.close();
-                }
-                catch (e) {
-                    console.error("Error while trying to close ws on ping timeout", e);
-                }
-            }, 2500);
-            if (msg.type === "ping") {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                globalThis.jazzPings =
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    globalThis.jazzPings || [];
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                globalThis.jazzPings.push({
+        const closed = once(ws, "close").pipe(Effect.flatMap((event) => new DisconnectedError({
+            message: `${event.code}: ${event.reason}`,
+        })), Stream.fromEffect);
+        const isSyncMessage = (msg) => {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            if (msg?.type === "ping") {
+                const ping = msg;
+                g.jazzPings || (g.jazzPings = []);
+                g.jazzPings.push({
                     received: Date.now(),
-                    sent: msg.time,
-                    dc: msg.dc,
+                    sent: ping.time,
+                    dc: ping.dc,
                 });
-                return;
-            }
-            else {
-                void Effect.runPromise(Queue.offer(incoming, Either.right(msg)));
+                return false;
             }
-        });
-        ws.addEventListener("open", () => {
-            void Stream.fromQueue(outgoing).pipe(Stream.runForEach((msg) => Effect.sync(() => ws.send(JSON.stringify(msg)))), Effect.runPromise);
-        });
+            return true;
+        };
+        yield* Effect.forkDaemon(Effect.gen(function* () {
+            yield* once(ws, "open");
+            yield* Queue.take(outgoing).pipe(Effect.andThen((message) => ws.send(JSON.stringify(message))), Effect.forever);
+        }));
+        const messages = Stream.fromEventListener(ws_, "message").pipe(Stream.timeoutFail(() => new PingTimeoutError(), "10 seconds"), Stream.tapError((_e) => Console.warn("Ping timeout").pipe(Effect.andThen(Effect.try(() => ws.close())), Effect.catchAll((e) => Console.error("Error while trying to close ws on ping timeout", e)))), Stream.mergeLeft(closed), Stream.map((_) => JSON.parse(_.data)), Stream.filter(isSyncMessage), Stream.buffer({ capacity: "unbounded" }), Stream.onDone(() => Queue.shutdown(outgoing)));
         return {
             id: options.id,
-            incoming: Stream.fromQueue(incoming, { shutdown: true }).pipe(Stream.mapEffect((either) => either)),
+            incoming: messages,
             outgoing,
             role: options.role,
         };
     });
 }
+const once = (ws, event) => Effect.async((register) => {
+    const cb = (msg) => {
+        ws.removeEventListener(event, cb);
+        register(Effect.succeed(msg));
+    };
+    ws.addEventListener(event, cb);
+});
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAQ,gBAAgB,EAAe,MAAM,QAAQ,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAgB7D,MAAM,UAAU,mBAAmB,CAAC,OAInC;IACG,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACvB,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;QAE7B,MAAM,QAAQ,GACV,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,EAEnB,CAAC;QACR,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,EAAe,CAAC;QAEvD,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACnC,KAAK,MAAM,CAAC,cAAc,CACtB,KAAK,CAAC,KAAK,CACP,QAAQ,EACR,MAAM,CAAC,IAAI,CACP,IAAI,iBAAiB,CAAC,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC,CAC1D,CACJ,CACJ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC9C,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;gBACzC,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,IAAI,WAAsD,CAAC;QAE3D,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;YAE7C,IAAI,WAAW,EAAE,CAAC;gBACd,YAAY,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC;YAED,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC1B,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBAC9B,KAAK,MAAM,CAAC,UAAU,CAClB,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC,CAC7D,CAAC;gBACF,IAAI,CAAC;oBACD,EAAE,CAAC,KAAK,EAAE,CAAC;gBACf,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,OAAO,CAAC,KAAK,CACT,gDAAgD,EAChD,CAAC,CACJ,CAAC;gBACN,CAAC;YACL,CAAC,EAAE,IAAI,CAAC,CAAC;YAET,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACtB,8DAA8D;gBAC7D,UAAkB,CAAC,SAAS;oBACzB,8DAA8D;oBAC7D,UAAkB,CAAC,SAAS,IAAI,EAAE,CAAC;gBACxC,8DAA8D;gBAC7D,UAAkB,CAAC,SAAS,CAAC,IAAI,CAAC;oBAC/B,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;oBACpB,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,EAAE,EAAE,GAAG,CAAC,EAAE;iBACb,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;iBAAM,CAAC;gBACJ,KAAK,MAAM,CAAC,UAAU,CAClB,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAC3C,CAAC;YACN,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE;YAC7B,KAAK,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,CAChC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE,CACtB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAClD,EACD,MAAM,CAAC,UAAU,CACpB,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,OAAO;YACH,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CACzD,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CACvC;YACD,QAAQ;YACR,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "cojson-transport-ws",
   "type": "module",
-  "version": "0.7.18",
+  "version": "0.7.23",
   "main": "dist/index.js",
   "types": "src/index.ts",
   "license": "MIT",
   "dependencies": {
     "effect": "^3.5.2",
     "typescript": "^5.1.6",
-    "cojson": "0.7.18"
+    "cojson": "0.7.23"
   },
   "devDependencies": {
     "@types/ws": "^8.5.5"

package/src/index.ts

@@ -1,20 +1,37 @@
 import { DisconnectedError, Peer, PingTimeoutError, SyncMessage } from "cojson";
-import { Either, Stream, Queue, Effect, Exit } from "effect";
+import { Stream, Queue, Effect, Console } from "effect";
+
+interface WebsocketEvents {
+    close: { code: number; reason: string };
+    message: { data: unknown };
+    open: void;
+}
+interface PingMsg {
+    time: number;
+    dc: string;
+}
 
 interface AnyWebSocket {
-    addEventListener(
-        type: "close",
-        listener: (event: { code: number; reason: string }) => void,
+    addEventListener<K extends keyof WebsocketEvents>(
+        type: K,
+        listener: (event: WebsocketEvents[K]) => void,
     ): void;
-    addEventListener(
-        type: "message",
-        listener: (event: { data: string | unknown }) => void,
+    removeEventListener<K extends keyof WebsocketEvents>(
+        type: K,
+        listener: (event: WebsocketEvents[K]) => void,
     ): void;
-    addEventListener(type: "open", listener: () => void): void;
     close(): void;
     send(data: string): void;
 }
 
+const g: typeof globalThis & {
+    jazzPings?: {
+        received: number;
+        sent: number;
+        dc: string;
+    }[];
+} = globalThis;
+
 export function createWebSocketPeer(options: {
     id: string;
     websocket: AnyWebSocket;
@@ -22,87 +39,81 @@ export function createWebSocketPeer(options: {
 }): Effect.Effect<Peer> {
     return Effect.gen(function* () {
         const ws = options.websocket;
+        const ws_ = ws as unknown as Stream.EventListener<WebsocketEvents["message"]>;
 
-        const incoming =
-            yield* Queue.unbounded<
-                Either.Either<SyncMessage, DisconnectedError | PingTimeoutError>
-            >();
         const outgoing = yield* Queue.unbounded<SyncMessage>();
 
-        ws.addEventListener("close", (event) => {
-            void Effect.runPromiseExit(
-                Queue.offer(
-                    incoming,
-                    Either.left(
-                        new DisconnectedError(`${event.code}: ${event.reason}`),
-                    ),
-                ),
-            ).then((e) => {
-                if (Exit.isFailure(e) && !Exit.isInterrupted(e)) {
-                    console.warn("Failed closing ws", e);
-                }
-            });
-        });
-
-        let pingTimeout: ReturnType<typeof setTimeout> | undefined;
-
-        ws.addEventListener("message", (event) => {
-            const msg = JSON.parse(event.data as string);
-
-            if (pingTimeout) {
-                clearTimeout(pingTimeout);
-            }
-
-            pingTimeout = setTimeout(() => {
-                console.debug("Ping timeout");
-                void Effect.runPromise(
-                    Queue.offer(incoming, Either.left(new PingTimeoutError())),
-                );
-                try {
-                    ws.close();
-                } catch (e) {
-                    console.error(
-                        "Error while trying to close ws on ping timeout",
-                        e,
-                    );
-                }
-            }, 2500);
+        const closed = once(ws, "close").pipe(
+            Effect.flatMap(
+                (event) =>
+                    new DisconnectedError({
+                        message: `${event.code}: ${event.reason}`,
+                    }),
+            ),
+            Stream.fromEffect,
+        );
 
-            if (msg.type === "ping") {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (globalThis as any).jazzPings =
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    (globalThis as any).jazzPings || [];
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (globalThis as any).jazzPings.push({
+        const isSyncMessage = (msg: unknown): msg is SyncMessage => {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            if ((msg as any)?.type === "ping") {
+                const ping = msg as PingMsg;
+                g.jazzPings ||= [];
+                g.jazzPings.push({
                     received: Date.now(),
-                    sent: msg.time,
-                    dc: msg.dc,
+                    sent: ping.time,
+                    dc: ping.dc,
                 });
-                return;
-            } else {
-                void Effect.runPromise(
-                    Queue.offer(incoming, Either.right(msg)),
-                );
+                return false;
             }
-        });
+            return true;
+        };
 
-        ws.addEventListener("open", () => {
-            void Stream.fromQueue(outgoing).pipe(
-                Stream.runForEach((msg) =>
-                    Effect.sync(() => ws.send(JSON.stringify(msg))),
-                ),
-                Effect.runPromise,
+        yield* Effect.forkDaemon(Effect.gen(function* () {
+            yield* once(ws, "open");
+            yield* Queue.take(outgoing).pipe(
+                Effect.andThen((message) => ws.send(JSON.stringify(message))),
+                Effect.forever,
             );
-        });
+        }));
+
+        type E = WebsocketEvents["message"];
+        const messages = Stream.fromEventListener<E>(ws_, "message").pipe(
+            Stream.timeoutFail(() => new PingTimeoutError(), "10 seconds"),
+            Stream.tapError((_e) =>
+                Console.warn("Ping timeout").pipe(
+                    Effect.andThen(Effect.try(() => ws.close())),
+                    Effect.catchAll((e) =>
+                        Console.error(
+                            "Error while trying to close ws on ping timeout",
+                            e,
+                        ),
+                    ),
+                ),
+            ),
+            Stream.mergeLeft(closed),
+            Stream.map((_) => JSON.parse(_.data as string)),
+            Stream.filter(isSyncMessage),
+            Stream.buffer({ capacity: "unbounded" }),
+            Stream.onDone(() => Queue.shutdown(outgoing)),
+        );
 
         return {
             id: options.id,
-            incoming: Stream.fromQueue(incoming, { shutdown: true }).pipe(
-                Stream.mapEffect((either) => either),
-            ),
+            incoming: messages,
             outgoing,
             role: options.role,
         };
     });
 }
+
+const once = <Event extends keyof WebsocketEvents>(
+    ws: AnyWebSocket,
+    event: Event,
+) =>
+    Effect.async<WebsocketEvents[Event]>((register) => {
+        const cb = (msg: WebsocketEvents[Event]) => {
+            ws.removeEventListener(event, cb);
+            register(Effect.succeed(msg));
+        };
+        ws.addEventListener(event, cb);
+    });