chore: fix wrong id passed from iOS to RN

Author: AndrewAminInstabug

examples/default/src/App.tsx

@@ -37,8 +37,7 @@ export const App: React.FC = () => {
         networkData.url = networkData.url + '/iOS/obfuscated';
         return networkData;
       });
-
-      NetworkLogger.setRequestFilterExpression('false');
+      // NetworkLogger.setRequestFilterExpression('false');
     });
     CrashReporting.setNDKCrashesEnabled(true);
 

ios/RNInstabug/InstabugNetworkLoggerBridge.m

@@ -189,7 +189,7 @@ -(void)stopObserving {
     }
 
     // Ensure self.completion is not nil before calling it
-    NSString *callbackID = dict[@"callbackID"];
+    NSString *callbackID = dict[@"id"];
     if ([callbackID isKindOfClass:[NSString class]] && self.requestObfuscationCompletionDictionary[callbackID] != nil) {
         ((IBGURLRequestAsyncObfuscationCompletedHandler)self.requestObfuscationCompletionDictionary[callbackID])(request);
     } else {
@@ -229,9 +229,10 @@ -(void)stopObserving {
 
 //    NSPredicate *requestPredicate = [NSPredicate predicateWithValue:(value) ? YES : NO];
 
-    if ([callbackID isKindOfClass:[NSString class]] && self.responseFilteringCompletionDictionary[callbackID] != nil) {
-        // ⬇️ YES == Response will be saved, NO == will be ignored
-        ((IBGURLRequestResponseAsyncFilteringCompletedHandler)self.responseFilteringCompletionDictionary[callbackID])(YES);
+    
+    if ([callbackID isKindOfClass:[NSString class]] && self.requestFilteringCompletionDictionary[callbackID] != nil) {
+        // ⬇️ YES == Request will be saved, NO == will be ignored
+        ((IBGURLRequestResponseAsyncFilteringCompletedHandler)self.requestFilteringCompletionDictionary[callbackID])(YES);
     } else {
         NSLog(@"Not Available Completion");
     }
@@ -250,7 +251,10 @@ - (void)setupRequestFilteringHandler {
         self.requestFilteringCompletionDictionary[callbackID] = completion;
 
         NSDictionary *dict = [self createNetworkRequestDictForRequest:request callbackID:callbackID];
-        [self sendEventWithName:@"IBGNetworkLoggerHandler" body:dict];
+        if(hasListeners){
+            [self sendEventWithName:@"IBGNetworkLoggerHandler" body:dict];
+        }
+
     }];
 }
 
@@ -262,12 +266,16 @@ - (void)setupRequestObfuscationHandler {
 
 
         NSDictionary *dict = [self createNetworkRequestDictForRequest:request callbackID:callbackID];
-        [self sendEventWithName:@"IBGNetworkLoggerHandler" body:dict];
+        if (hasListeners) {
+            [self sendEventWithName:@"IBGNetworkLoggerHandler" body:dict];
+        }
+        
     }];
 }
 
 // Set up the obfuscation handler
 - (void)setupRequestFilteringAndObfuscationHandler {
+    
     NSString *callbackID = [[[NSUUID alloc] init] UUIDString];
 
     [IBGNetworkLogger setRequestAsyncObfuscationHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(NSURLRequest * _Nonnull)) {
@@ -278,7 +286,10 @@ - (void)setupRequestFilteringAndObfuscationHandler {
         self.requestObfuscationCompletionDictionary[callbackID] = completion;
 
         NSDictionary *dict = [self createNetworkRequestDictForRequest:request callbackID:callbackID];
-        [self sendEventWithName:@"IBGNetworkLoggerHandler" body:dict];
+        if(hasListeners){
+            [self sendEventWithName:@"IBGNetworkLoggerHandler" body:dict];
+        }
+        
     }];
 }
 
