25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(updater): clean runtimes before forced Windows exit
t8y2c1c18fd5d48a
diff --git a/src-tauri/src/commands/update.rs b/src-tauri/src/commands/update.rsindex 46940d5284..f4441e437d 100644--- a/src-tauri/src/commands/update.rs+++ b/src-tauri/src/commands/update.rs@@ -14,7 +14,7 @@ pub use dbx_core::update::UpdateInfo;use semver::Version;use serde::{Deserialize, Serialize};use tauri::{AppHandle, Emitter, Manager};-use tauri_plugin_updater::{Update, UpdaterExt};+use tauri_plugin_updater::{Update, UpdaterBuilder, UpdaterExt};const OFFICIAL_UPDATE_ENDPOINTS: [&str; 2] = ["https://dl.dbxio.com/releases/latest/latest.json",@@ -30,6 +30,11 @@ const MAX_PORTABLE_ARCHIVE_BYTES: usize = 512 * 1024 * 1024;const MAX_PORTABLE_SIGNATURE_BYTES: usize = 64 * 1024;const IS_WINDOWS_7_TARGET: bool = cfg!(target_vendor = "win7");+fn dbx_updater_builder(app: &AppHandle) -> UpdaterBuilder {+ let cleanup_app = app.clone();+ app.updater_builder().on_before_exit(move || crate::cleanup_before_updater_forced_exit(&cleanup_app))+}+#[derive(Debug, Deserialize)]#[serde(rename_all = "lowercase")]pub enum UpdateDownloadSource {@@ -390,7 +395,7 @@ fn package_kind(app: &AppHandle) -> Result<String, String> {if crate::data_dir::is_portable_mode() {return Ok("portable".into());}- Ok(app.updater_builder().build().map_err(|e| e.to_string())?.package_kind().into())+ Ok(dbx_updater_builder(app).build().map_err(|e| e.to_string())?.package_kind().into())}fn validate_cache_target(record: &CacheRecord, portable_mode: bool, package_kind: &str) -> Result<(), String> {@@ -424,8 +429,7 @@ fn restore_cached(app: &AppHandle) -> Result<Option<CachedUpdate>, String> {)?;ReadyUpdate::Portable { archive: bytes, version }} else {- let update = app- .updater_builder()+ let update = dbx_updater_builder(app).build().map_err(|e| e.to_string())?.restore_update(record.manifest.clone().ok_or("Missing cached release metadata")?)@@ -565,8 +569,9 @@ async fn download_update_inner(for endpoint_url in endpoint_urls {endpoints.push(endpoint_url.parse().map_err(|e| format!("Invalid update endpoint: {e}"))?);}- let mut builder =- app.updater_builder().endpoints(endpoints).map_err(|e| format!("Failed to configure updater endpoint: {e}"))?;+ let mut builder = dbx_updater_builder(app)+ .endpoints(endpoints)+ .map_err(|e| format!("Failed to configure updater endpoint: {e}"))?;if let Some(proxy_url) = dbx_core::update::system_proxy_url() {let proxy = proxy_url.parse().map_err(|e| format!("Invalid system proxy URL: {e}"))?;diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rsindex 8c58408e01..fd30c0ce32 100644--- a/src-tauri/src/lib.rs+++ b/src-tauri/src/lib.rs@@ -1086,6 +1086,37 @@ pub(crate) fn apply_desktop_settings(app: &tauri::AppHandle, desktop_settings: &Ok(())}+async fn shutdown_runtime_resources(app_handle: &tauri::AppHandle) {+ if let Some(backups) = app_handle.try_state::<background_backup::BackgroundBackup>() {+ backups.shutdown().await;+ }+ if let Some(server) = app_handle.try_state::<commands::redis_pubsub_server::PubSubServerState>() {+ server.shutdown(Duration::from_secs(1)).await;+ }+ if let Some(state) = app_handle.try_state::<Arc<AppState>>() {+ state.shutdown(Duration::from_secs(3)).await;+ }+}++fn run_shutdown_on_dedicated_thread(shutdown: impl FnOnce() + Send + 'static) -> Result<(), String> {+ std::thread::Builder::new()+ .name("dbx-runtime-shutdown".into())+ .spawn(shutdown)+ .map_err(|error| format!("failed to start runtime shutdown: {error}"))?+ .join()+ .map_err(|_| "runtime shutdown thread panicked".to_string())+}++pub(crate) fn cleanup_before_updater_forced_exit(app_handle: &tauri::AppHandle) {+ let shutdown_app = app_handle.clone();+ if let Err(error) = run_shutdown_on_dedicated_thread(move || {+ tauri::async_runtime::block_on(shutdown_runtime_resources(&shutdown_app));+ }) {+ log::warn!("Failed to shut down DBX runtime resources before updater exit: {error}");+ }+ app_handle.cleanup_before_exit();+}+#[cfg(test)]#[allow(clippy::items_after_test_module)]mod tests {@@ -1094,15 +1125,32 @@ mod tests {linux_appimage_requires_dmabuf_workaround, linux_drm_driver_is_software_only,linux_drm_render_devices_from_paths, linux_nvidia_driver_from_state, linux_pci_id_from_sysfs_value,linux_selected_drm_render_device, linux_uses_native_wayland, linux_webkit_environment_override,- linux_webkit_rendering_workarounds, native_window_decorations_override, should_confirm_app_exit_request,- should_enable_linux_floating_frame, should_enable_single_instance, should_fallback_to_native_quit,- should_hide_window_before_exit, should_hide_window_on_close, should_setup_desktop_tray,- should_show_main_window_after_setup, should_show_main_window_before_setup_tasks, startup_data_dir_mode,- tray_menu_labels_for_locale, uses_application_level_icon, LinuxDrmRenderDevice, LinuxNvidiaDriver,+ linux_webkit_rendering_workarounds, native_window_decorations_override, run_shutdown_on_dedicated_thread,+ should_confirm_app_exit_request, should_enable_linux_floating_frame, should_enable_single_instance,+ should_fallback_to_native_quit, should_hide_window_before_exit, should_hide_window_on_close,+ should_setup_desktop_tray, should_show_main_window_after_setup, should_show_main_window_before_setup_tasks,+ startup_data_dir_mode, tray_menu_labels_for_locale, uses_application_level_icon, LinuxDrmRenderDevice,+ LinuxNvidiaDriver,};use crate::data_dir::DataDirMode;use std::ffi::OsStr;use std::path::{Path, PathBuf};+ use std::sync::{Arc, Mutex};++ #[test]+ fn forced_exit_shutdown_waits_for_a_dedicated_cleanup_thread() {+ let caller = std::thread::current().id();+ let cleanup_thread = Arc::new(Mutex::new(None));+ let observed_thread = cleanup_thread.clone();++ run_shutdown_on_dedicated_thread(move || {+ *observed_thread.lock().unwrap() = Some(std::thread::current().id());+ })+ .unwrap();++ let cleanup_thread = cleanup_thread.lock().unwrap().expect("cleanup thread id");+ assert_ne!(cleanup_thread, caller);+ }#[test]fn linux_floating_frame_is_disabled_by_default() {@@ -2828,18 +2876,7 @@ pub fn run() {let _ = window.hide();}}- tauri::async_runtime::block_on(async {- if let Some(backups) = app_handle.try_state::<background_backup::BackgroundBackup>() {- backups.shutdown().await;- }- if let Some(server) = app_handle.try_state::<commands::redis_pubsub_server::PubSubServerState>()- {- server.shutdown(Duration::from_secs(1)).await;- }- if let Some(state) = app_handle.try_state::<Arc<AppState>>() {- state.shutdown(Duration::from_secs(3)).await;- }- });+ tauri::async_runtime::block_on(shutdown_runtime_resources(app_handle));}}