root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-28 07:14:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: service unexpected status after restart app in unix (#5768)"

Browse Source 
This reverts commit 2995f61087.
This commit is contained in:
Tunglies
2025-12-12 12:46:51 +08:00
parent 1a2d45555d
commit cea78289c1
2 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src-tauri/src/constants.rs
View File

@@ -1,3 +1,5 @@
use std::time::Duration;
pub mod network {
pub const DEFAULT_EXTERNAL_CONTROLLER: &str = "127.0.0.1:9097";
@@ -18,14 +20,16 @@ pub mod network {
}
pub mod timing {
use std::time::Duration;
use super::Duration;
pub const CONFIG_UPDATE_DEBOUNCE: Duration = Duration::from_millis(300);
pub const EVENT_EMIT_DELAY: Duration = Duration::from_millis(20);
pub const STARTUP_ERROR_DELAY: Duration = Duration::from_secs(2);
pub const ERROR_BATCH_DELAY: Duration = Duration::from_millis(300);
#[cfg(target_os = "windows")]
pub const SERVICE_WAIT_MAX: Duration = Duration::from_millis(3000);
#[cfg(target_os = "windows")]
pub const SERVICE_WAIT_INTERVAL: Duration = Duration::from_millis(200);
}

42
src-tauri/src/core/manager/lifecycle.rs
View File

@@ -1,12 +1,10 @@
use super::{CoreManager, RunningMode};
use crate::cmd::StringifyErr as _;
use crate::config::{Config, IVerge};
use crate::constants::timing;
use crate::core::handle::Handle;
use crate::core::manager::CLASH_LOGGER;
use crate::core::service::{SERVICE_MANAGER, ServiceStatus};
use anyhow::Result;
use backoff::{Error as BackoffError, ExponentialBackoff};
use clash_verge_logging::{Type, logging};
use scopeguard::defer;
use smartstring::alias::String;
@@ -65,6 +63,7 @@ impl CoreManager {
}
async fn prepare_startup(&self) -> Result<()> {
#[cfg(target_os = "windows")]
self.wait_for_service_if_needed().await;
let value = SERVICE_MANAGER.lock().await.current();
@@ -82,40 +81,17 @@ impl CoreManager {
tauri_plugin_clash_verge_sysinfo::set_app_core_mode(app_handle, self.get_running_mode().to_string());
}
#[cfg(target_os = "windows")]
async fn wait_for_service_if_needed(&self) {
#[cfg(target_os = "windows")]
{
let needs_service = Config::verge().await.latest_arc().enable_tun_mode.unwrap_or(false);
use crate::{config::Config, constants::timing};
use backoff::{Error as BackoffError, ExponentialBackoff};
if !needs_service {
return;
}
}
let needs_service = Config::verge().await.latest_arc().enable_tun_mode.unwrap_or(false);
// 在 unix 上，如果服务状态是 "Need Checks"，尝试初始化服务管理器
// 在 Windows 上，只有在需要 TUN 模式时才等待服务
let mut manager = SERVICE_MANAGER.lock().await;
let current_status = manager.current();
// 如果服务状态是 "Need Checks"，尝试初始化服务管理器
if matches!(current_status, ServiceStatus::Unavailable(ref reason) if reason == "Need Checks") {
// 尝试初始化服务管理器，即使 IPC 路径可能暂时不存在
if let Err(e) = manager.init().await {
logging!(debug, Type::Core, "服务管理器初始化失败（可能服务未启动）: {}", e);
} else {
// 初始化成功，尝试刷新状态
let _ = manager.refresh().await;
}
}
// 如果服务已经就绪，直接返回
if matches!(manager.current(), ServiceStatus::Ready) {
if !needs_service {
return;
}
drop(manager);
// 使用退避重试策略等待服务就绪
let backoff = ExponentialBackoff {
initial_interval: timing::SERVICE_WAIT_INTERVAL,
max_interval: timing::SERVICE_WAIT_INTERVAL,
@@ -132,11 +108,7 @@ impl CoreManager {
return Ok(());
}
// 如果服务管理器未初始化，尝试初始化
if matches!(manager.current(), ServiceStatus::Unavailable(ref reason) if reason == "Need Checks") {
manager.init().await.map_err(BackoffError::transient)?;
}
manager.init().await.map_err(BackoffError::transient)?;
let _ = manager.refresh().await;
if matches!(manager.current(), ServiceStatus::Ready) {