@idealyst/payments 1.2.109 → 1.2.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idealyst/payments",
-  "version": "1.2.109",
+  "version": "1.2.110",
   "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/payments.native.ts

@@ -1,6 +1,12 @@
 // ============================================================================
 // 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/requestSubscription → requestPurchase({ request, type })
+// - Product fields: id (not productId), displayPrice (not localizedPrice)
+// - Purchase fields: productId, id (transaction ID)
 // ============================================================================
 
 import { Platform } from 'react-native';
@@ -61,15 +67,6 @@ 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
-      }
-    }
-
     _status = {
       state: 'ready',
       isStoreAvailable: true,
@@ -90,8 +87,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 +103,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 +117,21 @@ export async function purchaseProduct(sku: string): Promise<IAPPurchase> {
   assertReady();
 
   try {
-    const purchase = await RNIap!.requestPurchase({ sku });
+    const purchase = await RNIap!.requestPurchase({
+      request: {
+        apple: { sku },
+        google: { skus: [sku] },
+      },
+      type: 'in-app',
+    });
+
+    const mapped = mapPurchase(purchase);
 
     if (_config.autoFinishTransactions) {
       await RNIap!.finishTransaction({ purchase, isConsumable: false });
     }
 
-    return mapPurchase(purchase);
+    return mapped;
   } catch (error) {
     throw normalizeError(error);
   }
@@ -143,19 +148,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 purchase = await RNIap!.requestPurchase({
+      request: {
+        apple: { sku },
+        google: googleRequest,
+      },
+      type: 'subs',
+    });
+
+    const mapped = mapPurchase(purchase);
 
     if (_config.autoFinishTransactions) {
       await RNIap!.finishTransaction({ purchase, isConsumable: false });
     }
 
-    return mapPurchase(purchase);
+    return mapped;
   } catch (error) {
     throw normalizeError(error);
   }
@@ -174,8 +187,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) {
@@ -235,26 +254,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 +293,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 +362,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 +374,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',