@@ -289,7 +300,7 @@ - (NSDictionary *)createNetworkRequestDictForRequest:(NSURLRequest *)request cal
     NSDictionary *headerDict = request.allHTTPHeaderFields ?: @{};
 
     return @{
-        @"callbackID": callbackID,
+        @"id": callbackID,
         @"url": urlString,
         @"requestBody": bodyString,
         @"requestHeader": headerDict

src/modules/NetworkLogger.ts

@@ -77,7 +77,7 @@ export const setEnabled = (isEnabled: boolean) => {
  * @param isEnabled
  */
 export const setNativeInterceptionEnabled = (isEnabled: boolean) => {
-  console.log(`NetworkLogger -> setNativeInterceptionEnabled ${isEnabled}`);
+  console.log(`Andrew: NetworkLogger -> setNativeInterceptionEnabled ${isEnabled}`);
   _isNativeInterceptionEnabled = isEnabled;
 };
 
@@ -89,16 +89,8 @@ export const setNetworkDataObfuscationHandler = (
   handler?: NetworkDataObfuscationHandler | null | undefined,
 ) => {
   _networkDataObfuscationHandler = handler;
-
-  console.log(
-    `Andrew: Obfuscation -> _isNativeInterceptionEnabled ${_isNativeInterceptionEnabled}`,
-  );
   if (_isNativeInterceptionEnabled) {
     _registerNetworkLogsListener(NetworkListenerType.obfuscation, async (networkSnapshot) => {
-      console.log(
-        `Andrew: new snapshot from setNetworkDataObfuscationHandler: ${networkSnapshot.url}`,
-      );
-
       if (_networkDataObfuscationHandler) {
         networkSnapshot = await _networkDataObfuscationHandler(networkSnapshot);
       }
@@ -113,11 +105,9 @@ export const setNetworkDataObfuscationHandler = (
  */
 export const setRequestFilterExpression = (expression: string) => {
   _requestFilterExpression = expression;
-  console.log(`Andrew: Filtering -> _isNativeInterceptionEnabled ${_isNativeInterceptionEnabled}`);
 
   if (_isNativeInterceptionEnabled) {
     _registerNetworkLogsListener(NetworkListenerType.filtering, async (networkSnapshot) => {
-      console.log(`Andrew: new snapshot from setRequestFilterExpression: ${networkSnapshot.url}`);
       // eslint-disable-next-line no-new-func
       const predicate = Function('network', 'return ' + _requestFilterExpression);
       const value = predicate(networkSnapshot);
@@ -176,23 +166,16 @@ const _registerNetworkLogsListener = (
   } else {
     _networkListener = NetworkListenerType.both;
   }
-  console.log('Andrew: new NetworkLogsListener attached');
+  console.log(`Andrew: new NetworkLogsListener (${_networkListener}) attached`);
   NetworkLoggerEmitter.addListener(
     NativeNetworkLoggerEvent.NETWORK_LOGGER_HANDLER,
     (networkSnapshot) => {
-      const {
-        callbackID,
-        url,
-        requestHeader,
-        requestBody,
-        responseHeader,
-        response,
-        responseCode,
-      } = networkSnapshot;
+      const { id, url, requestHeader, requestBody, responseHeader, response, responseCode } =
+        networkSnapshot;
 
       console.log(`Andrew: new snapshot ${url}`);
       const networkSnapshotObj: NetworkData = {
-        id: callbackID,
+        id: id,
         url: url,
         requestBody: requestBody,
         requestHeaders: requestHeader,
@@ -210,7 +193,6 @@ const _registerNetworkLogsListener = (
         serverErrorMessage: '',
         requestContentType: '',
       };
-      console.log(`Andrew registerNetworkLogsListener object ${networkSnapshotObj.url}`);
       if (handler) {
         handler(networkSnapshotObj);
       }

src/native/NativeNetworkLogger.ts

@@ -16,8 +16,6 @@ export interface NetworkLoggerNativeModule extends NativeModule {
 
   registerNetworkLogsListener(type: NetworkListenerType): void;
 
-  // registerNetworkLogsListener(): void;
-
   updateNetworkLogSnapshot(networkData: string): void;
 
   setNetworkLoggingRequestFilterPredicateIOS(id: string, value: boolean): void; // iOS only