expo-iap 2.9.0-rc.2 → 2.9.0-rc.4

package/ios/ExpoIapModule.swift

@@ -1,12 +1,18 @@
 import ExpoModulesCore
+import StoreKit
 import OpenIAP
+import OSLog
 
-func logDebug(_ message: String) {
+private let iapLogger = Logger(subsystem: "dev.hyo.expo-iap", category: "ExpoIapModule")
+private func logDebug(_ message: String) {
+    // Use OSLog/Logger so logs are structured and filterable
+    // Suppress debug logs in Release builds
     #if DEBUG
-        print("DEBUG - \(message)")
+    iapLogger.debug("\(message, privacy: .public)")
     #endif
 }
 
+// Event names
 struct OpenIapEvent {
     static let PurchaseUpdated = "purchase-updated"
     static let PurchaseError = "purchase-error"
@@ -16,183 +22,347 @@ struct OpenIapEvent {
 @available(iOS 15.0, tvOS 15.0, *)
 @MainActor
 public class ExpoIapModule: Module {
-    private let iapModule = OpenIapModule.shared
-    private var hasListeners = false
+    // Subscriptions for OpenIapModule event listeners
+    private var purchaseUpdatedSub: Subscription?
+    private var purchaseErrorSub: Subscription?
+    private var promotedProductSub: Subscription?
     
-    public func definition() -> ModuleDefinition {
+    nonisolated public func definition() -> ModuleDefinition {
         Name("ExpoIap")
         
-        // Export native constants for error code mapping
-        Constants([
-            "ERROR_CODES": IapErrorCode.toDictionary()
-        ])
+        Constants {
+            OpenIapSerialization.errorCodes()
+        }
+        
+        Events(
+            OpenIapEvent.PurchaseUpdated,
+            OpenIapEvent.PurchaseError,
+            OpenIapEvent.PromotedProductIOS
+        )
+        
+        OnCreate {
+            logDebug("Module created")
+            Task { @MainActor in
+                self.setupStore()
+            }
+        }
         
-        Events(OpenIapEvent.PurchaseUpdated, OpenIapEvent.PurchaseError, OpenIapEvent.PromotedProductIOS)
+        OnDestroy {
+            logDebug("Module destroyed")
+            Task { @MainActor in
+                await self.cleanupStore()
+            }
+        }
+        
+        // MARK: - Connection Management
         
         AsyncFunction("initConnection") { () async throws -> Bool in
             logDebug("initConnection called")
-            
-            if !self.hasListeners {
-                self.setupPurchaseListeners()
-                self.hasListeners = true
-            }
-            
-            return try await self.iapModule.initConnection()
+            let isConnected = try await OpenIapModule.shared.initConnection()
+            logDebug("Connection initialized: \(isConnected)")
+            return isConnected
         }
         
         AsyncFunction("endConnection") { () async throws -> Bool in
             logDebug("endConnection called")
+            let _ = try await OpenIapModule.shared.endConnection()
             
-            if self.hasListeners {
-                // OpenIAP now exposes unified listener management
-                await self.iapModule.removeAllListeners()
-                self.hasListeners = false
-            }
-            
-            return try await self.iapModule.endConnection()
+            logDebug("Connection ended")
+            return true
         }
         
-        AsyncFunction("fetchProducts") { (skus: [String]) async throws -> [[String: Any?]] in
-            logDebug("fetchProducts called with skus: \(skus)")
-            // Use ProductRequest for OpenIAP PR #3
-            let request = ProductRequest(skus: skus, type: "all")
-            let products = try await self.iapModule.fetchProducts(request)
+        // MARK: - Product Management
+        
+        AsyncFunction("fetchProducts") { (params: [String: Any]) async throws -> [[String: Any?]] in
+            logDebug("fetchProducts raw params: \(params)")
             
-            // Debug logging
-            for product in products {
-                logDebug("Product: id=\(product.id), title=\(product.title), description=\(product.description)")
-                logDebug("Product: price=\(product.price ?? 0), displayPrice=\(product.displayPrice), currency=\(product.currency)")
-                logDebug("Product: type=\(product.type), platform=\(product.platform)")
+            // Handle both object format {skus: [...], type: "..."} and array format
+            var skus: [String] = []
+            var typeString = "all"
+            
+            if let skusArray = params["skus"] as? [String] {
+                // Object format: {skus: [...], type: "..."}
+                skus = skusArray
+                typeString = params["type"] as? String ?? "all"
+            } else {
+                // Array format passed directly - reconstruct from indexed keys
+                var tempSkus: [String] = []
+                var index = 0
+                while let sku = params["\(index)"] as? String {
+                    tempSkus.append(sku)
+                    index += 1
+                }
+                skus = tempSkus
             }
             
-            let serializedProducts = products.map { self.serializeProduct($0) }
-            logDebug("Serialized products: \(serializedProducts)")
-            return serializedProducts
-        }
-        
-        AsyncFunction("getAvailableItems") {
-            (alsoPublishToEventListenerIOS: Bool?, onlyIncludeActiveItemsIOS: Bool?) async throws -> [[String: Any?]] in
-            logDebug("getAvailableItems called")
-            // Use PurchaseOptions for OpenIAP PR #3
-            let options = PurchaseOptions(
-                alsoPublishToEventListenerIOS: alsoPublishToEventListenerIOS,
-                onlyIncludeActiveItemsIOS: onlyIncludeActiveItemsIOS
-            )
-            let transactions = try await self.iapModule.getAvailablePurchases(options)
-            return transactions.map { self.serializePurchase($0) }
+            logDebug("fetchProducts parsed - skus: \(skus), type: \(typeString)")
+            logDebug("SKUs count: \(skus.count)")
+            
+            // Validate SKUs
+            guard !skus.isEmpty else {
+                logDebug("ERROR: Empty SKUs array!")
+                throw OpenIapError.purchaseFailed(reason: "Empty SKU list provided")
+            }
+            
+            // Convert string to OpenIapRequestProductType enum
+            let productType: OpenIapRequestProductType = {
+                switch typeString {
+                case "inapp":
+                    return .inapp
+                case "subs":
+                    return .subs
+                default:
+                    return .all
+                }
+            }()
+            
+            logDebug("Converted type to OpenIapRequestProductType: \(productType)")
+            
+            // Build OpenIapProductRequest and fetch via OpenIapModule
+            let request = OpenIapProductRequest(skus: skus, type: productType)
+            let products = try await OpenIapModule.shared.fetchProducts(request)
+            logDebug("Fetched \(products.count) products from store")
+            if products.isEmpty {
+                logDebug("No products found. Possible reasons:")
+                logDebug("1. Products not configured in App Store Connect")
+                logDebug("2. Bundle ID mismatch")
+                logDebug("3. Not signed in to sandbox account")
+                logDebug("4. Products pending review")
+            }
+            for product in products {
+                logDebug("Product: \(product.id) - \(product.title) - \(product.displayPrice)")
+            }
+            return OpenIapSerialization.products(products)
         }
         
-        AsyncFunction("requestPurchase") {
-            (sku: String,
-             andDangerouslyFinishTransactionAutomaticallyIOS: Bool?,
-             appAccountToken: String?,
-             quantity: Int?,
-             discountOffer: [String: String]?) async throws -> [String: Any?]? in
-            
-            logDebug("requestPurchase called for sku: \(sku)")
+        // MARK: - Purchase Operations
+        
+        AsyncFunction("requestPurchase") { (params: [String: Any]) async throws in
+            // Extract and validate required fields
+            guard let sku = params["sku"] as? String, !sku.isEmpty else {
+                throw OpenIapError.purchaseFailed(reason: "Missing required 'sku'")
+            }
+
+            // Optional fields
+            let andFinish = (params["andDangerouslyFinishTransactionAutomatically"] as? Bool) ?? false
+            let appAccountToken = params["appAccountToken"] as? String
+            let quantity: Int? = {
+                if let q = params["quantity"] as? Int { return q }
+                if let qd = params["quantity"] as? Double { return Int(qd) }
+                return nil
+            }()
+
+            // Discount offer mapping (strings expected from JS)
+            // Use OpenIapDiscountOffer from OpenIAP package (avoid relying on legacy typealiases)
+            var discountOffer: OpenIapDiscountOffer? = nil
+            if let offer = params["withOffer"] as? [String: Any] {
+                let identifier = (offer["identifier"] as? String) ?? (offer["id"] as? String) ?? ""
+                let keyIdentifier = (offer["keyIdentifier"] as? String) ?? ""
+                let nonce = (offer["nonce"] as? String) ?? ""
+                let signature = (offer["signature"] as? String) ?? ""
+                let timestamp = (offer["timestamp"] as? String) ?? ""
+                if !identifier.isEmpty && !keyIdentifier.isEmpty && !nonce.isEmpty && !signature.isEmpty && !timestamp.isEmpty {
+                    discountOffer = OpenIapDiscountOffer(
+                        identifier: identifier,
+                        keyIdentifier: keyIdentifier,
+                        nonce: nonce,
+                        signature: signature,
+                        timestamp: timestamp
+                    )
+                }
+            }
+
+            let tokenForLog = appAccountToken ?? "nil"
+            let qtyForLog = quantity ?? -1
+            logDebug("requestPurchase parsed - sku: \(sku), andFinish: \(andFinish), appAccountToken: \(tokenForLog), quantity: \(qtyForLog), hasOffer: \(discountOffer != nil)")
             
-            let finishAutomatically = andDangerouslyFinishTransactionAutomaticallyIOS ?? false
-            let qty = quantity ?? 1
             
-            // Use RequestPurchaseProps for OpenIAP PR #3
-            let props = RequestPurchaseProps(
+            // Build purchase request props using OpenIapRequestPurchaseProps
+            let requestProps = OpenIapRequestPurchaseProps(
                 sku: sku,
-                andDangerouslyFinishTransactionAutomatically: finishAutomatically,
+                andDangerouslyFinishTransactionAutomatically: andFinish,
                 appAccountToken: appAccountToken,
-                quantity: qty,
-                discountOffer: discountOffer
+                quantity: quantity,
+                withOffer: discountOffer
             )
-            let purchase = try await self.iapModule.requestPurchase(props)
-            return self.serializePurchase(purchase)
+            
+            do {
+                _ = try await OpenIapModule.shared.requestPurchase(requestProps)
+                logDebug("Purchase request completed successfully")
+            } catch {
+                logDebug("Purchase request failed with error: \(error)")
+                throw error
+            }
+        }
+        
+        AsyncFunction("finishTransaction") { (transactionId: String) async throws -> Bool in
+            logDebug("finishTransaction called with id: \(transactionId)")
+            let result = try await OpenIapModule.shared.finishTransaction(transactionIdentifier: transactionId)
+            return result
         }
         
-        AsyncFunction("finishTransaction") { (transactionIdentifier: String) async throws -> Bool in
-            logDebug("finishTransaction called for id: \(transactionIdentifier)")
-            return try await self.iapModule.finishTransaction(transactionIdentifier: transactionIdentifier)
+        // MARK: - Purchase History
+        
+        AsyncFunction("getAvailablePurchases") { (options: [String: Any?]?) async throws -> [[String: Any?]] in
+            logDebug("getAvailablePurchases called")
+            
+            // Build options and get purchases directly from OpenIapModule
+            let purchaseOptions: OpenIapGetAvailablePurchasesProps? = options.map {
+                OpenIapGetAvailablePurchasesProps(
+                    alsoPublishToEventListenerIOS: $0["alsoPublishToEventListenerIOS"] as? Bool,
+                    onlyIncludeActiveItemsIOS: $0["onlyIncludeActiveItemsIOS"] as? Bool
+                )
+            }
+            let purchases = try await OpenIapModule.shared.getAvailablePurchases(purchaseOptions)
+            return OpenIapSerialization.purchases(purchases)
+        }
+        
+        // Legacy function for backward compatibility
+        AsyncFunction("getAvailableItems") { (alsoPublishToEventListener: Bool, onlyIncludeActiveItems: Bool) async throws -> [[String: Any?]] in
+            logDebug("getAvailableItems called (legacy)")
+            
+            let purchaseOptions = OpenIapGetAvailablePurchasesProps(
+                alsoPublishToEventListenerIOS: alsoPublishToEventListener,
+                onlyIncludeActiveItemsIOS: onlyIncludeActiveItems
+            )
+            let purchases = try await OpenIapModule.shared.getAvailablePurchases(purchaseOptions)
+            return OpenIapSerialization.purchases(purchases)
         }
         
         AsyncFunction("getPendingTransactionsIOS") { () async throws -> [[String: Any?]] in
             logDebug("getPendingTransactionsIOS called")
-            let transactions = try await self.iapModule.getPendingTransactionsIOS()
-            return transactions.map { self.serializePurchase($0) }
+            
+            let pendingTransactions = try await OpenIapModule.shared.getPendingTransactionsIOS()
+            return OpenIapSerialization.purchases(pendingTransactions)
         }
         
-        AsyncFunction("clearTransactionIOS") { () async throws in
+        AsyncFunction("clearTransactionIOS") { () async throws -> Bool in
             logDebug("clearTransactionIOS called")
-            try await self.iapModule.clearTransactionIOS()
+            try await OpenIapModule.shared.clearTransactionIOS()
+            return true
         }
         
-        AsyncFunction("getReceiptDataIOS") { () async throws -> String? in
-            logDebug("getReceiptDataIOS called")
-            return try await self.iapModule.getReceiptDataIOS()
+        // MARK: - Receipt & Validation
+        
+        AsyncFunction("getReceiptIOS") { () async throws -> String in
+            logDebug("getReceiptIOS called")
+            return try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
         }
         
-        AsyncFunction("getTransactionJwsIOS") { (sku: String) async throws -> String? in
-            logDebug("getTransactionJwsIOS called for sku: \(sku)")
-            return try await self.iapModule.getTransactionJwsIOS(sku: sku)
+        AsyncFunction("requestReceiptRefreshIOS") { () async throws -> String in
+            logDebug("requestReceiptRefreshIOS called")
+            // Receipt refresh is handled automatically by StoreKit 2
+            return try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
         }
         
         AsyncFunction("validateReceiptIOS") { (sku: String) async throws -> [String: Any?] in
             logDebug("validateReceiptIOS called for sku: \(sku)")
-            // Use ReceiptValidationProps for OpenIAP PR #3
-            let props = ReceiptValidationProps(sku: sku)
-            let validation = try await self.iapModule.validateReceiptIOS(props)
-            var result: [String: Any?] = [
-                "isValid": validation.isValid,
-                "receiptData": validation.receiptData,
-                "jwsRepresentation": validation.jwsRepresentation
+            
+            // Use OpenIapReceiptValidationProps to keep naming parity with OpenIAP
+            let props = OpenIapReceiptValidationProps(sku: sku)
+            let result = try await OpenIapModule.shared.validateReceiptIOS(props)
+            
+            return [
+                "isValid": result.isValid,
+                "receiptData": result.receiptData,
+                "jwsRepresentation": result.jwsRepresentation,
+                "latestTransaction": result.latestTransaction.map { OpenIapSerialization.purchase($0) },
             ]
-            if let latest = validation.latestTransaction {
-                result["latestTransaction"] = self.serializePurchase(latest)
-            }
-            return result
         }
         
-        AsyncFunction("getStorefrontIOS") { () async throws -> String in
-            logDebug("getStorefrontIOS called")
-            return try await self.iapModule.getStorefrontIOS()
+        // MARK: - iOS Specific Features
+        
+        AsyncFunction("presentCodeRedemptionSheetIOS") { () async throws -> Bool in
+            logDebug("presentCodeRedemptionSheetIOS called")
+            let _ = try await OpenIapModule.shared.presentCodeRedemptionSheetIOS()
+            return true
         }
         
-        // Deprecated: Keep for backward compatibility
-        AsyncFunction("getStorefront") { () async throws -> String in
-            logDebug("getStorefront called (deprecated)")
-            return try await self.iapModule.getStorefrontIOS()
+        AsyncFunction("showManageSubscriptionsIOS") { () async throws -> Bool in
+            logDebug("showManageSubscriptionsIOS called")
+            let _ = try await OpenIapModule.shared.showManageSubscriptionsIOS()
+            return true
         }
         
-        AsyncFunction("getAppTransactionIOS") { () async throws -> [String: Any?]? in
-            logDebug("getAppTransactionIOS called")
-            if #available(iOS 16.0, tvOS 16.0, *) {
-                if let appTransaction = try await self.iapModule.getAppTransactionIOS() {
-                    return [
-                        "appVersion": appTransaction.appVersion,
-                        "originalAppVersion": appTransaction.originalAppVersion,
-                        "originalPurchaseDate": appTransaction.originalPurchaseDate.timeIntervalSince1970 * 1000,
-                        "deviceVerification": appTransaction.deviceVerification,
-                        "deviceVerificationNonce": appTransaction.deviceVerificationNonce,
-                        "preorderDate": appTransaction.preorderDate.map { $0.timeIntervalSince1970 * 1000 },
-                        "jwsRepresentation": nil // Not available in IapAppTransaction
-                    ]
+        AsyncFunction("deepLinkToSubscriptionsIOS") { () async throws in
+            logDebug("deepLinkToSubscriptionsIOS called")
+            // Open App Store subscriptions page directly
+            if let url = URL(string: "https://apps.apple.com/account/subscriptions") {
+                #if canImport(UIKit)
+                await MainActor.run {
+                    UIApplication.shared.open(url, options: [:], completionHandler: nil)
                 }
+                #endif
+            }
+        }
+        
+        AsyncFunction("beginRefundRequestIOS") { (sku: String) async throws -> String? in
+            logDebug("beginRefundRequestIOS called for sku: \(sku)")
+            return try await OpenIapModule.shared.beginRefundRequestIOS(sku: sku)
+        }
+        
+        AsyncFunction("getPromotedProductIOS") { () async throws -> [String: Any?]? in
+            logDebug("getPromotedProductIOS called")
+            
+            if let promotedProduct = try await OpenIapModule.shared.getPromotedProductIOS() {
+                return [
+                    "productIdentifier": promotedProduct.productIdentifier,
+                    "localizedTitle": promotedProduct.localizedTitle,
+                    "localizedDescription": promotedProduct.localizedDescription,
+                    "price": promotedProduct.price,
+                    "priceLocale": [
+                        "currencyCode": promotedProduct.priceLocale.currencyCode,
+                        "currencySymbol": promotedProduct.priceLocale.currencySymbol
+                    ]
+                ]
             }
             return nil
         }
         
-        AsyncFunction("isEligibleForIntroOfferIOS") { (groupID: String) async -> Bool in
+        AsyncFunction("buyPromotedProductIOS") { () async throws in
+            logDebug("buyPromotedProductIOS called")
+            try await OpenIapModule.shared.requestPurchaseOnPromotedProductIOS()
+        }
+        
+        AsyncFunction("getStorefrontIOS") { () async throws -> String in
+            logDebug("getStorefrontIOS called")
+            return try await OpenIapModule.shared.getStorefrontIOS()
+        }
+        
+        AsyncFunction("syncIOS") { () async throws -> Bool in
+            logDebug("syncIOS called")
+            return try await OpenIapModule.shared.syncIOS()
+        }
+        
+        // MARK: - Additional iOS Methods
+        
+        AsyncFunction("isTransactionVerifiedIOS") { (sku: String) async throws -> Bool in
+            logDebug("isTransactionVerifiedIOS called for sku: \(sku)")
+            return await OpenIapModule.shared.isTransactionVerifiedIOS(sku: sku)
+        }
+        
+        AsyncFunction("getTransactionJwsIOS") { (sku: String) async throws -> String? in
+            logDebug("getTransactionJwsIOS called for sku: \(sku)")
+            return try await OpenIapModule.shared.getTransactionJwsIOS(sku: sku)
+        }
+        
+        AsyncFunction("isEligibleForIntroOfferIOS") { (groupID: String) async throws -> Bool in
             logDebug("isEligibleForIntroOfferIOS called for groupID: \(groupID)")
-            return await self.iapModule.isEligibleForIntroOfferIOS(groupID: groupID)
+            return await OpenIapModule.shared.isEligibleForIntroOfferIOS(groupID: groupID)
         }
         
         AsyncFunction("subscriptionStatusIOS") { (sku: String) async throws -> [[String: Any?]]? in
             logDebug("subscriptionStatusIOS called for sku: \(sku)")
-            if let statuses = try await self.iapModule.subscriptionStatusIOS(sku: sku) {
+            
+            if let statuses = try await OpenIapModule.shared.subscriptionStatusIOS(sku: sku) {
                 return statuses.map { status in
-                    [
+                    return [
                         "state": status.state,
-                        "renewalInfo": status.renewalInfo != nil ? [
-                            "autoRenewPreference": status.renewalInfo!.autoRenewPreference as Any,
-                            "expirationReason": status.renewalInfo!.expirationReason as Any,
-                            "gracePeriodExpirationDate": status.renewalInfo!.gracePeriodExpirationDate.map { $0.timeIntervalSince1970 * 1000 } as Any
-                        ] : nil
+                        "autoRenewStatus": status.renewalInfo?.autoRenewStatus,
+                        "autoRenewPreference": status.renewalInfo?.autoRenewPreference,
+                        "expirationReason": status.renewalInfo?.expirationReason,
+                        "currentProductID": status.renewalInfo?.currentProductID,
+                        "gracePeriodExpirationDate": status.renewalInfo?.gracePeriodExpirationDate
                     ]
                 }
             }
@@ -201,240 +371,70 @@ public class ExpoIapModule: Module {
         
         AsyncFunction("currentEntitlementIOS") { (sku: String) async throws -> [String: Any?]? in
             logDebug("currentEntitlementIOS called for sku: \(sku)")
-            if let transaction = try await self.iapModule.currentEntitlementIOS(sku: sku) {
-                return self.serializePurchase(transaction)
+            
+            if let entitlement = try await OpenIapModule.shared.currentEntitlementIOS(sku: sku) {
+                return OpenIapSerialization.purchase(entitlement)
             }
             return nil
         }
         
         AsyncFunction("latestTransactionIOS") { (sku: String) async throws -> [String: Any?]? in
             logDebug("latestTransactionIOS called for sku: \(sku)")
-            if let transaction = try await self.iapModule.latestTransactionIOS(sku: sku) {
-                return self.serializePurchase(transaction)
+            
+            if let transaction = try await OpenIapModule.shared.latestTransactionIOS(sku: sku) {
+                return OpenIapSerialization.purchase(transaction)
             }
             return nil
         }
+    }
+    
+    // MARK: - Listeners Setup
+    
+    @MainActor
+    private func setupStore() {
+        logDebug("Setting up OpenIapModule event listeners")
         
-        AsyncFunction("beginRefundRequestIOS") { (sku: String) async throws -> String? in
-            logDebug("beginRefundRequestIOS called for sku: \(sku)")
-            return try await self.iapModule.beginRefundRequestIOS(sku: sku)
+        purchaseUpdatedSub = OpenIapModule.shared.purchaseUpdatedListener { [weak self] purchase in
+            Task { @MainActor in
+                guard let self else { return }
+                logDebug("✅ Purchase success callback - sending event")
+                let purchaseData = OpenIapSerialization.purchase(purchase)
+                self.sendEvent(OpenIapEvent.PurchaseUpdated, purchaseData)
+            }
         }
         
-        AsyncFunction("getPromotedProductIOS") { () async throws -> [String: Any?]? in
-            logDebug("getPromotedProductIOS called")
-            if let promotedProduct = try await self.iapModule.getPromotedProductIOS() {
-                return [
-                    "productId": promotedProduct.productIdentifier,
-                    "paymentDiscount": nil
+        purchaseErrorSub = OpenIapModule.shared.purchaseErrorListener { [weak self] error in
+            Task { @MainActor in
+                guard let self else { return }
+                logDebug("❌ Purchase error callback - sending error event")
+                let errorData: [String: Any?] = [
+                    "code": error.code,
+                    "message": error.message,
+                    "productId": error.productId
                 ]
+                self.sendEvent(OpenIapEvent.PurchaseError, errorData)
             }
-            return nil
-        }
-        
-        AsyncFunction("requestPurchaseOnPromotedProductIOS") { () async throws in
-            logDebug("requestPurchaseOnPromotedProductIOS called")
-            try await self.iapModule.requestPurchaseOnPromotedProductIOS()
-        }
-        
-        AsyncFunction("syncIOS") { () async throws -> Bool in
-            logDebug("syncIOS called")
-            return try await self.iapModule.syncIOS()
         }
         
-        AsyncFunction("presentCodeRedemptionSheetIOS") { () async throws -> Bool in
-            logDebug("presentCodeRedemptionSheetIOS called")
-            return try await self.iapModule.presentCodeRedemptionSheetIOS()
-        }
-        
-        AsyncFunction("showManageSubscriptionsIOS") { () async throws -> Bool in
-            logDebug("showManageSubscriptionsIOS called")
-            return try await self.iapModule.showManageSubscriptionsIOS()
-        }
-        
-        AsyncFunction("isTransactionVerifiedIOS") { (sku: String) async -> Bool in
-            logDebug("isTransactionVerifiedIOS called for sku: \(sku)")
-            return await self.iapModule.isTransactionVerifiedIOS(sku: sku)
-        }
-    }
-    
-    // MARK: - Purchase Listeners
-    
-    private func setupPurchaseListeners() {
-        _ = iapModule.purchaseUpdatedListener { [weak self] purchase in
-            self?.handlePurchaseUpdated(purchase)
-        }
-        _ = iapModule.purchaseErrorListener { [weak self] error in
-            self?.handlePurchaseError(error)
+        promotedProductSub = OpenIapModule.shared.promotedProductListenerIOS { [weak self] productId in
+            Task { @MainActor in
+                guard let self else { return }
+                logDebug("📱 Promoted product callback - sending event for: \(productId)")
+                self.sendEvent(OpenIapEvent.PromotedProductIOS, ["productId": productId])
+            }
         }
     }
     
-    private func handlePurchaseUpdated(_ purchase: OpenIapPurchase) {
-        logDebug("Purchase updated: \(purchase.productId)")
-        let serialized = serializePurchase(purchase)
-        sendEvent(OpenIapEvent.PurchaseUpdated, serialized)
-    }
-    
-    private func handlePurchaseError(_ error: PurchaseError) {
-        logDebug("Purchase error: \(error)")
-        let serialized: [String: Any?] = [
-            "code": error.code,
-            "message": error.message,
-            "productId": error.productId as Any
-        ]
-        sendEvent(OpenIapEvent.PurchaseError, serialized)
-    }
-    
-    // MARK: - Serialization Helpers
-    
-    private func serializePurchase(_ purchase: OpenIapPurchase) -> [String: Any?] {
-        return [
-            // PurchaseCommon required fields
-            "id": purchase.id,
-            "productId": purchase.productId,
-            "transactionDate": purchase.transactionDate,
-            "transactionReceipt": purchase.transactionReceipt,
-            "purchaseToken": purchase.purchaseToken,
-            "platform": purchase.platform,
-            
-            // PurchaseCommon optional fields
-            "ids": purchase.ids,
-            "transactionId": purchase.id, // deprecated but kept for backward compatibility
-            "quantity": purchase.quantity,
-            "purchaseState": purchase.purchaseState.rawValue,
-            "isAutoRenewing": purchase.isAutoRenewing,
-            
-            // PurchaseIOS specific fields
-            "quantityIOS": purchase.quantityIOS,
-            "originalTransactionDateIOS": purchase.originalTransactionDateIOS,
-            "originalTransactionIdentifierIOS": purchase.originalTransactionIdentifierIOS,
-            "appAccountToken": purchase.appAccountToken,
-            
-            // Additional iOS fields from StoreKit 2
-            "expirationDateIOS": purchase.expirationDateIOS,
-            "webOrderLineItemIdIOS": purchase.webOrderLineItemIdIOS,
-            "environmentIOS": purchase.environmentIOS,
-            "storefrontCountryCodeIOS": purchase.storefrontCountryCodeIOS,
-            "appBundleIdIOS": purchase.appBundleIdIOS,
-            "productTypeIOS": purchase.productTypeIOS,
-            "subscriptionGroupIdIOS": purchase.subscriptionGroupIdIOS,
-            "isUpgradedIOS": purchase.isUpgradedIOS,
-            "ownershipTypeIOS": purchase.ownershipTypeIOS,
-            "reasonIOS": purchase.reasonIOS,
-            "reasonStringRepresentationIOS": purchase.reasonStringRepresentationIOS,
-            "transactionReasonIOS": purchase.transactionReasonIOS,
-            "revocationDateIOS": purchase.revocationDateIOS,
-            "revocationReasonIOS": purchase.revocationReasonIOS,
-            
-            // Offer information
-            "offerIOS": purchase.offerIOS != nil ? [
-                "id": purchase.offerIOS!.id,
-                "type": purchase.offerIOS!.type,
-                "paymentMode": purchase.offerIOS!.paymentMode
-            ] : nil,
-            
-            // Price locale fields
-            "currencyCodeIOS": purchase.currencyCodeIOS,
-            "currencySymbolIOS": purchase.currencySymbolIOS,
-            "countryCodeIOS": purchase.countryCodeIOS
-        ]
-    }
-    
-    private func serializeProduct(_ product: OpenIapProduct) -> [String: Any?] {
-        var result: [String: Any?] = [
-            // Common fields (required by ProductCommon)
-            "id": product.id,
-            "title": product.title,
-            "description": product.description,
-            "type": product.type,
-            "displayName": product.displayName,
-            "displayPrice": product.displayPrice,
-            "currency": product.currency,
-            "price": product.price,
-            "debugDescription": product.debugDescription,
-            "platform": product.platform,
-            
-            // iOS-specific fields (required by ProductIOS)
-            "displayNameIOS": product.displayNameIOS,
-            "isFamilyShareableIOS": product.isFamilyShareableIOS,
-            "jsonRepresentationIOS": product.jsonRepresentationIOS,
-            "typeIOS": product.typeIOS.rawValue,
-            
-            // Additional iOS-specific fields
-            "descriptionIOS": product.description,  
-            "displayPriceIOS": product.displayPrice,
-            "priceIOS": product.price,
-            
-            // ProductSubscriptionIOS specific fields
-            "discountsIOS": product.discountsIOS?.map { discount in
-                [
-                    "identifier": discount.identifier,
-                    "type": discount.type,
-                    "numberOfPeriods": discount.numberOfPeriods,
-                    "price": discount.price,
-                    "priceAmount": discount.priceAmount,
-                    "paymentMode": discount.paymentMode,
-                    "subscriptionPeriod": discount.subscriptionPeriod
-                ]
-            },
-            "introductoryPriceIOS": product.introductoryPriceIOS,
-            "introductoryPriceAsAmountIOS": product.introductoryPriceAsAmountIOS,
-            "introductoryPricePaymentModeIOS": product.introductoryPricePaymentModeIOS,
-            "introductoryPriceNumberOfPeriodsIOS": product.introductoryPriceNumberOfPeriodsIOS,
-            "introductoryPriceSubscriptionPeriodIOS": product.introductoryPriceSubscriptionPeriodIOS,
-            "subscriptionPeriodNumberIOS": product.subscriptionPeriodNumberIOS,
-            "subscriptionPeriodUnitIOS": product.subscriptionPeriodUnitIOS
-        ]
-        
-        // Add subscriptionInfoIOS if available
-        if let subInfo = product.subscriptionInfoIOS {
-            var subInfoDict: [String: Any?] = [
-                "subscriptionGroupId": subInfo.subscriptionGroupId,
-                "subscriptionPeriod": [
-                    "unit": subInfo.subscriptionPeriod.unit.rawValue,
-                    "value": subInfo.subscriptionPeriod.value
-                ]
-            ]
-            
-            if let intro = subInfo.introductoryOffer {
-                subInfoDict["introductoryOffer"] = [
-                    "displayPrice": intro.displayPrice,
-                    "id": intro.id,
-                    "paymentMode": intro.paymentMode.rawValue,
-                    "period": [
-                        "unit": intro.period.unit.rawValue,
-                        "value": intro.period.value
-                    ],
-                    "periodCount": intro.periodCount,
-                    "price": intro.price,
-                    "type": intro.type.rawValue
-                ]
-            }
-            
-            if let promos = subInfo.promotionalOffers {
-                subInfoDict["promotionalOffers"] = promos.map { offer in
-                    [
-                        "displayPrice": offer.displayPrice,
-                        "id": offer.id,
-                        "paymentMode": offer.paymentMode.rawValue,
-                        "period": [
-                            "unit": offer.period.unit.rawValue,
-                            "value": offer.period.value
-                        ],
-                        "periodCount": offer.periodCount,
-                        "price": offer.price,
-                        "type": offer.type.rawValue
-                    ]
-                }
-            }
-            
-            result["subscriptionInfoIOS"] = subInfoDict
-        }
-        
-        // Deprecated fields for backward compatibility  
-        result["isFamilyShareable"] = product.isFamilyShareableIOS
-        result["jsonRepresentation"] = product.jsonRepresentationIOS
-        
-        return result
+    @MainActor
+    private func cleanupStore() async {
+        logDebug("Cleaning up listeners and ending connection")
+        if let sub = purchaseUpdatedSub { OpenIapModule.shared.removeListener(sub) }
+        if let sub = purchaseErrorSub { OpenIapModule.shared.removeListener(sub) }
+        if let sub = promotedProductSub { OpenIapModule.shared.removeListener(sub) }
+        purchaseUpdatedSub = nil
+        purchaseErrorSub = nil
+        promotedProductSub = nil
+        _ = try? await OpenIapModule.shared.endConnection()
     }
     
 }