feat: discover nodes over DNS by default

Author: Frando

iroh/Cargo.toml

@@ -29,6 +29,7 @@ hashlink = "0.8.4"
 hex = { version = "0.4.3" }
 iroh-bytes = { version = "0.12.0", path = "../iroh-bytes", features = ["downloader"] }
 iroh-base = { version = "0.12.0", path = "../iroh-base" }
+iroh-dns = { version = "0.12.0", path = "../iroh-dns" }
 iroh-io = { version = "0.4.0", features = ["stats"] }
 iroh-metrics = { version = "0.12.0", path = "../iroh-metrics", optional = true }
 iroh-net = { version = "0.12.0", path = "../iroh-net" }

iroh/src/commands/start.rs

@@ -14,6 +14,7 @@ use iroh::{
     rpc_protocol::{ProviderRequest, ProviderResponse, ProviderService},
     util::{fs::load_secret_key, path::IrohPaths},
 };
+use iroh_dns::discovery::{DnsDiscovery};
 use iroh_net::{
     derp::{DerpMap, DerpMode},
     key::SecretKey,
@@ -219,12 +220,15 @@ pub(crate) async fn start_node(
         Some(derp_map) => DerpMode::Custom(derp_map),
     };
 
+    let discovery = DnsDiscovery::with_iroh_test(Some(secret_key.clone()))?;
+
     Node::builder(bao_store, doc_store)
         .derp_mode(derp_mode)
         .peers_data_path(peers_data_path)
         .local_pool(rt)
         .rpc_endpoint(rpc_endpoint)
         .secret_key(secret_key)
+        .node_discovery(Box::new(discovery))
         .spawn()
         .await
 }

iroh/src/node.rs

@@ -37,6 +37,7 @@ use iroh_net::derp::DerpUrl;
 use iroh_net::magic_endpoint::get_alpn;
 use iroh_net::magicsock::LocalEndpointsStream;
 use iroh_net::util::AbortingJoinHandle;
+use iroh_net::magicsock::Discovery;
 use iroh_net::{
     derp::DerpMode,
     key::{PublicKey, SecretKey},
@@ -135,6 +136,8 @@ where
     docs: S,
     /// Path to store peer data. If `None`, peer data will not be persisted.
     peers_data_path: Option<PathBuf>,
+    /// Discovery service to retreive node dialing info.
+    node_discovery: Option<Box<dyn Discovery>>,
 }
 
 const PROTOCOLS: [&[u8]; 3] = [&iroh_bytes::protocol::ALPN, GOSSIP_ALPN, SYNC_ALPN];
@@ -153,6 +156,7 @@ impl<D: Map, S: DocStore> Builder<D, S> {
             rt: None,
             docs,
             peers_data_path: None,
+            node_discovery: None,
         }
     }
 }
@@ -180,6 +184,7 @@ where
             rt: self.rt,
             docs: self.docs,
             peers_data_path: self.peers_data_path,
+            node_discovery: self.node_discovery,
         }
     }
 
@@ -243,6 +248,14 @@ where
         self
     }
 
+    /// Sets the node discovery service.
+    ///
+    /// If not set, nodes without direct or derp addresses will not be dialable.
+    pub fn node_discovery(mut self, discovery: Box<dyn Discovery>) -> Self {
+        self.node_discovery = Some(discovery);
+        self
+    }
+
     /// Spawns the [`Node`] in a tokio task.
     ///
     /// This will create the underlying network server and spawn a tokio task accepting
@@ -274,6 +287,10 @@ where
             .transport_config(transport_config)
             .concurrent_connections(MAX_CONNECTIONS)
             .derp_mode(self.derp_mode);
+        let endpoint = match self.node_discovery {
+            Some(discovery) => endpoint.discovery(discovery),
+            None => endpoint
+        };
         let endpoint = match self.peers_data_path {
             Some(path) => endpoint.peers_data_path(path),
             None => endpoint,