fix: major update of the android sdk

Use latest
Catch JS stack when a native exception is catched on the java side

Author: farfromrefug

plugin/platforms/android/include.gradle

@@ -1,14 +1,4 @@
 
 dependencies {
-    compile 'org.slf4j:slf4j-nop:1.7.25'
-    implementation 'io.sentry:sentry-android:1.7.29'
+    api 'io.sentry:sentry-android:2.1.0-alpha.1'
 }
-
-android.applicationVariants.all { variant ->
-  if (variant.buildType.name == 'release') {
-      variant.mergeAssets.doLast {
-          println("deleting source map files from variant")
-          delete(fileTree(dir: variant.mergeAssets.outputDir, includes: ['**/*.map']))
-      }
-  }
-}

src/backend.ts

@@ -33,11 +33,14 @@ export interface NativescriptOptions extends BrowserOptions {
     shutdownTimeout?: number;
 
     /** Should the native nagger alert be shown or not. */
-    enableNativeNagger?: boolean;
+    // enableNativeNagger?: boolean;
     /**
      * Optional prefix to add while rewriting frames
      */
     appPrefix?: string;
+
+    traceErrorHandler?: boolean;
+    uncaughtErrors?: boolean;
 }
 
 /** The Sentry Nativescript SDK Backend. */

src/client.ts

