emnapi 0.45.0 → 1.0.0

package/CMakeLists.txt

@@ -38,7 +38,7 @@ set(EMNAPI_THREADS_SRC
 )
 set(EMNAPI_SRC ${ENAPI_BASIC_SRC} ${EMNAPI_THREADS_SRC})
 
-set(EMNAPI_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+set(EMNAPI_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include/node")
 set(EMNAPI_DEFINES "BUILDING_NODE_EXTENSION")
 
 set(EMNAPI_JS_LIB "${CMAKE_CURRENT_SOURCE_DIR}/dist/library_napi.js")
@@ -209,35 +209,41 @@ if(LIB_ARCH)
 endif()
 
 install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/emnapi_common.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/emnapi.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/js_native_api_types.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/js_native_api.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node_api_types.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/node_api.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/uv.h
-  DESTINATION "include/${PROJECT_NAME}")
+    ${CMAKE_CURRENT_SOURCE_DIR}/common.gypi
+    ${CMAKE_CURRENT_SOURCE_DIR}/emnapi.gyp
+  DESTINATION ".")
+
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/emnapi_common.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/emnapi.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/js_native_api_types.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/js_native_api.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/node_api_types.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/node_api.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/uv.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/node/config.gypi
+  DESTINATION "include/node")
 
 install(DIRECTORY
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/uv
-  DESTINATION "include/${PROJECT_NAME}")
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/node/uv
+  DESTINATION "include/node")
 
 install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/dist/library_napi.js
-  DESTINATION "lib/${PROJECT_NAME}")
+  DESTINATION "dist")
 
 if(EMNAPI_INSTALL_SRC)
   install(FILES
       ${EMNAPI_SRC}
       "${CMAKE_CURRENT_SOURCE_DIR}/src/emnapi_internal.h"
-    DESTINATION "src/${PROJECT_NAME}")
+    DESTINATION "src")
   install(DIRECTORY
     ${CMAKE_CURRENT_SOURCE_DIR}/src/uv
-    DESTINATION "src/${PROJECT_NAME}")
+    DESTINATION "src")
   install(DIRECTORY
     ${CMAKE_CURRENT_SOURCE_DIR}/src/malloc
-    DESTINATION "src/${PROJECT_NAME}")
+    DESTINATION "src")
   install(DIRECTORY
     ${CMAKE_CURRENT_SOURCE_DIR}/src/thread
-    DESTINATION "src/${PROJECT_NAME}")
+    DESTINATION "src")
 endif()

package/README.md

@@ -4,15 +4,25 @@
   <img src="https://toyobayashi.github.io/emnapi-docs/emnapi.svg" alt="emnapi logo" width="256" />
 </p>
 
