expo-iap 2.9.0-rc.3 → 2.9.0

package/src/modules/ios.ts

@@ -170,15 +170,14 @@ export const beginRefundRequestIOS = (
 
 /**
  * Shows the system UI for managing subscriptions.
- * When the user changes subscription renewal status, the system will emit events to
- * purchaseUpdatedListener and transactionUpdatedIOS listeners.
+ * Returns an array of subscriptions that had status changes after the UI is closed.
  *
- * @returns Promise resolving to null on success
+ * @returns Promise<Purchase[]> - Array of subscriptions with status changes (e.g., auto-renewal toggled)
  * @throws Error if called on non-iOS platform
  *
  * @platform iOS
  */
-export const showManageSubscriptionsIOS = (): Promise<null> => {
+export const showManageSubscriptionsIOS = (): Promise<Purchase[]> => {
   return ExpoIapModule.showManageSubscriptionsIOS();
 };
 
@@ -417,7 +416,7 @@ export const beginRefundRequest = (
 /**
  * @deprecated Use `showManageSubscriptionsIOS` instead. This function will be removed in version 3.0.0.
  */
-export const showManageSubscriptions = (): Promise<null> => {
+export const showManageSubscriptions = (): Promise<Purchase[]> => {
   console.warn(
     '`showManageSubscriptions` is deprecated. Use `showManageSubscriptionsIOS` instead. This function will be removed in version 3.0.0.',
   );

package/src/types/ExpoIapAndroid.types.ts

@@ -31,7 +31,7 @@ type ProductSubscriptionAndroidOfferDetail = {
 export type ProductAndroid = ProductCommon & {
   nameAndroid: string;
   oneTimePurchaseOfferDetailsAndroid?: ProductAndroidOneTimePurchaseOfferDetail;
-  platform: "android";
+  platform: 'android';
   subscriptionOfferDetailsAndroid?: ProductSubscriptionAndroidOfferDetail[];
   /**
    * @deprecated Use `nameAndroid` instead. This field will be removed in v2.9.0.
@@ -144,7 +144,7 @@ export const PurchaseStateAndroid = PurchaseAndroidState;
 
 // Legacy naming for backward compatibility
 export type ProductPurchaseAndroid = PurchaseCommon & {
-  platform: "android";
+  platform: 'android';
   /**
    * @deprecated Use `purchaseToken` instead. This field will be removed in a future version.
    */
@@ -167,7 +167,8 @@ export type PurchaseAndroid = ProductPurchaseAndroid;
 /**
  * @deprecated Use `ProductAndroidOneTimePurchaseOfferDetail` instead. This type will be removed in v2.9.0.
  */
-export type OneTimePurchaseOfferDetails = ProductAndroidOneTimePurchaseOfferDetail;
+export type OneTimePurchaseOfferDetails =
+  ProductAndroidOneTimePurchaseOfferDetail;
 
 /**
  * @deprecated Use `ProductSubscriptionAndroidOfferDetail` instead. This type will be removed in v2.9.0.

package/src/types/ExpoIapIOS.types.ts

@@ -30,7 +30,7 @@ export type ProductIOS = ProductCommon & {
   displayNameIOS: string;
   isFamilyShareableIOS: boolean;
   jsonRepresentationIOS: string;
-  platform: "ios";
+  platform: 'ios';
   subscriptionInfoIOS?: SubscriptionInfo;
   /**
    * @deprecated Use `displayNameIOS` instead. This field will be removed in v2.9.0.
@@ -69,7 +69,7 @@ export type ProductSubscriptionIOS = ProductIOS & {
   introductoryPricePaymentModeIOS?: PaymentMode;
   introductoryPriceNumberOfPeriodsIOS?: string;
   introductoryPriceSubscriptionPeriodIOS?: SubscriptionIosPeriod;
-  platform: "ios";
+  platform: 'ios';
   subscriptionPeriodNumberIOS?: string;
   subscriptionPeriodUnitIOS?: SubscriptionIosPeriod;
   /**
@@ -140,7 +140,7 @@ export type ProductStatusIOS = {
 // Legacy naming for backward compatibility
 export type ProductPurchaseIOS = PurchaseCommon & {
   // iOS basic fields
-  platform: "ios";
+  platform: 'ios';
   quantityIOS?: number;
   originalTransactionDateIOS?: number;
   originalTransactionIdentifierIOS?: string;
@@ -179,7 +179,6 @@ export type ProductPurchaseIOS = PurchaseCommon & {
 // Preferred naming
 export type PurchaseIOS = ProductPurchaseIOS;
 
-
 export type AppTransactionIOS = {
   appTransactionId?: string; // Only available in iOS 18.4+
   originalPlatform?: string; // Only available in iOS 18.4+

package/src/useIAP.ts

@@ -100,16 +100,12 @@ type UseIap = {
   requestPurchaseOnPromotedProductIOS: () => Promise<void>;
   /** @deprecated Use requestPurchaseOnPromotedProductIOS instead */
   buyPromotedProductIOS: () => Promise<void>;
-  getActiveSubscriptions: (
-    subscriptionIds?: string[],
-  ) => Promise<ActiveSubscription[]>;
+  getActiveSubscriptions: (subscriptionIds?: string[]) => Promise<void>;
   hasActiveSubscriptions: (subscriptionIds?: string[]) => Promise<boolean>;
 };
 
 export interface UseIAPOptions {
-  onPurchaseSuccess?: (
-    purchase: Purchase,
-  ) => void;
+  onPurchaseSuccess?: (purchase: Purchase) => void;
   onPurchaseError?: (error: PurchaseError) => void;
   onSyncError?: (error: Error) => void;
   shouldAutoSyncPurchases?: boolean; // New option to control auto-syncing
@@ -125,12 +121,8 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   const [products, setProducts] = useState<Product[]>([]);
   const [promotedProductsIOS] = useState<Purchase[]>([]);
   const [subscriptions, setSubscriptions] = useState<SubscriptionProduct[]>([]);
-  const [purchaseHistories, setPurchaseHistories] = useState<Purchase[]>(
-    [],
-  );
-  const [availablePurchases, setAvailablePurchases] = useState<
-    Purchase[]
-  >([]);
+  const [purchaseHistories, setPurchaseHistories] = useState<Purchase[]>([]);
+  const [availablePurchases, setAvailablePurchases] = useState<Purchase[]>([]);
   const [currentPurchase, setCurrentPurchase] = useState<Purchase>();
   const [promotedProductIOS, setPromotedProductIOS] = useState<Product>();
   const [currentPurchaseError, setCurrentPurchaseError] =
@@ -231,6 +223,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     }): Promise<void> => {
       try {
         const result = await fetchProducts(params);
+
         if (params.type === 'subs') {
           setSubscriptions((prevSubscriptions) =>
             mergeWithDuplicateCheck(
@@ -261,7 +254,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
       type?: 'inapp' | 'subs';
     }): Promise<void> => {
       console.warn(
-        "`requestProducts` is deprecated in useIAP hook. Use the new `fetchProducts` method instead. The 'request' prefix should only be used for event-based operations."
+        "`requestProducts` is deprecated in useIAP hook. Use the new `fetchProducts` method instead. The 'request' prefix should only be used for event-based operations.",
       );
       return fetchProductsInternal(params);
     },
@@ -270,7 +263,10 @@ export function useIAP(options?: UseIAPOptions): UseIap {
 
   const getAvailablePurchasesInternal = useCallback(async (): Promise<void> => {
     try {
-      const result = await getAvailablePurchases();
+      const result = await getAvailablePurchases({
+        alsoPublishToEventListenerIOS: false,
+        onlyIncludeActiveItemsIOS: true,
+      });
       setAvailablePurchases(result);
     } catch (error) {
       console.error('Error fetching available purchases:', error);
@@ -278,16 +274,13 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   }, []);
 
   const getActiveSubscriptionsInternal = useCallback(
-    async (subscriptionIds?: string[]): Promise<ActiveSubscription[]> => {
+    async (subscriptionIds?: string[]): Promise<void> => {
       try {
         const result = await getActiveSubscriptions(subscriptionIds);
         setActiveSubscriptions(result);
-        return result;
       } catch (error) {
         console.error('Error getting active subscriptions:', error);
-        // Don't clear existing activeSubscriptions on error - preserve current state
-        // This prevents the UI from showing empty state when there are temporary network issues
-        return [];
+        // Preserve existing state on error
       }
     },
     [],
@@ -406,48 +399,76 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   );
 
   const initIapWithSubscriptions = useCallback(async (): Promise<void> => {
-    const result = await initConnection();
-    setConnected(result);
+    // CRITICAL: Register listeners BEFORE initConnection to avoid race condition
+    // Events might fire immediately after initConnection, so listeners must be ready
+    console.log('[useIAP] Setting up event listeners BEFORE initConnection...');
+
+    // Register purchase update listener BEFORE initConnection to avoid race conditions.
+    subscriptionsRef.current.purchaseUpdate = purchaseUpdatedListener(
+      async (purchase: Purchase) => {
+        console.log('[useIAP] Purchase success callback triggered:', purchase);
+        setCurrentPurchaseError(undefined);
+        setCurrentPurchase(purchase);
+
+        if ('expirationDateIOS' in purchase) {
+          await refreshSubscriptionStatus(purchase.id);
+        }
 
-    if (result) {
-      subscriptionsRef.current.purchaseUpdate = purchaseUpdatedListener(
-        async (purchase: Purchase) => {
-          setCurrentPurchaseError(undefined);
-          setCurrentPurchase(purchase);
+        if (optionsRef.current?.onPurchaseSuccess) {
+          optionsRef.current.onPurchaseSuccess(purchase);
+        }
+      },
+    );
 
-          if ('expirationDateIOS' in purchase) {
-            await refreshSubscriptionStatus(purchase.id);
-          }
+    // IMPORTANT: Do NOT register the purchase error listener until after initConnection succeeds.
+    // Some platforms may emit an initialization error event (E_INIT_CONNECTION) during startup.
+    // Delaying registration prevents noisy, misleading errors before the connection is ready.
 
-          if (optionsRef.current?.onPurchaseSuccess) {
-            optionsRef.current.onPurchaseSuccess(purchase);
-          }
-        },
-      );
-
-      subscriptionsRef.current.purchaseError = purchaseErrorListener(
-        (error: PurchaseError) => {
-          setCurrentPurchase(undefined);
-          setCurrentPurchaseError(error);
+    if (Platform.OS === 'ios') {
+      // iOS promoted products listener
+      subscriptionsRef.current.promotedProductsIOS = promotedProductListenerIOS(
+        (product: Product) => {
+          console.log('[useIAP] Promoted product callback triggered:', product);
+          setPromotedProductIOS(product);
 
-          if (optionsRef.current?.onPurchaseError) {
-            optionsRef.current.onPurchaseError(error);
+          if (optionsRef.current?.onPromotedProductIOS) {
+            optionsRef.current.onPromotedProductIOS(product);
           }
         },
       );
+    }
 
-      if (Platform.OS === 'ios') {
-        // iOS promoted products listener
-        subscriptionsRef.current.promotedProductsIOS =
-          promotedProductListenerIOS((product: Product) => {
-            setPromotedProductIOS(product);
-
-            if (optionsRef.current?.onPromotedProductIOS) {
-              optionsRef.current.onPromotedProductIOS(product);
-            }
-          });
-      }
+    console.log(
+      '[useIAP] Event listeners registered, now calling initConnection...',
+    );
+
+    // NOW call initConnection after listeners are ready
+    const result = await initConnection();
+    setConnected(result);
+    console.log('[useIAP] initConnection result:', result);
+    if (!result) {
+      // If connection failed, clean up listeners
+      console.warn('[useIAP] Connection failed, cleaning up listeners...');
+      subscriptionsRef.current.purchaseUpdate?.remove();
+      subscriptionsRef.current.promotedProductsIOS?.remove();
+      subscriptionsRef.current.purchaseUpdate = undefined;
+      subscriptionsRef.current.promotedProductsIOS = undefined;
+      // Do not register error listener when connection fails
+      return;
     }
+
+    // Now that the connection is established, register the purchase error listener.
+    subscriptionsRef.current.purchaseError = purchaseErrorListener(
+      (error: PurchaseError) => {
+        console.log('[useIAP] Purchase error callback triggered:', error);
+        setCurrentPurchase(undefined);
+        setCurrentPurchaseError(error);
+
+        if (optionsRef.current?.onPurchaseError) {
+          optionsRef.current.onPurchaseError(error);
+        }
+      },
+    );
   }, [refreshSubscriptionStatus]);
 
   useEffect(() => {

package/src/utils/constants.ts

@@ -0,0 +1,14 @@
+// Centralized product ID constants for examples and internal usage
+// Rename guide: subscriptionIds -> SUBSCRIPTION_PRODUCT_IDS, PRODUCT_IDS remains the same name
+
+// One-time purchase product IDs (consumables/non-consumables)
+export const PRODUCT_IDS: string[] = [
+  'dev.hyo.martie.10bulbs',
+  'dev.hyo.martie.30bulbs',
+];
+
+// Subscription product IDs
+export const SUBSCRIPTION_PRODUCT_IDS: string[] = ['dev.hyo.martie.premium'];
+
+// Optionally export a single default subscription for convenience
+export const DEFAULT_SUBSCRIPTION_PRODUCT_ID = SUBSCRIPTION_PRODUCT_IDS[0];

package/ios/ProductStore.swift

@@ -1,27 +0,0 @@
-import Foundation
-import StoreKit
-
-@available(iOS 15.0, *)
-actor ProductStore {
-  private(set) var products: [String: Product] = [:]
-
-  func addProduct(_ product: Product) {
-    self.products[product.id] = product
-  }
-
-  func getAllProducts() -> [Product] {
-    return Array(self.products.values)
-  }
-
-  func getProduct(productID: String) -> Product? {
-    return self.products[productID]
-  }
-
-  func removeAll() {
-    products.removeAll()
-  }
-
-  func performOnActor(_ action: @escaping (isolated ProductStore) -> Void) async {
-    action(self)
-  }
-}

package/ios/Types.swift

@@ -1,96 +0,0 @@
-//
-//  IapTypes.swift
-//  RNIap
-//
-//  Created by Andres Aguilar on 8/18/22.
-//
-
-import Foundation
-import StoreKit
-
-public enum StoreError: Error {
-    case failedVerification
-}
-
-// Error codes for IAP operations - centralized error code management
-struct IapErrorCode {
-    // Constants for code usage - safe pattern without force unwrapping
-    static let unknown = "E_UNKNOWN"
-    static let serviceError = "E_SERVICE_ERROR"
-    static let userCancelled = "E_USER_CANCELLED"
-    static let userError = "E_USER_ERROR"
-    static let itemUnavailable = "E_ITEM_UNAVAILABLE"
-    static let remoteError = "E_REMOTE_ERROR"
-    static let networkError = "E_NETWORK_ERROR"
-    static let receiptFailed = "E_RECEIPT_FAILED"
-    static let receiptFinishedFailed = "E_RECEIPT_FINISHED_FAILED"
-    static let notPrepared = "E_NOT_PREPARED"
-    static let notEnded = "E_NOT_ENDED"
-    static let alreadyOwned = "E_ALREADY_OWNED"
-    static let developerError = "E_DEVELOPER_ERROR"
-    static let purchaseError = "E_PURCHASE_ERROR"
-    static let syncError = "E_SYNC_ERROR"
-    static let deferredPayment = "E_DEFERRED_PAYMENT"
-    static let transactionValidationFailed = "E_TRANSACTION_VALIDATION_FAILED"
-    static let billingResponseJsonParseError = "E_BILLING_RESPONSE_JSON_PARSE_ERROR"
-    static let interrupted = "E_INTERRUPTED"
-    static let iapNotAvailable = "E_IAP_NOT_AVAILABLE"
-    static let activityUnavailable = "E_ACTIVITY_UNAVAILABLE"
-    static let alreadyPrepared = "E_ALREADY_PREPARED"
-    static let pending = "E_PENDING"
-    static let connectionClosed = "E_CONNECTION_CLOSED"
-    
-    // Cached dictionary for Constants export - using constants as keys to avoid duplication
-    private static let _cachedDictionary: [String: String] = [
-        unknown: unknown,
-        serviceError: serviceError,
-        userCancelled: userCancelled,
-        userError: userError,
-        itemUnavailable: itemUnavailable,
-        remoteError: remoteError,
-        networkError: networkError,
-        receiptFailed: receiptFailed,
-        receiptFinishedFailed: receiptFinishedFailed,
-        notPrepared: notPrepared,
-        notEnded: notEnded,
-        alreadyOwned: alreadyOwned,
-        developerError: developerError,
-        purchaseError: purchaseError,
-        syncError: syncError,
-        deferredPayment: deferredPayment,
-        transactionValidationFailed: transactionValidationFailed,
-        billingResponseJsonParseError: billingResponseJsonParseError,
-        interrupted: interrupted,
-        iapNotAvailable: iapNotAvailable,
-        activityUnavailable: activityUnavailable,
-        alreadyPrepared: alreadyPrepared,
-        pending: pending,
-        connectionClosed: connectionClosed
-    ]
-    
-    // Return cached dictionary - no allocation on repeated calls
-    static func toDictionary() -> [String: String] {
-        return _cachedDictionary
-    }
-}
-
-// Based on https://stackoverflow.com/a/40135192/570612
-extension Date {
-    var millisecondsSince1970: Int64 {
-        return Int64((self.timeIntervalSince1970 * 1000.0).rounded())
-    }
-
-    var millisecondsSince1970String: String {
-        return String(self.millisecondsSince1970)
-    }
-
-    init(milliseconds: Int64) {
-        self = Date(timeIntervalSince1970: TimeInterval(milliseconds) / 1000)
-    }
-}
-
-extension SKProductsRequest {
-    var key: String {
-        return String(self.hashValue)
-    }
-}