react-native-iap 14.1.1-rc.1 → 14.2.0

package/src/types.ts

@@ -211,6 +211,27 @@ export type PurchaseIOS = PurchaseCommon & {
   jwsRepresentationIOS?: string
 }
 
+/**
+ * iOS subscription renewal info
+ */
+export interface SubscriptionRenewalInfoIOS {
+  autoRenewStatus: boolean
+  autoRenewPreference?: string
+  expirationReason?: number
+  gracePeriodExpirationDate?: number
+  currentProductID?: string
+  platform: 'ios'
+}
+
+/**
+ * iOS subscription status entry
+ */
+export interface SubscriptionStatusIOS {
+  state: number
+  platform: 'ios'
+  renewalInfo?: SubscriptionRenewalInfoIOS
+}
+
 // ============================================================================
 // ANDROID TYPES
 // ============================================================================

package/src/utils/error.ts

@@ -2,15 +2,15 @@
  * Error utilities for parsing platform-specific error responses
  */
 
-import {ErrorCode} from '../types';
+import { ErrorCode } from '../types'
 
 export interface IapError {
-  code: string;
-  message: string;
-  responseCode?: number;
-  debugMessage?: string;
-  productId?: string;
-  [key: string]: any; // Allow additional platform-specific fields
+  code: string
+  message: string
+  responseCode?: number
+  debugMessage?: string
+  productId?: string
+  [key: string]: any // Allow additional platform-specific fields
 }
 
 /**
@@ -25,11 +25,11 @@ export interface IapError {
  * @returns Parsed error object with code and message
  */
 export function parseErrorStringToJsonObj(
-  errorString: string | Error | unknown,
+  errorString: string | Error | unknown
 ): IapError {
   // Handle Error objects
   if (errorString instanceof Error) {
-    errorString = errorString.message;
+    errorString = errorString.message
   }
 
   // Handle non-string inputs
@@ -37,35 +37,35 @@ export function parseErrorStringToJsonObj(
     return {
       code: ErrorCode.E_UNKNOWN,
       message: 'Unknown error occurred',
-    };
+    }
   }
 
   // Try to parse as JSON first
   try {
-    const parsed = JSON.parse(errorString);
+    const parsed = JSON.parse(errorString)
     if (typeof parsed === 'object' && parsed !== null) {
       // Ensure it has at least code and message
       return {
         code: parsed.code || ErrorCode.E_UNKNOWN,
         message: parsed.message || errorString,
         ...parsed,
-      };
+      }
     }
   } catch {
     // Not JSON, continue with other formats
   }
 
   // Try to parse "CODE: message" format
-  const colonIndex = errorString.indexOf(':');
+  const colonIndex = errorString.indexOf(':')
   if (colonIndex > 0 && colonIndex < 50) {
     // Reasonable position for error code
-    const potentialCode = errorString.substring(0, colonIndex).trim();
+    const potentialCode = errorString.substring(0, colonIndex).trim()
     // Check if it looks like an error code (starts with E_ or contains uppercase)
     if (potentialCode.startsWith('E_') || /^[A-Z_]+$/.test(potentialCode)) {
       return {
         code: potentialCode,
         message: errorString.substring(colonIndex + 1).trim(),
-      };
+      }
     }
   }
 
@@ -73,7 +73,7 @@ export function parseErrorStringToJsonObj(
   return {
     code: ErrorCode.E_UNKNOWN,
     message: errorString,
-  };
+  }
 }
 
 /**
@@ -82,16 +82,16 @@ export function parseErrorStringToJsonObj(
  * @returns true if the error is a user cancellation
  */
 export function isUserCancelledError(
-  error: IapError | string | Error | unknown,
+  error: IapError | string | Error | unknown
 ): boolean {
   const errorObj =
     typeof error === 'object' && error !== null && 'code' in error
       ? (error as IapError)
-      : parseErrorStringToJsonObj(error);
+      : parseErrorStringToJsonObj(error)
 
   return (
     errorObj.code === ErrorCode.E_USER_CANCELLED ||
     errorObj.code === 'E_USER_CANCELED' || // Alternative spelling
     errorObj.responseCode === 1
-  ); // Android BillingClient.BillingResponseCode.USER_CANCELED
+  ) // Android BillingClient.BillingResponseCode.USER_CANCELED
 }

