emnapi 1.1.1 → 1.3.0

package/CMakeLists.txt

@@ -17,10 +17,23 @@ 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"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/loop.c"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/posix-hrtime.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/thread.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/async.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/uv/unix/core.c"
@@ -127,13 +140,16 @@ endif()
 
 add_library(${EMNAPI_BASIC_TARGET_NAME} STATIC ${ENAPI_BASIC_SRC})
 target_include_directories(${EMNAPI_BASIC_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
-target_compile_definitions(${EMNAPI_BASIC_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES})
+target_compile_definitions(${EMNAPI_BASIC_TARGET_NAME}
+  PUBLIC ${EMNAPI_DEFINES}
+  PRIVATE "EMNAPI_DISABLE_UV"
+)
 if(IS_EMSCRIPTEN)
   set_target_properties(${EMNAPI_BASIC_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
   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)
@@ -147,7 +163,10 @@ if(EMNAPI_BUILD_BASIC_MT)
   )
   target_compile_options(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC "-matomics" "-mbulk-memory")
   target_include_directories(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
-  target_compile_definitions(${EMNAPI_BASIC_MT_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES})
+  target_compile_definitions(${EMNAPI_BASIC_MT_TARGET_NAME}
+    PUBLIC ${EMNAPI_DEFINES}
+    PRIVATE "EMNAPI_DISABLE_UV"
+  )
 
   if(IS_EMSCRIPTEN)
     set_target_properties(${EMNAPI_BASIC_MT_TARGET_NAME} PROPERTIES INTERFACE_LINK_DEPENDS ${EMNAPI_JS_LIB})
@@ -155,7 +174,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)
@@ -163,7 +182,10 @@ endif()
 
 if(EMNAPI_BUILD_MT)
   add_library(${EMNAPI_MT_TARGET_NAME} STATIC ${EMNAPI_SRC} ${UV_SRC})
-  target_compile_options(${EMNAPI_MT_TARGET_NAME} PRIVATE ${EMNAPI_MT_CFLAGS})
+  target_compile_options(${EMNAPI_MT_TARGET_NAME}
+    PUBLIC "-matomics" "-mbulk-memory"
+    PRIVATE ${EMNAPI_MT_CFLAGS}
+  )
   target_include_directories(${EMNAPI_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
   target_compile_definitions(${EMNAPI_MT_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES})
   if(IS_EMSCRIPTEN)

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

@@ -958,7 +958,7 @@ var emnapiExternalMemory = {
         var _a;
         var info = {
             address: 0,
-            ownership: 0 /* Ownership.kRuntime */,
+            ownership: 0 /* ReferenceOwnership.kRuntime */,
             runtimeAllocated: 0
         };
         if (arrayBuffer === wasmMemory.buffer) {
@@ -971,7 +971,7 @@ var emnapiExternalMemory = {
                 cachedInfo.address = 0;
                 return cachedInfo;
             }
-            if (shouldCopy && cachedInfo.ownership === 0 /* Ownership.kRuntime */ && cachedInfo.runtimeAllocated === 1) {
+            if (shouldCopy && cachedInfo.ownership === 0 /* ReferenceOwnership.kRuntime */ && cachedInfo.runtimeAllocated === 1) {
                 new Uint8Array(wasmMemory.buffer).set(new Uint8Array(arrayBuffer), cachedInfo.address);
             }
             return cachedInfo;
@@ -987,7 +987,7 @@ var emnapiExternalMemory = {
             throw new Error('Out of memory');
         new Uint8Array(wasmMemory.buffer).set(new Uint8Array(arrayBuffer), pointer);
         info.address = pointer;
-        info.ownership = emnapiExternalMemory.registry ? 0 /* Ownership.kRuntime */ : 1 /* Ownership.kUserland */;
+        info.ownership = emnapiExternalMemory.registry ? 0 /* ReferenceOwnership.kRuntime */ : 1 /* ReferenceOwnership.kUserland */;
         info.runtimeAllocated = 1;
         emnapiExternalMemory.table.set(arrayBuffer, info);
         (_a = emnapiExternalMemory.registry) === null || _a === void 0 ? void 0 : _a.register(arrayBuffer, pointer);
@@ -1000,7 +1000,7 @@ var emnapiExternalMemory = {
                     Ctor: view.constructor,
                     address: view.byteOffset,
                     length: view instanceof DataView ? view.byteLength : view.length,
-                    ownership: 1 /* Ownership.kUserland */,
+                    ownership: 1 /* ReferenceOwnership.kUserland */,
                     runtimeAllocated: 0
                 });
             }
@@ -1031,7 +1031,7 @@ var emnapiExternalMemory = {
                 var _a = emnapiExternalMemory.wasmMemoryViewTable.get(view), address_1 = _a.address, ownership_1 = _a.ownership, runtimeAllocated_1 = _a.runtimeAllocated;
                 return { address: address_1, ownership: ownership_1, runtimeAllocated: runtimeAllocated_1, view: view };
             }
-            return { address: view.byteOffset, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0, view: view };
+            return { address: view.byteOffset, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0, view: view };
         }
         var _b = emnapiExternalMemory.getArrayBufferPointer(view.buffer, shouldCopy), address = _b.address, ownership = _b.ownership, runtimeAllocated = _b.runtimeAllocated;
         return { address: address === 0 ? 0 : (address + view.byteOffset), ownership: ownership, runtimeAllocated: runtimeAllocated, view: view };
@@ -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);
 }
@@ -1867,6 +1867,18 @@ function _node_api_create_external_string_latin1(env, str, length, finalize_call
 function _node_api_create_external_string_utf16(env, str, length, finalize_callback, finalize_hint, result, copied) {
     return emnapiString.newExternalString(env, str, length, finalize_callback, finalize_hint, result, copied, _napi_create_string_utf16, undefined);
 }
+/**
+ * @__sig ipppp
+ */
+function _node_api_create_property_key_latin1(env, str, length, result) {
+    return _napi_create_string_latin1(env, str, length, result);
+}
+/**
+ * @__sig ipppp
+ */
+function _node_api_create_property_key_utf8(env, str, length, result) {
+    return _napi_create_string_utf8(env, str, length, result);
+}
 /**
  * @__sig ipppp
  */
@@ -2128,13 +2140,16 @@ function emnapiWrap(env, js_object, native_object, finalize_cb, finalize_hint, r
         if (result) {
             if (!finalize_cb)
                 return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
-            reference = emnapiCtx.createReference(envObject, handle.id, 0, 1 /* Ownership.kUserland */, finalize_cb, native_object, finalize_hint);
+            reference = emnapiCtx.createReferenceWithFinalizer(envObject, handle.id, 0, 1 /* ReferenceOwnership.kUserland */, finalize_cb, native_object, finalize_hint);
             {{{ from64('result') }}};
             referenceId = reference.id;
             {{{ makeSetValue('result', 0, 'referenceId', '*') }}};
         }
+        else if (finalize_cb) {
+            reference = emnapiCtx.createReferenceWithFinalizer(envObject, handle.id, 0, 0 /* ReferenceOwnership.kRuntime */, finalize_cb, native_object, finalize_hint);
+        }
         else {
-            reference = emnapiCtx.createReference(envObject, handle.id, 0, 0 /* Ownership.kRuntime */, finalize_cb, native_object, !finalize_cb ? finalize_cb : finalize_hint);
+            reference = emnapiCtx.createReferenceWithData(envObject, handle.id, 0, 0 /* ReferenceOwnership.kRuntime */, native_object);
         }
         envObject.getObjectBinding(handle.value).wrapped = reference.id;
         return envObject.getReturnStatus();
@@ -2181,7 +2196,7 @@ function emnapiUnwrap(env, js_object, result, action) {
         }
         if (action === 1 /* UnwrapAction.RemoveWrap */) {
             binding.wrapped = 0;
-            if (ref.ownership() === 1 /* Ownership.kUserland */) {
+            if (ref.ownership() === 1 /* ReferenceOwnership.kUserland */) {
                 // When the wrap is been removed, the finalizer should be reset.
                 ref.resetFinalizer();
             }
@@ -2406,11 +2421,11 @@ function _napi_add_finalizer(env, js_object, finalize_data, finalize_cb, finaliz
         return envObject.setLastError(handleResult.status);
     }
     var handle = handleResult.handle;
-    var ownership = !result ? 0 /* Ownership.kRuntime */ : 1 /* Ownership.kUserland */;
+    var ownership = !result ? 0 /* ReferenceOwnership.kRuntime */ : 1 /* ReferenceOwnership.kUserland */;
     {{{ from64('finalize_data') }}};
     {{{ from64('finalize_cb') }}};
     {{{ from64('finalize_hint') }}};
-    var reference = emnapiCtx.createReference(envObject, handle.id, 0, ownership, finalize_cb, finalize_data, finalize_hint);
+    var reference = emnapiCtx.createReferenceWithFinalizer(envObject, handle.id, 0, ownership, finalize_cb, finalize_data, finalize_hint);
     if (result) {
         {{{ from64('result') }}};
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -2467,46 +2482,46 @@ function _emnapi_create_memory_view(env, typedarray_type, external_data, byte_le
         var viewDescriptor = void 0;
         switch (typedarray_type) {
             case 0 /* emnapi_memory_view_type.emnapi_int8_array */:
-                viewDescriptor = { Ctor: Int8Array, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Int8Array, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 1 /* emnapi_memory_view_type.emnapi_uint8_array */:
-                viewDescriptor = { Ctor: Uint8Array, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Uint8Array, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 2 /* emnapi_memory_view_type.emnapi_uint8_clamped_array */:
-                viewDescriptor = { Ctor: Uint8ClampedArray, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Uint8ClampedArray, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 3 /* emnapi_memory_view_type.emnapi_int16_array */:
-                viewDescriptor = { Ctor: Int16Array, address: external_data, length: byte_length >> 1, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Int16Array, address: external_data, length: byte_length >> 1, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 4 /* emnapi_memory_view_type.emnapi_uint16_array */:
-                viewDescriptor = { Ctor: Uint16Array, address: external_data, length: byte_length >> 1, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Uint16Array, address: external_data, length: byte_length >> 1, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 5 /* emnapi_memory_view_type.emnapi_int32_array */:
-                viewDescriptor = { Ctor: Int32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Int32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 6 /* emnapi_memory_view_type.emnapi_uint32_array */:
-                viewDescriptor = { Ctor: Uint32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Uint32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 7 /* emnapi_memory_view_type.emnapi_float32_array */:
-                viewDescriptor = { Ctor: Float32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Float32Array, address: external_data, length: byte_length >> 2, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 8 /* emnapi_memory_view_type.emnapi_float64_array */:
-                viewDescriptor = { Ctor: Float64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: Float64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 9 /* emnapi_memory_view_type.emnapi_bigint64_array */:
-                viewDescriptor = { Ctor: BigInt64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: BigInt64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case 10 /* emnapi_memory_view_type.emnapi_biguint64_array */:
-                viewDescriptor = { Ctor: BigUint64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: BigUint64Array, address: external_data, length: byte_length >> 3, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case -1 /* emnapi_memory_view_type.emnapi_data_view */:
-                viewDescriptor = { Ctor: DataView, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: DataView, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             case -2 /* emnapi_memory_view_type.emnapi_buffer */: {
                 if (!emnapiCtx.feature.Buffer) {
                     throw emnapiCtx.createNotSupportBufferError('emnapi_create_memory_view', '');
                 }
-                viewDescriptor = { Ctor: emnapiCtx.feature.Buffer, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
+                viewDescriptor = { Ctor: emnapiCtx.feature.Buffer, address: external_data, length: byte_length, ownership: 1 /* ReferenceOwnership.kUserland */, runtimeAllocated: 0 };
                 break;
             }
             default: return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
@@ -2869,7 +2884,7 @@ function _napi_create_external(env, data, finalize_cb, finalize_hint, result) {
         }
         var externalHandle = emnapiCtx.getCurrentScope().addExternal(envObject, data);
         if (finalize_cb) {
-            emnapiCtx.createReference(envObject, externalHandle.id, 0, 0 /* Ownership.kRuntime */, finalize_cb, data, finalize_hint);
+            emnapiCtx.createReferenceWithFinalizer(envObject, externalHandle.id, 0, 0 /* ReferenceOwnership.kRuntime */, finalize_cb, data, finalize_hint);
         }
         {{{ from64('result') }}};
         value = externalHandle.id;
@@ -2927,7 +2942,7 @@ function _napi_create_external_arraybuffer(env, external_data, byte_length, fina
             u8arr.set(new Uint8Array(wasmMemory.buffer).subarray(external_data, external_data + byte_length));
             emnapiExternalMemory.table.set(arrayBuffer, {
                 address: external_data,
-                ownership: 1 /* Ownership.kUserland */,
+                ownership: 1 /* ReferenceOwnership.kUserland */,
                 runtimeAllocated: 0
             });
         }
@@ -3051,7 +3066,7 @@ function _napi_create_typedarray(env, type, length, arraybuffer, byte_offset, re
                         Ctor: Type,
                         address: byte_offset,
                         length: length,
-                        ownership: 1 /* Ownership.kUserland */,
+                        ownership: 1 /* ReferenceOwnership.kUserland */,
                         runtimeAllocated: 0
                     });
                 }
@@ -3138,7 +3153,7 @@ function _napi_create_buffer(env, size, data, result) {
                 Ctor: Buffer,
                 address: pointer,
                 length: size,
-                ownership: emnapiExternalMemory.registry ? 0 /* Ownership.kRuntime */ : 1 /* Ownership.kUserland */,
+                ownership: emnapiExternalMemory.registry ? 0 /* ReferenceOwnership.kRuntime */ : 1 /* ReferenceOwnership.kUserland */,
                 runtimeAllocated: 1
             };
             emnapiExternalMemory.wasmMemoryViewTable.set(buffer_1, viewDescriptor);
@@ -3241,7 +3256,7 @@ function _napi_create_dataview(env, byte_length, arraybuffer, byte_offset, resul
                     Ctor: DataView,
                     address: byte_offset,
                     length: byte_length,
-                    ownership: 1 /* Ownership.kUserland */,
+                    ownership: 1 /* ReferenceOwnership.kUserland */,
                     runtimeAllocated: 0
                 });
             }
@@ -4032,7 +4047,7 @@ function _napi_create_reference(env, value, initial_refcount, result) {
         }
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    var ref = emnapiCtx.createReference(envObject, handle.id, initial_refcount >>> 0, 1 /* Ownership.kUserland */);
+    var ref = emnapiCtx.createReference(envObject, handle.id, initial_refcount >>> 0, 1 /* ReferenceOwnership.kUserland */);
     {{{ from64('result') }}};
     {{{ makeSetValue('result', 0, 'ref.id', '*') }}};
     return envObject.clearLastError();
@@ -4076,7 +4091,7 @@ function _napi_reference_unref(env, ref, result) {
     if (!ref)
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     var reference = emnapiCtx.refStore.get(ref);
-    var refcount = reference.refCount();
+    var refcount = reference.refcount();
     if (refcount === 0) {
         return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
     }
@@ -4101,7 +4116,7 @@ function _napi_get_reference_value(env, ref, result) {
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     var reference = emnapiCtx.refStore.get(ref);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    var handleId = reference.get();
+    var handleId = reference.get(envObject);
     {{{ from64('result') }}};
     {{{ makeSetValue('result', 0, 'handleId', '*') }}};
     return envObject.clearLastError();
@@ -5911,7 +5926,7 @@ function _napi_create_threadsafe_function(env, func, async_resource, async_resou
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        ref = emnapiCtx.createReference(envObject, func, 1, 1 /* Ownership.kUserland */).id;
+        ref = emnapiCtx.createReference(envObject, func, 1, 1 /* ReferenceOwnership.kUserland */).id;
     }
     var asyncResourceObject;
     if (async_resource) {
@@ -5937,7 +5952,7 @@ function _napi_create_threadsafe_function(env, func, async_resource, async_resou
     if (!tsfn)
         return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
     new Uint8Array(wasmMemory.buffer).subarray(tsfn, tsfn + sizeofTSFN).fill(0);
-    var resourceRef = emnapiCtx.createReference(envObject, resource, 1, 1 /* Ownership.kUserland */);
+    var resourceRef = emnapiCtx.createReference(envObject, resource, 1, 1 /* ReferenceOwnership.kUserland */);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var resource_ = resourceRef.id;
     {{{ makeSetValue('tsfn', 0, 'resource_', '*') }}};
@@ -6393,7 +6408,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();
 }
@@ -7074,9 +7089,15 @@ function _napi_get_version(env, result) {
     node_api_create_external_string_utf16: _node_api_create_external_string_utf16,
     node_api_create_external_string_utf16__deps: ["$emnapiString", "napi_create_string_utf16"],
     node_api_create_external_string_utf16__sig: "ippppppp",
+    node_api_create_property_key_latin1: _node_api_create_property_key_latin1,
+    node_api_create_property_key_latin1__deps: ["napi_create_string_latin1"],
+    node_api_create_property_key_latin1__sig: "ipppp",
     node_api_create_property_key_utf16: _node_api_create_property_key_utf16,
     node_api_create_property_key_utf16__deps: ["napi_create_string_utf16"],
     node_api_create_property_key_utf16__sig: "ipppp",
+    node_api_create_property_key_utf8: _node_api_create_property_key_utf8,
+    node_api_create_property_key_utf8__deps: ["napi_create_string_utf8"],
+    node_api_create_property_key_utf8__sig: "ipppp",
     node_api_create_syntax_error: _node_api_create_syntax_error,
     node_api_create_syntax_error__deps: ["$emnapiCtx"],
     node_api_create_syntax_error__sig: "ipppp",

package/emnapi.gyp

@@ -47,6 +47,9 @@
     {
       'target_name': 'emnapi_basic',
       'type': 'static_library',
+      'defines': [
+        'EMNAPI_DISABLE_UV'
+      ],
       'sources': [
         'src/js_native_api.c',
         'src/node_api.c',
@@ -63,7 +66,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 3
+#define EMNAPI_PATCH_VERSION 0
 
 typedef enum {
   emnapi_runtime,