expo-iap 2.9.0 → 2.9.2

package/src/types/ExpoIapIOS.types.ts

@@ -32,22 +32,6 @@ export type ProductIOS = ProductCommon & {
   jsonRepresentationIOS: string;
   platform: 'ios';
   subscriptionInfoIOS?: SubscriptionInfo;
-  /**
-   * @deprecated Use `displayNameIOS` instead. This field will be removed in v2.9.0.
-   */
-  displayName?: string;
-  /**
-   * @deprecated Use `isFamilyShareableIOS` instead. This field will be removed in v2.9.0.
-   */
-  isFamilyShareable?: boolean;
-  /**
-   * @deprecated Use `jsonRepresentationIOS` instead. This field will be removed in v2.9.0.
-   */
-  jsonRepresentation?: string;
-  /**
-   * @deprecated Use `subscriptionInfoIOS` instead. This field will be removed in v2.9.0.
-   */
-  subscription?: SubscriptionInfo;
   introductoryPriceNumberOfPeriodsIOS?: string;
   introductoryPriceSubscriptionPeriodIOS?: SubscriptionIosPeriod;
 };
@@ -72,14 +56,6 @@ export type ProductSubscriptionIOS = ProductIOS & {
   platform: 'ios';
   subscriptionPeriodNumberIOS?: string;
   subscriptionPeriodUnitIOS?: SubscriptionIosPeriod;
-  /**
-   * @deprecated Use `discountsIOS` instead. This field will be removed in v2.9.0.
-   */
-  discounts?: Discount[];
-  /**
-   * @deprecated Use `introductoryPriceIOS` instead. This field will be removed in v2.9.0.
-   */
-  introductoryPrice?: string;
 };
 
 // Legacy naming for backward compatibility
@@ -119,7 +95,7 @@ export type RequestPurchaseIosProps = {
   withOffer?: PaymentDiscount;
 };
 
-type SubscriptionStatus =
+type SubscriptionState =
   | 'expired'
   | 'inBillingRetryPeriod'
   | 'inGracePeriod'
@@ -132,8 +108,8 @@ type RenewalInfo = {
   autoRenewPreference?: string;
 };
 