package/src/utils/errorMapping.ts

@@ -0,0 +1,44 @@
+import { ErrorCode, type PurchaseError } from '../types'
+
+export function isUserCancelledError(error: PurchaseError): boolean {
+  return (
+    error.code === ErrorCode.E_USER_CANCELLED ||
+    error.code === 'E_USER_CANCELED'
+  )
+}
+
+export function isRecoverableError(error: PurchaseError): boolean {
+  const recoverable = new Set<string>([
+    ErrorCode.E_NETWORK_ERROR,
+    ErrorCode.E_SERVICE_ERROR,
+    ErrorCode.E_REMOTE_ERROR,
+    ErrorCode.E_CONNECTION_CLOSED,
+    ErrorCode.E_SERVICE_DISCONNECTED,
+    ErrorCode.E_INIT_CONNECTION,
+    ErrorCode.E_SYNC_ERROR,
+  ])
+  return recoverable.has(error.code)
+}
+
+export function getUserFriendlyErrorMessage(error: PurchaseError): string {
+  switch (error.code) {
+    case ErrorCode.E_USER_CANCELLED:
+      return 'Purchase cancelled'
+    case ErrorCode.E_NETWORK_ERROR:
+      return 'Network connection error'
+    case ErrorCode.E_SERVICE_ERROR:
+      return 'Store service error'
+    case ErrorCode.E_REMOTE_ERROR:
+      return 'Remote service error'
+    case ErrorCode.E_IAP_NOT_AVAILABLE:
+      return 'In-app purchases are not available on this device'
+    case ErrorCode.E_DEFERRED_PAYMENT:
+      return 'Payment was deferred (pending approval)'
+    case ErrorCode.E_TRANSACTION_VALIDATION_FAILED:
+      return 'Transaction validation failed'
+    case ErrorCode.E_SKU_NOT_FOUND:
+      return 'Product not found'
+    default:
+      return error.message || 'Unknown error occurred'
+  }
+}

package/src/utils/type-bridge.ts

@@ -7,10 +7,19 @@
  * Purpose: Prevent type fragmentation between native (Nitro) and TypeScript sides
  */
 
-import type {NitroProduct, NitroPurchase} from '../specs/RnIap.nitro';
-import type {Product, Purchase, SubscriptionProduct} from '../types';
-import {PurchaseState, ProductTypeIOS} from '../types';
-import {Platform} from 'react-native';
+import type {
+  NitroProduct,
+  NitroPurchase,
+  NitroSubscriptionStatus,
+} from '../specs/RnIap.nitro'
+import type {
+  Product,
+  Purchase,
+  SubscriptionProduct,
+  SubscriptionStatusIOS,
+} from '../types'
+import { PurchaseState, ProductTypeIOS } from '../types'
+import { Platform } from 'react-native'
 
 // ============================================================================
 // PRODUCT CONVERSION
