vrr/spawn
2
0
Fork 0
mirror of https://github.com/OpenRouterTeam/spawn.git synced 2026-05-05 23:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

refactor: extract helpers from performAutoUpdate in update-check.ts (#881)

Browse source 
Break down the 70-line performAutoUpdate function (depth-4 nesting, mixed
concerns) into focused helpers:

- shellQuote: reusable shell-quoting utility
- printUpdateBanner: boxed update notification formatting
- reExecWithArgs: binary re-exec with exit code forwarding
- performAutoUpdate: clean 22-line orchestrator

Agent: complexity-hunter

Co-authored-by: A <6723574+louisgv@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
A 2026-02-13 05:53:33 -08:00 • committed by GitHub
parent a0d1d1b40b
commit 6589fd1f2f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 42 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

73
cli/src/update-check.ts
View file

@ -52,7 +52,13 @@ function compareVersions(current: string, latest: string): boolean {
return false; // Versions are equal
}
function performAutoUpdate(latestVersion: string): void {
/** Shell-quote a string for safe interpolation into a bash command */
function shellQuote(s: string): string {
return `'${s.replace(/'/g, "'\\''")}'`;
}
/** Print boxed update banner to stderr */
function printUpdateBanner(latestVersion: string): void {
const line1 = `Update available: v${VERSION} -> v${latestVersion}`;
const line2 = "Updating automatically...";
const width = Math.max(line1.length, line2.length) + 4;
@ -75,9 +81,41 @@ function performAutoUpdate(latestVersion: string): void {
);
console.error(pc.yellow(border));
console.error();
}
/** Re-exec the updated binary with the original CLI arguments, forwarding the exit code */
function reExecWithArgs(): void {
const args = process.argv.slice(2);
if (args.length === 0) {
console.error(pc.dim(" Run your spawn command again to use the new version."));
console.error();
process.exit(0);
return; // unreachable in production, but needed when process.exit is mocked in tests
}
const binPath = process.argv[1] || "spawn";
const cmd = [shellQuote(binPath), ...args.map(shellQuote)].join(" ");
console.error(pc.dim(` Rerunning: spawn ${args.join(" ")}`));
console.error();
try {
executor.execSync(cmd, {
stdio: "inherit",
shell: "/bin/bash",
env: { ...process.env, SPAWN_NO_UPDATE_CHECK: "1" },
});
process.exit(0);
} catch (reexecErr) {
const code = reexecErr && typeof reexecErr === "object" && "status" in reexecErr
? (reexecErr as { status: number }).status
: 1;
process.exit(code);
}
}
function performAutoUpdate(latestVersion: string): void {
printUpdateBanner(latestVersion);
try {
// Run the install script to update
executor.execSync(`curl -fsSL ${RAW_BASE}/cli/install.sh | bash`, {
stdio: "inherit",
shell: "/bin/bash",
@ -85,35 +123,8 @@ function performAutoUpdate(latestVersion: string): void {
console.error();
console.error(pc.green(pc.bold(`${CHECK_MARK} Updated successfully!`)));
// Re-exec the updated binary with the same arguments
const args = process.argv.slice(2);
if (args.length > 0) {
const binPath = process.argv[1] || "spawn";
const quotedBin = `'${binPath.replace(/'/g, "'\\''")}'`;
const quotedArgs = args.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
console.error(pc.dim(` Rerunning: spawn ${args.join(" ")}`));
console.error();
try {
executor.execSync(`${quotedBin} ${quotedArgs}`, {
stdio: "inherit",
shell: "/bin/bash",
env: { ...process.env, SPAWN_NO_UPDATE_CHECK: "1" },
});
process.exit(0);
} catch (reexecErr) {
// Forward the exit code from the re-executed command
const code = reexecErr && typeof reexecErr === "object" && "status" in reexecErr
? (reexecErr as { status: number }).status
: 1;
process.exit(code);
}
} else {
console.error(pc.dim(" Run your spawn command again to use the new version."));
console.error();
process.exit(0);
}
} catch (err) {
reExecWithArgs();
} catch {
console.error();
console.error(pc.red(pc.bold(`${CROSS_MARK} Auto-update failed`)));
console.error(pc.dim(" Please update manually:"));