expo-iap 6.0.1 → 6.0.3

package/AGENTS.md

@@ -2,11 +2,9 @@
 
 ## Commit Message Convention
 
-- Follow the Angular Conventional Commits format: `<type>(<scope>): <subject>`
-- Allowed types: `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `chore`
-- Scope is optional but recommended (for example: `auth`, `api`, `ui`)
-- Subject must be imperative, lowercase, without a trailing period, and roughly 50 characters
-- Wrap commit body lines near 72 characters and include footers such as `BREAKING CHANGE:` or `Closes #123` when needed
+Follow the monorepo
+[Git Commit Message Format](../../knowledge/internal/06-git-deployment.md#git-commit-message-format)
+with the `expo` scope, e.g. `fix(expo): resolve purchase crash`.
 
 ## Tooling & Package Management
 

package/CONTRIBUTING.md

@@ -363,36 +363,8 @@ bun run lint:prettier
 
 ### Commit Messages
 
-Follow conventional commit format:
-
-```text
-type(scope): subject
-
-body
-
-footer
-```
-
-Types:
-
-- `feat`: new feature
-- `fix`: bug fix
-- `docs`: documentation changes
-- `style`: code style changes (formatting, etc.)
-- `refactor`: code refactoring
-- `test`: test additions or modifications
-- `chore`: maintenance tasks
-
-Example:
-
-```text
-feat(ios): add getStorefrontIos function
-
-Implements iOS-specific storefront retrieval using StoreKit.
-Follows platform-specific naming convention.
-
-Closes #123
-```
+Follow the monorepo's [Git Commit Message Format](https://github.com/hyodotdev/openiap/blob/main/knowledge/internal/06-git-deployment.md#git-commit-message-format),
+for example `feat(expo): add getAppTransactionIOS`.
 
 ### Pull Request Process
 

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

@@ -45,6 +45,15 @@ object ExpoIapHelper {
 
     internal fun serializeErrorEnvelope(payload: Map<String, Any?>): String = ERROR_ENVELOPE_PREFIX + JSONObject(payload).toString()
 
+    /** Rejects with the canonical error envelope that the JS bridge parses. */
+    internal fun rejectWithErrorEnvelope(
+        promise: Promise,
+        error: Exception,
+    ) {
+        val openIapError = error as? OpenIapError ?: OpenIapError.ServiceUnavailable(error.message)
+        promise.reject(openIapError.code, serializeErrorEnvelope(serializeOpenIapError(openIapError)), null)
+    }
+
     fun emitOrQueue(
         module: Module,
         scope: CoroutineScope,
@@ -282,7 +291,6 @@ object ExpoIapHelper {
         eventName: String,
         payload: Map<String, Any?>,
         eventPurchaseError: String,
-        fallbackErrorCode: String,
         fallbackErrorPrefix: String,
         logTag: String,
     ) {
@@ -292,7 +300,7 @@ object ExpoIapHelper {
             ExpoIapLog.failure("buffer/send $logTag", error)
             val errorPayload =
                 mapOf(
-                    "code" to fallbackErrorCode,
+                    "code" to OpenIapError.UnknownError.CODE,
                     "message" to "$fallbackErrorPrefix: ${error.message}",
                 )
             runCatching {
@@ -397,7 +405,6 @@ object ExpoIapHelper {
                     eventUserChoiceBilling,
                     details.toJson(),
                     eventPurchaseError,
-                    "alternative-billing-not-available",
                     "Failed to process user choice billing",
                     "USER_CHOICE_BILLING",
                 )
@@ -415,7 +422,6 @@ object ExpoIapHelper {
                     eventDeveloperProvidedBilling,
                     details.toJson(),
                     eventPurchaseError,
-                    "developer-billing-error",
                     "Failed to process developer provided billing",
                     "DEVELOPER_PROVIDED_BILLING",
                 )
@@ -433,7 +439,6 @@ object ExpoIapHelper {
                     eventSubscriptionBillingIssue,
                     purchase.toJson(),
                     eventPurchaseError,
-                    "subscription-billing-issue-error",
                     "Failed to process subscription billing issue",
                     "SUBSCRIPTION_BILLING_ISSUE",
                 )

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

@@ -25,6 +25,7 @@ import dev.hyo.openiap.VerifyPurchaseHorizonOptions
 import dev.hyo.openiap.VerifyPurchaseProps
 import dev.hyo.openiap.VerifyPurchaseWithProviderProps
 import dev.hyo.openiap.helpers.OpenIapFirstPurchaseNotice
+import dev.hyo.openiap.helpers.finishPurchaseToken
 import dev.hyo.openiap.store.OpenIapStore
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.exception.Exceptions
@@ -529,13 +530,13 @@ class ExpoIapModule : Module() {
                 ExpoIapLog.payload("acknowledgePurchaseAndroid", mapOf("token" to token))
                 scope.launch {
                     try {
-                        openIap.acknowledgePurchaseAndroid(token)
+                        openIap.finishPurchaseToken(token, isConsumable = false)
                         val response = mapOf("responseCode" to 0)
                         ExpoIapLog.result("acknowledgePurchaseAndroid", response)
                         promise.resolve(response)
                     } catch (e: Exception) {
                         ExpoIapLog.failure("acknowledgePurchaseAndroid", e)
-                        promise.reject((e as? OpenIapError)?.code ?: OpenIapError.ServiceUnavailable.CODE, e.message, null)
+                        ExpoIapHelper.rejectWithErrorEnvelope(promise, e)
                     }
                 }
             }
@@ -544,7 +545,7 @@ class ExpoIapModule : Module() {
                 ExpoIapLog.payload("consumePurchaseAndroid", mapOf("token" to token))
                 scope.launch {
                     try {
-                        openIap.consumePurchaseAndroid(token)
+                        openIap.finishPurchaseToken(token, isConsumable = true)
                         val response = mapOf("responseCode" to 0, "purchaseToken" to token)
                         ExpoIapLog.result(
                             "consumePurchaseAndroid",
@@ -553,7 +554,7 @@ class ExpoIapModule : Module() {
                         promise.resolve(response)
                     } catch (e: Exception) {
                         ExpoIapLog.failure("consumePurchaseAndroid", e)
-                        promise.reject((e as? OpenIapError)?.code ?: OpenIapError.ServiceUnavailable.CODE, e.message, null)
+                        ExpoIapHelper.rejectWithErrorEnvelope(promise, e)
                     }
                 }
             }

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/build/index.js

@@ -10,7 +10,8 @@ import { showFirstPurchaseNotice } from './utils/firstPurchaseNotice';
 import { restorePurchasesNative } from './utils/restorePurchases';
 import { decodeAndroidPurchases, decodeApplePurchases, } from './utils/availablePurchases';
 import { ErrorCode, resolveStoreId } from './types';
-import { createPurchaseError, createPurchaseErrorFromNativeException, OPENIAP_ERROR_ENVELOPE_PREFIX, } from './utils/errorMapping';
+import { createPurchaseError, normalizeErrorCodeFromNative, } from './utils/errorMapping';
+import { createPurchaseErrorFromNativeException, invokeNativeWithPurchaseError, } from './utils/nativeError';
 export * from './types';
 export * from './modules/android';
 export * from './modules/ios';
@@ -33,6 +34,8 @@ export var OpenIapEvent;
 const isStorePlatform = () => Platform.OS === 'ios' || Platform.OS === 'android';
 const isStoreRuntime = () => Platform.OS === 'ios' || isAndroidStoreRuntime();
 const unsupportedPlatformError = () => new Error(`Unsupported platform: ${Platform.OS}`);
+// Platform tag for PurchaseErrors built from native rejections.
+const nativePlatform = () => Platform.OS === 'ios' ? 'ios' : 'android';
 // Listener calls go to the raw native module (see getNativeModule), resolved
 // lazily so importing this module doesn't throw on unsupported platforms.
 export const emitter = {
@@ -185,8 +188,9 @@ export const purchaseUpdatedListener = (listener, options) => {
     };
 };
 export const purchaseErrorListener = (listener) => {
+    // Native events may carry codes outside ErrorCode; deliver canonical codes.
     const wrappedListener = (error) => {
-        listener(error);
+        listener({ ...error, code: normalizeErrorCodeFromNative(error.code) });
     };
     const emitterSubscription = emitter.addListener(OpenIapEvent.PurchaseError, wrappedListener);
     return emitterSubscription;
@@ -371,7 +375,7 @@ export const subscriptionBillingIssueListener = (listener) => {
  * @see {@link https://openiap.dev/docs/apis/init-connection}
  */
 export const initConnection = async (config) => {
-    const result = await ExpoIapModule.initConnection(config ?? null);
+    const result = await invokeNativeWithPurchaseError(() => ExpoIapModule.initConnection(config ?? null), nativePlatform());
     if (result === true &&
         Platform.OS === 'ios' &&
         nonDedupingPurchaseUpdatedListenerCountIOS > 0) {
@@ -385,38 +389,12 @@ export const initConnection = async (config) => {
  * @see {@link https://openiap.dev/docs/apis/end-connection}
  */
 export const endConnection = async () => {
-    const result = await ExpoIapModule.endConnection();
+    const result = await invokeNativeWithPurchaseError(() => ExpoIapModule.endConnection(), nativePlatform());
     if (result === true && Platform.OS === 'ios') {
         resetPurchaseUpdatedDedupeHistoryIOS();
     }
     return result;
 };
-const invokeNativeWithPurchaseError = async (operation, platform, fallback) => {
-    try {
-        return await operation();
-    }
-    catch (error) {
-        const nativeError = typeof error === 'object' && error !== null
-            ? error
-            : undefined;
-        const nativeMessage = typeof nativeError?.message === 'string'
-            ? nativeError.message
-            : typeof error === 'string'
-                ? error
-                : '';
-        const hasCanonicalFields = nativeMessage.includes(OPENIAP_ERROR_ENVELOPE_PREFIX) ||
-            nativeError?.code !== undefined ||
-            nativeError?.responseCode !== undefined ||
-            nativeError?.debugMessage !== undefined ||
-            nativeError?.productId !== undefined ||
-            nativeError?.productIds !== undefined;
-        // Preserve the identity of unrelated JavaScript errors (including adapter
-        // or test errors) while normalizing native OpenIAP rejections.
-        if (!hasCanonicalFields)
-            throw error;
-        throw createPurchaseErrorFromNativeException(error, platform, fallback);
-    }
-};
 /**
  * Retrieve products or subscriptions from the store by SKU.
  *
@@ -525,10 +503,10 @@ export const getAvailablePurchases = async (options) => {
     }
     let purchases;
     if (Platform.OS === 'ios') {
-        purchases = (await ExpoIapModule.getAvailableItems(normalizedOptions.alsoPublishToEventListenerIOS, normalizedOptions.onlyIncludeActiveItemsIOS));
+        purchases = (await invokeNativeWithPurchaseError(() => ExpoIapModule.getAvailableItems(normalizedOptions.alsoPublishToEventListenerIOS, normalizedOptions.onlyIncludeActiveItemsIOS), 'ios'));
     }
     else if (Platform.OS === 'android') {
-        purchases = (await ExpoIapModule.getAvailableItems(normalizedOptions));
+        purchases = (await invokeNativeWithPurchaseError(() => ExpoIapModule.getAvailableItems(normalizedOptions), 'android'));
     }
     else {
         throw unsupportedPlatformError();
@@ -567,7 +545,7 @@ export const getActiveSubscriptions = async (subscriptionIds) => {
     if (!isStoreRuntime()) {
         throw unsupportedPlatformError();
     }
-    const result = await ExpoIapModule.getActiveSubscriptions(subscriptionIds ?? null);
+    const result = await invokeNativeWithPurchaseError(() => ExpoIapModule.getActiveSubscriptions(subscriptionIds ?? null), nativePlatform());
     return (result ?? []);
 };
 /**
@@ -591,7 +569,7 @@ export const hasActiveSubscriptions = async (subscriptionIds) => {
     if (!isStoreRuntime()) {
         throw unsupportedPlatformError();
     }
-    return !!(await ExpoIapModule.hasActiveSubscriptions(subscriptionIds ?? null));
+    return !!(await invokeNativeWithPurchaseError(() => ExpoIapModule.hasActiveSubscriptions(subscriptionIds ?? null), nativePlatform()));
 };
 /**
  * Return the user's storefront country code.
@@ -605,7 +583,7 @@ export const getStorefront = async () => {
             message: `Storefront lookup is not supported on ${Platform.OS}.`,
         });
     }
-    const platform = Platform.OS === 'ios' ? 'ios' : 'android';
+    const platform = nativePlatform();
     if (typeof ExpoIapModule.getStorefront !== 'function') {
         throw createPurchaseError({
             code: ErrorCode.FeatureNotSupported,
@@ -673,7 +651,7 @@ export const verifyAppOwnership = async (options) => {
                     : 'unknown',
         };
     }
-    return invokeNativeWithPurchaseError(() => ExpoIapModule.verifyAppOwnership(options ?? {}), Platform.OS === 'ios' ? 'ios' : 'android', {
+    return invokeNativeWithPurchaseError(() => ExpoIapModule.verifyAppOwnership(options ?? {}), nativePlatform(), {
         code: ErrorCode.ServiceError,
     });
 };
@@ -858,9 +836,10 @@ export const requestPurchase = async (args) => {
 export const finishTransaction = async ({ purchase, isConsumable, }) => {
     // The schema allows explicit null; the native boolean cannot take it.
     const consumable = isConsumable ?? false;
+    const platform = nativePlatform();
     if (Platform.OS === 'ios' ||
         (isAndroidStoreRuntime() && purchase.store === 'unknown')) {
-        await ExpoIapModule.finishTransaction(purchase, consumable);
+        await invokeNativeWithPurchaseError(() => ExpoIapModule.finishTransaction(purchase, consumable), platform, { productId: purchase.productId });
     }
     else if (isAndroidStoreRuntime()) {
         const token = purchase.purchaseToken ?? undefined;
@@ -872,12 +851,10 @@ export const finishTransaction = async ({ purchase, isConsumable, }) => {
                 platform: 'android',
             });
         }
-        if (consumable) {
-            await ExpoIapModule.consumePurchaseAndroid(token);
-        }
-        else {
-            await ExpoIapModule.acknowledgePurchaseAndroid(token);
-        }
+        // Native rejects when the store refuses the token, so a failure cannot pass as finished.
+        await invokeNativeWithPurchaseError(() => consumable
+            ? ExpoIapModule.consumePurchaseAndroid(token)
+            : ExpoIapModule.acknowledgePurchaseAndroid(token), 'android', { productId: purchase.productId });
     }
     else {
         throw unsupportedPlatformError();
@@ -949,7 +926,7 @@ export const openRedeemOfferCode = async () => {
     if (Platform.OS !== 'ios' && !isAndroidStoreRuntime()) {
         throw unsupportedPlatformError();
     }
-    return invokeNativeWithPurchaseError(() => ExpoIapModule.openRedeemOfferCode(), Platform.OS === 'ios' ? 'ios' : 'android', { code: ErrorCode.PurchaseError, message: 'Failed to redeem offer code.' });
+    return invokeNativeWithPurchaseError(() => ExpoIapModule.openRedeemOfferCode(), nativePlatform(), { code: ErrorCode.PurchaseError, message: 'Failed to redeem offer code.' });
 };
 /**
  * Verify purchase with the configured providers.
@@ -963,7 +940,8 @@ export const verifyPurchase = async (options) => {
     if (!isStorePlatform()) {
         throw unsupportedPlatformError();
     }
-    return ExpoIapModule.verifyPurchase(options);
+    // The native result is already the flat union member, with `__typename`.
+    return invokeNativeWithPurchaseError(() => ExpoIapModule.verifyPurchase(options), nativePlatform());
 };
 /**
  * Verify purchase with a specific provider (e.g., IAPKit).
@@ -1021,7 +999,7 @@ export const verifyPurchaseWithProvider = async (options) => {
                 'Or provide apiKey directly in verifyPurchaseWithProvider options.');
         }
     }
-    const result = await ExpoIapModule.verifyPurchaseWithProvider(resolvedOptions);
+    const result = await invokeNativeWithPurchaseError(() => ExpoIapModule.verifyPurchaseWithProvider(resolvedOptions), nativePlatform());
     if (result.iapkit == null) {
         return result;
     }