+## Sponsors
+
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/toyobayashi/toyobayashi/sponsorkit/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/toyobayashi/toyobayashi/sponsorkit/sponsors.svg'/>
+  </a>
+</p>
+
 [![Build](https://github.com/toyobayashi/emnapi/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/toyobayashi/emnapi/actions/workflows/main.yml)
 
-[Node-API](https://nodejs.org/docs/latest/api/n-api.html) implementation for [Emscripten](https://emscripten.org/index.html), [wasi-sdk](https://github.com/WebAssembly/wasi-sdk) and clang with wasm support. napi-rs support is comming soon.
+[Node-API](https://nodejs.org/docs/latest/api/n-api.html) implementation for [Emscripten](https://emscripten.org/index.html), [wasi-sdk](https://github.com/WebAssembly/wasi-sdk) and clang with wasm support.
 
 This project aims to
 
 - Help users port their or existing Node-API native addons to wasm with code change as less as possible.
 - Make runtime behavior matches native Node.js as much as possible.
 
+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.
+
 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/)
@@ -167,7 +177,7 @@ module.exports = (function (exports) {
 emcc -O3 \
      -DBUILDING_NODE_EXTENSION \
      "-DNAPI_EXTERN=__attribute__((__import_module__(\"env\")))" \
-     -I./node_modules/emnapi/include \
+     -I./node_modules/emnapi/include/node \
      -L./node_modules/emnapi/lib/wasm32-emscripten \
      --js-library=./node_modules/emnapi/dist/library_napi.js \
      -sEXPORTED_FUNCTIONS="['_malloc','_free','_napi_register_wasm_v1','_node_api_module_get_api_version_v1']" \
@@ -184,7 +194,7 @@ emcc -O3 \
 ```bash
 clang -O3 \
       -DBUILDING_NODE_EXTENSION \
-      -I./node_modules/emnapi/include \
+      -I./node_modules/emnapi/include/node \
       -L./node_modules/emnapi/lib/wasm32-wasi \
       --target=wasm32-wasi \
       --sysroot=$WASI_SDK_PATH/share/wasi-sysroot \
@@ -212,7 +222,7 @@ Choose `libdlmalloc.a` or `libemmalloc.a` for `malloc` and `free`.
 ```bash
 clang -O3 \
       -DBUILDING_NODE_EXTENSION \
-      -I./node_modules/emnapi/include \
+      -I./node_modules/emnapi/include/node \
       -L./node_modules/emnapi/lib/wasm32 \
       --target=wasm32 \
       -nostdlib \
@@ -456,7 +466,7 @@ em++ -O3 \
      "-DNAPI_EXTERN=__attribute__((__import_module__(\"env\")))" \
      -DNAPI_DISABLE_CPP_EXCEPTIONS \
      -DNODE_ADDON_API_ENABLE_MAYBE \
-     -I./node_modules/emnapi/include \
+     -I./node_modules/emnapi/include/node \
      -I./node_modules/node-addon-api \
      -L./node_modules/emnapi/lib/wasm32-emscripten \
      --js-library=./node_modules/emnapi/dist/library_napi.js \
@@ -476,7 +486,7 @@ clang++ -O3 \
         -DBUILDING_NODE_EXTENSION \
         -DNAPI_DISABLE_CPP_EXCEPTIONS \
         -DNODE_ADDON_API_ENABLE_MAYBE \
-        -I./node_modules/emnapi/include \
+        -I./node_modules/emnapi/include/node \
         -I./node_modules/node-addon-api \
         -L./node_modules/emnapi/lib/wasm32-wasi \
         --target=wasm32-wasi \
@@ -508,7 +518,7 @@ You can still use `wasm32-unknown-unknown` target if you use Node-API C API only
 ```bash
 clang++ -O3 \
         -DBUILDING_NODE_EXTENSION \
-        -I./node_modules/emnapi/include \
+        -I./node_modules/emnapi/include/node \
         -L./node_modules/emnapi/lib/wasm32 \
         --target=wasm32 \
         -fno-exceptions \
@@ -615,158 +625,166 @@ cmake --build build
 
 Output code can run in recent version modern browsers and Node.js latest LTS. IE is not supported.
 
-### Using Rust (Experimental)
+### Using node-gyp (Experimental)
 
-Currently you can use [napi-rs](https://github.com/napi-rs/napi-rs) like this, more work is working in progress.  
+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.
 
-Note: WASI target require rust nightly toolchain.
+- https://github.com/nodejs/gyp-next/pull/222
+- https://github.com/nodejs/node-gyp/pull/2974
 
-<details>
-<summary>Cargo.toml</summary><br />
-
-```toml
-[package]
-edition = "2021"
-name = "binding"
-version = "0.0.0"
-
-# We should build binary for WASI reactor
-# https://github.com/rust-lang/rust/pull/79997
-# https://github.com/WebAssembly/WASI/issues/24
-# for wasm
-[[bin]]
-name = "binding"
-path = "src/main.rs"
-
-# for native
-# [lib]
-# name = "binding"
-# path = "src/lib.rs"
-# crate-type = ["cdylib"]
-
-[dependencies]
-napi = { version = "2.12.1", default-features = false, features = ["napi8"] }
-napi-sys = { version = "2.2.3", features = ["napi8"] }
-napi-derive = "2.12.2"
-
-[build-dependencies]
-napi-build = "2.0.1"
-
-[profile.release]
-strip = "symbols"
-```
+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.
 
-</details>
+- Variables
 
-<details>
-<summary>.cargo/config.toml</summary><br />
-
-```toml
-[build]
-target = [
-  "wasm32-unknown-unknown",
-  "wasm32-wasi"
-]
-
-[target.wasm32-unknown-unknown]
-rustflags = [
-  "-L./node_modules/emnapi/lib/wasm32",
-  "-lemnapi",
-  "-ldlmalloc",
-  # "-lemmalloc",
-  "-C", "link-arg=--no-entry",
-  "-C", "link-arg=--initial-memory=16777216",
-  "-C", "link-arg=--export-dynamic",
-  "-C", "link-arg=--export=malloc",
-  "-C", "link-arg=--export=free",
-  "-C", "link-arg=--export=napi_register_wasm_v1",
-  "-C", "link-arg=--export-if-defined=node_api_module_get_api_version_v1",
-  "-C", "link-arg=--export-table",
-  "-C", "link-arg=--import-undefined",
-]
-
-[target.wasm32-wasi]
-rustflags = [
-  "-L./node_modules/emnapi/lib/wasm32-wasi",
-  "-lemnapi",
-  "-C", "link-arg=--initial-memory=16777216",
-  "-C", "link-arg=--export-dynamic",
-  "-C", "link-arg=--export=malloc",
-  "-C", "link-arg=--export=free",
-  "-C", "link-arg=--export=napi_register_wasm_v1",
-  "-C", "link-arg=--export-if-defined=node_api_module_get_api_version_v1",
-  "-C", "link-arg=--export-table",
-  "-C", "link-arg=--import-undefined",
-  "-Z", "wasi-exec-model=reactor", # +nightly
-]
-```
+Arch: `node-gyp configure --arch=<wasm32 | wasm64>`
 
-</details>
+```ts
+// node-gyp configure -- -Dvariable_name=value
 
-<details>
-<summary>src/main.rs</summary><br />
+declare var OS: 'emscripten' | 'wasi' | 'unknown' | ''
 
-```rust
-#![no_main]
+/**
+ * Enable async work and threadsafe-functions
+ * @default 0
+ */
+declare var wasm_threads: 0 | 1
 
-use napi_derive::napi;
+/** @default 1048576 */
+declare var stack_size: number
 
-#[napi]
-fn fibonacci(n: u32) -> u32 {
-  match n {
-    1 | 2 => 1,
-    _ => fibonacci(n - 1) + fibonacci(n - 2),
-  }
+/** @default 16777216 */
+declare var initial_memory: number
+
+/** @default 2147483648 */
+declare var max_memory: number
+
+/** @default path.join(path.dirname(commonGypiPath,'./dist/library_napi.js')) */
+declare var emnapi_js_library: string
+
+/** @default 0 */
+declare var emnapi_manual_linking: 0 | 1
+```
+
+- Create `binding.gyp`
+
+
+```py
+{
+  "targets": [
+    {
+      "target_name": "hello",
+      "sources": [
+        "hello.c"
+      ],
+      "conditions": [
+        ["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
+          }
+        }],
+        ["OS == 'wasi'", {
+          # ...
+        }],
+        ["OS == 'unknown' or OS == ''", {
+          # ...
+        }]
+      ]
+    }
+  ]
 }
 ```
 
-</details>
+- Add the following environment variables.
 
-<details>
-<summary>index.js</summary><br />
+```bash
+# Linux or macOS
+export GYP_CROSSCOMPILE=1
 
-```js
-const fs = require('fs')
-const path = require('path')
-const useWASI = false
+# emscripten
+export AR_target="$EMSDK/upstream/emscripten/emar"
+export CC_target="$EMSDK/upstream/emscripten/emcc"
+export CXX_target="$EMSDK/upstream/emscripten/em++"
 
-let wasi
-if (useWASI) {
-  const { WASI } = require('wasi')
-  wasi = new WASI({ /* ... */ })
-}
+# wasi-sdk
+export AR_target="$WASI_SDK_PATH/bin/ar"
+export CC_target="$WASI_SDK_PATH/bin/clang"
+export CXX_target="$WASI_SDK_PATH/bin/clang++"
+```
 
-const { instantiateNapiModule } = require('@emnapi/core')
+```bat
+@REM Windows
 
-const wasmBuffer = useWASI
-  ? fs.readFileSync(path.join(__dirname, './target/wasm32-wasi/release/binding.wasm'))
-  : fs.readFileSync(path.join(__dirname, './target/wasm32-unknown-unknown/release/binding.wasm'))
-
-instantiateNapiModule(wasmBuffer, {
-  context: require('@emnapi/runtime').getDefaultContext(),
-  wasi,
-  beforeInit ({ instance }) {
-    for (const sym in instance.exports) {
-      if (sym.startsWith('__napi_register__')) {
-        instance.exports[sym]()
-      }
-    }
-  },
-  overwriteImports (importObject) {
-    importObject.env = {
-      ...importObject.env,
-      ...importObject.napi,
-      ...importObject.emnapi
-    }
-  }
-}).then(({ napiModule }) => {
-  const binding = napiModule.exports
-  // output: 5
-  console.log(binding.fibonacci(5))
-})
+set GYP_CROSSCOMPILE=1
+
+@REM emscripten
+call set AR_target=%%EMSDK:\=/%%/upstream/emscripten/emar.bat
+call set CC_target=%%EMSDK:\=/%%/upstream/emscripten/emcc.bat
+call set CXX_target=%%EMSDK:\=/%%/upstream/emscripten/em++.bat
+
+@REM wasi-sdk
+call set AR_target=%%WASI_SDK_PATH:\=/%%/bin/ar.exe
+call set CC_target=%%WASI_SDK_PATH:\=/%%/bin/clang.exe
+call set CXX_target=%%WASI_SDK_PATH:\=/%%/bin/clang++.exe
 ```
 
-</details>
+- Build
+
+```bash
+# Linux or macOS
+
+# emscripten
+emmake node-gyp rebuild \
+  --arch=wasm32 \
+  --nodedir=./node_modules/emnapi \
+  -- -f make -DOS=emscripten # -Dwasm_threads=1
+
+# wasi
+node-gyp rebuild \
+  --arch=wasm32 \
+  --nodedir=./node_modules/emnapi \
+  -- -f make -DOS=wasi # -Dwasm_threads=1
+
+# bare wasm32
+node-gyp rebuild \
+  --arch=wasm32 \
+  --nodedir=./node_modules/emnapi \
+  -- -f make -DOS=unknown # -Dwasm_threads=1
+```
+
+```bat
+@REM Use make generator on Windows
+@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 -DOS=emscripten
+call emmake.bat make -C %~dp0build
+
+@REM wasi
+call npx.cmd node-gyp configure --arch=wasm32 --nodedir=./node_modules/emnapi -- -f make -DOS=wasi
+make -C %~dp0build
+
+@REM bare wasm32
+call npx.cmd node-gyp configure --arch=wasm32 --nodedir=./node_modules/emnapi -- -f make -DOS=unknown
+make -C %~dp0build
+```
+
+### Using Rust
+
+See [napi-rs](https://github.com/napi-rs/napi-rs) 
 
 ### Multithread
 
@@ -846,7 +864,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     "-sDEFAULT_PTHREAD_STACK_SIZE=2MB"
   )
 elseif(CMAKE_C_COMPILER_TARGET STREQUAL "wasm32-wasi-threads")
-  # Experimental
   target_link_libraries(hello emnapi-mt)
   set_target_properties(hello PROPERTIES SUFFIX ".wasm")
   target_compile_options(hello PRIVATE "-fno-exceptions" "-pthread")
@@ -887,7 +904,7 @@ emcmake cmake -DCMAKE_BUILD_TYPE=Release \
               -DEMNAPI_WORKER_POOL_SIZE=4 \
               -G Ninja -H. -Bbuild
 
-# wasi-sdk with thread support (Experimental)
+# wasi-sdk with thread support
 cmake -DCMAKE_TOOLCHAIN_FILE=$WASI_SDK_PATH/share/cmake/wasi-sdk-pthread.cmake \
       -DWASI_SDK_PREFIX=$WASI_SDK_PATH \
       -DEMNAPI_FIND_NODE_ADDON_API=ON \

package/cmake/wasm32.cmake

@@ -16,7 +16,7 @@ endif()
 
 set(CMAKE_C_COMPILER ${LLVM_PREFIX}/bin/clang${WASM_HOST_EXE_SUFFIX})
 set(CMAKE_CXX_COMPILER ${LLVM_PREFIX}/bin/clang++${WASM_HOST_EXE_SUFFIX})
-set(CMAKE_ASM_COMPILER ${LLVM_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_ASM_COMPILER ${LLVM_PREFIX}/bin/clang${WASM_HOST_EXE_SUFFIX})
 set(CMAKE_AR ${LLVM_PREFIX}/bin/llvm-ar${WASM_HOST_EXE_SUFFIX})
 set(CMAKE_RANLIB ${LLVM_PREFIX}/bin/llvm-ranlib${WASM_HOST_EXE_SUFFIX})
 set(CMAKE_C_COMPILER_TARGET ${triple})

package/common.gypi

@@ -0,0 +1,423 @@
+# This file is originally created by [RReverser](https://github.com/RReverser)
+# in https://github.com/lovell/sharp/pull/3522
+{
+  'variables': {
+    # OS: 'emscripten' | 'wasi' | 'unknown'
+    'clang': 1,
+    'target_arch%': 'wasm32',
+    'wasm_threads%': 0,
+    'stack_size%': 1048576,
+    'initial_memory%': 16777216,
+    'max_memory%': 2147483648,
+    # must be an absolute path
+    'emnapi_js_library%': '<!(node -p "path.resolve(process.argv[1],\'dist/library_napi.js\').replace(process.argv[2],\'/\')" "<(node_root_dir)" "\\\\")',
+    'emnapi_manual_linking%': 0,
+  },
+
+  'target_defaults': {
+    'type': 'executable',
+
+    'defines': [
+      'BUILDING_NODE_EXTENSION',
+      '__STDC_FORMAT_MACROS',
+    ],
+
+    'cflags': [
+      '-Wall',
+      '-Wextra',
+      '-Wno-unused-parameter',
+    ],
+    'cflags_cc': [
+      '-fno-rtti',
+      '-fno-exceptions',
+      '-std=c++17'
+    ],
+
+    'xcode_settings': {
+      # WARNING_CFLAGS == cflags
+      # OTHER_CFLAGS == cflags_c
+      # OTHER_CPLUSPLUSFLAGS == cflags_cc
+      # OTHER_LDFLAGS == ldflags
+
+      'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',
+      'GCC_ENABLE_CPP_RTTI': 'NO',
+      'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',
+      'WARNING_CFLAGS': [
+        '-Wall',
+        '-Wextra',
+        '-Wno-unused-parameter',
+      ]
+    },
+
+    'default_configuration': 'Release',
+    'configurations': {
+      'Debug': {
+        'defines': [ 'DEBUG', '_DEBUG' ],
+        'cflags': [ '-g', '-O0' ],
+        'ldflags': [ '-g', '-O0' ],
+        'xcode_settings': {
+          'WARNING_CFLAGS': [ '-g', '-O0' ],
+          'OTHER_LDFLAGS': [ '-g', '-O0' ],
+        },
+      },
+      'Release': {
+        'cflags': [ '-O3' ],
+        'ldflags': [ '-O3' ],
+        'xcode_settings': {
+          'WARNING_CFLAGS': [ '-O3' ],
+          'OTHER_LDFLAGS': [ '-O3' ],
+        },
+      }
+    },
+
+    'conditions': [
+      ['OS == "emscripten"', {
+        'defines': [
+          'NAPI_EXTERN=__attribute__((__import_module__(\"env\")))'
+        ],
+
+        'cflags': [
+          '-sDEFAULT_TO_CXX=0',
+        ],
+        'ldflags': [
+          "-sALLOW_MEMORY_GROWTH=1",
+          "-sEXPORTED_FUNCTIONS=['_malloc','_free','_napi_register_wasm_v1','_node_api_module_get_api_version_v1']",
+          '-sNODEJS_CATCH_EXIT=0',
+          '-sNODEJS_CATCH_REJECTION=0',
+          '-sWASM_BIGINT=1',
+          '-sMIN_CHROME_VERSION=84',
+          '-sMIN_NODE_VERSION=161500',
+          '-sSTACK_SIZE=<(stack_size)',
+          '-sDEFAULT_PTHREAD_STACK_SIZE=<(stack_size)',
+          '-sINITIAL_MEMORY=<(initial_memory)',
+          '-sMAXIMUM_MEMORY=<(max_memory)',
+        ],
+        'xcode_settings': {
+          'WARNING_CFLAGS': [
+            '-sDEFAULT_TO_CXX=0',
+          ],
+          'OTHER_LDFLAGS': [
+            "-sALLOW_MEMORY_GROWTH=1",
+            "-sEXPORTED_FUNCTIONS=['_malloc','_free','_napi_register_wasm_v1','_node_api_module_get_api_version_v1']",
+            '-sNODEJS_CATCH_EXIT=0',
+            '-sNODEJS_CATCH_REJECTION=0',
+            '-sWASM_BIGINT=1',
+            '-sMIN_CHROME_VERSION=84',
+            '-sMIN_NODE_VERSION=161500',
+            '-sSTACK_SIZE=<(stack_size)',
+            '-sDEFAULT_PTHREAD_STACK_SIZE=<(stack_size)',
+            '-sINITIAL_MEMORY=<(initial_memory)',
+            '-sMAXIMUM_MEMORY=<(max_memory)',
+          ],
+        },
+
+        'configurations': {
+          'Debug': {
+            'ldflags': [ '-sSAFE_HEAP=1' ],
+            'xcode_settings': {
+              'OTHER_LDFLAGS': [ '-sSAFE_HEAP=1' ],
+            },
+          }
+        },
+
+        'conditions': [
+          ['target_arch == "wasm64"', {
+            'cflags': [ '-sMEMORY64=1' ],
+            'ldflags': [ '-sMEMORY64=1' ],
+            'xcode_settings': {
+              'WARNING_CFLAGS': [ '-sMEMORY64=1' ],
+              'OTHER_LDFLAGS': [ '-sMEMORY64=1' ],
+            },
+          }],
+          ['wasm_threads != 0', {
+            'cflags': [ '-sWASM_WORKERS=1', '-pthread' ],
+            'ldflags': [ '-pthread' ],
+            'xcode_settings': {
+              'WARNING_CFLAGS': [ '-sWASM_WORKERS=1', '-pthread' ],
+              'OTHER_LDFLAGS': [ '-pthread' ],
+            },
+          }],
+        ],
+      }], 
+      ['OS in "wasi unknown "', {
+        'configurations': {
+          'Release': {
+            'ldflags': [ '-Wl,--strip-debug' ],
+            'xcode_settings': {
+              'OTHER_LDFLAGS': [ '-Wl,--strip-debug' ],
+            },
+          }
+        },
+
+        'conditions': [
+          ['target_arch == "wasm64"', {
+            'ldflags': [ "-Wl,-mwasm64" ],
+            'xcode_settings': {
+              'OTHER_LDFLAGS': [ "-Wl,-mwasm64" ],
+            },
+          }],
+          ['wasm_threads != 0', {
+            'cflags': [ "-matomics", "-mbulk-memory" ],
+            'xcode_settings': {
+              'WARNING_CFLAGS': [ "-matomics", "-mbulk-memory" ],
+            },
+          }],
+          ['OS == "wasi"', {
+            'ldflags': [
+              '-mexec-model=reactor'
+            ],
+            'xcode_settings': {
+              'OTHER_LDFLAGS': [
+                '-mexec-model=reactor'
+              ],
+            },
+            'conditions': [
+              ['target_arch == "wasm64"', {
+                'conditions': [
+                  ['wasm_threads != 0', {
+                    # wasi-threads
+                    'cflags': [ '--target=wasm64-wasi-threads', '-pthread' ],
+                    'ldflags': [ '--target=wasm64-wasi-threads', '-pthread' ],
+                    'xcode_settings': {
+                      'WARNING_CFLAGS': [ '--target=wasm64-wasi-threads', '-pthread' ],
+                      'OTHER_LDFLAGS': [ '--target=wasm64-wasi-threads', '-pthread' ],
+                    },
+                  }, {
+                    # wasi
+                    'cflags': [ '--target=wasm64-wasi' ],
+                    'ldflags': [ '--target=wasm64-wasi' ],
+                    'xcode_settings': {
+                      'WARNING_CFLAGS': [ '--target=wasm64-wasi' ],
+                      'OTHER_LDFLAGS': [ '--target=wasm64-wasi' ],
+                    },
+                  }],
+                ],
+              }, {
+                'conditions': [
+                  ['wasm_threads != 0', {
+                    # wasi-threads
+                    'cflags': [ '--target=wasm32-wasi-threads', '-pthread' ],
+                    'ldflags': [ '--target=wasm32-wasi-threads', '-pthread' ],
+                    'xcode_settings': {
+                      'WARNING_CFLAGS': [ '--target=wasm32-wasi-threads', '-pthread' ],
+                      'OTHER_LDFLAGS': [ '--target=wasm32-wasi-threads', '-pthread' ],
+                    },
+                  }, {
+                    # wasi
+                    'cflags': [ '--target=wasm32-wasi' ],
+                    'ldflags': [ '--target=wasm32-wasi' ],
+                    'xcode_settings': {
+                      'WARNING_CFLAGS': [ '--target=wasm32-wasi' ],
+                      'OTHER_LDFLAGS': [ '--target=wasm32-wasi' ],
+                    },
+                  }],
+                ],
+              }],
+            ],
+          }, {
+            'conditions': [
+              ['target_arch == "wasm64"', {
+                'cflags': [ '--target=wasm64-unknown-unknown' ],
+                'ldflags': [ '--target=wasm64-unknown-unknown' ],
+                'xcode_settings': {
+                  'WARNING_CFLAGS': [ '--target=wasm64-unknown-unknown' ],
+                  'OTHER_LDFLAGS': [ '--target=wasm64-unknown-unknown' ],
+                },
+              }, {
+                'cflags': [ '--target=wasm32-unknown-unknown' ],
+                'ldflags': [ '--target=wasm32-unknown-unknown' ],
+                'xcode_settings': {
+                  'WARNING_CFLAGS': [ '--target=wasm32-unknown-unknown' ],
+                  'OTHER_LDFLAGS': [ '--target=wasm32-unknown-unknown' ],
+                },
+              }],
+            ],
+          }],
+        ]
+      }],
+      ['emnapi_manual_linking != 0', {
+        'target_conditions': [
+          ['_type=="executable"', {
+            'conditions': [
+              ['OS in "wasi unknown "', {
+                'product_extension': 'wasm',
+
+                'ldflags': [
+                  '-Wl,--export-dynamic',
+                  '-Wl,--export=malloc',
+                  '-Wl,--export=free',
+                  '-Wl,--export=napi_register_wasm_v1',
+                  '-Wl,--export-if-defined=node_api_module_get_api_version_v1',
+                  '-Wl,--import-undefined',
+                  '-Wl,--export-table',
+                  '-Wl,-zstack-size=<(stack_size)',
+                  '-Wl,--initial-memory=<(initial_memory)',
+                  '-Wl,--max-memory=<(max_memory)',
+                ],
+                'xcode_settings': {
+                  'OTHER_LDFLAGS': [
+                    '-Wl,--export-dynamic',
+                    '-Wl,--export=malloc',
+                    '-Wl,--export=free',
+                    '-Wl,--export=napi_register_wasm_v1',
+                    '-Wl,--export-if-defined=node_api_module_get_api_version_v1',
+                    '-Wl,--import-undefined',
+                    '-Wl,--export-table',
+                    '-Wl,-zstack-size=<(stack_size)',
+                    '-Wl,--initial-memory=<(initial_memory)',
+                    '-Wl,--max-memory=<(max_memory)',
+                  ],
+                },
+
+                'conditions': [
+                  ['wasm_threads != 0', {
+                    'ldflags': [
+                      '-Wl,--import-memory',
+                      '-Wl,--shared-memory',
+                    ],
+                    'xcode_settings': {
+                      'OTHER_LDFLAGS': [
+                        '-Wl,--import-memory',
+                        '-Wl,--shared-memory',
+                      ]
+                    },
+                  }],
+                  ['OS != "wasi"', {
+                    'ldflags': [
+                      '-nostdlib',
+                      '-Wl,--no-entry',
+                    ],
+                    'xcode_settings': {
+                      'OTHER_LDFLAGS': [
+                        '-nostdlib',
+                        '-Wl,--no-entry',
+                      ],
+                    },
+                  }],
+                ]
+              }]
+            ],
+          }],
+        ],
+      }, {
+        'target_conditions': [
+          ['_type=="executable"', {
+            'sources': [
+              'src/js_native_api.c',
+              'src/node_api.c',
+              'src/async_cleanup_hook.c',
+              'src/async_context.c',
+              'src/async_work.c',
+              'src/threadsafe_function.c',
+              'src/uv/uv-common.c',
+              'src/uv/threadpool.c',
+              'src/uv/unix/loop.c',
+              'src/uv/unix/thread.c',
+              'src/uv/unix/async.c',
+              'src/uv/unix/core.c',
+            ],
+            'conditions': [
+              ['OS == "emscripten"', {
+                'conditions': [
+                  ['emnapi_js_library != ""', {
+                    'libraries': [
+                      '--js-library=<(emnapi_js_library)',
+                    ],
+                  }]
+                ],
+              }],
+              ['OS in "wasi unknown "', {
+                'product_extension': 'wasm',
+
+                'ldflags': [
+                  '-Wl,--export-dynamic',
+                  '-Wl,--export=malloc',
+                  '-Wl,--export=free',
+                  '-Wl,--export=napi_register_wasm_v1',
+                  '-Wl,--export-if-defined=node_api_module_get_api_version_v1',
+                  '-Wl,--import-undefined',
+                  '-Wl,--export-table',
+                  '-Wl,-zstack-size=<(stack_size)',
+                  '-Wl,--initial-memory=<(initial_memory)',
+                  '-Wl,--max-memory=<(max_memory)',
+                ],
+                'xcode_settings': {
+                  'OTHER_LDFLAGS': [
+                    '-Wl,--export-dynamic',
+                    '-Wl,--export=malloc',
+                    '-Wl,--export=free',
+                    '-Wl,--export=napi_register_wasm_v1',
+                    '-Wl,--export-if-defined=node_api_module_get_api_version_v1',
+                    '-Wl,--import-undefined',
+                    '-Wl,--export-table',
+                    '-Wl,-zstack-size=<(stack_size)',
+                    '-Wl,--initial-memory=<(initial_memory)',
+                    '-Wl,--max-memory=<(max_memory)',
+                  ],
+                },
+
+                'conditions': [
+                  ['wasm_threads != 0', {
+                    'ldflags': [
+                      '-Wl,--import-memory',
+                      '-Wl,--shared-memory',
+                    ],
+                    'xcode_settings': {
+                      'OTHER_LDFLAGS': [
+                        '-Wl,--import-memory',
+                        '-Wl,--shared-memory',
+                      ]
+                    },
+                  }],
+                  ['OS != "wasi"', {
+                    'defines': [
+                      'PAGESIZE=65536'
+                    ],
+                    'ldflags': [
+                      '-nostdlib',
+                      '-Wl,--no-entry',
+                    ],
+                    'xcode_settings': {
+                      'OTHER_LDFLAGS': [
+                        '-nostdlib',
+                        '-Wl,--no-entry',
+                      ],
+                    },
+                    'sources': [
+                      'src/malloc/sbrk.c',
+                      'src/malloc/memcpy.c',
+                      'src/malloc/memset.c',
+                      'src/malloc/dlmalloc/dlmalloc.c',
+                    ],
+                    'conditions': [
+                      ['wasm_threads != 0', {
+                        # wasm32 + threads
+                        'sources': [
+                          'src/thread/async_worker_create.c',
+                          'src/thread/async_worker_init.S',
+                        ],
+                        'defines': [
+                          'USE_LOCKS=1'
+                        ],
+                        'ldflags': [
+                          '-Wl,--export=emnapi_async_worker_create',
+                          '-Wl,--export=emnapi_async_worker_init',
+                        ],
+                        'xcode_settings': {
+                          'OTHER_LDFLAGS': [
+                            '-Wl,--export=emnapi_async_worker_create',
+                            '-Wl,--export=emnapi_async_worker_init',
+                          ],
+                        },
+                      }],
+                    ]
+                  }],
+                ]
+              }]
+            ],
+          }],
+        ],
+      }]
+    ],
+  }
+}

package/dist/library_napi.js

@@ -1549,7 +1549,9 @@ function _napi_get_value_int32(env, value, result) {
         return envObject.setLastError(6 /* napi_status.napi_number_expected */);
     }
     {{{ from64('result') }}};
-    {{{ makeSetValue('result', 0, 'handle.value', 'i32') }}};
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    var v = new Int32Array([handle.value])[0];
+    {{{ makeSetValue('result', 0, 'v', 'i32') }}};
     return envObject.clearLastError();
 }
 /**
@@ -1584,7 +1586,7 @@ function _napi_get_value_int64(env, value, result) {
         {{{ makeSetValue('result', 4, '0x7fffffff', 'u32') }}};
     }
     else {
-        emnapiSetValueI64(result, numberValue);
+        emnapiSetValueI64(result, Math.trunc(numberValue));
     }
     return envObject.clearLastError();
 }
@@ -1724,7 +1726,9 @@ function _napi_get_value_uint32(env, value, result) {
         return envObject.setLastError(6 /* napi_status.napi_number_expected */);
     }
     {{{ from64('result') }}};
-    {{{ makeSetValue('result', 0, 'handle.value', 'u32') }}};
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    var v = new Uint32Array([handle.value])[0];
+    {{{ makeSetValue('result', 0, 'v', 'u32') }}};
     return envObject.clearLastError();
 }
 /* eslint-disable @typescript-eslint/indent */

package/emnapi.gyp

@@ -0,0 +1,120 @@
+{
+  'targets': [
+    {
+      'target_name': 'dlmalloc',
+      'type': 'static_library',
+      'defines': [
+        'PAGESIZE=65536'
+      ],
+      'sources': [
+        'src/malloc/sbrk.c',
+        'src/malloc/memcpy.c',
+        'src/malloc/memset.c',
+        'src/malloc/dlmalloc/dlmalloc.c',
+      ],
+      'conditions': [
+        ['wasm_threads != 0', {
+          'defines': [
+            'USE_LOCKS=1'
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'emmalloc',
+      'type': 'static_library',
+      'defines': [
+        'PAGESIZE=65536'
+      ],
+      'sources': [
+        'src/malloc/sbrk.c',
+        'src/malloc/memcpy.c',
+        'src/malloc/memset.c',
+        'src/malloc/emmalloc/emmalloc.c',
+      ],
+      'cflags': [ '-fno-strict-aliasing' ],
+      'xcode_settings': {
+        'GCC_STRICT_ALIASING': 'NO',
+      },
+      'conditions': [
+        ['wasm_threads != 0', {
+          'defines': [
+            '__EMSCRIPTEN_SHARED_MEMORY__=1'
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'emnapi_basic',
+      'type': 'static_library',
+      'sources': [
+        'src/js_native_api.c',
+        'src/node_api.c',
+        'src/async_cleanup_hook.c',
+        'src/async_context.c',
+      ],
+      'link_settings': {
+        'target_conditions': [
+          ['_type == "executable" and OS == "emscripten"', {
+            'libraries': [
+              '--js-library=<(emnapi_js_library)',
+            ]
+          }],
+        ]
+      },
+      'conditions': [
+        ['wasm_threads != 0 and OS in " unknown"', {
+          'sources': [
+            'src/thread/async_worker_create.c',
+            'src/thread/async_worker_init.S',
+          ],
+          'link_settings': {
+            'target_conditions': [
+              ['_type == "executable"', {
+                'ldflags': [
+                  '-Wl,--export=emnapi_async_worker_create',
+                  '-Wl,--export=emnapi_async_worker_init',
+                ],
+                'xcode_settings': {
+                  'OTHER_LDFLAGS': [
+                    '-Wl,--export=emnapi_async_worker_create',
+                    '-Wl,--export=emnapi_async_worker_init',
+                  ],
+                },
+              }],
+            ]
+          },
+        }],
+      ]
+    },
+    {
+      'target_name': 'emnapi',
+      'type': 'static_library',
+      'sources': [
+        'src/js_native_api.c',
+        'src/node_api.c',
+        'src/async_cleanup_hook.c',
+        'src/async_context.c',
+
+        'src/uv/uv-common.c',
+        'src/uv/threadpool.c',
+        'src/uv/unix/loop.c',
+        'src/uv/unix/thread.c',
+        'src/uv/unix/async.c',
+        'src/uv/unix/core.c',
+
+        'src/async_work.c',
+        'src/threadsafe_function.c',
+      ],
+      'link_settings': {
+        'target_conditions': [
+          ['_type == "executable" and OS == "emscripten"', {
+            'libraries': [
+              '--js-library=<(emnapi_js_library)',
+            ]
+          }],
+        ]
+      },
+    }
+  ]
+}

package/include/node/config.gypi

@@ -0,0 +1,5 @@
+{
+  'variables': {
+    'napi_build_version': '9'
+  }
+}

package/include/{emnapi.h → node/emnapi.h}

@@ -5,8 +5,8 @@
 #include "js_native_api_types.h"
 #include "emnapi_common.h"
 
-#define EMNAPI_MAJOR_VERSION 0
-#define EMNAPI_MINOR_VERSION 45
+#define EMNAPI_MAJOR_VERSION 1
+#define EMNAPI_MINOR_VERSION 0
 #define EMNAPI_PATCH_VERSION 0
 
 typedef enum {

package/index.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, '__esModule', { value: true })
 
 const path = require('path')
 
-const include = path.join(__dirname, 'include')
+const include = path.join(__dirname, 'include/node')
 const includeDir = path.relative(process.cwd(), include)
-const jsLibrary = path.join(__dirname, './dist/library_napi.js')
+const jsLibrary = path.join(__dirname, './dist/library_napi.js').replace(/\\|\\\\/g, '/')
 const sources = [
   path.join(__dirname, './src/js_native_api.c'),
   path.join(__dirname, './src/node_api.c'),
@@ -20,8 +20,10 @@ const sources = [
   path.join(__dirname, './src/uv/unix/async.c'),
   path.join(__dirname, './src/uv/unix/core.c')
 ]
+const targets = path.relative(process.cwd(), path.join(__dirname, 'emnapi.gyp'))
 
 exports.include = include
 exports.include_dir = includeDir
 exports.js_library = jsLibrary
 exports.sources = sources
+exports.targets = targets

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emnapi",
-  "version": "0.45.0",
+  "version": "1.0.0",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "peerDependencies": {

package/src/js_native_api.c

@@ -42,8 +42,10 @@ napi_status napi_get_last_error_info(
 
   const int last_status = napi_cannot_run_js;
 
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || defined(__cplusplus)
   static_assert((sizeof(emnapi_error_messages) / sizeof(const char*)) == napi_cannot_run_js + 1,
                 "Count of error messages must match count of error values");
+#endif
 
   _emnapi_get_last_error_info(env,
                               &last_error.error_code,

package/src/malloc/emmalloc/emmalloc.c

@@ -77,6 +77,7 @@ _Noreturn void __assert_fail(const char *expr, const char *file, int line, const
 
 // Defind by the linker to have the address of the start of the heap.
 extern unsigned char __heap_base;
+extern unsigned char __heap_end;
 
 // Behavior of right shifting a signed integer is compiler implementation defined.
 static_assert((((int32_t)0x80000000U) >> 31) == -1, "This malloc implementation requires that right-shifting a signed integer produces a sign-extending (arithmetic) shift!");
@@ -566,9 +567,13 @@ static bool claim_more_memory(size_t numBytes)
     // If this is the first time we're called, see if we can use
     // the initial heap memory set up by wasm-ld.
     if (!listOfAllRegions) {
-      unsigned char *heap_end = sbrk(0);
-      if (numBytes <= (size_t)(heap_end - &__heap_base)) {
-        startPtr = &__heap_base;
+      unsigned char *heap_base = &__heap_base;
+      unsigned char *heap_end = &__heap_end;
+      if (heap_end < heap_base) {
+	      __builtin_trap();
+      }
+      if (numBytes <= (size_t)(heap_end - heap_base)) {
+        startPtr = heap_base;
         endPtr = heap_end;
 	break;
       }

package/lib/wasm32-emscripten.txt

@@ -1,5 +0,0 @@
-emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.44 (bec42dac7873903d09d713963e34020c22a8bd2d)
-clang version 17.0.0 (https://github.com/llvm/llvm-project a8cbd27d1f238e104a5d5ca345d93bc1f4d4ab1f)
-Target: wasm32-unknown-emscripten
-Thread model: posix
-InstalledDir: /home/runner/work/_temp/14a1b1b6-9a98-4bac-8f31-5c9ebda805ed/emsdk-main/upstream/bin

package/lib/wasm32-wasi-threads.txt

@@ -1,4 +0,0 @@
-clang version 17.0.6
-Target: wasm32-unknown-wasi-threads
-Thread model: posix
-InstalledDir: /home/runner/work/emnapi/emnapi/wasi-sdk-21.0/bin

package/lib/wasm32-wasi.txt

@@ -1,4 +0,0 @@
-clang version 17.0.6
-Target: wasm32-unknown-wasi
-Thread model: posix
-InstalledDir: /home/runner/work/emnapi/emnapi/wasi-sdk-21.0/bin

package/lib/wasm32.txt

@@ -1,4 +0,0 @@
-clang version 17.0.6
-Target: wasm32
-Thread model: posix
-InstalledDir: /home/runner/work/emnapi/emnapi/wasi-sdk-21.0/bin