fix: registerNetworkLogsListener signature for android

Author: AndrewAminInstabug

examples/default/src/App.tsx

@@ -7,7 +7,7 @@ import Instabug, {
   CrashReporting,
   InvocationEvent,
   LogLevel,
-  NetworkInterceptionMode,
+  NetworkLogger,
   ReproStepsMode,
 } from 'instabug-reactnative';
 import { NativeBaseProvider } from 'native-base';
@@ -23,27 +23,33 @@ const queryClient = new QueryClient();
 export const App: React.FC = () => {
   const [isInstabugInitialized, setIsInstabugInitialized] = useState(false);
 
-  useEffect(() => {
-    const initializeInstabug = async () => {
-      try {
-        await Instabug.init({
-          token: '0fcc87b8bf731164828cc411eccc802a',
-          invocationEvents: [InvocationEvent.floatingButton],
-          debugLogsLevel: LogLevel.verbose,
-          networkInterceptionMode: NetworkInterceptionMode.native,
-        });
+  const initializeInstabug = async () => {
+    try {
+      await Instabug.init({
+        token: '0fcc87b8bf731164828cc411eccc802a',
+        invocationEvents: [InvocationEvent.floatingButton],
+        debugLogsLevel: LogLevel.verbose,
+        // networkInterceptionMode: NetworkInterceptionMode.native,
+      });
 
-        CrashReporting.setNDKCrashesEnabled(true);
-        Instabug.setReproStepsConfig({ all: ReproStepsMode.enabled });
+      CrashReporting.setNDKCrashesEnabled(true);
+      Instabug.setReproStepsConfig({ all: ReproStepsMode.enabled });
 
-        setIsInstabugInitialized(true); // Set to true after initialization
-      } catch (error) {
-        console.error('Instabug initialization failed:', error);
-        setIsInstabugInitialized(true); // Proceed even if initialization fails
-      }
-    };
+      setIsInstabugInitialized(true); // Set to true after initialization
+    } catch (error) {
+      console.error('Instabug initialization failed:', error);
+      setIsInstabugInitialized(true); // Proceed even if initialization fails
+    }
+  };
 
-    initializeInstabug();
+  useEffect(() => {
+    initializeInstabug().then(() => {
+      NetworkLogger.setNetworkDataObfuscationHandler(async (networkData) => {
+        networkData.url = `${networkData.url}/JS/Obfuscated`;
+        return networkData;
+      });
+      // NetworkLogger.setRequestFilterExpression('false');
+    });
   }, []);
 
   if (!isInstabugInitialized) {

src/modules/NetworkLogger.ts

@@ -72,6 +72,7 @@ export const setEnabled = (isEnabled: boolean) => {
 };
 
 /**
+ * @internal
  * Sets whether enabling or disabling native network interception.
  * It is disabled by default.
  * @param isEnabled
@@ -157,6 +158,10 @@ export function registerNetworkLogsListener(
 ) {
   if (process.env.NODE_ENV === 'test') {
     _registerNetworkLogsListener(type, handler);
+  } else {
+    console.error(
+      `${InstabugConstants.IBG_APM_TAG}: The \`registerNetworkLogsListener()\` method is intended solely for testing purposes.`,
+    );
   }
 }
 
@@ -167,41 +172,48 @@ export function registerNetworkLogsListener(
 export const resetNetworkListener = () => {
   if (process.env.NODE_ENV === 'test') {
     _networkListener = null;
+  } else {
+    console.error(
+      `${InstabugConstants.IBG_APM_TAG}: The \`resetNetworkListener()\` method is intended solely for testing purposes.`,
+    );
   }
 };
 
 const _registerNetworkLogsListener = (
   type: NetworkListenerType,
   handler?: (networkSnapshot: NetworkData) => void,
 ) => {
-  console.log('Andrew: registerNetworkLogsListener called');
-  // ignore repetitive calls
-  if (_networkListener === type || _networkListener === NetworkListenerType.both) {
-    console.log('Andrew: _registerNetworkLogsListener called on the same type');
-    return;
-  }
-  // remove old listeners
-  if (NetworkLoggerEmitter.listenerCount(NativeNetworkLoggerEvent.NETWORK_LOGGER_HANDLER) > 0) {
-    console.log('Andrew: removeAllListeners called');
-    NetworkLoggerEmitter.removeAllListeners(NativeNetworkLoggerEvent.NETWORK_LOGGER_HANDLER);
+  if (Platform.OS === 'ios') {
+    console.log('Andrew: registerNetworkLogsListener called');
+    // ignore repetitive calls
+    if (_networkListener === type || _networkListener === NetworkListenerType.both) {
+      console.log('Andrew: _registerNetworkLogsListener called on the same type');
+      return;
+    }
+    // remove old listeners
+    if (NetworkLoggerEmitter.listenerCount(NativeNetworkLoggerEvent.NETWORK_LOGGER_HANDLER) > 0) {
+      console.log('Andrew: removeAllListeners called');
+      NetworkLoggerEmitter.removeAllListeners(NativeNetworkLoggerEvent.NETWORK_LOGGER_HANDLER);
+    }
+
+    if (_networkListener == null) {
+      // set new listener.
+      _networkListener = type;
+    } else {
+      // attach a new listener to the existing one.
+      _networkListener = NetworkListenerType.both;
+    }
+    console.log(`Andrew: new NetworkLogsListener (${_networkListener}) attached`);
   }
 
-  if (_networkListener == null) {
-    // set new listener.
-    _networkListener = type;
-  } else {
-    // attach a new listener to the existing one.
-    _networkListener = NetworkListenerType.both;
-  }
-  console.log(`Andrew: new NetworkLogsListener (${_networkListener}) attached`);
   NetworkLoggerEmitter.addListener(
     NativeNetworkLoggerEvent.NETWORK_LOGGER_HANDLER,
     (networkSnapshot) => {
       // Mapping the data [Native -> React-Native].
       const { id, url, requestHeader, requestBody, responseHeader, response, responseCode } =
         networkSnapshot;
 
-      console.log(`Andrew: new snapshot ${url}`);
+      // console.log(`Andrew: new snapshot ${url}`);
       const networkSnapshotObj: NetworkData = {
         id: id,
         url: url,
@@ -226,7 +238,9 @@ const _registerNetworkLogsListener = (
       }
     },
   );
-  //todo: find where to remove listener
-  // emitter.removeAllListeners(NativeEvents.NETWORK_LOGGER_HANDLER);
-  NativeNetworkLogger.registerNetworkLogsListener(_networkListener);
+  if (Platform.OS === 'ios') {
+    NativeNetworkLogger.registerNetworkLogsListener(_networkListener ?? NetworkListenerType.both);
+  } else {
+    NativeNetworkLogger.registerNetworkLogsListener();
+  }
 };

src/native/NativeNetworkLogger.ts

@@ -10,7 +10,7 @@ export enum NetworkListenerType {
 export interface NetworkLoggerNativeModule extends NativeModule {
   isNativeInterceptionEnabled(): Promise<boolean>;
 
-  registerNetworkLogsListener(type: NetworkListenerType): void;
+  registerNetworkLogsListener(type?: NetworkListenerType): void;
 
   updateNetworkLogSnapshot(networkData: string): void;
 

test/modules/NetworkLogger.spec.ts

@@ -332,6 +332,8 @@ describe('_registerNetworkLogsListener', () => {
   });
 
   it('should ignore repetitive calls with the same type', () => {
+    Platform.OS = 'ios';
+
     // Simulate existing listener
     jest.spyOn(NetworkLoggerEmitter, 'listenerCount').mockReturnValue(1);
     NetworkLogger.registerNetworkLogsListener(type, handlerMock);
@@ -345,6 +347,8 @@ describe('_registerNetworkLogsListener', () => {
   });
 
   it('should remove old listeners if they exist', () => {
+    Platform.OS = 'ios';
+
     // Simulate that there are existing listeners
     jest.spyOn(NetworkLoggerEmitter, 'listenerCount').mockReturnValue(2);
 
@@ -356,6 +360,7 @@ describe('_registerNetworkLogsListener', () => {
   });
 
   it('should set the new listener if _networkListener is null', () => {
+    Platform.OS = 'ios';
     // No existing listener
     jest.spyOn(NetworkLoggerEmitter, 'listenerCount').mockReturnValue(0);
 
@@ -366,6 +371,8 @@ describe('_registerNetworkLogsListener', () => {
   });
 
   it('should attach a new listener to the existing one if _networkListener is set', () => {
+    Platform.OS = 'ios';
+
     type = NetworkListenerType.filtering;
     const newType = NetworkListenerType.both;