mercuryworkshop-mirror/epoxy-tls
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/epoxy-tls.git synced 2025-05-13 06:20:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

add duplex streaming support and tests (https://github.com/ading2210/libcurl.js/issues/4)

Browse source
This commit is contained in:
Toshit Chawda 2024-10-30 15:24:06 -07:00
parent 353f4c9929
commit 6f14338ed6
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
3 changed files with 53 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/src/lib.rs
View file

@ -18,7 +18,7 @@ use http::{
HeaderName, HeaderValue, Method, Request, Response,
};
use http_body::Body;
use http_body_util::{BodyDataStream, BodyExt, Full};
use http_body_util::{BodyDataStream, Full};
use hyper::{body::Incoming, Uri};
use hyper_util_wasm::client::legacy::Client;
#[cfg(feature = "full")]
@ -29,8 +29,8 @@ use stream_provider::{StreamProvider, StreamProviderService};
use thiserror::Error;
use utils::{
asyncread_to_readablestream, convert_streaming_body, entries_of_object, from_entries,
is_null_body, is_redirect, object_get, object_set, object_truthy, ws_protocol,
MaybeStreamingBody, StreamingBody, UriExt, WasmExecutor, WispTransportRead, WispTransportWrite,
is_null_body, is_redirect, object_get, object_set, object_truthy, ws_protocol, StreamingBody,
UriExt, WasmExecutor, WispTransportRead, WispTransportWrite,
};
use wasm_bindgen::prelude::*;
use wasm_bindgen_futures::JsFuture;
@ -166,6 +166,8 @@ pub enum EpoxyError {
ResponseNewFailed,
#[error("Failed to convert streaming body: {0}")]
StreamingBodyConvertFailed(String),
#[error("Failed to tee streaming body: {0}")]
StreamingBodyTeeFailed(String),
#[error("Failed to collect streaming body: {0:?} ({0})")]
StreamingBodyCollectFailed(Box<dyn Error + Sync + Send>),
}
@ -605,15 +607,7 @@ impl EpoxyClient {
.await
.map_err(|_| EpoxyError::InvalidRequestBody)?;
body_content_type = content_type;
if matches!(body, MaybeStreamingBody::Streaming(_)) && request_redirect {
console_warn!("epoxy: streaming request body + redirect unsupported");
// collect body instead
http_body_util::Either::Right(Full::new(
body.into_httpbody()?.collect().await.map_err(EpoxyError::StreamingBodyCollectFailed)?.to_bytes(),
))
} else {
body.into_httpbody()?
}
body.into_httpbody()?
}
None => http_body_util::Either::Right(Full::new(Bytes::new())),
};
@ -674,7 +668,6 @@ impl EpoxyClient {
headers_map.insert(CONTENT_LENGTH, 0.into());
}
let (mut response, response_uri, redirected) = self
.send_req(request_builder.body(body)?, request_redirect)
.await?;