mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-01-29 08:45:41 +08:00
* feat: replace all tokio::spawn with unified AsyncHandler::spawn - 🚀 Core Improvements: * Replace all tokio::spawn calls with AsyncHandler::spawn for unified Tauri async task management * Prioritize converting sync functions to async functions to reduce spawn usage * Use .await directly in async contexts instead of spawn - 🔧 Major Changes: * core/hotkey.rs: Use AsyncHandler::spawn for hotkey callback functions * module/lightweight.rs: Async lightweight mode switching * feat/window.rs: Convert window operation functions to async, use .await internally * feat/proxy.rs, feat/clash.rs: Async proxy and mode switching functions * lib.rs: Window focus handling with AsyncHandler::spawn * core/tray/mod.rs: Complete async tray event handling - ✨ Technical Advantages: * Unified task tracking and debugging capabilities (via tokio-trace feature) * Better error handling and task management * Consistency with Tauri runtime * Reduced async boundaries for better performance - 🧪 Verification: * Compilation successful with 0 errors, 0 warnings * Maintains complete original functionality * Optimized async execution flow * feat: complete tokio fs migration and replace tokio::spawn with AsyncHandler 🚀 Major achievements: - Migrate 8 core modules from std::fs to tokio::fs - Create 6 Send-safe wrapper functions using spawn_blocking pattern - Replace all tokio::spawn calls with AsyncHandler::spawn for unified async task management - Solve all 19 Send trait compilation errors through innovative spawn_blocking architecture 🔧 Core changes: - config/profiles.rs: Add profiles_*_safe functions to handle Send trait constraints - cmd/profile.rs: Update all Tauri commands to use Send-safe operations - config/prfitem.rs: Replace append_item calls with profiles_append_item_safe - utils/help.rs: Convert YAML operations to async (read_yaml, save_yaml) - Multiple modules: Replace tokio::task::spawn_blocking with AsyncHandler::spawn_blocking ✅ Technical innovations: - spawn_blocking wrapper pattern resolves parking_lot RwLock Send trait conflicts - Maintain parking_lot performance while achieving Tauri async command compatibility - Preserve backwards compatibility with gradual migration strategy 🎯 Results: - Zero compilation errors - Zero warnings - All async file operations working correctly - Complete Send trait compliance for Tauri commands * feat: refactor app handle and command functions to use async/await for improved performance * feat: update async handling in profiles and logging functions for improved error handling and performance * fix: update TRACE_MINI_SIZE constant to improve task logging threshold * fix(windows): convert service management functions to async for improved performance * fix: convert service management functions to async for improved responsiveness * fix(ubuntu): convert install and reinstall service functions to async for improved performance * fix(linux): convert uninstall_service function to async for improved performance * fix: convert uninstall_service call to async for improved performance * fix: convert file and directory creation calls to async for improved performance * fix: convert hotkey functions to async for improved responsiveness * chore: update UPDATELOG.md for v2.4.1 with major improvements and performance optimizations
97 lines
3.3 KiB
Rust
97 lines
3.3 KiB
Rust
use super::resolve;
|
|
use crate::{
|
|
config::{Config, IVerge, DEFAULT_PAC},
|
|
logging_error,
|
|
process::AsyncHandler,
|
|
utils::logging::Type,
|
|
};
|
|
use anyhow::{bail, Result};
|
|
use port_scanner::local_port_available;
|
|
use warp::Filter;
|
|
|
|
#[derive(serde::Deserialize, Debug)]
|
|
struct QueryParam {
|
|
param: String,
|
|
}
|
|
|
|
/// check whether there is already exists
|
|
pub async fn check_singleton() -> Result<()> {
|
|
let port = IVerge::get_singleton_port();
|
|
if !local_port_available(port) {
|
|
let argvs: Vec<String> = std::env::args().collect();
|
|
if argvs.len() > 1 {
|
|
#[cfg(not(target_os = "macos"))]
|
|
{
|
|
let param = argvs[1].as_str();
|
|
if param.starts_with("clash:") {
|
|
let _ = reqwest::get(format!(
|
|
"http://127.0.0.1:{port}/commands/scheme?param={param}"
|
|
))
|
|
.await;
|
|
}
|
|
}
|
|
} else {
|
|
let _ = reqwest::get(format!("http://127.0.0.1:{port}/commands/visible")).await;
|
|
}
|
|
log::error!("failed to setup singleton listen server");
|
|
bail!("app exists");
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
/// The embed server only be used to implement singleton process
|
|
/// maybe it can be used as pac server later
|
|
pub fn embed_server() {
|
|
let port = IVerge::get_singleton_port();
|
|
|
|
AsyncHandler::spawn(move || async move {
|
|
let visible = warp::path!("commands" / "visible").and_then(|| async {
|
|
resolve::create_window(false).await;
|
|
Ok::<_, warp::Rejection>(warp::reply::with_status(
|
|
"ok".to_string(),
|
|
warp::http::StatusCode::OK,
|
|
))
|
|
});
|
|
|
|
let verge_config = Config::verge().await;
|
|
let clash_config = Config::clash().await;
|
|
|
|
let content = verge_config
|
|
.latest_ref()
|
|
.pac_file_content
|
|
.clone()
|
|
.unwrap_or(DEFAULT_PAC.to_string());
|
|
|
|
let mixed_port = verge_config
|
|
.latest_ref()
|
|
.verge_mixed_port
|
|
.unwrap_or(clash_config.latest_ref().get_mixed_port());
|
|
|
|
// Clone the content and port for the closure to avoid borrowing issues
|
|
let pac_content = content.clone();
|
|
let pac_port = mixed_port;
|
|
let pac = warp::path!("commands" / "pac").map(move || {
|
|
let processed_content = pac_content.replace("%mixed-port%", &format!("{pac_port}"));
|
|
warp::http::Response::builder()
|
|
.header("Content-Type", "application/x-ns-proxy-autoconfig")
|
|
.body(processed_content)
|
|
.unwrap_or_default()
|
|
});
|
|
|
|
// Use map instead of and_then to avoid Send issues
|
|
let scheme = warp::path!("commands" / "scheme")
|
|
.and(warp::query::<QueryParam>())
|
|
.map(|query: QueryParam| {
|
|
// Spawn async work in a fire-and-forget manner
|
|
let param = query.param.clone();
|
|
tokio::task::spawn_local(async move {
|
|
logging_error!(Type::Setup, true, resolve::resolve_scheme(param).await);
|
|
});
|
|
warp::reply::with_status("ok".to_string(), warp::http::StatusCode::OK)
|
|
});
|
|
|
|
let commands = visible.or(scheme).or(pac);
|
|
warp::serve(commands).run(([127, 0, 0, 1], port)).await;
|
|
});
|
|
}
|