@mpgd/capacitor-play-billing 0.3.5 → 0.3.7

package/README.md

@@ -69,11 +69,17 @@ when `includePending` is set; each carries `token = purchaseToken` and
 `transactionId = orderId`, or the `play-token-sha256:<hex>` token key until
 Play assigns an order id, so the same purchase deduplicates in the ledger. A
 purchased entry whose `isAcknowledged` flag is absent counts as unfinished so a
-paid purchase is never dropped. A purchase for a SKU that is not in `products` (a retired product)
-or a multi-line purchase has no logical id for the reconciler, so it is left
-out of the list and of events and handed to the optional `onUnmappedPurchase`
-diagnostics hook instead; the backend finalizer still sees it through the
-Play Developer API. The plugin's `purchaseUpdated` listener backs
+paid purchase is never dropped. A purchase for a SKU that is not in `products`
+(a retired product) is still listed and emitted, with that product id as
+`sku` and the purchase token intact, so the reconciler can submit it when a
+logical id is still known. A multi-line purchase is listed the same way,
+with every product id joined by a comma (not a product-id character, so it
+cannot match one catalog SKU). The reconciler then fails that purchase's
+catalog lookup visibly instead of granting one line of it.
+`onUnmappedPurchase` still receives both, as diagnostics only: the backend
+finalizer acknowledges or consumes a token only after the client submits it
+and the ledger grants, and it has no path that can acknowledge a token
+without a logical product id. The plugin's `purchaseUpdated` listener backs
 `addListener`: deliveries leave in the order the plugin reported them (a
 purchase without an order id waits for the token digest, and later updates
 queue behind it), and a `cancelled` or `failed` update without a purchase is

package/dist/commerce-provider.d.ts

@@ -36,7 +36,7 @@ export interface CreateCapacitorPlayBillingCommerceProviderInput {
   readonly store?: StoreId;
   /** Extra plugin codes merged over `playBillingStoreSdkErrorCodeMap`. */
   readonly mapError?: StoreSdkErrorCodeMap;
-  /** Diagnostics for plugin purchases left out of recovery (retired SKU, multi-line); see the SDK input. */
+  /** Diagnostics for a retired SKU or a multi-line purchase. The purchase is still surfaced; see the SDK input. */
   readonly onUnmappedPurchase?: (purchase: PlayPurchase) => void;
 }
 /**

package/dist/store-sdk.d.ts

@@ -26,11 +26,13 @@ export interface CreateCapacitorPlayBillingStoreSdkInput {
   /** Defaults to `Capacitor.getPlatform() === 'android'`. */
   readonly isAndroid?: () => boolean;
   /**
-  * Diagnostics hook for a plugin purchase the SDK leaves out of
-  * `getAvailablePurchases` and events: a SKU not in `products` (for example
-  * a retired product) or a multi-line purchase. Such a purchase has no
-  * logical id for the reconciler; the backend finalizer still sees it
-  * through the Play Developer API.
+  * Diagnostics for a plugin purchase the current catalog does not sell, or
+  * that names more than one product id. The purchase is still returned and
+  * emitted (token and product ids) so the reconciler can submit it when a
+  * logical id is known, or fail that purchase visibly when it is not. This
+  * hook is not a substitute for that delivery: the backend finalizer only
+  * acknowledges a token the client submits, and it has no path that can
+  * acknowledge one without a logical product id.
   */
   readonly onUnmappedPurchase?: (purchase: PlayPurchase) => void;
 }
@@ -64,8 +66,11 @@ export declare class PlayBillingStoreSdkError extends Error implements StoreSdkE
 * provider normalizes (`PLAY_BILLING_TIMEOUT`, `PLAY_BILLING_INTERRUPTED`, and
 * `PLAY_BILLING_EMPTY_PURCHASE` become `OUTCOME_UNKNOWN` and stay recoverable).
 * `transactionId` is the order id or, until Play assigns one, the token key
-* `play-token-sha256:<hex>` existing ledgers already use. Nothing here grants, and
-* nothing here acknowledges or consumes: the backend finalizer owns both.
+* `play-token-sha256:<hex>` existing ledgers already use. An unfinished
+* purchase whose SKU is not in `products`, and a multi-line purchase, are
+* still listed and emitted so the reconciler can see the token. Nothing here
+* grants, and nothing here acknowledges or consumes: the backend finalizer
+* owns both.
 */
 export declare function createCapacitorPlayBillingStoreSdk(input: CreateCapacitorPlayBillingStoreSdkInput): CapacitorPlayBillingStoreSdk;
 /** Validates a Play purchase token: non-empty, at most 4096 characters, no padding or control characters. */

package/dist/store-sdk.js

