expo-iap 2.2.5-rc.5 → 2.2.6

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

@@ -63,7 +63,11 @@ class ExpoIapModule :
             val errorData = PlayUtils.getBillingResponseData(responseCode)
             error["code"] = errorData.code
             error["message"] = errorData.message
-            sendEvent(IapEvent.PURCHASE_ERROR, error.toMap())
+            try {
+                sendEvent(IapEvent.PURCHASE_ERROR, error.toMap())
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to send PURCHASE_ERROR event: ${e.message}")
+            }
             PromiseUtils.rejectPromisesForKey(PROMISE_BUY_ITEM, errorData.code, errorData.message, null)
             return
         }
@@ -86,24 +90,34 @@ class ExpoIapModule :
                         "purchaseStateAndroid" to purchase.purchaseState,
                         "packageNameAndroid" to purchase.packageName,
                         "developerPayloadAndroid" to purchase.developerPayload,
+                        "platform" to "android",
                     )
                 purchase.accountIdentifiers?.let { accountIdentifiers ->
                     item["obfuscatedAccountIdAndroid"] = accountIdentifiers.obfuscatedAccountId
                     item["obfuscatedProfileIdAndroid"] = accountIdentifiers.obfuscatedProfileId
                 }
                 promiseItems.add(item.toMap())
-                sendEvent(IapEvent.PURCHASE_UPDATED, item.toMap())
+                try {
+                    sendEvent(IapEvent.PURCHASE_UPDATED, item.toMap())
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to send PURCHASE_UPDATED event: ${e.message}")
+                }
             }
             PromiseUtils.resolvePromisesForKey(PROMISE_BUY_ITEM, promiseItems)
         } else {
             val result =
                 mutableMapOf<String, Any?>(
+                    "platform" to "android",
                     "responseCode" to billingResult.responseCode,
                     "debugMessage" to billingResult.debugMessage,
                     "extraMessage" to
                         "The purchases are null. This is a normal behavior if you have requested DEFERRED proration. If not please report an issue.",
                 )
-            sendEvent(IapEvent.PURCHASE_UPDATED, result.toMap())
+            try {
+                sendEvent(IapEvent.PURCHASE_UPDATED, result.toMap())
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to send PURCHASE_UPDATED event: ${e.message}")
+            }
             PromiseUtils.resolvePromisesForKey(PROMISE_BUY_ITEM, result)
         }
     }
@@ -169,7 +183,7 @@ class ExpoIapModule :
                                     "description" to productDetails.description,
                                     "type" to productDetails.productType,
                                     "displayName" to productDetails.name,
-                                    "platform" to "android",  // Add platform identifier
+                                    "platform" to "android",
                                     "oneTimePurchaseOfferDetails" to
                                         productDetails.oneTimePurchaseOfferDetails?.let {
                                             mapOf(
@@ -239,6 +253,7 @@ class ExpoIapModule :
                                     "packageNameAndroid" to purchase.packageName,
                                     "obfuscatedAccountIdAndroid" to purchase.accountIdentifiers?.obfuscatedAccountId,
                                     "obfuscatedProfileIdAndroid" to purchase.accountIdentifiers?.obfuscatedProfileId,
+                                    "platform" to "android",
                                 )
                             if (type == BillingClient.ProductType.SUBS) {
                                 item["autoRenewingAndroid"] = purchase.isAutoRenewing
@@ -281,6 +296,7 @@ class ExpoIapModule :
                                     "dataAndroid" to purchase.originalJson,
                                     "signatureAndroid" to purchase.signature,
                                     "developerPayload" to purchase.developerPayload,
+                                    "platform" to "android",
                                 )
                             items.add(item)
                         }
