refactor: update AppHandle usage to use Arc<AppHandle> for improved memory management (#4491)

* refactor: update AppHandle usage to use Arc<AppHandle> for improved memory management

* fix: clippy ci

* fix: ensure default_latency_test is safely accessed with non-null assertion
This commit is contained in:
Tunglies
2025-08-23 00:20:58 +08:00
committed by GitHub
parent c416bd5755
commit 0d070fb934
13 changed files with 140 additions and 96 deletions

View File

@@ -255,7 +255,7 @@ impl NotificationSystem {
#[derive(Debug, Clone)]
pub struct Handle {
pub app_handle: Arc<RwLock<Option<AppHandle>>>,
pub app_handle: Arc<RwLock<Option<Arc<AppHandle>>>>,
pub is_exiting: Arc<RwLock<bool>>,
startup_errors: Arc<RwLock<Vec<ErrorMessage>>>,
startup_completed: Arc<RwLock<bool>>,
@@ -282,10 +282,10 @@ impl Handle {
Self::default()
}
pub fn init(&self, app_handle: &AppHandle) {
pub fn init(&self, app_handle: Arc<AppHandle>) {
{
let mut handle = self.app_handle.write();
*handle = Some(app_handle.clone());
*handle = Some(Arc::clone(&app_handle));
}
let mut system_opt = self.notification_system.write();
@@ -294,8 +294,9 @@ impl Handle {
}
}
pub fn app_handle(&self) -> Option<AppHandle> {
self.app_handle.read().clone()
/// 获取 AppHandle
pub fn app_handle(&self) -> Option<Arc<AppHandle>> {
self.app_handle.read().as_ref().map(Arc::clone)
}
pub fn get_window(&self) -> Option<WebviewWindow> {

View File

@@ -6,7 +6,7 @@ use crate::{
use anyhow::{bail, Result};
use parking_lot::Mutex;
use std::{collections::HashMap, fmt, str::FromStr, sync::Arc};
use tauri::Manager;
use tauri::{AppHandle, Manager};
use tauri_plugin_global_shortcut::{Code, GlobalShortcutExt, ShortcutState};
/// Enum representing all available hotkey functions
@@ -103,7 +103,7 @@ impl Hotkey {
}
/// Execute the function associated with a hotkey function enum
fn execute_function(function: HotkeyFunction, app_handle: &tauri::AppHandle) {
fn execute_function(function: HotkeyFunction, app_handle: Arc<AppHandle>) {
match function {
HotkeyFunction::OpenOrCloseDashboard => {
logging!(
@@ -218,7 +218,7 @@ impl Hotkey {
manager.unregister(hotkey)?;
}
let app_handle_clone = app_handle.clone();
let app_handle_clone = Arc::clone(&app_handle);
let is_quit = matches!(function, HotkeyFunction::Quit);
let _ = manager.on_shortcut(hotkey, move |app_handle, hotkey_event, event| {
@@ -229,7 +229,7 @@ impl Hotkey {
if let Some(window) = app_handle.get_webview_window("main") {
if window.is_focused().unwrap_or(false) {
logging!(debug, Type::Hotkey, "Executing quit function");
Self::execute_function(function, &app_handle_clone);
Self::execute_function(function, Arc::clone(&app_handle_clone));
}
}
} else {
@@ -241,14 +241,14 @@ impl Hotkey {
.unwrap_or(true);
if is_enable_global_hotkey {
Self::execute_function(function, &app_handle_clone);
Self::execute_function(function, Arc::clone(&app_handle_clone));
} else {
use crate::utils::window_manager::WindowManager;
let is_visible = WindowManager::is_main_window_visible();
let is_focused = WindowManager::is_main_window_focused();
if is_focused && is_visible {
Self::execute_function(function, &app_handle_clone);
Self::execute_function(function, Arc::clone(&app_handle_clone));
}
}
}

View File

@@ -15,6 +15,7 @@ use crate::{
use anyhow::Result;
use parking_lot::Mutex;
use std::sync::Arc;
use std::{
fs,
sync::atomic::{AtomicBool, Ordering},
@@ -244,7 +245,7 @@ impl Tray {
// 设置更新状态
self.menu_updating.store(true, Ordering::Release);
let result = self.update_menu_internal(&app_handle);
let result = self.update_menu_internal(app_handle);
{
let mut last_update = self.last_menu_update.lock();
@@ -255,7 +256,7 @@ impl Tray {
result
}
fn update_menu_internal(&self, app_handle: &AppHandle) -> Result<()> {
fn update_menu_internal(&self, app_handle: Arc<AppHandle>) -> Result<()> {
let verge = Config::verge().latest_ref().clone();
let system_proxy = verge.enable_system_proxy.as_ref().unwrap_or(&false);
let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false);
@@ -277,7 +278,7 @@ impl Tray {
match app_handle.tray_by_id("main") {
Some(tray) => {
let _ = tray.set_menu(Some(create_tray_menu(
app_handle,
&app_handle,
Some(mode.as_str()),
*system_proxy,
*tun_mode,
@@ -451,7 +452,7 @@ impl Tray {
#[cfg(target_os = "macos")]
pub fn unsubscribe_traffic(&self) {}
pub fn create_tray_from_handle(&self, app_handle: &AppHandle) -> Result<()> {
pub fn create_tray_from_handle(&self, app_handle: Arc<AppHandle>) -> Result<()> {
log::info!(target: "app", "正在从AppHandle创建系统托盘");
// 获取图标
@@ -477,7 +478,7 @@ impl Tray {
}
}
let tray = builder.build(app_handle)?;
let tray = builder.build(app_handle.as_ref())?;
tray.on_tray_icon_event(|_, event| {
let tray_event = { Config::verge().latest_ref().tray_event.clone() };