refactor: rename BlobsApi back to Request, remove unneeded code

Author: Frando

src/api.rs

@@ -12,14 +12,14 @@
 //!
 //! You can also [`connect`](Store::connect) to a remote store that is listening
 //! to rpc requests.
-use std::{io, net::SocketAddr, ops::Deref, sync::Arc};
+use std::{io, net::SocketAddr, ops::Deref};
 
 use bao_tree::io::EncodeError;
 use iroh::Endpoint;
-use irpc::rpc::{listen, Handler};
+use irpc::rpc::{listen, RemoteService};
 use n0_snafu::SpanTrace;
 use nested_enum_utils::common_fields;
-use proto::{BlobsApi, ShutdownRequest, SyncDbRequest};
+use proto::{Request, ShutdownRequest, SyncDbRequest};
 use ref_cast::RefCast;
 use serde::{Deserialize, Serialize};
 use snafu::{Backtrace, IntoError, Snafu};
@@ -32,7 +32,7 @@ pub mod remote;
 pub mod tags;
 pub use crate::{store::util::Tag, util::temp_tag::TempTag};
 
-pub(crate) type ApiClient = irpc::Client<proto::BlobsApi>;
+pub(crate) type ApiClient = irpc::Client<proto::Request>;
 
 #[common_fields({
     backtrace: Option<Backtrace>,
@@ -282,42 +282,8 @@ impl Store {
     /// Listen on a quinn endpoint for incoming rpc connections.
     pub async fn listen(self, endpoint: quinn::Endpoint) {
         let local = self.client.as_local().unwrap().clone();
-        let handler: Handler<BlobsApi> = Arc::new(move |req, rx, tx| {
-            let local = local.clone();
-            Box::pin({
-                match req {
-                    BlobsApi::SetTag(msg) => local.send((msg, tx)),
-                    BlobsApi::CreateTag(msg) => local.send((msg, tx)),
-                    BlobsApi::DeleteTags(msg) => local.send((msg, tx)),
-                    BlobsApi::RenameTag(msg) => local.send((msg, tx)),
-                    BlobsApi::ListTags(msg) => local.send((msg, tx)),
-
-                    BlobsApi::ListTempTags(msg) => local.send((msg, tx)),
-                    BlobsApi::CreateTempTag(msg) => local.send((msg, tx)),
-
-                    BlobsApi::BlobStatus(msg) => local.send((msg, tx)),
-
-                    BlobsApi::ImportBytes(msg) => local.send((msg, tx)),
-                    BlobsApi::ImportByteStream(msg) => local.send((msg, tx, rx)),
-                    BlobsApi::ImportBao(msg) => local.send((msg, tx, rx)),
-                    BlobsApi::ImportPath(msg) => local.send((msg, tx)),
-                    BlobsApi::ListBlobs(msg) => local.send((msg, tx)),
-                    BlobsApi::DeleteBlobs(msg) => local.send((msg, tx)),
-                    BlobsApi::Batch(msg) => local.send((msg, tx, rx)),
-
-                    BlobsApi::ExportBao(msg) => local.send((msg, tx)),
-                    BlobsApi::ExportRanges(msg) => local.send((msg, tx)),
-                    BlobsApi::ExportPath(msg) => local.send((msg, tx)),
-
-                    BlobsApi::Observe(msg) => local.send((msg, tx)),
-
-                    BlobsApi::ClearProtected(msg) => local.send((msg, tx)),
-                    BlobsApi::SyncDb(msg) => local.send((msg, tx)),
-                    BlobsApi::Shutdown(msg) => local.send((msg, tx)),
-                }
-            })
-        });
-        listen::<BlobsApi>(endpoint, handler).await
+        let handler = Request::remote_handler(local);
+        listen::<Request>(endpoint, handler).await
     }
 
     pub async fn sync_db(&self) -> RequestResult<()> {

src/api/proto.rs

@@ -88,7 +88,7 @@ impl HashSpecific for CreateTagMsg {
 
 #[rpc_requests(message = Command, alias = "Msg")]
 #[derive(Debug, Serialize, Deserialize)]
-pub enum BlobsApi {
+pub enum Request {
     #[rpc(tx = mpsc::Sender<super::Result<Hash>>)]
     ListBlobs(ListRequest),
     #[rpc(tx = oneshot::Sender<Scope>, rx = mpsc::Receiver<BatchResponse>)]

src/store/fs.rs

@@ -1259,7 +1259,7 @@ impl AsRef<Store> for FsStore {
 
 impl FsStore {
     fn new(
-        sender: irpc::LocalSender<proto::BlobsApi>,
+        sender: irpc::LocalSender<proto::Request>,
         db: tokio::sync::mpsc::Sender<InternalCommand>,
     ) -> Self {
         Self {

src/store/fs/import.rs

@@ -38,9 +38,8 @@ use crate::{
     api::{
         blobs::{AddProgressItem, ImportMode},
         proto::{
-            BlobsApi, HashSpecific, ImportByteStreamMsg, ImportByteStreamRequest,
-            ImportByteStreamUpdate, ImportBytesMsg, ImportBytesRequest, ImportPathMsg,
-            ImportPathRequest, Scope,
+            HashSpecific, ImportByteStreamMsg, ImportByteStreamRequest, ImportByteStreamUpdate,
+            ImportBytesMsg, ImportBytesRequest, ImportPathMsg, ImportPathRequest, Request, Scope,
         },
     },
     store::{
@@ -136,12 +135,12 @@ impl std::fmt::Debug for ImportEntry {
     }
 }
 
-impl Channels<BlobsApi> for ImportEntry {
+impl Channels<Request> for ImportEntry {
     type Tx = mpsc::Sender<AddProgressItem>;
     type Rx = NoReceiver;
 }
 
-pub type ImportEntryMsg = WithChannels<ImportEntry, BlobsApi>;
+pub type ImportEntryMsg = WithChannels<ImportEntry, Request>;
 
 impl HashSpecific for ImportEntryMsg {
     fn hash(&self) -> Hash {