fix(ext/websocket): panic on no next ws message from an already close…

…d stream (denoland#16004)
howqw · Oct 15, 2022 · 9c7a5c0 · 9c7a5c0
1 parent 225d516
commit 9c7a5c0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs
@@ -489,7 +489,9 @@ pub async fn op_ws_next_event(
     Some(Ok(Message::Pong(_))) => NextEventResponse::Pong,
     Some(Err(e)) => NextEventResponse::Error(e.to_string()),
     None => {
-      state.borrow_mut().resource_table.close(rid).unwrap();
+      // No message was received, presumably the socket closed while we waited.
+      // Try close the stream, ignoring any errors, and report closed status to JavaScript.
+      let _ = state.borrow_mut().resource_table.close(rid);
       NextEventResponse::Closed
     }
   };