@stamprally/core 0.11.0 → 0.12.0

package/dist/index.cjs

@@ -99,6 +99,47 @@ function issueClaimTicketNumber(reward2, currentState, options = {}) {
   return { ...currentState, claimTicketNumber };
 }
 
+// src/engine/sync.ts
+function latestTimestamp(serverTimestamp, localTimestamp) {
+  const serverTime = Date.parse(serverTimestamp);
+  const localTime = Date.parse(localTimestamp);
+  if (!Number.isNaN(serverTime) && !Number.isNaN(localTime))
+    return serverTime >= localTime ? serverTimestamp : localTimestamp;
+  if (!Number.isNaN(serverTime)) return serverTimestamp;
+  if (!Number.isNaN(localTime)) return localTimestamp;
+  return serverTimestamp >= localTimestamp ? serverTimestamp : localTimestamp;
+}
+function mergeRewardStates(serverRewards, localRewards) {
+  const merged = new Map(serverRewards.map((reward2) => [reward2.rewardId, reward2]));
+  for (const localReward of localRewards) {
+    const serverReward = merged.get(localReward.rewardId);
+    if (serverReward === void 0) {
+      merged.set(localReward.rewardId, localReward);
+      continue;
+    }
+    if (localReward.status === "CONSUMED" && serverReward.status !== "CONSUMED")
+      merged.set(localReward.rewardId, localReward);
+  }
+  return [...merged.values()];
+}
+function resolveRallyStateConflict(serverState, localState, options = { policy: "merge" }) {
+  if (options.policy === "server_wins") return serverState;
+  const records = [...serverState.records];
+  const knownStamps = new Set(records.map((record) => record.stampId));
+  for (const record of localState.records) {
+    if (!knownStamps.has(record.stampId)) {
+      records.push(record);
+      knownStamps.add(record.stampId);
+    }
+  }
+  return {
+    ...serverState,
+    records,
+    rewards: mergeRewardStates(serverState.rewards, localState.rewards),
+    updatedAt: latestTimestamp(serverState.updatedAt, localState.updatedAt)
+  };
+}
+
 // src/detectors/types.ts
 function createDetectorError(detector, code, message, cause) {
   return cause === void 0 ? { detector, code, message } : { detector, code, message, cause };
@@ -1000,6 +1041,7 @@ var StampRallyClient = class {
     this.#storage = this.#options.storage ?? new InMemoryStorage();
     this.#userId = this.#options.userId ?? null;
     this.#offlineQueue = this.#options.offlineQueue;
+    this.#offlineQueue?.setSyncResultListener((event) => this.#handleOfflineSyncResult(event));
   }
   getConfig() {
     return this.#config;
@@ -1217,12 +1259,19 @@ var StampRallyClient = class {
         });
       }
       if (adapter?.sync === void 0) {
-        this.#emitEvent({ type: "sync", state: current });
+        this.#emitEvent({ type: "sync", state: this.#state ?? current });
         return;
       }
-      const next = this.#reconcile(
-        await adapter.sync({ rallyId: this.#config.id, userId: this.#userId, state: current })
-      );
+      const serverState = await adapter.sync({
+        rallyId: this.#config.id,
+        userId: this.#userId,
+        state: this.#state ?? current
+      });
+      const localState = this.#state ?? current;
+      const merged = this.#offlineQueue === void 0 ? serverState : resolveRallyStateConflict(serverState, localState, {
+        policy: this.#offlineQueue.conflictPolicy
+      });
+      const next = this.#reconcile(merged);
       await this.#storage.save(next);
       this.#state = next;
       this.#emit(next);
@@ -1282,6 +1331,16 @@ var StampRallyClient = class {
       )
     };
   }
+  async #handleOfflineSyncResult(event) {
+    if (event.state !== void 0) {
+      const next = this.#reconcile(event.state);
+      await this.#storage.save(next);
+      this.#state = next;
+      this.#emit(next);
+    }
+    if ("ok" in event.result && !event.result.ok)
+      this.#emitEvent({ type: "error", error: event.result.error });
+  }
   #now() {
     return this.#options.clock?.() ?? (/* @__PURE__ */ new Date()).toISOString();
   }
@@ -1418,6 +1477,7 @@ var OfflineQueue = class {
   #error = null;
   #sender;
   #syncPromise = null;
+  #syncResultListener;
   constructor(options = {}) {
     if (options.storage !== void 0) this.#storage = options.storage;
     else if (options.storageLike !== void 0 && options.storageLike !== null)
@@ -1439,6 +1499,12 @@ var OfflineQueue = class {
   get operations() {
     return this.#operations;
   }
+  get conflictPolicy() {
+    return this.#conflictPolicy;
+  }
+  setSyncResultListener(listener) {
+    this.#syncResultListener = listener;
+  }
   async initialize() {
     if (this.#loaded) return;
     this.#operations = [...await this.#storage.load(this.#key)];
@@ -1491,8 +1557,12 @@ var OfflineQueue = class {
         } catch (cause) {
           throw cause instanceof Error ? cause : new Error(String(cause));
         }
-        if ("conflict" in result && result.conflict === true)
-          await this.resolveConflict(operation, result.localState, result.serverState);
+        const state = "conflict" in result && result.conflict === true ? await this.resolveConflict(operation, result.localState, result.serverState) : "ok" in result && result.ok ? result.value.state : void 0;
+        await this.#syncResultListener?.({
+          operation,
+          result,
+          ...state === void 0 ? {} : { state }
+        });
         this.#operations = this.#operations.slice(1);
         await this.#storage.save(this.#key, this.#operations);
       }
@@ -1506,9 +1576,7 @@ var OfflineQueue = class {
   async resolveConflict(operation, localState, serverState) {
     const configured = this.#onSyncConflict;
     const policy = (typeof configured === "function" ? await configured({ operation, localState, serverState }) : configured) ?? this.#conflictPolicy;
-    if (policy === "merge") {
-      return;
-    }
+    return resolveRallyStateConflict(serverState, localState, { policy });
   }
 };
 
@@ -2437,6 +2505,7 @@ exports.readNfcContext = readNfcContext;
 exports.readQrContext = readQrContext;
 exports.reconcileRewardStates = reconcileRewardStates;
 exports.resolveLocalizedText = resolveLocalizedText;
+exports.resolveRallyStateConflict = resolveRallyStateConflict;
 exports.safeParseAdminConfig = safeParseAdminConfig;
 exports.safeParsePublicConfig = safeParsePublicConfig;
 exports.sanitizeAdminConfig = sanitizeAdminConfig;