mdns improved peer discovery

2025-11-14 00:24:04 +01:00
parent b9e3e760d9
commit 4e9707dd51
2 changed files with 163 additions and 108 deletions
@@ -47,57 +47,91 @@ impl Drop for MdnsAdvertiser {
    }
 }

+pub struct MdnsBrowser {
+    daemon: ServiceDaemon,
+    receiver: Receiver<ServiceEvent>,
+    service_type: String,
+}
+
+impl MdnsBrowser {
+    pub fn new(service_type: &str) -> eyre::Result<Self> {
+        let daemon = ServiceDaemon::new()?;
+        let receiver = daemon.browse(service_type)?;
+        Ok(Self {
+            daemon,
+            receiver,
+            service_type: service_type.to_string(),
+        })
+    }
+
+    pub fn next_address(
+        &self,
+        ignore_addr: Option<SocketAddr>,
+    ) -> eyre::Result<Option<SocketAddr>> {
+        loop {
+            match self.receiver.recv() {
+                Ok(ServiceEvent::ServiceResolved(info)) => {
+                    log::trace!("mdns ServiceResolved event: {info:?}");
+
+                    if info.ty_domain != self.service_type {
+                        log::trace!(
+                            "Got mDNS with uninteresting service type: {} (expected: {})",
+                            info.ty_domain,
+                            self.service_type,
+                        );
+                        continue;
+                    }
+
+                    let mut ignored_match = false;
+                    for address in info.get_addresses() {
+                        let addr = SocketAddr::new(address.to_ip_addr(), info.get_port());
+
+                        if ignore_addr.is_some_and(|ignore| ignore == addr) {
+                            ignored_match = true;
+                            log::trace!("Ignoring mDNS advertisement for local server at {addr}");
+                            continue;
+                        }
+
+                        log::info!("Found server at {addr}");
+                        return Ok(Some(addr));
+                    }
+
+                    if ignored_match {
+                        log::trace!(
+                            "Only saw ignored mDNS advertisements (probably ourselves) for {:?}",
+                            info.get_fullname()
+                        );
+                        continue;
+                    }
+
+                    log::error!("No address found in mDNS response: {info:?}");
+                }
+                Ok(other_event) => {
+                    log::trace!("mdns unrelated event: {other_event:?}");
+                }
+                Err(err) => {
+                    log::error!("mDNS browse channel closed: {err}");
+                    return Ok(None);
+                }
+            }
+        }
+    }
+}
+
+impl Drop for MdnsBrowser {
+    fn drop(&mut self) {
+        let _ = self.daemon.shutdown();
+    }
+}
+
 pub fn discover_service(
    service_type: &str,
    ignore_addr: Option<SocketAddr>,
 ) -> eyre::Result<SocketAddr> {
-    let mdns = ServiceDaemon::new().expect("Failed to create mDNS daemon.");
-
-    let receiver = mdns.browse(service_type)?;
-
-    while let Ok(event) = receiver.recv() {
-        match event {
-            ServiceEvent::ServiceResolved(info) => {
-                log::trace!("mdns ServiceResolved event: {info:?}");
-
-                // Check if this service matches our expected service type
-                if info.ty_domain != service_type {
-                    log::trace!(
-                        "Got mDNS with uninteresting service type: {} (expected: {})",
-                        info.ty_domain,
-                        service_type,
-                    );
-                    continue;
-                }
-
-                let mut ignored_match = false;
-                for address in info.get_addresses() {
-                    let addr = SocketAddr::new(address.to_ip_addr(), info.get_port());
-
-                    if ignore_addr.is_some_and(|ignore| ignore == addr) {
-                        ignored_match = true;
-                        log::trace!("Ignoring mDNS advertisement for local server at {addr}");
-                        continue;
-                    }
-
-                    log::info!("Found server at {addr}");
-                    return Ok(addr);
-                }
-
-                if ignored_match {
-                    log::trace!(
-                        "Only saw ignored mDNS advertisements (probably ourselves) for {:?}",
-                        info.get_fullname()
-                    );
-                    continue;
-                }
-
-                log::error!("No address found in mDNS response: {info:?}");
-            }
-            other_event => {
-                log::trace!("mdns unrelated event: {other_event:?}");
-            }
-        }
+    // Currently unused; kept for potential one-off discovery callers that just need a single address.
+    let browser = MdnsBrowser::new(service_type)?;
+    match browser.next_address(ignore_addr)? {
+        Some(addr) => Ok(addr),
+        None => bail!("No server found."),
    }
-    bail!("No server found.")
 }