expo-iap 3.0.8 → 3.1.0

package/ios/ExpoIapModule.swift

@@ -1,53 +1,18 @@
 import ExpoModulesCore
-import OSLog
+import Foundation
 import OpenIAP
-import StoreKit
-
-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
-        iapLogger.debug("\(message, privacy: .public)")
-    #endif
-}
-
-// MARK: - Swift helpers for optional dictionary compaction
-extension Sequence where Element == [String: Any?] {
-    fileprivate func compactingValues() -> [[String: Any]] {
-        return self.map { $0.compactMapValues { $0 } }
-    }
-}
-
-extension Dictionary where Key == String, Value == Any? {
-    fileprivate func compactingValues() -> [String: Any] {
-        return self.compactMapValues { $0 }
-    }
-}
-
-// Event names
-struct OpenIapEvent {
-    static let PurchaseUpdated = "purchase-updated"
-    static let PurchaseError = "purchase-error"
-    static let PromotedProductIOS = "promoted-product-ios"
-}
+#if canImport(UIKit)
+import UIKit
+#endif
 
 @available(iOS 15.0, tvOS 15.0, *)
 @MainActor
-public class ExpoIapModule: Module {
-    // Connection state for local validation parity with RN module
-    private var isInitialized: Bool = false
-    // Subscriptions for OpenIapModule event listeners
+public final class ExpoIapModule: Module {
+    private var isInitialized = false
     private var purchaseUpdatedSub: Subscription?
     private var purchaseErrorSub: Subscription?
     private var promotedProductSub: Subscription?
 
-    // Helper to safely remove a listener and nil out the reference
-    private func removeListener(_ sub: inout Subscription?) {
-        if let s = sub { OpenIapModule.shared.removeListener(s) }
-        sub = nil
-    }
-
     nonisolated public func definition() -> ModuleDefinition {
         Name("ExpoIap")
 
@@ -56,473 +21,386 @@ public class ExpoIapModule: Module {
         }
 
         Events(
-            OpenIapEvent.PurchaseUpdated,
-            OpenIapEvent.PurchaseError,
-            OpenIapEvent.PromotedProductIOS
+            IapEvent.purchaseUpdated.rawValue,
+            IapEvent.purchaseError.rawValue,
+            IapEvent.promotedProductIos.rawValue
         )
 
         OnCreate {
-            logDebug("Module created")
             Task { @MainActor in
                 self.setupStore()
             }
         }
 
         OnDestroy {
-            logDebug("Module destroyed")
             Task { @MainActor in
                 await self.cleanupStore()
             }
         }
 
-        // MARK: - Connection Management
-
         AsyncFunction("initConnection") { () async throws -> Bool in
-            logDebug("initConnection called")
             let isConnected = try await OpenIapModule.shared.initConnection()
-            // Track initialization locally for ensureConnection()
             await MainActor.run { self.isInitialized = isConnected }
-            logDebug("Connection initialized: \(isConnected)")
             return isConnected
         }
 
         AsyncFunction("endConnection") { () async throws -> Bool in
-            logDebug("endConnection called")
-            let _ = try await OpenIapModule.shared.endConnection()
-
-            logDebug("Connection ended")
+            let succeeded = try await OpenIapModule.shared.endConnection()
             await MainActor.run { self.isInitialized = false }
-            return true
+            return succeeded
         }
 
-        // MARK: - Product Management
-
         AsyncFunction("fetchProducts") { (params: [String: Any]) async throws -> [[String: Any]] in
+            ExpoIapLog.payload("fetchProducts", payload: params)
             try await ensureConnection()
-            logDebug("fetchProducts raw params: \(params)")
-
-            // 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
-            }
-
-            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.emptySkuList()
-            }
-
-            // 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)")
-            }
-            // Ensure non-optional values for Expo bridge
-            return OpenIapSerialization.products(products).compactingValues()
+            let request = try ExpoIapHelper.decodeProductRequest(from: params)
+            let result = try await OpenIapModule.shared.fetchProducts(request)
+            let products = ExpoIapHelper.sanitizeArray(OpenIapSerialization.products(result))
+            ExpoIapLog.result("fetchProducts", value: products)
+            return products
         }
 
