react-native-marketap-sdk 0.1.0-beta.11 → 0.1.0-beta.13

package/android/build.gradle

@@ -99,7 +99,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
 
   // MarketapSDK dependency with forced version constraints
-  implementation('com.github.marketap-dev:marketap-android-sdk:1.1.7') {
+  implementation('com.github.marketap-dev:marketap-android-sdk:1.3.2') {
     exclude group: 'androidx.appcompat', module: 'appcompat'
     exclude group: 'androidx.core', module: 'core-ktx'
   }

package/android/src/main/AndroidManifest.xml

@@ -1,12 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.marketapsdk">
-    <application>
-        <service
-            android:name="com.marketap.sdk.client.push.MarketapFirebaseMessagingService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-    </application>
-</manifest>
+</manifest>

package/android/src/main/java/com/marketapsdk/MarketapSdkModule.kt

@@ -13,6 +13,8 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.bridge.LifecycleEventListener
 import com.marketap.sdk.Marketap
+import com.marketap.sdk.MarketapPlugin
+import com.marketap.sdk.MarketapWebBridge
 import com.marketap.sdk.model.external.MarketapCampaignType
 import com.marketap.sdk.model.external.MarketapLogLevel
 import com.marketap.sdk.client.CurrentActivityHolder
@@ -22,30 +24,45 @@ private fun ReadableMap?.toNonNullableMap(): Map<String, Any>? {
 }
 
 class MarketapSdkModule(reactContext: ReactApplicationContext) :
-  ReactContextBaseJavaModule(reactContext), LifecycleEventListener {
+  ReactContextBaseJavaModule(reactContext), LifecycleEventListener, ReactNativeBridgeTarget {
 
   companion object {
     const val NAME = "MarketapSdk"
     private const val CLICK_EVENT = "MarketapClickEvent"
-    
-    private var pendingClickEvent: WritableMap? = null
+    private const val IN_APP_MESSAGE_EVENT = "MarketapInAppMessageEvent"
+
+    private var isExternalInAppCallbackRegistered = false
   }
 
   private var hasListeners = false
   private var isInitialized = false
   private var initializedProjectId: String? = null
+  private var clickHandlerRegistered = false
+  private var isModuleActive = true
 
   init {
     reactApplicationContext.addLifecycleEventListener(this)
+    ReactNativeBridgeRegistry.register(this)
+    registerExternalInAppCallback()
   }
 
   override fun getName(): String {
     return NAME
   }
 
+  override val isAttachedToReact: Boolean
+    get() = isModuleActive
+
+  override val isClickHandlerRegistered: Boolean
+    get() = clickHandlerRegistered
+
+  override val isReactReady: Boolean
+    get() = isModuleActive && hasListeners && isReactInstanceReady()
+
   @ReactMethod
-  fun initialize(projectId: String, promise: Promise) {
+  fun initialize(payload: ReadableMap?, promise: Promise) {
     try {
+      val projectId = payload?.getString("projectId") ?: ""
       if (!isMainProcess()) {
         promise.resolve(null)
         return
@@ -75,7 +92,13 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun setLogLevel(logLevel: Int) {
+  fun setLogLevel(payload: ReadableMap?) {
+    val logLevel =
+      if (payload != null && payload.hasKey("logLevel") && !payload.isNull("logLevel")) {
+        payload.getInt("logLevel")
+      } else {
+        0
+      }
     val resolvedLevel = MarketapLogLevel.values().firstOrNull { level ->
       level.value == logLevel
     } ?: MarketapLogLevel.NONE
@@ -88,16 +111,29 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun signup(
-    userId: String,
-    userProperties: ReadableMap?,
-    eventProperties: ReadableMap?,
-    persistUser: Boolean?,
-    promise: Promise
-  ) {
+  fun signup(payload: ReadableMap?, promise: Promise) {
     try {
+      val userId = payload?.getString("userId") ?: ""
+      val userProperties =
+        if (payload != null && payload.hasKey("userProperties") && !payload.isNull("userProperties")) {
+          payload.getMap("userProperties")
+        } else {
+          null
+        }
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
+      val persistUser =
+        if (payload != null && payload.hasKey("persistUser") && !payload.isNull("persistUser")) {
+          payload.getBoolean("persistUser")
+        } else {
+          true
+        }
       // Call MarketapSDK signup method
-      Marketap.signup(userId, userProperties.toNonNullableMap(), eventProperties.toNonNullableMap(), persistUser ?: true)
+      Marketap.signup(userId, userProperties.toNonNullableMap(), eventProperties.toNonNullableMap(), persistUser)
       promise.resolve(null)
     } catch (e: Exception) {
       promise.reject("SIGNUP_ERROR", e.message, e)
@@ -105,13 +141,21 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun login(
-    userId: String,
-    userProperties: ReadableMap?,
-    eventProperties: ReadableMap?,
-    promise: Promise
-  ) {
+  fun login(payload: ReadableMap?, promise: Promise) {
     try {
+      val userId = payload?.getString("userId") ?: ""
+      val userProperties =
+        if (payload != null && payload.hasKey("userProperties") && !payload.isNull("userProperties")) {
+          payload.getMap("userProperties")
+        } else {
+          null
+        }
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK login method
       Marketap.login(userId, userProperties.toNonNullableMap(), eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -121,8 +165,14 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun logout(eventProperties: ReadableMap?, promise: Promise) {
+  fun logout(payload: ReadableMap?, promise: Promise) {
     try {
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK logout method
       Marketap.logout(eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -132,8 +182,15 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun track(eventName: String, eventProperties: ReadableMap?, promise: Promise) {
+  fun track(payload: ReadableMap?, promise: Promise) {
     try {
+      val eventName = payload?.getString("eventName") ?: ""
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK track method
       Marketap.track(eventName, eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -143,8 +200,20 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun trackPurchase(revenue: Double, eventProperties: ReadableMap?, promise: Promise) {
+  fun trackPurchase(payload: ReadableMap?, promise: Promise) {
     try {
+      val revenue =
+        if (payload != null && payload.hasKey("revenue") && !payload.isNull("revenue")) {
+          payload.getDouble("revenue")
+        } else {
+          0.0
+        }
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK trackPurchase method
       Marketap.trackPurchase(revenue, eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -154,13 +223,21 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun trackRevenue(
-    eventName: String,
-    revenue: Double,
-    eventProperties: ReadableMap?,
-    promise: Promise
-  ) {
+  fun trackRevenue(payload: ReadableMap?, promise: Promise) {
     try {
+      val eventName = payload?.getString("eventName") ?: ""
+      val revenue =
+        if (payload != null && payload.hasKey("revenue") && !payload.isNull("revenue")) {
+          payload.getDouble("revenue")
+        } else {
+          0.0
+        }
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK trackRevenue method
       Marketap.trackRevenue(eventName, revenue, eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -170,8 +247,14 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun trackPageView(eventProperties: ReadableMap?, promise: Promise) {
+  fun trackPageView(payload: ReadableMap?, promise: Promise) {
     try {
+      val eventProperties =
+        if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+          payload.getMap("eventProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK trackPageView method
       Marketap.trackPageView(eventProperties.toNonNullableMap())
       promise.resolve(null)
@@ -181,8 +264,15 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun identify(userId: String, userProperties: ReadableMap?, promise: Promise) {
+  fun identify(payload: ReadableMap?, promise: Promise) {
     try {
+      val userId = payload?.getString("userId") ?: ""
+      val userProperties =
+        if (payload != null && payload.hasKey("userProperties") && !payload.isNull("userProperties")) {
+          payload.getMap("userProperties")
+        } else {
+          null
+        }
       // Call MarketapSDK identify method
       Marketap.identify(userId, userProperties.toNonNullableMap())
       promise.resolve(null)
@@ -205,14 +295,14 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun setClickHandler(promise: Promise) {
     try {
-      hasListeners = true
+      clickHandlerRegistered = true
       Marketap.setClickHandler { event ->
         val clickData = convertClickEventToMap(event)
 
-        deliverOrStoreClick(clickData)
+        ReactNativeBridgeRegistry.deliverClick(clickData)
       }
 
-      flushPendingClick()
+      ReactNativeBridgeRegistry.flushIfPending()
       promise.resolve(null)
     } catch (e: Exception) {
       promise.reject("SET_CLICK_HANDLER_ERROR", e.message, e)
@@ -233,35 +323,139 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  // 웹브릿지 인앱 메시지 관련 메서드
   @ReactMethod
-  fun setPushToken(token: String, promise: Promise) {
+  fun trackFromWebBridge(payload: ReadableMap?, promise: Promise) {
+      try {
+          val eventName = payload?.getString("eventName") ?: ""
+          val eventProperties =
+            if (payload != null && payload.hasKey("eventProperties") && !payload.isNull("eventProperties")) {
+              payload.getMap("eventProperties")
+            } else {
+              null
+            }
+          val handleInAppInReactNative =
+            if (payload != null && payload.hasKey("handleInAppInReactNative") && !payload.isNull("handleInAppInReactNative")) {
+              payload.getBoolean("handleInAppInReactNative")
+            } else {
+              false
+            }
+          if (handleInAppInReactNative) {
+              ReactNativeBridgeRegistry.setWebBridgeSourceTarget(this)
+              MarketapWebBridge.setExternalWebBridgeActive(true)
+          } else {
+              ReactNativeBridgeRegistry.clearWebBridgeSourceTarget()
+              MarketapWebBridge.setExternalWebBridgeActive(false)
+          }
+          MarketapPlugin.trackEvent(eventName, eventProperties.toNonNullableMap())
+          promise.resolve(null)
+      } catch (e: Exception) {
+          promise.reject("TRACK_FROM_WEB_BRIDGE_ERROR", e.message, e)
+      }
+  }
+
+  @ReactMethod
+  fun setUserProperties(payload: ReadableMap?, promise: Promise) {
     try {
-      // Android: setPushToken not available - MarketapFirebaseMessagingService handles tokens automatically
+      val userProperties =
+        if (payload != null && payload.hasKey("userProperties") && !payload.isNull("userProperties")) {
+          payload.getMap("userProperties")
+        } else {
+          null
+        }
+      val props = userProperties.toNonNullableMap()
+      if (props == null) {
+        promise.reject("ARG_ERROR", "Missing userProperties", null)
+        return
+      }
+      MarketapPlugin.setUserProperties(props)
       promise.resolve(null)
     } catch (e: Exception) {
-      promise.reject("PUSH_TOKEN_ERROR", e.message, e)
+      promise.reject("SET_USER_PROPERTIES_ERROR", e.message, e)
     }
   }
 
   @ReactMethod
-  fun getInitialNotification(promise: Promise) {
+  fun trackInAppImpression(payload: ReadableMap?, promise: Promise) {
     try {
-      val pendingEvent = pendingClickEvent
-      if (pendingEvent != null) {
-        pendingClickEvent = null
-        promise.resolve(pendingEvent)
-      } else {
+      val campaignId = payload?.getString("campaignId")
+      val messageId = payload?.getString("messageId")
+      val layoutSubType = payload?.getString("layoutSubType")
+      if (campaignId == null || messageId == null) {
+        android.util.Log.w(
+          NAME,
+          "trackInAppImpression: missing required params (campaignId=$campaignId, messageId=$messageId)"
+        )
         promise.resolve(null)
+        return
       }
+      MarketapPlugin.trackInAppImpression(campaignId, messageId, layoutSubType)
+      promise.resolve(null)
     } catch (e: Exception) {
-      promise.reject("GET_INITIAL_NOTIFICATION_ERROR", e.message, e)
+      promise.reject("TRACK_INAPP_IMPRESSION_ERROR", e.message, e)
+    }
+  }
+
+  @ReactMethod
+  fun trackInAppClick(payload: ReadableMap?, promise: Promise) {
+    try {
+      val campaignId = payload?.getString("campaignId")
+      val messageId = payload?.getString("messageId")
+      val locationId = payload?.getString("locationId")
+      val url = payload?.getString("url")
+      val layoutSubType = payload?.getString("layoutSubType")
+      if (campaignId == null || messageId == null || locationId == null) {
+        android.util.Log.w(
+          NAME,
+          "trackInAppClick: missing required params (campaignId=$campaignId, messageId=$messageId, locationId=$locationId)"
+        )
+        promise.resolve(null)
+        return
+      }
+      MarketapPlugin.trackInAppClick(campaignId, messageId, locationId, url, layoutSubType)
+      promise.resolve(null)
+    } catch (e: Exception) {
+      promise.reject("TRACK_INAPP_CLICK_ERROR", e.message, e)
+    }
+  }
+
+  @ReactMethod
+  fun hideCampaign(payload: ReadableMap?, promise: Promise) {
+    try {
+      val campaignId = payload?.getString("campaignId")
+      val hideType = payload?.getString("hideType")
+      if (campaignId == null) {
+        android.util.Log.w(NAME, "hideCampaign: missing campaignId")
+        promise.resolve(null)
+        return
+      }
+      MarketapPlugin.hideInAppMessage(campaignId, hideType)
+      promise.resolve(null)
+    } catch (e: Exception) {
+      promise.reject("HIDE_CAMPAIGN_ERROR", e.message, e)
+    }
+  }
+
+  @ReactMethod
+  fun setDeviceOptIn(payload: ReadableMap?, promise: Promise) {
+    try {
+      val optIn: Boolean? =
+        if (payload != null && payload.hasKey("optIn") && !payload.isNull("optIn")) {
+          payload.getBoolean("optIn")
+        } else {
+          null
+        }
+      Marketap.setDeviceOptIn(optIn)
+      promise.resolve(null)
+    } catch (e: Exception) {
+      promise.reject("SET_DEVICE_OPT_IN_ERROR", e.message, e)
     }
   }
 
   @ReactMethod
   fun addListener(eventName: String) {
     hasListeners = true
-    flushPendingClick()
+    ReactNativeBridgeRegistry.flushIfPending()
   }
 
   @ReactMethod
@@ -270,7 +464,7 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
   }
 
   private fun sendEvent(eventName: String, params: WritableMap?): Boolean {
-    if (!hasListeners || !isReactReady()) {
+    if (!hasListeners || !isReactInstanceReady()) {
       return false
     }
     reactApplicationContext.runOnJSQueueThread {
@@ -281,28 +475,7 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
     return true
   }
 
-  private fun deliverOrStoreClick(clickData: WritableMap) {
-    if (hasListeners && isReactReady()) {
-      if (sendEvent(CLICK_EVENT, clickData)) {
-        pendingClickEvent = null
-      } else {
-        pendingClickEvent = clickData
-      }
-    } else {
-      pendingClickEvent = clickData
-    }
-  }
-
-  private fun flushPendingClick() {
-    val pendingEvent = pendingClickEvent
-    if (pendingEvent != null && hasListeners && isReactReady()) {
-      if (sendEvent(CLICK_EVENT, pendingEvent)) {
-        pendingClickEvent = null
-      }
-    }
-  }
-
-  private fun isReactReady(): Boolean {
+  private fun isReactInstanceReady(): Boolean {
     return reactApplicationContext.hasActiveCatalystInstance() &&
       reactApplicationContext.hasActiveReactInstance()
   }
@@ -320,16 +493,52 @@ class MarketapSdkModule(reactContext: ReactApplicationContext) :
     return map
   }
 
+  override fun sendInAppMessage(
+    campaign: Map<String, Any?>,
+    messageId: String,
+    hasCustomClickHandler: Boolean
+  ) {
+    val args = Arguments.createMap()
+    args.putMap("campaign", Arguments.makeNativeMap(campaign))
+    args.putString("messageId", messageId)
+    args.putBoolean("hasCustomClickHandler", hasCustomClickHandler)
+    sendEvent(IN_APP_MESSAGE_EVENT, args)
+  }
+
+  override fun sendClick(clickData: WritableMap) {
+    sendEvent(CLICK_EVENT, clickData)
+  }
+
   override fun onHostResume() {
     val activity = getCurrentActivity() ?: return
     CurrentActivityHolder.set(activity)
-    flushPendingClick()
+    ReactNativeBridgeRegistry.flushIfPending()
   }
 
   override fun onHostPause() {
   }
 
   override fun onHostDestroy() {
+    isModuleActive = false
+    ReactNativeBridgeRegistry.unregister(this)
+    reactApplicationContext.removeLifecycleEventListener(this)
+  }
+
+  override fun invalidate() {
+    isModuleActive = false
+    ReactNativeBridgeRegistry.unregister(this)
     reactApplicationContext.removeLifecycleEventListener(this)
+    super.invalidate()
   }
-}
+
+  private fun registerExternalInAppCallback() {
+    if (isExternalInAppCallbackRegistered) {
+      return
+    }
+    isExternalInAppCallbackRegistered = true
+
+    MarketapWebBridge.setExternalInAppMessageCallback { campaign, messageId, hasCustomClickHandler ->
+      ReactNativeBridgeRegistry.sendInAppMessage(campaign, messageId, hasCustomClickHandler)
+    }
+  }
+}

package/android/src/main/java/com/marketapsdk/ReactNativeBridgeRegistry.kt

@@ -0,0 +1,110 @@
+package com.marketapsdk
+
+import com.facebook.react.bridge.WritableMap
+
+internal interface ReactNativeBridgeTarget {
+  val isAttachedToReact: Boolean
+  val isClickHandlerRegistered: Boolean
+  val isReactReady: Boolean
+
+  fun sendInAppMessage(
+    campaign: Map<String, Any?>,
+    messageId: String,
+    hasCustomClickHandler: Boolean
+  )
+
+  fun sendClick(clickData: WritableMap)
+}
+
+internal object ReactNativeBridgeRegistry {
+  private val activeTargets: MutableList<ReactNativeBridgeTarget> = mutableListOf()
+
+  private val clickHandlerTargets: List<ReactNativeBridgeTarget>
+    get() = activeTargets.filter { it.isClickHandlerRegistered && it.isAttachedToReact }
+  private val attachedTargets: List<ReactNativeBridgeTarget>
+    get() = activeTargets.filter { it.isAttachedToReact }
+
+  private var lastPendingClick: WritableMap? = null
+
+  // trackFromWebBridge를 호출한 타겟 (인앱 메시지 전달 대상)
+  private var webBridgeSourceTarget: ReactNativeBridgeTarget? = null
+
+  fun register(target: ReactNativeBridgeTarget) {
+    log("Register target: $target")
+    activeTargets.add(target)
+  }
+
+  fun unregister(target: ReactNativeBridgeTarget) {
+    log("Unregister target: $target")
+    activeTargets.remove(target)
+    if (webBridgeSourceTarget == target) {
+      webBridgeSourceTarget = null
+    }
+  }
+
+  /**
+   * trackFromWebBridge 호출 시 소스 타겟 설정
+   */
+  fun setWebBridgeSourceTarget(target: ReactNativeBridgeTarget) {
+    webBridgeSourceTarget = target
+  }
+
+  /**
+   * 소스 타겟 초기화
+   */
+  fun clearWebBridgeSourceTarget() {
+    webBridgeSourceTarget = null
+  }
+
+  /**
+   * 네이티브 SDK에서 RN으로 인앱 메시지 전달
+   * trackFromWebBridge를 호출한 타겟에만 전달
+   */
+  fun sendInAppMessage(
+    campaign: Map<String, Any?>,
+    messageId: String,
+    hasCustomClickHandler: Boolean
+  ) {
+    val target = webBridgeSourceTarget
+    webBridgeSourceTarget = null
+
+    if (target != null && target.isAttachedToReact && target.isReactReady) {
+      target.sendInAppMessage(campaign, messageId, hasCustomClickHandler)
+    }
+  }
+
+  fun flushIfPending() {
+    log("flush called, $lastPendingClick")
+    lastPendingClick?.let { clickData ->
+      log("Flush pending click on new instance: $clickData")
+      deliverClick(clickData)
+    }
+  }
+
+  fun deliverClick(clickData: WritableMap) {
+    log("Deliver click: $clickData")
+    val readyTargets = clickHandlerTargets.filter { it.isReactReady }
+    if (readyTargets.isNotEmpty()) {
+      log("There are ${readyTargets.size} click handler targets available; delivery click: $clickData")
+      readyTargets.forEach { target ->
+        log("Deliver click to $target: $clickData")
+        target.sendClick(clickData)
+      }
+      lastPendingClick = null
+    } else {
+      log("Targets not ready; store click: $clickData")
+      lastPendingClick = clickData
+    }
+  }
+
+  fun popPendingClick(): WritableMap? {
+    val pending = lastPendingClick
+    lastPendingClick = null
+    return pending
+  }
+
+  private fun log(message: String) {
+    // TODO: route to Marketap logger when available in RN layer
+    android.util.Log.d("MarketapBridgeRegistry", message)
+  }
+}