infobip-mobile-messaging-react-native-plugin 14.7.0 → 14.8.3

package/README.md

@@ -12,7 +12,7 @@ The document describes library integration steps for your React Native project.
 ## Requirements
 - node (v20.16.0 or higher)
 - ruby (2.7.8 or higher; the Example app uses 3.3.5)
-- React Native (v0.79.0)
+- React Native (v0.84.0)
 
 For iOS project:
 - Xcode and Command Line Tools (16.x or newer, tested with 26.0.1)

package/infobip-mobile-messaging-react-native-plugin.podspec

@@ -1,7 +1,7 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-mmVersion = "14.4.3"
+mmVersion = "15.0.0"
 
 Pod::Spec.new do |s|
   s.name         = "infobip-mobile-messaging-react-native-plugin"

package/ios/MobileMessagingPlugin/RNMMChat.swift

@@ -13,9 +13,15 @@ import MobileMessaging
 class RNMMChat: NSObject  {
     private var willUseJWT = false
     private var willUseChatExceptionHandler = false
-    private var jwtRequestQueue: [((String?) -> Void)] = []
+    private var jwtRequestQueue: [JWTRequest] = []
     private let jwtQueueLock = NSLock()
 
+    private final class JWTRequest {
+        var completed = false
+        let onResult: (String?) -> Void
+        init(_ onResult: @escaping (String?) -> Void) { self.onResult = onResult }
+    }
+
     @objc(showChat:)
     func showChat(presentingOptions: NSDictionary) {
         MobileMessaging.inAppChat?.delegate = self
@@ -161,22 +167,26 @@ class RNMMChat: NSObject  {
     @objc(setChatJwtProvider)
     func setChatJwtProvider() {
         willUseJWT = true
+        // We cannot rely on 'showChat' for setting the delegate as we have several presentation modes - any async provider/handler request sets the delegate to ensure proper completions are triggered
+        MobileMessaging.inAppChat?.delegate = self
     }
 
     @objc(setChatExceptionHandler:)
     func setChatExceptionHandler(isHandlerPresent: NSNumber) {
         // NSNumber due to how RN bridge wraps JavaScript booleans
         willUseChatExceptionHandler = isHandlerPresent.boolValue
+        MobileMessaging.inAppChat?.delegate = self
     }
     
     @objc(setChatJwt:)
     func setChatJwt(jwt: String?) {
         jwtQueueLock.lock()
-        if !jwtRequestQueue.isEmpty {
-            let completion = jwtRequestQueue.removeFirst()
-            completion(jwt)
-        }
-        jwtQueueLock.unlock()
+        defer { jwtQueueLock.unlock() }
+        guard let request = jwtRequestQueue.first(where: { !$0.completed }) else { return }
+        request.completed = true
+        jwtRequestQueue.removeAll(where: { $0 === request })
+        // Settled inside the lock so a concurrent getJWT cleanup observes completed == true and jwtResult is set before getJWT returns.
+        request.onResult(jwt)
     }
 
     @objc(restartConnection)
@@ -201,15 +211,27 @@ extension RNMMChat: MMInAppChatDelegate {
         guard willUseJWT else { return nil }
         var jwtResult: String?
         let semaphore = DispatchSemaphore(value: 0)
-
-        jwtQueueLock.lock()
-        jwtRequestQueue.append { jwt in
+        let request = JWTRequest { jwt in
             jwtResult = jwt
             semaphore.signal()
         }
+
+        jwtQueueLock.lock()
+        jwtRequestQueue.append(request)
         jwtQueueLock.unlock()
-        ReactNativeMobileMessaging.shared?.sendEvent(withName: EventName.inAppChat_jwtRequested, body: nil)
+
+        ReactNativeMobileMessaging.shared?.sendDirectEvent(withName: EventName.inAppChat_jwtRequested, body: nil)
         _ = semaphore.wait(timeout: .now() + 45)
+
+        // Remove this request by identity (not position) so a setChatJwt that fires between the wait timeout and the lock cannot cause us to evict a different in-flight request.
+        jwtQueueLock.lock()
+        if !request.completed {
+            request.completed = true
+            if let idx = jwtRequestQueue.firstIndex(where: { $0 === request }) {
+                jwtRequestQueue.remove(at: idx)
+            }
+        }
+        jwtQueueLock.unlock()
         return jwtResult
     }
     

package/ios/MobileMessagingPlugin/RNMMChatViewManager.swift

@@ -37,7 +37,9 @@ class RNMMChatViewManager: RCTViewManager {
     }
 
     override func didMoveToWindow() {
-        embedViewController()
+        if window != nil { // this could be triggered in an improper manner from RN side, so we confirm UI is in a proper state
+            embedViewController()
+        }
         super.didMoveToWindow()
     }
 

package/ios/MobileMessagingPlugin/RNMobileMessaging.swift

@@ -64,6 +64,20 @@ class ReactNativeMobileMessaging: RCTEventEmitter  {
         }
         super.sendEvent(withName: name, body: body)
     }
+    
+    func sendDirectEvent(withName name: String!, body: Any!) {
+        guard let _eventsManager = eventsManager, _eventsManager.hasEventListeners == true else {
+            // JS listener persists on the mobileMessaging singleton but RCTEventEmitter's _listenerCount may be zero during a React Navigation transition (reproducible with custom chat navigations and JWT async callback/authentication flow). Bypass that guard by invoking RCTDeviceEventEmitter directly via the public callableJSModules API (bridgeless-safe; the same path super.sendEvent uses internally).
+            MMLogDebug("[RNMobileMessaging] sendDirectEvent: invoking RCTDeviceEventEmitter directly")
+            self.callableJSModules?.invokeModule(
+                "RCTDeviceEventEmitter",
+                method: "emit",
+                withArgs: [name!, body ?? NSNull()]
+            )
+            return
+        }
+        super.sendEvent(withName: name, body: body)
+    }
         
     @objc
     override static func requiresMainQueueSetup() -> Bool {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "14.7.0",
+  "version": "14.8.3",
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "./src/index.js",
   "scripts": {