Merge pull request #83 from Dstack-TEE/json-prpc

prpc: Choose json codec in prpc clients

Cargo.toml

@@ -131,8 +131,8 @@ rcgen = { version = "0.13.1", features = ["pem"] }
 x509-parser = "0.16.0"
 
 # RPC/Protocol
-prpc = "0.4.0"
-prpc-build = "0.4.1"
+prpc = "0.5.0"
+prpc-build = "0.5.1"
 
 # Development/Testing
 bindgen = "0.70.1"

http-client/Cargo.toml

@@ -14,6 +14,7 @@ hyperlocal.workspace = true
 log.workspace = true
 pin-project-lite = "0.2.15"
 prpc = { workspace = true, optional = true }
+serde.workspace = true
 tokio.workspace = true
 tokio-vsock.workspace = true
 tower-service = "0.3.3"

http-client/src/prpc.rs

@@ -1,4 +1,9 @@
-use prpc::client::{Error, RequestClient};
+use anyhow::Context;
+use prpc::{
+    client::{Error, RequestClient},
+    serde_json, Message,
+};
+use serde::{de::DeserializeOwned, Serialize};
 
 pub struct PrpcClient {
     base_url: String,
@@ -11,11 +16,18 @@ impl PrpcClient {
 }
 
 impl RequestClient for PrpcClient {
-    async fn request(&self, path: &str, body: Vec<u8>) -> Result<Vec<u8>, Error> {
-        let (status, body) = super::http_request("POST", &self.base_url, path, &body).await?;
+    async fn request<T, R>(&self, path: &str, body: T) -> Result<R, Error>
+    where
+        T: Message + Serialize,
+        R: Message + DeserializeOwned,
+    {
+        let body = serde_json::to_vec(&body).context("Failed to serialize body")?;
+        let path = format!("{path}?json");
+        let (status, body) = super::http_request("POST", &self.base_url, &path, &body).await?;
         if status != 200 {
             return Err(Error::RpcError(format!("Invalid status code: {status}")));
         }
-        Ok(body)
+        let response = serde_json::from_slice(&body).context("Failed to deserialize response")?;
+        Ok(response)
     }
 }

ra-rpc/Cargo.toml

@@ -16,6 +16,7 @@ reqwest = { workspace = true, default-features = false, features = ["rustls-tls"
 ra-tls.workspace = true
 bon.workspace = true
 rocket-vsock-listener = { workspace = true, optional = true }
+serde.workspace = true
 
 [features]
 default = ["rocket", "client"]

ra-rpc/src/client.rs

@@ -7,6 +7,7 @@ use prpc::{
     Message,
 };
 use reqwest::{Certificate, Client, Identity};
+use serde::{de::DeserializeOwned, Serialize};
 
 pub struct RaClient {
     remote_uri: String,
@@ -48,8 +49,13 @@ impl RaClient {
 }
 
 impl RequestClient for RaClient {
-    async fn request(&self, path: &str, body: Vec<u8>) -> Result<Vec<u8>, Error> {
-        let url = format!("{}/{}", self.remote_uri, path);
+    async fn request<T, R>(&self, path: &str, body: T) -> Result<R, Error>
+    where
+        T: Message + Serialize,
+        R: Message + DeserializeOwned,
+    {
+        let body = serde_json::to_vec(&body).context("Failed to serialize body")?;
+        let url = format!("{}/{}?json", self.remote_uri, path);
         let response = self
             .client
             .post(url)
@@ -72,6 +78,7 @@ impl RequestClient for RaClient {
             .await
             .map_err(|err| Error::RpcError(format!("failed to read response: {:?}", err)))?
             .to_vec();
-        Ok(body)
+        let response = serde_json::from_slice(&body).context("Failed to deserialize response")?;
+        Ok(response)
     }
 }