-        // 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.make(
-                    code: OpenIapError.PurchaseError, message: "Missing required 'sku'")
-            }
+        AsyncFunction("requestPurchase") { (payload: [String: Any]) async throws -> Any? in
+            ExpoIapLog.payload("requestPurchase", payload: payload)
             try await ensureConnection()
+            let props = try ExpoIapHelper.decodeRequestPurchaseProps(from: payload)
 
-            // 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
-                    )
+            do {
+                guard let result = try await OpenIapModule.shared.requestPurchase(props) else {
+                    ExpoIapLog.result("requestPurchase", value: nil)
+                    return nil
                 }
-            }
-
-            let tokenForLog = appAccountToken ?? "nil"
-            let qtyForLog = quantity ?? -1
-            logDebug(
-                "requestPurchase parsed - sku: \(sku), andFinish: \(andFinish), appAccountToken: \(tokenForLog), quantity: \(qtyForLog), hasOffer: \(discountOffer != nil)"
-            )
 
-            // Build purchase request props using OpenIapRequestPurchaseProps
-            let requestProps = OpenIapRequestPurchaseProps(
-                sku: sku,
-                andDangerouslyFinishTransactionAutomatically: andFinish,
-                appAccountToken: appAccountToken,
-                quantity: quantity,
-                withOffer: discountOffer
-            )
-
-            do {
-                _ = try await OpenIapModule.shared.requestPurchase(requestProps)
-                logDebug("Purchase request completed successfully")
-            } catch {
-                logDebug("Purchase request failed with error: \(error)")
-                if let openIapError = error as? OpenIapError {
-                    throw openIapError
+                switch result {
+                case .purchase(let maybePurchase):
+                    guard let purchase = maybePurchase else { return nil }
+                    let sanitized = ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.purchase(purchase))
+                    ExpoIapLog.result("requestPurchase", value: sanitized)
+                    return sanitized
+                case .purchases(let maybePurchases):
+                    guard let purchases = maybePurchases else { return nil }
+                    let sanitized = ExpoIapHelper.sanitizeArray(OpenIapSerialization.purchases(purchases))
+                    ExpoIapLog.result("requestPurchase", value: sanitized)
+                    return sanitized
                 }
-                throw OpenIapError.make(
-                    code: OpenIapError.PurchaseError, message: error.localizedDescription)
+            } catch let error as PurchaseError {
+                ExpoIapLog.failure("requestPurchase", error: error)
+                throw error
+            } catch {
+                ExpoIapLog.failure("requestPurchase", error: error)
+                throw PurchaseError.make(code: .purchaseError, message: error.localizedDescription)
             }
         }
 
