Merge branch 'master' into vmutafov/sbg-interfaces-handling-fix

vtrifonov · web-flow · commit dd4482bccad4 · 2019-01-08T18:58:59.000+02:00
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2015-2018 Progress Software Corporation
+   Copyright (c) 2015-2019 Progress Software Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test-app/app/src/main/assets/app/mainpage.js b/test-app/app/src/main/assets/app/mainpage.js
@@ -34,6 +34,7 @@ require("./tests/testPrimitiveTypeConversion");
 require("./tests/numericConversionTests");
 require("./tests/inheritanceChainResolutionTest");
 require("./tests/exceptionHandlingTests");
+require("./tests/discardedExceptionsTest");
 require("./tests/dispatchCallbacksOnUiThreadTests");
 require("./tests/stringConversionTests");
 require("./tests/testsForTypescript");
diff --git a/test-app/app/src/main/assets/app/tests/discardedExceptionsTest.js b/test-app/app/src/main/assets/app/tests/discardedExceptionsTest.js
@@ -0,0 +1,27 @@
+describe("Tests discarded exception ", function () {
+    var originalOnDiscardedError = null;
+
+    beforeEach(function() {
+      originalOnDiscardedError = global.__onDiscardedError;
+    });
+
+    it("should report discarded exception", function () {
+        var reportedException = null;
+
+        global.__onDiscardedError = (error) => {
+            reportedException = error;
+        }
+
+        var test = new com.tns.tests.DiscardedExceptionTest();
+        test.reportSupressedException();
+
+        expect(reportedException).not.toBe(null);
+        expect(reportedException.nativeException).not.toBe(null);
+        expect(reportedException.nativeException.getMessage()).toBe('Exception to suppress');
+        expect(reportedException.stackTrace).toContain('Error on "main" thread for reportSupressedException');
+    });
+
+    afterEach(function() {
+      global.__onDiscardedError = originalOnDiscardedError;
+    });
+});
diff --git a/test-app/app/src/main/java/com/tns/NativeScriptUncaughtExceptionHandler.java b/test-app/app/src/main/java/com/tns/NativeScriptUncaughtExceptionHandler.java
@@ -21,7 +21,7 @@ public NativeScriptUncaughtExceptionHandler(Logger logger, Context context) {
     public void uncaughtException(Thread thread, Throwable ex) {
         String currentThreadMessage = "An uncaught Exception occurred on \"" + thread.getName() + "\" thread.\n";
 
-        String errorMessage = currentThreadMessage + getErrorMessage(ex);
+        String errorMessage = currentThreadMessage + Runtime.getStackTraceErrorMessage(ex);
 
         if (Runtime.isInitialized()) {
             try {
@@ -64,27 +64,4 @@ public void uncaughtException(Thread thread, Throwable ex) {
             defaultHandler.uncaughtException(thread, ex);
         }
     }
-
-    private static String getErrorMessage(Throwable ex) {
-        String content;
-        java.io.PrintStream ps = null;
-
-        try {
-            java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
-            ps = new java.io.PrintStream(baos);
-            ex.printStackTrace(ps);
-
-            try {
-                content = baos.toString("US-ASCII");
-            } catch (java.io.UnsupportedEncodingException e) {
-                content = e.getMessage();
-            }
-        } finally {
-            if (ps != null) {
-                ps.close();
-            }
-        }
-
-        return content;
-    }
 }
diff --git a/test-app/app/src/main/java/com/tns/tests/DiscardedExceptionTest.java b/test-app/app/src/main/java/com/tns/tests/DiscardedExceptionTest.java
@@ -0,0 +1,11 @@
+package com.tns.tests;
+
+public class DiscardedExceptionTest {
+    public void reportSupressedException() {
+        try {
+            throw new Exception("Exception to suppress");
+        } catch (Throwable ex) {
+            com.tns.Runtime.passSuppressedExceptionToJs(ex, "reportSupressedException");
+        }
+    }
+}
diff --git a/test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java b/test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java
@@ -660,7 +660,8 @@ private void writeMethodBody(Method m, boolean isConstructor, boolean isApplicat
 
         if (this.suppressCallJSMethodExceptions) {
             w.writeln("\t\t} catch (Throwable t) {");
-            w.writeln("\t\t\tandroid.util.Log.w(\"Error\", t);");
+            w.writeln("\t\t\tcom.tns.Runtime.passSuppressedExceptionToJs(t, \"" + m.getName() + "\");");
+            w.writeln("\t\t\tandroid.util.Log.w(\"Warning\", \"NativeScript discarding uncaught JS exception!\");");
             if (!ret.equals(Type.VOID)) {
                 w.write("\t\t\t");
                 w.write("return ");
diff --git a/test-app/runtime/src/main/cpp/NativeScriptException.cpp b/test-app/runtime/src/main/cpp/NativeScriptException.cpp
@@ -133,14 +133,15 @@ void NativeScriptException::OnUncaughtError(Local<Message> message, Local<Value>
     e.ReThrowToJava();
 }
 
-void NativeScriptException::CallJsFuncWithErr(Local<Value> errObj) {
+void NativeScriptException::CallJsFuncWithErr(Local<Value> errObj, jboolean isDiscarded) {
     auto isolate = Isolate::GetCurrent();
     HandleScope scope(isolate);
 
     auto context = isolate->GetCurrentContext();
     auto globalHandle = context->Global();
 
-    auto handler = globalHandle->Get(V8StringConstants::GetUncaughtError(isolate));
+    auto handler = isDiscarded ?
+       globalHandle->Get(V8StringConstants::GetDiscardedError(isolate)) : globalHandle->Get(V8StringConstants::GetUncaughtError(isolate));
     auto isEmpty = handler.IsEmpty();
     auto isFunction = handler->IsFunction();
 
diff --git a/test-app/runtime/src/main/cpp/NativeScriptException.h b/test-app/runtime/src/main/cpp/NativeScriptException.h
@@ -36,9 +36,9 @@ class NativeScriptException {
         static void OnUncaughtError(v8::Local<v8::Message> message, v8::Local<v8::Value> error);
 
         /*
-         * Calls the global "__onUncaughtError" if such is provided
+         * Calls the global "__onUncaughtError" or "__onDiscardedError" if such is provided
          */
-        static void CallJsFuncWithErr(v8::Local<v8::Value> errObj);
+        static void CallJsFuncWithErr(v8::Local<v8::Value> errObj, jboolean isDiscarded);
 
     private:
         /*
diff --git a/test-app/runtime/src/main/cpp/Runtime.cpp b/test-app/runtime/src/main/cpp/Runtime.cpp
@@ -371,11 +371,13 @@ bool Runtime::TryCallGC() {
     return success;
 }
 
-void Runtime::PassUncaughtExceptionToJsNative(JNIEnv* env, jobject obj, jthrowable exception, jstring stackTrace) {
+void Runtime::PassExceptionToJsNative(JNIEnv* env, jobject obj, jthrowable exception, jstring stackTrace, jboolean isDiscarded) {
     auto isolate = m_isolate;
 
     //create error message
-    string errMsg = "The application crashed because of an uncaught exception. You can look at \"stackTrace\" or \"nativeException\" for more detailed information about the exception.";
+    string errMsg = isDiscarded ? "An exception was caught and discarded. You can look at \"stackTrace\" or \"nativeException\" for more detailed information about the exception.":
+        "The application crashed because of an uncaught exception. You can look at \"stackTrace\" or \"nativeException\" for more detailed information about the exception.";
+
     auto errObj = Exception::Error(ArgConverter::ConvertToV8String(isolate, errMsg)).As<Object>();
 
     //create a new native exception js object
@@ -399,7 +401,7 @@ void Runtime::PassUncaughtExceptionToJsNative(JNIEnv* env, jobject obj, jthrowab
     errObj->Set(V8StringConstants::GetStackTrace(isolate), ArgConverter::jstringToV8String(isolate, stackTrace));
 
     //pass err to JS
-    NativeScriptException::CallJsFuncWithErr(errObj);
+    NativeScriptException::CallJsFuncWithErr(errObj, isDiscarded);
 }
 
 void Runtime::PassUncaughtExceptionFromWorkerToMainHandler(Local<v8::String> message, Local<v8::String> stackTrace, Local<v8::String> filename, int lineno) {
diff --git a/test-app/runtime/src/main/cpp/Runtime.h b/test-app/runtime/src/main/cpp/Runtime.h
@@ -52,7 +52,7 @@ class Runtime {
         void AdjustAmountOfExternalAllocatedMemory();
         bool NotifyGC(JNIEnv* env, jobject obj);
         bool TryCallGC();
-        void PassUncaughtExceptionToJsNative(JNIEnv* env, jobject obj, jthrowable exception, jstring stackTrace);
+        void PassExceptionToJsNative(JNIEnv* env, jobject obj, jthrowable exception, jstring stackTrace, jboolean isDiscarded);
         void PassUncaughtExceptionFromWorkerToMainHandler(v8::Local<v8::String> message, v8::Local<v8::String> stackTrace, v8::Local<v8::String> filename, int lineno);
         void ClearStartupData(JNIEnv* env, jobject obj);
         void DestroyRuntime();
diff --git a/test-app/runtime/src/main/cpp/V8StringConstants.cpp b/test-app/runtime/src/main/cpp/V8StringConstants.cpp
@@ -111,6 +111,12 @@ Local<String> V8StringConstants::GetUncaughtError(Isolate* isolate) {
     return Local<String>::New(isolate, *consts->UNCAUGHT_ERROR_PERSISTENT);
 }
 
+Local<String> V8StringConstants::GetDiscardedError(Isolate* isolate) {
+    auto consts = GetConstantsForIsolate(isolate);
+
+    return Local<String>::New(isolate, *consts->DISCARDED_ERROR_PERSISTENT);
+}
+
 Local<String> V8StringConstants::GetImplementationObject(Isolate* isolate) {
     auto consts = GetConstantsForIsolate(isolate);
 
@@ -133,5 +139,6 @@ const string V8StringConstants::JAVA_LONG = "t::JavaLong";
 const string V8StringConstants::VALUE = "value";
 const string V8StringConstants::VALUE_OF = "valueOf";
 const string V8StringConstants::UNCAUGHT_ERROR = "__onUncaughtError";
+const string V8StringConstants::DISCARDED_ERROR = "__onDiscardedError";
 const string V8StringConstants::IMPLEMENTATION_OBJECT = "t::implObj";
 }
diff --git a/test-app/runtime/src/main/cpp/V8StringConstants.h b/test-app/runtime/src/main/cpp/V8StringConstants.h
@@ -41,6 +41,8 @@ class V8StringConstants {
 
         static v8::Local<v8::String> GetUncaughtError(v8::Isolate* isolate);
 
+        static v8::Local<v8::String> GetDiscardedError(v8::Isolate* isolate);
+
         static v8::Local<v8::String> GetImplementationObject(v8::Isolate* isolate);
 
         static const std::string CLASS_IMPLEMENTATION_OBJECT;
@@ -60,6 +62,7 @@ class V8StringConstants {
         static const std::string VALUE_OF;
         static const std::string VALUE;
         static const std::string UNCAUGHT_ERROR;
+        static const std::string DISCARDED_ERROR;
         static const std::string IMPLEMENTATION_OBJECT;
 
         /*
@@ -133,6 +136,9 @@ class V8StringConstants {
                 str = String::NewFromUtf8(isolate, UNCAUGHT_ERROR.c_str());
                 UNCAUGHT_ERROR_PERSISTENT = new Persistent<String>(isolate, str);
 
+                str = String::NewFromUtf8(isolate, DISCARDED_ERROR.c_str());
+                DISCARDED_ERROR_PERSISTENT = new Persistent<String>(isolate, str);
+
                 str = String::NewFromUtf8(isolate, IMPLEMENTATION_OBJECT.c_str());
                 IMPLEMENTATION_OBJECT_PERSISTENT = new Persistent<String>(isolate, str);
             };
@@ -175,6 +181,7 @@ class V8StringConstants {
             v8::Persistent<v8::String>* VALUE_OF_PERSISTENT;
             v8::Persistent<v8::String>* VALUE_PERSISTENT;
             v8::Persistent<v8::String>* UNCAUGHT_ERROR_PERSISTENT;
+            v8::Persistent<v8::String>* DISCARDED_ERROR_PERSISTENT;
             v8::Persistent<v8::String>* IMPLEMENTATION_OBJECT_PERSISTENT;
         };
 
diff --git a/test-app/runtime/src/main/cpp/com_tns_Runtime.cpp b/test-app/runtime/src/main/cpp/com_tns_Runtime.cpp
@@ -245,7 +245,7 @@ extern "C" JNIEXPORT void Java_com_tns_Runtime_unlock(JNIEnv* env, jobject obj,
     }
 }
 
-extern "C" JNIEXPORT void Java_com_tns_Runtime_passUncaughtExceptionToJsNative(JNIEnv* env, jobject obj, jint runtimeId, jthrowable exception, jstring stackTrace) {
+extern "C" JNIEXPORT void Java_com_tns_Runtime_passExceptionToJsNative(JNIEnv* env, jobject obj, jint runtimeId, jthrowable exception, jstring stackTrace, jboolean isDiscarded) {
     auto runtime = TryGetRuntime(runtimeId);
     if (runtime == nullptr) {
         return;
@@ -256,7 +256,7 @@ extern "C" JNIEXPORT void Java_com_tns_Runtime_passUncaughtExceptionToJsNative(J
     v8::HandleScope handleScope(isolate);
 
     try {
-        runtime->PassUncaughtExceptionToJsNative(env, obj, exception, stackTrace);
+        runtime->PassExceptionToJsNative(env, obj, exception, stackTrace, isDiscarded);
     } catch (NativeScriptException& e) {
         e.ReThrowToJava();
     } catch (std::exception e) {
diff --git a/test-app/runtime/src/main/java/com/tns/Runtime.java b/test-app/runtime/src/main/java/com/tns/Runtime.java
@@ -51,7 +51,7 @@ private native void initNativeScript(int runtimeId, String filesPath, String nat
     private native void lock(int runtimeId);
     private native void unlock(int runtimeId);
 
-    private native void passUncaughtExceptionToJsNative(int runtimeId, Throwable ex, String stackTrace);
+    private native void passExceptionToJsNative(int runtimeId, Throwable ex, String stackTrace, boolean isDiscarded);
 
     private native void clearStartupData(int runtimeId);
 
@@ -72,7 +72,20 @@ private native void initNativeScript(int runtimeId, String filesPath, String nat
     private static native void ResetDateTimeConfigurationCache(int runtimeId);
 
     void passUncaughtExceptionToJs(Throwable ex, String stackTrace) {
-        passUncaughtExceptionToJsNative(getRuntimeId(), ex, stackTrace);
+        passExceptionToJsNative(getRuntimeId(), ex, stackTrace, false);
+    }
+
+    void passDiscardedExceptionToJs(Throwable ex, String message) {
+        String stackTrace = message + Runtime.getStackTraceErrorMessage(ex);
+        passExceptionToJsNative(getRuntimeId(), ex, stackTrace, true);
+    }
+
+    public static void passSuppressedExceptionToJs(Throwable ex, String methodName) {
+        com.tns.Runtime runtime = com.tns.Runtime.getCurrentRuntime();
+        if (runtime != null) {
+            String errorMessage = "Error on \"" + Thread.currentThread().getName() + "\" thread for " + methodName + "\n";
+            runtime.passDiscardedExceptionToJs(ex, errorMessage);
+        }
     }
 
     private boolean initialized;
@@ -211,6 +224,29 @@ private static Runtime getObjectRuntime(Object object) {
         return runtime;
     }
 
+    public static String getStackTraceErrorMessage(Throwable ex) {
+        String content;
+        java.io.PrintStream ps = null;
+
+        try {
+            java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
+            ps = new java.io.PrintStream(baos);
+            ex.printStackTrace(ps);
+
+            try {
+                content = baos.toString("US-ASCII");
+            } catch (java.io.UnsupportedEncodingException e) {
+                content = e.getMessage();
+            }
+        } finally {
+            if (ps != null) {
+                ps.close();
+            }
+        }
+
+        return content;
+    }
+
     public DynamicConfiguration getDynamicConfig() {
         return dynamicConfig;
     }
@@ -1120,8 +1156,9 @@ private Object dispatchCallJSMethodNative(final int javaObjectID, final String m
                 ret = callJSMethodNative(getRuntimeId(), javaObjectID, methodName, returnType, isConstructor, packagedArgs);
             } catch (NativeScriptException e) {
                 if(discardUncaughtJsExceptions) {
-                    logger.write("Error on currentThread for callJSMethodNative:", e.getMessage());
-                    e.printStackTrace();
+                    String errorMessage = "Error on \"" + Thread.currentThread().getName() + "\" thread for callJSMethodNative\n";
+                    android.util.Log.w("Warning", "NativeScript discarding uncaught JS exception!");
+                    passDiscardedExceptionToJs(e, errorMessage);
                 } else {
                     throw e;
                 }
@@ -1140,8 +1177,9 @@ public void run() {
                             arr[0] = callJSMethodNative(getRuntimeId(), javaObjectID, methodName, returnType, isCtor, packagedArgs);
                         } catch (NativeScriptException e) {
                             if(discardUncaughtJsExceptions) {
-                                logger.write("Error off currentThread for callJSMethodNative:", e.getMessage());
-                                e.printStackTrace();
+                                String errorMessage = "Error on \"" + Thread.currentThread().getName() + "\" thread for callJSMethodNative\n";
+                                passDiscardedExceptionToJs(e, errorMessage);
+                                android.util.Log.w("Warning", "NativeScript discarding uncaught JS exception!");
                             } else {
                                 throw e;
                             }
