react-native-iap 16.4.0 → 16.5.0

package/nitrogen/generated/shared/c++/NitroPurchaseRequest.hpp

@@ -28,15 +28,18 @@
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
 
+// Forward declaration of `NitroPurchaseRequestType` to properly resolve imports.
+namespace margelo::nitro::iap { enum class NitroPurchaseRequestType; }
 // Forward declaration of `NitroRequestPurchaseIos` to properly resolve imports.
 namespace margelo::nitro::iap { struct NitroRequestPurchaseIos; }
 // Forward declaration of `NitroRequestPurchaseAndroid` to properly resolve imports.
 namespace margelo::nitro::iap { struct NitroRequestPurchaseAndroid; }
 
+#include "NitroPurchaseRequestType.hpp"
+#include <optional>
 #include <NitroModules/Null.hpp>
 #include "NitroRequestPurchaseIos.hpp"
 #include <variant>
-#include <optional>
 #include "NitroRequestPurchaseAndroid.hpp"
 
 namespace margelo::nitro::iap {
@@ -46,12 +49,13 @@ namespace margelo::nitro::iap {
    */
   struct NitroPurchaseRequest final {
   public:
+    std::optional<NitroPurchaseRequestType> type     SWIFT_PRIVATE;
     std::optional<std::variant<nitro::NullType, NitroRequestPurchaseIos>> apple     SWIFT_PRIVATE;
     std::optional<std::variant<nitro::NullType, NitroRequestPurchaseAndroid>> google     SWIFT_PRIVATE;
 
   public:
     NitroPurchaseRequest() = default;
-    explicit NitroPurchaseRequest(std::optional<std::variant<nitro::NullType, NitroRequestPurchaseIos>> apple, std::optional<std::variant<nitro::NullType, NitroRequestPurchaseAndroid>> google): apple(apple), google(google) {}
+    explicit NitroPurchaseRequest(std::optional<NitroPurchaseRequestType> type, std::optional<std::variant<nitro::NullType, NitroRequestPurchaseIos>> apple, std::optional<std::variant<nitro::NullType, NitroRequestPurchaseAndroid>> google): type(type), apple(apple), google(google) {}
 
   public:
     // NitroPurchaseRequest is not equatable because these properties are not equatable: google
@@ -67,12 +71,14 @@ namespace margelo::nitro {
     static inline margelo::nitro::iap::NitroPurchaseRequest fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return margelo::nitro::iap::NitroPurchaseRequest(
+        JSIConverter<std::optional<margelo::nitro::iap::NitroPurchaseRequestType>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type"))),
         JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroRequestPurchaseIos>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "apple"))),
         JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroRequestPurchaseAndroid>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "google")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::iap::NitroPurchaseRequest& arg) {
       jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "type"), JSIConverter<std::optional<margelo::nitro::iap::NitroPurchaseRequestType>>::toJSI(runtime, arg.type));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "apple"), JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroRequestPurchaseIos>>>::toJSI(runtime, arg.apple));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "google"), JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroRequestPurchaseAndroid>>>::toJSI(runtime, arg.google));
       return obj;
@@ -85,6 +91,7 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
+      if (!JSIConverter<std::optional<margelo::nitro::iap::NitroPurchaseRequestType>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type")))) return false;
       if (!JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroRequestPurchaseIos>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "apple")))) return false;
       if (!JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroRequestPurchaseAndroid>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "google")))) return false;
       return true;

package/nitrogen/generated/shared/c++/NitroPurchaseRequestType.hpp

@@ -0,0 +1,76 @@
+///
+/// NitroPurchaseRequestType.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/NitroHash.hpp>)
+#include <NitroModules/NitroHash.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+namespace margelo::nitro::iap {
+
+  /**
+   * An enum which can be represented as a JavaScript union (NitroPurchaseRequestType).
+   */
+  enum class NitroPurchaseRequestType {
+    IN_APP      SWIFT_NAME(inApp) = 0,
+    SUBS      SWIFT_NAME(subs) = 1,
+  } CLOSED_ENUM;
+
+} // namespace margelo::nitro::iap
+
+namespace margelo::nitro {
+
+  // C++ NitroPurchaseRequestType <> JS NitroPurchaseRequestType (union)
+  template <>
+  struct JSIConverter<margelo::nitro::iap::NitroPurchaseRequestType> final {
+    static inline margelo::nitro::iap::NitroPurchaseRequestType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
+      switch (hashString(unionValue.c_str(), unionValue.size())) {
+        case hashString("in-app"): return margelo::nitro::iap::NitroPurchaseRequestType::IN_APP;
+        case hashString("subs"): return margelo::nitro::iap::NitroPurchaseRequestType::SUBS;
+        default: [[unlikely]]
+          throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum NitroPurchaseRequestType - invalid value!");
+      }
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::iap::NitroPurchaseRequestType arg) {
+      switch (arg) {
+        case margelo::nitro::iap::NitroPurchaseRequestType::IN_APP: return JSIConverter<std::string>::toJSI(runtime, "in-app");
+        case margelo::nitro::iap::NitroPurchaseRequestType::SUBS: return JSIConverter<std::string>::toJSI(runtime, "subs");
+        default: [[unlikely]]
+          throw std::invalid_argument("Cannot convert NitroPurchaseRequestType to JS - invalid value: "
+                                    + std::to_string(static_cast<int>(arg)) + "!");
+      }
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isString()) {
+        return false;
+      }
+      std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, value);
+      switch (hashString(unionValue.c_str(), unionValue.size())) {
+        case hashString("in-app"):
+        case hashString("subs"):
+          return true;
+        default:
+          return false;
+      }
+    }
+  };
+
+} // namespace margelo::nitro

