react-native-iap 13.0.4 → 14.0.0-rc.2

package/src/utils/error.ts

@@ -0,0 +1,97 @@
+/**
+ * Error utilities for parsing platform-specific error responses
+ */
+
+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
+}
+
+/**
+ * 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
+ * - Legacy: "CODE: message" format
+ *
+ * @param errorString - The error string from native module
+ * @returns Parsed error object with code and message
+ */
+export function parseErrorStringToJsonObj(
+  errorString: string | Error | unknown,
+): IapError {
+  // Handle Error objects
+  if (errorString instanceof Error) {
+    errorString = errorString.message;
+  }
+
+  // Handle non-string inputs
+  if (typeof errorString !== 'string') {
+    return {
+      code: ErrorCode.E_UNKNOWN,
+      message: 'Unknown error occurred',
+    };
+  }
+
+  // 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.E_UNKNOWN,
+        message: parsed.message || errorString,
+        ...parsed,
+      };
+    }
+  } catch {
+    // Not JSON, continue with other formats
+  }
+
+  // Try to parse "CODE: message" format
+  const colonIndex = errorString.indexOf(':');
+  if (colonIndex > 0 && colonIndex < 50) {
+    // Reasonable position for error code
+    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(),
+      };
+    }
+  }
+
+  // Fallback: treat entire string as message
+  return {
+    code: ErrorCode.E_UNKNOWN,
+    message: errorString,
+  };
+}
+
+/**
+ * Checks if an error code indicates user cancellation
+ * @param error - Error object or string
+ * @returns true if the error is a user cancellation
+ */
+export function isUserCancelledError(
+  error: IapError | string | Error | unknown,
+): boolean {
+  const errorObj =
+    typeof error === 'object' && error !== null && 'code' in error
+      ? (error as IapError)
+      : parseErrorStringToJsonObj(error);
+
+  return (
+    errorObj.code === ErrorCode.E_USER_CANCELLED ||
+    errorObj.code === 'E_USER_CANCELED' || // Alternative spelling
+    errorObj.responseCode === 1
+  ); // Android BillingClient.BillingResponseCode.USER_CANCELED
+}

package/src/utils/type-bridge.ts

