shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-04 23:43:44 +08:00
Code Packages Projects Releases Activity

chore: update

Browse Source
This commit is contained in:
huzibaca 2024-10-04 05:37:53 +08:00
parent 0ca90ed082
commit 591c1cb454
1 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src-tauri/src/core/sysopt.rs
View File

@ -342,22 +342,65 @@ impl Sysopt {
.unwrap_or(Config::clash().data().get_mixed_port()) .unwrap_or(Config::clash().data().get_mixed_port())
}; };
let pac_port = IVerge::get_singleton_port(); let pac_port = IVerge::get_singleton_port();
if pac { #[cfg(not(target_os = "windows"))]
let autoproxy = Autoproxy { {
enable: true, if pac {
url: format!("http://127.0.0.1:{pac_port}/commands/pac"), let autoproxy = Autoproxy {
}; enable: true,
log_err!(autoproxy.set_auto_proxy()); url: format!("http://127.0.0.1:{pac_port}/commands/pac"),
} else { };
let sysproxy = Sysproxy { log_err!(autoproxy.set_auto_proxy());
enable: true, } else {
host: "127.0.0.1".into(), let sysproxy = Sysproxy {
port, enable: true,
bypass: get_bypass(), host: "127.0.0.1".into(),
}; port,
bypass: get_bypass(),
};
log_err!(sysproxy.set_system_proxy()); log_err!(sysproxy.set_system_proxy());
}
} }
// #[cfg(target_os = "windows")]
{
use crate::core::handle::Handle;
use crate::utils::dirs;
use tauri_plugin_shell::ShellExt;
let app_handle = Handle::global().app_handle().unwrap();
let binary_path = dirs::service_path().unwrap();
let sysproxy_exe = binary_path.with_file_name("sysproxy.exe");
if !sysproxy_exe.exists() {
break;
}
let shell = app_handle.shell();
let output = if pac {
let address = format!("http://{}:{}/pac", "127.0.0.1", pac_port);
let output = shell
.command(sysproxy_exe.as_path().to_str().unwrap())
.args(["opac", address.as_str()])
.output()
.await
.unwrap();
output
} else {
let address = format!("{}:{}", "127.0.0.1", port);
let bypass = get_bypass();
let output = shell
.command(sysproxy_exe.as_path().to_str().unwrap())
.args(["global", address.as_str(), bypass.as_ref()])
.output()
.await
.unwrap();
output
};
if !output.status.success() {
break;
}
};
} }
}); });
} }