refactor(iroh-cli)!: Use config and logging from iroh-node-utils

Cargo.toml

@@ -12,6 +12,7 @@ members = [
   "iroh-router",
   "net-tools/netwatch",
   "net-tools/portmapper",
+  "iroh-node-util",
 ]
 resolver = "2"
 

iroh-cli/Cargo.toml

@@ -33,7 +33,6 @@ console = "0.15.5"
 crossterm = "0.27.0"
 derive_more = { version = "1.0.0", features = ["display"] }
 dialoguer = { version = "0.11.0", default-features = false }
-dirs-next = "2.0.0"
 futures-buffered = "0.2.4"
 futures-lite = "2.3"
 futures-util = { version = "0.3.30", features = ["futures-sink"] }
@@ -45,6 +44,7 @@ iroh-blobs = { version = "0.28.1", features = ["cli"] }
 iroh-docs = { version = "0.28.0", features = ["cli"] }
 iroh-gossip = { version = "0.28.1", features = ["cli"] }
 iroh-metrics = { version = "0.28.0" }
+iroh-node-util = { path = "../iroh-node-util", features = ["config", "logging"] }
 parking_lot = "0.12.1"
 pkarr = { version = "2.2.0", default-features = false }
 portable-atomic = "1"
@@ -56,7 +56,6 @@ ratatui = "0.26.2"
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
 rustyline = "12.0.0"
 serde = { version = "1.0.197", features = ["derive"] }
-serde_with = "3.7.0"
 shell-words = "1.1.0"
 shellexpand = "3.1.0"
 strum = { version = "0.26.2", features = ["derive"] }
@@ -67,8 +66,6 @@ tokio = { version = "1.36.0", features = ["full"] }
 tokio-util = { version = "0.7.12", features = ["rt"] }
 toml = { version = "0.8.12", features = ["preserve_order"] }
 tracing = "0.1.40"
-tracing-appender = "0.2.3"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [dev-dependencies]
 duct = "0.13.6"

iroh-cli/src/commands.rs

@@ -128,7 +128,7 @@ impl Cli {
                     )
                     .await
                 } else {
-                    crate::logging::init_terminal_logging()?;
+                    iroh_node_util::logging::init_terminal_logging()?;
                     let iroh = if let Some(addr) = self.rpc_addr {
                         Iroh::connect_addr(addr).await.context("rpc connect")?
                     } else {
@@ -154,7 +154,7 @@ impl Cli {
                     )
                     .await
                 } else {
-                    crate::logging::init_terminal_logging()?;
+                    iroh_node_util::logging::init_terminal_logging()?;
                     let iroh = if let Some(addr) = self.rpc_addr {
                         Iroh::connect_addr(addr).await.context("rpc connect")?
                     } else {

iroh-cli/src/commands/doctor.rs

@@ -44,6 +44,7 @@ use iroh::{
     util::{path::IrohPaths, progress::ProgressWriter},
 };
 use iroh_metrics::core::Core;
+use iroh_node_util::config::data_root;
 use portable_atomic::AtomicU64;
 use postcard::experimental::max_size::MaxSize;
 use rand::Rng;
@@ -53,7 +54,7 @@ use tokio::{io::AsyncWriteExt, sync};
 use tokio_util::task::AbortOnDropHandle;
 use tracing::warn;
 
-use crate::config::{iroh_data_root, NodeConfig};
+use crate::config::NodeConfig;
 
 /// Options for the secret key usage.
 #[derive(Debug, Clone, derive_more::Display)]
@@ -1016,7 +1017,7 @@ fn create_secret_key(secret_key: SecretKeyOption) -> anyhow::Result<SecretKey> {
             SecretKey::try_from(&bytes[..])?
         }
         SecretKeyOption::Local => {
-            let path = IrohPaths::SecretKey.with_root(iroh_data_root()?);
+            let path = IrohPaths::SecretKey.with_root(data_root("iroh")?);
             if path.exists() {
                 let bytes = std::fs::read(&path)?;
                 SecretKey::try_from_openssh(bytes)?
@@ -1108,8 +1109,9 @@ fn inspect_ticket(ticket: &str, zbase32: bool) -> anyhow::Result<()> {
 
 /// Runs the doctor commands.
 pub async fn run(command: Commands, config: &NodeConfig) -> anyhow::Result<()> {
-    let data_dir = iroh_data_root()?;
-    let _guard = crate::logging::init_terminal_and_file_logging(&config.file_logs, &data_dir)?;
+    let data_dir = data_root("iroh")?;
+    let _guard =
+        iroh_node_util::logging::init_terminal_and_file_logging(&config.file_logs, &data_dir)?;
     let metrics_fut = super::start::start_metrics_server(config.metrics_addr);
     let cmd_res = match command {
         Commands::Report {

iroh-cli/src/commands/rpc.rs

@@ -101,7 +101,7 @@ impl RpcCommands {
             Self::Tags { command } => command.run(&iroh.tags()).await,
             Self::Gossip { command } => command.run(&iroh.gossip()).await,
             Self::Stats => {
-                let stats = iroh.stats().await?;
+                let stats = iroh.node().stats().await?;
                 for (name, details) in stats.iter() {
                     println!(
                         "{:23} : {:>6}    ({})",
@@ -111,11 +111,11 @@ impl RpcCommands {
                 Ok(())
             }
             Self::Shutdown { force } => {
-                iroh.shutdown(force).await?;
+                iroh.node().shutdown(force).await?;
                 Ok(())
             }
             Self::Status => {
-                let response = iroh.status().await?;
+                let response = iroh.node().status().await?;
                 println!("Listening addresses: {:#?}", response.listen_addrs);
                 println!("Node ID: {}", response.addr.node_id);
                 println!("Version: {}", response.version);

iroh-cli/src/commands/start.rs

@@ -46,7 +46,8 @@ where
     F: FnOnce(iroh::client::Iroh) -> T + Send + 'static,
     T: Future<Output = Result<()>> + 'static,
 {
-    let _guard = crate::logging::init_terminal_and_file_logging(&config.file_logs, iroh_data_root)?;
+    let _guard =
+        iroh_node_util::logging::init_terminal_and_file_logging(&config.file_logs, iroh_data_root)?;
     let metrics_fut = start_metrics_server(config.metrics_addr);
     let metrics_dumper_fut =
         start_metrics_dumper(config.metrics_dump_path.clone(), Duration::from_millis(100));