react-native-iap 16.0.1 → 16.1.0

package/src/hooks/useIAP.ts

@@ -2,6 +2,7 @@
 import {useCallback, useEffect, useState, useRef} from 'react';
 import {Platform} from 'react-native';
 import {RnIapConsole} from '../utils/debug';
+import {createPurchaseError} from '../utils/errorMapping';
 
 // Internal modules
 import {
@@ -46,8 +47,6 @@ import type {
   VerifyPurchaseWithProviderProps,
   VerifyPurchaseWithProviderResult,
   PurchaseOptions,
-} from '../types';
-import type {
   ActiveSubscription,
   Product,
   Purchase,
@@ -56,8 +55,8 @@ import type {
   ProductSubscription,
   MutationField,
   QueryField,
+  MutationFinishTransactionArgs,
 } from '../types';
-import type {MutationFinishTransactionArgs} from '../types';
 
 // Types for event subscriptions
 interface EventSubscription {
@@ -353,7 +352,8 @@ export function useIAP(options?: UseIapOptions): UseIap {
   }>({});
 
   // Track if component is mounted to prevent listener leaks on early unmount
-  const isMountedRef = useRef<boolean>(true);
+  const isMountedRef = useRef<boolean>(false);
+  const initializationGenerationRef = useRef(0);
 
   const subscriptionsRefState = useRef<ProductSubscription[]>([]);
 
@@ -467,6 +467,7 @@ export function useIAP(options?: UseIapOptions): UseIap {
       } catch (error) {
         RnIapConsole.error('Error fetching available purchases:', error);
         invokeOnError(error);
+        throw error;
       }
     },
     [invokeOnError],
@@ -483,7 +484,7 @@ export function useIAP(options?: UseIapOptions): UseIap {
       } catch (error) {
         RnIapConsole.error('Error getting active subscriptions:', error);
         invokeOnError(error);
-        return [];
+        throw error;
       }
     },
     [invokeOnError],
@@ -496,7 +497,7 @@ export function useIAP(options?: UseIapOptions): UseIap {
       } catch (error) {
         RnIapConsole.error('Error checking active subscriptions:', error);
         invokeOnError(error);
-        return false;
+        throw error;
       }
     },
     [invokeOnError],
