Migrate Replies to NativeEventEmitter

Author: a7medev

android/src/main/java/com/instabug/reactlibrary/RNInstabugRepliesModule.java

@@ -1,25 +1,21 @@
 package com.instabug.reactlibrary;
 
-import android.os.Handler;
-import android.os.Looper;
-
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.instabug.chat.Replies;
 import com.instabug.library.Feature;
-import com.instabug.reactlibrary.utils.InstabugUtil;
+import com.instabug.reactlibrary.utils.EventEmitterModule;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
 
 import javax.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.Map;
 
-public class RNInstabugRepliesModule extends ReactContextBaseJavaModule {
+public class RNInstabugRepliesModule extends EventEmitterModule {
 
     public RNInstabugRepliesModule(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
@@ -31,6 +27,16 @@ public String getName() {
         return "IBGReplies";
     }
 
+    @ReactMethod
+    public void addListener(String event) {
+        super.addListener(event);
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+        super.removeListeners(count);
+    }
+
     @ReactMethod
     public void setEnabled(final boolean isEnabled) {
         MainThreadHandler.runOnMainThread(new Runnable() {
@@ -278,7 +284,7 @@ public void run() {
                     Runnable onNewReplyReceivedRunnable = new Runnable() {
                         @Override
                         public void run() {
-                            InstabugUtil.sendEvent(getReactApplicationContext(), Constants.IBG_ON_NEW_REPLY_RECEIVED_CALLBACK, null);
+                            sendEvent(Constants.IBG_ON_NEW_REPLY_RECEIVED_CALLBACK, null);
                         }
                     };
                     Replies.setOnNewReplyReceivedCallback(onNewReplyReceivedRunnable);

src/modules/Replies.ts

@@ -1,8 +1,20 @@
-import { Platform } from 'react-native';
+import { NativeEventEmitter, Platform } from 'react-native';
 
 import { NativeReplies } from '../native/NativeReplies';
-import IBGEventEmitter from '../utils/IBGEventEmitter';
-import InstabugConstants from '../utils/InstabugConstants';
+
+/**
+ * @internal You shouldn't use this enum since you never emit or listen
+ * for native events in your code.
+ */
+export enum $NativeEvents {
+  ON_REPLY_RECEIVED_HANDLER = 'IBGOnNewReplyReceivedCallback',
+}
+
+/**
+ * @internal You shouldn't use this since you never emit or listen for native
+ * events in your code.
+ */
+export const $emitter = new NativeEventEmitter(NativeReplies);
 
 /**
  * Enables and disables everything related to receiving replies.
@@ -32,7 +44,7 @@ export const show = () => {
  * @param handler A callback that gets executed when a new message is received.
  */
 export const setOnNewReplyReceivedHandler = (handler: () => void) => {
-  IBGEventEmitter.addListener(NativeReplies, InstabugConstants.ON_REPLY_RECEIVED_HANDLER, handler);
+  $emitter.addListener($NativeEvents.ON_REPLY_RECEIVED_HANDLER, handler);
   NativeReplies.setOnNewReplyReceivedHandler(handler);
 };
 

src/utils/IBGEventEmitter.ts

@@ -1,5 +1,4 @@
 enum InstabugConstants {
-  ON_REPLY_RECEIVED_HANDLER = 'IBGOnNewReplyReceivedCallback',
   GRAPHQL_HEADER = 'ibg-graphql-header',
 }
 

src/utils/InstabugConstants.ts

@@ -2,10 +2,15 @@ import { Platform } from 'react-native';
 
 import * as Replies from '../../src/modules/Replies';
 import { NativeReplies } from '../../src/native/NativeReplies';
-import IBGEventEmitter from '../../src/utils/IBGEventEmitter';
-import IBGConstants from '../../src/utils/InstabugConstants';
 
 describe('Replies Module', () => {
+  beforeEach(() => {
+    const events = Object.values(Replies.$NativeEvents);
+    events.forEach((event) => {
+      Replies.$emitter.removeAllListeners(event);
+    });
+  });
+
   it('should call the native method setRepliesEnabled', () => {
     Replies.setEnabled(true);
 
@@ -39,9 +44,9 @@ describe('Replies Module', () => {
   it('should invoke callback on emitting the event IBGOnNewReplyReceivedCallback', () => {
     const callback = jest.fn();
     Replies.setOnNewReplyReceivedHandler(callback);
-    IBGEventEmitter.emit(IBGConstants.ON_REPLY_RECEIVED_HANDLER);
+    Replies.$emitter.emit(Replies.$NativeEvents.ON_REPLY_RECEIVED_HANDLER);
 
-    expect(IBGEventEmitter.getListeners(IBGConstants.ON_REPLY_RECEIVED_HANDLER).length).toEqual(1);
+    expect(Replies.$emitter.listenerCount(Replies.$NativeEvents.ON_REPLY_RECEIVED_HANDLER)).toBe(1);
     expect(callback).toHaveBeenCalled();
   });
 

test/modules/Replies.spec.ts

@@ -7,15 +7,11 @@ import 'react-native/Libraries/Network/fetch';
 import nock from 'nock';
 import XHR from 'xhr2';
 
-import IBGEventEmitter from '../src/utils/IBGEventEmitter';
-
 global.XMLHttpRequest = XHR;
 
 nock.disableNetConnect();
 
 beforeEach(() => {
-  IBGEventEmitter.removeAllListeners();
-
   jest.spyOn(Platform, 'constants', 'get').mockReturnValue({
     isTesting: true,
     reactNativeVersion: {