n0-computer · dignifiedquire · Nov 12, 2024 · Oct 30, 2024 · Oct 30, 2024 · Oct 30, 2024
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -23,7 +23,7 @@ env:
   RUSTFLAGS: -Dwarnings
   RUSTDOCFLAGS: -Dwarnings
   SCCACHE_CACHE_SIZE: "50G"
-  CRATES_LIST: "iroh,iroh-metrics,iroh-net,iroh-net-bench,iroh-test,iroh-cli,iroh-dns-server,iroh-router,netwatch,portmapper"
+  CRATES_LIST: "iroh,iroh-metrics,iroh-net,iroh-net-bench,iroh-test,iroh-cli,iroh-dns-server,iroh-router,netwatch,portmapper,iroh-relay"
   IROH_FORCE_STAGING_RELAYS: "1"
 
 jobs:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,6 +8,7 @@ members = [
   "iroh-test",
   "iroh-net/bench",
   "iroh-cli",
+  "iroh-relay",
   "iroh-router",
   "net-tools/netwatch",
   "net-tools/portmapper",

diff --git a/deny.toml b/deny.toml
@@ -34,6 +34,7 @@ license-files = [
 [advisories]
 ignore = [
       "RUSTSEC-2024-0370", # unmaintained, no upgrade available
+      "RUSTSEC-2024-0384", # instant is no longer maintained. This is not a direct dependency so can't be fixed on our end
 ]
 
 [sources]

diff --git a/iroh-cli/src/commands/blobs.rs b/iroh-cli/src/commands/blobs.rs
@@ -33,7 +33,7 @@ use iroh::{
         },
         Iroh,
     },
-    net::{key::PublicKey, relay::RelayUrl, NodeAddr},
+    net::{key::PublicKey, NodeAddr, RelayUrl},
 };
 use tokio::io::AsyncWriteExt;
 

diff --git a/iroh-cli/src/commands/doctor.rs b/iroh-cli/src/commands/doctor.rs
@@ -38,9 +38,8 @@ use iroh::{
         key::{PublicKey, SecretKey},
         metrics::MagicsockMetrics,
         netcheck,
-        relay::{RelayMap, RelayMode, RelayUrl},
         ticket::NodeTicket,
-        Endpoint, NodeAddr, NodeId,
+        Endpoint, NodeAddr, NodeId, RelayMap, RelayMode, RelayUrl,
     },
     util::{path::IrohPaths, progress::ProgressWriter},
 };

diff --git a/iroh-cli/src/commands/net.rs b/iroh-cli/src/commands/net.rs
@@ -12,8 +12,7 @@ use iroh::{
     client::Iroh,
     net::{
         endpoint::{DirectAddrInfo, RemoteInfo},
-        relay::RelayUrl,
-        NodeAddr, NodeId,
+        NodeAddr, NodeId, RelayUrl,
     },
 };
 

diff --git a/iroh-cli/src/commands/start.rs b/iroh-cli/src/commands/start.rs
@@ -11,7 +11,7 @@ use anyhow::Result;
 use colored::Colorize;
 use indicatif::{ProgressBar, ProgressDrawTarget, ProgressStyle};
 use iroh::{
-    net::relay::{RelayMap, RelayMode},
+    net::{RelayMap, RelayMode},
     node::{Node, RpcStatus, DEFAULT_RPC_ADDR},
 };
 use tracing::{info_span, trace, Instrument};

diff --git a/iroh-cli/src/config.rs b/iroh-cli/src/config.rs
@@ -13,7 +13,7 @@ use anyhow::{anyhow, bail, Context, Result};
 use iroh::{
     client::Iroh,
     docs::{AuthorId, NamespaceId},
-    net::relay::{RelayMap, RelayNode},
+    net::{RelayMap, RelayNode},
     node::GcPolicy,
 };
 use parking_lot::RwLock;

diff --git a/iroh-net/Cargo.toml b/iroh-net/Cargo.toml
@@ -19,9 +19,11 @@ workspace = true
 cc = "=1.1.31" # enforce cc version, because of https://github.com/rust-lang/cc-rs/issues/1278
 
 anyhow = { version = "1" }
+axum = { version = "0.7.4", optional = true }
 backoff = "0.4.0"
 base64 = "0.22.1"
 bytes = "1.7"
+clap = { version = "4", features = ["derive"], optional = true }
 der = { version = "0.7", features = ["alloc", "derive"] }
 derive_more = { version = "1.0.0", features = ["debug", "display", "from", "try_into", "deref"] }
 futures-buffered = "0.2.8"
