reduce deps, supposedly

Author: divagant-martian

Cargo.lock

@@ -10,120 +10,38 @@ rust-version = "1.76"
 workspace = true
 
 [dependencies]
-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"
+anyhow = "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"] }
+derive_more = { version = "1.0.0", features = ["display"] }
 futures-buffered = "0.2.8"
-futures-concurrency = "7.6.0"
 futures-lite = "2.3"
-futures-sink = "0.3.25"
-futures-util = "0.3.25"
-governor = "0.6.0"
-hex = "0.4.3"
-hickory-proto = "=0.25.0-alpha.2"
 hickory-resolver = "=0.25.0-alpha.2"
-hostname = "0.3.1"
-http = "1"
-http-body-util = "0.1.0"
-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-base = { version = "0.28.0", default-features = false, features = ["relay"] }
+iroh-metrics = { version = "0.28.0", default-features = false, optional = true }
 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" }
-num_enum = "0.7"
-once_cell = "1.18.0"
-parking_lot = "0.12.1"
-pin-project = "1"
-pkarr = { version = "2", default-features = false, features = ["async", "relay"] }
 portmapper = { version = "0.1.0", path = "../net-tools/portmapper" }
-postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
-quinn = { package = "iroh-quinn", version = "0.12.0" }
-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"] }
-serde = { version = "1", features = ["derive", "rc"] }
-smallvec = "1.11.1"
-socket2 = "0.5.3"
-stun-rs = "0.1.5"
+reqwest = { version = "0.12", default-features = false }
+rustls = { version = "0.23", default-features = false }
 surge-ping = "0.8.0"
 thiserror = "1"
-time = "0.3.20"
-tokio = { version = "1", features = ["io-util", "macros", "sync", "rt", "net", "fs", "io-std", "signal", "process"] }
-tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }
-tokio-stream = { version = "0.1.15" }
-tokio-tungstenite = "0.21"
-tokio-tungstenite-wasm = "0.3"
-tokio-util = { version = "0.7.12", features = ["io-util", "io", "codec", "rt"] }
+tokio = { version = "1", default-features = false }
+tokio-util = { version = "0.7.12", default-features = false }
 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"
-webpki = { package = "rustls-webpki", version = "0.102" }
-webpki-roots = "0.26"
-x509-parser = "0.16"
-z32 = "1.0.3"
-
-# metrics
-iroh-metrics = { version = "0.28.0", default-features = false }
-strum = { version = "0.26.2", features = ["derive"] }
-
-# local-swarm-discovery
-swarm-discovery = { version = "0.2.1", optional = true }
-
-# dht_discovery
-genawaiter = { version = "0.99.1", features = ["futures03"], optional = true }
-
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-netlink-packet-core = "0.7.0"
-netlink-packet-route = "0.17.0"
-netlink-sys = "0.8.5"
-rtnetlink = "0.13.0"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-wmi = "0.13"
-windows = { version = "0.51", features = ["Win32_NetworkManagement_IpHelper", "Win32_Foundation", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"] }
+url = { version = "2.4" }
 
 [dev-dependencies]
-axum = { version = "0.7.4" }
-clap = { version = "4", features = ["derive"] }
-criterion = "0.5.1"
-crypto_box = { version = "0.9.1", features = ["serde", "chacha20"] }
-pretty_assertions = "1.4"
-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-relay = { version = "0.28", path = "../iroh-relay", features = ["test-utils", "server"] }
 iroh-test = "0.28.0"
-serde_json = "1.0.107"
+once_cell = "1.18.0"
+pretty_assertions = "1.4"
 testresult = "0.4.0"
-mainline = "2.0.1"
-iroh-relay = { version = "0.28", path = "../iroh-relay", features = ["test-utils", "server"] }
-
-
-[build-dependencies]
-duct = "0.13.6"
+tokio = { version = "1", default-features = false, features = ["test-util"] }
 
 [features]
-default = ["metrics", "discovery-pkarr-dht"]
-metrics = ["iroh-metrics/metrics"]
-test-utils = ["iroh-relay/test-utils", "iroh-relay/server", "dep:axum"]
-discovery-local-network = ["dep:swarm-discovery"]
-discovery-pkarr-dht = ["pkarr/dht", "dep:genawaiter"]
+default = ["metrics"]
+metrics = ["dep:iroh-metrics"]
 
 [package.metadata.docs.rs]
 all-features = true

iroh-netcheck/Cargo.toml

@@ -17,6 +17,7 @@ use anyhow::{anyhow, Context as _, Result};
 use bytes::Bytes;
 use hickory_resolver::TokioAsyncResolver as DnsResolver;
 use iroh_base::relay_map::{RelayMap, RelayNode, RelayUrl};
+#[cfg(feature = "metrics")]
 use iroh_metrics::inc;
 use iroh_relay::protos::stun;
 use netwatch::{IpFamily, UdpSocket};
@@ -29,12 +30,13 @@ use tracing::{debug, error, info_span, trace, warn, Instrument};
 
 pub mod defaults;
 mod dns;
+#[cfg(feature = "metrics")]
 mod metrics;
 mod ping;
 mod reportgen;
 
+#[cfg(feature = "metrics")]
 pub use metrics::Metrics;
-use Metrics as NetcheckMetrics;
 
 const FULL_REPORT_INTERVAL: Duration = Duration::from_secs(5 * 60);
 
@@ -356,7 +358,8 @@ impl Addr {
             payload,
             from_addr: src,
         }) {
-            inc!(NetcheckMetrics, stun_packets_dropped);
+            #[cfg(feature = "metrics")]
+            inc!(Metrics, stun_packets_dropped);
             warn!("dropping stun packet from {}", src);
         }
     }
