fix: Endpoint::node_addr completes with direct addrs or relay ready

Author: Frando

iroh/src/endpoint.rs

@@ -25,7 +25,7 @@ use anyhow::{bail, Context, Result};
 use data_encoding::BASE32_DNSSEC;
 use iroh_base::{NodeAddr, NodeId, RelayUrl, SecretKey};
 use iroh_relay::RelayMap;
-use n0_future::time::Duration;
+use n0_future::{time::Duration, FutureExt};
 use pin_project::pin_project;
 use tracing::{debug, instrument, trace, warn};
 use url::Url;
@@ -836,8 +836,17 @@ impl Endpoint {
     /// The returned [`NodeAddr`] will have the current [`RelayUrl`] and direct addresses
     /// as they would be returned by [`Endpoint::home_relay`] and
     /// [`Endpoint::direct_addresses`].
+    ///
+    /// This function is async because it waits for either the node's direct addresses
+    /// or the node's home relay are initialized.
     pub async fn node_addr(&self) -> Result<NodeAddr> {
-        let addrs = self.direct_addresses().initialized().await?;
+        // Wait for either the home relay or the direct addresses to be ready.
+        n0_future::future::race(
+            async { self.direct_addresses().initialized().await.map(|_| ()) },
+            async { self.home_relay().initialized().await.map(|_| ()) },
+        )
+        .await?;
+        let addrs = self.direct_addresses().get()?.unwrap_or_default();
         let relay = self.home_relay().get()?;
         Ok(NodeAddr::from_parts(
             self.node_id(),