react-native-iap 16.4.1 → 16.5.1

package/src/hooks/useIAP.ts

@@ -83,10 +83,12 @@ type UseIap = {
    *
    * @example
    * ```ts
-   * purchaseUpdatedListener(async (purchase) => {
-   *   if (await verifyOnServer(purchase)) {
-   *     await finishTransaction({ purchase, isConsumable: false });
-   *   }
+   * purchaseUpdatedListener((purchase) => {
+   *   void verifyOnServer(purchase)
+   *     .then((verified) => verified
+   *       ? finishTransaction({ purchase, isConsumable: false })
+   *       : undefined)
+   *     .catch((error) => console.warn('Transaction finalization failed:', error));
    * });
    * ```
    *
@@ -109,18 +111,25 @@ type UseIap = {
    *
    * @example
    * ```ts
-   * const { availablePurchases, getAvailablePurchases, finishTransaction } = useIAP();
+   * const { connected, availablePurchases, getAvailablePurchases, finishTransaction } = useIAP();
    *
    * useEffect(() => {
-   *   void getAvailablePurchases();
-   * }, [getAvailablePurchases]);
+   *   if (!connected) return;
+   *   void getAvailablePurchases().catch((error) => {
+   *     console.warn('Purchase restore failed', error);
+   *   });
+   * }, [connected, getAvailablePurchases]);
    *
    * useEffect(() => {
-   *   for (const p of availablePurchases) {
-   *     void verifyOnServer(p).then((ok) => {
-   *       if (ok) finishTransaction({ purchase: p, isConsumable: false });
-   *     });
-   *   }
+   *   void (async () => {
+   *     for (const p of availablePurchases) {
+   *       if (await verifyOnServer(p)) {
+   *         await finishTransaction({ purchase: p, isConsumable: false });
+   *       }
+   *     }
+   *   })().catch((error) => {
+   *     console.warn('Restored purchase processing failed', error);
+   *   });
    * }, [availablePurchases, finishTransaction]);
    * ```
    *
@@ -139,14 +148,17 @@ type UseIap = {
    *
    * @example
    * ```ts
-   * const { products, fetchProducts } = useIAP();
+   * const { connected, products, fetchProducts } = useIAP();
    *
    * useEffect(() => {
+   *   if (!connected) return;
    *   void fetchProducts({
    *     skus: ['com.app.coins_100', 'com.app.premium'],
    *     type: 'in-app',
+   *   }).catch((error) => {
+   *     console.warn('Product fetch failed', error);
    *   });
-   * }, [fetchProducts]);
+   * }, [connected, fetchProducts]);
    *
    * // Render `products` directly from hook state.
    * ```
@@ -169,10 +181,14 @@ type UseIap = {
    *   - `type: 'subs'`  — same shape, plus `request.google.subscriptionOffers: [{ sku, offerToken }]`.
    * @returns Promise that resolves when the request is dispatched; results land in the
    *   hook's `onPurchaseSuccess` / `onPurchaseError` callbacks.
-   * @throws Synchronous rejection from the store (e.g. `E_NOT_PREPARED`, validation failure).
+   * @throws Invalid arguments or failures that prevent dispatch. Store outcomes are event-based;
+   *   on Android, `not-prepared` is delivered through `onPurchaseError`.
    *
    * @example
    * ```ts
+   * const { connected, requestPurchase } = useIAP();
+   * if (!connected) return;
+   *
    * await requestPurchase({
    *   request: {
    *     apple: { sku: 'com.app.premium' },
@@ -309,6 +325,18 @@ export interface UseIapOptions {
   billingChoiceScreenTypeAndroid?: BillingChoiceScreenTypeAndroid;
 }
 
+function mergeByKey<T>(
+  existingItems: T[],
+  newItems: T[],
+  getKey: (item: T) => string,
+): T[] {
+  const merged = new Map(
+    existingItems.map((item) => [getKey(item), item] as const),
+  );
+  newItems.forEach((item) => merged.set(getKey(item), item));
+  return Array.from(merged.values());
+}
+
 /**
  * React Hook for managing In-App Purchases.
  * See documentation at https://react-native-iap.hyo.dev/docs/hooks/useIAP
@@ -326,27 +354,6 @@ export function useIAP(options?: UseIapOptions): UseIap {
   const optionsRef = useRef<UseIapOptions | undefined>(options);
   const connectedRef = useRef<boolean>(false);
 
-  // Helper function to merge arrays with duplicate checking
-  const mergeWithDuplicateCheck = useCallback(
-    <T>(
-      existingItems: T[],
-      newItems: T[],
-      getKey: (item: T) => string,
-    ): T[] => {
-      const merged = [...existingItems];
-      newItems.forEach((newItem) => {
-        const isDuplicate = merged.some(
-          (existingItem) => getKey(existingItem) === getKey(newItem),
-        );
-        if (!isDuplicate) {
-          merged.push(newItem);
-        }
-      });
-      return merged;
-    },
-    [],
-  );
-
   useEffect(() => {
     optionsRef.current = options;
   }, [options]);
@@ -367,6 +374,8 @@ export function useIAP(options?: UseIapOptions): UseIap {
   // Track if component is mounted to prevent listener leaks on early unmount
   const isMountedRef = useRef<boolean>(false);
   const initializationGenerationRef = useRef(0);
+  const productRequestGenerationRef = useRef(0);
+  const productRequestOwnersRef = useRef(new Map<string, number>());
 
   const subscriptionsRefState = useRef<ProductSubscription[]>([]);
 
@@ -388,12 +397,11 @@ export function useIAP(options?: UseIapOptions): UseIap {
       skus: string[];
       type?: ProductQueryType | null;
     }): Promise<void> => {
-      if (!connectedRef.current) {
-        RnIapConsole.warn(
-          '[useIAP] fetchProducts called before connection; skipping',
-        );
-        return;
+      const generation = ++productRequestGenerationRef.current;
+      for (const sku of params.skus) {
+        productRequestOwnersRef.current.set(sku, generation);
       }
+
       try {
         const requestType = params.type ?? 'in-app';
         RnIapConsole.debug('[useIAP] Calling fetchProducts with:', {
@@ -408,13 +416,18 @@ export function useIAP(options?: UseIapOptions): UseIap {
           '[useIAP] fetchProducts count:',
           result?.length ?? 0,
         );
-        const items = (result ?? []) as (Product | ProductSubscription)[];
+        const items = (
+          (result ?? []) as (Product | ProductSubscription)[]
+        ).filter(
+          (item) => productRequestOwnersRef.current.get(item.id) === generation,
+        );
+        if (items.length === 0) return;
 
         // fetchProducts already returns properly filtered results based on type
         if (requestType === 'subs') {
           // All items are already subscriptions
           setSubscriptions((prevSubscriptions: ProductSubscription[]) =>
-            mergeWithDuplicateCheck(
+            mergeByKey(
               prevSubscriptions,
               items as ProductSubscription[],
               (subscription: ProductSubscription) => subscription.id,
@@ -433,14 +446,14 @@ export function useIAP(options?: UseIapOptions): UseIap {
           );
 
           setProducts((prevProducts: Product[]) =>
-            mergeWithDuplicateCheck(
+            mergeByKey(
               prevProducts,
               newProducts,
               (product: Product) => product.id,
             ),
           );
           setSubscriptions((prevSubscriptions: ProductSubscription[]) =>
-            mergeWithDuplicateCheck(
+            mergeByKey(
               prevSubscriptions,
               newSubscriptions,
               (subscription: ProductSubscription) => subscription.id,
@@ -451,7 +464,7 @@ export function useIAP(options?: UseIapOptions): UseIap {
 
         // For 'in-app' type, all items are already products
         setProducts((prevProducts: Product[]) =>
-          mergeWithDuplicateCheck(
+          mergeByKey(
             prevProducts,
             items as Product[],
             (product: Product) => product.id,
@@ -460,9 +473,16 @@ export function useIAP(options?: UseIapOptions): UseIap {
       } catch (error) {
         RnIapConsole.error('Error fetching products:', error);
         invokeOnError(error);
+        throw error;
+      } finally {
+        for (const sku of params.skus) {
+          if (productRequestOwnersRef.current.get(sku) === generation) {
+            productRequestOwnersRef.current.delete(sku);
+          }
+        }
       }
     },
-    [mergeWithDuplicateCheck, invokeOnError],
+    [invokeOnError],
   );
 
   const getAvailablePurchasesInternal = useCallback(
@@ -609,19 +629,27 @@ export function useIAP(options?: UseIapOptions): UseIap {
     if (!subscriptionsRef.current.purchaseUpdate) {
       subscriptionsRef.current.purchaseUpdate = purchaseUpdatedListener(
         async (purchase: Purchase) => {
+          // Deliver first so store refresh latency cannot delay verification
+          // and transaction finalization in the host app.
+          try {
+            const callbackResult =
+              optionsRef.current?.onPurchaseSuccess?.(purchase);
+            void Promise.resolve(callbackResult).catch((e) => {
+              RnIapConsole.error('[useIAP] onPurchaseSuccess failed:', e);
+            });
+          } catch (e) {
+            RnIapConsole.error('[useIAP] onPurchaseSuccess failed:', e);
+          }
+
           try {
             await getActiveSubscriptionsInternal();
-            await getAvailablePurchasesInternal();
           } catch (e) {
             RnIapConsole.warn('[useIAP] post-purchase refresh failed:', e);
           }
-
-          // Deliver even if the hook unmounted while the refresh was pending:
-          // onPurchaseSuccess is where apps call finishTransaction, and a
-          // dropped event has no in-session redelivery. Internal setState is
-          // mount-guarded inside the refresh helpers.
-          if (optionsRef.current?.onPurchaseSuccess) {
-            optionsRef.current.onPurchaseSuccess(purchase);
+          try {
+            await getAvailablePurchasesInternal();
+          } catch (e) {
+            RnIapConsole.warn('[useIAP] post-purchase refresh failed:', e);
           }
         },
         optionsRef.current?.purchaseUpdatedListenerOptions,
@@ -657,7 +685,6 @@ export function useIAP(options?: UseIapOptions): UseIap {
 
     if (
       Platform.OS === 'android' &&
-      optionsRef.current?.onUserChoiceBillingAndroid &&
       !subscriptionsRef.current.userChoiceBillingAndroid
     ) {
       subscriptionsRef.current.userChoiceBillingAndroid =
@@ -670,7 +697,6 @@ export function useIAP(options?: UseIapOptions): UseIap {
 
     if (
       Platform.OS === 'android' &&
-      optionsRef.current?.onDeveloperProvidedBillingAndroid &&
       !subscriptionsRef.current.developerProvidedBillingAndroid
     ) {
       subscriptionsRef.current.developerProvidedBillingAndroid =
@@ -757,16 +783,22 @@ export function useIAP(options?: UseIapOptions): UseIap {
   );
 
   const reconnect = useCallback(async (): Promise<boolean> => {
+    const generation = ++initializationGenerationRef.current;
     const config = buildAndroidConfig();
 
     try {
       const result = await initConnection(config);
 
-      if (!isMountedRef.current) {
+      if (
+        !isMountedRef.current ||
+        initializationGenerationRef.current !== generation
+      ) {
         return false;
       }
 
       if (result) {
+        // endConnection invalidates these hook-owned subscription handles.
+        cleanupListeners();
         registerListeners();
         setConnected(true);
         return true;
@@ -775,6 +807,12 @@ export function useIAP(options?: UseIapOptions): UseIap {
       setConnected(false);
       return false;
     } catch (error) {
+      if (
+        !isMountedRef.current ||
+        initializationGenerationRef.current !== generation
+      ) {
+        return false;
+      }
       RnIapConsole.error('[useIAP] reconnect failed:', error);
       cleanupListeners();
       if (isMountedRef.current) {

package/src/index.kepler.ts

@@ -157,6 +157,7 @@ export const requestPurchase: MutationField<'requestPurchase'> = async (
   }
 
   const nitroRequest: NitroPurchaseRequest = {
+    type,
     google: androidRequest,
   };
   const result = await getModule().requestPurchase(nitroRequest);