react-native-iap 15.2.2 → 15.2.4

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

@@ -0,0 +1,85 @@
+///
+/// NitroPurchaseUpdatedListenerOptions.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 <NitroModules/Null.hpp>
+#include <variant>
+#include <optional>
+
+namespace margelo::nitro::iap {
+
+  /**
+   * A struct which can be represented as a JavaScript object (NitroPurchaseUpdatedListenerOptions).
+   */
+  struct NitroPurchaseUpdatedListenerOptions final {
+  public:
+    std::optional<std::variant<nitro::NullType, bool>> dedupeTransactionIOS     SWIFT_PRIVATE;
+
+  public:
+    NitroPurchaseUpdatedListenerOptions() = default;
+    explicit NitroPurchaseUpdatedListenerOptions(std::optional<std::variant<nitro::NullType, bool>> dedupeTransactionIOS): dedupeTransactionIOS(dedupeTransactionIOS) {}
+
+  public:
+    friend bool operator==(const NitroPurchaseUpdatedListenerOptions& lhs, const NitroPurchaseUpdatedListenerOptions& rhs) = default;
+  };
+
+} // namespace margelo::nitro::iap
+
+namespace margelo::nitro {
+
+  // C++ NitroPurchaseUpdatedListenerOptions <> JS NitroPurchaseUpdatedListenerOptions (object)
+  template <>
+  struct JSIConverter<margelo::nitro::iap::NitroPurchaseUpdatedListenerOptions> final {
+    static inline margelo::nitro::iap::NitroPurchaseUpdatedListenerOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::iap::NitroPurchaseUpdatedListenerOptions(
+        JSIConverter<std::optional<std::variant<nitro::NullType, bool>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "dedupeTransactionIOS")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::iap::NitroPurchaseUpdatedListenerOptions& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "dedupeTransactionIOS"), JSIConverter<std::optional<std::variant<nitro::NullType, bool>>>::toJSI(runtime, arg.dedupeTransactionIOS));
+      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::optional<std::variant<nitro::NullType, bool>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "dedupeTransactionIOS")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/openiap-versions.json

@@ -1,5 +1,5 @@
 {
-  "spec": "2.0.1",
-  "google": "2.1.4",
-  "apple": "2.1.7"
+  "spec": "2.0.2",
+  "google": "2.1.5",
+  "apple": "2.1.9"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "15.2.2",
+  "version": "15.2.4",
   "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

@@ -48,6 +48,7 @@ import type {
   Product,
   Purchase,
   PurchaseError,
+  PurchaseUpdatedListenerOptions,
   ProductSubscription,
 } from '../types';
 import type {MutationFinishTransactionArgs} from '../types';
@@ -268,6 +269,12 @@ type UseIap = {
 
 export interface UseIapOptions {
   onPurchaseSuccess?: (purchase: Purchase) => void;
+  /**
+   * Options for the purchase success listener. iOS defaults to suppressing
+   * StoreKit replay events for the same transaction ID; set
+   * `dedupeTransactionIOS` to false only for diagnostics.
+   */
+  purchaseUpdatedListenerOptions?: PurchaseUpdatedListenerOptions | null;
   onPurchaseError?: (error: PurchaseError) => void;
   /** Callback for non-purchase errors (fetchProducts, getAvailablePurchases, etc.) */
   onError?: (error: Error) => void;
@@ -593,6 +600,7 @@ export function useIAP(options?: UseIapOptions): UseIap {
             optionsRef.current.onPurchaseSuccess(purchase);
           }
         },
+        optionsRef.current?.purchaseUpdatedListenerOptions,
       );
     }
 

package/src/index.ts

@@ -10,6 +10,7 @@ import type {
   NitroReceiptValidationParams,
   NitroReceiptValidationResultIOS,
   NitroReceiptValidationResultAndroid,
+  NitroPurchaseUpdatedListenerOptions,
   NitroSubscriptionStatus,
   RnIap,
 } from './specs/RnIap.nitro';
