fixes

Author: DjDeveloperr

NativeScript/ffi/Closure.mm

@@ -25,11 +25,7 @@ inline void JSCallbackInner(Closure* closure, napi_value func, napi_value thisAr
                             size_t argc, bool* done, void* ret) {
   napi_env env = closure->env;
 
-#ifdef ENABLE_JS_RUNTIME
-  NapiScope scope(env);
-#endif
-
-      napi_value result;
+  napi_value result;
 
   napi_get_and_clear_last_exception(env, &result);
 
@@ -69,6 +65,11 @@ inline void JSCallbackInner(Closure* closure, napi_value func, napi_value thisAr
 void JSMethodCallback(ffi_cif* cif, void* ret, void* args[], void* data) {
   Closure* closure = (Closure*)data;
   napi_env env = closure->env;
+
+#ifdef ENABLE_JS_RUNTIME
+  NapiScope scope(env);
+#endif
+
   auto bridgeState = ObjCBridgeState::InstanceData(env);
 
   napi_value constructor = get_ref_value(env, closure->thisConstructor);
@@ -135,6 +136,10 @@ void JSBlockCallback(ffi_cif* cif, void* ret, void* args[], void* data) {
   Closure* closure = (Closure*)data;
   napi_env env = closure->env;
 
+#ifdef ENABLE_JS_RUNTIME
+  NapiScope scope(env);
+#endif
+
   auto currentThreadId = std::this_thread::get_id();
 
   JSBlockCallContext ctx;
@@ -157,7 +162,9 @@ void JSBlockCallback(ffi_cif* cif, void* ret, void* args[], void* data) {
     ctx.cv.wait(lock, [&ctx] { return ctx.done; });
     napi_release_threadsafe_function(closure->tsfn, napi_tsfn_release);
 #else
-    assert(false && "Threadsafe functions are not supported");
+    NSLog(@"Threadsafe functions are not supported");
+    // assert(false && "Threadsafe functions are not supported");
+    Closure::callBlockFromMainThread(env, get_ref_value(env, closure->func), closure, &ctx);
 #endif  // ENABLE_JS_RUNTIME
   }
 }

NativeScript/ffi/TypeConv.mm

@@ -956,7 +956,8 @@ void toNative(napi_env env, napi_value value, void* result, bool* shouldFree,
  public:
   StringTypeConv() { type = &ffi_type_pointer; }
 
-  napi_value toJS(napi_env env, void* value, uint32_t flags) override {
+  napi_value toJS(napi_env env, void* cont, uint32_t flags) override {
+    void *value = *((void**)cont);
     napi_value result;
     napi_create_string_utf8(env, (char*)value, NAPI_AUTO_LENGTH, &result);
     return result;

NativeScript/runtime/modules/console/Console.cpp

@@ -3,6 +3,7 @@
 #include <sstream>
 #include <string>
 
+#include "ffi/NativeScriptException.h"
 #include "js_native_api.h"
 #include "native_api_util.h"
 #include "runtime/RuntimeConfig.h"
@@ -85,34 +86,34 @@ std::string buildStringFromArg(napi_env env, napi_value val) {
     return napi_util::get_string_value(env, funcString);
   } else if (napi_util::is_array(env, val)) {
     napi_value cachedSelf = val;
-    
+
     // Get array length
     uint32_t arrayLength;
     napi_get_array_length(env, val, &arrayLength);
-    
+
     std::stringstream arrayStr;
     arrayStr << "[";
-    
+
     for (uint32_t i = 0; i < arrayLength; i++) {
       napi_value propertyValue;
       napi_get_element(env, val, i, &propertyValue);
-      
+
       // Check for circular reference
       bool isStrictEqual = false;
       napi_strict_equals(env, propertyValue, cachedSelf, &isStrictEqual);
-      
+
       if (isStrictEqual) {
         arrayStr << "[Circular]";
       } else {
         std::string elementString = buildStringFromArg(env, propertyValue);
         arrayStr << elementString;
       }
-      
+
       if (i != arrayLength - 1) {
         arrayStr << ", ";
       }
     }
-    
+
     arrayStr << "]";
     return arrayStr.str();
   } else if (type == napi_object) {
@@ -152,118 +153,122 @@ std::string buildLogString(napi_env env, napi_callback_info info,
 }
 
 JS_METHOD(Console::Log) {
-  if (!RuntimeConfig.LogToSystemConsole) {
-    return UNDEFINED;
-  }
+  try {
+    if (!RuntimeConfig.LogToSystemConsole) {
+      return UNDEFINED;
+    }
 
-  size_t argc = 0;
-  ConsoleLogType stream;
-  void* data = nullptr;
+    size_t argc = 0;
+    ConsoleLogType stream;
+    void* data = nullptr;
 
-  napi_get_cb_info(env, cbinfo, &argc, nullptr, nullptr, &data);
+    napi_get_cb_info(env, cbinfo, &argc, nullptr, nullptr, &data);
 
-  stream = ConsoleLogType((unsigned long)data);
+    stream = ConsoleLogType((unsigned long)data);
 
-  size_t initialArg = 0;
+    size_t initialArg = 0;
 
-  if (stream == kConsoleLogTypeAssert) {
-    bool passes = false;
+    if (stream == kConsoleLogTypeAssert) {
+      bool passes = false;
 
-    if (argc > 0) {
-      napi_value firstArg = nullptr;
-      napi_get_cb_info(env, cbinfo, &argc, &firstArg, nullptr, nullptr);
-      napi_coerce_to_bool(env, firstArg, &firstArg);
-      napi_get_value_bool(env, firstArg, &passes);
-    }
+      if (argc > 0) {
+        napi_value firstArg = nullptr;
+        napi_get_cb_info(env, cbinfo, &argc, &firstArg, nullptr, nullptr);
+        napi_coerce_to_bool(env, firstArg, &firstArg);
+        napi_get_value_bool(env, firstArg, &passes);
+      }
 
-    if (!passes) {
-      initialArg = 1;
-    } else {
-      return UNDEFINED;
+      if (!passes) {
+        initialArg = 1;
+      } else {
+        return UNDEFINED;
+      }
     }
-  }
 
-  napi_value argv[argc];
-  napi_get_cb_info(env, cbinfo, &argc, argv, nullptr, nullptr);
-
-  napi_value global, Symbol, SymbolFor, symbolDescription, symbol;
-  napi_get_global(env, &global);
-  napi_get_named_property(env, global, "Symbol", &Symbol);
-  napi_get_named_property(env, Symbol, "for", &SymbolFor);
-  napi_create_string_utf8(env, "nodejs.util.inspect.custom", NAPI_AUTO_LENGTH,
-                          &symbolDescription);
-  napi_call_function(env, global, SymbolFor, 1, &symbolDescription, &symbol);
-
-  std::stringstream log;
-
-  // TODO(dj): what if we made this pretty?
-
-  log << "CONSOLE";
-  switch (stream) {
-    case kConsoleLogTypeLog:
-      log << " LOG";
-      break;
-    case kConsoleLogTypeError:
-      log << " ERROR";
-      break;
-    case kConsoleLogTypeWarn:
-      log << " WARN";
-      break;
-    case kConsoleLogTypeInfo:
-      log << " INFO";
-      break;
-    case kConsoleLogTypeAssert:
-      log << " ASSERT FAILED";
-      break;
-  }
-  log << ": ";
+    napi_value argv[argc];
+    napi_get_cb_info(env, cbinfo, &argc, argv, nullptr, nullptr);
+
+    napi_value global, Symbol, SymbolFor, symbolDescription, symbol;
+    napi_get_global(env, &global);
+    napi_get_named_property(env, global, "Symbol", &Symbol);
+    napi_get_named_property(env, Symbol, "for", &SymbolFor);
+    napi_create_string_utf8(env, "nodejs.util.inspect.custom", NAPI_AUTO_LENGTH,
+                            &symbolDescription);
+    napi_call_function(env, global, SymbolFor, 1, &symbolDescription, &symbol);
+
+    std::stringstream log;
+
+    // TODO(dj): what if we made this pretty?
+
+    log << "CONSOLE";
+    switch (stream) {
+      case kConsoleLogTypeLog:
+        log << " LOG";
+        break;
+      case kConsoleLogTypeError:
+        log << " ERROR";
+        break;
+      case kConsoleLogTypeWarn:
+        log << " WARN";
+        break;
+      case kConsoleLogTypeInfo:
+        log << " INFO";
+        break;
+      case kConsoleLogTypeAssert:
+        log << " ASSERT FAILED";
+        break;
+    }
+    log << ": ";
 
-  log << buildLogString(env, cbinfo, initialArg);
+    log << buildLogString(env, cbinfo, initialArg);
 
-  log << "\n";
+    log << "\n";
 
-  std::string logString = log.str();
+    std::string logString = log.str();
 
 #ifdef __APPLE__
-  NSLog(CFSTR("%s"), logString.c_str());
+    NSLog(CFSTR("%s"), logString.c_str());
 #else
-  switch (stream) {
-    case kConsoleLogTypeLog:
-    case kConsoleLogTypeInfo:
-      std::cout << logString;
-      break;
-    case kConsoleLogTypeError:
-    case kConsoleLogTypeWarn:
-    case kConsoleLogTypeAssert:
-      std::cerr << logString;
-      break;
-  }
+    switch (stream) {
+      case kConsoleLogTypeLog:
+      case kConsoleLogTypeInfo:
+        std::cout << logString;
+        break;
+      case kConsoleLogTypeError:
+      case kConsoleLogTypeWarn:
+      case kConsoleLogTypeAssert:
+        std::cerr << logString;
+        break;
+    }
 #endif
 
 #ifdef TARGET_ENGINE_V8
-  v8_inspector::ConsoleAPIType method;
-  switch (stream) {
-    case kConsoleLogTypeLog:
-      method = v8_inspector::ConsoleAPIType::kLog;
-      break;
-    case kConsoleLogTypeError:
-      method = v8_inspector::ConsoleAPIType::kError;
-      break;
-    case kConsoleLogTypeWarn:
-      method = v8_inspector::ConsoleAPIType::kWarning;
-      break;
-    case kConsoleLogTypeInfo:
-      method = v8_inspector::ConsoleAPIType::kInfo;
-      break;
-    case kConsoleLogTypeAssert:
-      method = v8_inspector::ConsoleAPIType::kAssert;
-      break;
-    default:
-      break;
-  }
+    v8_inspector::ConsoleAPIType method;
+    switch (stream) {
+      case kConsoleLogTypeLog:
+        method = v8_inspector::ConsoleAPIType::kLog;
+        break;
+      case kConsoleLogTypeError:
+        method = v8_inspector::ConsoleAPIType::kError;
+        break;
+      case kConsoleLogTypeWarn:
+        method = v8_inspector::ConsoleAPIType::kWarning;
+        break;
+      case kConsoleLogTypeInfo:
+        method = v8_inspector::ConsoleAPIType::kInfo;
+        break;
+      case kConsoleLogTypeAssert:
+        method = v8_inspector::ConsoleAPIType::kAssert;
+        break;
+      default:
+        break;
+    }
 
-  sendToDevToolsFrontEnd(env, method, logString);
+    sendToDevToolsFrontEnd(env, method, logString);
 #endif
+  } catch (NativeScriptException& e) {
+    e.ReThrowToJS(env);
+  }
 
   return UNDEFINED;
 }

NativeScript/runtime/modules/module/ModuleInternal.cpp

@@ -593,8 +593,8 @@ napi_value ModuleInternal::LoadModule(napi_env env,
 
     // napi_status status = js_execute_script(
     //     env, script, EnsureFileProtocol(modulePath).c_str(), &moduleFunc);
-    napi_status status = napi_run_script(
-        env, script, &moduleFunc);
+    napi_status status = napi_run_script_source(
+        env, script, modulePath.c_str(), &moduleFunc);
     if (status != napi_ok) {
       bool pendingException;
       napi_is_exception_pending(env, &pendingException);

build_all_ios.sh

@@ -8,7 +8,7 @@ rm -rf ./dist
   # ./update_version.sh
 # fi
 ./build_metadata_generator.sh
-./build_nativescript.sh --no-vision $1
+./build_nativescript.sh --no-vision $1 $2
 ./build_tklivesync.sh --no-vision
 ./prepare_dSYMs.sh
 ./build_npm_ios.sh

build_nativescript.sh

@@ -124,6 +124,8 @@ checkpoint "Building NativeScript for macOS"
 
 cmake_build macos
 
+cp "$DIST/intermediates/macos/$CONFIG_BUILD/libNativeScript.dylib" "$DIST/../packages/macos/dist/macos/NativeScript.node"
+
 fi
 
 if $BUILD_VISION; then
@@ -162,10 +164,6 @@ if $BUILD_IPHONE; then
                   -debug-symbols "$DIST/intermediates/ios/$CONFIG_BUILD-iphoneos/NativeScript.framework.dSYM" )
 fi
 
-if $BUILD_MACOS; then
-  XCFRAMEWORKS+=( -framework "$DIST/intermediates/macos/$CONFIG_BUILD/NativeScript.framework"
-                  -debug-symbols "$DIST/intermediates/macos/$CONFIG_BUILD/NativeScript.framework.dSYM" )
-fi
 
 if $BUILD_VISION; then
   XCFRAMEWORKS+=( -framework "$DIST/intermediates/visionos/$CONFIG_BUILD-xros/NativeScript.framework"

cli_tests/threadsafe.js

@@ -0,0 +1,19 @@
+// NSOperationQueue.mainQueue.addOperationWithBlock(() => {
+//   console.log("Hello from the main queue");
+// });
+
+// const bgQueue = NSOperationQueue.new();
+
+// bgQueue.addOperationWithBlock(() => {
+//   console.log("Hello from the background queue");
+// });
+
+dispatch_async(dispatch_get_current_queue(), () => {
+  console.log("Hello from the main queue");
+});
+
+dispatch_async(dispatch_get_global_queue(qos_class_t.DEFAULT, 0), () => {
+  console.log("Hello from the background queue");
+});
+
+NSApplicationMain(0, null);