emnapi 1.1.1 → 1.2.0

package/CMakeLists.txt

@@ -17,6 +17,18 @@ else()
   set(IS_WASM32 OFF)
 endif()
 
+if((CMAKE_C_COMPILER_TARGET STREQUAL "wasm32-wasi") OR (CMAKE_C_COMPILER_TARGET STREQUAL "wasm32-wasip1"))
+  set(IS_WASM32_WASIP1 ON)
+else()
+  set(IS_WASM32_WASIP1 OFF)
+endif()
+
+if((CMAKE_C_COMPILER_TARGET STREQUAL "wasm32-wasi-threads") OR (CMAKE_C_COMPILER_TARGET STREQUAL "wasm32-wasip1-threads"))
+  set(IS_WASM32_WASIP1_THREADS ON)
+else()
+  set(IS_WASM32_WASIP1_THREADS OFF)
+endif()
+
 set(UV_SRC
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/uv-common.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/threadpool.c"
@@ -133,7 +145,7 @@ if(IS_EMSCRIPTEN)
   target_link_options(${EMNAPI_BASIC_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
 endif()
 
-if(IS_WASM32 OR (CMAKE_C_COMPILER_TARGET STREQUAL "wasm32-wasi") OR (CMAKE_C_COMPILER_TARGET STREQUAL "wasm32-wasi-threads"))
+if(IS_WASM32 OR IS_WASM32_WASIP1 OR IS_WASM32_WASIP1_THREADS)
   set(EMNAPI_BUILD_BASIC_MT ON)
 else()
   set(EMNAPI_BUILD_BASIC_MT OFF)
@@ -155,7 +167,7 @@ if(EMNAPI_BUILD_BASIC_MT)
   endif()
 endif()
 
-if(IS_EMSCRIPTEN OR (CMAKE_C_COMPILER_TARGET STREQUAL "wasm32-wasi-threads"))
+if(IS_EMSCRIPTEN OR IS_WASM32_WASIP1_THREADS)
   set(EMNAPI_BUILD_MT ON)
 else()
   set(EMNAPI_BUILD_MT OFF)

package/README.md

@@ -23,6 +23,8 @@ This project aims to
 
 This project also powers the WebAssembly feature for [napi-rs](https://github.com/napi-rs/napi-rs), and enables many Node.js native addons to run on [StackBlitz](https://stackblitz.com)'s WebContainer.
 
+[Node-API changes](https://github.com/nodejs/node/pulls?q=is%3Apr+label%3Anode-api+) will be synchronized into this repo.
+
 See documentation for more details:
 - [https://toyobayashi.github.io/emnapi-docs/guide/](https://toyobayashi.github.io/emnapi-docs/guide/)
 - [https://emnapi-docs.vercel.app/guide/](https://emnapi-docs.vercel.app/guide/)
@@ -628,9 +630,10 @@ Output code can run in recent version modern browsers and Node.js latest LTS. IE
 ### Using node-gyp (Experimental)
 
 Currently node-gyp works on Linux only and don't support static library linking in cross-compiling.
-There are opened PRs to try to make node-gyp work fine.
+There are related PRs to try to make node-gyp work fine.
 
 - https://github.com/nodejs/gyp-next/pull/222
+- https://github.com/nodejs/gyp-next/pull/240
 - https://github.com/nodejs/node-gyp/pull/2974
 
 If you experienced issues on Windows or macOS, please check the PRs for upstream changes detail and see
@@ -643,7 +646,7 @@ Arch: `node-gyp configure --arch=<wasm32 | wasm64>`
 ```ts
 // node-gyp configure -- -Dvariable_name=value
 
-declare var OS: 'emscripten' | 'wasi' | 'unknown' | ''
+declare var OS: 'emscripten' | 'wasi' | 'unknown' | 'wasm' | ''
 
 /**
  * Enable async work and threadsafe-functions
@@ -699,7 +702,7 @@ declare var emnapi_manual_linking: 0 | 1
         ["OS == 'wasi'", {
           # ...
         }],
-        ["OS == 'unknown' or OS == ''", {
+        ["OS in ' wasm unknown'", {
           # ...
         }]
       ]
@@ -750,19 +753,19 @@ call set CXX_target=%%WASI_SDK_PATH:\=/%%/bin/clang++.exe
 emmake node-gyp rebuild \
   --arch=wasm32 \
   --nodedir=./node_modules/emnapi \
-  -- -f make-linux -DOS=emscripten # -Dwasm_threads=1
+  -- -f make-emscripten # -Dwasm_threads=1
 
 # wasi
 node-gyp rebuild \
   --arch=wasm32 \
   --nodedir=./node_modules/emnapi \
-  -- -f make-linux -DOS=wasi # -Dwasm_threads=1
+  -- -f make-wasi # -Dwasm_threads=1
 
 # bare wasm32
 node-gyp rebuild \
   --arch=wasm32 \
   --nodedir=./node_modules/emnapi \
-  -- -f make-linux -DOS=unknown # -Dwasm_threads=1
+  -- -f make-wasm # -Dwasm_threads=1
 ```
 
 ```bat
@@ -770,15 +773,15 @@ node-gyp rebuild \
 @REM Run the bat file in POSIX-like environment (e.g. Cygwin)
 
 @REM emscripten
-call npx.cmd node-gyp configure --arch=wasm32 --nodedir=./node_modules/emnapi -- -f make-linux -DOS=emscripten
+call npx.cmd node-gyp configure --arch=wasm32 --nodedir=./node_modules/emnapi -- -f make-emscripten
 call emmake.bat make -C %~dp0build
 
 @REM wasi
-call npx.cmd node-gyp configure --arch=wasm32 --nodedir=./node_modules/emnapi -- -f make-linux -DOS=wasi
+call npx.cmd node-gyp configure --arch=wasm32 --nodedir=./node_modules/emnapi -- -f make-wasi
 make -C %~dp0build
 
 @REM bare wasm32
-call npx.cmd node-gyp configure --arch=wasm32 --nodedir=./node_modules/emnapi -- -f make-linux -DOS=unknown
+call npx.cmd node-gyp configure --arch=wasm32 --nodedir=./node_modules/emnapi -- -f make-wasm
 make -C %~dp0build
 ```
 
@@ -935,7 +938,32 @@ instantiateNapiModule(input, {
    */
   asyncWorkPoolSize: 4, // 0: single thread mock, > 0: schedule async work in web worker
   wasi: new WASI(/* ... */),
-  // reuseWorker: true,
+
+  /**
+   * Setting this to `true` or a delay (ms) makes
+   * pthread_create() do not return until worker actually start.
+   * It will throw error if emnapi runs in browser main thread
+   * since browser disallow blocking the main thread (Atomics.wait).
+   * @defaultValue false
+   */
+  waitThreadStart: isNode || (isBrowser && !isBrowserMainThread),
+
+  /**
+   * Reuse the thread worker after thread exit to avoid re-creatation
+   * @defaultValue false
+   */
+  reuseWorker: {
+    /**
+     * @see {@link https://emscripten.org/docs/tools_reference/settings_reference.html#pthread-pool-size | PTHREAD_POOL_SIZE}
+     */
+    size: 0,
+
+    /**
+     * @see {@link https://emscripten.org/docs/tools_reference/settings_reference.html#pthread-pool-size-strict | PTHREAD_POOL_SIZE_STRICT}
+     */
+    strict: false
+  },
+
   onCreateWorker () {
     return new Worker('./worker.js')
     // Node.js
@@ -988,7 +1016,7 @@ instantiateNapiModule(input, {
       }
     })
 
-    WASI = require('./wasi').WASI
+    WASI = require('wasi').WASI
     emnapiCore = require('@emnapi/core')
   } else {
     importScripts('./node_modules/memfs-browser/dist/memfs.js')

package/common.gypi

@@ -2,7 +2,7 @@
 # in https://github.com/lovell/sharp/pull/3522
 {
   'variables': {
-    # OS: 'emscripten' | 'wasi' | 'unknown'
+    # OS: 'emscripten' | 'wasi' | 'unknown' | 'wasm'
     'clang': 1,
     'target_arch%': 'wasm32',
     'wasm_threads%': 0,
@@ -139,7 +139,7 @@
           }],
         ],
       }], 
-      ['OS in "wasi unknown "', {
+      ['OS in "wasi wasm unknown "', {
         'configurations': {
           'Release': {
             'ldflags': [ '-Wl,--strip-debug' ],
@@ -239,7 +239,7 @@
         'target_conditions': [
           ['_type=="executable"', {
             'conditions': [
-              ['OS in "wasi unknown "', {
+              ['OS in "wasi wasm unknown "', {
                 'product_extension': 'wasm',
 
                 'ldflags': [
@@ -326,7 +326,7 @@
                   }]
                 ],
               }],
-              ['OS in "wasi unknown "', {
+              ['OS in "wasi wasm unknown "', {
                 'product_extension': 'wasm',
 
                 'ldflags': [

package/dist/library_napi.js

@@ -1235,7 +1235,7 @@ function _napi_get_buffer_info(env, buffer, data, length) {
     if (!buffer)
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     var handle = emnapiCtx.handleStore.get(buffer);
-    if (!handle.isBuffer())
+    if (!handle.isBuffer(emnapiCtx.feature.Buffer))
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     return _napi_get_typedarray_info(env, buffer, 0, length, data, 0, 0);
 }
@@ -6393,7 +6393,7 @@ function _napi_is_buffer(env, value, result) {
     var h = emnapiCtx.handleStore.get(value);
     {{{ from64('result') }}};
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    var r = h.isBuffer() ? 1 : 0;
+    var r = h.isBuffer(emnapiCtx.feature.Buffer) ? 1 : 0;
     {{{ makeSetValue('result', 0, 'r', 'i8') }}};
     return envObject.clearLastError();
 }

package/emnapi.gyp

@@ -63,7 +63,7 @@
         ]
       },
       'conditions': [
-        ['wasm_threads != 0 and OS in " unknown wasi"', {
+        ['wasm_threads != 0 and OS in " unknown wasm wasi"', {
           'sources': [
             'src/thread/async_worker_create.c',
             'src/thread/async_worker_init.S',

package/include/node/emnapi.h

@@ -6,8 +6,8 @@
 #include "emnapi_common.h"
 
 #define EMNAPI_MAJOR_VERSION 1
-#define EMNAPI_MINOR_VERSION 1
-#define EMNAPI_PATCH_VERSION 1
+#define EMNAPI_MINOR_VERSION 2
+#define EMNAPI_PATCH_VERSION 0
 
 typedef enum {
   emnapi_runtime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emnapi",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "gypfile": false,