feat(network): resolve TCP addresses

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- next-header -->
 
 ## [Unreleased] - ReleaseDate
+### Added
+- network: DNS resolve for TCP transport.
+
 ### Fixed
 - network: unrouted requests don't lead to infinite waiting anymore ([#116]).
 - network: release routed if flow closed.

elfo-network/src/config.rs

@@ -1,9 +1,9 @@
 #[cfg(unix)]
 use std::path::PathBuf;
-use std::{net::SocketAddr, str::FromStr, time::Duration};
+use std::{str::FromStr, time::Duration};
 
 use derive_more::Display;
-use eyre::{bail, Result, WrapErr};
+use eyre::{bail, Result};
 use serde::{
     de::{self, Deserializer},
     Deserialize, Serialize,
@@ -51,7 +51,7 @@ fn default_attempt_interval() -> Duration {
 #[derive(Debug, Clone, Hash, PartialEq, Eq, Display, Serialize)]
 pub(crate) enum Transport {
     #[display(fmt = "tcp://{}", _0)]
-    Tcp(SocketAddr),
+    Tcp(String),
     #[cfg(unix)]
     #[display(fmt = "uds://{}", "_0.display()")]
     Uds(PathBuf),
@@ -70,10 +70,7 @@ impl FromStr for Transport {
 
         match protocol {
             "" => bail!("protocol must be specified ({PROTOCOLS})"),
-            "tcp" => addr
-                .parse()
-                .map(Transport::Tcp)
-                .wrap_err("invalid TCP address"),
+            "tcp" => Ok(Transport::Tcp(addr.into())),
             #[cfg(unix)]
             "uds" => {
                 eyre::ensure!(
@@ -102,8 +99,6 @@ impl<'de> Deserialize<'de> for Transport {
 
 #[cfg(test)]
 mod tests {
-    use std::net::{IpAddr, Ipv4Addr};
-
     use super::*;
 
     #[test]
@@ -130,10 +125,9 @@ mod tests {
             .starts_with("unknown protocol"));
 
         // TCP
-        let expected = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 4242);
         assert_eq!(
             Transport::from_str("tcp://127.0.0.1:4242").unwrap(),
-            Transport::Tcp(expected)
+            Transport::Tcp("127.0.0.1:4242".into())
         );
         assert_eq!(
             Transport::from_str("tcp://foobar").unwrap_err().to_string(),

elfo-network/src/discovery/mod.rs

@@ -316,6 +316,7 @@ impl Discovery {
                     .into_iter()
                     .for_each(|(local_group_no, remote_group_no)| {
                         // TODO: save stream to cancel later.
+                        // TODO: connect without DNS resolving here.
                         self.open_connection(
                             &transport,
                             ConnectionRole::Data(internode::SwitchToData {

elfo-network/src/socket/raw/mod.rs

@@ -114,7 +114,7 @@ impl From<uds::Socket> for Socket {
 
 pub(super) async fn connect(addr: &Transport) -> Result<Socket> {
     match addr {
-        Transport::Tcp(addr) => tcp::connect(*addr).await.map(Into::into),
+        Transport::Tcp(addr) => tcp::connect(addr).await.map(Into::into),
         #[cfg(unix)]
         Transport::Uds(addr) => uds::connect(addr).await.map(Into::into),
     }
@@ -123,7 +123,7 @@ pub(super) async fn connect(addr: &Transport) -> Result<Socket> {
 pub(super) async fn listen(addr: &Transport) -> Result<impl Stream<Item = Socket> + 'static> {
     match addr {
         Transport::Tcp(addr) => {
-            let result = tcp::listen(*addr).await.map(|s| s.map(Into::into));
+            let result = tcp::listen(addr).await.map(|s| s.map(Into::into));
             #[cfg(unix)]
             let result = result.map(Either::Left);
             result

elfo-network/src/socket/raw/tcp.rs

@@ -40,11 +40,11 @@ fn prepare_stream(stream: TcpStream) -> Result<Socket> {
     Ok(Socket { read, write, info })
 }
 
-pub(super) async fn connect(addr: SocketAddr) -> Result<Socket> {
+pub(super) async fn connect(addr: &str) -> Result<Socket> {
     prepare_stream(TcpStream::connect(addr).await?)
 }
 
-pub(super) async fn listen(addr: SocketAddr) -> Result<impl Stream<Item = Socket> + 'static> {
+pub(super) async fn listen(addr: &str) -> Result<impl Stream<Item = Socket> + 'static> {
     let listener = TcpListener::bind(addr).await?;
 
     let accept = move |listener: TcpListener| async move {
@@ -61,7 +61,7 @@ pub(super) async fn listen(addr: SocketAddr) -> Result<impl Stream<Item = Socket
                     warn!(
                         message = "cannot accept TCP connection",
                         error = %err,
-                        addr = %addr,
+                        // TODO: addr
                     );
 
                     // Continue listening.

examples/examples/network/alice.toml

@@ -7,9 +7,9 @@ path = "example.alice.{class}.dump"
 
 [system.network]
 # TCP
-#listen = ["tcp://127.0.0.1:9200"]
-#discovery.predefined = ["tcp://127.0.0.1:9201"]
+listen = ["tcp://127.0.0.1:9200"]
+discovery.predefined = ["tcp://localhost:9201"]
 
 # UDS (unix only)
-listen = ["uds://example-alice.socket"]
-discovery.predefined = ["uds://example-bob.socket"]
+#listen = ["uds://example-alice.socket"]
+#discovery.predefined = ["uds://example-bob.socket"]

examples/examples/network/bob.toml

@@ -7,9 +7,9 @@ path = "example.bob.{class}.dump"
 
 [system.network]
 # TCP
-#listen = ["tcp://127.0.0.1:9201"]
-#discovery.predefined = ["tcp://127.0.0.1:9200"]
+listen = ["tcp://127.0.0.1:9201"]
+discovery.predefined = ["tcp://127.0.0.1:9200"]
 
 # UDS (unix only)
-listen = ["uds://example-bob.socket"]
-discovery.predefined = ["uds://example-alice.socket"]
+#listen = ["uds://example-bob.socket"]
+#discovery.predefined = ["uds://example-alice.socket"]