@@ -314,14 +330,18 @@ class ExpoIapModule :
 
                     if (type == BillingClient.ProductType.SUBS && skuArr.size != offerTokenArr.size) {
                         val debugMessage = "The number of skus (${skuArr.size}) must match: the number of offerTokens (${offerTokenArr.size}) for Subscriptions"
-                        sendEvent(
-                            IapEvent.PURCHASE_ERROR,
-                            mapOf(
-                                "debugMessage" to debugMessage,
-                                "code" to "E_SKU_OFFER_MISMATCH",
-                                "message" to debugMessage,
+                        try {
+                            sendEvent(
+                                IapEvent.PURCHASE_ERROR,
+                                mapOf(
+                                    "debugMessage" to debugMessage,
+                                    "code" to "E_SKU_OFFER_MISMATCH",
+                                    "message" to debugMessage,
+                                )
                             )
-                        )
+                        } catch (e: Exception) {
+                            Log.e(TAG, "Failed to send PURCHASE_ERROR event: ${e.message}")
+                        }
                         promise.reject("E_SKU_OFFER_MISMATCH", debugMessage, null)
                         return@ensureConnection
                     }
@@ -332,15 +352,19 @@ class ExpoIapModule :
                             if (selectedSku == null) {
                                 val debugMessage =
                                     "The sku was not found. Please fetch products first by calling getItems"
-                                sendEvent(
-                                    IapEvent.PURCHASE_ERROR,
-                                    mapOf(
-                                        "debugMessage" to debugMessage,
-                                        "code" to "E_SKU_NOT_FOUND",
-                                        "message" to debugMessage,
-                                        "productId" to sku,
-                                    ),
-                                )
+                                try {
+                                    sendEvent(
+                                        IapEvent.PURCHASE_ERROR,
+                                        mapOf(
+                                            "debugMessage" to debugMessage,
+                                            "code" to "E_SKU_NOT_FOUND",
+                                            "message" to debugMessage,
+                                            "productId" to sku,
+                                        ),
+                                    )
+                                } catch (e: Exception) {
+                                    Log.e(TAG, "Failed to send PURCHASE_ERROR event: ${e.message}")
+                                }
                                 promise.reject("E_SKU_NOT_FOUND", debugMessage, null)
                                 return@ensureConnection
                             }

package/iap.md

@@ -147,6 +147,7 @@ This section describes purchase properties in `expo-iap`.
 ### Android-Only Purchase Types
 
 - **`ProductPurchase`**:
+
   - Adds the following properties specific to in-app product purchases:
     - **`ids`**: `string[]` - A list of product IDs associated with the purchase (for multi-item purchases).
     - **`dataAndroid`**: `string` - The raw purchase data from Google Play (e.g., JSON payload).
@@ -154,6 +155,7 @@ This section describes purchase properties in `expo-iap`.
     - **`purchaseStateAndroid`**: `number` - The state of the purchase (e.g., 0 = purchased, 1 = canceled, 2 = pending).
 
 - **`SubscriptionPurchase`**:
+
   - Extends the base properties and includes:
     - **`autoRenewingAndroid`**: `boolean` - Indicates whether the subscription automatically renews (true) or not (false).
 
@@ -163,6 +165,7 @@ This section describes purchase properties in `expo-iap`.
 ### iOS-Only Purchase Types
 
 - **`ProductPurchase`**:
+
   - Extends the base purchase properties with iOS-specific fields:
     - **`quantityIos`**: `number` - The quantity of the product purchased (e.g., how many units of an item were bought).
     - **`expirationDateIos`**: `number?` - The expiration date of the purchase as a Unix timestamp (in milliseconds), if applicable (optional, may be null for non-expiring products).

package/ios/ExpoIapModule.swift

@@ -47,6 +47,7 @@ func serializeTransaction(_ transaction: Transaction) -> [String: Any?] {
         "transactionId": String(transaction.id),
         "transactionDate": transaction.purchaseDate.timeIntervalSince1970 * 1000,
         "transactionReceipt": jwsReceipt,
+        "platform": "ios",
 
         "quantityIos": transaction.purchasedQuantity,
         "originalTransactionDateIos": transaction.originalPurchaseDate.timeIntervalSince1970 * 1000,
@@ -136,6 +137,7 @@ func serializeSubscriptionStatus(_ status: Product.SubscriptionInfo.Status) -> [
     return [
         "state": status.state.rawValue,
         "renewalInfo": serializeRenewalInfo(status.renewalInfo),
+        "platform": "ios",
     ]
 }
 
@@ -155,6 +157,7 @@ func serializeRenewalInfo(_ renewalInfo: VerificationResult<Product.Subscription
             "currentProductID": info.currentProductID,
             "debugDescription": info.debugDescription,
             "gracePeriodExpirationDate": info.gracePeriodExpirationDate,
+            "platform": "ios",
         ]
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "2.2.5-rc.5",
+  "version": "2.2.6",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",