@@ -40,6 +42,7 @@ hyper = { version = "1", features = ["server", "client", "http1"] }
 hyper-util = "0.1.1"
 igd-next = { version = "0.15.1", features = ["aio_tokio"] }
 iroh-base = { version = "0.28.0", features = ["key"] }
+iroh-relay = { version = "0.28", path = "../iroh-relay" }
 libc = "0.2.139"
 netdev = "0.30.0"
 netwatch = { version = "0.1.0", path = "../net-tools/netwatch" }
@@ -55,6 +58,7 @@ quinn-proto = { package = "iroh-quinn-proto", version = "0.12.0" }
 quinn-udp = { package = "iroh-quinn-udp", version = "0.5.5" }
 rand = "0.8"
 rcgen = "0.12"
+regex = { version = "1.7.1", optional = true }
 reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] }
 ring = "0.17"
 rustls = { version = "0.23", default-features = false, features = ["ring"] }
@@ -72,6 +76,7 @@ tokio-tungstenite = "0.21"
 tokio-tungstenite-wasm = "0.3"
 tokio-util = { version = "0.7.12", features = ["io-util", "io", "codec", "rt"] }
 tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = true }
 tungstenite = "0.21"
 url = { version = "2.4", features = ["serde"] }
 watchable = "1.1.2"
@@ -80,15 +85,6 @@ webpki-roots = "0.26"
 x509-parser = "0.16"
 z32 = "1.0.3"
 
-# iroh-relay
-axum = { version = "0.7.4", optional = true }
-clap = { version = "4", features = ["derive"], optional = true }
-regex = { version = "1.7.1", optional = true }
-rustls-pemfile = { version = "2.1", optional = true }
-toml = { version = "0.8", optional = true }
-tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = true }
-tokio-rustls-acme = { version = "0.4", optional = true }
-
 # metrics
 iroh-metrics = { version = "0.28.0", default-features = false }
 strum = { version = "0.26.2", features = ["derive"] }
@@ -114,14 +110,12 @@ axum = { version = "0.7.4" }
 clap = { version = "4", features = ["derive"] }
 criterion = "0.5.1"
 crypto_box = { version = "0.9.1", features = ["serde", "chacha20"] }
-ntest = "0.9"
 pretty_assertions = "1.4"
