mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-20 10:52:08 +08:00
refactor: hooked up a backend-driven profile switch flow
This commit is contained in:
@@ -15,15 +15,36 @@ use crate::{
|
||||
ret_err,
|
||||
utils::{dirs, help, logging::Type},
|
||||
};
|
||||
use futures::FutureExt;
|
||||
use once_cell::sync::OnceCell;
|
||||
use smartstring::alias::String;
|
||||
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
||||
use std::time::Duration;
|
||||
use std::{
|
||||
panic::AssertUnwindSafe,
|
||||
sync::atomic::{AtomicBool, AtomicU64, Ordering},
|
||||
time::Duration,
|
||||
};
|
||||
use tokio::sync::Mutex;
|
||||
|
||||
static SWITCH_MUTEX: OnceCell<Mutex<()>> = OnceCell::new();
|
||||
// 全局请求序列号跟踪,用于避免队列化执行
|
||||
static CURRENT_REQUEST_SEQUENCE: AtomicU64 = AtomicU64::new(0);
|
||||
|
||||
static CURRENT_SWITCHING_PROFILE: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
struct SwitchScope;
|
||||
|
||||
impl SwitchScope {
|
||||
fn begin() -> Self {
|
||||
CURRENT_SWITCHING_PROFILE.store(true, Ordering::SeqCst);
|
||||
Self
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for SwitchScope {
|
||||
fn drop(&mut self) {
|
||||
CURRENT_SWITCHING_PROFILE.store(false, Ordering::SeqCst);
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn get_profiles() -> CmdResult<IProfiles> {
|
||||
// 策略1: 尝试快速获取latest数据
|
||||
@@ -219,11 +240,17 @@ pub async fn delete_profile(index: String) -> CmdResult {
|
||||
/// 修改profiles的配置
|
||||
#[tauri::command]
|
||||
pub async fn patch_profiles_config(profiles: IProfiles) -> CmdResult<bool> {
|
||||
let mutex = SWITCH_MUTEX.get_or_init(|| Mutex::new(()));
|
||||
let _guard = mutex.lock().await;
|
||||
patch_profiles_config_internal(profiles).await
|
||||
}
|
||||
|
||||
async fn patch_profiles_config_internal(profiles: IProfiles) -> CmdResult<bool> {
|
||||
if CURRENT_SWITCHING_PROFILE.load(Ordering::SeqCst) {
|
||||
logging!(info, Type::Cmd, "当前正在切换配置,放弃请求");
|
||||
return Ok(false);
|
||||
}
|
||||
CURRENT_SWITCHING_PROFILE.store(true, Ordering::SeqCst);
|
||||
let _switch_guard = SwitchScope::begin();
|
||||
|
||||
// 为当前请求分配序列号
|
||||
let current_sequence = CURRENT_REQUEST_SEQUENCE.fetch_add(1, Ordering::SeqCst) + 1;
|
||||
@@ -561,13 +588,56 @@ pub async fn patch_profiles_config(profiles: IProfiles) -> CmdResult<bool> {
|
||||
/// 根据profile name修改profiles
|
||||
#[tauri::command]
|
||||
pub async fn patch_profiles_config_by_profile_index(profile_index: String) -> CmdResult<bool> {
|
||||
logging!(info, Type::Cmd, "切换配置到: {}", profile_index);
|
||||
switch_profile(profile_index, false).await
|
||||
}
|
||||
|
||||
let profiles = IProfiles {
|
||||
current: Some(profile_index),
|
||||
#[tauri::command]
|
||||
pub async fn switch_profile(profile_index: String, notify_success: bool) -> CmdResult<bool> {
|
||||
logging!(info, Type::Cmd, "请求切换配置到: {}", &profile_index);
|
||||
|
||||
let mutex = SWITCH_MUTEX.get_or_init(|| Mutex::new(()));
|
||||
let _guard = mutex.lock().await;
|
||||
|
||||
let switch_result = AssertUnwindSafe(patch_profiles_config_internal(IProfiles {
|
||||
current: Some(profile_index.clone()),
|
||||
items: None,
|
||||
}))
|
||||
.catch_unwind()
|
||||
.await;
|
||||
|
||||
let result = match switch_result {
|
||||
Ok(inner) => inner?,
|
||||
Err(_) => {
|
||||
logging!(
|
||||
error,
|
||||
Type::Cmd,
|
||||
"切换配置过程中发生panic,目标: {}",
|
||||
profile_index
|
||||
);
|
||||
handle::Handle::notice_message(
|
||||
"config_validate::panic",
|
||||
format!("profile switch panic: {}", profile_index),
|
||||
);
|
||||
handle::Handle::notify_profile_switch_finished(profile_index.clone(), false);
|
||||
return Ok(false);
|
||||
}
|
||||
};
|
||||
patch_profiles_config(profiles).await
|
||||
|
||||
if result {
|
||||
handle::Handle::notify_profile_switch_finished(profile_index.clone(), true);
|
||||
} else {
|
||||
handle::Handle::notify_profile_switch_finished(profile_index.clone(), false);
|
||||
}
|
||||
|
||||
if let Err(err) = handle::Handle::mihomo().await.close_all_connections().await {
|
||||
logging!(warn, Type::Cmd, "切换配置后关闭连接失败: {}", err);
|
||||
}
|
||||
|
||||
if notify_success && result {
|
||||
handle::Handle::notice_message("info", "Profile Switched");
|
||||
}
|
||||
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
/// 修改某个profile item的
|
||||
|
||||
@@ -100,6 +100,17 @@ impl Handle {
|
||||
});
|
||||
}
|
||||
|
||||
pub fn notify_profile_switch_finished(profile_id: String, success: bool) {
|
||||
Self::send_event(FrontendEvent::ProfileSwitchFinished {
|
||||
profile_id,
|
||||
success,
|
||||
});
|
||||
}
|
||||
|
||||
pub fn notify_rust_panic(message: String, location: String) {
|
||||
Self::send_event(FrontendEvent::RustPanic { message, location });
|
||||
}
|
||||
|
||||
pub fn notify_timer_updated(profile_index: String) {
|
||||
Self::send_event(FrontendEvent::TimerUpdated { profile_index });
|
||||
}
|
||||
|
||||
@@ -23,9 +23,11 @@ pub enum FrontendEvent {
|
||||
ProxiesUpdated { payload: serde_json::Value },
|
||||
NoticeMessage { status: String, message: String },
|
||||
ProfileChanged { current_profile_id: String },
|
||||
ProfileSwitchFinished { profile_id: String, success: bool },
|
||||
TimerUpdated { profile_index: String },
|
||||
ProfileUpdateStarted { uid: String },
|
||||
ProfileUpdateCompleted { uid: String },
|
||||
RustPanic { message: String, location: String },
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
@@ -167,6 +169,13 @@ impl NotificationSystem {
|
||||
FrontendEvent::ProfileChanged { current_profile_id } => {
|
||||
("profile-changed", Ok(json!(current_profile_id)))
|
||||
}
|
||||
FrontendEvent::ProfileSwitchFinished {
|
||||
profile_id,
|
||||
success,
|
||||
} => (
|
||||
"profile-switch-finished",
|
||||
Ok(json!({ "profileId": profile_id, "success": success })),
|
||||
),
|
||||
FrontendEvent::TimerUpdated { profile_index } => {
|
||||
("verge://timer-updated", Ok(json!(profile_index)))
|
||||
}
|
||||
@@ -176,6 +185,10 @@ impl NotificationSystem {
|
||||
FrontendEvent::ProfileUpdateCompleted { uid } => {
|
||||
("profile-update-completed", Ok(json!({ "uid": uid })))
|
||||
}
|
||||
FrontendEvent::RustPanic { message, location } => (
|
||||
"rust-panic",
|
||||
Ok(json!({ "message": message, "location": location })),
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,10 +214,19 @@ impl NotificationSystem {
|
||||
}
|
||||
|
||||
if let Some(sender) = &self.sender {
|
||||
sender.send(event).is_ok()
|
||||
} else {
|
||||
false
|
||||
if sender.send(event).is_err() {
|
||||
logging!(
|
||||
warn,
|
||||
Type::Frontend,
|
||||
"Failed to send event to worker thread"
|
||||
);
|
||||
self.handle_emit_error();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
false
|
||||
}
|
||||
|
||||
pub fn shutdown(&mut self) {
|
||||
|
||||
@@ -192,6 +192,7 @@ mod app_init {
|
||||
cmd::get_profiles,
|
||||
cmd::enhance_profiles,
|
||||
cmd::patch_profiles_config,
|
||||
cmd::switch_profile,
|
||||
cmd::view_profile,
|
||||
cmd::patch_profile,
|
||||
cmd::create_profile,
|
||||
@@ -356,6 +357,28 @@ pub fn run() {
|
||||
}
|
||||
}
|
||||
|
||||
std::panic::set_hook(Box::new(|info| {
|
||||
let payload = info
|
||||
.payload()
|
||||
.downcast_ref::<&'static str>()
|
||||
.map(|s| (*s).to_string())
|
||||
.or_else(|| info.payload().downcast_ref::<String>().cloned())
|
||||
.unwrap_or_else(|| "Unknown panic".to_string());
|
||||
let location = info
|
||||
.location()
|
||||
.map(|loc| format!("{}:{}", loc.file(), loc.line()))
|
||||
.unwrap_or_else(|| "unknown location".to_string());
|
||||
|
||||
logging!(
|
||||
error,
|
||||
Type::System,
|
||||
"Rust panic captured: {} @ {}",
|
||||
payload,
|
||||
location
|
||||
);
|
||||
handle::Handle::notify_rust_panic(payload.into(), location.into());
|
||||
}));
|
||||
|
||||
#[cfg(feature = "clippy")]
|
||||
let context = tauri::test::mock_context(tauri::test::noop_assets());
|
||||
#[cfg(feature = "clippy")]
|
||||
|
||||
Reference in New Issue
Block a user