chore: add iOS new APIs

Author: AndrewAminInstabug

examples/default/ios/Podfile

@@ -19,7 +19,7 @@ target 'InstabugExample' do
   flags = get_default_flags()
 
 #   pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-base/13.4.2/Instabug.podspec'
-  pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-release/13.4.2/Instabug.podspec'
+  pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-release/13.4.3/Instabug.podspec'
   use_react_native!(
     :path => config[:reactNativePath],
     # Hermes is now enabled by default. Disable by setting this flag to false.

examples/default/ios/Podfile.lock

@@ -38,7 +38,7 @@ PODS:
   - hermes-engine (0.72.3):
     - hermes-engine/Pre-built (= 0.72.3)
   - hermes-engine/Pre-built (0.72.3)
-  - Instabug (13.4.2)
+  - Instabug (13.4.3)
   - instabug-reactnative-ndk (0.1.0):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
@@ -476,7 +476,7 @@ PODS:
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - RNInstabug (13.4.0):
-    - Instabug (= 13.4.2)
+    - Instabug (= 13.4.3)
     - React-Core
   - RNReanimated (3.5.4):
     - DoubleConversion
@@ -524,7 +524,7 @@ DEPENDENCIES:
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
-  - Instabug (from `https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-release/13.4.2/Instabug.podspec`)
+  - Instabug (from `https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-release/13.4.3/Instabug.podspec`)
   - instabug-reactnative-ndk (from `../node_modules/instabug-reactnative-ndk`)
   - libevent (~> 2.1.12)
   - OCMock
@@ -600,7 +600,7 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
     :tag: hermes-2023-03-20-RNv0.72.0-49794cfc7c81fb8f69fd60c3bbf85a7480cc5a77
   Instabug:
-    :podspec: https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-release/13.4.2/Instabug.podspec
+    :podspec: https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-release/13.4.3/Instabug.podspec
   instabug-reactnative-ndk:
     :path: "../node_modules/instabug-reactnative-ndk"
   RCT-Folly:
@@ -706,7 +706,7 @@ SPEC CHECKSUMS:
   Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a
   GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
   hermes-engine: 10fbd3f62405c41ea07e71973ea61e1878d07322
-  Instabug: 2a314dc5c7a6d5d07f7cb20f21c98dab72ec2387
+  Instabug: f582dcf7a4099acca604fa7ffa3bf4eda295317f
   instabug-reactnative-ndk: 960119a69380cf4cbe47ccd007c453f757927d17
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
@@ -750,14 +750,14 @@ SPEC CHECKSUMS:
   ReactCommon: 3ccb8fb14e6b3277e38c73b0ff5e4a1b8db017a9
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNGestureHandler: 6e46dde1f87e5f018a54fe5d40cd0e0b942b49ee
-  RNInstabug: 8e7eb1df3f35b935dda661f5bb475f37cef595e6
+  RNInstabug: 514b187e5b884939fd337eefb3244ea75e7e34f8
   RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87
   RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
   RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
   RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
 
-PODFILE CHECKSUM: 406d29e19cb1ac67c149111d9ea23ee7bbf9db83
+PODFILE CHECKSUM: afd54e1cb156d7b63f6e1beca2ba1f66fa30be0f
 
 COCOAPODS: 1.15.2

examples/default/src/App.tsx

@@ -37,7 +37,9 @@ export const App: React.FC = () => {
       //   networkData.url = networkData.url + '/iOS/obfuscated';
       //   return networkData;
       // });
-      NetworkLogger.setRequestFilterExpression('true');
+      NetworkLogger.setRequestFilterExpression(
+        "network.requestHeaders['content-type'] === 'application/json'",
+      );
     });
     CrashReporting.setNDKCrashesEnabled(true);
 

ios/RNInstabug/InstabugNetworkLoggerBridge.h

@@ -28,8 +28,6 @@ typedef NS_ENUM(NSInteger, NetworkListenerType) {
 
 - (void) registerNetworkLogsListener:(NetworkListenerType)listenerType;
 
-//- (void) registerNetworkLogsListener;
-
 - (void) updateNetworkLogSnapshot: (NSString * _Nonnull)jsonString;
 
 - (void) setNetworkLoggingRequestFilterPredicateIOS:(NSString * _Nonnull) callbackID : (BOOL)value;

ios/RNInstabug/InstabugNetworkLoggerBridge.m

@@ -95,68 +95,6 @@ -(void)stopObserving {
              break;
      }
 }
