simplify loading nativescript node-api native addon, implement timers in hermes runtime, fix initializers returning null, hermes runtime can load .node files

DjDeveloperr · DjDeveloperr · commit db025afa3031 · 2024-11-04T01:00:10.000-05:00
diff --git a/packages/macos/lib/native.js b/packages/macos/lib/native.js
@@ -20,24 +20,16 @@ if (typeof interop === "undefined") {
     metaURL = "file://" + metaURL;
   }
 
-  let functions;
-  if (typeof Deno === "object") {
-    const { dlopen } = await import("node:process");
-    functions = dlopen(
-      { exports: {} },
-      new URL(path, metaURL).pathname,
-    ).exports;
-  } else {
-    functions = {};
-    process.dlopen(
-      { exports: functions },
-      new URL(path, metaURL).pathname,
-    );
-  }
+  const module = { exports: {} };
+
+  // deno-lint-ignore no-process-globals
+  process.dlopen(
+    module,
+    new URL(path, metaURL).pathname,
+  );
 
-  functions.init(
-    typeof Deno === "object"
-      ? Deno.env.get("METADATA_PATH")
-      : process.env.METADATA_PATH,
+  module.exports.init(
+    // deno-lint-ignore no-process-globals
+    process.env.METADATA_PATH,
   );
 }
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
@@ -43,7 +43,7 @@ elseif(TARGET_PLATFORM STREQUAL "macos")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0")
   set(TARGET_PLATFORM_MACOS TRUE)
   set(SDK_NAME "macosx")
-  set(CMAKE_OSX_ARCHITECTURES "arm64")
+  set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
   set(NS_BRIDGE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../packages/macos/build/macos/Release)
   set(TARGET_PLATFORM_SPEC "macos-arm64_x86_64")
 else()
diff --git a/runtime/include/Require.h b/runtime/include/Require.h
@@ -11,7 +11,8 @@ class Require {
   static Require *init(napi_env env, std::string &path, std::string &tilde);
 
   static napi_value createRequire(napi_env env, std::string &path,
-                                  std::string &tilde, Require **pRequire = nullptr);
+                                  std::string &tilde,
+                                  Require **pRequire = nullptr);
 
   static void finalize(napi_env env, void *data, void *hint);
 
diff --git a/runtime/include/Timers.h b/runtime/include/Timers.h
@@ -1,7 +1,7 @@
 #ifndef TIMERS_H
 #define TIMERS_H
 
-#include "js_native_api.h"
+#include "js_native_api_types.h"
 
 namespace charon {
 
@@ -10,6 +10,8 @@ class Timers {
   static void init(napi_env env);
 
   static napi_value setTimeout(napi_env env, napi_callback_info cbinfo);
+  static napi_value setInterval(napi_env env, napi_callback_info cbinfo);
+  static napi_value clearTimer(napi_env env, napi_callback_info cbinfo);
 };
 
 } // namespace charon
diff --git a/runtime/src/Require.cpp b/runtime/src/Require.cpp
@@ -1,9 +1,8 @@
 #include "Require.h"
 #include "NapiUtil.h"
-#include "js_native_api.h"
+#include <dlfcn.h>
 #include <iostream>
 #include <string>
