Skip to content
Draft
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
8 changes: 3 additions & 5 deletions lib/internal/webstreams/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const {
NumberIsNaN,
ObjectFreeze,
PromisePrototypeThen,
PromiseReject,
PromiseResolve,
Symbol,
TypedArrayPrototypeGetBuffer,
Expand All @@ -41,6 +40,7 @@ const {
constants: {
kPending,
},
createRejectedHandledPromise,
getPromiseDetails,
} = internalBinding('util');

Expand Down Expand Up @@ -365,13 +365,11 @@ function resolvedRecord() {
}

function rejectedHandledRecord(error) {
const record = {
promise: PromiseReject(error),
return {
promise: createRejectedHandledPromise(error),
resolve: undefined,
reject: undefined,
};
setPromiseHandled(record.promise);
return record;
}

function setPromiseHandled(promise) {
Expand Down
25 changes: 25 additions & 0 deletions src/node_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,26 @@ void MarkPromiseAsHandled(const FunctionCallbackInfo<Value>& args) {
promise->MarkAsSilent();
}

// Returns a promise rejected with the given reason, already marked as handled
// and silent so it does not trigger unhandled rejection tracking. This avoids
// the extra boundary crossing of rejecting the promise in JS and then marking
// it as handled through a separate call.
void CreateRejectedHandledPromise(const FunctionCallbackInfo<Value>& args) {
Isolate* isolate = args.GetIsolate();
Local<Context> context = isolate->GetCurrentContext();
Local<Promise::Resolver> resolver;
if (!Promise::Resolver::New(context).ToLocal(&resolver)) {
return;
}
Local<Promise> promise = resolver->GetPromise();
promise->MarkAsHandled();
promise->MarkAsSilent();
if (resolver->Reject(context, args[0]).IsNothing()) {
return;
}
args.GetReturnValue().Set(promise);
}

void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
registry->Register(GetPromiseDetails);
registry->Register(GetProxyDetails);
Expand All @@ -488,6 +508,7 @@ void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
registry->Register(DefineLazyPropertiesGetter);
registry->Register(ConstructSharedArrayBuffer);
registry->Register(MarkPromiseAsHandled);
registry->Register(CreateRejectedHandledPromise);
}

void Initialize(Local<Object> target,
Expand Down Expand Up @@ -594,6 +615,10 @@ void Initialize(Local<Object> target,
"constructSharedArrayBuffer",
ConstructSharedArrayBuffer);
SetMethod(context, target, "markPromiseAsHandled", MarkPromiseAsHandled);
SetMethod(context,
target,
"createRejectedHandledPromise",
CreateRejectedHandledPromise);

Local<String> should_abort_on_uncaught_toggle =
FIXED_ONE_BYTE_STRING(env->isolate(), "shouldAbortOnUncaughtToggle");
Expand Down
1 change: 1 addition & 0 deletions typings/internalBinding/util.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface UtilBinding {
getHiddenValue(object: object, index: number): any;
setHiddenValue(object: object, index: number, value: any): boolean;
getPromiseDetails(promise: any): undefined | [state: 0] | [state: 1 | 2, result: any];
createRejectedHandledPromise(reason: any): Promise<never>;
getProxyDetails(proxy: any, fullProxy?: boolean): undefined | any | [target: any, handler: any];
previewEntries(object: object, slowPath?: boolean): undefined | any[] | [entries: any[], isKeyValue: boolean];
getOwnNonIndexProperties(object: object, filter: number): Array<string | symbol>;
Expand Down
Loading