-//RCT_EXPORT_METHOD(registerNetworkLogsListener) {
-//    [IBGNetworkLogger setRequestAsyncObfuscationHandler:^(NSURLRequest * _Nonnull requestToBeObfuscated,
-//                                                          void (^ _Nonnull completion)(NSURLRequest * _Nonnull)) {
-//        NSString *callbackID = [[[NSUUID alloc] init] UUIDString];
-//        self.requestObfuscationCompletionDictionary[callbackID] = completion;
-//        
-//        // Ensure the URL, HTTP body, and headers are in the correct format
-//        NSString *urlString = requestToBeObfuscated.URL.absoluteString ?: @"";
-//        NSString *bodyString = [[NSString alloc] initWithData:requestToBeObfuscated.HTTPBody encoding:NSUTF8StringEncoding] ?: @"";
-//        NSDictionary *headerDict = requestToBeObfuscated.allHTTPHeaderFields ?: @{};
-//        
-//        // Create the dictionary to send
-//        NSDictionary *dict = @{
-//            @"callbackID": callbackID,
-//            @"url": urlString,
-//            @"requestBody": bodyString,
-//            @"requestHeader": headerDict
-//        };
-//        
-//        // Send the event
-//        [self sendEventWithName:@"IBGNetworkLoggerHandler" body:dict];
-//        
-//    }];
-//    
-//    
-//    [IBGNetworkLogger setResponseObfuscationHandler:^(NSData * _Nullable responseData, NSURLResponse * _Nonnull response, NetworkObfuscationCompletionBlock  _Nonnull completion) {
-//        
-//        NSString *callbackID = [[[NSUUID alloc] init] UUIDString];
-//        self.responseObfuscationCompletionDictionary[callbackID] = completion;
-//        
-//        
-//        // MARK: TODO: Convert Response To Dictionary & Pass it To React Native
-//        
-//    }];
-//    
-//    
-//    
-//    [IBGNetworkLogger setRequestFilteringHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(BOOL)) {
-//        
-//        NSString *callbackID = [[[NSUUID alloc] init] UUIDString];
-//        self.requestFilteringCompletionDictionary[callbackID] = completion;
-//        
-//        
-//        // MARK: TODO: Convert Request To Dictionary & Pass it To React Native
-//        
-//    }];
-//    
-//    
-//    [IBGNetworkLogger setResponseFilteringHandler:^(NSURLResponse * _Nonnull request, void (^ _Nonnull completion)(BOOL)) {
-//        
-//        NSString *callbackID = [[[NSUUID alloc] init] UUIDString];
-//        self.responseFilteringCompletionDictionary[callbackID] = completion;
-//        
-//        
-//        // MARK: TODO: Convert Request To Dictionary & Pass it To React Native
-//        
-//    }];
-//    
-//    
-//    
-//    
-//}
 
 
 RCT_EXPORT_METHOD(updateNetworkLogSnapshot:(NSString * _Nonnull)jsonString) {
@@ -195,33 +133,6 @@ -(void)stopObserving {
     } else {
         NSLog(@"Not Available Completion");
     }
-//    
-//    
-//    // MARK: Might need to moved this into another method.
-//    NSURLResponse *response; // Must be initialized from React Native Objects
-//    NSData *responseData; // Must be initialized from React Native Objects
-//    if ([callbackID isKindOfClass:[NSString class]] && self.responseObfuscationCompletionDictionary[callbackID] != nil) {
-//        
-//        ((NetworkObfuscationCompletionBlock)self.responseObfuscationCompletionDictionary[callbackID])(responseData, response);
-//    } else {
-//        NSLog(@"Not Available Completion");
-//    }
-//    
-//    
-//    
-//    if ([callbackID isKindOfClass:[NSString class]] && self.responseFilteringCompletionDictionary[callbackID] != nil) {
-//        // ⬇️ YES == Response will be saved, NO == will be ignored
-//        ((IBGURLRequestResponseAsyncFilteringCompletedHandler)self.responseFilteringCompletionDictionary[callbackID])(YES); 
-//    } else {
-//        NSLog(@"Not Available Completion");
-//    }
-//    
-//    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");
-//    }
 
 }
 