@@ -68,8 +68,11 @@ export class PlayBillingStoreSdkError extends Error {
  * provider normalizes (`PLAY_BILLING_TIMEOUT`, `PLAY_BILLING_INTERRUPTED`, and
  * `PLAY_BILLING_EMPTY_PURCHASE` become `OUTCOME_UNKNOWN` and stay recoverable).
  * `transactionId` is the order id or, until Play assigns one, the token key
- * `play-token-sha256:<hex>` existing ledgers already use. Nothing here grants, and
- * nothing here acknowledges or consumes: the backend finalizer owns both.
+ * `play-token-sha256:<hex>` existing ledgers already use. An unfinished
+ * purchase whose SKU is not in `products`, and a multi-line purchase, are
+ * still listed and emitted so the reconciler can see the token. Nothing here
+ * grants, and nothing here acknowledges or consumes: the backend finalizer
+ * owns both.
  */
 export function createCapacitorPlayBillingStoreSdk(input) {
     const plugin = input.plugin ?? CapacitorPlayBilling;
@@ -117,7 +120,10 @@ export function createCapacitorPlayBillingStoreSdk(input) {
             // Diagnostics never break delivery.
         }
     };
-    /** Whether a plugin purchase maps to one configured SKU; anything else is diagnostics only. */
+    /**
+     * Whether a plugin purchase maps to one configured SKU. Anything else is
+     * still surfaced; this only feeds the diagnostics hook.
+     */
     const isMapped = (purchase) => {
         const sku = skuOf(purchase);
         if (sku !== undefined && products.has(sku)) {
@@ -188,7 +194,14 @@ export function createCapacitorPlayBillingStoreSdk(input) {
             emitLateTerminalResult(outcome);
             return;
         }
-        if (!isRecord(purchase) || !isMapped(purchase)) {
+        if (!isRecord(purchase)) {
+            return;
+        }
+        // A retired SKU and a multi-line purchase stay in the event. The
+        // reconciler submits a token only when it can resolve a logical id, and
+        // otherwise fails the catalog lookup instead of dropping the token.
+        isMapped(purchase);
+        if (surfaceSku(purchase) === undefined) {
             return;
         }
         enqueue(() => emitConverted(purchase));
@@ -352,9 +365,10 @@ export function createCapacitorPlayBillingStoreSdk(input) {
                 if (!isUnfinished(purchase, includePending)) {
                     continue;
                 }
-                if (!isMapped(purchase)) {
-                    // A retired SKU or a multi-line purchase has no logical id for the
-                    // reconciler; onUnmappedPurchase sees it.
+                isMapped(purchase);
+                if (surfaceSku(purchase) === undefined) {
+                    // Not a purchase the reconciler can name: no product id, or an id
+                    // the evidence rules reject. The diagnostics hook already saw it.
                     continue;
                 }
                 available.push(await toSdkPurchase(purchase));
@@ -434,7 +448,7 @@ function convertPurchase(purchase) {
     if (state !== 'pending' && state !== 'purchased') {
         throw evidenceInvalid('Play purchase state is invalid.');
     }
-    const sku = skuOf(purchase);
+    const sku = surfaceSku(purchase);
     if (sku === undefined) {
         throw evidenceInvalid('Play purchase must name exactly one product.');
     }
@@ -478,13 +492,40 @@ function buildSdkPurchase(purchase, parsed) {
             : {}),
     };
 }
-function skuOf(purchase) {
+function productIdsOf(purchase) {
     if (!isRecord(purchase)) {
         return undefined;
     }
     const products = purchase.products ?? purchase.productIds;
-    const sku = Array.isArray(products) && products.length === 1 ? products[0] : undefined;
-    return typeof sku === 'string' && productIdPattern.test(sku) ? sku : undefined;
+    if (!Array.isArray(products) || products.length === 0) {
+        return undefined;
+    }
+    const ids = [];
+    for (const id of products) {
+        if (typeof id !== 'string' || !productIdPattern.test(id) || ids.includes(id)) {
+            return undefined;
+        }
+        ids.push(id);
+    }
+    return ids;
+}
+function skuOf(purchase) {
+    const ids = productIdsOf(purchase);
+    return ids?.length === 1 ? ids[0] : undefined;
+}
+/**
+ * The SKU a surfaced purchase carries. One product id is that id, including
+ * a retired SKU that is no longer in `products`. Several ids are joined with
+ * a comma, which is not a product-id character, so the joined value cannot
+ * equal one catalog SKU and the reconciler fails the lookup instead of
+ * granting one line of a multi-line purchase.
+ */
+function surfaceSku(purchase) {
+    const ids = productIdsOf(purchase);
+    if (ids === undefined) {
+        return undefined;
+    }
+    return ids.length === 1 ? ids[0] : ids.join(',');
 }
 /**
  * The purchase state under its Billing 9.1.0 name, or under the 0.1 name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpgd/capacitor-play-billing",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "Opt-in Android Google Play Billing purchase collector for mpgd Capacitor games.",
   "license": "MIT",
   "repository": {
@@ -39,7 +39,7 @@
   "peerDependencies": {
     "@capacitor/core": "^8.5.1",
     "@mpgd/adapter-capacitor": "^0.12.0",
-    "@mpgd/bridge": "^0.14.0",
+    "@mpgd/bridge": "^0.15.0",
     "@mpgd/platform": "^0.27.0"
   },
   "devDependencies": {
@@ -48,10 +48,10 @@
     "ttsc": "0.32.1",
     "typescript": "7.0.2",
     "vitest": "^4.0.0",
-    "@mpgd/adapter-capacitor": "0.12.1",
-    "@mpgd/bridge": "0.14.2",
-    "@mpgd/game-services": "0.27.0",
-    "@mpgd/platform": "0.27.0"
+    "@mpgd/adapter-capacitor": "0.12.3",
+    "@mpgd/bridge": "0.15.0",
+    "@mpgd/platform": "0.27.2",
+    "@mpgd/game-services": "0.27.2"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",