From ac9097685b4030e152259b82698d37631500b8a7 Mon Sep 17 00:00:00 2001 From: Kitson Kelly Date: Thu, 6 Jun 2024 13:34:59 +1000 Subject: [PATCH] fix: don't await respond --- deno.json | 2 +- http_server_node.test.ts | 2 +- http_server_node.ts | 5 ----- router.ts | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/deno.json b/deno.json index 2a81592..2c5d07b 100644 --- a/deno.json +++ b/deno.json @@ -1,6 +1,6 @@ { "name": "@oak/acorn", - "version": "0.6.0-alpha.3", + "version": "0.6.0-alpha.4", "exports": { ".": "./mod.ts", "./context": "./context.ts", diff --git a/http_server_node.test.ts b/http_server_node.test.ts index 97b6770..16279d1 100644 --- a/http_server_node.test.ts +++ b/http_server_node.test.ts @@ -23,7 +23,7 @@ Deno.test({ await server.listen(); const promise = fetch("http://localhost:8080/"); for await (const req of server) { - req.respond(new Response("hello world")); + req.respond(Promise.resolve(new Response("hello world"))); break; } const res = await promise; diff --git a/http_server_node.ts b/http_server_node.ts index d21955a..a98eb94 100644 --- a/http_server_node.ts +++ b/http_server_node.ts @@ -37,12 +37,10 @@ class RequestEvent implements _RequestEvent { } get request(): Request { - console.log("read request"); return this.#request; } get response(): Promise { - console.log("read response"); return this.#promise; } @@ -89,12 +87,10 @@ class RequestEvent implements _RequestEvent { // deno-lint-ignore no-explicit-any error(reason?: any): void { - console.log("error", reason); this.#reject(reason); } async respond(response: Response | PromiseLike): Promise { - console.log("respond", response); if (this.#resolved) { throw new Error("Request already responded to."); } @@ -192,7 +188,6 @@ export default class HttpServer implements Server { start: (controller) => { this.#controller = controller; const server = this.#server = createServer((req, res) => { - console.log("incoming", req, res); controller.enqueue( new RequestEvent(req, res, this.#host, this.#address), ); diff --git a/router.ts b/router.ts index ec82867..ea51385 100644 --- a/router.ts +++ b/router.ts @@ -909,7 +909,7 @@ export class Router extends EventTarget { performance.mark(`${HANDLE_START} ${uid}`); const { promise, resolve } = Promise.withResolvers(); this.#handling.add(promise); - await requestEvent.respond(promise); + requestEvent.respond(promise); promise.then(() => this.#handling.delete(promise)).catch( (error) => { this.#error(requestEvent.request, error, false);