Remove all protobuf code from the ipc crate.

saveoursecrets · Dec 6, 2024 · e3a2479 · e3a2479
1 parent 189f9d5
commit e3a2479
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 172 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ipc/Cargo.toml b/crates/ipc/Cargo.toml
@@ -16,7 +16,6 @@ native-send = ["tokio/process"]
 
 [dependencies]
 thiserror.workspace = true
-prost.workspace = true
 tracing.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -26,15 +25,14 @@ parking_lot.workspace = true
 sos-sdk = { version = "0.16", path = "../sdk", features = ["account"] }
 sos-protocol = { version = "0.16", path = "../protocol" }
 
-tokio = { version = "1", features = ["rt", "rt-multi-thread", "net", "macros", "io-util", "io-std", "sync"] }
-tokio-stream = "0.1"
+tokio = { version = "1", features = [
+  "rt", "net", "macros", "io-util", "io-std", "sync"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 futures-util = { version = "0.3", features = ["sink"] }
 interprocess = { version = "2", features = ["tokio"] }
 
 open = { version = "5", optional = true }
 once_cell = { workspace = true, optional = true }
-pin-project-lite = "0.2"
 
 # HTTP dependencies for local server
 http.workspace = true
@@ -43,10 +41,8 @@ hyper = { version = "1" }
 matchit = "0.7"
 bytes.workspace = true
 http-body-util = "0.1"
-hyper-util = "0.1"
+hyper-util = { version = "0.1", features = ["tokio"]}
 
 [build-dependencies]
 rustc_version = "0.4.1"
-prost-build = "0.13"
-protoc-bin-vendored = "3"
 
diff --git a/crates/ipc/build.rs b/crates/ipc/build.rs
@@ -1,4 +1,3 @@
-extern crate prost_build;
 use rustc_version::{version_meta, Channel};
 
 fn main() {
@@ -12,12 +11,4 @@ fn main() {
         Channel::Dev => "CHANNEL_DEV",
     };
     println!("cargo:rustc-cfg={}", channel);
-
-    std::env::set_var(
-        "PROTOC",
-        protoc_bin_vendored::protoc_bin_path().unwrap(),
-    );
-
-    prost_build::compile_protos(&["src/protobuf/common.proto"], &["src"])
-        .unwrap();
 }
diff --git a/crates/ipc/src/bindings/common.rs b/crates/ipc/src/bindings/common.rs
diff --git a/crates/ipc/src/bindings/mod.rs b/crates/ipc/src/bindings/mod.rs
diff --git a/crates/ipc/src/error.rs b/crates/ipc/src/error.rs
@@ -46,18 +46,6 @@ pub enum Error {
     #[error("native bridge failed to parse JSON, reason: {0}")]
     NativeBridgeJsonParse(String),
 
-    /// Error generated by the protobuf library when encoding.
-    #[error(transparent)]
-    ProtoBufEncode(#[from] prost::EncodeError),
-
-    /// Error generated by the protobuf library when decoding.
-    #[error(transparent)]
-    ProtoBufDecode(#[from] prost::DecodeError),
-
-    /// Error generated by the protobuf library when converting enums.
-    #[error(transparent)]
-    ProtoEnum(#[from] prost::UnknownEnumValue),
-
     /// Errors generated by the IO module.
     #[error(transparent)]
     Io(#[from] std::io::Error),

diff --git a/crates/ipc/src/lib.rs b/crates/ipc/src/lib.rs
@@ -16,7 +16,6 @@
 
 mod error;
 
-mod bindings;
 #[cfg(feature = "client")]
 mod client;
 #[cfg(feature = "server")]
@@ -59,21 +58,6 @@ impl Default for ServiceAppInfo {
     }
 }
 
-/// Encode to protobuf.
-pub(crate) fn encode_proto<T: prost::Message>(value: &T) -> Result<Vec<u8>> {
-    let mut buf = Vec::new();
-    buf.reserve(value.encoded_len());
-    value.encode(&mut buf)?;
-    Ok(buf)
-}
-
-/// Decode from protobuf.
-pub(crate) fn decode_proto<T: prost::Message + Default>(
-    buffer: &[u8],
-) -> Result<T> {
-    Ok(T::decode(buffer)?)
-}
-
 #[doc(hidden)]
 pub fn remove_socket_file(socket_name: &str) {
     if cfg!(target_os = "macos") {

diff --git a/crates/ipc/src/local_server/mod.rs b/crates/ipc/src/local_server/mod.rs
@@ -257,30 +257,6 @@ impl LocalServer {
         }
     }
 
-    /*
-    pub async fn handle(&self, req: LocalRequest) -> LocalResponse {
-        let res = match req.try_into() {
-            Ok(req) => self.call(req).await,
-            Err(e) => Response::builder()
-                .status(StatusCode::INTERNAL_SERVER_ERROR)
-                .body(e.to_string().as_bytes().to_vec())
-                .unwrap(),
-        };
-        res.into()
-    }
-    */
-
-    pub(crate) async fn call(
-        &self,
-        req: Request<Incoming>,
-    ) -> hyper::Result<Response<Body>> {
-        let router = self.router.clone();
-        Ok(match Self::route(router, req).await {
-            Ok(result) => result,
-            Err(e) => internal_server_error(e).unwrap(),
-        })
-    }
-
     async fn route(
         router: Arc<Router>,
         req: Request<Incoming>,

diff --git a/crates/ipc/src/protobuf/common.proto b/crates/ipc/src/protobuf/common.proto