update deps (irpc, iroh, iroh_blobs, iroh_gossip)

Author: Frando

Cargo.lock

@@ -21,6 +21,7 @@ derive_more = { version = "1.0.0", features = [
     "deref",
     "display",
     "from",
+    "from_str",
     "try_into",
     "into",
     "as_ref",
@@ -30,12 +31,12 @@ futures-buffered = "0.2.4"
 futures-lite = "2.3.0"
 futures-util = { version = "0.3.25" }
 hex = "0.4"
-iroh = { version = "0.90" }
-iroh-base = { version = "0.90", features = ["ticket"] }
-iroh-blobs = { version = "0.90" }
-iroh-gossip = { version = "0.90", features = ["net"] }
+iroh = { version = "0.91" }
+iroh-base = { version = "0.91", features = ["ticket"] }
+iroh-blobs = { version = "0.93" }
+iroh-gossip = { version = "0.91", features = ["net"] }
 iroh-metrics = { version = "0.35", default-features = false }
-irpc = { version = "0.5.0" }
+irpc = { version = "0.7.0" }
 n0-future = "0.1.3"
 num_enum = "0.7"
 postcard = { version = "1", default-features = false, features = [
@@ -61,7 +62,7 @@ tracing = "0.1"
 
 [dev-dependencies]
 data-encoding = "2.6.0"
-iroh = { version = "0.90", features = ["test-utils"] }
+iroh = { version = "0.91", features = ["test-utils"] }
 nested_enum_utils = "0.1.0"
 parking_lot = "0.12.3"
 proptest = "1.2.0"
@@ -94,6 +95,3 @@ missing_debug_implementations = "warn"
 # do.  To enable for a crate set `#![cfg_attr(iroh_docsrs,
 # feature(doc_cfg))]` in the crate.
 unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)"] }
-
-[patch.crates-io]
-iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "Frando/gc-protect" }

Cargo.toml

@@ -1,5 +1,5 @@
 use iroh::{protocol::Router, Endpoint};
-use iroh_blobs::{net_protocol::Blobs, store::mem::MemStore, ALPN as BLOBS_ALPN};
+use iroh_blobs::{store::mem::MemStore, BlobsProtocol, ALPN as BLOBS_ALPN};
 use iroh_docs::{protocol::Docs, ALPN as DOCS_ALPN};
 use iroh_gossip::{net::Gossip, ALPN as GOSSIP_ALPN};
 
@@ -27,7 +27,10 @@ async fn main() -> anyhow::Result<()> {
 
     // setup router
     let _router = builder
-        .accept(BLOBS_ALPN, Blobs::new(&blobs, endpoint.clone(), None))
+        .accept(
+            BLOBS_ALPN,
+            BlobsProtocol::new(&blobs, endpoint.clone(), None),
+        )
         .accept(GOSSIP_ALPN, gossip)
         .accept(DOCS_ALPN, docs)
         .spawn();

examples/setup.rs

@@ -32,11 +32,11 @@ use self::{
     protocol::{
         AddrInfoOptions, AuthorCreateRequest, AuthorDeleteRequest, AuthorExportRequest,
         AuthorGetDefaultRequest, AuthorImportRequest, AuthorListRequest, AuthorSetDefaultRequest,
-        CloseRequest, CreateRequest, DelRequest, DocsMessage, DocsProtocol, DocsService,
-        DropRequest, GetDownloadPolicyRequest, GetExactRequest, GetManyRequest,
-        GetSyncPeersRequest, ImportRequest, LeaveRequest, ListRequest, OpenRequest,
-        SetDownloadPolicyRequest, SetHashRequest, SetRequest, ShareMode, ShareRequest,
-        StartSyncRequest, StatusRequest, SubscribeRequest,
+        CloseRequest, CreateRequest, DelRequest, DocsProtocol, DropRequest,
+        GetDownloadPolicyRequest, GetExactRequest, GetManyRequest, GetSyncPeersRequest,
+        ImportRequest, LeaveRequest, ListRequest, OpenRequest, SetDownloadPolicyRequest,
+        SetHashRequest, SetRequest, ShareMode, ShareRequest, StartSyncRequest, StatusRequest,
+        SubscribeRequest,
     },
 };
 use crate::{
@@ -52,7 +52,7 @@ pub mod protocol;
 pub type RpcError = serde_error::Error;
 pub type RpcResult<T> = std::result::Result<T, RpcError>;
 
-type Client = irpc::Client<DocsMessage, DocsProtocol, DocsService>;
+type Client = irpc::Client<DocsProtocol>;
 
 /// API wrapper for the docs service
 #[derive(Debug, Clone)]
@@ -75,7 +75,10 @@ impl DocsApi {
 
     /// Listen for incoming RPC connections
     pub fn listen(&self, endpoint: quinn::Endpoint) -> Result<AbortOnDropHandle<()>> {
-        let local = self.inner.local().context("cannot listen on remote API")?;
+        let local = self
+            .inner
+            .as_local()
+            .context("cannot listen on remote API")?;
         let handler: Handler<DocsProtocol> = Arc::new(move |msg, _rx, tx| {
             let local = local.clone();
             Box::pin(match msg {

src/api.rs

@@ -15,7 +15,7 @@ use super::{
         AuthorGetDefaultResponse, AuthorImportRequest, AuthorImportResponse, AuthorListRequest,
         AuthorListResponse, AuthorSetDefaultRequest, AuthorSetDefaultResponse, CloseRequest,
         CloseResponse, CreateRequest, CreateResponse, DelRequest, DelResponse, DocsMessage,
-        DocsService, DropRequest, DropResponse, GetDownloadPolicyRequest,
+        DocsProtocol, DropRequest, DropResponse, GetDownloadPolicyRequest,
         GetDownloadPolicyResponse, GetExactRequest, GetExactResponse, GetManyRequest,
         GetSyncPeersRequest, GetSyncPeersResponse, ImportRequest, ImportResponse, LeaveRequest,
         LeaveResponse, ListRequest, ListResponse, OpenRequest, OpenResponse,
@@ -38,7 +38,7 @@ impl RpcActor {
         let (tx, rx) = tokio_mpsc::channel(64);
         let actor = Self { recv: rx, engine };
         task::spawn(actor.run());
-        let local = LocalSender::<DocsMessage, DocsService>::from(tx);
+        let local = LocalSender::<DocsProtocol>::from(tx);
         DocsApi {
             inner: local.into(),
         }
@@ -390,12 +390,7 @@ impl RpcActor {
             mode,
             addr_options,
         } = req;
-        let me = self
-            .endpoint
-            .node_addr()
-            .initialized()
-            .await
-            .map_err(|e| RpcError::new(&e))?;
+        let me = self.endpoint.node_addr().initialized().await;
         let me = addr_options.apply(&me);
 
         let capability = match mode {

src/api/actor.rs

@@ -7,7 +7,7 @@ use iroh::NodeAddr;
 use iroh_blobs::{api::blobs::ExportMode, Hash};
 use irpc::{
     channel::{mpsc, oneshot},
-    rpc_requests, Service,
+    rpc_requests,
 };
 use serde::{Deserialize, Serialize};
 
@@ -20,12 +20,6 @@ use crate::{
     SignedEntry,
 };
 
-/// The RPC service type for the docs protocol.
-#[derive(Debug, Clone, Copy)]
-pub struct DocsService;
-
-impl Service for DocsService {}
-
 /// Progress during import operations
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum ImportProgress {
@@ -310,7 +304,7 @@ pub struct AuthorDeleteResponse;
 
 // Use the macro to generate both the DocsProtocol and DocsMessage enums
 // plus implement Channels for each type
-#[rpc_requests(DocsService, message = DocsMessage)]
+#[rpc_requests(message = DocsMessage)]
 #[derive(Serialize, Deserialize, Debug)]
 pub enum DocsProtocol {
     #[rpc(tx = oneshot::Sender<RpcResult<OpenResponse>>)]

src/api/protocol.rs

@@ -159,35 +159,6 @@ impl Engine {
         })
     }
 
-    // TODO(Frando): We can't port iroh-docs to 0.90 without something like this.
-    // /// Return a callback that can be added to blobs to protect the content of
-    // /// all docs from garbage collection.
-    // pub fn protect_cb(&self) -> ProtectCb {
-    //     let sync = self.sync.clone();
-    //     Box::new(move |live| {
-    //         let sync = sync.clone();
-    //         Box::pin(async move {
-    //             let doc_hashes = match sync.content_hashes().await {
-    //                 Ok(hashes) => hashes,
-    //                 Err(err) => {
-    //                     tracing::warn!("Error getting doc hashes: {}", err);
-    //                     return;
-    //                 }
-    //             };
-    //             for hash in doc_hashes {
-    //                 match hash {
-    //                     Ok(hash) => {
-    //                         live.insert(hash);
-    //                     }
-    //                     Err(err) => {
-    //                         tracing::error!("Error getting doc hash: {}", err);
-    //                     }
-    //                 }
-    //             }
-    //         })
-    //     })
-    // }
-
     /// Get the blob store.
     pub fn blob_store(&self) -> &Store {
         &self.blob_store

src/engine.rs

@@ -112,7 +112,7 @@ impl Builder {
         };
         router = router.accept(
             iroh_blobs::ALPN,
-            iroh_blobs::net_protocol::Blobs::new(&blobs, endpoint.clone(), None),
+            iroh_blobs::BlobsProtocol::new(&blobs, endpoint.clone(), None),
         );
         router = router.accept(iroh_docs::ALPN, docs.clone());
         router = router.accept(iroh_gossip::ALPN, gossip.clone());