1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
use core::{
fmt,
pin::Pin,
task::{Context, Poll},
};
use bytes::Bytes;
use futures_util::Stream;
use hyper::{Body as HyperBody, Request as HyperRequest};
use pin_project_lite::pin_project;
pub mod error;
mod utils;
use error::Error;
pin_project! {
#[project = BodyProj]
pub enum Body {
HyperBody { #[pin] inner: HyperBody },
Stream { #[pin] inner: Pin<Box<dyn Stream<Item = Result<Bytes, Error>> + Send + 'static>> },
}
}
impl fmt::Display for Body {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::HyperBody { inner: _ } => write!(f, "HyperBody"),
Self::Stream { inner: _ } => write!(f, "Stream"),
}
}
}
impl Default for Body {
fn default() -> Self {
Self::HyperBody {
inner: HyperBody::default(),
}
}
}
impl Body {
pub fn with_hyper_body(hyper_body: HyperBody) -> Self {
Self::HyperBody { inner: hyper_body }
}
pub fn with_stream(stream: impl Stream<Item = Result<Bytes, Error>> + Send + 'static) -> Self {
Self::Stream {
inner: Box::pin(stream),
}
}
#[cfg(feature = "warp-request-body")]
pub fn from_warp_request_body(body: warp_request_body::Body) -> Self {
use futures_util::TryStreamExt as _;
use warp_request_body::error::Error as WarpRequestBodyError;
match body {
warp_request_body::Body::HyperBody { inner } => Self::with_hyper_body(inner),
body => Self::with_stream(body.map_err(|err| match err {
WarpRequestBodyError::HyperError(err) => Error::HyperError(err),
WarpRequestBodyError::WarpError(err) => Error::Other(err.into()),
})),
}
}
#[cfg(feature = "warp")]
pub fn from_warp_body_stream(
stream: impl Stream<Item = Result<impl warp::Buf + 'static, warp::Error>> + Send + 'static,
) -> Self {
use futures_util::TryStreamExt as _;
fn buf_to_bytes(mut buf: impl warp::Buf) -> Bytes {
let mut bytes_mut = bytes::BytesMut::new();
while buf.has_remaining() {
bytes_mut.extend_from_slice(buf.chunk());
let cnt = buf.chunk().len();
buf.advance(cnt);
}
bytes_mut.freeze()
}
Self::with_stream(
stream
.map_ok(buf_to_bytes)
.map_err(|err| Error::Other(err.into())),
)
}
}
#[cfg(feature = "warp-request-body")]
impl From<warp_request_body::Body> for Body {
fn from(body: warp_request_body::Body) -> Self {
Self::from_warp_request_body(body)
}
}
impl Body {
pub async fn to_bytes_async(self) -> Result<Bytes, Error> {
match self {
Self::HyperBody { inner } => {
utils::hyper_body_to_bytes(inner).await.map_err(Into::into)
}
Self::Stream { inner } => utils::bytes_stream_to_bytes(inner)
.await
.map_err(Into::into),
}
}
}
impl Stream for Body {
type Item = Result<Bytes, Error>;
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
match self.project() {
BodyProj::HyperBody { inner } => inner.poll_next(cx).map_err(Into::into),
BodyProj::Stream { inner } => inner.poll_next(cx).map_err(Into::into),
}
}
}
pub fn hyper_body_request_to_body_request(req: HyperRequest<HyperBody>) -> HyperRequest<Body> {
let (parts, body) = req.into_parts();
HyperRequest::from_parts(parts, Body::with_hyper_body(body))
}
pub fn stream_request_to_body_request(
req: HyperRequest<impl Stream<Item = Result<Bytes, Error>> + Send + 'static>,
) -> HyperRequest<Body> {
let (parts, body) = req.into_parts();
HyperRequest::from_parts(parts, Body::with_stream(body))
}
#[cfg(test)]
mod tests {
use futures_util::{stream::BoxStream, StreamExt as _, TryStreamExt};
use super::*;
#[tokio::test]
async fn test_with_hyper_body() {
let hyper_body = HyperBody::from("foo");
let body = Body::with_hyper_body(hyper_body);
assert!(matches!(body, Body::HyperBody { inner: _ }));
assert_eq!(
body.to_bytes_async().await.unwrap(),
Bytes::copy_from_slice(b"foo")
);
let hyper_body = HyperBody::from("foo");
let mut body = Body::with_hyper_body(hyper_body);
assert_eq!(
body.next().await.unwrap().unwrap(),
Bytes::copy_from_slice(b"foo")
);
assert!(body.next().await.is_none());
let req = HyperRequest::new(HyperBody::from("foo"));
let (_, body) = hyper_body_request_to_body_request(req).into_parts();
assert!(matches!(body, Body::HyperBody { inner: _ }));
assert_eq!(
body.to_bytes_async().await.unwrap(),
Bytes::copy_from_slice(b"foo")
);
}
#[tokio::test]
async fn test_with_stream() {
let stream =
futures_util::stream::once(async { Ok(Bytes::copy_from_slice(b"foo")) }).boxed();
let body = Body::with_stream(stream);
assert!(matches!(body, Body::Stream { inner: _ }));
assert_eq!(
body.to_bytes_async().await.unwrap(),
Bytes::copy_from_slice(b"foo")
);
let stream =
futures_util::stream::once(async { Ok(Bytes::copy_from_slice(b"foo")) }).boxed();
let mut body = Body::with_stream(stream);
assert_eq!(
body.next().await.unwrap().unwrap(),
Bytes::copy_from_slice(b"foo")
);
assert!(body.next().await.is_none());
let stream =
futures_util::stream::once(async { Ok(Bytes::copy_from_slice(b"foo")) }).boxed();
let req = HyperRequest::new(stream);
let (_, body) = stream_request_to_body_request(req).into_parts();
assert!(matches!(body, Body::Stream { inner: _ }));
assert_eq!(
body.to_bytes_async().await.unwrap(),
Bytes::copy_from_slice(b"foo")
);
}
#[cfg(feature = "warp-request-body")]
#[tokio::test]
async fn test_from_warp_request_body() {
let hyper_body = HyperBody::from("foo");
let warp_body = warp_request_body::Body::with_hyper_body(hyper_body);
let body = Body::from_warp_request_body(warp_body);
assert!(matches!(body, Body::HyperBody { inner: _ }));
assert_eq!(
body.to_bytes_async().await.unwrap(),
Bytes::copy_from_slice(b"foo")
);
let warp_body = warp_request_body::Body::with_bytes(Bytes::copy_from_slice(b"foo"));
let body = Body::from_warp_request_body(warp_body);
assert!(matches!(body, Body::Stream { inner: _ }));
assert_eq!(
body.to_bytes_async().await.unwrap(),
Bytes::copy_from_slice(b"foo")
);
let stream =
futures_util::stream::once(async { Ok(Bytes::copy_from_slice(b"foo")) }).boxed();
let warp_body = warp_request_body::Body::with_stream(stream);
let body = Body::from_warp_request_body(warp_body);
assert!(matches!(body, Body::Stream { inner: _ }));
assert_eq!(
body.to_bytes_async().await.unwrap(),
Bytes::copy_from_slice(b"foo")
);
}
#[cfg(feature = "warp")]
#[tokio::test]
async fn test_from_warp_body_stream() {
let stream = warp::test::request()
.body("foo")
.filter(&warp::body::stream())
.await
.unwrap();
let body = Body::from_warp_body_stream(stream);
assert!(matches!(body, Body::Stream { inner: _ }));
assert_eq!(
body.to_bytes_async().await.unwrap(),
Bytes::copy_from_slice(b"foo")
);
}
pin_project! {
pub struct BodyWrapper {
#[pin]
inner: BoxStream<'static, Result<Bytes, Box<dyn std::error::Error + Send + Sync + 'static>>>
}
}
#[tokio::test]
async fn test_wrapper() {
let hyper_body = HyperBody::from("foo");
let body = Body::with_hyper_body(hyper_body);
let _ = BodyWrapper {
inner: body.err_into().boxed(),
};
let stream =
futures_util::stream::once(async { Ok(Bytes::copy_from_slice(b"foo")) }).boxed();
let body = Body::with_stream(stream);
let _ = BodyWrapper {
inner: body.err_into().boxed(),
};
}
}
