fix: resolve from lightweight cause crash (#4682)

* refactor: streamline lightweight mode handling and improve window management

* refactor: replace mutex-based window creation lock with atomic operations for improved performance

* refactor: remove startup completed event handling and simplify initialization logic

* refactor: remove conditional compilation for emit_update_event function

* refactor: simplify return statements and clean up commented code in lightweight and window manager modules

* refactor: streamline lightweight mode handling by consolidating window management calls

* refactor: prevent unnecessary window toggle when exiting lightweight mode

* refactor: reorder imports for consistency in lightweight module

* refactor: move macOS specific logging_error import for clarity

src-tauri/src/core/handle.rs

@@ -20,7 +20,6 @@ enum FrontendEvent {
     NoticeMessage { status: String, message: String },
     ProfileChanged { current_profile_id: String },
     TimerUpdated { profile_index: String },
-    StartupCompleted,
     ProfileUpdateStarted { uid: String },
     ProfileUpdateCompleted { uid: String },
 }
@@ -134,9 +133,6 @@ impl NotificationSystem {
                                     FrontendEvent::TimerUpdated { profile_index } => {
                                         ("verge://timer-updated", Ok(serde_json::json!(profile_index)))
                                     }
-                                    FrontendEvent::StartupCompleted => {
-                                        ("verge://startup-completed", Ok(serde_json::json!(null)))
-                                    }
                                     FrontendEvent::ProfileUpdateStarted { uid } => {
                                         ("profile-update-started", Ok(serde_json::json!({ "uid": uid })))
                                     }
@@ -366,22 +362,6 @@ impl Handle {
         }
     }
 
-    pub fn notify_startup_completed() {
-        let handle = Self::global();
-        if handle.is_exiting() {
-            return;
-        }
-
-        let system_opt = handle.notification_system.read();
-        if let Some(system) = system_opt.as_ref() {
-            system.send_event(FrontendEvent::StartupCompleted);
-        } else {
-            log::warn!(
-                "Notification system not initialized when trying to send StartupCompleted event."
-            );
-        }
-    }
-
     pub fn notify_profile_update_started(uid: String) {
         let handle = Self::global();
         if handle.is_exiting() {

src-tauri/src/core/hotkey.rs

@@ -109,7 +109,7 @@ impl Hotkey {
         match function {
             HotkeyFunction::OpenOrCloseDashboard => {
                 AsyncHandler::spawn(async move || {
-                    crate::feat::open_or_close_dashboard_hotkey().await;
+                    crate::feat::open_or_close_dashboard().await;
                     notify_event(app_handle, NotificationEvent::DashboardToggled).await;
                 });
             }

src-tauri/src/core/timer.rs

@@ -434,7 +434,6 @@ impl Timer {
 
     /// Emit update events for frontend notification
     fn emit_update_event(_uid: &str, _is_start: bool) {
-        #[cfg(any(feature = "verge-dev", feature = "default"))]
         {
             if _is_start {
                 super::handle::Handle::notify_profile_update_started(_uid.to_string());

src-tauri/src/core/tray/mod.rs

@@ -4,7 +4,9 @@ use tauri::Emitter;
 #[cfg(target_os = "macos")]
 pub mod speed_rate;
 use crate::ipc::Rate;
+use crate::module::lightweight;
 use crate::process::AsyncHandler;
+use crate::utils::window_manager::WindowManager;
 use crate::{
     cmd,
     config::Config,
@@ -532,14 +534,9 @@ impl Tray {
                             feat::toggle_tun_mode(None).await;
                         }),
                         "main_window" => Box::pin(async move {
-                            use crate::utils::window_manager::WindowManager;
-                            log::info!(target: "app", "Tray点击事件: 显示主窗口");
-                            if crate::module::lightweight::is_in_lightweight_mode() {
-                                log::info!(target: "app", "当前在轻量模式，正在退出轻量模式");
-                                crate::module::lightweight::exit_lightweight_mode().await;
-                            }
-                            let result = WindowManager::show_main_window().await;
-                            log::info!(target: "app", "窗口显示结果: {result:?}");
+                            if !lightweight::exit_lightweight_mode().await {
+                                WindowManager::toggle_main_window().await;
+                            };
                         }),
                         _ => Box::pin(async move {}),
                     };
@@ -971,19 +968,14 @@ fn on_menu_event(_: &AppHandle, event: MenuEvent) {
                 feat::change_clash_mode(mode.into()).await; // Await async function
             }
             "open_window" => {
-                use crate::utils::window_manager::WindowManager;
                 log::info!(target: "app", "托盘菜单点击: 打开窗口");
 
                 if !should_handle_tray_click() {
                     return;
                 }
-
-                if crate::module::lightweight::is_in_lightweight_mode() {
-                    logging!(info, Type::Lightweight, true, "Exiting Lightweight Mode");
-                    crate::module::lightweight::exit_lightweight_mode().await; // Await async function
-                }
-                let result = WindowManager::show_main_window().await; // Await async function
-                logging!(info, Type::Window, true, "Show Main Window: {result:?}");
+                if !lightweight::exit_lightweight_mode().await {
+                    WindowManager::toggle_main_window().await;
+                };
             }
             "system_proxy" => {
                 feat::toggle_system_proxy().await; // Await async function
@@ -1007,16 +999,7 @@ fn on_menu_event(_: &AppHandle, event: MenuEvent) {
                 if !should_handle_tray_click() {
                     return;
                 }
-
-                let was_lightweight = crate::module::lightweight::is_in_lightweight_mode();
-                if was_lightweight {
-                    crate::module::lightweight::exit_lightweight_mode().await; // Await async function
-                    use crate::utils::window_manager::WindowManager;
-                    let result = WindowManager::show_main_window().await; // Await async function
-                    logging!(info, Type::Window, true, "Show Main Window: {result:?}");
-                } else {
-                    crate::module::lightweight::entry_lightweight_mode().await; // Remove .await as it's not async
-                }
+                lightweight::entry_lightweight_mode().await; // Await async function
             }
             "quit" => {
                 feat::quit().await; // Await async function