lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-05-04 10:43:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use collect combinator instead of manual stream handling for incoming body

Browse source
This commit is contained in:
Filip Tibell 2025-04-28 11:42:08 +02:00
parent bc87d6ca2f
commit 47d5f928b8
No known key found for this signature in database
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
crates/lune-std-net/src/shared/incoming.rs
View file

@ -1,7 +1,6 @@
use futures_lite::prelude::*; use http_body_util::BodyExt;
use http_body_util::BodyStream;
use hyper::{ use hyper::{
body::{Body as _, Bytes, Incoming}, body::{Bytes, Incoming},
header::CONTENT_ENCODING, header::CONTENT_ENCODING,
HeaderMap, HeaderMap,
}; };
@ -15,18 +14,7 @@ pub async fn handle_incoming_body(
body: Incoming, body: Incoming,
should_decompress: bool, should_decompress: bool,
) -> LuaResult<(Bytes, bool)> { ) -> LuaResult<(Bytes, bool)> {
let size = body.size_hint().lower() as usize; let mut body = body.collect().await.into_lua_err()?.to_bytes();
let buffer = Vec::<u8>::with_capacity(size);
let mut body = BodyStream::new(body)
.try_fold(buffer, |mut body, chunk| {
if let Some(chunk) = chunk.data_ref() {
body.extend_from_slice(chunk);
}
Ok(body)
})
.await
.into_lua_err()?;
let was_decompressed = if should_decompress { let was_decompressed = if should_decompress {
let decompress_format = headers let decompress_format = headers
@ -34,7 +22,7 @@ pub async fn handle_incoming_body(
.and_then(|value| value.to_str().ok()) .and_then(|value| value.to_str().ok())
.and_then(CompressDecompressFormat::detect_from_header_str); .and_then(CompressDecompressFormat::detect_from_header_str);
if let Some(format) = decompress_format { if let Some(format) = decompress_format {
body = decompress(body, format).await?; body = Bytes::from(decompress(body, format).await?);
true true
} else { } else {
false false
@ -43,5 +31,5 @@ pub async fn handle_incoming_body(
false false
}; };
Ok((Bytes::from(body), was_decompressed)) Ok((body, was_decompressed))
} }