expo-iap 3.0.8 → 3.1.0

package/CLAUDE.md

@@ -93,7 +93,7 @@ The library follows the OpenIAP type specifications with platform-specific exten
 ### Hook API Semantics (useIAP)
 
 - Inside the `useIAP` hook, most methods return `Promise<void>` and update internal state. Do not design examples or implementations that expect data from these methods.
-  - Examples: `fetchProducts`, `requestProducts`, `getProducts`/`getSubscriptions` (deprecated helpers), `requestPurchase`, `getAvailablePurchases`.
+  - Examples: `fetchProducts`, `requestPurchase`, `getAvailablePurchases`.
   - After calling, consume state from the hook: `products`, `subscriptions`, `availablePurchases`, etc.
 - Defined exceptions that DO return values in the hook:
   - `getActiveSubscriptions(subscriptionIds?) => Promise<ActiveSubscription[]>` (also updates `activeSubscriptions` state)
@@ -102,7 +102,7 @@ The library follows the OpenIAP type specifications with platform-specific exten
 
 ### API Method Naming
 
-- Functions that depend on event results should use `request` prefix (e.g., `requestPurchase`, `requestSubscription`)
+- Functions that depend on event results should use `request` prefix (e.g., `requestPurchase`)
 - Follow OpenIAP terminology: <https://www.openiap.dev/docs/apis#terminology>
 - Do not use generic prefixes like `get`, `find` - refer to the official terminology
 

package/CONTRIBUTING.md