@@ -523,16 +524,26 @@ export function useIAP(options?: UseIapOptions): UseIap {
 
   const restorePurchases = useCallback(
     async (options?: PurchaseOptions): Promise<void> => {
-      try {
-        if (Platform.OS === 'ios') {
-          await syncIOS();
+      if (Platform.OS === 'ios') {
+        try {
+          const synced = await syncIOS();
+          if (!synced) {
+            throw createPurchaseError({
+              code: ErrorCode.SyncError,
+              message: 'App Store purchase sync did not complete',
+              platform: 'ios',
+            });
+          }
+        } catch (error) {
+          RnIapConsole.warn('Failed to restore purchases:', error);
+          invokeOnError(error);
+          throw error;
         }
-
-        await getAvailablePurchasesInternal(options);
-      } catch (error) {
-        RnIapConsole.warn('Failed to restore purchases:', error);
-        invokeOnError(error);
       }
+
+      // The query helper reports and rethrows its own error, avoiding a second
+      // onError call while keeping restore failure observable to the caller.
+      await getAvailablePurchasesInternal(options);
     },
     [getAvailablePurchasesInternal, invokeOnError],
   );
@@ -681,37 +692,56 @@ export function useIAP(options?: UseIapOptions): UseIap {
     subscriptionsRef.current.subscriptionBillingIssue = undefined;
   }, []);
 
-  const initIapWithSubscriptions = useCallback(async (): Promise<void> => {
-    const config = buildAndroidConfig();
-
-    try {
-      const result = await initConnection(config);
-
-      if (!isMountedRef.current) {
+  const initIapWithSubscriptions = useCallback(
+    async (generation: number): Promise<void> => {
+      if (
+        !isMountedRef.current ||
+        initializationGenerationRef.current !== generation
+      ) {
         return;
       }
 
-      if (!result) {
-        cleanupListeners();
-        setConnected(false);
-        RnIapConsole.warn('[useIAP] initConnection returned false');
-        return;
-      }
+      const config = buildAndroidConfig();
 
-      // Android retains events emitted during connection setup in bounded
-      // native queues; registration flushes that backlog after Nitro is ready.
-      // Other platforms preserve the existing post-init listener ordering.
-      registerListeners();
-      setConnected(true);
-    } catch (error) {
-      RnIapConsole.error('initConnection failed:', error);
-      cleanupListeners();
-      if (isMountedRef.current) {
-        setConnected(false);
+      try {
+        const result = await initConnection(config);
+
+        if (
+          !isMountedRef.current ||
+          initializationGenerationRef.current !== generation
+        ) {
+          return;
+        }
+
+        if (!result) {
+          cleanupListeners();
+          setConnected(false);
+          RnIapConsole.warn('[useIAP] initConnection returned false');
+          return;
+        }
+
+        // Android retains events emitted during connection setup in bounded
+        // native queues; registration flushes that backlog after Nitro is ready.
+        // Other platforms preserve the existing post-init listener ordering.
+        registerListeners();
+        setConnected(true);
+      } catch (error) {
+        if (
+          !isMountedRef.current ||
+          initializationGenerationRef.current !== generation
+        ) {
+          return;
+        }
+        RnIapConsole.error('initConnection failed:', error);
+        cleanupListeners();
+        if (isMountedRef.current) {
+          setConnected(false);
+        }
+        invokeOnError(error);
       }
-      invokeOnError(error);
-    }
-  }, [buildAndroidConfig, registerListeners, cleanupListeners, invokeOnError]);
+    },
+    [buildAndroidConfig, registerListeners, cleanupListeners, invokeOnError],
+  );
 
   const reconnect = useCallback(async (): Promise<boolean> => {
     const config = buildAndroidConfig();
@@ -743,8 +773,9 @@ export function useIAP(options?: UseIapOptions): UseIap {
   }, [buildAndroidConfig, registerListeners, cleanupListeners, invokeOnError]);
 
   useEffect(() => {
+    const generation = ++initializationGenerationRef.current;
     isMountedRef.current = true;
-    initIapWithSubscriptions();
+    void Promise.resolve().then(() => initIapWithSubscriptions(generation));
 
     return () => {
       isMountedRef.current = false;

package/src/index.kepler.ts

@@ -26,6 +26,7 @@ import {
   validateNitroProduct,
   validateNitroPurchase,
 } from './utils/type-bridge';
+import {convertAndroidPurchasesOrThrow} from './utils/available-purchases';
 
 export * from './types';
 export * from './utils/error';
@@ -128,7 +129,8 @@ export const fetchProducts = async (
   const normalizedType = normalizeProductQueryType(type);
   const nitroProducts = await getModule().fetchProducts(skus, normalizedType);
   return mapProducts(nitroProducts, normalizedType) as
-    Product[] | ProductSubscription[];
+    | Product[]
+    | ProductSubscription[];
 };
 
 export const requestPurchase: MutationField<'requestPurchase'> = async (
@@ -152,9 +154,7 @@ export const requestPurchase: MutationField<'requestPurchase'> = async (
   const result = await getModule().requestPurchase(nitroRequest);
   if (!Array.isArray(result)) return null;
   const purchases = result as unknown as NitroPurchase[];
-  return purchases
-    .filter(validateNitroPurchase)
-    .map((purchase) => convertNitroPurchaseToPurchase(purchase));
+  return convertAndroidPurchasesOrThrow(purchases);
 };
 
 export const getAvailablePurchases: QueryField<
@@ -167,11 +167,7 @@ export const getAvailablePurchases: QueryField<
   };
   return getModule()
     .getAvailablePurchases(nitroOptions)
-    .then((purchases) =>
-      purchases
-        .filter(validateNitroPurchase)
-        .map(convertNitroPurchaseToPurchase),
-    );
+    .then(convertAndroidPurchasesOrThrow);
 };
 
 export const finishTransaction: MutationField<'finishTransaction'> = async (

package/src/index.ts

@@ -1,7 +1,6 @@
 // External dependencies
 import {Platform} from 'react-native';
-// Side-effect import ensures Nitro installs its dispatcher before IAP is used (no-op in tests)
-import 'react-native-nitro-modules';
+// Importing NitroModules installs its dispatcher before IAP is used (no-op in tests).
 import {NitroModules} from 'react-native-nitro-modules';
 
 // Internal modules
@@ -16,9 +15,21 @@ import type {
 } from './specs/RnIap.nitro';
 import {ErrorCode} from './types';
 import type {
+  AppTransaction,
   AndroidSubscriptionOfferInput,
+  ActiveSubscription,
+  BillingChoiceInfoAndroid,
+  BillingProgramAndroid,
+  BillingProgramInformationDialogParamsAndroid,
+  BillingProgramReportingDetailsAndroid,
+  BillingResultAndroid,
+  DeveloperBillingTypeAndroid,
+  DeveloperProvidedBillingDetailsAndroid,
   DiscountOfferInputIOS,
   FetchProductsResult,
+  GetBillingChoiceInfoParamsAndroid,
+  InAppMessageParamsAndroid,
+  InAppMessageResultAndroid,
   MutationField,
   Product,
   ProductIOS,
@@ -29,7 +40,6 @@ import type {
   PurchaseUpdatedListenerOptions,
   PurchaseIOS,
   QueryField,
-  AppTransaction,
   VerifyPurchaseResultAndroid,
   VerifyPurchaseResultIOS,
   RequestPurchaseAndroidProps,
@@ -38,8 +48,6 @@ import type {
   RequestSubscriptionAndroidProps,
   RequestSubscriptionIosProps,
   RequestSubscriptionPropsByPlatforms,
-  ActiveSubscription,
-  DeveloperProvidedBillingDetailsAndroid,
   UserChoiceBillingDetails,
 } from './types';
 import {
@@ -59,26 +67,18 @@ import {
 import {RnIapConsole} from './utils/debug';
 import {getSuccessFromPurchaseVariant} from './utils/purchase';
 import {parseAppTransactionPayload} from './utils';
+import {
+  convertAndroidPurchasesOrThrow,
+  convertApplePurchasesOrThrow,
+} from './utils/available-purchases';
 import {getVegaIapModule, isVegaOS} from './vega';
 
 // ------------------------------
 // Billing Programs API (Android 8.2.0+)
 // ------------------------------
 
-// Note: BillingProgramAndroid, ExternalLinkLaunchModeAndroid, and ExternalLinkTypeAndroid
+// BillingProgramAndroid, ExternalLinkLaunchModeAndroid, and ExternalLinkTypeAndroid
 // are exported from './types' (auto-generated from openiap-gql).
-// Import them here for use in this file's interfaces and functions.
-import type {
-  BillingChoiceInfoAndroid,
-  BillingProgramAndroid,
-  BillingProgramInformationDialogParamsAndroid,
-  BillingProgramReportingDetailsAndroid,
-  BillingResultAndroid,
-  DeveloperBillingTypeAndroid,
-  GetBillingChoiceInfoParamsAndroid,
-  InAppMessageParamsAndroid,
-  InAppMessageResultAndroid,
-} from './types';
 
 // Export all types
 export type {
@@ -991,14 +991,7 @@ export const getAvailablePurchases: QueryField<
       const nitroPurchases =
         await IAP.instance.getAvailablePurchases(nitroOptions);
 
-      const validPurchases = nitroPurchases.filter(validateNitroPurchase);
-      if (validPurchases.length !== nitroPurchases.length) {
-        RnIapConsole.warn(
-          `[getAvailablePurchases] Some purchases failed validation: ${nitroPurchases.length - validPurchases.length} invalid`,
-        );
-      }
-
-      return validPurchases.map(convertNitroPurchaseToPurchase);
+      return convertApplePurchasesOrThrow(nitroPurchases);
     } else if (isAndroidStoreRuntime()) {
       const includeSuspended = Boolean(
         options?.includeSuspendedAndroid ?? false,
@@ -1008,14 +1001,7 @@ export const getAvailablePurchases: QueryField<
         const nitroPurchases = await IAP.instance.getAvailablePurchases({
           android: {includeSuspended},
         });
-        const validPurchases = nitroPurchases.filter(validateNitroPurchase);
-        if (validPurchases.length !== nitroPurchases.length) {
-          RnIapConsole.warn(
-            `[getAvailablePurchases] Some Vega purchases failed validation: ${nitroPurchases.length - validPurchases.length} invalid`,
-          );
-        }
-
-        return validPurchases.map(convertNitroPurchaseToPurchase);
+        return convertAndroidPurchasesOrThrow(nitroPurchases);
       }
 
       // For Android Play/Horizon/Fire OS, query in-app items and subscriptions separately.
@@ -1026,16 +1012,8 @@ export const getAvailablePurchases: QueryField<
         android: {type: 'subs', includeSuspended},
       });
 
-      // Validate and convert both sets of purchases
       const allNitroPurchases = [...inappNitroPurchases, ...subsNitroPurchases];
-      const validPurchases = allNitroPurchases.filter(validateNitroPurchase);
-      if (validPurchases.length !== allNitroPurchases.length) {
-        RnIapConsole.warn(
-          `[getAvailablePurchases] Some Android purchases failed validation: ${allNitroPurchases.length - validPurchases.length} invalid`,
-        );
-      }
-
-      return validPurchases.map(convertNitroPurchaseToPurchase);
+      return convertAndroidPurchasesOrThrow(allNitroPurchases);
     } else {
       throw unsupportedPlatformError();
     }
@@ -1298,11 +1276,7 @@ export const getPendingTransactionsIOS: QueryField<
 
   try {
     const nitroPurchases = await IAP.instance.getPendingTransactionsIOS();
-    return nitroPurchases
-      .map(convertNitroPurchaseToPurchase)
-      .filter(
-        (purchase): purchase is PurchaseIOS => purchase.store === 'apple',
-      );
+    return convertApplePurchasesOrThrow(nitroPurchases);
   } catch (error) {
     const parsedError = parseErrorAndLogIfNeeded(
       '[getPendingTransactionsIOS] Failed:',
@@ -1331,11 +1305,7 @@ export const getAllTransactionsIOS: QueryField<
 
   try {
     const nitroPurchases = await IAP.instance.getAllTransactionsIOS();
-    return nitroPurchases
-      .map(convertNitroPurchaseToPurchase)
-      .filter(
-        (purchase): purchase is PurchaseIOS => purchase.store === 'apple',
-      );
+    return convertApplePurchasesOrThrow(nitroPurchases);
   } catch (error) {
     const parsedError = parseErrorAndLogIfNeeded(
       '[getAllTransactionsIOS] Failed:',
@@ -1366,11 +1336,7 @@ export const showManageSubscriptionsIOS: MutationField<
 
   try {
     const nitroPurchases = await IAP.instance.showManageSubscriptionsIOS();
-    return nitroPurchases
-      .map(convertNitroPurchaseToPurchase)
-      .filter(
-        (purchase): purchase is PurchaseIOS => purchase.store === 'apple',
-      );
+    return convertApplePurchasesOrThrow(nitroPurchases);
   } catch (error) {
     const parsedError = parseErrorAndLogIfNeeded(
       '[showManageSubscriptionsIOS] Failed:',
@@ -1627,7 +1593,14 @@ export const endConnection: MutationField<'endConnection'> = async () => {
 export const restorePurchases: MutationField<'restorePurchases'> = async () => {
   try {
     if (Platform.OS === 'ios') {
-      await syncIOS();
+      const synced = await syncIOS();
+      if (!synced) {
+        throw createPurchaseError({
+          code: ErrorCode.SyncError,
+          message: 'App Store purchase sync did not complete',
+          platform: 'ios',
+        });
+      }
     }
 
     await getAvailablePurchases({
@@ -2485,8 +2458,7 @@ export const getActiveSubscriptions: QueryField<
                 sub.renewalInfoIOS.autoRenewPreference ?? null,
               bundleOriginalTransactionId:
                 sub.renewalInfoIOS.bundleOriginalTransactionId ?? null,
-              bundleProductId:
-                sub.renewalInfoIOS.bundleProductId ?? null,
+              bundleProductId: sub.renewalInfoIOS.bundleProductId ?? null,
               bundleSubscriptionGroupId:
                 sub.renewalInfoIOS.bundleSubscriptionGroupId ?? null,
               commitmentInfo: sub.renewalInfoIOS.commitmentInfo ?? null,

package/src/specs/RnIap.nitro.ts

@@ -590,6 +590,8 @@ export interface NitroPurchase {
   developerPayloadAndroid?: string | null;
   isSuspendedAndroid?: null | boolean;
   pendingPurchaseUpdateAndroid?: PendingPurchaseUpdateAndroid | null;
+  userIdAmazon?: string | null;
+  userMarketplaceAmazon?: string | null;
 }
 
 /**

package/src/types.ts

@@ -1214,6 +1214,17 @@ export interface PurchaseAndroid extends PurchaseCommon {
   /** Unix timestamp in milliseconds since January 1, 1970 UTC. */
   transactionDate: number;
   transactionId?: (string | null);
+  /**
+   * Amazon Appstore user id (PurchaseResponse.getUserData().getUserId()).
+   * Only populated on the Amazon flavor; required for server-side Amazon RVS
+   * receipt verification (userId + receiptId). Null on Google Play and Horizon.
+   */
+  userIdAmazon?: (string | null);
+  /**
+   * Amazon Appstore marketplace (PurchaseResponse.getUserData().getMarketplace()),
+   * for example "US" or "FR". Only populated on the Amazon flavor.
+   */
+  userMarketplaceAmazon?: (string | null);
 }
 
 export interface PurchaseCommon {

package/src/utils/available-purchases.ts

@@ -0,0 +1,73 @@
+import {ErrorCode} from '../types';
+import type {Purchase, PurchaseIOS} from '../types';
+import {createPurchaseError} from './errorMapping';
+import {
+  convertNitroPurchaseToPurchase,
+  validateNitroPurchase,
+} from './type-bridge';
+
+const ANDROID_STORES = new Set(['google', 'amazon', 'horizon']);
+
+/** Decode an authoritative native purchase list atomically. */
+export const convertAvailablePurchasesOrThrow = (
+  purchases: unknown,
+): Purchase[] => {
+  if (!Array.isArray(purchases)) {
+    throw createPurchaseError({
+      code: ErrorCode.BillingResponseJsonParseError,
+      message: 'Malformed purchase list returned by the native bridge',
+    });
+  }
+
+  return purchases.map((purchase, index) => {
+    if (!validateNitroPurchase(purchase)) {
+      throw createPurchaseError({
+        code: ErrorCode.BillingResponseJsonParseError,
+        message: `Malformed purchase payload returned by the native bridge at index ${index}`,
+      });
+    }
+
+    try {
+      return convertNitroPurchaseToPurchase(purchase);
+    } catch {
+      throw createPurchaseError({
+        code: ErrorCode.BillingResponseJsonParseError,
+        message: `Failed to decode native purchase payload at index ${index}`,
+      });
+    }
+  });
+};
+
+/** Decode an authoritative StoreKit purchase list without filtering entries. */
+export const convertApplePurchasesOrThrow = (
+  purchases: unknown,
+): PurchaseIOS[] => {
+  const decoded = convertAvailablePurchasesOrThrow(purchases);
+  const invalidIndex = decoded.findIndex(
+    (purchase) => purchase.store !== 'apple',
+  );
+  if (invalidIndex !== -1) {
+    throw createPurchaseError({
+      code: ErrorCode.BillingResponseJsonParseError,
+      message: `Native StoreKit bridge returned a non-Apple purchase at index ${invalidIndex}`,
+    });
+  }
+  return decoded as PurchaseIOS[];
+};
+
+/** Decode an authoritative Android-family purchase list without foreign stores. */
+export const convertAndroidPurchasesOrThrow = (
+  purchases: unknown,
+): Purchase[] => {
+  const decoded = convertAvailablePurchasesOrThrow(purchases);
+  const invalidIndex = decoded.findIndex(
+    (purchase) => !ANDROID_STORES.has(purchase.store),
+  );
+  if (invalidIndex !== -1) {
+    throw createPurchaseError({
+      code: ErrorCode.BillingResponseJsonParseError,
+      message: `Native Android bridge returned a foreign purchase at index ${invalidIndex}`,
+    });
+  }
+  return decoded;
+};

package/src/utils/type-bridge.ts

@@ -19,8 +19,6 @@ import type {
   ProductTypeIOS,
   PurchaseState,
   SubscriptionPeriodIOS,
-} from '../types';
-import type {
   Product,
   ProductSubscription,
   Purchase,
@@ -504,6 +502,16 @@ export function convertNitroPurchaseToPurchase(
       ? legacyAndroidId
       : null);
 
+  // Amazon identity metadata must never leak onto other stores' purchases.
+  const amazonUserId =
+    nitroPurchase.userIdAmazon != null && store === STORE_AMAZON
+      ? toNullableString(nitroPurchase.userIdAmazon)
+      : null;
+  const amazonUserMarketplace =
+    nitroPurchase.userMarketplaceAmazon != null && store === STORE_AMAZON
+      ? toNullableString(nitroPurchase.userMarketplaceAmazon)
+      : null;
+
   const androidPurchase: PurchaseAndroid = {
     id: nitroPurchase.id,
     productId: nitroPurchase.productId,
@@ -540,6 +548,8 @@ export function convertNitroPurchaseToPurchase(
     isSuspendedAndroid: toNullableBoolean(nitroPurchase.isSuspendedAndroid),
     pendingPurchaseUpdateAndroid:
       nitroPurchase.pendingPurchaseUpdateAndroid ?? null,
+    userIdAmazon: amazonUserId,
+    userMarketplaceAmazon: amazonUserMarketplace,
   };
 
   return androidPurchase;
@@ -592,17 +602,80 @@ export function validateNitroPurchase(nitroPurchase: NitroPurchase): boolean {
     return false;
   }
 
-  const required = ['id', 'productId', 'transactionDate', 'store'];
-  for (const field of required) {
+  const invalidField = (field: string): false => {
+    RnIapConsole.error(`NitroPurchase has invalid required field: ${field}`);
+    return false;
+  };
+  if (typeof nitroPurchase.id !== 'string' || !nitroPurchase.id) {
+    return invalidField('id');
+  }
+  if (typeof nitroPurchase.productId !== 'string' || !nitroPurchase.productId) {
+    return invalidField('productId');
+  }
+  if (
+    typeof nitroPurchase.transactionDate !== 'number' ||
+    !Number.isFinite(nitroPurchase.transactionDate)
+  ) {
+    return invalidField('transactionDate');
+  }
+  if (typeof nitroPurchase.store !== 'string' || !nitroPurchase.store) {
+    return invalidField('store');
+  }
+  if (
+    typeof nitroPurchase.purchaseState !== 'string' ||
+    !nitroPurchase.purchaseState
+  ) {
+    return invalidField('purchaseState');
+  }
+  if (
+    typeof nitroPurchase.quantity !== 'number' ||
+    !Number.isInteger(nitroPurchase.quantity)
+  ) {
+    return invalidField('quantity');
+  }
+  if (typeof nitroPurchase.isAutoRenewing !== 'boolean') {
+    return invalidField('isAutoRenewing');
+  }
+  if (
+    nitroPurchase.store === 'apple' &&
+    (typeof nitroPurchase.transactionId !== 'string' ||
+      !nitroPurchase.transactionId)
+  ) {
+    return invalidField('transactionId');
+  }
+  const candidate = nitroPurchase as unknown as Record<string, unknown>;
+  if (
+    candidate.ids != null &&
+    (!Array.isArray(candidate.ids) ||
+      candidate.ids.some((id) => typeof id !== 'string'))
+  ) {
+    return invalidField('ids');
+  }
+  for (const field of [
+    'pendingPurchaseUpdateAndroid',
+    'renewalInfoIOS',
+    'commitmentInfoIOS',
+    'advancedCommerceInfoIOS',
+  ]) {
+    const nested = candidate[field];
     if (
-      !(field in nitroPurchase) ||
-      nitroPurchase[field as keyof NitroPurchase] == null
+      nested != null &&
+      (typeof nested !== 'object' || Array.isArray(nested))
     ) {
-      RnIapConsole.error(
-        `NitroPurchase missing required field: ${field}`,
-        nitroPurchase,
-      );
-      return false;
+      return invalidField(field);
+    }
+  }
+  if (candidate.offerIOS != null) {
+    if (typeof candidate.offerIOS !== 'string') {
+      return invalidField('offerIOS');
+    }
+    try {
+      const offer = JSON.parse(candidate.offerIOS);
+      if (offer == null || typeof offer !== 'object' || Array.isArray(offer)) {
+        return invalidField('offerIOS');
+      }
+    } catch {
+      return invalidField('offerIOS');
     }
   }