chore: add iOS feature flag changes

Author: AndrewAminInstabug

examples/default/ios/Podfile

@@ -18,6 +18,8 @@ target 'InstabugExample' do
   # Flags change depending on the env values.
   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'
   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.3.0)
+  - Instabug (13.4.2)
   - 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.3.0):
-    - Instabug (= 13.3.0)
+    - Instabug (= 13.4.2)
     - React-Core
   - RNReanimated (3.5.4):
     - DoubleConversion
@@ -524,6 +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-reactnative-ndk (from `../node_modules/instabug-reactnative-ndk`)
   - libevent (~> 2.1.12)
   - OCMock
@@ -580,7 +581,6 @@ SPEC REPOS:
     - fmt
     - Google-Maps-iOS-Utils
     - GoogleMaps
-    - Instabug
     - libevent
     - OCMock
     - SocketRocket
@@ -599,6 +599,8 @@ EXTERNAL SOURCES:
   hermes-engine:
     :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
   instabug-reactnative-ndk:
     :path: "../node_modules/instabug-reactnative-ndk"
   RCT-Folly:
@@ -704,7 +706,7 @@ SPEC CHECKSUMS:
   Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a
   GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
   hermes-engine: 10fbd3f62405c41ea07e71973ea61e1878d07322
-  Instabug: 4f26295103a330ec0236918359eef7ccaa74e2fa
+  Instabug: 2a314dc5c7a6d5d07f7cb20f21c98dab72ec2387
   instabug-reactnative-ndk: 960119a69380cf4cbe47ccd007c453f757927d17
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
@@ -748,14 +750,14 @@ SPEC CHECKSUMS:
   ReactCommon: 3ccb8fb14e6b3277e38c73b0ff5e4a1b8db017a9
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNGestureHandler: 6e46dde1f87e5f018a54fe5d40cd0e0b942b49ee
-  RNInstabug: a4ac0bd09123f6be7d58be541dc220acbaff8dc3
+  RNInstabug: 3bd51c9e01a076ed5b0bc0a10590e34272dff2fb
   RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87
   RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
   RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
   RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
 
-PODFILE CHECKSUM: 281036e04bd4b9e7c2cc03a503b3245d3f1dd0dd
+PODFILE CHECKSUM: 406d29e19cb1ac67c149111d9ea23ee7bbf9db83
 
 COCOAPODS: 1.15.2

ios/RNInstabug/InstabugNetworkLoggerBridge.h

@@ -10,4 +10,5 @@
  +------------------------------------------------------------------------+
  */
 