-export type ProductStatusIOS = {
-  state: SubscriptionStatus;
+export type SubscriptionStatusIOS = {
+  state: SubscriptionState;
   renewalInfo?: RenewalInfo;
 };
 

package/src/useIAP.ts

@@ -11,7 +11,6 @@ import {
   purchaseUpdatedListener,
   promotedProductListenerIOS,
   getAvailablePurchases,
-  getPurchaseHistories,
   finishTransaction as finishTransactionInternal,
   requestPurchase as requestPurchaseInternal,
   fetchProducts,
@@ -19,9 +18,9 @@ import {
   getActiveSubscriptions,
   hasActiveSubscriptions,
   type ActiveSubscription,
+  restorePurchases,
 } from '.';
 import {
-  syncIOS,
   getPromotedProductIOS,
   requestPurchaseOnPromotedProductIOS,
 } from './modules/ios';
@@ -35,7 +34,13 @@ import {
   SubscriptionProduct,
   RequestPurchaseProps,
   RequestSubscriptionProps,
+  ErrorCode,
 } from './ExpoIap.types';
+import {
+  getUserFriendlyErrorMessage,
+  isUserCancelledError,
+  isRecoverableError,
+} from './utils/errorMapping';
 
 type UseIap = {
   connected: boolean;
@@ -43,7 +48,6 @@ type UseIap = {
   promotedProductsIOS: Purchase[];
   promotedProductIdIOS?: string;
   subscriptions: SubscriptionProduct[];
-  purchaseHistories: Purchase[];
   availablePurchases: Purchase[];
   currentPurchase?: Purchase;
   currentPurchaseError?: PurchaseError;
@@ -59,7 +63,6 @@ type UseIap = {
     isConsumable?: boolean;
   }) => Promise<PurchaseResult | boolean>;
   getAvailablePurchases: (skus: string[]) => Promise<void>;
-  getPurchaseHistories: (skus: string[]) => Promise<void>;
   fetchProducts: (params: {
     skus: string[];
     type?: 'inapp' | 'subs';
@@ -98,8 +101,6 @@ type UseIap = {
   restorePurchases: () => Promise<void>;
   getPromotedProductIOS: () => Promise<Product | null>;
   requestPurchaseOnPromotedProductIOS: () => Promise<void>;
-  /** @deprecated Use requestPurchaseOnPromotedProductIOS instead */
-  buyPromotedProductIOS: () => Promise<void>;
   getActiveSubscriptions: (subscriptionIds?: string[]) => Promise<void>;
   hasActiveSubscriptions: (subscriptionIds?: string[]) => Promise<boolean>;
 };
@@ -114,14 +115,14 @@ export interface UseIAPOptions {
 
 /**
  * React Hook for managing In-App Purchases.
- * See documentation at https://expo-iap.hyo.dev/docs/hooks/useIAP
+ * See documentation at https://hyochan.github.io/expo-iap/docs/hooks/useIAP
  */
 export function useIAP(options?: UseIAPOptions): UseIap {
   const [connected, setConnected] = useState<boolean>(false);
   const [products, setProducts] = useState<Product[]>([]);
   const [promotedProductsIOS] = useState<Purchase[]>([]);
   const [subscriptions, setSubscriptions] = useState<SubscriptionProduct[]>([]);
-  const [purchaseHistories, setPurchaseHistories] = useState<Purchase[]>([]);
+  // Removed in v2.9.0: purchaseHistories state and related API
   const [availablePurchases, setAvailablePurchases] = useState<Purchase[]>([]);
   const [currentPurchase, setCurrentPurchase] = useState<Purchase>();
   const [promotedProductIOS, setPromotedProductIOS] = useState<Product>();
@@ -133,6 +134,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   >([]);
 
   const optionsRef = useRef<UseIAPOptions | undefined>(options);
+  const connectedRef = useRef<boolean>(false);
 
   // Helper function to merge arrays with duplicate checking
   const mergeWithDuplicateCheck = useCallback(
@@ -159,6 +161,10 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     optionsRef.current = options;
   }, [options]);
 
+  useEffect(() => {
+    connectedRef.current = connected;
+  }, [connected]);
+
   const subscriptionsRef = useRef<{
     purchaseUpdate?: EventSubscription;
     purchaseError?: EventSubscription;
@@ -298,13 +304,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     [],
   );
 
-  /**
-   * @deprecated Use getAvailablePurchases instead. This function is just calling getAvailablePurchases internally.
-   * Will be removed in v2.9.0
-   */
-  const getPurchaseHistoriesInternal = useCallback(async (): Promise<void> => {
-    setPurchaseHistories(await getPurchaseHistories());
-  }, []);
+  // NOTE: getPurchaseHistories removed in v2.9.0. Use getAvailablePurchases instead.
 
   const finishTransaction = useCallback(
     async ({
@@ -366,22 +366,20 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     [getAvailablePurchasesInternal, getSubscriptionsInternal],
   );
 
-  const restorePurchases = useCallback(async (): Promise<void> => {
+  // Restore completed transactions with cross-platform behavior.
+  // iOS: best-effort sync (ignore sync errors) then fetch available purchases.
+  // Android: fetch available purchases directly.
+  const restorePurchasesInternal = useCallback(async (): Promise<void> => {
     try {
-      if (Platform.OS === 'ios') {
-        await syncIOS().catch((error) => {
-          if (optionsRef.current?.onSyncError) {
-            optionsRef.current.onSyncError(error);
-          } else {
-            console.warn('Error restoring purchases:', error);
-          }
-        });
-      }
-      await getAvailablePurchasesInternal();
+      const purchases = await restorePurchases({
+        alsoPublishToEventListenerIOS: false,
+        onlyIncludeActiveItemsIOS: true,
+      });
+      setAvailablePurchases(purchases);
     } catch (error) {
       console.warn('Failed to restore purchases:', error);
     }
-  }, [getAvailablePurchasesInternal]);
+  }, []);
 
   const validateReceipt = useCallback(
     async (
@@ -420,9 +418,32 @@ export function useIAP(options?: UseIAPOptions): UseIap {
       },
     );
 
-    // 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.
+    // Register purchase error listener EARLY. Ignore init-related errors until connected.
+    subscriptionsRef.current.purchaseError = purchaseErrorListener(
+      (error: PurchaseError) => {
+        if (
+          !connectedRef.current &&
+          error.code === ErrorCode.E_INIT_CONNECTION
+        ) {
+          return; // Ignore initialization error before connected
+        }
+        const friendly = getUserFriendlyErrorMessage(error);
+        console.log('[useIAP] Purchase error callback triggered:', error);
+        if (isUserCancelledError(error)) {
+          console.log('[useIAP] User cancelled purchase');
+        } else if (isRecoverableError(error)) {
+          console.log('[useIAP] Recoverable purchase error:', friendly);
+        } else {
+          console.warn('[useIAP] Purchase error:', friendly);
+        }
+        setCurrentPurchase(undefined);
+        setCurrentPurchaseError(error);
+
+        if (optionsRef.current?.onPurchaseError) {
+          optionsRef.current.onPurchaseError(error);
+        }
+      },
+    );
 
     if (Platform.OS === 'ios') {
       // iOS promoted products listener
@@ -453,22 +474,9 @@ export function useIAP(options?: UseIAPOptions): UseIap {
       subscriptionsRef.current.promotedProductsIOS?.remove();
       subscriptionsRef.current.purchaseUpdate = undefined;
       subscriptionsRef.current.promotedProductsIOS = undefined;
-      // Do not register error listener when connection fails
+      // Keep purchaseError listener registered to capture subsequent retries
       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(() => {
@@ -491,7 +499,6 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     promotedProductsIOS,
     promotedProductIdIOS,
     subscriptions,
-    purchaseHistories,
     finishTransaction,
     availablePurchases,
     currentPurchase,
@@ -501,17 +508,15 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     clearCurrentPurchase,
     clearCurrentPurchaseError,
     getAvailablePurchases: getAvailablePurchasesInternal,
-    getPurchaseHistories: getPurchaseHistoriesInternal,
     fetchProducts: fetchProductsInternal,
     requestProducts: requestProductsInternal,
     requestPurchase: requestPurchaseWithReset,
     validateReceipt,
-    restorePurchases,
+    restorePurchases: restorePurchasesInternal,
     getProducts: getProductsInternal,
     getSubscriptions: getSubscriptionsInternal,
     getPromotedProductIOS,
     requestPurchaseOnPromotedProductIOS,
-    buyPromotedProductIOS: requestPurchaseOnPromotedProductIOS, // deprecated alias
     getActiveSubscriptions: getActiveSubscriptionsInternal,
     hasActiveSubscriptions: hasActiveSubscriptionsInternal,
   };

package/src/utils/errorMapping.ts

@@ -32,6 +32,8 @@ export function isNetworkError(error: any): boolean {
     ErrorCode.E_NETWORK_ERROR,
     ErrorCode.E_REMOTE_ERROR,
     ErrorCode.E_SERVICE_ERROR,
+    ErrorCode.E_SERVICE_DISCONNECTED,
+    ErrorCode.E_BILLING_UNAVAILABLE,
   ];
 
   const errorCode = typeof error === 'string' ? error : error?.code;
@@ -49,6 +51,10 @@ export function isRecoverableError(error: any): boolean {
     ErrorCode.E_REMOTE_ERROR,
     ErrorCode.E_SERVICE_ERROR,
     ErrorCode.E_INTERRUPTED,
+    ErrorCode.E_SERVICE_DISCONNECTED,
+    ErrorCode.E_BILLING_UNAVAILABLE,
+    ErrorCode.E_QUERY_PRODUCT,
+    ErrorCode.E_INIT_CONNECTION,
   ];
 
   const errorCode = typeof error === 'string' ? error : error?.code;
@@ -68,20 +74,38 @@ export function getUserFriendlyErrorMessage(error: any): string {
       return 'Purchase was cancelled by user';
     case ErrorCode.E_NETWORK_ERROR:
       return 'Network connection error. Please check your internet connection and try again.';
+    case ErrorCode.E_SERVICE_DISCONNECTED:
+      return 'Billing service disconnected. Please try again.';
+    case ErrorCode.E_BILLING_UNAVAILABLE:
+      return 'Billing is unavailable on this device or account.';
     case ErrorCode.E_ITEM_UNAVAILABLE:
       return 'This item is not available for purchase';
+    case ErrorCode.E_ITEM_NOT_OWNED:
+      return "You don't own this item";
     case ErrorCode.E_ALREADY_OWNED:
       return 'You already own this item';
+    case ErrorCode.E_SKU_NOT_FOUND:
+      return 'Requested product could not be found';
+    case ErrorCode.E_SKU_OFFER_MISMATCH:
+      return 'Selected offer does not match the SKU';
     case ErrorCode.E_DEFERRED_PAYMENT:
       return 'Payment is pending approval';
     case ErrorCode.E_NOT_PREPARED:
       return 'In-app purchase is not ready. Please try again later.';
     case ErrorCode.E_SERVICE_ERROR:
       return 'Store service error. Please try again later.';
+    case ErrorCode.E_FEATURE_NOT_SUPPORTED:
+      return 'This feature is not supported on this device.';
     case ErrorCode.E_TRANSACTION_VALIDATION_FAILED:
       return 'Transaction could not be verified';
     case ErrorCode.E_RECEIPT_FAILED:
       return 'Receipt processing failed';
+    case ErrorCode.E_EMPTY_SKU_LIST:
+      return 'No product IDs provided';
+    case ErrorCode.E_INIT_CONNECTION:
+      return 'Failed to initialize billing connection';
+    case ErrorCode.E_QUERY_PRODUCT:
+      return 'Failed to query products. Please try again later.';
     default:
       return error?.message || 'An unexpected error occurred';
   }