From 0de304d4e3b7d9594de37d798ba6683d8401f92c Mon Sep 17 00:00:00 2001 From: Tunglies Date: Sat, 5 Apr 2025 10:24:53 +0800 Subject: [PATCH] Fix and Optimize fix: #3187 and #3096, silent startup can not trigger lightweight mode fix: optimize startup initializing processing --- UPDATELOG.md | 1 + src-tauri/src/core/hotkey.rs | 2 +- src-tauri/src/core/timer.rs | 4 +- src-tauri/src/core/tray/mod.rs | 4 +- src-tauri/src/feat/window.rs | 2 +- src-tauri/src/module/lightweight.rs | 1 + src-tauri/src/utils/resolve.rs | 70 +++++++++-------------------- src-tauri/src/utils/server.rs | 2 +- 8 files changed, 30 insertions(+), 56 deletions(-) diff --git a/UPDATELOG.md b/UPDATELOG.md index 37fd25af..f7424e92 100644 --- a/UPDATELOG.md +++ b/UPDATELOG.md @@ -18,6 +18,7 @@ - 相同节点名称可能导致的页面渲染出错 - URL Schemes被截断的问题 - 首页流量统计卡更好的时间戳范围 + - 静默启动无法触发自动轻量化计时器 #### 新增了： - Mihomo(Meta)内核升级至 1.19.4 diff --git a/src-tauri/src/core/hotkey.rs b/src-tauri/src/core/hotkey.rs index 1e3fd7ec..4d0daa51 100755 --- a/src-tauri/src/core/hotkey.rs +++ b/src-tauri/src/core/hotkey.rs @@ -188,7 +188,7 @@ impl Hotkey { true, "Window does not exist, creating a new one" ); - resolve::create_window(); + resolve::create_window(true); } }); diff --git a/src-tauri/src/core/timer.rs b/src-tauri/src/core/timer.rs index 9a38c698..6094f6c9 100644 --- a/src-tauri/src/core/timer.rs +++ b/src-tauri/src/core/timer.rs @@ -1,4 +1,4 @@ -use crate::{config::Config, core::CoreManager, feat}; +use crate::{config::Config, core::CoreManager, feat, logging, utils::logging::Type}; use anyhow::{Context, Result}; use delay_timer::prelude::{DelayTimer, DelayTimerBuilder, TaskBuilder}; use once_cell::sync::OnceCell; @@ -58,7 +58,7 @@ impl Timer { return Ok(()); } - log::info!(target: "app", "Initializing timer..."); + logging!(info, Type::Timer, true, "Initializing timer..."); // Initialize timer tasks if let Err(e) = self.refresh() { diff --git a/src-tauri/src/core/tray/mod.rs b/src-tauri/src/core/tray/mod.rs index 177ef397..10103eac 100644 --- a/src-tauri/src/core/tray/mod.rs +++ b/src-tauri/src/core/tray/mod.rs @@ -205,7 +205,7 @@ impl Tray { match tray_event.as_str() { "system_proxy" => feat::toggle_system_proxy(), "tun_mode" => feat::toggle_tun_mode(None), - "main_window" => resolve::create_window(), + "main_window" => resolve::create_window(true), _ => {} } } @@ -680,7 +680,7 @@ fn on_menu_event(_: &AppHandle, event: MenuEvent) { println!("change mode to: {}", mode); feat::change_clash_mode(mode.into()); } - "open_window" => resolve::create_window(), + "open_window" => resolve::create_window(true), "system_proxy" => feat::toggle_system_proxy(), "tun_mode" => feat::toggle_tun_mode(None), "copy_env" => feat::copy_clash_env(), diff --git a/src-tauri/src/feat/window.rs b/src-tauri/src/feat/window.rs index 89bf9042..f5b7f137 100644 --- a/src-tauri/src/feat/window.rs +++ b/src-tauri/src/feat/window.rs @@ -47,7 +47,7 @@ pub fn open_or_close_dashboard() { } else { println!("No existing window found, creating new window"); log::info!(target: "app", "No existing window found, creating new window"); - resolve::create_window(); + resolve::create_window(true); } } diff --git a/src-tauri/src/module/lightweight.rs b/src-tauri/src/module/lightweight.rs index de24d5ed..d2025dd1 100644 --- a/src-tauri/src/module/lightweight.rs +++ b/src-tauri/src/module/lightweight.rs @@ -13,6 +13,7 @@ use crate::{ const LIGHT_WEIGHT_TASK_UID: &str = "light_weight_task"; pub fn enable_auto_light_weight_mode() { + let _ = Timer::global().init().unwrap(); logging!(info, Type::Lightweight, true, "开启自动轻量模式"); setup_window_close_listener(); setup_webview_focus_listener(); diff --git a/src-tauri/src/utils/resolve.rs b/src-tauri/src/utils/resolve.rs index b1839c2b..6f873f44 100644 --- a/src-tauri/src/utils/resolve.rs +++ b/src-tauri/src/utils/resolve.rs @@ -61,35 +61,6 @@ pub async fn resolve_setup(app: &mut App) { logging!(trace, Type::Config, true, "Initial config"); logging_error!(Type::Config, true, Config::init_config().await); - // if service::check_service().await.is_err() { - // match service::install_service().await { - // Ok(_) => { - // log::info!(target:"app", "install service susccess."); - // #[cfg(not(target_os = "macos"))] - // std::thread::sleep(std::time::Duration::from_millis(1000)); - // #[cfg(target_os = "macos")] - // { - // let mut service_runing = false; - // for _ in 0..40 { - // if service::check_service().await.is_ok() { - // service_runing = true; - // break; - // } else { - // log::warn!(target: "app", "service not runing, sleep 500ms and check again."); - // std::thread::sleep(std::time::Duration::from_millis(500)); - // } - // } - // if !service_runing { - // log::warn!(target: "app", "service not running, will fallback to user mode"); - // } - // } - // } - // Err(e) => { - // log::warn!(target: "app", "failed to install service: {e:?}, will fallback to user mode"); - // } - // } - // } - logging!(trace, Type::Core, "Starting CoreManager"); logging_error!(Type::Core, true, CoreManager::global().init().await); @@ -112,22 +83,21 @@ pub async fn resolve_setup(app: &mut App) { sysopt::Sysopt::global().init_guard_sysproxy() ); - // 初始化热键 - logging!(trace, Type::System, true, "Initial hotkeys"); - logging_error!(Type::System, true, hotkey::Hotkey::global().init()); + let is_silent_start = { Config::verge().data().enable_silent_start }.unwrap_or(false); + create_window(!is_silent_start); - let silent_start = { Config::verge().data().enable_silent_start }; - if !silent_start.unwrap_or(false) { - create_window(); - } - - logging_error!(Type::Tray, true, tray::Tray::global().update_part()); logging_error!(Type::System, true, timer::Timer::global().init()); let enable_auto_light_weight_mode = { Config::verge().data().enable_auto_light_weight_mode }; if enable_auto_light_weight_mode.unwrap_or(false) { lightweight::enable_auto_light_weight_mode(); } + + logging_error!(Type::Tray, true, tray::Tray::global().update_part()); + + // 初始化热键 + logging!(trace, Type::System, true, "Initial hotkeys"); + logging_error!(Type::System, true, hotkey::Hotkey::global().init()); } /// reset system proxy (异步版) @@ -151,7 +121,7 @@ pub async fn resolve_reset_async() { } /// create main window -pub fn create_window() { +pub fn create_window(is_showup: bool) { logging!(info, Type::Window, true, "Creating window"); let app_handle = handle::Handle::global().app_handle().unwrap(); @@ -226,17 +196,19 @@ pub fn create_window() { match window { Ok(window) => { - logging!( - info, - Type::Window, - true, - "Window created successfully, making window visible" - ); - let _ = window.show(); - let _ = window.set_focus(); + logging!(info, Type::Window, true, "Window created successfully"); + if is_showup { + println!("is showup"); + let _ = window.show(); + let _ = window.set_focus(); + } else { + let _ = window.hide(); + #[cfg(target_os = "macos")] + AppHandleManager::global().set_activation_policy_accessory(); + } // 设置窗口状态监控，实时保存窗口位置和大小 - crate::feat::setup_window_state_monitor(&app_handle); + // crate::feat::setup_window_state_monitor(&app_handle); // 标记前端UI已准备就绪，向前端发送启动完成事件 let app_handle_clone = app_handle.clone(); @@ -310,7 +282,7 @@ pub async fn resolve_scheme(param: String) -> Result<()> { Some(url) => { log::info!(target:"app", "decoded subscription url: {}", url); - create_window(); + create_window(false); match PrfItem::from_url(url.as_ref(), name, None, None).await { Ok(item) => { let uid = item.uid.clone().unwrap(); diff --git a/src-tauri/src/utils/server.rs b/src-tauri/src/utils/server.rs index 5322d790..61870473 100644 --- a/src-tauri/src/utils/server.rs +++ b/src-tauri/src/utils/server.rs @@ -49,7 +49,7 @@ pub fn embed_server() { tauri::async_runtime::spawn(async move { let visible = warp::path!("commands" / "visible").map(move || { - resolve::create_window(); + resolve::create_window(false); "ok" });