+- (void)isNativeInterceptionEnabled:(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject;
 @end

ios/RNInstabug/InstabugNetworkLoggerBridge.m

@@ -5,6 +5,7 @@
 //  Created by Andrew Amin on 01/10/2024.
 //
 #import "InstabugNetworkLoggerBridge.h"
+#import "Util/IBGNetworkLogger+CP.h"
 
 @implementation InstabugNtworkLoggerBridge
 
@@ -39,17 +40,11 @@ -(void)stopObserving {
     // Remove upstream listeners, stop unnecessary background tasks
 }
 
-// Get first-time value of [cp_native_interception_enabled] flag
-RCT_EXPORT_METHOD(isNativeInterceptionEnabled:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject) {
-    @try {
-        // Assuming you want to return YES for now, wrapped in NSNumber
-        resolve(@(NO));
-    } @catch (NSError *error) {
-        reject(@"error_code", @"An error occurred", error);
-    }
+RCT_EXPORT_METHOD(isNativeInterceptionEnabled:(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject) {
+    resolve(@(IBGNetworkLogger.isNativeNetworkInterceptionFeatureEnabled));
 }
 
+
 // RCT_EXPORT_METHOD(registerNetworkLogsListener){
 //     [IBGNetworkLogger setRequestObfuscationHandlerV2:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completionHandler)(NSURLRequest * _Nonnull)) {
 //         NSString *tempId = [[[NSUUID alloc] init] UUIDString];

ios/RNInstabug/Util/IBGNetworkLogger+CP.h

@@ -2,8 +2,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+
+
 @interface IBGNetworkLogger (CP)
 
+@property (class, atomic, assign) BOOL isNativeNetworkInterceptionFeatureEnabled;
+
 + (void)disableAutomaticCapturingOfNetworkLogs;
 + (void)addNetworkLogWithUrl:(NSString *)url
                       method:(NSString *)method

ios/native.rb

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

src/modules/Instabug.ts

@@ -43,10 +43,10 @@ let _lastScreen: string | null = null;
 let _isFirstScreen = false;
 const firstScreen = 'Initial Screen';
 let _currentAppState = AppState.currentState;
-let isNativeInterceptionEnabled = false;
+let isNativeInterceptionFeatureEnabled = false;
 let hasAPMNetworkPlugin = false;
 let isAPMNetworkEnabled = false;
-let disableAPMLogging = false; // used to disable APM logging inside reportNetworkLog() -> NativeAPM.networkLogAndroid()
+let shouldEnableNativeInterception = false; // used to disable APM logging inside reportNetworkLog() -> NativeAPM.networkLogAndroid()
 
 /**
  * Enables or disables Instabug functionality.
@@ -73,6 +73,17 @@ function reportCurrentViewForAndroid(screenName: string | null) {
   }
 }
 
+function _logFlags() {
+  console.log(
+    `Andrew: init -> {
+     isNativeInterceptionFeatureEnabled: ${isNativeInterceptionFeatureEnabled},
+     hasAPMNetworkPlugin: ${hasAPMNetworkPlugin},
+     isApmNetworkEnabled: ${isAPMNetworkEnabled},
+     shouldEnableNativeInterception: ${shouldEnableNativeInterception}
+    }`,
+  );
+}
+
 /**
  * Initializes the SDK.
  * This is the main SDK method that does all the magic. This is the only
@@ -82,11 +93,12 @@ function reportCurrentViewForAndroid(screenName: string | null) {
  */
 export const init = async (config: InstabugConfig) => {
   // Initialize necessary variables
-  isNativeInterceptionEnabled = await NativeNetworkLogger.isNativeInterceptionEnabled();
+  isNativeInterceptionFeatureEnabled = await NativeNetworkLogger.isNativeInterceptionEnabled();
   if (Platform.OS === 'android') {
     hasAPMNetworkPlugin = await NativeNetworkLogger.hasAPMNetworkPlugin();
     isAPMNetworkEnabled = await NativeNetworkLogger.isAPMNetworkEnabled();
-    disableAPMLogging = config.networkInterceptionMode === NetworkInterceptionMode.native;
+    shouldEnableNativeInterception =
+      config.networkInterceptionMode === NetworkInterceptionMode.native;
   }
 
   // Add app state listener to handle background/foreground transitions
@@ -100,21 +112,14 @@ export const init = async (config: InstabugConfig) => {
   handleNetworkInterceptionMode(config);
 
   // Log the current APM network flags and initialize Instabug
-  console.log(
-    `Andrew: init -> {
-     isNativeInterceptionEnabled: ${isNativeInterceptionEnabled},
-     hasAPMNetworkPlugin: ${hasAPMNetworkPlugin},
-     isApmNetworkEnabled: ${isAPMNetworkEnabled},
-     disableAPMLogging: ${disableAPMLogging}
-    }`,
-  );
+  _logFlags();
 
   //Set APM networking flags for the first time
   setApmNetworkFlagsIfChanged({
-    isNativeInterceptionEnabled: isNativeInterceptionEnabled,
+    isNativeInterceptionFeatureEnabled: isNativeInterceptionFeatureEnabled,
     hasAPMNetworkPlugin: hasAPMNetworkPlugin,
     isAPMNetworkEnabled: isAPMNetworkEnabled,
-    disableAPMLogging: disableAPMLogging,
+    shouldEnableNativeInterception: shouldEnableNativeInterception,
   });
 
   // call Instabug native init method
@@ -146,7 +151,7 @@ const handleAppStateChange = async (nextAppState: AppStateStatus, config: Instab
       handleNetworkInterceptionMode(config);
       initializeNativeInstabug(config);
     }
-
+    _logFlags();
     console.log('Andrew: App has come to the foreground!');
   }
 
@@ -158,15 +163,17 @@ const handleAppStateChange = async (nextAppState: AppStateStatus, config: Instab
  * Fetches the current APM network flags.
  */
 const fetchApmNetworkFlags = async () => {
-  isNativeInterceptionEnabled = await NativeNetworkLogger.isNativeInterceptionEnabled();
-  hasAPMNetworkPlugin = await NativeNetworkLogger.hasAPMNetworkPlugin();
-  isAPMNetworkEnabled = await NativeNetworkLogger.isAPMNetworkEnabled();
+  isNativeInterceptionFeatureEnabled = await NativeNetworkLogger.isNativeInterceptionEnabled();
+  if (Platform.OS === 'android') {
+    hasAPMNetworkPlugin = await NativeNetworkLogger.hasAPMNetworkPlugin();
+    isAPMNetworkEnabled = await NativeNetworkLogger.isAPMNetworkEnabled();
+  }
 
   return {
-    isNativeInterceptionEnabled,
+    isNativeInterceptionFeatureEnabled,
     hasAPMNetworkPlugin,
     isAPMNetworkEnabled,
-    disableAPMLogging,
+    shouldEnableNativeInterception,
   };
 };
 
@@ -198,15 +205,15 @@ const checkNativeInterceptionForAndroid = (config: InstabugConfig) => {
   const { networkInterceptionMode } = config;
 
   if (networkInterceptionMode === NetworkInterceptionMode.javascript) {
-    if (isNativeInterceptionEnabled && hasAPMNetworkPlugin) {
-      disableAPMLogging = true;
+    if (isNativeInterceptionFeatureEnabled && hasAPMNetworkPlugin) {
+      shouldEnableNativeInterception = true;
       console.warn(
         InstabugConstants.IBG_APM_TAG + 'Switched to Native Interception: Android Plugin Detected',
       );
     }
   } else {
-    if (isNativeInterceptionEnabled) {
-      disableAPMLogging = hasAPMNetworkPlugin;
+    if (isNativeInterceptionFeatureEnabled) {
+      shouldEnableNativeInterception = hasAPMNetworkPlugin;
       if (!hasAPMNetworkPlugin) {
         console.error(
           InstabugConstants.IBG_APM_TAG +
@@ -230,12 +237,13 @@ const checkNativeInterceptionForAndroid = (config: InstabugConfig) => {
  * Handles the native interception logic for iOS.
  */
 const checkNativeInterceptionForIOS = (config: InstabugConfig) => {
-  if (
-    config.networkInterceptionMode === NetworkInterceptionMode.native &&
-    !isNativeInterceptionEnabled
-  ) {
-    config.networkInterceptionMode = NetworkInterceptionMode.javascript;
-    console.error(InstabugConstants.IBG_APM_TAG + 'Native interception is disabled');
+  if (config.networkInterceptionMode === NetworkInterceptionMode.native) {
+    if (isNativeInterceptionFeatureEnabled) {
+      shouldEnableNativeInterception = true;
+    } else {
+      shouldEnableNativeInterception = false;
+      console.error(InstabugConstants.IBG_APM_TAG + 'Native interception is disabled');
+    }
   }
 };
 
@@ -245,14 +253,16 @@ const checkNativeInterceptionForIOS = (config: InstabugConfig) => {
 const initializeNativeInstabug = (config: InstabugConfig) => {
   console.log(
     `Andrew: initializeNativeInstabug -> NativeNetworkInterceptionMode ${
+      shouldEnableNativeInterception &&
       config.networkInterceptionMode === NetworkInterceptionMode.native
     }`,
   );
   NativeInstabug.init(
     config.token,
     config.invocationEvents,
     config.debugLogsLevel ?? LogLevel.error,
-    config.networkInterceptionMode === NetworkInterceptionMode.native,
+    shouldEnableNativeInterception &&
+      config.networkInterceptionMode === NetworkInterceptionMode.native,
     config.codePushVersion,
   );
 };

src/utils/InstabugUtils.ts

@@ -14,25 +14,25 @@ import { NativeInstabug } from '../native/NativeInstabug';
 import { NativeAPM } from '../native/NativeAPM';
 
 type ApmNetworkFlags = {
-  isNativeInterceptionEnabled: boolean;
+  isNativeInterceptionFeatureEnabled: boolean;
   hasAPMNetworkPlugin: boolean;
   isAPMNetworkEnabled: boolean;
-  disableAPMLogging: boolean;
+  shouldEnableNativeInterception: boolean;
 };
 
 let apmFlags: ApmNetworkFlags = {
-  isNativeInterceptionEnabled: false,
+  isNativeInterceptionFeatureEnabled: false,
   hasAPMNetworkPlugin: false,
   isAPMNetworkEnabled: false,
-  disableAPMLogging: false,
+  shouldEnableNativeInterception: false,
 };
 
 export function setApmNetworkFlagsIfChanged(flags: ApmNetworkFlags): boolean {
   if (
     flags.isAPMNetworkEnabled === apmFlags.isAPMNetworkEnabled &&
     flags.hasAPMNetworkPlugin === apmFlags.hasAPMNetworkPlugin &&
-    flags.isNativeInterceptionEnabled === apmFlags.isNativeInterceptionEnabled &&
-    flags.disableAPMLogging === apmFlags.disableAPMLogging
+    flags.isNativeInterceptionFeatureEnabled === apmFlags.isNativeInterceptionFeatureEnabled &&
+    flags.shouldEnableNativeInterception === apmFlags.shouldEnableNativeInterception
   ) {
     return false;
   }
@@ -188,9 +188,9 @@ export const reportNetworkLog = (network: NetworkData) => {
     );
 
     if (
-      (!apmFlags.isNativeInterceptionEnabled ||
+      (!apmFlags.isNativeInterceptionFeatureEnabled ||
         !apmFlags.hasAPMNetworkPlugin ||
-        !apmFlags.disableAPMLogging) &&
+        !apmFlags.shouldEnableNativeInterception) &&
       apmFlags.isAPMNetworkEnabled
     ) {
       console.log('Andrew: ' + 'NetworkLogger -> NativeAPM.networkLogAndroid');
@@ -216,7 +216,7 @@ export const reportNetworkLog = (network: NetworkData) => {
   } else {
     console.log(
       'Andrew: ' +
-        `NetworkLogger -> {isNativeInterceptionEnabled: ${apmFlags.isNativeInterceptionEnabled}}`,
+        `NetworkLogger -> {isNativeInterceptionEnabled: ${apmFlags.isNativeInterceptionFeatureEnabled}}`,
     );
     console.log('Andrew: ' + 'NetworkLogger -> NativeInstabug.networkLogIOS');