diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2022-07-15 01:06:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-15 01:06:20 +0200 |
commit | f9b692e68e97ab6d39ad03988e973279a32cceca (patch) | |
tree | 9ae831322bee0a7226cb725e15e7332f6ab89ebe /core | |
parent | 91a33c65f3bdc82bef4cbe95f614e1f533e5b368 (diff) |
Revert "feat: add "unhandledrejection" event support (#12994) (#15080)" (#15210)
This reverts commit 1a7259b04b7229f6350a7a7c21b50497b5c80c17.
Diffstat (limited to 'core')
-rw-r--r-- | core/01_core.js | 4 | ||||
-rw-r--r-- | core/bindings.rs | 10 | ||||
-rw-r--r-- | core/ops_builtin_v8.rs | 48 |
3 files changed, 9 insertions, 53 deletions
diff --git a/core/01_core.js b/core/01_core.js index 21376b695..156300327 100644 --- a/core/01_core.js +++ b/core/01_core.js @@ -268,10 +268,6 @@ terminate: opSync.bind(null, "op_terminate"), opNames: opSync.bind(null, "op_op_names"), eventLoopHasMoreWork: opSync.bind(null, "op_event_loop_has_more_work"), - setPromiseRejectCallback: opSync.bind( - null, - "op_set_promise_reject_callback", - ), }); ObjectAssign(globalThis.__bootstrap, { core }); diff --git a/core/bindings.rs b/core/bindings.rs index c9e27f087..49dc62c0e 100644 --- a/core/bindings.rs +++ b/core/bindings.rs @@ -282,6 +282,14 @@ pub extern "C" fn promise_reject_callback(message: v8::PromiseRejectMessage) { let state_rc = JsRuntime::state(scope); let mut state = state_rc.borrow_mut(); + // Node compat: perform synchronous process.emit("unhandledRejection"). + // + // Note the callback follows the (type, promise, reason) signature of Node's + // internal promiseRejectHandler from lib/internal/process/promises.js, not + // the (promise, reason) signature of the "unhandledRejection" event listener. + // + // Short-circuits Deno's regular unhandled rejection logic because that's + // a) asynchronous, and b) always terminates. if let Some(js_promise_reject_cb) = state.js_promise_reject_cb.clone() { let js_uncaught_exception_cb = state.js_uncaught_exception_cb.clone(); @@ -323,7 +331,6 @@ pub extern "C" fn promise_reject_callback(message: v8::PromiseRejectMessage) { } if tc_scope.has_caught() { - // TODO(bartlomieju): ensure that TODO provided below is still valid. // If we get here, an exception was thrown by the unhandledRejection // handler and there is ether no uncaughtException handler or the // handler threw an exception of its own. @@ -341,6 +348,7 @@ pub extern "C" fn promise_reject_callback(message: v8::PromiseRejectMessage) { } else { let promise = message.get_promise(); let promise_global = v8::Global::new(scope, promise); + match message.get_event() { PromiseRejectWithNoHandler => { let error = message.get_value().unwrap(); diff --git a/core/ops_builtin_v8.rs b/core/ops_builtin_v8.rs index a17e273f3..39469c0ad 100644 --- a/core/ops_builtin_v8.rs +++ b/core/ops_builtin_v8.rs @@ -48,9 +48,6 @@ pub(crate) fn init_builtins_v8() -> Vec<OpDecl> { op_apply_source_map::decl(), op_set_format_exception_callback::decl(), op_event_loop_has_more_work::decl(), - op_store_pending_promise_exception::decl(), - op_remove_pending_promise_exception::decl(), - op_has_pending_promise_exception::decl(), ] } @@ -795,48 +792,3 @@ fn op_set_format_exception_callback<'a>( fn op_event_loop_has_more_work(scope: &mut v8::HandleScope) -> bool { JsRuntime::event_loop_pending_state(scope).is_pending() } - -#[op(v8)] -fn op_store_pending_promise_exception<'a>( - scope: &mut v8::HandleScope<'a>, - promise: serde_v8::Value<'a>, - reason: serde_v8::Value<'a>, -) { - let state_rc = JsRuntime::state(scope); - let mut state = state_rc.borrow_mut(); - let promise_value = - v8::Local::<v8::Promise>::try_from(promise.v8_value).unwrap(); - let promise_global = v8::Global::new(scope, promise_value); - let error_global = v8::Global::new(scope, reason.v8_value); - state - .pending_promise_exceptions - .insert(promise_global, error_global); -} - -#[op(v8)] -fn op_remove_pending_promise_exception<'a>( - scope: &mut v8::HandleScope<'a>, - promise: serde_v8::Value<'a>, -) { - let state_rc = JsRuntime::state(scope); - let mut state = state_rc.borrow_mut(); - let promise_value = - v8::Local::<v8::Promise>::try_from(promise.v8_value).unwrap(); - let promise_global = v8::Global::new(scope, promise_value); - state.pending_promise_exceptions.remove(&promise_global); -} - -#[op(v8)] -fn op_has_pending_promise_exception<'a>( - scope: &mut v8::HandleScope<'a>, - promise: serde_v8::Value<'a>, -) -> bool { - let state_rc = JsRuntime::state(scope); - let state = state_rc.borrow(); - let promise_value = - v8::Local::<v8::Promise>::try_from(promise.v8_value).unwrap(); - let promise_global = v8::Global::new(scope, promise_value); - state - .pending_promise_exceptions - .contains_key(&promise_global) -} |