emnapi 1.3.0 → 1.3.1

package/README.md

@@ -45,6 +45,7 @@ You will need to install:
 - npm `>= v8`
 - Emscripten `>= v3.1.9` / wasi-sdk / LLVM clang with wasm support
 - (Optional) CMake `>= v3.13`
+- (Optional) node-gyp `>= v10.2.0`
 - (Optional) ninja
 - (Optional) make
 - (Optional) [node-addon-api](https://github.com/nodejs/node-addon-api) `>= 6.1.0`
@@ -68,6 +69,9 @@ emcc -v
 
 cmake --version
 
+# if you use node-gyp
+node-gyp --version
+
 # if you use ninja
 ninja --version
 
@@ -629,15 +633,9 @@ 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 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
+Require node-gyp `>= 10.2.0`
 
-If you experienced issues on Windows or macOS, please check the PRs for upstream changes detail and see
-[emnapi-node-gyp-test](https://github.com/toyobayashi/emnapi-node-gyp-test) for examples.
+See [emnapi-node-gyp-test](https://github.com/toyobayashi/emnapi-node-gyp-test) for examples.
 
 - Variables
 
@@ -685,19 +683,10 @@ declare var emnapi_manual_linking: 0 | 1
         ["OS == 'emscripten'", {
           "product_extension": "js", # required
 
-          # Windows and Linux
           "cflags": [],
           "cflags_c": [],
           "cflags_cc": [],
-          "ldflags": [],
-
-          # macOS uses following config
-          'xcode_settings': {
-            "WARNING_CFLAGS": [], # cflags
-            "OTHER_CFLAGS": [], # cflags_c
-            "OTHER_CPLUSPLUSFLAGS": [], # cflags_cc
-            "OTHER_LDFLAGS": [] # ldflags
-          }
+          "ldflags": []
         }],
         ["OS == 'wasi'", {
           # ...

package/common.gypi

@@ -312,6 +312,7 @@
               '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',

package/dist/library_napi.js

@@ -1237,6 +1237,9 @@ function _napi_get_buffer_info(env, buffer, data, length) {
     var handle = emnapiCtx.handleStore.get(buffer);
     if (!handle.isBuffer(emnapiCtx.feature.Buffer))
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    if (handle.isDataView()) {
+        return _napi_get_dataview_info(env, buffer, length, data, 0, 0);
+    }
     return _napi_get_typedarray_info(env, buffer, 0, length, data, 0, 0);
 }
 /**
@@ -3035,10 +3038,10 @@ function _napi_create_typedarray(env, type, length, arraybuffer, byte_offset, re
         if (!result)
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         var handle = emnapiCtx.handleStore.get(arraybuffer);
-        var buffer = handle.value;
-        if (!(buffer instanceof ArrayBuffer)) {
+        if (!handle.isArrayBuffer()) {
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
+        var buffer = handle.value;
         {{{ from64('byte_offset') }}};
         {{{ from64('length') }}};
         var createTypedArray = function (envObject, Type, size_of_element, buffer, byte_offset, length) {
@@ -3214,6 +3217,68 @@ function _napi_create_buffer_copy(env, length, data, result_data, result) {
 function _napi_create_external_buffer(env, length, data, finalize_cb, finalize_hint, result) {
     return _emnapi_create_memory_view(env, -2 /* emnapi_memory_view_type.emnapi_buffer */, data, length, finalize_cb, finalize_hint, result);
 }
+/**
+ * @__sig ippppp
+ */
+function _node_api_create_buffer_from_arraybuffer(env, arraybuffer, byte_offset, byte_length, result) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    var value;
+    if (!env)
+        return 1 /* napi_status.napi_invalid_arg */;
+    // @ts-expect-error
+    var envObject = emnapiCtx.envStore.get(env);
+    envObject.checkGCAccess();
+    if (!envObject.tryCatch.isEmpty())
+        return envObject.setLastError(10 /* napi_status.napi_pending_exception */);
+    if (!envObject.canCallIntoJs())
+        return envObject.setLastError(envObject.moduleApiVersion === 2147483647 /* Version.NAPI_VERSION_EXPERIMENTAL */ ? 23 /* napi_status.napi_cannot_run_js */ : 10 /* napi_status.napi_pending_exception */);
+    envObject.clearLastError();
+    try {
+        if (!arraybuffer)
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+        if (!result)
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+        {{{ from64('byte_offset') }}};
+        {{{ from64('byte_length') }}};
+        byte_offset = byte_offset >>> 0;
+        byte_length = byte_length >>> 0;
+        var handle = emnapiCtx.handleStore.get(arraybuffer);
+        if (!handle.isArrayBuffer()) {
+            return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+        }
+        var buffer = handle.value;
+        if ((byte_length + byte_offset) > buffer.byteLength) {
+            var err = new RangeError('The byte offset + length is out of range');
+            err.code = 'ERR_OUT_OF_RANGE';
+            throw err;
+        }
+        var Buffer = emnapiCtx.feature.Buffer;
+        if (!Buffer) {
+            throw emnapiCtx.createNotSupportBufferError('node_api_create_buffer_from_arraybuffer', '');
+        }
+        var out = Buffer.from(buffer, byte_offset, byte_length);
+        if (buffer === wasmMemory.buffer) {
+            if (!emnapiExternalMemory.wasmMemoryViewTable.has(out)) {
+                emnapiExternalMemory.wasmMemoryViewTable.set(out, {
+                    Ctor: Buffer,
+                    address: byte_offset,
+                    length: byte_length,
+                    ownership: 1 /* ReferenceOwnership.kUserland */,
+                    runtimeAllocated: 0
+                });
+            }
+        }
+        {{{ from64('result') }}};
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        value = emnapiCtx.addToCurrentScope(out).id;
+        {{{ makeSetValue('result', 0, 'value', '*') }}};
+        return envObject.getReturnStatus();
+    }
+    catch (err) {
+        envObject.tryCatch.setError(err);
+        return envObject.setLastError(10 /* napi_status.napi_pending_exception */);
+    }
+}
 /**
  * @__sig ippppp
  */
@@ -3240,10 +3305,10 @@ function _napi_create_dataview(env, byte_length, arraybuffer, byte_offset, resul
         byte_length = byte_length >>> 0;
         byte_offset = byte_offset >>> 0;
         var handle = emnapiCtx.handleStore.get(arraybuffer);
-        var buffer = handle.value;
-        if (!(buffer instanceof ArrayBuffer)) {
+        if (!handle.isArrayBuffer()) {
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
+        var buffer = handle.value;
         if ((byte_length + byte_offset) > buffer.byteLength) {
             var err = new RangeError('byte_offset + byte_length should be less than or equal to the size in bytes of the array passed in');
             err.code = 'ERR_NAPI_INVALID_DATAVIEW_ARGS';
@@ -6849,18 +6914,18 @@ function _napi_get_version(env, result) {
     napi_get_boolean: _napi_get_boolean,
     napi_get_boolean__deps: ["$emnapiCtx"],
     napi_get_boolean__sig: "ipip",
+    napi_get_dataview_info: _napi_get_dataview_info,
+    napi_get_dataview_info__deps: ["$emnapiCtx", "$emnapiExternalMemory"],
+    napi_get_dataview_info__sig: "ipppppp",
     napi_get_typedarray_info: _napi_get_typedarray_info,
     napi_get_typedarray_info__deps: ["$emnapiCtx", "$emnapiExternalMemory"],
     napi_get_typedarray_info__sig: "ippppppp",
     napi_get_buffer_info: _napi_get_buffer_info,
-    napi_get_buffer_info__deps: ["$emnapiCtx", "napi_get_typedarray_info"],
+    napi_get_buffer_info__deps: ["$emnapiCtx", "napi_get_dataview_info", "napi_get_typedarray_info"],
     napi_get_buffer_info__sig: "ipppp",
     napi_get_cb_info: _napi_get_cb_info,
     napi_get_cb_info__deps: ["$emnapiCtx"],
     napi_get_cb_info__sig: "ipppppp",
-    napi_get_dataview_info: _napi_get_dataview_info,
-    napi_get_dataview_info__deps: ["$emnapiCtx", "$emnapiExternalMemory"],
-    napi_get_dataview_info__sig: "ipppppp",
     napi_get_date_value: _napi_get_date_value,
     napi_get_date_value__deps: ["$emnapiCtx"],
     napi_get_date_value__sig: "ippp",
@@ -7083,6 +7148,9 @@ function _napi_get_version(env, result) {
     napi_wrap: _napi_wrap,
     napi_wrap__deps: ["$emnapiWrap"],
     napi_wrap__sig: "ipppppp",
+    node_api_create_buffer_from_arraybuffer: _node_api_create_buffer_from_arraybuffer,
+    node_api_create_buffer_from_arraybuffer__deps: ["$emnapiCtx", "$emnapiExternalMemory"],
+    node_api_create_buffer_from_arraybuffer__sig: "ippppp",
     node_api_create_external_string_latin1: _node_api_create_external_string_latin1,
     node_api_create_external_string_latin1__deps: ["$emnapiString", "napi_create_string_latin1"],
     node_api_create_external_string_latin1__sig: "ippppppp",

package/emnapi.gyp

@@ -102,6 +102,7 @@
         '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',

package/include/node/emnapi.h

@@ -7,7 +7,7 @@
 
 #define EMNAPI_MAJOR_VERSION 1
 #define EMNAPI_MINOR_VERSION 3
-#define EMNAPI_PATCH_VERSION 0
+#define EMNAPI_PATCH_VERSION 1
 
 typedef enum {
   emnapi_runtime,

package/include/node/node_api.h

@@ -145,6 +145,18 @@ napi_create_external_buffer(napi_env env,
                             void* finalize_hint,
                             napi_value* result);
 #endif  // NODE_API_NO_EXTERNAL_BUFFERS_ALLOWED
+
+#ifdef NAPI_EXPERIMENTAL
+#define NODE_API_EXPERIMENTAL_HAS_CREATE_BUFFER_FROM_ARRAYBUFFER
+
+NAPI_EXTERN napi_status NAPI_CDECL
+node_api_create_buffer_from_arraybuffer(napi_env env,
+                                        napi_value arraybuffer,
+                                        size_t byte_offset,
+                                        size_t byte_length,
+                                        napi_value* result);
+#endif  // NAPI_EXPERIMENTAL
+
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_buffer_copy(napi_env env,
                                                            size_t length,
                                                            const void* data,

package/index.js

@@ -16,6 +16,7 @@ const sources = [
   path.join(__dirname, './src/uv/uv-common.c'),
   path.join(__dirname, './src/uv/threadpool.c'),
   path.join(__dirname, './src/uv/unix/loop.c'),
+  path.join(__dirname, './src/uv/unix/posix-hrtime.c'),
   path.join(__dirname, './src/uv/unix/thread.c'),
   path.join(__dirname, './src/uv/unix/async.c'),
   path.join(__dirname, './src/uv/unix/core.c')

package/package.json

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