feat(iroh)!: introduce transport abstraction

iroh-relay/Cargo.toml

@@ -42,7 +42,7 @@ postcard = { version = "1", default-features = false, features = [
     "use-std",
     "experimental-derive",
 ] }
-quinn = { package = "iroh-quinn", version = "0.13.0", default-features = false, features = ["rustls-ring"] }
+quinn = { package = "iroh-quinn", version = "0.14.0", default-features = false, features = ["rustls-ring"] }
 quinn-proto = { package = "iroh-quinn-proto", version = "0.13.0" }
 rand = "0.8"
 reqwest = { version = "0.12", default-features = false, features = [

iroh/Cargo.toml

@@ -23,8 +23,6 @@ workspace = true
 [dependencies]
 anyhow = "1.0.98"
 aead = { version = "0.5.2", features = ["bytes", "std"] }
-atomic-waker = "1.1.2"
-concurrent-queue = "2.5"
 backon = { version = "1.4" }
 bytes = "1.7"
 crypto_box = { version = "0.9.1", features = ["serde", "chacha20"] }
@@ -44,13 +42,14 @@ iroh-base = { version = "0.35.0", default-features = false, features = ["key", "
 iroh-relay = { version = "0.35", path = "../iroh-relay", default-features = false }
 n0-future = "0.1.2"
 n0-snafu = "0.2.0"
+n0-watcher = "0.2"
 nested_enum_utils = "0.2.1"
-netwatch = { version = "0.5" }
+netwatch = { version = "0.6" }
 pin-project = "1"
 pkarr = { version = "3.7", default-features = false, features = [
     "relays",
 ] }
-quinn = { package = "iroh-quinn", version = "0.13.0", default-features = false, features = ["rustls-ring"] }
+quinn = { package = "iroh-quinn", version = "0.14.0", default-features = false, features = ["rustls-ring"] }
 quinn-proto = { package = "iroh-quinn-proto", version = "0.13.0" }
 quinn-udp = { package = "iroh-quinn-udp", version = "0.5.7" }
 rand = "0.8"
@@ -104,13 +103,14 @@ tracing-subscriber = { version = "0.3", features = [
 indicatif = { version = "0.17", features = ["tokio"], optional = true }
 parse-size = { version = "=1.0.0", optional = true, features = ['std'] } # pinned version to avoid bumping msrv to 1.81
 
+
 # non-wasm-in-browser dependencies
 [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
 hickory-resolver = "0.25.1"
 igd-next = { version = "0.16", features = ["aio_tokio"] }
 netdev = { version = "0.31.0" }
 portmapper = { version = "0.5.0", default-features = false }
-quinn = { package = "iroh-quinn", version = "0.13.0", default-features = false, features = ["runtime-tokio", "rustls-ring"] }
+quinn = { package = "iroh-quinn", version = "0.14.0", default-features = false, features = ["runtime-tokio", "rustls-ring"] }
 tokio = { version = "1", features = [
     "io-util",
     "macros",
@@ -141,7 +141,6 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 [target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dev-dependencies]
 axum = { version = "0.8" }
 clap = { version = "4", features = ["derive"] }
-futures-lite = "2.6"
 pretty_assertions = "1.4"
 rand_chacha = "0.3.1"
 tokio = { version = "1", features = [

iroh/bench/Cargo.toml

@@ -12,7 +12,8 @@ iroh = { path = ".." }
 iroh-metrics = "0.34"
 n0-future = "0.1.1"
 n0-snafu = "0.2.0"
-quinn = { package = "iroh-quinn", version = "0.13" }
+n0-watcher = "0.2"
+quinn = { package = "iroh-quinn", version = "0.14" }
 rand = "0.8"
 rcgen = "0.13"
 rustls = { version = "0.23", default-features = false, features = ["ring"] }

iroh/bench/src/iroh.rs

@@ -6,10 +6,10 @@ use std::{
 use bytes::Bytes;
 use iroh::{
     endpoint::{Connection, ConnectionError, RecvStream, SendStream, TransportConfig},
-    watcher::Watcher as _,
     Endpoint, NodeAddr, RelayMode, RelayUrl,
 };
 use n0_snafu::{Result, ResultExt};
+use n0_watcher::Watcher as _;
 use tracing::{trace, warn};
 
 use crate::{
@@ -54,7 +54,7 @@ pub fn server_endpoint(
         }
 
         let addr = ep.bound_sockets();
-        let addr = SocketAddr::new("127.0.0.1".parse().unwrap(), addr.0.port());
+        let addr = SocketAddr::new("127.0.0.1".parse().unwrap(), addr[0].port());
         let mut addr = NodeAddr::new(ep.node_id()).with_direct_addresses([addr]);
         if let Some(relay_url) = relay_url {
             addr = addr.with_relay_url(relay_url.clone());

iroh/examples/0rtt.rs

@@ -3,12 +3,12 @@ use std::{env, future::Future, str::FromStr, time::Instant};
 use clap::Parser;
 use iroh::{
     endpoint::{Connecting, Connection},
-    watcher::Watcher,
     SecretKey,
 };
 use iroh_base::ticket::NodeTicket;
 use n0_future::{future, StreamExt};
 use n0_snafu::ResultExt;
+use n0_watcher::Watcher;
 use rand::thread_rng;
 use tracing::{info, trace};
 
@@ -150,6 +150,7 @@ async fn accept(_args: Args) -> n0_snafu::Result<()> {
     println!("Listening on: {:?}", addr);
     println!("Node ID: {:?}", addr.node_id);
     println!("Ticket: {}", NodeTicket::from(addr));
+
     let accept = async move {
         while let Some(incoming) = endpoint.accept().await {
             tokio::spawn(async move {

iroh/examples/connect-unreliable.rs

@@ -8,8 +8,9 @@
 use std::net::SocketAddr;
 
 use clap::Parser;
-use iroh::{watcher::Watcher as _, Endpoint, NodeAddr, RelayMode, RelayUrl, SecretKey};
+use iroh::{Endpoint, NodeAddr, RelayMode, RelayUrl, SecretKey};
 use n0_snafu::ResultExt;
+use n0_watcher::Watcher as _;
 use tracing::info;
 
 // An example ALPN that we are using to communicate over the `Endpoint`

iroh/examples/connect.rs

@@ -8,8 +8,9 @@
 use std::net::SocketAddr;
 
 use clap::Parser;
-use iroh::{watcher::Watcher as _, Endpoint, NodeAddr, RelayMode, RelayUrl, SecretKey};
+use iroh::{Endpoint, NodeAddr, RelayMode, RelayUrl, SecretKey};
 use n0_snafu::{Result, ResultExt};
+use n0_watcher::Watcher as _;
 use tracing::info;
 
 // An example ALPN that we are using to communicate over the `Endpoint`
@@ -67,6 +68,8 @@ async fn main() -> Result<()> {
         .home_relay()
         .get()
         .unwrap()
+        .first()
+        .cloned()
         .expect("should be connected to a relay server, try calling `endpoint.local_endpoints()` or `endpoint.connect()` first, to ensure the endpoint has actually attempted a connection before checking for the connected relay server");
     println!("node relay server url: {relay_url}\n");
     // Build a `NodeAddr` from the node_id, relay url, and UDP addresses.

iroh/examples/echo-no-router.rs

@@ -7,8 +7,9 @@
 //!
 //!     cargo run --example echo-no-router --features=examples
 
-use iroh::{watcher::Watcher as _, Endpoint, NodeAddr};
+use iroh::{Endpoint, NodeAddr};
 use n0_snafu::{Error, Result, ResultExt};
+use n0_watcher::Watcher as _;
 
 /// Each protocol is identified by its ALPN string.
 ///

iroh/examples/echo.rs

@@ -9,10 +9,10 @@
 use iroh::{
     endpoint::Connection,
     protocol::{AcceptError, ProtocolHandler, Router},
-    watcher::Watcher as _,
     Endpoint, NodeAddr,
 };
 use n0_snafu::{Result, ResultExt};
+use n0_watcher::Watcher as _;
 
 /// Each protocol is identified by its ALPN string.
 ///

iroh/examples/listen-unreliable.rs

@@ -3,8 +3,9 @@
 //! This example uses the default relay servers to attempt to holepunch, and will use that relay server to relay packets if the two devices cannot establish a direct UDP connection.
 //! run this example from the project root:
 //!     $ cargo run --example listen-unreliable
-use iroh::{watcher::Watcher as _, Endpoint, RelayMode, SecretKey};
+use iroh::{Endpoint, RelayMode, SecretKey};
 use n0_snafu::{Error, Result, ResultExt};
+use n0_watcher::Watcher as _;
 use tracing::{info, warn};
 
 // An example ALPN that we are using to communicate over the `Endpoint`

iroh/examples/listen.rs

@@ -5,8 +5,9 @@
 //!     $ cargo run --example listen
 use std::time::Duration;
 
-use iroh::{endpoint::ConnectionError, watcher::Watcher as _, Endpoint, RelayMode, SecretKey};
+use iroh::{endpoint::ConnectionError, Endpoint, RelayMode, SecretKey};
 use n0_snafu::ResultExt;
+use n0_watcher::Watcher as _;
 use tracing::{debug, info, warn};
 
 // An example ALPN that we are using to communicate over the `Endpoint`

iroh/examples/transfer.rs

@@ -13,12 +13,12 @@ use iroh::{
     },
     dns::{DnsResolver, N0_DNS_NODE_ORIGIN_PROD, N0_DNS_NODE_ORIGIN_STAGING},
     endpoint::ConnectionError,
-    watcher::Watcher as _,
     Endpoint, NodeAddr, NodeId, RelayMap, RelayMode, RelayUrl, SecretKey,
 };
 use iroh_base::ticket::NodeTicket;
 use n0_future::task::AbortOnDropHandle;
 use n0_snafu::{Result, ResultExt};
+use n0_watcher::Watcher as _;
 use tokio_stream::StreamExt;
 use tracing::{info, warn};
 use url::Url;
@@ -253,6 +253,7 @@ impl EndpointArgs {
             let relay_url = endpoint
                 .home_relay()
                 .get()?
+                .pop()
                 .context("Failed to resolve our home relay")?;
             println!("Our home relay server:\n\t{relay_url}");
         }