package/nitrogen/generated/shared/c++/NitroVerifyPurchaseWithIapkitHorizonProps.hpp

@@ -0,0 +1,90 @@
+///
+/// NitroVerifyPurchaseWithIapkitHorizonProps.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+
+
+#include <string>
+#include <NitroModules/Null.hpp>
+#include <variant>
+#include <optional>
+
+namespace margelo::nitro::iap {
+
+  /**
+   * A struct which can be represented as a JavaScript object (NitroVerifyPurchaseWithIapkitHorizonProps).
+   */
+  struct NitroVerifyPurchaseWithIapkitHorizonProps final {
+  public:
+    std::string sku     SWIFT_PRIVATE;
+    std::optional<std::variant<nitro::NullType, std::string>> userId     SWIFT_PRIVATE;
+
+  public:
+    NitroVerifyPurchaseWithIapkitHorizonProps() = default;
+    explicit NitroVerifyPurchaseWithIapkitHorizonProps(std::string sku, std::optional<std::variant<nitro::NullType, std::string>> userId): sku(sku), userId(userId) {}
+
+  public:
+    friend bool operator==(const NitroVerifyPurchaseWithIapkitHorizonProps& lhs, const NitroVerifyPurchaseWithIapkitHorizonProps& rhs) = default;
+  };
+
+} // namespace margelo::nitro::iap
+
+namespace margelo::nitro {
+
+  // C++ NitroVerifyPurchaseWithIapkitHorizonProps <> JS NitroVerifyPurchaseWithIapkitHorizonProps (object)
+  template <>
+  struct JSIConverter<margelo::nitro::iap::NitroVerifyPurchaseWithIapkitHorizonProps> final {
+    static inline margelo::nitro::iap::NitroVerifyPurchaseWithIapkitHorizonProps fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::iap::NitroVerifyPurchaseWithIapkitHorizonProps(
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "sku"))),
+        JSIConverter<std::optional<std::variant<nitro::NullType, std::string>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "userId")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::iap::NitroVerifyPurchaseWithIapkitHorizonProps& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "sku"), JSIConverter<std::string>::toJSI(runtime, arg.sku));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "userId"), JSIConverter<std::optional<std::variant<nitro::NullType, std::string>>>::toJSI(runtime, arg.userId));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "sku")))) return false;
+      if (!JSIConverter<std::optional<std::variant<nitro::NullType, std::string>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "userId")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/nitrogen/generated/shared/c++/NitroVerifyPurchaseWithIapkitProps.hpp

