refactor: streamline clash mode handling and improve API interactions

src-tauri/src/feat/clash.rs

@@ -1,6 +1,7 @@
 use crate::config::Config;
-use crate::core::{clash_api, handle, tray, CoreManager};
+use crate::core::{handle, tray, CoreManager};
 use crate::log_err;
+use crate::module::mihomo::MihomoManager;
 use crate::utils::resolve;
 use serde_yaml::{Mapping, Value};
 use tauri::Manager;
@@ -38,10 +39,14 @@ pub fn restart_app() {
 pub fn change_clash_mode(mode: String) {
     let mut mapping = Mapping::new();
     mapping.insert(Value::from("mode"), mode.clone().into());
+    // Convert YAML mapping to JSON Value
+    let json_value = serde_json::json!({
+        "mode": mode
+    });
     tauri::async_runtime::spawn(async move {
         log::debug!(target: "app", "change clash mode to {mode}");
 
-        match clash_api::patch_configs(&mapping).await {
+        match MihomoManager::global().patch_configs(json_value).await {
             Ok(_) => {
                 // 更新订阅
                 Config::clash().data().patch_config(mapping);

src-tauri/src/feat/window.rs

@@ -1,9 +1,10 @@
-use crate::utils::resolve;
-use crate::core::handle;
-use crate::core::{sysopt, CoreManager, clash_api};
 use crate::config::Config;
-use tauri::Manager;
+use crate::core::handle;
+use crate::core::{sysopt, CoreManager};
+use crate::module::mihomo::MihomoManager;
+use crate::utils::resolve;
 use futures;
+use tauri::Manager;
 use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 
 /// Open or close the dashboard window
@@ -52,7 +53,7 @@ pub fn open_or_close_dashboard() {
 pub fn setup_window_state_monitor(app_handle: &tauri::AppHandle) {
     let window = app_handle.get_webview_window("main").unwrap();
     let app_handle_clone = app_handle.clone();
-    
+
     // 监听窗口移动事件
     let app_handle_move = app_handle_clone.clone();
     window.on_window_event(move |event| {
@@ -60,19 +61,19 @@ pub fn setup_window_state_monitor(app_handle: &tauri::AppHandle) {
             // 窗口移动时保存状态
             tauri::WindowEvent::Moved(_) => {
                 let _ = app_handle_move.save_window_state(StateFlags::all());
-            },
+            }
             // 窗口调整大小时保存状态
             tauri::WindowEvent::Resized(_) => {
                 let _ = app_handle_move.save_window_state(StateFlags::all());
-            },
+            }
             // 其他可能改变窗口状态的事件
             tauri::WindowEvent::ScaleFactorChanged { .. } => {
                 let _ = app_handle_move.save_window_state(StateFlags::all());
-            },
+            }
             // 窗口关闭时保存
             tauri::WindowEvent::CloseRequested { .. } => {
                 let _ = app_handle_move.save_window_state(StateFlags::all());
-            },
+            }
             _ => {}
         }
     });
@@ -81,16 +82,16 @@ pub fn setup_window_state_monitor(app_handle: &tauri::AppHandle) {
 /// 优化的应用退出函数
 pub fn quit(code: Option<i32>) {
     log::debug!(target: "app", "启动退出流程");
-    
+
     // 获取应用句柄并设置退出标志
     let app_handle = handle::Handle::global().app_handle().unwrap();
     handle::Handle::global().set_is_exiting();
-    
+
     // 优先关闭窗口，提供立即反馈
     if let Some(window) = handle::Handle::global().get_window() {
         let _ = window.hide();
     }
-    
+
     // 在单独线程中处理资源清理，避免阻塞主线程
     std::thread::spawn(move || {
         // 使用tokio运行时执行异步清理任务
@@ -100,34 +101,38 @@ pub fn quit(code: Option<i32>) {
 
             // 1. 直接关闭TUN模式 (优先处理，通常最容易卡住)
             if Config::verge().data().enable_tun_mode.unwrap_or(false) {
-                let mut disable = serde_yaml::Mapping::new();
-                let mut tun = serde_yaml::Mapping::new();
-                tun.insert("enable".into(), false.into());
-                disable.insert("tun".into(), tun.into());
-                
+                let disable = serde_json::json!({
+                    "tun": {
+                        "enable": false
+                    }
+                });
+
                 // 设置1秒超时
-                let _ = timeout(Duration::from_secs(1), 
-                    clash_api::patch_configs(&disable)).await;
+                let _ = timeout(
+                    Duration::from_secs(1),
+                    MihomoManager::global().patch_configs(disable),
+                )
+                .await;
             }
-            
+
             // 2. 并行处理系统代理和核心进程清理
-            let proxy_future = timeout(Duration::from_secs(1), 
-                sysopt::Sysopt::global().reset_sysproxy());
-                
-            let core_future = timeout(Duration::from_secs(1), 
-                CoreManager::global().stop_core());
-                
+            let proxy_future = timeout(
+                Duration::from_secs(1),
+                sysopt::Sysopt::global().reset_sysproxy(),
+            );
+
+            let core_future = timeout(Duration::from_secs(1), CoreManager::global().stop_core());
+
             // 同时等待两个任务完成
             let _ = futures::join!(proxy_future, core_future);
-            
+
             // 3. 处理macOS特定清理
             #[cfg(target_os = "macos")]
             {
-                let _ = timeout(Duration::from_millis(500), 
-                    resolve::restore_public_dns()).await;
+                let _ = timeout(Duration::from_millis(500), resolve::restore_public_dns()).await;
             }
         });
-        
+
         // 无论清理结果如何，确保应用退出
         app_handle.exit(code.unwrap_or(0));
     });