From 27303ef688ae56008aafab513d84e39096a51e34 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Tue, 16 May 2023 01:24:41 +0200 Subject: refactor(ext/http): simpler ws server in http_next (#19133) Merges `op_http_upgrade_next` and `op_ws_server_create`, significantly simplifying websocket construction in ext/http (next), and removing one JS -> Rust call. Also WS server now doesn't bypass `HttpPropertyExtractor`. --- ext/websocket/lib.rs | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'ext/websocket') diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs index a002b774c..ccda33cfc 100644 --- a/ext/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -16,7 +16,6 @@ use deno_core::Resource; use deno_core::ResourceId; use deno_core::StringOrBuffer; use deno_core::ZeroCopyBuf; -use deno_net::raw::take_network_stream_resource; use deno_net::raw::NetworkStream; use deno_tls::create_client_config; use deno_tls::RootCertStoreProvider; @@ -367,22 +366,6 @@ pub fn ws_create_server_stream( Ok(rid) } -#[op] -pub fn op_ws_server_create( - state: &mut OpState, - conn: ResourceId, - extra_bytes: &[u8], -) -> Result { - let network_stream = - take_network_stream_resource(&mut state.resource_table, conn)?; - // Copying the extra bytes, but unlikely this will account for much - ws_create_server_stream( - state, - network_stream, - Bytes::from(extra_bytes.to_vec()), - ) -} - #[op] pub async fn op_ws_send_binary( state: Rc>, @@ -534,7 +517,6 @@ deno_core::extension!(deno_websocket, op_ws_send_text, op_ws_send_ping, op_ws_send_pong, - op_ws_server_create, ], esm = [ "01_websocket.js", "02_websocketstream.js" ], options = { -- cgit v1.2.3