cry-synced-db-client 0.1.56 → 0.1.57

package/dist/index.js

@@ -2682,6 +2682,7 @@ class SyncedDb {
   syncedDbInstanceId;
   syncMetaCache = new Map;
   unsubscribeServerUpdates;
+  cleanupNotifierCallbacks;
   beforeUnloadHandler;
   onSync;
   onConflictResolved;
@@ -2882,11 +2883,13 @@ class SyncedDb {
     this.crossTabSync.init();
     if (this.serverUpdateNotifier) {
       if (this.serverUpdateNotifier.setCallbacks) {
-        this.serverUpdateNotifier.setCallbacks({
+        const cleanup = this.serverUpdateNotifier.setCallbacks({
           onConnect: () => this.connectionManager.callOnWsConnect(),
           onDisconnect: (reason) => this.connectionManager.callOnWsDisconnect(reason),
           onReconnect: (attempt) => this.connectionManager.callOnWsReconnect(attempt)
         });
+        if (cleanup)
+          this.cleanupNotifierCallbacks = cleanup;
       }
       this.unsubscribeServerUpdates = this.serverUpdateNotifier.subscribe((payload) => this.serverUpdateHandler.handleServerUpdate(payload));
       try {
@@ -2917,13 +2920,25 @@ class SyncedDb {
       this.unsubscribeServerUpdates();
       this.unsubscribeServerUpdates = undefined;
     }
+    if (this.cleanupNotifierCallbacks) {
+      this.cleanupNotifierCallbacks();
+      this.cleanupNotifierCallbacks = undefined;
+    }
     if (this.serverUpdateNotifier) {
-      await this.serverUpdateNotifier.disconnect();
+      if (this.serverUpdateNotifier.dispose) {
+        this.serverUpdateNotifier.dispose();
+      } else {
+        await this.serverUpdateNotifier.disconnect();
+      }
     }
     if (typeof window !== "undefined" && this.beforeUnloadHandler) {
       window.removeEventListener("beforeunload", this.beforeUnloadHandler);
       this.beforeUnloadHandler = undefined;
     }
+    this.syncMetaCache.clear();
+    for (const collectionName of this.collections.keys()) {
+      this.inMemManager.clearCollection(collectionName);
+    }
     this.initialized = false;
   }
   isOnline() {
@@ -5773,13 +5788,17 @@ class RestProxy {
   }
   combineSignals(signal1, signal2) {
     const controller = new AbortController;
-    const abort = () => controller.abort();
     if (signal1.aborted || signal2.aborted) {
       controller.abort();
       return controller.signal;
     }
-    signal1.addEventListener("abort", abort, { once: true });
-    signal2.addEventListener("abort", abort, { once: true });
+    const abort = () => {
+      controller.abort();
+      signal1.removeEventListener("abort", abort);
+      signal2.removeEventListener("abort", abort);
+    };
+    signal1.addEventListener("abort", abort);
+    signal2.addEventListener("abort", abort);
     return controller.signal;
   }
   async ping() {
@@ -5864,9 +5883,9 @@ class Ebus2ProxyServerUpdateNotifier {
   maxReconnectDelayMs;
   pingIntervalMs;
   pongTimeoutMs;
-  onWsConnect;
-  onWsDisconnect;
-  onWsReconnect;
+  onWsConnectCallbacks = [];
+  onWsDisconnectCallbacks = [];
+  onWsReconnectCallbacks = [];
   onWsNotification;
   ws = null;
   callbacks = new Set;
@@ -5889,9 +5908,12 @@ class Ebus2ProxyServerUpdateNotifier {
     this.pingIntervalMs = config.pingIntervalMs ?? DEFAULT_PING_INTERVAL_MS;
     this.pongTimeoutMs = config.pongTimeoutMs ?? DEFAULT_PONG_TIMEOUT_MS;
     this.currentReconnectDelay = this.reconnectDelayMs;
-    this.onWsConnect = config.onWsConnect;
-    this.onWsDisconnect = config.onWsDisconnect;
-    this.onWsReconnect = config.onWsReconnect;
+    if (config.onWsConnect)
+      this.onWsConnectCallbacks.push(config.onWsConnect);
+    if (config.onWsDisconnect)
+      this.onWsDisconnectCallbacks.push(config.onWsDisconnect);
+    if (config.onWsReconnect)
+      this.onWsReconnectCallbacks.push(config.onWsReconnect);
     this.onWsNotification = config.onWsNotification;
   }
   subscribe(callback) {
@@ -5920,31 +5942,47 @@ class Ebus2ProxyServerUpdateNotifier {
     }
     this.connected = false;
   }
+  dispose() {
+    this.disconnect();
+    this.callbacks.clear();
+    this.onWsConnectCallbacks.length = 0;
+    this.onWsDisconnectCallbacks.length = 0;
+    this.onWsReconnectCallbacks.length = 0;
+  }
   isConnected() {
     return this.connected && !this.forcedOffline;
   }
   setCallbacks(callbacks) {
+    const addedCallbacks = {};
     if (callbacks.onConnect) {
-      const existingOnConnect = this.onWsConnect;
-      this.onWsConnect = () => {
-        existingOnConnect?.();
-        callbacks.onConnect();
-      };
+      addedCallbacks.onConnect = callbacks.onConnect;
+      this.onWsConnectCallbacks.push(callbacks.onConnect);
     }
     if (callbacks.onDisconnect) {
-      const existingOnDisconnect = this.onWsDisconnect;
-      this.onWsDisconnect = (reason) => {
-        existingOnDisconnect?.(reason);
-        callbacks.onDisconnect(reason);
-      };
+      addedCallbacks.onDisconnect = callbacks.onDisconnect;
+      this.onWsDisconnectCallbacks.push(callbacks.onDisconnect);
     }
     if (callbacks.onReconnect) {
-      const existingOnReconnect = this.onWsReconnect;
-      this.onWsReconnect = (attempt) => {
-        existingOnReconnect?.(attempt);
-        callbacks.onReconnect(attempt);
-      };
+      addedCallbacks.onReconnect = callbacks.onReconnect;
+      this.onWsReconnectCallbacks.push(callbacks.onReconnect);
     }
+    return () => {
+      if (addedCallbacks.onConnect) {
+        const idx = this.onWsConnectCallbacks.indexOf(addedCallbacks.onConnect);
+        if (idx !== -1)
+          this.onWsConnectCallbacks.splice(idx, 1);
+      }
+      if (addedCallbacks.onDisconnect) {
+        const idx = this.onWsDisconnectCallbacks.indexOf(addedCallbacks.onDisconnect);
+        if (idx !== -1)
+          this.onWsDisconnectCallbacks.splice(idx, 1);
+      }
+      if (addedCallbacks.onReconnect) {
+        const idx = this.onWsReconnectCallbacks.indexOf(addedCallbacks.onReconnect);
+        if (idx !== -1)
+          this.onWsReconnectCallbacks.splice(idx, 1);
+      }
+    };
   }
   forceOffline(forced) {
     this.forcedOffline = forced;
@@ -6001,9 +6039,9 @@ class Ebus2ProxyServerUpdateNotifier {
       this.sendSubscribe(channel);
     }
     this.startPingInterval();
-    if (this.onWsConnect) {
+    for (const callback of this.onWsConnectCallbacks) {
       try {
-        this.onWsConnect();
+        callback();
       } catch (err) {
         console.error("onWsConnect callback failed:", err);
       }
@@ -6015,11 +6053,13 @@ class Ebus2ProxyServerUpdateNotifier {
     this.subscribedChannels.clear();
     this.clearTimers();
     const reason = event.reason || `Code: ${event.code}`;
-    if (wasConnected && this.onWsDisconnect) {
-      try {
-        this.onWsDisconnect(reason);
-      } catch (err) {
-        console.error("onWsDisconnect callback failed:", err);
+    if (wasConnected) {
+      for (const callback of this.onWsDisconnectCallbacks) {
+        try {
+          callback(reason);
+        } catch (err) {
+          console.error("onWsDisconnect callback failed:", err);
+        }
       }
     }
     if (this.shouldReconnect && !this.forcedOffline) {
@@ -6087,9 +6127,9 @@ class Ebus2ProxyServerUpdateNotifier {
       return;
     }
     this.reconnectAttempt++;
-    if (this.onWsReconnect) {
+    for (const callback of this.onWsReconnectCallbacks) {
       try {
-        this.onWsReconnect(this.reconnectAttempt);
+        callback(this.reconnectAttempt);
       } catch (err) {
         console.error("onWsReconnect callback failed:", err);
       }

package/dist/src/db/Ebus2ProxyServerUpdateNotifier.d.ts

@@ -35,9 +35,9 @@ export declare class Ebus2ProxyServerUpdateNotifier implements I_ServerUpdateNot
     private maxReconnectDelayMs;
     private pingIntervalMs;
     private pongTimeoutMs;
-    private onWsConnect?;
-    private onWsDisconnect?;
-    private onWsReconnect?;
+    private onWsConnectCallbacks;
+    private onWsDisconnectCallbacks;
+    private onWsReconnectCallbacks;
     private onWsNotification?;
     private ws;
     private callbacks;
@@ -54,12 +54,19 @@ export declare class Ebus2ProxyServerUpdateNotifier implements I_ServerUpdateNot
     subscribe(callback: ServerUpdateCallback): () => void;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
+    /**
+     * Fully dispose of the notifier, clearing all callbacks and state.
+     * Call this when completely done with the notifier (e.g., on app shutdown).
+     * Unlike disconnect(), this also clears all registered callbacks.
+     */
+    dispose(): void;
     isConnected(): boolean;
     /**
      * Set connection lifecycle callbacks.
      * These are merged with any callbacks provided in the constructor config.
+     * Returns a cleanup function to remove the added callbacks.
      */
-    setCallbacks(callbacks: ServerUpdateNotifierCallbacks): void;
+    setCallbacks(callbacks: ServerUpdateNotifierCallbacks): () => void;
     /**
      * Force offline mode - disconnects WebSocket and prevents reconnection
      */

package/dist/src/db/SyncedDb.d.ts

@@ -28,6 +28,7 @@ export declare class SyncedDb implements I_SyncedDb {
     private readonly syncedDbInstanceId;
     private syncMetaCache;
     private unsubscribeServerUpdates?;
+    private cleanupNotifierCallbacks?;
     private beforeUnloadHandler?;
     private readonly onSync?;
     private readonly onConflictResolved?;

package/dist/src/types/I_ServerUpdateNotifier.d.ts

@@ -42,6 +42,14 @@ export interface I_ServerUpdateNotifier {
      * Set connection lifecycle callbacks.
      * These are called by the notifier implementation when connection state changes.
      * Optional method - implementations that don't support lifecycle events may not implement this.
+     * @returns Cleanup function to remove the added callbacks (optional)
      */
-    setCallbacks?(callbacks: ServerUpdateNotifierCallbacks): void;
+    setCallbacks?(callbacks: ServerUpdateNotifierCallbacks): void | (() => void);
+    /**
+     * Fully dispose of the notifier, clearing all callbacks and state.
+     * Call this when completely done with the notifier (e.g., on app shutdown).
+     * Unlike disconnect(), this also clears all registered callbacks.
+     * Optional method.
+     */
+    dispose?(): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "0.1.56",
+  "version": "0.1.57",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",