代理模块修改

This commit is contained in:
zhongluofeng
2026-07-16 18:26:57 +08:00
parent fb361aff9a
commit 15f29c5895
67 changed files with 2546 additions and 118 deletions
+24 -6
View File
@@ -8,11 +8,11 @@ use logger::{
clear_logs, get_log_info, get_logs, log_message, LogManager,
};
use mihomo_manager::{
proxy_activate_profile, proxy_clear_system_proxy, proxy_close_connection, proxy_delete_profile,
proxy_activate_profile, proxy_check_kernel_update, proxy_clear_system_proxy, proxy_close_connection, proxy_delete_profile,
proxy_get_connections, proxy_get_proxies, proxy_get_settings, proxy_get_system_proxy,
proxy_import_profile, proxy_kernel_info, proxy_patch_configs, proxy_restart, proxy_save_settings,
proxy_select_proxy, proxy_set_system_proxy, proxy_start, proxy_status, proxy_stop,
proxy_test_delay, proxy_update_profile, proxy_version, MihomoManager,
proxy_test_delay, proxy_update_kernel, proxy_update_profile, proxy_version, MihomoManager,
};
use process_manager::{
get_all_process_status, get_process_status, start_monitoring_thread, start_process,
@@ -25,8 +25,13 @@ fn greet(name: &str) -> String {
}
#[tauri::command]
fn quit_app(state: tauri::State<'_, ProcessManager>) {
// 退出前停止所有子进程
fn quit_app(
state: tauri::State<'_, ProcessManager>,
mihomo: tauri::State<'_, MihomoManager>,
) {
// 退出前清理系统代理,避免遗留导致网络问题
mihomo.cleanup_on_exit();
// 停止所有子进程
state.stop_all();
std::process::exit(0);
}
@@ -52,6 +57,8 @@ pub fn run() {
proxy_get_settings,
proxy_save_settings,
proxy_kernel_info,
proxy_check_kernel_update,
proxy_update_kernel,
proxy_status,
proxy_start,
proxy_stop,
@@ -85,7 +92,8 @@ pub fn run() {
.path()
.app_data_dir()
.unwrap_or_else(|_| std::path::PathBuf::from("."));
app.manage(MihomoManager::new(app_data_dir));
let mihomo = MihomoManager::new(app_data_dir);
app.manage(mihomo);
let open = tauri::menu::MenuItem::with_id(app, "open", "设置", true, None::<&str>)?;
let quit = tauri::menu::MenuItem::with_id(app, "quit", "退出", true, None::<&str>)?;
@@ -103,7 +111,10 @@ pub fn run() {
}
}
"quit" => {
// 退出前停止所有子进程
// 退出前清理系统代理 + 停止所有子进程
if let Some(mihomo) = app.try_state::<MihomoManager>() {
mihomo.cleanup_on_exit();
}
if let Some(pm) = app.try_state::<ProcessManager>() {
pm.stop_all();
}
@@ -129,6 +140,13 @@ pub fn run() {
// 启动进程监控线程
start_monitoring_thread(app.handle().clone());
// 应用启动时自动启动 mihomo(如果用户在设置中开启了自动启动)
if let Some(mihomo) = app.try_state::<MihomoManager>() {
if let Some(pm) = app.try_state::<ProcessManager>() {
mihomo.auto_start_on_launch(app.handle(), &pm);
}
}
Ok(())
})
.on_window_event(|window, event| {