react-native-iap 15.3.5 → 15.4.0-rc.1

package/src/types.ts

@@ -511,7 +511,7 @@ export type IapEvent = 'purchase-updated' | 'purchase-error' | 'promoted-product
 
 export type IapPlatform = 'ios' | 'android';
 
-export type IapStore = 'unknown' | 'apple' | 'google' | 'horizon';
+export type IapStore = 'unknown' | 'apple' | 'google' | 'horizon' | 'amazon';
 
 /** Unified purchase states from IAPKit verification response. */
 export type IapkitPurchaseState = 'entitled' | 'pending-acknowledgment' | 'pending' | 'canceled' | 'expired' | 'ready-to-consume' | 'consumed' | 'unknown' | 'inauthentic';
@@ -1614,7 +1614,8 @@ export type RequestPurchaseProps =
  *
  * Note: "Platforms" refers to the SDK/OS level (apple, google), not the store.
  * - apple: Always targets App Store
- * - google: Targets Play Store by default, or Horizon when built with horizon flavor
+ * - google: Targets Play Store by default, Horizon when built with horizon flavor,
+ *   or Fire OS when built with amazon flavor
  *   (determined at build time, not runtime)
  */
 export interface RequestPurchasePropsByPlatforms {
@@ -1713,7 +1714,8 @@ export interface RequestSubscriptionIosProps {
  *
  * Note: "Platforms" refers to the SDK/OS level (apple, google), not the store.
  * - apple: Always targets App Store
- * - google: Targets Play Store by default, or Horizon when built with horizon flavor
+ * - google: Targets Play Store by default, Horizon when built with horizon flavor,
+ *   or Fire OS when built with amazon flavor
  *   (determined at build time, not runtime)
  */
 export interface RequestSubscriptionPropsByPlatforms {
@@ -1727,6 +1729,15 @@ export interface RequestSubscriptionPropsByPlatforms {
   ios?: (RequestSubscriptionIosProps | null);
 }
 
+export interface RequestVerifyPurchaseWithIapkitAmazonProps {
+  /** Amazon Appstore receipt id returned by PurchaseResponse.getReceipt().getReceiptId(). */
+  receiptId: string;
+  /** Use Amazon RVS Cloud Sandbox for App Tester receipts. */
+  sandbox?: (boolean | null);
+  /** Amazon Appstore user id returned by PurchaseResponse.getUserData().getUserId(). */
+  userId?: (string | null);
+}
+
 export interface RequestVerifyPurchaseWithIapkitAppleProps {
   /** The JWS token returned with the purchase response. */
   jws: string;
@@ -1742,8 +1753,11 @@ export interface RequestVerifyPurchaseWithIapkitGoogleProps {
  *
  * - apple: Verifies via App Store (JWS token)
  * - google: Verifies via Play Store (purchase token)
+ * - amazon: Verifies via Amazon Appstore RVS (userId + receiptId)
  */
 export interface RequestVerifyPurchaseWithIapkitProps {
+  /** Amazon Appstore verification parameters. */
+  amazon?: (RequestVerifyPurchaseWithIapkitAmazonProps | null);
   /** API key used for the Authorization header (Bearer {apiKey}). */
   apiKey?: (string | null);
   /** Apple App Store verification parameters. */

package/src/utils/error.ts

@@ -16,12 +16,125 @@ export interface IapError {
   [key: string]: any; // Allow additional platform-specific fields
 }
 
+const parseJsonPayload = (
+  payload: string,
+  fallbackMessage: string,
+): IapError | null => {
+  const trimmed = payload.trim();
+  const candidates = [trimmed];
+
+  if (trimmed.includes('\\"')) {
+    candidates.push(trimmed.replace(/\\"/g, '"'));
+  }
+
+  for (const candidate of candidates) {
+    try {
+      const parsed = JSON.parse(candidate);
+      if (typeof parsed === 'object' && parsed !== null) {
+        const parsedError = parsed as Partial<IapError>;
+        return {
+          code: parsedError.code || ErrorCode.Unknown,
+          message: parsedError.message || fallbackMessage,
+          ...parsedError,
+        };
+      }
+    } catch {
+      // Try the next candidate.
+    }
+  }
+
+  return null;
+};
+
+const extractBalancedJsonObject = (
+  value: string,
+  startIndex: number,
+): string | null => {
+  for (let index = startIndex; index < value.length; index += 1) {
+    if (value[index] !== '}') {
+      continue;
+    }
+
+    const candidate = value.substring(startIndex, index + 1);
+    if (parseJsonPayload(candidate, value)) {
+      return candidate;
+    }
+  }
+
+  return null;
+};
+
+const parseNSErrorJsonPayload = (rawString: string): IapError | null => {
+  const payloads: string[] = [];
+  const quotedPayloadMatch = /Code=-?\d+\s+"/.exec(rawString);
+
+  if (quotedPayloadMatch?.index !== undefined) {
+    const contentStart =
+      quotedPayloadMatch.index + quotedPayloadMatch[0].length;
+    const userInfoIndex = rawString.indexOf('UserInfo=', contentStart);
+    const contentEnd =
+      userInfoIndex > contentStart
+        ? rawString.lastIndexOf('"', userInfoIndex)
+        : rawString.lastIndexOf('"');
+
+    if (contentEnd > contentStart) {
+      payloads.push(rawString.substring(contentStart, contentEnd));
+    }
+  }
+
+  const localizedDescription = 'NSLocalizedDescription=';
+  const descriptionIndex = rawString.indexOf(localizedDescription);
+
+  if (descriptionIndex >= 0) {
+    let valueStart = descriptionIndex + localizedDescription.length;
+    while (/\s/.test(rawString[valueStart] ?? '')) {
+      valueStart += 1;
+    }
+
+    const firstBraceIndex = rawString.indexOf('{', valueStart);
+    if (firstBraceIndex >= 0 && firstBraceIndex <= valueStart + 2) {
+      const payload = extractBalancedJsonObject(rawString, firstBraceIndex);
+      if (payload) {
+        payloads.push(payload);
+      }
+    }
+  }
+
+  for (const payload of payloads) {
+    const parsed = parseJsonPayload(payload, rawString);
+    if (parsed?.code && parsed.code !== ErrorCode.Unknown) {
+      return parsed;
+    }
+  }
+
+  return null;
+};
+
+const parseStructuredError = (error: Error): IapError | null => {
+  const errorWithCode = error as Error & {code?: unknown} & Record<
+      string,
+      unknown
+    >;
+
+  if (errorWithCode.code != null) {
+    const {code, message, ...extraFields} = errorWithCode;
+
+    return {
+      ...extraFields,
+      code: String(code),
+      message: typeof message === 'string' ? message : error.message,
+    };
+  }
+
+  return null;
+};
+
 /**
  * Parses error string from native modules into a structured error object
  *
  * Native modules return errors in different formats:
  * - Android: JSON string like '{"code":"E_USER_CANCELLED","message":"User cancelled the purchase","responseCode":1}'
- * - iOS: JSON string or plain message
+ * - iOS: JSON string, Nitro NSError string with embedded JSON, or plain message
  * - Legacy: "CODE: message" format
  *
  * @param errorString - The error string from native module
@@ -32,6 +145,11 @@ export function parseErrorStringToJsonObj(
 ): IapError {
   // Handle Error objects
   if (errorString instanceof Error) {
+    const structuredError = parseStructuredError(errorString);
+    if (structuredError) {
+      return structuredError;
+    }
+
     errorString = errorString.message;
   }
 
@@ -43,19 +161,14 @@ export function parseErrorStringToJsonObj(
     };
   }
 
-  // Try to parse as JSON first
-  try {
-    const parsed = JSON.parse(errorString);
-    if (typeof parsed === 'object' && parsed !== null) {
-      // Ensure it has at least code and message
-      return {
-        code: parsed.code || ErrorCode.Unknown,
-        message: parsed.message || errorString,
-        ...parsed,
-      };
-    }
-  } catch {
-    // Not JSON, continue with other formats
+  const jsonPayload = parseJsonPayload(errorString, errorString);
+  if (jsonPayload) {
+    return jsonPayload;
+  }
+
+  const nsErrorPayload = parseNSErrorJsonPayload(errorString);
+  if (nsErrorPayload) {
+    return nsErrorPayload;
   }
 
   // Try to parse "CODE: message" format

package/src/utils/type-bridge.ts

@@ -35,6 +35,7 @@ const STORE_UNKNOWN: IapStore = 'unknown';
 const STORE_APPLE: IapStore = 'apple';
 const STORE_GOOGLE: IapStore = 'google';
 const STORE_HORIZON: IapStore = 'horizon';
+const STORE_AMAZON: IapStore = 'amazon';
 const PRODUCT_TYPE_SUBS: ProductType = 'subs';
 const PRODUCT_TYPE_IN_APP: ProductType = 'in-app';
 const PURCHASE_STATE_PENDING: PurchaseState = 'pending';
@@ -67,6 +68,8 @@ function normalizeStore(value?: Nullable<string>): IapStore {
       return STORE_GOOGLE;
     case 'horizon':
       return STORE_HORIZON;
+    case 'amazon':
+      return STORE_AMAZON;
     default:
       return STORE_UNKNOWN;
   }
@@ -191,7 +194,7 @@ function toNullableBoolean(value: unknown): boolean | null {
 function parseSubscriptionOffers(value?: Nullable<string> | any[]) {
   if (!value) return undefined;
 
-  // If it's already an array (from mocks), return it as-is
+  // Keep pre-normalized native values intact.
   if (Array.isArray(value)) {
     return value;
   }