fix: http_server_native when closing with signal abort event (#639)

oakserver · Feb 25, 2024 · ff1dfe8 · ff1dfe8
1 parent a3f0076
commit ff1dfe8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/http_server_native.test.ts b/http_server_native.test.ts
@@ -35,8 +35,9 @@ Deno.test({
   name: "HttpServer closes gracefully after serving requests",
   ignore: isNode(),
   async fn() {
+    const abortController = new AbortController();
     const app = new Application();
-    const listenOptions = { port: 4505 };
+    const listenOptions = { port: 4505, signal: abortController.signal };
 
     const server = new Server(app, listenOptions);
     server.listen();
@@ -56,7 +57,7 @@ Deno.test({
       console.error(e);
       unreachable();
     } finally {
-      await server.close();
+      abortController.abort();
     }
   },
 });

diff --git a/http_server_native.ts b/http_server_native.ts
@@ -71,7 +71,6 @@ export class Server<AS extends State = Record<string, any>>
       throw new Error("Server already listening.");
     }
     const { signal } = this.#options;
-    signal?.addEventListener("abort", () => this.close(), { once: true });
     const { onListen, ...options } = this.#options;
     const { promise, resolve } = createPromiseWithResolvers<Listener>();
     this.#stream = new ReadableStream<NativeRequest>({
@@ -94,6 +93,7 @@ export class Server<AS extends State = Record<string, any>>
       },
     });
 
+    signal?.addEventListener("abort", () => this.close(), { once: true });
     return promise;
   }