@@ -240,7 +151,7 @@ -(void)stopObserving {
 
 // Set up the filtering handler
 - (void)setupRequestFilteringHandler {
-    [IBGNetworkLogger setRequestFilteringHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(BOOL)) {
+    [IBGNetworkLogger setCPRequestFilteringHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(BOOL)) {
         NSString *callbackID = [[[NSUUID alloc] init] UUIDString];
         self.requestFilteringCompletionDictionary[callbackID] = completion;
 
@@ -254,7 +165,7 @@ - (void)setupRequestFilteringHandler {
 
 // Set up the obfuscation handler
 - (void)setupRequestObfuscationHandler {
-    [IBGNetworkLogger setRequestAsyncObfuscationHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(NSURLRequest * _Nonnull)) {
+    [IBGNetworkLogger setCPRequestAsyncObfuscationHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(NSURLRequest * _Nonnull)) {
         NSString *callbackID = [[[NSUUID alloc] init] UUIDString];
         self.requestObfuscationCompletionDictionary[callbackID] = completion;
 
@@ -272,11 +183,11 @@ - (void)setupRequestFilteringAndObfuscationHandler {
 
     NSString *callbackID = [[[NSUUID alloc] init] UUIDString];
 
-    [IBGNetworkLogger setRequestAsyncObfuscationHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(NSURLRequest * _Nonnull)) {
+    [IBGNetworkLogger setCPRequestAsyncObfuscationHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(NSURLRequest * _Nonnull)) {
         self.requestObfuscationCompletionDictionary[callbackID] = completion;
     }];
 
-    [IBGNetworkLogger setRequestAsyncObfuscationHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(NSURLRequest * _Nonnull)) {
+    [IBGNetworkLogger setCPRequestAsyncObfuscationHandler:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completion)(NSURLRequest * _Nonnull)) {
         self.requestObfuscationCompletionDictionary[callbackID] = completion;
 
         NSDictionary *dict = [self createNetworkRequestDictForRequest:request callbackID:callbackID];

ios/RNInstabug/Util/IBGNetworkLogger+CP.h

@@ -31,9 +31,9 @@ NS_ASSUME_NONNULL_BEGIN
      generatedW3CTraceparent:(NSString * _Nullable)generatedW3CTraceparent
       caughtedW3CTraceparent:(NSString * _Nullable)caughtedW3CTraceparent;
 
-+ (void)setRequestAsyncObfuscationHandler:(void (^)(NSURLRequest * requestToBeObfuscated, void (^ completion)(NSURLRequest * obfuscatedRequest)))asyncObfuscationHandler;
-+ (void)setRequestFilteringHandler:(void (^)(NSURLRequest * request, void (^completion)(BOOL keep)))requestFilteringHandler;
-+ (void)setResponseFilteringHandler:(void (^)(NSURLResponse * response, void (^completion)(BOOL keep)))responseFilteringHandler;
++ (void)setCPRequestAsyncObfuscationHandler:(void (^)(NSURLRequest * requestToBeObfuscated, void (^ completion)(NSURLRequest * obfuscatedRequest)))asyncObfuscationHandler;
++ (void)setCPRequestFilteringHandler:(void (^)(NSURLRequest * request, void (^completion)(BOOL keep)))requestFilteringHandler;
++ (void)setCPResponseFilteringHandler:(void (^)(NSURLResponse * response, void (^comppletion)(BOOL keep)))responseFilteringHandler;
 
 @end
 

ios/native.rb

@@ -1,4 +1,4 @@
-$instabug = { :version => '13.4.2' }
+$instabug = { :version => '13.4.3' }
 
 def use_instabug! (spec = nil)
   version = $instabug[:version]

src/modules/NetworkLogger.ts

@@ -163,14 +163,17 @@ const _registerNetworkLogsListener = (
   }
 
   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;