@stamprally/server 0.20.0 → 0.21.0

package/dist/index.d.cts

@@ -9,6 +9,12 @@ interface TrustedAuthContext {
     readonly sessionId?: string;
     readonly claims?: Record<string, unknown>;
 }
+/** Authentication accepted by direct server methods. Strings are a convenience for trusted callers. */
+type AuthInput = TrustedAuthContext | {
+    readonly userId: string;
+} | string;
+/** Normalizes the supported direct-method authentication forms at the server boundary. */
+declare function normalizeAuthContext(auth: AuthInput): TrustedAuthContext;
 /** @deprecated Use TrustedAuthContext. */
 type AuthenticationContext = TrustedAuthContext;
 
@@ -273,10 +279,10 @@ declare class StampRallyServer {
     handleCheckIn(request: Request): Promise<Response>;
     handleClaimReward(request: Request): Promise<Response>;
     handleSync(request: Request): Promise<Response>;
-    checkIn(request: CheckInRequest, authContext?: TrustedAuthContext): Promise<CheckInResponse>;
-    claimReward(request: ClaimRewardRequest, authContext?: TrustedAuthContext): Promise<ClaimResponse>;
+    checkIn(request: CheckInRequest, authInput?: AuthInput): Promise<CheckInResponse>;
+    claimReward(request: ClaimRewardRequest, authInput?: AuthInput): Promise<ClaimResponse>;
     sync(rallyId: string, identity: string | TrustedAuthContext): Promise<UserRallyState>;
-    syncProgress(request: SyncProgressRequest, authContext: TrustedAuthContext): Promise<SyncProgressResponse>;
+    syncProgress(request: SyncProgressRequest, authInput: AuthInput): Promise<SyncProgressResponse>;
 }
 
 /**
@@ -348,4 +354,4 @@ interface ServerOptions {
     readonly anonymousPolicy?: "session_scoped" | "reject" | "shared_global_opt_in_insecure";
 }
 
-export { type AuditLog, type AuthenticationContext, type CheckInRequest, type CheckInResponse, type CheckInTransactionMutation, type CheckInTransactionParams, type ClaimRewardMutationContext, type ClaimRewardRequest, type ClaimRewardTransactionMutation, type ClaimRewardTransactionParams, InMemoryServerPersistenceAdapter, type InMemoryServerPersistenceOptions, type RedisMultiExecutor, type RequestValidationError, RequestValidationException, type RequestValidationResult, type ServerOptions, type ServerPersistenceAdapter, type SqlCheckInStore, type SqlClaimRewardStore, type SqlTransactionDatabase, StampRallyServer, type SyncOperationStatus, type SyncProgressOperation, type SyncProgressRequest, type TrustedAuthContext, type UserClaimRecord, assertValidCheckInParams, assertValidClaimParams, assertValidSyncParams, executeCheckInTransaction, executeClaimRewardTransaction, executeRedisTransaction, runPersistenceAdapterComplianceTests, validateCheckInRequest, validateClaimRewardRequest, validateSyncRequest };
+export { type AuditLog, type AuthInput, type AuthenticationContext, type CheckInRequest, type CheckInResponse, type CheckInTransactionMutation, type CheckInTransactionParams, type ClaimRewardMutationContext, type ClaimRewardRequest, type ClaimRewardTransactionMutation, type ClaimRewardTransactionParams, InMemoryServerPersistenceAdapter, type InMemoryServerPersistenceOptions, type RedisMultiExecutor, type RequestValidationError, RequestValidationException, type RequestValidationResult, type ServerOptions, type ServerPersistenceAdapter, type SqlCheckInStore, type SqlClaimRewardStore, type SqlTransactionDatabase, StampRallyServer, type SyncOperationStatus, type SyncProgressOperation, type SyncProgressRequest, type TrustedAuthContext, type UserClaimRecord, assertValidCheckInParams, assertValidClaimParams, assertValidSyncParams, executeCheckInTransaction, executeClaimRewardTransaction, executeRedisTransaction, normalizeAuthContext, runPersistenceAdapterComplianceTests, validateCheckInRequest, validateClaimRewardRequest, validateSyncRequest };

package/dist/index.d.ts

@@ -9,6 +9,12 @@ interface TrustedAuthContext {
     readonly sessionId?: string;
     readonly claims?: Record<string, unknown>;
 }
+/** Authentication accepted by direct server methods. Strings are a convenience for trusted callers. */
+type AuthInput = TrustedAuthContext | {
+    readonly userId: string;
+} | string;
+/** Normalizes the supported direct-method authentication forms at the server boundary. */
+declare function normalizeAuthContext(auth: AuthInput): TrustedAuthContext;
 /** @deprecated Use TrustedAuthContext. */
 type AuthenticationContext = TrustedAuthContext;
 
