cry-synced-db-client 0.1.26 → 0.1.28

package/dist/db/SyncedDb.d.ts

@@ -18,6 +18,7 @@ export declare class SyncedDb implements I_SyncedDb {
     private debounceRestWritesMs;
     private onForcedOffline?;
     private onSync?;
+    private onConflictResolved?;
     private onServerWriteRequest?;
     private onServerWriteResult?;
     private onFindNewerManyCall?;

package/dist/index.js

@@ -271,6 +271,7 @@ class SyncedDb {
   debounceRestWritesMs;
   onForcedOffline;
   onSync;
+  onConflictResolved;
   onServerWriteRequest;
   onServerWriteResult;
   onFindNewerManyCall;
@@ -320,6 +321,7 @@ class SyncedDb {
     this.debounceRestWritesMs = config.debounceRestWritesMs ?? DEFAULT_REST_DEBOUNCE_MS;
     this.onForcedOffline = config.onForcedOffline;
     this.onSync = config.onSync;
+    this.onConflictResolved = config.onConflictResolved;
     this.onServerWriteRequest = config.onServerWriteRequest;
     this.onServerWriteResult = config.onServerWriteResult;
     this.onFindNewerManyCall = config.onFindNewerManyCall;
@@ -1312,7 +1314,7 @@ class SyncedDb {
       if (localItem) {
         if (localItem._dirty) {
           conflictsResolved++;
-          const resolved = this.resolveCollectionConflict(collectionName, config, localItem, serverItem);
+          const resolved = this.resolveCollectionConflict(collectionName, config, localItem, serverItem, "sync");
           dexieBatch.push({
             ...resolved,
             _dirty: true,
@@ -1467,11 +1469,26 @@ class SyncedDb {
     }
     return { sentCount };
   }
-  resolveCollectionConflict(collectionName, config, local, external) {
-    if (config.resolveSyncConflict) {
-      return config.resolveSyncConflict(local, external);
+  resolveCollectionConflict(collectionName, config, local, external, source) {
+    const usedCustomResolver = !!config.resolveSyncConflict;
+    const resolved = config.resolveSyncConflict ? config.resolveSyncConflict(local, external) : resolveConflict(local, external);
+    if (this.onConflictResolved) {
+      try {
+        this.onConflictResolved({
+          collection: collectionName,
+          id: local._id,
+          source,
+          localItem: local,
+          serverItem: external,
+          resolvedItem: resolved,
+          usedCustomResolver,
+          timestamp: new Date
+        });
+      } catch (err) {
+        console.error("onConflictResolved callback failed:", err);
+      }
     }
-    return resolveConflict(local, external);
+    return resolved;
   }
   compareTimestamps(a, b) {
     const aT = typeof a === "object" && "t" in a ? a.t : 0;
@@ -1598,7 +1615,7 @@ class SyncedDb {
       const currentMemItem = this.inMemDb.getById(collectionName, serverItem._id);
       if (currentMemItem) {
         const config = this.collections.get(collectionName);
-        const resolved = this.resolveCollectionConflict(collectionName, config, currentMemItem, serverItem);
+        const resolved = this.resolveCollectionConflict(collectionName, config, currentMemItem, serverItem, "serverUpdate_pendingChanges");
         if (!resolved._deleted) {
           this.inMemDb.save(collectionName, serverItem._id, this.stripLocalFields(resolved));
         }
@@ -1620,7 +1637,7 @@ class SyncedDb {
       }
       if (localItem._dirty) {
         const config = this.collections.get(collectionName);
-        const resolved = this.resolveCollectionConflict(collectionName, config, localItem, serverItem);
+        const resolved = this.resolveCollectionConflict(collectionName, config, localItem, serverItem, "serverUpdate_dirtyLocal");
         await this.dexieDb.save(collectionName, serverItem._id, {
           ...resolved,
           _dirty: true
@@ -1695,7 +1712,7 @@ class DexieDb extends Dexie {
     schema[SYNC_META_TABLE] = "[tenant+collection]";
     for (const config of collectionConfigs) {
       const additionalIndexes = config.indexes || [];
-      const indexes = ["_id", "_dirty", "_updatedAt", ...additionalIndexes.map(String)];
+      const indexes = ["_id", "_dirty", "_ts", ...additionalIndexes.map(String)];
       schema[config.name] = indexes.join(", ");
     }
     this.version(1).stores(schema);
@@ -1860,7 +1877,7 @@ class DexieDb extends Dexie {
   async getNewerThan(collection, timestamp) {
     const table = this.getTable(collection);
     const normalizedTs = this.normalizeTimestamp(timestamp);
-    return await table.where("_updatedAt").above(normalizedTs).toArray();
+    return await table.where("_ts").above(normalizedTs).toArray();
   }
   onMetaUpdated(callback) {
     this.metaUpdateCallbacks.add(callback);

package/dist/types/I_DexieDb.d.ts

@@ -61,7 +61,7 @@ export interface I_DexieDb {
     deleteSyncMeta(collection: string): Promise<void>;
     /** Vrne tenant */
     getTenant(): string;
-    /** Get records newer than timestamp (uses _updatedAt index) */
+    /** Get records newer than timestamp (uses _ts index - server timestamp) */
     getNewerThan<T extends LocalDbEntity>(collection: string, timestamp: any): Promise<T[]>;
     /** Subscribe to metadata updates from other tabs. Returns unsubscribe function. */
     onMetaUpdated(callback: (payload: MetaUpdateBroadcast) => void): () => void;

package/dist/types/I_SyncedDb.d.ts

@@ -144,6 +144,37 @@ export interface WsNotificationInfo {
     /** Timestamp when notification was received */
     timestamp: Date;
 }
+/**
+ * Source of the conflict - where the conflict was detected
+ */
+export type ConflictSource = 
+/** Conflict during batch sync (syncSingleCollection) */
+"sync"
+/** Conflict when processing server update with pending local changes not yet in Dexie */
+ | "serverUpdate_pendingChanges"
+/** Conflict when processing server update with dirty local item in Dexie */
+ | "serverUpdate_dirtyLocal";
+/**
+ * Callback payload for conflict resolution
+ */
+export interface ConflictResolutionReport {
+    /** Collection where conflict occurred */
+    collection: string;
+    /** ID of the conflicting item */
+    id: Id;
+    /** Source/context of the conflict */
+    source: ConflictSource;
+    /** Local item before resolution */
+    localItem: LocalDbEntity;
+    /** Server/external item */
+    serverItem: LocalDbEntity;
+    /** Resolved item (result of conflict resolution) */
+    resolvedItem: LocalDbEntity;
+    /** Whether a custom resolver was used (from CollectionConfig.resolveSyncConflict) */
+    usedCustomResolver: boolean;
+    /** Timestamp when conflict was resolved */
+    timestamp: Date;
+}
 /**
  * Informacije o sinhronizaciji za debugging/logging
  */
@@ -204,6 +235,8 @@ export interface SyncedDbConfig {
     onForcedOffline?: (reason: string) => void;
     /** Callback za debugging/logging - pokliče se po vsaki sinhronizaciji */
     onSync?: (info: SyncInfo) => void;
+    /** Callback when a sync conflict is resolved (local vs server data) */
+    onConflictResolved?: (report: ConflictResolutionReport) => void;
     /** Callback before sending data to server (updateCollections) */
     onServerWriteRequest?: (info: ServerWriteRequestInfo) => void;
     /** Callback after receiving result from server (updateCollections) */

package/dist/types/index.d.ts

@@ -4,5 +4,5 @@ export type { Obj, QuerySpec, Projection, QueryOpts, KeyOf, InsertKeyOf, InsertS
 export type { I_InMemDb as InMemDb } from "./I_InMemDb";
 export type { I_DexieDb as DexieDb, SyncMeta } from "./I_DexieDb";
 export type { I_ServerUpdateNotifier as ServerUpdateNotifier, ServerUpdateCallback, ServerUpdateNotifierCallbacks } from "./I_ServerUpdateNotifier";
-export type { I_SyncedDb as SyncedDb, SyncedDbConfig, CollectionConfig, SyncInfo, ServerWriteRequestInfo, ServerWriteResultInfo, FindNewerManyCallInfo, FindNewerCallInfo, DexieWriteRequestInfo, DexieWriteResultInfo, LocalstorageWriteResultInfo, WsNotificationInfo, InfrastructureErrorType, InfrastructureErrorInfo, } from "./I_SyncedDb";
+export type { I_SyncedDb as SyncedDb, SyncedDbConfig, CollectionConfig, SyncInfo, ServerWriteRequestInfo, ServerWriteResultInfo, FindNewerManyCallInfo, FindNewerCallInfo, DexieWriteRequestInfo, DexieWriteResultInfo, LocalstorageWriteResultInfo, WsNotificationInfo, InfrastructureErrorType, InfrastructureErrorInfo, ConflictSource, ConflictResolutionReport, } from "./I_SyncedDb";
 export type { CollectionConfig as CollectionConfigFull } from "./CollectionConfig";

package/package.json

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