mirror of
https://github.com/MercuryWorkshop/epoxy-tls.git
synced 2025-05-12 22:10:01 -04:00
minor changes
This commit is contained in:
parent
1b7181d78f
commit
f035e51256
3 changed files with 140 additions and 97 deletions
|
@ -2,12 +2,13 @@
|
|||
#[macro_use]
|
||||
mod utils;
|
||||
mod tokioio;
|
||||
mod wrappers;
|
||||
mod websocket;
|
||||
mod wrappers;
|
||||
|
||||
use tokioio::TokioIo;
|
||||
use utils::{ReplaceErr, UriExt};
|
||||
use wrappers::{IncomingBody, WsStreamWrapper};
|
||||
use websocket::EpxWebSocket;
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
|
@ -15,12 +16,8 @@ use async_compression::tokio::bufread as async_comp;
|
|||
use bytes::Bytes;
|
||||
use futures_util::StreamExt;
|
||||
use http::{uri, HeaderName, HeaderValue, Request, Response};
|
||||
use hyper::{
|
||||
body::Incoming,
|
||||
client::conn::http1::Builder,
|
||||
Uri,
|
||||
};
|
||||
use js_sys::{Array, Object, Reflect, Uint8Array};
|
||||
use hyper::{body::Incoming, client::conn::http1::Builder, Uri};
|
||||
use js_sys::{Function, Array, Object, Reflect, Uint8Array};
|
||||
use penguin_mux_wasm::{Multiplexor, MuxStream};
|
||||
use tokio_rustls::{client::TlsStream, rustls, rustls::RootCertStore, TlsConnector};
|
||||
use tokio_util::{
|
||||
|
@ -163,10 +160,6 @@ impl EpoxyClient {
|
|||
redirect_limit,
|
||||
})
|
||||
}
|
||||
#[wasm_bindgen]
|
||||
pub fn ptr(&mut self) -> *mut EpoxyClient {
|
||||
self as *mut Self
|
||||
}
|
||||
|
||||
async fn get_http_io(&self, url: &Uri) -> Result<EpxStream, JsError> {
|
||||
let url_host = url.host().replace_err("URL must have a host")?;
|
||||
|
@ -221,6 +214,21 @@ impl EpoxyClient {
|
|||
}
|
||||
}
|
||||
|
||||
// shut up
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub async fn connect_ws(
|
||||
&self,
|
||||
onopen: Function,
|
||||
onclose: Function,
|
||||
onerror: Function,
|
||||
onmessage: Function,
|
||||
url: String,
|
||||
protocols: Vec<String>,
|
||||
origin: String,
|
||||
) -> Result<EpxWebSocket, JsError> {
|
||||
EpxWebSocket::connect(self, onopen, onclose, onerror, onmessage, url, protocols, origin).await
|
||||
}
|
||||
|
||||
pub async fn fetch(&self, url: String, options: Object) -> Result<web_sys::Response, JsError> {
|
||||
let uri = url.parse::<uri::Uri>().replace_err("Failed to parse URL")?;
|
||||
let uri_scheme = uri.scheme().replace_err("URL must have a scheme")?;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue