react-native-nami-sdk 3.3.3-4 → 3.3.3-6

package/android/build.gradle

@@ -85,8 +85,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    playImplementation "com.namiml:sdk-android:3.3.3.3"
-    amazonImplementation "com.namiml:sdk-amazon:3.3.3.3"
+    playImplementation "com.namiml:sdk-android:3.3.3.5"
+    amazonImplementation "com.namiml:sdk-amazon:3.3.3.5"
 
     implementation "com.facebook.react:react-native:+"  // From node_modules
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"

package/android/src/main/java/com/namiml/reactnative/NamiCampaignManagerBridge.kt

@@ -3,23 +3,24 @@ package com.namiml.reactnative
 import android.app.Activity
 import android.net.Uri
 import android.util.Log
+import androidx.core.net.toUri
 import com.facebook.react.bridge.*
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.turbomodule.core.interfaces.TurboModule
 import com.namiml.billing.NamiPurchase
+import com.namiml.campaign.LaunchCampaignError
 import com.namiml.campaign.LaunchCampaignResult
 import com.namiml.campaign.NamiCampaign
 import com.namiml.campaign.NamiCampaignManager
 import com.namiml.paywall.model.NamiPaywallEvent
 import com.namiml.paywall.model.PaywallLaunchContext
-import androidx.core.net.toUri
 
 @ReactModule(name = NamiCampaignManagerBridgeModule.NAME)
 class NamiCampaignManagerBridgeModule internal constructor(
-    private val reactContext: ReactApplicationContext
-) : ReactContextBaseJavaModule(reactContext), TurboModule {
-
+    private val reactContext: ReactApplicationContext,
+) : ReactContextBaseJavaModule(reactContext),
+    TurboModule {
     companion object {
         const val NAME = "RNNamiCampaignManager"
         const val CAMPAIGN_ID = "campaignId"
@@ -42,10 +43,7 @@ class NamiCampaignManagerBridgeModule internal constructor(
         const val NAMI_PAYWALL_EVENT = "NamiPaywallEvent"
     }
 
-
-    override fun getName(): String {
-        return NAME
-    }
+    override fun getName(): String = NAME
 
     private fun campaignToReadableMap(campaign: NamiCampaign): ReadableMap {
         val readableMap = Arguments.createMap()
@@ -94,7 +92,37 @@ class NamiCampaignManagerBridgeModule internal constructor(
                     val keyIterator = attr.keySetIterator()
                     while (keyIterator.hasNextKey()) {
                         val key = keyIterator.nextKey()
-                        customAttributes[key] = attr.getString(key) ?: ""
+                        try {
+                            // Handle different data types and store with proper types
+                            val value: Any =
+                                when (attr.getType(key)) {
+                                    ReadableType.String -> attr.getString(key) ?: ""
+                                    ReadableType.Boolean -> attr.getBoolean(key)
+                                    ReadableType.Number -> {
+                                        // Try to get as int first, then as double
+                                        try {
+                                            attr.getInt(key)
+                                        } catch (e: Exception) {
+                                            attr.getDouble(key)
+                                        }
+                                    }
+                                    ReadableType.Null -> ""
+                                    ReadableType.Array -> attr.getArray(key)?.toArrayList() ?: emptyList<Any>()
+                                    ReadableType.Map -> attr.getMap(key)?.toHashMap() ?: emptyMap<String, Any>()
+                                }
+                            customAttributes[key] = value
+                        } catch (e: Exception) {
+                            // Log the error and try to store the value as a string representation
+                            Log.w(NAME, "Error parsing customAttribute '$key': ${e.message}. Attempting string conversion.")
+                            try {
+                                // Fallback: try to get the dynamic value and convert to string
+                                val dynamicValue = attr.getDynamic(key)
+                                customAttributes[key] = dynamicValue.asString() ?: ""
+                            } catch (fallbackError: Exception) {
+                                // If all else fails, log and skip this attribute
+                                Log.e(NAME, "Failed to parse customAttribute '$key': ${fallbackError.message}. Skipping.")
+                            }
+                        }
                     }
                     Log.d(NAME, "customAttributes $customAttributes")
                 }
@@ -120,8 +148,7 @@ class NamiCampaignManagerBridgeModule internal constructor(
 
         if (theActivity != null) {
             reactApplicationContext.runOnUiQueueThread {
-                val paywallActionCallback = {
-                        paywallEvent: NamiPaywallEvent ->
+                val paywallActionCallback = { paywallEvent: NamiPaywallEvent ->
                     handlePaywallCallback(
                         paywallEvent,
                         actionCallback,
@@ -184,7 +211,13 @@ class NamiCampaignManagerBridgeModule internal constructor(
                     putString("id", paywallEvent.sku?.id ?: "")
                     putString("skuId", paywallEvent.sku?.skuId ?: "")
                     putString("name", paywallEvent.sku?.name ?: "")
-                    putString("type", paywallEvent.sku?.type.toString().lowercase())
+                    putString(
+                        "type",
+                        paywallEvent.sku
+                            ?.type
+                            .toString()
+                            .lowercase(),
+                    )
                 }
             resultMap.putMap(SKU, skuMap)
         }
@@ -222,8 +255,8 @@ class NamiCampaignManagerBridgeModule internal constructor(
         emitEvent(NAMI_PAYWALL_EVENT, resultMap)
     }
 
-    private fun createPurchaseArray(purchases: List<NamiPurchase>?): WritableArray {
-        return WritableNativeArray().apply {
+    private fun createPurchaseArray(purchases: List<NamiPurchase>?): WritableArray =
+        WritableNativeArray().apply {
             purchases?.forEach { purchase ->
                 try {
                     pushMap(purchase.toPurchaseDict())
@@ -232,7 +265,6 @@ class NamiCampaignManagerBridgeModule internal constructor(
                 }
             }
         }
-    }
 
     private fun emitEvent(
         event: String,
@@ -246,17 +278,46 @@ class NamiCampaignManagerBridgeModule internal constructor(
         }
     }
 
+    /**
+     * Maps Android LaunchCampaignError enum values to iOS-compatible error codes
+     * to ensure consistent error handling across platforms in React Native.
+     */
+    private fun mapErrorCodeToIOS(androidError: LaunchCampaignError): Int =
+        when (androidError) {
+            LaunchCampaignError.DEFAULT_CAMPAIGN_NOT_FOUND -> 0
+            LaunchCampaignError.LABELED_CAMPAIGN_NOT_FOUND -> 1
+            LaunchCampaignError.CAMPAIGN_DATA_NOT_FOUND -> 2
+            LaunchCampaignError.PAYWALL_ALREADY_DISPLAYED -> 3
+            LaunchCampaignError.SDK_NOT_INITIALIZED -> 4
+            LaunchCampaignError.URL_CAMPAIGN_NOT_FOUND -> 6
+            LaunchCampaignError.PRODUCT_GROUPS_NOT_FOUND -> 8
+        }
+
     private fun handleResult(
         result: LaunchCampaignResult,
         resultCallback: Callback,
     ) {
-        val resultMap = Arguments.createMap()
         when (result) {
             is LaunchCampaignResult.Success -> {
                 resultCallback.invoke(true)
             }
             is LaunchCampaignResult.Failure -> {
-                resultCallback.invoke(false, "${result.error}")
+                val error = result.error
+                val errorInfo =
+                    if (error is LaunchCampaignError) {
+                        Arguments.createMap().apply {
+                            putInt("code", mapErrorCodeToIOS(error))
+                            putString("domain", "LaunchCampaignError")
+                            putString("message", error.errorMessage.ifEmpty { error.toString() })
+                        }
+                    } else {
+                        Arguments.createMap().apply {
+                            putInt("code", -1)
+                            putString("domain", "Unknown")
+                            putString("message", error.toString())
+                        }
+                    }
+                resultCallback.invoke(false, errorInfo)
             }
         }
     }
@@ -279,8 +340,8 @@ class NamiCampaignManagerBridgeModule internal constructor(
         val isCampaignAvailable =
             when {
                 campaignSource == null -> NamiCampaignManager.isCampaignAvailable()
-                campaignSource.toUri().scheme != null -> NamiCampaignManager.isCampaignAvailable(
-                    campaignSource.toUri())
+                campaignSource.toUri().scheme != null ->
+                    NamiCampaignManager.isCampaignAvailable(campaignSource.toUri())
                 else -> NamiCampaignManager.isCampaignAvailable(campaignSource)
             }
         promise.resolve(isCampaignAvailable)

package/dist/src/version.d.ts

@@ -2,4 +2,4 @@
  * Auto-generated file. Do not edit manually.
  * React Native Nami SDK version.
  */
-export declare const NAMI_REACT_NATIVE_VERSION = "3.3.3-4";
+export declare const NAMI_REACT_NATIVE_VERSION = "3.3.3-6";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.3.3-4",
+  "version": "3.3.3-6",
   "description": "React Native SDK for Nami - No-code paywall management with A/B testing.",
   "main": "index.ts",
   "types": "dist/index.d.ts",

package/src/version.ts

@@ -2,4 +2,4 @@
  * Auto-generated file. Do not edit manually.
  * React Native Nami SDK version.
  */
-export const NAMI_REACT_NATIVE_VERSION = '3.3.3-4';
+export const NAMI_REACT_NATIVE_VERSION = '3.3.3-6';