server: Allow replacing current instance

server/Cargo.toml

@@ -10,6 +10,7 @@ version.workspace = true
 
 [dependencies]
 clap.workspace = true
+enumflags2 = "0.7"
 oo7 = { workspace = true, features = ["unstable"] }
 rpassword = "7.3"
 serde.workspace = true

server/src/main.rs

@@ -24,6 +24,8 @@ struct Args {
         help = "Read a password from stdin, and use it to unlock the login keyring."
     )]
     login: bool,
+    #[arg(short, long, help = "Replace a running instance.")]
+    replace: bool,
 }
 
 #[tokio::main]
@@ -41,9 +43,14 @@ async fn main() -> Result<(), Error> {
         secret = Some(Secret::from(password.into_bytes()));
     }
 
+    let mut flags = zbus::fdo::RequestNameFlags::AllowReplacement.into();
+    if args.replace {
+        flags |= zbus::fdo::RequestNameFlags::ReplaceExisting;
+    }
+
     tracing::info!("Starting {}", BINARY_NAME);
 
-    Service::run(secret).await?;
+    Service::run(secret, flags).await?;
 
     std::future::pending::<()>().await;
 

server/src/service.rs

@@ -2,6 +2,7 @@
 
 use std::{collections::HashMap, sync::Arc};
 
+use enumflags2::BitFlags;
 use oo7::{
     dbus::{
         api::{Properties, SecretInner},
@@ -186,10 +187,16 @@ impl Service {
 }
 
 impl Service {
-    pub async fn run(secret: Option<Secret>) -> Result<(), Error> {
-        let connection = zbus::connection::Builder::session()?
-            .name(oo7::dbus::api::Service::DESTINATION.as_deref().unwrap())?
-            .build()
+    pub async fn run(
+        secret: Option<Secret>,
+        flags: BitFlags<zbus::fdo::RequestNameFlags>,
+    ) -> Result<(), Error> {
+        let connection = zbus::Connection::session().await?;
+        connection
+            .request_name_with_flags(
+                oo7::dbus::api::Service::DESTINATION.as_deref().unwrap(),
+                flags,
+            )
             .await?;
         let object_server = connection.object_server();
         let service = Self {