From 2f7e76cc3c2fd9d97ff0478685dccb92bd5bbf02 Mon Sep 17 00:00:00 2001 From: Kitson Kelly Date: Tue, 2 Jul 2024 20:34:12 +1000 Subject: [PATCH] fix: moved abort controller to appease CFW --- deno.json | 2 +- router.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deno.json b/deno.json index 807149c..c16cb7b 100644 --- a/deno.json +++ b/deno.json @@ -1,6 +1,6 @@ { "name": "@oak/acorn", - "version": "1.0.0-alpha.4", + "version": "1.0.0-alpha.5", "exports": { ".": "./mod.ts" }, "tasks": { "bench": "deno bench --allow-write --allow-read", diff --git a/router.ts b/router.ts index 0d7993d..0484796 100644 --- a/router.ts +++ b/router.ts @@ -435,7 +435,6 @@ let CFWRequestEventCtor: typeof CloudflareWorkerRequestEvent | undefined; export class Router< Env extends Record = Record, > { - #abortController = new AbortController(); #handling = new Set>(); #logger: Logger; #keys?: KeyRing; @@ -1647,17 +1646,18 @@ export class Router< onListen, } = options; this.#logger.debug(`listen options: ${options}`); + const abortController = new AbortController(); signal?.addEventListener("abort", async () => { this.#logger.debug(`closing server`); await Promise.all(this.#handling); this.#handling.clear(); - this.#abortController.abort(); + abortController.abort(); }); const server = new Server({ port, hostname, tls, - signal: this.#abortController.signal, + signal: abortController.signal, }); const addr = await server.listen(); this.#logger.info(`listening on: ${addr}`);