feat: better error handling

Author: DjDeveloperr

NativeScript/cli/main.cpp

@@ -1,10 +1,10 @@
-#include "ffi/NativeScriptException.h"
 #ifdef ENABLE_JS_RUNTIME
 
 #include <filesystem>
 #include <fstream>
 #include <iostream>
 
+#include "ffi/NativeScriptException.h"
 #include "runtime/Bundle.h"
 #include "runtime/Runtime.h"
 #include "runtime/RuntimeConfig.h"
@@ -31,8 +31,8 @@ void bootFromModuleSpec(std::string baseDir, std::string spec) {
   try {
     runtime.RunModule(spec);
   } catch (const nativescript::NativeScriptException& e) {
-    std::cerr << "Error running module: " << e.Description() << std::endl;
-    return;
+    std::cerr << "Uncaught Exception: " << e.Description() << std::endl;
+    std::exit(1);
   }
 
   runtime.RunLoop();

NativeScript/ffi/CFunction.mm

@@ -1,6 +1,7 @@
 #include "CFunction.h"
 #include "ClassMember.h"
 #include "ObjCBridge.h"
+#include "ffi/NativeScriptException.h"
 
 namespace nativescript {
 
@@ -71,7 +72,15 @@
     }
   }
 
-  ffi_call(&cif->cif, FFI_FN(func->fnptr), rvalue, avalues);
+  @try {
+    ffi_call(&cif->cif, FFI_FN(func->fnptr), rvalue, avalues);
+  } @catch (NSException* exception) {
+    std::string message = exception.description.UTF8String;
+    NSLog(@"ObjC->JS: Exception in CFunction: %s", message.c_str());
+    nativescript::NativeScriptException nativeScriptException(message);
+    nativeScriptException.ReThrowToJS(env);
+    return nullptr;
+  }
 
   if (shouldFreeAny) {
     for (unsigned int i = 0; i < cif->argc; i++) {

NativeScript/ffi/Closure.mm

@@ -8,6 +8,7 @@
 #include "ffi/NativeScriptException.h"
 #include "js_native_api.h"
 #include "js_native_api_types.h"
+#include "jsr.h"
 #include "node_api_util.h"
 #include "objc/message.h"
 
@@ -22,7 +23,9 @@ inline void JSCallbackInner(Closure* closure, napi_value func, napi_value thisAr
                             size_t argc, bool* done, void* ret) {
   napi_env env = closure->env;
 
-  napi_value result;
+  NapiScope scope(env);
+
+      napi_value result;
 
   napi_get_and_clear_last_exception(env, &result);
 

NativeScript/ffi/NativeScriptException.mm

@@ -42,12 +42,7 @@
   }
 }
 
-std::string NativeScriptException::Description() const {
-  std::stringstream ss;
-  ss << "NativeScriptException: " << this->message_ << std::endl;
-  ss << "StackTrace: " << this->stackTrace_ << std::endl;
-  return ss.str();
-}
+std::string NativeScriptException::Description() const { return this->fullMessage_; }
 
 void NativeScriptException::OnUncaughtError(napi_env env, napi_value error) {
   NapiScope scope(env);
@@ -58,8 +53,12 @@
     fullMessageStream << napi_util::get_cxx_string(
         env, napi_util::get_property(env, error, "fullMessage"));
   } else {
+#ifdef TARGET_ENGINE_V8
+    fullMessageStream << GetErrorStackTrace(env, error);
+#else
     fullMessageStream << GetErrorMessage(env, error);
     fullMessageStream << "\n at \n" << GetErrorStackTrace(env, error);
+#endif
   }
 
   // TODO: discardUncaughtJsExceptions
@@ -80,8 +79,12 @@
 
       if (napi_util::is_of_type(env, result, napi_object)) {
         fullMessageStream << "\n\nError handler threw an error too:\n";
+#ifdef TARGET_ENGINE_V8
+        fullMessageStream << GetErrorStackTrace(env, result);
+#else
         fullMessageStream << GetErrorMessage(env, result);
         fullMessageStream << "\n at \n" << GetErrorStackTrace(env, result);
+#endif
       } else {
         fullMessageStream
             << "\n\nError handler threw an error too, but we couldn't get the error object";
@@ -91,15 +94,15 @@
 
   std::string fullMessage = fullMessageStream.str();
 
-  NSLog(@"NativeScriptException: %s", fullMessage.c_str());
+  NSLog(@"NativeScriptException::OnUncaughtError: %s", fullMessage.c_str());
 
-  NSException* objcException = [NSException exceptionWithName:@(fullMessage.c_str())
-                                                       reason:nil
+  NSException* objcException = [NSException exceptionWithName:@"NativeScriptException"
+                                                       reason:@(fullMessage.c_str())
                                                      userInfo:@{@"sender" : @"onUncaughtError"}];
 
-  dispatch_async(dispatch_get_main_queue(), ^(void) {
-    @throw objcException;
-  });
+  // dispatch_async(dispatch_get_main_queue(), ^(void) {
+  @throw objcException;
+  // });
 }
 
 void NativeScriptException::ReThrowToJS(napi_env env) {
@@ -204,16 +207,21 @@
     return jsExceptionMessage;
   }
 
+  std::string stackTraceMessage = GetErrorStackTrace(env, error);
+
   std::stringstream ss;
-  ss << jsExceptionMessage;
 
-  std::string stackTraceMessage = GetErrorStackTrace(env, error);
+#ifdef TARGET_ENGINE_V8
+  ss << stackTraceMessage;
+#else
+  ss << jsExceptionMessage;
 
-  ss << std::endl << "StackTrace: " << std::endl << stackTraceMessage << std::endl;
+  ss << std::endl << "StackTrace: " << std::endl << stackTraceMessage;
+#endif
 
   std::string loggedMessage = ss.str();
 
-  PrintErrorMessage(loggedMessage);
+  // PrintErrorMessage(loggedMessage);
 
   return loggedMessage;
 }

NativeScript/runtime/modules/module/ModuleInternal.cpp

@@ -132,7 +132,7 @@ napi_value ModuleInternal::RequireCallback(napi_env env,
     e.ReThrowToJS(env);
   } catch (std::exception& e) {
     stringstream ss;
-    ss << "Error: c++ exception: " << e.what() << endl;
+    ss << "Error: C++ Exception: " << e.what() << endl;
     NativeScriptException nsEx(ss.str());
     nsEx.ReThrowToJS(env);
   } catch (...) {
@@ -147,7 +147,8 @@ napi_value ModuleInternal::Require(napi_env env, const std::string& moduleName,
                                    const std::string& callingModuleDirName) {
   auto isData = false;
 
-  auto moduleObj = LoadImpl(env, moduleName, callingModuleDirName, isData);
+  napi_value moduleObj =
+      LoadImpl(env, moduleName, callingModuleDirName, isData);
 
   if (isData) {
     assert(!napi_util::is_null_or_undefined(env, moduleObj));
@@ -180,7 +181,12 @@ napi_value ModuleInternal::RequireCallbackImpl(napi_env env,
   string moduleName = napi_util::get_cxx_string(env, argv[0]);
   string callingModuleDirName = napi_util::get_cxx_string(env, argv[1]);
 
-  return Require(env, moduleName, callingModuleDirName);
+  try {
+    return Require(env, moduleName, callingModuleDirName);
+  } catch (NativeScriptException& e) {
+    e.ReThrowToJS(env);
+    return nullptr;
+  }
 }
 
 napi_value ModuleInternal::RequireNativeCallback(napi_env env,
@@ -419,8 +425,6 @@ napi_value ModuleInternal::LoadImpl(napi_env env, const std::string& moduleName,
       path = "lib" + moduleName;
     } else if (moduleName.ends_with(".node")) {
       std::string libName = moduleName;
-      // Util::ReplaceAll(libName, ".node", "");
-      // using c++
       libName.replace(libName.find(".node"), 5, "");
       path = "lib" + libName + ".so";
     } else {

cli_tests/error.js

@@ -0,0 +1,48 @@
+const nsStr = NSString.stringWithString("0123");
+
+try {
+  console.log(nsStr.substringFromIndex(5));
+} catch (e) {
+  console.log(e.stack);
+}
+
+// NSOperationQueue.mainQueue.addOperationWithBlock(() => {
+//   console.log("Hello, World! from main queue");
+
+//   throw new Error("JavaScript error from block");
+// });
+
+// NSTimer.scheduledTimerWithTimeIntervalRepeatsBlock(
+//   1,
+//   false,
+//   () => {
+//     console.log("Hello, World! from timer");
+//     throw new Error("JavaScript error from timer");
+//   },
+// );
+
+// class ApplicationDelegate extends NSObject {
+//   static ObjCProtocols = [NSApplicationDelegate];
+
+//   static {
+//     NativeClass(this);
+//   }
+
+//   applicationDidFinishLaunching(_notification) {
+//     console.log("Hello, World! from applicationDidFinishLaunching");
+//     throw new Error("JavaScript error from applicationDidFinishLaunching");
+//   }
+// }
+
+// const appDelegate = ApplicationDelegate.new();
+// const app = NSApplication.sharedApplication;
+// app.delegate = appDelegate;
+// app.setActivationPolicy(NSApplicationActivationPolicy.Regular);
+
+// NSApplicationMain(0, null);
+
+// const arr = NSArray.arrayWithArray([1, 2, 3]);
+
+// arr.enumerateObjectsUsingBlock((_obj, _idx, _stop) => {
+//   throw new Error("JavaScript error from block");
+// });