emnapi 0.43.0 → 0.44.0

package/CMakeLists.txt

@@ -29,7 +29,6 @@ set(UV_SRC
 set(ENAPI_BASIC_SRC
   "${CMAKE_CURRENT_SOURCE_DIR}/src/js_native_api.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/node_api.c"
-  "${CMAKE_CURRENT_SOURCE_DIR}/src/emnapi.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/async_cleanup_hook.c"
   "${CMAKE_CURRENT_SOURCE_DIR}/src/async_context.c"
 )
@@ -40,11 +39,16 @@ set(EMNAPI_THREADS_SRC
 set(EMNAPI_SRC ${ENAPI_BASIC_SRC} ${EMNAPI_THREADS_SRC})
 
 set(EMNAPI_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+set(EMNAPI_DEFINES "BUILDING_NODE_EXTENSION")
 
 set(EMNAPI_JS_LIB "${CMAKE_CURRENT_SOURCE_DIR}/dist/library_napi.js")
 
 if(IS_EMSCRIPTEN)
   set(EMNAPI_MT_CFLAGS "-pthread" "-sWASM_WORKERS=1")
+
+  # https://github.com/emscripten-core/emscripten/issues/20035
+  # https://github.com/emscripten-core/emscripten/pull/20130
+  list(APPEND EMNAPI_DEFINES "NAPI_EXTERN=__attribute__((__import_module__(\"env\")))")
 else()
   set(EMNAPI_MT_CFLAGS "-pthread")
 endif()
@@ -115,12 +119,14 @@ endif()
 
 add_library(${EMNAPI_TARGET_NAME} STATIC ${EMNAPI_SRC} ${UV_SRC})
 target_include_directories(${EMNAPI_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
+target_compile_definitions(${EMNAPI_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES})
 if(IS_EMSCRIPTEN)
   target_link_options(${EMNAPI_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
 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})
 if(IS_EMSCRIPTEN)
   target_link_options(${EMNAPI_BASIC_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
 endif()
@@ -139,6 +145,7 @@ 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})
 endif()
 
 if(IS_EMSCRIPTEN OR (CMAKE_C_COMPILER_TARGET STREQUAL "wasm32-wasi-threads"))
@@ -151,6 +158,7 @@ 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_include_directories(${EMNAPI_MT_TARGET_NAME} PUBLIC ${EMNAPI_INCLUDE})
+  target_compile_definitions(${EMNAPI_MT_TARGET_NAME} PUBLIC ${EMNAPI_DEFINES})
   if(IS_EMSCRIPTEN)
     target_link_options(${EMNAPI_MT_TARGET_NAME} INTERFACE "--js-library=${EMNAPI_JS_LIB}")
   endif()

package/README.md

@@ -165,6 +165,8 @@ module.exports = (function (exports) {
 
 ```bash
 emcc -O3 \
+     -DBUILDING_NODE_EXTENSION \
+     "-DNAPI_EXTERN=__attribute__((__import_module__(\"env\")))" \
      -I./node_modules/emnapi/include \
      -L./node_modules/emnapi/lib/wasm32-emscripten \
      --js-library=./node_modules/emnapi/dist/library_napi.js \
@@ -181,6 +183,7 @@ emcc -O3 \
 
 ```bash
 clang -O3 \
+      -DBUILDING_NODE_EXTENSION \
       -I./node_modules/emnapi/include \
       -L./node_modules/emnapi/lib/wasm32-wasi \
       --target=wasm32-wasi \
@@ -208,6 +211,7 @@ Choose `libdlmalloc.a` or `libemmalloc.a` for `malloc` and `free`.
 
 ```bash
 clang -O3 \
+      -DBUILDING_NODE_EXTENSION \
       -I./node_modules/emnapi/include \
       -L./node_modules/emnapi/lib/wasm32 \
       --target=wasm32 \
@@ -448,6 +452,8 @@ Compile `hello.cpp` using `em++`. C++ exception is disabled by Emscripten defaul
 
 ```bash
 em++ -O3 \
+     -DBUILDING_NODE_EXTENSION \
+     "-DNAPI_EXTERN=__attribute__((__import_module__(\"env\")))" \
      -DNAPI_DISABLE_CPP_EXCEPTIONS \
      -DNODE_ADDON_API_ENABLE_MAYBE \
      -I./node_modules/emnapi/include \
@@ -467,6 +473,7 @@ em++ -O3 \
 
 ```bash
 clang++ -O3 \
+        -DBUILDING_NODE_EXTENSION \
         -DNAPI_DISABLE_CPP_EXCEPTIONS \
         -DNODE_ADDON_API_ENABLE_MAYBE \
         -I./node_modules/emnapi/include \
@@ -500,6 +507,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 \
         -L./node_modules/emnapi/lib/wasm32 \
         --target=wasm32 \

package/dist/library_napi.js

@@ -407,6 +407,28 @@ function emnapi_get_memory_address(env, arraybuffer_or_view, address, ownership,
         return envObject.setLastError(10 /* napi_status.napi_pending_exception */);
     }
 }
+function emnapi_get_runtime_version(env, version) {
+    if (!env)
+        return 1 /* napi_status.napi_invalid_arg */;
+    var envObject = emnapiCtx.envStore.get(env);
+    if (!version)
+        return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    var runtimeVersion;
+    try {
+        runtimeVersion = emnapiCtx.getRuntimeVersions().version;
+    }
+    catch (_) {
+        return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    var versions = runtimeVersion.split('.')
+        .map(function (n) { return Number(n); });
+    {{{ from64('version') }}};
+    {{{ makeSetValue('version', 0, 'versions[0]', 'u32') }}};
+    {{{ makeSetValue('version', 4, 'versions[1]', 'u32') }}};
+    {{{ makeSetValue('version', 8, 'versions[2]', 'u32') }}};
+    return envObject.clearLastError();
+}
 emnapiImplementHelper('$emnapiSyncMemory', undefined, emnapiSyncMemory, ['$emnapiExternalMemory'], 'syncMemory');
 emnapiImplementHelper('$emnapiGetMemoryAddress', undefined, emnapiGetMemoryAddress, ['$emnapiExternalMemory'], 'getMemoryAddress');
 emnapiImplement2('emnapi_is_support_weakref', 'i', emnapi_is_support_weakref);
@@ -415,6 +437,7 @@ emnapiImplement2('emnapi_is_node_binding_available', 'i', emnapi_is_node_binding
 emnapiImplement2('emnapi_create_memory_view', 'ipippppp', _emnapi_create_memory_view, ['napi_add_finalizer', '$emnapiExternalMemory']);
 emnapiImplement2('emnapi_sync_memory', 'ipippp', emnapi_sync_memory, ['$emnapiSyncMemory']);
 emnapiImplement2('emnapi_get_memory_address', 'ipppp', emnapi_get_memory_address, ['$emnapiGetMemoryAddress']);
+emnapiImplement2('emnapi_get_runtime_version', 'ipp', emnapi_get_runtime_version);
 function napi_set_instance_data(env, data, finalize_cb, finalize_hint) {
     if (!env)
         return 1 /* napi_status.napi_invalid_arg */;
@@ -4977,6 +5000,16 @@ function napi_get_value_int32(env, value, result) {
     {{{ makeSetValue('result', 0, 'handle.value', 'i32') }}};
     return envObject.clearLastError();
 }
+function emnapiSetValueI64(result, numberValue) {
+    var tempDouble;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    var tempI64 = [
+        numberValue >>> 0,
+        (tempDouble = numberValue, +Math.abs(tempDouble) >= 1 ? tempDouble > 0 ? (Math.min(+Math.floor(tempDouble / 4294967296), 4294967295) | 0) >>> 0 : ~~+Math.ceil((tempDouble - +(~~tempDouble >>> 0)) / 4294967296) >>> 0 : 0)
+    ];
+    {{{ makeSetValue('result', 0, 'tempI64[0]', 'i32') }}};
+    {{{ makeSetValue('result', 4, 'tempI64[1]', 'i32') }}};
+}
 function napi_get_value_int64(env, value, result) {
     if (!env)
         return 1 /* napi_status.napi_invalid_arg */;
@@ -4992,7 +5025,6 @@ function napi_get_value_int64(env, value, result) {
     }
     var numberValue = handle.value;
     {{{ from64('result') }}};
-    var tempI64;
     if (numberValue === Number.POSITIVE_INFINITY || numberValue === Number.NEGATIVE_INFINITY || isNaN(numberValue)) {
         {{{ makeSetValue('result', 0, '0', 'i32') }}};
         {{{ makeSetValue('result', 4, '0', 'i32') }}};
@@ -5006,13 +5038,7 @@ function napi_get_value_int64(env, value, result) {
         {{{ makeSetValue('result', 4, '0x7fffffff', 'u32') }}};
     }
     else {
-        var tempDouble 
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        = void 0;
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        tempI64 = [numberValue >>> 0, (tempDouble = numberValue, +Math.abs(tempDouble) >= 1 ? tempDouble > 0 ? (Math.min(+Math.floor(tempDouble / 4294967296), 4294967295) | 0) >>> 0 : ~~+Math.ceil((tempDouble - +(~~tempDouble >>> 0)) / 4294967296) >>> 0 : 0)];
-        {{{ makeSetValue('result', 0, 'tempI64[0]', 'i32') }}};
-        {{{ makeSetValue('result', 4, 'tempI64[1]', 'i32') }}};
+        emnapiSetValueI64(result, numberValue);
     }
     return envObject.clearLastError();
 }
@@ -5139,6 +5165,7 @@ function napi_get_value_uint32(env, value, result) {
     {{{ makeSetValue('result', 0, 'handle.value', 'u32') }}};
     return envObject.clearLastError();
 }
+emnapiImplementHelper('$emnapiSetValueI64', undefined, emnapiSetValueI64, undefined);
 emnapiImplement('napi_get_array_length', 'ippp', napi_get_array_length);
 emnapiImplement('napi_get_arraybuffer_info', 'ipppp', napi_get_arraybuffer_info, ['$emnapiExternalMemory']);
 emnapiImplement('napi_get_prototype', 'ippp', napi_get_prototype);
@@ -5153,7 +5180,7 @@ emnapiImplement('napi_get_value_bigint_uint64', 'ipppp', napi_get_value_bigint_u
 emnapiImplement('napi_get_value_bigint_words', 'ippppp', napi_get_value_bigint_words);
 emnapiImplement('napi_get_value_external', 'ippp', napi_get_value_external);
 emnapiImplement('napi_get_value_int32', 'ippp', napi_get_value_int32);
-emnapiImplement('napi_get_value_int64', 'ippp', napi_get_value_int64);
+emnapiImplement('napi_get_value_int64', 'ippp', napi_get_value_int64, ['$emnapiSetValueI64']);
 emnapiImplement('napi_get_value_string_latin1', 'ippppp', napi_get_value_string_latin1);
 emnapiImplement('napi_get_value_string_utf8', 'ippppp', napi_get_value_string_utf8, ['$emnapiString']);
 emnapiImplement('napi_get_value_string_utf16', 'ippppp', napi_get_value_string_utf16, ['$emnapiString']);
@@ -6224,6 +6251,50 @@ function __emnapi_async_work_pool_size() {
     return Math.abs(emnapiAsyncWorkPoolSize);
 }
 emnapiImplementInternal('_emnapi_async_work_pool_size', 'i', __emnapi_async_work_pool_size, ['$emnapiAsyncWorkPoolSize']);
+function _napi_adjust_external_memory(env, low, high, adjusted_value) {
+    if (!env)
+        return 1 /* napi_status.napi_invalid_arg */;
+    var envObject = emnapiCtx.envStore.get(env);
+    var change_in_bytes;
+#if WASM_BIGINT
+    if (!high)
+        return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    change_in_bytes = Number(low);
+#else
+    if (!adjusted_value)
+        return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    change_in_bytes = (low >>> 0) + (high * Math.pow(2, 32));
+#endif
+    if (change_in_bytes < 0) {
+        return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
+    }
+    if (change_in_bytes > 0) {
+        var old_size = wasmMemory.buffer.byteLength;
+        var new_size = old_size + change_in_bytes;
+        if (!_emscripten_resize_heap(new_size)) {
+            return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
+        }
+    }
+#if WASM_BIGINT
+    {{{ from64('high') }}};
+    if (emnapiCtx.feature.supportBigInt) {
+        {{{ makeSetValue('high', 0, 'wasmMemory.buffer.byteLength', 'i64') }}};
+    }
+    else {
+        emnapiSetValueI64(high, wasmMemory.buffer.byteLength);
+    }
+#else
+    {{{ from64('adjusted_value') }}};
+    {{{ makeSetValue('adjusted_value', 0, 'wasmMemory.buffer.byteLength', 'i64') }}};
+#endif
+    return envObject.clearLastError();
+}
+emnapiImplement('napi_adjust_external_memory', 'ipjp', _napi_adjust_external_memory, [
+#if WASM_BIGINT
+    '$emnapiSetValueI64',
+#endif
+    'emscripten_resize_heap'
+]);
 /* eslint-disable @typescript-eslint/no-unused-vars */
 function emnapiImplement(name, sig, compilerTimeFunction, deps) {
     var _a;

package/include/emnapi.h

@@ -5,6 +5,10 @@
 #include "js_native_api_types.h"
 #include "emnapi_common.h"
 
+#define EMNAPI_MAJOR_VERSION 0
+#define EMNAPI_MINOR_VERSION 44
+#define EMNAPI_PATCH_VERSION 0
+
 typedef enum {
   emnapi_runtime,
   emnapi_userland,
@@ -41,17 +45,17 @@ EMNAPI_EXTERN
 napi_status emnapi_get_module_property(napi_env env,
                                        const char* utf8name,
                                        napi_value* result);
+#endif
 
 typedef struct {
   uint32_t major;
   uint32_t minor;
   uint32_t patch;
-} emnapi_emscripten_version;
+} emnapi_runtime_version;
 
 EMNAPI_EXTERN
-napi_status emnapi_get_emscripten_version(napi_env env,
-                                          const emnapi_emscripten_version** version);
-#endif
+napi_status emnapi_get_runtime_version(napi_env env, 
+                                       emnapi_runtime_version* version);
 
 EMNAPI_EXTERN
 napi_status emnapi_create_memory_view(napi_env env,

package/include/emnapi_common.h

@@ -2,23 +2,29 @@
 #define EMNAPI_INCLUDE_COMMON_H_
 
 #ifdef __EMSCRIPTEN__
-#define NAPI_EXTERN __attribute__((__import_module__("env")))
-
 #define EMNAPI_EXTERN __attribute__((__import_module__("env")))
 #else
-#define NAPI_EXTERN __attribute__((__import_module__("napi")))
-
 #define EMNAPI_EXTERN __attribute__((__import_module__("emnapi")))
 #endif
 
 #define EMNAPI_INTERNAL_EXTERN __attribute__((__import_module__("env")))
 
 #ifdef __cplusplus
+#ifndef EXTERN_C_START
 #define EXTERN_C_START extern "C" {
+#endif
+
+#ifndef EXTERN_C_END
 #define EXTERN_C_END }
+#endif
 #else
+#ifndef EXTERN_C_START
 #define EXTERN_C_START
+#endif
+
+#ifndef EXTERN_C_END
 #define EXTERN_C_END
 #endif
+#endif
 
 #endif

package/include/js_native_api.h

@@ -21,15 +21,20 @@
 #endif
 #endif
 
+#ifndef EMNAPI_UNMODIFIED_UPSTREAM
+#if !defined(NAPI_EXTERN) && defined(__EMSCRIPTEN__)
+#define NAPI_EXTERN __attribute__((__import_module__("env")))
+#endif
+#endif
+
 #include "js_native_api_types.h"
 
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
 // If you need __declspec(dllimport), either include <node_api.h> instead, or
 // define NAPI_EXTERN as __declspec(dllimport) on the compiler's command line.
 #ifndef NAPI_EXTERN
 #ifdef _WIN32
 #define NAPI_EXTERN __declspec(dllexport)
-#elif defined(__wasm32__)
+#elif defined(__wasm__)
 #define NAPI_EXTERN                                                            \
   __attribute__((visibility("default")))                                       \
   __attribute__((__import_module__("napi")))
@@ -37,13 +42,9 @@
 #define NAPI_EXTERN __attribute__((visibility("default")))
 #endif
 #endif
-#else
-#include "emnapi_common.h"
-#endif
 
 #define NAPI_AUTO_LENGTH SIZE_MAX
 
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
 #ifdef __cplusplus
 #define EXTERN_C_START extern "C" {
 #define EXTERN_C_END }
@@ -51,7 +52,6 @@
 #define EXTERN_C_START
 #define EXTERN_C_END
 #endif
-#endif
 
 EXTERN_C_START
 

package/include/node_api.h

@@ -1,16 +1,24 @@
 #ifndef SRC_NODE_API_H_
 #define SRC_NODE_API_H_
 
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
-#ifdef BUILDING_NODE_EXTENSION
+#ifndef EMNAPI_UNMODIFIED_UPSTREAM
+#ifndef BUILDING_NODE_EXTENSION
+#define BUILDING_NODE_EXTENSION
+#endif
+
+#if !defined(NAPI_EXTERN) && defined(__EMSCRIPTEN__)
+#define NAPI_EXTERN __attribute__((__import_module__("env")))
+#endif
+#endif
+
+#if defined(BUILDING_NODE_EXTENSION) && !defined(NAPI_EXTERN)
 #ifdef _WIN32
 // Building native addon against node
 #define NAPI_EXTERN __declspec(dllimport)
-#elif defined(__wasm32__)
+#elif defined(__wasm__)
 #define NAPI_EXTERN __attribute__((__import_module__("napi")))
 #endif
 #endif
-#endif
 #include "js_native_api.h"
 #include "node_api_types.h"
 
@@ -19,16 +27,13 @@ struct uv_loop_s;  // Forward declaration.
 #ifdef _WIN32
 #define NAPI_MODULE_EXPORT __declspec(dllexport)
 #else
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
-#define NAPI_MODULE_EXPORT __attribute__((visibility("default")))
-#else
 #ifdef __EMSCRIPTEN__
-#define NAPI_MODULE_EXPORT __attribute__((visibility("default"))) __attribute__((used))
+#define NAPI_MODULE_EXPORT                                                     \
+  __attribute__((visibility("default"))) __attribute__((used))
 #else
 #define NAPI_MODULE_EXPORT __attribute__((visibility("default")))
 #endif
 #endif
-#endif
 
 #if defined(__GNUC__)
 #define NAPI_NO_RETURN __attribute__((noreturn))
@@ -59,19 +64,11 @@ typedef struct napi_module {
   NAPI_MODULE_INITIALIZER_X_HELPER(base, version)
 #define NAPI_MODULE_INITIALIZER_X_HELPER(base, version) base##version
 
-#ifdef EMNAPI_UNMODIFIED_UPSTREAM
-#ifdef __wasm32__
-#define NAPI_MODULE_INITIALIZER_BASE napi_register_wasm_v
-#else
-#define NAPI_MODULE_INITIALIZER_BASE napi_register_module_v
-#endif
-#else
 #ifdef __wasm__
 #define NAPI_MODULE_INITIALIZER_BASE napi_register_wasm_v
 #else
 #define NAPI_MODULE_INITIALIZER_BASE napi_register_module_v
 #endif
-#endif
 
 #define NODE_API_MODULE_GET_API_VERSION_BASE node_api_module_get_api_version_v
 
@@ -160,7 +157,7 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_get_buffer_info(napi_env env,
                                                         napi_value value,
                                                         void** data,
                                                         size_t* length);
-#if !defined(EMNAPI_UNMODIFIED_UPSTREAM) || (defined(EMNAPI_UNMODIFIED_UPSTREAM) && !defined(__wasm32__))
+
 // Methods to manage simple async operations
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_create_async_work(napi_env env,
@@ -176,7 +173,6 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_queue_async_work(napi_env env,
                                                          napi_async_work work);
 NAPI_EXTERN napi_status NAPI_CDECL napi_cancel_async_work(napi_env env,
                                                           napi_async_work work);
-#endif  // __wasm32__
 
 // version management
 NAPI_EXTERN napi_status NAPI_CDECL
@@ -214,7 +210,6 @@ napi_close_callback_scope(napi_env env, napi_callback_scope scope);
 
 #if NAPI_VERSION >= 4
 
-#if !defined(EMNAPI_UNMODIFIED_UPSTREAM) || (defined(EMNAPI_UNMODIFIED_UPSTREAM) && !defined(__wasm32__))
 // Calling into JS from other threads
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_create_threadsafe_function(napi_env env,
@@ -248,7 +243,6 @@ napi_unref_threadsafe_function(napi_env env, napi_threadsafe_function func);
 
 NAPI_EXTERN napi_status NAPI_CDECL
 napi_ref_threadsafe_function(napi_env env, napi_threadsafe_function func);
-#endif  // __wasm32__
 
 #endif  // NAPI_VERSION >= 4
 

package/index.js

@@ -9,7 +9,6 @@ const jsLibrary = path.join(__dirname, './dist/library_napi.js')
 const sources = [
   path.join(__dirname, './src/js_native_api.c'),
   path.join(__dirname, './src/node_api.c'),
-  path.join(__dirname, './src/emnapi.c'),
   path.join(__dirname, './src/async_cleanup_hook.c'),
   path.join(__dirname, './src/async_context.c'),
   path.join(__dirname, './src/async_work.c'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emnapi",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "peerDependencies": {
@@ -12,7 +12,8 @@
     }
   },
   "scripts": {
-    "build": "node ./script/build.js"
+    "build": "node ./script/build.js",
+    "version": "node ./script/version.js"
   },
   "repository": {
     "type": "git",

package/src/js_native_api.c

@@ -1,9 +1,5 @@
 #include "emnapi_internal.h"
 
-#ifdef __EMSCRIPTEN__
-#include <emscripten/heap.h>
-#endif
-
 EXTERN_C_START
 
 static const char* emnapi_error_messages[] = {
@@ -67,34 +63,4 @@ napi_status napi_get_last_error_info(
   return napi_ok;
 }
 
-#define PAGESIZE 65536
-
-napi_status napi_adjust_external_memory(napi_env env,
-                                        int64_t change_in_bytes,
-                                        int64_t* adjusted_value) {
-  CHECK_ENV(env);
-  CHECK_ARG(env, adjusted_value);
-
-  if (change_in_bytes < 0) {
-    return napi_set_last_error(env, napi_invalid_arg, 0, NULL);
-  }
-
-  size_t old_size = __builtin_wasm_memory_size(0) << 16;
-  size_t new_size = old_size + (size_t) change_in_bytes;
-#ifdef __EMSCRIPTEN__
-  if (!emscripten_resize_heap(new_size)) {
-    return napi_set_last_error(env, napi_generic_failure, 0, NULL);
-  }
-#else
-  new_size = new_size + (PAGESIZE - new_size % PAGESIZE) % PAGESIZE;
-  if (-1 == __builtin_wasm_memory_grow(0, (new_size - old_size + 65535) >> 16)) {
-    return napi_set_last_error(env, napi_generic_failure, 0, NULL);
-  }
-#endif
-
-  *adjusted_value = (int64_t) (__builtin_wasm_memory_size(0) << 16);
-
-  return napi_clear_last_error(env);
-}
-
 EXTERN_C_END

package/src/thread/async_worker_create.c

@@ -20,6 +20,7 @@ struct worker_args {
 
 extern void __wasm_init_tls(void*);
 
+__attribute__((__weak__))
 void* __copy_tls(unsigned char *mem) {
 	size_t tls_align = __builtin_wasm_tls_align();
 	volatile void* tls_base = __builtin_wasm_tls_base();

package/src/emnapi.c

@@ -1,21 +0,0 @@
-#include "emnapi_internal.h"
-
-EXTERN_C_START
-
-#ifdef __EMSCRIPTEN__
-napi_status
-emnapi_get_emscripten_version(napi_env env,
-                              const emnapi_emscripten_version** version) {
-  CHECK_ENV(env);
-  CHECK_ARG(env, version);
-  static emnapi_emscripten_version emscripten_version = {
-    __EMSCRIPTEN_major__,
-    __EMSCRIPTEN_minor__,
-    __EMSCRIPTEN_tiny__
-  };
-  *version = &emscripten_version;
-  return napi_clear_last_error(env);
-}
-#endif
-
-EXTERN_C_END