@@ -21,7 +30,7 @@ import {Platform} from 'react-native';
  * This ensures all fields are properly mapped and accessible
  */
 export function convertNitroProductToProduct(
-  nitroProduct: NitroProduct,
+  nitroProduct: NitroProduct
 ): Product {
   // Create base product with common fields, handling platform casting
   const product: any = {
@@ -34,92 +43,91 @@ export function convertNitroProductToProduct(
     currency: nitroProduct.currency || '',
     price: nitroProduct.price,
     platform: nitroProduct.platform as 'ios' | 'android',
-  };
+  }
 
   // Add platform-specific fields based on current platform
   if (Platform.OS === 'ios') {
     // Map iOS fields from Nitro to TypeScript types
-    const iosProduct = product as any; // Temporarily cast to access iOS fields
-    iosProduct.isFamilyShareable = (nitroProduct as any).isFamilyShareableIOS;
-    iosProduct.jsonRepresentation = (nitroProduct as any).jsonRepresentationIOS;
+    const iosProduct = product as any // Temporarily cast to access iOS fields
+    iosProduct.isFamilyShareable = (nitroProduct as any).isFamilyShareableIOS
+    iosProduct.jsonRepresentation = (nitroProduct as any).jsonRepresentationIOS
     // Detailed iOS product type - directly from the native field
-    const typeIOSValue: string | undefined = (nitroProduct as any).typeIOS;
+    const typeIOSValue: string | undefined = (nitroProduct as any).typeIOS
 
     switch (typeIOSValue) {
       case 'consumable':
-        iosProduct.typeIOS = ProductTypeIOS.consumable;
-        break;
+        iosProduct.typeIOS = ProductTypeIOS.consumable
+        break
       case 'nonConsumable':
-        iosProduct.typeIOS = ProductTypeIOS.nonConsumable;
-        break;
+        iosProduct.typeIOS = ProductTypeIOS.nonConsumable
+        break
       case 'autoRenewableSubscription':
-        iosProduct.typeIOS = ProductTypeIOS.autoRenewableSubscription;
-        break;
+        iosProduct.typeIOS = ProductTypeIOS.autoRenewableSubscription
+        break
       case 'nonRenewingSubscription':
-        iosProduct.typeIOS = ProductTypeIOS.nonRenewingSubscription;
-        break;
+        iosProduct.typeIOS = ProductTypeIOS.nonRenewingSubscription
+        break
       default:
-        iosProduct.typeIOS = undefined;
+        iosProduct.typeIOS = undefined
     }
     iosProduct.subscriptionPeriodUnitIOS =
-      nitroProduct.subscriptionPeriodUnitIOS;
+      nitroProduct.subscriptionPeriodUnitIOS
     iosProduct.subscriptionPeriodNumberIOS =
-      nitroProduct.subscriptionPeriodNumberIOS;
-    iosProduct.introductoryPriceIOS = nitroProduct.introductoryPriceIOS;
+      nitroProduct.subscriptionPeriodNumberIOS
+    iosProduct.introductoryPriceIOS = nitroProduct.introductoryPriceIOS
     iosProduct.introductoryPriceAsAmountIOS =
-      nitroProduct.introductoryPriceAsAmountIOS;
+      nitroProduct.introductoryPriceAsAmountIOS
     iosProduct.introductoryPricePaymentModeIOS =
-      nitroProduct.introductoryPricePaymentModeIOS;
+      nitroProduct.introductoryPricePaymentModeIOS
     iosProduct.introductoryPriceNumberOfPeriodsIOS =
-      nitroProduct.introductoryPriceNumberOfPeriodsIOS;
+      nitroProduct.introductoryPriceNumberOfPeriodsIOS
     iosProduct.introductoryPriceSubscriptionPeriodIOS =
-      nitroProduct.introductoryPriceSubscriptionPeriodIOS;
+      nitroProduct.introductoryPriceSubscriptionPeriodIOS
   } else if (Platform.OS === 'android') {
     // Map Android fields from Nitro to TypeScript types
-    const androidProduct = product as any; // Temporarily cast to access Android fields
-    androidProduct.originalPrice = (nitroProduct as any).originalPriceAndroid;
+    const androidProduct = product as any // Temporarily cast to access Android fields
+    androidProduct.originalPrice = (nitroProduct as any).originalPriceAndroid
     androidProduct.originalPriceAmountMicros = (
       nitroProduct as any
-    ).originalPriceAmountMicrosAndroid;
+    ).originalPriceAmountMicrosAndroid
     androidProduct.introductoryPriceValue = (
       nitroProduct as any
-    ).introductoryPriceValueAndroid;
+    ).introductoryPriceValueAndroid
     androidProduct.introductoryPriceCycles = (
       nitroProduct as any
-    ).introductoryPriceCyclesAndroid;
+    ).introductoryPriceCyclesAndroid
     androidProduct.introductoryPricePeriod = (
       nitroProduct as any
-    ).introductoryPricePeriodAndroid;
+    ).introductoryPricePeriodAndroid
     androidProduct.subscriptionPeriod = (
       nitroProduct as any
-    ).subscriptionPeriodAndroid;
+    ).subscriptionPeriodAndroid
     androidProduct.freeTrialPeriod = (
       nitroProduct as any
-    ).freeTrialPeriodAndroid;
+    ).freeTrialPeriodAndroid
 
     // Map subscription offer details (parse from JSON string)
     if (nitroProduct.subscriptionOfferDetailsAndroid) {
       try {
         androidProduct.subscriptionOfferDetailsAndroid = JSON.parse(
-          nitroProduct.subscriptionOfferDetailsAndroid,
-        );
+          nitroProduct.subscriptionOfferDetailsAndroid
+        )
       } catch (e) {
-        console.warn('Failed to parse subscription offer details:', e);
-        androidProduct.subscriptionOfferDetailsAndroid = null;
+        console.warn('Failed to parse subscription offer details:', e)
+        androidProduct.subscriptionOfferDetailsAndroid = null
       }
     }
 
     // Create flattened offer fields for easier access in example code
     androidProduct.oneTimePurchaseOfferFormattedPrice =
