@idealyst/payments 1.2.109 → 1.2.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idealyst/payments",
-  "version": "1.2.109",
+  "version": "1.2.111",
   "description": "Cross-platform In-App Purchase wrapper for React Native (StoreKit 2, Google Play Billing)",
   "documentation": "https://github.com/IdealystIO/idealyst-framework/tree/main/packages/payments#readme",
   "readme": "README.md",

package/src/errors.ts

@@ -11,56 +11,79 @@ export function createIAPError(
 /**
  * Normalize a react-native-iap error (or any thrown value) into an IAPError.
  *
- * react-native-iap errors have a `code` property with values like
- * "E_USER_CANCELLED", "E_ALREADY_OWNED", etc.
+ * react-native-iap v14 uses kebab-case ErrorCode enum values (e.g. 'user-cancelled').
+ * Older versions used E_ prefix strings (e.g. 'E_USER_CANCELLED').
+ * Both formats are handled here.
  */
 export function normalizeError(error: unknown): IAPError {
   if (error && typeof error === 'object' && 'code' in error) {
     const iapError = error as { code?: string; message?: string };
 
     switch (iapError.code) {
+      // v14: 'user-cancelled' | legacy: 'E_USER_CANCELLED'
+      case 'user-cancelled':
       case 'E_USER_CANCELLED':
         return createIAPError(
           'user_cancelled',
           'Purchase was cancelled by user',
           error,
         );
+      // v14: 'already-owned' | legacy: 'E_ALREADY_OWNED'
+      case 'already-owned':
       case 'E_ALREADY_OWNED':
         return createIAPError(
           'already_owned',
           'This item has already been purchased',
           error,
         );
+      // v14: 'not-prepared' | legacy: 'E_NOT_PREPARED'
+      case 'not-prepared':
       case 'E_NOT_PREPARED':
         return createIAPError(
           'not_initialized',
           'IAP connection not initialized. Call initializeIAP() first.',
           error,
         );
+      // v14: 'deferred-payment' | legacy: 'E_DEFERRED'
+      case 'deferred-payment':
+      case 'pending':
       case 'E_DEFERRED':
         return createIAPError(
           'purchase_pending',
           'Purchase is pending approval (e.g., Ask to Buy)',
           error,
         );
+      // v14: 'item-unavailable' | legacy: 'E_ITEM_UNAVAILABLE'
+      case 'item-unavailable':
       case 'E_ITEM_UNAVAILABLE':
         return createIAPError(
           'item_unavailable',
           'The requested product is not available in the store',
           error,
         );
+      // v14: 'network-error' | legacy: 'E_NETWORK_ERROR'
+      case 'network-error':
       case 'E_NETWORK_ERROR':
         return createIAPError(
           'network_error',
           iapError.message || 'A network error occurred',
           error,
         );
+      // v14: 'service-error' | legacy: 'E_SERVICE_ERROR'
+      case 'service-error':
       case 'E_SERVICE_ERROR':
         return createIAPError(
           'store_error',
           iapError.message || 'The store service encountered an error',
           error,
         );
+      // v14: 'iap-not-available'
+      case 'iap-not-available':
+        return createIAPError(
+          'not_available',
+          'In-App Purchases are not available on this device',
+          error,
+        );
       default:
         return createIAPError(
           'unknown',

package/src/payments.native.ts

@@ -1,6 +1,13 @@
 // ============================================================================
 // Native IAP Implementation
-// Wraps react-native-iap for StoreKit 2 (iOS) and Google Play Billing (Android)
+// Wraps react-native-iap v14.x for StoreKit 2 (iOS) and Google Play Billing (Android)
+//
+// v14 API changes from earlier versions:
+// - getProducts/getSubscriptions → fetchProducts({ skus, type })
+// - requestPurchase returns void — results come via purchaseUpdatedListener
+// - Errors come via purchaseErrorListener
+// - Product fields: id (not productId), displayPrice (not localizedPrice)
+// - Purchase fields: productId, id (transaction ID)
 // ============================================================================
 
 import { Platform } from 'react-native';
@@ -32,6 +39,16 @@ try {
 let _status: IAPProviderStatus = { ...INITIAL_PROVIDER_STATUS };
 let _config: IAPConfig = {};
 
+// Listener subscriptions (EmitterSubscription-like objects with .remove())
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let _purchaseUpdateSubscription: any = null;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+let _purchaseErrorSubscription: any = null;
+
+// Pending purchase promise callbacks — one purchase at a time
+let _pendingResolve: ((raw: unknown) => void) | null = null;
+let _pendingReject: ((error: unknown) => void) | null = null;
+
 /**
  * Get the current IAP provider status.
  */
@@ -41,6 +58,8 @@ export function getIAPStatus(): IAPProviderStatus {
 
 /**
  * Initialize the IAP connection to the native store.
+ * Sets up purchaseUpdatedListener and purchaseErrorListener to bridge
+ * v14's event-based purchase flow back to Promises.
  */
 export async function initializeIAP(config?: IAPConfig): Promise<void> {
   if (!RNIap) {
@@ -61,14 +80,28 @@ export async function initializeIAP(config?: IAPConfig): Promise<void> {
   try {
     await RNIap.initConnection();
 
-    // Flush failed purchases cached as pending on Android
-    if (Platform.OS === 'android') {
-      try {
-        await RNIap.flushFailedPurchasesCachedAsPendingAndroid();
-      } catch {
-        // Non-critical — ignore flush errors
-      }
-    }
+    // Set up purchase listeners — these fire when requestPurchase completes or fails
+    _purchaseUpdateSubscription = RNIap.purchaseUpdatedListener(
+      (purchase: unknown) => {
+        if (_pendingResolve) {
+          const resolve = _pendingResolve;
+          _pendingResolve = null;
+          _pendingReject = null;
+          resolve(purchase);
+        }
+      },
+    );
+
+    _purchaseErrorSubscription = RNIap.purchaseErrorListener(
+      (error: unknown) => {
+        if (_pendingReject) {
+          const reject = _pendingReject;
+          _pendingResolve = null;
+          _pendingReject = null;
+          reject(error);
+        }
+      },
+    );
 
     _status = {
       state: 'ready',
@@ -90,8 +123,8 @@ export async function getProducts(skus: string[]): Promise<IAPProduct[]> {
   assertReady();
 
   try {
-    const products = await RNIap!.getProducts({ skus });
-    return products.map(mapProduct);
+    const products = await RNIap!.fetchProducts({ skus, type: 'in-app' });
+    return products.map((p: unknown) => mapProduct(p, 'iap'));
   } catch (error) {
     throw normalizeError(error);
   }
@@ -106,8 +139,8 @@ export async function getSubscriptions(
   assertReady();
 
   try {
-    const subscriptions = await RNIap!.getSubscriptions({ skus });
-    return subscriptions.map(mapSubscription);
+    const products = await RNIap!.fetchProducts({ skus, type: 'subs' });
+    return products.map(mapSubscription);
   } catch (error) {
     throw normalizeError(error);
   }
@@ -120,13 +153,21 @@ export async function purchaseProduct(sku: string): Promise<IAPPurchase> {
   assertReady();
 
   try {
-    const purchase = await RNIap!.requestPurchase({ sku });
+    const rawPurchase = await requestPurchaseWithEvents({
+      request: {
+        apple: { sku },
+        google: { skus: [sku] },
+      },
+      type: 'in-app',
+    });
+
+    const mapped = mapPurchase(rawPurchase);
 
     if (_config.autoFinishTransactions) {
-      await RNIap!.finishTransaction({ purchase, isConsumable: false });
+      await RNIap!.finishTransaction({ purchase: rawPurchase, isConsumable: false });
     }
 
-    return mapPurchase(purchase);
+    return mapped;
   } catch (error) {
     throw normalizeError(error);
   }
@@ -143,19 +184,27 @@ export async function purchaseSubscription(
   assertReady();
 
   try {
-    const request: Record<string, unknown> = { sku };
-
-    if (Platform.OS === 'android' && offerToken) {
-      request.subscriptionOffers = [{ sku, offerToken }];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const googleRequest: any = { skus: [sku] };
+    if (offerToken) {
+      googleRequest.offerToken = offerToken;
     }
 
-    const purchase = await RNIap!.requestSubscription(request);
+    const rawPurchase = await requestPurchaseWithEvents({
+      request: {
+        apple: { sku },
+        google: googleRequest,
+      },
+      type: 'subs',
+    });
+
+    const mapped = mapPurchase(rawPurchase);
 
     if (_config.autoFinishTransactions) {
-      await RNIap!.finishTransaction({ purchase, isConsumable: false });
+      await RNIap!.finishTransaction({ purchase: rawPurchase, isConsumable: false });
     }
 
-    return mapPurchase(purchase);
+    return mapped;
   } catch (error) {
     throw normalizeError(error);
   }
@@ -174,8 +223,14 @@ export async function finishTransaction(
   assertReady();
 
   try {
+    // finishTransaction expects the raw purchase object; we reconstruct the
+    // minimal shape that react-native-iap needs (id + productId + purchaseToken)
     await RNIap!.finishTransaction({
-      purchase: { transactionId: purchase.transactionId },
+      purchase: {
+        id: purchase.transactionId,
+        productId: purchase.sku,
+        purchaseToken: purchase.purchaseToken,
+      },
       isConsumable: isConsumable ?? false,
     });
   } catch (error) {
@@ -199,22 +254,74 @@ export async function restorePurchases(): Promise<IAPPurchase[]> {
 
 /**
  * End the IAP connection. Call on cleanup (e.g., app unmount).
+ * Removes purchase listeners and rejects any pending purchase promise.
  */
 export async function endConnection(): Promise<void> {
   if (!RNIap) return;
 
+  // Reject any pending purchase
+  if (_pendingReject) {
+    const reject = _pendingReject;
+    _pendingResolve = null;
+    _pendingReject = null;
+    reject(createIAPError('not_initialized', 'IAP connection ended while purchase was pending'));
+  }
+
+  // Remove listeners
+  if (_purchaseUpdateSubscription) {
+    _purchaseUpdateSubscription.remove();
+    _purchaseUpdateSubscription = null;
+  }
+  if (_purchaseErrorSubscription) {
+    _purchaseErrorSubscription.remove();
+    _purchaseErrorSubscription = null;
+  }
+
   try {
     await RNIap.endConnection();
-    _status = { ...INITIAL_PROVIDER_STATUS };
   } catch {
     // Ignore errors during cleanup
   }
+
+  _status = { ...INITIAL_PROVIDER_STATUS };
 }
 
 // ============================================================================
 // Internal Helpers
 // ============================================================================
 
+/**
+ * Bridge v14's fire-and-forget requestPurchase to a Promise.
+ * Stores resolve/reject callbacks that are settled by the purchase listeners
+ * set up in initializeIAP.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function requestPurchaseWithEvents(params: any): Promise<any> {
+  if (_pendingResolve || _pendingReject) {
+    return Promise.reject(
+      createIAPError('unknown', 'A purchase is already in progress'),
+    );
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return new Promise<any>((resolve, reject) => {
+    _pendingResolve = resolve;
+    _pendingReject = reject;
+
+    // requestPurchase returns void in v14 — result comes through listeners
+    RNIap!.requestPurchase(params).catch((error: unknown) => {
+      // If requestPurchase itself throws (e.g., invalid params),
+      // settle the promise immediately
+      if (_pendingReject) {
+        const pendingReject = _pendingReject;
+        _pendingResolve = null;
+        _pendingReject = null;
+        pendingReject(error);
+      }
+    });
+  });
+}
+
 function assertReady(): void {
   if (!RNIap) {
     throw createIAPError(
@@ -235,26 +342,25 @@ function getPlatform(): ProductPlatform {
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function mapProduct(raw: any): IAPProduct {
+function mapProduct(raw: any, type: 'iap' | 'sub' = 'iap'): IAPProduct {
   return {
-    sku: raw.productId ?? raw.sku ?? '',
-    title: raw.title ?? '',
+    sku: raw.id ?? raw.productId ?? '',
+    title: raw.title ?? raw.displayName ?? '',
     description: raw.description ?? '',
-    price: parseFloat(raw.price ?? '0'),
-    priceFormatted: raw.localizedPrice ?? raw.price ?? '',
+    price: typeof raw.price === 'number' ? raw.price : parseFloat(raw.price ?? '0'),
+    priceFormatted: raw.displayPrice ?? raw.localizedPrice ?? String(raw.price ?? ''),
     currency: raw.currency ?? '',
-    type: 'iap',
+    type,
     platform: getPlatform(),
   };
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function mapSubscription(raw: any): IAPSubscription {
-  const base = mapProduct(raw);
+  const base = mapProduct(raw, 'sub');
 
   return {
     ...base,
-    type: 'sub',
     subscriptionPeriod: parseSubscriptionPeriod(raw),
     introductoryPrice: raw.introductoryPrice
       ? mapDiscount(raw.introductoryPrice, 'introductory')
@@ -275,7 +381,19 @@ function parseSubscriptionPeriod(raw: any): SubscriptionPeriod {
     };
   }
 
-  // Android: subscriptionPeriodAndroid (ISO 8601 duration, e.g., "P1M", "P1Y")
+  // Android: subscriptionOfferDetailsAndroid may contain period info
+  if (raw.subscriptionOfferDetailsAndroid?.length) {
+    const offer = raw.subscriptionOfferDetailsAndroid[0];
+    const pricingPhases = offer?.pricingPhases?.pricingPhaseList;
+    if (pricingPhases?.length) {
+      const billingPeriod = pricingPhases[0]?.billingPeriod;
+      if (billingPeriod) {
+        return parseISO8601Period(billingPeriod);
+      }
+    }
+  }
+
+  // Fallback: subscriptionPeriodAndroid (older format)
   if (raw.subscriptionPeriodAndroid) {
     return parseISO8601Period(raw.subscriptionPeriodAndroid);
   }
@@ -332,7 +450,7 @@ function mapDiscount(raw: any, type: 'introductory' | 'promotional'): Subscripti
   return {
     identifier: raw.identifier,
     price: parseFloat(raw.price ?? '0'),
-    priceFormatted: raw.localizedPrice ?? raw.price ?? '',
+    priceFormatted: raw.displayPrice ?? raw.localizedPrice ?? raw.price ?? '',
     period: raw.subscriptionPeriod
       ? parseISO8601Period(raw.subscriptionPeriod)
       : { unit: 'month', numberOfUnits: 1 },
@@ -344,13 +462,16 @@ function mapDiscount(raw: any, type: 'introductory' | 'promotional'): Subscripti
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function mapPurchase(raw: any, stateOverride?: IAPPurchase['purchaseState']): IAPPurchase {
+  // v14: transaction ID is in `id`, product is in `productId`
   return {
-    sku: raw.productId ?? raw.sku ?? '',
-    transactionId: raw.transactionId ?? '',
+    sku: raw.productId ?? raw.id ?? '',
+    transactionId: raw.id ?? raw.transactionId ?? '',
     transactionDate: raw.transactionDate
-      ? parseInt(raw.transactionDate, 10)
+      ? (typeof raw.transactionDate === 'number'
+          ? raw.transactionDate
+          : parseInt(raw.transactionDate, 10))
       : Date.now(),
-    transactionReceipt: raw.transactionReceipt ?? '',
+    transactionReceipt: raw.transactionReceipt ?? raw.dataAndroid ?? '',
     purchaseToken: raw.purchaseToken,
     isAcknowledged: raw.isAcknowledgedAndroid,
     purchaseState: stateOverride ?? 'purchased',