GithubBackup/clawpanel
1
0
Fork 0
mirror of https://github.com/qingchencloud/clawpanel.git synced 2026-05-29 20:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(windows): harden gateway terminal runner

Browse Source 
Use a generated clawpanel-gateway.cmd runner for the visible Windows Gateway terminal instead of embedding the resolved CLI path directly in the cmd /K command string. This keeps the simple visible-terminal model while improving quoting behavior for standalone, npm shim, and .js CLI paths.

## Verification
- cargo fmt --manifest-path src-tauri/Cargo.toml --all -- --check
- cargo check --manifest-path src-tauri/Cargo.toml
- cargo clippy --manifest-path src-tauri/Cargo.toml --all-targets -- -D warnings
- npm run build
This commit is contained in:
晴天
2026-05-15 19:58:15 +08:00
parent 807a1d87a9
commit c592f47217
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src-tauri/src/commands/service.rs
View File

@@ -1604,12 +1604,29 @@ mod platform {
const GATEWAY_WINDOW_TITLE: &str = "OpenClaw Gateway";
fn quote_cmd_arg(value: &str) -> String {
if value.contains('\\') || value.contains('/') || value.contains(' ') {
format!("\"{}\"", value.replace('"', ""))
} else {
value.to_string()
fn quote_batch_path(value: &str) -> String {
format!("\"{}\"", value.replace('"', ""))
}
fn gateway_terminal_command(cli: &str) -> String {
if cli.eq_ignore_ascii_case("openclaw") {
return "openclaw gateway".into();
}
if cli.to_ascii_lowercase().ends_with(".js") {
return format!("node {} gateway", quote_batch_path(cli));
}
format!("{} gateway", quote_batch_path(cli))
}
fn write_gateway_terminal_runner(openclaw_dir: &Path, cli: &str) -> Result<PathBuf, String> {
fs::create_dir_all(openclaw_dir).map_err(|e| format!("创建 OpenClaw 目录失败: {e}"))?;
let runner_path = openclaw_dir.join("clawpanel-gateway.cmd");
let content = format!(
"@echo off\r\ntitle {GATEWAY_WINDOW_TITLE}\r\necho OpenClaw Gateway is running. Keep this window open.\r\necho Close this window to stop Gateway.\r\necho.\r\n{}\r\necho.\r\necho Gateway exited. You can close this window.\r\n",
gateway_terminal_command(cli)
);
fs::write(&runner_path, content).map_err(|e| format!("写入 Gateway 启动脚本失败: {e}"))?;
Ok(runner_path)
}
/// 在 Windows 上打开一个可见终端启动 Gateway
@@ -1638,13 +1655,11 @@ mod platform {
let cli = crate::utils::resolve_openclaw_cli_path().unwrap_or_else(|| "openclaw".into());
let openclaw_dir = crate::commands::openclaw_dir();
let config_path = openclaw_dir.join("openclaw.json");
let script = format!(
"title {GATEWAY_WINDOW_TITLE} && echo OpenClaw Gateway is running. Keep this window open. && echo Close this window to stop Gateway. && echo. && {} gateway",
quote_cmd_arg(&cli)
);
let runner_path = write_gateway_terminal_runner(&openclaw_dir, &cli)?;
let mut cmd = StdCommand::new("cmd");
cmd.args(["/D", "/K", &script])
cmd.args(["/D", "/K"])
.arg(&runner_path)
.creation_flags(CREATE_NEW_CONSOLE)
.env("PATH", crate::commands::enhanced_path())
.env("OPENCLAW_HOME", &openclaw_dir)