fix(server): do not listen the connection for abort but the request i…

…tself
ardatan · Dec 13, 2023 · 340c719 · 340c719
1 parent c320861
commit 340c719
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/.changeset/cyan-cherries-listen.md b/.changeset/cyan-cherries-listen.md
@@ -0,0 +1,5 @@
+---
+"@whatwg-node/server": patch
+---
+
+Handle aborted requests correctly
diff --git a/packages/server/src/utils.ts b/packages/server/src/utils.ts
@@ -21,10 +21,10 @@ export interface NodeRequest {
   headers?: any;
   req?: IncomingMessage | Http2ServerRequest;
   raw?: IncomingMessage | Http2ServerRequest;
-  connection?: Socket;
   socket?: Socket;
   query?: any;
   once?(event: string, listener: (...args: any[]) => void): void;
+  aborted?: boolean;
 }
 
 export type NodeResponse = ServerResponse | Http2ServerResponse;
@@ -134,18 +134,23 @@ export function normalizeNodeRequest(
   if (RequestCtor !== globalThis.Request) {
     signal = new ServerAdapterRequestAbortSignal();
 
-    if (rawRequest.connection?.once) {
-      rawRequest.connection?.once('close', () =>
-        (signal as ServerAdapterRequestAbortSignal).sendAbort(),
-      );
+    if (rawRequest?.once) {
+      rawRequest.once('close', () => {
+        if (rawRequest.aborted) {
+          (signal as ServerAdapterRequestAbortSignal).sendAbort();
+        }
+      });
     }
   } else {
     const controller = new AbortController();
     signal = controller.signal;
 
     if (rawRequest.once) {
-      rawRequest.once('end', () => controller.abort());
-      rawRequest.once('close', () => controller.abort());
+      rawRequest.once('close', () => {
+        if (rawRequest.aborted) {
+          controller.abort();
+        }
+      });
     }
   }