@@ -34,6 +34,8 @@ namespace margelo::nitro::iap { struct NitroVerifyPurchaseWithIapkitAmazonProps;
 namespace margelo::nitro::iap { struct NitroVerifyPurchaseWithIapkitAppleProps; }
 // Forward declaration of `NitroVerifyPurchaseWithIapkitGoogleProps` to properly resolve imports.
 namespace margelo::nitro::iap { struct NitroVerifyPurchaseWithIapkitGoogleProps; }
+// Forward declaration of `NitroVerifyPurchaseWithIapkitHorizonProps` to properly resolve imports.
+namespace margelo::nitro::iap { struct NitroVerifyPurchaseWithIapkitHorizonProps; }
 
 #include <NitroModules/Null.hpp>
 #include <string>
@@ -42,6 +44,7 @@ namespace margelo::nitro::iap { struct NitroVerifyPurchaseWithIapkitGoogleProps;
 #include "NitroVerifyPurchaseWithIapkitAmazonProps.hpp"
 #include "NitroVerifyPurchaseWithIapkitAppleProps.hpp"
 #include "NitroVerifyPurchaseWithIapkitGoogleProps.hpp"
+#include "NitroVerifyPurchaseWithIapkitHorizonProps.hpp"
 
 namespace margelo::nitro::iap {
 
@@ -55,11 +58,12 @@ namespace margelo::nitro::iap {
     std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitAppleProps>> apple     SWIFT_PRIVATE;
     std::optional<std::variant<nitro::NullType, std::string>> baseUrl     SWIFT_PRIVATE;
     std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitGoogleProps>> google     SWIFT_PRIVATE;
+    std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitHorizonProps>> horizon     SWIFT_PRIVATE;
     std::optional<std::variant<nitro::NullType, bool>> includeClientPayload     SWIFT_PRIVATE;
 
   public:
     NitroVerifyPurchaseWithIapkitProps() = default;
-    explicit NitroVerifyPurchaseWithIapkitProps(std::optional<std::variant<nitro::NullType, std::string>> apiKey, std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitAmazonProps>> amazon, std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitAppleProps>> apple, std::optional<std::variant<nitro::NullType, std::string>> baseUrl, std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitGoogleProps>> google, std::optional<std::variant<nitro::NullType, bool>> includeClientPayload): apiKey(apiKey), amazon(amazon), apple(apple), baseUrl(baseUrl), google(google), includeClientPayload(includeClientPayload) {}
+    explicit NitroVerifyPurchaseWithIapkitProps(std::optional<std::variant<nitro::NullType, std::string>> apiKey, std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitAmazonProps>> amazon, std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitAppleProps>> apple, std::optional<std::variant<nitro::NullType, std::string>> baseUrl, std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitGoogleProps>> google, std::optional<std::variant<nitro::NullType, NitroVerifyPurchaseWithIapkitHorizonProps>> horizon, std::optional<std::variant<nitro::NullType, bool>> includeClientPayload): apiKey(apiKey), amazon(amazon), apple(apple), baseUrl(baseUrl), google(google), horizon(horizon), includeClientPayload(includeClientPayload) {}
 
   public:
     friend bool operator==(const NitroVerifyPurchaseWithIapkitProps& lhs, const NitroVerifyPurchaseWithIapkitProps& rhs) = default;
@@ -80,6 +84,7 @@ namespace margelo::nitro {
         JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroVerifyPurchaseWithIapkitAppleProps>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "apple"))),
         JSIConverter<std::optional<std::variant<nitro::NullType, std::string>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "baseUrl"))),
         JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroVerifyPurchaseWithIapkitGoogleProps>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "google"))),
+        JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroVerifyPurchaseWithIapkitHorizonProps>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "horizon"))),
         JSIConverter<std::optional<std::variant<nitro::NullType, bool>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "includeClientPayload")))
       );
     }
@@ -90,6 +95,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "apple"), JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroVerifyPurchaseWithIapkitAppleProps>>>::toJSI(runtime, arg.apple));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "baseUrl"), JSIConverter<std::optional<std::variant<nitro::NullType, std::string>>>::toJSI(runtime, arg.baseUrl));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "google"), JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroVerifyPurchaseWithIapkitGoogleProps>>>::toJSI(runtime, arg.google));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "horizon"), JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroVerifyPurchaseWithIapkitHorizonProps>>>::toJSI(runtime, arg.horizon));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "includeClientPayload"), JSIConverter<std::optional<std::variant<nitro::NullType, bool>>>::toJSI(runtime, arg.includeClientPayload));
       return obj;
     }
@@ -106,6 +112,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroVerifyPurchaseWithIapkitAppleProps>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "apple")))) return false;
       if (!JSIConverter<std::optional<std::variant<nitro::NullType, std::string>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "baseUrl")))) return false;
       if (!JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroVerifyPurchaseWithIapkitGoogleProps>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "google")))) return false;
+      if (!JSIConverter<std::optional<std::variant<nitro::NullType, margelo::nitro::iap::NitroVerifyPurchaseWithIapkitHorizonProps>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "horizon")))) return false;
       if (!JSIConverter<std::optional<std::variant<nitro::NullType, bool>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "includeClientPayload")))) return false;
       return true;
     }

package/openiap-versions.json

@@ -1,5 +1,5 @@
 {
-  "spec": "3.3.0",
-  "google": "3.4.0",
-  "apple": "3.3.0"
+  "spec": "3.4.0",
+  "google": "3.5.0",
+  "apple": "3.4.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "16.4.0",
+  "version": "16.5.0",
   "description": "React Native In-App Purchases module for iOS and Android using Nitro",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

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);