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/net/raw.rs | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'ext/net') diff --git a/ext/net/raw.rs b/ext/net/raw.rs index 3f230a08b..0c92c4670 100644 --- a/ext/net/raw.rs +++ b/ext/net/raw.rs @@ -260,31 +260,6 @@ pub fn take_network_stream_resource( Err(bad_resource_id()) } -/// Inserts a raw stream (back?) into the resource table and returns a resource ID. This can then be used to create raw connection -/// objects on the JS side. -pub fn put_network_stream_resource( - resource_table: &mut ResourceTable, - stream: NetworkStream, -) -> Result { - let res = match stream { - NetworkStream::Tcp(conn) => { - let (r, w) = conn.into_split(); - resource_table.add(TcpStreamResource::new((r, w))) - } - NetworkStream::Tls(conn) => { - let (r, w) = conn.into_split(); - resource_table.add(TlsStreamResource::new((r, w))) - } - #[cfg(unix)] - NetworkStream::Unix(conn) => { - let (r, w) = conn.into_split(); - resource_table.add(UnixStreamResource::new((r, w))) - } - }; - - Ok(res) -} - /// In some cases it may be more efficient to extract the resource from the resource table and use it directly (for example, an HTTP server). /// This method will extract a stream from the resource table and return it, unwrapped. pub fn take_network_stream_listener_resource( -- cgit v1.2.3