Skip to content

Commit 711d699

Browse files
Fishrock123BridgeAR
Fishrock123
authored and
BridgeAR
committed
lib,src: throw on unhanded promise rejections
src: use std::map for the promise reject map Refs: nodejs#5292 Refs: nodejs/promises#26 Refs: nodejs#6355 Refs: nodejs#6375
1 parent 456d8e2 commit 711d699

18 files changed

Lines changed: 493 additions & 40 deletions

‎lib/internal/bootstrap_node.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
const { clearIdStack, asyncIdStackSize } = async_wrap;
360360
const { kAfter, kCurrentAsyncId, kInitTriggerId } = async_wrap.constants;
361361

362-
process._fatalException = function(er) {
362+
process._fatalException = function(er, fromPromise) {
363363
var caught;
364364

365365
// It's possible that kInitTriggerId was set for a constructor call that
@@ -369,7 +369,7 @@
369369
if (process.domain && process.domain._errorHandler)
370370
caught = process.domain._errorHandler(er);
371371

372-
if (!caught)
372+
if (!caught && !fromPromise)
373373
caught = process.emit('uncaughtException', er);
374374

375375
// If someone handled it, then great. otherwise, die in C++ land

‎lib/internal/process/promises.js‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,13 @@ const { safeToString } = process.binding('util');
44

55
const promiseRejectEvent = process._promiseRejectEvent;
66
const hasBeenNotifiedProperty = new WeakMap();
7-
const promiseToGuidProperty = new WeakMap();
87
const pendingUnhandledRejections = [];
9-
let lastPromiseId = 1;
108

119
exports.setup = setupPromises;
1210

13-
function getAsynchronousRejectionWarningObject(uid) {
14-
return new Error('Promise rejection was handled ' +
15-
`asynchronously (rejection id: ${uid})`);
16-
}
17-
1811
function setupPromises(scheduleMicrotasks) {
1912
let deprecationWarned = false;
13+
const promiseInternals = {};
2014

2115
process._setupPromises(function(event, promise, reason) {
2216
if (event === promiseRejectEvent.unhandled)
@@ -25,34 +19,23 @@ function setupPromises(scheduleMicrotasks) {
2519
rejectionHandled(promise);
2620
else
2721
require('assert').fail(null, null, 'unexpected PromiseRejectEvent');
28-
});
22+
}, function getPromiseReason(data) {
23+
return data[data.indexOf('[[PromiseValue]]') + 1];
24+
}, promiseInternals);
2925

3026
function unhandledRejection(promise, reason) {
3127
hasBeenNotifiedProperty.set(promise, false);
32-
promiseToGuidProperty.set(promise, lastPromiseId++);
3328
addPendingUnhandledRejection(promise, reason);
3429
}
3530

3631
function rejectionHandled(promise) {
3732
const hasBeenNotified = hasBeenNotifiedProperty.get(promise);
3833
if (hasBeenNotified !== undefined) {
3934
hasBeenNotifiedProperty.delete(promise);
40-
const uid = promiseToGuidProperty.get(promise);
41-
promiseToGuidProperty.delete(promise);
4235
if (hasBeenNotified === true) {
43-
let warning = null;
44-
if (!process.listenerCount('rejectionHandled')) {
45-
// Generate the warning object early to get a good stack trace.
46-
warning = getAsynchronousRejectionWarningObject(uid);
47-
}
36+
promiseInternals.untrackPromise(promise);
4837
process.nextTick(function() {
49-
if (!process.emit('rejectionHandled', promise)) {
50-
if (warning === null)
51-
warning = getAsynchronousRejectionWarningObject(uid);
52-
warning.name = 'PromiseRejectionHandledWarning';
53-
warning.id = uid;
54-
process.emitWarning(warning);
55-
}
38+
process.emit('rejectionHandled', promise);
5639
});
5740
}
5841

@@ -90,9 +73,8 @@ function setupPromises(scheduleMicrotasks) {
9073
const reason = pendingUnhandledRejections.shift();
9174
if (hasBeenNotifiedProperty.get(promise) === false) {
9275
hasBeenNotifiedProperty.set(promise, true);
93-
const uid = promiseToGuidProperty.get(promise);
9476
if (!process.emit('unhandledRejection', reason, promise)) {
95-
emitWarning(uid, reason);
77+
promiseInternals.trackPromise(promise);
9678
} else {
9779
hadListeners = true;
9880
}

‎node.gyp‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@
228228
'src/stream_wrap.cc',
229229
'src/tcp_wrap.cc',
230230
'src/timer_wrap.cc',
231+
'src/track-promise.cc',
231232
'src/tracing/agent.cc',
232233
'src/tracing/node_trace_buffer.cc',
233234
'src/tracing/node_trace_writer.cc',
@@ -270,6 +271,8 @@
270271
'src/node_revert.h',
271272
'src/node_i18n.h',
272273
'src/pipe_wrap.h',
274+
'src/track-promise.h',
275+
'src/track-promise-inl.h',
273276
'src/tty_wrap.h',
274277
'src/tcp_wrap.h',
275278
'src/udp_wrap.h',
@@ -654,7 +657,39 @@
654657
'<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
655658
],
656659

657-
'defines': [ 'NODE_WANT_INTERNALS=1' ],
660+
'libraries': [
661+
'<(OBJ_GEN_PATH)/node_javascript.<(OBJ_SUFFIX)',
662+
'<(OBJ_PATH)/node_debug_options.<(OBJ_SUFFIX)',
663+
'<(OBJ_PATH)/async-wrap.<(OBJ_SUFFIX)',
664+
'<(OBJ_PATH)/env.<(OBJ_SUFFIX)',
665+
'<(OBJ_PATH)/node.<(OBJ_SUFFIX)',
666+
'<(OBJ_PATH)/node_buffer.<(OBJ_SUFFIX)',
667+
'<(OBJ_PATH)/node_i18n.<(OBJ_SUFFIX)',
668+
'<(OBJ_PATH)/node_url.<(OBJ_SUFFIX)',
669+
'<(OBJ_PATH)/debug-agent.<(OBJ_SUFFIX)',
670+
'<(OBJ_PATH)/util.<(OBJ_SUFFIX)',
671+
'<(OBJ_PATH)/string_bytes.<(OBJ_SUFFIX)',
672+
'<(OBJ_PATH)/string_search.<(OBJ_SUFFIX)',
673+
'<(OBJ_PATH)/stream_base.<(OBJ_SUFFIX)',
674+
'<(OBJ_PATH)/node_constants.<(OBJ_SUFFIX)',
675+
'<(OBJ_PATH)/node_revert.<(OBJ_SUFFIX)',
676+
'<(OBJ_TRACING_PATH)/agent.<(OBJ_SUFFIX)',
677+
'<(OBJ_TRACING_PATH)/node_trace_buffer.<(OBJ_SUFFIX)',
678+
'<(OBJ_TRACING_PATH)/node_trace_writer.<(OBJ_SUFFIX)',
679+
'<(OBJ_TRACING_PATH)/trace_event.<(OBJ_SUFFIX)',
680+
'<(OBJ_PATH)/track-promise.<(OBJ_SUFFIX)',
681+
],
682+
683+
'defines': [
684+
# gtest's ASSERT macros conflict with our own.
685+
'GTEST_DONT_DEFINE_ASSERT_EQ=1',
686+
'GTEST_DONT_DEFINE_ASSERT_GE=1',
687+
'GTEST_DONT_DEFINE_ASSERT_GT=1',
688+
'GTEST_DONT_DEFINE_ASSERT_LE=1',
689+
'GTEST_DONT_DEFINE_ASSERT_LT=1',
690+
'GTEST_DONT_DEFINE_ASSERT_NE=1',
691+
'NODE_WANT_INTERNALS=1',
692+
],
658693

659694
'sources': [
660695
'src/node_platform.cc',

‎src/env-inl.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,8 @@ inline Environment* Environment::GetCurrent(
280280

281281
inline Environment::Environment(IsolateData* isolate_data,
282282
v8::Local<v8::Context> context)
283-
: isolate_(context->GetIsolate()),
283+
: promise_tracker_(this),
284+
isolate_(context->GetIsolate()),
284285
isolate_data_(isolate_data),
285286
async_hooks_(context->GetIsolate()),
286287
timer_base_(uv_now(isolate_data->event_loop())),

‎src/env.h‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
#endif
3232
#include "handle_wrap.h"
3333
#include "req-wrap.h"
34+
#include "track-promise.h"
35+
#include "tree.h"
3436
#include "util.h"
3537
#include "uv.h"
3638
#include "v8.h"
@@ -236,6 +238,7 @@ class ModuleWrap;
236238
V(preference_string, "preference") \
237239
V(priority_string, "priority") \
238240
V(produce_cached_data_string, "produceCachedData") \
241+
V(promise_rejection_index_string, "_promiseRejectionIndex") \
239242
V(raw_string, "raw") \
240243
V(read_host_object_string, "_readHostObject") \
241244
V(readable_string, "readable") \
@@ -294,6 +297,7 @@ class ModuleWrap;
294297
V(zero_return_string, "ZERO_RETURN")
295298

296299
#define ENVIRONMENT_STRONG_PERSISTENT_PROPERTIES(V) \
300+
V(array_from, v8::Function) \
297301
V(as_external, v8::External) \
298302
V(async_hooks_destroy_function, v8::Function) \
299303
V(async_hooks_init_function, v8::Function) \
@@ -312,8 +316,8 @@ class ModuleWrap;
312316
V(performance_entry_callback, v8::Function) \
313317
V(performance_entry_template, v8::Function) \
314318
V(process_object, v8::Object) \
315-
V(promise_reject_function, v8::Function) \
316-
V(promise_wrap_template, v8::ObjectTemplate) \
319+
V(promise_unhandled_rejection_function, v8::Function) \
320+
V(promise_unhandled_rejection, v8::Function) \
317321
V(push_values_to_array_function, v8::Function) \
318322
V(randombytes_constructor_template, v8::ObjectTemplate) \
319323
V(script_context_constructor_template, v8::FunctionTemplate) \
@@ -678,6 +682,9 @@ class Environment {
678682
bool RemovePromiseHook(promise_hook_func fn, void* arg);
679683
bool EmitNapiWarning();
680684

685+
PromiseTracker promise_tracker_;
686+
int64_t promise_tracker_index_ = 0;
687+
681688
private:
682689
inline void ThrowError(v8::Local<v8::Value> (*fun)(v8::Local<v8::String>),
683690
const char* errmsg);

0 commit comments

Comments
 (0)