Skip to content

fix(cli): interrupt running commands cleanly on Ctrl+C #1370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jeppe Fredsgaard Blaabjerg (jfblaa) wants to merge 2 commits into
base: v1.x
Choose a base branch
from
+33 −1
Open

fix(cli): interrupt running commands cleanly on Ctrl+C #1370

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
010d858
fix(cli): interrupt running commands cleanly on Ctrl+C
jfblaa Jun 18, 2026
65534b2
fix(cli): mirror child signal death as 128+signum, not re-raise
jfblaa Jun 18, 2026
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
34 changes: 33 additions & 1 deletion bin/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

void (async () => {
const Module = require('node:module')
const os = require('node:os')
const path = require('node:path')
const rootPath = path.join(__dirname, '..')
Module.enableCompileCache?.(path.join(rootPath, '.cache'))
Expand Down Expand Up @@ -38,10 +39,41 @@ void (async () => {
},
)

// The child shares our process group and handles the signal itself; wait briefly for it
// to exit (so its final output isn't printed after the prompt returns) and mirror its
// exit below. SIGKILL and leave if it outlasts the grace, or on a second signal.
const SHUTDOWN_GRACE_MS = 3_000
const hardAbort = signalName => {
const child = spawnPromise.process
if (child.exitCode === null && child.signalCode === null) {
child.kill('SIGKILL')
}
// eslint-disable-next-line n/no-process-exit
process.exit(signalName === 'SIGTERM' ? 143 : 130)
}
let sawSignal = false
const onSignal = signalName => {
if (sawSignal) {
hardAbort(signalName)
return
}
sawSignal = true
setTimeout(() => hardAbort(signalName), SHUTDOWN_GRACE_MS).unref?.()
}
const onSigint = () => onSignal('SIGINT')
const onSigterm = () => onSignal('SIGTERM')
process.on('SIGINT', onSigint)
process.on('SIGTERM', onSigterm)

// See https://nodejs.org/api/child_process.html#event-exit.
spawnPromise.process.on('exit', (code, signalName) => {
if (signalName) {
process.kill(process.pid, signalName)
// Mirror a signal death as the conventional 128 + signum exit code. Exit explicitly
// rather than re-raising the signal: with our handlers installed the re-raise would
// race `await spawnPromise` resolving and could leave the default exitCode of 1.
const signum = os.constants.signals[signalName] ?? 0
// eslint-disable-next-line n/no-process-exit
process.exit(128 + signum)
} else if (typeof code === 'number') {
// eslint-disable-next-line n/no-process-exit
process.exit(code)
Expand Down
Loading