Merge branch 'main' into b5/dockerize

.github/workflows/ci.yml

@@ -34,6 +34,8 @@ jobs:
             release-arch: amd64
     env:
       RUST_BACKTRACE: full
+      # Force not building debuginfo to save space on disk.
+      RUSTFLAGS: "-C debuginfo=0"
       RUSTC_WRAPPER: sccache
       RUSTV: ${{ matrix.rust }}
       SCCACHE_CACHE_SIZE: 2G
@@ -135,7 +137,7 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: check
-        args: --all --bins --tests --examples
+        args: --workspace --all-features --bins --tests --examples --benches
 
     - name: tests
       uses: actions-rs/cargo@v1
@@ -145,17 +147,17 @@ jobs:
         # GHA if this is not present
         # https://twitter.com/steipete/status/921066430220652544?lang=en
         # https://blog.phusion.nl/2017/10/13/why-ruby-app-servers-break-on-macos-high-sierra-and-what-can-be-done-about-it/
-        OBJC_DISABLE_INITIALIZE_FORK_SAFETY: YES
+        OBJC_DISABLE_INITIALIZE_FORK_SAFETY: "YES"
       with:
         command: test
-        args: --all -j 4
+        args: -j 2 --workspace --all-features --examples --benches --bins
 
-    - name: clipy
+    - name: clippy
       uses: actions-rs/cargo@v1
       if: matrix.os == 'ubuntu-latest' && matrix.rust=='stable'
       with:
-          command: clippy
-          args: --all --tests --benches --all-targets -- -D warnings
+        command: clippy
+        args: --workspace --all-features --tests --benches --examples --bins --all-targets -- -D warnings
 
     - name: build release
       uses: actions-rs/cargo@v1
@@ -257,4 +259,4 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
-          args: --all -- --check
+          args: --all -- --check

DEVELOPERS.md

@@ -81,15 +81,15 @@ When you push your branch to github and open up a pull request, it will automati
 In order to catch linting and testing errors before pushing the code to github, be sure to run:
 
 ```shell
-$ cargo clippy --workspace --examples --benches --tests
-$ cargo test --workspace --examples --benches
+$ cargo clippy --workspace --all-features --examples --benches --tests --bins
+$ cargo test --workspace --all-features --examples --benches --bins
 ```
 
 Setting up a [git hook][git-hook] to run these commands can save you many headaches:
 
 ```shell
 #!/bin/sh
-cargo clippy --workspace --examples --tests --benches && cargo test --workspace --examples
+cargo clippy --workspace --all-features --examples --benches --tests --bins && cargo test --workspace --all-features --examples --benches --bins
 ```
 
 ## <a name="dependecies"></a> Dependencies

iroh-metrics/src/config.rs

