cry-synced-db-client 0.1.19 → 0.1.21

package/dist/db/SyncedDb.d.ts

@@ -52,6 +52,10 @@ export declare class SyncedDb implements I_SyncedDb {
     init(): Promise<void>;
     close(): Promise<void>;
     isOnline(): boolean;
+    /** Can we sync with server? Requires online AND not forced offline */
+    private canSync;
+    /** Can we process incoming server updates? Requires not forced offline */
+    private canReceiveServerUpdates;
     forceOffline(forced: boolean): void;
     isForcedOffline(): boolean;
     setOnline(online: boolean): Promise<void>;
@@ -60,10 +64,6 @@ export declare class SyncedDb implements I_SyncedDb {
      */
     private goOffline;
     private tryGoOnline;
-    /**
-     * Zažene avtomatsko periodično sinhronizacijo če je autoSyncIntervalMs konfiguriran.
-     * Safe to call multiple times - bo najprej ustavil obstoječi timer.
-     */
     private startAutoSync;
     /**
      * Ustavi avtomatsko periodično sinhronizacijo.

package/dist/index.js

@@ -370,26 +370,31 @@ class SyncedDb {
   isOnline() {
     return this.online && !this.forcedOffline;
   }
+  canSync() {
+    return this.online && !this.forcedOffline;
+  }
+  canReceiveServerUpdates() {
+    return !this.forcedOffline;
+  }
   forceOffline(forced) {
-    const wasForced = this.forcedOffline;
+    if (this.forcedOffline === forced)
+      return;
     this.forcedOffline = forced;
     if (forced) {
       this.stopAutoSync();
     } else if (this.online) {
-      this.startAutoSync();
-      if (wasForced) {
-        this.sync("forceOffline released").catch((err) => {
-          console.error("Sync after forceOffline release failed:", err);
-        });
-      }
+      this.tryGoOnline().catch((err) => {
+        console.error("Failed to go online after forceOffline release:", err);
+      });
     }
   }
   isForcedOffline() {
     return this.forcedOffline;
   }
   async setOnline(online) {
-    const wasOffline = !this.online;
-    if (online && wasOffline && this.initialized) {
+    if (this.online === online)
+      return;
+    if (online && this.initialized) {
       await this.tryGoOnline();
     } else {
       this.online = online;
@@ -410,6 +415,9 @@ class SyncedDb {
     }
   }
   async tryGoOnline() {
+    if (this.forcedOffline) {
+      return;
+    }
     try {
       const pingResult = await this.withSyncTimeout(this.restInterface.ping(), "ping");
       if (!pingResult) {
@@ -426,7 +434,7 @@ class SyncedDb {
   }
   startAutoSync() {
     this.stopAutoSync();
-    if (!this.autoSyncIntervalMs || this.autoSyncIntervalMs <= 0) {
+    if (this.forcedOffline || !this.autoSyncIntervalMs || this.autoSyncIntervalMs <= 0) {
       return;
     }
     const intervalMs = this.autoSyncIntervalMs;
@@ -675,10 +683,13 @@ class SyncedDb {
     }
   }
   async sync(calledFrom) {
-    if (this.forcedOffline) {
-      throw new Error("Cannot sync while in forced offline mode");
+    if (!this.canSync()) {
+      if (this.forcedOffline) {
+        throw new Error("Cannot sync while in forced offline mode");
+      }
+      return;
     }
-    if (!this.online || this.syncLock)
+    if (this.syncLock)
       return;
     this.syncLock = true;
     this.syncing = true;
@@ -979,7 +990,7 @@ class SyncedDb {
     }
   }
   scheduleRestUpload() {
-    if (!this.isOnline() || this.isUploadingToRest || this.syncing) {
+    if (!this.canSync() || this.isUploadingToRest || this.syncing) {
       return;
     }
     if (this.restUploadTimer) {
@@ -990,7 +1001,7 @@ class SyncedDb {
     }, this.debounceRestWritesMs);
   }
   async executeRestUpload() {
-    if (this.isUploadingToRest || this.syncing || !this.isOnline()) {
+    if (!this.canSync() || this.isUploadingToRest || this.syncing) {
       return;
     }
     this.isUploadingToRest = true;
@@ -1288,7 +1299,7 @@ class SyncedDb {
     return aI - bI;
   }
   async handleServerUpdate(payload) {
-    if (this.forcedOffline)
+    if (!this.canReceiveServerUpdates())
       return;
     const collectionName = payload.collection;
     if (!this.collections.has(collectionName))

package/package.json

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