mirror of
https://github.com/nodejs/node.git
synced 2025-05-20 23:55:47 +00:00
ca786c3734
Change `napi_callback` to return `napi_value` directly instead of requiring `napi_set_return_value`. When we invoke the callback, we will check the return value and call `SetReturnValue` ourselves. If the callback returns `NULL`, we don't set the return value in v8 which would have the same effect as previously if the callback didn't call `napi_set_return_value`. Seems to be a more natural way to handle return values from callbacks. As a consequence, remove `napi_set_return_value`. Add a `napi_value` to `napi_property_descriptor` to support string values which couldn't be passed in the `utf8name` parameter or symbols as property names. Class names, however, cannot be symbols so this `napi_value` must be a string type in that case. Remove all of the `napi_callback_info` helpers except for `napi_get_cb_info` and make all the parameters to `napi_get_cb_info` optional except for argc. Update all the test collateral according to these changes. Also add `test/addons-napi/common.h` to house some common macros for wrapping N-API calls and error handling. PR-URL: https://github.com/nodejs/node/pull/12248 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
60 lines
1.7 KiB
C
60 lines
1.7 KiB
C
#include <node_api.h>
|
|
#include "../common.h"
|
|
|
|
static bool exceptionWasPending = false;
|
|
|
|
napi_value returnException(napi_env env, napi_callback_info info) {
|
|
size_t argc = 1;
|
|
napi_value args[1];
|
|
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
|
|
|
|
napi_value global;
|
|
NAPI_CALL(env, napi_get_global(env, &global));
|
|
|
|
napi_value result;
|
|
napi_status status = napi_call_function(env, global, args[0], 0, 0, &result);
|
|
if (status == napi_pending_exception) {
|
|
napi_value ex;
|
|
NAPI_CALL(env, napi_get_and_clear_last_exception(env, &ex));
|
|
return ex;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
napi_value allowException(napi_env env, napi_callback_info info) {
|
|
size_t argc = 1;
|
|
napi_value args[1];
|
|
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
|
|
|
|
napi_value global;
|
|
NAPI_CALL(env, napi_get_global(env, &global));
|
|
|
|
napi_value result;
|
|
napi_call_function(env, global, args[0], 0, 0, &result);
|
|
// Ignore status and check napi_is_exception_pending() instead.
|
|
|
|
NAPI_CALL(env, napi_is_exception_pending(env, &exceptionWasPending));
|
|
return NULL;
|
|
}
|
|
|
|
napi_value wasPending(napi_env env, napi_callback_info info) {
|
|
napi_value result;
|
|
NAPI_CALL(env, napi_get_boolean(env, exceptionWasPending, &result));
|
|
|
|
return result;
|
|
}
|
|
|
|
void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
|
|
napi_property_descriptor descriptors[] = {
|
|
DECLARE_NAPI_PROPERTY("returnException", returnException),
|
|
DECLARE_NAPI_PROPERTY("allowException", allowException),
|
|
DECLARE_NAPI_PROPERTY("wasPending", wasPending),
|
|
};
|
|
|
|
NAPI_CALL_RETURN_VOID(env, napi_define_properties(
|
|
env, exports, sizeof(descriptors) / sizeof(*descriptors), descriptors));
|
|
}
|
|
|
|
NAPI_MODULE(addon, Init)
|