refactor(iroh): move blobs protocol to iroh-blobs

Depends on n0-computer/iroh-blobs#6

Author: dignifiedquire

Cargo.lock

@@ -52,5 +52,5 @@ iroh-metrics = { path = "./iroh-metrics" }
 iroh-test = { path = "./iroh-test" }
 iroh-router = { path = "./iroh-router" }
 
-iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "main" }
+iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "refactor-blobs-protocol" }
 iroh-gossip = { git = "https://github.com/n0-computer/iroh-gossip", branch = "main" }

Cargo.toml

@@ -74,10 +74,12 @@ use futures_lite::{Stream, StreamExt};
 use futures_util::SinkExt;
 use genawaiter::sync::{Co, Gen};
 use iroh_base::{node_addr::AddrInfoOptions, ticket::BlobTicket};
+pub use iroh_blobs::net_protocol::DownloadMode;
 use iroh_blobs::{
     export::ExportProgress as BytesExportProgress,
     format::collection::{Collection, SimpleStore},
     get::db::DownloadProgress as BytesDownloadProgress,
+    net_protocol::BlobDownloadRequest,
     store::{BaoBlobSize, ConsistencyCheckProgress, ExportFormat, ExportMode, ValidateProgress},
     util::SetTagOption,
     BlobFormat, Hash, Tag,
@@ -90,6 +92,7 @@ use serde::{Deserialize, Serialize};
 use tokio::io::{AsyncRead, AsyncReadExt, ReadBuf};
 use tokio_util::io::{ReaderStream, StreamReader};
 use tracing::warn;
+
 mod batch;
 pub use batch::{AddDirOpts, AddFileOpts, AddReaderOpts, Batch};
 
@@ -98,8 +101,8 @@ use crate::rpc_protocol::{
     blobs::{
         AddPathRequest, AddStreamRequest, AddStreamUpdate, BatchCreateRequest, BatchCreateResponse,
         BlobStatusRequest, ConsistencyCheckRequest, CreateCollectionRequest,
-        CreateCollectionResponse, DeleteRequest, DownloadRequest, ExportRequest,
-        ListIncompleteRequest, ListRequest, ReadAtRequest, ReadAtResponse, ValidateRequest,
+        CreateCollectionResponse, DeleteRequest, ExportRequest, ListIncompleteRequest, ListRequest,
+        ReadAtRequest, ReadAtResponse, ValidateRequest,
     },
     node::StatusRequest,
 };
@@ -357,7 +360,7 @@ impl Client {
         } = opts;
         let stream = self
             .rpc
-            .server_streaming(DownloadRequest {
+            .server_streaming(BlobDownloadRequest {
                 hash,
                 format,
                 nodes,
@@ -980,20 +983,6 @@ pub struct DownloadOptions {
     pub mode: DownloadMode,
 }
 
-/// Set the mode for whether to directly start the download or add it to the download queue.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum DownloadMode {
-    /// Start the download right away.
-    ///
-    /// No concurrency limits or queuing will be applied. It is up to the user to manage download
-    /// concurrency.
-    Direct,
-    /// Queue the download.
-    ///
-    /// The download queue will be processed in-order, while respecting the downloader concurrency limits.
-    Queued,
-}
-
 #[cfg(test)]
 mod tests {
     use iroh_blobs::hashseq::HashSeq;

iroh/src/client/blobs.rs

@@ -11,6 +11,7 @@ use futures_lite::StreamExt;
 use futures_util::{sink::Buffer, FutureExt, SinkExt, Stream};
 use iroh_blobs::{
     format::collection::Collection,
+    net_protocol::BatchId,
     provider::BatchAddPathProgress,
     store::ImportMode,
     util::{SetTagOption, TagDrop},
@@ -27,7 +28,7 @@ use crate::{
     rpc_protocol::{
         blobs::{
             BatchAddPathRequest, BatchAddStreamRequest, BatchAddStreamResponse,
-            BatchAddStreamUpdate, BatchCreateTempTagRequest, BatchId, BatchUpdate,
+            BatchAddStreamUpdate, BatchCreateTempTagRequest, BatchUpdate,
         },
         tags::{self, SyncMode},
     },

iroh/src/client/blobs/batch.rs

@@ -50,6 +50,7 @@ use futures_lite::StreamExt;
 use futures_util::future::{MapErr, Shared};
 use iroh_base::key::PublicKey;
 use iroh_blobs::{
+    net_protocol::Blobs as BlobsProtocol,
     store::Store as BaoStore,
     util::local_pool::{LocalPool, LocalPoolHandle},
 };
@@ -59,7 +60,6 @@ use iroh_net::{
     AddrInfo, Endpoint, NodeAddr,
 };
 use iroh_router::{ProtocolHandler, Router};
-use protocol::blobs::BlobsProtocol;
 use quic_rpc::{transport::ServerEndpoint as _, RpcServer};
 use tokio::task::{JoinError, JoinSet};
 use tokio_util::{sync::CancellationToken, task::AbortOnDropHandle};

iroh/src/node.rs

@@ -11,6 +11,7 @@ use futures_util::{FutureExt as _, TryFutureExt as _};
 use iroh_base::key::SecretKey;
 use iroh_blobs::{
     downloader::Downloader,
+    net_protocol::Blobs as BlobsProtocol,
     provider::EventSender,
     store::{Map, Store as BaoStore},
     util::local_pool::{self, LocalPool, LocalPoolHandle, PanicMode},
@@ -36,10 +37,7 @@ use tracing::{debug, error_span, trace, Instrument};
 use super::{rpc_status::RpcStatus, IrohServerEndpoint, JoinErrToStr, Node, NodeInner};
 use crate::{
     client::RPC_ALPN,
-    node::{
-        nodes_storage::load_node_addrs,
-        protocol::{blobs::BlobsProtocol, docs::DocsProtocol},
-    },
+    node::{nodes_storage::load_node_addrs, protocol::docs::DocsProtocol},
     rpc_protocol::RpcService,
     util::{fs::load_secret_key, path::IrohPaths},
 };

iroh/src/node/builder.rs

@@ -1,2 +1 @@
-pub(crate) mod blobs;
 pub(crate) mod docs;