diff --git a/Cargo.lock b/Cargo.lock index d433f76..5c9e0b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -371,7 +371,7 @@ dependencies = [ "http", "http-body-util", "hyper", - "hyper-util 0.1.3 (git+https://github.com/r58Playz/hyper-util-wasm)", + "hyper-util-wasm", "js-sys", "pin-project-lite", "ring", @@ -400,7 +400,7 @@ dependencies = [ "futures-util", "http-body-util", "hyper", - "hyper-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper-util", "tokio", "tokio-native-tls", "tokio-util", @@ -449,7 +449,7 @@ dependencies = [ "base64", "http-body-util", "hyper", - "hyper-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper-util", "pin-project", "rand", "sha1", @@ -727,25 +727,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "hyper-util" -version = "0.1.3" -source = "git+https://github.com/r58Playz/hyper-util-wasm#ea9a5608f3255562d4a647a5c94ff7d3f9c32b53" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "tower", - "tower-service", - "tracing", - "wasm-bindgen", - "wasmtimer", -] - [[package]] name = "hyper-util-wasm" version = "0.1.3" diff --git a/client/Cargo.toml b/client/Cargo.toml index cd05441..4c336d0 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -28,7 +28,7 @@ base64 = "0.21.7" wisp-mux = { path = "../wisp", features = ["ws_stream_wasm", "tokio_io", "hyper_tower"] } async_io_stream = { version = "0.3.3", features = ["tokio_io"] } getrandom = { version = "0.2.12", features = ["js"] } -hyper-util = { git = "https://github.com/r58Playz/hyper-util-wasm", features = ["client", "client-legacy", "http1", "http2"] } +hyper-util-wasm = { version = "0.1.3", features = ["client", "client-legacy", "http1", "http2"] } tokio = { version = "1.36.0", default-features = false } tower-service = "0.3.2" console_error_panic_hook = "0.1.7" diff --git a/client/src/lib.rs b/client/src/lib.rs index 4da9fee..799855b 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -18,7 +18,7 @@ use bytes::Bytes; use futures_util::{stream::SplitSink, StreamExt}; use http::{uri, HeaderName, HeaderValue, Request, Response}; use hyper::{body::Incoming, Uri}; -use hyper_util::client::legacy::Client; +use hyper_util_wasm::client::legacy::Client; use js_sys::{Array, Function, Object, Reflect, Uint8Array}; use tokio_rustls::{client::TlsStream, rustls, rustls::RootCertStore, TlsConnector}; use tokio_util::{ diff --git a/wisp/src/tokioio.rs b/wisp/src/tokioio.rs index 62061b9..4eb1c89 100644 --- a/wisp/src/tokioio.rs +++ b/wisp/src/tokioio.rs @@ -168,8 +168,8 @@ where } } -impl hyper_util::client::legacy::connect::Connection for TokioIo { - fn connected(&self) -> hyper_util::client::legacy::connect::Connected { - hyper_util::client::legacy::connect::Connected::new() +impl hyper_util_wasm::client::legacy::connect::Connection for TokioIo { + fn connected(&self) -> hyper_util_wasm::client::legacy::connect::Connected { + hyper_util_wasm::client::legacy::connect::Connected::new() } }