update node-api (#1)

Author: ammarahm-ed

NativeScript/CMakeLists.txt

@@ -168,6 +168,7 @@ if(ENABLE_JS_RUNTIME)
 
   elseif(TARGET_ENGINE_QUICKJS)
     set(MI_BUILD_OBJECT OFF)
+    set(MI_OVERRIDE OFF)
     add_subdirectory(napi/quickjs/mimalloc-dev mimalloc)
 
     include_directories(

NativeScript/napi/common/ConcurrentMap.h

@@ -0,0 +1,114 @@
+#ifndef CONCURRENT_MAP_H
+#define CONCURRENT_MAP_H
+
+#include "spinmutex.h"
+#include "mutex"
+#include "robin_hood.h"
+
+namespace tns {
+    template<class TKey, class TValue>
+    class SimpleMap {
+    public:
+        inline void Insert(TKey &key, TValue value) {
+            this->container_[key] = value;
+        }
+
+        inline TValue Get(TKey &key) {
+            bool found;
+            return this->Get(key, found);
+        }
+
+        inline TValue Get(TKey &key, bool &found) {
+            auto it = this->container_.find(key);
+            found = it != this->container_.end();
+            if (found) {
+                return it->second;
+            }
+            return nullptr;
+        }
+
+        inline bool ContainsKey(TKey &key) {
+            auto it = this->container_.find(key);
+            return it != this->container_.end();
+        }
+
+        inline void Remove(TKey &key) {
+            this->container_.erase(key);
+        }
+
+        inline void ForEach(const std::function<bool(TKey &, TValue &)> &func) {
+            for (auto i: this->container_) {
+                if (func(i.first, i.second)) {
+                    break;
+                }
+            }
+        }
+
+        SimpleMap() = default;
+
+        SimpleMap(const SimpleMap &) = delete;
+
+        SimpleMap &operator=(const SimpleMap &) = delete;
+
+    private:
+        robin_hood::unordered_map<TKey, TValue> container_;
+    };
+
+    template<class TKey, class TValue>
+    class ConcurrentMap {
+    public:
+        inline void Insert(TKey &key, TValue value) {
+
+            std::lock_guard<mz::spin_mutex> writerLock(this->containerMutex_);
+
+            this->container_[key] = value;
+        }
+
+        inline TValue Get(TKey &key) {
+            bool found;
+            return this->Get(key, found);
+        }
+
+        inline TValue Get(TKey &key, bool &found) {
+            std::lock_guard<mz::spin_mutex> writerLock(this->containerMutex_);
+            auto it = this->container_.find(key);
+            found = it != this->container_.end();
+            if (found) {
+                return it->second;
+            }
+            return nullptr;
+        }
+
+        inline bool ContainsKey(TKey &key) {
+            std::lock_guard<mz::spin_mutex> writerLock(this->containerMutex_);
+            auto it = this->container_.find(key);
+            return it != this->container_.end();
+        }
+
+        inline void Remove(TKey &key) {
+            std::lock_guard<mz::spin_mutex> writerLock(this->containerMutex_);
+            this->container_.erase(key);
+        }
+
+        inline void ForEach(const std::function<bool(TKey &, TValue &)> &func) {
+            std::lock_guard<mz::spin_mutex> writerLock(this->containerMutex_);
+            for (auto i: this->container_) {
+                if (func(i.first, i.second)) {
+                    break;
+                }
+            }
+        }
+
+        ConcurrentMap() = default;
+
+        ConcurrentMap(const ConcurrentMap &) = delete;
+
+        ConcurrentMap &operator=(const ConcurrentMap &) = delete;
+
+    private:
+        mz::spin_mutex containerMutex_;
+        robin_hood::unordered_map<TKey, TValue> container_;
+    };
+}
+
+#endif

NativeScript/napi/quickjs/js_native_api.h renamed to NativeScript/napi/common/js_native_api.h

@@ -14,7 +14,7 @@ EXTERN_C_START
 #include <stdint.h>  // NOLINT(modernize-deprecated-headers)
 
 #define NAPI_AUTO_LENGTH SIZE_MAX
-
+#define NAPI_VERSION_EXPERIMENTAL 2147483647
 #define NAPI_VERSION 8
 
 NAPI_EXTERN napi_status napi_get_last_error_info(napi_env env, const napi_extended_error_info **result);
@@ -50,7 +50,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_int64(napi_env env,
                                                      int64_t value,
                                                      napi_value *result);
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_string_latin1(
-    napi_env env, const char *str, size_t length, napi_value *result);
+        napi_env env, const char *str, size_t length, napi_value *result);
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_string_utf8(napi_env env,
                                                            const char *str,
                                                            size_t length,
@@ -110,11 +110,11 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_get_value_bool(napi_env env,
 
 // Copies LATIN-1 encoded bytes from a string into a buffer.
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_value_string_latin1(
-    napi_env env, napi_value value, char *buf, size_t bufsize, size_t *result);
+        napi_env env, napi_value value, char *buf, size_t bufsize, size_t *result);
 
 // Copies UTF-8 encoded bytes from a string into a buffer.
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_value_string_utf8(
-    napi_env env, napi_value value, char *str, size_t length, size_t *result);
+        napi_env env, napi_value value, char *str, size_t length, size_t *result);
 
 // Copies UTF-16 encoded bytes from a string into a buffer.
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_value_string_utf16(napi_env env,
@@ -241,16 +241,16 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_instanceof(napi_env env,
 
 // Gets all callback info in a single call. (Ugly, but faster.)
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_cb_info(
-    napi_env env,              // [in] NAPI environment handle
-    napi_callback_info cbinfo, // [in] Opaque callback-info handle
-    size_t *argc,              // [in-out] Specifies the size of the provided argv array
-                               // and receives the actual count of args.
-    napi_value *argv,          // [out] Array of values
-    napi_value *this_arg,      // [out] Receives the JS 'this' arg for the call
-    void **data);              // [out] Receives the data pointer for the callback.
+        napi_env env,              // [in] NAPI environment handle
+        napi_callback_info cbinfo, // [in] Opaque callback-info handle
+        size_t *argc,              // [in-out] Specifies the size of the provided argv array
+        // and receives the actual count of args.
+        napi_value *argv,          // [out] Array of values
+        napi_value *this_arg,      // [out] Receives the JS 'this' arg for the call
+        void **data);              // [out] Receives the data pointer for the callback.
 
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_new_target(
-    napi_env env, napi_callback_info cbinfo, napi_value *result);
+        napi_env env, napi_callback_info cbinfo, napi_value *result);
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_define_class(napi_env env,
                   const char *utf8name,
@@ -327,9 +327,9 @@ napi_open_handle_scope(napi_env env, napi_handle_scope *result);
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_close_handle_scope(napi_env env, napi_handle_scope scope);
 NAPI_EXTERN napi_status NAPI_CDECL napi_open_escapable_handle_scope(
-    napi_env env, napi_escapable_handle_scope *result);
+        napi_env env, napi_escapable_handle_scope *result);
 NAPI_EXTERN napi_status NAPI_CDECL napi_close_escapable_handle_scope(
-    napi_env env, napi_escapable_handle_scope scope);
+        napi_env env, napi_escapable_handle_scope scope);
 
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_escape_handle(napi_env env,
@@ -376,7 +376,7 @@ napi_create_external_arraybuffer(napi_env env,
                                  napi_value *result);
 #endif // NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_arraybuffer_info(
-    napi_env env, napi_value arraybuffer, void **data, size_t *byte_length);
+        napi_env env, napi_value arraybuffer, void **data, size_t *byte_length);
 NAPI_EXTERN napi_status NAPI_CDECL napi_is_typedarray(napi_env env,
                                                       napi_value value,
                                                       bool *result);
