Merge pull request #615 from Instabug/release/10.8.1

Author: bsameh-at-instabug

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v10.8.1 (2021-08-25)
+
+* Fixes a crash that occurs with network requests on slow network connectivity in v10.8
+* Fixes an issue with parseErrorStack whose signature was changed on RN 0.64
+
 ## v10.8.0 (2021-08-04)
 
 * Bumps Instabug native SDKs to v10.8

InstabugSample/ios/Podfile

@@ -28,6 +28,12 @@ target 'InstabugSample' do
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
+  post_install do |installer|
+      ## Fix for XCode 12.5 beta
+      find_and_replace("../node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm",
+      "_initializeModules:(NSArray<id<RCTBridgeModule>> *)modules", "_initializeModules:(NSArray<Class> *)modules")
+  end
+  
   target 'InstabugSampleTests' do
     inherit! :search_paths
     # Pods for testing
@@ -36,3 +42,17 @@ target 'InstabugSample' do
 
   use_native_modules!
 end
+
+def find_and_replace(dir, findstr, replacestr)
+  Dir[dir].each do |name|
+      text = File.read(name)
+      replace = text.gsub(findstr,replacestr)
+      if text != replace
+          puts "Fix: " + name
+          File.open(name, "w") { |file| file.puts replace }
+          STDOUT.flush
+      end
+  end
+  Dir[dir + '*/'].each(&method(:find_and_replace))
+end
+

__tests__/crashReporting.spec.js

@@ -44,7 +44,6 @@ describe('CrashReporting Module', () => {
     it('should call the native method sendHandledJSCrash when platform is ios', () => {
 
         Platform.OS = 'ios';
-        InstabugUtils.parseErrorStack.mockImplementation(() => 'javascriptStackTrace');
         const errorObject = { name: 'TypeError', message: 'Invalid type' };
         CrashReporting.reportJSException(errorObject);
 
@@ -62,7 +61,6 @@ describe('CrashReporting Module', () => {
     it('should call the native method sendHandledJSCrash when platform is android', () => {
 
         Platform.OS = 'android';
-        InstabugUtils.parseErrorStack.mockImplementation(() => 'javascriptStackTrace');
         const errorObject = { name: 'TypeError', message: 'Invalid type' };
         CrashReporting.reportJSException(errorObject);
 
@@ -81,7 +79,6 @@ describe('CrashReporting Module', () => {
     it('should emit event IBGSendHandledJSCrash with the error object when platform is android', (done) => {
 
         Platform.OS = 'android';
-        InstabugUtils.parseErrorStack.mockImplementation(() => 'javascriptStackTrace');
         InstabugUtils.isOnReportHandlerSet.mockImplementation(() => true);
 
         const errorObject = { name: 'TypeError', message: 'Invalid type' };

jest/mockInstabugUtils.js

@@ -4,6 +4,7 @@ jest.mock('../utils/InstabugUtils', () => {
         captureJsErrors: jest.fn(),
         setOnReportHandler: jest.fn(),
         isOnReportHandlerSet: jest.fn(),
-        getActiveRouteName: jest.fn()
+        getActiveRouteName: jest.fn(),
+        getStackTrace: jest.fn(() => 'javascriptStackTrace')
     }
 });

modules/CrashReporting.js

@@ -24,7 +24,8 @@ export default {
    * @param errorObject Error object to be sent to Instabug's servers
    */
   reportJSException: function(errorObject) {
-    let jsStackTrace = InstabugUtils.parseErrorStack(errorObject);
+    let jsStackTrace = InstabugUtils.getStackTrace(errorObject);
+    
     var jsonObject = {
       message: errorObject.name + ' - ' + errorObject.message,
       os: Platform.OS,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "instabug-reactnative",
-  "version": "10.8.0",
+  "version": "10.8.1",
   "description": "React Native plugin for integrating the Instabug SDK",
   "main": "index.js",
   "types": "index.d.ts",

utils/InstabugUtils.js

@@ -40,6 +40,21 @@ function getFullRoute(state) {
   }
 }
 
+export const getStackTrace = (e) => {
+  let jsStackTrace;
+  if (Platform.hasOwnProperty("constants")) {
+    // RN version >= 0.63
+    if (Platform.constants.reactNativeVersion.minor >= 64)
+      // RN version >= 0.64 -> Stacktrace as string
+      jsStackTrace = parseErrorStackLib(e.stack);
+    // RN version == 0.63 -> Stacktrace as string
+    else jsStackTrace = parseErrorStackLib(e);
+  }
+  // RN version < 0.63 -> Stacktrace as string
+  else jsStackTrace = parseErrorStackLib(e);
+  return jsStackTrace;
+};
+
 export const isOnReportHandlerSet = () => {
   return _isOnReportHandlerSet;
 };
@@ -52,7 +67,7 @@ export const captureJsErrors = () => {
   }
 
   function errorHandler(e, isFatal) {
-    let jsStackTrace = parseErrorStackLib(e);
+    let jsStackTrace = getStackTrace(e);
 
     //JSON object to be sent to the native SDK
     var jsonObject = {
@@ -91,5 +106,6 @@ export default {
   setOnReportHandler,
   isOnReportHandlerSet,
   getActiveRouteName,
-  getFullRoute
+  getFullRoute,
+  getStackTrace,
 };

utils/XhrNetworkInterceptor.js

@@ -111,7 +111,7 @@ const XHRInterceptor = {
                 cloneNetwork.errorCode = 0;
                 cloneNetwork.errorDomain = 'ClientError';
 
-                cloneNetwork.requestBody = this._response;
+                cloneNetwork.requestBody = typeof this._response === "string" ? this._response : JSON.stringify(this._response);
                 cloneNetwork.responseBody = null;
               }
               if (onDoneCallback) {