-      nitroProduct.displayPrice;
+      nitroProduct.displayPrice
     androidProduct.oneTimePurchaseOfferPriceAmountMicros = (
       nitroProduct as any
-    ).originalPriceAmountMicrosAndroid;
-    androidProduct.oneTimePurchaseOfferPriceCurrencyCode =
-      nitroProduct.currency;
+    ).originalPriceAmountMicrosAndroid
+    androidProduct.oneTimePurchaseOfferPriceCurrencyCode = nitroProduct.currency
   }
 
-  return product as Product;
+  return product as Product
 }
 
 // Note: Use nitroProducts.map(convertNitroProductToProduct) instead of a separate function
@@ -128,19 +136,19 @@ export function convertNitroProductToProduct(
  * Convert Product to SubscriptionProduct (type-safe casting)
  */
 export function convertProductToSubscriptionProduct(
-  product: Product,
+  product: Product
 ): SubscriptionProduct {
   if (product.type !== 'subs') {
     console.warn(
       'Converting non-subscription product to SubscriptionProduct:',
-      product.id,
-    );
+      product.id
+    )
   }
   // Since SubscriptionProduct is now an intersection type, we need to cast properly
   return {
     ...product,
     type: 'subs' as const,
-  } as SubscriptionProduct;
+  } as SubscriptionProduct
 }
 
 // ============================================================================
