@trycourier/courier-react-native 2.3.2 → 2.4.0

package/lib/typescript/models/CourierInboxListener.d.ts

@@ -1,9 +1,9 @@
-import { InboxMessage } from "./InboxMessage";
+import { EmitterSubscription } from "react-native";
 export declare class CourierInboxListener {
     readonly listenerId: string;
-    onInitialLoad?: () => void;
-    onError?: (error: string) => void;
-    onMessagesChanged?: (messages: InboxMessage[], unreadMessageCount: number, totalMessageCount: number, canPaginate: boolean) => void;
+    onInitialLoad?: EmitterSubscription;
+    onError?: EmitterSubscription;
+    onMessagesChanged?: EmitterSubscription;
     constructor(id: string);
     remove(): void;
 }

package/lib/typescript/models/CourierInboxListener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CourierInboxListener.d.ts","sourceRoot":"","sources":["../../../src/models/CourierInboxListener.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,oBAAoB;IAE/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,kBAAkB,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,KAAK,IAAI,CAAA;gBAE9H,EAAE,EAAE,MAAM;IAIf,MAAM;CASd"}
+{"version":3,"file":"CourierInboxListener.d.ts","sourceRoot":"","sources":["../../../src/models/CourierInboxListener.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,qBAAa,oBAAoB;IAE/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,iBAAiB,CAAC,EAAE,mBAAmB,CAAA;gBAElC,EAAE,EAAE,MAAM;IAIf,MAAM;CAId"}

package/lib/typescript/utils.d.ts

@@ -0,0 +1,21 @@
+import { EmitterSubscription, NativeEventEmitter } from "react-native";
+export declare namespace Events {
+    namespace Log {
+        const DEBUG_LOG = "courierDebugEvent";
+    }
+    namespace Push {
+        const CLICKED = "pushNotificationClicked";
+        const DELIVERED = "pushNotificationDelivered";
+    }
+}
+export declare namespace Utils {
+    /**
+    * Creates an event listener for the native function
+    * @param key Key for the listener
+    * @param callback Value returned for the listener callback
+    * @returns Subscription
+    */
+    function addEventListener(key: string, emitter: NativeEventEmitter, callback: (value: any) => void): EmitterSubscription | undefined;
+    function generateUUID(): string;
+}
+//# sourceMappingURL=utils.d.ts.map

package/lib/typescript/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAgC,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAErG,yBAAiB,MAAM,CAAC;IAEtB,UAAiB,GAAG,CAAC;QACZ,MAAM,SAAS,sBAAsB,CAAC;KAC9C;IAED,UAAiB,IAAI,CAAC;QACb,MAAM,OAAO,4BAA4B,CAAC;QAC1C,MAAM,SAAS,8BAA8B,CAAC;KACtD;CAEF;AAED,yBAAiB,KAAK,CAAC;IAErB;;;;;MAKE;IACF,SAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,GAAG,mBAAmB,GAAG,SAAS,CAY1I;IAED,SAAgB,YAAY,IAAI,MAAM,CAQrC;CAEF"}

package/package.json

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

package/src/index.tsx

@@ -1,9 +1,8 @@
 import {
-  NativeModules,
-  NativeEventEmitter,
   EmitterSubscription,
   Platform,
-  DeviceEventEmitter,
+  NativeModules,
+  NativeEventEmitter,
 } from 'react-native';
 
 // Imports
@@ -16,6 +15,7 @@ import { CourierUserPreferencesTopic } from './models/CourierUserPreferencesTopi
 import { CourierUserPreferencesChannel } from './models/CourierUserPreferencesChannel';
 import { CourierUserPreferencesStatus } from './models/CourierUserPreferencesStatus';
 import { CourierPushProvider } from './models/CourierPushProvider';
+import { Events, Utils } from './utils';
 
 // Exports
 export { CourierInboxView } from './views/CourierInboxView';
@@ -51,12 +51,11 @@ const CourierEventEmitter = new NativeEventEmitter(
 
 class Courier {
 
-  readonly PUSH_NOTIFICATION_CLICKED = 'pushNotificationClicked';
-  readonly PUSH_NOTIFICATION_DELIVERED = 'pushNotificationDelivered';
-
   private static _sharedInstance: Courier;
   private _isDebugging = false;
   private debugListener: EmitterSubscription | undefined;
+
+  private authListeners: Map<string, CourierAuthenticationListener> = new Map<string, CourierAuthenticationListener>();
   private inboxListeners: Map<string, CourierInboxListener> = new Map<string, CourierInboxListener>();
 
   public constructor() {
@@ -66,9 +65,6 @@ class Courier {
     // and will show all foreground notification styles in iOS
     this.setDefaults();
 
-    // Register for inbox listener changes
-    this.registerInboxListenerEvents();
-
   }
 
   // Returns the public shared instance
@@ -99,7 +95,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(Events.Log.DEBUG_LOG, event => {
         console.log('\x1b[36m%s\x1b[0m', 'COURIER', event);
       });
     }
@@ -119,36 +115,6 @@ class Courier {
     return this._isDebugging;
   }
 
-  /**
-   * Register inbox listener events
-   */
-  private registerInboxListenerEvents() {
-
-    CourierEventEmitter.addListener('inboxInitialLoad', () => {
-      this.inboxListeners.forEach((value, _) => {
-        value.onInitialLoad?.();
-      });
-    });
-
-    CourierEventEmitter.addListener('inboxError', event => {
-      this.inboxListeners.forEach((value, _) => {
-        value.onError?.(event);
-      });
-    });
-
-    CourierEventEmitter.addListener('inboxMessagesChanged', event => {
-      this.inboxListeners.forEach((value, _) => {
-        value.onMessagesChanged?.(
-          event.messages,
-          event.unreadMessageCount,
-          event.totalMessageCount,
-          event.canPaginate,
-        );
-      });
-    });
-
-  }
-
   /**
    * Sets the notification presentation options for iOS
    */
@@ -210,52 +176,24 @@ class Courier {
     
     const pushListener = new CourierPushListener();
 
-    if (Platform.OS === 'android') {
-
-      if (props.onPushNotificationClicked) {
-        pushListener.onNotificationClickedListener = DeviceEventEmitter.addListener(this.PUSH_NOTIFICATION_CLICKED, (event: any) => {
-          try {
-            props.onPushNotificationClicked!(JSON.parse(event));
-          } catch (error) {
-            console.log(error);
-          }
-        });
-      }
-
-      if (props.onPushNotificationDelivered) {
-        pushListener.onNotificationDeliveredListener = DeviceEventEmitter.addListener(this.PUSH_NOTIFICATION_DELIVERED, (event: any) => {
-          try {
-            props.onPushNotificationDelivered!(JSON.parse(event));
-          } catch (error) {
-            console.log(error);
-          }
-        });
-      }
-
+    if (props.onPushNotificationClicked) {
+      pushListener.onNotificationClickedListener = Utils.addEventListener(Events.Push.CLICKED, CourierEventEmitter, (event) => {
+        try {
+          props.onPushNotificationClicked!(JSON.parse(event));
+        } catch (error) {
+          console.log(error);
+        }
+      });
     }
 
-    if (Platform.OS === 'ios') {
-
-      if (props.onPushNotificationClicked) {
-        pushListener.onNotificationClickedListener = CourierEventEmitter.addListener(this.PUSH_NOTIFICATION_CLICKED, (event: any) => {
-          try {
-            props.onPushNotificationClicked!(JSON.parse(event));
-          } catch (error) {
-            console.log(error);
-          }
-        });
-      }
-
-      if (props.onPushNotificationDelivered) {
-        pushListener.onNotificationDeliveredListener = CourierEventEmitter.addListener(this.PUSH_NOTIFICATION_DELIVERED, (event: any) => {
-          try {
-            props.onPushNotificationDelivered!(JSON.parse(event));
-          } catch (error) {
-            console.log(error);
-          }
-        });
-      }
-
+    if (props.onPushNotificationDelivered) {
+      pushListener.onNotificationDeliveredListener = Utils.addEventListener(Events.Push.DELIVERED, CourierEventEmitter, (event) => {
+        try {
+          props.onPushNotificationDelivered!(JSON.parse(event));
+        } catch (error) {
+          console.log(error);
+        }
+      });
     }
 
     // When listener is registered
@@ -286,7 +224,7 @@ class Courier {
   /**
    * Removes the current user and credentials from the sdk
    */
-   public signOut(): Promise<void> {
+  public signOut(): Promise<void> {
     return CourierReactNativeModules.signOut();
   }
 
@@ -295,15 +233,22 @@ class Courier {
    */
    public addAuthenticationListener(props: { onUserChanged: (userId?: string) => void }): CourierAuthenticationListener {
 
-    const authListener = new CourierAuthenticationListener();
+    // Event listener id
+    const authId = Utils.generateUUID();
 
-    authListener.onUserChanged = CourierEventEmitter.addListener('courierAuthUserChanged', event => {
-      props.onUserChanged(event)
-    });
+    // Get the id
+    const id = CourierReactNativeModules.addAuthenticationListener(authId);
 
-    authListener.listenerId = CourierReactNativeModules.addAuthenticationListener();
+    // Create the listener
+    const listener = new CourierAuthenticationListener(id);
 
-    return authListener;
+    // Add the event listener
+    listener.onUserChanged = Utils.addEventListener(authId, CourierEventEmitter, (event) => props.onUserChanged(event));
+
+    // Add listener to manager
+    this.authListeners.set(id, listener);
+
+    return listener;
 
   }
 
@@ -311,7 +256,24 @@ class Courier {
    * Removes an authentication listener
    */
   public removeAuthenticationListener(props: { listenerId: string }): string {
-    return CourierReactNativeModules.removeAuthenticationListener(props.listenerId);
+
+    // Remove the native listener
+    CourierReactNativeModules.removeAuthenticationListener(props.listenerId);
+
+    // Remove the listener
+    if (this.authListeners.has(props.listenerId)) {
+
+      // Get the listener
+      const listener = this.authListeners.get(props.listenerId);
+      listener?.onUserChanged?.remove();
+
+      // Remove the listener
+      this.authListeners.delete(props.listenerId);
+
+    }
+
+    return props.listenerId;
+
   }
 
   /**
@@ -347,14 +309,44 @@ class Courier {
    */
   public addInboxListener(props: { onInitialLoad?: () => void, onError?: (error: string) => void, onMessagesChanged?: (messages: InboxMessage[], unreadMessageCount: number, totalMessageCount: number, canPaginate: boolean) => void }): CourierInboxListener {
 
+    const listenerIds = {
+      loading: Utils.generateUUID(),
+      error: Utils.generateUUID(),
+      messages: 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(id);
-    listener.onInitialLoad = props.onInitialLoad;
-    listener.onError = props.onError;
-    listener.onMessagesChanged = props.onMessagesChanged;
+
+    if (props.onInitialLoad) {
+      listener.onInitialLoad = Utils.addEventListener(listenerIds.loading, CourierEventEmitter, (_: any) => {
+        props.onInitialLoad?.();
+      });
+    }
+
+    if (props.onError) {
+      listener.onError = Utils.addEventListener(listenerIds.error, CourierEventEmitter, (event: any) => {
+        props.onError?.(event);
+      });
+    }
+
+    if (props.onMessagesChanged) {
+      listener.onMessagesChanged = Utils.addEventListener(listenerIds.messages, CourierEventEmitter, (event: any) => {
+        props.onMessagesChanged?.(
+          event.messages,
+          event.unreadMessageCount,
+          event.totalMessageCount,
+          event.canPaginate,
+        );
+      });
+    }
 
     // Add listener to manager
     this.inboxListeners.set(id, listener);
@@ -371,9 +363,18 @@ class Courier {
     // Call native code
     CourierReactNativeModules.removeInboxListener(props.listenerId);
 
-    // Remove the js listener
+    // Remove the listener
     if (this.inboxListeners.has(props.listenerId)) {
+
+      // Remove emitters
+      const listener = this.inboxListeners.get(props.listenerId);
+      listener?.onInitialLoad?.remove();
+      listener?.onError?.remove();
+      listener?.onMessagesChanged?.remove();
+
+      // Remove the listener
       this.inboxListeners.delete(props.listenerId);
+
     }
 
     return props.listenerId;
@@ -392,7 +393,7 @@ class Courier {
    * Fetches the next page of inbox messages
    * Returns the fetched inbox messages
    */
-   public async fetchNextPageOfMessages(): Promise<InboxMessage[]> {
+  public async fetchNextPageOfMessages(): Promise<InboxMessage[]> {
     return CourierReactNativeModules.fetchNextPageOfMessages();
   }
 
@@ -401,7 +402,7 @@ class Courier {
    * Min = 1
    * Max = 100
    */
-   public setInboxPaginationLimit(props: { limit: number }): void {
+  public setInboxPaginationLimit(props: { limit: number }): void {
     CourierReactNativeModules.setInboxPaginationLimit(props.limit);
   }
   

package/src/models/CourierAuthenticationListener.tsx

@@ -3,15 +3,19 @@ import Courier from "..";
 
 export class CourierAuthenticationListener {
 
-  public listenerId?: string
+  readonly listenerId: string
   public onUserChanged?: EmitterSubscription
 
+  constructor(id: string) {
+    this.listenerId = id;
+  }
+
   public remove() {
 
-    if (this.listenerId) {
-      Courier.shared.removeInboxListener({ listenerId: this.listenerId });
-    }
+    // Remove the native inbox listener
+    Courier.shared.removeInboxListener({ listenerId: this.listenerId });
 
+    // Remove the emitter
     this.onUserChanged?.remove();
     
   }

package/src/models/CourierInboxListener.tsx

@@ -1,24 +1,19 @@
 import Courier from "@trycourier/courier-react-native";
-import { InboxMessage } from "./InboxMessage";
+import { EmitterSubscription } from "react-native";
 
 export class CourierInboxListener {
 
   readonly listenerId: string
-  public onInitialLoad?: () => void
-  public onError?: (error: string) => void
-  public onMessagesChanged?: (messages: InboxMessage[], unreadMessageCount: number, totalMessageCount: number, canPaginate: boolean) => void
+  public onInitialLoad?: EmitterSubscription
+  public onError?: EmitterSubscription
+  public onMessagesChanged?: EmitterSubscription
 
   constructor(id: string) {
     this.listenerId = id;
   }
 
   public remove() {
-
-    // Remove the native inbox listener
-    if (this.listenerId) {
-      Courier.shared.removeInboxListener({ listenerId: this.listenerId });
-    }
-
+    Courier.shared.removeInboxListener({ listenerId: this.listenerId });
   }
 
 }

package/src/utils.tsx

@@ -0,0 +1,48 @@
+import { EmitterSubscription, Platform, DeviceEventEmitter, NativeEventEmitter } from "react-native";
+
+export namespace Events {
+
+  export namespace Log {
+    export const DEBUG_LOG = 'courierDebugEvent';
+  }
+  
+  export namespace Push {
+    export const CLICKED = 'pushNotificationClicked';
+    export const DELIVERED = 'pushNotificationDelivered';
+  }
+
+}
+
+export namespace Utils {
+
+  /**
+  * Creates an event listener for the native function
+  * @param key Key for the listener
+  * @param callback Value returned for the listener callback
+  * @returns Subscription
+  */
+  export function addEventListener(key: string, emitter: NativeEventEmitter, callback: (value: any) => void): EmitterSubscription | undefined {
+
+    if (Platform.OS === 'android') {
+      return DeviceEventEmitter.addListener(key, (event: any) => callback(event));
+    }
+
+    if (Platform.OS === 'ios') {
+      return emitter.addListener(key, (event: any) => callback(event));
+    }
+
+    return undefined;
+
+  }
+
+  export function generateUUID(): string {
+    let uuid = '';
+    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    const charactersLength = characters.length;
+    for (let i = 0; i < 16; i++) {
+      uuid += characters.charAt(Math.floor(Math.random() * charactersLength));
+    }
+    return uuid;
+  }
+
+}