@@ -133,7 +133,7 @@ mod tests {
         #[cfg(feature = "tokio-console")]
         expect.insert(
             "tokio_console".to_string(),
-            Value::new(None, cfg.tokio_console.clone()),
+            Value::new(None, cfg.tokio_console),
         );
         let got = cfg.collect().unwrap();
         for key in got.keys() {

iroh-one/Cargo.toml

@@ -29,6 +29,7 @@ iroh-store = {path = "../iroh-store", default-features = false, features = ["rpc
 iroh-util = {path = "../iroh-util"}
 reqwest = {version = "0.11", features = ["rustls-tls"], default-features = false}
 serde = {version = "1.0", features = ["derive"]}
+tempfile = { version = "3.3.0", optional = true }
 tokio = {version = "1", features = ["macros", "rt-multi-thread", "process"]}
 tracing = "0.1.33"
 
@@ -41,4 +42,4 @@ rpc-grpc = ["iroh-rpc-types/grpc", "iroh-rpc-client/grpc", "iroh-metrics/rpc-grp
 rpc-mem = ["iroh-rpc-types/mem", "iroh-rpc-client/mem"]
 # uds-gateway controls whether http over uds is enabled. This is independent of the
 # rpc-grpc control endpoint.
-uds-gateway = []
+uds-gateway = ["tempfile"]

iroh-one/src/config.rs

@@ -62,7 +62,9 @@ impl Config {
     /// as a single entry point for other system services if feature enabled.
     pub fn default_rpc_config() -> RpcClientConfig {
         #[cfg(feature = "uds-gateway")]
-        let path: PathBuf = tempdir::TempDir::new("iroh")
+        let path: PathBuf = tempfile::Builder::new()
+            .prefix("iroh")
+            .tempfile()
             .unwrap()
             .path()
             .join("ipfsd.http");
@@ -93,7 +95,12 @@ impl Config {
 impl Default for Config {
     fn default() -> Self {
         #[cfg(feature = "uds-gateway")]
-        let gateway_uds_path: PathBuf = TempDir::new("iroh").unwrap().path().join("ipfsd.http");
+        let gateway_uds_path: PathBuf = tempfile::Builder::new()
+            .prefix("iroh")
+            .tempfile()
+            .unwrap()
+            .path()
+            .join("ipfsd.http");
         let rpc_client = Self::default_rpc_config();
         let metrics_config = MetricsConfig::default();
         let store_config =

iroh-one/src/main.rs

@@ -15,8 +15,6 @@ use iroh_rpc_client::Client as RpcClient;
 use iroh_rpc_types::Addr;
 use iroh_util::lock::ProgramLock;
 use iroh_util::{iroh_config_path, make_config};
-#[cfg(feature = "uds-gateway")]
-use tempdir::TempDir;
 use tokio::sync::RwLock;
 
 #[tokio::main(flavor = "multi_thread")]
@@ -109,14 +107,18 @@ async fn main() -> Result<()> {
 
     #[cfg(feature = "uds-gateway")]
     let uds_server_task = {
-        let mut path = TempDir::new("iroh")?.path().join("ipfsd.http");
+        let mut path = tempfile::Builder::new()
+            .prefix("iroh")
+            .tempdir()?
+            .path()
+            .join("ipfsd.http");
         if let Some(uds_path) = config.gateway_uds_path {
             path = uds_path;
         } else {
             // Create the parent path when using the default value since it's likely
             // it won't exist yet.
             if let Some(parent) = path.parent() {
-                let _ = std::fs::create_dir_all(&parent);
+                let _ = std::fs::create_dir_all(parent);
             }
         }
 

iroh-one/src/uds.rs

@@ -8,7 +8,7 @@ use hyper::{
     server::accept::Accept,
 };
 use iroh_gateway::{core::State, handlers::get_app_routes};
-use iroh_resolver::resolver::ContentLoader;
+use iroh_resolver::content_loader::ContentLoader;
 use std::path::PathBuf;
 use std::{
     io,

iroh-share/Cargo.toml

@@ -26,7 +26,7 @@ libp2p = { version = "0.50", default-features = false, features = ["gossipsub"]
 multibase = "0.9.1"
 rand = "0.8.5"
 serde = { version = "1", features = ["derive"] }
-tempfile = "3.3"
+tempfile = "3.3.0"
 tokio = { version = "1" }
 tokio-stream = "0.1.9"
 tracing = "0.1.34"

iroh/src/run.rs

@@ -37,6 +37,7 @@ pub struct Cli {
 enum Commands {
     P2p(P2p),
     #[clap(about = "Add a file or directory to iroh & make it available on IPFS")]
+    #[clap(after_help = doc::ADD_LONG_DESCRIPTION )]
     Add {
         /// The path to a file or directory to be added
         path: PathBuf,

iroh/src/services.rs

@@ -14,8 +14,7 @@ use iroh_util::lock::{LockError, ProgramLock};
 
 const SERVICE_START_TIMEOUT_SECONDS: u64 = 15;
 
-/// start any of {iroh-gateway,iroh-store,iroh-p2p} that aren't currently
-/// running.
+/// Start any given services that aren't currently running.
 pub async fn start(api: &Api, services: &Vec<String>) -> Result<()> {
     let services = match services.is_empty() {
         true => HashSet::from(["gateway", "store"]),
@@ -232,7 +231,7 @@ where
     W: Write,
 {
     w.queue(style::PrintStyledContent(
-        "Process\t\t\tNumber\tStatus\n".bold(),
+        "Service\t\t\tNumber\tStatus\n".bold(),
     ))?;
     queue_row(&table.gateway, &mut w)?;
     queue_row(&table.p2p, &mut w)?;
@@ -326,7 +325,7 @@ mod tests {
 
     #[test]
     fn status_table_queue() {
-        let expect = format!("{}gateway\t\t\t1/1\t{}\np2p\t\t\t1/1\t{}\nstore\t\t\t1/1\t{}\tThe service is currently unavailable\n", "Process\t\t\tNumber\tStatus\n".bold(), "Unknown".dark_yellow(), "Serving".green(), "Down".grey());
+        let expect = format!("{}gateway\t\t\t1/1\t{}\np2p\t\t\t1/1\t{}\nstore\t\t\t1/1\t{}\tThe service is currently unavailable\n", "Service\t\t\tNumber\tStatus\n".bold(), "Unknown".dark_yellow(), "Serving".green(), "Down".grey());
         let table = StatusTable::new(
             Some(StatusRow::new("gateway", 1, ServiceStatus::Unknown)),
             Some(StatusRow::new("p2p", 1, ServiceStatus::Serving)),