@@ -151,7 +159,7 @@ export function convertProductToSubscriptionProduct(
  * Convert NitroPurchase (from native) to TypeScript Purchase (for library consumers)
  */
 export function convertNitroPurchaseToPurchase(
-  nitroPurchase: NitroPurchase,
+  nitroPurchase: NitroPurchase
 ): Purchase {
   // Create base purchase with common fields
   const purchase: any = {
@@ -163,61 +171,87 @@ export function convertNitroPurchaseToPurchase(
     platform: nitroPurchase.platform as 'ios' | 'android',
     // Common fields from NitroPurchase
     quantity: nitroPurchase.quantity || 1,
-    purchaseState: nitroPurchase.purchaseState as PurchaseState || PurchaseState.unknown,
+    purchaseState:
+      (nitroPurchase.purchaseState as PurchaseState) || PurchaseState.unknown,
     isAutoRenewing: nitroPurchase.isAutoRenewing || false,
-  };
+  }
 
   // Add platform-specific fields
   if (Platform.OS === 'ios') {
-    const iosPurchase = purchase as any;
-    iosPurchase.quantityIOS = nitroPurchase.quantityIOS;
+    const iosPurchase = purchase as any
+    iosPurchase.quantityIOS = nitroPurchase.quantityIOS
     iosPurchase.originalTransactionDateIOS =
-      nitroPurchase.originalTransactionDateIOS;
+      nitroPurchase.originalTransactionDateIOS
     iosPurchase.originalTransactionIdentifierIOS =
-      nitroPurchase.originalTransactionIdentifierIOS;
-    iosPurchase.appAccountToken = nitroPurchase.appAccountToken;
+      nitroPurchase.originalTransactionIdentifierIOS
+    iosPurchase.appAccountToken = nitroPurchase.appAccountToken
     // Fill common quantity from iOS-specific quantity when available
     if (typeof nitroPurchase.quantityIOS === 'number') {
-      purchase.quantity = nitroPurchase.quantityIOS;
+      purchase.quantity = nitroPurchase.quantityIOS
     }
   } else if (Platform.OS === 'android') {
-    const androidPurchase = purchase as any;
-    androidPurchase.purchaseTokenAndroid = nitroPurchase.purchaseTokenAndroid;
-    androidPurchase.dataAndroid = nitroPurchase.dataAndroid;
-    androidPurchase.signatureAndroid = nitroPurchase.signatureAndroid;
+    const androidPurchase = purchase as any
+    androidPurchase.purchaseTokenAndroid = nitroPurchase.purchaseTokenAndroid
+    androidPurchase.dataAndroid = nitroPurchase.dataAndroid
+    androidPurchase.signatureAndroid = nitroPurchase.signatureAndroid
     // Support both old and new field names for backward compatibility
-    androidPurchase.autoRenewingAndroid = nitroPurchase.autoRenewingAndroid ?? nitroPurchase.isAutoRenewing;
+    androidPurchase.autoRenewingAndroid =
+      nitroPurchase.autoRenewingAndroid ?? nitroPurchase.isAutoRenewing
     // no longer surface purchaseStateAndroid on TS side
-    androidPurchase.isAcknowledgedAndroid = nitroPurchase.isAcknowledgedAndroid;
-    androidPurchase.packageNameAndroid = nitroPurchase.packageNameAndroid;
+    androidPurchase.isAcknowledgedAndroid = nitroPurchase.isAcknowledgedAndroid
+    androidPurchase.packageNameAndroid = nitroPurchase.packageNameAndroid
     androidPurchase.obfuscatedAccountIdAndroid =
-      nitroPurchase.obfuscatedAccountIdAndroid;
+      nitroPurchase.obfuscatedAccountIdAndroid
     androidPurchase.obfuscatedProfileIdAndroid =
-      nitroPurchase.obfuscatedProfileIdAndroid;
+      nitroPurchase.obfuscatedProfileIdAndroid
 
     // Use the common isAutoRenewing field from NitroPurchase
-    purchase.isAutoRenewing = nitroPurchase.isAutoRenewing;
+    purchase.isAutoRenewing = nitroPurchase.isAutoRenewing
 
     // Map numeric Android purchase state to common PurchaseState
     switch (nitroPurchase.purchaseStateAndroid) {
       case 1:
-        purchase.purchaseState = PurchaseState.purchased;
-        break;
+        purchase.purchaseState = PurchaseState.purchased
+        break
       case 2:
-        purchase.purchaseState = PurchaseState.pending;
-        break;
+        purchase.purchaseState = PurchaseState.pending
+        break
       case 0:
       default:
-        purchase.purchaseState = PurchaseState.unknown;
-        break;
+        purchase.purchaseState = PurchaseState.unknown
+        break
     }
   }
 
-  return purchase as Purchase;
+  return purchase as Purchase
 }
 
 // Note: Use nitroPurchases.map(convertNitroPurchaseToPurchase) instead of a separate function
 
+// ============================================================================
+// SUBSCRIPTION STATUS CONVERSION (iOS)
+// ============================================================================
+
+export function convertNitroSubscriptionStatusToSubscriptionStatusIOS(
+  nitro: NitroSubscriptionStatus
+): SubscriptionStatusIOS {
+  return {
+    state: nitro.state,
+    platform: 'ios',
+    renewalInfo: nitro.renewalInfo
+      ? {
+          autoRenewStatus: nitro.renewalInfo.autoRenewStatus,
+          autoRenewPreference: nitro.renewalInfo.autoRenewPreference,
+          expirationReason: nitro.renewalInfo.expirationReason,
+          gracePeriodExpirationDate:
+            nitro.renewalInfo.gracePeriodExpirationDate,
+          currentProductID: nitro.renewalInfo.currentProductID,
+          platform: 'ios',
+        }
+      : undefined,
+  }
+}
+
 // ============================================================================
 // TYPE VALIDATION
 // ============================================================================
@@ -227,9 +261,9 @@ export function convertNitroPurchaseToPurchase(
  */
 export function validateNitroProduct(nitroProduct: NitroProduct): boolean {
   if (!nitroProduct || typeof nitroProduct !== 'object') {
-    return false;
+    return false
   }
-  const required = ['id', 'title', 'description', 'type', 'platform'];
+  const required = ['id', 'title', 'description', 'type', 'platform']
   for (const field of required) {
     if (
       !(field in nitroProduct) ||
@@ -237,12 +271,12 @@ export function validateNitroProduct(nitroProduct: NitroProduct): boolean {
     ) {
       console.error(
         `NitroProduct missing required field: ${field}`,
-        nitroProduct,
-      );
-      return false;
+        nitroProduct
+      )
+      return false
     }
   }
-  return true;
+  return true
 }
 
 /**
@@ -250,9 +284,9 @@ export function validateNitroProduct(nitroProduct: NitroProduct): boolean {
  */
 export function validateNitroPurchase(nitroPurchase: NitroPurchase): boolean {
   if (!nitroPurchase || typeof nitroPurchase !== 'object') {
-    return false;
+    return false
   }
-  const required = ['id', 'productId', 'transactionDate', 'platform'];
+  const required = ['id', 'productId', 'transactionDate', 'platform']
   for (const field of required) {
     if (
       !(field in nitroPurchase) ||
@@ -260,12 +294,12 @@ export function validateNitroPurchase(nitroPurchase: NitroPurchase): boolean {
     ) {
       console.error(
         `NitroPurchase missing required field: ${field}`,
-        nitroPurchase,
-      );
-      return false;
+        nitroPurchase
+      )
+      return false
     }
   }
-  return true;
+  return true
 }
 
 // ============================================================================
@@ -277,10 +311,10 @@ export function validateNitroPurchase(nitroPurchase: NitroPurchase): boolean {
  * This function can be run in development to detect type mismatches
  */
 export function checkTypeSynchronization(): {
-  isSync: boolean;
-  issues: string[];
+  isSync: boolean
+  issues: string[]
 } {
-  const issues: string[] = [];
+  const issues: string[] = []
 
   try {
     // Simple test: can we convert between types?
@@ -292,19 +326,19 @@ export function checkTypeSynchronization(): {
       platform: 'ios',
       displayPrice: '$1.00',
       currency: 'USD',
-    };
+    }
 
-    const converted = convertNitroProductToProduct(testNitroProduct);
+    const converted = convertNitroProductToProduct(testNitroProduct)
 
     if (!converted.id || !converted.title) {
-      issues.push('Type conversion failed');
+      issues.push('Type conversion failed')
     }
   } catch (error) {
-    issues.push(`Type conversion error: ${error}`);
+    issues.push(`Type conversion error: ${error}`)
   }
 
   return {
     isSync: issues.length === 0,
     issues,
-  };
+  }
 }