cry-synced-db-client 0.1.33 → 0.1.34

package/dist/index.js

@@ -1583,7 +1583,7 @@ class SyncedDb {
       case "insert": {
         const serverItem = payload.data;
         if (serverItem) {
-          await this.handleServerItemUpdate(collectionName, serverItem);
+          await this.handleServerItemInsert(collectionName, serverItem);
           if (serverItem._ts) {
             await this.broadcastMetaUpdate(collectionName, serverItem._ts);
           }
@@ -1595,7 +1595,7 @@ class SyncedDb {
         if (deltaData && deltaData._id) {
           const localItem = await this.dexieDb.getById(collectionName, deltaData._id);
           if (localItem) {
-            await this.handleServerItemUpdate(collectionName, deltaData);
+            await this.handleServerItemUpdate(collectionName, localItem, deltaData);
             if (deltaData._ts) {
               await this.broadcastMetaUpdate(collectionName, deltaData._ts);
             }
@@ -1603,7 +1603,7 @@ class SyncedDb {
             const items = await this.restInterface.findNewer(collectionName, 0, { _id: deltaData._id });
             const fullItem = items[0];
             if (fullItem) {
-              await this.handleServerItemUpdate(collectionName, fullItem);
+              await this.handleServerItemInsert(collectionName, fullItem);
               if (fullItem._ts) {
                 await this.broadcastMetaUpdate(collectionName, fullItem._ts);
               }
@@ -1623,19 +1623,19 @@ class SyncedDb {
           if (item.operation === "insert") {
             const serverItem = item.data;
             if (serverItem) {
-              await this.handleServerItemUpdate(collectionName, serverItem);
+              await this.handleServerItemInsert(collectionName, serverItem);
             }
           } else if (item.operation === "update") {
             const deltaData = item.data;
             if (deltaData && deltaData._id) {
               const localItem = await this.dexieDb.getById(collectionName, deltaData._id);
               if (localItem) {
-                await this.handleServerItemUpdate(collectionName, deltaData);
+                await this.handleServerItemUpdate(collectionName, localItem, deltaData);
               } else {
                 const items = await this.restInterface.findNewer(collectionName, 0, { _id: deltaData._id });
                 const fullItem = items[0];
                 if (fullItem) {
-                  await this.handleServerItemUpdate(collectionName, fullItem);
+                  await this.handleServerItemInsert(collectionName, fullItem);
                 }
               }
             }
@@ -1651,61 +1651,69 @@ class SyncedDb {
       }
     }
   }
-  async handleServerItemUpdate(collectionName, serverItem) {
+  async handleServerItemInsert(collectionName, serverItem) {
     const localItem = await this.dexieDb.getById(collectionName, serverItem._id);
-    const pendingKey = this.getPendingKey(collectionName, serverItem._id);
+    if (localItem) {
+      await this.dexieDb.save(collectionName, serverItem._id, {
+        _rev: serverItem._rev,
+        _ts: serverItem._ts,
+        _dirty: false
+      });
+    } else {
+      await this.dexieDb.insert(collectionName, {
+        ...serverItem,
+        _dirty: false
+      });
+      if (!serverItem._deleted) {
+        this.inMemDb.insert(collectionName, this.stripLocalFields(serverItem));
+      }
+    }
+  }
+  async handleServerItemUpdate(collectionName, localItem, serverDelta) {
+    const isLoopback = serverDelta._lastUpdaterId === this.updaterId && serverDelta._rev !== undefined && localItem._rev !== undefined && serverDelta._rev === localItem._rev + 1;
+    if (isLoopback) {
+      await this.dexieDb.save(collectionName, serverDelta._id, {
+        _rev: serverDelta._rev,
+        _ts: serverDelta._ts,
+        _dirty: false
+      });
+      return;
+    }
+    const pendingKey = this.getPendingKey(collectionName, serverDelta._id);
     const pendingChange = this.pendingChanges.get(pendingKey);
-    const hasPendingChanges = !!pendingChange;
-    if (hasPendingChanges) {
-      const currentMemItem = this.inMemDb.getById(collectionName, serverItem._id);
+    if (pendingChange) {
+      const currentMemItem = this.inMemDb.getById(collectionName, serverDelta._id);
       if (currentMemItem) {
-        const merged = this.mergeLocalWithDelta(currentMemItem, serverItem);
+        const merged = this.mergeLocalWithDelta(currentMemItem, serverDelta);
         if (!merged._deleted) {
-          this.inMemDb.save(collectionName, serverItem._id, this.stripLocalFields(merged));
+          this.inMemDb.save(collectionName, serverDelta._id, this.stripLocalFields(merged));
         }
         pendingChange.data = {
           ...pendingChange.data,
-          ...this.getNewFieldsFromServer(currentMemItem, serverItem)
+          ...this.getNewFieldsFromServer(currentMemItem, serverDelta)
         };
       }
       return;
     }
-    if (localItem) {
-      if (serverItem._lastUpdaterId === this.updaterId && serverItem._rev !== undefined && localItem._rev !== undefined && serverItem._rev === localItem._rev + 1) {
-        await this.dexieDb.save(collectionName, serverItem._id, {
-          _rev: serverItem._rev,
-          _ts: serverItem._ts,
-          _dirty: false
-        });
-        return;
-      }
-      if (localItem._dirty) {
-        const merged = this.mergeLocalWithDelta(localItem, serverItem);
-        await this.dexieDb.save(collectionName, serverItem._id, {
-          ...merged,
-          _dirty: true
-        });
-        if (!merged._deleted) {
-          this.inMemDb.save(collectionName, serverItem._id, this.stripLocalFields(merged));
-        }
-      } else {
-        await this.dexieDb.save(collectionName, serverItem._id, {
-          ...serverItem,
-          _dirty: false
-        });
-        if (!serverItem._deleted) {
-          this.inMemDb.save(collectionName, serverItem._id, this.stripLocalFields(serverItem));
-        } else {
-          this.inMemDb.deleteOne(collectionName, serverItem._id);
-        }
+    if (localItem._dirty) {
+      const merged = this.mergeLocalWithDelta(localItem, serverDelta);
+      await this.dexieDb.save(collectionName, serverDelta._id, {
+        ...merged,
+        _dirty: true
+      });
+      if (!merged._deleted) {
+        this.inMemDb.save(collectionName, serverDelta._id, this.stripLocalFields(merged));
       }
     } else {
-      await this.dexieDb.insert(collectionName, {
-        ...serverItem,
+      const merged = this.mergeLocalWithDelta(localItem, serverDelta);
+      await this.dexieDb.save(collectionName, serverDelta._id, {
+        ...merged,
         _dirty: false
       });
-      if (!serverItem._deleted) {
-        this.inMemDb.insert(collectionName, this.stripLocalFields(serverItem));
+      if (!merged._deleted) {
+        this.inMemDb.save(collectionName, serverDelta._id, this.stripLocalFields(merged));
+      } else {
+        this.inMemDb.deleteOne(collectionName, serverDelta._id);
       }
     }
   }

package/dist/{db → src/db}/SyncedDb.d.ts

@@ -199,6 +199,16 @@ export declare class SyncedDb implements I_SyncedDb {
      */
     private handleCrossTabMetaUpdate;
     private handleServerUpdate;
+    /**
+     * Handle server insert notification.
+     * Insert notifications contain full object data.
+     */
+    private handleServerItemInsert;
+    /**
+     * Handle server update notification (delta).
+     * Update notifications contain only changed fields.
+     * Caller must provide the existing local item.
+     */
     private handleServerItemUpdate;
     private getNewFieldsFromServer;
     /**

package/dist/src/debug/insertOneNote.d.ts

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

package/dist/test/testConstants.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Test constants for faster test execution
+ */
+/** Debounce time for tests (ms) - much shorter than production default of 1000ms */
+export declare const TEST_DEBOUNCE_MS = 5;
+/** Helper to get wait time for debounce (1.2x debounce time) */
+export declare const getDebounceWaitMs: (debounceMs?: number) => number;
+/** REST endpoint for real-life proxy tests */
+export declare const REST_ENDPOINT = "http://localhost:3002";
+/** Test tenant name for RestProxy tests */
+export declare const TEST_TENANT = "test";
+/** API key for RestProxy tests */
+export declare const API_KEY = "1234";
+/** WebSocket URL for ebus-proxy tests */
+export declare const EBUS_PROXY_WS_URL = "ws://localhost:3033";
+/** API key for ebus-proxy tests */
+export declare const EBUS_PROXY_API_KEY = "123";

package/package.json

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