diff options
author | Luca Casonato <lucacasonato@yahoo.com> | 2021-04-08 18:46:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-08 18:46:14 +0200 |
commit | 4e70ff80c2f630875b73c9010d959b518a977715 (patch) | |
tree | adf2f066d97fbc997e4f501fd2de0489dee5f8f7 /op_crates/websocket/lib.rs | |
parent | d050b491b10fe37b4461b37c56028a14c8674c95 (diff) |
chore: update deps (#10058)
This commit updates crate dependencies.
Diffstat (limited to 'op_crates/websocket/lib.rs')
-rw-r--r-- | op_crates/websocket/lib.rs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/op_crates/websocket/lib.rs b/op_crates/websocket/lib.rs index 1e6eaafb7..59fa5acdb 100644 --- a/op_crates/websocket/lib.rs +++ b/op_crates/websocket/lib.rs @@ -32,12 +32,12 @@ use std::rc::Rc; use std::sync::Arc; use tokio::net::TcpStream; use tokio_rustls::{rustls::ClientConfig, TlsConnector}; -use tokio_tungstenite::stream::Stream as StreamSwitcher; use tokio_tungstenite::tungstenite::Error as TungsteniteError; use tokio_tungstenite::tungstenite::{ handshake::client::Response, protocol::frame::coding::CloseCode, protocol::CloseFrame, Message, }; +use tokio_tungstenite::MaybeTlsStream; use tokio_tungstenite::{client_async, WebSocketStream}; use webpki::DNSNameRef; @@ -61,10 +61,7 @@ impl WebSocketPermissions for NoWebSocketPermissions { } } -type MaybeTlsStream = - StreamSwitcher<TcpStream, tokio_rustls::client::TlsStream<TcpStream>>; - -type WsStream = WebSocketStream<MaybeTlsStream>; +type WsStream = WebSocketStream<MaybeTlsStream<TcpStream>>; struct WsStreamResource { tx: AsyncRefCell<SplitSink<WsStream, Message>>, rx: AsyncRefCell<SplitStream<WsStream>>, @@ -149,8 +146,8 @@ where Err(_) => return Ok(json!({ "success": false })), }; - let socket: MaybeTlsStream = match uri.scheme_str() { - Some("ws") => StreamSwitcher::Plain(tcp_socket), + let socket: MaybeTlsStream<TcpStream> = match uri.scheme_str() { + Some("ws") => MaybeTlsStream::Plain(tcp_socket), Some("wss") => { let mut config = ClientConfig::new(); config @@ -166,7 +163,7 @@ where let dnsname = DNSNameRef::try_from_ascii_str(&domain).expect("Invalid DNS lookup"); let tls_socket = tls_connector.connect(dnsname, tcp_socket).await?; - StreamSwitcher::Tls(tls_socket) + MaybeTlsStream::Rustls(tls_socket) } _ => unreachable!(), }; |