From da10c9c8d1f7bf6ada71bb70f5f331ed830e5b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Fri, 26 Aug 2022 05:12:11 +0200
Subject: fix(ext/flash): panic on AddrInUse (#15607)

---
 ext/flash/01_http.js | 12 ++++++++----
 ext/flash/lib.rs     |  7 +++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'ext/flash')

diff --git a/ext/flash/01_http.js b/ext/flash/01_http.js
index 4867da161..fbc24d73d 100644
--- a/ext/flash/01_http.js
+++ b/ext/flash/01_http.js
@@ -28,7 +28,7 @@
   const {
     Function,
     ObjectPrototypeIsPrototypeOf,
-    PromiseResolve,
+    PromiseAll,
     TypedArrayPrototypeSubarray,
     TypeError,
     Uint8Array,
@@ -249,7 +249,8 @@
 
     core.opAsync("op_flash_wait_for_listening", serverId).then((port) => {
       onListen({ hostname: listenOpts.hostname, port });
-    });
+    }).catch(() => {});
+    const finishedPromise = serverPromise.catch(() => {});
 
     const server = {
       id: serverId,
@@ -257,7 +258,7 @@
       hostname: listenOpts.hostname,
       port: listenOpts.port,
       closed: false,
-      finished: PromiseResolve(serverPromise),
+      finished: finishedPromise,
       async close() {
         if (server.closed) {
           return;
@@ -551,7 +552,10 @@
       }, 1000);
     }
 
-    return await server.serve().catch(console.error);
+    await PromiseAll([
+      server.serve().catch(console.error),
+      serverPromise,
+    ]);
   }
 
   function createRequestBodyStream(serverId, token) {
diff --git a/ext/flash/lib.rs b/ext/flash/lib.rs
index 2c76c450f..90363c082 100644
--- a/ext/flash/lib.rs
+++ b/ext/flash/lib.rs
@@ -1313,8 +1313,11 @@ fn op_flash_wait_for_listening(
     server_ctx.listening_rx.take().unwrap()
   };
   Ok(async move {
-    let port = listening_rx.recv().await.unwrap();
-    Ok(port)
+    if let Some(port) = listening_rx.recv().await {
+      Ok(port)
+    } else {
+      Err(generic_error("This error will be discarded"))
+    }
   })
 }
 
-- 
cgit v1.2.3