YuuMJ1997/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-04-18 16:30:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(service): await for service operations, prevent too early to check service available

Browse Source
This commit is contained in:
Tunglies 2025-12-10 23:29:11 +08:00
parent 66483d0ef6
commit dd34ced070
No known key found for this signature in database
GPG Key ID: B9B01B389469B3E8
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src-tauri/src/core/service.rs
View File

@ -469,10 +469,24 @@ pub(super) async fn stop_core_by_service() -> Result<()> {
/// 检查服务是否正在运行 /// 检查服务是否正在运行
pub async fn is_service_available() -> Result<()> { pub async fn is_service_available() -> Result<()> {
// Service client 当前会优先判断 IPC 文件是否存在
// 睡一会等文件拉起服务
tokio::time::sleep(Duration::from_millis(725)).await;
clash_verge_service_ipc::connect().await?; clash_verge_service_ipc::connect().await?;
Ok(()) Ok(())
} }
/// 等待一会，再检查服务是否正在运行
/// TODO 使用 tokio select 之类机制并结合 timeout 实现更优雅的等待机制，期望等待文件出现，再尝试连接
pub async fn wait_and_check_service_available(status: &mut ServiceManager) -> Result<()> {
status.0 = ServiceStatus::Unavailable("Waiting for service to be available".into());
// 过早返回可能导致 UI 侧积极尝试连接服务失败
tokio::time::sleep(Duration::from_millis(725)).await;
clash_verge_service_ipc::connect().await?;
status.0 = ServiceStatus::Ready;
Ok(())
}
pub fn is_service_ipc_path_exists() -> bool { pub fn is_service_ipc_path_exists() -> bool {
Path::new(clash_verge_service_ipc::IPC_PATH).exists() Path::new(clash_verge_service_ipc::IPC_PATH).exists()
} }
@ -484,7 +498,7 @@ impl ServiceManager {
pub const fn config() -> clash_verge_service_ipc::IpcConfig { pub const fn config() -> clash_verge_service_ipc::IpcConfig {
clash_verge_service_ipc::IpcConfig { clash_verge_service_ipc::IpcConfig {
default_timeout: Duration::from_millis(30), default_timeout: Duration::from_millis(60),
retry_delay: Duration::from_millis(250), retry_delay: Duration::from_millis(250),
max_retries: 6, max_retries: 6,
} }
@ -511,6 +525,7 @@ impl ServiceManager {
/// 综合服务状态检查（一次性完成所有检查） /// 综合服务状态检查（一次性完成所有检查）
pub async fn check_service_comprehensive(&self) -> ServiceStatus { pub async fn check_service_comprehensive(&self) -> ServiceStatus {
tokio::time::sleep(Duration::from_millis(125)).await;
match check_service_needs_reinstall().await { match check_service_needs_reinstall().await {
Ok(need) => { Ok(need) => {
logging!(debug, Type::Service, "服务当前可用，检查是否需要重装"); logging!(debug, Type::Service, "服务当前可用，检查是否需要重装");
@ -538,24 +553,17 @@ impl ServiceManager {
ServiceStatus::NeedsReinstall | ServiceStatus::ReinstallRequired => { ServiceStatus::NeedsReinstall | ServiceStatus::ReinstallRequired => {
logging!(info, Type::Service, "服务需要重装，执行重装流程"); logging!(info, Type::Service, "服务需要重装，执行重装流程");
reinstall_service().await?; reinstall_service().await?;
self.0 = ServiceStatus::Ready; wait_and_check_service_available(self).await?;
} }
ServiceStatus::ForceReinstallRequired => { ServiceStatus::ForceReinstallRequired => {
logging!(info, Type::Service, "服务需要强制重装，执行强制重装流程"); logging!(info, Type::Service, "服务需要强制重装，执行强制重装流程");
force_reinstall_service().await?; force_reinstall_service().await?;
self.0 = ServiceStatus::Ready; wait_and_check_service_available(self).await?;
} }
ServiceStatus::InstallRequired => { ServiceStatus::InstallRequired => {
logging!(info, Type::Service, "需要安装服务，执行安装流程"); logging!(info, Type::Service, "需要安装服务，执行安装流程");
install_service().await?; install_service().await?;
// compatible with older service version, force reinstall if service is unavailable wait_and_check_service_available(self).await?;
// wait for service server is running
tokio::time::sleep(Duration::from_millis(500)).await;
if is_service_available().await.is_err() {
logging!(info, Type::Service, "服务需要强制重装，执行强制重装流程");
force_reinstall_service().await?;
}
self.0 = ServiceStatus::Ready;
} }
ServiceStatus::UninstallRequired => { ServiceStatus::UninstallRequired => {
logging!(info, Type::Service, "服务需要卸载，执行卸载流程"); logging!(info, Type::Service, "服务需要卸载，执行卸载流程");