Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions lib/internal/process/promises.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ const {
promiseRejectEvents: {
kPromiseRejectWithNoHandler,
kPromiseHandlerAddedAfterReject,
kPromiseRejectAfterResolved,
kPromiseResolveAfterResolved,
},
setPromiseRejectCallback,
} = internalBinding('task_queue');
Expand Down Expand Up @@ -161,21 +159,15 @@ function promiseRejectHandler(type, promise, reason) {
if (unhandledRejectionsMode === undefined) {
unhandledRejectionsMode = getUnhandledRejectionsMode();
}
// kPromiseRejectAfterResolved and kPromiseResolveAfterResolved are
// filtered out in C++ (src/node_task_queue.cc) and never reach JS.
switch (type) {
case kPromiseRejectWithNoHandler: // 0
unhandledRejection(promise, reason);
break;
case kPromiseHandlerAddedAfterReject: // 1
handledRejection(promise);
break;
case kPromiseRejectAfterResolved: // 2
// Do nothing in this case. Previous we would emit a multipleResolves
// event but that was deprecated then later removed.
break;
case kPromiseResolveAfterResolved: // 3
// Do nothing in this case. Previous we would emit a multipleResolves
// event but that was deprecated then later removed.
break;
}
}

Expand Down
14 changes: 5 additions & 9 deletions src/node_task_queue.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ using v8::FunctionCallbackInfo;
using v8::Isolate;
using v8::Just;
using v8::kPromiseHandlerAddedAfterReject;
using v8::kPromiseRejectAfterResolved;
using v8::kPromiseRejectWithNoHandler;
using v8::kPromiseResolveAfterResolved;
using v8::Local;
using v8::Maybe;
using v8::Number;
Expand Down Expand Up @@ -53,7 +51,11 @@ void PromiseRejectCallback(PromiseRejectMessage message) {

Environment* env = Environment::GetCurrent(isolate);

if (env == nullptr || !env->can_call_into_js()) return;
if (env == nullptr || !env->can_call_into_js() ||
(event != kPromiseRejectWithNoHandler &&
event != kPromiseHandlerAddedAfterReject)) {
return;
}

Local<Function> callback = env->promise_reject_callback();
// The promise is rejected before JS land calls SetPromiseRejectCallback
Expand All @@ -77,10 +79,6 @@ void PromiseRejectCallback(PromiseRejectMessage message) {
"rejections",
"unhandled", unhandledRejections,
"handledAfter", rejectionsHandledAfter);
} else if (event == kPromiseResolveAfterResolved) {
value = message.GetValue();
} else if (event == kPromiseRejectAfterResolved) {
value = message.GetValue();
} else {
return;
}
Expand Down Expand Up @@ -173,8 +171,6 @@ static void Initialize(Local<Object> target,
Local<Object> events = Object::New(isolate);
NODE_DEFINE_CONSTANT(events, kPromiseRejectWithNoHandler);
NODE_DEFINE_CONSTANT(events, kPromiseHandlerAddedAfterReject);
NODE_DEFINE_CONSTANT(events, kPromiseResolveAfterResolved);
NODE_DEFINE_CONSTANT(events, kPromiseRejectAfterResolved);

target->Set(env->context(),
FIXED_ONE_BYTE_STRING(isolate, "promiseRejectEvents"),
Expand Down