Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MessagePack codec #2371

Merged
merged 2 commits into from
Mar 3, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions server_fn/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ rkyv = { version = "0.7", features = [
"uuid",
"strict",
], optional = true }
rmp-serde = { version = "1.1", optional = true }

# client
gloo-net = { version = "0.5", optional = true }
Expand Down Expand Up @@ -101,6 +102,7 @@ multipart = ["browser", "dep:multer"]
url = ["dep:serde_qs"]
cbor = ["dep:ciborium"]
rkyv = ["dep:rkyv"]
msgpack = ["dep:rmp-serde"]
default-tls = ["reqwest?/default-tls"]
rustls = ["reqwest?/rustls-tls"]
reqwest = ["dep:reqwest"]
Expand Down
5 changes: 5 additions & 0 deletions server_fn/src/codec/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ mod multipart;
#[cfg(feature = "multipart")]
pub use multipart::*;

#[cfg(feature = "msgpack")]
mod msgpack;
#[cfg(feature = "msgpack")]
pub use msgpack::*;

mod stream;
use crate::error::ServerFnError;
use futures::Future;
Expand Down
74 changes: 74 additions & 0 deletions server_fn/src/codec/msgpack.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
use super::{Encoding, FromReq, FromRes, IntoReq, IntoRes};
use crate::{
error::ServerFnError,
request::{ClientReq, Req},
response::{ClientRes, Res},
};
use bytes::Bytes;
use http::Method;
use serde::{de::DeserializeOwned, Serialize};

/// A codec for MessagePack.
pub struct MsgPack;

impl Encoding for MsgPack {
const CONTENT_TYPE: &'static str = "application/msgpack";
const METHOD: Method = Method::POST;
}

impl<T, Request, Err> IntoReq<MsgPack, Request, Err> for T
where
Request: ClientReq<Err>,
T: Serialize,
{
fn into_req(
self,
path: &str,
accepts: &str,
) -> Result<Request, ServerFnError<Err>> {
let data = rmp_serde::to_vec(&self)
.map_err(|e| ServerFnError::Serialization(e.to_string()))?;
Request::try_new_post_bytes(
path,
MsgPack::CONTENT_TYPE,
accepts,
Bytes::from(data),
)
}
}

impl<T, Request, Err> FromReq<MsgPack, Request, Err> for T
where
Request: Req<Err> + Send,
T: DeserializeOwned,
{
async fn from_req(req: Request) -> Result<Self, ServerFnError<Err>> {
let string_data = req.try_into_string().await?;
johnbchron marked this conversation as resolved.
Show resolved Hide resolved
rmp_serde::from_slice::<T>(string_data.as_bytes())
.map_err(|e| ServerFnError::Args(e.to_string()))
}
}

impl<T, Response, Err> IntoRes<MsgPack, Response, Err> for T
where
Response: Res<Err>,
T: Serialize + Send,
{
async fn into_res(self) -> Result<Response, ServerFnError<Err>> {
let data = rmp_serde::to_vec(&self)
.map_err(|e| ServerFnError::Serialization(e.to_string()))?;
Response::try_from_bytes(MsgPack::CONTENT_TYPE, Bytes::from(data))
}
}

impl<T, Response, Err> FromRes<MsgPack, Response, Err> for T
where
Response: ClientRes<Err> + Send,
T: DeserializeOwned,
{
async fn from_res(res: Response) -> Result<Self, ServerFnError<Err>> {
let data = res.try_into_string().await?;
johnbchron marked this conversation as resolved.
Show resolved Hide resolved
rmp_serde::from_slice(data.as_bytes())
.map_err(|e| ServerFnError::Deserialization(e.to_string()))
}
}
Loading