github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 02:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(daemon): extract windows cmd argv helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-19 16:22:17 +01:00
parent a1cb700a05
commit 035832b4c5
4 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/daemon/schtasks.ts
View File

@@ -1,7 +1,7 @@
import fs from "node:fs/promises";
import path from "node:path";
import { splitArgsPreservingQuotes } from "./arg-split.js";
import { parseCmdSetAssignment, renderCmdSetAssignment } from "./cmd-set.js";
import { parseCmdScriptCommandLine, quoteCmdScriptArg } from "./cmd-argv.js";
import { assertNoCmdLineBreak, parseCmdSetAssignment, renderCmdSetAssignment } from "./cmd-set.js";
import { resolveGatewayServiceDescription, resolveGatewayWindowsTaskName } from "./constants.js";
import { formatLine, writeFormattedLines } from "./output.js";
import { resolveGatewayStateDir } from "./paths.js";
@@ -36,12 +36,8 @@ export function resolveTaskScriptPath(env: GatewayServiceEnv): string {
return path.join(stateDir, scriptName);
}
function assertNoCmdLineBreak(value: string, field: string): void {
if (/[\r\n]/.test(value)) {
throw new Error(`${field} cannot contain CR or LF in Windows task scripts.`);
}
}
// `/TR` is parsed by schtasks itself, while the generated `gateway.cmd` line is parsed by cmd.exe.
// Keep their quoting strategies separate so each parser gets the encoding it expects.
function quoteSchtasksArg(value: string): string {
if (!/[ \t"]/g.test(value)) {
return value;
@@ -49,22 +45,6 @@ function quoteSchtasksArg(value: string): string {
return `"${value.replace(/"/g, '\\"')}"`;
}
function quoteCmdScriptArg(value: string): string {
assertNoCmdLineBreak(value, "Command argument");
if (!value) {
return '""';
}
const escaped = value.replace(/"/g, '\\"').replace(/%/g, "%%").replace(/!/g, "^!");
if (!/[ \t"&|<>^()%!]/g.test(value)) {
return escaped;
}
return `"${escaped}"`;
}
function unescapeCmdScriptArg(value: string): string {
return value.replace(/\^!/g, "!").replace(/%%/g, "%");
}
function resolveTaskUser(env: GatewayServiceEnv): string | null {
const username = env.USERNAME || env.USER || env.LOGNAME;
if (!username) {
@@ -80,14 +60,6 @@ function resolveTaskUser(env: GatewayServiceEnv): string | null {
return username;
}
function parseCommandLine(value: string): string[] {
// `buildTaskScript` escapes quotes (`\"`) and cmd expansions (`%%`, `^!`).
// Keep all other backslashes literal so drive and UNC paths are preserved.
return splitArgsPreservingQuotes(value, { escapeMode: "backslash-quote-only" }).map(
unescapeCmdScriptArg,
);
}
export async function readScheduledTaskCommand(
env: GatewayServiceEnv,
): Promise<GatewayServiceCommandConfig | null> {
@@ -127,7 +99,7 @@ export async function readScheduledTaskCommand(
return null;
}
return {
programArguments: parseCommandLine(commandLine),
programArguments: parseCmdScriptCommandLine(commandLine),
...(workingDirectory ? { workingDirectory } : {}),
...(Object.keys(environment).length > 0 ? { environment } : {}),
};
@@ -180,8 +152,6 @@ function buildTaskScript({
if (!value) {
continue;
}
assertNoCmdLineBreak(key, "Environment variable name");
assertNoCmdLineBreak(value, "Environment variable value");
lines.push(renderCmdSetAssignment(key, value));
}
}