Skip to content

Commit

Permalink
fix: moved abort controller to appease CFW
Browse files Browse the repository at this point in the history
  • Loading branch information
kitsonk committed Jul 2, 2024
1 parent 90c919a commit 2f7e76c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion deno.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,6 @@ let CFWRequestEventCtor: typeof CloudflareWorkerRequestEvent | undefined;
export class Router<
Env extends Record<string, string> = Record<string, string>,
> {
#abortController = new AbortController();
#handling = new Set<Promise<Response>>();
#logger: Logger;
#keys?: KeyRing;
Expand Down Expand Up @@ -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<Env>({
port,
hostname,
tls,
signal: this.#abortController.signal,
signal: abortController.signal,
});
const addr = await server.listen();
this.#logger.info(`listening on: ${addr}`);
Expand Down

0 comments on commit 2f7e76c

Please sign in to comment.