jazz-react-native 0.8.37 → 0.8.39

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # jazz-browser
 
+## 0.8.39
+
+### Patch Changes
+
+- 0c6b0f3: Reconnect automatically when the WebSocket is closed by the server
+- Updated dependencies [249eecb]
+- Updated dependencies [3121551]
+  - jazz-tools@0.8.39
+  - cojson@0.8.39
+  - cojson-transport-ws@0.8.39
+
+## 0.8.38
+
+### Patch Changes
+
+- Updated dependencies [b00ee91]
+- Updated dependencies [f488c09]
+  - cojson@0.8.38
+  - cojson-transport-ws@0.8.38
+  - jazz-tools@0.8.38
+
 ## 0.8.37
 
 ### Patch Changes

package/dist/createWebSocketPeerWithReconnection.d.ts

@@ -0,0 +1,5 @@
+import { Peer } from "cojson";
+export declare function createWebSocketPeerWithReconnection(peer: string, reconnectionTimeout: number | undefined, addPeer: (peer: Peer) => void): {
+    peer: Peer;
+    done: () => void;
+};

package/dist/createWebSocketPeerWithReconnection.js

@@ -0,0 +1,58 @@
+import NetInfo from "@react-native-community/netinfo";
+import { createWebSocketPeer } from "cojson-transport-ws";
+export function createWebSocketPeerWithReconnection(peer, reconnectionTimeout, addPeer) {
+    const firstWsPeer = createWebSocketPeer({
+        websocket: new WebSocket(peer),
+        id: peer,
+        role: "server",
+        onClose: reconnectWebSocket,
+    });
+    const initialReconnectionTimeout = reconnectionTimeout || 500;
+    let shouldTryToReconnect = true;
+    let currentReconnectionTimeout = initialReconnectionTimeout;
+    const unsubscribeNetworkChange = NetInfo.addEventListener((state) => {
+        if (state.isConnected) {
+            currentReconnectionTimeout = initialReconnectionTimeout;
+        }
+    });
+    async function reconnectWebSocket() {
+        if (!shouldTryToReconnect)
+            return;
+        console.log("Websocket disconnected, trying to reconnect in " +
+            currentReconnectionTimeout +
+            "ms");
+        currentReconnectionTimeout = Math.min(currentReconnectionTimeout * 2, 30000);
+        await waitForOnline(currentReconnectionTimeout);
+        if (!shouldTryToReconnect)
+            return;
+        addPeer(createWebSocketPeer({
+            websocket: new WebSocket(peer),
+            id: peer,
+            role: "server",
+            onClose: reconnectWebSocket,
+        }));
+    }
+    return {
+        peer: firstWsPeer,
+        done: () => {
+            shouldTryToReconnect = false;
+            unsubscribeNetworkChange();
+        },
+    };
+}
+function waitForOnline(timeout) {
+    return new Promise((resolve) => {
+        const unsubscribeNetworkChange = NetInfo.addEventListener((state) => {
+            if (state.isConnected) {
+                handleTimeoutOrOnline();
+            }
+        });
+        function handleTimeoutOrOnline() {
+            clearTimeout(timer);
+            unsubscribeNetworkChange();
+            resolve();
+        }
+        const timer = setTimeout(handleTimeoutOrOnline, timeout);
+    });
+}
+//# sourceMappingURL=createWebSocketPeerWithReconnection.js.map

