Kill plugin manager before NSIS update on Windows

src-tauri/Cargo.toml

@@ -44,7 +44,7 @@ reqwest_cookie_store = "0.8.0"
 serde = { version = "1.0.198", features = ["derive"] }
 serde_json = { version = "1.0.116", features = ["raw_value"] }
 serde_yaml = "0.9.34"
-tauri = { workspace = true, features = ["unstable"] }
+tauri = { workspace = true }
 tauri-plugin-shell = { workspace = true }
 tauri-plugin-clipboard-manager = "2.1.0-beta.7"
 tauri-plugin-dialog = "2.0.0-rc.0"

src-tauri/src/lib.rs

@@ -2062,20 +2062,28 @@ async fn handle_plugin_event<R: Runtime>(app_handle: &AppHandle<R>, event: &Inte
     if let Some(e) = response_event {
         let plugin_manager: State<'_, PluginManager> = app_handle.state();
         if let Err(e) = plugin_manager.reply(&event, &e).await {
-            warn!("Failed to reply to plugin manager: {}", e)
+            warn!("Failed to reply to plugin manager: {:?}", e)
         }
     }
 }
 
 // app_handle.get_focused_window locks, so this one is a non-locking version, safe for use in async context
 fn get_focused_window_no_lock<R: Runtime>(app_handle: &AppHandle<R>) -> Option<WebviewWindow<R>> {
+    // TODO: Getting the focused window doesn't seem to work on Windows, so
+    //   we'll need to pass the window label into plugin events instead.
+    if app_handle.webview_windows().len() == 1 {
+        debug!("Returning only webview window");
+        let w = app_handle
+            .webview_windows()
+            .iter()
+            .next()
+            .map(|w| w.1.clone());
+        return w;
+    }
+
     app_handle
-        .windows()
-        .iter()
-        .find(|w| w.1.is_focused().unwrap_or(false))
-        .map(|w| w.1.clone())?
         .webview_windows()
         .iter()
-        .next()
-        .map(|(_, w)| w.to_owned())
+        .find(|w| w.1.is_focused().unwrap_or(false))
+        .map(|w| w.1.clone())
 }

src-tauri/src/updates.rs

@@ -2,9 +2,11 @@ use std::fmt::{Display, Formatter};
 use std::time::SystemTime;
 
 use log::info;
-use tauri::AppHandle;
+use tauri::{AppHandle, Manager};
 use tauri_plugin_dialog::DialogExt;
 use tauri_plugin_updater::UpdaterExt;
+use tokio::task::block_in_place;
+use yaak_plugin_runtime::manager::PluginManager;
 
 use crate::is_dev;
 
@@ -49,6 +51,7 @@ impl YaakUpdater {
             last_update_check: SystemTime::UNIX_EPOCH,
         }
     }
+
     pub async fn force_check(
         &mut self,
         app_handle: &AppHandle,
@@ -58,8 +61,22 @@ impl YaakUpdater {
 
         info!("Checking for updates mode={}", mode);
 
+        let h = app_handle.clone();
         let update_check_result = app_handle
             .updater_builder()
+            .on_before_exit(move || {
+                // Kill plugin manager before exit or NSIS installer will fail to replace sidecar
+                // while it's running.
+                // NOTE: This is only called on Windows
+                let h = h.clone();
+                block_in_place(|| {
+                    tauri::async_runtime::block_on(async move {
+                        info!("Shutting down plugin manager before update");
+                        let plugin_manager = h.state::<PluginManager>();
+                        plugin_manager.cleanup().await;
+                    });
+                });
+            })
             .header("X-Update-Mode", mode.to_string())?
             .build()?
             .check()

src-web/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />