Add rpc types

Author: rklaehn

Cargo.lock

@@ -21,6 +21,7 @@ chrono = "0.4.31"
 derive_more = { version = "1.0.0", features = ["debug", "display", "deref", "deref_mut", "from", "try_into", "into"] }
 futures-buffered = "0.2.4"
 futures-lite = "2.3"
+futures-util = { version = "0.3.30", optional = true }
 genawaiter = { version = "0.99.1", features = ["futures03"] }
 hashlink = { version = "0.9.0", optional = true }
 hex = "0.4.3"
@@ -29,27 +30,34 @@ iroh-io = { version = "0.6.0", features = ["stats"] }
 iroh-metrics = { version = "0.27.0", default-features = false }
 iroh-net = { version = "0.27.0" }
 iroh-router = "0.27.0"
+nested_enum_utils = { version = "0.1.0", optional = true }
 num_cpus = "1.15.0"
 oneshot = "0.1.8"
 parking_lot = { version = "0.12.1", optional = true }
 pin-project = "1.1.5"
+portable-atomic = { version = "1.9.0", optional = true }
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] }
+quic-rpc = { version = "0.13.0", optional = true }
+quic-rpc-derive = { version = "0.13.0", optional = true }
 quinn = { package = "iroh-quinn", version = "0.11", features = ["ring"] }
 rand = "0.8"
 range-collections = "0.4.0"
 redb = { version = "2.0.0", optional = true }
 redb_v1  = { package = "redb", version = "1.5.1", optional = true }
+ref-cast = { version = "1.0.23", optional = true }
 reflink-copy = { version = "0.1.8", optional = true }
 self_cell = "1.0.1"
 serde = { version = "1", features = ["derive"] }
 serde-error = "0.1.3"
 smallvec = { version = "1.10.0", features = ["serde", "const_new"] }
+strum = { version = "0.26.3", optional = true }
 tempfile = { version = "3.10.0", optional = true }
 thiserror = "1"
 tokio = { version = "1", features = ["fs"] }
 tokio-util = { version = "0.7", features = ["io-util", "io"] }
 tracing = "0.1"
 tracing-futures = "0.2.5"
+walkdir = { version = "2.5.0", optional = true }
 
 [dev-dependencies]
 http-body = "0.4.5"
@@ -65,13 +73,18 @@ rcgen = "0.12.0"
 rustls = { version = "0.23", default-features = false, features = ["ring"] }
 tempfile = "3.10.0"
 futures-util = "0.3.30"
+testdir = "0.9.1"
 
 [features]
-default = ["fs-store"]
+default = ["fs-store", "rpc"]
 downloader = ["dep:parking_lot", "tokio-util/time", "dep:hashlink"]
 fs-store = ["dep:reflink-copy", "redb", "dep:redb_v1", "dep:tempfile"]
 metrics = ["iroh-metrics/metrics"]
 redb = ["dep:redb"]
+rpc = ["dep:quic-rpc", "dep:quic-rpc-derive", "dep:nested_enum_utils", "dep:strum", "dep:futures-util", "dep:ref-cast", "dep:portable-atomic", "dep:walkdir", "downloader"]
+ref-cast = ["dep:ref-cast"]
+portable-atomic = ["dep:portable-atomic"]
+walkdir = ["dep:walkdir"]
 
 [package.metadata.docs.rs]
 all-features = true

Cargo.toml

@@ -40,6 +40,9 @@ pub mod metrics;
 pub mod net_protocol;
 pub mod protocol;
 pub mod provider;
+#[cfg(feature = "rpc")]
+#[cfg_attr(iroh_docsrs, doc(cfg(feature = "rpc")))]
+pub mod rpc;
 pub mod store;
 pub mod util;
 

src/lib.rs

@@ -0,0 +1,3 @@
+//! Provides a rpc protocol as well as a client for the protocol
+pub mod client;
+pub mod proto;

src/rpc.rs

@@ -0,0 +1,20 @@
+//! Iroh blobs and tags client
+use anyhow::Result;
+use futures_util::{Stream, StreamExt};
+
+pub mod blobs;
+pub mod tags;
+
+fn flatten<T, E1, E2>(
+    s: impl Stream<Item = Result<Result<T, E1>, E2>>,
+) -> impl Stream<Item = Result<T>>
+where
+    E1: std::error::Error + Send + Sync + 'static,
+    E2: std::error::Error + Send + Sync + 'static,
+{
+    s.map(|res| match res {
+        Ok(Ok(res)) => Ok(res),
+        Ok(Err(err)) => Err(err.into()),
+        Err(err) => Err(err.into()),
+    })
+}