feat(profile): raise auto-update intervals below 24h

Each auto-update reloads the core, which drops every connection running through a
`proxy-providers` entry. Existing profiles are corrected once at startup; the form
warns about shorter intervals but still saves them.
This commit is contained in:
wonfen
2026-08-17 12:14:24 +08:00
parent 73d986369c
commit ec6241b30a
21 changed files with 215 additions and 17 deletions
+6
View File
@@ -21,6 +21,8 @@ pub static PORTABLE_FLAG: OnceCell<bool> = OnceCell::new();
pub static CLASH_CONFIG: &str = "config.yaml";
pub static VERGE_CONFIG: &str = "verge.yaml";
pub static PROFILE_YAML: &str = "profiles.yaml";
/// Marks that the one-shot raise of too-short auto-update intervals has already run.
pub static UPDATE_INTERVAL_MIGRATED: &str = ".update-interval-migrated";
/// init portable flag
pub fn init_portable_flag() -> Result<()> {
@@ -170,6 +172,10 @@ pub fn profiles_path() -> Result<PathBuf> {
Ok(app_home_dir()?.join(PROFILE_YAML))
}
pub fn update_interval_migrated_path() -> Result<PathBuf> {
Ok(app_home_dir()?.join(UPDATE_INTERVAL_MIGRATED))
}
#[cfg(target_os = "macos")]
pub fn service_path() -> Result<PathBuf> {
let res_dir = app_resources_dir()?;
+46
View File
@@ -232,6 +232,52 @@ async fn migrate_legacy_macos_service_logs(log_dir: &Path) -> Result<()> {
Ok(())
}
/// Raise existing sub-floor update intervals, once per install.
///
/// One-off repair, not a standing rule — the UI warns about shorter intervals but still saves
/// them, so the marker is written even when nothing needed raising.
pub async fn migrate_short_update_intervals() -> Result<()> {
let marker = dirs::update_interval_migrated_path()?;
if fs::try_exists(&marker).await? {
return Ok(());
}
// Same order as every other writer holding it (lock, then draft permit): save_file runs
// inside the closure, ahead of the optimistic check, so a racing restore can't be undone.
let _profile_write = crate::config::profiles::PROFILE_WRITE_LOCK.lock().await;
let min = constants::profile::MIN_UPDATE_INTERVAL;
let raised = Config::profiles()
.await
.with_data_modify(|mut profiles: IProfiles| async move {
// `IProfiles::new` normalises items to Some when it read the file, and returns a
// bare default() when it failed. A failed load also raises zero — without this the
// marker would burn the one shot on profiles nobody managed to load.
if profiles.items.is_none() {
anyhow::bail!("profiles.yaml was not loaded; refusing to record the migration as done");
}
let raised = profiles.raise_short_update_intervals(min);
if raised > 0 {
profiles.save_file().await?;
}
Ok((profiles, raised))
})
.await?;
if raised > 0 {
logging!(
info,
Type::Setup,
"已将 {} 个订阅的自动更新间隔提升到 {} 分钟",
raised,
min
);
}
fs::write(&marker, b"").await?;
Ok(())
}
#[cfg(target_os = "macos")]
async fn migrate_legacy_macos_logs() -> Result<()> {
let log_dir = dirs::app_logs_dir()?;
+4
View File
@@ -48,6 +48,10 @@ pub fn resolve_setup_async() {
AsyncHandler::spawn(|| async {
logging!(info, Type::ClashVergeRev, "Version: {}", env!("CARGO_PKG_VERSION"));
// Ahead of the window and init_timer: anything saved or deep-link-imported after the app
// is up is a deliberate choice. Config files already exist (init_work_dir_and_logger).
logging_error!(Type::Setup, init::migrate_short_update_intervals().await);
#[cfg(target_os = "macos")]
resolve_dock_show().await;
init_startup_script().await;