expo-iap 2.9.7 → 3.0.1

package/src/useIAP.ts

@@ -67,24 +67,7 @@ type UseIap = {
     skus: string[];
     type?: 'inapp' | 'subs';
   }) => Promise<void>;
-  /**
-   * @deprecated Use fetchProducts({ skus, type: 'inapp' | 'subs' }) instead. This method will be removed in version 3.0.0.
-   * The 'request' prefix should only be used for event-based operations.
-   */
-  requestProducts: (params: {
-    skus: string[];
-    type?: 'inapp' | 'subs';
-  }) => Promise<void>;
-  /**
-   * @deprecated Use fetchProducts({ skus, type: 'inapp' }) instead. This method will be removed in version 3.0.0.
-   * Note: This method internally uses fetchProducts, so no deprecation warning is shown.
-   */
-  getProducts: (skus: string[]) => Promise<void>;
-  /**
-   * @deprecated Use fetchProducts({ skus, type: 'subs' }) instead. This method will be removed in version 3.0.0.
-   * Note: This method internally uses fetchProducts, so no deprecation warning is shown.
-   */
-  getSubscriptions: (skus: string[]) => Promise<void>;
+
   requestPurchase: (params: {
     request: RequestPurchaseProps | RequestSubscriptionProps;
     type?: 'inapp' | 'subs';
@@ -122,7 +105,7 @@ export function useIAP(options?: UseIAPOptions): UseIap {
   const [products, setProducts] = useState<Product[]>([]);
   const [promotedProductsIOS] = useState<Purchase[]>([]);
   const [subscriptions, setSubscriptions] = useState<SubscriptionProduct[]>([]);
-  // 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>();
@@ -186,24 +169,6 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     setCurrentPurchaseError(undefined);
   }, []);
 
-  const getProductsInternal = useCallback(
-    async (skus: string[]): Promise<void> => {
-      try {
-        const result = await fetchProducts({skus, type: 'inapp'});
-        setProducts((prevProducts) =>
-          mergeWithDuplicateCheck(
-            prevProducts,
-            result as Product[],
-            (product) => product.id,
-          ),
-        );
-      } catch (error) {
-        console.error('Error fetching products:', error);
-      }
-    },
-    [mergeWithDuplicateCheck],
-  );
-
   const getSubscriptionsInternal = useCallback(
     async (skus: string[]): Promise<void> => {
       try {
@@ -254,19 +219,6 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     [mergeWithDuplicateCheck],
   );
 
-  const requestProductsInternal = useCallback(
-    async (params: {
-      skus: string[];
-      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.",
-      );
-      return fetchProductsInternal(params);
-    },
-    [fetchProductsInternal],
-  );
-
   const getAvailablePurchasesInternal = useCallback(async (): Promise<void> => {
     try {
       const result = await getAvailablePurchases({
@@ -304,8 +256,6 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     [],
   );
 
-  // NOTE: getPurchaseHistories removed in v2.9.0. Use getAvailablePurchases instead.
-
   const finishTransaction = useCallback(
     async ({
       purchase,
@@ -509,12 +459,10 @@ export function useIAP(options?: UseIAPOptions): UseIap {
     clearCurrentPurchaseError,
     getAvailablePurchases: getAvailablePurchasesInternal,
     fetchProducts: fetchProductsInternal,
-    requestProducts: requestProductsInternal,
     requestPurchase: requestPurchaseWithReset,
     validateReceipt,
     restorePurchases: restorePurchasesInternal,
-    getProducts: getProductsInternal,
-    getSubscriptions: getSubscriptionsInternal,
+    // internal getters kept for hook state management
     getPromotedProductIOS,
     requestPurchaseOnPromotedProductIOS,
     getActiveSubscriptions: getActiveSubscriptionsInternal,

package/android/src/main/java/expo/modules/iap/PlayUtils.kt

@@ -1,178 +0,0 @@
-package expo.modules.iap
-
-import android.util.Log
-import com.android.billingclient.api.BillingClient
-import expo.modules.kotlin.Promise
-
-data class BillingResponse(
-    val code: String,
-    val message: String,
-)
-
-object PromiseUtils {
-    private val promises = HashMap<String, MutableList<Promise>>()
-
-    const val TAG = "PromiseUtils"
-
-    fun addPromiseForKey(
-        key: String,
-        promise: Promise,
-    ) {
-        promises.getOrPut(key) { mutableListOf() }.add(promise)
-    }
-
-    fun resolvePromisesForKey(
-        key: String,
-        value: Any?,
-    ) {
-        promises[key]?.forEach { promise ->
-            promise.safeResolve(value)
-        }
-        promises.remove(key)
-    }
-
-    fun rejectAllPendingPromises() {
-        promises.flatMap { it.value }.forEach { promise ->
-            promise.safeReject(IapErrorCode.E_CONNECTION_CLOSED, "Connection has been closed", null)
-        }
-        promises.clear()
-    }
-
-    fun rejectPromisesForKey(
-        key: String,
-        code: String,
-        message: String?,
-        err: Exception?,
-    ) {
-        promises[key]?.forEach { promise ->
-            promise.safeReject(code, message, err)
-        }
-        promises.remove(key)
-    }
-}
-
-const val TAG = "IapPromises"
-
-fun Promise.safeResolve(value: Any?) {
-    try {
-        this.resolve(value)
-    } catch (e: RuntimeException) {
-        Log.d(TAG, "Already consumed ${e.message}")
-    }
-}
-
-fun Promise.safeReject(message: String) = this.safeReject(message, null, null)
-
-fun Promise.safeReject(
-    code: String,
-    message: String?,
-) = this.safeReject(code, message, null)
-
-fun Promise.safeReject(
-    code: String,
-    throwable: Throwable?,
-) = this.safeReject(code, null, throwable)
-
-fun Promise.safeReject(
-    code: String,
-    message: String?,
-    throwable: Throwable?,
-) {
-    try {
-        this.reject(code, message, throwable)
-    } catch (e: RuntimeException) {
-        Log.d(TAG, "Already consumed ${e.message}")
-    }
-}
-
-object PlayUtils {
-    const val TAG = "PlayUtils"
-
-    fun rejectPromiseWithBillingError(
-        promise: Promise,
-        responseCode: Int,
-    ) {
-        val errorData = getBillingResponseData(responseCode)
-        promise.reject(errorData.code, errorData.message, null)
-    }
-
-    fun getBillingResponseData(responseCode: Int): BillingResponse {
-        val errorData =
-            when (responseCode) {
-                BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED -> {
-                    BillingResponse(
-                        IapErrorCode.E_SERVICE_ERROR,
-                        "This feature is not available on your device.",
-                    )
-                }
-                BillingClient.BillingResponseCode.SERVICE_DISCONNECTED -> {
-                    BillingResponse(
-                        IapErrorCode.E_NETWORK_ERROR,
-                        "The service is disconnected (check your internet connection.)",
-                    )
-                }
-                BillingClient.BillingResponseCode.NETWORK_ERROR -> {
-                    BillingResponse(
-                        IapErrorCode.E_NETWORK_ERROR,
-                        "You have a problem with network connection.",
-                    )
-                }
-                BillingClient.BillingResponseCode.OK -> {
-                    BillingResponse(
-                        "OK",
-                        "",
-                    )
-                }
-                BillingClient.BillingResponseCode.USER_CANCELED -> {
-                    BillingResponse(
-                        IapErrorCode.E_USER_CANCELLED,
-                        "Payment is cancelled.",
-                    )
-                }
-                BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE -> {
-                    BillingResponse(
-                        IapErrorCode.E_SERVICE_ERROR,
-                        "The service is unreachable. This may be your internet connection, or the Play Store may be down.",
-                    )
-                }
-                BillingClient.BillingResponseCode.BILLING_UNAVAILABLE -> {
-                    BillingResponse(
-                        IapErrorCode.E_SERVICE_ERROR,
-                        "Billing is unavailable. This may be a problem with your device, or the Play Store may be down.",
-                    )
-                }
-                BillingClient.BillingResponseCode.ITEM_UNAVAILABLE -> {
-                    BillingResponse(
-                        IapErrorCode.E_ITEM_UNAVAILABLE,
-                        "That item is unavailable.",
-                    )
-                }
-                BillingClient.BillingResponseCode.DEVELOPER_ERROR -> {
-                    BillingResponse(
-                        IapErrorCode.E_DEVELOPER_ERROR,
-                        "Google is indicating that we have some issue connecting to payment.",
-                    )
-                }
-                BillingClient.BillingResponseCode.ERROR -> {
-                    BillingResponse(
-                        IapErrorCode.E_UNKNOWN,
-                        "An unknown or unexpected error has occurred. Please try again later.",
-                    )
-                }
-                BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
-                    BillingResponse(
-                        IapErrorCode.E_ALREADY_OWNED,
-                        "You already own this item.",
-                    )
-                }
-                else -> {
-                    BillingResponse(
-                        IapErrorCode.E_UNKNOWN,
-                        "Purchase failed with code: $responseCode",
-                    )
-                }
-            }
-        Log.e(TAG, "Error Code: $responseCode")
-        return errorData
-    }
-}

package/android/src/main/java/expo/modules/iap/Types.kt

@@ -1,98 +0,0 @@
-package expo.modules.iap
-
-/**
- * Error codes for IAP operations - centralized error code management
- * Single source of truth for all error codes used across the module
- */
-object IapErrorCode {
-    // Connection and initialization errors
-    const val E_NOT_PREPARED = "E_NOT_PREPARED"
-    const val E_INIT_CONNECTION = "E_INIT_CONNECTION"
-    const val E_SERVICE_DISCONNECTED = "E_SERVICE_DISCONNECTED"
-    const val E_ALREADY_PREPARED = "E_ALREADY_PREPARED"
-    const val E_CONNECTION_CLOSED = "E_CONNECTION_CLOSED"
-    
-    // Product and purchase errors
-    const val E_QUERY_PRODUCT = "E_QUERY_PRODUCT"
-    const val E_SKU_NOT_FOUND = "E_SKU_NOT_FOUND"
-    const val E_SKU_OFFER_MISMATCH = "E_SKU_OFFER_MISMATCH"
-    const val E_PURCHASE_ERROR = "E_PURCHASE_ERROR"
-    const val E_USER_CANCELLED = "E_USER_CANCELLED"
-    const val E_PENDING = "E_PENDING"
-    
-    // Service and developer errors
-    const val E_SERVICE_ERROR = "E_SERVICE_ERROR"
-    const val E_DEVELOPER_ERROR = "E_DEVELOPER_ERROR"
-    const val E_ITEM_UNAVAILABLE = "E_ITEM_UNAVAILABLE"
-    const val E_ALREADY_OWNED = "E_ALREADY_OWNED"
-    const val E_ITEM_NOT_OWNED = "E_ITEM_NOT_OWNED"
-    
-    // Network and billing errors
-    const val E_NETWORK_ERROR = "E_NETWORK_ERROR"
-    const val E_BILLING_UNAVAILABLE = "E_BILLING_UNAVAILABLE"
-    const val E_FEATURE_NOT_SUPPORTED = "E_FEATURE_NOT_SUPPORTED"
-    const val E_BILLING_RESPONSE_JSON_PARSE_ERROR = "E_BILLING_RESPONSE_JSON_PARSE_ERROR"
-    
-    // Activity and UI errors
-    const val E_ACTIVITY_UNAVAILABLE = "E_ACTIVITY_UNAVAILABLE"
-    
-    // User and remote errors
-    const val E_USER_ERROR = "E_USER_ERROR"
-    const val E_REMOTE_ERROR = "E_REMOTE_ERROR"
-    const val E_NOT_ENDED = "E_NOT_ENDED"
-    
-    // Unknown error
-    const val E_UNKNOWN = "E_UNKNOWN"
-    
-    // Empty SKU list error
-    const val E_EMPTY_SKU_LIST = "E_EMPTY_SKU_LIST"
-    
-    // Cached map for Constants export - initialized once at class loading time
-    // Using constants as keys to avoid duplication and ensure type safety
-    private val _cachedMap: Map<String, String> = mapOf(
-        E_NOT_PREPARED to E_NOT_PREPARED,
-        E_INIT_CONNECTION to E_INIT_CONNECTION,
-        E_QUERY_PRODUCT to E_QUERY_PRODUCT,
-        E_UNKNOWN to E_UNKNOWN,
-        E_SKU_OFFER_MISMATCH to E_SKU_OFFER_MISMATCH,
-        E_SKU_NOT_FOUND to E_SKU_NOT_FOUND,
-        E_USER_CANCELLED to E_USER_CANCELLED,
-        E_DEVELOPER_ERROR to E_DEVELOPER_ERROR,
-        E_ITEM_UNAVAILABLE to E_ITEM_UNAVAILABLE,
-        E_SERVICE_ERROR to E_SERVICE_ERROR,
-        E_PURCHASE_ERROR to E_PURCHASE_ERROR,
-        E_ACTIVITY_UNAVAILABLE to E_ACTIVITY_UNAVAILABLE,
-        E_ALREADY_PREPARED to E_ALREADY_PREPARED,
-        E_PENDING to E_PENDING,
-        E_NOT_ENDED to E_NOT_ENDED,
-        E_NETWORK_ERROR to E_NETWORK_ERROR,
-        E_ALREADY_OWNED to E_ALREADY_OWNED,
-        E_REMOTE_ERROR to E_REMOTE_ERROR,
-        E_USER_ERROR to E_USER_ERROR,
-        E_BILLING_RESPONSE_JSON_PARSE_ERROR to E_BILLING_RESPONSE_JSON_PARSE_ERROR,
-        E_CONNECTION_CLOSED to E_CONNECTION_CLOSED,
-        E_SERVICE_DISCONNECTED to E_SERVICE_DISCONNECTED,
-        E_BILLING_UNAVAILABLE to E_BILLING_UNAVAILABLE,
-        E_FEATURE_NOT_SUPPORTED to E_FEATURE_NOT_SUPPORTED,
-        E_ITEM_NOT_OWNED to E_ITEM_NOT_OWNED,
-        E_EMPTY_SKU_LIST to E_EMPTY_SKU_LIST
-    )
-    
-    // Return cached map reference - no new allocations on repeated calls
-    fun toMap(): Map<String, String> = _cachedMap
-}
-
-/**
- * IAP Event constants
- */
-object OpenIapEvent {
-    const val PURCHASE_UPDATED = "purchase-updated"
-    const val PURCHASE_ERROR = "purchase-error"
-}
-
-/**
- * Other IAP-related constants (Promise keys, etc.)
- */
-object IapConstants {
-    const val PROMISE_BUY_ITEM = "PROMISE_BUY_ITEM"
-}