package/dist/createWebSocketPeerWithReconnection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createWebSocketPeerWithReconnection.js","sourceRoot":"","sources":["../src/createWebSocketPeerWithReconnection.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,UAAU,mCAAmC,CACjD,IAAY,EACZ,mBAAuC,EACvC,OAA6B;IAE7B,MAAM,WAAW,GAAG,mBAAmB,CAAC;QACtC,SAAS,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC;QAC9B,EAAE,EAAE,IAAI;QACR,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,kBAAkB;KAC5B,CAAC,CAAC;IAEH,MAAM,0BAA0B,GAAG,mBAAmB,IAAI,GAAG,CAAC;IAC9D,IAAI,oBAAoB,GAAG,IAAI,CAAC;IAChC,IAAI,0BAA0B,GAAG,0BAA0B,CAAC;IAE5D,MAAM,wBAAwB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE;QAClE,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACtB,0BAA0B,GAAG,0BAA0B,CAAC;QAC1D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,UAAU,kBAAkB;QAC/B,IAAI,CAAC,oBAAoB;YAAE,OAAO;QAElC,OAAO,CAAC,GAAG,CACT,iDAAiD;YAC/C,0BAA0B;YAC1B,IAAI,CACP,CAAC;QACF,0BAA0B,GAAG,IAAI,CAAC,GAAG,CACnC,0BAA0B,GAAG,CAAC,EAC9B,KAAK,CACN,CAAC;QAEF,MAAM,aAAa,CAAC,0BAA0B,CAAC,CAAC;QAEhD,IAAI,CAAC,oBAAoB;YAAE,OAAO;QAElC,OAAO,CACL,mBAAmB,CAAC;YAClB,SAAS,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC;YAC9B,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,kBAAkB;SAC5B,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,GAAG,EAAE;YACT,oBAAoB,GAAG,KAAK,CAAC;YAC7B,wBAAwB,EAAE,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAe;IACpC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QACnC,MAAM,wBAAwB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE;YAClE,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;gBACtB,qBAAqB,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,SAAS,qBAAqB;YAC5B,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,wBAAwB,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/index.js

@@ -1,74 +1,33 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { cojsonInternals, createJazzContext, } from "jazz-tools";
-import NetInfo from "@react-native-community/netinfo";
-import { createWebSocketPeer } from "cojson-transport-ws";
 import * as Linking from "expo-linking";
 import { PureJSCrypto } from "jazz-tools/native";
 export { RNDemoAuth } from "./auth/DemoAuthMethod.js";