@@ -432,12 +432,17 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_is_promise(napi_env env,
 
 // Running a script
 NAPI_EXTERN napi_status NAPI_CDECL napi_run_script(napi_env env,
-                                                     napi_value script,
-                                                     napi_value *result);
+                                                   napi_value script,
+                                                   napi_value *result);
+
+NAPI_EXTERN napi_status NAPI_CDECL napi_run_script_source(napi_env env,
+                                                          napi_value script,
+                                                          const char* source_url,
+                                                          napi_value* result);
 
 // Memory management
 NAPI_EXTERN napi_status NAPI_CDECL napi_adjust_external_memory(
-    napi_env env, int64_t change_in_bytes, int64_t *adjusted_value);
+        napi_env env, int64_t change_in_bytes, int64_t *adjusted_value);
 
 #if NAPI_VERSION >= 5
 
@@ -457,7 +462,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_get_date_value(napi_env env,
 // Add finalizer for pointer
 NAPI_EXTERN napi_status NAPI_CDECL napi_add_finalizer(napi_env env,
                                                       napi_value js_object,
-                                                      void *finalize_data,
+                                                      void *native_object,
                                                       napi_finalize finalize_cb,
                                                       void *finalize_hint,
                                                       napi_ref *result);
@@ -483,7 +488,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_get_value_bigint_int64(napi_env env,
                                                                int64_t *result,
                                                                bool *lossless);
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_value_bigint_uint64(
-    napi_env env, napi_value value, uint64_t *result, bool *lossless);
+        napi_env env, napi_value value, uint64_t *result, bool *lossless);
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_get_value_bigint_words(napi_env env,
                             napi_value value,
@@ -502,7 +507,7 @@ napi_get_all_property_names(napi_env env,
 
 // Instance data
 NAPI_EXTERN napi_status NAPI_CDECL napi_set_instance_data(
-    napi_env env, void *data, napi_finalize finalize_cb, void *finalize_hint);
+        napi_env env, void *data, napi_finalize finalize_cb, void *finalize_hint);
 
 NAPI_EXTERN napi_status NAPI_CDECL napi_get_instance_data(napi_env env,
                                                           void **data);
@@ -520,7 +525,7 @@ napi_is_detached_arraybuffer(napi_env env, napi_value value, bool *result);
 #if NAPI_VERSION >= 8
 // Type tagging
 NAPI_EXTERN napi_status NAPI_CDECL napi_type_tag_object(
-    napi_env env, napi_value value, const napi_type_tag *type_tag);
+        napi_env env, napi_value value, const napi_type_tag *type_tag);
 
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_check_object_type_tag(napi_env env,
@@ -532,30 +537,15 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_object_freeze(napi_env env,
 NAPI_EXTERN napi_status NAPI_CDECL napi_object_seal(napi_env env,
                                                     napi_value object);
 
-NAPI_EXTERN napi_status NAPI_CDECL napi_is_float(napi_env env, napi_value value, bool *result);
-#endif // NAPI_VERSION >= 8
-
-NAPI_EXTERN napi_status NAPI_CDECL qjs_create_runtime(napi_runtime *runtime);
-
-NAPI_EXTERN napi_status NAPI_CDECL qjs_create_napi_env(napi_env *env, napi_runtime runtime);
-
-NAPI_EXTERN napi_status NAPI_CDECL qjs_free_napi_env(napi_env env);
+#ifdef USE_HOST_OBJECT
+NAPI_EXTERN napi_status NAPI_CDECL napi_create_host_object(napi_env env, napi_value value, napi_finalize finalize, void* data, bool is_array, napi_value getter, napi_value setter, napi_value* result);
 
-NAPI_EXTERN napi_status NAPI_CDECL qjs_free_runtime(napi_runtime runtime);
+NAPI_EXTERN napi_status NAPI_CDECL napi_get_host_object_data(napi_env env, napi_value object, void** data);
 
-NAPI_EXTERN napi_status NAPI_CDECL qjs_execute_script(napi_env env,
-                                                     napi_value script,
-                                                     const char *file,
-                                                     napi_value *result);
-
-NAPI_EXTERN napi_status NAPI_CDECL qjs_runtime_before_gc_callback(napi_env env, napi_finalize cb, void *data);
-
-NAPI_EXTERN napi_status NAPI_CDECL qjs_runtime_after_gc_callback(napi_env env, napi_finalize cb, void *data);
-
-
-NAPI_EXTERN napi_status NAPI_CDECL qjs_execute_pending_jobs(napi_env env);
+NAPI_EXTERN napi_status NAPI_CDECL napi_is_host_object(napi_env env, napi_value object, bool* result);
+#endif
 
-NAPI_EXTERN napi_status NAPI_CDECL qjs_update_stack_top(napi_env env);
+#endif // NAPI_VERSION >= 8
 
 EXTERN_C_END
 

NativeScript/napi/quickjs/js_native_api_types.h renamed to NativeScript/napi/common/js_native_api_types.h

@@ -25,17 +25,14 @@ extern "C"
 
 EXTERN_C_START
 
-/**
- Opaque pointer to the QuickJS Runtime
- */
-typedef struct NapiRuntime *napi_runtime;
-typedef struct NapiEnvironment *napi_env;
-typedef void * napi_value;
-typedef struct NapiReference *napi_ref;
-typedef struct NapiHandleScope *napi_handle_scope;
-typedef struct NapiHandleScope *napi_escapable_handle_scope;
-typedef struct NapiCallbackInfo *napi_callback_info;
-typedef struct NapiDeferred* napi_deferred;
+typedef struct napi_runtime__ *napi_runtime;
+typedef struct napi_env__ *napi_env;
+typedef struct napi_value__ *napi_value;
+typedef struct napi_ref__ *napi_ref;
+typedef struct napi_handle_scope__ *napi_handle_scope;
+typedef struct napi_handle_scope__ *napi_escapable_handle_scope;
+typedef struct napi_callback_info__ *napi_callback_info;
+typedef struct napi_deferred__* napi_deferred;
 
 
 typedef enum

NativeScript/napi/common/napi.h

@@ -28,9 +28,7 @@
 #endif
 #endif
 
-#ifdef NODE_ADDON_API_DISABLE_NODE_SPECIFIC
 #include "js_native_api.h"
-#endif
 
 #include <functional>
 #include <initializer_list>

NativeScript/napi/common/native_api_util.h

@@ -5,8 +5,6 @@
 #include <dlfcn.h>
 #include <sstream>
 
-#define NAPI_EXPORT __attribute__((visibility("default")))
-
 #ifndef NAPI_PREAMBLE
 #define NAPI_PREAMBLE napi_status status;
 #endif
@@ -74,9 +72,6 @@
 
 #endif
 
-#define NAPI_MODULE_REGISTER \
-  napi_value napi_register_module_v1(napi_env env, napi_value exports)
-
 #define NAPI_FUNCTION(name) \
   napi_value JS_##name(napi_env env, napi_callback_info cbinfo)
 
@@ -313,20 +308,13 @@ namespace napi_util {
     }
 
     inline bool is_float(napi_env env, napi_value value) {
-
-#ifdef __QJS__
-        bool result;
-        napi_is_float(env, value, &result);
-        return result;
-#else
         napi_value global, number, is_int, result;
         napi_get_global(env, &global);
         napi_get_named_property(env, global, "Number", &number);
         napi_get_named_property(env, number, "isInteger", &is_int);
         napi_call_function(env, number, is_int, 1, &value, &result);
 
-        return napi_util::get_bool(env, result) == false;
-#endif
+        return !napi_util::get_bool(env, result);
     }
 
     // Same as Object.create()`