From 4d25910ed14d68033f2ec359121e4366dbdb018c Mon Sep 17 00:00:00 2001 From: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Tue, 13 Jan 2026 21:37:24 +0800 Subject: [PATCH] refactor(timer): integrate lightweight timer setup and cancellation into Timer struct --- src-tauri/src/core/timer.rs | 43 +++++++++++++++++- src-tauri/src/module/lightweight.rs | 67 ++++------------------------- 2 files changed, 50 insertions(+), 60 deletions(-) diff --git a/src-tauri/src/core/timer.rs b/src-tauri/src/core/timer.rs index f6fecad37..12433af6d 100644 --- a/src-tauri/src/core/timer.rs +++ b/src-tauri/src/core/timer.rs @@ -1,4 +1,4 @@ -use crate::{config::Config, feat, singleton, utils::resolve::is_resolve_done}; +use crate::{config::Config, feat, module::lightweight, singleton, utils::resolve::is_resolve_done}; use anyhow::{Context as _, Result}; use clash_verge_logging::{Type, logging, logging_error}; use delay_timer::prelude::{DelayTimer, DelayTimerBuilder, TaskBuilder}; @@ -35,6 +35,8 @@ pub struct Timer { /// Flag to mark if timer is initialized - atomic for better performance pub initialized: AtomicBool, + + pub lightweight_task_id: AtomicU64, } // Use singleton macro @@ -47,6 +49,7 @@ impl Timer { timer_map: Arc::new(RwLock::new(HashMap::new())), timer_count: AtomicU64::new(1), initialized: AtomicBool::new(false), + lightweight_task_id: AtomicU64::new(0), } } @@ -471,3 +474,41 @@ enum DiffFlag { Add(TaskID, u64), Mod(TaskID, u64), } + +impl Timer { + pub fn setup_lightweight_timer(&self, minutes: u64) -> Result<()> { + if self.lightweight_task_id.load(Ordering::SeqCst) != 0 { + // logging!(debug, Type::Lightweight, "轻量模式定时器已存在，跳过创建"); + return Ok(()); + } + + let task_id = 42; + let task = TaskBuilder::default() + .set_task_id(task_id) + .set_maximum_running_time(1) + .set_maximum_parallel_runnable_num(1) + .set_frequency_once_by_minutes(minutes) + .spawn_async_routine(move || async move { + logging!(info, Type::Timer, "计时器到期，开始进入轻量模式"); + lightweight::entry_lightweight_mode().await; + })?; + self.delay_timer + .write() + .add_task(task) + .context("failed to add lightweight timer task")?; + self.lightweight_task_id.store(task_id, Ordering::SeqCst); + Ok(()) + } + + pub fn cancel_lightweight_timer(&self) -> Result<()> { + let task_id = self.lightweight_task_id.load(Ordering::SeqCst); + if task_id != 0 { + self.delay_timer + .write() + .remove_task(task_id) + .context("failed to remove lightweight timer task")?; + self.lightweight_task_id.store(0, Ordering::SeqCst); + } + Ok(()) + } +} diff --git a/src-tauri/src/module/lightweight.rs b/src-tauri/src/module/lightweight.rs index 900510781..34b494cc7 100644 --- a/src-tauri/src/module/lightweight.rs +++ b/src-tauri/src/module/lightweight.rs @@ -8,12 +8,9 @@ use clash_verge_logging::{Type, logging, logging_error}; use crate::utils::window_manager::WindowManager; use anyhow::{Context as _, Result}; -use delay_timer::prelude::TaskBuilder; use std::sync::atomic::{AtomicU8, AtomicU32, Ordering}; use tauri::Listener as _; -const LIGHT_WEIGHT_TASK_UID: &str = "light_weight_task"; - #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] enum LightweightState { @@ -101,7 +98,7 @@ pub async fn enable_auto_light_weight_mode() { pub fn disable_auto_light_weight_mode() { logging!(info, Type::Lightweight, "关闭自动轻量模式"); - let _ = cancel_light_weight_timer(); + logging_error!(Type::Lightweight, Timer::global().cancel_lightweight_timer()); cancel_window_close_listener(); cancel_webview_focus_listener(); } @@ -114,7 +111,6 @@ pub async fn entry_lightweight_mode() -> bool { } record_state_and_log(LightweightState::In); WindowManager::destroy_main_window(); - let _ = cancel_light_weight_timer(); refresh_lightweight_tray_state().await; true } @@ -131,7 +127,7 @@ pub async fn exit_lightweight_mode() -> bool { } record_state_and_log(LightweightState::Exiting); WindowManager::show_main_window().await; - let _ = cancel_light_weight_timer(); + logging_error!(Type::Lightweight, Timer::global().cancel_lightweight_timer()); record_state_and_log(LightweightState::Normal); refresh_lightweight_tray_state().await; true @@ -154,7 +150,7 @@ fn setup_window_close_listener() { ); } })); - logging!(info, Type::Lightweight, "监听到关闭请求，开始轻量模式计时"); + logging!(debug, Type::Lightweight, "监听到关闭请求，开始轻量模式计时"); }); WINDOW_CLOSE_HANDLER_ID.store(handler_id, Ordering::Release); } @@ -173,7 +169,7 @@ fn cancel_window_close_listener() { fn setup_webview_focus_listener() { if let Some(window) = handle::Handle::get_window() { let handler_id = window.listen("tauri://focus", move |_event| { - logging_error!(Type::Lightweight, cancel_light_weight_timer()); + logging_error!(Type::Lightweight, Timer::global().cancel_lightweight_timer()); logging!(debug, Type::Lightweight, "监听到窗口获得焦点，取消轻量模式计时"); }); WEBVIEW_FOCUS_HANDLER_ID.store(handler_id, Ordering::Release); @@ -197,43 +193,10 @@ async fn setup_light_weight_timer() -> Result<()> { let once_by_minutes = Config::verge().await.data_arc().auto_light_weight_minutes.unwrap_or(10); - { - let timer_map = Timer::global().timer_map.read(); - if timer_map.contains_key(LIGHT_WEIGHT_TASK_UID) { - logging!(debug, Type::Timer, "轻量模式计时器已存在，跳过创建"); - return Ok(()); - } - } - - let task_id = { - Timer::global() - .timer_count - .fetch_add(1, std::sync::atomic::Ordering::Relaxed) - }; - - let task = TaskBuilder::default() - .set_task_id(task_id) - .set_maximum_parallel_runnable_num(1) - .set_frequency_once_by_minutes(once_by_minutes) - .spawn_async_routine(move || async move { - logging!(info, Type::Timer, "计时器到期，开始进入轻量模式"); - entry_lightweight_mode().await; - }) - .context("failed to create timer task")?; - - { - let delay_timer = Timer::global().delay_timer.write(); - delay_timer.add_task(task).context("failed to add timer task")?; - } - - { - let mut timer_map = Timer::global().timer_map.write(); - let timer_task = crate::core::timer::TimerTask { - task_id, - interval_minutes: once_by_minutes, - }; - timer_map.insert(LIGHT_WEIGHT_TASK_UID.into(), timer_task); - } + logging_error!( + Type::Lightweight, + Timer::global().setup_lightweight_timer(once_by_minutes) + ); logging!( info, @@ -244,17 +207,3 @@ async fn setup_light_weight_timer() -> Result<()> { Ok(()) } - -fn cancel_light_weight_timer() -> Result<()> { - let value = Timer::global().timer_map.write().remove(LIGHT_WEIGHT_TASK_UID); - if let Some(task) = value { - Timer::global() - .delay_timer - .write() - .remove_task(task.task_id) - .context("failed to remove timer task")?; - logging!(debug, Type::Timer, "计时器已取消"); - } - - Ok(()) -}