@trycourier/courier-react-native 5.5.7 → 5.5.9

package/android/src/main/java/com/courierreactnative/Utils.kt

@@ -15,7 +15,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.GsonBuilder
 
 internal object Utils {
-  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.5.7")
+  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.5.9")
 }
 
 internal fun ReactContext.sendEvent(eventName: String, value: Any?) {

package/ios/CourierReactNativeDelegate.m

@@ -33,7 +33,7 @@ static NSString *const CourierForegroundOptionsDidChangeNotification = @"iosFore
     if (self) {
       
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.7"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"5.5.9"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];
@@ -57,7 +57,7 @@ static NSString *const CourierForegroundOptionsDidChangeNotification = @"iosFore
       
         [[NSNotificationCenter defaultCenter]
             addObserver:self
-            selector:@selector(onReactUIReady:)
+            selector:@selector(onReactNativeReady:)
             name:RCTContentDidAppearNotification
             object:nil];
     }
@@ -66,7 +66,7 @@ static NSString *const CourierForegroundOptionsDidChangeNotification = @"iosFore
 }
 
 // Called when React Native is loaded and ready
-- (void)onReactUIReady:(__unused NSNotification *)note
+- (void)onReactNativeReady:(__unused NSNotification *)note
 {
   self.isReactNativeReady = YES;
 

package/ios/CourierReactNativeEventEmitter.swift

@@ -14,7 +14,7 @@ internal class CourierReactNativeEventEmitter: RCTEventEmitter {
         
         // Set the user agent
         // Used to know the platform performing requests
-        Courier.agent = CourierAgent.reactNativeIOS("5.5.7")
+        Courier.agent = CourierAgent.reactNativeIOS("5.5.9")
         
     }
     

package/ios/CourierSystemModule.swift

@@ -6,10 +6,12 @@
 //
 
 import Courier_iOS
+import React
 
 @objc(CourierSystemModule)
 class CourierSystemModule: CourierReactNativeEventEmitter {
     
+    private var isReactNativeReady: Bool = false
     private var lastClickedMessage: [AnyHashable: Any]? = nil
     private var notificationCenter: NotificationCenter {
         get { return NotificationCenter.default }
@@ -38,6 +40,30 @@ class CourierSystemModule: CourierReactNativeEventEmitter {
             object: nil
         )
         
+        notificationCenter.addObserver(
+            self,
+            selector: #selector(onReactNativeReady),
+            name: NSNotification.Name(rawValue: "RCTContentDidAppearNotification"),
+            object: nil
+        )
+
+        notificationCenter.addObserver(
+            self,
+            selector: #selector(onBridgeWillReload),
+            name: NSNotification.Name(rawValue: "RCTBridgeWillReloadNotification"),
+            object: nil
+        )
+        
+    }
+    
+    // MARK: - RN Lifecycle Notifications
+
+    @objc private func onReactNativeReady(_ notification: Notification) {
+        isReactNativeReady = true
+    }
+
+    @objc private func onBridgeWillReload(_ notification: Notification) {
+        isReactNativeReady = false
     }
     
     @objc private func pushNotificationClicked(notification: Notification) {
@@ -70,16 +96,30 @@ class CourierSystemModule: CourierReactNativeEventEmitter {
     }
     
     @objc func registerPushNotificationClickedOnKilledState() {
-        
-        guard let message = lastClickedMessage else {
-            return
+        let pollInterval: UInt64 = 250_000_000  // 250ms
+        let timeout: UInt64 = 10_000_000_000    // 10s
+
+        // Poll until react native is ready
+        Task.detached(priority: .background) { [weak self] in
+            guard let self else { return }
+
+            let start = DispatchTime.now().uptimeNanoseconds
+
+            // Hold until react native is ready
+            while !self.isReactNativeReady, DispatchTime.now().uptimeNanoseconds - start < timeout {
+                try? await Task.sleep(nanoseconds: pollInterval)
+            }
+
+            // If possible, broadcast the message
+            await MainActor.run {
+                guard self.isReactNativeReady, let message = self.lastClickedMessage else {
+                    NSLog("[Courier] Timed out waiting for React Native or no message available.")
+                    return
+                }
+
+                self.broadcast(name: PushEvents.CLICKED_EVENT, message: message)
+            }
         }
-        
-        broadcast(
-            name: PushEvents.CLICKED_EVENT,
-            message: message
-        )
-        
     }
     
     // MARK: Open App

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/courier-react-native",
-  "version": "5.5.7",
+  "version": "5.5.9",
   "description": "Inbox, Push Notifications, and Preferences for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",