expo-iap 3.0.8 → 3.1.1-rc.1

package/scripts/update-types.mjs

@@ -3,8 +3,27 @@ import {mkdtempSync, readFileSync, writeFileSync, rmSync} from 'node:fs';
 import {join} from 'node:path';
 import {tmpdir} from 'node:os';
 import {execFileSync} from 'node:child_process';
+import {fileURLToPath, URL} from 'node:url';
+
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
+let versions;
+try {
+  versions = JSON.parse(
+    readFileSync(join(__dirname, '..', 'openiap-versions.json'), 'utf8'),
+  );
+} catch {
+  throw new Error(
+    'expo-iap: Unable to load openiap-versions.json. Ensure the file exists and is valid JSON.',
+  );
+}
+
+const DEFAULT_TAG = versions?.gql;
+if (typeof DEFAULT_TAG !== 'string' || DEFAULT_TAG.length === 0) {
+  throw new Error(
+    'expo-iap: "gql" version missing in openiap-versions.json. Specify --tag manually or update the file.',
+  );
+}
 
-const DEFAULT_TAG = '1.0.1';
 const PROJECT_ROOT = process.cwd();
 
 function parseArgs() {

package/src/ExpoIapModule.ts

@@ -1,10 +1,51 @@
-import {requireNativeModule} from 'expo-modules-core';
+import {requireNativeModule, UnavailabilityError} from 'expo-modules-core';
 
-// It loads the native module object from the JSI or falls back to
-// the bridge module (from NativeModulesProxy) if the remote debugger is on.
-const ExpoIapModule = requireNativeModule('ExpoIap');
+type NativeIapModuleName = 'ExpoIapOnside' | 'ExpoIap';
+
+const {module: ExpoIapModule, name: resolvedNativeModuleName} =
+  resolveNativeModule();
+
+export const USING_ONSIDE_SDK = resolvedNativeModuleName === 'ExpoIapOnside';
 
 // Platform-specific error codes from native modules
 export const NATIVE_ERROR_CODES = ExpoIapModule.ERROR_CODES || {};
 
 export default ExpoIapModule;
+
+function resolveNativeModule(): {
+  module: any;
+  name: NativeIapModuleName;
+} {
+  const candidates: NativeIapModuleName[] = ['ExpoIapOnside', 'ExpoIap'];
+
+  for (const name of candidates) {
+    try {
+      const module = requireNativeModule(name);
+      return {module, name};
+    } catch (error) {
+      if (name === 'ExpoIapOnside' && isMissingModuleError(error, name)) {
+        // Onside module is optional. If unavailable, fall back to ExpoIap.
+        continue;
+      }
+
+      throw error;
+    }
+  }
+
+  throw new UnavailabilityError(
+    'expo-iap',
+    'ExpoIap native module is unavailable',
+  );
+}
+
+function isMissingModuleError(error: unknown, moduleName: string): boolean {
+  if (error instanceof UnavailabilityError) {
+    return true;
+  }
+
+  if (error instanceof Error) {
+    return error.message.includes(`Cannot find native module '${moduleName}'`);
+  }
+
+  return false;
+}

package/src/index.ts

@@ -9,6 +9,7 @@ import {
   validateReceiptIOS,
   deepLinkToSubscriptionsIOS,
   syncIOS,
+  getStorefrontIOS,
 } from './modules/ios';
 import {
   isProductAndroid,
@@ -22,14 +23,12 @@ import type {
   DeepLinkOptions,
   FetchProductsResult,
   MutationField,
+  MutationRequestPurchaseArgs,
   MutationValidateReceiptArgs,
   Product,
-  ProductAndroid,
-  ProductIOS,
   ProductQueryType,
   ProductSubscription,
   Purchase,
-  PurchaseInput,
   PurchaseOptions,
   QueryField,
   RequestPurchasePropsByPlatforms,
@@ -38,15 +37,12 @@ import type {
   RequestSubscriptionPropsByPlatforms,
   RequestSubscriptionAndroidProps,
   RequestSubscriptionIosProps,
-  DiscountOfferInputIOS,
 } from './types';
 import {ErrorCode} from './types';
-import {PurchaseError} from './purchase-error';
-import {normalizePurchaseId, normalizePurchaseList} from './utils/purchase';
+import {createPurchaseError, type PurchaseError} from './utils/errorMapping';
 
 // Export all types
 export * from './types';
-export {ErrorCodeUtils, ErrorCodeMapping} from './purchase-error';
 export * from './modules/android';
 export * from './modules/ios';
 
@@ -57,18 +53,12 @@ export {
 } from './helpers/subscription';
 
 // Get the native constant value
-export const PI = ExpoIapModule.PI;
-
 export enum OpenIapEvent {
   PurchaseUpdated = 'purchase-updated',
   PurchaseError = 'purchase-error',
   PromotedProductIOS = 'promoted-product-ios',
 }
 
-export function setValueAsync(value: string) {
-  return ExpoIapModule.setValueAsync(value);
-}
-
 type ExpoIapEventPayloads = {
   [OpenIapEvent.PurchaseUpdated]: Purchase;
   [OpenIapEvent.PurchaseError]: PurchaseError;
@@ -109,7 +99,7 @@ const normalizeProductType = (type?: ProductTypeInput) => {
   if (!type || type === 'inapp' || type === 'in-app') {
     return {
       canonical: 'in-app' as ProductQueryType,
-      native: 'inapp' as const,
+      native: 'in-app' as const,
     };
   }
   if (type === 'subs') {
@@ -127,36 +117,47 @@ const normalizeProductType = (type?: ProductTypeInput) => {
   throw new Error(`Unsupported product type: ${type}`);
 };
 
+const normalizePurchasePlatform = (purchase: Purchase): Purchase => {
+  const platform = purchase.platform;
+  if (typeof platform !== 'string') {
+    return purchase;
+  }
+
+  const lowered = platform.toLowerCase();
+  if (lowered === platform || (lowered !== 'ios' && lowered !== 'android')) {
+    return purchase;
+  }
+
+  return {...purchase, platform: lowered};
+};
+
+const normalizePurchaseArray = (purchases: Purchase[]): Purchase[] =>
+  purchases.map((purchase) => normalizePurchasePlatform(purchase));
+
 export const purchaseUpdatedListener = (
   listener: (event: Purchase) => void,
 ) => {
-  console.log('[JS] Registering purchaseUpdatedListener');
   const wrappedListener = (event: Purchase) => {
-    const normalized = normalizePurchaseId(event);
-    console.log('[JS] purchaseUpdatedListener fired:', normalized);
+    const normalized = normalizePurchasePlatform(event);
     listener(normalized);
   };
   const emitterSubscription = emitter.addListener(
     OpenIapEvent.PurchaseUpdated,
     wrappedListener,
   );
-  console.log('[JS] purchaseUpdatedListener registered successfully');
   return emitterSubscription;
 };
 
 export const purchaseErrorListener = (
   listener: (error: PurchaseError) => void,
 ) => {
-  console.log('[JS] Registering purchaseErrorListener');
   const wrappedListener = (error: PurchaseError) => {
-    console.log('[JS] purchaseErrorListener fired:', error);
     listener(error);
   };
   const emitterSubscription = emitter.addListener(
     OpenIapEvent.PurchaseError,
     wrappedListener,
   );
-  console.log('[JS] purchaseErrorListener registered successfully');
   return emitterSubscription;
 };
 
@@ -206,10 +207,11 @@ export const endConnection: MutationField<'endConnection'> = async () =>
  * @param request.type - Product query type: 'in-app', 'subs', or 'all'
  */
 export const fetchProducts: QueryField<'fetchProducts'> = async (request) => {
+  console.log('fetchProducts called with:', request);
   const {skus, type} = request ?? {};
 
   if (!Array.isArray(skus) || skus.length === 0) {
-    throw new PurchaseError({
+    throw createPurchaseError({
       message: 'No SKUs provided',
       code: ErrorCode.EmptySkuList,
     });
@@ -223,22 +225,22 @@ export const fetchProducts: QueryField<'fetchProducts'> = async (request) => {
   const filterIosItems = (
     items: unknown[],
   ): Product[] | ProductSubscription[] =>
-    items.filter((item): item is ProductIOS | ProductSubscription => {
+    items.filter((item): item is Product | ProductSubscription => {
       if (!isProductIOS(item)) {
         return false;
       }
-      const candidate = item as ProductIOS | ProductSubscription;
+      const candidate = item as Product | ProductSubscription;
       return typeof candidate.id === 'string' && skuSet.has(candidate.id);
     });
 
   const filterAndroidItems = (
     items: unknown[],
   ): Product[] | ProductSubscription[] =>
-    items.filter((item): item is ProductAndroid | ProductSubscription => {
+    items.filter((item): item is Product | ProductSubscription => {
       if (!isProductAndroid(item)) {
         return false;
       }
-      const candidate = item as ProductAndroid | ProductSubscription;
+      const candidate = item as Product | ProductSubscription;
       return typeof candidate.id === 'string' && skuSet.has(candidate.id);
     });
 
@@ -287,44 +289,18 @@ export const getAvailablePurchases: QueryField<
     }) ?? (() => Promise.resolve([] as Purchase[]));
 
   const purchases = await resolvePurchases();
-  return normalizePurchaseList(purchases);
+  return normalizePurchaseArray(purchases as Purchase[]);
 };
 
-/**
- * Restore completed transactions (cross-platform behavior)
- *
- * - iOS: perform a lightweight sync to refresh transactions and ignore sync errors,
- *   then fetch available purchases to surface restored items to the app.
- * - Android: simply fetch available purchases (restoration happens via query).
- *
- * This helper returns the restored/available purchases so callers can update UI/state.
- *
- * @param options.alsoPublishToEventListenerIOS - iOS only: whether to also publish to the event listener
- * @param options.onlyIncludeActiveItemsIOS - iOS only: whether to only include active items
- * @returns Promise resolving to the list of available/restored purchases
- */
-export const restorePurchases: MutationField<'restorePurchases'> = async () => {
-  if (Platform.OS === 'ios') {
-    await syncIOS().catch(() => undefined);
+export const getStorefront: QueryField<'getStorefrontIOS'> = async () => {
+  // Cross-platform storefront
+  if (Platform.OS === 'android') {
+    if (typeof ExpoIapModule.getStorefrontAndroid === 'function') {
+      return ExpoIapModule.getStorefrontAndroid();
+    }
+    return '';
   }
-
-  await getAvailablePurchases({
-    alsoPublishToEventListenerIOS: false,
-    onlyIncludeActiveItemsIOS: true,
-  });
-};
-
-const offerToRecordIOS = (
-  offer: DiscountOfferInputIOS | undefined,
-): Record<keyof DiscountOfferInputIOS, string> | undefined => {
-  if (!offer) return undefined;
-  return {
-    identifier: offer.identifier,
-    keyIdentifier: offer.keyIdentifier,
-    nonce: offer.nonce,
-    signature: offer.signature,
-    timestamp: offer.timestamp.toString(),
-  };
+  return getStorefrontIOS();
 };
 
 /**
@@ -403,24 +379,35 @@ export const requestPurchase: MutationField<'requestPurchase'> = async (
       );
     }
 
-    const {
-      sku,
-      andDangerouslyFinishTransactionAutomatically = false,
-      appAccountToken,
-      quantity,
-      withOffer,
-    } = normalizedRequest;
-
-    const offer = offerToRecordIOS(withOffer ?? undefined);
-    const purchase = await ExpoIapModule.requestPurchase({
-      sku,
-      andDangerouslyFinishTransactionAutomatically,
-      appAccountToken,
-      quantity,
-      withOffer: offer,
-    });
+    let payload: MutationRequestPurchaseArgs;
+    if (canonical === 'in-app') {
+      payload = {
+        type: 'in-app',
+        request: request as RequestPurchasePropsByPlatforms,
+      };
+    } else if (canonical === 'subs') {
+      payload = {
+        type: 'subs',
+        request: request as RequestSubscriptionPropsByPlatforms,
+      };
+    } else {
+      throw new Error(`Unsupported product type: ${canonical}`);
+    }
+
+    const purchase = (await ExpoIapModule.requestPurchase(payload)) as
+      | Purchase
+      | Purchase[]
+      | null;
+
+    if (Array.isArray(purchase)) {
+      return normalizePurchaseArray(purchase);
+    }
 
-    return normalizePurchaseId(purchase as Purchase);
+    if (purchase) {
+      return normalizePurchasePlatform(purchase);
+    }
+
+    return canonical === 'subs' ? [] : null;
   }
 
   if (Platform.OS === 'android') {
@@ -454,7 +441,7 @@ export const requestPurchase: MutationField<'requestPurchase'> = async (
         isOfferPersonalized: isOfferPersonalized ?? false,
       })) as Purchase[];
 
-      return normalizePurchaseList(result);
+      return normalizePurchaseArray(result);
     }
 
     if (canonical === 'subs') {
@@ -497,7 +484,7 @@ export const requestPurchase: MutationField<'requestPurchase'> = async (
         isOfferPersonalized: isOfferPersonalized ?? false,
       })) as Purchase[];
 
-      return normalizePurchaseList(result);
+      return normalizePurchaseArray(result);
     }
 
     throw new Error(
@@ -508,43 +495,23 @@ export const requestPurchase: MutationField<'requestPurchase'> = async (
   throw new Error('Platform not supported');
 };
 
-const toPurchaseInput = (
-  purchase: Purchase | PurchaseInput,
-): PurchaseInput => ({
-  id: purchase.id,
-  ids: purchase.ids ?? undefined,
-  isAutoRenewing: purchase.isAutoRenewing,
-  platform: purchase.platform,
-  productId: purchase.productId,
-  purchaseState: purchase.purchaseState,
-  purchaseToken: purchase.purchaseToken ?? null,
-  quantity: purchase.quantity,
-  transactionDate: purchase.transactionDate,
-});
-
 export const finishTransaction: MutationField<'finishTransaction'> = async ({
   purchase,
   isConsumable = false,
 }) => {
-  const normalizedPurchase = toPurchaseInput(purchase);
-
   if (Platform.OS === 'ios') {
-    const transactionId = normalizedPurchase.id;
-    if (!transactionId) {
-      throw new Error('purchase.id required to finish iOS transaction');
-    }
-    await ExpoIapModule.finishTransaction(transactionId);
+    await ExpoIapModule.finishTransaction(purchase, isConsumable);
     return;
   }
 
   if (Platform.OS === 'android') {
-    const token = normalizedPurchase.purchaseToken ?? undefined;
+    const token = purchase.purchaseToken ?? undefined;
 
     if (!token) {
-      throw new PurchaseError({
+      throw createPurchaseError({
         message: 'Purchase token is required to finish transaction',
         code: ErrorCode.DeveloperError,
-        productId: normalizedPurchase.productId,
+        productId: purchase.productId,
         platform: 'android',
       });
     }
@@ -562,43 +529,58 @@ export const finishTransaction: MutationField<'finishTransaction'> = async ({
 };
 
 /**
- * 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
+ * Restore completed transactions (cross-platform behavior)
  *
- * @example
- * ```typescript
- * const storefront = await getStorefrontIOS();
- * console.log(storefront); // 'US'
- * ```
+ * - iOS: perform a lightweight sync to refresh transactions and ignore sync errors,
+ *   then fetch available purchases to surface restored items to the app.
+ * - Android: simply fetch available purchases (restoration happens via query).
  *
- * @platform iOS
+ * This helper triggers the refresh flows but does not return the purchases; consumers should
+ * call `getAvailablePurchases` or rely on hook state to inspect the latest items.
  */
-export const getStorefrontIOS = (): Promise<string> => {
-  if (Platform.OS !== 'ios') {
-    console.warn('getStorefrontIOS: This method is only available on iOS');
-    return Promise.resolve('');
+export const restorePurchases: MutationField<'restorePurchases'> = async () => {
+  if (Platform.OS === 'ios') {
+    await syncIOS().catch(() => undefined);
   }
-  return ExpoIapModule.getStorefrontIOS();
+
+  await getAvailablePurchases({
+    alsoPublishToEventListenerIOS: false,
+    onlyIncludeActiveItemsIOS: true,
+  });
 };
 
 /**
- * Gets the storefront country code from the underlying native store.
- * Returns a two-letter country code such as 'US', 'KR', or empty string on failure.
+ * Deeplinks to native interface that allows users to manage their subscriptions
+ * @param options.skuAndroid - Required for Android to locate specific subscription (ignored on iOS)
+ * @param options.packageNameAndroid - Required for Android to identify your app (ignored on iOS)
+ *
+ * @returns Promise that resolves when the deep link is successfully opened
+ *
+ * @throws {Error} When called on unsupported platform or when required Android parameters are missing
+ *
+ * @example
+ * import { deepLinkToSubscriptions } from 'expo-iap';
  *
- * @platform ios
- * @platform android
+ * // Works on both iOS and Android
+ * await deepLinkToSubscriptions({
+ *   skuAndroid: 'your_subscription_sku',
+ *   packageNameAndroid: 'com.example.app'
+ * });
  */
-export const getStorefront = (): Promise<string> => {
-  // Cross-platform storefront
+export const deepLinkToSubscriptions: MutationField<
+  'deepLinkToSubscriptions'
+> = async (options) => {
+  if (Platform.OS === 'ios') {
+    await deepLinkToSubscriptionsIOS();
+    return;
+  }
+
   if (Platform.OS === 'android') {
-    if (typeof ExpoIapModule.getStorefrontAndroid === 'function') {
-      return ExpoIapModule.getStorefrontAndroid();
-    }
-    return Promise.resolve('');
+    await deepLinkToSubscriptionsAndroid((options as DeepLinkOptions) ?? null);
+    return;
   }
-  return getStorefrontIOS();
+
+  throw new Error(`Unsupported platform: ${Platform.OS}`);
 };
 
 /**
@@ -641,39 +623,14 @@ export const validateReceipt: MutationField<'validateReceipt'> = async (
   throw new Error('Platform not supported');
 };
 
-/**
- * Deeplinks to native interface that allows users to manage their subscriptions
- * @param options.skuAndroid - Required for Android to locate specific subscription (ignored on iOS)
- * @param options.packageNameAndroid - Required for Android to identify your app (ignored on iOS)
- *
- * @returns Promise that resolves when the deep link is successfully opened
- *
- * @throws {Error} When called on unsupported platform or when required Android parameters are missing
- *
- * @example
- * import { deepLinkToSubscriptions } from 'expo-iap';
- *
- * // Works on both iOS and Android
- * await deepLinkToSubscriptions({
- *   skuAndroid: 'your_subscription_sku',
- *   packageNameAndroid: 'com.example.app'
- * });
- */
-export const deepLinkToSubscriptions: MutationField<
-  'deepLinkToSubscriptions'
-> = async (options) => {
-  if (Platform.OS === 'ios') {
-    await deepLinkToSubscriptionsIOS();
-    return;
-  }
-
-  if (Platform.OS === 'android') {
-    await deepLinkToSubscriptionsAndroid((options as DeepLinkOptions) ?? null);
-    return;
-  }
-
-  throw new Error(`Unsupported platform: ${Platform.OS}`);
-};
-
 export * from './useIAP';
-export * from './utils/errorMapping';
+export {
+  ErrorCodeUtils,
+  ErrorCodeMapping,
+  createPurchaseError,
+  createPurchaseErrorFromPlatform,
+} from './utils/errorMapping';
+export type {
+  PurchaseError as ExpoPurchaseError,
+  PurchaseErrorProps,
+} from './utils/errorMapping';

package/src/modules/android.ts

@@ -19,7 +19,8 @@ export function isProductAndroid<T extends {platform?: string}>(
     item != null &&
     typeof item === 'object' &&
     'platform' in item &&
-    (item as any).platform === 'android'
+    typeof (item as any).platform === 'string' &&
+    (item as any).platform.toLowerCase() === 'android'
   );
 }
 

package/src/modules/ios.ts

@@ -15,9 +15,8 @@ import type {
   ReceiptValidationResultIOS,
   SubscriptionStatusIOS,
 } from '../types';
-import type {PurchaseError} from '../purchase-error';
-import {Linking} from 'react-native';
-import {normalizePurchaseId, normalizePurchaseList} from '../utils/purchase';
+import type {PurchaseError} from '../utils/errorMapping';
+import {Linking, Platform} from 'react-native';
 
 export type TransactionEvent = {
   transaction?: Purchase;
@@ -34,7 +33,8 @@ export function isProductIOS<T extends {platform?: string}>(
     item != null &&
     typeof item === 'object' &&
     'platform' in item &&
-    (item as any).platform === 'ios'
+    typeof (item as any).platform === 'string' &&
+    (item as any).platform.toLowerCase() === 'ios'
   );
 }
 
@@ -105,7 +105,7 @@ export const currentEntitlementIOS: QueryField<
     throw new Error('currentEntitlementIOS requires a SKU');
   }
   const purchase = await ExpoIapModule.currentEntitlementIOS(sku);
-  return normalizePurchaseId((purchase ?? null) as PurchaseIOS | null);
+  return (purchase ?? null) as PurchaseIOS | null;
 };
 
 /**
@@ -124,7 +124,7 @@ export const latestTransactionIOS: QueryField<'latestTransactionIOS'> = async (
     throw new Error('latestTransactionIOS requires a SKU');
   }
   const transaction = await ExpoIapModule.latestTransactionIOS(sku);
-  return normalizePurchaseId((transaction ?? null) as PurchaseIOS | null);
+  return (transaction ?? null) as PurchaseIOS | null;
 };
 
 /**
@@ -159,7 +159,7 @@ export const showManageSubscriptionsIOS: MutationField<
   'showManageSubscriptionsIOS'
 > = async () => {
   const purchases = await ExpoIapModule.showManageSubscriptionsIOS();
-  return normalizePurchaseList((purchases ?? []) as PurchaseIOS[]);
+  return (purchases ?? []) as PurchaseIOS[];
 };
 
 /**
@@ -178,6 +178,28 @@ export const getReceiptDataIOS: QueryField<'getReceiptDataIOS'> = async () => {
 
 export const getReceiptIOS = getReceiptDataIOS;
 
+/**
+ * Retrieves the current storefront information from the 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: QueryField<'getStorefrontIOS'> = async () => {
+  if (Platform.OS !== 'ios') {
+    console.warn('getStorefrontIOS: This method is only available on iOS');
+    return '';
+  }
+  return ExpoIapModule.getStorefrontIOS();
+};
+
 /**
  * Check if a transaction is verified through StoreKit 2.
  * StoreKit 2 performs local verification of transaction JWS signatures.
@@ -242,19 +264,9 @@ const validateReceiptIOSImpl = async (
     throw new Error('validateReceiptIOS requires a SKU');
   }
 
-  const result = (await ExpoIapModule.validateReceiptIOS(
+  return (await ExpoIapModule.validateReceiptIOS(
     sku,
   )) as ReceiptValidationResultIOS;
-  const normalizedLatest = normalizePurchaseId(
-    result.latestTransaction ?? undefined,
-  );
-  if (normalizedLatest === result.latestTransaction) {
-    return result;
-  }
-  return {
-    ...result,
-    latestTransaction: normalizedLatest ?? null,
-  };
 };
 
 export const validateReceiptIOS =
@@ -340,7 +352,7 @@ export const getPendingTransactionsIOS: QueryField<
   'getPendingTransactionsIOS'
 > = async () => {
   const transactions = await ExpoIapModule.getPendingTransactionsIOS();
-  return normalizePurchaseList((transactions ?? []) as PurchaseIOS[]);
+  return (transactions ?? []) as PurchaseIOS[];
 };
 
 /**