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

better compat with fetch api

Browse source
This commit is contained in:
Toshit Chawda 2024-03-10 13:13:50 -07:00
parent 53a399856f
commit bed942eb75
8 changed files with 99 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

35
client/src/lib.rs
View file

@ -32,7 +32,6 @@ use tokio_util::{
io::{ReaderStream, StreamReader},
};
use wasm_bindgen::{intern, prelude::*};
use web_sys::TextEncoder;
use wisp_mux::{ClientMux, MuxStreamIo, StreamType};
type HttpBody = http_body_util::Full<Bytes>;
@ -58,6 +57,7 @@ fn init() {
// utils.rs
intern("value");
intern("writable");
intern("POST");
// main.rs
intern("method");
@ -67,6 +67,7 @@ fn init() {
intern("url");
intern("redirected");
intern("rawHeaders");
intern("Content-Type");
}
fn cert_to_jval(cert: &TrustAnchor) -> Result<JsValue, JsValue> {
@ -310,31 +311,24 @@ impl EpoxyClient {
Err(_) => true,
};
let mut body_content_type: Option<String> = None;
let body_jsvalue: Option<JsValue> = Reflect::get(&options, &jval!("body")).ok();
let body = if let Some(val) = body_jsvalue {
if val.is_string() {
let str = val
.as_string()
.replace_err("Failed to get string from body")?;
let encoder =
TextEncoder::new().replace_err("Failed to create TextEncoder for body")?;
let encoded = encoder.encode_with_input(str.as_ref());
Some(encoded)
} else {
Some(Uint8Array::new(&val).to_vec())
let body_bytes: Bytes = match body_jsvalue {
Some(buf) => {
let (body, req) = utils::jval_to_u8_array_req(buf)
.await
.replace_err("Invalid body")?;
body_content_type = req.headers().get("Content-Type").ok().flatten();
Bytes::from(body.to_vec())
}
} else {
None
};
let body_bytes: Bytes = match body {
Some(vec) => Bytes::from(vec),
None => Bytes::new(),
};
let headers = Reflect::get(&options, &jval!("headers"))
.map(|val| {
if val.is_truthy() {
if web_sys::Headers::instanceof(&val) {
Some(utils::entries_of_object(&Object::from_entries(&val).ok()?))
} else if val.is_truthy() {
Some(utils::entries_of_object(&Object::from(val)))
} else {
None
@ -352,6 +346,9 @@ impl EpoxyClient {
if body_bytes.is_empty() {
headers_map.insert("Content-Length", HeaderValue::from_static("0"));
}
if let Some(content_type) = body_content_type {
headers_map.insert("Content-Type", HeaderValue::from_str(&content_type)?);
}
if let Some(headers) = headers {
for hdr in headers {