feat: OpenClaw 4.9 全面适配 (v0.12.0)

- 推荐内核统一升级至 2026.4.9 / 2026.4.9-zh.2
- standalone 安装兼容 edition 格式 latest.json + openclaw-zh- 文件名前缀
- standalone 三级降级: R2 CDN → GitHub Releases → npm
- pre_install_cleanup 所有命令加 10s 超时保护(修复安装卡死)
- npm uninstall 加 30s 超时保护
- wmic 全部迁移到 PowerShell(兼容 Windows 11)
- standalone 下载增加文字进度显示
This commit is contained in:
晴天
2026-04-11 04:42:36 +08:00
parent 70d768be17
commit 271dc93b08
18 changed files with 706 additions and 145 deletions

View File

@@ -485,40 +485,83 @@ fn npm_command_elevated() -> Command {
/// 安装/升级前的清理工作:停止 Gateway、清理 npm 全局 bin 下的 openclaw 残留文件
/// 解决 Windows 上 EEXIST文件已存在和文件被占用的问题
fn pre_install_cleanup() {
// 1. 先通过 CLI 正常停止 Gateway
let _ = openclaw_command().args(["gateway", "stop"]).output();
/// 带超时执行命令spawn + try_wait防止任何子进程无限阻塞
fn run_with_timeout(mut child: std::process::Child, timeout_secs: u64) -> Option<std::process::Output> {
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(timeout_secs);
loop {
match child.try_wait() {
Ok(Some(status)) => {
let stdout = child.stdout.take().map(|mut s| {
let mut buf = Vec::new();
let _ = std::io::Read::read_to_end(&mut s, &mut buf);
buf
}).unwrap_or_default();
return Some(std::process::Output { status, stdout, stderr: Vec::new() });
}
Ok(None) => {
if std::time::Instant::now() >= deadline {
let _ = child.kill();
let _ = child.wait();
return None;
}
std::thread::sleep(std::time::Duration::from_millis(200));
}
Err(_) => return None,
}
}
}
// 1. 先通过 CLI 正常停止 Gateway10s 超时)
if let Ok(child) = openclaw_command()
.args(["gateway", "stop"])
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.spawn()
{
run_with_timeout(child, 10);
}
// 2. 停止 Gateway 进程,释放 openclaw 相关文件锁
#[cfg(target_os = "windows")]
{
// 杀死所有运行 openclaw gateway 的 node.exe 进程(通过命令行匹配)
if let Ok(output) = Command::new("wmic")
.args(["process", "where", "CommandLine like '%openclaw%gateway%'", "get", "ProcessId", "/format:list"])
.output()
// 使用 PowerShell Get-CimInstance兼容 Windows 11wmic 已废弃10s 超时)
if let Ok(child) = Command::new("powershell")
.args(["-NoProfile", "-Command",
"Get-CimInstance Win32_Process -Filter \"CommandLine like '%openclaw%gateway%'\" -ErrorAction SilentlyContinue | Select-Object -ExpandProperty ProcessId"])
.stdout(std::process::Stdio::piped())
.stderr(std::process::Stdio::null())
.spawn()
{
let text = String::from_utf8_lossy(&output.stdout);
for line in text.lines() {
if let Some(pid_str) = line.strip_prefix("ProcessId=") {
if let Ok(_pid) = pid_str.trim().parse::<u32>() {
let _ = Command::new("taskkill").args(["/F", "/PID", pid_str.trim()]).output();
if let Some(output) = run_with_timeout(child, 10) {
let text = String::from_utf8_lossy(&output.stdout);
for line in text.lines() {
if let Ok(_pid) = line.trim().parse::<u32>() {
let _ = Command::new("taskkill").args(["/F", "/PID", line.trim()]).output();
}
}
}
}
// 同时杀死 standalone 目录下的 node.exe 进程
// 同时杀死 standalone 目录下的 node.exe 进程(每个目录 10s 超时)
for sa_dir in all_standalone_dirs() {
if sa_dir.exists() {
let dir_str = sa_dir.to_string_lossy().to_lowercase();
if let Ok(output) = Command::new("wmic")
.args(["process", "where", &format!("ExecutablePath like '%{}%'", dir_str.replace('\\', "\\\\")), "get", "ProcessId", "/format:list"])
.output()
let dir_lower = sa_dir.to_string_lossy().to_lowercase().replace('\\', "\\\\");
let ps_script = format!(
"Get-Process -Name node -ErrorAction SilentlyContinue | Where-Object {{ $_.Path -and $_.Path.ToLower().Contains('{}') }} | Select-Object -ExpandProperty Id",
dir_lower
);
if let Ok(child) = Command::new("powershell")
.args(["-NoProfile", "-Command", &ps_script])
.stdout(std::process::Stdio::piped())
.stderr(std::process::Stdio::null())
.spawn()
{
let text = String::from_utf8_lossy(&output.stdout);
for line in text.lines() {
if let Some(pid_str) = line.strip_prefix("ProcessId=") {
if let Ok(_pid) = pid_str.trim().parse::<u32>() {
let _ = Command::new("taskkill").args(["/F", "/PID", pid_str.trim()]).output();
if let Some(output) = run_with_timeout(child, 10) {
let text = String::from_utf8_lossy(&output.stdout);
for line in text.lines() {
if let Ok(_pid) = line.trim().parse::<u32>() {
let _ = Command::new("taskkill").args(["/F", "/PID", line.trim()]).output();
}
}
}
@@ -532,16 +575,26 @@ fn pre_install_cleanup() {
#[cfg(target_os = "macos")]
{
let uid = get_uid().unwrap_or(501);
let _ = Command::new("launchctl")
if let Ok(child) = Command::new("launchctl")
.args(["bootout", &format!("gui/{uid}/ai.openclaw.gateway")])
.output();
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.spawn()
{
run_with_timeout(child, 10);
}
std::thread::sleep(std::time::Duration::from_secs(1));
}
#[cfg(target_os = "linux")]
{
let _ = Command::new("pkill")
if let Ok(child) = Command::new("pkill")
.args(["-f", "openclaw.*gateway"])
.output();
.stdout(std::process::Stdio::null())
.stderr(std::process::Stdio::null())
.spawn()
{
run_with_timeout(child, 10);
}
std::thread::sleep(std::time::Duration::from_secs(1));
}
@@ -2915,10 +2968,27 @@ async fn try_standalone_install(
.await
.map_err(|e| format!("standalone 清单解析失败: {e}"))?;
let remote_version = manifest
.get("version")
.and_then(|v| v.as_str())
.ok_or("standalone 清单缺少 version 字段")?;
// 兼容两种 latest.json 格式:
// 新格式CI 生成): { "editions": { "zh": { "version": "...", "base_url": "..." } } }
// 旧格式(兼容): { "version": "...", "base_url": "..." }
let edition_obj = manifest
.get("editions")
.and_then(|e| e.get("zh"));
let (remote_version, manifest_base_url, archive_prefix) = if let Some(ed) = edition_obj {
let ver = ed
.get("version")
.and_then(|v| v.as_str())
.ok_or("standalone 清单 editions.zh 缺少 version 字段")?;
let bu = ed.get("base_url").and_then(|v| v.as_str());
(ver, bu, "openclaw-zh")
} else {
let ver = manifest
.get("version")
.and_then(|v| v.as_str())
.ok_or("standalone 清单缺少 version 字段")?;
let bu = manifest.get("base_url").and_then(|v| v.as_str());
(ver, bu, "openclaw")
};
// 版本匹配检查
if version != "latest" && !versions_match(remote_version, version) {
@@ -2931,15 +3001,12 @@ async fn try_standalone_install(
let remote_base = if let Some(ovr) = override_base_url {
ovr
} else {
manifest
.get("base_url")
.and_then(|v| v.as_str())
.unwrap_or(&default_base)
manifest_base_url.unwrap_or(&default_base)
};
// 2. 构造下载 URL
let ext = standalone_archive_ext();
let filename = format!("openclaw-{remote_version}-{platform}.{ext}");
let filename = format!("{archive_prefix}-{remote_version}-{platform}.{ext}");
let download_url = format!("{remote_base}/{filename}");
let _ = app.emit("upgrade-log", format!("{source_label} 下载: {filename}"));
@@ -2987,6 +3054,13 @@ async fn try_standalone_install(
if total_bytes > 0 {
let pct = 15 + ((downloaded as f64 / total_bytes as f64) * 55.0) as u32;
if pct > last_progress {
// 每 5% 输出一次文字进度
if pct / 5 > last_progress / 5 {
let dl_mb = downloaded as f64 / 1_048_576.0;
let total_mb = total_bytes as f64 / 1_048_576.0;
let real_pct = (downloaded as f64 / total_bytes as f64 * 100.0) as u32;
let _ = app.emit("upgrade-log", format!("下载中 {real_pct}% ({dl_mb:.0}/{total_mb:.0}MB)"));
}
last_progress = pct;
let _ = app.emit("upgrade-progress", pct.min(70));
}
@@ -3464,38 +3538,65 @@ async fn upgrade_openclaw_inner(
&& (method == "auto" || method == "standalone-r2" || method == "standalone-github");
if try_standalone {
// standalone-github 模式:使用 GitHub Releases 下载地址
let github_base = if method == "standalone-github" {
Some(format!(
"https://github.com/qingchencloud/openclaw-standalone/releases/download/v{}",
ver
))
} else {
None
};
match try_standalone_install(&app, ver, github_base.as_deref()).await {
Ok(installed_ver) => {
let _ = app.emit("upgrade-progress", 100);
super::refresh_enhanced_path();
crate::commands::service::invalidate_cli_detection_cache();
let label = if method == "standalone-github" {
"GitHub"
} else {
"CDN"
};
let msg = format!("✅ standalone ({label}) 安装完成,当前版本: {installed_ver}");
let _ = app.emit("upgrade-log", &msg);
return Ok(msg);
let github_release_base = format!(
"https://github.com/qingchencloud/openclaw-standalone/releases/download/v{}",
ver
);
if method == "standalone-github" {
// standalone-github 模式:只走 GitHub
match try_standalone_install(&app, ver, Some(&github_release_base)).await {
Ok(installed_ver) => {
let _ = app.emit("upgrade-progress", 100);
super::refresh_enhanced_path();
crate::commands::service::invalidate_cli_detection_cache();
let msg = format!("✅ standalone (GitHub) 安装完成,当前版本: {installed_ver}");
let _ = app.emit("upgrade-log", &msg);
return Ok(msg);
}
Err(reason) => {
return Err(format!("standalone 安装失败: {reason}"));
}
}
Err(reason) => {
if method == "auto" {
} else {
// auto / standalone-r2 模式R2 CDN → GitHub Releases fallback
match try_standalone_install(&app, ver, None).await {
Ok(installed_ver) => {
let _ = app.emit("upgrade-progress", 100);
super::refresh_enhanced_path();
crate::commands::service::invalidate_cli_detection_cache();
let msg = format!("✅ standalone (CDN) 安装完成,当前版本: {installed_ver}");
let _ = app.emit("upgrade-log", &msg);
return Ok(msg);
}
Err(cdn_reason) => {
let _ = app.emit(
"upgrade-log",
format!("standalone 不可用({reason}),降级到 npm 安装..."),
format!("CDN 下载失败({cdn_reason}),尝试从 GitHub Releases 下载..."),
);
let _ = app.emit("upgrade-progress", 5);
} else {
return Err(format!("standalone 安装失败: {reason}"));
// Fallback: GitHub Releases
match try_standalone_install(&app, ver, Some(&github_release_base)).await {
Ok(installed_ver) => {
let _ = app.emit("upgrade-progress", 100);
super::refresh_enhanced_path();
crate::commands::service::invalidate_cli_detection_cache();
let msg = format!("✅ standalone (GitHub) 安装完成,当前版本: {installed_ver}");
let _ = app.emit("upgrade-log", &msg);
return Ok(msg);
}
Err(gh_reason) => {
if method == "auto" {
let _ = app.emit(
"upgrade-log",
format!("standalone 不可用GitHub: {gh_reason}),降级到 npm 安装..."),
);
let _ = app.emit("upgrade-progress", 5);
} else {
return Err(format!("standalone 安装失败: CDN={cdn_reason}, GitHub={gh_reason}"));
}
}
}
}
}
}
@@ -3726,11 +3827,37 @@ async fn upgrade_openclaw_inner(
}
// 安装成功后再卸载旧包(确保 CLI 始终可用)
// 清理步骤采用错误隔离:任何清理失败都不影响安装成功的最终结果
if need_uninstall_old {
let _ = app.emit("upgrade-log", format!("清理旧版本 ({old_pkg})..."));
let _ = npm_command_elevated()
// npm uninstall 加 30s 超时,避免无限卡住
let uninstall_child = npm_command_elevated()
.args(["uninstall", "-g", old_pkg])
.output();
.stdout(Stdio::null())
.stderr(Stdio::null())
.spawn();
match uninstall_child {
Ok(mut child) => {
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(30);
loop {
match child.try_wait() {
Ok(Some(_status)) => break,
Ok(None) => {
if std::time::Instant::now() >= deadline {
let _ = child.kill();
let _ = app.emit("upgrade-log", "⚠️ 清理旧版本超时30s已跳过");
break;
}
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
}
Err(_) => break,
}
}
}
Err(e) => {
let _ = app.emit("upgrade-log", format!("⚠️ 清理旧版本启动失败: {e},已跳过"));
}
}
// 清理 standalone 安装目录(不论从 standalone 切走还是切到 standalone
// npm 路径已经安装了新 CLIstandalone 残留会干扰源检测)
@@ -3742,20 +3869,23 @@ async fn upgrade_openclaw_inner(
);
// Windows: 终止占用该目录的 node.exe 进程
// 使用 PowerShell Get-Process兼容 Windows 11wmic 已废弃)
#[cfg(target_os = "windows")]
{
let dir_str = sa_dir.to_string_lossy().to_lowercase();
if let Ok(output) = Command::new("wmic")
.args(["process", "where", &format!("ExecutablePath like '%{}%'", dir_str.replace('\\', "\\\\")), "get", "ProcessId", "/format:list"])
let dir_lower = sa_dir.to_string_lossy().to_lowercase().replace('\\', "\\\\");
let ps_script = format!(
"Get-Process -Name node -ErrorAction SilentlyContinue | Where-Object {{ $_.Path -and $_.Path.ToLower().Contains('{}') }} | Select-Object -ExpandProperty Id",
dir_lower
);
if let Ok(output) = Command::new("powershell")
.args(["-NoProfile", "-Command", &ps_script])
.output()
{
let text = String::from_utf8_lossy(&output.stdout);
for line in text.lines() {
if let Some(pid_str) = line.strip_prefix("ProcessId=") {
if let Ok(pid) = pid_str.trim().parse::<u32>() {
let _ = app.emit("upgrade-log", format!("终止占用进程 PID {pid}..."));
let _ = Command::new("taskkill").args(["/F", "/PID", &pid.to_string()]).output();
}
if let Ok(pid) = line.trim().parse::<u32>() {
let _ = app.emit("upgrade-log", format!("终止占用进程 PID {pid}..."));
let _ = Command::new("taskkill").args(["/F", "/PID", &pid.to_string()]).output();
}
}
}
@@ -3900,20 +4030,23 @@ async fn uninstall_openclaw_inner(
);
// Windows: 先尝试终止占用该目录的 node.exe 进程
// 使用 PowerShell Get-Process兼容 Windows 11wmic 已废弃)
#[cfg(target_os = "windows")]
{
let dir_str = sa_dir.to_string_lossy().to_lowercase();
if let Ok(output) = Command::new("wmic")
.args(["process", "where", &format!("ExecutablePath like '%{}%'", dir_str.replace('\\', "\\\\")), "get", "ProcessId", "/format:list"])
let dir_lower = sa_dir.to_string_lossy().to_lowercase().replace('\\', "\\\\");
let ps_script = format!(
"Get-Process -Name node -ErrorAction SilentlyContinue | Where-Object {{ $_.Path -and $_.Path.ToLower().Contains('{}') }} | Select-Object -ExpandProperty Id",
dir_lower
);
if let Ok(output) = Command::new("powershell")
.args(["-NoProfile", "-Command", &ps_script])
.output()
{
let text = String::from_utf8_lossy(&output.stdout);
for line in text.lines() {
if let Some(pid_str) = line.strip_prefix("ProcessId=") {
if let Ok(pid) = pid_str.trim().parse::<u32>() {
let _ = app.emit("upgrade-log", format!("终止占用进程 PID {pid}..."));
let _ = Command::new("taskkill").args(["/F", "/PID", &pid.to_string()]).output();
}
if let Ok(pid) = line.trim().parse::<u32>() {
let _ = app.emit("upgrade-log", format!("终止占用进程 PID {pid}..."));
let _ = Command::new("taskkill").args(["/F", "/PID", &pid.to_string()]).output();
}
}
}

View File

@@ -1491,7 +1491,7 @@ mod platform {
}
/// 检测 Gateway 是否在运行,并返回其 PID
/// 策略:先 TCP 端口检测连通性,再用 netstat+WMIC 验证命令行是 OpenClaw Gateway
/// 策略:先 TCP 端口检测连通性,再用 netstat+PowerShell 验证命令行是 OpenClaw Gateway
pub fn check_service_status(_uid: u32, _label: &str) -> (bool, Option<u32>) {
let port = crate::commands::gateway_listen_port();
let addr = format!("127.0.0.1:{port}");