@@ -30,6 +31,7 @@ import type {
   ProductSubscription,
   Purchase,
   PurchaseError,
+  PurchaseUpdatedListenerOptions,
   PurchaseIOS,
   QueryField,
   AppTransaction,
@@ -97,6 +99,9 @@ type NitroFinishTransactionParamsInternal = Parameters<
   RnIap['finishTransaction']
 >[0];
 type NitroPurchaseListener = Parameters<RnIap['addPurchaseUpdatedListener']>[0];
+type NitroPurchaseUpdatedListenerOptionsParam = NonNullable<
+  Parameters<RnIap['addPurchaseUpdatedListener']>[1]
+>;
 type NitroPurchaseErrorListener = Parameters<
   RnIap['addPurchaseErrorListener']
 >[0];
@@ -129,10 +134,7 @@ export type {
   UseWebhookEventsOptions,
   UseWebhookEventsResult,
 } from './hooks/useWebhookEvents';
-export {
-  connectWebhookStream,
-  parseWebhookEventData,
-} from './webhook-client';
+export {connectWebhookStream, parseWebhookEventData} from './webhook-client';
 export type {
   WebhookEventPayload,
   WebhookEventStream,
@@ -232,11 +234,20 @@ const IAP = {
 // ============================================================================
 
 const purchaseUpdateJsListeners = new Set<(purchase: Purchase) => void>();
+const purchaseUpdateDuplicateJsListeners = new Set<
+  (purchase: Purchase) => void
+>();
 let purchaseUpdateNativeAttached = false;
-const purchaseUpdateNativeHandler: NitroPurchaseListener = (nitroPurchase) => {
+let purchaseUpdateDuplicateNativeAttached = false;
+let purchaseUpdateNativeToken: number | null = null;
+let purchaseUpdateDuplicateNativeToken: number | null = null;
+const emitPurchaseUpdateToListeners = (
+  nitroPurchase: Parameters<NitroPurchaseListener>[0],
+  listeners: Set<(purchase: Purchase) => void>,
+) => {
   if (validateNitroPurchase(nitroPurchase)) {
     const convertedPurchase = convertNitroPurchaseToPurchase(nitroPurchase);
-    for (const listener of purchaseUpdateJsListeners) {
+    for (const listener of listeners) {
       try {
         listener(convertedPurchase);
       } catch (e) {
@@ -250,6 +261,17 @@ const purchaseUpdateNativeHandler: NitroPurchaseListener = (nitroPurchase) => {
     );
   }
 };
+const purchaseUpdateNativeHandler: NitroPurchaseListener = (nitroPurchase) => {
+  emitPurchaseUpdateToListeners(nitroPurchase, purchaseUpdateJsListeners);
+};
+const purchaseUpdateDuplicateNativeHandler: NitroPurchaseListener = (
+  nitroPurchase,
+) => {
+  emitPurchaseUpdateToListeners(
+    nitroPurchase,
+    purchaseUpdateDuplicateJsListeners,
+  );
+};
 
 const purchaseErrorJsListeners = new Set<(error: PurchaseError) => void>();
 let purchaseErrorNativeAttached = false;
@@ -299,6 +321,9 @@ const promotedProductNativeHandler: NitroPromotedProductListener = (
  */
 export const resetListenerState = (): void => {
   purchaseUpdateNativeAttached = false;
+  purchaseUpdateDuplicateNativeAttached = false;
+  purchaseUpdateNativeToken = null;
+  purchaseUpdateDuplicateNativeToken = null;
   purchaseErrorNativeAttached = false;
   promotedProductNativeAttached = false;
   userChoiceBillingNativeAttached = false;
@@ -306,6 +331,7 @@ export const resetListenerState = (): void => {
   subscriptionBillingIssueNativeAttached = false;
   // Clear all JS listeners since native side clears them in endConnection
   purchaseUpdateJsListeners.clear();
+  purchaseUpdateDuplicateJsListeners.clear();
   purchaseErrorJsListeners.clear();
   promotedProductJsListeners.clear();
   userChoiceBillingJsListeners.clear();
@@ -315,12 +341,22 @@ export const resetListenerState = (): void => {
 
 export const purchaseUpdatedListener = (
   listener: (purchase: Purchase) => void,
+  options?: PurchaseUpdatedListenerOptions | null,
 ): EventSubscription => {
-  purchaseUpdateJsListeners.add(listener);
+  const receiveDuplicateTransactionUpdatesIOS =
+    Platform.OS === 'ios' && options?.dedupeTransactionIOS === false;
+  const listeners = receiveDuplicateTransactionUpdatesIOS
+    ? purchaseUpdateDuplicateJsListeners
+    : purchaseUpdateJsListeners;
 
-  if (!purchaseUpdateNativeAttached) {
+  listeners.add(listener);
+
+  if (!purchaseUpdateNativeAttached && !receiveDuplicateTransactionUpdatesIOS) {
     try {
-      IAP.instance.addPurchaseUpdatedListener(purchaseUpdateNativeHandler);
+      const token = IAP.instance.addPurchaseUpdatedListener(
+        purchaseUpdateNativeHandler,
+      );
+      purchaseUpdateNativeToken = typeof token === 'number' ? token : null;
       purchaseUpdateNativeAttached = true;
     } catch (e) {
       const msg = toErrorMessage(e);
@@ -334,9 +370,65 @@ export const purchaseUpdatedListener = (
     }
   }
 
+  if (
+    !purchaseUpdateDuplicateNativeAttached &&
+    receiveDuplicateTransactionUpdatesIOS
+  ) {
+    try {
+      const nativeOptions: NitroPurchaseUpdatedListenerOptions &
+        NitroPurchaseUpdatedListenerOptionsParam = {
+        dedupeTransactionIOS: false,
+      };
+      const token = IAP.instance.addPurchaseUpdatedListener(
+        purchaseUpdateDuplicateNativeHandler,
+        nativeOptions,
+      );
+      purchaseUpdateDuplicateNativeToken =
+        typeof token === 'number' ? token : null;
+      purchaseUpdateDuplicateNativeAttached = true;
+    } catch (e) {
+      const msg = toErrorMessage(e);
+      if (msg.includes('Nitro runtime not installed')) {
+        RnIapConsole.warn(
+          '[purchaseUpdatedListener] Nitro not ready yet; listener inert until initConnection()',
+        );
+      } else {
+        throw e;
+      }
+    }
+  }
+
+  let removed = false;
   return {
     remove: () => {
-      purchaseUpdateJsListeners.delete(listener);
+      if (removed) {
+        return;
+      }
+      removed = true;
+      listeners.delete(listener);
+      if (listeners.size > 0) {
+        return;
+      }
+
+      const token = receiveDuplicateTransactionUpdatesIOS
+        ? purchaseUpdateDuplicateNativeToken
+        : purchaseUpdateNativeToken;
+      if (token == null) {
+        return;
+      }
+
+      try {
+        IAP.instance.removePurchaseUpdatedListener(token);
+        if (receiveDuplicateTransactionUpdatesIOS) {
+          purchaseUpdateDuplicateNativeToken = null;
+          purchaseUpdateDuplicateNativeAttached = false;
+        } else {
+          purchaseUpdateNativeToken = null;
+          purchaseUpdateNativeAttached = false;
+        }
+      } catch (e) {
+        RnIapConsole.warn('[purchaseUpdatedListener] native remove failed:', e);
+      }
     },
   };
 };
@@ -619,7 +711,9 @@ type NitroSubscriptionBillingIssueListener = Parameters<
   RnIap['addSubscriptionBillingIssueListener']
 >[0];
 
-const subscriptionBillingIssueJsListeners = new Set<(purchase: Purchase) => void>();
+const subscriptionBillingIssueJsListeners = new Set<
+  (purchase: Purchase) => void
+>();
 let subscriptionBillingIssueNativeAttached = false;
 const subscriptionBillingIssueNativeHandler: NitroSubscriptionBillingIssueListener =
   (nitroPurchase) => {

package/src/specs/RnIap.nitro.ts

@@ -40,6 +40,7 @@ import type {
   PromotionalOfferJwsInputIOS,
   PurchaseCommon,
   PurchaseOptions,
+  PurchaseUpdatedListenerOptions,
   VerifyPurchaseAppleOptions,
   VerifyPurchaseGoogleOptions,
   VerifyPurchaseHorizonOptions,
@@ -146,6 +147,9 @@ export interface NitroReceiptValidationHorizonOptions {
   userId: VerifyPurchaseHorizonOptions['userId'];
 }
 
+export interface NitroPurchaseUpdatedListenerOptions
+  extends PurchaseUpdatedListenerOptions {}
+
 export interface NitroReceiptValidationParams {
   apple?: NitroReceiptValidationAppleOptions | null;
   google?: NitroReceiptValidationGoogleOptions | null;
@@ -725,7 +729,10 @@ export interface RnIap extends HybridObject<{ios: 'swift'; android: 'kotlin'}> {
    * Add a listener for purchase updates
    * @param listener - Function to call when a purchase is updated
    */
-  addPurchaseUpdatedListener(listener: (purchase: NitroPurchase) => void): void;
+  addPurchaseUpdatedListener(
+    listener: (purchase: NitroPurchase) => void,
+    options?: NitroPurchaseUpdatedListenerOptions,
+  ): number;
 
   /**
    * Add a listener for purchase errors
@@ -737,11 +744,9 @@ export interface RnIap extends HybridObject<{ios: 'swift'; android: 'kotlin'}> {
 
   /**
    * Remove a purchase updated listener
-   * @param listener - Function to remove from listeners
+   * @param token - Token returned from addPurchaseUpdatedListener
    */
-  removePurchaseUpdatedListener(
-    listener: (purchase: NitroPurchase) => void,
-  ): void;
+  removePurchaseUpdatedListener(token: number): void;
 
   /**
    * Remove a purchase error listener

package/src/types.ts

@@ -1292,6 +1292,15 @@ export interface PurchaseOptions {
 
 export type PurchaseState = 'pending' | 'purchased' | 'unknown';
 
+export interface PurchaseUpdatedListenerOptions {
+  /**
+   * iOS only. Defaults to true. When false, listener callbacks also receive
+   * StoreKit replay events for a transaction ID that was already emitted during
+   * the current connection session. Android ignores this option.
+   */
+  dedupeTransactionIOS?: (boolean | null);
+}
+
 export type PurchaseVerificationProvider = 'iapkit';
 
 export interface Query {
@@ -1734,7 +1743,12 @@ export interface Subscription {
   promotedProductIOS: string;
   /** Fires when a purchase fails or is cancelled */
   purchaseError: PurchaseError;
-  /** Fires when a purchase completes successfully or a pending purchase resolves */
+  /**
+   * Fires when a purchase completes successfully or a pending purchase resolves
+   * Options can opt iOS listeners into duplicate StoreKit transaction replays
+   * for diagnostics; default listeners receive one event per transaction ID
+   * during a single connection session.
+   */
   purchaseUpdated: Purchase;
   /**
    * Fires when an active subscription enters a billing-issue state that needs user action
@@ -1758,6 +1772,9 @@ export interface Subscription {
 }
 
 
+
+export type SubscriptionPurchaseUpdatedArgs = (PurchaseUpdatedListenerOptions | null) | undefined;
+
 export interface SubscriptionInfoIOS {
   introductoryOffer?: (SubscriptionOfferIOS | null);
   promotionalOffers?: (SubscriptionOfferIOS[] | null);
@@ -2218,7 +2235,7 @@ export type SubscriptionArgsMap = {
   developerProvidedBillingAndroid: never;
   promotedProductIOS: never;
   purchaseError: never;
-  purchaseUpdated: never;
+  purchaseUpdated: SubscriptionPurchaseUpdatedArgs;
   subscriptionBillingIssue: never;
   userChoiceBillingAndroid: never;
 };