expo-iap 4.3.2 → 4.3.4

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

@@ -3,6 +3,7 @@ package expo.modules.iap
 import android.content.Context
 import dev.hyo.openiap.AndroidSubscriptionOfferInput
 import dev.hyo.openiap.DeepLinkOptions
+import dev.hyo.openiap.FetchProductsResultAll
 import dev.hyo.openiap.FetchProductsResultProducts
 import dev.hyo.openiap.FetchProductsResultSubscriptions
 import dev.hyo.openiap.InitConnectionConfig
@@ -183,9 +184,9 @@ class ExpoIapModule : Module() {
                         val result = openIap.fetchProducts(request)
                         val payload =
                             when (result) {
+                                is FetchProductsResultAll -> result.value.orEmpty().map { it.toJson() }
                                 is FetchProductsResultProducts -> result.value.orEmpty().map { it.toJson() }
                                 is FetchProductsResultSubscriptions -> result.value.orEmpty().map { it.toJson() }
-                                else -> emptyList<Map<String, Any?>>()
                             }
                         ExpoIapLog.result("fetchProducts", payload)
                         promise.resolve(payload)

package/ios/onside/OnsideIapModule.swift

@@ -50,6 +50,7 @@ public final class ExpoIapOnsideModule: Module {
     private let transactionObserver = OnsideTransactionObserverBridge()
     private let productFetcher = OnsideProductFetcher()
     private var productCache: [String: OnsideProduct] = [:]
+    private var transactionDateCache: [String: Date] = [:]
 
     nonisolated public func definition() -> ModuleDefinition {
         Name("ExpoIapOnside")
@@ -113,7 +114,7 @@ public final class ExpoIapOnsideModule: Module {
 
                 // Check if Onside Store is installed
                 if let onsideURL = URL(string: "onside://"),
-                UIApplication.shared.canOpenURL(onsideURL) {
+                await MainActor.run(body: { UIApplication.shared.canOpenURL(onsideURL) }) {
                     #if DEBUG
                     print("[ExpoIapOnsideModule] ✅ Onside Store app is installed")
                     #endif
@@ -225,16 +226,15 @@ public final class ExpoIapOnsideModule: Module {
             let productId = purchasePayload["productId"] as? String
             let txId = purchasePayload["transactionId"] as? String
 
-            let queue = await Onside.defaultPaymentQueue()
-
             let transaction: OnsidePaymentTransaction? = await MainActor.run {
+                let transactions = Onside.defaultPaymentQueue().transactions
                 if let txId, !txId.isEmpty {
-                    return queue.transactions.first(where: { $0.transactionIdentifier == txId })
+                    return transactions.first(where: { $0.transactionIdentifier == txId })
                 }
 
                 // 2) fallback: if txId is not available yet — search by productId (less reliable!)
                 if let productId, !productId.isEmpty {
-                    return queue.transactions.first(where: {
+                    return transactions.first(where: {
                         $0.payment.product.productIdentifier == productId
                         && ($0.transactionState == .purchased || $0.transactionState == .restored)
                     })
@@ -247,7 +247,9 @@ public final class ExpoIapOnsideModule: Module {
                 throw OnsideBridgeError.transactionNotFound(txId ?? productId ?? "")
             }
 
-            await queue.finishTransaction(transaction)
+            await MainActor.run {
+                Onside.defaultPaymentQueue().finishTransaction(transaction)
+            }
             ExpoIapLog.result("finishTransactionOnside", value: true)
             return true
         }
@@ -298,14 +300,21 @@ public final class ExpoIapOnsideModule: Module {
                 ]
             )
             try await ensureObserverRegistered()
-            let queue = await Onside.defaultPaymentQueue()
-            let payload = try queue.transactions.compactMap { transaction -> [String: Any]? in
-                switch transaction.transactionState {
-                case .purchased, .restored:
-                    return try serialize(transaction: transaction)
-                default:
-                    return nil
+            let payload: [[String: Any]] = try await MainActor.run {
+                let items = try Onside.defaultPaymentQueue().transactions.compactMap { transaction -> [String: Any]? in
+                    switch transaction.transactionState {
+                    case .purchased, .restored:
+                        return try serialize(transaction: transaction)
+                    default:
+                        return nil
+                    }
                 }
+                if alsoPublish {
+                    items.forEach {
+                        sendEvent(OnsideEvent.purchaseUpdated.rawValue, $0)
+                    }
+                }
+                return items
             }
             ExpoIapLog.result("getAvailableItemsOnside", value: payload)
             return payload
@@ -323,7 +332,7 @@ public final class ExpoIapOnsideModule: Module {
     private func getOnsideStorefront() async throws -> String {
         ExpoIapLog.payload("getStorefrontOnside", payload: nil)
         try await ensureObserverRegistered()
-        let storefront = await Onside.defaultPaymentQueue().storefront?.countryCode ?? ""
+        let storefront = Onside.defaultPaymentQueue().storefront?.countryCode ?? ""
         ExpoIapLog.result("getStorefrontOnside", value: storefront)
         return storefront
     }
@@ -385,6 +394,7 @@ public final class ExpoIapOnsideModule: Module {
         let cont = restoreContinuation
         restoreContinuation = nil
         cont?.resume(returning: false)
+        transactionDateCache.removeAll()
     }
 
     private func handle(transaction: OnsidePaymentTransaction) {
@@ -425,11 +435,11 @@ public final class ExpoIapOnsideModule: Module {
         dictionary["displayNameIOS"] = product.localizedTitle
         let formatter = NumberFormatter()
         formatter.numberStyle = .currency
-        formatter.currencyCode = product.price.currencyCode ?? ""
-        let priceNumber = NSDecimalNumber(decimal: product.price.value)
+        formatter.currencyCode = product.price.currencyCode
+        let priceNumber = NSDecimalNumber(string: String(product.price.value))
         let formattedPrice = formatter.string(from: priceNumber) ?? "\(product.price.value)"
         dictionary["displayPrice"] = formattedPrice
-        dictionary["currency"] = product.price.currencyCode ?? ""
+        dictionary["currency"] = product.price.currencyCode
         dictionary["price"] = priceNumber
         dictionary["type"] = "in-app"
         dictionary["typeIOS"] = "non-consumable"
@@ -450,15 +460,15 @@ public final class ExpoIapOnsideModule: Module {
         dictionary["quantity"] = 1
         dictionary["isAutoRenewing"] = false
         dictionary["purchaseState"] = mapPurchaseState(transaction.transactionState)
-        let txDate = transaction.transactionDate ?? Date()
+        let txDate = date(for: transaction)
         dictionary["transactionDate"] = Int(txDate.timeIntervalSince1970 * 1000)
-        dictionary["currencyCodeIOS"] = product.price.currencyCode ?? ""
+        dictionary["currencyCodeIOS"] = product.price.currencyCode
         let currencyFormatter = NumberFormatter()
         currencyFormatter.numberStyle = .currency
-        currencyFormatter.currencyCode = product.price.currencyCode ?? ""
+        currencyFormatter.currencyCode = product.price.currencyCode
         dictionary["currencySymbolIOS"] = currencyFormatter.currencySymbol ?? ""
 
-        dictionary["storefrontCountryCodeIOS"] = transaction.storefront.countryCode ?? ""
+        dictionary["storefrontCountryCodeIOS"] = transaction.storefront.countryCode
         dictionary["purchaseToken"] = nil
         dictionary["environmentIOS"] = transaction.storefront.id
         if let error = transaction.error {
@@ -467,12 +477,30 @@ public final class ExpoIapOnsideModule: Module {
         return sanitize(dictionary)
     }
 
+    private func date(for transaction: OnsidePaymentTransaction) -> Date {
+        guard let key = transaction.transactionIdentifier ?? transaction.originalTransactionIdentifier,
+              !key.isEmpty
+        else {
+            return Date()
+        }
+
+        if let cachedDate = transactionDateCache[key] {
+            return cachedDate
+        }
+
+        // OnsideKit currently exposes no purchase date on the transaction, so
+        // keep the first observed timestamp stable for repeated serializations.
+        let observedDate = Date()
+        transactionDateCache[key] = observedDate
+        return observedDate
+    }
+
     // Build a JSON string from known product fields (no Encodable conformance required)
     private func makeProductJSONRepresentation(from product: OnsideProduct) throws -> String {
         let priceFormatter = NumberFormatter()
         priceFormatter.numberStyle = .currency
-        priceFormatter.currencyCode = product.price.currencyCode ?? ""
-        let priceNumber = NSDecimalNumber(decimal: product.price.value)
+        priceFormatter.currencyCode = product.price.currencyCode
+        let priceNumber = NSDecimalNumber(string: String(product.price.value))
         let formattedPrice = priceFormatter.string(from: priceNumber) ?? "\(product.price.value)"
         let jsonObject: [String: Any] = [
             "id": product.productIdentifier,
@@ -480,7 +508,7 @@ public final class ExpoIapOnsideModule: Module {
             "description": product.localizedDescription,
             "price": [
                 "value": priceNumber,
-                "currencyCode": product.price.currencyCode ?? "",
+                "currencyCode": product.price.currencyCode,
                 "formatted": formattedPrice,
             ],
             "isFamilyShareable": false,
@@ -655,6 +683,7 @@ private final class OnsideProductFetcher: NSObject, OnsideProductsRequestDelegat
         }
     }
 
+    @MainActor
     private func cleanup() {
         request?.delegate = nil
         request?.stop()

package/openiap-versions.json

@@ -1,5 +1,5 @@
 {
   "spec": "2.0.2",
-  "google": "2.2.2",
+  "google": "2.2.3",
   "apple": "2.2.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "4.3.2",
+  "version": "4.3.4",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/build/withLocalOpenIAP.d.ts

@@ -8,6 +8,8 @@ type LocalPathOption = string | {
     ios?: string;
     android?: string;
 };
+type GradleLanguage = 'groovy' | 'kotlin';
+export declare const ensureLocalOpenIapFlavorStrategy: (contents: string, flavor: "play" | "horizon", language?: GradleLanguage) => string;
 declare const withLocalOpenIAP: ConfigPlugin<{
     localPath?: LocalPathOption;
     iosAlternativeBilling?: IOSAlternativeBillingConfig;

package/plugin/build/withLocalOpenIAP.js

@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureLocalOpenIapFlavorStrategy = void 0;
 const config_plugins_1 = require("expo/config-plugins");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -72,6 +73,42 @@ const logOnce = (() => {
         }
     };
 })();
+const LOCAL_OPENIAP_FLAVOR_BLOCK_START = '// Added by expo-iap (local openiap-google flavor selection)';
+const LOCAL_OPENIAP_FLAVOR_BLOCK_END = '// End expo-iap local openiap-google flavor selection';
+const normalizeGradleLanguage = (language) => language === 'kotlin' ? 'kotlin' : 'groovy';
+const ensureLocalOpenIapFlavorStrategy = (contents, flavor, language = 'groovy') => {
+    const existingBlockPattern = new RegExp(`\\n?${escapeRegExp(LOCAL_OPENIAP_FLAVOR_BLOCK_START)}[\\s\\S]*?${escapeRegExp(LOCAL_OPENIAP_FLAVOR_BLOCK_END)}\\n?`, 'gm');
+    const cleaned = contents
+        .replace(existingBlockPattern, '\n')
+        .replace(/\n{3,}/g, '\n\n')
+        .trimEnd();
+    const strategyBlock = language === 'kotlin'
+        ? `subprojects {
+  plugins.withId("com.android.library") {
+    extensions.configure<com.android.build.gradle.LibraryExtension>("android") {
+      defaultConfig {
+        missingDimensionStrategy("platform", "${flavor}")
+      }
+    }
+  }
+}`
+        : `subprojects { subproject ->
+  subproject.plugins.withId("com.android.library") {
+    subproject.android {
+      defaultConfig {
+        missingDimensionStrategy "platform", "${flavor}"
+      }
+    }
+  }
+}`;
+    return `${cleaned}
+
+${LOCAL_OPENIAP_FLAVOR_BLOCK_START}
+${strategyBlock}
+${LOCAL_OPENIAP_FLAVOR_BLOCK_END}
+`;
+};
+exports.ensureLocalOpenIapFlavorStrategy = ensureLocalOpenIapFlavorStrategy;
 const withLocalOpenIAP = (config, props) => {
     // Import and apply iOS alternative billing configuration if provided
     if (props?.iosAlternativeBilling) {
@@ -162,9 +199,15 @@ const withLocalOpenIAP = (config, props) => {
             .replace(/\\/g, '/');
         // 1) settings.gradle: include and map projectDir
         const settings = config.modResults;
-        const includeLine = "include ':openiap-google'";
-        const projectDirLine = `project(':openiap-google').projectDir = new File(settingsDir, '${relativeAndroidModulePath}')`;
-        const projectDirPattern = /^project\(':openiap-google'\)\.projectDir\s*=.*$/gm;
+        const settingsLanguage = normalizeGradleLanguage(settings.language);
+        const includeLine = settingsLanguage === 'kotlin'
+            ? 'include(":openiap-google")'
+            : "include ':openiap-google'";
+        const projectDirLine = settingsLanguage === 'kotlin'
+            ? `project(":openiap-google").projectDir = File(settingsDir, "${relativeAndroidModulePath}")`
+            : `project(':openiap-google').projectDir = new File(settingsDir, '${relativeAndroidModulePath}')`;
+        const includePattern = /include\s*(?:\(\s*)?["']:openiap-google["']\s*\)?/;
+        const projectDirPattern = /^\s*project\(["']:openiap-google["']\)\.projectDir\s*=.*$/gm;
         let contents = settings.contents ?? '';
         // Ensure pluginManagement has plugin mappings required by the included module
         const injectPluginManagement = () => {
@@ -208,7 +251,7 @@ const withLocalOpenIAP = (config, props) => {
             }
         };
         injectPluginManagement();
-        if (!contents.includes(includeLine))
+        if (!includePattern.test(contents))
             contents += `\n${includeLine}\n`;
         if (projectDirPattern.test(contents)) {
             contents = contents.replace(projectDirPattern, projectDirLine);
@@ -232,9 +275,14 @@ const withLocalOpenIAP = (config, props) => {
             return config;
         }
         const gradle = config.modResults;
-        const dependencyLine = `    implementation project(':openiap-google')`;
+        const appLanguage = normalizeGradleLanguage(gradle.language);
+        const dependencyLine = appLanguage === 'kotlin'
+            ? `    implementation(project(":openiap-google"))`
+            : `    implementation project(':openiap-google')`;
         const flavor = props?.isHorizonEnabled ? 'horizon' : 'play';
-        const strategyLine = `        missingDimensionStrategy "platform", "${flavor}"`;
+        const strategyLine = appLanguage === 'kotlin'
+            ? `        missingDimensionStrategy("platform", "${flavor}")`
+            : `        missingDimensionStrategy "platform", "${flavor}"`;
         let contents = gradle.contents;
         // Remove Maven deps (both openiap-google and openiap-google-horizon)
         // to avoid duplicate classes with local module
@@ -273,6 +321,23 @@ const withLocalOpenIAP = (config, props) => {
         gradle.contents = contents;
         return config;
     });
+    // 2b) project build.gradle: Expo autolinked library modules can consume the
+    // local flavored OpenIAP module transitively, so give them the same default.
+    config = (0, config_plugins_1.withProjectBuildGradle)(config, (config) => {
+        const projectRoot = config.modRequest.projectRoot;
+        const raw = props?.localPath;
+        const androidInput = typeof raw === 'string' ? undefined : raw?.android;
+        const androidModulePath = resolveAndroidModulePath(androidInput) ||
+            resolveAndroidModulePath(path.resolve(projectRoot, 'openiap-google')) ||
+            null;
+        if (!androidModulePath || !fs.existsSync(androidModulePath)) {
+            return config;
+        }
+        const flavor = props?.isHorizonEnabled ? 'horizon' : 'play';
+        config.modResults.contents = (0, exports.ensureLocalOpenIapFlavorStrategy)(config.modResults.contents, flavor, normalizeGradleLanguage(config.modResults.language));
+        logOnce(`🛠️ expo-iap: Added local OpenIAP flavor strategy for ${flavor}`);
+        return config;
+    });
     // 3) Set horizonEnabled in gradle.properties
     config = (0, config_plugins_1.withDangerousMod)(config, [
         'android',

package/plugin/src/withLocalOpenIAP.ts

@@ -3,6 +3,7 @@ import {
   withDangerousMod,
   withSettingsGradle,
   withAppBuildGradle,
+  withProjectBuildGradle,
 } from 'expo/config-plugins';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -16,6 +17,7 @@ import {
  * This is only for local development with openiap-apple library
  */
 type LocalPathOption = string | {ios?: string; android?: string};
+type GradleLanguage = 'groovy' | 'kotlin';
 
 interface AndroidGradlePluginVersions {
   kotlin: string;
@@ -86,6 +88,59 @@ const logOnce = (() => {
   };
 })();
 
+const LOCAL_OPENIAP_FLAVOR_BLOCK_START =
+  '// Added by expo-iap (local openiap-google flavor selection)';
+const LOCAL_OPENIAP_FLAVOR_BLOCK_END =
+  '// End expo-iap local openiap-google flavor selection';
+
+const normalizeGradleLanguage = (language?: string): GradleLanguage =>
+  language === 'kotlin' ? 'kotlin' : 'groovy';
+
+export const ensureLocalOpenIapFlavorStrategy = (
+  contents: string,
+  flavor: 'play' | 'horizon',
+  language: GradleLanguage = 'groovy',
+): string => {
+  const existingBlockPattern = new RegExp(
+    `\\n?${escapeRegExp(
+      LOCAL_OPENIAP_FLAVOR_BLOCK_START,
+    )}[\\s\\S]*?${escapeRegExp(LOCAL_OPENIAP_FLAVOR_BLOCK_END)}\\n?`,
+    'gm',
+  );
+  const cleaned = contents
+    .replace(existingBlockPattern, '\n')
+    .replace(/\n{3,}/g, '\n\n')
+    .trimEnd();
+
+  const strategyBlock =
+    language === 'kotlin'
+      ? `subprojects {
+  plugins.withId("com.android.library") {
+    extensions.configure<com.android.build.gradle.LibraryExtension>("android") {
+      defaultConfig {
+        missingDimensionStrategy("platform", "${flavor}")
+      }
+    }
+  }
+}`
+      : `subprojects { subproject ->
+  subproject.plugins.withId("com.android.library") {
+    subproject.android {
+      defaultConfig {
+        missingDimensionStrategy "platform", "${flavor}"
+      }
+    }
+  }
+}`;
+
+  return `${cleaned}
+
+${LOCAL_OPENIAP_FLAVOR_BLOCK_START}
+${strategyBlock}
+${LOCAL_OPENIAP_FLAVOR_BLOCK_END}
+`;
+};
+
 const withLocalOpenIAP: ConfigPlugin<
   {
     localPath?: LocalPathOption;
@@ -203,10 +258,18 @@ const withLocalOpenIAP: ConfigPlugin<
 
     // 1) settings.gradle: include and map projectDir
     const settings = config.modResults;
-    const includeLine = "include ':openiap-google'";
-    const projectDirLine = `project(':openiap-google').projectDir = new File(settingsDir, '${relativeAndroidModulePath}')`;
+    const settingsLanguage = normalizeGradleLanguage(settings.language);
+    const includeLine =
+      settingsLanguage === 'kotlin'
+        ? 'include(":openiap-google")'
+        : "include ':openiap-google'";
+    const projectDirLine =
+      settingsLanguage === 'kotlin'
+        ? `project(":openiap-google").projectDir = File(settingsDir, "${relativeAndroidModulePath}")`
+        : `project(':openiap-google').projectDir = new File(settingsDir, '${relativeAndroidModulePath}')`;
+    const includePattern = /include\s*(?:\(\s*)?["']:openiap-google["']\s*\)?/;
     const projectDirPattern =
-      /^project\(':openiap-google'\)\.projectDir\s*=.*$/gm;
+      /^\s*project\(["']:openiap-google["']\)\.projectDir\s*=.*$/gm;
     let contents = settings.contents ?? '';
 
     // Ensure pluginManagement has plugin mappings required by the included module
@@ -279,7 +342,7 @@ const withLocalOpenIAP: ConfigPlugin<
     };
 
     injectPluginManagement();
-    if (!contents.includes(includeLine)) contents += `\n${includeLine}\n`;
+    if (!includePattern.test(contents)) contents += `\n${includeLine}\n`;
     if (projectDirPattern.test(contents)) {
       contents = contents.replace(projectDirPattern, projectDirLine);
     } else if (!contents.includes(projectDirLine)) {
@@ -305,9 +368,16 @@ const withLocalOpenIAP: ConfigPlugin<
     }
 
     const gradle = config.modResults;
-    const dependencyLine = `    implementation project(':openiap-google')`;
+    const appLanguage = normalizeGradleLanguage(gradle.language);
+    const dependencyLine =
+      appLanguage === 'kotlin'
+        ? `    implementation(project(":openiap-google"))`
+        : `    implementation project(':openiap-google')`;
     const flavor = props?.isHorizonEnabled ? 'horizon' : 'play';
-    const strategyLine = `        missingDimensionStrategy "platform", "${flavor}"`;
+    const strategyLine =
+      appLanguage === 'kotlin'
+        ? `        missingDimensionStrategy("platform", "${flavor}")`
+        : `        missingDimensionStrategy "platform", "${flavor}"`;
 
     let contents = gradle.contents;
 
@@ -358,6 +428,31 @@ const withLocalOpenIAP: ConfigPlugin<
     return config;
   });
 
+  // 2b) project build.gradle: Expo autolinked library modules can consume the
+  // local flavored OpenIAP module transitively, so give them the same default.
+  config = withProjectBuildGradle(config, (config) => {
+    const projectRoot = (config.modRequest as any).projectRoot as string;
+    const raw = props?.localPath;
+    const androidInput = typeof raw === 'string' ? undefined : raw?.android;
+    const androidModulePath =
+      resolveAndroidModulePath(androidInput) ||
+      resolveAndroidModulePath(path.resolve(projectRoot, 'openiap-google')) ||
+      null;
+
+    if (!androidModulePath || !fs.existsSync(androidModulePath)) {
+      return config;
+    }
+
+    const flavor = props?.isHorizonEnabled ? 'horizon' : 'play';
+    config.modResults.contents = ensureLocalOpenIapFlavorStrategy(
+      config.modResults.contents,
+      flavor,
+      normalizeGradleLanguage(config.modResults.language),
+    );
+    logOnce(`🛠️ expo-iap: Added local OpenIAP flavor strategy for ${flavor}`);
+    return config;
+  });
+
   // 3) Set horizonEnabled in gradle.properties
   config = withDangerousMod(config, [
     'android',