From 75793baae83123f890442c5d32e3dd38eb18ce1c Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Tue, 9 Nov 2021 12:10:21 +0100 Subject: Revert "refactor(ext/http): rewrite hyper integration and fix bug (#12332)" (#12704) This reverts commit 5b1e537446454f6332de44adbeb6a15ff072c2fa. --- ext/websocket/lib.rs | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'ext/websocket') diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs index ba626a45a..d469b5aaf 100644 --- a/ext/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -34,13 +34,12 @@ use std::sync::Arc; use tokio::net::TcpStream; use tokio_rustls::rustls::RootCertStore; use tokio_rustls::TlsConnector; -use tokio_tungstenite::client_async; use tokio_tungstenite::tungstenite::{ handshake::client::Response, protocol::frame::coding::CloseCode, - protocol::CloseFrame, protocol::Role, Message, + protocol::CloseFrame, Message, }; use tokio_tungstenite::MaybeTlsStream; -use tokio_tungstenite::WebSocketStream; +use tokio_tungstenite::{client_async, WebSocketStream}; pub use tokio_tungstenite; // Re-export tokio_tungstenite @@ -73,27 +72,6 @@ pub enum WebSocketStreamType { }, } -pub async fn ws_create_server_stream( - state: &Rc>, - transport: hyper::upgrade::Upgraded, -) -> Result { - let ws_stream = - WebSocketStream::from_raw_socket(transport, Role::Server, None).await; - let (ws_tx, ws_rx) = ws_stream.split(); - - let ws_resource = WsStreamResource { - stream: WebSocketStreamType::Server { - tx: AsyncRefCell::new(ws_tx), - rx: AsyncRefCell::new(ws_rx), - }, - cancel: Default::default(), - }; - - let resource_table = &mut state.borrow_mut().resource_table; - let rid = resource_table.add(ws_resource); - Ok(rid) -} - pub struct WsStreamResource { pub stream: WebSocketStreamType, // When a `WsStreamResource` resource is closed, all pending 'read' ops are -- cgit v1.2.3