@@ -8,6 +8,7 @@ Thank you for your interest in contributing to expo-iap! This guide will help yo
 - [Package Manager](#-package-manager)
 - [Running the Example App](#-running-the-example-app)
 - [Development Guidelines](#-development-guidelines)
+- [OpenIAP Version Management](#-openiap-version-management)
 - [Testing](#-testing)
 - [Code Style](#-code-style)
 - [Submitting Changes](#-submitting-changes)
@@ -223,6 +224,24 @@ The generated TypeScript definitions in `src/types.ts` come from the [`openiap-g
 
 Always ensure the repository builds and tests succeed after regenerating the types.
 
+## 🔢 OpenIAP Version Management
+
+All native and type-generation version numbers are sourced from `openiap-versions.json` at the repository root:
+
+- `apple` → iOS Pod dependency (`ios/ExpoIap.podspec`).
+- `google` → Android artifact (`android/build.gradle`, Expo config plugin).
+- `gql` → GraphQL type generator (`scripts/update-types.mjs`).
+
+When bumping dependencies:
+
+1. Update the relevant fields in `openiap-versions.json`.
+2. For iOS changes, run `cd ios && pod install` (and commit the Pod.lock if required by the workflow).
+3. For Android, re-run Gradle (`bun run android`) so the new artifact is pulled down.
+4. When the `gql` value changes, run `bun run generate:types` to refresh `src/types.ts`.
+5. Commit the updated JSON, regenerated files, and any resulting lockfile changes together.
+
+If the JSON file is missing or malformed, build scripts (Gradle, Podspec, the type generator) will fail fast — fix the JSON rather than hard-coding version strings in multiple locations.
+
 ### Development Workflow
 
 1. **Before starting work**:

package/README.md

@@ -5,9 +5,12 @@
   
   [![Version](http://img.shields.io/npm/v/expo-iap.svg?style=flat-square)](https://npmjs.org/package/expo-iap) [![Download](http://img.shields.io/npm/dm/expo-iap.svg?style=flat-square)](https://npmjs.org/package/expo-iap) [![CI](https://github.com/hyochan/expo-iap/actions/workflows/ci.yml/badge.svg)](https://github.com/hyochan/expo-iap/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/hyochan/expo-iap/graph/badge.svg?token=47VMTY5NyM)](https://codecov.io/gh/hyochan/expo-iap) [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fhyochan%2Fexpo-iap.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Fhyochan%2Fexpo-iap?ref=badge_shield&issueType=license)
   
-  In app purchase module in [Expo](https://docs.expo.dev/guides/in-app-purchases) that conforms to the [Open IAP specification](https://openiap.dev)
-  
-  <a href="https://openiap.dev"><img src="https://openiap.dev/logo.png" alt="Open IAP" height="40" /></a>
+Expo IAP is a powerful in-app purchase solution for Expo and React Native applications that conforms to the Open IAP specification. It provides a unified API for handling in-app purchases across iOS and Android platforms with comprehensive error handling and modern TypeScript support.
+
+If you're shipping an app with expo-iap, we’d love to hear about it—please share your product and feedback in [Who's using Expo IAP?](https://github.com/hyochan/expo-iap/discussions/143). Community stories help us keep improving the ecosystem.
+
+<a href="https://openiap.dev"><img src="https://openiap.dev/logo.png" alt="Open IAP" height="40" /></a>
+
 </div>
 
 ## 📚 Documentation
@@ -44,7 +47,7 @@ npx expo install expo-iap
         "expo-build-properties",
         {
           "android": {
-            "kotlinVersion": "2.0.21"
+            "kotlinVersion": "2.1.20"
           }
         }
       ]
@@ -53,6 +56,8 @@ npx expo install expo-iap
 }
 ```
 
+If you're targeting Expo SDK 54 or newer, please confirm whether this manual override is still required and share findings with the community at [github.com/hyochan/expo-iap/discussions](https://github.com/hyochan/expo-iap/discussions).
+
 ## Contributing
 
 We welcome contributions! Please see our [Contributing Guide](./CONTRIBUTING.md) for details on:
@@ -67,14 +72,21 @@ For detailed usage examples and error handling, see the [documentation](https://
 
 > Sharing your thoughts—any feedback would be greatly appreciated!
 
-## Sponsors
+## Our Sponsors
 
 💼 **[View Our Sponsors](https://openiap.dev/sponsors)**
 
+We're building the OpenIAP ecosystem—defining the spec at [openiap.dev](https://www.openiap.dev), maintaining [openiap-gql](https://github.com/hyodotdev/openiap-gql) for the shared type system, and shipping platform SDKs like [openiap-apple](https://github.com/hyodotdev/openiap-apple) and [openiap-google](https://github.com/hyodotdev/openiap-google) that power [expo-iap](https://github.com/hyochan/expo-iap), [flutter_inapp_purchase](https://github.com/hyochan/flutter_inapp_purchase), React Native, and [kmp-iap](https://github.com/hyochan/kmp-iap). The work so far has focused on untangling fragmented APIs; the next milestone is a streamlined purchase flow: `initConnection → fetchProducts → requestPurchase → (server receipt validation) → finishTransaction`.
+
+Your sponsorship helps ensure developers across platforms, OS, and frameworks can implement in-app purchases without headaches. It also fuels new plugins, payment systems, and partner integrations already being explored in the OpenIAP community. Sponsors receive shout-outs in every release and can request tailored support depending on tier. If you’re interested—or have rollout feedback to share—you can view sponsorship options at [openiap.dev/sponsors](https://openiap.dev/sponsors).
+
 ### <p style="color: rgb(255, 182, 193);">Angel</p>
 
 <a href="https://meta.com">
-    <img width="600" alt="courier_dot_com" src="https://static.xx.fbcdn.net/rsrc.php/y3/r/y6QsbGgc866.svg" />
+    <div style="display: inline-flex; flex-direction: column; align-items: center; gap: 0.25rem; padding: 0.75rem 1rem; border-radius: 12px; background: rgba(212, 165, 116, 0.12);">
+      <img alt="Meta" src="https://www.openiap.dev/meta.svg" style="width: 120px;" />
+      <span style="font-size: 0.85rem; font-weight: 600; color: rgb(107, 78, 61); text-align: center; width: 100%;">Meta</span>
+    </div>
 </a>
 
 ## Past Supporters

package/android/build.gradle

@@ -1,3 +1,5 @@
+import groovy.json.JsonSlurper
+
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
@@ -10,6 +12,27 @@ applyKotlinExpoModulesCorePlugin()
 useCoreDependencies()
 useExpoPublishing()
 
+def resolveOpenIapVersionsFile() {
+  def candidates = [
+    new File(projectDir.parentFile, 'openiap-versions.json'),
+    new File(rootDir.parentFile ?: rootDir, 'openiap-versions.json'),
+    new File(rootProject.projectDir.parentFile ?: rootProject.projectDir, 'openiap-versions.json')
+  ]
+  return candidates.find { it.exists() }
+}
+
+def openiapVersionsFile = resolveOpenIapVersionsFile()
+if (openiapVersionsFile == null) {
+  throw new GradleException("expo-iap: Unable to locate openiap-versions.json")
+}
+
+def openiapVersions = new JsonSlurper().parse(openiapVersionsFile)
+def googleVersion = (openiapVersions instanceof Map) ? openiapVersions.google : null
+if (!(googleVersion instanceof String) || !googleVersion.trim()) {
+  throw new GradleException("expo-iap: 'google' version missing or invalid in openiap-versions.json")
+}
+def googleVersionString = googleVersion.trim()
+
 // If you want to use the managed Android SDK versions from expo-modules-core, set this to true.
 // The Android SDK versions will be bumped from time to time in SDK releases and may introduce breaking changes in your module code.
 // Most of the time, you may like to manage the Android SDK versions yourself.
@@ -58,6 +81,6 @@ dependencies {
       implementation project(":openiap-google")
     } else {
       // Fallback to published artifact when local project isn't linked
-      implementation "io.github.hyochan.openiap:openiap-google:1.1.12"
+      implementation "io.github.hyochan.openiap:openiap-google:${googleVersionString}"
     }
 }

package/android/src/main/java/expo/modules/iap/ExpoIapLog.kt

@@ -0,0 +1,69 @@
+package expo.modules.iap
+
+import android.util.Log
+import org.json.JSONArray
+import org.json.JSONObject
+
+internal object ExpoIapLog {
+    private const val TAG = "ExpoIap"
+
+    fun payload(
+        name: String,
+        payload: Any?,
+    ) {
+        debug("$name payload: ${stringify(payload)}")
+    }
+
+    fun result(
+        name: String,
+        value: Any?,
+    ) {
+        debug("$name result: ${stringify(value)}")
+    }
+
+    fun failure(
+        name: String,
+        error: Throwable,
+    ) {
+        Log.e(TAG, "$name failed: ${error.localizedMessage}", error)
+    }
+
+    fun debug(message: String) {
+        Log.d(TAG, message)
+    }
+
+    private fun stringify(value: Any?): String {
+        val sanitized = sanitize(value) ?: return "null"
+        return when (sanitized) {
+            is String -> sanitized
+            is Number, is Boolean -> sanitized.toString()
+            is Map<*, *> -> JSONObject(sanitized).toString()
+            is List<*> -> JSONArray(sanitized).toString()
+            else -> sanitized.toString()
+        }
+    }
+
+    private fun sanitize(value: Any?): Any? {
+        if (value == null) return null
+
+        return when (value) {
+            is Map<*, *> -> sanitizeMap(value)
+            is List<*> -> value.mapNotNull { sanitize(it) }
+            is Array<*> -> value.mapNotNull { sanitize(it) }
+            else -> value
+        }
+    }
+
+    private fun sanitizeMap(source: Map<*, *>): Map<String, Any?> {
+        val sanitized = linkedMapOf<String, Any?>()
+        for ((rawKey, rawValue) in source) {
+            val key = rawKey as? String ?: continue
+            if (key.lowercase().contains("token")) {
+                sanitized[key] = "hidden"
+                continue
+            }
+            sanitized[key] = sanitize(rawValue)
+        }
+        return sanitized
+    }
+}

package/android/src/main/java/expo/modules/iap/ExpoIapModule.kt

@@ -2,12 +2,22 @@ package expo.modules.iap
 
 import android.content.Context
 import android.util.Log
+import dev.hyo.openiap.AndroidSubscriptionOfferInput
+import dev.hyo.openiap.DeepLinkOptions
+import dev.hyo.openiap.FetchProductsResultProducts
+import dev.hyo.openiap.FetchProductsResultSubscriptions
 import dev.hyo.openiap.OpenIapError
 import dev.hyo.openiap.OpenIapModule
-import dev.hyo.openiap.models.DeepLinkOptions
-import dev.hyo.openiap.models.ProductRequest
-import dev.hyo.openiap.models.RequestPurchaseParams
-import dev.hyo.openiap.models.RequestSubscriptionAndroidProps
+import dev.hyo.openiap.ProductQueryType
+import dev.hyo.openiap.ProductRequest
+import dev.hyo.openiap.Purchase
+import dev.hyo.openiap.RequestPurchaseAndroidProps
+import dev.hyo.openiap.RequestPurchaseProps
+import dev.hyo.openiap.RequestPurchasePropsByPlatforms
+import dev.hyo.openiap.RequestPurchaseResultPurchase
+import dev.hyo.openiap.RequestPurchaseResultPurchases
+import dev.hyo.openiap.RequestSubscriptionAndroidProps
+import dev.hyo.openiap.RequestSubscriptionPropsByPlatforms
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.modules.Module
@@ -18,6 +28,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import java.util.Locale
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -59,7 +70,20 @@ class ExpoIapModule : Module() {
         pendingEvents.add(name to payload)
     }
 
-    // Mapping helpers now provided by openiap-google (toJSON helpers)
+    private fun parseProductQueryType(rawType: String?): ProductQueryType {
+        val normalized =
+            rawType
+                ?.trim()
+                ?.lowercase(Locale.US)
+                ?.replace("-", "")
+                ?.replace("_", "")
+
+        return when (normalized) {
+            "subs" -> ProductQueryType.Subs
+            "all" -> ProductQueryType.All
+            else -> ProductQueryType.InApp
+        }
+    }
 
     override fun definition() =
         ModuleDefinition {
@@ -72,6 +96,7 @@ class ExpoIapModule : Module() {
             Events(EVENT_PURCHASE_UPDATED, EVENT_PURCHASE_ERROR)
 
             AsyncFunction("initConnection") { promise: Promise ->
+                ExpoIapLog.payload("initConnection", null)
                 scope.launch {
                     connectionMutex.withLock {
                         try {
@@ -82,6 +107,7 @@ class ExpoIapModule : Module() {
 
                             // If already connected, short-circuit
                             if (connectionReady.get()) {
+                                ExpoIapLog.result("initConnection", true)
                                 promise.resolve(true)
                                 return@withLock
                             }
@@ -90,8 +116,9 @@ class ExpoIapModule : Module() {
                             if (!listenersAttached) {
                                 listenersAttached = true
                                 openIap.addPurchaseUpdateListener { p ->
-                                    runCatching { emitOrQueue(EVENT_PURCHASE_UPDATED, p.toJSON()) }
-                                        .onFailure { Log.e(TAG, "Failed to buffer/send PURCHASE_UPDATED", it) }
+                                    runCatching {
+                                        emitOrQueue(EVENT_PURCHASE_UPDATED, p.toJson())
+                                    }.onFailure { Log.e(TAG, "Failed to buffer/send PURCHASE_UPDATED", it) }
                                 }
                                 openIap.addPurchaseErrorListener { e ->
                                     runCatching { emitOrQueue(EVENT_PURCHASE_ERROR, e.toJSON()) }
@@ -104,6 +131,10 @@ class ExpoIapModule : Module() {
                             if (!ok) {
                                 // Clear any buffered events from a failed init
                                 pendingEvents.clear()
+                                ExpoIapLog.failure(
+                                    "initConnection",
+                                    IllegalStateException("Failed to initialize connection"),
+                                )
                                 promise.reject(OpenIapError.InitConnection.CODE, "Failed to initialize connection", null)
                                 return@withLock
                             }
@@ -117,8 +148,10 @@ class ExpoIapModule : Module() {
                                     .onFailure { Log.e(TAG, "Failed to flush buffered event: ${ev.first}", it) }
                             }
 
+                            ExpoIapLog.result("initConnection", true)
                             promise.resolve(true)
                         } catch (e: Exception) {
+                            ExpoIapLog.failure("initConnection", e)
                             promise.reject(OpenIapError.InitConnection.CODE, e.message, e)
                         }
                     }
@@ -126,35 +159,54 @@ class ExpoIapModule : Module() {
             }
 
             AsyncFunction("endConnection") { promise: Promise ->
+                ExpoIapLog.payload("endConnection", null)
                 scope.launch {
                     connectionMutex.withLock {
                         runCatching { openIap.endConnection() }
                         // Reset connection state and clear any buffered events
                         connectionReady.set(false)
                         pendingEvents.clear()
+                        ExpoIapLog.result("endConnection", true)
                         promise.resolve(true)
                     }
                 }
             }
 
             AsyncFunction("fetchProducts") { type: String, skuArr: Array<String>, promise: Promise ->
+                ExpoIapLog.payload(
+                    "fetchProductsAndroid",
+                    mapOf("type" to type, "skus" to skuArr.toList()),
+                )
                 scope.launch {
                     try {
-                        val reqType = ProductRequest.ProductRequestType.fromString(type)
-                        val products = openIap.fetchProducts(ProductRequest(skuArr.toList(), reqType))
-                        promise.resolve(products.map { it.toJSON() })
+                        val queryType = parseProductQueryType(type)
+                        val request = ProductRequest(skuArr.toList(), queryType)
+                        val result = openIap.fetchProducts(request)
+                        val payload =
+                            when (result) {
+                                is FetchProductsResultProducts -> result.value.orEmpty().map { it.toJson() }
+                                is FetchProductsResultSubscriptions -> result.value.orEmpty().map { it.toJson() }
+                                else -> emptyList<Map<String, Any?>>()
+                            }
+                        ExpoIapLog.result("fetchProductsAndroid", payload)
+                        promise.resolve(payload)
                     } catch (e: Exception) {
+                        ExpoIapLog.failure("fetchProductsAndroid", e)
                         promise.reject(OpenIapError.QueryProduct.CODE, e.message, null)
                     }
                 }
             }
 
             AsyncFunction("getAvailableItems") { promise: Promise ->
+                ExpoIapLog.payload("getAvailableItemsAndroid", null)
                 scope.launch {
                     try {
                         val purchases = openIap.getAvailablePurchases(null)
-                        promise.resolve(purchases.map { it.toJSON() })
+                        val payload = purchases.map { it.toJson() }
+                        ExpoIapLog.result("getAvailableItemsAndroid", payload)
+                        promise.resolve(payload)
                     } catch (e: Exception) {
+                        ExpoIapLog.failure("getAvailableItemsAndroid", e)
                         promise.reject(OpenIapError.ServiceUnavailable.CODE, e.message, null)
                     }
                 }
@@ -164,11 +216,22 @@ class ExpoIapModule : Module() {
             AsyncFunction("deepLinkToSubscriptionsAndroid") { params: Map<String, Any?>, promise: Promise ->
                 val sku = (params["sku"] ?: params["skuAndroid"]) as? String
                 val packageName = (params["packageName"] ?: params["packageNameAndroid"]) as? String
+                ExpoIapLog.payload(
+                    "deepLinkToSubscriptionsAndroid",
+                    mapOf("sku" to sku, "packageName" to packageName),
+                )
                 scope.launch {
                     try {
-                        openIap.deepLinkToSubscriptions(DeepLinkOptions(sku, packageName))
+                        openIap.deepLinkToSubscriptions(
+                            DeepLinkOptions(
+                                packageNameAndroid = packageName,
+                                skuAndroid = sku,
+                            ),
+                        )
+                        ExpoIapLog.result("deepLinkToSubscriptionsAndroid", true)
                         promise.resolve(null)
                     } catch (e: Exception) {
+                        ExpoIapLog.failure("deepLinkToSubscriptionsAndroid", e)
                         promise.reject(OpenIapError.ServiceUnavailable.CODE, e.message, null)
                     }
                 }
@@ -176,18 +239,22 @@ class ExpoIapModule : Module() {
 
             // Get Google Play storefront country code (Android)
             AsyncFunction("getStorefrontAndroid") { promise: Promise ->
+                ExpoIapLog.payload("getStorefrontAndroid", null)
                 scope.launch {
                     try {
                         val code = openIap.getStorefront()
+                        ExpoIapLog.result("getStorefrontAndroid", code)
                         promise.resolve(code)
                     } catch (e: Exception) {
+                        ExpoIapLog.failure("getStorefrontAndroid", e)
                         promise.reject(OpenIapError.ServiceUnavailable.CODE, e.message, e)
                     }
                 }
             }
 
             AsyncFunction("requestPurchase") { params: Map<String, Any?>, promise: Promise ->
-                val type = params["type"] as String
+                ExpoIapLog.payload("requestPurchaseAndroid", params)
+                val type = params["type"] as? String
                 val skus: List<String> =
                     (params["skus"] as? List<*>)?.filterIsInstance<String>()
                         ?: (params["skuArr"] as? List<*>)?.filterIsInstance<String>()
@@ -199,7 +266,7 @@ class ExpoIapModule : Module() {
                 val isOfferPersonalized = params["isOfferPersonalized"] as? Boolean ?: false
                 val offerTokenArr =
                     (params["offerTokenArr"] as? List<*>)?.filterIsInstance<String>() ?: emptyList()
-                val subscriptionOffersParam =
+                val explicitSubscriptionOffers =
                     (params["subscriptionOffers"] as? List<*>)?.mapNotNull { rawOffer ->
                         val offerMap = rawOffer as? Map<*, *> ?: return@mapNotNull null
                         val sku = offerMap["sku"] as? String
@@ -207,67 +274,123 @@ class ExpoIapModule : Module() {
                         if (sku.isNullOrEmpty() || offerToken.isNullOrEmpty()) {
                             null
                         } else {
-                            RequestSubscriptionAndroidProps.SubscriptionOffer(sku = sku, offerToken = offerToken)
+                            AndroidSubscriptionOfferInput(offerToken = offerToken, sku = sku)
                         }
                     } ?: emptyList()
+                val purchaseToken =
+                    (params["purchaseTokenAndroid"] ?: params["purchaseToken"]) as? String
+                val replacementMode =
+                    (params["replacementModeAndroid"] ?: params["replacementMode"]) as? Number
 
-                PromiseUtils.addPromiseForKey(PromiseUtils.PROMISE_BUY_ITEM, promise)
-                scope.launch {
-                    try {
-                        openIap.setActivity(currentActivity)
-                        val reqType = ProductRequest.ProductRequestType.fromString(type)
-                        val subscriptionOffers =
-                            if (reqType == ProductRequest.ProductRequestType.Subs) {
-                                when {
-                                    subscriptionOffersParam.isNotEmpty() -> subscriptionOffersParam
-                                    offerTokenArr.isNotEmpty() ->
-                                        skus.zip(offerTokenArr).mapNotNull { (sku, token) ->
-                                            if (token.isNotEmpty()) {
-                                                RequestSubscriptionAndroidProps.SubscriptionOffer(
-                                                    sku = sku,
-                                                    offerToken = token,
-                                                )
-                                            } else {
-                                                null
-                                            }
-                                        }
-                                    else -> emptyList()
-                                }
+                val productType =
+                    when (parseProductQueryType(type)) {
+                        ProductQueryType.Subs -> ProductQueryType.Subs
+                        else -> ProductQueryType.InApp
+                    }
+
+                val fallbackOffers =
+                    if (explicitSubscriptionOffers.isEmpty() && offerTokenArr.isNotEmpty()) {
+                        skus.zip(offerTokenArr).mapNotNull { (sku, token) ->
+                            if (token.isNotEmpty()) {
+                                AndroidSubscriptionOfferInput(offerToken = token, sku = sku)
                             } else {
-                                emptyList()
+                                null
                             }
-                        val result =
-                            openIap.requestPurchase(
-                                RequestPurchaseParams(
-                                    skus = skus,
+                        }
+                    } else {
+                        emptyList()
+                    }
+
+                val subscriptionOffers =
+                    (explicitSubscriptionOffers.ifEmpty { fallbackOffers })
+                        .takeIf { it.isNotEmpty() }
+
+                val requestProps =
+                    when (productType) {
+                        ProductQueryType.Subs -> {
+                            val android =
+                                RequestSubscriptionAndroidProps(
+                                    isOfferPersonalized = isOfferPersonalized,
                                     obfuscatedAccountIdAndroid = obfuscatedAccountId,
                                     obfuscatedProfileIdAndroid = obfuscatedProfileId,
-                                    isOfferPersonalized = isOfferPersonalized,
+                                    purchaseTokenAndroid = purchaseToken,
+                                    replacementModeAndroid = replacementMode?.toInt(),
+                                    skus = skus,
                                     subscriptionOffers = subscriptionOffers,
-                                ),
-                                reqType,
+                                )
+                            RequestPurchaseProps(
+                                request =
+                                    RequestPurchaseProps.Request.Subscription(
+                                        RequestSubscriptionPropsByPlatforms(android = android),
+                                    ),
+                                type = ProductQueryType.Subs,
                             )
-                        result.forEach { p ->
-                            try {
-                                emitOrQueue(EVENT_PURCHASE_UPDATED, p.toJSON())
-                            } catch (ex: Exception) {
-                                Log.e(TAG, "Failed to send PURCHASE_UPDATED event (requestPurchase)", ex)
+                        }
+
+                        else -> {
+                            val android =
+                                RequestPurchaseAndroidProps(
+                                    isOfferPersonalized = isOfferPersonalized,
+                                    obfuscatedAccountIdAndroid = obfuscatedAccountId,
+                                    obfuscatedProfileIdAndroid = obfuscatedProfileId,
+                                    skus = skus,
+                                )
+                            RequestPurchaseProps(
+                                request =
+                                    RequestPurchaseProps.Request.Purchase(
+                                        RequestPurchasePropsByPlatforms(android = android),
+                                    ),
+                                type = ProductQueryType.InApp,
+                            )
+                        }
+                    }
+
+                PromiseUtils.addPromiseForKey(PromiseUtils.PROMISE_BUY_ITEM, promise)
+                scope.launch {
+                    try {
+                        openIap.setActivity(currentActivity)
+                        val result = openIap.requestPurchase(requestProps)
+                        val purchases =
+                            when (result) {
+                                is RequestPurchaseResultPurchases -> result.value.orEmpty()
+                                is RequestPurchaseResultPurchase -> result.value?.let(::listOf).orEmpty()
+                                else -> emptyList()
+                            }
+                        ExpoIapLog.result(
+                            "requestPurchaseAndroid",
+                            purchases.map { it.toJson() },
+                        )
+                        purchases.forEach { purchase ->
+                            runCatching {
+                                emitOrQueue(EVENT_PURCHASE_UPDATED, purchase.toJson())
+                            }.onFailure { ex ->
+                                Log.e(
+                                    TAG,
+                                    "Failed to send PURCHASE_UPDATED event (requestPurchase)",
+                                    ex,
+                                )
                             }
                         }
-                        PromiseUtils.resolvePromisesForKey(PromiseUtils.PROMISE_BUY_ITEM, result.map { it.toJSON() })
+                        PromiseUtils.resolvePromisesForKey(
+                            PromiseUtils.PROMISE_BUY_ITEM,
+                            purchases.map { it.toJson() },
+                        )
                     } catch (e: Exception) {
+                        ExpoIapLog.failure("requestPurchaseAndroid", e)
                         val errorMap =
                             mapOf(
                                 "code" to OpenIapError.PurchaseFailed.CODE,
                                 "message" to (e.message ?: "Purchase failed"),
                                 "platform" to "android",
                             )
-                        try {
-                            emitOrQueue(EVENT_PURCHASE_ERROR, errorMap)
-                        } catch (ex: Exception) {
-                            Log.e(TAG, "Failed to send PURCHASE_ERROR event (requestPurchase)", ex)
-                        }
-                        // Reject and clear any pending promises for this purchase flow
+                        runCatching { emitOrQueue(EVENT_PURCHASE_ERROR, errorMap) }
+                            .onFailure { ex ->
+                                Log.e(
+                                    TAG,
+                                    "Failed to send PURCHASE_ERROR event (requestPurchase)",
+                                    ex,
+                                )
+                            }
                         PromiseUtils.rejectPromisesForKey(
                             PromiseUtils.PROMISE_BUY_ITEM,
                             OpenIapError.PurchaseFailed.CODE,
@@ -279,11 +402,15 @@ class ExpoIapModule : Module() {
             }
 
             AsyncFunction("acknowledgePurchaseAndroid") { token: String, promise: Promise ->
+                ExpoIapLog.payload("acknowledgePurchaseAndroid", mapOf("token" to token))
                 scope.launch {
                     try {
                         openIap.acknowledgePurchaseAndroid(token)
-                        promise.resolve(mapOf("responseCode" to 0))
+                        val response = mapOf("responseCode" to 0)
+                        ExpoIapLog.result("acknowledgePurchaseAndroid", response)
+                        promise.resolve(response)
                     } catch (e: Exception) {
+                        ExpoIapLog.failure("acknowledgePurchaseAndroid", e)
                         promise.reject(OpenIapError.ServiceUnavailable.CODE, e.message, null)
                     }
                 }
@@ -291,11 +418,15 @@ class ExpoIapModule : Module() {
 
             // New name: consumePurchaseAndroid
             AsyncFunction("consumePurchaseAndroid") { token: String, promise: Promise ->
+                ExpoIapLog.payload("consumePurchaseAndroid", mapOf("token" to token))
                 scope.launch {
                     try {
                         openIap.consumePurchaseAndroid(token)
-                        promise.resolve(mapOf("responseCode" to 0, "purchaseToken" to token))
+                        val response = mapOf("responseCode" to 0, "purchaseToken" to token)
+                        ExpoIapLog.result("consumePurchaseAndroid", response)
+                        promise.resolve(response)
                     } catch (e: Exception) {
+                        ExpoIapLog.failure("consumePurchaseAndroid", e)
                         promise.reject(OpenIapError.ServiceUnavailable.CODE, e.message, null)
                     }
                 }