@stamprally/server 0.17.0 → 0.18.0

package/dist/index.d.cts

@@ -93,6 +93,8 @@ interface ServerPersistenceAdapter {
     }>;
     /** Set false when the adapter cannot persist per-reward inventory atomically. */
     readonly supportsRewardStock?: boolean;
+    /** Must be true when a claim plan uses `secondaryStockKey`. */
+    readonly supportsSecondaryStock?: boolean;
     acquireLock(rallyId: string, lockKey: string, ttlMs: number): Promise<boolean>;
     releaseLock(rallyId: string, lockKey: string): Promise<void>;
     getRewardStock(rallyId: string, rewardId: string): Promise<number | null>;
@@ -117,6 +119,7 @@ interface InMemoryServerPersistenceOptions {
 declare class InMemoryServerPersistenceAdapter implements ServerPersistenceAdapter {
     #private;
     readonly supportsRewardStock: boolean;
+    readonly supportsSecondaryStock: boolean;
     constructor(options?: InMemoryServerPersistenceOptions);
     acquireLock(rallyId: string, key: string, ttlMs: number): Promise<boolean>;
     releaseLock(rallyId: string, key: string): Promise<void>;
@@ -271,12 +274,12 @@ declare class StampRallyServer {
     handleSync(request: Request): Promise<Response>;
     checkIn(request: CheckInRequest, authContext?: TrustedAuthContext): Promise<CheckInResponse>;
     claimReward(request: ClaimRewardRequest, authContext?: TrustedAuthContext): Promise<ClaimResponse>;
-    sync(rallyId: string, userId: string): Promise<UserRallyState>;
+    sync(rallyId: string, identity: string | TrustedAuthContext): Promise<UserRallyState>;
     syncProgress(request: {
         readonly rallyId: string;
         readonly userId?: string;
         readonly anonymousSessionId?: string;
-    }): Promise<UserRallyState>;
+    }, authContext: TrustedAuthContext): Promise<UserRallyState>;
 }
 
 /**

package/dist/index.d.ts

@@ -93,6 +93,8 @@ interface ServerPersistenceAdapter {
     }>;
     /** Set false when the adapter cannot persist per-reward inventory atomically. */
     readonly supportsRewardStock?: boolean;
+    /** Must be true when a claim plan uses `secondaryStockKey`. */
+    readonly supportsSecondaryStock?: boolean;
     acquireLock(rallyId: string, lockKey: string, ttlMs: number): Promise<boolean>;
     releaseLock(rallyId: string, lockKey: string): Promise<void>;
     getRewardStock(rallyId: string, rewardId: string): Promise<number | null>;
@@ -117,6 +119,7 @@ interface InMemoryServerPersistenceOptions {
 declare class InMemoryServerPersistenceAdapter implements ServerPersistenceAdapter {
     #private;
     readonly supportsRewardStock: boolean;
+    readonly supportsSecondaryStock: boolean;
     constructor(options?: InMemoryServerPersistenceOptions);
     acquireLock(rallyId: string, key: string, ttlMs: number): Promise<boolean>;
     releaseLock(rallyId: string, key: string): Promise<void>;
@@ -271,12 +274,12 @@ declare class StampRallyServer {
     handleSync(request: Request): Promise<Response>;
     checkIn(request: CheckInRequest, authContext?: TrustedAuthContext): Promise<CheckInResponse>;
     claimReward(request: ClaimRewardRequest, authContext?: TrustedAuthContext): Promise<ClaimResponse>;
-    sync(rallyId: string, userId: string): Promise<UserRallyState>;
+    sync(rallyId: string, identity: string | TrustedAuthContext): Promise<UserRallyState>;
     syncProgress(request: {
         readonly rallyId: string;
         readonly userId?: string;
         readonly anonymousSessionId?: string;
-    }): Promise<UserRallyState>;
+    }, authContext: TrustedAuthContext): Promise<UserRallyState>;
 }
 
 /**

package/dist/index.js

@@ -76,6 +76,7 @@ async function executeRedisTransaction(redis, queue) {
 // src/persistence.ts
 var InMemoryServerPersistenceAdapter = class {
   supportsRewardStock = true;
+  supportsSecondaryStock = true;
   #locks = /* @__PURE__ */ new Map();
   #idempotent = /* @__PURE__ */ new Map();
   #states = /* @__PURE__ */ new Map();
@@ -640,26 +641,41 @@ function initialState(config, userId, timestamp) {
     updatedAt: timestamp
   };
 }
