From 9b9becf1ae256b645e37a7eecf3441f3ae4b8ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Tue, 20 Jul 2021 15:41:36 +0200
Subject: fix: panic for non-WS connections to inspector (#11466)

---
 runtime/inspector_server.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/inspector_server.rs b/runtime/inspector_server.rs
index 793cd2866..9f631ed2f 100644
--- a/runtime/inspector_server.rs
+++ b/runtime/inspector_server.rs
@@ -133,7 +133,13 @@ fn handle_ws_request(
 
     if resp.is_ok() {
       tokio::task::spawn_local(async move {
-        let upgraded = hyper::upgrade::on(req).await.unwrap();
+        let upgrade_result = hyper::upgrade::on(req).await;
+        let upgraded = if let Ok(u) = upgrade_result {
+          u
+        } else {
+          eprintln!("Inspector server failed to upgrade to WS connection");
+          return;
+        };
         let websocket =
           deno_websocket::tokio_tungstenite::WebSocketStream::from_raw_socket(
             upgraded,
-- 
cgit v1.2.3