@@ -0,0 +1,209 @@
+/**
+ * Type Bridge Utilities
+ * 
+ * This file provides conversion utilities between Nitro types (simple primitives)
+ * and TypeScript union types (complex types.ts definitions).
+ * 
+ * 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 {Platform} from 'react-native';
+
+// ============================================================================
+// PRODUCT CONVERSION
+// ============================================================================
+
+/**
+ * Convert NitroProduct (from native) to TypeScript Product (for library consumers)
+ * This ensures all fields are properly mapped and accessible
+ */
+export function convertNitroProductToProduct(nitroProduct: NitroProduct): Product {
+  // Create base product with common fields, handling platform casting
+  const product: any = {
+    id: nitroProduct.id,
+    title: nitroProduct.title,
+    description: nitroProduct.description,
+    type: nitroProduct.type as 'inapp' | 'subs',
+    displayName: nitroProduct.displayName,
+    displayPrice: nitroProduct.displayPrice || '',
+    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.isFamilyShareable;
+    iosProduct.jsonRepresentation = nitroProduct.jsonRepresentation;
+    iosProduct.subscriptionPeriodUnitIOS = nitroProduct.subscriptionPeriodUnitIOS;
+    iosProduct.subscriptionPeriodNumberIOS = nitroProduct.subscriptionPeriodNumberIOS;
+    iosProduct.introductoryPriceIOS = nitroProduct.introductoryPriceIOS;
+    iosProduct.introductoryPriceAsAmountIOS = nitroProduct.introductoryPriceAsAmountIOS;
+    iosProduct.introductoryPricePaymentModeIOS = nitroProduct.introductoryPricePaymentModeIOS;
+    iosProduct.introductoryPriceNumberOfPeriodsIOS = nitroProduct.introductoryPriceNumberOfPeriodsIOS;
+    iosProduct.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.originalPrice;
+    androidProduct.originalPriceAmountMicros = nitroProduct.originalPriceAmountMicros;
+    androidProduct.introductoryPriceValue = nitroProduct.introductoryPriceValue;
+    androidProduct.introductoryPriceCycles = nitroProduct.introductoryPriceCycles;
+    androidProduct.introductoryPricePeriod = nitroProduct.introductoryPricePeriod;
+    androidProduct.subscriptionPeriod = nitroProduct.subscriptionPeriod;
+    androidProduct.freeTrialPeriod = nitroProduct.freeTrialPeriod;
+    
+    // Map subscription offer details (parse from JSON string)
+    if (nitroProduct.subscriptionOfferDetailsAndroid) {
+      try {
+        androidProduct.subscriptionOfferDetailsAndroid = JSON.parse(nitroProduct.subscriptionOfferDetailsAndroid);
+      } catch (e) {
+        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;
+    androidProduct.oneTimePurchaseOfferPriceAmountMicros = nitroProduct.originalPriceAmountMicros;
+    androidProduct.oneTimePurchaseOfferPriceCurrencyCode = nitroProduct.currency;
+  }
+
+  return product as Product;
+}
+
+// Note: Use nitroProducts.map(convertNitroProductToProduct) instead of a separate function
+
+/**
+ * Convert Product to SubscriptionProduct (type-safe casting)
+ */
+export function convertProductToSubscriptionProduct(product: Product): SubscriptionProduct {
+  if (product.type !== 'subs') {
+    console.warn('Converting non-subscription product to SubscriptionProduct:', product.id);
+  }
+  // Since SubscriptionProduct is now an intersection type, we need to cast properly
+  return {
+    ...product,
+    type: 'subs' as const,
+  } as SubscriptionProduct;
+}
+
+// ============================================================================
+// PURCHASE CONVERSION  
+// ============================================================================
+
+/**
+ * Convert NitroPurchase (from native) to TypeScript Purchase (for library consumers)
+ */
+export function convertNitroPurchaseToPurchase(nitroPurchase: NitroPurchase): Purchase {
+  // Create base purchase with common fields
+  const purchase: any = {
+    id: nitroPurchase.id,
+    productId: nitroPurchase.productId,
+    transactionDate: nitroPurchase.transactionDate,
+    transactionReceipt: '', // Will be set by native layer
+    purchaseToken: nitroPurchase.purchaseToken,
+    platform: nitroPurchase.platform as 'ios' | 'android',
+  };
+
+  // Add platform-specific fields
+  if (Platform.OS === 'ios') {
+    const iosPurchase = purchase as any;
+    iosPurchase.quantityIOS = nitroPurchase.quantityIOS;
+    iosPurchase.originalTransactionDateIOS = nitroPurchase.originalTransactionDateIOS;
+    iosPurchase.originalTransactionIdentifierIOS = nitroPurchase.originalTransactionIdentifierIOS;
+    iosPurchase.appAccountToken = nitroPurchase.appAccountToken;
+  } else if (Platform.OS === 'android') {
+    const androidPurchase = purchase as any;
+    androidPurchase.purchaseTokenAndroid = nitroPurchase.purchaseTokenAndroid;
+    androidPurchase.dataAndroid = nitroPurchase.dataAndroid;
+    androidPurchase.signatureAndroid = nitroPurchase.signatureAndroid;
+    androidPurchase.autoRenewingAndroid = nitroPurchase.autoRenewingAndroid;
+    androidPurchase.purchaseStateAndroid = nitroPurchase.purchaseStateAndroid;
+    androidPurchase.isAcknowledgedAndroid = nitroPurchase.isAcknowledgedAndroid;
+    androidPurchase.packageNameAndroid = nitroPurchase.packageNameAndroid;
+    androidPurchase.obfuscatedAccountIdAndroid = nitroPurchase.obfuscatedAccountIdAndroid;
+    androidPurchase.obfuscatedProfileIdAndroid = nitroPurchase.obfuscatedProfileIdAndroid;
+  }
+
+  return purchase as Purchase;
+}
+
+// Note: Use nitroPurchases.map(convertNitroPurchaseToPurchase) instead of a separate function
+
+// ============================================================================
+// TYPE VALIDATION
+// ============================================================================
+
+/**
+ * Validate that a NitroProduct has all required fields for conversion
+ */
+export function validateNitroProduct(nitroProduct: NitroProduct): boolean {
+  const required = ['id', 'title', 'description', 'type', 'platform'];
+  for (const field of required) {
+    if (!(field in nitroProduct) || nitroProduct[field as keyof NitroProduct] == null) {
+      console.error(`NitroProduct missing required field: ${field}`, nitroProduct);
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * Validate that a NitroPurchase has all required fields for conversion
+ */
+export function validateNitroPurchase(nitroPurchase: NitroPurchase): boolean {
+  const required = ['id', 'productId', 'transactionDate', 'platform'];
+  for (const field of required) {
+    if (!(field in nitroPurchase) || nitroPurchase[field as keyof NitroPurchase] == null) {
+      console.error(`NitroPurchase missing required field: ${field}`, nitroPurchase);
+      return false;
+    }
+  }
+  return true;
+}
+
+// ============================================================================
+// TYPE SYNCHRONIZATION HELPERS
+// ============================================================================
+
+/**
+ * Check if Nitro types and TypeScript types are synchronized
+ * This function can be run in development to detect type mismatches
+ */
+export function checkTypeSynchronization(): {
+  isSync: boolean;
+  issues: string[];
+} {
+  const issues: string[] = [];
+
+  try {
+    // Simple test: can we convert between types?
+    const testNitroProduct: NitroProduct = {
+      id: 'test',
+      title: 'Test',
+      description: 'Test',
+      type: 'inapp',
+      platform: 'ios',
+      displayPrice: '$1.00',
+      currency: 'USD',
+    };
+
+    const converted = convertNitroProductToProduct(testNitroProduct);
+    
+    if (!converted.id || !converted.title) {
+      issues.push('Type conversion failed');
+    }
+  } catch (error) {
+    issues.push(`Type conversion error: ${error}`);
+  }
+
+  return {
+    isSync: issues.length === 0,
+    issues,
+  };
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 hyochan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/RNIap.podspec

@@ -1,36 +0,0 @@
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-
-Pod::Spec.new do |s|
-  s.name         = "RNIap"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.homepage     = package["homepage"]
-  s.license      = package["license"]
-  s.authors      = package["author"]
-
-  s.platforms    = { :ios => "10.0" , :tvos => "10.0", :visionos => "1.0" }
-  s.source       = { :git => "https://github.com/hyochan/react-native-iap.git", :tag => "#{s.version}" }
-
-  s.source_files = "ios/*.{h,m,mm,swift}"
-
-  s.requires_arc  = true
-
-  s.dependency "React-Core"
-
-  # Don't install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-  end
-end

package/android/src/amazon/AndroidManifest.xml

@@ -1,14 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.dooboolab.rniap">
-
-    <application android:exported="true">
-        <receiver android:name="com.amazon.device.iap.ResponseReceiver" android:exported="true"
-             >
-            <intent-filter>
-                <action
-                    android:name="com.amazon.inapp.purchasing.NOTIFY"
-                    android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY" />
-            </intent-filter>
-        </receiver>
-    </application>
-</manifest>

package/android/src/amazon/java/com/dooboolab/rniap/EventSender.kt

@@ -1,10 +0,0 @@
-package com.dooboolab.rniap
-
-import com.facebook.react.bridge.WritableMap
-
-interface EventSender {
-    fun sendEvent(
-        eventName: String,
-        params: WritableMap?,
-    )
-}

package/android/src/amazon/java/com/dooboolab/rniap/PurchasingServiceProxy.kt

@@ -1,29 +0,0 @@
-package com.dooboolab.rniap
-
-import android.content.Context
-import com.amazon.device.iap.PurchasingListener
-import com.amazon.device.iap.model.FulfillmentResult
-import com.amazon.device.iap.model.ProrationMode
-import com.amazon.device.iap.model.RequestId
-
-interface PurchasingServiceProxy {
-    fun registerListener(
-        var0: Context?,
-        var1: PurchasingListener?,
-    )
-
-    fun getUserData(): RequestId
-
-    fun purchase(var0: String?): RequestId
-
-    fun getProductData(var0: Set<String?>?): RequestId
-
-    fun getPurchaseUpdates(var0: Boolean): RequestId
-
-    fun notifyFulfillment(
-        var0: String?,
-        var1: FulfillmentResult?,
-    )
-
-    fun modifySubscription(var0: String?, var1: ProrationMode): RequestId
-}

package/android/src/amazon/java/com/dooboolab/rniap/PurchasingServiceProxyAmazonImpl.kt

@@ -1,31 +0,0 @@
-package com.dooboolab.rniap
-
-import android.content.Context
-import com.amazon.device.iap.PurchasingListener
-import com.amazon.device.iap.PurchasingService
-import com.amazon.device.iap.model.FulfillmentResult
-import com.amazon.device.iap.model.ProrationMode
-import com.amazon.device.iap.model.RequestId
-
-class PurchasingServiceProxyAmazonImpl : PurchasingServiceProxy {
-    override fun registerListener(
-        var0: Context?,
-        var1: PurchasingListener?,
-    ) = PurchasingService.registerListener(var0, var1)
-
-    override fun getUserData(): RequestId = PurchasingService.getUserData()
-
-    override fun purchase(var0: String?): RequestId = PurchasingService.purchase(var0)
-
-    override fun getProductData(var0: Set<String?>?): RequestId = PurchasingService.getProductData(var0)
-
-    override fun getPurchaseUpdates(var0: Boolean): RequestId = PurchasingService.getPurchaseUpdates(var0)
-
-    override fun notifyFulfillment(
-        var0: String?,
-        var1: FulfillmentResult?,
-    ) = PurchasingService.notifyFulfillment(var0, var1)
-
-    override fun modifySubscription(var0: String?, var1: ProrationMode): RequestId =
-        PurchasingService.modifySubscription(var0, var1)
-}

package/android/src/amazon/java/com/dooboolab/rniap/RNIapActivityListener.kt

@@ -1,55 +0,0 @@
-package com.dooboolab.rniap
-
-import android.app.Activity
-import android.util.Log
-import com.amazon.device.iap.PurchasingService
-import com.dooboolab.rniap.modifysubscription.RNIapAmazonModifySubscriptionListener
-
-/**
- * In order of the IAP process to show correctly, AmazonPurchasingService must be registered on Activity.onCreate
- * registering it in on Application.onCreate will not throw an error but it will now show the Native purchasing screen
- */
-class RNIapActivityListener {
-    companion object {
-        @JvmStatic
-        var hasListener = false
-
-        @JvmStatic
-        var amazonListener: RNIapAmazonListener? = null
-
-        @JvmStatic
-        var amazonModifySubscriptionListener: RNIapAmazonModifySubscriptionListener? = null
-
-        @JvmStatic
-        fun initListeners(eventSender: EventSender?, purchasingService: PurchasingServiceProxy?) {
-            if (amazonListener == null || amazonModifySubscriptionListener == null) {
-                Log.e(
-                    RNIapAmazonModule.TAG,
-                    "registerActivity should be called on Activity.onCreate ",
-                )
-            }
-
-            amazonListener?.eventSender = eventSender
-            amazonListener?.purchasingService = purchasingService
-            amazonModifySubscriptionListener?.eventSender = eventSender
-        }
-
-        @JvmStatic
-        fun registerActivity(activity: Activity) {
-            amazonListener = RNIapAmazonListener(null, null)
-            amazonModifySubscriptionListener = RNIapAmazonModifySubscriptionListener(null)
-
-            try {
-                PurchasingService.registerListener(activity, amazonListener)
-                PurchasingService.registerListener(activity, amazonModifySubscriptionListener)
-                hasListener = true
-
-                // Prefetch user and purchases as per Amazon SDK documentation:
-                PurchasingService.getUserData()
-                PurchasingService.getPurchaseUpdates(false)
-            } catch (e: Exception) {
-                Log.e(RNIapAmazonModule.TAG, "Error initializing Amazon appstore sdk", e)
-            }
-        }
-    }
-}