-function rewardStock(config, rewardId, stockLimit) {
-  const configured = config.inventory?.[rewardId];
+function rewardStock(config, reward) {
+  const stockLimit = reward.stockLimit;
+  const key = reward.stockKey ?? reward.id;
+  const configured = key === "__shared__" ? config.inventory?.sharedStock : config.inventory?.[key];
   if (stockLimit === void 0) return configured ?? null;
   if (configured === void 0) return stockLimit;
   return Math.min(stockLimit, configured);
 }
 function sharedStock(config) {
-  return config.inventory?.sharedStock ?? config.inventory?.global ?? null;
+  return config.inventory?.sharedStock ?? null;
 }
 function inventoryPlan(config, rewardId, stockLimit) {
-  const individual = rewardStock(config, rewardId, stockLimit);
+  const reward = config.rewards.find((item) => item.id === rewardId);
+  const individual = reward === void 0 ? stockLimit ?? null : rewardStock(config, reward);
   const shared = sharedStock(config);
+  const explicitPrimaryKey = reward?.stockKey;
+  const explicitSecondaryKey = reward?.secondaryStockKey;
   if (config.inventoryMode === "shared" && shared !== null) {
     return {
-      primaryKey: "__shared__",
-      primaryInitial: shared,
-      ...individual === null ? {} : { secondaryKey: rewardId, secondaryInitial: individual }
+      primaryKey: explicitPrimaryKey ?? "__shared__",
+      primaryInitial: explicitPrimaryKey === void 0 ? shared : individual,
+      ...explicitSecondaryKey !== void 0 ? {
+        secondaryKey: explicitSecondaryKey,
+        secondaryInitial: config.inventory?.[explicitSecondaryKey] ?? individual
+      } : individual === null ? {} : { secondaryKey: rewardId, secondaryInitial: individual }
     };
   }
-  return { primaryKey: rewardId, primaryInitial: individual };
+  return {
+    primaryKey: explicitPrimaryKey ?? rewardId,
+    primaryInitial: individual,
+    ...explicitSecondaryKey === void 0 ? {} : {
+      secondaryKey: explicitSecondaryKey,
+      secondaryInitial: config.inventory?.[explicitSecondaryKey] ?? null
+    }
+  };
 }
 function getProof(context) {
   return context.type === "qr" ? context.token : context.type === "passcode" ? context.code : context.type === "gps" ? { latitude: context.latitude, longitude: context.longitude } : context.type === "nfc" ? context.tagId : context.value;
@@ -821,14 +837,20 @@ var StampRallyServer = class {
         401
       );
     const sessionId = request.headers.get("x-anonymous-session-id");
+    const authContext = {
+      authenticatedUserId: userId,
+      ...sessionId === null ? {} : { isAnonymous: true, sessionId }
+    };
     try {
       return json({
         ok: true,
-        state: await this.syncProgress({
-          rallyId: body.data.rallyId,
-          userId,
-          ...sessionId === null ? {} : { anonymousSessionId: sessionId }
-        })
+        state: await this.syncProgress(
+          {
+            rallyId: body.data.rallyId,
+            ...sessionId === null ? {} : { anonymousSessionId: sessionId }
+          },
+          authContext
+        )
       });
     } catch (error) {
       if (error instanceof RequestValidationException) return validationResponse(error.errors);
@@ -988,6 +1010,8 @@ var StampRallyServer = class {
         now(this.#options)
       );
     const plan = inventoryPlan(this.#config, reward.id, reward.stockLimit);
+    if (plan.secondaryKey !== void 0 && this.#persistence.supportsSecondaryStock !== true)
+      throw new Error("SECONDARY_STOCK_UNSUPPORTED");
     const inventoryEnabled = plan.primaryInitial !== null || plan.secondaryInitial !== void 0 && plan.secondaryInitial !== null;
     if (inventoryEnabled && (this.#persistence.supportsRewardStock === false || typeof this.#persistence.getRewardStock !== "function" || typeof this.#persistence.executeClaimRewardTransaction !== "function"))
       return this.#rememberClaim(
@@ -1022,7 +1046,7 @@ var StampRallyServer = class {
           rewardId: reward.id,
           stockKey: plan.primaryKey,
           ...plan.secondaryKey === void 0 ? {} : { secondaryStockKey: plan.secondaryKey },
-          rewardStockLimit: rewardStock(this.#config, reward.id, reward.stockLimit),
+          rewardStockLimit: rewardStock(this.#config, reward),
           sharedStockLimit: this.#config.inventoryMode === "shared" ? sharedStock(this.#config) : null,
           initialStock: plan.primaryInitial,
           ...plan.secondaryInitial === void 0 ? {} : { initialSecondaryStock: plan.secondaryInitial },
@@ -1154,21 +1178,24 @@ var StampRallyServer = class {
       await this.#persistence.releaseLock(request.rallyId, lockKey);
     }
   }
-  async sync(rallyId, userId) {
+  async sync(rallyId, identity) {
+    const userId = typeof identity === "string" ? identity : identity.authenticatedUserId;
     assertValidSyncParams({ rallyId, userId }, this.#config);
     const state2 = await this.#persistence.getUserState(rallyId, userId) ?? initialState(this.#config, userId, now(this.#options));
     return this.#attachInventory(state2);
   }
-  async syncProgress(request) {
-    const directRequest = withDirectIdentity(request);
+  async syncProgress(request, authContext) {
+    const directRequest = withDirectIdentity(request, authContext);
     assertValidSyncParams(directRequest, this.#config);
-    return this.sync(directRequest.rallyId, directRequest.userId);
+    return this.sync(directRequest.rallyId, authContext);
   }
   async #attachInventory(state2) {
     const rewardRemaining = {};
     for (const reward of this.#config.rewards) {
       const plan = inventoryPlan(this.#config, reward.id, reward.stockLimit);
       if (plan.secondaryKey !== void 0) {
+        if (this.#persistence.supportsSecondaryStock !== true)
+          throw new Error("SECONDARY_STOCK_UNSUPPORTED");
         const stock = await this.#persistence.getRewardStock(state2.rallyId, plan.secondaryKey);
         const remaining = stock ?? plan.secondaryInitial ?? null;
         if (remaining !== null) rewardRemaining[reward.id] = Math.max(0, remaining);