cry-synced-db-client 0.1.199 → 0.1.200

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Versions
 
+## 0.1.200 (2026-06-14)
+
+### `preprocessDirtyItem` skip/throw zdaj incrementa `numUploadAttempts`
+
+`SyncEngine.uploadDirtyItems`: ko `preprocessDirtyItem` vrne `undefined` ali vrže
+exception, se item ne samo preskoči — zdaj dobi tudi `incrementDirtyUploadAttempts`,
+tako da po 2+ skipih postane stuck in viden prek `getStuckItems()` / `onDirtyItemStuck`.
+
+Prej so skipani itemi tiho ostali v `_dirty_changes` brez metapodatkov in nikoli ne
+bi postali stuck — zdaj se po 3 skipih (vsak sync da 2 incrementa = main + followUp)
+dobijo `stuckSince`.
+
+**Internal:**
+- V `uploadDirtyItems` zbira `preprocessSkippedIds` v obeh poteh, batch-write v
+  `incrementDirtyUploadAttempts` takoj za `for` zanko (en DB write za vse skipane
+  iteme namesto N write-ov)
+
+**Tests:** 5 novih testov v `test/preprocessDirtyItem.test.ts`:
+- `undefined/throw: numUploadAttempts increments across sync cycles, eventually stuck`
+- `undefined/throw: onDirtyItemStuck fires when item becomes stuck`
+- `mixed: stuck item via getStuckItems while non-stuck dirty still active`
+
+876 pass, 0 fail.
+
 ## 0.1.198 (2026-06-13)
 
 ### Stuck-item tracking (`getStuckItems` / `discardStuckItems` / `onDirtyItemStuck`)

package/dist/index.js

@@ -3245,7 +3245,10 @@ var _SyncEngine = class _SyncEngine {
         configMap.set(collectionName, config);
       }
       this.callOnFindNewerManyCall(syncSpecs, calledFrom);
