Fixes on client abort

.changeset/metal-bottles-flow.md

@@ -0,0 +1,5 @@
+---
+"@whatwg-node/node-fetch": patch
+---
+
+Handle request errors properly

.changeset/sweet-avocados-smoke.md

@@ -0,0 +1,5 @@
+---
+"@whatwg-node/server": patch
+---
+
+Do not call res.onAborted multiple times because it causes it to overwrite the previous listener, and use AbortSignal's abort event instead

packages/node-fetch/src/fetchNodeHttp.ts

@@ -96,6 +96,7 @@ export function fetchNodeHttp<TResponseJSON = any, TRequestJSON = any>(
             }
           });
         }
+        nodeResponse.once('error', reject);
         const ponyfillResponse = new PonyfillResponse(responseBody, {
           status: nodeResponse.statusCode,
           statusText: nodeResponse.statusMessage,

packages/server/src/createServerAdapter.ts

@@ -255,9 +255,13 @@ function createServerAdapter<
       resEnded = true;
       return originalResEnd(data);
     };
-    res.onAborted(() => {
+    const originalOnAborted = res.onAborted.bind(res);
+    originalOnAborted(function () {
       signal.sendAbort();
     });
+    res.onAborted = function (cb: () => void) {
+      signal.addEventListener('abort', cb);
+    };
     const request = getRequestFromUWSRequest({
       req,
       res,

packages/server/src/utils.ts

@@ -156,6 +156,7 @@ export function normalizeNodeRequest(
       }
     };
 
+    nodeResponse.once('error', closeEventListener);
     nodeResponse.once('close', closeEventListener);
 
     nodeResponse.once('finish', () => {

packages/server/src/uwebsockets.ts

@@ -1,5 +1,6 @@
 import type { Readable } from 'stream';
 import type { FetchAPI } from './types.js';
+import { ServerAdapterRequestAbortSignal } from './utils.js';
 
 export interface UWSRequest {
   getMethod(): string;
@@ -40,7 +41,7 @@ export function getRequestFromUWSRequest({ req, res, fetchAPI, signal }: GetRequ
   if (method !== 'get' && method !== 'head') {
     body = new fetchAPI.ReadableStream({});
     const readable = (body as any).readable as Readable;
-    res.onAborted(() => {
+    signal.addEventListener('abort', () => {
       readable.push(null);
     });
     res.onData(function (ab, isLast) {
@@ -71,7 +72,7 @@ export function getRequestFromUWSRequest({ req, res, fetchAPI, signal }: GetRequ
 async function forwardResponseBodyToUWSResponse(
   uwsResponse: UWSResponse,
   fetchResponse: Response,
-  signal: AbortSignal,
+  signal: ServerAdapterRequestAbortSignal,
 ) {
   for await (const chunk of fetchResponse.body as any as AsyncIterable<Uint8Array>) {
     if (signal.aborted) {
@@ -89,7 +90,7 @@ async function forwardResponseBodyToUWSResponse(
 export function sendResponseToUwsOpts(
   uwsResponse: UWSResponse,
   fetchResponse: Response,
-  signal: AbortSignal,
+  signal: ServerAdapterRequestAbortSignal,
 ) {
   if (!fetchResponse) {
     uwsResponse.writeStatus('404 Not Found');

packages/server/test/node.spec.ts

@@ -186,6 +186,41 @@ describe('Node Specific Cases', () => {
         expect(abortListener).toHaveBeenCalledTimes(1);
       });
 
+      it('handles AbortSignal correctly with streaming bodies', async () => {
+        const abortListener = jest.fn();
+        const adapterResponseDeferred = createDeferred<Response>();
+        function resolveAdapter() {
+          adapterResponseDeferred.resolve(
+            Response.json({
+              message: "You're so late!",
+            }),
+          );
+        }
+        const controller = new AbortController();
+        const serverAdapter = createServerAdapter(req => {
+          req.signal.addEventListener('abort', abortListener);
+          return req.text().then(() => {
+            controller.abort();
+            return adapterResponseDeferred.promise;
+          });
+        });
+        testServer.addOnceHandler(serverAdapter);
+        let error: Error | undefined;
+        try {
+          await fetch(testServer.url, {
+            method: 'POST',
+            signal: controller.signal,
+            body: 'Hello world!',
+          });
+        } catch (e: any) {
+          error = e;
+        }
+        expect(error).toBeDefined();
+        await sleep(300);
+        expect(abortListener).toHaveBeenCalledTimes(1);
+        resolveAdapter();
+      });
+
       it('handles query parameters correctly', async () => {
         const serverAdapter = createServerAdapter(req => {
           const urlObj = new URL(req.url);