Merge branch 'v2' into feat/setup-single-instance-manually

.changes/setup-single-instance-manually.md

@@ -0,0 +1,5 @@
+---
+"single-instance": patch
+---
+
+Add `setup` function to run the single instance initialization manually, without waiting for the tauri setup hook to run.

plugins/single-instance/src/lib.rs

@@ -10,7 +10,7 @@
 )]
 #![cfg(not(any(target_os = "android", target_os = "ios")))]
 
-use tauri::{plugin::TauriPlugin, AppHandle, Manager, Runtime};
+use tauri::{plugin, plugin::TauriPlugin, AppHandle, Manager, RunEvent, Runtime};
 
 #[cfg(target_os = "windows")]
 #[path = "platform_impl/windows.rs"]
@@ -34,6 +34,17 @@ pub fn init<R: Runtime, F: FnMut(&AppHandle<R>, Vec<String>, String) + Send + Sy
     Builder::new().callback(f).build()
 }
 
+/// Runs the single-instance setup flow with the given app and callback.
+/// Use this when you need to run single-instance from your own plugin or app setup.
+/// On Linux, pass `dbus_id` (e.g. `Some("com.mycompany.myapp".into())`); on other platforms it is ignored.
+pub fn setup<R: Runtime, F: FnMut(&AppHandle<R>, Vec<String>, String) + Send + Sync + 'static>(
+    app: &AppHandle<R>,
+    callback: F,
+    dbus_id: Option<String>,
+) -> Result<(), ()> {
+    platform_impl::setup_single_instance(app, Box::new(callback), dbus_id)
+}
+
 pub fn destroy<R: Runtime, M: Manager<R>>(manager: &M) {
     platform_impl::destroy(manager)
 }
@@ -89,10 +100,18 @@ impl<R: Runtime> Builder<R> {
     }
 
     pub fn build(self) -> TauriPlugin<R> {
-        platform_impl::init(
+        let callback = self.callback;
-            self.callback,
+        let dbus_id = self.dbus_id;
-            #[cfg(target_os = "linux")]
+        plugin::Builder::new("single-instance")
-            self.dbus_id,
+            .setup(move |app, _api| {
-        )
+                let _ = platform_impl::setup_single_instance(app, callback, dbus_id);
+                Ok(())
+            })
+            .on_event(|app, event| {
+                if let RunEvent::Exit = event {
+                    destroy(app);
+                }
+            })
+            .build()
     }
 }

plugins/single-instance/src/platform_impl/linux.rs

@@ -6,10 +6,7 @@
 use crate::semver_compat::semver_compat_string;
 
 use crate::SingleInstanceCallback;
-use tauri::{
+use tauri::{AppHandle, Manager, Runtime};
-    plugin::{self, TauriPlugin},
-    AppHandle, Manager, RunEvent, Runtime,
-};
 use zbus::{blocking::Connection, interface, names::WellKnownName};
 
 struct ConnectionHandle(Connection);
