@stamprally/core 0.18.0 → 0.20.0

package/dist/index.js

@@ -1198,8 +1198,6 @@ function errorValue(value, fallbackCode) {
   if (typeof value === "string") return { code: fallbackCode, message: value };
   return { code: fallbackCode, message: "Offline operation was rejected." };
 }
-var syncLocks = /* @__PURE__ */ new Map();
-var SYNC_LOCK_TTL_MS = 3e4;
 var DEFAULT_RETRY_OPTIONS = {
   maxRetries: 0,
   initialIntervalMs: 250,
@@ -1226,9 +1224,7 @@ var OfflineQueue = class {
   #synchronizeInstances;
   #retryOptions;
   #instanceId = randomId();
-  #lockStorage;
-  #observedLocks = /* @__PURE__ */ new Map();
-  #warnedMemoryLock = false;
+  #warnedCapabilityMessages = /* @__PURE__ */ new Set();
   #capabilityWarningListener;
   #replayConfig;
   #storageListener;
@@ -1258,8 +1254,7 @@ var OfflineQueue = class {
       initialIntervalMs: Math.max(0, retryOptions.initialIntervalMs),
       backoffMultiplier: Math.max(1, retryOptions.backoffMultiplier)
     };
-    this.#lockStorage = options.storageLike ?? availableLocalStorage();
-    if (this.#synchronizeInstances) this.#subscribeToExternalChanges();
+    if (this.#synchronizeInstances && this.#hasWebLocks()) this.#subscribeToExternalChanges();
   }
   get syncState() {
     return this.#state;
@@ -1268,12 +1263,14 @@ var OfflineQueue = class {
     return this.#operations.length;
   }
   get queueCapability() {
-    return this.#queueCapability;
+    return {
+      storage: this.#queueCapability,
+      multiTabSync: this.#hasWebLocks() ? "supported_web_locks" : "disabled_unsafe_environment"
+    };
   }
   get storageCapability() {
     if (this.#queueCapability === "memory") return "memory";
-    const locks = globalThis.navigator?.locks;
-    return locks !== void 0 || this.#lockStorage !== null ? this.#queueCapability : "volatile_single_tab";
+    return this.#hasWebLocks() ? this.#queueCapability : "volatile_single_tab";
   }
   get isStoragePersistent() {
     return this.#queueCapability !== "memory";
@@ -1320,12 +1317,16 @@ var OfflineQueue = class {
       this.#queueCapability = "memory";
       this.#operations = [];
       this.#rejectedHistory = [];
-      this.#warnMemoryLock(
+      this.#warnCapability(
         `Offline queue persistence is unavailable; queued data can be lost after reload (${String(error)}).`
       );
     }
     if (this.#queueCapability === "memory")
-      this.#warnMemoryLock("Offline queue persistence is unavailable; queued data is memory-only.");
+      this.#warnCapability("Offline queue persistence is unavailable; queued data is memory-only.");
+    if (this.queueCapability.multiTabSync === "disabled_unsafe_environment")
+      this.#warnCapability(
+        "Web Locks is unavailable; automatic cross-tab synchronization is disabled. Sync must be triggered by the foreground tab."
+      );
     this.#loaded = true;
   }
   /** Releases browser listeners when the queue is no longer used. */
@@ -1336,7 +1337,6 @@ var OfflineQueue = class {
     this.#storageListener = void 0;
     this.#channel?.close();
     this.#channel = null;
-    this.#releaseSyncLock();
   }
   /** Selects a rally/user queue scope and loads its pending operations. */
   async setScope(rallyId, userId) {
@@ -1448,6 +1448,12 @@ var OfflineQueue = class {
   async retrySync(sender = this.#sender) {
     return this.sync(sender);
   }
+  /** Applies a server-side batch response while preserving retryable operations. */
+  async applySyncProgress(response) {
+    await this.initialize();
+    for (const result of response.results)
+      await this.#applySyncOperationResult(result, response.currentState);
+  }
   async #run(sender) {
     const locks = globalThis.navigator?.locks;
     if (locks !== void 0 && typeof locks.request === "function") {
@@ -1464,7 +1470,7 @@ var OfflineQueue = class {
               return false;
             }
             callbackStarted = true;
-            await this.#runWithStorageLock(sender);
+            await this.#runSingleTab(sender);
             return true;
           }
         );
@@ -1474,22 +1480,12 @@ var OfflineQueue = class {
         if (callbackStarted) throw error;
       }
     }
-    if (this.storageCapability === "volatile_single_tab")
-      this.#warnMemoryLock(
-        "No cross-tab storage lock is available; offline sync is single-tab only."
-      );
-    await this.#runWithStorageLock(sender);
+    await this.#runSingleTab(sender);
   }
-  async #runWithStorageLock(sender) {
+  async #runSingleTab(sender) {
     this.#state = "syncing";
     this.#error = null;
     this.#changeListener?.();
-    if (!this.#acquireSyncLock()) {
-      await this.#reloadFromStorage();
-      this.#state = "idle";
-      this.#changeListener?.();
-      return;
-    }
     try {
       while (this.#operations.length > 0) {
         const operation = this.#operations[0];
@@ -1561,8 +1557,6 @@ var OfflineQueue = class {
       this.#error = cause instanceof Error ? cause : new Error(String(cause));
       this.#changeListener?.();
       throw this.#error;
-    } finally {
-      this.#releaseSyncLock();
     }
   }
   async #updateOperationStatus(status, attempts) {
@@ -1572,6 +1566,59 @@ var OfflineQueue = class {
     await this.#storage.save(this.#storageKey(), this.#operations);
     this.#announceChange();
   }
+  async #applySyncOperationResult(result, currentState) {
+    const operationIndex = this.#operations.findIndex(
+      (operation2) => offlineOperationId(operation2) === result.operationId
+    );
+    const operation = operationIndex < 0 ? void 0 : this.#operations[operationIndex];
+    if (operation === void 0) return;
+    if (result.status === "FAILED_RETRYABLE") {
+      const attempts = (operation.attempts ?? 0) + 1;
+      this.#operations = [
+        ...this.#operations.slice(0, operationIndex),
+        { ...operation, status: "FAILED_RETRYABLE", attempts },
+        ...this.#operations.slice(operationIndex + 1)
+      ];
+      await this.#storage.save(this.#storageKey(), this.#operations);
+      this.#announceChange();
+      await this.#syncResultListener?.({
+        operation,
+        status: "RETRYABLE_ERROR",
+        error: { code: "FAILED_RETRYABLE", message: result.error }
+      });
+      return;
+    }
+    this.#operations = [
+      ...this.#operations.slice(0, operationIndex),
+      ...this.#operations.slice(operationIndex + 1)
+    ];
+    if (result.status === "REJECTED_PERMANENT") {
+      const attempts = (operation.attempts ?? 0) + 1;
+      const error = {
+        code: result.errorCode,
+        message: result.reason
+      };
+      this.#rejectedHistory = [
+        ...this.#rejectedHistory,
+        {
+          operation: { ...operation, status: "REJECTED_PERMANENT", attempts },
+          reason: error,
+          errorCode: result.errorCode,
+          rejectedAt: (/* @__PURE__ */ new Date()).toISOString(),
+          attempts
+        }
+      ];
+      await this.#saveRejectedHistory();
+    }
+    await this.#storage.save(this.#storageKey(), this.#operations);
+    this.#announceChange();
+    await this.#syncResultListener?.({
+      operation,
+      status: result.status,
+      state: currentState,
+      ...result.status === "REJECTED_PERMANENT" ? { error: { code: result.errorCode, message: result.reason } } : {}
+    });
+  }
   async #rejectFailedPrerequisite(operation) {
     if (operation.kind !== "checkIn" || this.#replayConfig === void 0) return false;
     const spot2 = this.#replayConfig.spots.find(
@@ -1579,9 +1626,10 @@ var OfflineQueue = class {
     );
     if (spot2 === void 0) return false;
     const failedSpots = new Set(
-      this.#rejectedHistory.filter((entry) => entry.operation.kind === "checkIn").map(
-        (entry) => entry.operation.kind === "checkIn" ? entry.operation.request.spotId : void 0
-      ).filter((spotId) => spotId !== void 0)
+      [
+        ...this.#rejectedHistory.map((entry) => entry.operation),
+        ...this.#operations.filter((candidate) => candidate.status === "REJECTED_PERMANENT")
+      ].filter((candidate) => candidate.kind === "checkIn").map((candidate) => candidate.kind === "checkIn" ? candidate.request.spotId : void 0).filter((spotId) => spotId !== void 0)
     );
     if (!spot2.prerequisites?.some((prerequisite) => failedSpots.has(prerequisite))) return false;
     const error = {
@@ -1624,20 +1672,6 @@ var OfflineQueue = class {
       try {
         this.#channel = new Channel("stamprally:queue-sync");
         this.#channel.addEventListener("message", (event) => {
-          if (typeof event.data === "object" && event.data !== null) {
-            const data = event.data;
-            if (data.type === "lock" && data.lockKey === this.#lockKey()) {
-              this.#observedLocks.set(data.lockKey, {
-                owner: typeof data.owner === "string" ? data.owner : "unknown",
-                expiresAt: typeof data.expiresAt === "number" ? data.expiresAt : 0
-              });
-              return;
-            }
-            if (data.type === "unlock" && data.lockKey === this.#lockKey()) {
-              this.#observedLocks.delete(data.lockKey);
-              return;
-            }
-          }
           if (typeof event.data === "object" && event.data !== null && "key" in event.data && event.data.key === this.#storageKey())
             void this.#reloadFromStorage();
         });
