fix: failed to restart core (#5754)

* fix: failed to restart core after install service

* chore: update tauri-plugin-mihomo deps

* fix: update dependencies for tauri-plugin-mihomo and related packages

---------

Co-authored-by: Tunglies <77394545+Tunglies@users.noreply.github.com>
This commit is contained in:
oomeow
2025-12-07 12:42:32 +08:00
committed by GitHub
parent 418fc1c702
commit 3ab985aacc
4 changed files with 24 additions and 27 deletions

View File

@@ -1,6 +1,6 @@
use crate::{
config::{Config, IClashTemp},
core::tray,
core::Timer,
utils::{dirs, init::service_writer_config},
};
use anyhow::{Context as _, Result, bail};
@@ -568,7 +568,9 @@ impl ServiceManager {
return Err(anyhow::anyhow!("服务不可用: {}", reason));
}
}
let _ = tray::Tray::global().update_menu().await;
// 防止服务安装成功后,内核未完全启动导致系统托盘无法获取代理节点信息
Timer::global().add_update_tray_menu_task()?;
Ok(())
}
}

View File

@@ -722,7 +722,13 @@ async fn create_tray_menu(
i18n::sync_locale().await;
let proxy_nodes_data = handle::Handle::mihomo().await.get_proxies().await.ok();
// TODO: mihomo 请求的超时机制未起作用,需要排查
let proxy_nodes_data = tokio::time::timeout(
Duration::from_millis(1000),
handle::Handle::mihomo().await.get_proxies(),
)
.await
.map_or(None, |res| res.ok());
let runtime_proxy_groups_order = cmd::get_runtime_config()
.await