fix(core): store the hosting Window directly on Webview and WebviewWindow (#11161)

closes #11159

Author: amrbashir

.changes/crash-closing-window-multiple-times.md

@@ -0,0 +1,5 @@
+---
+"tauri": "patch:bug"
+---
+
+Fix internal crash when trying to close the same window multiple times.

crates/tauri/src/app.rs

@@ -364,7 +364,7 @@ impl<R: Runtime> Clone for AppHandle<R> {
 impl<'de, R: Runtime> CommandArg<'de, R> for AppHandle<R> {
   /// Grabs the [`Window`] from the [`CommandItem`] and returns the associated [`AppHandle`]. This will never fail.
   fn from_command(command: CommandItem<'de, R>) -> std::result::Result<Self, InvokeError> {
-    Ok(command.message.webview().window().app_handle)
+    Ok(command.message.webview().app_handle)
   }
 }
 

crates/tauri/src/lib.rs

@@ -584,8 +584,12 @@ pub trait Manager<R: Runtime>: sealed::ManagerBase<R> {
   /// Fetch a single webview window from the manager.
   fn get_webview_window(&self, label: &str) -> Option<WebviewWindow<R>> {
     self.manager().get_webview(label).and_then(|webview| {
-      if webview.window().is_webview_window() {
-        Some(WebviewWindow { webview })
+      let window = webview.window();
+      if window.is_webview_window() {
+        Some(WebviewWindow {
+          window: window.clone(),
+          webview,
+        })
       } else {
         None
       }
@@ -599,8 +603,15 @@ pub trait Manager<R: Runtime>: sealed::ManagerBase<R> {
       .webviews()
       .into_iter()
       .filter_map(|(label, webview)| {
-        if webview.window().is_webview_window() {
-          Some((label, WebviewWindow { webview }))
+        let window = webview.window();
+        if window.is_webview_window() {
+          Some((
+            label,
+            WebviewWindow {
+              window: window.clone(),
+              webview,
+            },
+          ))
         } else {
           None
         }

crates/tauri/src/webview/mod.rs

@@ -792,19 +792,19 @@ fn main() {
 /// Webview.
 #[default_runtime(crate::Wry, wry)]
 pub struct Webview<R: Runtime> {
-  window_label: Arc<Mutex<String>>,
+  pub(crate) window: Arc<Mutex<Window<R>>>,
+  /// The webview created by the runtime.
+  pub(crate) webview: DetachedWebview<EventLoopMessage, R>,
   /// The manager to associate this webview with.
   pub(crate) manager: Arc<AppManager<R>>,
   pub(crate) app_handle: AppHandle<R>,
-  /// The webview created by the runtime.
-  pub(crate) webview: DetachedWebview<EventLoopMessage, R>,
   pub(crate) resources_table: Arc<Mutex<ResourceTable>>,
 }
 
 impl<R: Runtime> std::fmt::Debug for Webview<R> {
   fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
     f.debug_struct("Window")
-      .field("window_label", &self.window_label)
+      .field("window", &self.window.lock().unwrap())
       .field("webview", &self.webview)
       .finish()
   }
@@ -813,10 +813,10 @@ impl<R: Runtime> std::fmt::Debug for Webview<R> {
 impl<R: Runtime> Clone for Webview<R> {
   fn clone(&self) -> Self {
     Self {
-      window_label: self.window_label.clone(),
+      window: self.window.clone(),
+      webview: self.webview.clone(),
       manager: self.manager.clone(),
       app_handle: self.app_handle.clone(),
-      webview: self.webview.clone(),
       resources_table: self.resources_table.clone(),
     }
   }
@@ -842,9 +842,9 @@ impl<R: Runtime> Webview<R> {
   /// Create a new webview that is attached to the window.
   pub(crate) fn new(window: Window<R>, webview: DetachedWebview<EventLoopMessage, R>) -> Self {
     Self {
-      window_label: Arc::new(Mutex::new(window.label().into())),
       manager: window.manager.clone(),
       app_handle: window.app_handle.clone(),
+      window: Arc::new(Mutex::new(window)),
       webview,
       resources_table: Default::default(),
     }
@@ -957,14 +957,13 @@ impl<R: Runtime> Webview<R> {
   pub fn reparent(&self, window: &Window<R>) -> crate::Result<()> {
     #[cfg(not(feature = "unstable"))]
     {
-      let current_window = self.window();
-      if current_window.is_webview_window() || window.is_webview_window() {
+      if self.window_ref().is_webview_window() || window.is_webview_window() {
         return Err(crate::Error::CannotReparentWebviewWindow);
       }
     }
 
+    *self.window.lock().unwrap() = window.clone();
     self.webview.dispatcher.reparent(window.window.id)?;
-    *self.window_label.lock().unwrap() = window.label().to_string();
     Ok(())
   }
 
@@ -1000,14 +999,16 @@ impl<R: Runtime> Webview<R> {
 impl<R: Runtime> Webview<R> {
   /// The window that is hosting this webview.
   pub fn window(&self) -> Window<R> {
-    self
-      .manager
-      .get_window(&self.window_label.lock().unwrap())
-      .expect("could not locate webview parent window")
+    self.window.lock().unwrap().clone()
+  }
+
+  /// A reference to the window that is hosting this webview.
+  pub fn window_ref(&self) -> MutexGuard<'_, Window<R>> {
+    self.window.lock().unwrap()
   }
 
   pub(crate) fn window_label(&self) -> String {
-    self.window_label.lock().unwrap().clone()
+    self.window_ref().label().to_string()
   }
 
   /// Executes a closure, providing it with the webview handle that is specific to the current platform.
@@ -1193,7 +1194,7 @@ fn main() {
       let runtime_authority = manager.runtime_authority.lock().unwrap();
       let acl = runtime_authority.resolve_access(
         &request.cmd,
-        message.webview.window().label(),
+        message.webview.window_ref().label(),
         message.webview.label(),
         &acl_origin,
       );

crates/tauri/src/webview/plugin.rs

@@ -57,7 +57,7 @@ mod desktop_commands {
       .webviews()
       .values()
       .map(|webview| WebviewRef {
-        window_label: webview.window().label().into(),
+        window_label: webview.window_ref().label().into(),
         label: webview.label().into(),
       })
       .collect()