expo-iap 3.0.2 → 3.0.3

package/src/utils/errorMapping.ts

@@ -5,21 +5,27 @@
 
 import {ErrorCode} from '../ExpoIap.types';
 
-/**
- * Checks if an error is a user cancellation
- * @param error Error object or error code
- * @returns True if the error represents user cancellation
- */
-export function isUserCancelledError(error: any): boolean {
+type ErrorLike = string | {code?: ErrorCode | string; message?: string};
+
+function extractCode(error: unknown): string | undefined {
   if (typeof error === 'string') {
-    return error === ErrorCode.E_USER_CANCELLED;
+    return error;
   }
 
-  if (error && error.code) {
-    return error.code === ErrorCode.E_USER_CANCELLED;
+  if (error && typeof error === 'object' && 'code' in error) {
+    return (error as {code?: string}).code;
   }
 
-  return false;
+  return undefined;
+}
+
+/**
+ * Checks if an error is a user cancellation
+ * @param error Error object or error code
+ * @returns True if the error represents user cancellation
+ */
+export function isUserCancelledError(error: unknown): boolean {
+  return extractCode(error) === ErrorCode.UserCancelled;
 }
 
 /**
@@ -27,17 +33,17 @@ export function isUserCancelledError(error: any): boolean {
  * @param error Error object or error code
  * @returns True if the error is network-related
  */
-export function isNetworkError(error: any): boolean {
-  const networkErrors = [
-    ErrorCode.E_NETWORK_ERROR,
-    ErrorCode.E_REMOTE_ERROR,
-    ErrorCode.E_SERVICE_ERROR,
-    ErrorCode.E_SERVICE_DISCONNECTED,
-    ErrorCode.E_BILLING_UNAVAILABLE,
+export function isNetworkError(error: unknown): boolean {
+  const networkErrors: ErrorCode[] = [
+    ErrorCode.NetworkError,
+    ErrorCode.RemoteError,
+    ErrorCode.ServiceError,
+    ErrorCode.ServiceDisconnected,
+    ErrorCode.BillingUnavailable,
   ];
 
-  const errorCode = typeof error === 'string' ? error : error?.code;
-  return networkErrors.includes(errorCode);
+  const code = extractCode(error);
+  return !!code && (networkErrors as string[]).includes(code);
 }
 
 /**
@@ -45,20 +51,20 @@ export function isNetworkError(error: any): boolean {
  * @param error Error object or error code
  * @returns True if the error is potentially recoverable
  */
-export function isRecoverableError(error: any): boolean {
-  const recoverableErrors = [
-    ErrorCode.E_NETWORK_ERROR,
-    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,
+export function isRecoverableError(error: unknown): boolean {
+  const recoverableErrors: ErrorCode[] = [
+    ErrorCode.NetworkError,
+    ErrorCode.RemoteError,
+    ErrorCode.ServiceError,
+    ErrorCode.Interrupted,
+    ErrorCode.ServiceDisconnected,
+    ErrorCode.BillingUnavailable,
+    ErrorCode.QueryProduct,
+    ErrorCode.InitConnection,
   ];
 
-  const errorCode = typeof error === 'string' ? error : error?.code;
-  return recoverableErrors.includes(errorCode);
+  const code = extractCode(error);
+  return !!code && (recoverableErrors as string[]).includes(code);
 }
 
 /**
@@ -66,49 +72,56 @@ export function isRecoverableError(error: any): boolean {
  * @param error Error object or error code
  * @returns User-friendly error message
  */
-export function getUserFriendlyErrorMessage(error: any): string {
-  const errorCode = typeof error === 'string' ? error : error?.code;
+export function getUserFriendlyErrorMessage(error: ErrorLike): string {
+  const errorCode = extractCode(error);
 
   switch (errorCode) {
-    case ErrorCode.E_USER_CANCELLED:
+    case ErrorCode.UserCancelled:
       return 'Purchase was cancelled by user';
-    case ErrorCode.E_NETWORK_ERROR:
+    case ErrorCode.NetworkError:
       return 'Network connection error. Please check your internet connection and try again.';
-    case ErrorCode.E_RECEIPT_FINISHED:
+    case ErrorCode.ReceiptFinished:
       return 'Receipt already finished';
-    case ErrorCode.E_SERVICE_DISCONNECTED:
+    case ErrorCode.ServiceDisconnected:
       return 'Billing service disconnected. Please try again.';
-    case ErrorCode.E_BILLING_UNAVAILABLE:
+    case ErrorCode.BillingUnavailable:
       return 'Billing is unavailable on this device or account.';
-    case ErrorCode.E_ITEM_UNAVAILABLE:
+    case ErrorCode.ItemUnavailable:
       return 'This item is not available for purchase';
-    case ErrorCode.E_ITEM_NOT_OWNED:
+    case ErrorCode.ItemNotOwned:
       return "You don't own this item";
-    case ErrorCode.E_ALREADY_OWNED:
+    case ErrorCode.AlreadyOwned:
       return 'You already own this item';
-    case ErrorCode.E_SKU_NOT_FOUND:
+    case ErrorCode.SkuNotFound:
       return 'Requested product could not be found';
-    case ErrorCode.E_SKU_OFFER_MISMATCH:
+    case ErrorCode.SkuOfferMismatch:
       return 'Selected offer does not match the SKU';
-    case ErrorCode.E_DEFERRED_PAYMENT:
+    case ErrorCode.DeferredPayment:
       return 'Payment is pending approval';
-    case ErrorCode.E_NOT_PREPARED:
+    case ErrorCode.NotPrepared:
       return 'In-app purchase is not ready. Please try again later.';
-    case ErrorCode.E_SERVICE_ERROR:
+    case ErrorCode.ServiceError:
       return 'Store service error. Please try again later.';
-    case ErrorCode.E_FEATURE_NOT_SUPPORTED:
+    case ErrorCode.FeatureNotSupported:
       return 'This feature is not supported on this device.';
-    case ErrorCode.E_TRANSACTION_VALIDATION_FAILED:
+    case ErrorCode.TransactionValidationFailed:
       return 'Transaction could not be verified';
-    case ErrorCode.E_RECEIPT_FAILED:
+    case ErrorCode.ReceiptFailed:
       return 'Receipt processing failed';
-    case ErrorCode.E_EMPTY_SKU_LIST:
+    case ErrorCode.EmptySkuList:
       return 'No product IDs provided';
-    case ErrorCode.E_INIT_CONNECTION:
+    case ErrorCode.InitConnection:
       return 'Failed to initialize billing connection';
-    case ErrorCode.E_QUERY_PRODUCT:
+    case ErrorCode.QueryProduct:
       return 'Failed to query products. Please try again later.';
-    default:
-      return error?.message || 'An unexpected error occurred';
+    default: {
+      if (error && typeof error === 'object' && 'message' in error) {
+        return (
+          (error as {message?: string}).message ??
+          'An unexpected error occurred'
+        );
+      }
+      return 'An unexpected error occurred';
+    }
   }
 }