@digia-engage/core 2.3.2 → 2.4.0

package/DigiaEngageReactNative.podspec

@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.dependency 'React-Core'
 
   # ── Digia Engage iOS SDK ──────────────────────────────────────────────────
-  s.dependency 'DigiaEngage','~> 2.3.1'
+  s.dependency 'DigiaEngage','~> 2.4.0'
 
   # ── New Architecture (Fabric / TurboModules) support ─────────────────────
   install_modules_dependencies(s)

package/android/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>digia-engage_core</name>
+	<comment>Project digia-engage_core created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1780322402778</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

package/android/build.gradle

@@ -71,7 +71,7 @@ android {
 
 dependencies {
     // Digia Engage Android library
-    implementation 'tech.digia:engage:2.1.1'
+    implementation 'tech.digia:engage:2.2.0'
 
     // ── React Native ─────────────────────────────────────────────────────────
     // React Native is provided by the host app; mark as compileOnly so it is

package/android/local.properties

@@ -0,0 +1 @@
+sdk.dir=/Users/ram/Library/Android/sdk

package/android/src/main/java/com/digia/engage/rn/DigiaModule.kt

@@ -29,6 +29,7 @@ import androidx.lifecycle.setViewTreeLifecycleOwner
 import androidx.lifecycle.setViewTreeViewModelStoreOwner
 import androidx.savedstate.SavedStateRegistryOwner
 import androidx.savedstate.setViewTreeSavedStateRegistryOwner
+import com.digia.engage.CEPTriggerPayload
 import com.digia.engage.DiagnosticReport
 import com.digia.engage.Digia
 import com.digia.engage.DigiaCEPDelegate
@@ -126,6 +127,54 @@ internal class DigiaModule(
         Digia.setCurrentScreen(name)
     }
 
+    // ─── Analytics identity ───────────────────────────────────────────────────
+
+    @ReactMethod
+    fun setUserId(userId: String) {
+        Digia.setUserId(userId)
+    }
+
+    @ReactMethod
+    fun clearUserId() {
+        Digia.clearUserId()
+    }
+
+    // ─── Analytics event forwarding (guide / JS-rendered campaigns) ───────────
+
+    /**
+     * Records an analytics event originating from JS-rendered campaigns (guides).
+     * Native campaigns (nudge, inline, survey) are tracked internally by the SDK.
+     */
+    @ReactMethod
+    fun trackEvent(
+        eventType: String,
+        campaignId: String,
+        campaignKey: String,
+        campaignType: String,
+        elementId: String?,
+    ) {
+        android.util.Log.d("DigiaAnalytics", "[trackEvent] RN bridge received: type=$eventType campaignId=$campaignId campaignKey=$campaignKey campaignType=$campaignType elementId=$elementId")
+        val event = when (eventType) {
+            "impressed" -> DigiaExperienceEvent.Impressed
+            "clicked" -> DigiaExperienceEvent.Clicked(elementId)
+            "dismissed" -> DigiaExperienceEvent.Dismissed
+            else -> {
+                android.util.Log.w("DigiaAnalytics", "[trackEvent] unknown eventType='$eventType' — dropped")
+                return
+            }
+        }
+        val payload = InAppPayload(
+            id = campaignKey,
+            content = mapOf(
+                "campaign_id" to campaignId,
+                "campaign_key" to campaignKey,
+                "campaign_type" to campaignType,
+            ),
+        )
+        android.util.Log.d("DigiaAnalytics", "[trackEvent] forwarding to Digia.captureAnalyticsEvent: event=${event::class.simpleName}")
+        Digia.captureAnalyticsEvent(event, payload)
+    }
+
     // ─── triggerCampaign ──────────────────────────────────────────────────────
 
     /**
@@ -138,11 +187,20 @@ internal class DigiaModule(
     @ReactMethod
     fun triggerCampaign(id: String, content: ReadableMap, cepContext: ReadableMap) {
         val delegate = rnPlugin.delegate ?: return
+        val contentMap = content.toHashMap().toMap()
+        val campaignKey = (contentMap["digia_campaign_key"] as? String)
+            ?: (contentMap["campaign_key"] as? String)
+            ?: id
+        @Suppress("UNCHECKED_CAST")
+        val variables = (contentMap["variables"] as? Map<*, *>)
+            ?.entries
+            ?.associate { it.key.toString() to it.value?.toString().orEmpty() }
         delegate.onCampaignTriggered(
-                InAppPayload(
-                        id = id,
-                        content = content.toHashMap().toMap(),
-                        cepContext = cepContext.toHashMap().toMap(),
+                CEPTriggerPayload(
+                        cepCampaignId = id,
+                        campaignKey = campaignKey,
+                        cepMetadata = cepContext.toHashMap().toMap(),
+                        variables = variables,
                 )
         )
     }
@@ -277,10 +335,10 @@ internal class RNEventBridgePlugin(
         /* forwarded by Digia.setCurrentScreen() on the native side */
     }
 
-    override fun notifyEvent(event: DigiaExperienceEvent, payload: InAppPayload) {
+    override fun notifyEvent(event: DigiaExperienceEvent, payload: CEPTriggerPayload) {
         val params =
                 Arguments.createMap().apply {
-                    putString("campaignId", payload.id)
+                    putString("campaignId", payload.cepCampaignId)
                     when (event) {
                         is DigiaExperienceEvent.Impressed -> putString("type", "impressed")
                         is DigiaExperienceEvent.Clicked -> {

package/ios/DigiaModule.swift

@@ -78,13 +78,18 @@ final class DigiaModule: RCTEventEmitter {
         default: logLevelValue = .error
         }
 
+        let cleanBaseUrl = baseUrl.flatMap { url -> String? in
+            var s = url.trimmingCharacters(in: .whitespacesAndNewlines)
+                .trimmingCharacters(in: CharacterSet(charactersIn: "/"))
+            if s.hasSuffix("/api/v1") { s = String(s.dropLast(7)) }
+            return s.isEmpty ? nil : s
+        }
+
         let config = DigiaConfig(
             apiKey: projectId,
             logLevel: logLevelValue,
             environment: envValue,
-            developerConfig: baseUrl.flatMap {
-                $0.isEmpty ? nil : DigiaDeveloperConfig(baseURL: $0)
-            },
+            developerConfig: cleanBaseUrl.map { DigiaDeveloperConfig(baseURL: $0) },
             fontFamily: fontFamily.flatMap { $0.isEmpty ? nil : $0 }
         )
 
@@ -109,10 +114,27 @@ final class DigiaModule: RCTEventEmitter {
     @objc
     func registerBridge() {
         Task { @MainActor in
+            // Dismiss any stale overlay left over from the previous JS session.
+            Digia.dismissActiveNudge()
+
+            // After a JS reload, re-bring the overlay host to the front.
+            // Expo/RN may have added views during the reload cycle that sit on
+            // top of the host, causing the SwiftUI layer to be unreachable by
+            // touch even when hasActiveOverlay = true.
+            if let rootVC = UIApplication.shared.connectedScenes
+                .compactMap({ ($0 as? UIWindowScene)?.keyWindow?.rootViewController })
+                .first,
+               let hostView = rootVC.view.viewWithTag(Self.overlayMountTag) {
+                rootVC.view.bringSubviewToFront(hostView)
+            }
+
             Digia.register(self.rnPlugin)
+            print("[DigiaRN] registerBridge: rnPlugin registered, delegate=\(self.rnPlugin.delegate != nil ? "set" : "nil")")
         }
     }
 
+    private static let overlayMountTag = 0xD19140
+
     // ────────────────────────────────────────────────────────────────────────
     // MARK: - setCurrentScreen
 
@@ -140,10 +162,17 @@ final class DigiaModule: RCTEventEmitter {
         let content = buildInAppPayloadContent(from: contentMap)
         let cepContext = (cepContextMap as? [String: String]) ?? [:]
         let payload = InAppPayload(id: id, content: content, cepContext: cepContext)
+        print("[DigiaRN] triggerCampaign id=\(id) campaignKey=\(content.campaignKey ?? "nil")")
 
         Task { @MainActor in
-            guard let delegate = self.rnPlugin.delegate else { return }
+            guard let delegate = self.rnPlugin.delegate else {
+                print("[DigiaRN] triggerCampaign: delegate is nil — registerBridge() may not have run yet")
+                return
+            }
             delegate.onCampaignTriggered(payload)
+            Task { @MainActor in
+                print("[DigiaRN] triggerCampaign post-call: hasActiveOverlay=\(Digia.hasActiveOverlay)")
+            }
         }
     }
 
@@ -213,12 +242,11 @@ final class DigiaModule: RCTEventEmitter {
         else { return }
 
         // Guard against double-mounting (e.g. fast-refresh).
-        let mountTag = 0xD19140
-        if rootVC.view.viewWithTag(mountTag) != nil { return }
+        if rootVC.view.viewWithTag(Self.overlayMountTag) != nil { return }
 
         let hc = UIHostingController(rootView: DigiaHostWrapperView())
         let hostView = DigiaRootOverlayView(hostingController: hc)
-        hostView.tag = mountTag
+        hostView.tag = Self.overlayMountTag
         hostView.translatesAutoresizingMaskIntoConstraints = false
         hostView.backgroundColor = .clear
 
@@ -254,6 +282,7 @@ final class DigiaModule: RCTEventEmitter {
         let screenId = map["screenId"] as? String
         let campaignKey =
             (map["campaignKey"] as? String) ?? (map["campaign_key"] as? String)
+            ?? (map["digia_campaign_key"] as? String)
             ?? (map["digiaKey"] as? String)
         var type = (map["type"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         if type.isEmpty {
@@ -266,6 +295,13 @@ final class DigiaModule: RCTEventEmitter {
             return raw.compactMapValues { JSONValue(rawValue: $0) }
         }()
 
+        // CEP trigger variables for `{{ }}` interpolation. CleverTap's nudge
+        // mapper puts them at `content.variables` (top-level); the command/inline
+        // mappers may nest them under `args.variables`. Mirror the JS bridge's
+        // `_extractVariables` (content.variables first, then args.variables).
+        let variables = Self.variableMap(map["variables"])
+            ?? Self.variableMap((map["args"] as? [String: Any])?["variables"])
+
         return InAppPayloadContent(
             type: type,
             placementKey: pk,
@@ -275,9 +311,35 @@ final class DigiaModule: RCTEventEmitter {
             command: command,
             args: args,
             screenId: screenId,
-            campaignKey: campaignKey
+            campaignKey: campaignKey,
+            variables: variables
         )
     }
+
+    /// Coerces a raw `variables` value into a `[String: String]` map, stringifying
+    /// scalar values (string / number / bool) and dropping anything else. Returns
+    /// nil for a missing or empty map. Mirrors the JS `parseVariableMap`.
+    private static func variableMap(_ raw: Any?) -> [String: String]? {
+        guard let dict = raw as? [String: Any] else { return nil }
+        var result: [String: String] = [:]
+        for (key, value) in dict {
+            switch value {
+            case let string as String:
+                result[key] = string
+            case let number as NSNumber:
+                // Distinguish a boxed bool from a numeric NSNumber so `true`
+                // stays "true" rather than "1".
+                if CFGetTypeID(number) == CFBooleanGetTypeID() {
+                    result[key] = number.boolValue ? "true" : "false"
+                } else {
+                    result[key] = number.stringValue
+                }
+            default:
+                continue
+            }
+        }
+        return result.isEmpty ? nil : result
+    }
 }
 
 // MARK: - DigiaRootOverlayView

package/ios/RNEventBridgePlugin.swift

@@ -54,6 +54,8 @@ internal final class RNEventBridgePlugin: NSObject, DigiaCEPPlugin {
         case .dismissed:
             body["type"] = "dismissed"
         }
+        let hasEmitter = eventEmitter != nil
+        print("[DigiaRN] RNEventBridgePlugin.notifyEvent type=\(body["type"] ?? "?") campaignId=\(payload.id) hasEmitter=\(hasEmitter)")
         eventEmitter?.sendEvent(withName: "digiaEngageEvent", body: body)
     }