@trycourier/courier-react-native 2.3.2 → 2.4.0

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,23 +218,24 @@ 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 ->
 
@@ -250,7 +246,7 @@ class CourierReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
         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/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 {

package/lib/commonjs/index.js

@@ -92,6 +92,7 @@ var _reactNative = require("react-native");
 var _CourierInboxListener = require("./models/CourierInboxListener");
 var _CourierPushListener = require("./models/CourierPushListener");
 var _CourierAuthenticationListener = require("./models/CourierAuthenticationListener");
+var _utils = require("./utils");
 var _CourierInboxView = require("./views/CourierInboxView");
 var _CourierUserPreferencesChannel = require("./models/CourierUserPreferencesChannel");
 var _CourierUserPreferencesStatus = require("./models/CourierUserPreferencesStatus");
@@ -112,18 +113,14 @@ const CourierReactNativeModules = _reactNative.NativeModules.CourierReactNativeM
 });
 const CourierEventEmitter = new _reactNative.NativeEventEmitter(_reactNative.NativeModules.CourierReactNativeModule);
 class Courier {
-  PUSH_NOTIFICATION_CLICKED = 'pushNotificationClicked';
-  PUSH_NOTIFICATION_DELIVERED = 'pushNotificationDelivered';
   _isDebugging = false;
+  authListeners = new Map();
   inboxListeners = new Map();
   constructor() {
     // Sets the initial SDK values
     // Defaults to React Native level debugging
     // and will show all foreground notification styles in iOS
     this.setDefaults();
-
-    // Register for inbox listener changes
-    this.registerInboxListenerEvents();
   }
 
   // Returns the public shared instance
@@ -152,7 +149,7 @@ class Courier {
     // Set a new listener
     // listener needs to be registered first to catch the event
     if (isDebugging) {
-      this.debugListener = CourierEventEmitter.addListener('courierDebugEvent', event => {
+      this.debugListener = CourierEventEmitter.addListener(_utils.Events.Log.DEBUG_LOG, event => {
         console.log('\x1b[36m%s\x1b[0m', 'COURIER', event);
       });
     }
@@ -168,30 +165,6 @@ class Courier {
     return this._isDebugging;
   }
 
-  /**
-   * Register inbox listener events
-   */
-  registerInboxListenerEvents() {
-    CourierEventEmitter.addListener('inboxInitialLoad', () => {
-      this.inboxListeners.forEach((value, _) => {
-        var _value$onInitialLoad;
-        (_value$onInitialLoad = value.onInitialLoad) === null || _value$onInitialLoad === void 0 ? void 0 : _value$onInitialLoad.call(value);
-      });
-    });
-    CourierEventEmitter.addListener('inboxError', event => {
-      this.inboxListeners.forEach((value, _) => {
-        var _value$onError;
-        (_value$onError = value.onError) === null || _value$onError === void 0 ? void 0 : _value$onError.call(value, event);
-      });
-    });
-    CourierEventEmitter.addListener('inboxMessagesChanged', event => {
-      this.inboxListeners.forEach((value, _) => {
-        var _value$onMessagesChan;
-        (_value$onMessagesChan = value.onMessagesChanged) === null || _value$onMessagesChan === void 0 ? void 0 : _value$onMessagesChan.call(value, event.messages, event.unreadMessageCount, event.totalMessageCount, event.canPaginate);
-      });
-    });
-  }
-
   /**
    * Sets the notification presentation options for iOS
    */
@@ -246,45 +219,23 @@ class Courier {
    */
   addPushNotificationListener(props) {
     const pushListener = new _CourierPushListener.CourierPushListener();
-    if (_reactNative.Platform.OS === 'android') {
-      if (props.onPushNotificationClicked) {
-        pushListener.onNotificationClickedListener = _reactNative.DeviceEventEmitter.addListener(this.PUSH_NOTIFICATION_CLICKED, event => {
-          try {
-            props.onPushNotificationClicked(JSON.parse(event));
-          } catch (error) {
-            console.log(error);
-          }
-        });
-      }
-      if (props.onPushNotificationDelivered) {
-        pushListener.onNotificationDeliveredListener = _reactNative.DeviceEventEmitter.addListener(this.PUSH_NOTIFICATION_DELIVERED, event => {
-          try {
-            props.onPushNotificationDelivered(JSON.parse(event));
-          } catch (error) {
-            console.log(error);
-          }
-        });
-      }
+    if (props.onPushNotificationClicked) {
+      pushListener.onNotificationClickedListener = _utils.Utils.addEventListener(_utils.Events.Push.CLICKED, CourierEventEmitter, event => {
+        try {
+          props.onPushNotificationClicked(JSON.parse(event));
+        } catch (error) {
+          console.log(error);
+        }
+      });
     }
-    if (_reactNative.Platform.OS === 'ios') {
-      if (props.onPushNotificationClicked) {
-        pushListener.onNotificationClickedListener = CourierEventEmitter.addListener(this.PUSH_NOTIFICATION_CLICKED, event => {
-          try {
-            props.onPushNotificationClicked(JSON.parse(event));
-          } catch (error) {
-            console.log(error);
-          }
-        });
-      }
-      if (props.onPushNotificationDelivered) {
-        pushListener.onNotificationDeliveredListener = CourierEventEmitter.addListener(this.PUSH_NOTIFICATION_DELIVERED, event => {
-          try {
-            props.onPushNotificationDelivered(JSON.parse(event));
-          } catch (error) {
-            console.log(error);
-          }
-        });
-      }
+    if (props.onPushNotificationDelivered) {
+      pushListener.onNotificationDeliveredListener = _utils.Utils.addEventListener(_utils.Events.Push.DELIVERED, CourierEventEmitter, event => {
+        try {
+          props.onPushNotificationDelivered(JSON.parse(event));
+        } catch (error) {
+          console.log(error);
+        }
+      });
     }
 
     // When listener is registered
@@ -321,19 +272,41 @@ class Courier {
    * Listens to authentication changes for the current user
    */
   addAuthenticationListener(props) {
-    const authListener = new _CourierAuthenticationListener.CourierAuthenticationListener();
-    authListener.onUserChanged = CourierEventEmitter.addListener('courierAuthUserChanged', event => {
-      props.onUserChanged(event);
-    });
-    authListener.listenerId = CourierReactNativeModules.addAuthenticationListener();
-    return authListener;
+    // Event listener id
+    const authId = _utils.Utils.generateUUID();
+
+    // Get the id
+    const id = CourierReactNativeModules.addAuthenticationListener(authId);
+
+    // Create the listener
+    const listener = new _CourierAuthenticationListener.CourierAuthenticationListener(id);
+
+    // Add the event listener
+    listener.onUserChanged = _utils.Utils.addEventListener(authId, CourierEventEmitter, event => props.onUserChanged(event));
+
+    // Add listener to manager
+    this.authListeners.set(id, listener);
+    return listener;
   }
 
   /**
    * Removes an authentication listener
    */
   removeAuthenticationListener(props) {
-    return CourierReactNativeModules.removeAuthenticationListener(props.listenerId);
+    // Remove the native listener
+    CourierReactNativeModules.removeAuthenticationListener(props.listenerId);
+
+    // Remove the listener
+    if (this.authListeners.has(props.listenerId)) {
+      var _listener$onUserChang;
+      // Get the listener
+      const listener = this.authListeners.get(props.listenerId);
+      listener === null || listener === void 0 || (_listener$onUserChang = listener.onUserChanged) === null || _listener$onUserChang === void 0 ? void 0 : _listener$onUserChang.remove();
+
+      // Remove the listener
+      this.authListeners.delete(props.listenerId);
+    }
+    return props.listenerId;
   }
 
   /**
@@ -368,14 +341,35 @@ class Courier {
    * Listens to changes for the inbox itself
    */
   addInboxListener(props) {
+    const listenerIds = {
+      loading: _utils.Utils.generateUUID(),
+      error: _utils.Utils.generateUUID(),
+      messages: _utils.Utils.generateUUID()
+    };
+
     // Set the listener id
-    const id = CourierReactNativeModules.addInboxListener();
+    const id = CourierReactNativeModules.addInboxListener(listenerIds.loading, listenerIds.error, listenerIds.messages);
 
     // Create the initial listeners
     const listener = new _CourierInboxListener.CourierInboxListener(id);
-    listener.onInitialLoad = props.onInitialLoad;
-    listener.onError = props.onError;
-    listener.onMessagesChanged = props.onMessagesChanged;
+    if (props.onInitialLoad) {
+      listener.onInitialLoad = _utils.Utils.addEventListener(listenerIds.loading, CourierEventEmitter, _ => {
+        var _props$onInitialLoad;
+        (_props$onInitialLoad = props.onInitialLoad) === null || _props$onInitialLoad === void 0 ? void 0 : _props$onInitialLoad.call(props);
+      });
+    }
+    if (props.onError) {
+      listener.onError = _utils.Utils.addEventListener(listenerIds.error, CourierEventEmitter, event => {
+        var _props$onError;
+        (_props$onError = props.onError) === null || _props$onError === void 0 ? void 0 : _props$onError.call(props, event);
+      });
+    }
+    if (props.onMessagesChanged) {
+      listener.onMessagesChanged = _utils.Utils.addEventListener(listenerIds.messages, CourierEventEmitter, event => {
+        var _props$onMessagesChan;
+        (_props$onMessagesChan = props.onMessagesChanged) === null || _props$onMessagesChan === void 0 ? void 0 : _props$onMessagesChan.call(props, event.messages, event.unreadMessageCount, event.totalMessageCount, event.canPaginate);
+      });
+    }
 
     // Add listener to manager
     this.inboxListeners.set(id, listener);
@@ -389,8 +383,16 @@ class Courier {
     // Call native code
     CourierReactNativeModules.removeInboxListener(props.listenerId);
 
-    // Remove the js listener
+    // Remove the listener
     if (this.inboxListeners.has(props.listenerId)) {
+      var _listener$onInitialLo, _listener$onError, _listener$onMessagesC;
+      // Remove emitters
+      const listener = this.inboxListeners.get(props.listenerId);
+      listener === null || listener === void 0 || (_listener$onInitialLo = listener.onInitialLoad) === null || _listener$onInitialLo === void 0 ? void 0 : _listener$onInitialLo.remove();
+      listener === null || listener === void 0 || (_listener$onError = listener.onError) === null || _listener$onError === void 0 ? void 0 : _listener$onError.remove();
+      listener === null || listener === void 0 || (_listener$onMessagesC = listener.onMessagesChanged) === null || _listener$onMessagesC === void 0 ? void 0 : _listener$onMessagesC.remove();
+
+      // Remove the listener
       this.inboxListeners.delete(props.listenerId);
     }
     return props.listenerId;