cry-synced-db-client 0.1.29 → 0.1.31

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/Ebus2ProxyServerUpdateNotifier.d.ts

@@ -1,5 +1,5 @@
 import type { I_ServerUpdateNotifier, ServerUpdateCallback, ServerUpdateNotifierCallbacks } from "../types/I_ServerUpdateNotifier";
-import type { PublishRevsPayload } from "../types/PublishRevsPayload";
+import type { PublishDataPayload } from "../types/PublishRevsPayload";
 export interface Ebus2ProxyServerUpdateNotifierConfig {
     /** WebSocket URL (e.g., "ws://localhost:3033/ws") */
     wsUrl: string;
@@ -24,7 +24,7 @@ export interface Ebus2ProxyServerUpdateNotifierConfig {
     /** Called when WebSocket reconnects */
     onWsReconnect?: (attempt: number) => void;
     /** Called when a notification is received */
-    onWsNotification?: (payload: PublishRevsPayload) => void;
+    onWsNotification?: (payload: PublishDataPayload) => void;
 }
 export declare class Ebus2ProxyServerUpdateNotifier implements I_ServerUpdateNotifier {
     private wsUrl;

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 */
@@ -199,5 +201,19 @@ export declare class SyncedDb implements I_SyncedDb {
     private handleServerUpdate;
     private handleServerItemUpdate;
     private getNewFieldsFromServer;
+    /**
+     * Merge local dirty item with server delta.
+     *
+     * Delta updates only contain fields that were ACTUALLY changed on the server.
+     * We apply ALL delta fields because:
+     * - Deltas represent specific server-side changes
+     * - Local dirty status indicates the object has changes, but not WHICH fields
+     * - Server delta fields are by definition different from what client had
+     * - Local dirty changes will be sent on next sync and can overwrite if needed
+     *
+     * This approach ensures real-time updates are reflected immediately while
+     * local dirty changes are preserved in Dexie for sync.
+     */
+    private mergeLocalWithDelta;
     private handleServerItemDelete;
 }

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) {
@@ -1585,22 +1580,8 @@ class SyncedDb {
     if (!this.collections.has(collectionName))
       return;
     switch (payload.operation) {
-      case "insert":
-      case "update": {
-        if (this.onFindNewerCall) {
-          try {
-            this.onFindNewerCall({
-              collection: collectionName,
-              fromTimestamp: 0,
-              query: { _id: payload._id },
-              timestamp: new Date
-            });
-          } catch (err) {
-            console.error("onFindNewerCall callback failed:", err);
-          }
-        }
-        const items = await this.restInterface.findNewer(collectionName, 0, { _id: payload._id });
-        const serverItem = items[0];
+      case "insert": {
+        const serverItem = payload.data;
         if (serverItem) {
           await this.handleServerItemUpdate(collectionName, serverItem);
           if (serverItem._ts) {
@@ -1609,18 +1590,61 @@ class SyncedDb {
         }
         break;
       }
-      case "delete": {
-        await this.handleServerItemDelete(collectionName, payload._id);
-        await this.broadcastMetaUpdate(collectionName, Date.now());
+      case "update": {
+        const deltaData = payload.data;
+        if (deltaData && deltaData._id) {
+          const localItem = await this.dexieDb.getById(collectionName, deltaData._id);
+          if (localItem) {
+            await this.handleServerItemUpdate(collectionName, deltaData);
+            if (deltaData._ts) {
+              await this.broadcastMetaUpdate(collectionName, deltaData._ts);
+            }
+          } else {
+            const items = await this.restInterface.findNewer(collectionName, 0, { _id: deltaData._id });
+            const fullItem = items[0];
+            if (fullItem) {
+              await this.handleServerItemUpdate(collectionName, fullItem);
+              if (fullItem._ts) {
+                await this.broadcastMetaUpdate(collectionName, fullItem._ts);
+              }
+            }
+          }
+        }
         break;
       }
-      case "updateMany":
-      case "deleteMany": {
-        await this.syncSingleCollection(collectionName);
+      case "delete": {
+        const deleteData = payload.data;
+        await this.handleServerItemDelete(collectionName, deleteData._id);
+        await this.broadcastMetaUpdate(collectionName, Date.now());
         break;
       }
       case "batch": {
-        await this.syncSingleCollection(collectionName);
+        for (const item of payload.data) {
+          if (item.operation === "insert") {
+            const serverItem = item.doc;
+            if (serverItem) {
+              await this.handleServerItemUpdate(collectionName, serverItem);
+            }
+          } else if (item.operation === "update") {
+            const deltaData = item.doc;
+            if (deltaData && deltaData._id) {
+              const localItem = await this.dexieDb.getById(collectionName, deltaData._id);
+              if (localItem) {
+                await this.handleServerItemUpdate(collectionName, deltaData);
+              } else {
+                const items = await this.restInterface.findNewer(collectionName, 0, { _id: deltaData._id });
+                const fullItem = items[0];
+                if (fullItem) {
+                  await this.handleServerItemUpdate(collectionName, fullItem);
+                }
+              }
+            }
+          } else if (item.operation === "delete") {
+            const deleteData = item.doc;
+            await this.handleServerItemDelete(collectionName, deleteData._id);
+          }
+        }
+        await this.broadcastMetaUpdate(collectionName, Date.now());
         break;
       }
     }
@@ -1633,10 +1657,9 @@ class SyncedDb {
     if (hasPendingChanges) {
       const currentMemItem = this.inMemDb.getById(collectionName, serverItem._id);
       if (currentMemItem) {
-        const config = this.collections.get(collectionName);
-        const resolved = this.resolveCollectionConflict(collectionName, config, currentMemItem, serverItem, "serverUpdate_pendingChanges");
-        if (!resolved._deleted) {
-          this.inMemDb.save(collectionName, serverItem._id, this.stripLocalFields(resolved));
+        const merged = this.mergeLocalWithDelta(currentMemItem, serverItem);
+        if (!merged._deleted) {
+          this.inMemDb.save(collectionName, serverItem._id, this.stripLocalFields(merged));
         }
         pendingChange.data = {
           ...pendingChange.data,
@@ -1655,14 +1678,13 @@ class SyncedDb {
         return;
       }
       if (localItem._dirty) {
-        const config = this.collections.get(collectionName);
-        const resolved = this.resolveCollectionConflict(collectionName, config, localItem, serverItem, "serverUpdate_dirtyLocal");
+        const merged = this.mergeLocalWithDelta(localItem, serverItem);
         await this.dexieDb.save(collectionName, serverItem._id, {
-          ...resolved,
+          ...merged,
           _dirty: true
         });
-        if (!resolved._deleted) {
-          this.inMemDb.save(collectionName, serverItem._id, this.stripLocalFields(resolved));
+        if (!merged._deleted) {
+          this.inMemDb.save(collectionName, serverItem._id, this.stripLocalFields(merged));
         }
       } else {
         await this.dexieDb.save(collectionName, serverItem._id, {
@@ -1694,6 +1716,16 @@ class SyncedDb {
     }
     return newFields;
   }
+  mergeLocalWithDelta(local, delta) {
+    const result = { ...local };
+    for (const key of Object.keys(delta)) {
+      if (key === "_id" || key === "_dirty" || key === "_localChangedAt") {
+        continue;
+      }
+      result[key] = delta[key];
+    }
+    return result;
+  }
   async handleServerItemDelete(collectionName, id) {
     const localItem = await this.dexieDb.getById(collectionName, id);
     if (!localItem)
@@ -1731,7 +1763,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 +1925,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 +1935,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);
@@ -4409,7 +4427,7 @@ class Ebus2ProxyServerUpdateNotifier {
     this.reconnectAttempt = 0;
     this.currentReconnectDelay = this.reconnectDelayMs;
     for (const collection of this.collections) {
-      const channel = `dbrev/${this.dbName}/${collection}`;
+      const channel = `db/${this.dbName}/${collection}`;
       this.sendSubscribe(channel);
     }
     this.startPingInterval();
@@ -4469,7 +4487,7 @@ class Ebus2ProxyServerUpdateNotifier {
     }
   }
   handleChannelMessage(message) {
-    if (!message.channel.startsWith("dbrev/")) {
+    if (!message.channel.startsWith("db/")) {
       return;
     }
     const payload = message.data;

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/dist/types/I_ServerUpdateNotifier.d.ts

@@ -1,8 +1,9 @@
-import type { PublishRevsPayload } from "./PublishRevsPayload";
+import type { PublishDataPayload } from "./PublishRevsPayload";
 /**
  * Callback za prejemanje server update notifikacij
+ * Payload now contains actual data, not just metadata
  */
-export type ServerUpdateCallback = (payload: PublishRevsPayload) => void;
+export type ServerUpdateCallback = (payload: PublishDataPayload) => void;
 /**
  * Connection lifecycle callbacks for I_ServerUpdateNotifier
  */

package/dist/types/I_SyncedDb.d.ts

@@ -139,8 +139,8 @@ export interface LocalstorageWriteResultInfo {
  * Callback payload for WebSocket notification received
  */
 export interface WsNotificationInfo {
-    /** The notification payload */
-    payload: import("./PublishRevsPayload").PublishRevsPayload;
+    /** The notification payload - contains actual data changes */
+    payload: import("./PublishRevsPayload").PublishDataPayload;
     /** Timestamp when notification was received */
     timestamp: Date;
 }

package/dist/types/PublishRevsPayload.d.ts

@@ -52,14 +52,44 @@ export type PublishRevsSpec = {
     payload: PublishRevsPayload;
     user?: string;
 };
+/**
+ * Payload for data-carrying notifications (db/ channel)
+ * Unlike PublishRevsPayload which only contains metadata,
+ * this contains the actual data changes.
+ */
+export type PublishDataPayloadBase = {
+    db: string;
+    collection: string;
+};
+export type PublishDataPayloadInsert = PublishDataPayloadBase & {
+    operation: 'insert';
+    data: any;
+};
+export type PublishDataPayloadUpdate = PublishDataPayloadBase & {
+    operation: 'update';
+    data: any;
+};
+export type PublishDataPayloadDelete = PublishDataPayloadBase & {
+    operation: 'delete';
+    data: {
+        _id: Id;
+    };
+};
+export type PublishDataPayloadBatch = PublishDataPayloadBase & {
+    operation: 'batch';
+    data: Array<{
+        operation: 'insert' | 'update' | 'delete';
+        doc: any;
+    }>;
+};
+/**
+ * Notifikacija serverja s podatki o spremembah
+ * Vsebuje dejanske podatke, ne samo metapodatke
+ */
+export type PublishDataPayload = PublishDataPayloadInsert | PublishDataPayloadUpdate | PublishDataPayloadDelete | PublishDataPayloadBatch;
 export type PublishDataSpec = {
     channel: string;
-    payload: {
-        db: string;
-        collection: string;
-        operation: PublishableOperation;
-        data: any;
-    };
+    payload: PublishDataPayload;
     user?: string;
 };
 export type PublishSpec = PublishDataSpec | PublishRevsSpec;

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 export type { Id, Entity, IdOrEntity, DbEntity, LocalDbEntity } from "./DbEntity";
-export type { PublishableOperation, PublishRevsPayloadInsert, PublishRevsPayloadUpdate, PublishRevsPayloadDelete, PublishRevsPayloadUpdateMany, PublishRevsPayloadDeleteMany, PublishRevsPayloadBatchItem, PublishRevsPayloadBatch, PublishRevsPayload, PublishRevsSpec, PublishDataSpec, PublishSpec, } from "./PublishRevsPayload";
+export type { PublishableOperation, PublishRevsPayloadInsert, PublishRevsPayloadUpdate, PublishRevsPayloadDelete, PublishRevsPayloadUpdateMany, PublishRevsPayloadDeleteMany, PublishRevsPayloadBatchItem, PublishRevsPayloadBatch, PublishRevsPayload, PublishRevsSpec, PublishDataPayloadBase, PublishDataPayloadInsert, PublishDataPayloadUpdate, PublishDataPayloadDelete, PublishDataPayloadBatch, PublishDataPayload, PublishDataSpec, PublishSpec, } from "./PublishRevsPayload";
 export type { Obj, QuerySpec, Projection, QueryOpts, KeyOf, InsertKeyOf, InsertSpec, UpdateSpec, BatchSpec, UpsertOptions, GetNewerSpec, I_RestInterface as RestInterface, } from "./I_RestInterface";
 export type { I_InMemDb as InMemDb } from "./I_InMemDb";
 export type { I_DexieDb as DexieDb, SyncMeta } from "./I_DexieDb";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -27,7 +27,6 @@
   "devDependencies": {
     "@types/bun": "latest",
     "bson": "^7.0.0",
-    "cry-db": "^2.4.15",
     "cry-ebus-proxy": "^1.0.3",
     "dexie": "^4.2.1",
     "fake-indexeddb": "^6.2.5",
@@ -35,6 +34,7 @@
     "vitest": "^4.0.17"
   },
   "dependencies": {
+    "cry-db": "^2.4.16",
     "cry-helpers": "^2.1.187",
     "msgpackr": "^1.11.8",
     "notepack": "^0.0.2",