purgatory/clash-verge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fetch profile with system proxy, close #249

Browse Source
This commit is contained in:
GyDi 2022-10-25 23:45:24 +08:00
parent df14af7337
commit 600134a3ac
No known key found for this signature in database
GPG Key ID: 58B15242BA8277A6
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src-tauri/src/data/prfitem.rs
View File

@ -4,6 +4,7 @@ use reqwest::StatusCode;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_yaml::Mapping; use serde_yaml::Mapping;
use std::fs; use std::fs;
use sysproxy::Sysproxy;
#[derive(Debug, Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
pub struct PrfItem { pub struct PrfItem {
@ -187,12 +188,10 @@ impl PrfItem {
let self_proxy = opt_ref.map_or(false, |o| o.self_proxy.unwrap_or(false)); let self_proxy = opt_ref.map_or(false, |o| o.self_proxy.unwrap_or(false));
let user_agent = opt_ref.map_or(None, |o| o.user_agent.clone()); let user_agent = opt_ref.map_or(None, |o| o.user_agent.clone());
let mut builder = reqwest::ClientBuilder::new(); let mut builder = reqwest::ClientBuilder::new().no_proxy();
if !with_proxy && !self_proxy {
builder = builder.no_proxy();
} else if self_proxy {
// 使用软件自己的代理 // 使用软件自己的代理
if self_proxy {
let data = super::Data::global(); let data = super::Data::global();
let port = data.clash.lock().info.port.clone(); let port = data.clash.lock().info.port.clone();
let port = port.ok_or(anyhow::anyhow!("failed to get clash info port"))?; let port = port.ok_or(anyhow::anyhow!("failed to get clash info port"))?;
@ -208,6 +207,18 @@ impl PrfItem {
builder = builder.proxy(proxy); builder = builder.proxy(proxy);
} }
} }
// 使用系统代理
else if with_proxy {
match Sysproxy::get_system_proxy() {
Ok(p @ Sysproxy { enable: true, .. }) => {
let proxy_scheme = format!("http://{}:{}", p.host, p.port);
if let Ok(proxy) = reqwest::Proxy::http(&proxy_scheme) {
builder = builder.proxy(proxy);
}
}
_ => {}
};
}
let version = unsafe { dirs::APP_VERSION }; let version = unsafe { dirs::APP_VERSION };
let version = format!("clash-verge/{version}"); let version = format!("clash-verge/{version}");
@ -217,7 +228,7 @@ impl PrfItem {
let status_code = resp.status(); let status_code = resp.status();
if !StatusCode::is_success(&status_code) { if !StatusCode::is_success(&status_code) {
bail!("Error requesting remote profile.") bail!("failed to fetch remote profile with status {status_code}")
} }
let header = resp.headers(); let header = resp.headers();