-        AsyncFunction("finishTransaction") { (transactionId: String) async throws -> Bool in
+        AsyncFunction("finishTransaction") {
+            (purchasePayload: [String: Any], isConsumable: Bool?) async throws -> Bool in
+            ExpoIapLog.payload(
+                "finishTransaction",
+                payload: [
+                    "purchase": purchasePayload,
+                    "isConsumable": isConsumable as Any,
+                ]
+            )
             try await ensureConnection()
-            logDebug("finishTransaction called with id: \(transactionId)")
-            let result = try await OpenIapModule.shared.finishTransaction(
-                transactionIdentifier: transactionId)
-            return result
+            let purchaseInput = try OpenIapSerialization.purchaseInput(from: purchasePayload)
+            try await OpenIapModule.shared.finishTransaction(
+                purchase: purchaseInput,
+                isConsumable: isConsumable
+            )
+            ExpoIapLog.result("finishTransaction", value: true)
+            return true
         }
 
-        // MARK: - Purchase History
-
         AsyncFunction("getAvailablePurchases") {
-            (options: [String: Any?]?) async throws -> [[String: Any]] in
+            (options: [String: Any]?) async throws -> [[String: Any]] in
+            ExpoIapLog.payload("getAvailablePurchases", payload: options ?? [:])
             try await ensureConnection()
-            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 purchaseOptions = try options.map { try OpenIapSerialization.purchaseOptions(from: $0) }
             let purchases = try await OpenIapModule.shared.getAvailablePurchases(purchaseOptions)
-            return OpenIapSerialization.purchases(purchases).compactingValues()
+            let sanitized = ExpoIapHelper.sanitizeArray(OpenIapSerialization.purchases(purchases))
+            ExpoIapLog.result("getAvailablePurchases", value: sanitized)
+            return sanitized
         }
 
-        // Legacy function for backward compatibility
         AsyncFunction("getAvailableItems") {
-            (alsoPublishToEventListener: Bool, onlyIncludeActiveItems: Bool) async throws
-                -> [[String: Any]] in
-            try await ensureConnection()
-            logDebug("getAvailableItems called (legacy)")
-
-            let purchaseOptions = OpenIapGetAvailablePurchasesProps(
-                alsoPublishToEventListenerIOS: alsoPublishToEventListener,
-                onlyIncludeActiveItemsIOS: onlyIncludeActiveItems
+            (alsoPublish: Bool, onlyIncludeActive: Bool) async throws -> [[String: Any]] in
+            ExpoIapLog.payload(
+                "getAvailableItems",
+                payload: [
+                    "alsoPublishToEventListenerIOS": alsoPublish,
+                    "onlyIncludeActiveItemsIOS": onlyIncludeActive,
+                ]
             )
-            let purchases = try await OpenIapModule.shared.getAvailablePurchases(purchaseOptions)
-            return OpenIapSerialization.purchases(purchases).compactingValues()
+            try await ensureConnection()
+            let optionsDictionary: [String: Any] = [
+                "alsoPublishToEventListenerIOS": alsoPublish,
+                "onlyIncludeActiveItemsIOS": onlyIncludeActive
+            ]
+            let options = try OpenIapSerialization.purchaseOptions(from: optionsDictionary)
+            let purchases = try await OpenIapModule.shared.getAvailablePurchases(options)
+            let sanitized = ExpoIapHelper.sanitizeArray(OpenIapSerialization.purchases(purchases))
+            ExpoIapLog.result("getAvailableItems", value: sanitized)
+            return sanitized
         }
 
         AsyncFunction("getPendingTransactionsIOS") { () async throws -> [[String: Any]] in
+            ExpoIapLog.payload("getPendingTransactionsIOS", payload: nil)
             try await ensureConnection()
-            logDebug("getPendingTransactionsIOS called")
-
-            let pendingTransactions = try await OpenIapModule.shared.getPendingTransactionsIOS()
-            return OpenIapSerialization.purchases(pendingTransactions).compactingValues()
+            let pending = try await OpenIapModule.shared.getPendingTransactionsIOS()
+            let sanitized = pending.map { ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.encode($0)) }
+            ExpoIapLog.result("getPendingTransactionsIOS", value: sanitized)
+            return sanitized
         }
 
         AsyncFunction("clearTransactionIOS") { () async throws -> Bool in
+            ExpoIapLog.payload("clearTransactionIOS", payload: nil)
             try await ensureConnection()
-            logDebug("clearTransactionIOS called")
-            try await OpenIapModule.shared.clearTransactionIOS()
-            return true
+            let success = try await OpenIapModule.shared.clearTransactionIOS()
+            ExpoIapLog.result("clearTransactionIOS", value: success)
+            return success
         }
 
-        // MARK: - Receipt & Validation
-
         AsyncFunction("getReceiptIOS") { () async throws -> String in
+            ExpoIapLog.payload("getReceiptIOS", payload: nil)
             try await ensureConnection()
-            logDebug("getReceiptIOS called")
-            return try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
+            let receipt = try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
+            ExpoIapLog.result("getReceiptIOS", value: receipt)
+            return receipt
         }
 
-        // Backward-compatible alias expected by JS layer/tests
         AsyncFunction("getReceiptDataIOS") { () async throws -> String in
+            ExpoIapLog.payload("getReceiptDataIOS", payload: nil)
             try await ensureConnection()
-            logDebug("getReceiptDataIOS called (alias of getReceiptIOS)")
-            return try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
+            let receipt = try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
+            ExpoIapLog.result("getReceiptDataIOS", value: receipt)
+            return receipt
         }
 
         AsyncFunction("requestReceiptRefreshIOS") { () async throws -> String in
+            ExpoIapLog.payload("requestReceiptRefreshIOS", payload: nil)
             try await ensureConnection()
-            logDebug("requestReceiptRefreshIOS called")
-            // Receipt refresh is handled automatically by StoreKit 2
-            return try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
+            let receipt = try await OpenIapModule.shared.getReceiptDataIOS() ?? ""
+            ExpoIapLog.result("requestReceiptRefreshIOS", value: receipt)
+            return receipt
         }
 
         AsyncFunction("validateReceiptIOS") { (sku: String) async throws -> [String: Any] in
+            ExpoIapLog.payload("validateReceiptIOS", payload: ["sku": sku])
             try await ensureConnection()
-            logDebug("validateReceiptIOS called for sku: \(sku)")
             do {
-                // Use OpenIapReceiptValidationProps to keep naming parity with OpenIAP
-                let props = OpenIapReceiptValidationProps(sku: sku)
+                let props = try OpenIapSerialization.receiptValidationProps(from: ["sku": sku])
                 let result = try await OpenIapModule.shared.validateReceiptIOS(props)
-                let dict: [String: Any?] = [
-                    "isValid": result.isValid,
-                    "receiptData": result.receiptData,
-                    "jwsRepresentation": result.jwsRepresentation,
-                    // Populate unified purchaseToken for iOS as alias of JWS
-                    "purchaseToken": result.jwsRepresentation,
-                    "latestTransaction": result.latestTransaction.map {
-                        OpenIapSerialization.purchase($0).compactingValues()
-                    },
-                ]
-                return dict.compactingValues()
+                var payload = OpenIapSerialization.encode(result)
+                payload["purchaseToken"] = result.jwsRepresentation
+                let sanitized = ExpoIapHelper.sanitizeDictionary(payload)
+                ExpoIapLog.result("validateReceiptIOS", value: sanitized)
+                return sanitized
+            } catch let error as PurchaseError {
+                ExpoIapLog.failure("validateReceiptIOS", error: error)
+                throw error
             } catch {
-                throw OpenIapError.make(code: OpenIapError.ReceiptFailed)
+                ExpoIapLog.failure("validateReceiptIOS", error: error)
+                throw PurchaseError.make(code: .receiptFailed)
             }
         }
 
-        // MARK: - iOS Specific Features
-
         AsyncFunction("presentCodeRedemptionSheetIOS") { () async throws -> Bool in
+            ExpoIapLog.payload("presentCodeRedemptionSheetIOS", payload: nil)
             try await ensureConnection()
-            logDebug("presentCodeRedemptionSheetIOS called")
-            let _ = try await OpenIapModule.shared.presentCodeRedemptionSheetIOS()
-            return true
+            let success = try await OpenIapModule.shared.presentCodeRedemptionSheetIOS()
+            ExpoIapLog.result("presentCodeRedemptionSheetIOS", value: success)
+            return success
         }
 
         AsyncFunction("showManageSubscriptionsIOS") { () async throws -> [[String: Any]] in
+            ExpoIapLog.payload("showManageSubscriptionsIOS", payload: nil)
             try await ensureConnection()
-            logDebug("showManageSubscriptionsIOS called")
-            // OpenIAP returns already-serialized dictionaries here.
             let purchases = try await OpenIapModule.shared.showManageSubscriptionsIOS()
-            return purchases.compactingValues()
+            let sanitized = purchases.map { ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.encode($0)) }
+            ExpoIapLog.result("showManageSubscriptionsIOS", value: sanitized)
+            return sanitized
         }
 
