mirror/clash-verge-rev-lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

fixed an issue with opening a window via a shortcut when the application is already running

Browse Source
This commit is contained in:
coolcoala
2025-11-12 23:28:15 +03:00
parent c8f61d6359
commit aba9715453
1 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src-tauri/src/lib.rs
View File

@@ -7,7 +7,11 @@ mod module;
mod process; mod process;
mod state; mod state;
mod utils; mod utils;
use crate::{core::hotkey, process::AsyncHandler, utils::resolve}; use crate::{
core::{event_driven_proxy::EventDrivenProxyManager, hotkey},
process::AsyncHandler,
utils::resolve,
};
use config::Config; use config::Config;
use std::sync::{Mutex, Once}; use std::sync::{Mutex, Once};
use tauri::AppHandle; use tauri::AppHandle;
@@ -98,15 +102,35 @@ pub fn run() {
#[allow(unused_mut)] #[allow(unused_mut)]
let mut builder = tauri::Builder::default() let mut builder = tauri::Builder::default()
.plugin(tauri_plugin_single_instance::init(|_app, argv, _cwd| { .plugin(tauri_plugin_single_instance::init(|_app, argv, _cwd| {
// Handle deep link when a second instance is invoked: forward URL to the running instance // When a second instance is invoked, always show the window
if let Some(url) = argv AsyncHandler::spawn(move || async move {
.iter() // Exit lightweight mode if active
.find(|a| a.starts_with("clash://") || a.starts_with("koala-clash://")) if crate::module::lightweight::is_in_lightweight_mode() {
.cloned() logging!(info, Type::System, true, "Second instance detected: exiting lightweight mode");
{ crate::module::lightweight::exit_lightweight_mode();
// Robust scheduling avoids races with lightweight/window // Wait for lightweight mode to fully exit
resolve::schedule_handle_deep_link(url); for _ in 0..50 {
} if !crate::module::lightweight::is_in_lightweight_mode() {
break;
}
tokio::time::sleep(tokio::time::Duration::from_millis(20)).await;
}
}
// Show the main window
logging!(info, Type::System, true, "Second instance detected: showing main window");
let _ = crate::utils::window_manager::WindowManager::show_main_window();
// Handle deep link if present
if let Some(url) = argv
.iter()
.find(|a| a.starts_with("clash://") || a.starts_with("koala-clash://"))
.cloned()
{
logging!(info, Type::System, true, "Second instance with deep link: {}", url);
resolve::schedule_handle_deep_link(url);
}
});
})) }))
.plugin(tauri_plugin_notification::init()) .plugin(tauri_plugin_notification::init())
.plugin(tauri_plugin_updater::Builder::new().build()) .plugin(tauri_plugin_updater::Builder::new().build())
@@ -400,11 +424,20 @@ pub fn run() {
} }
} }
tauri::RunEvent::Exit => { tauri::RunEvent::Exit => {
// avoid duplicate cleanup let handle = core::handle::Handle::global();
if core::handle::Handle::global().is_exiting() {
return; if handle.is_exiting() {
logging!(
debug,
Type::System,
"Exit event triggered, but exit flow already executed, skip duplicate cleanup"
);
} else {
logging!(debug, Type::System, "Exit event triggered, executing cleanup flow");
handle.set_is_exiting();
EventDrivenProxyManager::global().notify_app_stopping();
feat::clean();
} }
feat::clean();
} }
tauri::RunEvent::WindowEvent { label, event, .. } => { tauri::RunEvent::WindowEvent { label, event, .. } => {
if label == "main" { if label == "main" {