Skip to content

Commit b6005b3

Browse files
joyeecheungtargos
authored andcommitted
module: mark evaluation rejection in require(esm) as handled
Previously the implemention of require(esm) only converted the rejected promise from module evaluation into an error, but the rejected promise was still treated as a pending unhandled rejection by the promise rejection callback, because the promise is created by V8 internals and we don't get a chance to mark it as handled, so the rejection incorrectly marked as unhandled would still go through unhandled rejection handling (if no global listener is set, the default handling would print a warning and make the Node.js instance exit with 1). This patch fixes it by calling into the JS promise rejection callback to mark the evalaution rejection handled so that it doesn't go through unhandled rejection handling. PR-URL: #56122 Fixes: #56115 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 78a2a6c commit b6005b3

6 files changed

+59
-0
lines changed

src/module_wrap.cc

+16
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,22 @@ void ModuleWrap::EvaluateSync(const FunctionCallbackInfo<Value>& args) {
663663
CHECK(result->IsPromise());
664664
Local<Promise> promise = result.As<Promise>();
665665
if (promise->State() == Promise::PromiseState::kRejected) {
666+
// The rejected promise is created by V8, so we don't get a chance to mark
667+
// it as resolved before the rejection happens from evaluation. But we can
668+
// tell the promise rejection callback to treat it as a promise rejected
669+
// before handler was added which would remove it from the unhandled
670+
// rejection handling, since we are converting it into an error and throw
671+
// from here directly.
672+
Local<Value> type = v8::Integer::New(
673+
isolate,
674+
static_cast<int32_t>(
675+
v8::PromiseRejectEvent::kPromiseHandlerAddedAfterReject));
676+
Local<Value> args[] = {type, promise, Undefined(isolate)};
677+
if (env->promise_reject_callback()
678+
->Call(context, Undefined(isolate), arraysize(args), args)
679+
.IsEmpty()) {
680+
return;
681+
}
666682
Local<Value> exception = promise->Result();
667683
Local<v8::Message> message =
668684
v8::Exception::CreateMessage(isolate, exception);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// This tests synchronous errors in ESM from require(esm) can be caught.
2+
3+
'use strict';
4+
5+
require('../common');
6+
const assert = require('assert');
7+
8+
// Runtime errors from throw should be caught.
9+
assert.throws(() => {
10+
require('../fixtures/es-modules/runtime-error-esm.js');
11+
}, {
12+
message: 'hello'
13+
});
14+
15+
// References errors should be caught too.
16+
assert.throws(() => {
17+
require('../fixtures/es-modules/reference-error-esm.js');
18+
}, {
19+
name: 'ReferenceError',
20+
message: 'exports is not defined'
21+
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// This synchronous rejections from require(esm) still go to the unhandled rejection
2+
// handler.
3+
4+
'use strict';
5+
6+
const common = require('../common');
7+
const assert = require('assert');
8+
9+
process.on('unhandledRejection', common.mustCall((reason, promise) => {
10+
assert.strictEqual(reason, 'reject!');
11+
}));
12+
13+
require('../fixtures/es-modules/synchronous-rejection-esm.js');
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// This module is invalid in both ESM and CJS, because
2+
// 'exports' are not defined in ESM, while require cannot be
3+
// redeclared in CJS.
4+
Object.defineProperty(exports, "__esModule", { value: true });
5+
const require = () => {};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import 'node:fs'; // Forces it to be recognized as ESM.
2+
throw new Error('hello');
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import 'node:fs'; // Forces it to be recognized as ESM.
2+
Promise.reject('reject!');

0 commit comments

Comments
 (0)