gitea-admin/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-11-08 19:22:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(sysproxy): re-apply the proxy when macOS gains a network service

Browse Source
This commit is contained in:
wonfen
2026-09-03 22:42:49 +08:00
parent c89f431cb0
commit e57d115110
7 changed files with 119 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/core/proxy_control.rs
+6 -14
View File
@@ -384,21 +384,13 @@ async fn current_service_proxy_config(verge: &IVerge) -> Result<MacosProxyConfig
service_proxy_config(verge, mixed_port, 0)
}
/// Wait, up to `limit`, for a network service to write the proxy on. At login the app usually
/// comes up before the network does, and nothing re-applies a proxy the first write missed.
pub async fn wait_for_network_service(limit: Duration) -> bool {
let no_service = || {
tokio::task::spawn_blocking(
|| matches!(sysproxy::Sysproxy::get_system_proxy(), Err(error) if is_missing_network_service(&error)),
)
};
tokio::time::timeout(limit, async {
while no_service().await.unwrap_or(false) {
tokio::time::sleep(Duration::from_secs(1)).await;
}
})
/// Whether macOS has a network service to write the proxy on right now.
pub async fn has_network_service() -> bool {
tokio::task::spawn_blocking(
|| !matches!(sysproxy::Sysproxy::get_system_proxy(), Err(error) if is_missing_network_service(&error)),
)
.await
.is_ok()
.unwrap_or(true)
}
pub fn is_reportable(error: &anyhow::Error) -> bool {