diff --git a/Cargo.lock b/Cargo.lock index 7e5489491..89cc608c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1623,19 +1623,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - [[package]] name = "crossbeam-channel" version = "0.5.15" @@ -1664,15 +1651,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.21" @@ -3346,7 +3324,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -3440,7 +3418,7 @@ dependencies = [ "tokio", "tower-service", "tracing", - "windows-registry 0.6.1", + "windows-registry", ] [[package]] @@ -6954,16 +6932,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "socket2" version = "0.6.2" @@ -7499,7 +7467,7 @@ dependencies = [ "thiserror 2.0.18", "tracing", "url", - "windows-registry 0.5.3", + "windows-registry", "windows-result 0.3.4", ] @@ -7611,18 +7579,12 @@ dependencies = [ [[package]] name = "tauri-plugin-mihomo" -version = "0.1.5" -source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo#1cc80bc0fbe1245315617f4cecd93710a152325b" +version = "0.1.6" +source = "git+https://github.com/clash-verge-rev/tauri-plugin-mihomo#3cc25aeccdbfb33d2528f96790abcd1d1ec69ee3" dependencies = [ - "base64 0.22.1", - "bytes", - "crossbeam", "futures-util", "http 1.4.0", - "http-body-util", "httparse", - "hyper 1.8.1", - "libc", "log", "pin-project", "rand 0.9.2", @@ -9480,17 +9442,6 @@ dependencies = [ "windows-strings 0.4.2", ] -[[package]] -name = "windows-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" -dependencies = [ - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", -] - [[package]] name = "windows-result" version = "0.3.4" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index cb9a85c75..43a0e32d9 100755 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -95,7 +95,7 @@ backoff = { version = "0.4.0", features = ["tokio"] } tauri-plugin-http = "2.5.7" console-subscriber = { version = "0.5.0", optional = true } tauri-plugin-devtools = { version = "2.0.1" } -tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo" } +tauri-plugin-mihomo = { git = "https://github.com/clash-verge-rev/tauri-plugin-mihomo"} clash_verge_logger = { git = "https://github.com/clash-verge-rev/clash-verge-logger" } async-trait = "0.1.89" clash_verge_service_ipc = { version = "2.1.3", features = [ diff --git a/src-tauri/src/core/logger.rs b/src-tauri/src/core/logger.rs index 57b9bdb62..b406e1e99 100644 --- a/src-tauri/src/core/logger.rs +++ b/src-tauri/src/core/logger.rs @@ -68,8 +68,7 @@ impl Logger { self.log_max_size.store(log_max_size, Ordering::SeqCst); self.log_max_count.store(log_max_count, Ordering::SeqCst); - #[cfg(not(feature = "tokio-trace"))] - #[cfg(not(feature = "tauri-dev"))] + #[cfg(not(any(feature = "tauri-dev", feature = "tokio-trace")))] { let log_spec = Self::generate_log_spec(log_level); let log_dir = dirs::app_logs_dir()?; @@ -89,9 +88,9 @@ impl Logger { let mut filter_modules = vec!["wry", "tokio_tungstenite", "tungstenite"]; #[cfg(not(feature = "tracing"))] - filter_modules.push("tauri"); + filter_modules.push("tauri::ipc"); #[cfg(feature = "tracing")] - filter_modules.extend(["tauri_plugin_mihomo", "kode_bridge"]); + filter_modules.extend(["kode_bridge"]); let logger = logger.filter(Box::new(clash_verge_logging::NoModuleFilter(filter_modules))); let handle = logger.start()?; diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 26cbc91d5..10a9fad5e 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -23,7 +23,6 @@ use tauri::{AppHandle, Manager as _}; #[cfg(target_os = "macos")] use tauri_plugin_autostart::MacosLauncher; use tauri_plugin_deep_link::DeepLinkExt as _; -use tauri_plugin_mihomo::RejectPolicy; pub static APP_HANDLE: OnceCell = OnceCell::new(); /// Application initialization helper functions @@ -58,15 +57,6 @@ mod app_init { tauri_plugin_mihomo::Builder::new() .protocol(tauri_plugin_mihomo::models::Protocol::LocalSocket) .socket_path(crate::config::IClashTemp::guard_external_controller_ipc()) - .pool_config( - tauri_plugin_mihomo::IpcPoolConfigBuilder::new() - .min_connections(3) - .max_connections(32) - .idle_timeout(std::time::Duration::from_secs(60)) - .health_check_interval(std::time::Duration::from_secs(60)) - .reject_policy(RejectPolicy::Wait) - .build(), - ) .build(), );