@@ -512,9 +515,11 @@ impl Actor {
             self.reports.last = None; // causes ProbePlan::new below to do a full (initial) plan
             self.reports.next_full = false;
             self.reports.last_full = now;
-            inc!(NetcheckMetrics, reports_full);
+            #[cfg(feature = "metrics")]
+            inc!(Metrics, reports_full);
         }
-        inc!(NetcheckMetrics, reports);
+        #[cfg(feature = "metrics")]
+        inc!(Metrics, reports);
 
         let actor = reportgen::Client::new(
             self.addr(),
@@ -558,12 +563,13 @@ impl Actor {
             return;
         }
 
+        #[cfg(feature = "metrics")]
         match &src {
             SocketAddr::V4(_) => {
-                inc!(NetcheckMetrics, stun_packets_recv_ipv4);
+                inc!(Metrics, stun_packets_recv_ipv4);
             }
             SocketAddr::V6(_) => {
-                inc!(NetcheckMetrics, stun_packets_recv_ipv6);
+                inc!(Metrics, stun_packets_recv_ipv6);
             }
         }
 

iroh-netcheck/src/lib.rs

@@ -27,6 +27,7 @@ use std::{
 
 use anyhow::{anyhow, bail, Context as _, Result};
 use hickory_resolver::TokioAsyncResolver as DnsResolver;
+#[cfg(feature = "metrics")]
 use iroh_metrics::inc;
 use iroh_relay::{http::RELAY_PROBE_PATH, protos::stun};
 use netwatch::{interfaces, UdpSocket};
@@ -40,7 +41,8 @@ use tokio_util::task::AbortOnDropHandle;
 use tracing::{debug, debug_span, error, info_span, trace, warn, Instrument, Span};
 use url::Host;
 
-use super::NetcheckMetrics;
+#[cfg(feature = "metrics")]
+use crate::Metrics;
 use crate::{
     self as netcheck,
     defaults::DEFAULT_STUN_PORT,
@@ -807,10 +809,12 @@ async fn run_stun_probe(
 
             if matches!(probe, Probe::StunIpv4 { .. }) {
                 result.ipv4_can_send = true;
-                inc!(NetcheckMetrics, stun_packets_sent_ipv4);
+                #[cfg(feature = "metrics")]
+                inc!(Metrics, stun_packets_sent_ipv4);
             } else {
                 result.ipv6_can_send = true;
-                inc!(NetcheckMetrics, stun_packets_sent_ipv6);
+                #[cfg(feature = "metrics")]
+                inc!(Metrics, stun_packets_sent_ipv6);
             }
             let (delay, addr) = stun_rx
                 .await