cry-synced-db-client 0.1.71 → 0.1.72

package/dist/index.js

@@ -2166,11 +2166,12 @@ class SyncEngine {
       const allUpdatedIds = {};
       for (const [collectionName, config] of configMap) {
         const serverData = allServerData[collectionName] || [];
+        delete allServerData[collectionName];
         receivedCount += serverData.length;
         collectionStats[collectionName] = {
           receivedCount: serverData.length,
           sentCount: 0,
-          receivedItems: serverData
+          receivedItems: []
         };
         const stats = await this.processIncomingServerData(collectionName, config, serverData);
         conflictsResolved += stats.conflictsResolved;
@@ -2420,60 +2421,69 @@ class SyncEngine {
     }
     return { updatedIds: result.updatedIds };
   }
+  static SYNC_BATCH_SIZE = 200;
   async processIncomingServerData(collectionName, config, serverData) {
     if (serverData.length === 0) {
       return { conflictsResolved: 0, maxTs: undefined, updatedIds: [] };
     }
     let maxTs;
     let conflictsResolved = 0;
-    const serverIds = serverData.map((item) => item._id);
-    const localItems = await this.dexieDb.getByIds(collectionName, serverIds);
-    const dirtyChangesMap = await this.dexieDb.getDirtyChangesBatch(collectionName, serverIds);
-    const dexieBatch = [];
-    const inMemSaveBatch = [];
-    const inMemDeleteIds = [];
-    for (let i = 0;i < serverData.length; i++) {
-      const serverItem = serverData[i];
-      const localItem = localItems[i];
-      const dirtyChange = dirtyChangesMap.get(String(serverItem._id));
-      if (serverItem._ts) {
-        if (!maxTs || this.compareTimestamps(serverItem._ts, maxTs) > 0) {
-          maxTs = serverItem._ts;
+    const allUpdatedIds = [];
+    const BATCH = SyncEngine.SYNC_BATCH_SIZE;
+    for (let offset = 0;offset < serverData.length; offset += BATCH) {
+      const chunk = serverData.slice(offset, offset + BATCH);
+      const chunkIds = chunk.map((item) => item._id);
+      const localItems = await this.dexieDb.getByIds(collectionName, chunkIds);
+      const dirtyChangesMap = await this.dexieDb.getDirtyChangesBatch(collectionName, chunkIds);
+      const dexieBatch = [];
+      const inMemSaveBatch = [];
+      const inMemDeleteIds = [];
+      for (let i = 0;i < chunk.length; i++) {
+        const serverItem = chunk[i];
+        const localItem = localItems[i];
+        const dirtyChange = dirtyChangesMap.get(String(serverItem._id));
+        if (serverItem._ts) {
+          if (!maxTs || this.compareTimestamps(serverItem._ts, maxTs) > 0) {
+            maxTs = serverItem._ts;
+          }
         }
-      }
-      if (localItem) {
-        if (dirtyChange) {
-          conflictsResolved++;
-          const resolved = this.resolveCollectionConflict(collectionName, config, localItem, serverItem, "sync");
-          dexieBatch.push(resolved);
-          if (!resolved._deleted && !resolved._archived) {
-            inMemSaveBatch.push(resolved);
+        if (localItem) {
+          if (dirtyChange) {
+            conflictsResolved++;
+            const resolved = this.resolveCollectionConflict(collectionName, config, localItem, serverItem, "sync");
+            dexieBatch.push(resolved);
+            if (!resolved._deleted && !resolved._archived) {
+              inMemSaveBatch.push(resolved);
+            } else {
+              inMemDeleteIds.push(serverItem._id);
+            }
           } else {
-            inMemDeleteIds.push(serverItem._id);
+            dexieBatch.push(serverItem);
+            if (!serverItem._deleted && !serverItem._archived) {
+              inMemSaveBatch.push(serverItem);
+            } else {
+              inMemDeleteIds.push(serverItem._id);
+            }
           }
         } else {
           dexieBatch.push(serverItem);
           if (!serverItem._deleted && !serverItem._archived) {
             inMemSaveBatch.push(serverItem);
-          } else {
-            inMemDeleteIds.push(serverItem._id);
           }
         }
-      } else {
-        dexieBatch.push(serverItem);
-        if (!serverItem._deleted && !serverItem._archived) {
-          inMemSaveBatch.push(serverItem);
-        }
       }
-    }
-    if (dexieBatch.length > 0) {
-      await this.dexieDb.saveMany(collectionName, dexieBatch);
-    }
-    if (inMemSaveBatch.length > 0) {
-      this.deps.writeToInMemBatch(collectionName, inMemSaveBatch, "upsert");
-    }
-    if (inMemDeleteIds.length > 0) {
-      this.deps.writeToInMemBatch(collectionName, inMemDeleteIds.map((id) => ({ _id: id })), "delete");
+      if (dexieBatch.length > 0) {
+        await this.dexieDb.saveMany(collectionName, dexieBatch);
+      }
+      if (inMemSaveBatch.length > 0) {
+        this.deps.writeToInMemBatch(collectionName, inMemSaveBatch, "upsert");
+      }
+      if (inMemDeleteIds.length > 0) {
+        this.deps.writeToInMemBatch(collectionName, inMemDeleteIds.map((id) => ({ _id: id })), "delete");
+      }
+      for (const id of chunkIds) {
+        allUpdatedIds.push(String(id));
+      }
     }
     if (maxTs) {
       await this.dexieDb.setSyncMeta(collectionName, maxTs);
@@ -2483,8 +2493,7 @@ class SyncEngine {
         lastSyncTs: maxTs
       });
     }
-    const updatedIds = serverIds.map((id) => String(id));
-    return { conflictsResolved, maxTs, updatedIds };
+    return { conflictsResolved, maxTs, updatedIds: allUpdatedIds };
   }
   compareTimestamps(a, b) {
     const aT = typeof a === "object" && "t" in a ? a.t : 0;
@@ -3251,8 +3260,15 @@ class SyncedDb {
     await this.pendingChanges.recoverPendingWrites();
     for (const [name] of this.collections) {
       const data = await this.dexieDb.getAll(name);
-      const activeData = data.filter((item) => !item._deleted && !item._archived);
-      this.inMemManager.initCollection(name, activeData);
+      let writeIdx = 0;
+      for (let i = 0;i < data.length; i++) {
+        const item = data[i];
+        if (!item._deleted && !item._archived) {
+          data[writeIdx++] = item;
+        }
+      }
+      data.length = writeIdx;
+      this.inMemManager.initCollection(name, data);
       const meta = await this.dexieDb.getSyncMeta(name);
       if (meta) {
         this.syncMetaCache.set(name, meta);

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

@@ -38,6 +38,8 @@ export declare class SyncEngine implements I_SyncEngine {
     processCollectionServerData(collectionName: string, serverData: LocalDbEntity[]): Promise<{
         updatedIds: string[];
     }>;
+    /** Max items to process per batch in processIncomingServerData */
+    private static readonly SYNC_BATCH_SIZE;
     private processIncomingServerData;
     private compareTimestamps;
     private resolveCollectionConflict;

package/dist/src/types/I_SyncedDb.d.ts

@@ -206,7 +206,7 @@ export interface CollectionSyncStats {
     receivedCount: number;
     /** Number of dirty items sent to server for this collection */
     sentCount: number;
-    /** The actual items received from server (for debugging/logging) */
+    /** @deprecated Use receivedCount instead. Will be empty array in future streaming mode. */
     receivedItems: LocalDbEntity[];
 }
 /**

package/package.json

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