react-native-fluxsens-syaxon 0.1.2 → 0.1.4

package/android/src/main/java/com/syaxonreactnativesdk/SyaxonDeviceInfoModule.kt

@@ -48,18 +48,18 @@ class SyaxonDeviceInfoModule(
 
             val map = Arguments.createMap()
 
-            map.putString("sxn-device-id", deviceId)
-            map.putString("sxn-device-model", Build.MODEL)
-            map.putString("sxn-manufacturer", Build.MANUFACTURER)
-            map.putString("sxn-os", "Android")
-            map.putString("sxn-os-version", Build.VERSION.RELEASE)
-            map.putString("sxn-app-name", appName)
-            map.putString("sxn-package-name", packageName)
-            map.putString("sxn-app-version", versionName)
-            map.putString("sxn-build-number", buildNumber)
-            map.putString("sxn-country", locale.country)
-            map.putString("sxn-language", locale.language)
-            map.putString("sxn-timezone", java.util.TimeZone.getDefault().id)
+            map.putString("device-id", deviceId)
+            map.putString("device-model", Build.MODEL)
+            map.putString("manufacturer", Build.MANUFACTURER)
+            map.putString("os", "Android")
+            map.putString("os-version", Build.VERSION.RELEASE)
+            map.putString("app-name", appName)
+            map.putString("package-name", packageName)
+            map.putString("app-version", versionName)
+            map.putString("build-number", buildNumber)
+            map.putString("country", locale.country)
+            map.putString("language", locale.language)
+            map.putString("timezone", java.util.TimeZone.getDefault().id)
 
             promise.resolve(map)
 

package/android/src/main/java/com/syaxonreactnativesdk/event/EventEmitter.kt

@@ -1,39 +1,59 @@
-package com.syaxonreactnativesdk.event
-
-import android.app.Activity
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.common.LifecycleState
-import com.facebook.react.modules.core.DeviceEventManagerModule
-
-object EventEmitter {
+package com.syaxonreactnativesdk.event
+
+import android.app.Activity
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.LifecycleEventListener
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.common.LifecycleState
+import com.facebook.react.modules.core.DeviceEventManagerModule
+
+object EventEmitter {
 
     private var reactContext: ReactApplicationContext? = null
+    private val pendingEvents = mutableListOf<Pair<String, WritableMap?>>()
+
+    fun initialize(context: ReactApplicationContext) {
+        reactContext = context
+        context.addLifecycleEventListener(object : LifecycleEventListener {
+            override fun onHostResume() {
+                flushPendingEvents()
+            }
+            override fun onHostPause() {}
+            override fun onHostDestroy() {}
+        })
+    }
+
+    private fun flushPendingEvents() {
+        val snapshot = pendingEvents.toList()
+        pendingEvents.clear()
+        snapshot.forEach { (event, params) ->
+            reactContext
+                ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                ?.emit(event, params)
+        }
+    }
 
-    fun initialize(context: ReactApplicationContext) {
-
-        reactContext = context
-
-    }
-
-    fun currentActivity(): Activity? {
-        return reactContext?.currentActivity
-    }
-
-    fun isAppVisible(): Boolean {
-        return reactContext?.lifecycleState == LifecycleState.RESUMED
-    }
-
-    fun emit(
-        event: String,
+    fun currentActivity(): Activity? {
+        return reactContext?.currentActivity
+    }
+
+    fun isAppVisible(): Boolean {
+        return reactContext?.lifecycleState == LifecycleState.RESUMED
+    }
+
+    fun emit(
+        event: String,
         params: WritableMap?
     ) {
+        if (reactContext?.lifecycleState != LifecycleState.RESUMED) {
+            pendingEvents.add(Pair(event, params))
+            return
+        }
 
         reactContext
             ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
             ?.emit(event, params)
-
     }
 
     fun emitToken(
@@ -51,107 +71,107 @@ object EventEmitter {
 
     }
 
-    fun emitPushReceived(
-        campaignId: String?,
-        title: String?,
-        body: String?,
-        deepLink: String?,
-        imageUrl: String? = null,
-        clickAction: String? = null,
-        priority: String? = null,
-        badge: Int = 0,
-        sound: String? = null,
-        data: Map<String, String> = emptyMap()
-    ) {
-
-        val map = createPushPayloadMap(
-            campaignId,
-            title,
-            body,
-            deepLink,
-            imageUrl,
-            clickAction,
-            priority,
-            badge,
-            sound,
-            data
-        )
-
-        emit(
-            EventConstants.PUSH_RECEIVED,
+    fun emitPushReceived(
+        campaignId: String?,
+        title: String?,
+        body: String?,
+        deepLink: String?,
+        imageUrl: String? = null,
+        clickAction: String? = null,
+        priority: String? = null,
+        badge: Int = 0,
+        sound: String? = null,
+        data: Map<String, String> = emptyMap()
+    ) {
+
+        val map = createPushPayloadMap(
+            campaignId,
+            title,
+            body,
+            deepLink,
+            imageUrl,
+            clickAction,
+            priority,
+            badge,
+            sound,
+            data
+        )
+
+        emit(
+            EventConstants.PUSH_RECEIVED,
             map
         )
 
     }
-
-    fun emitPushOpened(
-        campaignId: String?,
-        deepLink: String?,
-        title: String? = null,
-        body: String? = null,
-        imageUrl: String? = null,
-        clickAction: String? = null,
-        priority: String? = null,
-        badge: Int = 0,
-        sound: String? = null,
-        data: Map<String, String> = emptyMap()
-    ) {
-
-        val map = createPushPayloadMap(
-            campaignId,
-            title,
-            body,
-            deepLink,
-            imageUrl,
-            clickAction,
-            priority,
-            badge,
-            sound,
-            data
-        )
-
-        emit(
-            EventConstants.PUSH_OPENED,
+
+    fun emitPushOpened(
+        campaignId: String?,
+        deepLink: String?,
+        title: String? = null,
+        body: String? = null,
+        imageUrl: String? = null,
+        clickAction: String? = null,
+        priority: String? = null,
+        badge: Int = 0,
+        sound: String? = null,
+        data: Map<String, String> = emptyMap()
+    ) {
+
+        val map = createPushPayloadMap(
+            campaignId,
+            title,
+            body,
+            deepLink,
+            imageUrl,
+            clickAction,
+            priority,
+            badge,
+            sound,
+            data
+        )
+
+        emit(
+            EventConstants.PUSH_OPENED,
             map
         )
-
-    }
-
-    fun emitPushDismissed(
-        campaignId: String?,
-        title: String? = null,
-        body: String? = null,
-        deepLink: String? = null,
-        imageUrl: String? = null,
-        clickAction: String? = null,
-        priority: String? = null,
-        badge: Int = 0,
-        sound: String? = null,
-        data: Map<String, String> = emptyMap()
-    ) {
-
-        val map = createPushPayloadMap(
-            campaignId,
-            title,
-            body,
-            deepLink,
-            imageUrl,
-            clickAction,
-            priority,
-            badge,
-            sound,
-            data
-        )
-
-        emit(
-            EventConstants.PUSH_DISMISSED,
-            map
-        )
-
-    }
-
-    fun emitPermissionChanged(
-        granted: Boolean
+
+    }
+
+    fun emitPushDismissed(
+        campaignId: String?,
+        title: String? = null,
+        body: String? = null,
+        deepLink: String? = null,
+        imageUrl: String? = null,
+        clickAction: String? = null,
+        priority: String? = null,
+        badge: Int = 0,
+        sound: String? = null,
+        data: Map<String, String> = emptyMap()
+    ) {
+
+        val map = createPushPayloadMap(
+            campaignId,
+            title,
+            body,
+            deepLink,
+            imageUrl,
+            clickAction,
+            priority,
+            badge,
+            sound,
+            data
+        )
+
+        emit(
+            EventConstants.PUSH_DISMISSED,
+            map
+        )
+
+    }
+
+    fun emitPermissionChanged(
+        granted: Boolean
     ) {
 
         val map = Arguments.createMap()
@@ -162,42 +182,42 @@ object EventEmitter {
             EventConstants.PERMISSION_CHANGED,
             map
         )
-
-    }
-
-    private fun createPushPayloadMap(
-        campaignId: String?,
-        title: String?,
-        body: String?,
-        deepLink: String?,
-        imageUrl: String?,
-        clickAction: String?,
-        priority: String?,
-        badge: Int,
-        sound: String?,
-        data: Map<String, String>
-    ): WritableMap {
-
-        val map = Arguments.createMap()
-        val dataMap = Arguments.createMap()
-
-        data.forEach { (key, value) ->
-            dataMap.putString(key, value)
-        }
-
-        map.putString("title", title)
-        map.putString("message", body)
-        map.putString("body", body)
-        map.putString("imageUrl", imageUrl)
-        map.putString("campaignId", campaignId)
-        map.putString("deepLink", deepLink)
-        map.putString("clickAction", clickAction)
-        map.putString("priority", priority)
-        map.putInt("badge", badge)
-        map.putString("sound", sound)
-        map.putMap("data", dataMap)
-
-        return map
-    }
-
-}
+
+    }
+
+    private fun createPushPayloadMap(
+        campaignId: String?,
+        title: String?,
+        body: String?,
+        deepLink: String?,
+        imageUrl: String?,
+        clickAction: String?,
+        priority: String?,
+        badge: Int,
+        sound: String?,
+        data: Map<String, String>
+    ): WritableMap {
+
+        val map = Arguments.createMap()
+        val dataMap = Arguments.createMap()
+
+        data.forEach { (key, value) ->
+            dataMap.putString(key, value)
+        }
+
+        map.putString("title", title)
+        map.putString("message", body)
+        map.putString("body", body)
+        map.putString("imageUrl", imageUrl)
+        map.putString("campaignId", campaignId)
+        map.putString("deepLink", deepLink)
+        map.putString("clickAction", clickAction)
+        map.putString("priority", priority)
+        map.putInt("badge", badge)
+        map.putString("sound", sound)
+        map.putMap("data", dataMap)
+
+        return map
+    }
+
+}

package/android/src/main/java/com/syaxonreactnativesdk/firebase/NotificationParser.kt

@@ -4,31 +4,36 @@ import com.google.firebase.messaging.RemoteMessage
 
 object NotificationParser {
 
-    fun parse(remoteMessage: RemoteMessage): NotificationPayload {
-        
-        val notification = remoteMessage.notification
-        val data = remoteMessage.data
-        val payload = NotificationPayload(
-            title = notification?.title
-                ?: data["title"]
-                ?: data["notificationTitle"],
-            body = notification?.body
-                ?: data["body"]
-                ?: data["message"]
-                ?: data["notificationBody"],
-            imageUrl = notification?.imageUrl?.toString()
-                ?: data["imageUrl"]
-                ?: data["image"],
-            campaignId = data["campaignId"],
-            deepLink = data["deepLink"],
-            clickAction = data["clickAction"] ?: data["click_action"],
-            priority = data["priority"],
-            sound = data["sound"],
-            badge = data["badge"]?.toIntOrNull() ?: 0,
-            data = data.toMutableMap()
-        )
-        return payload
-
+    fun parse(remoteMessage: RemoteMessage): NotificationPayload {
+        val notification = remoteMessage.notification
+        val data = remoteMessage.data
+        return NotificationPayload(
+            title = notification?.title ?: data["title"] ?: data["notificationTitle"],
+            body = notification?.body ?: data["body"] ?: data["message"] ?: data["notificationBody"],
+            imageUrl = notification?.imageUrl?.toString() ?: data["imageUrl"] ?: data["image"],
+            campaignId = data["campaignId"],
+            deepLink = data["deepLink"],
+            clickAction = data["clickAction"] ?: data["click_action"],
+            priority = data["priority"],
+            sound = data["sound"],
+            badge = data["badge"]?.toIntOrNull() ?: 0,
+            data = data.toMutableMap()
+        )
     }
 
-}
+    fun parseFromData(data: Map<String, String>): NotificationPayload {
+        return NotificationPayload(
+            title = data["title"] ?: data["notificationTitle"],
+            body = data["body"] ?: data["message"] ?: data["notificationBody"],
+            imageUrl = data["imageUrl"] ?: data["image"],
+            campaignId = data["campaignId"],
+            deepLink = data["deepLink"],
+            clickAction = data["clickAction"] ?: data["click_action"],
+            priority = data["priority"],
+            sound = data["sound"],
+            badge = data["badge"]?.toIntOrNull() ?: 0,
+            data = data.toMutableMap()
+        )
+    }
+
+}

package/ios/Firebase/SyaxonFirebaseManager.m

@@ -155,14 +155,8 @@ didReceiveRegistrationToken:(nullable NSString *)fcmToken
 
     [SyaxonNotificationEventStore saveOpened:payload];
 
-    [[SyaxonEventEmitter shared]
-        sendEventWithName:SyaxonPushOpenedEvent
-                     body:payloadDictionary];
-
-    // TODO:
-    // AnalyticsManager.trackPushOpened(payload)
-    // Open Deep Link
-    // Handle In-App Actions
+    [SyaxonEventEmitter bufferEventWithName:SyaxonPushOpenedEvent
+                                       body:payloadDictionary];
 }
 
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center

package/ios/SyaxonDeviceInfo.mm

@@ -42,18 +42,18 @@ RCT_EXPORT_MODULE(SyaxonDeviceInfo)
 #pragma clang diagnostic pop
 
     resolve(@{
-        @"sxn-device-id": deviceId,
-        @"sxn-device-model": deviceModel,
-        @"sxn-manufacturer": @"Apple",
-        @"sxn-os": device.systemName ?: @"iOS",
-        @"sxn-os-version": device.systemVersion ?: @"",
-        @"sxn-app-name": info[@"CFBundleDisplayName"] ?: info[@"CFBundleName"] ?: @"",
-        @"sxn-package-name": [[NSBundle mainBundle] bundleIdentifier] ?: @"",
-        @"sxn-app-version": info[@"CFBundleShortVersionString"] ?: @"",
-        @"sxn-build-number": info[@"CFBundleVersion"] ?: @"",
-        @"sxn-country": [locale objectForKey:NSLocaleCountryCode] ?: @"",
-        @"sxn-language": [locale objectForKey:NSLocaleLanguageCode] ?: @"",
-        @"sxn-timezone": NSTimeZone.localTimeZone.name ?: @""
+        @"device-id": deviceId,
+        @"device-model": deviceModel,
+        @"manufacturer": @"Apple",
+        @"os": device.systemName ?: @"iOS",
+        @"os-version": device.systemVersion ?: @"",
+        @"app-name": info[@"CFBundleDisplayName"] ?: info[@"CFBundleName"] ?: @"",
+        @"package-name": [[NSBundle mainBundle] bundleIdentifier] ?: @"",
+        @"app-version": info[@"CFBundleShortVersionString"] ?: @"",
+        @"build-number": info[@"CFBundleVersion"] ?: @"",
+        @"country": [locale objectForKey:NSLocaleCountryCode] ?: @"",
+        @"language": [locale objectForKey:NSLocaleLanguageCode] ?: @"",
+        @"timezone": NSTimeZone.localTimeZone.name ?: @""
     });
 }
 

package/ios/event/SyaxonEventEmitter.h

@@ -8,4 +8,7 @@
 - (void)sendEventWithName:(NSString *)name
                      body:(NSDictionary *)body;
 
++ (void)bufferEventWithName:(NSString *)name
+                       body:(NSDictionary *)body;
+
 @end

package/ios/event/SyaxonEventEmitter.m

@@ -5,6 +5,7 @@
 RCT_EXPORT_MODULE();
 
 static SyaxonEventEmitter *sharedEmitter = nil;
+static NSMutableArray<NSDictionary *> *pendingEvents = nil;
 
 + (instancetype)shared
 {
@@ -17,11 +18,38 @@ static SyaxonEventEmitter *sharedEmitter = nil;
 
     if (self) {
         sharedEmitter = self;
+        [self flushPendingEvents];
     }
 
     return self;
 }
 
++ (void)bufferEventWithName:(NSString *)name body:(NSDictionary *)body
+{
+    if (sharedEmitter) {
+        [sharedEmitter sendEventWithName:name body:body];
+        return;
+    }
+
+    if (!pendingEvents) {
+        pendingEvents = [NSMutableArray array];
+    }
+
+    [pendingEvents addObject:@{ @"name": name, @"body": body ?: @{} }];
+}
+
+- (void)flushPendingEvents
+{
+    if (!pendingEvents || pendingEvents.count == 0) return;
+
+    NSArray *snapshot = [pendingEvents copy];
+    [pendingEvents removeAllObjects];
+
+    for (NSDictionary *event in snapshot) {
+        [self sendEventWithName:event[@"name"] body:event[@"body"]];
+    }
+}
+
 - (NSArray<NSString *> *)supportedEvents
 {
     return @[