@@ -273,10 +279,10 @@ declare class StampRallyServer {
     handleCheckIn(request: Request): Promise<Response>;
     handleClaimReward(request: Request): Promise<Response>;
     handleSync(request: Request): Promise<Response>;
-    checkIn(request: CheckInRequest, authContext?: TrustedAuthContext): Promise<CheckInResponse>;
-    claimReward(request: ClaimRewardRequest, authContext?: TrustedAuthContext): Promise<ClaimResponse>;
+    checkIn(request: CheckInRequest, authInput?: AuthInput): Promise<CheckInResponse>;
+    claimReward(request: ClaimRewardRequest, authInput?: AuthInput): Promise<ClaimResponse>;
     sync(rallyId: string, identity: string | TrustedAuthContext): Promise<UserRallyState>;
-    syncProgress(request: SyncProgressRequest, authContext: TrustedAuthContext): Promise<SyncProgressResponse>;
+    syncProgress(request: SyncProgressRequest, authInput: AuthInput): Promise<SyncProgressResponse>;
 }
 
 /**
@@ -348,4 +354,4 @@ interface ServerOptions {
     readonly anonymousPolicy?: "session_scoped" | "reject" | "shared_global_opt_in_insecure";
 }
 
-export { type AuditLog, type AuthenticationContext, type CheckInRequest, type CheckInResponse, type CheckInTransactionMutation, type CheckInTransactionParams, type ClaimRewardMutationContext, type ClaimRewardRequest, type ClaimRewardTransactionMutation, type ClaimRewardTransactionParams, InMemoryServerPersistenceAdapter, type InMemoryServerPersistenceOptions, type RedisMultiExecutor, type RequestValidationError, RequestValidationException, type RequestValidationResult, type ServerOptions, type ServerPersistenceAdapter, type SqlCheckInStore, type SqlClaimRewardStore, type SqlTransactionDatabase, StampRallyServer, type SyncOperationStatus, type SyncProgressOperation, type SyncProgressRequest, type TrustedAuthContext, type UserClaimRecord, assertValidCheckInParams, assertValidClaimParams, assertValidSyncParams, executeCheckInTransaction, executeClaimRewardTransaction, executeRedisTransaction, runPersistenceAdapterComplianceTests, validateCheckInRequest, validateClaimRewardRequest, validateSyncRequest };
+export { type AuditLog, type AuthInput, type AuthenticationContext, type CheckInRequest, type CheckInResponse, type CheckInTransactionMutation, type CheckInTransactionParams, type ClaimRewardMutationContext, type ClaimRewardRequest, type ClaimRewardTransactionMutation, type ClaimRewardTransactionParams, InMemoryServerPersistenceAdapter, type InMemoryServerPersistenceOptions, type RedisMultiExecutor, type RequestValidationError, RequestValidationException, type RequestValidationResult, type ServerOptions, type ServerPersistenceAdapter, type SqlCheckInStore, type SqlClaimRewardStore, type SqlTransactionDatabase, StampRallyServer, type SyncOperationStatus, type SyncProgressOperation, type SyncProgressRequest, type TrustedAuthContext, type UserClaimRecord, assertValidCheckInParams, assertValidClaimParams, assertValidSyncParams, executeCheckInTransaction, executeClaimRewardTransaction, executeRedisTransaction, normalizeAuthContext, runPersistenceAdapterComplianceTests, validateCheckInRequest, validateClaimRewardRequest, validateSyncRequest };

package/dist/index.js

@@ -639,6 +639,15 @@ function validateSyncRequest(value) {
     data: value
   };
 }
+
+// src/types.ts
+function normalizeAuthContext(auth) {
+  if (typeof auth === "string") return { authenticatedUserId: auth, isAnonymous: false };
+  if ("authenticatedUserId" in auth) return auth;
+  return { authenticatedUserId: auth.userId, isAnonymous: false };
+}
+
+// src/server.ts
 function json(body, status = 200) {
   return new Response(JSON.stringify(body), {
     status,
@@ -789,8 +798,17 @@ function syncOperationResult(operation, userId, result) {
     reason: result.ok ? "The operation was rejected." : result.message
   };
 }
-function withDirectIdentity(request, authContext) {
-  if (authContext !== void 0) {
+function syncOperationError(operation, userId, error) {
+  return {
+    operationId: syncOperationId(operation, userId),
+    status: "FAILED_RETRYABLE",
+    resourceId: operation.kind === "checkIn" ? operation.request.spotId : operation.request.rewardId,
+    error: error instanceof Error ? error.message : "Unknown server error"
+  };
+}
+function withDirectIdentity(request, authInput) {
+  if (authInput !== void 0) {
+    const authContext = normalizeAuthContext(authInput);
     if (authContext.authenticatedUserId.trim() === "")
       throw new RequestValidationException([
         {
@@ -938,8 +956,8 @@ var StampRallyServer = class {
       throw error;
     }
   }
-  async checkIn(request, authContext) {
-    const directRequest = withDirectIdentity(request, authContext);
+  async checkIn(request, authInput) {
+    const directRequest = withDirectIdentity(request, authInput);
     assertValidCheckInParams(directRequest, this.#config);
     const { userId } = directRequest;
     const key = `check-in:${request.rallyId}:${userId}:${request.idempotencyKey}`;
@@ -1072,8 +1090,8 @@ var StampRallyServer = class {
       await this.#persistence.releaseLock(request.rallyId, lockKey);
     }
   }
-  async claimReward(request, authContext) {
-    const directRequest = withDirectIdentity(request, authContext);
+  async claimReward(request, authInput) {
+    const directRequest = withDirectIdentity(request, authInput);
     assertValidClaimParams(directRequest, this.#config);
     const { userId } = directRequest;
     const key = `claim:${request.rallyId}:${userId}:${request.rewardId}:${request.idempotencyKey}`;
@@ -1265,35 +1283,47 @@ var StampRallyServer = class {
     const state2 = await this.#persistence.getUserState(rallyId, userId) ?? initialState(this.#config, userId, now(this.#options));
     return this.#attachInventory(state2);
   }
-  async syncProgress(request, authContext) {
-    const directRequest = withDirectIdentity(request, authContext);
-    assertValidSyncParams(directRequest, this.#config);
+  async syncProgress(request, authInput) {
+    const directRequest = withDirectIdentity(request, authInput);
+    const authContext = normalizeAuthContext(authInput);
+    assertValidSyncParams(
+      {
+        rallyId: directRequest.rallyId,
+        userId: directRequest.userId,
+        ...directRequest.anonymousSessionId === void 0 ? {} : { anonymousSessionId: directRequest.anonymousSessionId }
+      },
+      this.#config
+    );
     const results = [];
     const rejectedCheckIns = /* @__PURE__ */ new Set();
     const operations = [...request.operations ?? []].map((operation, index) => ({ operation, index })).sort(
       (left, right) => operationTimestamp(left.operation) - operationTimestamp(right.operation) || left.index - right.index
     ).map(({ operation }) => operation);
     for (const operation of operations) {
-      const resourceId = operation.kind === "checkIn" ? operation.request.spotId : operation.request.rewardId;
-      if (operation.kind === "checkIn") {
-        const spot = this.#config.spots.find((candidate) => candidate.id === resourceId);
-        if (spot?.prerequisites?.some((prerequisite) => rejectedCheckIns.has(prerequisite))) {
-          results.push({
-            operationId: syncOperationId(operation, directRequest.userId),
-            status: "REJECTED_PERMANENT",
-            resourceId,
-            errorCode: "REJECTED_PREREQUISITE_FAILED",
-            reason: "A prerequisite operation was rejected by the server."
-          });
-          rejectedCheckIns.add(resourceId);
-          continue;
+      try {
+        const resourceId = operation.kind === "checkIn" ? operation.request.spotId : operation.request.rewardId;
+        if (operation.kind === "checkIn") {
+          const spot = this.#config.spots.find((candidate) => candidate.id === resourceId);
+          if (spot?.prerequisites?.some((prerequisite) => rejectedCheckIns.has(prerequisite))) {
+            results.push({
+              operationId: syncOperationId(operation, directRequest.userId),
+              status: "REJECTED_PERMANENT",
+              resourceId,
+              errorCode: "REJECTED_PREREQUISITE_FAILED",
+              reason: "A prerequisite operation was rejected by the server."
+            });
+            rejectedCheckIns.add(resourceId);
+            continue;
+          }
         }
+        const result = operation.kind === "checkIn" ? await this.checkIn(operation.request, authContext) : await this.claimReward(operation.request, authContext);
+        const operationResult = syncOperationResult(operation, directRequest.userId, result);
+        results.push(operationResult);
+        if (operation.kind === "checkIn" && operationResult.status === "REJECTED_PERMANENT")
+          rejectedCheckIns.add(resourceId);
+      } catch (error) {
+        results.push(syncOperationError(operation, directRequest.userId, error));
       }
-      const result = operation.kind === "checkIn" ? await this.checkIn(operation.request, authContext) : await this.claimReward(operation.request, authContext);
-      const operationResult = syncOperationResult(operation, directRequest.userId, result);
-      results.push(operationResult);
-      if (operation.kind === "checkIn" && operationResult.status === "REJECTED_PERMANENT")
-        rejectedCheckIns.add(resourceId);
     }
     const currentState = await this.sync(directRequest.rallyId, authContext);
     return {
@@ -1522,6 +1552,6 @@ async function runPersistenceAdapterComplianceTests(createAdapter) {
   );
 }
 
-export { InMemoryServerPersistenceAdapter, RequestValidationException, StampRallyServer, assertValidCheckInParams, assertValidClaimParams, assertValidSyncParams, executeCheckInTransaction, executeClaimRewardTransaction, executeRedisTransaction, runPersistenceAdapterComplianceTests, validateCheckInRequest, validateClaimRewardRequest, validateSyncRequest };
+export { InMemoryServerPersistenceAdapter, RequestValidationException, StampRallyServer, assertValidCheckInParams, assertValidClaimParams, assertValidSyncParams, executeCheckInTransaction, executeClaimRewardTransaction, executeRedisTransaction, normalizeAuthContext, runPersistenceAdapterComplianceTests, validateCheckInRequest, validateClaimRewardRequest, validateSyncRequest };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map