@trycourier/courier-react-native 2.3.2 → 2.4.1

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

@@ -10,19 +10,9 @@ internal class CourierEvents {
     const val DEBUG_LOG = "courierDebugEvent"
   }
 
-  object Auth {
-    const val USER_CHANGED = "courierAuthUserChanged"
-  }
-
   object Push {
     const val CLICKED_EVENT = "pushNotificationClicked"
     const val DELIVERED_EVENT = "pushNotificationDelivered"
   }
 
-  object Inbox {
-    const val INITIAL_LOADING = "inboxInitialLoad"
-    const val ERROR = "inboxError"
-    const val MESSAGES_CHANGED = "inboxMessagesChanged"
-  }
-
 }

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

@@ -18,13 +18,9 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
   override fun getName() = "CourierReactNativeModule"
   private val reactActivity: ReactActivity? get() = currentActivity as? ReactActivity
 
-  // Auth Listeners
-  private var authListener: CourierAuthenticationListener? = null
-  private var authListeners: MutableList<String> = mutableListOf()
-
-  // Inbox Listeners
-  private var inboxListener: CourierInboxListener? = null
-  private var inboxListeners: MutableList<String> = mutableListOf()
+  // Listeners
+  private var authListeners = mutableMapOf<String, CourierAuthenticationListener>()
+  private var inboxListeners = mutableMapOf<String, CourierInboxListener>()
 
   init {
 
@@ -135,19 +131,21 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
-  fun addAuthenticationListener(): String {
+  fun addAuthenticationListener(authId: String): String {
 
-    authListener?.remove()
+    // Create the listener
+    val listener = Courier.shared.addAuthenticationListener { userId ->
 
-    authListener = Courier.shared.addAuthenticationListener { userId ->
       reactApplicationContext.sendEvent(
-        eventName = CourierEvents.Auth.USER_CHANGED,
+        eventName = authId,
         value = userId
       )
+
     }
 
+    // Add the listener to the map
     val id = UUID.randomUUID().toString()
-    authListeners.add(id)
+    authListeners[id] = listener
 
     return id
 
@@ -156,17 +154,14 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
   @ReactMethod(isBlockingSynchronousMethod = true)
   fun removeAuthenticationListener(listenerId: String): String {
 
-    // Remove the item from the array
-    val index = authListeners.indexOf(listenerId)
-    if (index != -1) {
-      authListeners.removeAt(index)
-    }
+    // Get the listener
+    val listener = authListeners[listenerId]
 
-    // Check the length
-    if (authListeners.isEmpty()) {
-      authListener?.remove()
-      authListener = null
-    }
+    // Remove the listener
+    listener?.remove()
+
+    // Remove the listener
+    authListeners.remove(listenerId)
 
     return listenerId
 
@@ -223,34 +218,35 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
-  fun addInboxListener(): String {
-
-    // Remove the old listener
-    inboxListener?.remove()
+  fun addInboxListener(loadingId: String, errorId: String, messagesId: String): String {
 
-    inboxListener = Courier.shared.addInboxListener(
+    val listener = Courier.shared.addInboxListener(
       onInitialLoad = {
+
         reactApplicationContext.sendEvent(
-          eventName = CourierEvents.Inbox.INITIAL_LOADING,
+          eventName = loadingId,
           value = null
         )
+
       },
       onError = { e ->
+
         reactApplicationContext.sendEvent(
-          eventName = CourierEvents.Inbox.ERROR,
+          eventName = errorId,
           value = e.message ?: "Courier Inbox Error"
         )
+
       },
       onMessagesChanged = { messages: List<InboxMessage>, unreadMessageCount: Int, totalMessageCount: Int, canPaginate: Boolean ->
 
         val json = Arguments.createMap()
-        json.putArray("messages", messages.toWritableArray())
+        json.putArray("messages", messages.toList().toWritableArray())
         json.putInt("unreadMessageCount", unreadMessageCount)
         json.putInt("totalMessageCount", totalMessageCount)
         json.putBoolean("canPaginate", canPaginate)
 
         reactApplicationContext.sendEvent(
-          eventName = CourierEvents.Inbox.MESSAGES_CHANGED,
+          eventName = messagesId,
           value = json
         )
 
@@ -259,7 +255,7 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
 
     // Add listener
     val id = UUID.randomUUID().toString()
-    inboxListeners.add(id)
+    inboxListeners[id] = listener
 
     return id
 
@@ -268,17 +264,14 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
   @ReactMethod(isBlockingSynchronousMethod = true)
   fun removeInboxListener(listenerId: String): String {
 
-    // Remove the item from the array
-    val index = inboxListeners.indexOf(listenerId)
-    if (index != -1) {
-      inboxListeners.removeAt(index)
-    }
+    // Get the listener
+    val listener = inboxListeners[listenerId]
 
-    // Check the length
-    if (inboxListeners.isEmpty()) {
-      inboxListener?.remove()
-      inboxListener = null
-    }
+    // Remove the listener
+    listener?.remove()
+
+    // Remove the listener
+    inboxListeners.remove(listenerId)
 
     return listenerId
 

package/ios/CourierAuthenticationListenerWrapper.swift

@@ -0,0 +1,14 @@
+//
+//  CourierAuthenticationListenerWrapper.swift
+//  courier-react-native
+//
+//  Created by Michael Miller on 2/15/24.
+//
+
+import Foundation
+import Courier_iOS
+
+internal struct CourierAuthenticationListenerWrapper {
+    let authId: String
+    let listener: CourierAuthenticationListener
+}

package/ios/CourierInboxListenerWrapper.swift

@@ -0,0 +1,24 @@
+//
+//  CourierInboxListenerWrapper.swift
+//  courier-react-native
+//
+//  Created by Michael Miller on 2/15/24.
+//
+
+import Foundation
+import Courier_iOS
+
+internal struct CourierInboxListenerWrapper {
+    let loadingId: String
+    let errorId: String
+    let messagesId: String
+    let listener: CourierInboxListener
+}
+
+extension CourierInboxListenerWrapper {
+    
+    internal func getIds() -> [String] {
+        return [loadingId, errorId, messagesId]
+    }
+    
+}

package/ios/CourierReactNativeModule.m

@@ -28,7 +28,7 @@ RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
 )
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  addAuthenticationListener
+  addAuthenticationListener: (NSString*)authId
 )
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
@@ -76,7 +76,9 @@ RCT_EXTERN_METHOD(
 )
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  addInboxListener
+  addInboxListener: (NSString*)loadingId
+  withErrorId: (NSString*)errorId
+  withMessagesId: (NSString*)messagesId
 )
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(

package/ios/CourierReactNativeModule.swift

@@ -9,28 +9,14 @@ class CourierReactNativeModule: RCTEventEmitter {
         internal static let DEBUG_LOG = "courierDebugEvent"
     }
     
-    class AuthEvents {
-        internal static let USER_CHANGED = "courierAuthUserChanged"
-    }
-    
     class PushEvents {
         internal static let CLICKED_EVENT = "pushNotificationClicked"
         internal static let DELIVERED_EVENT = "pushNotificationDelivered"
     }
     
-    class InboxEvents {
-        internal static let INITIAL_LOADING = "inboxInitialLoad"
-        internal static let ERROR = "inboxError"
-        internal static let MESSAGES_CHANGED = "inboxMessagesChanged"
-    }
-    
-    // Auth Listeners
-    private var authListener: CourierAuthenticationListener? = nil
-    private var authListeners: [String] = []
-    
-    // Inbox Listeners
-    private var inboxListener: CourierInboxListener? = nil
-    private var inboxListeners: [String] = []
+    // Listeners
+    private var authListeners: [String: CourierAuthenticationListenerWrapper] = [:]
+    private var inboxListeners: [String: CourierInboxListenerWrapper] = [:]
     
     private var hasDebuggingListeners = false
     
@@ -105,8 +91,8 @@ class CourierReactNativeModule: RCTEventEmitter {
         }
      
         do {
-            sendEvent(
-                withName: name,
+            broadcastEvent(
+                name: name,
                 body: try message.toString()
             )
         } catch {
@@ -114,6 +100,19 @@ class CourierReactNativeModule: RCTEventEmitter {
         }
         
     }
+    
+    private func broadcastEvent(name: String, body: Any?) {
+        
+        if (!supportedEvents().contains(name)) {
+            return
+        }
+        
+        sendEvent(
+            withName: name,
+            body: body
+        )
+        
+    }
 
     @objc private func pushNotificationClicked(notification: Notification) {
         
@@ -196,24 +195,22 @@ class CourierReactNativeModule: RCTEventEmitter {
         return Courier.shared.userId
     }
 
-    @objc func addAuthenticationListener() -> String {
+    @objc(addAuthenticationListener:)
+    func addAuthenticationListener(authId: String) -> String {
         
-        // Remove the listener
-        authListener?.remove()
-        
-        // Set the new listener
-        authListener = Courier.shared.addAuthenticationListener { [weak self] userId in
-            
-            self?.sendEvent(
-                withName: CourierReactNativeModule.AuthEvents.USER_CHANGED,
+        let listener = Courier.shared.addAuthenticationListener { [weak self] userId in
+            self?.broadcastEvent(
+                name: authId,
                 body: userId
             )
-            
         }
         
-        // Add the listener to the arrau
         let id = UUID().uuidString
-        authListeners.append(id)
+        
+        authListeners[id] = CourierAuthenticationListenerWrapper(
+            authId: authId,
+            listener: listener
+        )
         
         return id
         
@@ -224,16 +221,13 @@ class CourierReactNativeModule: RCTEventEmitter {
         
         let id = listenerId as String
         
-        // Remove the item from the array
-        if let index = authListeners.firstIndex(of: id) {
-            authListeners.remove(at: index)
-        }
+        let wrapper = authListeners[id]
         
-        // Check the length
-        if (authListeners.isEmpty) {
-            authListener?.remove()
-            authListener = nil
-        }
+        // Disable the listener
+        wrapper?.listener.remove()
+        
+        // Remove the id from the map
+        authListeners.removeValue(forKey: id)
         
         return id
         
@@ -318,25 +312,23 @@ class CourierReactNativeModule: RCTEventEmitter {
         
     }
     
-    @objc func addInboxListener() -> String {
-        
-        // Remove the old listener
-        inboxListener?.remove()
+    @objc(addInboxListener: withErrorId: withMessagesId:)
+    func addInboxListener(loadingId: String, errorId: String, messagesId: String) -> String {
         
         // Create the new listener
-        inboxListener = Courier.shared.addInboxListener(
+        let listener = Courier.shared.addInboxListener(
             onInitialLoad: { [weak self] in
                 
-                self?.sendEvent(
-                    withName: CourierReactNativeModule.InboxEvents.INITIAL_LOADING,
+                self?.broadcastEvent(
+                    name: loadingId,
                     body: nil
                 )
                 
             },
             onError: { [weak self] error in
                      
-                self?.sendEvent(
-                    withName: CourierReactNativeModule.InboxEvents.ERROR,
+                self?.broadcastEvent(
+                    name: errorId,
                     body: String(describing: error)
                 )
                 
@@ -350,17 +342,23 @@ class CourierReactNativeModule: RCTEventEmitter {
                     "canPaginate": canPaginate
                 ]
                 
-                self?.sendEvent(
-                    withName: CourierReactNativeModule.InboxEvents.MESSAGES_CHANGED,
+                self?.broadcastEvent(
+                    name: messagesId,
                     body: json
                 )
                 
             }
         )
         
-        // Track listener id
+        let wrapper = CourierInboxListenerWrapper(
+            loadingId: loadingId,
+            errorId: errorId,
+            messagesId: messagesId,
+            listener: listener
+        )
+        
         let id = UUID().uuidString
-        inboxListeners.append(id)
+        inboxListeners[id] = wrapper
         
         return id
         
@@ -371,16 +369,13 @@ class CourierReactNativeModule: RCTEventEmitter {
         
         let id = listenerId as String
         
-        // Remove the item from the array
-        if let index = inboxListeners.firstIndex(of: id) {
-            inboxListeners.remove(at: index)
-        }
+        let wrapper = inboxListeners[id]
         
-        // Check the length
-        if (inboxListeners.isEmpty) {
-            inboxListener?.remove()
-            inboxListener = nil
-        }
+        // Disable the listener
+        wrapper?.listener.remove()
+        
+        // Remove the id from the map
+        inboxListeners.removeValue(forKey: id)
         
         return id
         
@@ -450,7 +445,6 @@ class CourierReactNativeModule: RCTEventEmitter {
     @objc(putUserPreferencesTopic: withStatus: withHasCustomRouting: withCustomRouting: withResolver: withRejecter:)
         func putUserPreferencesTopic(topicId: NSString, status: NSString, hasCustomRouting: Bool, customRouting: [NSString], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
 
-        
         Courier.shared.putUserPreferencesTopic(
             topicId: topicId as String,
             status: CourierUserPreferencesStatus(rawValue: status as String) ?? .unknown,
@@ -467,15 +461,23 @@ class CourierReactNativeModule: RCTEventEmitter {
     }
 
     override func supportedEvents() -> [String]! {
-        return [
+        
+        // Built in events
+        var events = [
             CourierReactNativeModule.LogEvents.DEBUG_LOG,
-            CourierReactNativeModule.AuthEvents.USER_CHANGED,
             CourierReactNativeModule.PushEvents.CLICKED_EVENT,
-            CourierReactNativeModule.PushEvents.DELIVERED_EVENT,
-            CourierReactNativeModule.InboxEvents.INITIAL_LOADING,
-            CourierReactNativeModule.InboxEvents.ERROR,
-            CourierReactNativeModule.InboxEvents.MESSAGES_CHANGED
+            CourierReactNativeModule.PushEvents.DELIVERED_EVENT
         ]
+        
+        // Add the custom events
+        let inboxIds = inboxListeners.flatMap { [$0.value.loadingId, $0.value.errorId, $0.value.messagesId] }
+        events.append(contentsOf: inboxIds)
+        
+        let authIds = authListeners.flatMap { [$0.value.authId] }
+        events.append(contentsOf: authIds)
+        
+        return events
+        
     }
     
     @objc override static func requiresMainQueueSetup() -> Bool {