emnapi 1.8.0 → 1.9.0

package/emnapi.gyp

@@ -48,7 +48,6 @@
       'target_name': 'emnapi_basic',
       'type': 'static_library',
       'defines': [
-        'EMNAPI_DISABLE_UV'
       ],
       'sources': [
         'src/js_native_api.c',
@@ -56,6 +55,14 @@
         'src/async_cleanup_hook.c',
         'src/async_context.c',
         'src/wasi_wait.c',
+
+        'src/uv/uv-common.c',
+        'src/uv/threadpool.c',
+        'src/uv/unix/loop.c',
+        'src/uv/unix/posix-hrtime.c',
+        'src/uv/unix/thread.c',
+        'src/uv/unix/async.c',
+        'src/uv/unix/core.c',
       ],
       'link_settings': {
         'target_conditions': [

package/include/node/emnapi.h

@@ -6,7 +6,7 @@
 #include "emnapi_common.h"
 
 #define EMNAPI_MAJOR_VERSION 1
-#define EMNAPI_MINOR_VERSION 8
+#define EMNAPI_MINOR_VERSION 9
 #define EMNAPI_PATCH_VERSION 0
 
 typedef enum {
@@ -26,6 +26,7 @@ typedef enum {
   emnapi_float64_array,
   emnapi_bigint64_array,
   emnapi_biguint64_array,
+  emnapi_float16_array,
   emnapi_data_view = -1,
   emnapi_buffer = -2,
 } emnapi_memory_view_type;

package/include/node/js_native_api.h

@@ -59,12 +59,12 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_object(napi_env env,
 #ifdef NAPI_EXPERIMENTAL
 #define NODE_API_EXPERIMENTAL_HAS_CREATE_OBJECT_WITH_PROPERTIES
 NAPI_EXTERN napi_status NAPI_CDECL
-napi_create_object_with_properties(napi_env env,
-                                   napi_value prototype_or_null,
-                                   napi_value* property_names,
-                                   napi_value* property_values,
-                                   size_t property_count,
-                                   napi_value* result);
+node_api_create_object_with_properties(napi_env env,
+                                       napi_value prototype_or_null,
+                                       napi_value* property_names,
+                                       napi_value* property_values,
+                                       size_t property_count,
+                                       napi_value* result);
 #endif  // NAPI_EXPERIMENTAL
 
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_array(napi_env env,

package/include/node/js_native_api_types.h

@@ -7,12 +7,11 @@
 #ifdef NAPI_EXPERIMENTAL
 #define NAPI_VERSION NAPI_VERSION_EXPERIMENTAL
 #else
-// The baseline version for N-API.
-// The NAPI_VERSION controls which version will be used by default when
-// compilling a native addon. If the addon developer specifically wants to use
-// functions available in a new version of N-API that is not yet ported in all
-// LTS versions, they can set NAPI_VERSION knowing that they have specifically
-// depended on that version.
+// The baseline version for Node-API.
+// NAPI_VERSION controls which version is used by default when compiling
+// a native addon. If the addon developer wants to use functions from a
+// newer Node-API version not yet available in all LTS versions, they can
+// set NAPI_VERSION to explicitly depend on that version.
 #define NAPI_VERSION 8
 #endif
 #endif
@@ -31,7 +30,7 @@
 
 // This file needs to be compatible with C compilers.
 // This is a public include file, and these includes have essentially
-// became part of it's API.
+// become part of its API.
 #include <stddef.h>  // NOLINT(modernize-deprecated-headers)
 #include <stdint.h>  // NOLINT(modernize-deprecated-headers)
 
@@ -133,6 +132,8 @@ typedef enum {
   napi_float64_array,
   napi_bigint64_array,
   napi_biguint64_array,
+#define NODE_API_HAS_FLOAT16_ARRAY
+  napi_float16_array,
 } napi_typedarray_type;
 
 typedef enum {

package/index.d.ts

@@ -2,3 +2,15 @@ export const include: string
 export const include_dir: string
 export const js_library: string
 export const sources: string[]
+export const targets: string
+export const requiredConfig: {
+  emscripten: {
+    settings: Record<string, string | string[]>
+  }
+  clang: {
+    target: string
+    cflags: string[]
+    ldflags: string[]
+    wasmld: string[]
+  }
+}

package/index.js

@@ -28,3 +28,39 @@ exports.include_dir = includeDir
 exports.js_library = jsLibrary
 exports.sources = sources
 exports.targets = targets
+
+exports.requiredConfig = {
+  emscripten: {
+    settings: {
+      WASM_BIGINT: '1',
+      ALLOW_MEMORY_GROWTH: '1',
+      MIN_CHROME_VERSION: '85',
+      EXPORTED_RUNTIME_METHODS: [
+        'emnapiInit'
+      ],
+      EXPORTED_FUNCTIONS: [
+        '_malloc',
+        '_free',
+        '_napi_register_wasm_v1',
+        '_node_api_module_get_api_version_v1'
+      ]
+    }
+  },
+  clang: {
+    target: 'wasm32-wasip1-threads',
+    cflags: ['-matomics', '-mbulk-memory'],
+    ldflags: ['-mexec-model=reactor'],
+    wasmld: [
+      '--import-memory',
+      '--shared-memory',
+      '--export-table',
+      '--export=malloc',
+      '--export=free',
+      '--export=napi_register_wasm_v1',
+      '--export-if-defined=node_api_module_get_api_version_v1',
+      '--export=emnapi_thread_crashed',
+      '--export-if-defined=emnapi_async_worker_create',
+      '--export-if-defined=emnapi_async_worker_init'
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emnapi",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "gypfile": false,
@@ -14,7 +14,10 @@
   },
   "scripts": {
     "build": "node ./script/build.js",
-    "version": "node ./script/version.js"
+    "version": "node ./script/version.js",
+    "generate-struct-info-wasm32": "node -e \"fs.mkdirSync('script/out',{recursive:true})\" && emcc -Iinclude/node -pthread script/generate_struct_info.c -sNODERAWFS -o script/out/generate_struct_info_wasm32.js && node ./script/out/generate_struct_info_wasm32.js",
+    "generate-struct-info-wasm64": "node -e \"fs.mkdirSync('script/out',{recursive:true})\" && emcc -Iinclude/node -pthread script/generate_struct_info.c -sNODERAWFS -sMEMORY64 -o script/out/generate_struct_info_wasm64.js && node ./script/out/generate_struct_info_wasm64.js",
+    "generate-struct-info": "npm run generate-struct-info-wasm32 && npm run generate-struct-info-wasm64"
   },
   "repository": {
     "type": "git",

package/src/async_cleanup_hook.c

@@ -82,8 +82,6 @@ _emnapi_ach_handle_create(napi_env env,
   return handle;
 }
 
-EMNAPI_INTERNAL_EXTERN void _emnapi_set_immediate(void (*callback)(void*), void* data);
-
 static void _emnapi_ach_handle_env_unref(void* arg) {
   napi_env env = (napi_env) arg;
   _emnapi_env_unref(env);

package/src/emnapi_internal.h

@@ -1,3 +1,6 @@
+#ifndef EMNAPI_INTERNAL_H
+#define EMNAPI_INTERNAL_H
+
 #include "emnapi.h"
 
 #if defined(__EMSCRIPTEN__) || defined(__wasi__)
@@ -109,6 +112,13 @@ EMNAPI_INTERNAL_EXTERN int _emnapi_is_main_browser_thread();
 EMNAPI_INTERNAL_EXTERN int _emnapi_is_main_runtime_thread();
 EMNAPI_INTERNAL_EXTERN double _emnapi_get_now();
 EMNAPI_INTERNAL_EXTERN void _emnapi_unwind();
+EMNAPI_INTERNAL_EXTERN void _emnapi_set_immediate(void (*callback)(void*), void* data);
+EMNAPI_INTERNAL_EXTERN napi_status _emnapi_create_function(napi_env env,
+                                                           const char* utf8name,
+                                                           size_t length,
+                                                           napi_callback cb,
+                                                           void* data,
+                                                           napi_value* result);
 
 #if defined(__EMSCRIPTEN_PTHREADS__) || defined(_REENTRANT)
 #define EMNAPI_HAVE_THREADS 1
@@ -186,3 +196,5 @@ void _emnapi_env_check_gc_access(napi_env env);
   } while (0)
 
 EXTERN_C_END
+
+#endif

package/src/node_api.c

@@ -1,9 +1,7 @@
 #include "node_api.h"
 #include "emnapi_internal.h"
 
-#if EMNAPI_HAVE_THREADS && !defined(EMNAPI_DISABLE_UV)
-#include "uv.h"
-#endif
+struct uv_loop_s* uv_default_loop(void);
 
 EXTERN_C_START
 
@@ -31,15 +29,11 @@ napi_get_node_version(node_api_basic_env env,
 
 napi_status napi_get_uv_event_loop(node_api_basic_env env,
                                    struct uv_loop_s** loop) {
-#if EMNAPI_HAVE_THREADS && !defined(EMNAPI_DISABLE_UV)
   CHECK_ENV(env);
   CHECK_ARG(env, loop);
   // Though this is fake libuv loop
   *loop = uv_default_loop();
   return napi_clear_last_error(env);
-#else
-  return napi_set_last_error(env, napi_generic_failure, 0, NULL);
-#endif
 }
 
 EMNAPI_INTERNAL_EXTERN int _emnapi_get_filename(napi_env env, char* buf, int len);

package/src/thread/async_worker_create.c

@@ -1,6 +1,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#if defined(__EMSCRIPTEN_PTHREADS__) || (defined(_REENTRANT) && defined(__wasi__))
+#include <pthread.h>
+#else
+int _emnapi_spawn_worker(void* (*worker)(void*), void* arg);
 void* calloc(size_t n, size_t size);
 
 extern unsigned char __heap_base;
@@ -32,9 +36,27 @@ void* __copy_tls(unsigned char *mem) {
 			:: "r"(tls_base));
 	return mem;
 }
+#endif
+
+void* _emnapi_async_worker(void* arg);
 
 __attribute__((visibility("default")))
-void* emnapi_async_worker_create() {
+void* emnapi_async_worker_create(int directly_spawn, void* global_address) {
+#if defined(__EMSCRIPTEN_PTHREADS__) || (defined(_REENTRANT) && defined(__wasi__))
+  if (directly_spawn) {
+    pthread_t thread;
+    int r = pthread_create(&thread, NULL, _emnapi_async_worker, global_address);
+    if (r != 0) {
+      return NULL;
+    }
+    return (void*)(uintptr_t)thread;
+  }
+  return NULL;
+#else
+  if (directly_spawn) {
+    int index = _emnapi_spawn_worker(_emnapi_async_worker, global_address);
+    return (void*)(intptr_t)(-(index + 1));
+  }
   size_t args_size = sizeof(struct worker_args);
   size_t size = args_size;
 
@@ -74,4 +96,5 @@ void* emnapi_async_worker_create() {
   args->stack_base = block + args_size + tls_block_size + stack_size;
   args->tls_base = tls_base;
   return block;
+#endif
 }