-        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("deepLinkToSubscriptionsIOS") { () async throws -> Bool in
+            ExpoIapLog.payload("deepLinkToSubscriptionsIOS", payload: nil)
+            try await ensureConnection()
+            try await OpenIapModule.shared.deepLinkToSubscriptions(nil)
+            ExpoIapLog.result("deepLinkToSubscriptionsIOS", value: true)
+            return true
         }
 
         AsyncFunction("beginRefundRequestIOS") { (sku: String) async throws -> String? in
+            ExpoIapLog.payload("beginRefundRequestIOS", payload: ["sku": sku])
             try await ensureConnection()
-            logDebug("beginRefundRequestIOS called for sku: \(sku)")
-            return try await OpenIapModule.shared.beginRefundRequestIOS(sku: sku)
+            let result = try await OpenIapModule.shared.beginRefundRequestIOS(sku: sku)
+            ExpoIapLog.result("beginRefundRequestIOS", value: result)
+            return result
         }
 
         AsyncFunction("getPromotedProductIOS") { () async throws -> [String: Any]? in
+            ExpoIapLog.payload("getPromotedProductIOS", payload: nil)
             try await ensureConnection()
-            logDebug("getPromotedProductIOS called")
-
-            if let promoted = try await OpenIapModule.shared.getPromotedProductIOS() {
-                // Fetch full product info by SKU to conform to OpenIapProduct
-                let request = OpenIapProductRequest(skus: [promoted.productIdentifier], type: .all)
-                let products = try await OpenIapModule.shared.fetchProducts(request)
-                let serialized = OpenIapSerialization.products(products).compactingValues()
-                return serialized.first
+            if let product = try await OpenIapModule.shared.getPromotedProductIOS() {
+                let sanitized = ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.encode(product))
+                ExpoIapLog.result("getPromotedProductIOS", value: sanitized)
+                return sanitized
             }
+            ExpoIapLog.result("getPromotedProductIOS", value: nil)
             return nil
         }
