react-native-iap 14.3.0 → 14.3.2-rc.1

package/ios/HybridRnIap.swift

@@ -60,12 +60,12 @@ class HybridRnIap: HybridRnIapSpec {
                             #if DEBUG
                             print("[HybridRnIap] purchaseError event: code=\(error.code), productId=\(error.productId ?? "-")")
                             #endif
-                            let nitroError = self.createPurchaseErrorResult(
-                                code: error.code,
-                                message: error.message,
-                                productId: error.productId
-                            )
-                            self.sendPurchaseError(nitroError)
+                    let nitroError = self.createPurchaseErrorResult(
+                        code: error.code,
+                        message: error.message,
+                        productId: error.productId
+                    )
+                    self.sendPurchaseError(nitroError, productId: error.productId)
                         }
                     }
                 }
@@ -123,7 +123,7 @@ class HybridRnIap: HybridRnIapSpec {
                             message: error.message,
                             productId: error.productId
                         )
-                        self.sendPurchaseError(nitroError)
+                        self.sendPurchaseError(nitroError, productId: error.productId)
                     }
                 }
             }
@@ -168,7 +168,7 @@ class HybridRnIap: HybridRnIapSpec {
                     message: error.localizedDescription,
                     productId: nil
                 )
-                self.sendPurchaseError(err)
+                self.sendPurchaseError(err, productId: nil)
                 self.isInitialized = false
                 self.isInitializing = false
                 return false
@@ -205,7 +205,7 @@ class HybridRnIap: HybridRnIapSpec {
                     code: OpenIapError.E_USER_ERROR,
                     message: "No iOS request provided"
                 )
-                self.sendPurchaseError(error)
+                self.sendPurchaseError(error, productId: nil)
                 return
             }
             do {
@@ -219,7 +219,7 @@ class HybridRnIap: HybridRnIapSpec {
                         message: "IAP store connection not initialized",
                         productId: iosRequest.sku
                     )
-                    self.sendPurchaseError(err)
+                    self.sendPurchaseError(err, productId: iosRequest.sku)
                     return
                 }
                 // Delegate purchase to OpenIAP. It emits success/error events which we bridge above.
@@ -246,7 +246,7 @@ class HybridRnIap: HybridRnIapSpec {
                     message: error.localizedDescription,
                     productId: iosRequest.sku
                 )
-                self.sendPurchaseErrorDedup(err)
+                self.sendPurchaseErrorDedup(err, productId: iosRequest.sku)
             }
         }
     }
@@ -612,25 +612,30 @@ class HybridRnIap: HybridRnIapSpec {
         }
     }
     
