emnapi 0.44.0 → 1.0.0

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 44
+#define EMNAPI_MAJOR_VERSION 1
+#define EMNAPI_MINOR_VERSION 0
 #define EMNAPI_PATCH_VERSION 0
 
 typedef enum {

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

@@ -99,6 +99,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_string_utf16(napi_env env,
                                                             size_t length,
                                                             napi_value* result);
 #ifdef NAPI_EXPERIMENTAL
+#define NODE_API_EXPERIMENTAL_HAS_EXTERNAL_STRINGS
 NAPI_EXTERN napi_status NAPI_CDECL
 node_api_create_external_string_latin1(napi_env env,
                                        char* str,
@@ -116,6 +117,13 @@ node_api_create_external_string_utf16(napi_env env,
                                       napi_value* result,
                                       bool* copied);
 #endif  // NAPI_EXPERIMENTAL
+
+#ifdef NAPI_EXPERIMENTAL
+#define NODE_API_EXPERIMENTAL_HAS_PROPERTY_KEYS
+NAPI_EXTERN napi_status NAPI_CDECL node_api_create_property_key_utf16(
+    napi_env env, const char16_t* str, size_t length, napi_value* result);
+#endif  // NAPI_EXPERIMENTAL
+
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_symbol(napi_env env,
                                                       napi_value description,
                                                       napi_value* result);
@@ -524,6 +532,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_add_finalizer(napi_env env,
 #endif  // NAPI_VERSION >= 5
 
 #ifdef NAPI_EXPERIMENTAL
+#define NODE_API_EXPERIMENTAL_HAS_POST_FINALIZER
 
 NAPI_EXTERN napi_status NAPI_CDECL
 node_api_post_finalizer(napi_env env,

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.44.0",
+  "version": "1.0.0",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "peerDependencies": {

package/src/async_context.c

@@ -20,8 +20,7 @@ napi_async_init(napi_env env,
                 napi_value async_resource,
                 napi_value async_resource_name,
                 napi_async_context* result) {
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, async_resource_name);
   CHECK_ARG(env, result);
 
@@ -39,8 +38,7 @@ napi_async_init(napi_env env,
 
 napi_status napi_async_destroy(napi_env env,
                                napi_async_context async_context) {
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, async_context);
 
   napi_status status = _emnapi_async_destroy_js(async_context);

package/src/async_work.c

@@ -148,8 +148,7 @@ napi_status napi_create_async_work(napi_env env,
                                    void* data,
                                    napi_async_work* result) {
 #if EMNAPI_HAVE_THREADS
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, execute);
   CHECK_ARG(env, result);
 
@@ -188,8 +187,7 @@ napi_status napi_create_async_work(napi_env env,
 
 napi_status napi_delete_async_work(napi_env env, napi_async_work work) {
 #if EMNAPI_HAVE_THREADS
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, work);
 
   async_work_delete(work);

package/src/emnapi_internal.h

@@ -52,6 +52,12 @@ EXTERN_C_END
 #define CHECK_ARG(env, arg) \
   RETURN_STATUS_IF_FALSE((env), ((arg) != NULL), napi_invalid_arg)
 
+#define CHECK_ENV_NOT_IN_GC(env)                                               \
+  do {                                                                         \
+    CHECK_ENV((env));                                                          \
+    _emnapi_env_check_gc_access((env));                                          \
+  } while (0)
+
 #define CHECK(expr)                                                           \
   do {                                                                        \
     if (!(expr)) {                                                            \

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/src/threadsafe_function.c

@@ -408,8 +408,7 @@ napi_create_threadsafe_function(napi_env env,
                                 napi_threadsafe_function_call_js call_js_cb,
                                 napi_threadsafe_function* result) {
 #if EMNAPI_HAVE_THREADS
-  CHECK_ENV(env);
-  _emnapi_env_check_gc_access(env);
+  CHECK_ENV_NOT_IN_GC(env);
   CHECK_ARG(env, async_resource_name);
   RETURN_STATUS_IF_FALSE(env, initial_thread_count > 0, napi_invalid_arg);
   CHECK_ARG(env, result);

package/lib/wasm32-emscripten.txt

@@ -1,5 +0,0 @@
-emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.36 (518d9fea335f7cd2b5771e43df76e0535c6df5dd)
-clang version 17.0.0 (https://github.com/llvm/llvm-project 5084abbea933b1a510556726a9e226b5ae22f19f)
-Target: wasm32-unknown-emscripten
-Thread model: posix
-InstalledDir: /home/runner/work/emnapi/emnapi/emsdk-cache/emsdk-main/upstream/bin

package/lib/wasm32-wasi-threads.txt

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

package/lib/wasm32-wasi.txt

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

package/lib/wasm32.txt

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