@mpgd/game-services 0.30.5 → 0.32.0

package/dist/server.js

@@ -1,12 +1,16 @@
+import { COMMON_ERROR_STATUS_MAP } from '@orpc/client';
 import { implement, ORPCError } from '@orpc/server';
-import { BodyLimitHandlerPlugin, RPCHandler } from '@orpc/server/fetch';
+import { RPCHandler } from '@orpc/server/fetch';
+import { RequestLimitHandlerPlugin } from '@orpc/server/plugins';
 import { createAnalyticsReporter } from '@mpgd/analytics';
 import { resolveAdPlacementPlatformId, resolveCatalogCurrencies, resolveProductPlatformId, } from '@mpgd/catalog';
 import { gameServicesBackendEndpoints, } from './client.js';
 import { resolveCommerceStoreId, } from './commerce-evidence-registry.js';
 import { createPurchaseHolderEvidenceVerificationId, findEntitlementRevocationsChunked, findPurchaseWideRevocation, holderRevocationEvidenceId, isEntitlementGrantReversed, isRestoredAcrossPlayers, listPurchaseHolders, readPurchaseLedgerStatuses, readPurchaseVerificationId, RevocationKeyConflictError, revokeEntitlementGrant, } from './commerce-ledger.js';
 import { assertPlayerDataErasureInput, createRetainedLedgerEntryId, detachRetainedLedgerPayload, isRetainedPlayerId, } from './account-deletion.js';
+import { createPurchaseBoundToAnotherAccountBody, GameServicesPurchaseBoundToAnotherAccountError, isStoreAccountMismatchReason, purchaseBoundToAnotherAccountCode, purchaseBoundToAnotherAccountStatus, } from './another-account.js';
 import { gameServicesContract } from './contract.js';
+import { addLegacyOrpcErrorFlag } from './orpc-error-compat.js';
 import { createRejectingGameServicesEvidenceVerifier, } from './evidence-verification.js';
 import { assertClaimAdRewardRequest, assertClaimAdRewardResponse, assertEntitlementLedgerGrant, assertEntitlementLedgerNote, assertEntitlementLedgerResult, assertEntitlementLedgerRevocation, assertEntitlementRevocationTransaction, assertGameServicesDeploymentTarget, assertLeaderboardScoreTransaction, assertProductGrantTransaction, assertPurchaseGrantFinalization, assertRecordLeaderboardScoreRequest, assertRecordLeaderboardScoreResponse, assertVerifyPurchaseRequest, assertVerifyPurchaseResponse, } from './types.js';
 import { resolvePurchaseRestoreSharingPolicy, } from './purchase-sharing.js';
@@ -405,6 +409,23 @@ export function createGameServicesBackend(input) {
                         : { purchaseGrantFinalizer }),
                     ...(registry === undefined ? {} : { registry }),
                 }, async (verification) => {
+                    if (verification instanceof GameServicesPurchaseBoundToAnotherAccountError) {
+                        // Refused for this player, not decided for its account: tracked
+                        // as a refusal with the mark, never as a pending purchase.
+                        await analytics.track({
+                            name: 'purchase_rejected',
+                            properties: {
+                                target: request.target,
+                                store: resolveCommerceStoreId(request),
+                                playerId: request.playerId,
+                                productId: request.productId,
+                                alreadyProcessed: false,
+                                reason: verification.code,
+                                boundToAnotherAccount: verification.reason,
+                            },
+                        });
+                        return;
+                    }
                     await analytics.track({
                         name: verification.verified ? 'purchase_granted'
                             : verification.disposition === 'pending' ? 'purchase_pending' : 'purchase_rejected',
@@ -519,6 +540,12 @@ export function createGameServicesBackendApiHandler(input) {
                 if (error instanceof GameServicesRequestValidationError) {
                     return errorResponse(400, 'INVALID_REQUEST', error.message);
                 }
+                if (error instanceof GameServicesPurchaseBoundToAnotherAccountError) {
+                    return {
+                        status: purchaseBoundToAnotherAccountStatus,
+                        body: createPurchaseBoundToAnotherAccountBody(error.reason),
+                    };
+                }
                 reportInternalError(input.onInternalError, error);
                 return errorResponse(500, 'INTERNAL_ERROR');
             }
@@ -571,6 +598,15 @@ export function createGameServicesRouter(backend, options = {}) {
             if (error instanceof GameServicesRequestValidationError) {
                 throw new ORPCError('BAD_REQUEST', { message: error.message });
             }
+            if (error instanceof GameServicesPurchaseBoundToAnotherAccountError) {
+                // A retryable answer, not an internal error: the code and reason reach the client.
+                // oRPC beta.46 errors carry no status: `gameServicesRpcErrorStatusMap`
+                // (used by `createGameServicesRpcFetchHandler`) maps the code to 409.
+                throw new ORPCError(purchaseBoundToAnotherAccountCode, {
+                    message: error.message,
+                    data: { reason: error.reason },
+                });
+            }
             reportInternalError(options.onInternalError, error);
             throw error;
         }
@@ -610,16 +646,31 @@ export function createGameServicesRouter(backend, options = {}) {
         }),
     });
 }