@@ -1664,57 +1698,6 @@ var OfflineQueue = class {
     } catch {
     }
   }
-  #lockKey() {
-    return `${this.#storageKey()}:sync-lock`;
-  }
-  #acquireSyncLock() {
-    const key = this.#lockKey();
-    const now = Date.now();
-    const local = syncLocks.get(key);
-    if (local !== void 0 && local.expiresAt > now && local.owner !== this.#instanceId)
-      return false;
-    const observed = this.#observedLocks.get(key);
-    if (observed !== void 0 && observed.expiresAt > now && observed.owner !== this.#instanceId)
-      return false;
-    if (this.#lockStorage !== null) {
-      try {
-        const existing = this.#lockStorage.getItem(key);
-        if (existing !== null) {
-          const parsed = JSON.parse(existing);
-          if (typeof parsed === "object" && parsed !== null && typeof parsed.expiresAt === "number" && parsed.expiresAt > now && parsed.owner !== this.#instanceId)
-            return false;
-        }
-        this.#lockStorage.setItem(
-          key,
-          JSON.stringify({ owner: this.#instanceId, expiresAt: now + SYNC_LOCK_TTL_MS })
-        );
-        this.#channel?.postMessage({
-          type: "lock",
-          lockKey: key,
-          owner: this.#instanceId,
-          expiresAt: now + SYNC_LOCK_TTL_MS
-        });
-      } catch {
-        this.#warnMemoryLock("Persistent lock access failed; offline sync is single-tab only.");
-      }
-    }
-    syncLocks.set(key, { owner: this.#instanceId, expiresAt: now + SYNC_LOCK_TTL_MS });
-    return true;
-  }
-  #releaseSyncLock() {
-    const key = this.#lockKey();
-    const current = syncLocks.get(key);
-    if (current?.owner === this.#instanceId) syncLocks.delete(key);
-    if (this.#lockStorage !== null) {
-      try {
-        const value = this.#lockStorage.getItem(key);
-        if (value !== null && JSON.parse(value).owner === this.#instanceId)
-          this.#lockStorage.removeItem?.(key);
-        this.#channel?.postMessage({ type: "unlock", lockKey: key, owner: this.#instanceId });
-      } catch {
-      }
-    }
-  }
   #storageKey() {
     if (this.#configuredKey !== void 0) return this.#configuredKey;
     return `stamprally:queue:${this.#rallyId ?? "unscoped"}:${this.#userId ?? "anonymous"}`;
@@ -1737,17 +1720,22 @@ var OfflineQueue = class {
   async #saveRejectedHistory() {
     await this.#storage.saveRejectedHistory?.(this.#storageKey(), this.#rejectedHistory);
   }
-  #warnMemoryLock(message) {
-    if (this.#warnedMemoryLock) return;
-    this.#warnedMemoryLock = true;
+  #warnCapability(message) {
+    if (this.#warnedCapabilityMessages.has(message)) return;
+    this.#warnedCapabilityMessages.add(message);
     console.warn(`[@stamprally/core] ${message}`);
     this.#capabilityWarningListener?.({
       type: "STORAGE_CAPABILITY_WARNING",
       storageCapability: this.storageCapability === "memory" ? "memory" : "volatile_single_tab",
+      multiTabSync: "disabled_unsafe_environment",
       isStoragePersistent: this.isStoragePersistent,
       message
     });
   }
+  #hasWebLocks() {
+    const locks = globalThis.navigator?.locks;
+    return locks !== void 0 && typeof locks.request === "function";
+  }
 };
 function normalizeOperation(operation) {
   const status = operation.status;
@@ -1792,18 +1780,18 @@ function applyInventoryDelta(state, previous, optimistic) {
     if (before !== void 0 && after !== void 0)
       rewardRemaining[key] = Math.max(0, (currentRewards[key] ?? before) + after - before);
   }
-  return {
-    ...state,
-    inventory: {
-      ...currentInventory.sharedRemaining === void 0 || sharedDelta === void 0 ? {} : { sharedRemaining: Math.max(0, currentInventory.sharedRemaining + sharedDelta) },
-      ...Object.keys(rewardRemaining).length === 0 ? {} : { rewardRemaining }
-    }
+  const nextInventory = {
+    ...currentInventory.sharedRemaining === void 0 || sharedDelta === void 0 ? optimisticInventory.sharedRemaining === void 0 || sharedDelta === void 0 ? {} : { sharedRemaining: Math.max(0, optimisticInventory.sharedRemaining) } : { sharedRemaining: Math.max(0, currentInventory.sharedRemaining + sharedDelta) },
+    ...Object.keys(rewardRemaining).length === 0 ? {} : { rewardRemaining }
   };
+  return { ...state, inventory: nextInventory };
 }
-function applyOperation(state, operation, config) {
+function applyOperation(state, operation, config, rejectedCheckIns) {
   if (operation.kind === "checkIn") {
     const spot2 = config?.spots.find((candidate) => candidate.id === operation.request.spotId);
-    if (spot2?.prerequisites?.some((id2) => !state.records.some((record2) => record2.stampId === id2)))
+    if (spot2?.prerequisites?.some(
+      (id2) => rejectedCheckIns.has(id2) || !state.records.some((record2) => record2.stampId === id2)
+    ))
       return { state, prerequisiteFailed: true };
     if (state.records.some((record2) => record2.stampId === operation.request.spotId))
       return { state, prerequisiteFailed: false };
@@ -1850,11 +1838,21 @@ function rebuildUserStateFromLog(baselineOrOptions, operationsArgument, configAr
 function rebuildUserStateLog(baseline, operations, config) {
   let state = cloneState(baseline);
   const rejectedOperationIds = [];
+  const rejectedCheckIns = new Set(
+    operations.filter(
+      (operation) => operation.status === "REJECTED_PERMANENT" && operation.kind === "checkIn"
+    ).map((operation) => operation.kind === "checkIn" ? operation.request.spotId : void 0).filter((spotId) => spotId !== void 0)
+  );
   for (const operation of operations) {
+    if (operation.status === "REJECTED_PERMANENT") {
+      if (operation.kind === "checkIn") rejectedCheckIns.add(operation.request.spotId);
+      continue;
+    }
     if (!isReplayable(operation)) continue;
-    const replay = applyOperation(state, operation, config);
+    const replay = applyOperation(state, operation, config, rejectedCheckIns);
     if (replay.prerequisiteFailed) {
       rejectedOperationIds.push(operationId(operation));
+      if (operation.kind === "checkIn") rejectedCheckIns.add(operation.request.spotId);
       continue;
     }
     state = replay.state;
@@ -1902,9 +1900,36 @@ function emptyState(config, userId, now) {
     updatedAt: now
   };
 }
+function applyOptimisticRewardClaim(state, rewardId, reward2, now) {
+  if (reward2.claimTicketNumber === void 0 || state.inventory === void 0)
+    return {
+      ...state,
+      rewards: state.rewards.map((item) => item.rewardId === rewardId ? reward2 : item),
+      updatedAt: now
+    };
+  const currentInventory = state.inventory;
+  const currentRewardRemaining = currentInventory.rewardRemaining?.[rewardId];
+  return {
+    ...state,
+    rewards: state.rewards.map((item) => item.rewardId === rewardId ? reward2 : item),
+    updatedAt: now,
+    inventory: {
+      ...currentInventory.sharedRemaining === void 0 ? {} : { sharedRemaining: Math.max(0, currentInventory.sharedRemaining - 1) },
+      ...currentInventory.rewardRemaining === void 0 || currentRewardRemaining === void 0 ? {} : {
+        rewardRemaining: {
+          ...currentInventory.rewardRemaining,
+          [rewardId]: Math.max(0, currentRewardRemaining - 1)
+        }
+      }
+    }
+  };
+}
 function errorMessage(error, fallback) {
   return error !== void 0 && "message" in error && typeof error.message === "string" ? error.message : fallback;
 }
+function isSyncProgressResponse(value) {
+  return typeof value === "object" && value !== null && "results" in value && Array.isArray(value.results) && "currentState" in value && "syncTimestamp" in value;
+}
 var StampRallyClient = class {
   #listeners = /* @__PURE__ */ new Set();
   #eventListeners = /* @__PURE__ */ new Set();
@@ -1929,6 +1954,9 @@ var StampRallyClient = class {
     this.#offlineQueue = this.#options.offlineQueue;
     this.#offlineQueue?.setReplayConfig(config);
     this.#offlineQueue?.setSyncResultListener((event) => this.#handleOfflineSyncResult(event));
+    this.#offlineQueue?.setCapabilityWarningListener(
+      (warning) => this.#emitEvent({ type: "storageCapabilityWarning", warning })
+    );
     this.#offlineQueue?.setChangeListener(() => {
       this.#syncRevision += 1;
       if (this.#state !== null) this.#emit(this.#state);
@@ -1959,7 +1987,10 @@ var StampRallyClient = class {
     return this.#syncRevision;
   }
   get queueCapability() {
-    return this.#offlineQueue?.queueCapability ?? "custom";
+    return this.#offlineQueue?.queueCapability ?? {
+      storage: "custom",
+      multiTabSync: "disabled_unsafe_environment"
+    };
   }
   get storageCapability() {
     return this.#offlineQueue?.storageCapability ?? "custom";
@@ -2159,23 +2190,13 @@ var StampRallyClient = class {
           return result.ok ? this.#commitClaim(result) : this.#fail(result.error);
         } catch (error) {
           if (this.#offlineQueue === void 0) throw error;
-          const next2 = {
-            ...current,
-            rewards: current.rewards.map(
-              (item) => item.rewardId === rewardId ? local.value : item
-            ),
-            updatedAt: now
-          };
+          const next2 = applyOptimisticRewardClaim(current, rewardId, local.value, now);
           await this.#offlineQueue.enqueueClaimReward(request, next2);
           await this.#storage.save(next2);
           return this.#commitClaim({ ok: true, value: { state: next2, reward: local.value } });
         }
       }
-      const next = {
-        ...current,
-        rewards: current.rewards.map((item) => item.rewardId === rewardId ? local.value : item),
-        updatedAt: now
-      };
+      const next = applyOptimisticRewardClaim(current, rewardId, local.value, now);
       await this.#storage.save(next);
       return this.#commitClaim({ ok: true, value: { state: next, reward: local.value } });
     });
@@ -2186,7 +2207,9 @@ var StampRallyClient = class {
       this.#syncMetrics = { processed: 0, failed: 0 };
       try {
         const current = await this.initialize();
-        if (this.#offlineQueue !== void 0 && adapter !== void 0) {
+        const queuedOperations = this.#offlineQueue?.operations ?? [];
+        const hasPerOperationAdapters = adapter?.checkIn !== void 0 || adapter?.claimReward !== void 0;
+        if (this.#offlineQueue !== void 0 && adapter !== void 0 && hasPerOperationAdapters) {
           await this.#offlineQueue.sync(async (operation) => {
             if (operation.kind === "checkIn") {
               if (adapter.checkIn === void 0)
@@ -2203,12 +2226,16 @@ var StampRallyClient = class {
           return;
         }
         const localState = this.#state ?? current;
-        const serverState = await adapter.sync({
+        const syncResult = await adapter.sync({
           rallyId: this.#config.id,
           userId: this.#userId,
           state: localState,
-          ...this.#userId === this.#anonymousSessionId ? { anonymousSessionId: this.#anonymousSessionId } : {}
+          ...this.#userId === this.#anonymousSessionId ? { anonymousSessionId: this.#anonymousSessionId } : {},
+          ...this.#offlineQueue !== void 0 && !hasPerOperationAdapters && queuedOperations.length > 0 ? { operations: queuedOperations } : {}
         });
+        const progress = isSyncProgressResponse(syncResult) ? syncResult : void 0;
+        if (progress !== void 0) await this.#offlineQueue?.applySyncProgress(progress);
+        const serverState = isSyncProgressResponse(syncResult) ? syncResult.currentState : syncResult;
         const resolved = rebuildUserStateFromLog(
           serverState,
           this.#offlineQueue?.operations ?? [],
@@ -3249,7 +3276,7 @@ function validateRallyConfigRelations(config) {
       ["stockKey", reward2.stockKey],
       ["secondaryStockKey", reward2.secondaryStockKey]
     ]) {
-      if (key !== void 0 && key !== "__shared__" && inventory?.[key] === void 0)
+      if (key !== void 0 && (key === "__shared__" && inventory?.sharedStock === void 0 || key !== "__shared__" && inventory?.[key] === void 0))
         add(
           errors,
           `rewards[${index}].${field}`,
@@ -3257,13 +3284,6 @@ function validateRallyConfigRelations(config) {
           "missing_inventory_key"
         );
     }
-    if (reward2.stockKey === "__shared__" && inventory?.sharedStock === void 0)
-      add(
-        errors,
-        `rewards[${index}].stockKey`,
-        "sharedStock is not defined.",
-        "missing_inventory_key"
-      );
   });
   const visiting = /* @__PURE__ */ new Set();
   const visited = /* @__PURE__ */ new Set();