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

allow disabling redirect

Browse source
This commit is contained in:
Toshit Chawda 2024-01-13 03:57:53 -08:00
parent 1d3272d8d0
commit d50e6b6bec
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
2 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/src/lib.rs
View file

@ -42,7 +42,7 @@ type WsTcpTlsStream = TlsStream<MuxStream<WsStreamWrapper>>;
type WsTcpUnencryptedStream = MuxStream<WsStreamWrapper>; type WsTcpUnencryptedStream = MuxStream<WsStreamWrapper>;
type WsTcpStream = Either<WsTcpTlsStream, WsTcpUnencryptedStream>; type WsTcpStream = Either<WsTcpTlsStream, WsTcpUnencryptedStream>;
async fn send_req(req: http::Request<HttpBody>, io: WsTcpStream) -> Result<WsTcpResponse, JsError> { async fn send_req(req: http::Request<HttpBody>, should_redirect: bool, io: WsTcpStream) -> Result<WsTcpResponse, JsError> {
let (mut req_sender, conn) = Builder::new() let (mut req_sender, conn) = Builder::new()
.title_case_headers(true) .title_case_headers(true)
.preserve_header_case(true) .preserve_header_case(true)
@ -56,7 +56,7 @@ async fn send_req(req: http::Request<HttpBody>, io: WsTcpStream) -> Result<WsTcp
} }
}); });
let mut new_req = req.clone(); let new_req = if should_redirect { Some(req.clone()) } else { None };
let res = req_sender let res = req_sender
.send_request(req) .send_request(req)
@ -65,6 +65,7 @@ async fn send_req(req: http::Request<HttpBody>, io: WsTcpStream) -> Result<WsTcp
match res { match res {
Ok(res) => { Ok(res) => {
if utils::is_redirect(res.status().as_u16()) if utils::is_redirect(res.status().as_u16())
&& let Some(mut new_req) = new_req
&& let Some(location) = res.headers().get("Location") && let Some(location) = res.headers().get("Location")
&& let Ok(redirect_url) = new_req.uri().get_redirect(location) && let Ok(redirect_url) = new_req.uri().get_redirect(location)
&& let Some(redirect_url_authority) = redirect_url && let Some(redirect_url_authority) = redirect_url
@ -181,16 +182,17 @@ impl WsTcp {
async fn send_req( async fn send_req(
&self, &self,
req: http::Request<HttpBody>, req: http::Request<HttpBody>,
should_redirect: bool
) -> Result<(hyper::Response<Incoming>, Uri, bool), JsError> { ) -> Result<(hyper::Response<Incoming>, Uri, bool), JsError> {
let mut redirected = false; let mut redirected = false;
let uri = req.uri().clone(); let uri = req.uri().clone();
let mut current_resp: WsTcpResponse = send_req(req, self.get_http_io(&uri).await?).await?; let mut current_resp: WsTcpResponse = send_req(req, should_redirect, self.get_http_io(&uri).await?).await?;
for _ in 0..self.redirect_limit - 1 { for _ in 0..self.redirect_limit - 1 {
match current_resp { match current_resp {
WsTcpResponse::Success(_) => break, WsTcpResponse::Success(_) => break,
WsTcpResponse::Redirect((_, req, new_url)) => { WsTcpResponse::Redirect((_, req, new_url)) => {
redirected = true; redirected = true;
current_resp = send_req(req, self.get_http_io(&new_url).await?).await? current_resp = send_req(req, should_redirect, self.get_http_io(&new_url).await?).await?
} }
} }
} }
@ -217,6 +219,11 @@ impl WsTcp {
http::Method::try_from(<String as AsRef<str>>::as_ref(&req_method_string)) http::Method::try_from(<String as AsRef<str>>::as_ref(&req_method_string))
.replace_err("Invalid http method")?; .replace_err("Invalid http method")?;
let req_should_redirect = match Reflect::get(&options, &jval!("redirect")) {
Ok(val) => !matches!(val.as_string().unwrap_or_default().as_str(), "error" | "manual"),
Err(_) => true,
};
let body_jsvalue: Option<JsValue> = Reflect::get(&options, &jval!("body")).ok(); let body_jsvalue: Option<JsValue> = Reflect::get(&options, &jval!("body")).ok();
let body = if let Some(val) = body_jsvalue { let body = if let Some(val) = body_jsvalue {
if val.is_string() { if val.is_string() {
@ -275,7 +282,7 @@ impl WsTcp {
.body(HttpBody::new(body_bytes)) .body(HttpBody::new(body_bytes))
.replace_err("Failed to make request")?; .replace_err("Failed to make request")?;
let (resp, last_url, req_redirected) = self.send_req(request).await?; let (resp, last_url, req_redirected) = self.send_req(request, req_should_redirect).await?;
let resp_headers_jsarray = resp let resp_headers_jsarray = resp
.headers() .headers()

30
client/src/web/index.js
View file

@ -4,7 +4,8 @@
"color:red;font-size:2rem;font-weight:bold" "color:red;font-size:2rem;font-weight:bold"
); );
const should_test = (new URL(window.location.href)).searchParams.has("test"); const should_feature_test = (new URL(window.location.href)).searchParams.has("feature_test");
const should_perf_test = (new URL(window.location.href)).searchParams.has("perf_test");
await wasm_bindgen("./wstcp_client_bg.wasm"); await wasm_bindgen("./wstcp_client_bg.wasm");
@ -14,14 +15,22 @@
const tconn1 = performance.now(); const tconn1 = performance.now();
console.warn(`conn establish took ${tconn1 - tconn0} ms or ${(tconn1 - tconn0) / 1000} s`); console.warn(`conn establish took ${tconn1 - tconn0} ms or ${(tconn1 - tconn0) / 1000} s`);
for (const url of ["https://httpbin.org/get", "https://httpbin.org/gzip", "https://httpbin.org/brotli"]) {
let resp = await wstcp.fetch(url); if (should_feature_test) {
console.warn(resp); for (const url of [
console.warn(Object.fromEntries(resp.headers)); ["https://httpbin.org/get", {}],
["https://httpbin.org/gzip", {}],
["https://httpbin.org/brotli", {}],
["https://httpbin.org/redirect/11", {}],
["https://httpbin.org/redirect/1", { redirect: "manual" }]
]) {
let resp = await wstcp.fetch(url[0], url[1]);
console.warn(url, resp, Object.fromEntries(resp.headers));
console.warn(await resp.text()); console.warn(await resp.text());
} }
if (should_test) { alert("you can open console now");
} else if (should_perf_test) {
const test_mux = async (url) => { const test_mux = async (url) => {
const t0 = performance.now(); const t0 = performance.now();
await wstcp.fetch(url); await wstcp.fetch(url);
@ -40,19 +49,24 @@
let total_mux = 0; let total_mux = 0;
for (const _ of Array(num_tests).keys()) { for (const _ of Array(num_tests).keys()) {
total_mux += await test_mux("https://httpbin.org/gzip"); total_mux += await test_mux("https://httpbin.org/get");
} }
total_mux = total_mux / num_tests; total_mux = total_mux / num_tests;
let total_native = 0; let total_native = 0;
for (const _ of Array(num_tests).keys()) { for (const _ of Array(num_tests).keys()) {
total_native += await test_native("https://httpbin.org/gzip"); total_native += await test_native("https://httpbin.org/get");
} }
total_native = total_native / num_tests; total_native = total_native / num_tests;
console.warn(`avg mux (10) took ${total_mux} ms or ${total_mux / 1000} s`); console.warn(`avg mux (10) took ${total_mux} ms or ${total_mux / 1000} s`);
console.warn(`avg native (10) took ${total_native} ms or ${total_native / 1000} s`); console.warn(`avg native (10) took ${total_native} ms or ${total_native / 1000} s`);
console.warn(`mux - native: ${total_mux - total_native} ms or ${(total_mux - total_native) / 1000} s`); console.warn(`mux - native: ${total_mux - total_native} ms or ${(total_mux - total_native) / 1000} s`);
alert("you can open console now"); alert("you can open console now");
} else {
let resp = await wstcp.fetch("https://httpbin.org/get");
console.warn(resp, Object.fromEntries(resp.headers));
console.warn(await resp.text());
} }
})(); })();