mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-19 22:10:51 +00:00
The updater was previously attempting to restart the service using the installed codebase, which could be in an inconsistent state during the update process. This caused the service to stall when the updater deleted its own files before the restart could complete. Changes: - restart-helper.ts: new module that writes a platform-specific restart script to os.tmpdir() before the update begins (Linux systemd, macOS launchctl, Windows schtasks). - update-command.ts: prepares the restart script before installing, then uses it for service restart instead of the standard runDaemonRestart. - restart-helper.test.ts: 12 tests covering all platforms, custom profiles, error cases, and shell injection safety. Review feedback addressed: - Use spawn(detached: true) + unref() so restart script survives parent process termination (Greptile). - Shell-escape profile values using single-quote wrapping to prevent injection via OPENCLAW_PROFILE (Greptile). - Reject unsafe batch characters on Windows. - Self-cleanup: scripts delete themselves after execution (Copilot). - Add tests for write failures and custom profiles (Copilot). Fixes #17225
119 lines
4.0 KiB
TypeScript
119 lines
4.0 KiB
TypeScript
import { spawn } from "node:child_process";
|
|
import fs from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import {
|
|
resolveGatewayLaunchAgentLabel,
|
|
resolveGatewaySystemdServiceName,
|
|
resolveGatewayWindowsTaskName,
|
|
} from "../../daemon/constants.js";
|
|
|
|
/**
|
|
* Shell-escape a string for embedding in single-quoted shell arguments.
|
|
* Replaces every `'` with `'\''` (end quote, escaped quote, resume quote).
|
|
* For batch scripts, validates against special characters instead.
|
|
*/
|
|
function shellEscape(value: string): string {
|
|
return value.replace(/'/g, "'\\''");
|
|
}
|
|
|
|
/** Validates a string is safe for embedding in a batch (cmd.exe) script. */
|
|
function isBatchSafe(value: string): boolean {
|
|
// Reject characters that have special meaning in batch: & | < > ^ % " ` $
|
|
return /^[A-Za-z0-9 _\-().]+$/.test(value);
|
|
}
|
|
|
|
/**
|
|
* Prepares a standalone script to restart the gateway service.
|
|
* This script is written to a temporary directory and does not depend on
|
|
* the installed package files, ensuring restart capability even if the
|
|
* update process temporarily removes or corrupts installation files.
|
|
*/
|
|
export async function prepareRestartScript(
|
|
env: NodeJS.ProcessEnv = process.env,
|
|
): Promise<string | null> {
|
|
const tmpDir = os.tmpdir();
|
|
const timestamp = Date.now();
|
|
const platform = process.platform;
|
|
|
|
let scriptContent = "";
|
|
let filename = "";
|
|
|
|
try {
|
|
if (platform === "linux") {
|
|
const serviceName = resolveGatewaySystemdServiceName(env.OPENCLAW_PROFILE);
|
|
const escaped = shellEscape(`${serviceName}.service`);
|
|
filename = `openclaw-restart-${timestamp}.sh`;
|
|
scriptContent = `#!/bin/sh
|
|
# Standalone restart script — survives parent process termination.
|
|
# Wait briefly to ensure file locks are released after update.
|
|
sleep 1
|
|
systemctl --user restart '${escaped}'
|
|
# Self-cleanup
|
|
rm -f "$0"
|
|
`;
|
|
} else if (platform === "darwin") {
|
|
const label = resolveGatewayLaunchAgentLabel(env.OPENCLAW_PROFILE);
|
|
const escaped = shellEscape(label);
|
|
// Fallback to 501 if getuid is not available (though it should be on macOS)
|
|
const uid = process.getuid ? process.getuid() : 501;
|
|
filename = `openclaw-restart-${timestamp}.sh`;
|
|
scriptContent = `#!/bin/sh
|
|
# Standalone restart script — survives parent process termination.
|
|
# Wait briefly to ensure file locks are released after update.
|
|
sleep 1
|
|
launchctl kickstart -k 'gui/${uid}/${escaped}'
|
|
# Self-cleanup
|
|
rm -f "$0"
|
|
`;
|
|
} else if (platform === "win32") {
|
|
const taskName = resolveGatewayWindowsTaskName(env.OPENCLAW_PROFILE);
|
|
if (!isBatchSafe(taskName)) {
|
|
return null;
|
|
}
|
|
filename = `openclaw-restart-${timestamp}.bat`;
|
|
scriptContent = `@echo off
|
|
REM Standalone restart script — survives parent process termination.
|
|
REM Wait briefly to ensure file locks are released after update.
|
|
timeout /t 2 /nobreak >nul
|
|
schtasks /End /TN "${taskName}"
|
|
schtasks /Run /TN "${taskName}"
|
|
REM Self-cleanup
|
|
del "%~f0"
|
|
`;
|
|
} else {
|
|
return null;
|
|
}
|
|
|
|
const scriptPath = path.join(tmpDir, filename);
|
|
await fs.writeFile(scriptPath, scriptContent, { mode: 0o755 });
|
|
return scriptPath;
|
|
} catch {
|
|
// If we can't write the script, we'll fall back to the standard restart method
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Executes the prepared restart script as a **detached** process.
|
|
*
|
|
* The script must outlive the CLI process because the CLI itself is part
|
|
* of the service being restarted — `systemctl restart` / `launchctl
|
|
* kickstart -k` will terminate the current process tree. Using
|
|
* `spawn({ detached: true })` + `unref()` ensures the script survives
|
|
* the parent's exit.
|
|
*
|
|
* Resolves immediately after spawning; the script runs independently.
|
|
*/
|
|
export async function runRestartScript(scriptPath: string): Promise<void> {
|
|
const isWindows = process.platform === "win32";
|
|
const file = isWindows ? "cmd.exe" : "/bin/sh";
|
|
const args = isWindows ? ["/c", scriptPath] : [scriptPath];
|
|
|
|
const child = spawn(file, args, {
|
|
detached: true,
|
|
stdio: "ignore",
|
|
});
|
|
child.unref();
|
|
}
|