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 most of io_stream and replace with web streams

Browse source
This commit is contained in:
Toshit Chawda 2024-10-09 23:03:55 -07:00
parent 7c9605474d
commit dcf638efca
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
3 changed files with 107 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

64
client/src/lib.rs
View file

@ -20,7 +20,7 @@ use http::{
use hyper::{body::Incoming, Uri};
use hyper_util_wasm::client::legacy::Client;
#[cfg(feature = "full")]
use io_stream::{EpoxyIoStream, EpoxyUdpStream};
use io_stream::{iostream_from_asyncrw, iostream_from_stream, EpoxyIoStream};
use js_sys::{Array, Function, Object, Promise};
use send_wrapper::SendWrapper;
use stream_provider::{StreamProvider, StreamProviderService};
@ -312,7 +312,7 @@ fn get_stream_provider(
))
}))
}),
&options,
options,
)
}
@ -383,75 +383,39 @@ impl EpoxyClient {
}
#[cfg(feature = "full")]
pub async fn connect_tcp(
&self,
handlers: EpoxyHandlers,
url: String,
) -> Result<EpoxyIoStream, EpoxyError> {
pub async fn connect_tcp(&self, url: String) -> Result<EpoxyIoStream, EpoxyError> {
let url: Uri = url.try_into()?;
let host = url.host().ok_or(EpoxyError::NoUrlHost)?;
let port = url.port_u16().ok_or(EpoxyError::NoUrlPort)?;
match self
let stream = self
.stream_provider
.get_asyncread(StreamType::Tcp, host.to_string(), port)
.await
{
Ok(stream) => Ok(EpoxyIoStream::connect(Either::Right(stream), handlers)),
Err(err) => {
let _ = handlers
.onerror
.call1(&JsValue::null(), &err.to_string().into());
Err(err)
}
}
.await?;
Ok(iostream_from_asyncrw(Either::Right(stream)))
}
#[cfg(feature = "full")]
pub async fn connect_tls(
&self,
handlers: EpoxyHandlers,
url: String,
) -> Result<EpoxyIoStream, EpoxyError> {
pub async fn connect_tls(&self, url: String) -> Result<EpoxyIoStream, EpoxyError> {
let url: Uri = url.try_into()?;
let host = url.host().ok_or(EpoxyError::NoUrlHost)?;
let port = url.port_u16().ok_or(EpoxyError::NoUrlPort)?;
match self
let stream = self
.stream_provider
.get_tls_stream(host.to_string(), port)
.await
{
Ok(stream) => Ok(EpoxyIoStream::connect(Either::Left(stream), handlers)),
Err(err) => {
let _ = handlers
.onerror
.call1(&JsValue::null(), &err.to_string().into());
Err(err)
}
}
.await?;
Ok(iostream_from_asyncrw(Either::Left(stream)))
}
#[cfg(feature = "full")]
pub async fn connect_udp(
&self,
handlers: EpoxyHandlers,
url: String,
) -> Result<EpoxyUdpStream, EpoxyError> {
pub async fn connect_udp(&self, url: String) -> Result<EpoxyIoStream, EpoxyError> {
let url: Uri = url.try_into()?;
let host = url.host().ok_or(EpoxyError::NoUrlHost)?;
let port = url.port_u16().ok_or(EpoxyError::NoUrlPort)?;
match self
let stream = self
.stream_provider
.get_stream(StreamType::Udp, host.to_string(), port)
.await
{
Ok(stream) => Ok(EpoxyUdpStream::connect(stream, handlers)),
Err(err) => {
let _ = handlers
.onerror
.call1(&JsValue::null(), &err.to_string().into());
Err(err)
}
}
.await?;
Ok(iostream_from_stream(stream))
}
async fn send_req_inner(