root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 08:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(timer): better subscription update timer after core startup

Browse Source
This commit is contained in:
Tunglies
2025-11-15 21:18:35 +08:00
parent 8654bad6b0
commit e66b8e7894
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src-tauri/src/core/timer.rs
View File

@@ -1,5 +1,7 @@
use crate::{
config::Config, core::sysopt::Sysopt, feat, logging, logging_error, singleton,
config::Config,
core::{CoreManager, manager::RunningMode, sysopt::Sysopt},
feat, logging, logging_error, singleton,
utils::logging::Type,
};
use anyhow::{Context as _, Result};
@@ -392,6 +394,7 @@ impl Timer {
.spawn_async_routine(move || {
let uid = uid.clone();
Box::pin(async move {
Self::wait_untile_core_manager(Duration::from_millis(1000)).await;
Self::wait_until_sysopt(Duration::from_millis(1000)).await;
Self::async_task(&uid).await;
}) as Pin<Box<dyn std::future::Future<Output = ()> + Send>>
@@ -523,10 +526,28 @@ impl Timer {
Self::emit_update_event(uid, false);
}
async fn wait_untile_core_manager(max_wait: Duration) {
let _ = timeout(max_wait, async {
while *CoreManager::global().get_running_mode() != RunningMode::NotRunning {
logging!(
debug,
Type::Timer,
"Waiting for CoreManager to be initialized..."
);
sleep(Duration::from_millis(30)).await;
}
})
.await;
}
async fn wait_until_sysopt(max_wait: Duration) {
let _ = timeout(max_wait, async {
while !Sysopt::global().is_initialed() {
logging!(warn, Type::Timer, "Waiting for Sysopt to be initialized...");
logging!(
debug,
Type::Timer,
"Waiting for Sysopt to be initialized..."
);
sleep(Duration::from_millis(30)).await;
}
})