refactor: add rpc feature flag

Author: Frando

Cargo.lock

@@ -36,11 +36,11 @@ chrono = "0.4.39"
 nested_enum_utils = "0.2.1"
 ref-cast = "1.0.24"
 arrayvec = "0.7.6"
-iroh = "0.93"
+iroh = { version = "0.93", default-features = false }
 self_cell = "1.1.0"
 genawaiter = { version = "0.99.1", features = ["futures03"] }
 iroh-base = "0.93"
-irpc = { version = "0.9.0", features = ["rpc", "quinn_endpoint_setup", "spans", "stream", "derive"], default-features = false }
+irpc = { version = "0.9.0", features = ["spans", "stream", "derive", "varint-util"], default-features = false }
 iroh-metrics = { version = "0.36" }
 redb = { version = "2.6.3", optional = true }
 reflink-copy = { version = "0.1.24", optional = true }
@@ -62,9 +62,15 @@ atomic_refcell = "0.1.13"
 iroh = { version = "0.93", features = ["discovery-local-network"]}
 async-compression = { version = "0.4.30", features = ["lz4", "tokio"] }
 concat_const = "0.2.0"
+irpc = { version = "0.9.0", features = ["rpc", "quinn_endpoint_setup", "spans", "stream", "derive"], default-features = false }
 
 [features]
 hide-proto-docs = []
 metrics = []
-default = ["hide-proto-docs", "fs-store"]
+default = ["hide-proto-docs", "fs-store", "rpc"]
 fs-store = ["dep:redb", "dep:reflink-copy"]
+rpc = ["irpc/rpc", "irpc/quinn_endpoint_setup"]
+
+[patch.crates-io]
+# irpc = { git = "https://github.com/n0-computer/irpc", branch = "Frando/varint-feature" }
+irpc = { path = "../irpc" }

Cargo.toml

@@ -12,14 +12,13 @@
 //!
 //! You can also [`connect`](Store::connect) to a remote store that is listening
 //! to rpc requests.
-use std::{io, net::SocketAddr, ops::Deref};
+use std::{io, ops::Deref};
 
 use bao_tree::io::EncodeError;
 use iroh::Endpoint;
-use irpc::rpc::{listen, RemoteService};
 use n0_snafu::SpanTrace;
 use nested_enum_utils::common_fields;
-use proto::{Request, ShutdownRequest, SyncDbRequest};
+use proto::{ShutdownRequest, SyncDbRequest};
 use ref_cast::RefCast;
 use serde::{Deserialize, Serialize};
 use snafu::{Backtrace, IntoError, Snafu};
@@ -128,6 +127,7 @@ impl From<irpc::Error> for ExportBaoError {
             irpc::Error::OneshotRecv(e) => OneshotRecvSnafu.into_error(e),
             irpc::Error::Send(e) => SendSnafu.into_error(e),
             irpc::Error::Request(e) => RequestSnafu.into_error(e),
+            #[cfg(feature = "rpc")]
             irpc::Error::Write(e) => ExportBaoIoSnafu.into_error(e.into()),
         }
     }
@@ -220,6 +220,7 @@ impl From<irpc::channel::mpsc::RecvError> for Error {
     }
 }
 
+#[cfg(feature = "rpc")]
 impl From<irpc::rpc::WriteError> for Error {
     fn from(e: irpc::rpc::WriteError) -> Self {
         Self::Io(e.into())
@@ -298,16 +299,20 @@ impl Store {
     }
 
     /// Connect to a remote store as a rpc client.
-    pub fn connect(endpoint: quinn::Endpoint, addr: SocketAddr) -> Self {
+    #[cfg(feature = "rpc")]
+    pub fn connect(endpoint: quinn::Endpoint, addr: std::net::SocketAddr) -> Self {
         let sender = irpc::Client::quinn(endpoint, addr);
         Store::from_sender(sender)
     }
 
     /// Listen on a quinn endpoint for incoming rpc connections.
+    #[cfg(feature = "rpc")]
     pub async fn listen(self, endpoint: quinn::Endpoint) {
+        use self::proto::Request;
+        use irpc::rpc::RemoteService;
         let local = self.client.as_local().unwrap().clone();
         let handler = Request::remote_handler(local);
-        listen::<Request>(endpoint, handler).await
+        irpc::rpc::listen::<Request>(endpoint, handler).await
     }
 
     pub async fn sync_db(&self) -> RequestResult<()> {

src/api.rs

@@ -31,7 +31,7 @@ pub struct Downloader {
     client: irpc::Client<SwarmProtocol>,
 }
 
-#[rpc_requests(message = SwarmMsg, alias = "Msg")]
+#[rpc_requests(message = SwarmMsg, alias = "Msg", rpc_feature = "rpc")]
 #[derive(Debug, Serialize, Deserialize)]
 enum SwarmProtocol {
     #[rpc(tx = mpsc::Sender<DownloadProgressItem>)]

src/api/downloader.rs

@@ -87,7 +87,7 @@ impl HashSpecific for CreateTagMsg {
     }
 }
 
-#[rpc_requests(message = Command, alias = "Msg")]
+#[rpc_requests(message = Command, alias = "Msg", rpc_feature = "rpc")]
 #[derive(Debug, Serialize, Deserialize)]
 pub enum Request {
     #[rpc(tx = mpsc::Sender<super::Result<Hash>>)]

src/api/proto.rs

@@ -531,7 +531,7 @@ impl EventSender {
     }
 }
 
-#[rpc_requests(message = ProviderMessage)]
+#[rpc_requests(message = ProviderMessage, rpc_feature = "rpc")]
 #[derive(Debug, Serialize, Deserialize)]
 pub enum ProviderProto {
     /// A new client connected to the provider.
@@ -705,10 +705,15 @@ mod irpc_ext {
                             .map_err(irpc::Error::from)?;
                         Ok(req_tx)
                     }
+                    #[cfg(feature = "rpc")]
                     irpc::Request::Remote(remote) => {
                         let (s, _) = remote.write(msg).await?;
                         Ok(s.into())
                     }
+                    #[cfg(not(feature = "rpc"))]
+                    irpc::Request::Remote(_) => {
+                        unreachable!()
+                    }
                 }
             }
         }