-proptest = "1.2.0"
 rand_chacha = "0.3.1"
 tokio = { version = "1", features = ["io-util", "sync", "rt", "net", "fs", "macros", "time", "test-util"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 iroh-test = "0.28.0"
-iroh-net = { path = ".", features = ["iroh-relay"] }
+iroh-net = { path = "." }
 serde_json = "1.0.107"
 testresult = "0.4.0"
 mainline = "2.0.1"
@@ -135,24 +129,11 @@ duct = "0.13.6"
 
 [features]
 default = ["metrics", "discovery-pkarr-dht"]
-iroh-relay = [
-    "dep:tokio-rustls-acme",
-    "dep:axum",
-    "dep:clap",
-    "dep:toml",
-    "dep:rustls-pemfile",
-    "dep:regex",
-    "dep:tracing-subscriber"
-]
 metrics = ["iroh-metrics/metrics"]
-test-utils = ["iroh-relay"]
+test-utils = ["iroh-relay/test-utils", "iroh-relay/server", "dep:axum"]
 discovery-local-network = ["dep:swarm-discovery"]
 discovery-pkarr-dht = ["pkarr/dht", "dep:genawaiter"]
 
-[[bin]]
-name = "iroh-relay"
-required-features = ["iroh-relay"]
-
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "iroh_docsrs"]

diff --git a/iroh-net/bench/src/iroh.rs b/iroh-net/bench/src/iroh.rs
@@ -8,8 +8,7 @@ use bytes::Bytes;
 use futures_lite::StreamExt as _;
 use iroh_net::{
     endpoint::{Connection, ConnectionError, RecvStream, SendStream, TransportConfig},
-    relay::{RelayMap, RelayMode, RelayUrl},
-    Endpoint, NodeAddr,
+    Endpoint, NodeAddr, RelayMap, RelayMode, RelayUrl,
 };
 use tracing::{trace, warn};
 

diff --git a/iroh-net/examples/connect-unreliable.rs b/iroh-net/examples/connect-unreliable.rs
@@ -10,11 +10,7 @@ use std::net::SocketAddr;
 use anyhow::Context;
 use clap::Parser;
 use futures_lite::StreamExt;
-use iroh_net::{
-    key::SecretKey,
-    relay::{RelayMode, RelayUrl},
-    Endpoint, NodeAddr,
-};
+use iroh_net::{key::SecretKey, Endpoint, NodeAddr, RelayMode, RelayUrl};
 use tracing::info;
 
 // An example ALPN that we are using to communicate over the `Endpoint`

diff --git a/iroh-net/examples/connect.rs b/iroh-net/examples/connect.rs
@@ -10,11 +10,7 @@ use std::net::SocketAddr;
 use anyhow::Context;
 use clap::Parser;
 use futures_lite::StreamExt;
-use iroh_net::{
-    key::SecretKey,
-    relay::{RelayMode, RelayUrl},
-    Endpoint, NodeAddr,
-};
+use iroh_net::{key::SecretKey, Endpoint, NodeAddr, RelayMode, RelayUrl};
 use tracing::info;
 
 // An example ALPN that we are using to communicate over the `Endpoint`

diff --git a/iroh-net/examples/listen-unreliable.rs b/iroh-net/examples/listen-unreliable.rs
@@ -5,7 +5,7 @@
 //!     $ cargo run --example listen-unreliable
 use anyhow::Context;
 use futures_lite::StreamExt;
-use iroh_net::{key::SecretKey, relay::RelayMode, Endpoint};
+use iroh_net::{key::SecretKey, Endpoint, RelayMode};
 use tracing::{info, warn};
 
 // An example ALPN that we are using to communicate over the `Endpoint`

diff --git a/iroh-net/examples/listen.rs b/iroh-net/examples/listen.rs
@@ -7,7 +7,7 @@ use std::time::Duration;
 
 use anyhow::Context;
 use futures_lite::StreamExt;
-use iroh_net::{endpoint::ConnectionError, key::SecretKey, relay::RelayMode, Endpoint};
+use iroh_net::{endpoint::ConnectionError, key::SecretKey, Endpoint, RelayMode};
 use tracing::{debug, info, warn};
 
 // An example ALPN that we are using to communicate over the `Endpoint`

diff --git a/iroh-net/src/defaults.rs b/iroh-net/src/defaults.rs
@@ -2,7 +2,7 @@
 
 use url::Url;
 
-use crate::relay::{RelayMap, RelayNode};
+use crate::{RelayMap, RelayNode};
 
 /// The default STUN port used by the Relay server.
 ///
@@ -164,30 +164,4 @@ pub(crate) mod timeouts {
 
     /// Default Pinger timeout
     pub(crate) const DEFAULT_PINGER_TIMEOUT: Duration = Duration::from_secs(5);
-
-    /// Timeouts specifically used in the iroh-relay
-    pub(crate) mod relay {
-        use super::*;
-
-        /// Timeout used by the relay client while connecting to the relay server,
-        /// using `TcpStream::connect`
-        pub(crate) const DIAL_NODE_TIMEOUT: Duration = Duration::from_millis(1500);
-        /// Timeout for expecting a pong from the relay server
-        pub(crate) const PING_TIMEOUT: Duration = Duration::from_secs(5);
-        /// Timeout for the entire relay connection, which includes dns, dialing
-        /// the server, upgrading the connection, and completing the handshake
-        pub(crate) const CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
-        /// Timeout for our async dns resolver
-        pub(crate) const DNS_TIMEOUT: Duration = Duration::from_secs(1);
-
-        /// Maximum time the client will wait to receive on the connection, since
-        /// the last message. Longer than this time and the client will consider
-        /// the connection dead.
-        pub(crate) const CLIENT_RECV_TIMEOUT: Duration = Duration::from_secs(120);
-
-        /// Maximum time the server will attempt to get a successful write to the connection.
-        #[cfg(feature = "iroh-relay")]
-        #[cfg_attr(iroh_docsrs, doc(cfg(feature = "iroh-relay")))]
-        pub(crate) const SERVER_WRITE_TIMEOUT: Duration = Duration::from_secs(2);
-    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ use iroh::{ @@
             },
             Iroh,
         },
-        net::{key::PublicKey, relay::RelayUrl, NodeAddr},
+        net::{key::PublicKey, NodeAddr, RelayUrl},
     };
     use tokio::io::AsyncWriteExt;
@@ Expand Down @@