cojson-transport-ws 0.7.22 → 0.7.26

package/.turbo/turbo-build.log

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

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # cojson-transport-nodejs-ws
 
+## 0.7.26
+
+### Patch Changes
+
+-   Remove Effect from jazz/cojson internals
+-   Updated dependencies
+    -   cojson@0.7.26
+
+## 0.7.23
+
+### Patch Changes
+
+-   Updated dependencies
+    -   cojson@0.7.23
+
 ## 0.7.22
 
 ### Patch Changes

package/dist/index.js

@@ -1,46 +1,54 @@
-import { DisconnectedError, PingTimeoutError } from "cojson";
-import { Stream, Queue, Effect, Console } from "effect";
+import { cojsonInternals } from "cojson";
 const g = globalThis;
-export function createWebSocketPeer(options) {
-    return Effect.gen(function* () {
-        const ws = options.websocket;
-        const ws_ = ws;
-        const outgoing = yield* Queue.unbounded();
-        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: ping.time,
-                    dc: ping.dc,
-                });
-                return false;
-            }
-            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: messages,
-            outgoing,
-            role: options.role,
-        };
+export function createWebSocketPeer({ id, websocket, role, }) {
+    const incoming = new cojsonInternals.Channel();
+    websocket.addEventListener("close", function handleClose() {
+        incoming
+            .push("Disconnected")
+            .catch((e) => console.error("Error while pushing disconnect msg", e));
     });
-}
-const once = (ws, event) => Effect.async((register) => {
-    const cb = (msg) => {
-        ws.removeEventListener(event, cb);
-        register(Effect.succeed(msg));
+    let pingTimeout = null;
+    websocket.addEventListener("message", function handleIncomingMsg(event) {
+        const msg = JSON.parse(event.data);
+        pingTimeout && clearTimeout(pingTimeout);
+        if (msg?.type === "ping") {
+            const ping = msg;
+            g.jazzPings || (g.jazzPings = []);
+            g.jazzPings.push({
+                received: Date.now(),
+                sent: ping.time,
+                dc: ping.dc,
+            });
+        }
+        else {
+            incoming
+                .push(msg)
+                .catch((e) => console.error("Error while pushing incoming msg", e));
+        }
+        pingTimeout = setTimeout(() => {
+            incoming
+                .push("PingTimeout")
+                .catch((e) => console.error("Error while pushing ping timeout", e));
+        }, 10000);
+    });
+    const websocketOpen = new Promise((resolve) => {
+        websocket.addEventListener("open", resolve, { once: true });
+    });
+    return {
+        id,
+        incoming,
+        outgoing: {
+            async push(msg) {
+                await websocketOpen;
+                websocket.send(JSON.stringify(msg));
+            },
+            close() {
+                if (websocket.readyState === 1) {
+                    websocket.close();
+                }
+            }
+        },
+        role,
     };
-    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":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0D,eAAe,EAAE,MAAM,QAAQ,CAAC;AA2BjG,MAAM,CAAC,GAMH,UAAU,CAAC;AAEf,MAAM,UAAU,mBAAmB,CAAC,EAChC,EAAE,EACF,SAAS,EACT,IAAI,GAKP;IACG,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,OAAO,EAEzC,CAAC;IAEJ,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,WAAW;QACpD,QAAQ;aACH,IAAI,CAAC,cAAc,CAAC;aACpB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,CAAC,CAAC,CACzD,CAAC;IACV,CAAC,CAAC,CAAC;IAEH,IAAI,WAAW,GAAyC,IAAI,CAAC;IAE7D,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,iBAAiB,CAAC,KAAK;QAClE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;QAC7C,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;QACzC,IAAI,GAAG,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,GAAc,CAAC;YAC5B,CAAC,CAAC,SAAS,KAAX,CAAC,CAAC,SAAS,GAAK,EAAE,EAAC;YACnB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;gBACb,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;gBACpB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,EAAE,EAAE,IAAI,CAAC,EAAE;aACd,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,QAAQ;iBACH,IAAI,CAAC,GAAG,CAAC;iBACT,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,CAAC,CAAC,CACvD,CAAC;QACV,CAAC;QACD,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1B,QAAQ;iBACH,IAAI,CAAC,aAAa,CAAC;iBACnB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,CAAC,CAAC,CACvD,CAAC;QACV,CAAC,EAAE,KAAM,CAAC,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAChD,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,EAAE;QACF,QAAQ;QACR,QAAQ,EAAE;YACN,KAAK,CAAC,IAAI,CAAC,GAAG;gBACV,MAAM,aAAa,CAAC;gBACpB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YACxC,CAAC;YACD,KAAK;gBACD,IAAI,SAAS,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;oBAC7B,SAAS,CAAC,KAAK,EAAE,CAAC;gBACtB,CAAC;YACL,CAAC;SACJ;QACD,IAAI;KACP,CAAC;AACN,CAAC"}

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "cojson-transport-ws",
   "type": "module",
-  "version": "0.7.22",
+  "version": "0.7.26",
   "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.26"
   },
   "devDependencies": {
     "@types/ws": "^8.5.5"

package/src/index.ts

@@ -1,5 +1,4 @@
-import { DisconnectedError, Peer, PingTimeoutError, SyncMessage } from "cojson";
-import { Stream, Queue, Effect, Console } from "effect";
+import { DisconnectedError, Peer, PingTimeoutError, SyncMessage, cojsonInternals } from "cojson";
 
 interface WebsocketEvents {
     close: { code: number; reason: string };
@@ -15,6 +14,7 @@ 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,
@@ -22,6 +22,7 @@ interface AnyWebSocket {
     ): void;
     close(): void;
     send(data: string): void;
+    readyState: number;
 }
 
 const g: typeof globalThis & {
@@ -32,88 +33,74 @@ const g: typeof globalThis & {
     }[];
 } = globalThis;
 
-export function createWebSocketPeer(options: {
+export function createWebSocketPeer({
+    id,
+    websocket,
+    role,
+}: {
     id: string;
     websocket: AnyWebSocket;
     role: Peer["role"];
-}): Effect.Effect<Peer> {
-    return Effect.gen(function* () {
-        const ws = options.websocket;
-        const ws_ = ws as unknown as Stream.EventListener<WebsocketEvents["message"]>;
+}): Peer {
+    const incoming = new cojsonInternals.Channel<
+        SyncMessage | DisconnectedError | PingTimeoutError
+    >();
 
-        const outgoing = yield* Queue.unbounded<SyncMessage>();
-
-        const closed = once(ws, "close").pipe(
-            Effect.flatMap(
-                (event) =>
-                    new DisconnectedError({
-                        message: `${event.code}: ${event.reason}`,
-                    }),
-            ),
-            Stream.fromEffect,
-        );
-
-        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: ping.time,
-                    dc: ping.dc,
-                });
-                return false;
-            }
-            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,
+    websocket.addEventListener("close", function handleClose() {
+        incoming
+            .push("Disconnected")
+            .catch((e) =>
+                console.error("Error while pushing disconnect msg", e),
             );
-        }));
+    });
 
-        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)),
-        );
+    let pingTimeout: ReturnType<typeof setTimeout> | null = null;
 
-        return {
-            id: options.id,
-            incoming: messages,
-            outgoing,
-            role: options.role,
-        };
+    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 ||= [];
+            g.jazzPings.push({
+                received: Date.now(),
+                sent: ping.time,
+                dc: ping.dc,
+            });
+        } else {
+            incoming
+                .push(msg)
+                .catch((e) =>
+                    console.error("Error while pushing incoming msg", e),
+                );
+        }
+        pingTimeout = setTimeout(() => {
+            incoming
+                .push("PingTimeout")
+                .catch((e) =>
+                    console.error("Error while pushing ping timeout", e),
+                );
+        }, 10_000);
     });
-}
 
-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);
+    const websocketOpen = new Promise<void>((resolve) => {
+        websocket.addEventListener("open", resolve, { once: true });
     });
+
+    return {
+        id,
+        incoming,
+        outgoing: {
+            async push(msg) {
+                await websocketOpen;
+                websocket.send(JSON.stringify(msg));
+            },
+            close() {
+                if (websocket.readyState === 1) {
+                    websocket.close();
+                }
+            }
+        },
+        role,
+    };
+}