-#include <dlfcn.h>
 
 napi_value Require::createRequire(napi_env env, std::string &path,
                                   std::string &tilde, Require **pRequire) {
@@ -83,7 +82,8 @@ typedef napi_value napi_module_register_fn(napi_env env, napi_value exports);
 napi_value Require::require(napi_env env, std::string &spec) {
   std::string path = resolve(spec);
 
-  if (path.ends_with(".node") || path.ends_with(".dylib") || path.ends_with(".so")) {
+  if (path.ends_with(".node") || path.ends_with(".dylib") ||
+      path.ends_with(".so")) {
     void *handle = dlopen(path.c_str(), RTLD_GLOBAL | RTLD_LAZY);
     if (!handle) {
       std::cerr << "error in dlopen: " << dlerror() << std::endl;
@@ -177,15 +177,9 @@ napi_value Require::require(napi_env env, std::string &spec) {
   napi_create_string_utf8(env, dirname.c_str(), NAPI_AUTO_LENGTH, &__dirname);
 
   napi_value argv[5] = {exports, require, module, __filename, __dirname};
-
-  // std::cout << "napi_call_function(env: " << env << ", global: " << global << ", func: " << func << ", argc: 5, argv: " << argv[0] << ", " << argv[1] << ", " << argv[2] << ", " << argv[3] << ", " << argv[4] << ", result: " << result << std::endl;
-
-  std::cout << "require eval: " << path << std::endl;
-
+  
   status = napi_call_function(env, global, func, 5, argv, &result);
 
-  std::cout << "require eval done: " << path << std::endl;
-
   if (status != napi_ok) {
     const napi_extended_error_info *info;
     napi_get_last_error_info(env, &info);
diff --git a/runtime/src/Timers.mm b/runtime/src/Timers.mm
@@ -3,6 +3,7 @@
 
 #include "Timers.h"
 #import <Foundation/Foundation.h>
+#include <objc/runtime.h>
 
 namespace charon {
 
@@ -22,9 +23,39 @@
           .attributes = napi_default,
           .data = nullptr,
       },
+      {
+          .utf8name = "setInterval",
+          .name = nullptr,
+          .method = setInterval,
+          .getter = nullptr,
+          .setter = nullptr,
+          .value = nullptr,
+          .attributes = napi_default,
+          .data = nullptr,
+      },
+      {
+          .utf8name = "clearTimeout",
+          .name = nullptr,
+          .method = clearTimer,
+          .getter = nullptr,
+          .setter = nullptr,
+          .value = nullptr,
+          .attributes = napi_default,
+          .data = nullptr,
+      },
+      {
+          .utf8name = "clearInterval",
+          .name = nullptr,
+          .method = clearTimer,
+          .getter = nullptr,
+          .setter = nullptr,
+          .value = nullptr,
+          .attributes = napi_default,
+          .data = nullptr,
+      },
   };
 
-  napi_define_properties(env, global, 1, properties);
+  napi_define_properties(env, global, 4, properties);
 }
 
 napi_value Timers::setTimeout(napi_env env, napi_callback_info cbinfo) {
@@ -42,16 +73,21 @@
 
   NSTimer *timer = [NSTimer
       timerWithTimeInterval:interval
-                    repeats:false
+                    repeats:NO
                       block:^(NSTimer *timer) {
                         napi_value global, callbackValue;
                         napi_get_global(env, &global);
                         napi_get_reference_value(env, callback, &callbackValue);
                         napi_call_function(env, global, callbackValue, 0,
                                            nullptr, nullptr);
                         napi_delete_reference(env, callback);
+                        objc_setAssociatedObject(timer, "callback", nil,
+                                                 OBJC_ASSOCIATION_ASSIGN);
                       }];
 
+  objc_setAssociatedObject(timer, "callback", (id)callback,
+                           OBJC_ASSOCIATION_ASSIGN);
+
   napi_value result;
   napi_create_int64(env, (int64_t)timer, &result);
 
@@ -60,6 +96,60 @@
   return result;
 }
 
+napi_value Timers::setInterval(napi_env env, napi_callback_info cbinfo) {
+  size_t argc = 2;
+  napi_value argv[2];
+  napi_get_cb_info(env, cbinfo, &argc, argv, nullptr, nullptr);
+
+  double ms;
+  napi_get_value_double(env, argv[1], &ms);
+
+  NSTimeInterval interval = ms / 1000;
+
+  napi_ref callback;
+  napi_create_reference(env, argv[0], 1, &callback);
+
+  NSTimer *timer = [NSTimer
+      timerWithTimeInterval:interval
+                    repeats:YES
+                      block:^(NSTimer *timer) {
+                        napi_value global, callbackValue;
+                        napi_get_global(env, &global);
+                        napi_get_reference_value(env, callback, &callbackValue);
+                        napi_call_function(env, global, callbackValue, 0,
+                                           nullptr, nullptr);
+                      }];
+
+  objc_setAssociatedObject(timer, "callback", (id)callback,
+                           OBJC_ASSOCIATION_ASSIGN);
+
+  napi_value result;
+  napi_create_int64(env, (int64_t)timer, &result);
+
+  [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSDefaultRunLoopMode];
+
+  return result;
+}
+
+napi_value Timers::clearTimer(napi_env env, napi_callback_info cbinfo) {
+  size_t argc = 1;
+  napi_value argv[1];
+  napi_get_cb_info(env, cbinfo, &argc, argv, nullptr, nullptr);
+
+  int64_t timer;
+  napi_get_value_int64(env, argv[0], &timer);
+
+  NSTimer *t = (NSTimer *)timer;
+  [t invalidate];
+
+  napi_ref callback = (napi_ref)objc_getAssociatedObject(t, "callback");
+  if (callback != nil) {
+    napi_delete_reference(env, callback);
+  }
+
+  return nullptr;
+}
+
 } // namespace charon
 
 #endif // __APPLE__
diff --git a/runtime/test.js b/runtime/test.js
@@ -4,8 +4,24 @@ const { test } = require("./mod.js");
 
 test();
 
+const id = setTimeout(() => {
+    console.log("timeout");
+}, 1000);
+
+clearTimeout(id);
+
+const int = setInterval(() => {
+    console.log("interval");
+}, 1000);
+
+setTimeout(() => {
+    clearInterval(int);
+}, 5000);
+
 console.log(new Error().stack);
 
+NSApplicationMain(0, null);
+
 // const timer = NSTimer.scheduledTimerWithTimeIntervalRepeatsBlock(1, true, () => {
 //     console.log("timer");
 //     timer.invalidate();
diff --git a/src/ClassMember.mm b/src/ClassMember.mm
@@ -254,6 +254,12 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, Cif *cif, id self,
     }
   }
 
+  if (rvalue == nil) {
+    napi_value result;
+    napi_get_null(env, &result);
+    return result;
+  }
+
   napi_value constructor = jsThis;
   if (!method->classMethod)
     napi_get_named_property(env, jsThis, "constructor", &constructor);

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,12 @@ inline void objcNativeCall(napi_env env, napi_value jsThis, Cif *cif, id self,`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
	`257`	`+ if (rvalue == nil) {`
	`258`	`+ napi_value result;`
	`259`	`+ napi_get_null(env, &result);`
	`260`	`+ return result;`
	`261`	`+ }`
	`262`	`+`
`257`	`263`	`napi_value constructor = jsThis;`
`258`	`264`	`if (!method->classMethod)`
`259`	`265`	`napi_get_named_property(env, jsThis, "constructor", &constructor);`