+
         AsyncFunction("getStorefrontIOS") { () async throws -> String in
+            ExpoIapLog.payload("getStorefrontIOS", payload: nil)
             try await ensureConnection()
-            logDebug("getStorefrontIOS called")
-            return try await OpenIapModule.shared.getStorefrontIOS()
+            let storefront = try await OpenIapModule.shared.getStorefrontIOS()
+            ExpoIapLog.result("getStorefrontIOS", value: storefront)
+            return storefront
         }
 
         AsyncFunction("syncIOS") { () async throws -> Bool in
+            ExpoIapLog.payload("syncIOS", payload: nil)
             try await ensureConnection()
-            logDebug("syncIOS called")
-            return try await OpenIapModule.shared.syncIOS()
+            let success = try await OpenIapModule.shared.syncIOS()
+            ExpoIapLog.result("syncIOS", value: success)
+            return success
         }
 
-        // MARK: - Additional iOS Methods
-
         AsyncFunction("isTransactionVerifiedIOS") { (sku: String) async throws -> Bool in
+            ExpoIapLog.payload("isTransactionVerifiedIOS", payload: ["sku": sku])
             try await ensureConnection()
-            logDebug("isTransactionVerifiedIOS called for sku: \(sku)")
-            return await OpenIapModule.shared.isTransactionVerifiedIOS(sku: sku)
+            let verified = try await OpenIapModule.shared.isTransactionVerifiedIOS(sku: sku)
+            ExpoIapLog.result("isTransactionVerifiedIOS", value: verified)
+            return verified
         }
 
         AsyncFunction("getTransactionJwsIOS") { (sku: String) async throws -> String? in
+            ExpoIapLog.payload("getTransactionJwsIOS", payload: ["sku": sku])
             try await ensureConnection()
-            logDebug("getTransactionJwsIOS called for sku: \(sku)")
-            return try await OpenIapModule.shared.getTransactionJwsIOS(sku: sku)
+            let jws = try await OpenIapModule.shared.getTransactionJwsIOS(sku: sku)
+            ExpoIapLog.result("getTransactionJwsIOS", value: jws)
+            return jws
         }
 
         AsyncFunction("isEligibleForIntroOfferIOS") { (groupID: String) async throws -> Bool in
+            ExpoIapLog.payload("isEligibleForIntroOfferIOS", payload: ["groupID": groupID])
             try await ensureConnection()
-            logDebug("isEligibleForIntroOfferIOS called for groupID: \(groupID)")
-            return await OpenIapModule.shared.isEligibleForIntroOfferIOS(groupID: groupID)
+            let eligible = try await OpenIapModule.shared.isEligibleForIntroOfferIOS(groupID: groupID)
+            ExpoIapLog.result("isEligibleForIntroOfferIOS", value: eligible)
+            return eligible
         }
 
         AsyncFunction("subscriptionStatusIOS") { (sku: String) async throws -> [[String: Any]]? in
+            ExpoIapLog.payload("subscriptionStatusIOS", payload: ["sku": sku])
             try await ensureConnection()
-            logDebug("subscriptionStatusIOS called for sku: \(sku)")
-
-            if let statuses = try await OpenIapModule.shared.subscriptionStatusIOS(sku: sku) {
-                // Align output with SubscriptionStatusIOS in TS:
-                // { state: SubscriptionState; renewalInfo?: { jsonRepresentation?: string; willAutoRenew: boolean; autoRenewPreference?: string } }
-                return statuses.map { status in
-                    var dict: [String: Any?] = [
-                        "state": status.state
-                    ]
-
-                    if let info = status.renewalInfo {
-                        // autoRenewStatus is a Bool from OpenIAP types
-                        let renewalInfo: [String: Any?] = [
-                            "willAutoRenew": info.autoRenewStatus,
-                            "autoRenewPreference": info.autoRenewPreference,
-                        ]
-                        dict["renewalInfo"] = renewalInfo
-                    }
-
-                    return dict.compactingValues()
-                }
-            }
-            return nil
+            let statuses = try await OpenIapModule.shared.subscriptionStatusIOS(sku: sku)
+            let sanitized = statuses.map { ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.encode($0)) }
+            ExpoIapLog.result("subscriptionStatusIOS", value: sanitized)
+            return sanitized
         }
 
         AsyncFunction("currentEntitlementIOS") { (sku: String) async throws -> [String: Any]? in
+            ExpoIapLog.payload("currentEntitlementIOS", payload: ["sku": sku])
             try await ensureConnection()
-            logDebug("currentEntitlementIOS called for sku: \(sku)")
             do {
-                if let entitlement = try await OpenIapModule.shared.currentEntitlementIOS(sku: sku)
-                {
-                    return OpenIapSerialization.purchase(entitlement).compactingValues()
+                if let entitlement = try await OpenIapModule.shared.currentEntitlementIOS(sku: sku) {
+                    let sanitized = ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.encode(entitlement))
+                    ExpoIapLog.result("currentEntitlementIOS", value: sanitized)
+                    return sanitized
                 }
+                ExpoIapLog.result("currentEntitlementIOS", value: nil)
                 return nil
+            } catch let error as PurchaseError {
+                ExpoIapLog.failure("currentEntitlementIOS", error: error)
+                throw error
             } catch {
-                throw OpenIapError.make(code: OpenIapError.SkuNotFound, productId: sku)
+                ExpoIapLog.failure("currentEntitlementIOS", error: error)
+                throw PurchaseError.make(code: .skuNotFound, productId: sku)
             }
         }
 
         AsyncFunction("latestTransactionIOS") { (sku: String) async throws -> [String: Any]? in
+            ExpoIapLog.payload("latestTransactionIOS", payload: ["sku": sku])
             try await ensureConnection()
-            logDebug("latestTransactionIOS called for sku: \(sku)")
             do {
                 if let transaction = try await OpenIapModule.shared.latestTransactionIOS(sku: sku) {
-                    return OpenIapSerialization.purchase(transaction).compactingValues()
+                    let sanitized = ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.encode(transaction))
+                    ExpoIapLog.result("latestTransactionIOS", value: sanitized)
+                    return sanitized
                 }
+                ExpoIapLog.result("latestTransactionIOS", value: nil)
                 return nil
+            } catch let error as PurchaseError {
+                ExpoIapLog.failure("latestTransactionIOS", error: error)
+                throw error
             } catch {
-                throw OpenIapError.make(code: OpenIapError.SkuNotFound, productId: sku)
+                ExpoIapLog.failure("latestTransactionIOS", error: error)
+                throw PurchaseError.make(code: .skuNotFound, productId: sku)
             }
         }
     }
 
