cry-synced-db-client 0.1.29 → 0.1.30

package/dist/db/DexieDb.d.ts

@@ -39,9 +39,8 @@ export declare class DexieDb extends Dexie implements I_DexieDb {
     deleteSyncMeta(collection: string): Promise<void>;
     getTenant(): string;
     getInstanceId(): string;
-    getNewerThan<T extends LocalDbEntity>(collection: string, timestamp: any): Promise<T[]>;
+    getNewerThan<T extends LocalDbEntity>(collection: string, rev: number): Promise<T[]>;
     onMetaUpdated(callback: (payload: MetaUpdateBroadcast) => void): () => void;
-    private normalizeTimestamp;
     /** Close the broadcast channel when done */
     closeBroadcastChannel(): void;
 }

package/dist/db/SyncedDb.d.ts

@@ -60,6 +60,8 @@ export declare class SyncedDb implements I_SyncedDb {
     private readonly syncedDbInstanceId;
     /** In-memory cache of sync metadata per collection */
     private syncMetaCache;
+    /** In-memory cache of max _rev seen per collection (for cross-tab sync) */
+    private lastSeenRevCache;
     /** Unsubscribe function for cross-tab meta updates */
     private unsubscribeMetaUpdates?;
     /** Whether this instance is the leader tab */

package/dist/index.js

@@ -306,6 +306,7 @@ class SyncedDb {
   updaterId;
   syncedDbInstanceId;
   syncMetaCache = new Map;
+  lastSeenRevCache = new Map;
   unsubscribeMetaUpdates;
   isLeader = false;
   leaderLockAbortController;
@@ -1528,51 +1529,45 @@ class SyncedDb {
     }
   }
   async handleCrossTabMetaUpdate(payload) {
-    if (payload.instanceId === this.syncedDbInstanceId) {
+    if (payload.instanceId === this.dexieDb.getInstanceId()) {
       return;
     }
     const collection = payload.collection;
     if (!this.collections.has(collection)) {
       return;
     }
-    const cachedMeta = this.syncMetaCache.get(collection);
-    const cachedTs = this.normalizeTimestamp(cachedMeta?.lastSyncTs);
-    const receivedTs = this.normalizeTimestamp(payload.lastSyncTs);
-    if (receivedTs > cachedTs) {
-      try {
-        const newMeta = await this.dexieDb.getSyncMeta(collection);
-        if (newMeta) {
-          this.syncMetaCache.set(collection, newMeta);
-        }
-        const newerItems = await this.dexieDb.getNewerThan(collection, cachedTs);
-        let newItemsCount = 0;
-        for (const item of newerItems) {
-          if (item._deleted) {
-            this.inMemDb.deleteOne(collection, item._id);
-          } else {
-            this.inMemDb.save(collection, item._id, item);
-          }
-          newItemsCount++;
+    const lastSeenRev = this.lastSeenRevCache.get(collection) ?? 0;
+    try {
+      const newMeta = await this.dexieDb.getSyncMeta(collection);
+      if (newMeta) {
+        this.syncMetaCache.set(collection, newMeta);
+      }
+      const newerItems = await this.dexieDb.getNewerThan(collection, lastSeenRev);
+      let newItemsCount = 0;
+      let maxRev = lastSeenRev;
+      for (const item of newerItems) {
+        if (item._rev !== undefined && item._rev > maxRev) {
+          maxRev = item._rev;
         }
-        if (this.onExternalSync) {
-          try {
-            this.onExternalSync(collection, newItemsCount);
-          } catch (err) {
-            console.error("onExternalSync callback failed:", err);
-          }
+        if (item._deleted) {
+          this.inMemDb.deleteOne(collection, item._id);
+        } else {
+          this.inMemDb.save(collection, item._id, this.stripLocalFields(item));
         }
-      } catch (err) {
-        console.error(`Error handling cross-tab meta update for ${collection}:`, err);
+        newItemsCount++;
+      }
+      if (maxRev > lastSeenRev) {
+        this.lastSeenRevCache.set(collection, maxRev);
       }
-    } else if (receivedTs < cachedTs) {
-      console.warn(`Cross-tab sync: Received stale metadata for ${collection}. ` + `In-memory: ${cachedTs}, Received: ${receivedTs}`);
-      if (this.onStaleMetaConflict) {
+      if (this.onExternalSync) {
         try {
-          this.onStaleMetaConflict(collection, cachedMeta?.lastSyncTs, payload.lastSyncTs);
+          this.onExternalSync(collection, newItemsCount);
         } catch (err) {
-          console.error("onStaleMetaConflict callback failed:", err);
+          console.error("onExternalSync callback failed:", err);
         }
       }
+    } catch (err) {
+      console.error(`Error handling cross-tab meta update for ${collection}:`, err);
     }
   }
   async handleServerUpdate(payload) {
@@ -1731,7 +1726,7 @@ class DexieDb extends Dexie {
     schema[SYNC_META_TABLE] = "[tenant+collection]";
     for (const config of collectionConfigs) {
       const additionalIndexes = config.indexes || [];
-      const indexes = ["_id", "_dirty", "_ts", ...additionalIndexes.map(String)];
+      const indexes = ["_id", "_dirty", "_rev", ...additionalIndexes.map(String)];
       schema[config.name] = indexes.join(", ");
     }
     this.version(1).stores(schema);
@@ -1893,10 +1888,9 @@ class DexieDb extends Dexie {
   getInstanceId() {
     return this.instanceId;
   }
-  async getNewerThan(collection, timestamp) {
+  async getNewerThan(collection, rev) {
     const table = this.getTable(collection);
-    const normalizedTs = this.normalizeTimestamp(timestamp);
-    return await table.where("_ts").above(normalizedTs).toArray();
+    return await table.where("_rev").above(rev).toArray();
   }
   onMetaUpdated(callback) {
     this.metaUpdateCallbacks.add(callback);
@@ -1904,19 +1898,6 @@ class DexieDb extends Dexie {
       this.metaUpdateCallbacks.delete(callback);
     };
   }
-  normalizeTimestamp(ts) {
-    if (ts === null || ts === undefined)
-      return 0;
-    if (typeof ts === "number")
-      return ts;
-    if (ts instanceof Date)
-      return ts.getTime();
-    if (typeof ts.toNumber === "function")
-      return ts.toNumber();
-    if (typeof ts.valueOf === "function")
-      return ts.valueOf();
-    return 0;
-  }
   closeBroadcastChannel() {
     if (this.debounceTimer) {
       clearTimeout(this.debounceTimer);

package/dist/types/I_DexieDb.d.ts

@@ -61,8 +61,8 @@ export interface I_DexieDb {
     deleteSyncMeta(collection: string): Promise<void>;
     /** Vrne tenant */
     getTenant(): string;
-    /** Get records newer than timestamp (uses _ts index - server timestamp) */
-    getNewerThan<T extends LocalDbEntity>(collection: string, timestamp: any): Promise<T[]>;
+    /** Get records newer than revision (uses _rev index) */
+    getNewerThan<T extends LocalDbEntity>(collection: string, rev: number): Promise<T[]>;
     /** Subscribe to metadata updates from other tabs. Returns unsubscribe function. */
     onMetaUpdated(callback: (payload: MetaUpdateBroadcast) => void): () => void;
     /** Get the instance ID */

package/package.json

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