Part 1 of 2 of the n/no-process-exit cleanup (umbrella #738): convert every process.exit() call in standalone scripts/** CLIs to the rule-compliant pattern. - New shared helper scripts/lib/cli-exit.cjs: ExitError(code,message) + runMain() which translates a thrown ExitError / returned number into process.exitCode (never process.exit()), flushing output and still firing process.on('exit'). - main()-based entrypoints: throw new ExitError(code) for errors, return <code> for verdicts; invoked via runMain(main). Child exit codes preserved via return. - top-level-only scripts: imperative body extracted into main() so mid-flow aborts (throw ExitError) actually halt; pure consts/helpers stay at module scope. - diff-touches-shipped-paths.cjs: stdin event handling restructured to an async read so the whole flow runs under runMain; uncaughtException/unhandledRejection nets replaced by an in-band catch that preserves EXIT_ERROR=2. Exit codes verified unchanged for every converted script (success/error/help and the 0/1/2 semantic codes in diff-touches). Rule stays warn here; flipped to error in part 2 (#738) once gsd-core/bin/** is also clean. Refs #739 Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -46,6 +46,7 @@ const fs = require('fs');
|
||||
const os = require('os');
|
||||
const path = require('path');
|
||||
const { PACKAGE_NAME } = require('../gsd-core/bin/lib/package-identity.cjs');
|
||||
const { ExitError, runMain } = require('./lib/cli-exit.cjs');
|
||||
// 120 s proved too tight on Windows GitHub-hosted runners: cold-cache
|
||||
// `npm install -g` with a 1499-file tarball took ~120 s exactly, causing
|
||||
// spawnSync to fire SIGTERM and return { status: null, stdout: '', stderr: '' }
|
||||
@@ -587,23 +588,24 @@ function cliMain() {
|
||||
};
|
||||
if (isJson) process.stdout.write(JSON.stringify(result) + '\n');
|
||||
cleanup(packDir, installPrefix, fixtureDir);
|
||||
process.exit(1);
|
||||
throw new ExitError(1);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
if (err instanceof ExitError) throw err;
|
||||
const result = {
|
||||
code: SMOKE.PACK_FAILED,
|
||||
details: { error: err.message, stderr: err.stderr },
|
||||
};
|
||||
if (isJson) process.stdout.write(JSON.stringify(result) + '\n');
|
||||
cleanup(packDir, installPrefix, fixtureDir);
|
||||
process.exit(1);
|
||||
throw new ExitError(1);
|
||||
}
|
||||
|
||||
const result = runSmoke({ tarballPath, installPrefix, expectedVersion, fixtureDir });
|
||||
if (isJson) process.stdout.write(JSON.stringify(result) + '\n');
|
||||
cleanup(packDir, installPrefix, fixtureDir);
|
||||
process.exit(result.code === SMOKE.OK ? 0 : 1);
|
||||
return result.code === SMOKE.OK ? 0 : 1;
|
||||
}
|
||||
|
||||
function cleanup(...dirs) {
|
||||
@@ -623,5 +625,5 @@ function cleanup(...dirs) {
|
||||
module.exports = { SMOKE, runSmoke, binInvocation };
|
||||
|
||||
if (require.main === module) {
|
||||
cliMain();
|
||||
runMain(cliMain);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user