Added randezvous

crates/artist-dht/src/config.rs

@@ -3,7 +3,7 @@
 use std::path::PathBuf;
 use std::time::Duration;
 
-use federation_net::NetworkId;
+use federation_net::{NetworkId, RendezvousConfig};
 
 use crate::error::{ArtistDhtError, Result};
 
@@ -40,6 +40,10 @@ pub struct ArtistDhtConfig {
     /// establishing a connection through relays can take much longer than a
     /// request over an existing one.
     pub transport_timeout: Duration,
+    /// Automatic peer discovery over the mainline DHT: peers of the same
+    /// network find each other knowing nothing but the network id. `None`
+    /// disables it; peers are then connected via tickets only.
+    pub rendezvous: Option<RendezvousConfig>,
 }
 
 impl ArtistDhtConfig {
@@ -62,6 +66,7 @@ pub struct ArtistDhtConfigBuilder {
     request_timeout: Option<Duration>,
     lookup_timeout: Option<Duration>,
     transport_timeout: Option<Duration>,
+    rendezvous: Option<RendezvousConfig>,
 }
 
 impl ArtistDhtConfigBuilder {
@@ -107,6 +112,12 @@ impl ArtistDhtConfigBuilder {
         self
     }
 
+    /// Enables automatic peer discovery over the mainline DHT.
+    pub fn rendezvous(mut self, rendezvous: RendezvousConfig) -> Self {
+        self.rendezvous = Some(rendezvous);
+        self
+    }
+
     /// Validates and builds the configuration.
     pub fn build(self) -> Result<ArtistDhtConfig> {
         let data_dir = self
@@ -131,6 +142,7 @@ impl ArtistDhtConfigBuilder {
             request_timeout: self.request_timeout.unwrap_or(DEFAULT_REQUEST_TIMEOUT),
             lookup_timeout: self.lookup_timeout.unwrap_or(DEFAULT_LOOKUP_TIMEOUT),
             transport_timeout: self.transport_timeout.unwrap_or(DEFAULT_TRANSPORT_TIMEOUT),
+            rendezvous: self.rendezvous,
         };
         for (name, value) in [
             ("republish_interval", config.republish_interval),

crates/artist-dht/src/lib.rs

@@ -89,4 +89,4 @@ pub use service::{
 };
 
 // Re-exported types from the transport layer that appear in this API.
-pub use federation_net::{EndpointId, NetworkId, PeerTicket};
+pub use federation_net::{EndpointId, NetworkId, PeerTicket, RendezvousConfig};

crates/artist-dht/src/service.rs

@@ -106,11 +106,15 @@ impl ArtistDhtService {
     /// Starts the service: opens the database, starts the network engine,
     /// loads persisted contacts and spawns the maintenance tasks.
     pub async fn start(config: ArtistDhtConfig) -> Result<(Self, ArtistDhtEventReceiver)> {
-        let engine_config = NetworkConfig::builder()
+        let mut engine_builder = NetworkConfig::builder()
             .data_dir(&config.data_dir)
             .network_id(config.network_id)
             .schema_id(SchemaId::from_name(SCHEMA_NAME))
-            .request_timeout(config.transport_timeout)
+            .request_timeout(config.transport_timeout);
+        if let Some(rendezvous) = config.rendezvous.clone() {
+            engine_builder = engine_builder.rendezvous(rendezvous);
+        }
+        let engine_config = engine_builder
             .build()
             .map_err(|err| ArtistDhtError::Network(err.to_string()))?;
         let (engine, net_events) = NetworkEngine::start(engine_config).await?;