root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 17:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(async-proxy): remove unnecessary Result wrappers from Windows registry helpers

Browse Source
This commit is contained in:
Slinetrac
2025-11-15 16:37:53 +08:00
parent 55ac25b1a6
commit 0b641992e7
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src-tauri/src/core/async_proxy_query.rs
View File

@@ -90,14 +90,12 @@ impl AsyncProxyQuery {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
async fn get_auto_proxy_impl() -> Result<AsyncAutoproxy> { async fn get_auto_proxy_impl() -> Result<AsyncAutoproxy> {
// Windows: 从注册表读取PAC配置 // Windows: 从注册表读取PAC配置
AsyncHandler::spawn_blocking(move || -> Result<AsyncAutoproxy> { let proxy = AsyncHandler::spawn_blocking(Self::get_pac_config_from_registry).await?;
Self::get_pac_config_from_registry() Ok(proxy)
})
.await?
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
fn get_pac_config_from_registry() -> Result<AsyncAutoproxy> { fn get_pac_config_from_registry() -> AsyncAutoproxy {
use std::ptr; use std::ptr;
use winapi::shared::minwindef::{DWORD, HKEY}; use winapi::shared::minwindef::{DWORD, HKEY};
use winapi::um::winnt::{KEY_READ, REG_DWORD, REG_SZ}; use winapi::um::winnt::{KEY_READ, REG_DWORD, REG_SZ};
@@ -114,7 +112,7 @@ impl AsyncProxyQuery {
if result != 0 { if result != 0 {
logging!(debug, Type::Network, "无法打开注册表项"); logging!(debug, Type::Network, "无法打开注册表项");
return Ok(AsyncAutoproxy::default()); return AsyncAutoproxy::default();
} }
// 1. 检查自动配置是否启用 (AutoConfigURL 存在且不为空即表示启用) // 1. 检查自动配置是否启用 (AutoConfigURL 存在且不为空即表示启用)
@@ -174,13 +172,13 @@ impl AsyncProxyQuery {
pac_url = "auto-detect".into(); pac_url = "auto-detect".into();
} }
Ok(AsyncAutoproxy { AsyncAutoproxy {
enable: true, enable: true,
url: pac_url, url: pac_url,
}) }
} else { } else {
logging!(debug, Type::Network, "PAC配置未启用"); logging!(debug, Type::Network, "PAC配置未启用");
Ok(AsyncAutoproxy::default()) AsyncAutoproxy::default()
} }
} }
} }
@@ -286,14 +284,12 @@ impl AsyncProxyQuery {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
async fn get_system_proxy_impl() -> Result<AsyncSysproxy> { async fn get_system_proxy_impl() -> Result<AsyncSysproxy> {
// Windows: 使用注册表直接读取代理设置 // Windows: 使用注册表直接读取代理设置
AsyncHandler::spawn_blocking(move || -> Result<AsyncSysproxy> { let sys = AsyncHandler::spawn_blocking(Self::get_system_proxy_from_registry).await?;
Self::get_system_proxy_from_registry() Ok(sys)
})
.await?
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
fn get_system_proxy_from_registry() -> Result<AsyncSysproxy> { fn get_system_proxy_from_registry() -> AsyncSysproxy {
use std::ptr; use std::ptr;
use winapi::shared::minwindef::{DWORD, HKEY}; use winapi::shared::minwindef::{DWORD, HKEY};
use winapi::um::winnt::{KEY_READ, REG_DWORD, REG_SZ}; use winapi::um::winnt::{KEY_READ, REG_DWORD, REG_SZ};
@@ -309,7 +305,7 @@ impl AsyncProxyQuery {
RegOpenKeyExW(HKEY_CURRENT_USER, key_path.as_ptr(), 0, KEY_READ, &mut hkey); RegOpenKeyExW(HKEY_CURRENT_USER, key_path.as_ptr(), 0, KEY_READ, &mut hkey);
if result != 0 { if result != 0 {
return Ok(AsyncSysproxy::default()); return AsyncSysproxy::default();
} }
// 检查代理是否启用 // 检查代理是否启用
@@ -329,7 +325,7 @@ impl AsyncProxyQuery {
if enable_result != 0 || value_type != REG_DWORD || proxy_enable == 0 { if enable_result != 0 || value_type != REG_DWORD || proxy_enable == 0 {
RegCloseKey(hkey); RegCloseKey(hkey);
return Ok(AsyncSysproxy::default()); return AsyncSysproxy::default();
} }
// 读取代理服务器设置 // 读取代理服务器设置
@@ -398,14 +394,14 @@ impl AsyncProxyQuery {
"从注册表读取到代理设置: {host}:{port}, bypass: {bypass_list}" "从注册表读取到代理设置: {host}:{port}, bypass: {bypass_list}"
); );
Ok(AsyncSysproxy { AsyncSysproxy {
enable: true, enable: true,
host, host,
port, port,
bypass: bypass_list, bypass: bypass_list,
}) }
} else { } else {
Ok(AsyncSysproxy::default()) AsyncSysproxy::default()
} }
} }
} }