bugsnag · imjoehaines · Feb 22, 2021 · Nov 23, 2020 · Dec 3, 2020 · Dec 18, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## v7.8.0 (2021-02-22)
+
+### Changed
+
+- (react-native): Update bugsnag-cocoa to v6.6.3
+  - Improve performance of thread recording for handled errors [bugsnag-cocoa#992](https://github.com/bugsnag/bugsnag-cocoa/pull/992)
+  - Stop Bugsnag unregistering other signal handlers when catching a mach exception [bugsnag-cocoa#976](https://github.com/bugsnag/bugsnag-cocoa/pull/976)/[bugsnag-cocoa#1002](https://github.com/bugsnag/bugsnag-cocoa/pull/1002)
+  - Fix a tvOS file permission error that was introduced in 6.5.1 [bugsnag-cocoa#996](https://github.com/bugsnag/bugsnag-cocoa/pull/996)
+  - Fix an analyzer warning [bugsnag-cocoa#994](https://github.com/bugsnag/bugsnag-cocoa/pull/994)
+
+### Added
+
+- (react-native): Capture additional native stack for native promise rejections [#1253](https://github.com/bugsnag/bugsnag-js/pull/1253)
+
 ## v7.7.0 (2021-02-15)
 
 ### Changed

diff --git a/TESTING.md b/TESTING.md
@@ -260,7 +260,7 @@ The CLI tests target the command line interface by providing a set of responses
 1. Run `npm pack packages/react-native-cli/` to pack the react-native-cli package
 1. Copy the resulting package, `bugsnag-react-native-cli-{VERSION}.tgz` into the target fixture, e.g.:
     ```shell script
-    cp bugsnag-react-native-cli-*.tgz tests/react-native-cli/features/fixtures/rn0_60/
+    cp bugsnag-react-native-cli-*.tgz test/react-native-cli/features/fixtures/rn0_60/
     ```
 
 ##### Running

diff --git a/packages/delivery-react-native/delivery.js b/packages/delivery-react-native/delivery.js
@@ -1,14 +1,14 @@
 module.exports = (client, NativeClient) => ({
   sendEvent: (payload, cb = () => {}) => {
     const event = payload.events[0]
-    // let nativeStack
-    // if (event.originalError) {
-    //   if (event.originalError.nativeStackIOS) {
-    //     nativeStack = event.originalError.nativeStackIOS
-    //   } else if (event.originalError.nativeStackAndroid) {
-    //     nativeStack = event.originalError.nativeStackAndroid
-    //   }
-    // }
+    let nativeStack
+    if (event.originalError) {
+      if (event.originalError.nativeStackIOS) {
+        nativeStack = event.originalError.nativeStackIOS
+      } else if (event.originalError.nativeStackAndroid) {
+        nativeStack = event.originalError.nativeStackAndroid
+      }
+    }
     NativeClient.dispatch({
       errors: event.errors,
       severity: event.severity,
@@ -22,8 +22,8 @@ module.exports = (client, NativeClient) => ({
       user: event._user,
       metadata: event._metadata,
       groupingHash: event.groupingHash,
-      apiKey: event.apiKey//,
-      // nativeStack: nativeStack
+      apiKey: event.apiKey,
+      nativeStack: nativeStack
     }).then(() => cb()).catch(cb)
   },
   sendSession: () => {

diff --git a/packages/node/test/integration/handled-unhandled.test.ts b/packages/node/test/integration/handled-unhandled.test.ts
@@ -69,7 +69,7 @@ describe('@bugsnag/node: handled and unhandled errors', () => {
       expect(https._requests[0].body.events[0].unhandled).toBe(true)
       expect(https._requests[0].body.events[0].severityReason).toEqual({ type: 'unhandledException' })
       done()
-    }, 100)
+    }, 200)
   })
 
   it('should send an unhandled rejection', (done) => {
@@ -84,6 +84,6 @@ describe('@bugsnag/node: handled and unhandled errors', () => {
       expect(https._requests[0].body.events[0].unhandled).toBe(true)
       expect(https._requests[0].body.events[0].severityReason).toEqual({ type: 'unhandledPromiseRejection' })
       done()
-    }, 100)
+    }, 200)
   })
 })
diff --git a/packages/react-native-cli/package-lock.json b/packages/react-native-cli/package-lock.json
diff --git a/packages/react-native-cli/package.json b/packages/react-native-cli/package.json
@@ -31,6 +31,7 @@
   "devDependencies": {
     "@types/command-line-args": "^5.0.0",
     "@types/command-line-usage": "^5.0.1",
-    "@types/prompts": "^2.0.9"
+    "@types/prompts": "^2.0.9",
+    "typescript": "^4.1.3"
   }
 }
diff --git a/packages/react-native-cli/src/lib/Xcode.ts b/packages/react-native-cli/src/lib/Xcode.ts
@@ -7,11 +7,11 @@ const DOCS_LINK = 'https://docs.bugsnag.com/platforms/react-native/react-native/
 const UNLOCATED_PROJ_MSG = `The Xcode project was not in the expected location and so couldn't be updated automatically.
 
 Update the "Bundle React Native Code And Images" build phase with the following environment variables:
-export EXTRA_PACKAGER_ARGS="--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map"
+export EXTRA_PACKAGER_ARGS="--sourcemap-output $TMPDIR/$(md5 -qs "$CONFIGURATION_BUILD_DIR")-main.jsbundle.map""
 
 See ${DOCS_LINK} for more information`
 
-const EXTRA_PACKAGER_ARGS = 'export EXTRA_PACKAGER_ARGS="--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map"'
+const EXTRA_PACKAGER_ARGS = 'export EXTRA_PACKAGER_ARGS="--sourcemap-output $TMPDIR/$(md5 -qs "$CONFIGURATION_BUILD_DIR")-main.jsbundle.map"'
 
 export async function updateXcodeProject (projectRoot: string, endpoint: string|undefined, logger: Logger) {
   const iosDir = path.join(projectRoot, 'ios')
@@ -25,7 +25,7 @@ export async function updateXcodeProject (projectRoot: string, endpoint: string|
   const pbxProjPath = path.join(iosDir, xcodeprojDir, 'project.pbxproj')
   const proj = xcode.project(pbxProjPath)
 
-  await new Promise((resolve, reject) => {
+  await new Promise<void>((resolve, reject) => {
     proj.parse((err) => {
       if (err) return reject(err)
       resolve()
@@ -76,7 +76,7 @@ async function addUploadSourceMapsTask (
     }
   }
 
-  let shellScript = '../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh'
+  let shellScript = 'SOURCE_MAP="$TMPDIR/$(md5 -qs "$CONFIGURATION_BUILD_DIR")-main.jsbundle.map" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh'
 
   if (endpoint) {
     shellScript = `export ENDPOINT='${endpoint}'\\n${shellScript}`

diff --git a/packages/react-native-cli/src/lib/__test__/fixtures/project-after-with-endpoint.pbxproj b/packages/react-native-cli/src/lib/__test__/fixtures/project-after-with-endpoint.pbxproj
@@ -376,7 +376,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
 		2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -390,7 +390,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
 		3EBDF05F265B984FA826288C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -566,7 +566,7 @@
 			outputPaths = (
 			);
 			shellPath = /bin/sh;
-			shellScript = "export ENDPOINT='https://upload.example.com'\n../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh";
+			shellScript = "export ENDPOINT='https://upload.example.com'\nSOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/packages/react-native-cli/src/lib/__test__/fixtures/project-after.pbxproj b/packages/react-native-cli/src/lib/__test__/fixtures/project-after.pbxproj
@@ -376,7 +376,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
 		2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -390,7 +390,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
 		3EBDF05F265B984FA826288C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -566,7 +566,7 @@
 			outputPaths = (
 			);
 			shellPath = /bin/sh;
-			shellScript = "../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh";
+			shellScript = "SOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/packages/react-native/bugsnag-react-native-xcode.sh b/packages/react-native/bugsnag-react-native-xcode.sh
@@ -23,9 +23,12 @@ if [ ! -f "$BUNDLE_FILE" ]; then
   exit 0
 fi
 
-MAP_FILE="$BUNDLE_FILE.map"
-if [ ! -f "$MAP_FILE" ]; then
-  echo "Error: Source map main.jsbundle.map could not be found."
+if [ -z "$SOURCE_MAP" ]; then
+  echo "Warning: SOURCE_MAP was not specified, falling back to $BUNDLE_FILE.map"
+  SOURCE_MAP="$BUNDLE_FILE.map"
+fi
+if [ ! -f "$SOURCE_MAP" ]; then
+  echo "Error: SOURCE_MAP $SOURCE_MAP could not be found."
   echo "Ensure the --sourcemap-output option is passed to the react-native bundle command."
   exit 1
 fi
@@ -39,7 +42,7 @@ ARGS=(
     "--app-version" "$APP_VERSION"
     "--bundle" "$BUNDLE_FILE"
     "--platform" "ios"
-    "--source-map" "$MAP_FILE"
+    "--source-map" "$SOURCE_MAP"
     "--project-root" "$PROJECT_ROOT"
     )
 

diff --git a/packages/react-native/ios/.bugsnag-cocoa-version b/packages/react-native/ios/.bugsnag-cocoa-version
@@ -1 +1 @@
-be6136cc119a0fdb725243859d6808102aebe1e4
+e74e2b3632a43406e49304f2cf1b2221a4313401
diff --git a/packages/react-native/ios/BugsnagReactNative/BugsnagEventDeserializer.m b/packages/react-native/ios/BugsnagReactNative/BugsnagEventDeserializer.m
@@ -17,6 +17,7 @@
 #import "BugsnagEvent+Private.h"
 #import "BugsnagHandledState.h"
 #import "BugsnagSessionTracker+Private.h"
+#import "BugsnagStackframe+Private.h"
 #import "BugsnagStacktrace.h"
 #import "BugsnagThread+Private.h"
 #import "BugsnagUser+Private.h"
@@ -52,23 +53,20 @@ - (BugsnagEvent *)deserializeEvent:(NSDictionary *)payload {
     if (error != nil) {
         event.errors[0].errorClass = error[@"errorClass"];
         event.errors[0].errorMessage = error[@"errorMessage"];
-        [event attachCustomStacktrace:error[@"stacktrace"] withType:@"reactnativejs"];
-    }
-
-    id nativeStack = payload[@"nativeStack"];
-    if ([nativeStack isKindOfClass:[NSArray class]] &&
-        [nativeStack filteredArrayUsingPredicate:
-         [NSPredicate predicateWithFormat:@"NOT SELF isKindOfClass: %@", [NSString class]]].count == 0) {
-        NSArray<BugsnagStackframe *> *stackframes = [BugsnagStackframe stackframesWithCallStackSymbols:nativeStack];
-        if (stackframes != nil) {
-            BugsnagError *nativeError = [[BugsnagError alloc] initWithErrorClass:error[@"errorClass"]
-                                                                    errorMessage:error[@"errorMessage"]
-                                                                       errorType:BSGErrorTypeCocoa
-                                                                      stacktrace:stackframes];
-            event.errors = [event.errors arrayByAddingObject:nativeError];
+        NSArray<NSDictionary *> *stacktrace = error[@"stacktrace"];
+        NSArray<NSString *> *nativeStack = payload[@"nativeStack"];
+        if (nativeStack) {
+            NSMutableArray<NSDictionary *> *mixedStack = [NSMutableArray array];
+            for (BugsnagStackframe *frame in [BugsnagStackframe stackframesWithCallStackSymbols:nativeStack]) {
+                frame.type = BugsnagStackframeTypeCocoa;
+                [mixedStack addObject:[frame toDictionary]];
+            }
+            [mixedStack addObjectsFromArray:stacktrace];
+            stacktrace = mixedStack;
         }
+        [event attachCustomStacktrace:stacktrace withType:@"reactnativejs"];
     }
-    
+
     return event;
 }
 

diff --git a/packages/react-native/ios/vendor/bugsnag-cocoa/Bugsnag.podspec.json b/packages/react-native/ios/vendor/bugsnag-cocoa/Bugsnag.podspec.json
@@ -1,6 +1,6 @@
 {
   "name": "Bugsnag",
-  "version": "6.6.1",
+  "version": "6.6.3",
   "summary": "The Bugsnag crash reporting framework for Apple platforms.",
   "homepage": "https://bugsnag.com",
   "license": "MIT",
@@ -9,7 +9,7 @@
   },
   "source": {
     "git": "https://github.com/bugsnag/bugsnag-cocoa.git",
-    "tag": "v6.6.1"
+    "tag": "v6.6.3"
   },
   "frameworks": [
     "Foundation",