Adopt react-native event emitter signature

Author: hoangvvo

src/SpotifyRemote.ts

@@ -301,28 +301,32 @@ const SpotifyRemote: SpotifyRemoteApi = {
             nativeModule.eventStartObserving(eventType);
         }
         eventListeners[eventType].add(sub);
-        return this;
+        const _remove = sub.remove;
+        // rewrite sub.remove so we can add stopObserving API
+        sub.remove = () => {
+            _remove.call(sub);
+            eventListeners[eventType].delete(sub);
+            if (this.listenerCount(eventType) === 0) {
+                nativeModule.eventStopObserving(eventType);
+            }
+        };
+        return sub;
     },
     removeListener(eventType, listener) {
         eventListeners[eventType].forEach((eventListener) => {
-            if (!listener || eventListener.listener === listener) {
-                eventListener.remove();
-                eventListeners[eventType].delete(eventListener);
-            }
+            if (eventListener.listener === listener) eventListener.remove();
         });
-        if (this.listenerCount(eventType) === 0) {
-            nativeModule.eventStopObserving(eventType);
-        }
-        return this;
     },
     removeAllListeners(eventType) {
         const eventsToRemove = eventType ? [eventType] : this.eventNames();
-        eventsToRemove.forEach((eventType) => this.removeListener(eventType));
-        return this;
+        for (const eventToRemove of eventsToRemove) {
+            eventListeners[eventToRemove].forEach((eventListener) => {
+                eventListener.remove();
+            });
+        }
     },
     emit(eventType, ...args) {
-        nativeEventEmitter.emit(eventType, ...args);
-        return true;
+        return nativeEventEmitter.emit(eventType, ...args);
     },
     listenerCount(eventType) {
         return eventListeners[eventType].size;

src/TypedEventEmitter.ts

@@ -1,3 +1,5 @@
+import { EmitterSubscription } from "react-native";
+
 /**
  * An EventEmitter that supports events given by the interface in {T}
  * Where each Key represents the eventName and the type represents the payload
@@ -7,12 +9,21 @@
  * @template T
  */
 export default interface TypedEventEmitter<T> {
-    addListener<K extends keyof T>(event: K, listener: (v: T[K]) => void): this;
-    removeListener<K extends keyof T>(event: K, listener?: (v: T[K]) => void): this;
-    removeAllListeners<K extends keyof T>(event?: K): this;
-    emit<K extends keyof T>(event: K, args: T[K]): boolean;
+    addListener<K extends keyof T>(event: K, listener: (v: T[K]) => void): EmitterSubscription;
+    /**
+     * @deprecated Use `remove` on the EventSubscription from `addListener`.
+     */
+    removeListener<K extends keyof T>(event: K, listener: (v: T[K]) => void): void;
+    removeAllListeners<K extends keyof T>(event?: K): void;
+    emit<K extends keyof T>(event: K, args: T[K]): void;
     eventNames(): Array<keyof T>;
     listenerCount<K extends keyof T>(type: K): number;
-    on<K extends keyof T>(name: K, listener: (v: T[K]) => void): this;
-    off<K extends keyof T>(event: K, listener: (v: T[K]) => void): this;
+    /**
+     * @deprecated Use `addListener` instead.
+     */
+    on<K extends keyof T>(name: K, listener: (v: T[K]) => void): EmitterSubscription;
+    /**
+     * @deprecated Use `remove` on the EventSubscription from `addListener`.
+     */
+    off<K extends keyof T>(event: K, listener: (v: T[K]) => void): void;
 }