perf: async app startup loading to prevent UI freeze

src-tauri/src/feat/window.rs

@@ -49,8 +49,9 @@ pub fn open_or_close_dashboard() {
     }
 }
 
-/// 优化的应用退出函数
+/// 异步优化的应用退出函数
 pub fn quit() {
+    use crate::process::AsyncHandler;
     log::debug!(target: "app", "启动退出流程");
 
     // 获取应用句柄并设置退出标志
@@ -60,54 +61,191 @@ pub fn quit() {
     // 优先关闭窗口，提供立即反馈
     if let Some(window) = handle::Handle::global().get_window() {
         let _ = window.hide();
+        log::info!(target: "app", "窗口已隐藏");
     }
 
-    // 在单独线程中处理资源清理，避免阻塞主线程
-    std::thread::spawn(move || {
-        let cleanup_result = clean();
-        app_handle.exit(match cleanup_result {
-            true => 0,
-            false => 1,
-        });
+    // 使用异步任务处理资源清理，避免阻塞
+    AsyncHandler::spawn(move || async move {
+        log::info!(target: "app", "开始异步清理资源");
+        let cleanup_result = clean_async().await;
+
+        log::info!(target: "app", "资源清理完成，退出代码: {}", if cleanup_result { 0 } else { 1 });
+        app_handle.exit(if cleanup_result { 0 } else { 1 });
     });
 }
 
-pub fn clean() -> bool {
+async fn clean_async() -> bool {
     use tokio::time::{timeout, Duration};
-    let rt = tokio::runtime::Runtime::new().unwrap();
-    let cleanup_result = rt.block_on(async {
-        // 1. 处理TUN模式
-        let tun_success = if Config::verge().data().enable_tun_mode.unwrap_or(false) {
+
+    log::info!(target: "app", "开始执行异步清理操作...");
+
+    // 1. 处理TUN模式
+    let tun_task = async {
+        if Config::verge().data().enable_tun_mode.unwrap_or(false) {
             let disable_tun = serde_json::json!({
                 "tun": {
                     "enable": false
                 }
             });
-            timeout(
-                Duration::from_secs(1),
+            match timeout(
+                Duration::from_secs(2),
                 MihomoManager::global().patch_configs(disable_tun),
             )
             .await
-            .is_ok()
+            {
+                Ok(_) => {
+                    log::info!(target: "app", "TUN模式已禁用");
+                    true
+                }
+                Err(_) => {
+                    log::warn!(target: "app", "禁用TUN模式超时");
+                    false
+                }
+            }
         } else {
             true
-        };
+        }
+    };
 
-        // 2. 顺序执行关键清理
-        let proxy_res = timeout(
-            Duration::from_secs(1),
+    // 2. 系统代理重置
+    let proxy_task = async {
+        match timeout(
+            Duration::from_secs(3),
             sysopt::Sysopt::global().reset_sysproxy(),
         )
-        .await;
+        .await
+        {
+            Ok(_) => {
+                log::info!(target: "app", "系统代理已重置");
+                true
+            }
+            Err(_) => {
+                log::warn!(target: "app", "重置系统代理超时");
+                false
+            }
+        }
+    };
 
-        let core_res = timeout(Duration::from_secs(1), CoreManager::global().stop_core()).await;
+    // 3. 核心服务停止
+    let core_task = async {
+        match timeout(Duration::from_secs(3), CoreManager::global().stop_core()).await {
+            Ok(_) => {
+                log::info!(target: "app", "核心服务已停止");
+                true
+            }
+            Err(_) => {
+                log::warn!(target: "app", "停止核心服务超时");
+                false
+            }
+        }
+    };
 
-        // 3. 平台特定清理
+    // 4. DNS恢复（仅macOS）
+    #[cfg(target_os = "macos")]
+    let dns_task = async {
+        match timeout(Duration::from_millis(1000), resolve::restore_public_dns()).await {
+            Ok(_) => {
+                log::info!(target: "app", "DNS设置已恢复");
+                true
+            }
+            Err(_) => {
+                log::warn!(target: "app", "恢复DNS设置超时");
+                false
+            }
+        }
+    };
+
+    // 并行执行所有清理任务
+    let (tun_success, proxy_success, core_success) = tokio::join!(tun_task, proxy_task, core_task);
+
+    #[cfg(target_os = "macos")]
+    let dns_success = dns_task.await;
+    #[cfg(not(target_os = "macos"))]
+    let dns_success = true;
+
+    let all_success = tun_success && proxy_success && core_success && dns_success;
+
+    log::info!(
+        target: "app",
+        "异步清理操作完成 - TUN: {}, 代理: {}, 核心: {}, DNS: {}, 总体: {}",
+        tun_success, proxy_success, core_success, dns_success, all_success
+    );
+
+    all_success
+}
+
+pub fn clean() -> bool {
+    use tokio::time::{timeout, Duration};
+
+    // 使用异步处理
+    let rt = tokio::runtime::Runtime::new().unwrap();
+    let cleanup_result = rt.block_on(async {
+        log::info!(target: "app", "开始执行清理操作...");
+
+        // 1. 处理TUN模式 - 并行执行，减少等待时间
+        let tun_task = async {
+            if Config::verge().data().enable_tun_mode.unwrap_or(false) {
+                let disable_tun = serde_json::json!({
+                    "tun": {
+                        "enable": false
+                    }
+                });
+                timeout(
+                    Duration::from_secs(2),
+                    MihomoManager::global().patch_configs(disable_tun),
+                )
+                .await
+                .is_ok()
+            } else {
+                true
+            }
+        };
+
+        // 2. 系统代理重置
+        let proxy_task = async {
+            timeout(
+                Duration::from_secs(2),
+                sysopt::Sysopt::global().reset_sysproxy(),
+            )
+            .await
+            .is_ok()
+        };
+
+        // 3. 核心服务停止
+        let core_task = async {
+            timeout(Duration::from_secs(2), CoreManager::global().stop_core())
+                .await
+                .is_ok()
+        };
+
+        // 4. DNS恢复（仅macOS）
         #[cfg(target_os = "macos")]
-        let _dns_res = timeout(Duration::from_millis(500), resolve::restore_public_dns()).await;
+        let dns_task = async {
+            timeout(Duration::from_millis(800), resolve::restore_public_dns())
+                .await
+                .is_ok()
+        };
 
-        tun_success && proxy_res.is_ok() && core_res.is_ok()
+        // 并行执行所有清理任务，提高效率
+        let (tun_success, proxy_success, core_success) =
+            tokio::join!(tun_task, proxy_task, core_task);
+
+        #[cfg(target_os = "macos")]
+        let dns_success = dns_task.await;
+        #[cfg(not(target_os = "macos"))]
+        let dns_success = true;
+
+        let all_success = tun_success && proxy_success && core_success && dns_success;
+
+        log::info!(
+            target: "app",
+            "清理操作完成 - TUN: {}, 代理: {}, 核心: {}, DNS: {}, 总体: {}",
+            tun_success, proxy_success, core_success, dns_success, all_success
+        );
+
+        all_success
     });
+
     cleanup_result
 }