initial work

Author: DjDeveloperr

NativeScript/CMakeLists.txt

@@ -21,7 +21,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
 # Arguments
 
 set(TARGET_PLATFORM "macos" CACHE STRING "Target platform for the Objective-C bridge")
-set(TARGET_ENGINE "hermes" CACHE STRING "Target JS engine for the NativeScript runtime")
+set(TARGET_ENGINE "v8" CACHE STRING "Target JS engine for the NativeScript runtime")
 set(METADATA_SIZE 0 CACHE STRING "Size of embedded metadata in bytes")
 
 if(TARGET_PLATFORM STREQUAL "ios")
@@ -159,10 +159,12 @@ if(ENABLE_JS_RUNTIME)
     )
 
   elseif(TARGET_ENGINE_HERMES)
+    message(STATUS "Hermes engine detected")
+
     include_directories(
       napi/hermes
-      napi/hermes/hermes
-      napi/hermes/jsi
+      napi/hermes/include/hermes
+      napi/hermes/include/jsi
     )
 
     set(SOURCE_FILES

NativeScript/runtime/Console.cpp

@@ -1,9 +1,11 @@
 #include "Console.h"
-#include "js_native_api_types.h"
+
 #include <iostream>
 #include <string>
 
-namespace charon {
+#include "js_native_api_types.h"
+
+namespace nativescript {
 
 void Console::init(napi_env env) {
   napi_value global, Console, console;
@@ -19,7 +21,7 @@ void Console::init(napi_env env) {
           .setter = nullptr,
           .value = nullptr,
           .attributes = napi_default,
-          .data = (void *)kConsoleStreamLog,
+          .data = (void*)kConsoleStreamLog,
       },
       {
           .utf8name = "error",
@@ -29,7 +31,7 @@ void Console::init(napi_env env) {
           .setter = nullptr,
           .value = nullptr,
           .attributes = napi_default,
-          .data = (void *)kConsoleStreamError,
+          .data = (void*)kConsoleStreamError,
       },
       {
           .utf8name = "warn",
@@ -39,7 +41,7 @@ void Console::init(napi_env env) {
           .setter = nullptr,
           .value = nullptr,
           .attributes = napi_default,
-          .data = (void *)kConsoleStreamWarn,
+          .data = (void*)kConsoleStreamWarn,
       },
   };
 
@@ -83,7 +85,7 @@ napi_value Console::constructor(napi_env env, napi_callback_info cbinfo) {
 napi_value Console::log(napi_env env, napi_callback_info cbinfo) {
   size_t argc = 0;
   ConsoleStream stream;
-  void *data = nullptr;
+  void* data = nullptr;
 
   napi_get_cb_info(env, cbinfo, &argc, nullptr, nullptr, &data);
 
@@ -123,7 +125,7 @@ napi_value Console::log(napi_env env, napi_callback_info cbinfo) {
 
     size_t length = 0;
     napi_get_value_string_utf8(env, argstr, nullptr, 0, &length);
-    char *strbuf = (char *)malloc(length + 2);
+    char* strbuf = (char*)malloc(length + 2);
     napi_get_value_string_utf8(env, argstr, strbuf, length + 2, &length);
     strbuf[length] = i >= (argc - 1) ? '\0' : ' ';
     strbuf[length + 1] = '\0';
@@ -135,35 +137,35 @@ napi_value Console::log(napi_env env, napi_callback_info cbinfo) {
   std::string log;
   log += "[JS]";
   switch (stream) {
-  case kConsoleStreamLog:
-    // log += "LOG";
-    break;
-  case kConsoleStreamError:
-    log += " ERROR";
-    break;
-  case kConsoleStreamWarn:
-    log += " WARN";
-    break;
+    case kConsoleStreamLog:
+      // log += "LOG";
+      break;
+    case kConsoleStreamError:
+      log += " ERROR";
+      break;
+    case kConsoleStreamWarn:
+      log += " WARN";
+      break;
   }
   log += " ";
   log += string;
   log += "\n";
 
   switch (stream) {
-  case kConsoleStreamLog:
-    std::cout << log;
-    break;
-  case kConsoleStreamError:
-    std::cerr << log;
-    break;
-  case kConsoleStreamWarn:
-    std::cerr << log;
-    break;
+    case kConsoleStreamLog:
+      std::cout << log;
+      break;
+    case kConsoleStreamError:
+      std::cerr << log;
+      break;
+    case kConsoleStreamWarn:
+      std::cerr << log;
+      break;
   }
 
   napi_value undefined;
   napi_get_undefined(env, &undefined);
   return undefined;
 }
 
-} // namespace charon
+}  // namespace nativescript

NativeScript/runtime/Console.h

@@ -3,7 +3,7 @@
 
 #include "js_native_api.h"
 
-namespace charon {
+namespace nativescript {
 
 enum ConsoleStream {
   kConsoleStreamLog,
@@ -12,14 +12,14 @@ enum ConsoleStream {
 };
 
 class Console {
-public:
+ public:
   static void init(napi_env env);
 
   static napi_value constructor(napi_env env, napi_callback_info cbinfo);
 
   static napi_value log(napi_env env, napi_callback_info cbinfo);
 };
 
-} // namespace charon
+}  // namespace nativescript
 
-#endif // CONSOLE_H
+#endif  // CONSOLE_H

NativeScript/runtime/NativeScript.mm

@@ -2,7 +2,7 @@
 #include "Runtime.h"
 #include "RuntimeConfig.h"
 
-using namespace charon;
+using namespace nativescript;
 
 @implementation Config
 

NativeScript/runtime/Performance.cpp

@@ -1,7 +1,8 @@
 #include "Performance.h"
+
 #include "mach/mach_time.h"
 
-namespace charon {
+namespace nativescript {
 
 void Performance::init(napi_env env) {
   napi_value global, Performance, performance;
@@ -63,4 +64,4 @@ napi_value Performance::now(napi_env env, napi_callback_info cbinfo) {
   return result;
 }
 
-} // namespace charon
+}  // namespace nativescript

NativeScript/runtime/Performance.h

@@ -3,17 +3,17 @@
 
 #include "js_native_api.h"
 
-namespace charon {
+namespace nativescript {
 
 class Performance {
-public:
+ public:
   static void init(napi_env env);
 
   static napi_value constructor(napi_env env, napi_callback_info cbinfo);
 
   static napi_value now(napi_env env, napi_callback_info cbinfo);
 };
 
-} // namespace charon
+}  // namespace nativescript
 
-#endif // PERFORMANCE_H
+#endif  // PERFORMANCE_H

NativeScript/runtime/Runtime.cpp

@@ -23,31 +23,9 @@
 
 #include "NativeScript.h"
 
-namespace charon {
-
-// class BytecodeBuffer : public facebook::jsi::Buffer {
-// public:
-//   BytecodeBuffer(const uint8_t *data, size_t length)
-//       : data_(data), length_(length) {}
-
-//   size_t size() const override { return length_; }
-//   const uint8_t *data() const override { return data_; }
-
-// private:
-//   const uint8_t *data_;
-//   size_t length_;
-// };
-
-Runtime::Runtime(std::string& mainPath) : mainPath(mainPath) {
-  // hermes::vm::RuntimeConfig config =
-  //     hermes::vm::RuntimeConfig::Builder().withMicrotaskQueue(true).build();
-  // threadSafeRuntime = facebook::hermes::makeThreadSafeHermesRuntime(config);
-  // runtime =
-  //     (facebook::hermes::HermesRuntime
-  //     *)&threadSafeRuntime->getUnsafeRuntime();
-
-  // runtime->createNapiEnv(&env);
+namespace nativescript {
 
+Runtime::Runtime() {
   js_set_runtime_flags("");
 
   js_create_runtime(&runtime);
@@ -87,8 +65,7 @@ Runtime::Runtime(std::string& mainPath) : mainPath(mainPath) {
   )";
 
   napi_value compatScript, result;
-  napi_create_string_utf8(env, CompatScript, NAPI_AUTO_LENGTH,
-                          &compatScript);
+  napi_create_string_utf8(env, CompatScript, NAPI_AUTO_LENGTH, &compatScript);
   napi_run_script(env, compatScript, &result);
 
   Console::init(env);
@@ -97,7 +74,7 @@ Runtime::Runtime(std::string& mainPath) : mainPath(mainPath) {
   Timers::init(env);
 #endif  // __APPLE__
 
-  require = Require::init(env, mainPath, mainPath);
+  require = Require::init(env, RuntimeConfig.BaseDir, RuntimeConfig.BaseDir);
 
   const char* metadata_path = std::getenv("NS_METADATA_PATH");
   objc_bridge_init(env, metadata_path, RuntimeConfig.MetadataPtr);
@@ -110,96 +87,28 @@ Runtime::Runtime(std::string& mainPath) : mainPath(mainPath) {
   napi_close_handle_scope(env, scope);
 }
 
-napi_value Runtime::evaluateModule(std::string& spec) {
-  NapiScope scope(env);
-  std::string path = require->resolve(spec);
-  return require->require(env, path);
-}
-
-int Runtime::runScriptString(std::string& scriptSrc) {
+void Runtime::RunScript(std::string& scriptSrc) {
   NapiScope scope(env);
 
   napi_value script, result;
   napi_create_string_utf8(env, scriptSrc.c_str(), scriptSrc.length(), &script);
   js_execute_script(env, script, "<anonymous>", &result);
-
-  return 0;
-}
-
-int Runtime::executeJS(const char* sourceFile) {
-  NapiScope scope(env);
-
-  auto f = std::fopen(sourceFile, "r");
-  if (!f) {
-    std::cout << "Failed to open file: " << sourceFile << std::endl;
-    return 1;
-  }
-
-  auto source = std::string{};
-  auto buf = std::array<char, 1024>{};
-  while (auto n = std::fread(buf.data(), 1, buf.size(), f)) {
-    source.append(buf.data(), n);
-  }
-
-  std::fclose(f);
-
-  // auto buffer = std::make_shared<facebook::jsi::StringBuffer>(source);
-  // std::string sourceURL = sourceFile;
-
-  // auto result = runtime->evaluateJavaScript(buffer, sourceURL);
-
-  napi_value script, result;
-  napi_create_string_utf8(env, source.c_str(), source.length(), &script);
-  js_execute_script(env, script, sourceFile, &result);
-
-  return 0;
 }
 
-int Runtime::executeBytecode(const uint8_t* data, size_t size) {
+napi_value Runtime::RunModule(std::string spec) {
   NapiScope scope(env);
-
-  // auto buffer = std::make_shared<BytecodeBuffer>(data, size);
-  // std::string sourceURL = "embedded-hbc";
-
-  // auto result = runtime->evaluateJavaScript(buffer, sourceURL);
-  // TODO implement this for v8
-
-  return 0;
+  std::string path = require->resolve(spec);
+  return require->require(env, path);
 }
 
-bool Runtime::eventLoopStep() { return false; }
-
-void Runtime::addEventLoopToRunLoop(bool exitOnEmpty) {
-  auto handler =
-      ^void(CFRunLoopObserverRef observer, CFRunLoopActivity activity) {
-        if (activity == kCFRunLoopBeforeWaiting) {
-          bool moreWork = this->eventLoopStep();
-          if (moreWork) {
-            CFRunLoopWakeUp(CFRunLoopGetMain());
-          } else if (exitOnEmpty) {
-            CFRunLoopStop(CFRunLoopGetMain());
-          }
-        }
-      };
-
-  CFRunLoopObserverRef observer = CFRunLoopObserverCreateWithHandler(
-      kCFAllocatorDefault, kCFRunLoopAllActivities, true, 0, handler);
-  CFRunLoopAddObserver(CFRunLoopGetMain(), observer, kCFRunLoopDefaultMode);
+void Runtime::RunMainModule() {
+  napi_value result = RunModule("./");
 }
 
-void Runtime::runRunLoop() {
-  // Why does this not stop?
-  // while (true) {
-  //   CFRunLoopRunResult result = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0,
-  //   true); if (result == kCFRunLoopRunFinished || result ==
-  //   kCFRunLoopRunStopped) {
-  //     break;
-  //   }
-  // }
-
+void Runtime::RunLoop() {
   CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true);
 }
 
-}  // namespace charon
+}  // namespace nativescript
 
 #endif  // ENABLE_JS_RUNTIME