react-native-iap 15.3.6 → 15.4.0-rc.2

package/README.md

@@ -105,7 +105,7 @@ Before installing React Native IAP, make sure you have:
 
 #### Android Configuration
 
-**Kotlin Version Requirement:** This library requires Kotlin 2.0+. Configure your project's Kotlin version:
+**Kotlin Version Requirement:** This library requires Kotlin 2.2+. Configure your project's Kotlin version:
 
 In your root `android/build.gradle`:
 

package/android/build.gradle

@@ -107,8 +107,13 @@ def getExtOrIntegerDefault(name) {
   return getExtOrDefault(name).toString().toInteger()
 }
 
-// Read horizonEnabled from gradle.properties, default to false (play)
+// Read store flags from gradle.properties, default to play
 def horizonEnabled = project.findProperty('horizonEnabled')?.toBoolean() ?: false
+def fireOsEnabled = project.findProperty('fireOsEnabled')?.toBoolean() ?: false
+if (horizonEnabled && fireOsEnabled) {
+  throw new GradleException("react-native-iap: horizonEnabled and fireOsEnabled cannot both be true")
+}
+def openiapFlavor = fireOsEnabled ? 'amazon' : (horizonEnabled ? 'horizon' : 'play')
 
 def resolveOpenIapGoogleBuildFile() {
   def candidates = [
@@ -155,9 +160,8 @@ android {
     // Ship consumer keep rules so Nitro HybridObjects aren't stripped in app release builds
     consumerProguardFiles 'consumer-rules.pro'
 
-    // Use horizonEnabled to determine platform flavor
-    def flavor = horizonEnabled ? 'horizon' : 'play'
-    missingDimensionStrategy "platform", flavor
+    // Use explicit store flags to determine platform flavor
+    missingDimensionStrategy "platform", openiapFlavor
 
     externalNativeBuild {
       cmake {
@@ -251,7 +255,9 @@ dependencies {
   }
 
   // Google Play Services
-  implementation "com.google.android.gms:play-services-base:$playServicesBaseVersion"
+  if (!fireOsEnabled && !horizonEnabled) {
+    implementation "com.google.android.gms:play-services-base:$playServicesBaseVersion"
+  }
 
   // Kotlin coroutines
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
@@ -261,6 +267,8 @@ dependencies {
   def localGoogleProject = findProject(':openiap')
   if (localGoogleProject != null) {
     implementation project(':openiap')
+  } else if (fireOsEnabled) {
+    implementation "io.github.hyochan.openiap:openiap-google-amazon:${googleVersionString}"
   } else if (horizonEnabled) {
     implementation "io.github.hyochan.openiap:openiap-google-horizon:${googleVersionString}"
   } else {

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

@@ -43,13 +43,13 @@ import dev.hyo.openiap.ExternalLinkLaunchModeAndroid as OpenIapExternalLinkLaunc
 import dev.hyo.openiap.ExternalLinkTypeAndroid as OpenIapExternalLinkType
 import dev.hyo.openiap.listener.OpenIapDeveloperProvidedBillingListener
 import dev.hyo.openiap.store.OpenIapStore
+import java.util.Locale
 import kotlin.coroutines.cancellation.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.CompletableDeferred
 import org.json.JSONArray
 import org.json.JSONObject
-import java.util.Locale
 
 /**
  * Custom exception for OpenIAP errors that only includes the error JSON without stack traces.
@@ -575,7 +575,7 @@ class HybridRnIap : HybridRnIapSpec() {
                 mapOf("type" to androidOptions?.type?.name, "includeSuspended" to includeSuspended)
             )
 
-            val typeName = androidOptions?.type?.name?.lowercase()
+            val typeName = androidOptions?.type?.name?.lowercase(java.util.Locale.ROOT)
             val normalizedType = when (typeName) {
                 "inapp" -> {
                     RnIapLog.warn("getAvailablePurchases received legacy type 'inapp'; forwarding as 'in-app'")
@@ -1279,6 +1279,7 @@ class HybridRnIap : HybridRnIapSpec() {
             dev.hyo.openiap.IapStore.Apple -> IapStore.APPLE
             dev.hyo.openiap.IapStore.Google -> IapStore.GOOGLE
             dev.hyo.openiap.IapStore.Horizon -> IapStore.HORIZON
+            dev.hyo.openiap.IapStore.Amazon -> IapStore.AMAZON
             dev.hyo.openiap.IapStore.Unknown -> IapStore.UNKNOWN
         }
     }
@@ -1469,19 +1470,27 @@ class HybridRnIap : HybridRnIapSpec() {
         return Promise.async {
             try {
                 // Convert Nitro enum to string (e.g., IAPKIT -> "iapkit")
-                val providerString = params.provider.name.lowercase()
+                val providerString = params.provider.name.lowercase(java.util.Locale.ROOT)
                 RnIapLog.payload("verifyPurchaseWithProvider", mapOf("provider" to providerString))
 
                 // Build the props map for OpenIAP - use string value for provider
                 val propsMap = mutableMapOf<String, Any?>("provider" to providerString)
                 (params.iapkit as? Variant_NullType_NitroVerifyPurchaseWithIapkitProps.Second)?.value?.let { iapkit ->
                     val iapkitMap = mutableMapOf<String, Any?>()
-                    // Use provided apiKey, or fallback to AndroidManifest meta-data (set by config plugin)
+                    // Use provided apiKey, or fallback to host app AndroidManifest meta-data.
                     val apiKey = iapkit.apiKey.unwrapString() ?: getIapkitApiKeyFromManifest()
                     apiKey?.let { iapkitMap["apiKey"] = it }
                     (iapkit.google as? Variant_NullType_NitroVerifyPurchaseWithIapkitGoogleProps.Second)?.value?.let { google ->
                         iapkitMap["google"] = mapOf("purchaseToken" to google.purchaseToken)
                     }
+                    (iapkit.amazon as? Variant_NullType_NitroVerifyPurchaseWithIapkitAmazonProps.Second)?.value?.let { amazon ->
+                        val amazonMap = mutableMapOf<String, Any?>(
+                            "receiptId" to amazon.receiptId
+                        )
+                        amazon.userId.unwrapString()?.let { amazonMap["userId"] = it }
+                        amazon.sandbox.unwrapBool()?.let { amazonMap["sandbox"] = it }
+                        iapkitMap["amazon"] = amazonMap
+                    }
                     (iapkit.apple as? Variant_NullType_NitroVerifyPurchaseWithIapkitAppleProps.Second)?.value?.let { apple ->
                         iapkitMap["apple"] = mapOf("jws" to apple.jws)
                     }
@@ -1609,6 +1618,7 @@ class HybridRnIap : HybridRnIapSpec() {
     // Alternative Billing (Android)
     // -------------------------------------------------------------------------
 
+    @Suppress("DEPRECATION")
     override fun checkAlternativeBillingAvailabilityAndroid(): Promise<Boolean> {
         return Promise.async {
             RnIapLog.payload("checkAlternativeBillingAvailabilityAndroid", null)
@@ -1626,6 +1636,7 @@ class HybridRnIap : HybridRnIapSpec() {
         }
     }
 
+    @Suppress("DEPRECATION")
     override fun showAlternativeBillingDialogAndroid(): Promise<Boolean> {
         return Promise.async {
             RnIapLog.payload("showAlternativeBillingDialogAndroid", null)
@@ -1647,6 +1658,7 @@ class HybridRnIap : HybridRnIapSpec() {
         }
     }
 
+    @Suppress("DEPRECATION")
     override fun createAlternativeBillingTokenAndroid(sku: Variant_NullType_String?): Promise<Variant_NullType_String> {
         return Promise.async {
             val skuValue = sku.unwrapString()
@@ -2000,6 +2012,7 @@ class HybridRnIap : HybridRnIapSpec() {
             "APPLE" -> IapStore.APPLE
             "GOOGLE" -> IapStore.GOOGLE
             "HORIZON" -> IapStore.HORIZON
+            "AMAZON" -> IapStore.AMAZON
             else -> IapStore.UNKNOWN
         }
     }
@@ -2012,8 +2025,8 @@ class HybridRnIap : HybridRnIapSpec() {
     }
 
     /**
-     * Read IAPKit API key from AndroidManifest.xml meta-data (set by config plugin).
-     * Config plugin sets: <meta-data android:name="dev.iapkit.API_KEY" android:value="..." />
+     * Read IAPKit API key from AndroidManifest.xml meta-data.
+     * Host app sets: <meta-data android:name="dev.iapkit.API_KEY" android:value="..." />
      */
     private fun getIapkitApiKeyFromManifest(): String? {
         return try {

package/ios/HybridRnIap.swift

@@ -434,7 +434,7 @@ class HybridRnIap: HybridRnIapSpec {
                 var propsDict: [String: Any] = ["provider": params.provider.stringValue]
                 if case .second(let iapkit) = params.iapkit {
                     var iapkitDict: [String: Any] = [:]
-                    // Use provided apiKey, or fallback to Info.plist IAPKitAPIKey (set by config plugin)
+                    // Use provided apiKey, or fallback to the host app's Info.plist IAPKitAPIKey.
                     if case .second(let apiKey) = iapkit.apiKey {
                         iapkitDict["apiKey"] = apiKey
                     } else if let plistApiKey = Bundle.main.object(forInfoDictionaryKey: "IAPKitAPIKey") as? String {
@@ -446,6 +446,18 @@ class HybridRnIap: HybridRnIapSpec {
                     if case .second(let google) = iapkit.google {
                         iapkitDict["google"] = ["purchaseToken": google.purchaseToken]
                     }
+                    if case .second(let amazon) = iapkit.amazon {
+                        var amazonDict: [String: Any] = [
+                            "receiptId": amazon.receiptId
+                        ]
+                        if case .second(let sandbox) = amazon.sandbox {
+                            amazonDict["sandbox"] = sandbox
+                        }
+                        if case .second(let userId) = amazon.userId {
+                            amazonDict["userId"] = userId
+                        }
+                        iapkitDict["amazon"] = amazonDict
+                    }
                     propsDict["iapkit"] = iapkitDict
                 }
                 // Use JSONSerialization + JSONDecoder like expo-iap does

package/lib/module/index.js

@@ -15,6 +15,7 @@ import { normalizeErrorCodeFromNative, createPurchaseError, DUPLICATE_PURCHASE_C
 import { RnIapConsole } from "./utils/debug.js";
 import { getSuccessFromPurchaseVariant } from "./utils/purchase.js";
 import { parseAppTransactionPayload } from "./utils.js";
+import { getVegaIapModule, isVegaOS } from "./vega.js";
 
 // ------------------------------
 // Billing Programs API (Android 8.2.0+)
@@ -28,6 +29,7 @@ import { parseAppTransactionPayload } from "./utils.js";
 
 export * from "./types.js";
 export * from "./utils/error.js";
+export * from "./vega.js";
 const LEGACY_INAPP_WARNING = "[react-native-iap] `type: 'inapp'` is deprecated and will be removed in a future major version. Use 'in-app' instead.";
 const toErrorMessage = error => {
   if (typeof error === 'object' && error !== null && 'message' in error && error.message != null) {
@@ -63,6 +65,10 @@ let iapRef = null;
  */
 export const isNitroReady = () => {
   if (iapRef) return true;
+  if (isVegaOS()) {
+    iapRef = getVegaIapModule();
+    return Boolean(iapRef);
+  }
   try {
     iapRef = NitroModules.createHybridObject('RnIap');
     return true;
@@ -93,9 +99,20 @@ export const isMacOS = () => {
 export const isStandardIOS = () => {
   return Platform.OS === 'ios' && !isTVOS() && !isMacOS();
 };
+const isAndroidStoreRuntime = () => {
+  return Platform.OS === 'android' || isVegaOS();
+};
 const IAP = {
   get instance() {
     if (iapRef) return iapRef;
+    if (isVegaOS()) {
+      const vegaModule = getVegaIapModule();
+      if (!vegaModule) {
+        throw new Error('Amazon Vega IAP module is unavailable. Install @amazon-devices/keplerscript-appstore-iap-lib in the Vega app target and build with the React Native for Vega kepler platform.');
+      }
+      iapRef = vegaModule;
+      return iapRef;
+    }
 
     // Attempt to create the HybridObject and map common Nitro/JSI readiness errors
     try {
@@ -507,7 +524,7 @@ function tryAttachSubscriptionBillingIssueNative() {
   } catch (e) {
     const msg = toErrorMessage(e);
     if (msg.includes('Nitro runtime not installed')) {
-      RnIapConsole.warn('[subscriptionBillingIssueListener] Nitro not ready yet; will retry on next registration after initConnection()');
+      RnIapConsole.warn('[subscriptionBillingIssueListener] Nitro not ready yet; will retry after initConnection()');
     } else {
       throw e;
     }
@@ -597,7 +614,7 @@ export const fetchProducts = async request => {
 
         // item.type === 'subs' case
         // For Android, check if subscription items have actual offers
-        if (Platform.OS === 'android' && item.platform === 'android' && item.type === 'subs') {
+        if (isAndroidStoreRuntime() && item.platform === 'android' && item.type === 'subs') {
           // TypeScript now knows this is ProductSubscriptionAndroid
           const hasSubscriptionOffers = item.subscriptionOfferDetailsAndroid && Array.isArray(item.subscriptionOfferDetailsAndroid) && item.subscriptionOfferDetailsAndroid.length > 0;
           RnIapConsole.debug(`[fetchProducts] ${item.id}: type=${item.type}, hasOffers=${hasSubscriptionOffers}`);
@@ -683,9 +700,22 @@ export const getAvailablePurchases = async options => {
         RnIapConsole.warn(`[getAvailablePurchases] Some purchases failed validation: ${nitroPurchases.length - validPurchases.length} invalid`);
       }
       return validPurchases.map(convertNitroPurchaseToPurchase);
-    } else if (Platform.OS === 'android') {
-      // For Android, we need to call twice for inapp and subs
+    } else if (isAndroidStoreRuntime()) {
       const includeSuspended = Boolean(options?.includeSuspendedAndroid ?? false);
+      if (isVegaOS()) {
+        const nitroPurchases = await IAP.instance.getAvailablePurchases({
+          android: {
+            includeSuspended
+          }
+        });
+        const validPurchases = nitroPurchases.filter(validateNitroPurchase);
+        if (validPurchases.length !== nitroPurchases.length) {
+          RnIapConsole.warn(`[getAvailablePurchases] Some Vega purchases failed validation: ${nitroPurchases.length - validPurchases.length} invalid`);
+        }
+        return validPurchases.map(convertNitroPurchaseToPurchase);
+      }
+
+      // For Android Play/Horizon/Fire OS, query in-app items and subscriptions separately.
       const inappNitroPurchases = await IAP.instance.getAvailablePurchases({
         android: {
           type: 'inapp',
@@ -777,8 +807,8 @@ export const getStorefrontIOS = async () => {
  * @see {@link https://openiap.dev/docs/apis/get-storefront}
  */
 export const getStorefront = async () => {
-  if (Platform.OS !== 'ios' && Platform.OS !== 'android') {
-    RnIapConsole.warn('[getStorefront] Storefront lookup is only supported on iOS and Android.');
+  if (Platform.OS !== 'ios' && !isAndroidStoreRuntime()) {
+    RnIapConsole.warn('[getStorefront] Storefront lookup is only supported on iOS, Android, and Vega OS.');
     return '';
   }
   const hasUnifiedMethod = typeof IAP.instance.getStorefront === 'function';
@@ -1171,7 +1201,11 @@ export const getTransactionJwsIOS = async sku => {
  */
 export const initConnection = async config => {
   try {
-    return await IAP.instance.initConnection(config);
+    const result = await IAP.instance.initConnection(config);
+    if (subscriptionBillingIssueJsListeners.size > 0) {
+      tryAttachSubscriptionBillingIssueNative();
+    }
+    return result;
   } catch (error) {
     const parsedError = parseErrorAndLogIfNeeded('Failed to initialize IAP connection:', error);
     throw createPurchaseError({
@@ -1274,7 +1308,7 @@ export const requestPurchase = async request => {
       if (!iosRequest?.sku) {
         throw new Error('Invalid request for iOS. The `sku` property is required.');
       }
-    } else if (Platform.OS === 'android') {
+    } else if (isAndroidStoreRuntime()) {
       // Support both 'google' (recommended) and 'android' (deprecated) fields
       const androidRequest = perPlatformRequest.google ?? perPlatformRequest.android;
       if (!androidRequest?.skus?.length) {
@@ -1328,7 +1362,7 @@ export const requestPurchase = async request => {
 
     // Support both 'google' (recommended) and 'android' (deprecated) fields
     const androidRequestSource = perPlatformRequest.google ?? perPlatformRequest.android;
-    if (Platform.OS === 'android' && androidRequestSource) {
+    if (isAndroidStoreRuntime() && androidRequestSource) {
       const androidRequest = isSubs ? androidRequestSource : androidRequestSource;
       const androidPayload = {
         skus: androidRequest.skus
@@ -1421,7 +1455,7 @@ export const finishTransaction = async args => {
           transactionId: purchase.id
         }
       };
-    } else if (Platform.OS === 'android') {
+    } else if (isAndroidStoreRuntime()) {
       const token = purchase.purchaseToken ?? undefined;
       if (!token) {
         throw new Error('purchaseToken required to finish Android transaction');
@@ -1471,8 +1505,8 @@ export const finishTransaction = async args => {
  */
 export const acknowledgePurchaseAndroid = async purchaseToken => {
   try {
-    if (Platform.OS !== 'android') {
-      throw new Error('acknowledgePurchaseAndroid is only available on Android');
+    if (!isAndroidStoreRuntime()) {
+      throw new Error('acknowledgePurchaseAndroid is only available on Android and Vega OS');
     }
     const result = await IAP.instance.finishTransaction({
       android: {
@@ -1506,8 +1540,8 @@ export const acknowledgePurchaseAndroid = async purchaseToken => {
  */
 export const consumePurchaseAndroid = async purchaseToken => {
   try {
-    if (Platform.OS !== 'android') {
-      throw new Error('consumePurchaseAndroid is only available on Android');
+    if (!isAndroidStoreRuntime()) {
+      throw new Error('consumePurchaseAndroid is only available on Android and Vega OS');
     }
     const result = await IAP.instance.finishTransaction({
       android: {
@@ -1699,8 +1733,14 @@ export const validateReceiptIOS = async options => {
  *   provider: 'iapkit',
  *   iapkit: {
  *     apiKey: 'your-api-key',
- *     apple: { jws: purchase.purchaseToken },
- *     google: { purchaseToken: purchase.purchaseToken },
+ *     // Choose exactly one store payload.
+ *     // apple: { jws: purchase.purchaseToken },
+ *     // google: { purchaseToken: purchase.purchaseToken },
+ *     amazon: {
+ *       userId: amazonUserId,
+ *       receiptId: purchase.purchaseToken,
+ *       sandbox: __DEV__,
+ *     },
  *   },
  * });
  * ```