admin/CC-Switch
1
0
Fork 0
mirror of https://github.com/farion1231/cc-switch.git synced 2026-08-02 10:21:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(proxy): restore request timeout and fix proxy hot-reload issues

Browse Source 
- Add URL scheme validation in build_client (http/https/socks5/socks5h)
- Restore per-request timeout for speedtest, stream_check, usage_script, forwarder
- Fix set_global_proxy_url to validate before persisting to DB
- Mask proxy credentials in all log outputs
- Fix forwarder hot-reload by fetching client on each request
This commit is contained in:
YoVinchen
2026-01-12 11:34:31 +08:00
parent fdd539759e
commit c2adb1af46
6 changed files with 87 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/services/stream_check.rs
+25 -3
View File
@@ -138,18 +138,34 @@ impl StreamCheckService {
// 使用全局 HTTP 客户端（已包含代理配置）
let client = crate::proxy::http_client::get();
let request_timeout = std::time::Duration::from_secs(config.timeout_secs);
let model_to_test = Self::resolve_test_model(app_type, provider, config);
let result = match app_type {
AppType::Claude => {
Self::check_claude_stream(&client, &base_url, &auth, &model_to_test).await
Self::check_claude_stream(
&client,
&base_url,
&auth,
&model_to_test,
request_timeout,
)
.await
}
AppType::Codex => {
Self::check_codex_stream(&client, &base_url, &auth, &model_to_test).await
Self::check_codex_stream(&client, &base_url, &auth, &model_to_test, request_timeout)
.await
}
AppType::Gemini => {
Self::check_gemini_stream(&client, &base_url, &auth, &model_to_test).await
Self::check_gemini_stream(
&client,
&base_url,
&auth,
&model_to_test,
request_timeout,
)
.await
}
};
@@ -190,6 +206,7 @@ impl StreamCheckService {
base_url: &str,
auth: &AuthInfo,
model: &str,
timeout: std::time::Duration,
) -> Result<(u16, String), AppError> {
let base = base_url.trim_end_matches('/');
let url = if base.ends_with("/v1") {
@@ -210,6 +227,7 @@ impl StreamCheckService {
.header("x-api-key", &auth.api_key)
.header("anthropic-version", "2023-06-01")
.header("Content-Type", "application/json")
.timeout(timeout)
.json(&body)
.send()
.await
@@ -240,6 +258,7 @@ impl StreamCheckService {
base_url: &str,
auth: &AuthInfo,
model: &str,
timeout: std::time::Duration,
) -> Result<(u16, String), AppError> {
let base = base_url.trim_end_matches('/');
let url = if base.ends_with("/v1") {
@@ -272,6 +291,7 @@ impl StreamCheckService {
.post(&url)
.header("Authorization", format!("Bearer {}", auth.api_key))
.header("Content-Type", "application/json")
.timeout(timeout)
.json(&body)
.send()
.await
@@ -301,6 +321,7 @@ impl StreamCheckService {
base_url: &str,
auth: &AuthInfo,
model: &str,
timeout: std::time::Duration,
) -> Result<(u16, String), AppError> {
let base = base_url.trim_end_matches('/');
let url = format!("{base}/v1/chat/completions");
@@ -317,6 +338,7 @@ impl StreamCheckService {
.post(&url)
.header("Authorization", format!("Bearer {}", auth.api_key))
.header("Content-Type", "application/json")
.timeout(timeout)
.json(&body)
.send()
.await