@@ -28,12 +25,11 @@ impl<R: Runtime> SingleInstanceDBus<R> {
 
 struct DBusName(String);
 
-pub fn init<R: Runtime>(
+pub fn setup_single_instance<R: Runtime>(
+    app: &AppHandle<R>,
     callback: Box<SingleInstanceCallback<R>>,
     dbus_id: Option<String>,
-) -> TauriPlugin<R> {
+) -> Result<(), ()> {
-    plugin::Builder::new("single-instance")
-        .setup(move |app, _api| {
     let mut dbus_name = dbus_id.unwrap_or_else(|| app.config().identifier.clone());
 
     #[cfg(feature = "semver")]
@@ -41,6 +37,7 @@ pub fn init<R: Runtime>(
         dbus_name.push('_');
         dbus_name.push_str(semver_compat_string(&app.package_info().version).as_str());
     }
+
     dbus_name.push_str(".SingleInstance");
 
     let mut dbus_path = dbus_name.replace('.', "/").replace('-', "_");
@@ -91,13 +88,6 @@ pub fn init<R: Runtime>(
     app.manage(DBusName(dbus_name));
 
     Ok(())
-        })
-        .on_event(move |app, event| {
-            if let RunEvent::Exit = event {
-                destroy(app);
-            }
-        })
-        .build()
 }
 
 pub fn destroy<R: Runtime, M: Manager<R>>(manager: &M) {

plugins/single-instance/src/platform_impl/macos.rs

@@ -11,14 +11,13 @@ use std::{
 #[cfg(feature = "semver")]
 use crate::semver_compat::semver_compat_string;
 use crate::SingleInstanceCallback;
-use tauri::{
+use tauri::{AppHandle, Config, Manager, Runtime};
-    plugin::{self, TauriPlugin},
-    AppHandle, Config, Manager, RunEvent, Runtime,
-};
 
-pub fn init<R: Runtime>(cb: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
+pub fn setup_single_instance<R: Runtime>(
-    plugin::Builder::new("single-instance")
+    app: &AppHandle<R>,
-        .setup(|app, _api| {
+    cb: Box<SingleInstanceCallback<R>>,
+    _dbus_id: Option<String>,
+) -> Result<(), ()> {
     let socket = socket_path(app.config(), app.package_info());
 
     // Notify the singleton which may or may not exist.
@@ -43,13 +42,6 @@ pub fn init<R: Runtime>(cb: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
         }
     }
     Ok(())
-        })
-        .on_event(|app, event| {
-            if let RunEvent::Exit = event {
-                destroy(app);
-            }
-        })
-        .build()
 }
 
 pub fn destroy<R: Runtime, M: Manager<R>>(manager: &M) {

plugins/single-instance/src/platform_impl/windows.rs

@@ -7,10 +7,7 @@ use crate::semver_compat::semver_compat_string;
 
 use crate::SingleInstanceCallback;
 use std::ffi::CStr;
-use tauri::{
+use tauri::{AppHandle, Manager, Runtime};
-    plugin::{self, TauriPlugin},
-    AppHandle, Manager, RunEvent, Runtime,
-};
 use windows_sys::Win32::{
     Foundation::{CloseHandle, GetLastError, ERROR_ALREADY_EXISTS, HWND, LPARAM, LRESULT, WPARAM},
     System::{
@@ -51,9 +48,11 @@ impl<R: Runtime> UserData<R> {
     }
 }
 
-pub fn init<R: Runtime>(callback: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
+pub fn setup_single_instance<R: Runtime>(
-    plugin::Builder::new("single-instance")
+    app: &AppHandle<R>,
-        .setup(|app, _api| {
+    callback: Box<SingleInstanceCallback<R>>,
+    _dbus_id: Option<String>,
+) -> Result<(), ()> {
     #[allow(unused_mut)]
     let mut id = app.config().identifier.clone();
     #[cfg(feature = "semver")]
@@ -66,8 +65,7 @@ pub fn init<R: Runtime>(callback: Box<SingleInstanceCallback<R>>) -> TauriPlugin
     let window_name = encode_wide(format!("{id}-siw"));
     let mutex_name = encode_wide(format!("{id}-sim"));
 
-            let hmutex =
+    let hmutex = unsafe { CreateMutexW(std::ptr::null(), true.into(), mutex_name.as_ptr()) };
-                unsafe { CreateMutexW(std::ptr::null(), true.into(), mutex_name.as_ptr()) };
 
     if unsafe { GetLastError() } == ERROR_ALREADY_EXISTS {
         unsafe {
@@ -107,13 +105,6 @@ pub fn init<R: Runtime>(callback: Box<SingleInstanceCallback<R>>) -> TauriPlugin
     }
 
     Ok(())
-        })
-        .on_event(|app, event| {
-            if let RunEvent::Exit = event {
-                destroy(app);
-            }
-        })
-        .build()
 }
 
 pub fn destroy<R: Runtime, M: Manager<R>>(manager: &M) {