1 files changed, 8 insertions, 4 deletions
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) {