mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-01-29 08:45:41 +08:00
* add proxy memu in tray * 添加win下系统托盘 节点 代理->代理组->nodes 同时添加了对应gui同步 * 添加win 系统托盘显示代理节点 且gui和托盘刷新机制 * rust format * 添加 win下系统托盘节点延迟 * Squashed commit of the following: commit44caaa62c5Merge:1916e5393939741aAuthor: Junkai W. <129588175+Be-Forever223@users.noreply.github.com> Date: Sat Aug 30 02:37:07 2025 +0800 Merge branch 'dev' into dev commit3939741a06Author: Tunglies <tunglies.dev@outlook.com> Date: Sat Aug 30 02:24:47 2025 +0800 refactor: migrate from serde_yaml to serde_yaml_ng for improved YAML handling (#4568) * refactor: migrate from serde_yaml to serde_yaml_ng for improved YAML handling * refactor: format code for better readability in DNS configuration commitf86a1816e0Author: Tunglies <tunglies.dev@outlook.com> Date: Sat Aug 30 02:15:34 2025 +0800 chore(deps): update sysinfo to 0.37.0 and zip to 4.5.0 in Cargo.toml (#4564) * chore(deps): update sysinfo to 0.37.0 and zip to 4.5.0 in Cargo.toml * chore(deps): remove libnghttp2-sys dependency and update isahc features in Cargo.toml * chore(deps): remove sysinfo and zip from ignoreDeps in renovate.json commit9cbd8b4529Author: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Sat Aug 30 01:30:48 2025 +0800 feat: add x86 OpenSSL installation step for macOS in workflows commit5dea73fc2aAuthor: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Aug 30 01:21:53 2025 +0800 chore(deps): update npm dependencies (#4542) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit01af1bea23Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Sat Aug 30 01:21:46 2025 +0800 chore(deps): update rust crate reqwest_dav to 0.2.2 (#4554) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> commit1227e86134Author: Tunglies <77394545+Tunglies@users.noreply.github.com> Date: Sat Aug 30 01:12:03 2025 +0800 Remove unnecessary "rustls-tls" feature from reqwest dependency in Cargo.toml commitc6a6ea48ddAuthor: Tunglies <tunglies.dev@outlook.com> Date: Fri Aug 29 23:51:09 2025 +0800 refactor: enhance async initialization and streamline setup process (#4560) * feat: Implement DNS management for macOS - Added `set_public_dns` and `restore_public_dns` functions in `dns.rs` to manage system DNS settings. - Introduced `resolve` module to encapsulate DNS and scheme resolution functionalities. - Implemented `resolve_scheme` function in `scheme.rs` to handle deep links and profile imports. - Created UI readiness management in `ui.rs` to track and update UI loading states. - Developed window management logic in `window.rs` to handle window creation and visibility. - Added initial loading overlay script in `window_script.rs` for better user experience during startup. - Updated server handling in `server.rs` to integrate new resolve functionalities. - Refactored window creation calls in `window_manager.rs` to use the new window management logic. * refactor: streamline asynchronous handling in config and resolve setup * Revert "refactor: streamline asynchronous handling in config and resolve setup" This reverts commit23d7dc86d5. * fix: optimize asynchronous memory handling * fix: enhance task logging by adding size check for special cases * refactor: enhance async initialization and streamline setup process * refactor: optimize async setup by consolidating initialization tasks * chore: update changelog for Mihomo(Meta) kernel upgrade to v1.19.13 * fix: improve startup phase initialization performance * refactor: optimize file read/write performance to reduce application wait time * refactor: simplify app instance exit logic and adjust system proxy guard initialization * refactor: change resolve_setup_async to synchronous execution for improved performance * refactor: update resolve_setup_async to accept AppHandle for improved initialization flow * refactor: remove unnecessary initialization of portable flag in run function * refactor: consolidate async initialization tasks into a single blocking call for improved execution flow * refactor: optimize resolve_setup_async by restructuring async tasks for improved concurrency * refactor: streamline resolve_setup_async and embed_server for improved async handling * refactor: separate synchronous and asynchronous setup functions for improved clarity * refactor: simplify async notification handling and remove redundant network manager initialization * refactor: enhance async handling in proxy request cache and window creation logic * refactor: improve code formatting and readability in ProxyRequestCache * refactor: adjust singleton check timeout and optimize trace size conditions * refactor: update TRACE_SPECIAL_SIZE to include additional size condition * refactor: update kode-bridge dependency to version 0.2.1-rc2 * refactor: replace RwLock with AtomicBool for UI readiness and implement event-driven monitoring * refactor: convert async functions to synchronous for window management * Update src-tauri/src/utils/resolve/window.rs * fix: handle missing app_handle in create_window function * Update src-tauri/src/module/lightweight.rs * format
122 lines
3.8 KiB
Rust
122 lines
3.8 KiB
Rust
use tauri::Emitter;
|
|
|
|
use super::CmdResult;
|
|
use crate::{
|
|
core::{handle::Handle, tray::Tray},
|
|
ipc::IpcManager,
|
|
logging,
|
|
state::proxy::ProxyRequestCache,
|
|
utils::logging::Type,
|
|
};
|
|
use std::time::Duration;
|
|
|
|
const PROXIES_REFRESH_INTERVAL: Duration = Duration::from_secs(60);
|
|
const PROVIDERS_REFRESH_INTERVAL: Duration = Duration::from_secs(60);
|
|
|
|
#[tauri::command]
|
|
pub async fn get_proxies() -> CmdResult<serde_json::Value> {
|
|
let manager = IpcManager::global();
|
|
let cache = ProxyRequestCache::global();
|
|
let key = ProxyRequestCache::make_key("proxies", "default");
|
|
let value = cache
|
|
.get_or_fetch(key, PROXIES_REFRESH_INTERVAL, || async {
|
|
manager.get_proxies().await.unwrap_or_else(|e| {
|
|
logging!(error, Type::Cmd, "Failed to fetch proxies: {e}");
|
|
serde_json::Value::Object(serde_json::Map::new())
|
|
})
|
|
})
|
|
.await;
|
|
Ok((*value).clone())
|
|
}
|
|
|
|
/// 强制刷新代理缓存用于profile切换
|
|
#[tauri::command]
|
|
pub async fn force_refresh_proxies() -> CmdResult<serde_json::Value> {
|
|
let cache = ProxyRequestCache::global();
|
|
let key = ProxyRequestCache::make_key("proxies", "default");
|
|
cache.map.remove(&key);
|
|
get_proxies().await
|
|
}
|
|
|
|
#[tauri::command]
|
|
pub async fn get_providers_proxies() -> CmdResult<serde_json::Value> {
|
|
let manager = IpcManager::global();
|
|
let cache = ProxyRequestCache::global();
|
|
let key = ProxyRequestCache::make_key("providers", "default");
|
|
let value = cache
|
|
.get_or_fetch(key, PROVIDERS_REFRESH_INTERVAL, || async {
|
|
manager.get_providers_proxies().await.unwrap_or_else(|e| {
|
|
logging!(error, Type::Cmd, "Failed to fetch provider proxies: {e}");
|
|
serde_json::Value::Object(serde_json::Map::new())
|
|
})
|
|
})
|
|
.await;
|
|
Ok((*value).clone())
|
|
}
|
|
|
|
/// 同步托盘和GUI的代理选择状态
|
|
#[tauri::command]
|
|
pub async fn sync_tray_proxy_selection() -> CmdResult<()> {
|
|
use crate::core::tray::Tray;
|
|
|
|
match Tray::global().update_menu().await {
|
|
Ok(_) => {
|
|
logging!(info, Type::Cmd, "Tray proxy selection synced successfully");
|
|
Ok(())
|
|
}
|
|
Err(e) => {
|
|
logging!(error, Type::Cmd, "Failed to sync tray proxy selection: {e}");
|
|
Err(e.to_string())
|
|
}
|
|
}
|
|
}
|
|
|
|
/// 更新代理选择并同步托盘和GUI状态
|
|
#[tauri::command]
|
|
pub async fn update_proxy_and_sync(group: String, proxy: String) -> CmdResult<()> {
|
|
match IpcManager::global().update_proxy(&group, &proxy).await {
|
|
Ok(_) => {
|
|
logging!(
|
|
info,
|
|
Type::Cmd,
|
|
"Proxy updated successfully: {} -> {}",
|
|
group,
|
|
proxy
|
|
);
|
|
|
|
let cache = crate::state::proxy::ProxyRequestCache::global();
|
|
let key = crate::state::proxy::ProxyRequestCache::make_key("proxies", "default");
|
|
cache.map.remove(&key);
|
|
|
|
if let Err(e) = Tray::global().update_menu().await {
|
|
logging!(error, Type::Cmd, "Failed to sync tray menu: {}", e);
|
|
}
|
|
|
|
if let Some(app_handle) = Handle::global().app_handle() {
|
|
let _ = app_handle.emit("verge://force-refresh-proxies", ());
|
|
let _ = app_handle.emit("verge://refresh-proxy-config", ());
|
|
}
|
|
|
|
logging!(
|
|
info,
|
|
Type::Cmd,
|
|
"Proxy and sync completed successfully: {} -> {}",
|
|
group,
|
|
proxy
|
|
);
|
|
Ok(())
|
|
}
|
|
Err(e) => {
|
|
logging!(
|
|
error,
|
|
Type::Cmd,
|
|
"Failed to update proxy: {} -> {}, error: {}",
|
|
group,
|
|
proxy,
|
|
e
|
|
);
|
|
Err(e.to_string())
|
|
}
|
|
}
|
|
}
|