+/**
+ * The RPC handler's error status map: oRPC's common codes and
+ * `PURCHASE_BOUND_TO_ANOTHER_ACCOUNT` at 409. oRPC 2.0.0-beta.46 derives the
+ * HTTP status of an error from its code through this map (an `ORPCError`
+ * carries no status of its own), so a host that mounts
+ * `createGameServicesRouter` in its own `RPCHandler` passes it as
+ * `errorStatusMap` to answer 409 too; without it the code still reaches the
+ * client, with status 500.
+ */
+export const gameServicesRpcErrorStatusMap = Object.freeze({
+    ...COMMON_ERROR_STATUS_MAP,
+    [purchaseBoundToAnotherAccountCode]: purchaseBoundToAnotherAccountStatus,
+});
 export function createGameServicesRpcFetchHandler(router, options = {}) {
     const rpcHandler = new RPCHandler(router, {
+        errorStatusMap: { ...gameServicesRpcErrorStatusMap },
         plugins: [
-            new BodyLimitHandlerPlugin({
+            new RequestLimitHandlerPlugin({
                 maxBodySize: resolveMaxBodyBytes(options.maxBodyBytes),
             }),
         ],
     });
     const prefix = options.prefix ?? '/rpc';
     const healthPath = options.healthPath ?? '/health';
+    const legacyOrpcErrorFlag = options.legacyOrpcErrorFlag ?? true;
     return async (request) => {
         const requestUrl = new URL(request.url);
         if (requestUrl.pathname === healthPath) {
@@ -637,7 +688,11 @@ export function createGameServicesRpcFetchHandler(router, options = {}) {
         if (!result.matched) {
             return textResponse('Not Found', 404, options.corsHeaders);
         }
-        return withCors(result.response, options.corsHeaders);
+        // Error bodies keep the pre-beta.34 `inferable` flag so older game clients decode them.
+        const response = legacyOrpcErrorFlag
+            ? await addLegacyOrpcErrorFlag(result.response)
+            : result.response;
+        return withCors(response, options.corsHeaders);
     };
 }
 export function createGameServicesHttpFetchHandler(handler, options = {}) {
@@ -780,7 +835,21 @@ async function verifyPurchaseWithStore(input, context, onDecision) {
             : { deploymentTarget: request.deploymentTarget }),
     };
     return withEntitlementRetryLock(retryIdentity, async () => {
-        const verification = await verifyPurchaseForRetry(request, retryIdentity, context);
+        let verification;
+        try {
+            verification = await verifyPurchaseForRetry(request, retryIdentity, context);
+        }
+        catch (error) {
+            if (error instanceof GameServicesPurchaseBoundToAnotherAccountError) {
+                try {
+                    await onDecision(error);
+                }
+                catch {
+                    // Analytics is best-effort: a failed report never replaces the answer.
+                }
+            }
+            throw error;
+        }
         await onDecision(verification);
         return verification;
     });
@@ -855,18 +924,27 @@ async function verifyPurchaseForRetry(request, retryIdentity, context) {
         ? routedEntry.entry.store
         : resolveCommerceStoreId(request);
     if (verification.status === 'restorable') {
-        // A verified restore of a purchase the store binds to another player.
+        // A verified restore of a purchase the store binds to another player, or to none.
         return shareRestoredPurchase(request, {
             product,
             platformProductId,
             verification,
             verifiedStore,
-            refusal: assertVerifyPurchaseResponse({
-                verified: false,
-                alreadyProcessed: false,
-                disposition: 'rejected',
-                reason: verification.reason,
-            }),
+            refusal: () => {
+                if (isStoreAccountMismatchReason(verification.reason)) {
+                    // No share for this player: the purchase stays its account's,
+                    // which can still restore it (RFC "Another account's purchase").
+                    throw new GameServicesPurchaseBoundToAnotherAccountError(verification.reason);
+                }
+                // Bound to no account (`*_MISSING`) or a custom verifier's reason:
+                // no account can claim it, so the refusal is final.
+                return assertVerifyPurchaseResponse({
+                    verified: false,
+                    alreadyProcessed: false,
+                    disposition: 'rejected',
+                    reason: verification.reason,
+                });
+            },
         }, context);
     }
     if (verification.status !== 'verified') {
@@ -876,6 +954,12 @@ async function verifyPurchaseForRetry(request, retryIdentity, context) {
         if (racedExisting !== undefined) {
             return completeExistingRetry(racedExisting);
         }
+        if (verification.status === 'rejected' && verification.anotherAccount === true) {
+            // Another account's valid purchase: nothing is granted or recorded, and
+            // the answer is a retryable error, never a `rejected` receipt that would
+            // end the client's record and block its account's recovery.
+            throw new GameServicesPurchaseBoundToAnotherAccountError(verification.reason);
+        }
         return assertVerifyPurchaseResponse({
             verified: false,
             alreadyProcessed: false,
@@ -985,6 +1069,22 @@ async function verifyPurchaseForRetry(request, retryIdentity, context) {
                     finalization,
                 });
             }
+            if (product.type === 'consumable'
+                && routedEntry?.status === 'routed'
+                && routedEntry.entry.finish === 'client') {
+                // This player's own grant of a consumable the client finishes
+                // (StoreKit): the store still lists the transaction, so its finish
+                // never happened or never reached the client's journal, and the
+                // client's record of it is gone (journal retention), so it asks
+                // under the derived key. The recorded grant is reported, never a
+                // second one, so the client can finish the transaction instead of
+                // the store re-delivering it on every launch.
+                return assertVerifyPurchaseResponse({
+                    verified: true,
+                    ledgerEntryId: existingEvidence.ledgerEntryId,
+                    alreadyProcessed: true,
+                });
+            }
         }
         return assertVerifyPurchaseResponse({
             verified: false,
@@ -1088,6 +1188,15 @@ function createPurchaseGrantPayload(request, input) {
         evidenceVerifiedAt: input.verification.verifiedAt,
     };
 }
+/**
+ * Whether the `share` policy applies: a non-consumable, asked as a restore
+ * unless the store binds it to this player.
+ */
+function sharesRestoredPurchase(request, product, context, bindingMatches = false) {
+    return context.restoreSharing.mode === 'share'
+        && (request.intent === 'restore' || bindingMatches)
+        && product.type === 'non_consumable';
+}
 /**
  * A verified restore of a non-consumable the store binds to another player
  * (RFC "Restore sharing"). Under the `share` policy, for a request with
@@ -1102,10 +1211,8 @@ function createPurchaseGrantPayload(request, input) {
 async function shareRestoredPurchase(request, input, context) {
     const { store, restoreSharing: policy } = context;
     const { product, verification } = input;
-    if (policy.mode !== 'share'
-        || (request.intent !== 'restore' && input.bindingMatches !== true)
-        || product.type !== 'non_consumable') {
-        return input.refusal;
+    if (!sharesRestoredPurchase(request, product, context, input.bindingMatches === true)) {
+        return typeof input.refusal === 'function' ? input.refusal() : input.refusal;
     }
     const purchaseVerificationId = verification.verificationId;
     const notGranted = (disposition, reason) => ({
@@ -1717,6 +1824,9 @@ function assertEvidenceVerificationDecision(decision) {
     }
     if (decision.status === 'rejected') {
         assertNonEmptyDecisionString(decision.reason, 'reason');
+        if (decision.anotherAccount !== undefined && decision.anotherAccount !== true) {
+            throw new Error('Evidence verification anotherAccount must be true when present.');
+        }
         return decision;
     }
     throw new Error('Unknown evidence verification status.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpgd/game-services",
-  "version": "0.30.5",
+  "version": "0.32.0",
   "description": "Client, contract, server, store, and test helpers for authoritative mpgd game services.",
   "license": "MIT",
   "repository": {
@@ -228,12 +228,12 @@
   "dependencies": {
     "@ait-kit/api-core": "0.6.0",
     "@noble/secp256k1": "3.1.0",
-    "@orpc/client": "2.0.0-beta.14",
-    "@orpc/contract": "2.0.0-beta.14",
-    "@orpc/server": "2.0.0-beta.14",
-    "@mpgd/analytics": "0.5.5",
-    "@mpgd/platform": "0.32.0",
-    "@mpgd/catalog": "0.13.0"
+    "@orpc/client": "2.0.0-beta.46",
+    "@orpc/contract": "2.0.0-beta.46",
+    "@orpc/server": "2.0.0-beta.46",
+    "@mpgd/analytics": "0.5.7",
+    "@mpgd/platform": "0.34.0",
+    "@mpgd/catalog": "0.14.1"
   },
   "peerDependencies": {
     "@apple/app-store-server-library": "^3.1.0"
@@ -246,7 +246,7 @@
   "devDependencies": {
     "@apple/app-store-server-library": "3.1.0",
     "@opentelemetry/api": "1.9.0",
-    "ttsc": "0.32.1",
+    "ttsc": "0.34.2",
     "typescript": "7.0.2",
     "vitest": "^4.0.0"
   },
@@ -262,7 +262,7 @@
     "fix": "ttsc fix",
     "build": "cd ../.. && node tools/run-ttsx.mjs tools/package/build-packages.ts @mpgd/game-services",
     "test:packed-transport": "pnpm build && node test/runtime-transport-package-import.mjs && node test/reward-evidence-import.mjs",
-    "test:unit": "cd ../.. && node tools/run-ttsx.mjs packages/game-services/src/client.test.ts && node tools/run-ttsx.mjs packages/game-services/src/client-progress.test.ts && node tools/run-ttsx.mjs packages/game-services/src/runtime.test.ts && node tools/run-ttsx.mjs packages/game-services/src/types.test.ts && node tools/run-ttsx.mjs packages/game-services/src/server.test.ts && node tools/run-ttsx.mjs packages/game-services/src/google-play-purchase.test.ts && node tools/run-ttsx.mjs packages/game-services/src/google-play-publisher-client.test.ts && node tools/run-ttsx.mjs packages/game-services/src/google-play-store-server.test.ts && node tools/run-ttsx.mjs packages/game-services/src/microsoft-store-purchase.test.ts && node tools/run-ttsx.mjs packages/game-services/src/microsoft-store-identity.test.ts && node tools/run-ttsx.mjs packages/game-services/src/platform-order.test.ts && node tools/run-ttsx.mjs packages/game-services/src/progress-link.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notification-delivery.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/service.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/service-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/client.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/client-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/scheduler.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/fcm.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/store-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/ait-functional-delivery.test.ts && node tools/run-ttsx.mjs packages/game-services/src/admob-ssv.test.ts && node tools/run-ttsx.mjs packages/game-services/src/app-store-verifier.test.ts && node tools/run-ttsx.mjs packages/game-services/src/app-store-server-notifications.test.ts && node tools/run-ttsx.mjs packages/game-services/src/apps-in-toss-evidence-verification-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/apps-in-toss-partner-api.test.ts && node tools/run-ttsx.mjs packages/game-services/src/verified-leaderboard.test.ts && node tools/run-ttsx.mjs packages/game-services/src/verified-leaderboard-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/verified-leaderboard-durability-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/verified-leaderboard-transport.test.ts && node tools/run-ttsx.mjs packages/game-services/src/guest-session.test.ts && node tools/run-ttsx.mjs packages/game-services/src/development-session.test.ts && node tools/run-ttsx.mjs packages/game-services/src/client-reward-evidence.test.ts && node tools/run-ttsx.mjs packages/game-services/src/ad-reward-verifier-registry.test.ts && node tools/run-ttsx.mjs packages/game-services/src/oneplay-reward.test.ts && node tools/run-ttsx.mjs packages/game-services/src/oneplay-purchase.test.ts && node tools/run-ttsx.mjs packages/game-services/src/commerce-registry-routing.test.ts && node tools/run-ttsx.mjs packages/game-services/src/commerce-registry-server.test.ts && node tools/run-ttsx.mjs packages/game-services/src/commerce-ledger-revocation.test.ts && node tools/run-ttsx.mjs packages/game-services/src/purchase-sharing.test.ts && node tools/run-ttsx.mjs packages/game-services/src/apps-in-toss-anonymous-auth.test.ts && node tools/run-ttsx.mjs packages/game-services/src/account-deletion.test.ts",
+    "test:unit": "cd ../.. && node tools/run-ttsx.mjs packages/game-services/src/client.test.ts && node tools/run-ttsx.mjs packages/game-services/src/client-progress.test.ts && node tools/run-ttsx.mjs packages/game-services/src/runtime.test.ts && node tools/run-ttsx.mjs packages/game-services/src/runtime-session.test.ts && node tools/run-ttsx.mjs packages/game-services/src/types.test.ts && node tools/run-ttsx.mjs packages/game-services/src/server.test.ts && node tools/run-ttsx.mjs packages/game-services/src/orpc-error-compat.test.ts && node tools/run-ttsx.mjs packages/game-services/src/google-play-purchase.test.ts && node tools/run-ttsx.mjs packages/game-services/src/google-play-publisher-client.test.ts && node tools/run-ttsx.mjs packages/game-services/src/google-play-store-server.test.ts && node tools/run-ttsx.mjs packages/game-services/src/microsoft-store-purchase.test.ts && node tools/run-ttsx.mjs packages/game-services/src/microsoft-store-identity.test.ts && node tools/run-ttsx.mjs packages/game-services/src/platform-order.test.ts && node tools/run-ttsx.mjs packages/game-services/src/progress-link.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notification-delivery.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/service.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/service-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/client.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/client-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/scheduler.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/fcm.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/store-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/notifications/ait-functional-delivery.test.ts && node tools/run-ttsx.mjs packages/game-services/src/admob-ssv.test.ts && node tools/run-ttsx.mjs packages/game-services/src/app-store-verifier.test.ts && node tools/run-ttsx.mjs packages/game-services/src/app-store-server-notifications.test.ts && node tools/run-ttsx.mjs packages/game-services/src/apps-in-toss-evidence-verification-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/apps-in-toss-partner-api.test.ts && node tools/run-ttsx.mjs packages/game-services/src/verified-leaderboard.test.ts && node tools/run-ttsx.mjs packages/game-services/src/verified-leaderboard-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/verified-leaderboard-durability-conformance.test.ts && node tools/run-ttsx.mjs packages/game-services/src/verified-leaderboard-transport.test.ts && node tools/run-ttsx.mjs packages/game-services/src/guest-session.test.ts && node tools/run-ttsx.mjs packages/game-services/src/development-session.test.ts && node tools/run-ttsx.mjs packages/game-services/src/client-reward-evidence.test.ts && node tools/run-ttsx.mjs packages/game-services/src/ad-reward-verifier-registry.test.ts && node tools/run-ttsx.mjs packages/game-services/src/oneplay-reward.test.ts && node tools/run-ttsx.mjs packages/game-services/src/oneplay-purchase.test.ts && node tools/run-ttsx.mjs packages/game-services/src/commerce-registry-routing.test.ts && node tools/run-ttsx.mjs packages/game-services/src/commerce-registry-server.test.ts && node tools/run-ttsx.mjs packages/game-services/src/commerce-ledger-revocation.test.ts && node tools/run-ttsx.mjs packages/game-services/src/purchase-sharing.test.ts && node tools/run-ttsx.mjs packages/game-services/src/apps-in-toss-anonymous-auth.test.ts && node tools/run-ttsx.mjs packages/game-services/src/account-deletion.test.ts",
     "test:recovery": "cd ../.. && node tools/run-ttsx.mjs packages/game-services/src/monetization-recovery.test.ts && node tools/run-ttsx.mjs packages/game-services/src/app-store-recovery.test.ts && node tools/run-ttsx.mjs packages/game-services/src/commerce-reconciler.test.ts && node tools/run-ttsx.mjs packages/game-services/src/commerce-reconciler-conformance.test.ts",
     "test": "pnpm test:unit && pnpm test:app-store-server && pnpm test:recovery && pnpm test:packed-transport",
     "test:app-store-server": "vitest run"