emnapi 0.38.2 → 0.39.0

package/include/js_native_api.h

@@ -101,13 +101,13 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_string_utf16(napi_env env,
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_symbol(napi_env env,
                                                       napi_value description,
                                                       napi_value* result);
-#ifdef NAPI_EXPERIMENTAL
+#if NAPI_VERSION >= 9
 NAPI_EXTERN napi_status NAPI_CDECL
 node_api_symbol_for(napi_env env,
                     const char* utf8description,
                     size_t length,
                     napi_value* result);
-#endif  // NAPI_EXPERIMENTAL
+#endif  // NAPI_VERSION >= 9
 NAPI_EXTERN napi_status NAPI_CDECL napi_create_function(napi_env env,
                                                         const char* utf8name,
                                                         size_t length,
@@ -126,10 +126,10 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_create_range_error(napi_env env,
                                                            napi_value code,
                                                            napi_value msg,
                                                            napi_value* result);
-#ifdef NAPI_EXPERIMENTAL
+#if NAPI_VERSION >= 9
 NAPI_EXTERN napi_status NAPI_CDECL node_api_create_syntax_error(
     napi_env env, napi_value code, napi_value msg, napi_value* result);
-#endif  // NAPI_EXPERIMENTAL
+#endif  // NAPI_VERSION >= 9
 
 // Methods to get the native napi_value from Primitive type
 NAPI_EXTERN napi_status NAPI_CDECL napi_typeof(napi_env env,
@@ -384,11 +384,11 @@ NAPI_EXTERN napi_status NAPI_CDECL napi_throw_type_error(napi_env env,
 NAPI_EXTERN napi_status NAPI_CDECL napi_throw_range_error(napi_env env,
                                                           const char* code,
                                                           const char* msg);
-#ifdef NAPI_EXPERIMENTAL
+#if NAPI_VERSION >= 9
 NAPI_EXTERN napi_status NAPI_CDECL node_api_throw_syntax_error(napi_env env,
                                                                const char* code,
                                                                const char* msg);
-#endif  // NAPI_EXPERIMENTAL
+#endif  // NAPI_VERSION >= 9
 NAPI_EXTERN napi_status NAPI_CDECL napi_is_error(napi_env env,
                                                  napi_value value,
                                                  bool* result);

package/include/js_native_api_types.h

@@ -99,7 +99,8 @@ typedef enum {
   napi_arraybuffer_expected,
   napi_detachable_arraybuffer_expected,
   napi_would_deadlock,  // unused
-  napi_no_external_buffers_allowed
+  napi_no_external_buffers_allowed,
+  napi_cannot_run_js,
 } napi_status;
 // Note: when adding a new enum value to `napi_status`, please also update
 //   * `const int last_status` in the definition of `napi_get_last_error_info()'

package/include/node_api.h

@@ -40,6 +40,7 @@ struct uv_loop_s;  // Forward declaration.
 
 typedef napi_value(NAPI_CDECL* napi_addon_register_func)(napi_env env,
                                                          napi_value exports);
+typedef int32_t(NAPI_CDECL* node_api_addon_get_api_version_func)();
 
 // Used by deprecated registration method napi_module_register.
 typedef struct napi_module {
@@ -72,11 +73,20 @@ typedef struct napi_module {
 #endif
 #endif
 
+#define NODE_API_MODULE_GET_API_VERSION_BASE node_api_module_get_api_version_v
+
 #define NAPI_MODULE_INITIALIZER                                                \
   NAPI_MODULE_INITIALIZER_X(NAPI_MODULE_INITIALIZER_BASE, NAPI_MODULE_VERSION)
 
+#define NODE_API_MODULE_GET_API_VERSION                                        \
+  NAPI_MODULE_INITIALIZER_X(NODE_API_MODULE_GET_API_VERSION_BASE,              \
+                            NAPI_MODULE_VERSION)
+
 #define NAPI_MODULE_INIT()                                                     \
   EXTERN_C_START                                                               \
+  NAPI_MODULE_EXPORT int32_t NODE_API_MODULE_GET_API_VERSION() {               \
+    return NAPI_VERSION;                                                       \
+  }                                                                            \
   NAPI_MODULE_EXPORT napi_value NAPI_MODULE_INITIALIZER(napi_env env,          \
                                                         napi_value exports);   \
   EXTERN_C_END                                                                 \
@@ -255,12 +265,12 @@ napi_remove_async_cleanup_hook(napi_async_cleanup_hook_handle remove_handle);
 
 #endif  // NAPI_VERSION >= 8
 
-#ifdef NAPI_EXPERIMENTAL
+#if NAPI_VERSION >= 9
 
 NAPI_EXTERN napi_status NAPI_CDECL
 node_api_get_module_file_name(napi_env env, const char** result);
 
-#endif  // NAPI_EXPERIMENTAL
+#endif  // NAPI_VERSION >= 9
 
 EXTERN_C_END
 

package/package.json

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

package/src/async_work.c

@@ -77,7 +77,7 @@ static napi_value async_work_after_cb(napi_env env, napi_callback_info info) {
   void* data = NULL;
   EMNAPI_ASSERT_CALL(napi_get_cb_info(env, info, NULL, NULL, NULL, &data));
   complete_wrap_t* wrap = (complete_wrap_t*) data;
-  _emnapi_call_into_module(env, async_work_on_complete, wrap, 1);
+  _emnapi_callback_into_module(1, env, async_work_on_complete, wrap, 1);
   return NULL;
 }
 
@@ -103,7 +103,7 @@ static void async_work_after_thread_pool_work(napi_async_work work, int status)
                               work->async_context_.trigger_async_id,
                               NULL);
   } else {
-    _emnapi_call_into_module(env, async_work_on_complete, wrap, 1);
+    _emnapi_callback_into_module(1, env, async_work_on_complete, wrap, 1);
   }
   EMNAPI_ASSERT_CALL(napi_close_handle_scope(env, scope));
 }

package/src/emnapi_internal.h

@@ -110,10 +110,11 @@ EMNAPI_INTERNAL_EXTERN void _emnapi_ctx_decrease_waiting_request_counter();
 
 typedef void (*_emnapi_call_into_module_callback)(napi_env env, void* args);
 EMNAPI_INTERNAL_EXTERN
-void _emnapi_call_into_module(napi_env env,
-                              _emnapi_call_into_module_callback callback,
-                              void* args,
-                              int close_scope_if_throw);
+void _emnapi_callback_into_module(int force_uncaught,
+                                  napi_env env,
+                                  _emnapi_call_into_module_callback callback,
+                                  void* args,
+                                  int close_scope_if_throw);
 
 #endif
 

package/src/js_native_api.c

@@ -29,7 +29,8 @@ static const char* emnapi_error_messages[] = {
   "An arraybuffer was expected",
   "A detachable arraybuffer was expected",
   "Main thread would deadlock",
-  "External buffers are not allowed"
+  "External buffers are not allowed",
+  "Cannot run JavaScript",
 };
 
 EMNAPI_INTERNAL_EXTERN void _emnapi_get_last_error_info(napi_env env,
@@ -43,9 +44,9 @@ napi_status napi_get_last_error_info(
   CHECK_ENV(env);
   CHECK_ARG(env, result);
 
-  const int last_status = napi_no_external_buffers_allowed;
+  const int last_status = napi_cannot_run_js;
 
-  static_assert((sizeof(emnapi_error_messages) / sizeof(const char*)) == napi_no_external_buffers_allowed + 1,
+  static_assert((sizeof(emnapi_error_messages) / sizeof(const char*)) == napi_cannot_run_js + 1,
                 "Count of error messages must match count of error values");
 
   _emnapi_get_last_error_info(env,
@@ -96,11 +97,4 @@ napi_status napi_adjust_external_memory(napi_env env,
   return napi_clear_last_error(env);
 }
 
-napi_status napi_get_version(napi_env env, uint32_t* result) {
-  CHECK_ENV(env);
-  CHECK_ARG(env, result);
-  *result = NAPI_VERSION;
-  return napi_clear_last_error(env);
-}
-
 EXTERN_C_END

package/src/node_api.c

@@ -42,7 +42,7 @@ napi_status napi_get_uv_event_loop(napi_env env,
 #endif
 }
 
-EMNAPI_INTERNAL_EXTERN int _emnapi_get_filename(char* buf, int len);
+EMNAPI_INTERNAL_EXTERN int _emnapi_get_filename(napi_env env, char* buf, int len);
 
 napi_status node_api_get_module_file_name(napi_env env,
                                           const char** result) {
@@ -57,12 +57,12 @@ napi_status node_api_get_module_file_name(napi_env env,
     filename = NULL;
   }
 
-  int len = _emnapi_get_filename(NULL, 0);
+  int len = _emnapi_get_filename(env, NULL, 0);
   if (len == 0) {
     *result = empty_string;
   } else {
     filename = (char*) malloc(len + 1);
-    len = _emnapi_get_filename(filename, len + 1);
+    len = _emnapi_get_filename(env, filename, len + 1);
     *(filename + len) = '\0';
     *result = filename;
   }

package/src/threadsafe_function.c

@@ -11,7 +11,7 @@
 
 EXTERN_C_START
 
-EMNAPI_INTERNAL_EXTERN void _emnapi_call_finalizer(napi_env env, napi_finalize cb, void* data, void* hint);
+EMNAPI_INTERNAL_EXTERN void _emnapi_call_finalizer(int force_uncaught, napi_env env, napi_finalize cb, void* data, void* hint);
 
 static const unsigned char kDispatchIdle = 0;
 static const unsigned char kDispatchRunning = 1 << 0;
@@ -205,7 +205,7 @@ static napi_value _emnapi_tsfn_finalize_in_callback_scope(napi_env env, napi_cal
   void* data = NULL;
   EMNAPI_ASSERT_CALL(napi_get_cb_info(env, info, NULL, NULL, NULL, &data));
   napi_threadsafe_function func = (napi_threadsafe_function) data;
-  _emnapi_call_finalizer(func->env, func->finalize_cb, func->finalize_data, func->context);
+  _emnapi_call_finalizer(0, func->env, func->finalize_cb, func->finalize_data, func->context);
   return NULL;
 }
 
@@ -226,7 +226,7 @@ static void _emnapi_tsfn_finalize(napi_threadsafe_function func) {
                                 func->async_context_.trigger_async_id,
                                 NULL);
     } else {
-      _emnapi_call_finalizer(func->env, func->finalize_cb, func->finalize_data, func->context);
+      _emnapi_call_finalizer(0, func->env, func->finalize_cb, func->finalize_data, func->context);
     }
   }
   _emnapi_tsfn_empty_queue_and_delete(func);
@@ -275,7 +275,7 @@ static void _emnapi_tsfn_call_js_cb(napi_env env, void* arg) {
 static napi_value _emnapi_tsfn_call_js_cb_in_callback_scope(napi_env env, napi_callback_info info) {
   void* data = NULL;
   EMNAPI_ASSERT_CALL(napi_get_cb_info(env, info, NULL, NULL, NULL, &data));
-  _emnapi_call_into_module(env, _emnapi_tsfn_call_js_cb, data, 1);
+  _emnapi_callback_into_module(0, env, _emnapi_tsfn_call_js_cb, data, 1);
   return NULL;
 }
 
@@ -347,7 +347,7 @@ static bool _emnapi_tsfn_dispatch_one(napi_threadsafe_function func) {
                                 func->async_context_.trigger_async_id,
                                 NULL);
     } else {
-      _emnapi_call_into_module(func->env, _emnapi_tsfn_call_js_cb, jscb_data, 1);
+      _emnapi_callback_into_module(0, func->env, _emnapi_tsfn_call_js_cb, jscb_data, 1);
     }
     EMNAPI_ASSERT_CALL(napi_close_handle_scope(func->env, scope));
   }