cry-synced-db-client 2.0.11 → 2.0.14

package/dist/index.js

@@ -3325,20 +3325,35 @@ var SyncEngine = class {
             async (collection, items, specId) => {
               if (specId !== void 0) {
                 if (specId.endsWith(":exit")) {
-                  const exitItems = items.filter((it) => it._evictIds);
-                  if (exitItems.length > 0) {
-                    const exitIds = exitItems.map((it) => String(it._id));
-                    await this.dexieDb.deleteMany(collection, exitIds);
+                  const exitItems = items.filter((item) => item._evictIds);
+                  const state2 = collectionState.get(collection);
+                  for (const exitItem of exitItems) {
+                    if (exitItem._ts && (!(state2 == null ? void 0 : state2.maxTs) || this.compareTimestamps(exitItem._ts, state2.maxTs) > 0)) {
+                      state2.maxTs = exitItem._ts;
+                    }
+                  }
+                  const exitIds = exitItems.map((item) => String(item._id));
+                  const dirtyChanges = await this.dexieDb.getDirtyChangesBatch(
+                    collection,
+                    exitIds
+                  );
+                  const evictIds = exitIds.filter((id) => !dirtyChanges.has(id));
+                  const dirtySkipped = exitIds.length - evictIds.length;
+                  if (evictIds.length > 0) {
+                    await this.dexieDb.deleteMany(collection, evictIds);
                     this.deps.writeToInMemBatch(
                       collection,
-                      exitIds.map((id) => ({ _id: id })),
+                      evictIds.map((id) => ({ _id: id })),
                       "delete",
                       { source: "incremental" }
                     );
+                  }
+                  if (exitIds.length > 0) {
                     this.callbackSafe(this.callbacks.onEviction, {
                       collection,
-                      totalEvicted: exitIds.length,
-                      totalServerEvicted: exitIds.length
+                      totalEvicted: evictIds.length,
+                      totalServerEvicted: evictIds.length,
+                      dirtySkipped
                     });
                   }
                 } else if (extras) {
@@ -3403,6 +3418,15 @@ var SyncEngine = class {
           ),
           "findNewerManyStream"
         );
+        for (const [collection, state] of collectionState) {
+          if (!state.maxTs) continue;
+          await this.dexieDb.setSyncMeta(collection, state.maxTs);
+          this.deps.setSyncMetaCache(collection, {
+            tenant: this.tenant,
+            collection,
+            lastSyncTs: state.maxTs
+          });
+        }
         for (const [name, state] of collectionState) {
           receivedCount += state.receivedCount;
           conflictsResolved += state.conflicts;
@@ -4111,28 +4135,6 @@ var SyncEngine = class {
       if (collectionSentCount > 0) {
         collectionSentCounts[collection] = collectionSentCount;
       }
-      let maxTs;
-      for (const arr of [inserted, updated, deleted]) {
-        for (const item of arr) {
-          if (item._ts) {
-            if (!maxTs || this.compareTimestamps(item._ts, maxTs) > 0) {
-              maxTs = item._ts;
-            }
-          }
-        }
-      }
-      if (maxTs) {
-        const currentMeta = this.deps.getSyncMetaCache().get(collection);
-        const currentTs = currentMeta == null ? void 0 : currentMeta.lastSyncTs;
-        if (!currentTs || this.compareTimestamps(maxTs, currentTs) > 0) {
-          await this.dexieDb.setSyncMeta(collection, maxTs);
-          this.deps.setSyncMetaCache(collection, {
-            tenant: this.tenant,
-            collection,
-            lastSyncTs: maxTs
-          });
-        }
-      }
       if (errors2 && errors2.length > 0) {
         for (const e of errors2) {
           console.error(
@@ -4338,7 +4340,7 @@ var SyncEngine = class {
   async processCollectionServerData(collectionName, serverData, opts) {
     var _a;
     const config = this.collections.get(collectionName);
-    if (!config) return { updatedIds: [] };
+    if (!config) return { updatedIds: [], maxTs: void 0 };
     const source = (_a = opts == null ? void 0 : opts.source) != null ? _a : "incremental";
     const result = await this.processIncomingServerData(
       collectionName,
@@ -4349,7 +4351,7 @@ var SyncEngine = class {
     if (result.updatedIds.length > 0) {
       this.deps.broadcastUpdates({ [collectionName]: result.updatedIds });
     }
-    return { updatedIds: result.updatedIds };
+    return { updatedIds: result.updatedIds, maxTs: result.maxTs };
   }
   async processIncomingServerData(collectionName, config, serverData, source = "incremental") {
     if (serverData.length === 0) {
@@ -4443,14 +4445,6 @@ var SyncEngine = class {
         );
       }
     }
-    if (maxTs) {
-      await this.dexieDb.setSyncMeta(collectionName, maxTs);
-      this.deps.setSyncMetaCache(collectionName, {
-        tenant: this.tenant,
-        collection: collectionName,
-        lastSyncTs: maxTs
-      });
-    }
     return { conflictsResolved, maxTs, updatedIds: allUpdatedIds, dexieMs: totalDexieMs, inMemMs: totalInMemMs };
   }
   // ============================================================
@@ -5911,11 +5905,14 @@ var _SyncedDb = class _SyncedDb {
       if (!data || data.length === 0) continue;
       const source = plan.wasFirstTime ? "initial" : "incremental";
       try {
-        await this.syncEngine.processCollectionServerData(
+        const result = await this.syncEngine.processCollectionServerData(
           plan.spec.name,
           data,
           { source }
         );
+        if (plan.wasFirstTime) {
+          await this._persistInitialCollectionCursor(plan.spec.name, result.maxTs);
+        }
       } catch (err) {
         console.error(
           `[SyncedDb] addCollectionsToSync: processCollectionServerData failed for "${plan.spec.name}":`,
@@ -5954,9 +5951,12 @@ var _SyncedDb = class _SyncedDb {
     if (!spec.writeOnly && this.connectionManager.canSync()) {
       const rawQuery = (_a = spec.syncConfig) == null ? void 0 : _a.query;
       const query = typeof rawQuery === "function" ? rawQuery() : rawQuery;
-      await this.syncCollectionForFind(spec.name, query, {
-        returnDeleted: true
-      });
+      await this.syncCollectionForFind(
+        spec.name,
+        query,
+        { returnDeleted: true },
+        true
+      );
     }
   }
   /**
@@ -6586,7 +6586,7 @@ var _SyncedDb = class _SyncedDb {
    * Sync a collection from server before querying locally.
    * Used when returnDeleted/returnArchived is specified on find/findOne.
    */
-  async syncCollectionForFind(collection, query, opts) {
+  async syncCollectionForFind(collection, query, opts, checkpointInitialCollection = false) {
     const meta = this.syncMetaCache.get(collection);
     const timestamp = (meta == null ? void 0 : meta.lastSyncTs) || 0;
     try {
@@ -6604,15 +6604,28 @@ var _SyncedDb = class _SyncedDb {
       );
       if (serverData.length > 0) {
         const source = timestamp === 0 ? "initial" : "incremental";
-        await this.syncEngine.processCollectionServerData(
+        const result = await this.syncEngine.processCollectionServerData(
           collection,
           serverData,
           { source }
         );
+        if (checkpointInitialCollection && timestamp === 0) {
+          await this._persistInitialCollectionCursor(collection, result.maxTs);
+        }
       }
     } catch (e) {
     }
   }
+  async _persistInitialCollectionCursor(collection, maxTs) {
+    var _a;
+    if (!maxTs || ((_a = this.syncMetaCache.get(collection)) == null ? void 0 : _a.lastSyncTs)) return;
+    await this.dexieDb.setSyncMeta(collection, maxTs);
+    this.syncMetaCache.set(collection, {
+      tenant: this.tenant,
+      collection,
+      lastSyncTs: maxTs
+    });
+  }
   /**
    * Fire-and-forget background query to server.
    * Uses timestamp 0 to fetch all matching items (not just newer than
@@ -8641,30 +8654,15 @@ var DexieDb = class extends Dexie {
   async saveMany(collection, items) {
     if (items.length === 0) return;
     const table = this.getTable(collection);
-    const valid = [];
     for (const item of items) {
       this.ensureStringId(item);
       if (typeof item._id !== "string" || item._id.length === 0) {
-        console.error(
-          `[DexieDb] DexieDb.saveMany: skipping item with invalid _id in "${collection}"`,
-          { _id: item._id, _idType: typeof item._id, item }
+        throw new Error(
+          `[DexieDb] DexieDb.saveMany: invalid _id in "${collection}": ${String(item._id)}`
         );
-        continue;
       }
-      valid.push(item);
-    }
-    if (valid.length === 0) return;
-    try {
-      await table.bulkPut(valid);
-    } catch (err) {
-      const ids = valid.map((it) => String(it._id));
-      console.error(
-        `[DexieDb] DexieDb.saveMany: bulkPut failed for "${collection}" (${valid.length} items):`,
-        err,
-        "_ids:",
-        ids
-      );
     }
+    await table.bulkPut(items);
   }
   async deleteOne(collection, id) {
     const table = this.getTable(collection);
@@ -9435,36 +9433,45 @@ function readStringJS(length) {
     if ((byte1 & 128) === 0) {
       units.push(byte1);
     } else if ((byte1 & 224) === 192) {
-      const byte2 = src[position++] & 63;
-      const codePoint = (byte1 & 31) << 6 | byte2;
-      if (codePoint < 128) {
+      if (byte1 < 194 || position >= end || (src[position] & 192) !== 128) {
         units.push(65533);
       } else {
-        units.push(codePoint);
+        const byte2 = src[position++] & 63;
+        units.push((byte1 & 31) << 6 | byte2);
       }
     } else if ((byte1 & 240) === 224) {
-      const byte2 = src[position++] & 63;
-      const byte3 = src[position++] & 63;
-      const codePoint = (byte1 & 31) << 12 | byte2 << 6 | byte3;
-      if (codePoint < 2048 || codePoint >= 55296 && codePoint <= 57343) {
+      const byte2 = position < end ? src[position] : 0;
+      if (position >= end || (byte2 & 192) !== 128 || byte1 === 224 && byte2 < 160 || byte1 === 237 && byte2 >= 160) {
         units.push(65533);
       } else {
-        units.push(codePoint);
+        position++;
+        if (position >= end || (src[position] & 192) !== 128) {
+          units.push(65533);
+        } else {
+          const byte3 = src[position++] & 63;
+          units.push((byte1 & 31) << 12 | (byte2 & 63) << 6 | byte3);
+        }
       }
     } else if ((byte1 & 248) === 240) {
-      const byte2 = src[position++] & 63;
-      const byte3 = src[position++] & 63;
-      const byte4 = src[position++] & 63;
-      let unit = (byte1 & 7) << 18 | byte2 << 12 | byte3 << 6 | byte4;
-      if (unit < 65536 || unit > 1114111) {
+      const byte2 = position < end ? src[position] : 0;
+      if (byte1 > 244 || position >= end || (byte2 & 192) !== 128 || byte1 === 240 && byte2 < 144 || byte1 === 244 && byte2 >= 144) {
         units.push(65533);
-      } else if (unit > 65535) {
-        unit -= 65536;
-        units.push(unit >>> 10 & 1023 | 55296);
-        unit = 56320 | unit & 1023;
-        units.push(unit);
       } else {
-        units.push(unit);
+        position++;
+        if (position >= end || (src[position] & 192) !== 128) {
+          units.push(65533);
+        } else {
+          const byte3 = src[position++] & 63;
+          if (position >= end || (src[position] & 192) !== 128) {
+            units.push(65533);
+          } else {
+            const byte4 = src[position++] & 63;
+            let unit = (byte1 & 7) << 18 | (byte2 & 63) << 12 | byte3 << 6 | byte4;
+            unit -= 65536;
+            units.push(unit >>> 10 & 1023 | 55296);
+            units.push(56320 | unit & 1023);
+          }
+        }
       }
     } else {
       units.push(65533);

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

@@ -234,6 +234,7 @@ export declare class SyncedDb implements I_SyncedDb {
      * Used when returnDeleted/returnArchived is specified on find/findOne.
      */
     private syncCollectionForFind;
+    private _persistInitialCollectionCursor;
     /**
      * Fire-and-forget background query to server.
      * Uses timestamp 0 to fetch all matching items (not just newer than

package/dist/src/db/sync/SyncEngine.d.ts

@@ -6,6 +6,7 @@
  * - Processing incoming data with conflict resolution
  * - Uploading dirty items to server
  */
+import type { Timestamp } from "mongodb";
 import type { LocalDbEntity } from "../../types/DbEntity";
 import type { SyncSource } from "../../types/I_InMemDb";
 import type { I_SyncEngine, SyncEngineConfig, SyncExtras } from "../types/managers";
@@ -118,6 +119,7 @@ export declare class SyncEngine implements I_SyncEngine {
         source?: SyncSource;
     }): Promise<{
         updatedIds: string[];
+        maxTs: Timestamp | undefined;
     }>;
     private readonly syncBatchSize;
     private processIncomingServerData;

package/dist/src/db/types/managers.d.ts

@@ -347,6 +347,7 @@ export interface I_SyncEngine {
         source?: SyncSource;
     }): Promise<{
         updatedIds: string[];
+        maxTs: import("mongodb").Timestamp | undefined;
     }>;
 }
 export interface ServerUpdateHandlerCallbacks {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cry-synced-db-client",
-  "version": "2.0.11",
+  "version": "2.0.14",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -38,9 +38,9 @@
     "vitest": "^4.1.10"
   },
   "dependencies": {
-    "cry-db": "^2.6.3",
-    "cry-helpers": "^2.1.207",
-    "msgpackr": "^2.0.4",
+    "cry-db": "^2.6.4",
+    "cry-helpers": "^2.1.208",
+    "msgpackr": "^2.0.5",
     "superjson": "^2.2.6"
   },
   "peerDependencies": {