From c97c4cbd41756439acc64c00215c4cf8bb24f59c Mon Sep 17 00:00:00 2001
From: Tunglies <77394545+Tunglies@users.noreply.github.com>
Date: Sat, 18 Oct 2025 13:56:13 +0800
Subject: [PATCH] refactor: optimize async setup flow and add config
 verification

---
 src-tauri/src/utils/resolve/mod.rs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src-tauri/src/utils/resolve/mod.rs b/src-tauri/src/utils/resolve/mod.rs
index 78834947..8218f7cb 100644
--- a/src-tauri/src/utils/resolve/mod.rs
+++ b/src-tauri/src/utils/resolve/mod.rs
@@ -50,18 +50,8 @@ pub fn resolve_setup_async() {
             "Version: {}",
             env!("CARGO_PKG_VERSION")
         );
-        futures::join!(init_service_manager());
 
-        futures::join!(
-            init_work_config(),
-            init_resources(),
-            init_startup_script(),
-            init_hotkey(),
-        );
-
-        init_timer().await;
-        init_once_auto_lightweight().await;
-        init_auto_lightweight_mode().await;
+        futures::join!(init_work_config(), init_resources(), init_startup_script(),);
 
         // 确保配置完全初始化后再启动核心管理器
         init_verge_config().await;
@@ -69,6 +59,7 @@ pub fn resolve_setup_async() {
         // 添加配置验证，确保运行时配置已正确生成
         Config::verify_config_initialization().await;
 
+        init_service_manager().await;
         init_core_manager().await;
 
         init_system_proxy().await;
@@ -80,7 +71,15 @@ pub fn resolve_setup_async() {
             init_tray().await;
             refresh_tray_menu().await;
         };
-        futures::join!(init_window(), tray_and_refresh,);
+
+        futures::join!(
+            init_window(),
+            tray_and_refresh,
+            init_timer(),
+            init_hotkey(),
+            init_auto_lightweight_mode(),
+            init_once_auto_lightweight(),
+        );
     });
 
     let elapsed = start_time.elapsed();