-    // MARK: - Listeners Setup
-
     @MainActor
     private func setupStore() {
-        logDebug("Setting up OpenIapModule event listeners")
-
         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)
+                let payload = ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.purchase(purchase))
+                self.sendEvent(IapEvent.purchaseUpdated.rawValue, payload)
             }
         }
 
-        purchaseErrorSub = OpenIapModule.shared.purchaseErrorListener { [weak self] event in
+        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": event.code,
-                    "message": event.message,
-                    "productId": event.productId,
-                ]
-                self.sendEvent(OpenIapEvent.PurchaseError, errorData)
+                let payload = ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.encode(error))
+                self.sendEvent(IapEvent.purchaseError.rawValue, payload)
             }
         }
 
-        promotedProductSub = OpenIapModule.shared.promotedProductListenerIOS {
-            [weak self] productId in
+        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])
+                do {
+                    if let product = try await OpenIapModule.shared.getPromotedProductIOS() {
+                        let sanitized = ExpoIapHelper.sanitizeDictionary(OpenIapSerialization.encode(product))
+                        self.sendEvent(IapEvent.promotedProductIos.rawValue, sanitized)
+                        return
+                    }
+                } catch {
+                    ExpoIapLog.failure("promotedProductListenerIOS", error: error)
+                }
+
+                self.sendEvent(
+                    IapEvent.promotedProductIos.rawValue,
+                    ["productId": productId]
+                )
             }
         }
     }
 
     @MainActor
     private func cleanupStore() async {
-        logDebug("Cleaning up listeners and ending connection")
         removeListener(&purchaseUpdatedSub)
         removeListener(&purchaseErrorSub)
         removeListener(&promotedProductSub)
         _ = try? await OpenIapModule.shared.endConnection()
     }
 
-    // MARK: - Private Helper Methods
-
-    private func ensureConnection() throws {
-        guard isInitialized else {
-            throw OpenIapError.make(
-                code: OpenIapError.InitConnection,
-                message: "Connection not initialized. Call initConnection() first."
-            )
+    private func removeListener(_ subscription: inout Subscription?) {
+        if let current = subscription {
+            OpenIapModule.shared.removeListener(current)
         }
+        subscription = nil
     }
 
+    private func ensureConnection() async throws {
+        try await MainActor.run {
+            guard self.isInitialized else {
+                throw PurchaseError.make(
+                    code: .initConnection,
+                    message: "Connection not initialized. Call initConnection() first."
+                )
+            }
+        }
+    }
 }