-      this.callbackSafe(this.callbacks.onServerSyncStart, { calledFrom, collectionCount: syncSpecs.length });
+      this.callbackSafe(this.callbacks.onServerSyncStart, {
+        calledFrom,
+        collectionCount: syncSpecs.length
+      });
       const findNewerManyStartTime = Date.now();
       const collectionState = /* @__PURE__ */ new Map();
       for (const [name] of configMap) {
@@ -3276,7 +3279,12 @@ var _SyncEngine = class _SyncEngine {
               if (!config) return;
               const state = collectionState.get(collection);
               state.receivedCount += items.length;
-              const stats = await this.processIncomingServerData(collection, config, items, state.source);
+              const stats = await this.processIncomingServerData(
+                collection,
+                config,
+                items,
+                state.source
+              );
               state.conflicts += stats.conflictsResolved;
               if (stats.maxTs) {
                 if (!state.maxTs || this.compareTimestamps(stats.maxTs, state.maxTs) > 0) {
@@ -3358,12 +3366,16 @@ var _SyncEngine = class _SyncEngine {
       try {
         uploadStats = await this.uploadDirtyItems(calledFrom);
         await this.deps.flushAllPendingChanges();
-        const followUp = await this.uploadDirtyItems(`${calledFrom != null ? calledFrom : "sync"}:followUp`);
+        const followUp = await this.uploadDirtyItems(
+          `${calledFrom != null ? calledFrom : "sync"}:followUp`
+        );
         if (followUp.sentCount > 0) {
           uploadStats.sentCount += followUp.sentCount;
           if (followUp.collectionSentCounts) {
             uploadStats.collectionSentCounts = uploadStats.collectionSentCounts || {};
-            for (const [c, n] of Object.entries(followUp.collectionSentCounts)) {
+            for (const [c, n] of Object.entries(
+              followUp.collectionSentCounts
+            )) {
               uploadStats.collectionSentCounts[c] = (uploadStats.collectionSentCounts[c] || 0) + n;
             }
           }
@@ -3375,7 +3387,9 @@ var _SyncEngine = class _SyncEngine {
         );
       }
       sentCount = uploadStats.sentCount;
-      for (const [collectionName, stats] of Object.entries(uploadStats.collectionSentCounts || {})) {
+      for (const [collectionName, stats] of Object.entries(
+        uploadStats.collectionSentCounts || {}
+      )) {
         if (collectionStats[collectionName]) {
           collectionStats[collectionName].sentCount = stats;
         } else {
@@ -3473,15 +3487,20 @@ var _SyncEngine = class _SyncEngine {
         });
       }
     }
-    if (dexieSave.length > 0) await this.dexieDb.saveMany(collection, dexieSave);
+    if (dexieSave.length > 0)
+      await this.dexieDb.saveMany(collection, dexieSave);
     if (dexieDeleteIds.length > 0) {
       await this.dexieDb.deleteMany(collection, dexieDeleteIds);
     }
     if (memUpsert.length > 0) {
-      this.deps.writeToInMemBatch(collection, memUpsert, "upsert", { source: "incremental" });
+      this.deps.writeToInMemBatch(collection, memUpsert, "upsert", {
+        source: "incremental"
+      });
     }
     if (memDelete.length > 0) {
-      this.deps.writeToInMemBatch(collection, memDelete, "delete", { source: "incremental" });
+      this.deps.writeToInMemBatch(collection, memDelete, "delete", {
+        source: "incremental"
+      });
     }
     if (reAddDirty.length > 0) {
       await this.dexieDb.addDirtyChangesBatch(collection, reAddDirty);
@@ -3520,7 +3539,10 @@ var _SyncEngine = class _SyncEngine {
       const updates = [];
       const skipped = [];
       const ids = dirtyChanges.map((dc) => dc._id);
-      const fullItems = await this.dexieDb.getByIds(collectionName, ids);
+      const fullItems = await this.dexieDb.getByIds(
+        collectionName,
+        ids
+      );
       const orphanReconstructed = [];
       for (let i = 0; i < fullItems.length; i++) {
         const fullItem = fullItems[i];
@@ -3531,7 +3553,10 @@ var _SyncEngine = class _SyncEngine {
             const currentServerRev = typeof fullItem._rev === "number" ? fullItem._rev : void 0;
             updates.push({ _id: fullItem._id, delta, currentServerRev });
           } else {
-            skipped.push({ _id: String(fullItem._id), reason: "no-delta-for-fullitem" });
+            skipped.push({
+              _id: String(fullItem._id),
+              reason: "no-delta-for-fullitem"
+            });
           }
         } else if (id != null) {
           const delta = dirtyChangesMap.get(String(id));
@@ -3568,7 +3593,10 @@ var _SyncEngine = class _SyncEngine {
               timestamp: /* @__PURE__ */ new Date()
             });
           } catch (err) {
-            console.error(`[SyncEngine] onUploadSkip callback failed: ${err}`, err);
+            console.error(
+              `[SyncEngine] onUploadSkip callback failed: ${err}`,
+              err
+            );
           }
         }
         continue;
@@ -3585,10 +3613,14 @@ var _SyncEngine = class _SyncEngine {
             timestamp: /* @__PURE__ */ new Date()
           });
         } catch (err) {
-          console.error(`[SyncEngine] onUploadSkip callback failed: ${err}`, err);
+          console.error(
+            `[SyncEngine] onUploadSkip callback failed: ${err}`,
+            err
+          );
         }
       }
       const mappedUpdates = [];
+      const preprocessSkippedIds = [];
       for (const item of updates) {
         const dirtyBaseRev = typeof item.delta._rev === "number" ? item.delta._rev : void 0;
         const stripped = stripServerManagedFromChanges(
@@ -3605,8 +3637,12 @@ var _SyncEngine = class _SyncEngine {
         };
         if (this.preprocessDirtyItem) {
           try {
-            const processed = this.preprocessDirtyItem(candidate, collectionName);
+            const processed = this.preprocessDirtyItem(
+              candidate,
+              collectionName
+            );
             if (processed === void 0) {
+              preprocessSkippedIds.push(item._id);
               continue;
             }
             candidate = processed;
@@ -3615,6 +3651,7 @@ var _SyncEngine = class _SyncEngine {
               `[SyncEngine] preprocessDirtyItem(${collectionName}) failed for _id=${String(item._id)}; keeping dirty for retry:`,
               err
             );
+            preprocessSkippedIds.push(item._id);
             continue;
           }
         }
@@ -3624,14 +3661,23 @@ var _SyncEngine = class _SyncEngine {
           update: candidate.update
         });
       }
+      if (preprocessSkippedIds.length > 0) {
+        const newlyStuck = await this.dexieDb.incrementDirtyUploadAttempts(
+          collectionName,
+          preprocessSkippedIds
+        );
+        this.callOnDirtyItemStuck(collectionName, newlyStuck, calledFrom);
+      }
       if (mappedUpdates.length === 0) continue;
-      collectionBatches.push([{
-        collection: collectionName,
-        batch: {
-          updates: mappedUpdates,
-          deletes: []
+      collectionBatches.push([
+        {
+          collection: collectionName,
+          batch: {
+            updates: mappedUpdates,
+            deletes: []
+          }
         }
-      }]);
+      ]);
     }
     if (collectionBatches.length === 0) {
       return { sentCount: 0 };
@@ -3669,7 +3715,10 @@ var _SyncEngine = class _SyncEngine {
           const allIds = [];
           for (const u of b.batch.updates) allIds.push(u._id);
           for (const d of b.batch.deletes) allIds.push((_a = d._id) != null ? _a : d);
-          const newlyStuck = await this.dexieDb.incrementDirtyUploadAttempts(b.collection, allIds);
+          const newlyStuck = await this.dexieDb.incrementDirtyUploadAttempts(
+            b.collection,
+            allIds
+          );
           this.callOnDirtyItemStuck(b.collection, newlyStuck, calledFrom);
         }
       }
@@ -3721,7 +3770,9 @@ var _SyncEngine = class _SyncEngine {
           `[SyncEngine] Sync upload [${collection}]: ${ambiguous.length} id(s) appeared in BOTH inserted/updated/deleted AND errors[] \u2014 keeping dirty for safety. _ids: ${ambiguous.join(", ")}`
         );
       }
-      const dirtyBeforeRefresh = mustRefreshIds.size > 0 ? await this.dexieDb.getDirtyChangesBatch(collection, [...mustRefreshIds]) : /* @__PURE__ */ new Map();
+      const dirtyBeforeRefresh = mustRefreshIds.size > 0 ? await this.dexieDb.getDirtyChangesBatch(collection, [
+        ...mustRefreshIds
+      ]) : /* @__PURE__ */ new Map();
       const uploadedByIdRefresh = mustRefreshIds.size > 0 ? this.uploadedSnapshotFor(collectionBatches, collection) : /* @__PURE__ */ new Map();
       if (allSuccessIds.length > 0) {
         await this.dexieDb.clearDirtyChangesBatch(collection, allSuccessIds);
@@ -3730,8 +3781,10 @@ var _SyncEngine = class _SyncEngine {
       for (const batch of collectionBatches) {
         for (const b of batch) {
           if (b.collection !== collection) continue;
-          for (const u of b.batch.updates) sentIdsForCollection.add(String(u._id));
-          for (const d of b.batch.deletes) sentIdsForCollection.add(String(d._id));
+          for (const u of b.batch.updates)
+            sentIdsForCollection.add(String(u._id));
+          for (const d of b.batch.deletes)
+            sentIdsForCollection.add(String(d._id));
         }
       }
       const retainedIds = [];
@@ -3741,7 +3794,10 @@ var _SyncEngine = class _SyncEngine {
         }
       }
       if (retainedIds.length > 0) {
-        const newlyStuck = await this.dexieDb.incrementDirtyUploadAttempts(collection, retainedIds);
+        const newlyStuck = await this.dexieDb.incrementDirtyUploadAttempts(
+          collection,
+          retainedIds
+        );
         this.callOnDirtyItemStuck(collection, newlyStuck, calledFrom);
       }
       let collectionSentCount = 0;
@@ -3753,7 +3809,10 @@ var _SyncEngine = class _SyncEngine {
         if (isWriteOnly) {
           await this.dexieDb.deleteMany(collection, idsToCheck);
         } else {
-          const dexieItems = await this.dexieDb.getByIds(collection, idsToCheck);
+          const dexieItems = await this.dexieDb.getByIds(
+            collection,
+            idsToCheck
+          );
           const dexieSaveBatch = [];
           const inMemUpdateBatch = [];
           const inMemDeleteIds = [];
@@ -3781,7 +3840,12 @@ var _SyncEngine = class _SyncEngine {
             await this.dexieDb.deleteMany(collection, dexieDeleteIds);
           }
           if (inMemUpdateBatch.length > 0) {
-            this.deps.writeToInMemBatch(collection, inMemUpdateBatch, "upsert", { source: "incremental" });
+            this.deps.writeToInMemBatch(
+              collection,
+              inMemUpdateBatch,
+              "upsert",
+              { source: "incremental" }
+            );
           }
           if (inMemDeleteIds.length > 0) {
             this.deps.writeToInMemBatch(
@@ -3804,7 +3868,9 @@ var _SyncEngine = class _SyncEngine {
         }
         await this.dexieDb.deleteMany(collection, deleteIds);
         if (!isWriteOnly) {
-          this.deps.writeToInMemBatch(collection, deleteDbEntities, "delete", { source: "incremental" });
+          this.deps.writeToInMemBatch(collection, deleteDbEntities, "delete", {
+            source: "incremental"
+          });
         }
         sentCount += deleted.length;
         collectionSentCount += deleted.length;
@@ -3820,7 +3886,7 @@ var _SyncEngine = class _SyncEngine {
       if (collectionSentCount > 0) {
         collectionSentCounts[collection] = collectionSentCount;
       }
-      let maxTs = void 0;
+      let maxTs;
       for (const arr of [inserted, updated, deleted]) {
         for (const item of arr) {
           if (item._ts) {
@@ -3890,7 +3956,10 @@ var _SyncEngine = class _SyncEngine {
       return { sentCount: 0 };
     }
     const ids = dirtyItems.map((item) => item._id);
-    const fullItems = await this.dexieDb.getByIds(collection, ids);
+    const fullItems = await this.dexieDb.getByIds(
+      collection,
+      ids
+    );
     const dirtyChangesMap = /* @__PURE__ */ new Map();
     for (const dirtyItem of dirtyItems) {
       dirtyChangesMap.set(String(dirtyItem._id), dirtyItem);
@@ -3906,20 +3975,24 @@ var _SyncEngine = class _SyncEngine {
     if (updates.length === 0) {
       return { sentCount: 0 };
     }
-    const collectionBatches = [[{
-      collection,
-      batch: {
-        updates: updates.map((item) => {
-          const _a = item.delta, { _ts, _rev } = _a, changes = __objRest(_a, ["_ts", "_rev"]);
-          return {
-            _id: item._id,
-            _rev: typeof _rev === "number" ? _rev : 0,
-            update: changes
-          };
-        }),
-        deletes: []
-      }
-    }]];
+    const collectionBatches = [
+      [
+        {
+          collection,
+          batch: {
+            updates: updates.map((item) => {
+              const _a = item.delta, { _ts, _rev } = _a, changes = __objRest(_a, ["_ts", "_rev"]);
+              return {
+                _id: item._id,
+                _rev: typeof _rev === "number" ? _rev : 0,
+                update: changes
+              };
+            }),
+            deletes: []
+          }
+        }
+      ]
+    ];
     const results = await this.deps.withSyncTimeout(
       this.restInterface.updateCollections(collectionBatches),
       "updateCollections"
@@ -3986,8 +4059,10 @@ var _SyncEngine = class _SyncEngine {
       for (const batch of collectionBatches) {
         for (const b of batch) {
           if (b.collection !== collection) continue;
-          for (const u of b.batch.updates) sentIdsForCollection.add(String(u._id));
-          for (const d of b.batch.deletes) sentIdsForCollection.add(String(d._id));
+          for (const u of b.batch.updates)
+            sentIdsForCollection.add(String(u._id));
+          for (const d of b.batch.deletes)
+            sentIdsForCollection.add(String(d._id));
         }
       }
       const retainedIds = [];
@@ -3997,7 +4072,10 @@ var _SyncEngine = class _SyncEngine {
         }
       }
       if (retainedIds.length > 0) {
-        const newlyStuck = await this.dexieDb.incrementDirtyUploadAttempts(collection, retainedIds);
+        const newlyStuck = await this.dexieDb.incrementDirtyUploadAttempts(
+          collection,
+          retainedIds
+        );
         this.callOnDirtyItemStuck(collection, newlyStuck, calledFrom);
       }
       if (mustRefresh && mustRefresh.length > 0) {
@@ -4025,7 +4103,12 @@ var _SyncEngine = class _SyncEngine {
     const config = this.collections.get(collectionName);
     if (!config) return { updatedIds: [] };
     const source = (_a = opts == null ? void 0 : opts.source) != null ? _a : "incremental";
-    const result = await this.processIncomingServerData(collectionName, config, serverData, source);
+    const result = await this.processIncomingServerData(
+      collectionName,
+      config,
+      serverData,
+      source
+    );
     if (result.updatedIds.length > 0) {
       this.deps.broadcastUpdates({ [collectionName]: result.updatedIds });
     }
@@ -4043,8 +4126,14 @@ var _SyncEngine = class _SyncEngine {
       const chunk = serverData.slice(offset, offset + BATCH);
       const chunkIds = [];
       for (const item of chunk) chunkIds.push(item._id);
-      const localItems = await this.dexieDb.getByIds(collectionName, chunkIds);
-      const dirtyChangesMap = await this.dexieDb.getDirtyChangesBatch(collectionName, chunkIds);
+      const localItems = await this.dexieDb.getByIds(
+        collectionName,
+        chunkIds
+      );
+      const dirtyChangesMap = await this.dexieDb.getDirtyChangesBatch(
+        collectionName,
+        chunkIds
+      );
       const dexieBatch = [];
       const inMemSaveBatch = [];
       const inMemDeleteIds = [];
@@ -4093,7 +4182,9 @@ var _SyncEngine = class _SyncEngine {
         await this.dexieDb.saveMany(collectionName, dexieBatch);
       }
       if (inMemSaveBatch.length > 0) {
-        this.deps.writeToInMemBatch(collectionName, inMemSaveBatch, "upsert", { source });
+        this.deps.writeToInMemBatch(collectionName, inMemSaveBatch, "upsert", {
+          source
+        });
       }
       if (inMemDeleteIds.length > 0) {
         this.deps.writeToInMemBatch(
@@ -4141,7 +4232,10 @@ var _SyncEngine = class _SyncEngine {
           timestamp: /* @__PURE__ */ new Date()
         });
       } catch (err) {
-        console.error(`[SyncEngine] onConflictResolved callback failed: ${err}`, err);
+        console.error(
+          `[SyncEngine] onConflictResolved callback failed: ${err}`,
+          err
+        );
       }
     }
     return resolved;
@@ -4186,7 +4280,10 @@ var _SyncEngine = class _SyncEngine {
           calledFrom
         });
       } catch (err) {
-        console.error(`[SyncEngine] onFindNewerManyCall callback failed: ${err}`, err);
+        console.error(
+          `[SyncEngine] onFindNewerManyCall callback failed: ${err}`,
+          err
+        );
       }
     }
   }
@@ -4205,7 +4302,10 @@ var _SyncEngine = class _SyncEngine {
           ttfbMs: metrics == null ? void 0 : metrics.ttfbMs
         });
       } catch (err) {
-        console.error(`[SyncEngine] onFindNewerManyResult callback failed: ${err}`, err);
+        console.error(
+          `[SyncEngine] onFindNewerManyResult callback failed: ${err}`,
+          err
+        );
       }
     }
   }
@@ -4218,7 +4318,10 @@ var _SyncEngine = class _SyncEngine {
           calledFrom
         });
       } catch (err) {
-        console.error(`[SyncEngine] onServerWriteRequest callback failed: ${err}`, err);
+        console.error(
+          `[SyncEngine] onServerWriteRequest callback failed: ${err}`,
+          err
+        );
       }
     }
   }
@@ -4233,7 +4336,10 @@ var _SyncEngine = class _SyncEngine {
           calledFrom
         });
       } catch (err) {
-        console.error(`[SyncEngine] onServerWriteResult callback failed: ${err}`, err);
+        console.error(
+          `[SyncEngine] onServerWriteResult callback failed: ${err}`,
+          err
+        );
       }
     }
   }
@@ -4247,7 +4353,10 @@ var _SyncEngine = class _SyncEngine {
         timestamp: /* @__PURE__ */ new Date()
       });
     } catch (err) {
-      console.error(`[SyncEngine] onDirtyItemStuck callback failed: ${err}`, err);
+      console.error(
+        `[SyncEngine] onDirtyItemStuck callback failed: ${err}`,
+        err
+      );
     }
   }
   callOnServerSyncWrite(request, response, error, startTime, timestamp, calledFrom) {
@@ -4267,7 +4376,10 @@ var _SyncEngine = class _SyncEngine {
         timestamp
       });
     } catch (err) {
-      console.error(`[SyncEngine] onServerSyncWrite callback failed: ${err}`, err);
+      console.error(
+        `[SyncEngine] onServerSyncWrite callback failed: ${err}`,
+        err
+      );
     }
   }
 };

package/package.json

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