fix(sysproxy): wait for the network before the login-time proxy write

This commit is contained in:
wonfen
2026-09-03 22:42:49 +08:00
parent 7ffb0ef23b
commit c89f431cb0
2 changed files with 36 additions and 0 deletions
+17
View File
@@ -384,6 +384,23 @@ 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;
}
})
.await
.is_ok()
}
pub fn is_reportable(error: &anyhow::Error) -> bool {
is_reportable_given(error, notification::has_pending_failure)
}