cojson-transport-ws 0.13.27 → 0.13.28

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> cojson-transport-ws@0.13.27 build /home/runner/_work/jazz/jazz/packages/cojson-transport-ws
+> cojson-transport-ws@0.13.28 build /home/runner/_work/jazz/jazz/packages/cojson-transport-ws
 > rm -rf ./dist && tsc --sourceMap --outDir dist
 

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # cojson-transport-nodejs-ws
 
+## 0.13.28
+
+### Patch Changes
+
+- 422dbc4: Add waitUntilConnected and subscribe APIs on WebSocketPeerWithReconnection
+- Updated dependencies [e7ccb2c]
+  - cojson@0.13.28
+
 ## 0.13.27
 
 ### Patch Changes

package/dist/WebSocketPeerWithReconnection.d.ts

@@ -1,21 +1,31 @@
 import { type Peer } from "cojson";
+import type { AnyWebSocketConstructor } from "./types.js";
 export declare class WebSocketPeerWithReconnection {
     private peer;
     private reconnectionTimeout;
     private addPeer;
     private removePeer;
+    private WebSocketConstructor;
+    private pingTimeout;
     constructor(opts: {
         peer: string;
         reconnectionTimeout: number | undefined;
         addPeer: (peer: Peer) => void;
         removePeer: (peer: Peer) => void;
+        WebSocketConstructor?: AnyWebSocketConstructor;
+        pingTimeout?: number;
     });
-    state: "disabled" | "enabled";
+    enabled: boolean;
+    closed: boolean;
     currentPeer: Peer | undefined;
-    unsubscribeNetworkChange: (() => void) | undefined;
+    private unsubscribeNetworkChange;
     onNetworkChange(callback: (connected: boolean) => void): () => void;
-    waitForOnline(timeout: number): Promise<void>;
+    private waitForOnline;
     reconnectionAttempts: number;
+    onConnectionChangeListeners: Set<(connected: boolean) => void>;
+    waitUntilConnected: () => Promise<void>;
+    subscribe: (listener: (connected: boolean) => void) => void;
+    unsubscribe: (listener: (connected: boolean) => void) => void;
     startConnection: () => Promise<void>;
     enable: () => void;
     disable: () => void;

package/dist/WebSocketPeerWithReconnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketPeerWithReconnection.d.ts","sourceRoot":"","sources":["../src/WebSocketPeerWithReconnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAU,MAAM,QAAQ,CAAC;AAG3C,qBAAa,6BAA6B;IACxC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,UAAU,CAAuB;gBAE7B,IAAI,EAAE;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;QACxC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;QAC9B,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;KAClC;IAOD,KAAK,EAAE,UAAU,GAAG,SAAS,CAAc;IAC3C,WAAW,EAAE,IAAI,GAAG,SAAS,CAAa;IAC1C,wBAAwB,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAa;IAI/D,eAAe,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,GAAG,MAAM,IAAI;IAKnE,aAAa,CAAC,OAAO,EAAE,MAAM;IAkB7B,oBAAoB,SAAK;IAEzB,eAAe,sBAgCb;IAEF,MAAM,aAKJ;IAEF,OAAO,aAaL;CACH"}
+{"version":3,"file":"WebSocketPeerWithReconnection.d.ts","sourceRoot":"","sources":["../src/WebSocketPeerWithReconnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAU,MAAM,QAAQ,CAAC;AAE3C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAE1D,qBAAa,6BAA6B;IACxC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,oBAAoB,CAA0B;IACtD,OAAO,CAAC,WAAW,CAAS;gBAEhB,IAAI,EAAE;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;QACxC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;QAC9B,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;QACjC,oBAAoB,CAAC,EAAE,uBAAuB,CAAC;QAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;IASD,OAAO,UAAS;IAChB,MAAM,UAAQ;IAEd,WAAW,EAAE,IAAI,GAAG,SAAS,CAAa;IAC1C,OAAO,CAAC,wBAAwB,CAAuC;IAIvE,eAAe,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,GAAG,MAAM,IAAI;IAKnE,OAAO,CAAC,aAAa;IAkBrB,oBAAoB,SAAK;IAEzB,2BAA2B,kBAAuB,OAAO,KAAK,IAAI,EAAI;IAEtE,kBAAkB,sBAahB;IAEF,SAAS,aAAc,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,UAGjD;IAEF,WAAW,aAAc,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,UAEnD;IAEF,eAAe,sBA4Cb;IAEF,MAAM,aAKJ;IAEF,OAAO,aAcL;CACH"}

package/dist/WebSocketPeerWithReconnection.js

@@ -2,28 +2,62 @@ import { logger } from "cojson";
 import { createWebSocketPeer } from "./createWebSocketPeer.js";
 export class WebSocketPeerWithReconnection {
     constructor(opts) {
-        this.state = "disabled";
+        this.enabled = false;
+        this.closed = true;
         this.currentPeer = undefined;
         this.unsubscribeNetworkChange = undefined;
         this.reconnectionAttempts = 0;
+        this.onConnectionChangeListeners = new Set();
+        this.waitUntilConnected = async () => {
+            if (this.closed) {
+                return new Promise((resolve) => {
+                    const listener = (connected) => {
+                        if (connected) {
+                            resolve();
+                            this.onConnectionChangeListeners.delete(listener);
+                        }
+                    };
+                    this.onConnectionChangeListeners.add(listener);
+                });
+            }
+        };
+        this.subscribe = (listener) => {
+            this.onConnectionChangeListeners.add(listener);
+            listener(!this.closed);
+        };
+        this.unsubscribe = (listener) => {
+            this.onConnectionChangeListeners.delete(listener);
+        };
         this.startConnection = async () => {
-            if (this.state !== "enabled")
+            if (!this.enabled)
                 return;
             if (this.currentPeer) {
                 this.removePeer(this.currentPeer);
+                this.currentPeer.outgoing.close();
                 this.reconnectionAttempts++;
                 const timeout = this.reconnectionTimeout * this.reconnectionAttempts;
                 logger.debug(`Websocket disconnected, trying to reconnect in ${timeout}ms`);
                 await this.waitForOnline(timeout);
             }
-            if (this.state !== "enabled")
+            if (!this.enabled)
                 return;
             this.currentPeer = createWebSocketPeer({
-                websocket: new WebSocket(this.peer),
+                websocket: new this.WebSocketConstructor(this.peer),
+                pingTimeout: this.pingTimeout,
                 id: this.peer,
                 role: "server",
-                onClose: this.startConnection,
+                onClose: () => {
+                    this.closed = true;
+                    for (const listener of this.onConnectionChangeListeners) {
+                        listener(false);
+                    }
+                    this.startConnection();
+                },
                 onSuccess: () => {
+                    this.closed = false;
+                    for (const listener of this.onConnectionChangeListeners) {
+                        listener(true);
+                    }
                     logger.debug("Websocket connection successful");
                     this.reconnectionAttempts = 0;
                 },
@@ -31,20 +65,21 @@ export class WebSocketPeerWithReconnection {
             this.addPeer(this.currentPeer);
         };
         this.enable = () => {
-            if (this.state === "enabled")
+            if (this.enabled)
                 return;
-            this.state = "enabled";
+            this.enabled = true;
             this.startConnection();
         };
         this.disable = () => {
-            if (this.state === "disabled")
+            if (!this.enabled)
                 return;
-            this.state = "disabled";
+            this.enabled = false;
             this.reconnectionAttempts = 0;
             this.unsubscribeNetworkChange?.();
             this.unsubscribeNetworkChange = undefined;
             if (this.currentPeer) {
                 this.removePeer(this.currentPeer);
+                this.currentPeer.outgoing.close();
                 this.currentPeer = undefined;
             }
         };
@@ -52,6 +87,8 @@ export class WebSocketPeerWithReconnection {
         this.reconnectionTimeout = opts.reconnectionTimeout || 500;
         this.addPeer = opts.addPeer;
         this.removePeer = opts.removePeer;
+        this.WebSocketConstructor = opts.WebSocketConstructor || WebSocket;
+        this.pingTimeout = opts.pingTimeout || 10000;
     }
     // Basic implementation for environments that don't support network change events (e.g. Node.js)
     // Needs to be extended to handle platform specific APIs
@@ -68,7 +105,7 @@ export class WebSocketPeerWithReconnection {
             });
             function handleTimeoutOrOnline() {
                 clearTimeout(timer);
-                unsubscribeNetworkChange();
+                unsubscribeNetworkChange?.();
                 resolve();
             }
             const timer = setTimeout(handleTimeoutOrOnline, timeout);

package/dist/WebSocketPeerWithReconnection.js.map

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

package/dist/tests/WebSocketPeerWithReconnection.test.js

@@ -101,5 +101,183 @@ describe("WebSocketPeerWithReconnection", () => {
         await waitFor(() => expect(peer.reconnectionAttempts).toBe(0));
         peer.disable();
     });
+    describe("waitUntilConnected", () => {
+        test("should wait until connected before resolving", async () => {
+            const addPeer = vi.fn();
+            const removePeer = vi.fn();
+            const peer = new WebSocketPeerWithReconnection({
+                peer: syncServerUrl,
+                reconnectionTimeout: 100,
+                addPeer,
+                removePeer,
+            });
+            // Start waiting for connection before enabling
+            const waitPromise = peer.waitUntilConnected();
+            // Enable the peer after a short delay
+            setTimeout(() => peer.enable(), 100);
+            // Wait for connection to be established
+            await waitPromise;
+            expect(addPeer).toHaveBeenCalledTimes(1);
+            expect(peer.closed).toBe(false);
+            peer.disable();
+        });
+        test("should resolve immediately if already connected", async () => {
+            const addPeer = vi.fn();
+            const removePeer = vi.fn();
+            const peer = new WebSocketPeerWithReconnection({
+                peer: syncServerUrl,
+                reconnectionTimeout: 100,
+                addPeer,
+                removePeer,
+            });
+            // Enable the peer first
+            peer.enable();
+            // Wait for initial connection
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            // Now wait for connection again
+            const waitPromise = peer.waitUntilConnected();
+            // Should resolve immediately since we're already connected
+            await waitPromise;
+            expect(addPeer).toHaveBeenCalledTimes(1);
+            expect(peer.closed).toBe(false);
+            peer.disable();
+        });
+        test("should work when connection is lost and regained", async () => {
+            const addPeer = vi.fn();
+            const removePeer = vi.fn();
+            const peer = new WebSocketPeerWithReconnection({
+                peer: syncServerUrl,
+                reconnectionTimeout: 100,
+                addPeer,
+                removePeer,
+            });
+            peer.enable();
+            // Wait for initial connection
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            // Close server to simulate connection loss
+            server.close();
+            // Wait for disconnect to be detected
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            // Start server again
+            server = await startSyncServer(server.port);
+            // Wait for the waitUntilConnected promise to resolve
+            await peer.waitUntilConnected();
+            // Verify that we have a new connection
+            expect(addPeer).toHaveBeenCalledTimes(3); // Once for initial, once for reconnection
+            expect(peer.closed).toBe(false);
+            peer.disable();
+        });
+    });
+    describe("subscribe", () => {
+        test("should notify subscribers of initial connection state", async () => {
+            const addPeer = vi.fn();
+            const removePeer = vi.fn();
+            const listener = vi.fn();
+            const peer = new WebSocketPeerWithReconnection({
+                peer: syncServerUrl,
+                reconnectionTimeout: 100,
+                addPeer,
+                removePeer,
+            });
+            // Subscribe before enabling
+            peer.subscribe(listener);
+            // Initial state should be disconnected
+            expect(listener).toHaveBeenCalledWith(false);
+            // Enable the peer
+            peer.enable();
+            // Wait for connection
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            // Should notify of connected state
+            expect(listener).toHaveBeenCalledWith(true);
+            peer.disable();
+        });
+        test("should notify subscribers of connection state changes", async () => {
+            const addPeer = vi.fn();
+            const removePeer = vi.fn();
+            const listener = vi.fn();
+            const peer = new WebSocketPeerWithReconnection({
+                peer: syncServerUrl,
+                reconnectionTimeout: 100,
+                addPeer,
+                removePeer,
+            });
+            peer.enable();
+            peer.subscribe(listener);
+            // Wait for initial connection
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            // Should notify of connected state
+            expect(listener).toHaveBeenCalledWith(true);
+            // Close server to simulate disconnect
+            server.close();
+            // Wait for disconnect to be detected
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            // Should notify of disconnected state
+            expect(listener).toHaveBeenCalledWith(false);
+            peer.disable();
+        });
+        test("should not notify unsubscribed listeners", async () => {
+            const addPeer = vi.fn();
+            const removePeer = vi.fn();
+            const listener1 = vi.fn();
+            const listener2 = vi.fn();
+            const peer = new WebSocketPeerWithReconnection({
+                peer: syncServerUrl,
+                reconnectionTimeout: 100,
+                addPeer,
+                removePeer,
+            });
+            peer.enable();
+            peer.subscribe(listener1);
+            peer.subscribe(listener2);
+            // Wait for initial connection
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            // Both listeners should be notified of connection
+            expect(listener1).toHaveBeenCalledWith(true);
+            expect(listener2).toHaveBeenCalledWith(true);
+            // Unsubscribe listener1
+            peer.unsubscribe(listener1);
+            listener1.mockClear();
+            listener2.mockClear();
+            // Close server to simulate disconnect
+            server.close();
+            // Wait for disconnect to be detected
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            // Only listener2 should be notified of disconnect
+            expect(listener1).not.toHaveBeenCalled();
+            expect(listener2).toHaveBeenCalledWith(false);
+            peer.disable();
+        });
+        test("should handle multiple subscribers correctly", async () => {
+            const addPeer = vi.fn();
+            const removePeer = vi.fn();
+            const listeners = Array.from({ length: 3 }, () => vi.fn());
+            const peer = new WebSocketPeerWithReconnection({
+                peer: syncServerUrl,
+                reconnectionTimeout: 100,
+                addPeer,
+                removePeer,
+            });
+            peer.enable();
+            // Subscribe all listeners
+            for (const listener of listeners) {
+                peer.subscribe(listener);
+            }
+            // Wait for initial connection
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            // All listeners should be notified of connection
+            for (const listener of listeners) {
+                expect(listener).toHaveBeenCalledWith(true);
+            }
+            // Close server to simulate disconnect
+            server.close();
+            // Wait for disconnect to be detected
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            // All listeners should be notified of disconnect
+            for (const listener of listeners) {
+                expect(listener).toHaveBeenCalledWith(false);
+            }
+            peer.disable();
+        });
+    });
 });
 //# sourceMappingURL=WebSocketPeerWithReconnection.test.js.map

package/dist/tests/WebSocketPeerWithReconnection.test.js.map

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

package/package.json

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

package/src/WebSocketPeerWithReconnection.ts

@@ -1,27 +1,36 @@
 import { type Peer, logger } from "cojson";
 import { createWebSocketPeer } from "./createWebSocketPeer.js";
+import type { AnyWebSocketConstructor } from "./types.js";
 
 export class WebSocketPeerWithReconnection {
   private peer: string;
   private reconnectionTimeout: number;
   private addPeer: (peer: Peer) => void;
   private removePeer: (peer: Peer) => void;
+  private WebSocketConstructor: AnyWebSocketConstructor;
+  private pingTimeout: number;
 
   constructor(opts: {
     peer: string;
     reconnectionTimeout: number | undefined;
     addPeer: (peer: Peer) => void;
     removePeer: (peer: Peer) => void;
+    WebSocketConstructor?: AnyWebSocketConstructor;
+    pingTimeout?: number;
   }) {
     this.peer = opts.peer;
     this.reconnectionTimeout = opts.reconnectionTimeout || 500;
     this.addPeer = opts.addPeer;
     this.removePeer = opts.removePeer;
+    this.WebSocketConstructor = opts.WebSocketConstructor || WebSocket;
+    this.pingTimeout = opts.pingTimeout || 10_000;
   }
 
-  state: "disabled" | "enabled" = "disabled";
+  enabled = false;
+  closed = true;
+
   currentPeer: Peer | undefined = undefined;
-  unsubscribeNetworkChange: (() => void) | undefined = undefined;
+  private unsubscribeNetworkChange: (() => void) | undefined = undefined;
 
   // Basic implementation for environments that don't support network change events (e.g. Node.js)
   // Needs to be extended to handle platform specific APIs
@@ -30,7 +39,7 @@ export class WebSocketPeerWithReconnection {
     return () => {};
   }
 
-  waitForOnline(timeout: number) {
+  private waitForOnline(timeout: number) {
     return new Promise<void>((resolve) => {
       const unsubscribeNetworkChange = this.onNetworkChange((connected) => {
         if (connected) {
@@ -40,7 +49,7 @@ export class WebSocketPeerWithReconnection {
 
       function handleTimeoutOrOnline() {
         clearTimeout(timer);
-        unsubscribeNetworkChange();
+        unsubscribeNetworkChange?.();
         resolve();
       }
 
@@ -50,11 +59,38 @@ export class WebSocketPeerWithReconnection {
 
   reconnectionAttempts = 0;
 
+  onConnectionChangeListeners = new Set<(connected: boolean) => void>();
+
+  waitUntilConnected = async () => {
+    if (this.closed) {
+      return new Promise<void>((resolve) => {
+        const listener = (connected: boolean) => {
+          if (connected) {
+            resolve();
+            this.onConnectionChangeListeners.delete(listener);
+          }
+        };
+
+        this.onConnectionChangeListeners.add(listener);
+      });
+    }
+  };
+
+  subscribe = (listener: (connected: boolean) => void) => {
+    this.onConnectionChangeListeners.add(listener);
+    listener(!this.closed);
+  };
+
+  unsubscribe = (listener: (connected: boolean) => void) => {
+    this.onConnectionChangeListeners.delete(listener);
+  };
+
   startConnection = async () => {
-    if (this.state !== "enabled") return;
+    if (!this.enabled) return;
 
     if (this.currentPeer) {
       this.removePeer(this.currentPeer);
+      this.currentPeer.outgoing.close();
 
       this.reconnectionAttempts++;
 
@@ -67,14 +103,25 @@ export class WebSocketPeerWithReconnection {
       await this.waitForOnline(timeout);
     }
 
-    if (this.state !== "enabled") return;
+    if (!this.enabled) return;
 
     this.currentPeer = createWebSocketPeer({
-      websocket: new WebSocket(this.peer),
+      websocket: new this.WebSocketConstructor(this.peer),
+      pingTimeout: this.pingTimeout,
       id: this.peer,
       role: "server",
-      onClose: this.startConnection,
+      onClose: () => {
+        this.closed = true;
+        for (const listener of this.onConnectionChangeListeners) {
+          listener(false);
+        }
+        this.startConnection();
+      },
       onSuccess: () => {
+        this.closed = false;
+        for (const listener of this.onConnectionChangeListeners) {
+          listener(true);
+        }
         logger.debug("Websocket connection successful");
 
         this.reconnectionAttempts = 0;
@@ -85,16 +132,16 @@ export class WebSocketPeerWithReconnection {
   };
 
   enable = () => {
-    if (this.state === "enabled") return;
+    if (this.enabled) return;
 
-    this.state = "enabled";
+    this.enabled = true;
     this.startConnection();
   };
 
   disable = () => {
-    if (this.state === "disabled") return;
+    if (!this.enabled) return;
 
-    this.state = "disabled";
+    this.enabled = false;
 
     this.reconnectionAttempts = 0;
     this.unsubscribeNetworkChange?.();
@@ -102,6 +149,7 @@ export class WebSocketPeerWithReconnection {
 
     if (this.currentPeer) {
       this.removePeer(this.currentPeer);
+      this.currentPeer.outgoing.close();
       this.currentPeer = undefined;
     }
   };

package/src/tests/WebSocketPeerWithReconnection.test.ts

@@ -140,4 +140,245 @@ describe("WebSocketPeerWithReconnection", () => {
 
     peer.disable();
   });
+
+  describe("waitUntilConnected", () => {
+    test("should wait until connected before resolving", async () => {
+      const addPeer = vi.fn();
+      const removePeer = vi.fn();
+
+      const peer = new WebSocketPeerWithReconnection({
+        peer: syncServerUrl,
+        reconnectionTimeout: 100,
+        addPeer,
+        removePeer,
+      });
+
+      // Start waiting for connection before enabling
+      const waitPromise = peer.waitUntilConnected();
+
+      // Enable the peer after a short delay
+      setTimeout(() => peer.enable(), 100);
+
+      // Wait for connection to be established
+      await waitPromise;
+
+      expect(addPeer).toHaveBeenCalledTimes(1);
+      expect(peer.closed).toBe(false);
+
+      peer.disable();
+    });
+
+    test("should resolve immediately if already connected", async () => {
+      const addPeer = vi.fn();
+      const removePeer = vi.fn();
+
+      const peer = new WebSocketPeerWithReconnection({
+        peer: syncServerUrl,
+        reconnectionTimeout: 100,
+        addPeer,
+        removePeer,
+      });
+
+      // Enable the peer first
+      peer.enable();
+
+      // Wait for initial connection
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      // Now wait for connection again
+      const waitPromise = peer.waitUntilConnected();
+
+      // Should resolve immediately since we're already connected
+      await waitPromise;
+
+      expect(addPeer).toHaveBeenCalledTimes(1);
+      expect(peer.closed).toBe(false);
+
+      peer.disable();
+    });
+
+    test("should work when connection is lost and regained", async () => {
+      const addPeer = vi.fn();
+      const removePeer = vi.fn();
+
+      const peer = new WebSocketPeerWithReconnection({
+        peer: syncServerUrl,
+        reconnectionTimeout: 100,
+        addPeer,
+        removePeer,
+      });
+
+      peer.enable();
+
+      // Wait for initial connection
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      // Close server to simulate connection loss
+      server.close();
+
+      // Wait for disconnect to be detected
+      await new Promise((resolve) => setTimeout(resolve, 200));
+
+      // Start server again
+      server = await startSyncServer(server.port);
+
+      // Wait for the waitUntilConnected promise to resolve
+      await peer.waitUntilConnected();
+
+      // Verify that we have a new connection
+      expect(addPeer).toHaveBeenCalledTimes(3); // Once for initial, once for reconnection
+      expect(peer.closed).toBe(false);
+
+      peer.disable();
+    });
+  });
+
+  describe("subscribe", () => {
+    test("should notify subscribers of initial connection state", async () => {
+      const addPeer = vi.fn();
+      const removePeer = vi.fn();
+      const listener = vi.fn();
+
+      const peer = new WebSocketPeerWithReconnection({
+        peer: syncServerUrl,
+        reconnectionTimeout: 100,
+        addPeer,
+        removePeer,
+      });
+
+      // Subscribe before enabling
+      peer.subscribe(listener);
+
+      // Initial state should be disconnected
+      expect(listener).toHaveBeenCalledWith(false);
+
+      // Enable the peer
+      peer.enable();
+
+      // Wait for connection
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      // Should notify of connected state
+      expect(listener).toHaveBeenCalledWith(true);
+
+      peer.disable();
+    });
+
+    test("should notify subscribers of connection state changes", async () => {
+      const addPeer = vi.fn();
+      const removePeer = vi.fn();
+      const listener = vi.fn();
+
+      const peer = new WebSocketPeerWithReconnection({
+        peer: syncServerUrl,
+        reconnectionTimeout: 100,
+        addPeer,
+        removePeer,
+      });
+
+      peer.enable();
+      peer.subscribe(listener);
+
+      // Wait for initial connection
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      // Should notify of connected state
+      expect(listener).toHaveBeenCalledWith(true);
+
+      // Close server to simulate disconnect
+      server.close();
+
+      // Wait for disconnect to be detected
+      await new Promise((resolve) => setTimeout(resolve, 200));
+
+      // Should notify of disconnected state
+      expect(listener).toHaveBeenCalledWith(false);
+
+      peer.disable();
+    });
+
+    test("should not notify unsubscribed listeners", async () => {
+      const addPeer = vi.fn();
+      const removePeer = vi.fn();
+      const listener1 = vi.fn();
+      const listener2 = vi.fn();
+
+      const peer = new WebSocketPeerWithReconnection({
+        peer: syncServerUrl,
+        reconnectionTimeout: 100,
+        addPeer,
+        removePeer,
+      });
+
+      peer.enable();
+      peer.subscribe(listener1);
+      peer.subscribe(listener2);
+
+      // Wait for initial connection
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      // Both listeners should be notified of connection
+      expect(listener1).toHaveBeenCalledWith(true);
+      expect(listener2).toHaveBeenCalledWith(true);
+
+      // Unsubscribe listener1
+      peer.unsubscribe(listener1);
+
+      listener1.mockClear();
+      listener2.mockClear();
+
+      // Close server to simulate disconnect
+      server.close();
+
+      // Wait for disconnect to be detected
+      await new Promise((resolve) => setTimeout(resolve, 200));
+
+      // Only listener2 should be notified of disconnect
+      expect(listener1).not.toHaveBeenCalled();
+      expect(listener2).toHaveBeenCalledWith(false);
+
+      peer.disable();
+    });
+
+    test("should handle multiple subscribers correctly", async () => {
+      const addPeer = vi.fn();
+      const removePeer = vi.fn();
+      const listeners = Array.from({ length: 3 }, () => vi.fn());
+
+      const peer = new WebSocketPeerWithReconnection({
+        peer: syncServerUrl,
+        reconnectionTimeout: 100,
+        addPeer,
+        removePeer,
+      });
+
+      peer.enable();
+
+      // Subscribe all listeners
+      for (const listener of listeners) {
+        peer.subscribe(listener);
+      }
+
+      // Wait for initial connection
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      // All listeners should be notified of connection
+      for (const listener of listeners) {
+        expect(listener).toHaveBeenCalledWith(true);
+      }
+
+      // Close server to simulate disconnect
+      server.close();
+
+      // Wait for disconnect to be detected
+      await new Promise((resolve) => setTimeout(resolve, 200));
+
+      // All listeners should be notified of disconnect
+      for (const listener of listeners) {
+        expect(listener).toHaveBeenCalledWith(false);
+      }
+
+      peer.disable();
+    });
+  });
 });