refactor(ext/websocket): use concrete error type (#26226)

denoland · Oct 25, 2024 · 998a371 · 998a371
1 parent 374049b
commit 998a371
Show file tree

Hide file tree

Showing 7 changed files with 172 additions and 97 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ext/http/http_next.rs b/ext/http/http_next.rs
@@ -246,7 +246,11 @@ pub async fn op_http_upgrade_websocket_next(
 
   // Stage 3: take the extracted raw network stream and upgrade it to a websocket, then return it
   let (stream, bytes) = extract_network_stream(upgraded);
-  ws_create_server_stream(&mut state.borrow_mut(), stream, bytes)
+  Ok(ws_create_server_stream(
+    &mut state.borrow_mut(),
+    stream,
+    bytes,
+  ))
 }
 
 #[op2(fast)]

diff --git a/ext/http/lib.rs b/ext/http/lib.rs
@@ -1053,9 +1053,11 @@ async fn op_http_upgrade_websocket(
 
   let (transport, bytes) =
     extract_network_stream(hyper_v014::upgrade::on(request).await?);
-  let ws_rid =
-    ws_create_server_stream(&mut state.borrow_mut(), transport, bytes)?;
-  Ok(ws_rid)
+  Ok(ws_create_server_stream(
+    &mut state.borrow_mut(),
+    transport,
+    bytes,
+  ))
 }
 
 // Needed so hyper can use non Send futures

diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml
@@ -28,4 +28,5 @@ hyper-util.workspace = true
 once_cell.workspace = true
 rustls-tokio-stream.workspace = true
 serde.workspace = true
+thiserror.workspace = true
 tokio.workspace = true