mercuryworkshop-mirror/epoxy-tls
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/epoxy-tls.git synced 2025-05-12 22:10:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove ws_stream_wasm, wisp_mux 1.1.2

Browse source
This commit is contained in:
Toshit Chawda 2024-03-02 16:03:18 -08:00
parent 06d3225721
commit 1bf1a809bd
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
7 changed files with 202 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/src/lib.rs
View file

@ -8,14 +8,14 @@ mod wrappers;
use tls_stream::EpxTlsStream;
use utils::{Boolinator, ReplaceErr, UriExt};
use websocket::EpxWebSocket;
use wrappers::{IncomingBody, TlsWispService};
use wrappers::{IncomingBody, TlsWispService, WebSocketWrapper};
use std::sync::Arc;
use async_compression::tokio::bufread as async_comp;
use async_io_stream::IoStream;
use bytes::Bytes;
use futures_util::{stream::SplitSink, StreamExt};
use futures_util::StreamExt;
use http::{uri, HeaderName, HeaderValue, Request, Response};
use hyper::{body::Incoming, Uri};
use hyper_util_wasm::client::legacy::Client;
@ -28,7 +28,6 @@ use tokio_util::{
use wasm_bindgen::{intern, prelude::*};
use web_sys::TextEncoder;
use wisp_mux::{tokioio::TokioIo, tower::ServiceWrapper, ClientMux, MuxStreamIo, StreamType};
use ws_stream_wasm::{WsMessage, WsMeta, WsStream};
type HttpBody = http_body_util::Full<Bytes>;
@ -64,12 +63,11 @@ fn init() {
intern("rawHeaders");
}
#[wasm_bindgen(inspectable)]
pub struct EpoxyClient {
rustls_config: Arc<rustls::ClientConfig>,
mux: Arc<ClientMux<SplitSink<WsStream, WsMessage>>>,
hyper_client: Client<TlsWispService<SplitSink<WsStream, WsMessage>>, HttpBody>,
mux: Arc<ClientMux<WebSocketWrapper>>,
hyper_client: Client<TlsWispService<WebSocketWrapper>, HttpBody>,
#[wasm_bindgen(getter_with_clone)]
pub useragent: String,
#[wasm_bindgen(js_name = "redirectLimit")]
@ -96,12 +94,11 @@ impl EpoxyClient {
}
debug!("connecting to ws {:?}", ws_url);
let (_, ws) = WsMeta::connect(ws_url, vec![])
let (wtx, wrx) = WebSocketWrapper::connect(ws_url, vec![])
.await
.replace_err("Failed to connect to websocket")?;
debug!("connected!");
let (wtx, wrx) = ws.split();
let (mux, fut) = ClientMux::new(wrx, wtx).await?;
let mux = Arc::new(mux);