Merge pull request #683 from JoL0712/master

Multiple event listener support

Author: manuquentin

index.d.ts

@@ -102,6 +102,10 @@ declare module 'react-native-callkeep' {
     }
   };
 
+  export class EventListener {
+    remove(): void
+  }
+
   export default class RNCallKeep {
     static getInitialEvents(): Promise<InitialEvents>
 
@@ -110,7 +114,7 @@ declare module 'react-native-callkeep' {
     static addEventListener<Event extends Events>(
       type: Event,
       handler: (args: EventsPayload[Event]) => void,
-    ): void
+    ): EventListener
 
     static removeEventListener(type: Events): void
 

index.js

@@ -19,6 +19,18 @@ const CONSTANTS = {
 
 export { emit, CONSTANTS };
 
+class EventListener {
+  constructor(type, listener, callkeep) {
+    this._type = type;
+    this._listener = listener;
+    this._callkeep = callkeep;
+  }
+
+  remove = () => {
+    this._callkeep.removeEventListener(this._type, this._listener);
+  };
+}
+
 class RNCallKeep {
   constructor() {
     this._callkeepEventHandlers = new Map();
@@ -27,17 +39,32 @@ class RNCallKeep {
   addEventListener = (type, handler) => {
     const listener = listeners[type](handler);
 
-    this._callkeepEventHandlers.set(type, listener);
+    const listenerSet = this._callkeepEventHandlers.get(type) ?? new Set();
+    listenerSet.add(listener);
+
+    this._callkeepEventHandlers.set(type, listenerSet);
+
+    return new EventListener(type, listener, this);
   };
 
-  removeEventListener = (type) => {
-    const listener = this._callkeepEventHandlers.get(type);
-    if (!listener) {
+  removeEventListener = (type, listener = undefined) => {
+    const listenerSet = this._callkeepEventHandlers.get(type);
+    if (!listenerSet) {
       return;
     }
 
-    listener.remove();
-    this._callkeepEventHandlers.delete(type);
+    if (listener) {
+      listenerSet.delete(listener);
+      listener.remove();
+      if (listenerSet.size <= 0) {
+        this._callkeepEventHandlers.delete(type);
+      }
+    } else {
+      listenerSet.forEach((listener) => {
+        listener.remove();
+      });
+      this._callkeepEventHandlers.delete(type);
+    }
   };
 
   setup = async (options) => {