expo-iap 2.8.6 → 2.9.0-rc.1

package/ios/ExpoIapModule.swift

@@ -1,13 +1,5 @@
 import ExpoModulesCore
-import StoreKit
-
-func serializeDebug(_ s: String) -> String? {
-    #if DEBUG
-        return s
-    #else
-        return nil
-    #endif
-}
+import OpenIAP
 
 func logDebug(_ message: String) {
     #if DEBUG
@@ -15,1231 +7,434 @@ func logDebug(_ message: String) {
     #endif
 }
 
-struct IapEvent {
+struct OpenIapEvent {
     static let PurchaseUpdated = "purchase-updated"
     static let PurchaseError = "purchase-error"
     static let PromotedProductIOS = "promoted-product-ios"
 }
 
-@available(iOS 15.0, *)
-func serializeTransaction(_ transaction: Transaction, jwsRepresentationIOS: String? = nil) -> [String: Any?] {
-    let _ =
-        transaction.productType.rawValue.lowercased().contains("renewable")
-        || transaction.expirationDate != nil
-
-    var transactionReasonIOS: String? = nil
-    var webOrderLineItemId: Int? = nil
-    var jsonData: [String: Any]? = nil
-    var jwsReceipt: String = ""
-
-    let jsonRep = transaction.jsonRepresentation
-    jwsReceipt = String(data: jsonRep, encoding: .utf8) ?? ""
-
-    do {
-        if let jsonObj = try JSONSerialization.jsonObject(with: jsonRep) as? [String: Any] {
-            jsonData = jsonObj
-            transactionReasonIOS = jsonObj["transactionReason"] as? String
-            if let webOrderId = jsonObj["webOrderLineItemID"] as? NSNumber {
-                webOrderLineItemId = webOrderId.intValue
-            }
-        }
-    } catch {
-        print("Error parsing JSON representation: \(error)")
-    }
-
-    var purchaseMap: [String: Any?] = [
-        "id": String(transaction.id),
-        "productId": transaction.productID,
-        "ids": [transaction.productID],
-        "transactionId": String(transaction.id), // @deprecated - use id instead
-        "transactionDate": transaction.purchaseDate.timeIntervalSince1970 * 1000,
-        "transactionReceipt": jwsReceipt,
-        "platform": "ios",
-
-        "quantityIOS": transaction.purchasedQuantity,
-        "originalTransactionDateIOS": transaction.originalPurchaseDate.timeIntervalSince1970 * 1000,
-        "originalTransactionIdentifierIOS": String(transaction.originalID),
-        "appAccountToken": transaction.appAccountToken?.uuidString,
-
-        "appBundleIdIOS": transaction.appBundleID,
-        "productTypeIOS": transaction.productType.rawValue,
-        "subscriptionGroupIdIOS": transaction.subscriptionGroupID,
-
-        "webOrderLineItemIdIOS": webOrderLineItemId,
-
-        "expirationDateIOS": transaction.expirationDate.map { $0.timeIntervalSince1970 * 1000 },
-
-        "isUpgradedIOS": transaction.isUpgraded,
-        "ownershipTypeIOS": transaction.ownershipType.rawValue,
-
-        "revocationDateIOS": transaction.revocationDate.map { $0.timeIntervalSince1970 * 1000 },
-        "revocationReasonIOS": transaction.revocationReason?.rawValue,
-        "transactionReasonIOS": transactionReasonIOS,
-    ]
-
-    if (jwsRepresentationIOS != nil) {
-        logDebug("serializeTransaction adding jwsRepresentationIOS with length: \(jwsRepresentationIOS!.count)")
-        purchaseMap["jwsRepresentationIOS"] = jwsRepresentationIOS
-        purchaseMap["purchaseToken"] = jwsRepresentationIOS
-    } else {
-        logDebug("serializeTransaction jwsRepresentationIOS is nil")
-    }
-    
-    if #available(iOS 16.0, *) {
-        purchaseMap["environmentIOS"] = transaction.environment.rawValue
-    }
-
-    if #available(iOS 17.0, *) {
-        purchaseMap["storefrontCountryCodeIOS"] = transaction.storefront.countryCode
-        purchaseMap["reasonIOS"] = transaction.reason.rawValue
-    }
-
-    if #available(iOS 17.2, *) {
-        if let offer = transaction.offer {
-            purchaseMap["offerIOS"] = [
-                "id": offer.id ?? "",
-                "type": offer.type.rawValue,
-                "paymentMode": offer.paymentMode?.rawValue ?? "",
-            ]
-        }
-    }
-
-    if #available(iOS 15.4, *), let jsonData = jsonData {
-        if let price = jsonData["price"] as? NSNumber {
-            // START: Deprecated - will be removed in v2.9.0
-            // Use currencyCodeIOS, currencySymbolIOS, countryCodeIOS instead
-            purchaseMap["priceIOS"] = price.doubleValue
-            // END: Deprecated - will be removed in v2.9.0
-        }
-        if let currency = jsonData["currency"] as? String {
-            purchaseMap["currencyCodeIOS"] = currency
-            
-            // Try to get currency symbol from locale
-            let locale = Locale(identifier: Locale.identifier(fromComponents: [NSLocale.Key.currencyCode.rawValue: currency]))
-            purchaseMap["currencySymbolIOS"] = locale.currencySymbol
-            
-            // START: Deprecated - will be removed in v2.9.0
-            // Use currencyCodeIOS instead
-            purchaseMap["currencyIOS"] = currency
-            // END: Deprecated - will be removed in v2.9.0
-        }
-        // Extract country code from storefront if available
-        if let storefront = jsonData["storefront"] as? String {
-            purchaseMap["countryCodeIOS"] = storefront
-        }
-    }
-
-    return purchaseMap
-}
-
-private let DEFAULT_SUBSCRIPTION_PERIOD_UNIT = "DAY" // Default fallback unit for subscription periods.
-
-func getPeriodIOS(_ unit: Product.SubscriptionPeriod.Unit) -> String {
-    return switch (unit) {
-    case .day: "DAY"
-    case .week: "WEEK"
-    case .month: "MONTH"
-    case .year: "YEAR"
-    @unknown default: 
-        fatalError("Unknown subscription period unit: \(unit)")
-    }
-}
-
-func serializeOffer(_ offer: Product.SubscriptionOffer?) -> [String: Any?]? {
-    guard let offer = offer else { return nil }
-    
-    return [
-        "id": offer.id,
-        "period": [
-            "unit": getPeriodIOS(offer.period.unit),
-            "value": offer.period.value
-        ],
-        "periodCount": offer.periodCount,
-        "paymentMode": offer.paymentMode.rawValue,
-        "type": offer.type.rawValue,
-        "price": offer.price,
-        "displayPrice": offer.displayPrice,
-    ]
-}
-
-func serializeSubscription(_ s: Product.SubscriptionInfo?) -> [String: Any?]? {
-    guard let s = s else { return nil }
-    return [
-        "introductoryOffer": serializeOffer(s.introductoryOffer),
-        "promotionalOffers": s.promotionalOffers.map(serializeOffer),
-        "subscriptionGroupId": s.subscriptionGroupID,
-        "subscriptionPeriod": [
-            "unit": getPeriodIOS(s.subscriptionPeriod.unit),
-            "value": s.subscriptionPeriod.value
-        ],
-    ]
-
-}
-
-@available(iOS 15.0, *)
-func serializeProduct(_ p: Product) -> [String: Any?] {
-    // Convert Product.ProductType to our expected 'inapp' or 'subs' string
-    let productType: String = p.subscription != nil ? "subs" : "inapp"
-    
-    // For subscription products, add discounts and introductory price
-    var discounts: [[String: Any?]]? = nil
-    var introductoryPrice: String? = nil
-    var introductoryPriceAsAmountIOS: String? = nil
-    var introductoryPricePaymentModeIOS: String? = nil
-    var introductoryPriceNumberOfPeriodsIOS: String? = nil
-    var introductoryPriceSubscriptionPeriodIOS: String? = nil
-    var subscriptionPeriodNumberIOS: String? = nil
-    var subscriptionPeriodUnitIOS: String? = nil
-    
-    if let subscription = p.subscription {
-        // Extract discount information from promotional offers
-        if !subscription.promotionalOffers.isEmpty {
-            discounts = subscription.promotionalOffers.compactMap { offer in
-                return [
-                    "identifier": offer.id ?? "",
-                    "type": offer.type.rawValue,
-                    "numberOfPeriods": "\(offer.periodCount)",
-                    "price": "\(offer.price)",
-                    "localizedPrice": offer.displayPrice,
-                    "paymentMode": offer.paymentMode.rawValue,
-                    "subscriptionPeriod": getPeriodIOS(offer.period.unit)
-                ]
-            }
-        }
-        
-        // Extract introductory price from introductory offer
-        if let introOffer = subscription.introductoryOffer {
-            introductoryPrice = introOffer.displayPrice
-            introductoryPriceAsAmountIOS = "\(introOffer.price)"
-            introductoryPricePaymentModeIOS = introOffer.paymentMode.rawValue
-            introductoryPriceNumberOfPeriodsIOS = "\(introOffer.periodCount)"
-            introductoryPriceSubscriptionPeriodIOS = getPeriodIOS(introOffer.period.unit)
-        }
-        
-        // Extract subscription period information
-        subscriptionPeriodNumberIOS = "\(subscription.subscriptionPeriod.value)"
-        subscriptionPeriodUnitIOS = getPeriodIOS(subscription.subscriptionPeriod.unit)
-    }
-    
-    return [
-        "debugDescription": serializeDebug(p.debugDescription),
-        "description": p.description,
-        // New iOS-suffixed fields
-        "displayNameIOS": p.displayName,
-        "discountsIOS": discounts,
-        "introductoryPriceIOS": introductoryPrice,
-        "introductoryPriceAsAmountIOS": introductoryPriceAsAmountIOS,
-        "introductoryPricePaymentModeIOS": introductoryPricePaymentModeIOS,
-        "introductoryPriceNumberOfPeriodsIOS": introductoryPriceNumberOfPeriodsIOS,
-        "introductoryPriceSubscriptionPeriodIOS": introductoryPriceSubscriptionPeriodIOS,
-        "subscriptionPeriodNumberIOS": subscriptionPeriodNumberIOS,
-        "subscriptionPeriodUnitIOS": subscriptionPeriodUnitIOS,
-        "displayPrice": p.displayPrice,
-        "id": p.id,
-        "title": p.displayName,
-        "isFamilyShareableIOS": p.isFamilyShareable,
-        "jsonRepresentationIOS": String(data: p.jsonRepresentation, encoding: .utf8),
-        "price": p.price,
-        "subscriptionInfoIOS": serializeSubscription(p.subscription),
-        "type": productType,
-        "currency": p.priceFormatStyle.currencyCode,
-        "platform": "ios",
-        // START: Deprecated - will be removed in v2.9.0
-        // Use displayNameIOS instead of displayName
-        "displayName": p.displayName,
-        // Use discountsIOS instead of discounts
-        "discounts": discounts,
-        // Use introductoryPriceIOS instead of introductoryPrice
-        "introductoryPrice": introductoryPrice,
-        // Use isFamilyShareableIOS instead of isFamilyShareable
-        "isFamilyShareable": p.isFamilyShareable,
-        // Use jsonRepresentationIOS instead of jsonRepresentation
-        "jsonRepresentation": String(data: p.jsonRepresentation, encoding: .utf8),
-        // Use subscriptionInfoIOS instead of subscription
-        "subscription": serializeSubscription(p.subscription),
-        // END: Deprecated - will be removed in v2.9.0
-    ]
-}
-
-@available(iOS 15.0, *)
-@Sendable func serialize(_ rs: Transaction.RefundRequestStatus?) -> String? {
-    guard let rs = rs else { return nil }
-    switch rs {
-    case .success: return "success"
-    case .userCancelled: return "userCancelled"
-    default:
-        return nil
-    }
-}
-
-@available(iOS 15.0, *)
-func serializeSubscriptionStatus(_ status: Product.SubscriptionInfo.Status) -> [String: Any?] {
-    return [
-        "state": status.state.rawValue,
-        "renewalInfo": serializeRenewalInfo(status.renewalInfo),
-        "platform": "ios",
-    ]
-}
-
-@available(iOS 15.0, *)
-func serializeRenewalInfo(_ renewalInfo: VerificationResult<Product.SubscriptionInfo.RenewalInfo>)
-    -> [String: Any?]?
-{
-    switch renewalInfo {
-    case .unverified:
-        return nil
-    case .verified(let info):
-        return [
-            "autoRenewStatus": info.willAutoRenew,
-            "autoRenewPreference": info.autoRenewPreference,
-            "expirationReason": info.expirationReason,
-            "deviceVerification": info.deviceVerification,
-            "currentProductID": info.currentProductID,
-            "debugDescription": info.debugDescription,
-            "gracePeriodExpirationDate": info.gracePeriodExpirationDate,
-            "platform": "ios",
-        ]
-    }
-}
-
-@available(iOS 15.0, *)
+@available(iOS 15.0, tvOS 15.0, *)
+@MainActor
 public class ExpoIapModule: Module {
-    private var transactions: [String: Transaction] = [:]
-    private var productStore: ProductStore?
+    private let iapModule = OpenIapModule.shared
     private var hasListeners = false
-    private var updateListenerTask: Task<Void, Error>?
-    private var subscriptionPollingTask: Task<Void, Error>?
-    private var pollingSkus: Set<String> = []
-    private var paymentObserver: PaymentObserver?
-    private var promotedPayment: SKPayment?
-    private var promotedProduct: SKProduct?
     
-    // Add a flag to track initialization state
-    private var isInitialized = false
-
     public func definition() -> ModuleDefinition {
         Name("ExpoIap")
-
+        
+        // Export native constants for error code mapping
         Constants([
             "ERROR_CODES": IapErrorCode.toDictionary()
         ])
-
-        Events(IapEvent.PurchaseUpdated, IapEvent.PurchaseError, IapEvent.PromotedProductIOS)
-
-        OnStartObserving {
-            self.hasListeners = true
-            self.addTransactionObserver()
-        }
-
-        OnStopObserving {
-            self.hasListeners = false
-            self.removeTransactionObserver()
-        }
-
-        Function("initConnection") { () -> Bool in
-            // Clean up any existing state first (important for hot reload)
-            self.cleanupExistingState()
-            
-            // Initialize fresh state
-            self.productStore = ProductStore()
+        
+        Events(OpenIapEvent.PurchaseUpdated, OpenIapEvent.PurchaseError, OpenIapEvent.PromotedProductIOS)
+        
+        AsyncFunction("initConnection") { () async throws -> Bool in
+            logDebug("initConnection called")
             
-            // Set up PaymentObserver for promoted products
-            if self.paymentObserver == nil {
-                self.paymentObserver = PaymentObserver(module: self)
-                SKPaymentQueue.default().add(self.paymentObserver!)
+            if !self.hasListeners {
+                self.setupPurchaseListeners()
+                self.hasListeners = true
             }
             
-            self.isInitialized = true
-            return AppStore.canMakePayments
-        }
-
-        AsyncFunction("getStorefront") {
-            let storefront = await Storefront.current
-            return storefront?.countryCode
-        }
-
-        AsyncFunction("getAppTransactionIOS") { () async throws -> [String: Any?]? in
-            if #available(iOS 16.0, *) {
-                #if compiler(>=5.7)
-                let verificationResult = try await AppTransaction.shared
-                
-                let appTransaction: AppTransaction
-                switch verificationResult {
-                case .verified(let verified):
-                    appTransaction = verified
-                case .unverified(_, _):
-                    return nil
-                }
-                
-                var result: [String: Any?] = [
-                    "bundleId": appTransaction.bundleID,
-                    "appVersion": appTransaction.appVersion,
-                    "originalAppVersion": appTransaction.originalAppVersion,
-                    "originalPurchaseDate": appTransaction.originalPurchaseDate.timeIntervalSince1970 * 1000,
-                    "deviceVerification": appTransaction.deviceVerification.base64EncodedString(),
-                    "deviceVerificationNonce": appTransaction.deviceVerificationNonce.uuidString,
-                    "environment": appTransaction.environment.rawValue,
-                    "signedDate": appTransaction.signedDate.timeIntervalSince1970 * 1000,
-                    "appId": appTransaction.appID,
-                    "appVersionId": appTransaction.appVersionID,
-                    "preorderDate": appTransaction.preorderDate.map { $0.timeIntervalSince1970 * 1000 }
-                ]
-                
-                // iOS 18.4+ properties - only compile with Xcode 16.4+ (Swift 6.1+)
-                // This prevents build failures on Xcode 16.3 and below
-                #if swift(>=6.1)
-                if #available(iOS 18.4, *) {
-                    result["appTransactionId"] = appTransaction.appTransactionID
-                    result["originalPlatform"] = appTransaction.originalPlatform.rawValue
-                }
-                #endif
-                
-                return result
-                #else
-                throw Exception(
-                    name: "ExpoIapModule",
-                    description: "getAppTransaction requires Xcode 15.0+ with iOS 16.0 SDK for compilation",
-                    code: IapErrorCode.unknown
-                )
-                #endif
-            } else {
-                throw Exception(
-                    name: "ExpoIapModule",
-                    description: "getAppTransaction requires iOS 16.0 or later",
-                    code: IapErrorCode.unknown
-                )
-            }
+            return try await self.iapModule.initConnection()
         }
         
-        AsyncFunction("getPromotedProductIOS") { () -> [String: Any?]? in
-            guard let product = self.promotedProduct else {
-                return nil
-            }
+        AsyncFunction("endConnection") { () async throws -> Bool in
+            logDebug("endConnection called")
             
-            // Convert SKProduct to dictionary
-            return [
-                "productIdentifier": product.productIdentifier,
-                "localizedTitle": product.localizedTitle,
-                "localizedDescription": product.localizedDescription,
-                "price": product.price.doubleValue,
-                "priceLocale": [
-                    "currencyCode": product.priceLocale.currencyCode ?? "",
-                    "currencySymbol": product.priceLocale.currencySymbol ?? "",
-                    "countryCode": product.priceLocale.regionCode ?? ""
-                ]
-            ]
-        }
-        
-        AsyncFunction("requestPurchaseOnPromotedProductIOS") { () -> Void in
-            guard let payment = self.promotedPayment else {
-                throw Exception(
-                    name: "ExpoIapModule",
-                    description: "No promoted product available",
-                    code: IapErrorCode.itemUnavailable
-                )
+            if self.hasListeners {
+                // OpenIAP now exposes unified listener management
+                await self.iapModule.removeAllListeners()
+                self.hasListeners = false
             }
             
-            // Add the deferred payment to the queue
-            SKPaymentQueue.default().add(payment)
-            
-            // Clear the promoted product data
-            self.promotedPayment = nil
-            self.promotedProduct = nil
+            return try await self.iapModule.endConnection()
         }
-
-        AsyncFunction("requestProducts") { (skus: [String]) -> [[String: Any?]?] in
-            try self.ensureConnection()
-            
-            let productStore = self.productStore!
+        
+        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)
             
-            do {
-                let fetchedProducts = try await Product.products(for: skus)
-                await productStore.performOnActor { isolatedStore in
-                    fetchedProducts.forEach { product in
-                        isolatedStore.addProduct(product)
-                    }
-                }
-                let products = await productStore.getAllProducts()
-                return products.map { serializeProduct($0) }.compactMap { $0 }
-            } catch {
-                print("Error fetching items: \(error)")
-                throw error
+            // 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)")
             }
+            
+            let serializedProducts = products.map { self.serializeProduct($0) }
+            logDebug("Serialized products: \(serializedProducts)")
+            return serializedProducts
         }
-
-        AsyncFunction("endConnection") { () -> Bool in
-            self.cleanupExistingState()
-            return true
-        }
-
+        
         AsyncFunction("getAvailableItems") {
-            (alsoPublishToEventListenerIOS: Bool, onlyIncludeActiveItemsIOS: Bool) -> [[String: Any?]?] in
-            
-            try self.ensureConnection()
-            
-            var purchasedItemsSerialized: [[String: Any?]] = []
-
-            func addTransaction(transaction: Transaction, jwsRepresentationIOS: String? = nil) {
-                let serialized = serializeTransaction(transaction, jwsRepresentationIOS: jwsRepresentationIOS)
-                purchasedItemsSerialized.append(serialized)
-                
-                if alsoPublishToEventListenerIOS {
-                    self.sendEvent(IapEvent.PurchaseUpdated, serialized)
-                }
-            }
-
-            for await verification in onlyIncludeActiveItemsIOS
-                ? Transaction.currentEntitlements : Transaction.all
-            {
-                do {
-                    let transaction = try self.checkVerified(verification)
-                    if !onlyIncludeActiveItemsIOS {
-                        addTransaction(transaction: transaction, jwsRepresentationIOS: verification.jwsRepresentation)
-                        continue
-                    }
-                    switch transaction.productType {
-                    case .nonConsumable, .autoRenewable, .consumable:
-                        if await self.productStore?.getProduct(productID: transaction.productID)
-                            != nil
-                        {
-                            addTransaction(transaction: transaction, jwsRepresentationIOS: verification.jwsRepresentation)
-                        }
-                    case .nonRenewable:
-                        if await self.productStore?.getProduct(productID: transaction.productID)
-                            != nil
-                        {
-                            let currentDate = Date()
-                            let expirationDate = Calendar(identifier: .gregorian).date(
-                                byAdding: DateComponents(year: 1), to: transaction.purchaseDate)!
-                            if currentDate < expirationDate {
-                                addTransaction(transaction: transaction, jwsRepresentationIOS: verification.jwsRepresentation)
-                            }
-                        }
-                    default:
-                        break
-                    }
-                } catch StoreError.failedVerification {
-                    let err = [
-                        "responseCode": IapErrorCode.transactionValidationFailed,
-                        "debugMessage": StoreError.failedVerification.localizedDescription,
-                        "code": IapErrorCode.transactionValidationFailed,
-                        "message": StoreError.failedVerification.localizedDescription,
-                        "productId": "unknown",
-                    ]
-                    if alsoPublishToEventListenerIOS {
-                        self.sendEvent(IapEvent.PurchaseError, err)
-                    }
-                } catch {
-                    let err = [
-                        "responseCode": IapErrorCode.unknown,
-                        "debugMessage": error.localizedDescription,
-                        "code": IapErrorCode.unknown,
-                        "message": error.localizedDescription,
-                        "productId": "unknown",
-                    ]
-                    if alsoPublishToEventListenerIOS {
-                        self.sendEvent(IapEvent.PurchaseError, err)
-                    }
-                }
-            }
-            return purchasedItemsSerialized
+            (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) }
         }
-
+        
         AsyncFunction("requestPurchase") {
-            (
-                sku: String, andDangerouslyFinishTransactionAutomatically: Bool,
-                appAccountToken: String?, quantity: Int, discountOffer: [String: String]?
-            ) -> [String: Any?]? in
+            (sku: String,
+             andDangerouslyFinishTransactionAutomaticallyIOS: Bool?,
+             appAccountToken: String?,
+             quantity: Int?,
+             discountOffer: [String: String]?) async throws -> [String: Any?]? in
             
-            try self.ensureConnection()
-            let productStore = self.productStore!
-
-            let product: Product? = await productStore.getProduct(productID: sku)
-            if let product = product {
-                do {
-                    var options: Set<Product.PurchaseOption> = []
-                    if quantity > -1 {
-                        options.insert(.quantity(quantity))
-                    }
-                    if let offerID = discountOffer?["identifier"],
-                        let keyID = discountOffer?["keyIdentifier"],
-                        let nonce = discountOffer?["nonce"],
-                        let signature = discountOffer?["signature"],
-                        let timestamp = discountOffer?["timestamp"],
-                        let uuidNonce = UUID(uuidString: nonce),
-                        let signatureData = Data(base64Encoded: signature),
-                        let timestampInt = Int(timestamp)
-                    {
-                        options.insert(
-                            .promotionalOffer(
-                                offerID: offerID, keyID: keyID, nonce: uuidNonce,
-                                signature: signatureData, timestamp: timestampInt))
-                    }
-                    if let appAccountToken = appAccountToken,
-                        let appAccountUUID = UUID(uuidString: appAccountToken)
-                    {
-                        options.insert(.appAccountToken(appAccountUUID))
-                    }
-                    guard let windowScene = await self.currentWindowScene() else {
-                        let errorData = [
-                            "responseCode": IapErrorCode.serviceError,
-                            "debugMessage": "Could not find window scene",
-                            "code": IapErrorCode.serviceError,
-                            "message": "Could not find window scene",
-                            "productId": sku,
-                        ]
-                        self.sendEvent(IapEvent.PurchaseError, errorData)
-                        throw Exception(name: "ExpoIapModule", description: "Could not find window scene", code: IapErrorCode.serviceError)
-                    }
-                    let result: Product.PurchaseResult
-                    #if swift(>=5.9)
-                        if #available(iOS 17.0, tvOS 17.0, *) {
-                            result = try await product.purchase(
-                                confirmIn: windowScene, options: options)
-                        } else {
-                            #if !os(visionOS)
-                                result = try await product.purchase(options: options)
-                            #endif
-                        }
-                    #elseif !os(visionOS)
-                        result = try await product.purchase(options: options)
-                    #endif
-
-                    switch result {
-                    case .success(let verification):
-                        let transaction = try self.checkVerified(verification)
-                        
-                        // Debug: Log JWS representation
-                        let jwsRepresentation = verification.jwsRepresentation
-                        if !jwsRepresentation.isEmpty {
-                            logDebug("buyProduct JWS: exists")
-                            logDebug("buyProduct JWS length: \(jwsRepresentation.count)")
-                        } else {
-                            logDebug("buyProduct JWS: empty string")
-                        }
-                        
-                        if andDangerouslyFinishTransactionAutomatically {
-                            await transaction.finish()
-                            return nil
-                        } else {
-                            self.transactions[String(transaction.id)] = transaction
-                            let serialized = serializeTransaction(transaction, jwsRepresentationIOS: verification.jwsRepresentation)
-                            
-                            // Debug: Check if jwsRepresentationIOS is included in serialized result
-                            logDebug("buyProduct serialized includes JWS: \(serialized["jwsRepresentationIOS"] != nil)")
-                            
-                            self.sendEvent(IapEvent.PurchaseUpdated, serialized)
-                            return serialized
-                        }
-                    case .userCancelled:
-                        let errorData = [
-                            "responseCode": IapErrorCode.userCancelled,
-                            "debugMessage": "User cancelled the purchase",
-                            "code": IapErrorCode.userCancelled,
-                            "message": "User cancelled the purchase",
-                            "productId": sku,
-                        ]
-                        self.sendEvent(IapEvent.PurchaseError, errorData)
-                        throw Exception(name: "ExpoIapModule", description: "User cancelled the purchase", code: IapErrorCode.userCancelled)
-                    case .pending:
-                        let errorData = [
-                            "responseCode": IapErrorCode.deferredPayment,
-                            "debugMessage": "The payment was deferred",
-                            "code": IapErrorCode.deferredPayment,
-                            "message": "The payment was deferred",
-                            "productId": sku,
-                        ]
-                        self.sendEvent(IapEvent.PurchaseError, errorData)
-                        throw Exception(name: "ExpoIapModule", description: "The payment was deferred", code: IapErrorCode.deferredPayment)
-                    @unknown default:
-                        let errorData = [
-                            "responseCode": IapErrorCode.unknown,
-                            "debugMessage": "Unknown purchase result",
-                            "code": IapErrorCode.unknown,
-                            "message": "Unknown purchase result",
-                            "productId": sku,
-                        ]
-                        self.sendEvent(IapEvent.PurchaseError, errorData)
-                        throw Exception(name: "ExpoIapModule", description: "Unknown purchase result", code: IapErrorCode.unknown)
-                    }
-                } catch {
-                    if error is Exception {
-                        throw error
-                    }
-                    
-                    // Map StoreKit errors to proper error codes
-                    var errorCode = IapErrorCode.purchaseError
-                    var errorMessage = error.localizedDescription
-                    
-                    // Check for specific StoreKit error types
-                    if let nsError = error as NSError? {
-                        switch nsError.domain {
-                        case "SKErrorDomain":
-                            // Handle SKError codes
-                            switch nsError.code {
-                            case 0: // SKError.unknown
-                                errorCode = IapErrorCode.unknown
-                            case 1: // SKError.clientInvalid
-                                errorCode = IapErrorCode.serviceError
-                            case 2: // SKError.paymentCancelled
-                                errorCode = IapErrorCode.userCancelled
-                                errorMessage = "User cancelled the purchase"
-                            case 3: // SKError.paymentInvalid
-                                errorCode = IapErrorCode.userError
-                            case 4: // SKError.paymentNotAllowed
-                                errorCode = IapErrorCode.userError
-                                errorMessage = "Payment not allowed"
-                            case 5: // SKError.storeProductNotAvailable
-                                errorCode = IapErrorCode.itemUnavailable
-                            case 6: // SKError.cloudServicePermissionDenied
-                                errorCode = IapErrorCode.serviceError
-                            case 7: // SKError.cloudServiceNetworkConnectionFailed
-                                errorCode = IapErrorCode.networkError
-                            case 8: // SKError.cloudServiceRevoked
-                                errorCode = IapErrorCode.serviceError
-                            default:
-                                errorCode = IapErrorCode.purchaseError
-                            }
-                        case "NSURLErrorDomain":
-                            errorCode = IapErrorCode.networkError
-                            errorMessage = "Network error: \(error.localizedDescription)"
-                        default:
-                            errorCode = IapErrorCode.purchaseError
-                        }
-                    } else if error.localizedDescription.lowercased().contains("network") {
-                        errorCode = IapErrorCode.networkError
-                    } else if error.localizedDescription.lowercased().contains("cancelled") {
-                        errorCode = IapErrorCode.userCancelled
-                    }
-                    
-                    let errorData = [
-                        "responseCode": errorCode,
-                        "debugMessage": "Purchase failed: \(error.localizedDescription)",
-                        "code": errorCode,
-                        "message": errorMessage,
-                        "productId": sku,
-                    ]
-                    self.sendEvent(IapEvent.PurchaseError, errorData)
-                    throw Exception(name: "ExpoIapModule", description: errorMessage, code: errorCode)
-                }
-            } else {
-                let errorData = [
-                    "responseCode": IapErrorCode.itemUnavailable,
-                    "debugMessage": "Invalid product ID",
-                    "code": IapErrorCode.itemUnavailable,
-                    "message": "Invalid product ID",
-                    "productId": sku,
-                ]
-                self.sendEvent(IapEvent.PurchaseError, errorData)
-                throw Exception(name: "ExpoIapModule", description: "Invalid product ID", code: IapErrorCode.itemUnavailable)
-            }
-        }
-
-        AsyncFunction("isEligibleForIntroOfferIOS") { (groupID: String) -> Bool in
-            return await Product.SubscriptionInfo.isEligibleForIntroOffer(for: groupID)
+            logDebug("requestPurchase called for sku: \(sku)")
+            
+            let finishAutomatically = andDangerouslyFinishTransactionAutomaticallyIOS ?? false
+            let qty = quantity ?? 1
+            
+            // Use RequestPurchaseProps for OpenIAP PR #3
+            let props = RequestPurchaseProps(
+                sku: sku,
+                andDangerouslyFinishTransactionAutomatically: finishAutomatically,
+                appAccountToken: appAccountToken,
+                quantity: qty,
+                discountOffer: discountOffer
+            )
+            let purchase = try await self.iapModule.requestPurchase(props)
+            return self.serializePurchase(purchase)
         }
-
-        AsyncFunction("subscriptionStatusIOS") { (sku: String) -> [[String: Any?]?]? in
-            try self.ensureConnection()
-            let productStore = self.productStore!
-
-            do {
-                let product = await productStore.getProduct(productID: sku)
-                let status: [Product.SubscriptionInfo.Status]? = try await product?.subscription?
-                    .status
-                guard let status = status else {
-                    return nil
-                }
-                return status.map { serializeSubscriptionStatus($0) }
-            } catch {
-                if error is Exception {
-                    throw error
-                }
-                throw Exception(name: "ExpoIapModule", description: "Error getting subscription status: \(error.localizedDescription)", code: IapErrorCode.serviceError)
-            }
+        
+        AsyncFunction("finishTransaction") { (transactionIdentifier: String) async throws -> Bool in
+            logDebug("finishTransaction called for id: \(transactionIdentifier)")
+            return try await self.iapModule.finishTransaction(transactionIdentifier: transactionIdentifier)
         }
-
-        AsyncFunction("currentEntitlementIOS") { (sku: String) -> [String: Any?]? in
-            try self.ensureConnection()
-            let productStore = self.productStore!
-
-            if let product = await productStore.getProduct(productID: sku) {
-                if let result = await product.currentEntitlement {
-                    do {
-                        let transaction = try self.checkVerified(result)
-                        return serializeTransaction(transaction)
-                    } catch StoreError.failedVerification {
-                        throw Exception(name: "ExpoIapModule", description: "Failed to verify transaction for sku \(sku)", code: IapErrorCode.transactionValidationFailed)
-                    } catch {
-                        if error is Exception {
-                            throw error
-                        }
-                        throw Exception(name: "ExpoIapModule", description: "Error fetching entitlement for sku \(sku): \(error.localizedDescription)", code: IapErrorCode.serviceError)
-                    }
-                } else {
-                    throw Exception(name: "ExpoIapModule", description: "Can't find entitlement for sku \(sku)", code: IapErrorCode.itemUnavailable)
-                }
-            } else {
-                throw Exception(name: "ExpoIapModule", description: "Can't find product for sku \(sku)", code: IapErrorCode.itemUnavailable)
-            }
+        
+        AsyncFunction("getPendingTransactionsIOS") { () async throws -> [[String: Any?]] in
+            logDebug("getPendingTransactionsIOS called")
+            let transactions = try await self.iapModule.getPendingTransactionsIOS()
+            return transactions.map { self.serializePurchase($0) }
         }
-
-        AsyncFunction("latestTransactionIOS") { (sku: String) -> [String: Any?]? in
-            try self.ensureConnection()
-            let productStore = self.productStore!
-
-            if let product = await productStore.getProduct(productID: sku) {
-                if let result = await product.latestTransaction {
-                    do {
-                        let transaction = try self.checkVerified(result)
-                        return serializeTransaction(transaction)
-                    } catch StoreError.failedVerification {
-                        throw Exception(name: "ExpoIapModule", description: "Failed to verify transaction for sku \(sku)", code: IapErrorCode.transactionValidationFailed)
-                    } catch {
-                        if error is Exception {
-                            throw error
-                        }
-                        throw Exception(name: "ExpoIapModule", description: "Error fetching latest transaction for sku \(sku): \(error.localizedDescription)", code: IapErrorCode.serviceError)
-                    }
-                } else {
-                    throw Exception(name: "ExpoIapModule", description: "Can't find latest transaction for sku \(sku)", code: IapErrorCode.itemUnavailable)
-                }
-            } else {
-                throw Exception(name: "ExpoIapModule", description: "Can't find product for sku \(sku)", code: IapErrorCode.itemUnavailable)
-            }
+        
+        AsyncFunction("clearTransactionIOS") { () async throws in
+            logDebug("clearTransactionIOS called")
+            try await self.iapModule.clearTransactionIOS()
         }
-
-        AsyncFunction("finishTransaction") { (transactionIdentifier: String) -> Bool in
-            if let transaction = self.transactions[transactionIdentifier] {
-                await transaction.finish()
-                self.transactions.removeValue(forKey: transactionIdentifier)
-                return true
-            } else {
-                throw Exception(name: "ExpoIapModule", description: "Invalid transaction ID", code: IapErrorCode.developerError)
-            }
+        
+        AsyncFunction("getReceiptDataIOS") { () async throws -> String? in
+            logDebug("getReceiptDataIOS called")
+            return try await self.iapModule.getReceiptDataIOS()
         }
-
-        AsyncFunction("getPendingTransactionsIOS") { () -> [[String: Any?]?] in
-            return self.transactions.values.map { serializeTransaction($0) }
+        
+        AsyncFunction("getTransactionJwsIOS") { (sku: String) async throws -> String? in
+            logDebug("getTransactionJwsIOS called for sku: \(sku)")
+            return try await self.iapModule.getTransactionJwsIOS(sku: sku)
         }
-
-        AsyncFunction("syncIOS") { () -> Bool in
-            do {
-                try await AppStore.sync()
-                return true
-            } catch {
-                if error is Exception {
-                    throw error
-                }
-                throw Exception(name: "ExpoIapModule", description: "Error synchronizing with the AppStore: \(error.localizedDescription)", code: IapErrorCode.syncError)
+        
+        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
+            ]
+            if let latest = validation.latestTransaction {
+                result["latestTransaction"] = self.serializePurchase(latest)
             }
+            return result
         }
-
-        AsyncFunction("presentCodeRedemptionSheetIOS") { () -> Bool in
-            #if !os(tvOS)
-                SKPaymentQueue.default().presentCodeRedemptionSheet()
-                return true
-            #else
-                throw Exception(name: "ExpoIapModule", description: "This method is not available on tvOS", code: IapErrorCode.serviceError)
-            #endif
+        
+        AsyncFunction("getStorefrontIOS") { () async throws -> String in
+            logDebug("getStorefrontIOS called")
+            return try await self.iapModule.getStorefrontIOS()
         }
-
-        AsyncFunction("showManageSubscriptionsIOS") { () -> Bool in
-            #if !os(tvOS)
-                guard let windowScene = await self.currentWindowScene() else {
-                    throw Exception(name: "ExpoIapModule", description: "Cannot find window scene or not available on macOS", code: IapErrorCode.serviceError)
-                }
-                // Get all subscription products before showing the management UI
-                let subscriptionSkus = await self.getAllSubscriptionProductIds()
-                self.pollingSkus = Set(subscriptionSkus)
-                // Show the management UI
-                try await AppStore.showManageSubscriptions(in: windowScene)
-                // Start polling for status changes
-                self.pollForSubscriptionStatusChanges()
-                return true
-            #else
-                throw Exception(name: "ExpoIapModule", description: "This method is not available on tvOS", code: IapErrorCode.serviceError)
-            #endif
+        
+        // Deprecated: Keep for backward compatibility
+        AsyncFunction("getStorefront") { () async throws -> String in
+            logDebug("getStorefront called (deprecated)")
+            return try await self.iapModule.getStorefrontIOS()
         }
-
-        AsyncFunction("clearTransactionIOS") { () -> Void in
-            Task {
-                for await result in Transaction.unfinished {
-                    do {
-                        let transaction = try self.checkVerified(result)
-                        await transaction.finish()
-                        self.transactions.removeValue(forKey: String(transaction.id))
-                    } catch {
-                        if error is Exception {
-                            throw error
-                        }
-                        print("Failed to finish transaction")
-                    }
+        
+        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
+                    ]
                 }
             }
+            return nil
         }
-
-        AsyncFunction("beginRefundRequestIOS") { (sku: String) -> String? in
-            #if !os(tvOS)
-                try self.ensureConnection()
-                let productStore = self.productStore!
-                
-                guard let product = await productStore.getProduct(productID: sku),
-                    let result = await product.latestTransaction
-                else {
-                    throw Exception(name: "ExpoIapModule", description: "Can't find product or transaction for sku \(sku)", code: IapErrorCode.itemUnavailable)
-                }
-
-                do {
-                    let transaction = try self.checkVerified(result)
-                    guard let windowScene = await self.currentWindowScene() else {
-                        throw Exception(name: "ExpoIapModule", description: "Cannot find window scene or not available on macOS", code: IapErrorCode.serviceError)
-                    }
-                    let refundStatus = try await transaction.beginRefundRequest(in: windowScene)
-                    return serialize(refundStatus)
-                } catch StoreError.failedVerification {
-                    throw Exception(name: "ExpoIapModule", description: "Failed to verify transaction for sku \(sku)", code: IapErrorCode.transactionValidationFailed)
-                } catch {
-                    if error is Exception {
-                        throw error
-                    }
-                    throw Exception(name: "ExpoIapModule", description: "Failed to refund purchase: \(error.localizedDescription)", code: IapErrorCode.serviceError)
-                }
-            #else
-                throw Exception(name: "ExpoIapModule", description: "This method is not available on tvOS", code: IapErrorCode.serviceError)
-            #endif
-        }
-
-        // @deprecated - This function is deprecated and will be removed in v2.9.0
-        // The transaction observer is now managed automatically
-        Function("disable") { () -> Bool in
-            // No longer needed - observer management is automatic
-            return true
-        }
-
-        AsyncFunction("getReceiptDataIOS") { () -> String? in
-            return try self.getReceiptDataInternal()
+        
+        AsyncFunction("isEligibleForIntroOfferIOS") { (groupID: String) async -> Bool in
+            logDebug("isEligibleForIntroOfferIOS called for groupID: \(groupID)")
+            return await self.iapModule.isEligibleForIntroOfferIOS(groupID: groupID)
         }
-
-        AsyncFunction("isTransactionVerifiedIOS") { (sku: String) -> Bool in
-            try self.ensureConnection()
-            let productStore = self.productStore!
-            
-            if let product = await productStore.getProduct(productID: sku),
-               let result = await product.latestTransaction {
-                do {
-                    // If this doesn't throw, the transaction is verified
-                    _ = try self.checkVerified(result)
-                    return true
-                } catch {
-                    return false
+        
+        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) {
+                return statuses.map { status in
+                    [
+                        "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
+                    ]
                 }
             }
-            return false
+            return nil
         }
-
-        AsyncFunction("getTransactionJwsIOS") { (sku: String) -> String? in
-            try self.ensureConnection()
-            let productStore = self.productStore!
-            
-            if let product = await productStore.getProduct(productID: sku),
-               let result = await product.latestTransaction {
-                return result.jwsRepresentation
-            } else {
-                throw Exception(name: "ExpoIapModule", description: "Can't find transaction for sku \(sku)", code: IapErrorCode.itemUnavailable)
+        
+        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)
             }
+            return nil
         }
-
-        AsyncFunction("validateReceiptIOS") { (sku: String) -> [String: Any] in
-            try self.ensureConnection()
-            let productStore = self.productStore!
-            
-            // Get receipt data
-            var receiptData: String = ""
-            do {
-                receiptData = try self.getReceiptDataInternal()
-            } catch {
-                // Continue with validation even if receipt retrieval fails
-                // Error will be reflected by empty receipt data
-            }
-            
-            var isValid = false
-            var jwsRepresentation: String? = nil
-            var latestTransaction: [String: Any?]? = nil
-            
-            // Get JWS representation and verify transaction
-            if let product = await productStore.getProduct(productID: sku),
-               let result = await product.latestTransaction {
-                jwsRepresentation = result.jwsRepresentation
-                
-                do {
-                    // If this doesn't throw, the transaction is verified
-                    let transaction = try self.checkVerified(result)
-                    isValid = true
-                    latestTransaction = serializeTransaction(transaction, jwsRepresentationIOS: result.jwsRepresentation)
-                } catch {
-                    isValid = false
-                }
+        
+        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)
             }
-
-            return [
-                "isValid": isValid,
-                "receiptData": receiptData,
-                "jwsRepresentation": jwsRepresentation ?? "",
-                "latestTransaction": latestTransaction as Any
-            ]
-        }
-    }
-
-    // Similar to Android's ensureConnection pattern
-    private func ensureConnection() throws {
-        guard isInitialized else {
-            throw Exception(
-                name: "ExpoIapModule", 
-                description: "Connection not initialized. Call initConnection() first.", 
-                code: IapErrorCode.notPrepared
-            )
+            return nil
         }
         
-        guard productStore != nil else {
-            throw Exception(
-                name: "ExpoIapModule", 
-                description: "Product store not available", 
-                code: IapErrorCode.notPrepared
-            )
+        AsyncFunction("beginRefundRequestIOS") { (sku: String) async throws -> String? in
+            logDebug("beginRefundRequestIOS called for sku: \(sku)")
+            return try await self.iapModule.beginRefundRequestIOS(sku: sku)
         }
-    }
-    
-    private func cleanupExistingState() {
-        // Cancel any existing tasks
-        updateListenerTask?.cancel()
-        updateListenerTask = nil
         
-        subscriptionPollingTask?.cancel()
-        subscriptionPollingTask = nil
+        AsyncFunction("getPromotedProductIOS") { () async throws -> [String: Any?]? in
+            logDebug("getPromotedProductIOS called")
+            if let promotedProduct = try await self.iapModule.getPromotedProductIOS() {
+                return [
+                    "productId": promotedProduct.productIdentifier,
+                    "paymentDiscount": nil
+                ]
+            }
+            return nil
+        }
         
-        // Clear collections
-        transactions.removeAll()
-        pollingSkus.removeAll()
+        AsyncFunction("requestPurchaseOnPromotedProductIOS") { () async throws in
+            logDebug("requestPurchaseOnPromotedProductIOS called")
+            try await self.iapModule.requestPurchaseOnPromotedProductIOS()
+        }
         
-        // Reset promoted products
-        promotedPayment = nil
-        promotedProduct = nil
+        AsyncFunction("syncIOS") { () async throws -> Bool in
+            logDebug("syncIOS called")
+            return try await self.iapModule.syncIOS()
+        }
         
-        // Remove existing payment observer if any
-        if let observer = paymentObserver {
-            SKPaymentQueue.default().remove(observer)
-            paymentObserver = nil
+        AsyncFunction("presentCodeRedemptionSheetIOS") { () async throws -> Bool in
+            logDebug("presentCodeRedemptionSheetIOS called")
+            return try await self.iapModule.presentCodeRedemptionSheetIOS()
         }
         
-        // Clear product store
-        if let store = productStore {
-            Task {
-                await store.removeAll()
-            }
+        AsyncFunction("showManageSubscriptionsIOS") { () async throws -> Bool in
+            logDebug("showManageSubscriptionsIOS called")
+            return try await self.iapModule.showManageSubscriptionsIOS()
         }
-        productStore = nil
         
-        isInitialized = false
-    }
-    
-    private func addTransactionObserver() {
-        if updateListenerTask == nil {
-            updateListenerTask = listenForTransactions()
+        AsyncFunction("isTransactionVerifiedIOS") { (sku: String) async -> Bool in
+            logDebug("isTransactionVerifiedIOS called for sku: \(sku)")
+            return await self.iapModule.isTransactionVerifiedIOS(sku: sku)
         }
     }
-
-    private func removeTransactionObserver() {
-        updateListenerTask?.cancel()
-        updateListenerTask = nil
-    }
-
-    private func listenForTransactions() -> Task<Void, Error> {
-        return Task.detached { [weak self] in
-            guard let self = self else { return }
-            for await result in Transaction.updates {
-                do {
-                    let transaction = try self.checkVerified(result)
-                    self.transactions[String(transaction.id)] = transaction
-                    if self.hasListeners {
-                        let serialized = serializeTransaction(transaction, jwsRepresentationIOS: result.jwsRepresentation)
-                        self.sendEvent(IapEvent.PurchaseUpdated, serialized)
-                    }
-                } catch {
-                    if self.hasListeners {
-                        let err = [
-                            "responseCode": IapErrorCode.transactionValidationFailed,
-                            "debugMessage": error.localizedDescription,
-                            "code": IapErrorCode.transactionValidationFailed,
-                            "message": error.localizedDescription,
-                        ]
-                        self.sendEvent(IapEvent.PurchaseError, err)
-                    }
-                }
-            }
+    
+    // MARK: - Purchase Listeners
+    
+    private func setupPurchaseListeners() {
+        _ = iapModule.purchaseUpdatedListener { [weak self] purchase in
+            self?.handlePurchaseUpdated(purchase)
         }
-    }
-
-    public func startObserving() {
-        hasListeners = true
-        addTransactionObserver()
-    }
-
-    public func stopObserving() {
-        hasListeners = false
-        removeTransactionObserver()
-    }
-
-    private func currentWindowScene() async -> UIWindowScene? {
-        await MainActor.run {
-            return UIApplication.shared.connectedScenes.first as? UIWindowScene
+        _ = iapModule.purchaseErrorListener { [weak self] error in
+            self?.handlePurchaseError(error)
         }
     }
-
-    private func checkVerified<T>(_ result: VerificationResult<T>) throws -> T {
-        switch result {
-        case .unverified(_, let error):
-            throw error
-        case .verified(let item):
-            return item
-        }
+    
+    private func handlePurchaseUpdated(_ purchase: OpenIapPurchase) {
+        logDebug("Purchase updated: \(purchase.productId)")
+        let serialized = serializePurchase(purchase)
+        sendEvent(OpenIapEvent.PurchaseUpdated, serialized)
     }
-
-    private func getAllSubscriptionProductIds() async -> [String] {
-        guard let productStore = self.productStore else { return [] }
-        let products = await productStore.getAllProducts()
-        return products.compactMap { product in
-            if product.subscription != nil {
-                return product.id
-            }
-            return nil
-        }
+    
+    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)
     }
-
-    private func pollForSubscriptionStatusChanges() {
-        subscriptionPollingTask?.cancel()
-        subscriptionPollingTask = Task {
-            try? await Task.sleep(nanoseconds: 1_500_000_000) // 1.5 seconds
+    
+    // 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,
             
-            var previousStatuses: [String: Bool] = [:] // Track auto-renewal state with Bool
+            // 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,
             
-            for sku in self.pollingSkus {
-                guard let product = await self.productStore?.getProduct(productID: sku),
-                      let status = try? await product.subscription?.status.first else { continue }
-                
-                // Track willAutoRenew as a bool value
-                var willAutoRenew = false
-                if case .verified(let info) = status.renewalInfo {
-                    willAutoRenew = info.willAutoRenew
-                }
-                previousStatuses[sku] = willAutoRenew
-            }
-
-            for _ in 1...5 {
-                try? await Task.sleep(nanoseconds: 2_000_000_000) // 2 seconds
-                if Task.isCancelled {
-                    return
-                }
-                
-                for sku in self.pollingSkus {
-                    guard let product = await self.productStore?.getProduct(productID: sku),
-                          let status = try? await product.subscription?.status.first,
-                          let result = await product.latestTransaction else { continue }
-                    // Try to verify the transaction
-                    let transaction: Transaction
-                    do {
-                        transaction = try self.checkVerified(result)
-                    } catch {
-                        continue // Skip if verification fails
-                    }
-                    
-                    // Track current auto-renewal state
-                    var currentWillAutoRenew = false
-                    if case .verified(let info) = status.renewalInfo {
-                        currentWillAutoRenew = info.willAutoRenew
-                    }
-                    
-                    // Compare with previous state
-                    if let previousWillAutoRenew = previousStatuses[sku], 
-                       previousWillAutoRenew != currentWillAutoRenew {
-                        
-                        // Use the jwsRepresentation when serializing the transaction
-                        var purchaseMap = serializeTransaction(transaction, jwsRepresentationIOS: result.jwsRepresentation)
-                        
-                        if case .verified(let renewalInfo) = status.renewalInfo {
-                            if let renewalInfoDict = serializeRenewalInfo(.verified(renewalInfo)) {
-                                purchaseMap["renewalInfo"] = renewalInfoDict
-                            }
-                        }
-                        
-                        self.sendEvent(IapEvent.PurchaseUpdated, purchaseMap)
-                        previousStatuses[sku] = currentWillAutoRenew
-                    }
-                }
-            }
-            self.pollingSkus.removeAll()
-        }
-    }
-    
-    private func getReceiptDataInternal() throws -> String {
-        if let appStoreReceiptURL = Bundle.main.appStoreReceiptURL,
-           FileManager.default.fileExists(atPath: appStoreReceiptURL.path) {
-            do {
-                let receiptData = try Data(contentsOf: appStoreReceiptURL, options: .alwaysMapped)
-                return receiptData.base64EncodedString(options: [])
-            } catch {
-                throw Exception(name: "ExpoIapModule", description: "Error reading receipt data: \(error.localizedDescription)", code: IapErrorCode.receiptFailed)
-            }
-        } else {
-            throw Exception(name: "ExpoIapModule", description: "App Store receipt not found", code: IapErrorCode.receiptFailed)
-        }
+            // 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
+        ]
     }
     
-    // Called by PaymentObserver when a promoted product is received
-    func handlePromotedProduct(payment: SKPayment, product: SKProduct) {
-        self.promotedPayment = payment
-        self.promotedProduct = product
+    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
+        ]
         
-        if hasListeners {
-            let productData: [String: Any] = [
-                "productIdentifier": product.productIdentifier,
-                "localizedTitle": product.localizedTitle,
-                "localizedDescription": product.localizedDescription,
-                "price": product.price.doubleValue,
-                "priceLocale": [
-                    "currencyCode": product.priceLocale.currencyCode ?? "",
-                    "currencySymbol": product.priceLocale.currencySymbol ?? "",
-                    "countryCode": product.priceLocale.regionCode ?? ""
+        // 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
                 ]
             ]
-            sendEvent(IapEvent.PromotedProductIOS, productData)
+            
+            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
     }
     
-    // Ensure cleanup when module is deallocated
-    deinit {
-        cleanupExistingState()
-    }
-}
-
-// PaymentObserver for handling promoted products
-@available(iOS 15.0, *)
-class PaymentObserver: NSObject, SKPaymentTransactionObserver {
-    weak var module: ExpoIapModule?
-    
-    init(module: ExpoIapModule) {
-        self.module = module
-    }
-    
-    // Required by SKPaymentTransactionObserver protocol but not used
-    func paymentQueue(_ queue: SKPaymentQueue, updatedTransactions transactions: [SKPaymentTransaction]) {
-        // We don't handle transactions here as StoreKit 2 handles them in ExpoIapModule
-    }
-    
-    // Handle promoted products from App Store
-    func paymentQueue(_ queue: SKPaymentQueue, shouldAddStorePayment payment: SKPayment, for product: SKProduct) -> Bool {
-        module?.handlePromotedProduct(payment: payment, product: product)
-        // Return false to defer the payment
-        return false
-    }
 }