Skip to content

Commit b828eac

Browse files
committed
module: process.exit() should result in exit code 0
1 parent 48e7840 commit b828eac

File tree

6 files changed

+50
-6
lines changed

6 files changed

+50
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
'use strict';
2+
3+
function handleProcessExit() {
4+
if (process.exitCode === undefined)
5+
process.exitCode = 13;
6+
}
7+
8+
module.exports = {
9+
handleProcessExit,
10+
};

lib/internal/modules/run_main.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ const CJSLoader = require('internal/modules/cjs/loader');
88
const { Module, toRealPath, readPackageScope } = CJSLoader;
99
const { getOptionValue } = require('internal/options');
1010
const path = require('path');
11+
const {
12+
handleProcessExit
13+
} = require('internal/modules/esm/handle_process_exit');
1114

1215
function resolveMainPath(main) {
1316
// Note extension resolution for the main entry point can be deprecated in a
@@ -56,15 +59,11 @@ async function handleMainPromise(promise) {
5659
// Handle a Promise from running code that potentially does Top-Level Await.
5760
// In that case, it makes sense to set the exit code to a specific non-zero
5861
// value if the main code never finishes running.
59-
function handler() {
60-
if (process.exitCode === undefined)
61-
process.exitCode = 13;
62-
}
63-
process.on('exit', handler);
62+
process.on('exit', handleProcessExit);
6463
try {
6564
return await promise;
6665
} finally {
67-
process.off('exit', handler);
66+
process.off('exit', handleProcessExit);
6867
}
6968
}
7069

lib/internal/process/per_thread.js

+6
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ const {
4848
} = require('internal/validators');
4949
const constants = internalBinding('constants').os.signals;
5050

51+
const {
52+
handleProcessExit
53+
} = require('internal/modules/esm/handle_process_exit');
54+
5155
const kInternal = Symbol('internal properties');
5256

5357
function assert(x, msg) {
@@ -175,6 +179,8 @@ function wrapProcessMethods(binding) {
175179
memoryUsage.rss = rss;
176180

177181
function exit(code) {
182+
process.off('exit', handleProcessExit);
183+
178184
if (code || code === 0)
179185
process.exitCode = code;
180186

test/es-module/test-esm-tla-unfinished.mjs

+18
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,21 @@ import fixtures from '../common/fixtures.js';
8080
assert.deepStrictEqual([status, stdout], [1, '']);
8181
assert.match(stderr, /Error: Xyz/);
8282
}
83+
84+
{
85+
// Calling process.exit() in .mjs should return status 0
86+
const { status, stdout, stderr } = child_process.spawnSync(
87+
process.execPath,
88+
[fixtures.path('es-modules/tla/process-exit.mjs')],
89+
{ encoding: 'utf8' });
90+
assert.deepStrictEqual([status, stdout, stderr], [0, '', '']);
91+
}
92+
93+
{
94+
// Calling process.exit() in worker thread shouldn't influence main thread
95+
const { status, stdout, stderr } = child_process.spawnSync(
96+
process.execPath,
97+
[fixtures.path('es-modules/tla/unresolved-with-worker-process-exit.mjs')],
98+
{ encoding: 'utf8' });
99+
assert.deepStrictEqual([status, stdout, stderr], [13, '', '']);
100+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
process.exit();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Worker } from 'worker_threads';
2+
3+
// Do not use isMainThread so that this test itself can be run inside a Worker.
4+
if (!process.env.HAS_STARTED_WORKER) {
5+
process.env.HAS_STARTED_WORKER = 1;
6+
new Worker(import.meta.url.slice('file://'.length));
7+
await new Promise(() => {});
8+
} else {
9+
process.exit()
10+
}

0 commit comments

Comments
 (0)