cry-synced-db-client 0.1.67 → 0.1.69

package/dist/index.js

@@ -2032,6 +2032,7 @@ class SyncEngine {
     let receivedCount = 0;
     let sentCount = 0;
     let conflictsResolved = 0;
+    const collectionStats = {};
     try {
       this.deps.cancelRestUploadTimer();
       await this.deps.awaitRestUpload();
@@ -2069,6 +2070,11 @@ class SyncEngine {
       for (const [collectionName, config] of configMap) {
         const serverData = allServerData[collectionName] || [];
         receivedCount += serverData.length;
+        collectionStats[collectionName] = {
+          receivedCount: serverData.length,
+          sentCount: 0,
+          receivedItems: serverData
+        };
         const stats = await this.processIncomingServerData(collectionName, config, serverData);
         conflictsResolved += stats.conflictsResolved;
         if (stats.updatedIds.length > 0) {
@@ -2080,13 +2086,25 @@ class SyncEngine {
       }
       const uploadStats = await this.uploadDirtyItems(calledFrom);
       sentCount = uploadStats.sentCount;
+      for (const [collectionName, stats] of Object.entries(uploadStats.collectionSentCounts || {})) {
+        if (collectionStats[collectionName]) {
+          collectionStats[collectionName].sentCount = stats;
+        } else {
+          collectionStats[collectionName] = {
+            receivedCount: 0,
+            sentCount: stats,
+            receivedItems: []
+          };
+        }
+      }
       this.callOnSync({
         durationMs: Date.now() - startTime,
         receivedCount,
         sentCount,
         conflictsResolved,
         success: true,
-        calledFrom
+        calledFrom,
+        collections: collectionStats
       });
     } catch (err) {
       const reason = err instanceof Error ? err.message : String(err);
@@ -2099,7 +2117,8 @@ class SyncEngine {
         conflictsResolved,
         success: false,
         error: err instanceof Error ? err : new Error(String(err)),
-        calledFrom
+        calledFrom,
+        collections: collectionStats
       });
       throw err;
     }
@@ -2158,6 +2177,7 @@ class SyncEngine {
       throw err;
     }
     let sentCount = 0;
+    const collectionSentCounts = {};
     for (const result of results) {
       const { collection, results: { inserted, updated, deleted, errors } } = result;
       const allSuccessIds = [
@@ -2168,6 +2188,7 @@ class SyncEngine {
       if (allSuccessIds.length > 0) {
         await this.dexieDb.clearDirtyChangesBatch(collection, allSuccessIds);
       }
+      let collectionSentCount = 0;
       const insertedAndUpdated = [...inserted, ...updated];
       if (insertedAndUpdated.length > 0) {
         const idsToCheck = insertedAndUpdated.map((e) => e._id);
@@ -2202,12 +2223,17 @@ class SyncEngine {
           this.deps.writeToInMemBatch(collection, inMemUpdateBatch, "upsert");
         }
         sentCount += insertedAndUpdated.length;
+        collectionSentCount += insertedAndUpdated.length;
       }
       if (deleted.length > 0) {
         const deleteIds = deleted.map((e) => e._id);
         await this.dexieDb.deleteMany(collection, deleteIds);
         this.deps.writeToInMemBatch(collection, deleteIds.map((id) => ({ _id: id })), "delete");
         sentCount += deleted.length;
+        collectionSentCount += deleted.length;
+      }
+      if (collectionSentCount > 0) {
+        collectionSentCounts[collection] = collectionSentCount;
       }
       const allItems = [...inserted, ...updated, ...deleted];
       let maxTs = undefined;
@@ -2234,7 +2260,7 @@ class SyncEngine {
         console.error(`Sync errors for ${collection}:`, errors);
       }
     }
-    return { sentCount };
+    return { sentCount, collectionSentCounts };
   }
   async uploadDirtyItemsForCollection(collection) {
     const dirtyItems = await this.dexieDb.getDirty(collection);
@@ -2885,6 +2911,7 @@ class SyncedDb {
   initialized = false;
   syncing = false;
   syncLock = false;
+  wsUpdateQueue = [];
   updaterId;
   syncedDbInstanceId;
   syncMetaCache = new Map;
@@ -3134,7 +3161,13 @@ class SyncedDb {
         if (cleanup)
           this.cleanupNotifierCallbacks = cleanup;
       }
-      this.unsubscribeServerUpdates = this.serverUpdateNotifier.subscribe((payload) => this.serverUpdateHandler.handleServerUpdate(payload));
+      this.unsubscribeServerUpdates = this.serverUpdateNotifier.subscribe((payload) => {
+        if (this.syncing) {
+          this.wsUpdateQueue.push(payload);
+          return;
+        }
+        return this.serverUpdateHandler.handleServerUpdate(payload);
+      });
       try {
         await this.serverUpdateNotifier.connect();
       } catch (err) {
@@ -3416,6 +3449,16 @@ class SyncedDb {
     } finally {
       this.syncing = false;
       this.syncLock = false;
+      await this.processQueuedWsUpdates();
+    }
+  }
+  async processQueuedWsUpdates() {
+    if (this.wsUpdateQueue.length === 0)
+      return;
+    const queue = this.wsUpdateQueue;
+    this.wsUpdateQueue = [];
+    for (const payload of queue) {
+      await this.serverUpdateHandler.handleServerUpdate(payload);
     }
   }
   isSyncing() {

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

@@ -26,6 +26,7 @@ export declare class SyncedDb implements I_SyncedDb {
     private initialized;
     private syncing;
     private syncLock;
+    private wsUpdateQueue;
     private readonly updaterId;
     private readonly syncedDbInstanceId;
     private syncMetaCache;
@@ -65,6 +66,7 @@ export declare class SyncedDb implements I_SyncedDb {
     hardDelete<T extends DbEntity>(collection: string, query: QuerySpec<T>): Promise<number>;
     ping(timeoutMs?: number): Promise<boolean>;
     sync(calledFrom?: string): Promise<void>;
+    private processQueuedWsUpdates;
     isSyncing(): boolean;
     upsertBatch<T extends DbEntity>(collection: string, batch: BatchSpec<T>): Promise<T[]>;
     getMemoryCollection<T extends DbEntity>(collection: string): T[];

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

@@ -27,6 +27,8 @@ export interface SyncResult {
  */
 export interface UploadResult {
     sentCount: number;
+    /** Per-collection sent counts (collection name -> count) */
+    collectionSentCounts?: Record<string, number>;
 }
 /**
  * Result from processing incoming server data.

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

@@ -198,6 +198,17 @@ export interface ConflictResolutionReport {
     /** Timestamp when conflict was resolved */
     timestamp: Date;
 }
+/**
+ * Per-collection sync statistics
+ */
+export interface CollectionSyncStats {
+    /** Number of items received from server for this collection */
+    receivedCount: number;
+    /** Number of dirty items sent to server for this collection */
+    sentCount: number;
+    /** The actual items received from server (for debugging/logging) */
+    receivedItems: LocalDbEntity[];
+}
 /**
  * Informacije o sinhronizaciji za debugging/logging
  */
@@ -216,6 +227,8 @@ export interface SyncInfo {
     error?: Error;
     /** Where sync was called from (for debugging) */
     calledFrom?: string;
+    /** Per-collection sync statistics (collection name -> stats) */
+    collections?: Record<string, CollectionSyncStats>;
 }
 /**
  * Configuration for collection sync behavior (used in sync() method only, not uploadDirtyItems)

package/package.json

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