react-native-iap 15.5.2 → 15.5.4

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

@@ -402,43 +402,32 @@ class HybridRnIap : HybridRnIapSpec() {
             val skusList = skus.toList()
 
             val products: List<ProductCommon> = try {
-                when (queryType) {
-                    ProductQueryType.All -> {
-                        collectAllQueryProducts(
-                            skusList = skusList,
-                            fetchKind = { kind ->
-                                RnIapLog.payload(
-                                    "fetchProducts.native",
-                                    mapOf("skus" to skusList, "type" to kind.rawValue)
-                                )
-                                val fetched = openIap.fetchProducts(ProductRequest(skusList, kind)).productsOrEmpty()
-                                RnIapLog.result(
-                                    "fetchProducts.native",
-                                    fetched.map { mapOf("id" to it.id, "type" to it.type.rawValue) }
-                                )
-                                fetched
-                            },
-                            onFailure = { kind, error ->
-                                RnIapLog.failure("fetchProducts.native[${kind.rawValue}]", error)
-                            },
-                        )
-                    }
-                    else -> {
-                        RnIapLog.payload(
-                            "fetchProducts.native",
-                            mapOf("skus" to skusList, "type" to queryType.rawValue)
-                        )
-                        val fetched = openIap.fetchProducts(ProductRequest(skusList, queryType)).productsOrEmpty()
-                        RnIapLog.result(
-                            "fetchProducts.native",
-                            fetched.map { mapOf("id" to it.id, "type" to it.type.rawValue) }
-                        )
+                RnIapLog.payload(
+                    "fetchProducts.native",
+                    mapOf("skus" to skusList, "type" to queryType.rawValue)
+                )
+                // Pass the query type through unchanged: the native module resolves
+                // ProductQueryType.All itself, so each sku keeps its real product type
+                // instead of being shadowed by a per-type not-found placeholder.
+                val fetched = openIap.fetchProducts(ProductRequest(skusList, queryType)).productsOrEmpty()
+                RnIapLog.result(
+                    "fetchProducts.native",
+                    fetched.map { mapOf("id" to it.id, "type" to it.type.rawValue) }
+                )
 
-                        // Preserve input order for non-All queries
-                        val byId = fetched.associateBy { it.id }
-                        skusList.mapNotNull { byId[it] }
-                    }
+                // Match the iOS bridge's result shape: preserve input order,
+                // drop duplicate skus, then append any fetched products that
+                // were not requested.
+                val byId = fetched.associateBy { it.id }
+                val seenIds = mutableSetOf<String>()
+                val orderedProducts = mutableListOf<ProductCommon>()
+                skusList.forEach { sku ->
+                    byId[sku]?.takeIf { seenIds.add(it.id) }?.let(orderedProducts::add)
+                }
+                fetched.forEach { product ->
+                    if (seenIds.add(product.id)) orderedProducts.add(product)
                 }
+                orderedProducts
             } catch (e: OpenIapError) {
                 throw OpenIapException(toErrorJson(e))
             }
@@ -1509,8 +1498,12 @@ class HybridRnIap : HybridRnIapSpec() {
                         },
                         isValid = item.isValid,
                         productId = item.productId?.let { Variant_NullType_String.Second(it) },
-                        state = mapIapkitPurchaseState(item.state.name),
-                        store = mapIapkitStore(item.store.name)
+                        // Use rawValue ("pending-acknowledgment"), not the Kotlin
+                        // enum constant name ("PendingAcknowledgment") — the
+                        // mappers match separator-delimited spellings, so
+                        // multi-word states would otherwise degrade to UNKNOWN.
+                        state = mapIapkitPurchaseState(item.state.rawValue),
+                        store = mapIapkitStore(item.store.rawValue)
                     )
                 }
 
@@ -1525,7 +1518,7 @@ class HybridRnIap : HybridRnIapSpec() {
                 NitroVerifyPurchaseWithProviderResult(
                     iapkit = nitroIapkitResult?.let { Variant_NullType_NitroVerifyPurchaseWithIapkitResult.Second(it) },
                     errors = nitroErrors?.let { Variant_NullType_Array_NitroVerifyPurchaseWithProviderError_.Second(it) },
-                    provider = mapPurchaseVerificationProvider(result.provider.name)
+                    provider = mapPurchaseVerificationProvider(result.provider.rawValue)
                 )
             } catch (e: Exception) {
                 RnIapLog.failure("verifyPurchaseWithProvider", e)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-iap",
-  "version": "15.5.2",
+  "version": "15.5.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/android/src/main/java/com/margelo/nitro/iap/ProductQueryHelpers.kt

@@ -1,42 +0,0 @@
-package com.margelo.nitro.iap
-
-import dev.hyo.openiap.ProductCommon
-import dev.hyo.openiap.ProductQueryType
-import kotlin.coroutines.cancellation.CancellationException
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
-
-internal suspend fun collectAllQueryProducts(
-    skusList: List<String>,
-    fetchKind: suspend (ProductQueryType) -> List<ProductCommon>,
-    onFailure: (ProductQueryType, Throwable) -> Unit = { _, _ -> },
-): List<ProductCommon> = coroutineScope {
-    val byId = linkedMapOf<String, ProductCommon>()
-    var firstFailure: Throwable? = null
-
-    val queries = listOf(ProductQueryType.InApp, ProductQueryType.Subs).map { kind ->
-        kind to async {
-            runCatching {
-                fetchKind(kind)
-            }
-        }
-    }
-
-    queries.forEach { (kind, query) ->
-        query.await().onSuccess { fetched ->
-            fetched.forEach { product ->
-                byId.putIfAbsent(product.id, product)
-            }
-        }.onFailure { error ->
-            if (error is CancellationException) throw error
-            onFailure(kind, error)
-            if (firstFailure == null) firstFailure = error
-        }
-    }
-
-    if (byId.isEmpty()) {
-        firstFailure?.let { throw it }
-    }
-
-    skusList.mapNotNull { byId[it] }
-}