-    private func sendPurchaseError(_ error: NitroPurchaseResult) {
-        // Update last error for deduplication
+    private func sendPurchaseError(_ error: NitroPurchaseResult, productId: String? = nil) {
+        // Update last error for deduplication using the associated product SKU (not token)
         lastPurchaseErrorCode = error.code
-        lastPurchaseErrorProductId = error.purchaseToken
+        lastPurchaseErrorProductId = productId
         lastPurchaseErrorTimestamp = Date().timeIntervalSince1970
+        // Ensure we never leak SKU via purchaseToken
+        var sanitized = error
+        if let pid = productId, sanitized.purchaseToken == pid {
+            sanitized.purchaseToken = nil
+        }
         for listener in purchaseErrorListeners {
-            listener(error)
+            listener(sanitized)
         }
     }
 
-    private func sendPurchaseErrorDedup(_ error: NitroPurchaseResult) {
+    private func sendPurchaseErrorDedup(_ error: NitroPurchaseResult, productId: String? = nil) {
         let now = Date().timeIntervalSince1970
         let sameCode = (error.code == lastPurchaseErrorCode)
-        let sameProduct = (error.purchaseToken == lastPurchaseErrorProductId)
+        let sameProduct = (productId == lastPurchaseErrorProductId)
         let withinWindow = (now - lastPurchaseErrorTimestamp) < 0.3
         if sameCode && sameProduct && withinWindow {
             return
         }
-        sendPurchaseError(error)
+        sendPurchaseError(error, productId: productId)
     }
     
     private func createPurchaseErrorResult(code: String, message: String, productId: String? = nil) -> NitroPurchaseResult {
@@ -638,7 +643,8 @@ class HybridRnIap: HybridRnIapSpec {
         result.responseCode = 0
         result.code = code
         result.message = message
-        result.purchaseToken = productId
+        // Do not overload the token field with productId
+        result.purchaseToken = nil
         return result
     }
     

package/lib/index.d.ts

@@ -0,0 +1,8 @@
+export * from './specs/RnIap.nitro';
+declare class RnIapImpl {
+    private hybridObject;
+    private getHybridObject;
+    toString(): string;
+}
+declare const RnIap: RnIapImpl;
+export default RnIap;

package/lib/index.js

@@ -0,0 +1,36 @@
+import { NitroModules } from 'react-native-nitro-modules';
+export * from './specs/RnIap.nitro';
+class RnIapImpl {
+    hybridObject = null;
+    getHybridObject() {
+        if (!this.hybridObject) {
+            try {
+                console.log('🔧 Creating RnIap HybridObject...');
+                this.hybridObject = NitroModules.createHybridObject('RnIap');
+                console.log('🔧 HybridObject created successfully:', !!this.hybridObject);
+            }
+            catch (error) {
+                console.error('🔧 Failed to create HybridObject:', error);
+                throw new Error(`Failed to create RnIap HybridObject: ${error}`);
+            }
+        }
+        return this.hybridObject;
+    }
+    toString() {
+        try {
+            console.log('🔧 Getting HybridObject for toString...');
+            const hybridObject = this.getHybridObject();
+            console.log('🔧 HybridObject obtained, calling toString...');
+            const result = hybridObject.toString();
+            console.log('🔧 toString completed with result:', result);
+            return result;
+        }
+        catch (error) {
+            console.error('🔧 toString failed:', error);
+            throw error;
+        }
+    }
+}
+// Create singleton instance
+const RnIap = new RnIapImpl();
+export default RnIap;

package/lib/module/helpers/subscription.js

@@ -26,8 +26,8 @@ export const getActiveSubscriptions = async subscriptionIds => {
         isActive: true,
         // If it's in availablePurchases, it's active
         // Backend validation fields
-        transactionId: purchase.transactionId || purchase.id,
-        purchaseToken: androidPurchase.purchaseToken || androidPurchase.purchaseTokenAndroid || iosPurchase.purchaseToken,
+        transactionId: purchase.id,
+        purchaseToken: purchase.purchaseToken,
         transactionDate: purchase.transactionDate,
         // Platform-specific fields
         expirationDateIOS: iosPurchase.expirationDateIOS ? new Date(iosPurchase.expirationDateIOS) : undefined,

package/lib/module/helpers/subscription.js.map

@@ -1 +1 @@
-{"version":3,"names":["getAvailablePurchases","getActiveSubscriptions","subscriptionIds","purchases","subscriptions","filter","purchase","length","includes","productId","map","iosPurchase","androidPurchase","isActive","transactionId","id","purchaseToken","purchaseTokenAndroid","transactionDate","expirationDateIOS","Date","undefined","autoRenewingAndroid","isAutoRenewing","environmentIOS","willExpireSoon","daysUntilExpirationIOS","Math","ceil","now","error","console","hasActiveSubscriptions","activeSubscriptions"],"sourceRoot":"../../../src","sources":["helpers/subscription.ts"],"mappings":";;AAAA,SAAQA,qBAAqB,QAAO,aAAK;AAGzC;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,GAAG,MACpCC,eAA0B,IACQ;EAClC,IAAI;IACF;IACA,MAAMC,SAAS,GAAG,MAAMH,qBAAqB,CAAC,CAAC;;IAE/C;IACA,MAAMI,aAAa,GAAGD,SAAS,CAC5BE,MAAM,CAAEC,QAAQ,IAAK;MACpB;MACA,IAAIJ,eAAe,IAAIA,eAAe,CAACK,MAAM,GAAG,CAAC,EAAE;QACjD,OAAOL,eAAe,CAACM,QAAQ,CAACF,QAAQ,CAACG,SAAS,CAAC;MACrD;MACA,OAAO,IAAI;IACb,CAAC,CAAC,CACDC,GAAG,CAAEJ,QAAQ,IAAyB;MACrC,MAAMK,WAAW,GAAGL,QAAuB;MAC3C,MAAMM,eAAe,GAAGN,QAA2B;MACnD,OAAO;QACLG,SAAS,EAAEH,QAAQ,CAACG,SAAS;QAC7BI,QAAQ,EAAE,IAAI;QAAE;QAChB;QACAC,aAAa,EAAER,QAAQ,CAACQ,aAAa,IAAIR,QAAQ,CAACS,EAAE;QACpDC,aAAa,EACXJ,eAAe,CAACI,aAAa,IAC7BJ,eAAe,CAACK,oBAAoB,IACpCN,WAAW,CAACK,aAAa;QAC3BE,eAAe,EAAEZ,QAAQ,CAACY,eAAe;QACzC;QACAC,iBAAiB,EAAER,WAAW,CAACQ,iBAAiB,GAC5C,IAAIC,IAAI,CAACT,WAAW,CAACQ,iBAAiB,CAAC,GACvCE,SAAS;QACbC,mBAAmB,EACjBV,eAAe,CAACU,mBAAmB,IACnCV,eAAe,CAACW,cAAc;QAAE;QAClCC,cAAc,EAAEb,WAAW,CAACa,cAAc;QAC1C;QACAC,cAAc,EAAE,KAAK;QAAE;QACvBC,sBAAsB,EAAEf,WAAW,CAACQ,iBAAiB,GACjDQ,IAAI,CAACC,IAAI,CACP,CAACjB,WAAW,CAACQ,iBAAiB,GAAGC,IAAI,CAACS,GAAG,CAAC,CAAC,KACxC,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CACxB,CAAC,GACDR;MACN,CAAC;IACH,CAAC,CAAC;IAEJ,OAAOjB,aAAa;EACtB,CAAC,CAAC,OAAO0B,KAAK,EAAE;IACdC,OAAO,CAACD,KAAK,CAAC,qCAAqC,EAAEA,KAAK,CAAC;IAC3D,MAAMA,KAAK;EACb;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,sBAAsB,GAAG,MACpC9B,eAA0B,IACL;EACrB,IAAI;IACF,MAAM+B,mBAAmB,GAAG,MAAMhC,sBAAsB,CAACC,eAAe,CAAC;IACzE,OAAO+B,mBAAmB,CAAC1B,MAAM,GAAG,CAAC;EACvC,CAAC,CAAC,OAAOuB,KAAK,EAAE;IACdC,OAAO,CAACD,KAAK,CAAC,uCAAuC,EAAEA,KAAK,CAAC;IAC7D,OAAO,KAAK;EACd;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["getAvailablePurchases","getActiveSubscriptions","subscriptionIds","purchases","subscriptions","filter","purchase","length","includes","productId","map","iosPurchase","androidPurchase","isActive","transactionId","id","purchaseToken","transactionDate","expirationDateIOS","Date","undefined","autoRenewingAndroid","isAutoRenewing","environmentIOS","willExpireSoon","daysUntilExpirationIOS","Math","ceil","now","error","console","hasActiveSubscriptions","activeSubscriptions"],"sourceRoot":"../../../src","sources":["helpers/subscription.ts"],"mappings":";;AAAA,SAAQA,qBAAqB,QAAO,aAAK;AAGzC;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,sBAAsB,GAAG,MACpCC,eAA0B,IACQ;EAClC,IAAI;IACF;IACA,MAAMC,SAAS,GAAG,MAAMH,qBAAqB,CAAC,CAAC;;IAE/C;IACA,MAAMI,aAAa,GAAGD,SAAS,CAC5BE,MAAM,CAAEC,QAAQ,IAAK;MACpB;MACA,IAAIJ,eAAe,IAAIA,eAAe,CAACK,MAAM,GAAG,CAAC,EAAE;QACjD,OAAOL,eAAe,CAACM,QAAQ,CAACF,QAAQ,CAACG,SAAS,CAAC;MACrD;MACA,OAAO,IAAI;IACb,CAAC,CAAC,CACDC,GAAG,CAAEJ,QAAQ,IAAyB;MACrC,MAAMK,WAAW,GAAGL,QAAuB;MAC3C,MAAMM,eAAe,GAAGN,QAA2B;MACnD,OAAO;QACLG,SAAS,EAAEH,QAAQ,CAACG,SAAS;QAC7BI,QAAQ,EAAE,IAAI;QAAE;QAChB;QACAC,aAAa,EAAER,QAAQ,CAACS,EAAE;QAC1BC,aAAa,EAAEV,QAAQ,CAACU,aAAa;QACrCC,eAAe,EAAEX,QAAQ,CAACW,eAAe;QACzC;QACAC,iBAAiB,EAAEP,WAAW,CAACO,iBAAiB,GAC5C,IAAIC,IAAI,CAACR,WAAW,CAACO,iBAAiB,CAAC,GACvCE,SAAS;QACbC,mBAAmB,EACjBT,eAAe,CAACS,mBAAmB,IACnCT,eAAe,CAACU,cAAc;QAAE;QAClCC,cAAc,EAAEZ,WAAW,CAACY,cAAc;QAC1C;QACAC,cAAc,EAAE,KAAK;QAAE;QACvBC,sBAAsB,EAAEd,WAAW,CAACO,iBAAiB,GACjDQ,IAAI,CAACC,IAAI,CACP,CAAChB,WAAW,CAACO,iBAAiB,GAAGC,IAAI,CAACS,GAAG,CAAC,CAAC,KACxC,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CACxB,CAAC,GACDR;MACN,CAAC;IACH,CAAC,CAAC;IAEJ,OAAOhB,aAAa;EACtB,CAAC,CAAC,OAAOyB,KAAK,EAAE;IACdC,OAAO,CAACD,KAAK,CAAC,qCAAqC,EAAEA,KAAK,CAAC;IAC3D,MAAMA,KAAK;EACb;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,sBAAsB,GAAG,MACpC7B,eAA0B,IACL;EACrB,IAAI;IACF,MAAM8B,mBAAmB,GAAG,MAAM/B,sBAAsB,CAACC,eAAe,CAAC;IACzE,OAAO8B,mBAAmB,CAACzB,MAAM,GAAG,CAAC;EACvC,CAAC,CAAC,OAAOsB,KAAK,EAAE;IACdC,OAAO,CAACD,KAAK,CAAC,uCAAuC,EAAEA,KAAK,CAAC;IAC7D,OAAO,KAAK;EACd;AACF,CAAC","ignoreList":[]}

package/lib/module/index.js

@@ -38,15 +38,27 @@ export const restorePurchases = async (options = {
 
 // Development utilities removed - use type bridge functions directly if needed
 
-// Create the RnIap HybridObject instance (internal use only)
-const iap = NitroModules.createHybridObject('RnIap');
+// Create the RnIap HybridObject instance lazily to avoid early JSI crashes
+let iap = null;
+const getIap = () => {
+  if (iap) return iap;
+
+  // Guard against accessing Nitro before it's installed into the JS runtime
+  const hasNitroDispatcher = typeof globalThis !== 'undefined' && globalThis?.__nitro?.dispatcher != null;
+  const isJestEnvironment = typeof globalThis.jest !== 'undefined' || typeof process !== 'undefined' && !!process.env && process.env.JEST_WORKER_ID != null;
+  if (!hasNitroDispatcher && !isJestEnvironment) {
+    throw new Error('Nitro runtime not installed yet. Ensure react-native-nitro-modules is initialized before calling IAP.');
+  }
+  iap = NitroModules.createHybridObject('RnIap');
+  return iap;
+};
 
 /**
  * Initialize connection to the store
  */
 export const initConnection = async () => {
   try {
-    return await iap.initConnection();
+    return await getIap().initConnection();
   } catch (error) {
     console.error('Failed to initialize IAP connection:', error);
     throw error;
@@ -58,7 +70,9 @@ export const initConnection = async () => {
  */
 export const endConnection = async () => {
   try {
-    return await iap.endConnection();
+    // If never initialized, treat as ended
+    if (!iap) return true;
+    return await getIap().endConnection();
   } catch (error) {
     console.error('Failed to end IAP connection:', error);
     throw error;
@@ -90,7 +104,7 @@ export const fetchProducts = async ({
       throw new Error('No SKUs provided');
     }
     if (type === 'all') {
-      const [inappNitro, subsNitro] = await Promise.all([iap.fetchProducts(skus, 'inapp'), iap.fetchProducts(skus, 'subs')]);
+      const [inappNitro, subsNitro] = await Promise.all([getIap().fetchProducts(skus, 'inapp'), getIap().fetchProducts(skus, 'subs')]);
       const allNitro = [...inappNitro, ...subsNitro];
       const validAll = allNitro.filter(validateNitroProduct);
       if (validAll.length !== allNitro.length) {
@@ -98,7 +112,7 @@ export const fetchProducts = async ({
       }
       return validAll.map(convertNitroProductToProduct);
     }
-    const nitroProducts = await iap.fetchProducts(skus, type);
+    const nitroProducts = await getIap().fetchProducts(skus, type);
 
     // Validate and convert NitroProducts to TypeScript Products
     const validProducts = nitroProducts.filter(validateNitroProduct);
@@ -197,7 +211,7 @@ export const requestPurchase = async ({
     }
 
     // Call unified method - returns void, listen for events instead
-    await iap.requestPurchase(unifiedRequest);
+    await getIap().requestPurchase(unifiedRequest);
   } catch (error) {
     console.error('Failed to request purchase:', error);
     throw error;
@@ -234,12 +248,12 @@ export const getAvailablePurchases = async ({
       };
     } else if (Platform.OS === 'android') {
       // For Android, we need to call twice for inapp and subs
-      const inappNitroPurchases = await iap.getAvailablePurchases({
+      const inappNitroPurchases = await getIap().getAvailablePurchases({
         android: {
           type: 'inapp'
         }
       });
-      const subsNitroPurchases = await iap.getAvailablePurchases({
+      const subsNitroPurchases = await getIap().getAvailablePurchases({
         android: {
           type: 'subs'
         }
@@ -255,7 +269,7 @@ export const getAvailablePurchases = async ({
     } else {
       throw new Error('Unsupported platform');
     }
-    const nitroPurchases = await iap.getAvailablePurchases(options);
+    const nitroPurchases = await getIap().getAvailablePurchases(options);
 
     // Validate and convert NitroPurchases to TypeScript Purchases
     const validPurchases = nitroPurchases.filter(validateNitroPurchase);
@@ -299,7 +313,7 @@ export const finishTransaction = async ({
       };
     } else if (Platform.OS === 'android') {
       const androidPurchase = purchase;
-      const token = androidPurchase.purchaseToken || androidPurchase.purchaseTokenAndroid;
+      const token = androidPurchase.purchaseToken;
       if (!token) {
         throw new Error('purchaseToken required to finish Android transaction');
       }
@@ -310,7 +324,7 @@ export const finishTransaction = async ({
     } else {
       throw new Error('Unsupported platform');
     }
-    const result = await iap.finishTransaction(params);
+    const result = await getIap().finishTransaction(params);
 
     // Handle variant return type
     if (typeof result === 'boolean') {
@@ -348,7 +362,7 @@ export const acknowledgePurchaseAndroid = async purchaseToken => {
     if (Platform.OS !== 'android') {
       throw new Error('acknowledgePurchaseAndroid is only available on Android');
     }
-    const result = await iap.finishTransaction({
+    const result = await getIap().finishTransaction({
       android: {
         purchaseToken,
         isConsumable: false
@@ -386,7 +400,7 @@ export const consumePurchaseAndroid = async purchaseToken => {
     if (Platform.OS !== 'android') {
       throw new Error('consumePurchaseAndroid is only available on Android');
     }
-    const result = await iap.finishTransaction({
+    const result = await getIap().finishTransaction({
       android: {
         purchaseToken,
         isConsumable: true
@@ -450,12 +464,27 @@ export const purchaseUpdatedListener = listener => {
 
   // Store the wrapped listener for removal
   listenerMap.set(listener, wrappedListener);
-  iap.addPurchaseUpdatedListener(wrappedListener);
+  let attached = false;
+  try {
+    getIap().addPurchaseUpdatedListener(wrappedListener);
+    attached = true;
+  } catch (e) {
+    const msg = String(e ?? '');
+    if (msg.includes('Nitro runtime not installed')) {
+      console.warn('[purchaseUpdatedListener] Nitro not ready yet; listener inert until initConnection()');
+    } else {
+      throw e;
+    }
+  }
   return {
     remove: () => {
       const wrapped = listenerMap.get(listener);
       if (wrapped) {
-        iap.removePurchaseUpdatedListener(wrapped);
+        if (attached) {
+          try {
+            getIap().removePurchaseUpdatedListener(wrapped);
+          } catch {}
+        }
         listenerMap.delete(listener);
       }
     }
@@ -492,10 +521,25 @@ export const purchaseUpdatedListener = listener => {
 export const purchaseErrorListener = listener => {
   // Store the listener for removal
   listenerMap.set(listener, listener);
-  iap.addPurchaseErrorListener(listener);
+  let attached = false;
+  try {
+    getIap().addPurchaseErrorListener(listener);
+    attached = true;
+  } catch (e) {
+    const msg = String(e ?? '');
+    if (msg.includes('Nitro runtime not installed')) {
+      console.warn('[purchaseErrorListener] Nitro not ready yet; listener inert until initConnection()');
+    } else {
+      throw e;
+    }
+  }
   return {
     remove: () => {
-      iap.removePurchaseErrorListener(listener);
+      if (attached) {
+        try {
+          getIap().removePurchaseErrorListener(listener);
+        } catch {}
+      }
       listenerMap.delete(listener);
     }
   };
@@ -541,12 +585,27 @@ export const promotedProductListenerIOS = listener => {
 
   // Store the wrapped listener for removal
   listenerMap.set(listener, wrappedListener);
-  iap.addPromotedProductListenerIOS(wrappedListener);
+  let attached = false;
+  try {
+    getIap().addPromotedProductListenerIOS(wrappedListener);
+    attached = true;
+  } catch (e) {
+    const msg = String(e ?? '');
+    if (msg.includes('Nitro runtime not installed')) {
+      console.warn('[promotedProductListenerIOS] Nitro not ready yet; listener inert until initConnection()');
+    } else {
+      throw e;
+    }
+  }
   return {
     remove: () => {
       const wrapped = listenerMap.get(listener);
       if (wrapped) {
-        iap.removePromotedProductListenerIOS(wrapped);
+        if (attached) {
+          try {
+            getIap().removePromotedProductListenerIOS(wrapped);
+          } catch {}
+        }
         listenerMap.delete(listener);
       }
     }
@@ -564,16 +623,12 @@ export const promotedProductListenerIOS = listener => {
  * @returns Promise<ReceiptValidationResultIOS | ReceiptValidationResultAndroid> - Platform-specific receipt validation result
  */
 export const validateReceipt = async (sku, androidOptions) => {
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
     const params = {
       sku,
       androidOptions
     };
-    const nitroResult = await iap.validateReceipt(params);
+    const nitroResult = await getIap().validateReceipt(params);
 
     // Convert Nitro result to public API result
     if (Platform.OS === 'ios') {
@@ -626,12 +681,8 @@ export const syncIOS = async () => {
   if (Platform.OS !== 'ios') {
     throw new Error('syncIOS is only available on iOS');
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    return await iap.syncIOS();
+    return await getIap().syncIOS();
   } catch (error) {
     console.error('[syncIOS] Failed:', error);
     const errorJson = parseErrorStringToJsonObj(error);
@@ -648,12 +699,8 @@ export const requestPromotedProductIOS = async () => {
   if (Platform.OS !== 'ios') {
     return null;
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    const nitroProduct = await iap.requestPromotedProductIOS();
+    const nitroProduct = await getIap().requestPromotedProductIOS();
     if (nitroProduct) {
       return convertNitroProductToProduct(nitroProduct);
     }
@@ -674,12 +721,8 @@ export const presentCodeRedemptionSheetIOS = async () => {
   if (Platform.OS !== 'ios') {
     return false;
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    return await iap.presentCodeRedemptionSheetIOS();
+    return await getIap().presentCodeRedemptionSheetIOS();
   } catch (error) {
     console.error('[presentCodeRedemptionSheetIOS] Failed:', error);
     const errorJson = parseErrorStringToJsonObj(error);
@@ -696,12 +739,8 @@ export const buyPromotedProductIOS = async () => {
   if (Platform.OS !== 'ios') {
     throw new Error('buyPromotedProductIOS is only available on iOS');
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    await iap.buyPromotedProductIOS();
+    await getIap().buyPromotedProductIOS();
   } catch (error) {
     console.error('[buyPromotedProductIOS] Failed:', error);
     const errorJson = parseErrorStringToJsonObj(error);
@@ -718,12 +757,8 @@ export const clearTransactionIOS = async () => {
   if (Platform.OS !== 'ios') {
     return;
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    await iap.clearTransactionIOS();
+    await getIap().clearTransactionIOS();
   } catch (error) {
     console.error('[clearTransactionIOS] Failed:', error);
     const errorJson = parseErrorStringToJsonObj(error);
@@ -741,12 +776,8 @@ export const beginRefundRequestIOS = async sku => {
   if (Platform.OS !== 'ios') {
     return null;
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    return await iap.beginRefundRequestIOS(sku);
+    return await getIap().beginRefundRequestIOS(sku);
   } catch (error) {
     console.error('[beginRefundRequestIOS] Failed:', error);
     const errorJson = parseErrorStringToJsonObj(error);
@@ -765,12 +796,8 @@ export const subscriptionStatusIOS = async sku => {
   if (Platform.OS !== 'ios') {
     throw new Error('subscriptionStatusIOS is only available on iOS');
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    const statuses = await iap.subscriptionStatusIOS(sku);
+    const statuses = await getIap().subscriptionStatusIOS(sku);
     if (!statuses || !Array.isArray(statuses)) return [];
     return statuses.map(s => convertNitroSubscriptionStatusToSubscriptionStatusIOS(s));
   } catch (error) {
@@ -790,12 +817,8 @@ export const currentEntitlementIOS = async sku => {
   if (Platform.OS !== 'ios') {
     return null;
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    const nitroPurchase = await iap.currentEntitlementIOS(sku);
+    const nitroPurchase = await getIap().currentEntitlementIOS(sku);
     if (nitroPurchase) {
       return convertNitroPurchaseToPurchase(nitroPurchase);
     }
@@ -817,12 +840,8 @@ export const latestTransactionIOS = async sku => {
   if (Platform.OS !== 'ios') {
     return null;
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    const nitroPurchase = await iap.latestTransactionIOS(sku);
+    const nitroPurchase = await getIap().latestTransactionIOS(sku);
     if (nitroPurchase) {
       return convertNitroPurchaseToPurchase(nitroPurchase);
     }
@@ -843,12 +862,8 @@ export const getPendingTransactionsIOS = async () => {
   if (Platform.OS !== 'ios') {
     return [];
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    const nitroPurchases = await iap.getPendingTransactionsIOS();
+    const nitroPurchases = await getIap().getPendingTransactionsIOS();
     return nitroPurchases.map(convertNitroPurchaseToPurchase);
   } catch (error) {
     console.error('[getPendingTransactionsIOS] Failed:', error);
@@ -866,12 +881,8 @@ export const showManageSubscriptionsIOS = async () => {
   if (Platform.OS !== 'ios') {
     return [];
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    const nitroPurchases = await iap.showManageSubscriptionsIOS();
+    const nitroPurchases = await getIap().showManageSubscriptionsIOS();
     return nitroPurchases.map(convertNitroPurchaseToPurchase);
   } catch (error) {
     console.error('[showManageSubscriptionsIOS] Failed:', error);
@@ -890,12 +901,8 @@ export const isEligibleForIntroOfferIOS = async groupID => {
   if (Platform.OS !== 'ios') {
     return false;
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    return await iap.isEligibleForIntroOfferIOS(groupID);
+    return await getIap().isEligibleForIntroOfferIOS(groupID);
   } catch (error) {
     console.error('[isEligibleForIntroOfferIOS] Failed:', error);
     const errorJson = parseErrorStringToJsonObj(error);
@@ -912,12 +919,8 @@ export const getReceiptDataIOS = async () => {
   if (Platform.OS !== 'ios') {
     throw new Error('getReceiptDataIOS is only available on iOS');
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    return await iap.getReceiptDataIOS();
+    return await getIap().getReceiptDataIOS();
   } catch (error) {
     console.error('[getReceiptDataIOS] Failed:', error);
     const errorJson = parseErrorStringToJsonObj(error);
@@ -935,12 +938,8 @@ export const isTransactionVerifiedIOS = async sku => {
   if (Platform.OS !== 'ios') {
     return false;
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    return await iap.isTransactionVerifiedIOS(sku);
+    return await getIap().isTransactionVerifiedIOS(sku);
   } catch (error) {
     console.error('[isTransactionVerifiedIOS] Failed:', error);
     const errorJson = parseErrorStringToJsonObj(error);
@@ -958,12 +957,8 @@ export const getTransactionJwsIOS = async sku => {
   if (Platform.OS !== 'ios') {
     return null;
   }
-  if (!iap) {
-    const errorJson = parseErrorStringToJsonObj('RnIap: Service not initialized. Call initConnection() first.');
-    throw new Error(errorJson.message);
-  }
   try {
-    return await iap.getTransactionJwsIOS(sku);
+    return await getIap().getTransactionJwsIOS(sku);
   } catch (error) {
     console.error('[getTransactionJwsIOS] Failed:', error);
     const errorJson = parseErrorStringToJsonObj(error);
@@ -988,7 +983,7 @@ export const getStorefrontIOS = async () => {
   }
   try {
     // Call the native method to get storefront
-    const storefront = await iap.getStorefrontIOS();
+    const storefront = await getIap().getStorefrontIOS();
     return storefront;
   } catch (error) {
     console.error('Failed to get storefront:', error);
@@ -1006,7 +1001,7 @@ export const getStorefront = async () => {
   if (Platform.OS === 'android') {
     try {
       // Optional since older builds may not have the method
-      const result = await iap.getStorefrontAndroid?.();
+      const result = await getIap().getStorefrontAndroid?.();
       return result ?? '';
     } catch {
       return '';
@@ -1021,7 +1016,7 @@ export const getStorefront = async () => {
  */
 export const deepLinkToSubscriptions = async (options = {}) => {
   if (Platform.OS === 'android') {
-    await iap.deepLinkToSubscriptionsAndroid?.({
+    await getIap().deepLinkToSubscriptionsAndroid?.({
       skuAndroid: options.skuAndroid,
       packageNameAndroid: options.packageNameAndroid
     });
@@ -1030,7 +1025,7 @@ export const deepLinkToSubscriptions = async (options = {}) => {
   // iOS: Use manage subscriptions sheet (ignore returned purchases for deeplink parity)
   if (Platform.OS === 'ios') {
     try {
-      await iap.showManageSubscriptionsIOS();
+      await getIap().showManageSubscriptionsIOS();
     } catch {
       // no-op
     }
@@ -1064,7 +1059,7 @@ export const getAppTransactionIOS = async () => {
   }
   try {
     // Call the native method to get app transaction
-    const appTransaction = await iap.getAppTransactionIOS();
+    const appTransaction = await getIap().getAppTransactionIOS();
     return appTransaction;
   } catch (error) {
     console.error('Failed to get app transaction:', error);