+import { createWebSocketPeerWithReconnection } from "./createWebSocketPeerWithReconnection.js";
 import { KvStoreContext } from "./storage/kv-store-context.js";
 export async function createJazzRNContext(options) {
-    const firstWsPeer = createWebSocketPeer({
-        websocket: new WebSocket(options.peer),
-        id: options.peer + "@" + new Date().toISOString(),
-        role: "server",
-        expectPings: true,
-    });
-    let shouldTryToReconnect = true;
-    let currentReconnectionTimeout = options.reconnectionTimeout || 500;
-    const unsubscribeNetworkChange = NetInfo.addEventListener((state) => {
-        if (state.isConnected) {
-            currentReconnectionTimeout = options.reconnectionTimeout || 500;
-        }
+    const websocketPeer = createWebSocketPeerWithReconnection(options.peer, options.reconnectionTimeout, (peer) => {
+        node.syncManager.addPeer(peer);
     });
     const context = "auth" in options
         ? await createJazzContext({
             AccountSchema: options.AccountSchema,
             auth: options.auth,
             crypto: await PureJSCrypto.create(),
-            peersToLoadFrom: [firstWsPeer],
+            peersToLoadFrom: [websocketPeer.peer],
             sessionProvider: provideLockSession,
         })
         : await createJazzContext({
             crypto: await PureJSCrypto.create(),
-            peersToLoadFrom: [firstWsPeer],
+            peersToLoadFrom: [websocketPeer.peer],
         });
     const node = "account" in context ? context.account._raw.core.node : context.agent.node;
-    async function websocketReconnectLoop() {
-        while (shouldTryToReconnect) {
-            if (Object.keys(node.syncManager.peers).some((peerId) => peerId.includes(options.peer))) {
-                // TODO: this might drain battery, use listeners instead
-                await new Promise((resolve) => setTimeout(resolve, 100));
-            }
-            else {
-                console.log("Websocket disconnected, trying to reconnect in " +
-                    currentReconnectionTimeout +
-                    "ms");
-                currentReconnectionTimeout = Math.min(currentReconnectionTimeout * 2, 30000);
-                await new Promise((resolve) => {
-                    setTimeout(resolve, currentReconnectionTimeout);
-                    const _unsubscribeNetworkChange = NetInfo.addEventListener((state) => {
-                        if (state.isConnected) {
-                            resolve();
-                            _unsubscribeNetworkChange();
-                        }
-                    });
-                });
-                node.syncManager.addPeer(createWebSocketPeer({
-                    websocket: new WebSocket(options.peer),
-                    id: options.peer + "@" + new Date().toISOString(),
-                    role: "server",
-                }));
-            }
-        }
-    }
-    void websocketReconnectLoop();
     return "account" in context
         ? {
             me: context.account,
             done: () => {
-                shouldTryToReconnect = false;
-                unsubscribeNetworkChange?.();
+                websocketPeer.done();
                 context.done();
             },
             logOut: () => {
@@ -78,8 +37,7 @@ export async function createJazzRNContext(options) {
         : {
             guest: context.agent,
             done: () => {
-                shouldTryToReconnect = false;
-                unsubscribeNetworkChange?.();
+                websocketPeer.done();
                 context.done();
             },
             logOut: () => {

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,uDAAuD;AACvD,sDAAsD;AACtD,OAAO,EAWL,eAAe,EACf,iBAAiB,GAClB,MAAM,YAAY,CAAC;AAKpB,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,mCAAmC,EAAE,MAAM,0CAA0C,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAwC/D,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAuE;IAEvE,MAAM,aAAa,GAAG,mCAAmC,CACvD,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,mBAAmB,EAC3B,CAAC,IAAI,EAAE,EAAE;QACP,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,CACF,CAAC;IAEF,MAAM,OAAO,GACX,MAAM,IAAI,OAAO;QACf,CAAC,CAAC,MAAM,iBAAiB,CAAC;YACtB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,MAAM,YAAY,CAAC,MAAM,EAAE;YACnC,eAAe,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;YACrC,eAAe,EAAE,kBAAkB;SACpC,CAAC;QACJ,CAAC,CAAC,MAAM,iBAAiB,CAAC;YACtB,MAAM,EAAE,MAAM,YAAY,CAAC,MAAM,EAAE;YACnC,eAAe,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;SACtC,CAAC,CAAC;IAET,MAAM,IAAI,GACR,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;IAE7E,OAAO,SAAS,IAAI,OAAO;QACzB,CAAC,CAAC;YACE,EAAE,EAAE,OAAO,CAAC,OAAO;YACnB,IAAI,EAAE,GAAG,EAAE;gBACT,aAAa,CAAC,IAAI,EAAE,CAAC;gBACrB,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,CAAC;YACD,MAAM,EAAE,GAAG,EAAE;gBACX,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,CAAC;SACF;QACH,CAAC,CAAC;YACE,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,GAAG,EAAE;gBACT,aAAa,CAAC,IAAI,EAAE,CAAC;gBACrB,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,CAAC;YACD,MAAM,EAAE,GAAG,EAAE;gBACX,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,CAAC;SACF,CAAC;AACR,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,SAAgC,EAChC,MAAsB;IAEtB,MAAM,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAE7B,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC,UAAU,EAAE,CAAC;IAE1D,MAAM,SAAS,GACZ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAe;QAC7C,MAAM,CAAC,kBAAkB,CAAC,SAAmC,CAAC,CAAC;IACjE,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAExC,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,SAAS;QACT,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,gBAAgB,CAC9B,KAAQ,EACR,IAAmC,EACnC,EAAE,OAAO,EAAE,SAAS,KAA+C,EAAE;IAErE,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;IACpC,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,OAAO,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QAC7D,cAAc,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC;IAClD,CAAC;IAED,IAAI,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC9E,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAE9C,OAAO,GAAG,OAAO,WAAW,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAC1D,KAAK,CAAC,EACR,IAAI,YAAY,EAAE,CAAC;AACrB,CAAC;AAED,6BAA6B;AAC7B,MAAM,UAAU,eAAe,CAC7B,SAAiB;IAQjB,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAEnC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,SAA6B,CAAC;IAClC,IAAI,OAA0B,CAAC;IAC/B,IAAI,YAAsC,CAAC;IAE3C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,OAAO,GAAG,KAAK,CAAC,CAAC,CAAU,CAAC;QAC5B,YAAY,GAAG,KAAK,CAAC,CAAC,CAAiB,CAAC;IAC1C,CAAC;SAAM,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,GAAG,KAAK,CAAC,CAAC,CAAU,CAAC;QAC5B,YAAY,GAAG,KAAK,CAAC,CAAC,CAAiB,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS;AAET,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC"}

package/dist/tests/createWebSocketPeerWithReconnection.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/createWebSocketPeerWithReconnection.test.js

@@ -0,0 +1,106 @@
+// @vitest-environment happy-dom
+import NetInfo from "@react-native-community/netinfo";
+import { createWebSocketPeer } from "cojson-transport-ws";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { createWebSocketPeerWithReconnection } from "../createWebSocketPeerWithReconnection.js";
+// Mock WebSocket
+class MockWebSocket {
+    addEventListener = vi.fn();
+    removeEventListener = vi.fn();
+    close = vi.fn();
+    readyState = 1;
+}
+vi.mock("@react-native-community/netinfo", async () => {
+    return {
+        default: {
+            addEventListener: vi.fn(),
+        },
+    };
+});
+vi.mock("cojson-transport-ws", () => ({
+    createWebSocketPeer: vi.fn().mockImplementation(({ onClose }) => ({
+        id: "test-peer",
+        incoming: { push: vi.fn() },
+        outgoing: { push: vi.fn(), close: vi.fn() },
+        onClose,
+    })),
+}));
+let listeners = new Set();
+let unsubscribe = undefined;
+function mockNetInfo() {
+    listeners.clear();
+    vi.mocked(NetInfo.addEventListener).mockImplementation((listener) => {
+        listeners.add(listener);
+        unsubscribe = vi.fn();
+        return unsubscribe;
+    });
+}
+function dispatchNetInfoChange(isConnected) {
+    listeners.forEach((listener) => listener({ isConnected }));
+}
+describe("createWebSocketPeerWithReconnection", () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        vi.stubGlobal("WebSocket", MockWebSocket);
+        mockNetInfo();
+    });
+    afterEach(() => {
+        vi.useRealTimers();
+    });
+    test("should reset reconnection timeout when coming online", async () => {
+        vi.useFakeTimers();
+        const addPeerMock = vi.fn();
+        const { done } = createWebSocketPeerWithReconnection("ws://localhost:8080", 500, addPeerMock);
+        // Simulate multiple disconnections to increase timeout
+        const initialPeer = vi.mocked(createWebSocketPeer).mock.results[0].value;
+        initialPeer.onClose();
+        await vi.advanceTimersByTimeAsync(1000);
+        expect(addPeerMock).toHaveBeenCalledTimes(1);
+        vi.mocked(createWebSocketPeer).mock.results[1].value.onClose();
+        await vi.advanceTimersByTimeAsync(2000);
+        expect(addPeerMock).toHaveBeenCalledTimes(2);
+        // Resets the timeout to initial value
+        dispatchNetInfoChange(true);
+        // Next reconnection should use initial timeout
+        vi.mocked(createWebSocketPeer).mock.results[2].value.onClose();
+        await vi.advanceTimersByTimeAsync(1000);
+        expect(addPeerMock).toHaveBeenCalledTimes(3);
+        done();
+    });
+    test("should wait for online event or timeout before reconnecting", async () => {
+        vi.useFakeTimers();
+        const addPeerMock = vi.fn();
+        const { done } = createWebSocketPeerWithReconnection("ws://localhost:8080", 500, addPeerMock);
+        const initialPeer = vi.mocked(createWebSocketPeer).mock.results[0].value;
+        // Simulate offline state
+        vi.stubGlobal("navigator", { onLine: false });
+        initialPeer.onClose();
+        // Advance timer but not enough to trigger reconnection
+        await vi.advanceTimersByTimeAsync(500);
+        expect(createWebSocketPeer).toHaveBeenCalledTimes(1);
+        // Simulate coming back online
+        dispatchNetInfoChange(true);
+        // Wait for event loop to settle
+        await Promise.resolve().then();
+        // Should reconnect immediately after coming online
+        expect(createWebSocketPeer).toHaveBeenCalledTimes(2);
+        done();
+    });
+    test("should clean up event listeners when done", () => {
+        const addPeerMock = vi.fn();
+        const { done } = createWebSocketPeerWithReconnection("ws://localhost:8080", 1000, addPeerMock);
+        done();
+        expect(unsubscribe).toHaveBeenCalled();
+    });
+    test("should not attempt reconnection after done is called", async () => {
+        vi.useFakeTimers();
+        const addPeerMock = vi.fn();
+        const { done } = createWebSocketPeerWithReconnection("ws://localhost:8080", 500, addPeerMock);
+        const initialPeer = vi.mocked(createWebSocketPeer).mock.results[0].value;
+        done();
+        initialPeer.onClose();
+        await vi.advanceTimersByTimeAsync(1000);
+        expect(createWebSocketPeer).toHaveBeenCalledTimes(1);
+    });
+});
+//# sourceMappingURL=createWebSocketPeerWithReconnection.test.js.map

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jazz-react-native",
-  "version": "0.8.37",
+  "version": "0.8.39",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -16,9 +16,9 @@
   "license": "MIT",
   "dependencies": {
     "@scure/bip39": "^1.3.0",
-    "cojson": "0.8.37",
-    "cojson-transport-ws": "0.8.37",
-    "jazz-tools": "0.8.37"
+    "cojson": "0.8.39",
+    "cojson-transport-ws": "0.8.39",
+    "jazz-tools": "0.8.39"
   },
   "peerDependencies": {
     "@react-native-community/netinfo": "*",

package/src/createWebSocketPeerWithReconnection.ts

@@ -0,0 +1,79 @@
+import NetInfo from "@react-native-community/netinfo";
+import { Peer } from "cojson";
+import { createWebSocketPeer } from "cojson-transport-ws";
+
+export function createWebSocketPeerWithReconnection(
+  peer: string,
+  reconnectionTimeout: number | undefined,
+  addPeer: (peer: Peer) => void,
+) {
+  const firstWsPeer = createWebSocketPeer({
+    websocket: new WebSocket(peer),
+    id: peer,
+    role: "server",
+    onClose: reconnectWebSocket,
+  });
+
+  const initialReconnectionTimeout = reconnectionTimeout || 500;
+  let shouldTryToReconnect = true;
+  let currentReconnectionTimeout = initialReconnectionTimeout;
+
+  const unsubscribeNetworkChange = NetInfo.addEventListener((state) => {
+    if (state.isConnected) {
+      currentReconnectionTimeout = initialReconnectionTimeout;
+    }
+  });
+
+  async function reconnectWebSocket() {
+    if (!shouldTryToReconnect) return;
+
+    console.log(
+      "Websocket disconnected, trying to reconnect in " +
+        currentReconnectionTimeout +
+        "ms",
+    );
+    currentReconnectionTimeout = Math.min(
+      currentReconnectionTimeout * 2,
+      30000,
+    );
+
+    await waitForOnline(currentReconnectionTimeout);
+
+    if (!shouldTryToReconnect) return;
+
+    addPeer(
+      createWebSocketPeer({
+        websocket: new WebSocket(peer),
+        id: peer,
+        role: "server",
+        onClose: reconnectWebSocket,
+      }),
+    );
+  }
+
+  return {
+    peer: firstWsPeer,
+    done: () => {
+      shouldTryToReconnect = false;
+      unsubscribeNetworkChange();
+    },
+  };
+}
+
+function waitForOnline(timeout: number) {
+  return new Promise<void>((resolve) => {
+    const unsubscribeNetworkChange = NetInfo.addEventListener((state) => {
+      if (state.isConnected) {
+        handleTimeoutOrOnline();
+      }
+    });
+
+    function handleTimeoutOrOnline() {
+      clearTimeout(timer);
+      unsubscribeNetworkChange();
+      resolve();
+    }
+
+    const timer = setTimeout(handleTimeoutOrOnline, timeout);
+  });
+}

package/src/index.ts

@@ -23,6 +23,7 @@ import { PureJSCrypto } from "jazz-tools/native";
 
 export { RNDemoAuth } from "./auth/DemoAuthMethod.js";
 
+import { createWebSocketPeerWithReconnection } from "./createWebSocketPeerWithReconnection.js";
 import { KvStoreContext } from "./storage/kv-store-context.js";
 
 /** @category Context Creation */
@@ -66,21 +67,13 @@ export async function createJazzRNContext<Acc extends Account>(
 export async function createJazzRNContext<Acc extends Account>(
   options: ReactNativeContextOptions<Acc> | BaseReactNativeContextOptions,
 ): Promise<ReactNativeContext<Acc> | ReactNativeGuestContext> {
-  const firstWsPeer = createWebSocketPeer({
-    websocket: new WebSocket(options.peer),
-    id: options.peer + "@" + new Date().toISOString(),
-    role: "server",
-    expectPings: true,
-  });
-  let shouldTryToReconnect = true;
-
-  let currentReconnectionTimeout = options.reconnectionTimeout || 500;
-
-  const unsubscribeNetworkChange = NetInfo.addEventListener((state) => {
-    if (state.isConnected) {
-      currentReconnectionTimeout = options.reconnectionTimeout || 500;
-    }
-  });
+  const websocketPeer = createWebSocketPeerWithReconnection(
+    options.peer,
+    options.reconnectionTimeout,
+    (peer) => {
+      node.syncManager.addPeer(peer);
+    },
+  );
 
   const context =
     "auth" in options
@@ -88,67 +81,22 @@ export async function createJazzRNContext<Acc extends Account>(
           AccountSchema: options.AccountSchema,
           auth: options.auth,
           crypto: await PureJSCrypto.create(),
-          peersToLoadFrom: [firstWsPeer],
+          peersToLoadFrom: [websocketPeer.peer],
           sessionProvider: provideLockSession,
         })
       : await createJazzContext({
           crypto: await PureJSCrypto.create(),
-          peersToLoadFrom: [firstWsPeer],
+          peersToLoadFrom: [websocketPeer.peer],
         });
 
   const node =
     "account" in context ? context.account._raw.core.node : context.agent.node;
 
-  async function websocketReconnectLoop() {
-    while (shouldTryToReconnect) {
-      if (
-        Object.keys(node.syncManager.peers).some((peerId) =>
-          peerId.includes(options.peer),
-        )
-      ) {
-        // TODO: this might drain battery, use listeners instead
-        await new Promise((resolve) => setTimeout(resolve, 100));
-      } else {
-        console.log(
-          "Websocket disconnected, trying to reconnect in " +
-            currentReconnectionTimeout +
-            "ms",
-        );
-        currentReconnectionTimeout = Math.min(
-          currentReconnectionTimeout * 2,
-          30000,
-        );
-        await new Promise<void>((resolve) => {
-          setTimeout(resolve, currentReconnectionTimeout);
-          const _unsubscribeNetworkChange = NetInfo.addEventListener(
-            (state) => {
-              if (state.isConnected) {
-                resolve();
-                _unsubscribeNetworkChange();
-              }
-            },
-          );
-        });
-
-        node.syncManager.addPeer(
-          createWebSocketPeer({
-            websocket: new WebSocket(options.peer),
-            id: options.peer + "@" + new Date().toISOString(),
-            role: "server",
-          }),
-        );
-      }
-    }
-  }
-
-  void websocketReconnectLoop();
-
   return "account" in context
     ? {
         me: context.account,
         done: () => {
-          shouldTryToReconnect = false;
-          unsubscribeNetworkChange?.();
+          websocketPeer.done();
           context.done();
         },
         logOut: () => {
@@ -158,8 +106,7 @@ export async function createJazzRNContext<Acc extends Account>(
     : {
         guest: context.agent,
         done: () => {
-          shouldTryToReconnect = false;
-          unsubscribeNetworkChange?.();
+          websocketPeer.done();
           context.done();
         },
         logOut: () => {

package/src/tests/createWebSocketPeerWithReconnection.test.ts

@@ -0,0 +1,163 @@
+// @vitest-environment happy-dom
+
+import NetInfo, {
+  NetInfoChangeHandler,
+  NetInfoState,
+} from "@react-native-community/netinfo";
+import { createWebSocketPeer } from "cojson-transport-ws";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { createWebSocketPeerWithReconnection } from "../createWebSocketPeerWithReconnection.js";
+
+// Mock WebSocket
+class MockWebSocket {
+  addEventListener = vi.fn();
+  removeEventListener = vi.fn();
+  close = vi.fn();
+  readyState = 1;
+}
+
+vi.mock("@react-native-community/netinfo", async () => {
+  return {
+    default: {
+      addEventListener: vi.fn(),
+    },
+  };
+});
+
+vi.mock("cojson-transport-ws", () => ({
+  createWebSocketPeer: vi.fn().mockImplementation(({ onClose }) => ({
+    id: "test-peer",
+    incoming: { push: vi.fn() },
+    outgoing: { push: vi.fn(), close: vi.fn() },
+    onClose,
+  })),
+}));
+
+let listeners = new Set<NetInfoChangeHandler>();
+let unsubscribe: (() => void) | undefined = undefined;
+
+function mockNetInfo() {
+  listeners.clear();
+  vi.mocked(NetInfo.addEventListener).mockImplementation((listener) => {
+    listeners.add(listener);
+    unsubscribe = vi.fn();
+    return unsubscribe;
+  });
+}
+
+function dispatchNetInfoChange(isConnected: boolean) {
+  listeners.forEach((listener) => listener({ isConnected } as NetInfoState));
+}
+
+describe("createWebSocketPeerWithReconnection", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.stubGlobal("WebSocket", MockWebSocket);
+    mockNetInfo();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  test("should reset reconnection timeout when coming online", async () => {
+    vi.useFakeTimers();
+    const addPeerMock = vi.fn();
+
+    const { done } = createWebSocketPeerWithReconnection(
+      "ws://localhost:8080",
+      500,
+      addPeerMock,
+    );
+
+    // Simulate multiple disconnections to increase timeout
+    const initialPeer = vi.mocked(createWebSocketPeer).mock.results[0]!.value;
+    initialPeer.onClose();
+
+    await vi.advanceTimersByTimeAsync(1000);
+
+    expect(addPeerMock).toHaveBeenCalledTimes(1);
+
+    vi.mocked(createWebSocketPeer).mock.results[1]!.value.onClose();
+    await vi.advanceTimersByTimeAsync(2000);
+
+    expect(addPeerMock).toHaveBeenCalledTimes(2);
+
+    // Resets the timeout to initial value
+    dispatchNetInfoChange(true);
+
+    // Next reconnection should use initial timeout
+    vi.mocked(createWebSocketPeer).mock.results[2]!.value.onClose();
+    await vi.advanceTimersByTimeAsync(1000);
+
+    expect(addPeerMock).toHaveBeenCalledTimes(3);
+
+    done();
+  });
+
+  test("should wait for online event or timeout before reconnecting", async () => {
+    vi.useFakeTimers();
+
+    const addPeerMock = vi.fn();
+    const { done } = createWebSocketPeerWithReconnection(
+      "ws://localhost:8080",
+      500,
+      addPeerMock,
+    );
+
+    const initialPeer = vi.mocked(createWebSocketPeer).mock.results[0]!.value;
+
+    // Simulate offline state
+    vi.stubGlobal("navigator", { onLine: false });
+
+    initialPeer.onClose();
+
+    // Advance timer but not enough to trigger reconnection
+    await vi.advanceTimersByTimeAsync(500);
+    expect(createWebSocketPeer).toHaveBeenCalledTimes(1);
+
+    // Simulate coming back online
+    dispatchNetInfoChange(true);
+
+    // Wait for event loop to settle
+    await Promise.resolve().then();
+
+    // Should reconnect immediately after coming online
+    expect(createWebSocketPeer).toHaveBeenCalledTimes(2);
+
+    done();
+  });
+
+  test("should clean up event listeners when done", () => {
+    const addPeerMock = vi.fn();
+    const { done } = createWebSocketPeerWithReconnection(
+      "ws://localhost:8080",
+      1000,
+      addPeerMock,
+    );
+
+    done();
+
+    expect(unsubscribe).toHaveBeenCalled();
+  });
+
+  test("should not attempt reconnection after done is called", async () => {
+    vi.useFakeTimers();
+
+    const addPeerMock = vi.fn();
+    const { done } = createWebSocketPeerWithReconnection(
+      "ws://localhost:8080",
+      500,
+      addPeerMock,
+    );
+
+    const initialPeer = vi.mocked(createWebSocketPeer).mock.results[0]!.value;
+
+    done();
+
+    initialPeer.onClose();
+    await vi.advanceTimersByTimeAsync(1000);
+
+    expect(createWebSocketPeer).toHaveBeenCalledTimes(1);
+  });
+});