From 54119cb187b265554997d270890ecbce6bc2566e Mon Sep 17 00:00:00 2001 From: wonfen Date: Wed, 18 Nov 2026 23:09:05 +0800 Subject: [PATCH] feat(proxy): follow url-test/fallback picks with the first select group In rule mode, picking a node in a url-test or fallback group also points the first select group listing it at that group. Toggle in Misc settings, on by default. --- Changelog.md | 1 + src-tauri/src/config/verge.rs | 4 + src-tauri/src/feat/effects.rs | 1 + src-tauri/src/feat/profile.rs | 106 +++++++++++++++++++- src/components/setting/mods/misc-viewer.tsx | 24 +++++ src/components/setting/settings-catalog.ts | 2 + src/locales/ar/settings.json | 2 + src/locales/de/settings.json | 2 + src/locales/en/settings.json | 2 + src/locales/es/settings.json | 2 + src/locales/fa/settings.json | 2 + src/locales/id/settings.json | 2 + src/locales/jp/settings.json | 2 + src/locales/ko/settings.json | 2 + src/locales/pt/settings.json | 2 + src/locales/ru/settings.json | 2 + src/locales/tr/settings.json | 2 + src/locales/tt/settings.json | 2 + src/locales/zh/settings.json | 2 + src/locales/zhtw/settings.json | 2 + src/services/bindings.ts | 2 + src/types/generated/i18n-keys.ts | 2 + src/types/generated/i18n-resources.ts | 2 + 23 files changed, 169 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index b3410ea27..22bfa034c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -55,6 +55,7 @@ ✨ 新增功能 - 新增连接页面按网络协议(TCP/UDP)筛选连接 +- 新增规则模式下在 `url-test` 或 `fallback` 代理组选节点时,自动将首个包含该组的 `select` 代理组切换到该组,可在「杂项设置」关闭 diff --git a/src-tauri/src/config/verge.rs b/src-tauri/src/config/verge.rs index 88eebd4dd..26d11c21f 100644 --- a/src-tauri/src/config/verge.rs +++ b/src-tauri/src/config/verge.rs @@ -109,6 +109,8 @@ pub struct IVerge { pub auto_close_connection: Option, + pub auto_switch_selector_group: Option, + pub auto_check_update: Option, pub default_latency_test: Option, @@ -368,6 +370,7 @@ impl IVerge { use_default_bypass: Some(true), proxy_guard_duration: Some(30), auto_close_connection: Some(true), + auto_switch_selector_group: Some(true), auto_check_update: Some(true), enable_builtin_enhanced: Some(true), auto_log_clean: Some(2), // 1: 1天, 2: 7天, 3: 30天, 4: 90天 @@ -456,6 +459,7 @@ impl IVerge { patch_opt_field!(self, patch, enable_global_hotkey); patch_opt_field!(self, patch, auto_close_connection); + patch_opt_field!(self, patch, auto_switch_selector_group); patch_opt_field!(self, patch, auto_check_update); patch_opt_field!(self, patch, default_latency_test); patch_opt_field!(self, patch, default_latency_timeout); diff --git a/src-tauri/src/feat/effects.rs b/src-tauri/src/feat/effects.rs index e1ac370fb..61cfba67c 100644 --- a/src-tauri/src/feat/effects.rs +++ b/src-tauri/src/feat/effects.rs @@ -90,6 +90,7 @@ verge_registry! { enable_global_hotkey => NoEffect; home_cards => NoEffect; auto_close_connection => NoEffect; + auto_switch_selector_group => NoEffect; auto_check_update => NoEffect; default_latency_test => NoEffect; default_latency_timeout => NoEffect; diff --git a/src-tauri/src/feat/profile.rs b/src-tauri/src/feat/profile.rs index e8a0c00b7..daf8e1e36 100644 --- a/src-tauri/src/feat/profile.rs +++ b/src-tauri/src/feat/profile.rs @@ -9,6 +9,7 @@ use crate::{ }; use anyhow::{Result, bail}; use clash_verge_logging::{Type, logging}; +use tauri_plugin_mihomo::models::ProxyType; use tristr::alias::String; /// Toggle proxy profile @@ -22,9 +23,80 @@ pub async fn toggle_proxy_profile(profile_index: String) { } } +/// First `select` group in config order that lists `group_name`, when that group is `url-test` or `fallback`. +fn parent_selector<'a>(groups: &'a [serde_yaml_ng::Value], group_name: &str) -> Option<&'a str> { + let field = |group: &'a serde_yaml_ng::Value, key: &str| group.get(key)?.as_str(); + let group = groups.iter().find(|group| field(group, "name") == Some(group_name))?; + if !matches!(field(group, "type"), Some("url-test" | "fallback")) { + return None; + } + groups + .iter() + .filter(|group| field(group, "type") == Some("select")) + .filter(|group| { + group + .get("proxies") + .and_then(|members| members.as_sequence()) + .is_some_and(|members| members.iter().any(|member| member.as_str() == Some(group_name))) + }) + .filter_map(|group| field(group, "name")) + .find(|name| *name != "GLOBAL") +} + +/// Rule traffic enters through `select` groups, so a pick inside a `url-test`/`fallback` group only +/// carries traffic once the first `select` group listing that group points at it. +/// Returns the node that group left. +async fn follow_group_selection(group_name: &str) -> Option { + if !Config::verge() + .await + .data_arc() + .auto_switch_selector_group + .unwrap_or(true) + { + return None; + } + if Config::clash() + .await + .data_arc() + .get_mode() + .is_some_and(|mode| mode != "rule") + { + return None; + } + let selector = { + let runtime = Config::runtime().await.latest_arc(); + let groups = runtime.config.as_ref()?.get("proxy-groups")?.as_sequence()?; + parent_selector(groups, group_name)?.to_owned() + }; + + let mihomo = handle::Handle::mihomo(); + let current = mihomo.get_proxy_by_name(&selector).await.ok()?; + // The runtime config can lag the core, which alone knows what this group is now. + if current.proxy_type != ProxyType::Selector { + return None; + } + let previous = current.now?; + if previous == group_name { + return None; + } + if let Err(err) = mihomo.select_node_for_group(&selector, group_name).await { + logging!(warn, Type::Core, "Failed to point {selector} at {group_name}: {err:#}"); + return None; + } + if let Err(error) = crate::config::profiles::record_selected_node(&selector, group_name).await { + logging!( + warn, + Type::Config, + "Failed to persist proxy selection for {selector}: {error:#}" + ); + } + Some(previous) +} + pub async fn switch_proxy_node(group_name: &str, proxy_name: &str, unfix: bool) -> Result<()> { let mihomo = handle::Handle::mihomo(); - let previous_proxy = if Config::verge().await.data_arc().auto_close_connection.unwrap_or(false) { + let auto_close = Config::verge().await.data_arc().auto_close_connection.unwrap_or(false); + let previous_proxy = if auto_close { match mihomo.get_proxy_by_name(group_name).await { Ok(group) => group.now.filter(|name| !name.is_empty()), Err(err) => { @@ -58,9 +130,16 @@ pub async fn switch_proxy_node(group_name: &str, proxy_name: &str, unfix: bool) "Failed to persist proxy selection for {group_name}: {error:#}" ); } + let mut stale_proxies: Vec<_> = previous_proxy.into_iter().collect(); + if !unfix + && let Some(left) = follow_group_selection(group_name).await + && auto_close + { + stale_proxies.push(left); + } announce(Refresh::Proxies); - if let Some(previous_proxy) = previous_proxy { + if !stale_proxies.is_empty() { AsyncHandler::spawn(move || async move { let connections = match mihomo.get_connections().await { Ok(connections) => connections, @@ -78,7 +157,7 @@ pub async fn switch_proxy_node(group_name: &str, proxy_name: &str, unfix: bool) .connections .unwrap_or_default() .into_iter() - .filter(|connection| connection.chains.contains(&previous_proxy)) + .filter(|connection| stale_proxies.iter().any(|proxy| connection.chains.contains(proxy))) .map(|connection| async move { if let Err(err) = mihomo.close_connection(&connection.id).await { logging!( @@ -280,3 +359,24 @@ pub async fn update_profile(uid: &str, option: Option<&PrfOption>, is_mannual_tr pub async fn enhance_profiles() -> Result { CoreManager::global().update_config_forced().await } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn only_the_first_select_group_follows_an_auto_group() -> Result<()> { + let groups: Vec = serde_yaml_ng::from_str( + " +- { name: GLOBAL, type: select, proxies: [Auto, Proxy, Direct] } +- { name: Auto, type: url-test, proxies: [Node] } +- { name: Proxy, type: select, proxies: [Auto, Node] } +- { name: Direct, type: select, proxies: [DIRECT, Auto] } +", + )?; + + assert_eq!(parent_selector(&groups, "Auto"), Some("Proxy")); + assert_eq!(parent_selector(&groups, "Proxy"), None); + Ok(()) + } +} diff --git a/src/components/setting/mods/misc-viewer.tsx b/src/components/setting/mods/misc-viewer.tsx index 52a01a4b2..c7365c621 100644 --- a/src/components/setting/mods/misc-viewer.tsx +++ b/src/components/setting/mods/misc-viewer.tsx @@ -22,6 +22,7 @@ const buildInitialValues = (verge?: IVergeConfig | null) => ({ appLogMaxSize: verge?.app_log_max_size ?? 128, appLogMaxCount: verge?.app_log_max_count ?? 8, autoCloseConnection: verge?.auto_close_connection ?? true, + autoSwitchSelectorGroup: verge?.auto_switch_selector_group ?? true, autoCheckUpdate: verge?.auto_check_update ?? true, enableBuiltinEnhanced: verge?.enable_builtin_enhanced ?? true, proxyLayoutColumn: verge?.proxy_layout_column || 6, @@ -55,6 +56,7 @@ export const MiscViewer = forwardRef((props, ref) => { app_log_max_size: values.appLogMaxSize, app_log_max_count: values.appLogMaxCount, auto_close_connection: values.autoCloseConnection, + auto_switch_selector_group: values.autoSwitchSelectorGroup, auto_check_update: values.autoCheckUpdate, enable_builtin_enhanced: values.enableBuiltinEnhanced, proxy_layout_column: values.proxyLayoutColumn, @@ -202,6 +204,28 @@ export const MiscViewer = forwardRef((props, ref) => { /> + + + + + setValues((v) => ({ ...v, autoSwitchSelectorGroup: c })) + } + sx={{ marginLeft: 'auto' }} + /> + +