-
Notifications
You must be signed in to change notification settings - Fork 28.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
node-api: return napi_exception_pending on proxy handlers
Accessing JS objects can be trapped with proxy handlers. These handlers can throw when no node-api errors occur. In such cases, `napi_pending_exception` should be returned. PR-URL: #48607 Reviewed-By: Gabriel Schulhof <gabrielschulhof@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
- Loading branch information
1 parent
03a31ce
commit 91e373f
Showing
5 changed files
with
155 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| #include <assert.h> | ||
| #include <js_native_api.h> | ||
| #include <string.h> | ||
| #include "../common.h" | ||
| #include "../entry_point.h" | ||
|
|
||
| static napi_value TestExceptions(napi_env env, napi_callback_info info) { | ||
| size_t argc = 1; | ||
| napi_value args[1]; | ||
| NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL)); | ||
|
|
||
| napi_value target = args[0]; | ||
| napi_value exception, key, value; | ||
| napi_status status; | ||
| bool is_exception_pending; | ||
| bool bool_result; | ||
|
|
||
| NODE_API_CALL(env, | ||
| napi_create_string_utf8(env, "key", NAPI_AUTO_LENGTH, &key)); | ||
| NODE_API_CALL( | ||
| env, napi_create_string_utf8(env, "value", NAPI_AUTO_LENGTH, &value)); | ||
|
|
||
| #define PROCEDURE(call) \ | ||
| { \ | ||
| status = (call); \ | ||
| NODE_API_ASSERT( \ | ||
| env, status == napi_pending_exception, "expect exception pending"); \ | ||
| NODE_API_CALL(env, napi_is_exception_pending(env, &is_exception_pending)); \ | ||
| NODE_API_ASSERT(env, is_exception_pending, "expect exception pending"); \ | ||
| NODE_API_CALL(env, napi_get_and_clear_last_exception(env, &exception)); \ | ||
| } | ||
| // discard the exception values. | ||
|
|
||
| // properties | ||
| PROCEDURE(napi_set_property(env, target, key, value)); | ||
| PROCEDURE(napi_set_named_property(env, target, "key", value)); | ||
| PROCEDURE(napi_has_property(env, target, key, &bool_result)); | ||
| PROCEDURE(napi_has_own_property(env, target, key, &bool_result)); | ||
| PROCEDURE(napi_has_named_property(env, target, "key", &bool_result)); | ||
| PROCEDURE(napi_get_property(env, target, key, &value)); | ||
| PROCEDURE(napi_get_named_property(env, target, "key", &value)); | ||
| PROCEDURE(napi_delete_property(env, target, key, &bool_result)); | ||
|
|
||
| // elements | ||
| PROCEDURE(napi_set_element(env, target, 0, value)); | ||
| PROCEDURE(napi_has_element(env, target, 0, &bool_result)); | ||
| PROCEDURE(napi_get_element(env, target, 0, &value)); | ||
| PROCEDURE(napi_delete_element(env, target, 0, &bool_result)); | ||
|
|
||
| napi_property_descriptor descriptors[] = { | ||
| DECLARE_NODE_API_PROPERTY_VALUE("key", value), | ||
| }; | ||
| PROCEDURE(napi_define_properties( | ||
| env, target, sizeof(descriptors) / sizeof(*descriptors), descriptors)); | ||
|
|
||
| PROCEDURE(napi_get_all_property_names(env, | ||
| target, | ||
| napi_key_own_only, | ||
| napi_key_enumerable, | ||
| napi_key_keep_numbers, | ||
| &value)); | ||
| PROCEDURE(napi_get_property_names(env, target, &value)); | ||
|
|
||
| return NULL; | ||
| } | ||
|
|
||
| EXTERN_C_START | ||
| napi_value Init(napi_env env, napi_value exports) { | ||
| napi_property_descriptor descriptors[] = { | ||
| DECLARE_NODE_API_PROPERTY("testExceptions", TestExceptions), | ||
| }; | ||
|
|
||
| NODE_API_CALL( | ||
| env, | ||
| napi_define_properties(env, | ||
| exports, | ||
| sizeof(descriptors) / sizeof(*descriptors), | ||
| descriptors)); | ||
|
|
||
| return exports; | ||
| } | ||
| EXTERN_C_END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| 'use strict'; | ||
| const common = require('../../common'); | ||
|
|
||
| // Test | ||
| const { testExceptions } = require(`./build/${common.buildType}/test_exceptions`); | ||
|
|
||
| function throws() { | ||
| throw new Error('foobar'); | ||
| } | ||
| testExceptions(new Proxy({}, { | ||
| get: common.mustCallAtLeast(throws, 1), | ||
| getOwnPropertyDescriptor: common.mustCallAtLeast(throws, 1), | ||
| defineProperty: common.mustCallAtLeast(throws, 1), | ||
| deleteProperty: common.mustCallAtLeast(throws, 1), | ||
| has: common.mustCallAtLeast(throws, 1), | ||
| set: common.mustCallAtLeast(throws, 1), | ||
| ownKeys: common.mustCallAtLeast(throws, 1), | ||
| })); |