react-native-iap 16.4.0 → 16.5.0

package/android/src/main/java/com/margelo/nitro/iap/HybridRnIap.kt

@@ -78,13 +78,53 @@ class OpenIapException(private val errorJson: String, cause: Throwable? = null)
     }
 }
 
+internal fun parseOpenIapError(err: Throwable): OpenIapError {
+    var cause: Throwable? = err
+    while (cause != null) {
+        if (cause is OpenIapError) return cause
+        cause = cause.cause
+    }
+
+    cause = err
+    while (cause != null) {
+        val message = cause.message ?: ""
+        when {
+            message.contains("not prepared", ignoreCase = true) ||
+                message.contains("not initialized", ignoreCase = true) -> return OpenIapError.NotPrepared
+            message.contains("developer error", ignoreCase = true) ||
+                message.contains("activity not available", ignoreCase = true) -> return OpenIapError.DeveloperError()
+            message.contains("network", ignoreCase = true) -> return OpenIapError.NetworkError
+            message.contains("service unavailable", ignoreCase = true) ||
+                message.contains("billing unavailable", ignoreCase = true) -> return OpenIapError.ServiceUnavailable()
+        }
+        cause = cause.cause
+    }
+    return OpenIapError.ServiceUnavailable()
+}
+
+internal fun normalizeAvailablePurchasesType(type: NitroAvailablePurchasesAndroidType?): String? =
+    when (type) {
+        NitroAvailablePurchasesAndroidType.IN_APP -> "in-app"
+        NitroAvailablePurchasesAndroidType.SUBS -> "subs"
+        null -> null
+    }
+
+internal fun rejectDisconnectedPurchase(
+    isInitialized: Boolean,
+    sendError: (OpenIapError) -> Unit,
+): Boolean {
+    if (isInitialized) return false
+    sendError(OpenIapError.NotPrepared)
+    return true
+}
+
 internal suspend fun endRnConnectionWithCleanup(
     endConnection: suspend () -> Boolean,
     cleanup: () -> Unit,
-): Boolean = try {
-    endConnection()
-} finally {
+): Boolean {
+    val result = endConnection()
     cleanup()
+    return result
 }
 
 /**
@@ -139,6 +179,17 @@ internal fun requireMatchingPurchaseOptions(
     }
 }
 
+internal inline fun <T> catchNonCancellation(
+    block: () -> T,
+    onFailure: (Exception) -> T,
+): T = try {
+    block()
+} catch (error: CancellationException) {
+    throw error
+} catch (error: Exception) {
+    onFailure(error)
+}
+
 /**
  * Bound for the pending purchase-event queues, matching expo-iap's
  * ExpoIapHelper.MAX_BUFFERED_EVENTS. Oldest entries are dropped on overflow.
@@ -183,6 +234,7 @@ class HybridRnIap : HybridRnIapSpec() {
     private val developerProvidedBillingListenersAndroid = mutableListOf<(DeveloperProvidedBillingDetailsAndroid) -> Unit>()
     private val subscriptionBillingIssueListeners = mutableListOf<(NitroPurchase) -> Unit>()
     private var listenersAttached = false
+    @Volatile
     private var isInitialized = false
     private val connectionLifecycleQueue = ConnectionLifecycleQueue()
     
@@ -206,15 +258,10 @@ class HybridRnIap : HybridRnIapSpec() {
     private fun Variant_NullType_Double?.unwrapDouble(): Double? = (this as? Variant_NullType_Double.Second)?.value
     private fun Variant_NullType_Boolean?.unwrapBool(): Boolean? = (this as? Variant_NullType_Boolean.Second)?.value
 
-    private suspend fun ensureConnection() {
-        initConnection(null as Variant_NullType_InitConnectionConfig?).await()
-    }
-
     override fun initConnection(config: Variant_NullType_InitConnectionConfig?): Promise<Boolean> {
         val configValue = (config as? Variant_NullType_InitConnectionConfig.Second)?.value
         val performInit: suspend () -> Boolean = initOperation@{
             RnIapLog.payload("initConnection", configValue)
-            if (isInitialized) return@initOperation true
 
             // CRITICAL: Set Activity BEFORE calling initConnection
             // Horizon SDK needs Activity to initialize OVRPlatform with proper returnComponent
@@ -236,7 +283,7 @@ class HybridRnIap : HybridRnIapSpec() {
                 }
             } catch (err: CancellationException) {
                 throw err
-            } catch (err: Throwable) {
+            } catch (err: Exception) {
                 val error = OpenIapError.InitConnection
                 val errorMessage = err.message ?: err.javaClass.name
                 RnIapLog.failure("initConnection.setActivity", err)
@@ -337,7 +384,7 @@ class HybridRnIap : HybridRnIapSpec() {
                 }
             } catch (err: CancellationException) {
                 throw err
-            } catch (err: Throwable) {
+            } catch (err: Exception) {
                 listenersAttached = false
                 val error = OpenIapError.InitConnection
                 val errorMessage = err.message ?: err.javaClass.name
@@ -374,7 +421,7 @@ class HybridRnIap : HybridRnIapSpec() {
                     }
                 } catch (err: CancellationException) {
                     throw err
-                } catch (err: Throwable) {
+                } catch (err: Exception) {
                     val error = OpenIapError.InitConnection
                     RnIapLog.failure("initConnection.native", err)
                     throw OpenIapException(
@@ -470,7 +517,6 @@ class HybridRnIap : HybridRnIapSpec() {
                 throw OpenIapException(toErrorJson(OpenIapError.EmptySkuList))
             }
 
-            ensureConnection()
 
             val queryType = parseProductQueryType(type)
             val skusList = skus.toList()
@@ -545,9 +591,15 @@ class HybridRnIap : HybridRnIapSpec() {
                 return@async defaultResult
             }
 
+            if (rejectDisconnectedPurchase(isInitialized) { error ->
+                RnIapLog.warn("requestPurchase called before initConnection")
+                sendPurchaseError(toErrorResult(error))
+            }) {
+                return@async defaultResult
+            }
+
             var reachedOpenIapRequest = false
             try {
-                ensureConnection()
 
                 // Ensure Activity is available for purchase flow
                 val activity = withContext(Dispatchers.Main) {
@@ -565,29 +617,36 @@ class HybridRnIap : HybridRnIapSpec() {
                     openIap.setActivity(activity)
                 }
 
-                val missingSkus = androidRequest.skus.filterNot { productTypeBySku.containsKey(it) }
-                if (missingSkus.isNotEmpty()) {
+                val queryType = request.type?.let { requestType ->
+                    when (requestType) {
+                        NitroPurchaseRequestType.SUBS -> ProductQueryType.Subs
+                        NitroPurchaseRequestType.IN_APP -> ProductQueryType.InApp
+                    }
+                } ?: run {
+                    val missingSkus = androidRequest.skus.filterNot { productTypeBySku.containsKey(it) }
                     missingSkus.forEach { sku ->
-                        RnIapLog.warn("requestPurchase missing cached type for $sku; attempting fetch")
-                        val fetched = runCatching {
-                            openIap.fetchProducts(
-                                ProductRequest(listOf(sku), ProductQueryType.All)
-                            ).productsOrEmpty()
-                        }.getOrElse { error ->
-                            RnIapLog.failure("requestPurchase.fetchMissing", error)
-                            emptyList()
-                        }
+                        RnIapLog.warn("requestPurchase missing type hint for $sku; attempting fetch")
+                        val fetched = catchNonCancellation(
+                            block = {
+                                openIap.fetchProducts(
+                                    ProductRequest(listOf(sku), ProductQueryType.All)
+                                ).productsOrEmpty()
+                            },
+                            onFailure = { error ->
+                                if (error is OpenIapError) throw error
+                                RnIapLog.failure("requestPurchase.fetchMissing", error)
+                                emptyList()
+                            },
+                        )
                         fetched.firstOrNull()?.let { productTypeBySku[it.id] = it.type.rawValue }
                         if (!productTypeBySku.containsKey(sku)) {
                             sendPurchaseError(toErrorResult(OpenIapError.SkuNotFound(sku)))
                             return@async defaultResult
                         }
                     }
+                    parseProductQueryType(productTypeBySku[androidRequest.skus.first()] ?: "in-app")
                 }
 
-                val typeHint = androidRequest.skus.firstOrNull()?.let { productTypeBySku[it] } ?: "in-app"
-                val queryType = parseProductQueryType(typeHint)
-
                 try {
                     requireMatchingPurchaseOptions(
                         type = queryType,
@@ -697,6 +756,12 @@ class HybridRnIap : HybridRnIapSpec() {
                 defaultResult
             } catch (e: CancellationException) {
                 throw e
+            } catch (e: OpenIapError) {
+                RnIapLog.failure("requestPurchase", e)
+                if (!reachedOpenIapRequest) {
+                    sendPurchaseError(toErrorResult(error = e, debugMessage = e.message))
+                }
+                defaultResult
             } catch (e: Exception) {
                 RnIapLog.failure("requestPurchase", e)
                 if (!reachedOpenIapRequest) {
@@ -716,54 +781,53 @@ class HybridRnIap : HybridRnIapSpec() {
     // Purchase history methods (Unified)
     override fun getAvailablePurchases(options: NitroAvailablePurchasesOptions?): Promise<Array<NitroPurchase>> {
         return Promise.async {
-            val androidOptions = (options?.android as? Variant_NullType_NitroAvailablePurchasesAndroidOptions.Second)?.value
-            ensureConnection()
+            try {
+                val androidOptions = (options?.android as? Variant_NullType_NitroAvailablePurchasesAndroidOptions.Second)?.value
 
-            val includeSuspended = androidOptions?.includeSuspended.unwrapBool() ?: false
+                val includeSuspended = androidOptions?.includeSuspended.unwrapBool() ?: false
 
-            RnIapLog.payload(
-                "getAvailablePurchases",
-                mapOf("type" to androidOptions?.type?.name, "includeSuspended" to includeSuspended)
-            )
+                RnIapLog.payload(
+                    "getAvailablePurchases",
+                    mapOf("type" to androidOptions?.type?.name, "includeSuspended" to includeSuspended)
+                )
 
-            val typeName = androidOptions?.type?.name?.lowercase(java.util.Locale.ROOT)
-            val normalizedType = when (typeName) {
-                "in-app", "subs" -> typeName
-                else -> null
-            }
+                val normalizedType = normalizeAvailablePurchasesType(androidOptions?.type)
 
-            // Create PurchaseOptions with includeSuspendedAndroid
-            val purchaseOptions = dev.hyo.openiap.PurchaseOptions(
-                includeSuspendedAndroid = includeSuspended
-            )
+                // Create PurchaseOptions with includeSuspendedAndroid
+                val purchaseOptions = dev.hyo.openiap.PurchaseOptions(
+                    includeSuspendedAndroid = includeSuspended
+                )
 
-            val result: List<OpenIapPurchase> = if (normalizedType != null) {
-                val typeEnum = parseProductQueryType(normalizedType)
-                RnIapLog.payload(
-                    "getAvailablePurchases.native",
-                    mapOf("type" to typeEnum.rawValue, "includeSuspended" to includeSuspended)
+                val result: List<OpenIapPurchase> = if (normalizedType != null) {
+                    val typeEnum = parseProductQueryType(normalizedType)
+                    RnIapLog.payload(
+                        "getAvailablePurchases.native",
+                        mapOf("type" to typeEnum.rawValue, "includeSuspended" to includeSuspended)
+                    )
+                    // Note: getAvailableItems doesn't accept PurchaseOptions
+                    // includeSuspended only applies when fetching all types
+                    openIap.getAvailableItems(typeEnum)
+                } else {
+                    RnIapLog.payload("getAvailablePurchases.native", mapOf("type" to "all", "includeSuspended" to includeSuspended))
+                    openIap.getAvailablePurchases(purchaseOptions)
+                }
+                RnIapLog.result(
+                    "getAvailablePurchases",
+                    mapOf(
+                        "purchaseCount" to result.size,
+                        "productIds" to result.map { it.productId }
+                    )
                 )
-                // Note: getAvailableItems doesn't accept PurchaseOptions
-                // includeSuspended only applies when fetching all types
-                openIap.getAvailableItems(typeEnum)
-            } else {
-                RnIapLog.payload("getAvailablePurchases.native", mapOf("type" to "all", "includeSuspended" to includeSuspended))
-                openIap.getAvailablePurchases(purchaseOptions)
+                result.map { convertToNitroPurchase(it) }.toTypedArray()
+            } catch (e: OpenIapError) {
+                RnIapLog.failure("getAvailablePurchases", e)
+                throw OpenIapException(toErrorJson(e), e)
             }
-            RnIapLog.result(
-                "getAvailablePurchases",
-                mapOf(
-                    "purchaseCount" to result.size,
-                    "productIds" to result.map { it.productId }
-                )
-            )
-            result.map { convertToNitroPurchase(it) }.toTypedArray()
         }
     }
 
     override fun getActiveSubscriptions(subscriptionIds: Array<String>?): Promise<Array<NitroActiveSubscription>> {
         return Promise.async {
-            ensureConnection()
 
             RnIapLog.payload(
                 "getActiveSubscriptions",
@@ -771,7 +835,6 @@ class HybridRnIap : HybridRnIapSpec() {
             )
 
             try {
-                // Use OpenIapModule's native getActiveSubscriptions method
                 RnIapLog.payload("getActiveSubscriptions.native", mapOf("type" to "subs"))
                 val activeSubscriptions = openIap.getActiveSubscriptions(subscriptionIds?.toList())
 
@@ -801,6 +864,11 @@ class HybridRnIap : HybridRnIapSpec() {
                 )
 
                 nitroSubscriptions.toTypedArray()
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: OpenIapError) {
+                RnIapLog.failure("getActiveSubscriptions", e)
+                throw OpenIapException(toErrorJson(e))
             } catch (e: Exception) {
                 RnIapLog.failure("getActiveSubscriptions", e)
                 val error = OpenIapError.ServiceUnavailable()
@@ -817,7 +885,6 @@ class HybridRnIap : HybridRnIapSpec() {
 
     override fun hasActiveSubscriptions(subscriptionIds: Array<String>?): Promise<Boolean> {
         return Promise.async {
-            ensureConnection()
 
             RnIapLog.payload(
                 "hasActiveSubscriptions",
@@ -828,6 +895,11 @@ class HybridRnIap : HybridRnIapSpec() {
                 val hasActive = openIap.hasActiveSubscriptions(subscriptionIds?.toList())
                 RnIapLog.result("hasActiveSubscriptions", hasActive)
                 hasActive
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: OpenIapError) {
+                RnIapLog.failure("hasActiveSubscriptions", e)
+                throw OpenIapException(toErrorJson(e))
             } catch (e: Exception) {
                 RnIapLog.failure("hasActiveSubscriptions", e)
                 val error = OpenIapError.ServiceUnavailable()
@@ -877,27 +949,6 @@ class HybridRnIap : HybridRnIapSpec() {
                 )
             }
 
-            // Ensure connection; if it fails, return an error result instead of throwing
-            try {
-                ensureConnection()
-            } catch (e: Exception) {
-                val err = OpenIapError.InitConnection
-                return@async Variant_Boolean_NitroPurchaseResult.Second(
-                    NitroPurchaseResult(
-                        responseCode = -1.0,
-                        debugMessage = e.message,
-                        code = OpenIapError.toCode(err),
-                        message = e.message?.takeIf { it.isNotBlank() } ?: err.message,
-                        purchaseToken = purchaseToken,
-                        productId = null,
-                        productIds = null,
-                        productType = null,
-                        isEmptyProductList = null,
-                        subResponseCodeAndroid = null
-                    )
-                )
-            }
-
             try {
                 if (isConsumable) {
                     openIap.consumePurchaseAndroid(purchaseToken)
@@ -920,6 +971,24 @@ class HybridRnIap : HybridRnIapSpec() {
                 )
                 RnIapLog.result("finishTransaction", mapOf("success" to true))
                 result
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: OpenIapError) {
+                RnIapLog.failure("finishTransaction", e)
+                Variant_Boolean_NitroPurchaseResult.Second(
+                    NitroPurchaseResult(
+                        responseCode = -1.0,
+                        debugMessage = e.message,
+                        code = OpenIapError.toCode(e),
+                        message = e.message,
+                        purchaseToken = purchaseToken,
+                        productId = null,
+                        productIds = null,
+                        productType = null,
+                        isEmptyProductList = null,
+                        subResponseCodeAndroid = null
+                    )
+                )
             } catch (e: Exception) {
                 val err = OpenIapError.BillingError()
                 RnIapLog.failure("finishTransaction", e)
@@ -944,7 +1013,6 @@ class HybridRnIap : HybridRnIapSpec() {
     override fun getStorefront(): Promise<String> {
         return Promise.async {
             try {
-                ensureConnection()
                 RnIapLog.payload("getStorefront", null)
                 val value = openIap.getStorefront()
                 if (value.isBlank()) {
@@ -954,6 +1022,8 @@ class HybridRnIap : HybridRnIapSpec() {
                 }
                 RnIapLog.result("getStorefront", value)
                 value
+            } catch (e: CancellationException) {
+                throw e
             } catch (e: OpenIapException) {
                 RnIapLog.failure("getStorefront", e)
                 throw e
@@ -1400,7 +1470,6 @@ class HybridRnIap : HybridRnIapSpec() {
     override fun deepLinkToSubscriptionsAndroid(options: NitroDeepLinkOptionsAndroid): Promise<Unit> {
         return Promise.async {
             try {
-                ensureConnection()
                 OpenIapDeepLinkOptions(
                     skuAndroid = options.skuAndroid.unwrapString(),
                     packageNameAndroid = options.packageNameAndroid.unwrapString()
@@ -1568,6 +1637,8 @@ class HybridRnIap : HybridRnIapSpec() {
 
                 Variant_NitroPurchaseVerificationResultIOS_NitroPurchaseVerificationResultAndroid_NitroPurchaseVerificationResultHorizon.Second(result)
 
+            } catch (e: CancellationException) {
+                throw e
             } catch (e: OpenIapException) {
                 RnIapLog.failure("verifyPurchase", e)
                 throw e
@@ -1607,6 +1678,11 @@ class HybridRnIap : HybridRnIapSpec() {
                     (iapkit.google as? Variant_NullType_NitroVerifyPurchaseWithIapkitGoogleProps.Second)?.value?.let { google ->
                         iapkitMap["google"] = mapOf("purchaseToken" to google.purchaseToken)
                     }
+                    (iapkit.horizon as? Variant_NullType_NitroVerifyPurchaseWithIapkitHorizonProps.Second)?.value?.let { horizon ->
+                        val horizonMap = mutableMapOf<String, Any?>("sku" to horizon.sku)
+                        horizon.userId.unwrapString()?.let { horizonMap["userId"] = it }
+                        iapkitMap["horizon"] = horizonMap
+                    }
                     (iapkit.amazon as? Variant_NullType_NitroVerifyPurchaseWithIapkitAmazonProps.Second)?.value?.let { amazon ->
                         val amazonMap = mutableMapOf<String, Any?>(
                             "receiptId" to amazon.receiptId
@@ -1673,6 +1749,8 @@ class HybridRnIap : HybridRnIapSpec() {
                     errors = nitroErrors?.let { Variant_NullType_Array_NitroVerifyPurchaseWithProviderError_.Second(it) },
                     provider = mapPurchaseVerificationProvider(result.provider.rawValue)
                 )
+            } catch (e: CancellationException) {
+                throw e
             } catch (e: Exception) {
                 RnIapLog.failure("verifyPurchaseWithProvider", e)
                 val error = OpenIapError.VerificationFailed
@@ -1764,9 +1842,7 @@ class HybridRnIap : HybridRnIapSpec() {
     }
 
     override fun removeUserChoiceBillingListenerAndroid(listener: (UserChoiceBillingDetails) -> Unit) {
-        synchronized(userChoiceBillingListenersAndroid) {
-            userChoiceBillingListenersAndroid.remove(listener)
-        }
+        removeSingletonBridgeListener(userChoiceBillingListenersAndroid, listener)
     }
 
     private fun sendUserChoiceBilling(details: UserChoiceBillingDetails) {
@@ -1782,9 +1858,7 @@ class HybridRnIap : HybridRnIapSpec() {
     }
 
     override fun removeDeveloperProvidedBillingListenerAndroid(listener: (DeveloperProvidedBillingDetailsAndroid) -> Unit) {
-        synchronized(developerProvidedBillingListenersAndroid) {
-            developerProvidedBillingListenersAndroid.remove(listener)
-        }
+        removeSingletonBridgeListener(developerProvidedBillingListenersAndroid, listener)
     }
 
     private fun sendDeveloperProvidedBilling(details: DeveloperProvidedBillingDetailsAndroid) {
@@ -1813,9 +1887,7 @@ class HybridRnIap : HybridRnIapSpec() {
 
     override fun removeSubscriptionBillingIssueListener(listener: (purchase: NitroPurchase) -> Unit) {
         synchronized(subscriptionBillingIssueAttachLock) {
-            synchronized(subscriptionBillingIssueListeners) {
-                subscriptionBillingIssueListeners.remove(listener)
-            }
+            removeSingletonBridgeListener(subscriptionBillingIssueListeners, listener)
         }
     }
 
@@ -1865,21 +1937,22 @@ class HybridRnIap : HybridRnIapSpec() {
 
     override fun enableBillingProgramAndroid(program: BillingProgramAndroid) {
         RnIapLog.payload("enableBillingProgramAndroid", mapOf("program" to program.name))
-        try {
-            val openIapProgram = mapBillingProgram(program)
-            openIapStore.enableBillingProgram(openIapProgram)
-            RnIapLog.result("enableBillingProgramAndroid", true)
-        } catch (err: Throwable) {
-            RnIapLog.failure("enableBillingProgramAndroid", err)
-            // enableBillingProgram is void, so we just log the error
-        }
+        catchNonCancellation(
+            block = {
+                val openIapProgram = mapBillingProgram(program)
+                openIapStore.enableBillingProgram(openIapProgram)
+                RnIapLog.result("enableBillingProgramAndroid", true)
+            },
+            onFailure = { err ->
+                RnIapLog.failure("enableBillingProgramAndroid", err)
+            },
+        )
     }
 
     override fun isBillingProgramAvailableAndroid(program: BillingProgramAndroid): Promise<NitroBillingProgramAvailabilityResultAndroid> {
         return Promise.async {
             RnIapLog.payload("isBillingProgramAvailableAndroid", mapOf("program" to program.name))
             try {
-                ensureConnection()
                 val openIapProgram = mapBillingProgram(program)
                 val result = openIapStore.isBillingProgramAvailable(openIapProgram)
                 val nitroResult = NitroBillingProgramAvailabilityResultAndroid(
@@ -1890,7 +1963,9 @@ class HybridRnIap : HybridRnIapSpec() {
                 )
                 RnIapLog.result("isBillingProgramAvailableAndroid", mapOf("isAvailable" to result.isAvailable))
                 nitroResult
-            } catch (err: Throwable) {
+            } catch (err: CancellationException) {
+                throw err
+            } catch (err: Exception) {
                 RnIapLog.failure("isBillingProgramAvailableAndroid", err)
                 val errorType = parseOpenIapError(err)
                 throw OpenIapException(toErrorJson(errorType, debugMessage = err.message), err)
@@ -1906,7 +1981,6 @@ class HybridRnIap : HybridRnIapSpec() {
                 "userLocale" to params.userLocale.unwrapString()
             ))
             try {
-                ensureConnection()
                 val result = openIapStore.getBillingChoiceInfo(
                     OpenIapGetBillingChoiceInfoParams(
                         billingProgram = mapBillingProgram(params.billingProgram),
@@ -1920,7 +1994,9 @@ class HybridRnIap : HybridRnIapSpec() {
                 )
                 RnIapLog.result("getBillingChoiceInfoAndroid", mapOf("hasImageUrl" to result.playBillingChoiceImageUrl.isNotBlank()))
                 nitroResult
-            } catch (err: Throwable) {
+            } catch (err: CancellationException) {
+                throw err
+            } catch (err: Exception) {
                 RnIapLog.failure("getBillingChoiceInfoAndroid", err)
                 val errorType = parseOpenIapError(err)
                 throw OpenIapException(toErrorJson(errorType, debugMessage = err.message), err)
@@ -1938,7 +2014,6 @@ class HybridRnIap : HybridRnIapSpec() {
                 mapOf("program" to program.name, "developerBillingType" to developerBillingType?.name)
             )
             try {
-                ensureConnection()
                 val openIapProgram = mapBillingProgram(program)
                 val result = openIapStore.createBillingProgramReportingDetails(
                     openIapProgram,
@@ -1950,7 +2025,9 @@ class HybridRnIap : HybridRnIapSpec() {
                 )
                 RnIapLog.result("createBillingProgramReportingDetailsAndroid", mapOf("hasToken" to true))
                 nitroResult
-            } catch (err: Throwable) {
+            } catch (err: CancellationException) {
+                throw err
+            } catch (err: Exception) {
                 RnIapLog.failure("createBillingProgramReportingDetailsAndroid", err)
                 val errorType = parseOpenIapError(err)
                 throw OpenIapException(toErrorJson(errorType, debugMessage = err.message), err)
@@ -1964,7 +2041,6 @@ class HybridRnIap : HybridRnIapSpec() {
         return Promise.async {
             RnIapLog.payload("showBillingProgramInformationDialogAndroid", mapOf("program" to params.billingProgram.name))
             try {
-                ensureConnection()
                 val activity = withContext(Dispatchers.Main) {
                     runCatching { context.currentActivity }.getOrNull()
                 } ?: throw OpenIapException(toErrorJson(OpenIapError.DeveloperError(), debugMessage = "Activity not available"))
@@ -1983,7 +2059,9 @@ class HybridRnIap : HybridRnIapSpec() {
                     debugMessage = result.debugMessage.wrapVariant(),
                     subResponseCode = mapSubResponseCode(result.subResponseCode)
                 )
-            } catch (err: Throwable) {
+            } catch (err: CancellationException) {
+                throw err
+            } catch (err: Exception) {
                 RnIapLog.failure("showBillingProgramInformationDialogAndroid", err)
                 val errorType = parseOpenIapError(err)
                 throw OpenIapException(toErrorJson(errorType, debugMessage = err.message), err)
@@ -1999,7 +2077,6 @@ class HybridRnIap : HybridRnIapSpec() {
             val categories = messageParams?.categories?.asSecondOrNull()
             RnIapLog.payload("showInAppMessagesAndroid", mapOf("categories" to categories?.map { it.name }))
             try {
-                ensureConnection()
                 val activity = withContext(Dispatchers.Main) {
                     runCatching { context.currentActivity }.getOrNull()
                 } ?: throw OpenIapException(toErrorJson(OpenIapError.DeveloperError(), debugMessage = "Activity not available"))
@@ -2018,7 +2095,9 @@ class HybridRnIap : HybridRnIapSpec() {
                     responseCode = mapInAppMessageResponseCode(result.responseCode),
                     purchaseToken = result.purchaseToken.wrapVariant()
                 )
-            } catch (err: Throwable) {
+            } catch (err: CancellationException) {
+                throw err
+            } catch (err: Exception) {
                 RnIapLog.failure("showInAppMessagesAndroid", err)
                 val errorType = parseOpenIapError(err)
                 throw OpenIapException(toErrorJson(errorType, debugMessage = err.message), err)
@@ -2035,7 +2114,6 @@ class HybridRnIap : HybridRnIapSpec() {
                 "linkUri" to params.linkUri
             ))
             try {
-                ensureConnection()
 
                 val activity = withContext(Dispatchers.Main) {
                     runCatching { context.currentActivity }.getOrNull()
@@ -2054,7 +2132,9 @@ class HybridRnIap : HybridRnIapSpec() {
                 }
                 RnIapLog.result("launchExternalLinkAndroid", result)
                 result
-            } catch (err: Throwable) {
+            } catch (err: CancellationException) {
+                throw err
+            } catch (err: Exception) {
                 RnIapLog.failure("launchExternalLinkAndroid", err)
                 val errorType = parseOpenIapError(err)
                 throw OpenIapException(toErrorJson(errorType, debugMessage = err.message))
@@ -2074,7 +2154,9 @@ class HybridRnIap : HybridRnIapSpec() {
                 val result = handler()
                 RnIapLog.result("openRedeemOfferCodeAndroid", result)
                 result
-            } catch (err: Throwable) {
+            } catch (err: CancellationException) {
+                throw err
+            } catch (err: Exception) {
                 RnIapLog.failure("openRedeemOfferCodeAndroid", err)
                 val errorType = parseOpenIapError(err)
                 throw OpenIapException(toErrorJson(errorType, debugMessage = err.message), err)
@@ -2230,30 +2312,6 @@ class HybridRnIap : HybridRnIapSpec() {
         }
     }
 
-    // ---------------------------------------------------------------------
-    // OpenIAP error helpers: unify error codes/messages from library
-    // ---------------------------------------------------------------------
-    private fun parseOpenIapError(err: Throwable): OpenIapError {
-        // Try to extract OpenIapError from the exception chain
-        var cause: Throwable? = err
-        while (cause != null) {
-            val message = cause.message ?: ""
-            // Check if message contains OpenIAP error patterns
-            when {
-                message.contains("not prepared", ignoreCase = true) ||
-                message.contains("not initialized", ignoreCase = true) -> return OpenIapError.NotPrepared
-                message.contains("developer error", ignoreCase = true) ||
-                message.contains("activity not available", ignoreCase = true) -> return OpenIapError.DeveloperError()
-                message.contains("network", ignoreCase = true) -> return OpenIapError.NetworkError
-                message.contains("service unavailable", ignoreCase = true) ||
-                message.contains("billing unavailable", ignoreCase = true) -> return OpenIapError.ServiceUnavailable()
-            }
-            cause = cause.cause
-        }
-        // Default to ServiceUnavailable if we can't determine the error type
-        return OpenIapError.ServiceUnavailable()
-    }
-
     private fun toErrorJson(
         error: OpenIapError,
         productId: String? = null,

package/android/src/main/java/com/margelo/nitro/iap/TokenizedListenerRegistry.kt

@@ -35,6 +35,5 @@ internal class TokenizedListenerRegistry<T> {
     @Synchronized
     fun clear() {
         registrations.clear()
-        nextToken = 1.0
     }
 }