fix(iroh): ensure initial addresses are published via discovery (#3525)

## Description

- Ensures that the addresses are published on startup
- Published the last known `NodeData` when adding a new discovery
service, to ensure all services are up to date

Author: dignifiedquire

iroh/src/discovery.rs

@@ -432,6 +432,8 @@ impl From<DiscoveryItem> for NodeInfo {
 #[derive(Debug, Default, Clone)]
 pub struct ConcurrentDiscovery {
     services: Arc<RwLock<Vec<Box<dyn Discovery>>>>,
+    /// The data last published, used to publish when adding a new service.
+    last_data: Arc<RwLock<Option<NodeData>>>,
 }
 
 impl ConcurrentDiscovery {
@@ -444,15 +446,28 @@ impl ConcurrentDiscovery {
     pub fn from_services(services: Vec<Box<dyn Discovery>>) -> Self {
         Self {
             services: Arc::new(RwLock::new(services)),
+            last_data: Default::default(),
         }
     }
 
     /// Adds a [`Discovery`] service.
+    ///
+    /// If there is historical discovery data, it will be published immediately on this service.
     pub fn add(&self, service: impl Discovery + 'static) {
-        self.services
-            .write()
-            .expect("poisoned")
-            .push(Box::new(service));
+        self.add_boxed(Box::new(service))
+    }
+
+    /// Adds an already `Box`ed [`Discovery`] service.
+    ///
+    /// If there is historical discovery data, it will be published immediately on this service.
+    pub fn add_boxed(&self, service: Box<dyn Discovery>) {
+        {
+            let data = self.last_data.read().expect("poisoned");
+            if let Some(data) = &*data {
+                service.publish(data)
+            }
+        }
+        self.services.write().expect("poisoned").push(service);
     }
 
     /// Is there any services configured?
@@ -474,6 +489,7 @@ where
         let services = iter.into_iter().collect::<Vec<_>>();
         Self {
             services: Arc::new(RwLock::new(services)),
+            last_data: Default::default(),
         }
     }
 }
@@ -484,6 +500,11 @@ impl Discovery for ConcurrentDiscovery {
         for service in &*services {
             service.publish(data);
         }
+
+        self.last_data
+            .write()
+            .expect("poisoned")
+            .replace(data.clone());
     }
 
     fn resolve(&self, node_id: NodeId) -> Option<BoxStream<Result<DiscoveryItem, DiscoveryError>>> {

iroh/src/magicsock.rs

@@ -1878,6 +1878,9 @@ impl Actor {
 
         let mut net_report_watcher = self.msock.net_report.watch();
 
+        // ensure we are doing an initial publish of our addresses
+        self.msock.publish_my_addr();
+
         loop {
             self.msock.metrics.magicsock.actor_tick_main.inc();
             #[cfg(not(wasm_browser))]