@@ -24,7 +24,6 @@ export class NativescriptClient extends BaseClient<NativescriptBackend, Nativesc
      * @inheritDoc
      */
     protected _prepareEvent(event: Event, scope?: Scope, hint?: EventHint): SyncPromise<Event | null> {
-        // console.log('_prepareEvent', hint);
         event.platform = event.platform || 'javascript';
         event.sdk = {
             ...event.sdk,

src/integrations/debugsymbolicator.ts

@@ -33,7 +33,7 @@ type NativescriptError = Error & {
 //   ...
 // };
 
-function parseErrorStack(e: NativescriptError): StackFrame[] {
+export function parseErrorStack(e: NativescriptError): StackFrame[] {
     if (!e || !e.stack) {
         return [];
     }
@@ -47,6 +47,29 @@ function parseErrorStack(e: NativescriptError): StackFrame[] {
         }));
     }
 }
+
+/**
+ * Converts NativescriptFrames to frames in the Sentry format
+ * @param frames NativescriptFrame[]
+ */
+export function convertNativescriptFramesToSentryFrames(frames: NativescriptFrame[]): StackFrame[] {
+    // Below you will find lines marked with :HACK to prevent showing errors in the sentry ui
+    // But since this is a debug only feature: This is Fine (TM)
+    return frames.map(
+        (frame: NativescriptFrame): StackFrame => {
+            const inApp = (frame.file && !frame.file.includes('node_modules')) || (!!frame.column && !!frame.lineNumber);
+            // const inApp =true;
+            return {
+                colno: frame.column,
+                filename: frame.file,
+                function: frame.methodName,
+                in_app: inApp,
+                lineno: inApp ? frame.lineNumber : undefined, // :HACK
+                platform: inApp ? 'javascript' : 'node' // :HACK
+            };
+        }
+    );
+}
 /** Tries to symbolicate the JS stack trace on the device. */
 export class DebugSymbolicator implements Integration {
     /**
@@ -67,7 +90,6 @@ export class DebugSymbolicator implements Integration {
             if (!self || hint === undefined || hint.originalException === undefined) {
                 return event;
             }
-
             const error: NativescriptError = hint.originalException as any;
 
             // const parseErrorStack = require('react-native/Libraries/Core/Devtools/parseErrorStack');
@@ -84,7 +106,7 @@ export class DebugSymbolicator implements Integration {
             //     await self._symbolicate(event, stack);
             // }
             // if (reactError.jsEngine === 'hermes') {
-            const convertedFrames = this._convertNativescriptFramesToSentryFrames(stack as any);
+            const convertedFrames = convertNativescriptFramesToSentryFrames(stack as any);
             this._replaceFramesInEvent(event, convertedFrames);
             // }
 
@@ -114,29 +136,6 @@ export class DebugSymbolicator implements Integration {
         }
     }
 
-    /**
-     * Converts NativescriptFrames to frames in the Sentry format
-     * @param frames NativescriptFrame[]
-     */
-    private _convertNativescriptFramesToSentryFrames(frames: NativescriptFrame[]): StackFrame[] {
-        // Below you will find lines marked with :HACK to prevent showing errors in the sentry ui
-        // But since this is a debug only feature: This is Fine (TM)
-        return frames.map(
-            (frame: NativescriptFrame): StackFrame => {
-                const inApp = (frame.file && !frame.file.includes('node_modules')) || (!!frame.column && !!frame.lineNumber);
-                // const inApp =true;
-                return {
-                    colno: frame.column,
-                    filename: frame.file,
-                    function: frame.methodName,
-                    in_app: inApp,
-                    lineno: inApp ? frame.lineNumber : undefined, // :HACK
-                    platform: inApp ? 'javascript' : 'node' // :HACK
-                };
-            }
-        );
-    }
-
     /**
      * Replaces the frames in the exception of a error.
      * @param event Event

src/integrations/nativescripterrorhandlers.ts

@@ -1,5 +1,6 @@
 import { getCurrentHub } from '@sentry/core';
 import { Integration, Severity } from '@sentry/types';
+import { NSSentry } from '../nssentry';
 import { logger } from '@sentry/utils';
 
 import { NativescriptClient } from '../client';
@@ -8,9 +9,9 @@ import * as application from '@nativescript/core/application';
 import * as trace from '@nativescript/core/trace';
 
 /** NativescriptErrorHandlers Options */
-interface NativescriptErrorHandlersOptions {
-    onerror: boolean;
-    onunhandledrejection: boolean;
+export interface NativescriptErrorHandlersOptions {
+    traceErrorHandler?: boolean;
+    uncaughtErrors?: boolean;
 }
 
 declare const global: any;
@@ -33,8 +34,8 @@ export class NativescriptErrorHandlers implements Integration {
     /** Constructor */
     public constructor(options?: NativescriptErrorHandlersOptions) {
         this._options = {
-            onerror: true,
-            onunhandledrejection: true,
+            traceErrorHandler: false,
+            uncaughtErrors: false,
             ...options
         };
     }
@@ -51,7 +52,7 @@ export class NativescriptErrorHandlers implements Integration {
      * Handle Promises
      */
     private _handleUnhandledRejections(): void {
-        if (this._options.onunhandledrejection) {
+        if (this._options.uncaughtErrors) {
             application.on(application.uncaughtErrorEvent, this.globalHanderEvent, this);
             // const tracking = require('promise/setimmediate/rejection-tracking');
             // tracking.disable();
@@ -97,13 +98,19 @@ export class NativescriptErrorHandlers implements Integration {
             getCurrentHub().captureException(error, {
                 originalException: error
             });
+            // const timeout = client.getOptions().shutdownTimeout || 2000;
+            // NSSentry.flush(timeout);
+            // getCurrentHub()
+            //     .getClient()
+            //     .flush(2000);
         });
 
         const client = getCurrentHub().getClient<NativescriptClient>();
         // If in dev, we call the default handler anyway and hope the error will be sent
         // Just for a better dev experience
         if (client) {
-            (client.flush(client.getOptions().shutdownTimeout || 2000) as any)
+            const timeout = client.getOptions().shutdownTimeout || 2000;
+            (client.flush(timeout) as Promise<any>)
                 .then(() => {
                     // defaultHandler(error, isFatal);
                 })
@@ -120,7 +127,7 @@ export class NativescriptErrorHandlers implements Integration {
      * Handle erros
      */
     private _handleOnError(): void {
-        if (this._options.onerror) {
+        if (this._options.traceErrorHandler) {
             // let handlingFatal = false;
             application.on(application.discardedErrorEvent, this.globalHanderEvent, this);