355a18e5eb
* 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
246 lines
6.8 KiB
Rust
246 lines
6.8 KiB
Rust
use super::CmdResult;
|
|
use crate::{
|
|
feat, logging,
|
|
utils::{dirs, logging::Type},
|
|
wrap_err,
|
|
};
|
|
use tauri::{AppHandle, Manager};
|
|
|
|
/// 打开应用程序所在目录
|
|
#[tauri::command]
|
|
pub async fn open_app_dir() -> CmdResult<()> {
|
|
let app_dir = wrap_err!(dirs::app_home_dir())?;
|
|
wrap_err!(open::that(app_dir))
|
|
}
|
|
|
|
/// 打开核心所在目录
|
|
#[tauri::command]
|
|
pub async fn open_core_dir() -> CmdResult<()> {
|
|
let core_dir = wrap_err!(tauri::utils::platform::current_exe())?;
|
|
let core_dir = core_dir.parent().ok_or("failed to get core dir")?;
|
|
wrap_err!(open::that(core_dir))
|
|
}
|
|
|
|
/// 打开日志目录
|
|
#[tauri::command]
|
|
pub async fn open_logs_dir() -> CmdResult<()> {
|
|
let log_dir = wrap_err!(dirs::app_logs_dir())?;
|
|
wrap_err!(open::that(log_dir))
|
|
}
|
|
|
|
/// 打开网页链接
|
|
#[tauri::command]
|
|
pub fn open_web_url(url: String) -> CmdResult<()> {
|
|
wrap_err!(open::that(url))
|
|
}
|
|
|
|
/// 打开/关闭开发者工具
|
|
#[tauri::command]
|
|
pub fn open_devtools(app_handle: AppHandle) {
|
|
if let Some(window) = app_handle.get_webview_window("main") {
|
|
if !window.is_devtools_open() {
|
|
window.open_devtools();
|
|
} else {
|
|
window.close_devtools();
|
|
}
|
|
}
|
|
}
|
|
|
|
/// 退出应用
|
|
#[tauri::command]
|
|
pub async fn exit_app() {
|
|
feat::quit().await;
|
|
}
|
|
|
|
/// 重启应用
|
|
#[tauri::command]
|
|
pub async fn restart_app() -> CmdResult<()> {
|
|
feat::restart_app().await;
|
|
Ok(())
|
|
}
|
|
|
|
/// 获取便携版标识
|
|
#[tauri::command]
|
|
pub fn get_portable_flag() -> CmdResult<bool> {
|
|
Ok(*dirs::PORTABLE_FLAG.get().unwrap_or(&false))
|
|
}
|
|
|
|
/// 获取应用目录
|
|
#[tauri::command]
|
|
pub fn get_app_dir() -> CmdResult<String> {
|
|
let app_home_dir = wrap_err!(dirs::app_home_dir())?
|
|
.to_string_lossy()
|
|
.to_string();
|
|
Ok(app_home_dir)
|
|
}
|
|
|
|
/// 获取当前自启动状态
|
|
#[tauri::command]
|
|
pub fn get_auto_launch_status() -> CmdResult<bool> {
|
|
use crate::core::sysopt::Sysopt;
|
|
wrap_err!(Sysopt::global().get_launch_status())
|
|
}
|
|
|
|
/// 下载图标缓存
|
|
#[tauri::command]
|
|
pub async fn download_icon_cache(url: String, name: String) -> CmdResult<String> {
|
|
let icon_cache_dir = wrap_err!(dirs::app_home_dir())?.join("icons").join("cache");
|
|
let icon_path = icon_cache_dir.join(&name);
|
|
|
|
if icon_path.exists() {
|
|
return Ok(icon_path.to_string_lossy().to_string());
|
|
}
|
|
|
|
if !icon_cache_dir.exists() {
|
|
let _ = std::fs::create_dir_all(&icon_cache_dir);
|
|
}
|
|
|
|
let temp_path = icon_cache_dir.join(format!("{}.downloading", &name));
|
|
|
|
let response = wrap_err!(reqwest::get(&url).await)?;
|
|
|
|
let content_type = response
|
|
.headers()
|
|
.get(reqwest::header::CONTENT_TYPE)
|
|
.and_then(|v| v.to_str().ok())
|
|
.unwrap_or("");
|
|
|
|
let is_image = content_type.starts_with("image/");
|
|
|
|
let content = wrap_err!(response.bytes().await)?;
|
|
|
|
let is_html = content.len() > 15
|
|
&& (content.starts_with(b"<!DOCTYPE html")
|
|
|| content.starts_with(b"<html")
|
|
|| content.starts_with(b"<?xml"));
|
|
|
|
if is_image && !is_html {
|
|
{
|
|
let mut file = match std::fs::File::create(&temp_path) {
|
|
Ok(file) => file,
|
|
Err(_) => {
|
|
if icon_path.exists() {
|
|
return Ok(icon_path.to_string_lossy().to_string());
|
|
}
|
|
return Err("Failed to create temporary file".into());
|
|
}
|
|
};
|
|
|
|
wrap_err!(std::io::copy(&mut content.as_ref(), &mut file))?;
|
|
}
|
|
|
|
if !icon_path.exists() {
|
|
match std::fs::rename(&temp_path, &icon_path) {
|
|
Ok(_) => {}
|
|
Err(_) => {
|
|
let _ = std::fs::remove_file(&temp_path);
|
|
if icon_path.exists() {
|
|
return Ok(icon_path.to_string_lossy().to_string());
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
let _ = std::fs::remove_file(&temp_path);
|
|
}
|
|
|
|
Ok(icon_path.to_string_lossy().to_string())
|
|
} else {
|
|
let _ = std::fs::remove_file(&temp_path);
|
|
Err(format!("下载的内容不是有效图片: {url}"))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, serde::Serialize, serde::Deserialize)]
|
|
pub struct IconInfo {
|
|
name: String,
|
|
previous_t: String,
|
|
current_t: String,
|
|
}
|
|
|
|
/// 复制图标文件
|
|
#[tauri::command]
|
|
pub fn copy_icon_file(path: String, icon_info: IconInfo) -> CmdResult<String> {
|
|
use std::{fs, path::Path};
|
|
|
|
let file_path = Path::new(&path);
|
|
|
|
let icon_dir = wrap_err!(dirs::app_home_dir())?.join("icons");
|
|
if !icon_dir.exists() {
|
|
let _ = fs::create_dir_all(&icon_dir);
|
|
}
|
|
let ext = match file_path.extension() {
|
|
Some(e) => e.to_string_lossy().to_string(),
|
|
None => "ico".to_string(),
|
|
};
|
|
|
|
let dest_path = icon_dir.join(format!(
|
|
"{0}-{1}.{ext}",
|
|
icon_info.name, icon_info.current_t
|
|
));
|
|
if file_path.exists() {
|
|
if icon_info.previous_t.trim() != "" {
|
|
fs::remove_file(
|
|
icon_dir.join(format!("{0}-{1}.png", icon_info.name, icon_info.previous_t)),
|
|
)
|
|
.unwrap_or_default();
|
|
fs::remove_file(
|
|
icon_dir.join(format!("{0}-{1}.ico", icon_info.name, icon_info.previous_t)),
|
|
)
|
|
.unwrap_or_default();
|
|
}
|
|
logging!(
|
|
info,
|
|
Type::Cmd,
|
|
true,
|
|
"Copying icon file path: {:?} -> file dist: {:?}",
|
|
path,
|
|
dest_path
|
|
);
|
|
match fs::copy(file_path, &dest_path) {
|
|
Ok(_) => Ok(dest_path.to_string_lossy().to_string()),
|
|
Err(err) => Err(err.to_string()),
|
|
}
|
|
} else {
|
|
Err("file not found".to_string())
|
|
}
|
|
}
|
|
|
|
/// 通知UI已准备就绪
|
|
#[tauri::command]
|
|
pub fn notify_ui_ready() -> CmdResult<()> {
|
|
log::info!(target: "app", "前端UI已准备就绪");
|
|
crate::utils::resolve::mark_ui_ready();
|
|
Ok(())
|
|
}
|
|
|
|
/// UI加载阶段
|
|
#[tauri::command]
|
|
pub fn update_ui_stage(stage: String) -> CmdResult<()> {
|
|
log::info!(target: "app", "UI加载阶段更新: {stage}");
|
|
|
|
use crate::utils::resolve::UiReadyStage;
|
|
|
|
let stage_enum = match stage.as_str() {
|
|
"NotStarted" => UiReadyStage::NotStarted,
|
|
"Loading" => UiReadyStage::Loading,
|
|
"DomReady" => UiReadyStage::DomReady,
|
|
"ResourcesLoaded" => UiReadyStage::ResourcesLoaded,
|
|
"Ready" => UiReadyStage::Ready,
|
|
_ => {
|
|
log::warn!(target: "app", "未知的UI加载阶段: {stage}");
|
|
return Err(format!("未知的UI加载阶段: {stage}"));
|
|
}
|
|
};
|
|
|
|
crate::utils::resolve::update_ui_ready_stage(stage_enum);
|
|
Ok(())
|
|
}
|
|
|
|
/// 重置UI就绪状态
|
|
#[tauri::command]
|
|
pub fn reset_ui_ready_state() -> CmdResult<()> {
|
|
log::info!(target: "app", "重置UI就绪状态");
|
|
crate::utils::resolve::reset_ui_ready();
|
|
Ok(())
|
|
}
|