expo-iap 2.7.5 → 2.7.7-rc.1

package/ios/ExpoIapModule.swift

@@ -229,6 +229,9 @@ public class ExpoIapModule: Module {
     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")
@@ -250,6 +253,10 @@ public class ExpoIapModule: Module {
         }
 
         Function("initConnection") { () -> Bool in
+            // Clean up any existing state first (important for hot reload)
+            self.cleanupExistingState()
+            
+            // Initialize fresh state
             self.productStore = ProductStore()
             
             // Set up PaymentObserver for promoted products
@@ -258,6 +265,7 @@ public class ExpoIapModule: Module {
                 SKPaymentQueue.default().add(self.paymentObserver!)
             }
             
+            self.isInitialized = true
             return AppStore.canMakePayments
         }
 
@@ -352,10 +360,10 @@ public class ExpoIapModule: Module {
         }
 
         AsyncFunction("getItems") { (skus: [String]) -> [[String: Any?]?] in
-            guard let productStore = self.productStore else {
-                throw Exception(name: "ExpoIapModule", description: "Connection not initialized", code: IapErrorCode.notPrepared)
-            }
-
+            try self.ensureConnection()
+            
+            let productStore = self.productStore!
+            
             do {
                 let fetchedProducts = try await Product.products(for: skus)
                 await productStore.performOnActor { isolatedStore in
@@ -367,48 +375,26 @@ public class ExpoIapModule: Module {
                 return products.map { serializeProduct($0) }.compactMap { $0 }
             } catch {
                 print("Error fetching items: \(error)")
-                if error is Exception {
-                    throw error
-                }
                 throw error
             }
         }
 
         AsyncFunction("endConnection") { () -> Bool in
-            guard let productStore = self.productStore else {
-                return false
-            }
-            await productStore.removeAll()
-            self.transactions.removeAll()
-            self.productStore = nil
-            self.removeTransactionObserver()
-            
-            // Remove PaymentObserver
-            if let observer = self.paymentObserver {
-                SKPaymentQueue.default().remove(observer)
-                self.paymentObserver = nil
-            }
-            
+            self.cleanupExistingState()
             return true
         }
 
         AsyncFunction("getAvailableItems") {
             (alsoPublishToEventListener: Bool, onlyIncludeActiveItems: Bool) -> [[String: Any?]?] in
+            
+            try self.ensureConnection()
+            
             var purchasedItemsSerialized: [[String: Any?]] = []
 
             func addTransaction(transaction: Transaction, jwsRepresentationIos: String? = nil) {
-                // Debug: Log JWS representation
-                logDebug("getAvailableItems JWS: \(jwsRepresentationIos != nil ? "exists" : "nil")")
-                if let jws = jwsRepresentationIos {
-                    logDebug("getAvailableItems JWS length: \(jws.count)")
-                }
-                
                 let serialized = serializeTransaction(transaction, jwsRepresentationIos: jwsRepresentationIos)
                 purchasedItemsSerialized.append(serialized)
                 
-                // Debug: Check if jwsRepresentationIos is included in serialized result
-                logDebug("getAvailableItems serialized includes JWS: \(serialized["jwsRepresentationIos"] != nil)")
-                
                 if alsoPublishToEventListener {
                     self.sendEvent(IapEvent.PurchaseUpdated, serialized)
                 }
@@ -476,9 +462,9 @@ public class ExpoIapModule: Module {
                 sku: String, andDangerouslyFinishTransactionAutomatically: Bool,
                 appAccountToken: String?, quantity: Int, discountOffer: [String: String]?
             ) -> [String: Any?]? in
-            guard let productStore = self.productStore else {
-                throw Exception(name: "ExpoIapModule", description: "Connection not initialized", code: IapErrorCode.serviceError)
-            }
+            
+            try self.ensureConnection()
+            let productStore = self.productStore!
 
             let product: Product? = await productStore.getProduct(productID: sku)
             if let product = product {
@@ -572,9 +558,8 @@ public class ExpoIapModule: Module {
         }
 
         AsyncFunction("subscriptionStatus") { (sku: String) -> [[String: Any?]?]? in
-            guard let productStore = self.productStore else {
-                throw Exception(name: "ExpoIapModule", description: "Connection not initialized", code: IapErrorCode.serviceError)
-            }
+            try self.ensureConnection()
+            let productStore = self.productStore!
 
             do {
                 let product = await productStore.getProduct(productID: sku)
@@ -593,9 +578,8 @@ public class ExpoIapModule: Module {
         }
 
         AsyncFunction("currentEntitlement") { (sku: String) -> [String: Any?]? in
-            guard let productStore = self.productStore else {
-                throw Exception(name: "ExpoIapModule", description: "Connection not initialized", code: IapErrorCode.serviceError)
-            }
+            try self.ensureConnection()
+            let productStore = self.productStore!
 
             if let product = await productStore.getProduct(productID: sku) {
                 if let result = await product.currentEntitlement {
@@ -619,9 +603,8 @@ public class ExpoIapModule: Module {
         }
 
         AsyncFunction("latestTransaction") { (sku: String) -> [String: Any?]? in
-            guard let productStore = self.productStore else {
-                throw Exception(name: "ExpoIapModule", description: "Connection not initialized", code: IapErrorCode.serviceError)
-            }
+            try self.ensureConnection()
+            let productStore = self.productStore!
 
             if let product = await productStore.getProduct(productID: sku) {
                 if let result = await product.latestTransaction {
@@ -716,7 +699,10 @@ public class ExpoIapModule: Module {
 
         AsyncFunction("beginRefundRequest") { (sku: String) -> String? in
             #if !os(tvOS)
-                guard let product = await self.productStore?.getProduct(productID: sku),
+                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)
@@ -752,9 +738,8 @@ public class ExpoIapModule: Module {
         }
 
         AsyncFunction("isTransactionVerified") { (sku: String) -> Bool in
-            guard let productStore = self.productStore else {
-                throw Exception(name: "ExpoIapModule", description: "Connection not initialized", code: IapErrorCode.serviceError)
-            }
+            try self.ensureConnection()
+            let productStore = self.productStore!
             
             if let product = await productStore.getProduct(productID: sku),
                let result = await product.latestTransaction {
@@ -770,9 +755,8 @@ public class ExpoIapModule: Module {
         }
 
         AsyncFunction("getTransactionJws") { (sku: String) -> String? in
-            guard let productStore = self.productStore else {
-                throw Exception(name: "ExpoIapModule", description: "Connection not initialized", code: IapErrorCode.serviceError)
-            }
+            try self.ensureConnection()
+            let productStore = self.productStore!
             
             if let product = await productStore.getProduct(productID: sku),
                let result = await product.latestTransaction {
@@ -783,9 +767,8 @@ public class ExpoIapModule: Module {
         }
 
         AsyncFunction("validateReceiptIOS") { (sku: String) -> [String: Any] in
-            guard let productStore = self.productStore else {
-                throw Exception(name: "ExpoIapModule", description: "Connection not initialized", code: IapErrorCode.serviceError)
-            }
+            try self.ensureConnection()
+            let productStore = self.productStore!
             
             // Get receipt data
             var receiptData: String = ""
@@ -824,6 +807,58 @@ public class ExpoIapModule: Module {
         }
     }
 
+    // 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
+            )
+        }
+        
+        guard productStore != nil else {
+            throw Exception(
+                name: "ExpoIapModule", 
+                description: "Product store not available", 
+                code: IapErrorCode.notPrepared
+            )
+        }
+    }
+    
+    private func cleanupExistingState() {
+        // Cancel any existing tasks
+        updateListenerTask?.cancel()
+        updateListenerTask = nil
+        
+        subscriptionPollingTask?.cancel()
+        subscriptionPollingTask = nil
+        
+        // Clear collections
+        transactions.removeAll()
+        pollingSkus.removeAll()
+        
+        // Reset promoted products
+        promotedPayment = nil
+        promotedProduct = nil
+        
+        // Remove existing payment observer if any
+        if let observer = paymentObserver {
+            SKPaymentQueue.default().remove(observer)
+            paymentObserver = nil
+        }
+        
+        // Clear product store
+        if let store = productStore {
+            Task {
+                await store.removeAll()
+            }
+        }
+        productStore = nil
+        
+        isInitialized = false
+    }
+    
     private func addTransactionObserver() {
         if updateListenerTask == nil {
             updateListenerTask = listenForTransactions()
@@ -996,6 +1031,11 @@ public class ExpoIapModule: Module {
             sendEvent(IapEvent.PromotedProductIOS, productData)
         }
     }
+    
+    // Ensure cleanup when module is deallocated
+    deinit {
+        cleanupExistingState()
+    }
 }
 
 // PaymentObserver for handling promoted products

package/ios/expoiap.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/expoiap.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/package.json

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

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/withIAP.ts"],"version":"5.8.3"}
+{"root":["./src/withiap.ts"],"version":"5.8.3"}

package/src/ExpoIap.types.ts

@@ -365,8 +365,7 @@ export interface AndroidRequestPurchaseProps {
 /**
  * Android-specific subscription request parameters
  */
-export interface AndroidRequestSubscriptionProps
-  extends AndroidRequestPurchaseProps {
+export interface AndroidRequestSubscriptionProps extends AndroidRequestPurchaseProps {
   readonly purchaseTokenAndroid?: string;
   readonly replacementModeAndroid?: number;
   readonly subscriptionOffers: {
@@ -409,36 +408,28 @@ export type RequestSubscriptionProps = PlatformRequestSubscriptionProps;
  * Includes both unified and old platform-specific formats
  * @deprecated Use RequestPurchaseProps with platform-specific structure instead
  */
-export type LegacyRequestPurchasePropsAll =
-  | UnifiedRequestPurchaseProps
-  | LegacyRequestPurchaseProps;
+export type LegacyRequestPurchasePropsAll = UnifiedRequestPurchaseProps | LegacyRequestPurchaseProps;
 
 /**
  * Legacy request subscription parameters (deprecated)
  * Includes both unified and old platform-specific formats
  * @deprecated Use RequestSubscriptionProps with platform-specific structure instead
  */
-export type LegacyRequestSubscriptionPropsAll =
-  | UnifiedRequestSubscriptionProps
-  | LegacyRequestSubscriptionProps;
+export type LegacyRequestSubscriptionPropsAll = UnifiedRequestSubscriptionProps | LegacyRequestSubscriptionProps;
 
 /**
  * All supported request purchase parameters
  * Used internally for backward compatibility
  * @internal
  */
-export type RequestPurchasePropsWithLegacy =
-  | RequestPurchaseProps
-  | LegacyRequestPurchasePropsAll;
+export type RequestPurchasePropsWithLegacy = RequestPurchaseProps | LegacyRequestPurchasePropsAll;
 
 /**
  * All supported request subscription parameters
  * Used internally for backward compatibility
  * @internal
  */
-export type RequestSubscriptionPropsWithLegacy =
-  | RequestSubscriptionProps
-  | LegacyRequestSubscriptionPropsAll;
+export type RequestSubscriptionPropsWithLegacy = RequestSubscriptionProps | LegacyRequestSubscriptionPropsAll;
 
 // ============================================================================
 // Type Guards and Utility Functions
@@ -446,19 +437,19 @@ export type RequestSubscriptionPropsWithLegacy =
 
 // Type guards to check which API style is being used
 export function isPlatformRequestProps(
-  props: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy,
+  props: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy
 ): props is PlatformRequestPurchaseProps | PlatformRequestSubscriptionProps {
   return 'ios' in props || 'android' in props;
 }
 
 export function isUnifiedRequestProps(
-  props: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy,
+  props: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy
 ): props is UnifiedRequestPurchaseProps | UnifiedRequestSubscriptionProps {
   return 'sku' in props || 'skus' in props;
 }
 
 export function isLegacyRequestProps(
-  props: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy,
+  props: RequestPurchasePropsWithLegacy | RequestSubscriptionPropsWithLegacy
 ): props is LegacyRequestPurchaseProps | LegacyRequestSubscriptionProps {
   return 'productId' in props || 'productIds' in props;
 }

package/src/index.ts

@@ -21,8 +21,12 @@ import {
   isPlatformRequestProps,
   isUnifiedRequestProps,
 } from './ExpoIap.types';
-import {ProductPurchaseAndroid} from './types/ExpoIapAndroid.types';
-import {PaymentDiscount} from './types/ExpoIapIos.types';
+import {
+  ProductPurchaseAndroid,
+} from './types/ExpoIapAndroid.types';
+import {
+  PaymentDiscount,
+} from './types/ExpoIapIos.types';
 
 // Export all types
 export * from './ExpoIap.types';
@@ -76,42 +80,41 @@ export const purchaseErrorListener = (
 /**
  * iOS-only listener for App Store promoted product events.
  * This fires when a user taps on a promoted product in the App Store.
- *
+ * 
  * @param listener - Callback function that receives the promoted product details
  * @returns EventSubscription that can be used to unsubscribe
- *
+ * 
  * @example
  * ```typescript
  * const subscription = promotedProductListenerIOS((product) => {
  *   console.log('Promoted product:', product);
  *   // Handle the promoted product
  * });
- *
+ * 
  * // Later, clean up
  * subscription.remove();
  * ```
- *
+ * 
  * @platform iOS
  */
 export const promotedProductListenerIOS = (
   listener: (product: Product) => void,
 ) => {
   if (Platform.OS !== 'ios') {
-    console.warn(
-      'promotedProductListenerIOS: This listener is only available on iOS',
-    );
-    return {remove: () => {}};
+    console.warn('promotedProductListenerIOS: This listener is only available on iOS');
+    return { remove: () => {} };
   }
   return emitter.addListener(IapEvent.PromotedProductIOS, listener);
 };
 
-export function initConnection() {
-  return ExpoIapModule.initConnection();
+export function initConnection(): Promise<boolean> {
+  const result = ExpoIapModule.initConnection();
+  return Promise.resolve(result);
 }
 
 export const getProducts = async (skus: string[]): Promise<Product[]> => {
   console.warn(
-    "`getProducts` is deprecated. Use `requestProducts({ skus, type: 'inapp' })` instead. This function will be removed in version 3.0.0.",
+    '`getProducts` is deprecated. Use `requestProducts({ skus, type: \'inapp\' })` instead. This function will be removed in version 3.0.0.',
   );
   if (!skus?.length) {
     return Promise.reject(new Error('"skus" is required'));
@@ -145,7 +148,7 @@ export const getSubscriptions = async (
   skus: string[],
 ): Promise<SubscriptionProduct[]> => {
   console.warn(
-    "`getSubscriptions` is deprecated. Use `requestProducts({ skus, type: 'subs' })` instead. This function will be removed in version 3.0.0.",
+    '`getSubscriptions` is deprecated. Use `requestProducts({ skus, type: \'subs\' })` instead. This function will be removed in version 3.0.0.',
   );
   if (!skus?.length) {
     return Promise.reject(new Error('"skus" is required'));
@@ -269,7 +272,7 @@ export const getPurchaseHistory = ({
   onlyIncludeActiveItems?: boolean;
 } = {}): Promise<ProductPurchase[]> => {
   console.warn(
-    '`getPurchaseHistory` is deprecated. Use `getPurchaseHistories` instead. This function will be removed in version 3.0.0.',
+    "`getPurchaseHistory` is deprecated. Use `getPurchaseHistories` instead. This function will be removed in version 3.0.0.",
   );
   return getPurchaseHistories({
     alsoPublishToEventListener,
@@ -319,8 +322,9 @@ export const getAvailablePurchases = ({
         ),
       android: async () => {
         const products = await ExpoIapModule.getAvailableItemsByType('inapp');
-        const subscriptions =
-          await ExpoIapModule.getAvailableItemsByType('subs');
+        const subscriptions = await ExpoIapModule.getAvailableItemsByType(
+          'subs',
+        );
         return products.concat(subscriptions);
       },
     }) || (() => Promise.resolve([]))
@@ -339,6 +343,7 @@ const offerToRecordIos = (
   };
 };
 
+
 // Define discriminated union with explicit type parameter
 // Using legacy types internally for backward compatibility
 type PurchaseRequest =
@@ -368,8 +373,7 @@ const normalizeRequestProps = (
     if (platform === 'ios') {
       return {
         sku: request.sku || (request.skus?.[0] ?? ''),
-        andDangerouslyFinishTransactionAutomaticallyIOS:
-          request.andDangerouslyFinishTransactionAutomaticallyIOS,
+        andDangerouslyFinishTransactionAutomaticallyIOS: request.andDangerouslyFinishTransactionAutomaticallyIOS,
         appAccountToken: request.appAccountToken,
         quantity: request.quantity,
         withOffer: request.withOffer,
@@ -381,7 +385,7 @@ const normalizeRequestProps = (
         obfuscatedProfileIdAndroid: request.obfuscatedProfileIdAndroid,
         isOfferPersonalized: request.isOfferPersonalized,
       };
-
+      
       // Add subscription-specific fields if present
       if ('subscriptionOffers' in request && request.subscriptionOffers) {
         androidRequest.subscriptionOffers = request.subscriptionOffers;
@@ -392,7 +396,7 @@ const normalizeRequestProps = (
       if ('replacementModeAndroid' in request) {
         androidRequest.replacementModeAndroid = request.replacementModeAndroid;
       }
-
+      
       return androidRequest;
     }
   }
@@ -403,11 +407,11 @@ const normalizeRequestProps = (
 
 /**
  * Request a purchase for products or subscriptions.
- *
+ * 
  * @param requestObj - Purchase request configuration
  * @param requestObj.request - Platform-specific purchase parameters
  * @param requestObj.type - Type of purchase: 'inapp' for products (default) or 'subs' for subscriptions
- *
+ * 
  * @example
  * ```typescript
  * // Product purchase
@@ -418,12 +422,12 @@ const normalizeRequestProps = (
  *   },
  *   type: 'inapp'
  * });
- *
+ * 
  * // Subscription purchase
  * await requestPurchase({
  *   request: {
  *     ios: { sku: subscriptionId },
- *     android: {
+ *     android: { 
  *       skus: [subscriptionId],
  *       subscriptionOffers: [{ sku: subscriptionId, offerToken: 'token' }]
  *     }
@@ -445,7 +449,7 @@ export const requestPurchase = (
 
   if (Platform.OS === 'ios') {
     const normalizedRequest = normalizeRequestProps(request, 'ios');
-
+    
     if (!normalizedRequest?.sku) {
       throw new Error(
         'Invalid request for iOS. The `sku` property is required and must be a string.',
@@ -478,7 +482,7 @@ export const requestPurchase = (
 
   if (Platform.OS === 'android') {
     const normalizedRequest = normalizeRequestProps(request, 'android');
-
+    
     if (!normalizedRequest?.skus?.length) {
       throw new Error(
         'Invalid request for Android. The `skus` property is required and must be a non-empty array.',
@@ -542,7 +546,7 @@ export const requestPurchase = (
 
 /**
  * @deprecated Use `requestPurchase({ request, type: 'subs' })` instead. This method will be removed in version 3.0.0.
- *
+ * 
  * @example
  * ```typescript
  * // Old way (deprecated)
@@ -551,12 +555,12 @@ export const requestPurchase = (
  *   // or for Android
  *   skus: [subscriptionId],
  * });
- *
+ * 
  * // New way (recommended)
  * await requestPurchase({
  *   request: {
  *     ios: { sku: subscriptionId },
- *     android: {
+ *     android: { 
  *       skus: [subscriptionId],
  *       subscriptionOffers: [{ sku: subscriptionId, offerToken: 'token' }]
  *     }
@@ -621,16 +625,16 @@ export const finishTransaction = ({
 
 /**
  * Retrieves the current storefront information from iOS App Store
- *
+ * 
  * @returns Promise resolving to the storefront country code
  * @throws Error if called on non-iOS platform
- *
+ * 
  * @example
  * ```typescript
  * const storefront = await getStorefrontIOS();
  * console.log(storefront); // 'US'
  * ```
- *
+ * 
  * @platform iOS
  */
 export const getStorefrontIOS = (): Promise<string> => {

package/src/modules/android.ts

@@ -102,9 +102,11 @@ export const acknowledgePurchaseAndroid = ({
  * Open the Google Play Store to redeem offer codes (Android only).
  * Note: Google Play does not provide a direct API to redeem codes within the app.
  * This function opens the Play Store where users can manually enter their codes.
- *
+ * 
  * @returns {Promise<void>}
  */
 export const openRedeemOfferCodeAndroid = async (): Promise<void> => {
-  return Linking.openURL(`https://play.google.com/redeem?code=`);
+  return Linking.openURL(
+    `https://play.google.com/redeem?code=`
+  );
 };