@whatwg-node/server 0.9.66-alpha-20250205000734-b48a2e64484147e8ccb74c205803bb5cd4b7e948 → 0.9.66

package/cjs/createServerAdapter.js

@@ -213,7 +213,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             controller.abort();
         });
         res.onAborted = function (cb) {
-            controller.signal.addEventListener('abort', cb);
+            controller.signal.addEventListener('abort', cb, { once: true });
         };
         const request = (0, uwebsockets_js_1.getRequestFromUWSRequest)({
             req,
@@ -275,13 +275,17 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             if ((0, utils_js_1.isRequestInit)(initOrCtx)) {
                 const request = new fetchAPI.Request(input, initOrCtx);
                 const res$ = handleRequestWithWaitUntil(request, ...restOfCtx);
-                return (0, utils_js_1.handleAbortSignalAndPromiseResponse)(res$, initOrCtx?.signal);
+                const signal = initOrCtx.signal;
+                if (signal) {
+                    return (0, utils_js_1.handleAbortSignalAndPromiseResponse)(res$, signal);
+                }
+                return res$;
             }
             const request = new fetchAPI.Request(input);
             return handleRequestWithWaitUntil(request, ...maybeCtx);
         }
         const res$ = handleRequestWithWaitUntil(input, ...maybeCtx);
-        return (0, utils_js_1.handleAbortSignalAndPromiseResponse)(res$, input._signal);
+        return (0, utils_js_1.handleAbortSignalAndPromiseResponse)(res$, input.signal);
     };
     const genericRequestHandler = (input, ...maybeCtx) => {
         // If it is a Node request

package/cjs/plugins/useCors.js

@@ -112,7 +112,6 @@ function useCORS(options) {
             }
         },
         async onResponse({ request, serverContext, response }) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const headers = await getCORSResponseHeaders(request, corsOptionsFactory, serverContext);
             if (headers != null) {
                 for (const headerName in headers) {

package/cjs/utils.js

@@ -97,7 +97,7 @@ function normalizeNodeRequest(nodeRequest, fetchAPI) {
         const closeEventListener = () => {
             if (!controller.signal.aborted) {
                 Object.defineProperty(rawRequest, 'aborted', { value: true });
-                controller.abort();
+                controller.abort(nodeResponse.errored ?? undefined);
             }
         };
         nodeResponse.once('error', closeEventListener);
@@ -443,17 +443,24 @@ function createDeferredPromise() {
     };
 }
 function handleAbortSignalAndPromiseResponse(response$, abortSignal) {
+    if (abortSignal?.aborted) {
+        throw abortSignal.reason;
+    }
     if (isPromise(response$) && abortSignal) {
         const deferred$ = createDeferredPromise();
-        abortSignal.addEventListener('abort', function abortSignalFetchErrorHandler() {
+        function abortSignalFetchErrorHandler() {
             deferred$.reject(abortSignal.reason);
-        });
+        }
+        abortSignal.addEventListener('abort', abortSignalFetchErrorHandler, { once: true });
         response$
             .then(function fetchSuccessHandler(res) {
             deferred$.resolve(res);
         })
             .catch(function fetchErrorHandler(err) {
             deferred$.reject(err);
+        })
+            .finally(() => {
+            abortSignal.removeEventListener('abort', abortSignalFetchErrorHandler);
         });
         return deferred$.promise;
     }

package/cjs/uwebsockets.js

@@ -45,7 +45,7 @@ function getRequestFromUWSRequest({ req, res, fetchAPI, controller, }) {
         duplex = 'half';
         controller.signal.addEventListener('abort', () => {
             stop();
-        });
+        }, { once: true });
         let readableStream;
         getReadableStream = () => {
             if (!readableStream) {
@@ -212,7 +212,7 @@ function sendResponseToUwsOpts(uwsResponse, fetchResponse, controller, fetchAPI)
         if (!fetchResponse.body?.locked) {
             fetchResponse.body?.cancel(controller.signal.reason);
         }
-    });
+    }, { once: true });
     return fetchResponse.body
         .pipeTo(createWritableFromUWS(uwsResponse, fetchAPI), {
         signal: controller.signal,

package/esm/createServerAdapter.js

@@ -209,7 +209,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             controller.abort();
         });
         res.onAborted = function (cb) {
-            controller.signal.addEventListener('abort', cb);
+            controller.signal.addEventListener('abort', cb, { once: true });
         };
         const request = getRequestFromUWSRequest({
             req,
@@ -271,13 +271,17 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             if (isRequestInit(initOrCtx)) {
                 const request = new fetchAPI.Request(input, initOrCtx);
                 const res$ = handleRequestWithWaitUntil(request, ...restOfCtx);
-                return handleAbortSignalAndPromiseResponse(res$, initOrCtx?.signal);
+                const signal = initOrCtx.signal;
+                if (signal) {
+                    return handleAbortSignalAndPromiseResponse(res$, signal);
+                }
+                return res$;
             }
             const request = new fetchAPI.Request(input);
             return handleRequestWithWaitUntil(request, ...maybeCtx);
         }
         const res$ = handleRequestWithWaitUntil(input, ...maybeCtx);
-        return handleAbortSignalAndPromiseResponse(res$, input._signal);
+        return handleAbortSignalAndPromiseResponse(res$, input.signal);
     };
     const genericRequestHandler = (input, ...maybeCtx) => {
         // If it is a Node request

package/esm/plugins/useCors.js

@@ -108,7 +108,6 @@ export function useCORS(options) {
             }
         },
         async onResponse({ request, serverContext, response }) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const headers = await getCORSResponseHeaders(request, corsOptionsFactory, serverContext);
             if (headers != null) {
                 for (const headerName in headers) {

package/esm/utils.js

@@ -75,7 +75,7 @@ export function normalizeNodeRequest(nodeRequest, fetchAPI) {
         const closeEventListener = () => {
             if (!controller.signal.aborted) {
                 Object.defineProperty(rawRequest, 'aborted', { value: true });
-                controller.abort();
+                controller.abort(nodeResponse.errored ?? undefined);
             }
         };
         nodeResponse.once('error', closeEventListener);
@@ -421,17 +421,24 @@ export function createDeferredPromise() {
     };
 }
 export function handleAbortSignalAndPromiseResponse(response$, abortSignal) {
+    if (abortSignal?.aborted) {
+        throw abortSignal.reason;
+    }
     if (isPromise(response$) && abortSignal) {
         const deferred$ = createDeferredPromise();
-        abortSignal.addEventListener('abort', function abortSignalFetchErrorHandler() {
+        function abortSignalFetchErrorHandler() {
             deferred$.reject(abortSignal.reason);
-        });
+        }
+        abortSignal.addEventListener('abort', abortSignalFetchErrorHandler, { once: true });
         response$
             .then(function fetchSuccessHandler(res) {
             deferred$.resolve(res);
         })
             .catch(function fetchErrorHandler(err) {
             deferred$.reject(err);
+        })
+            .finally(() => {
+            abortSignal.removeEventListener('abort', abortSignalFetchErrorHandler);
         });
         return deferred$.promise;
     }

package/esm/uwebsockets.js

@@ -38,7 +38,7 @@ export function getRequestFromUWSRequest({ req, res, fetchAPI, controller, }) {
         duplex = 'half';
         controller.signal.addEventListener('abort', () => {
             stop();
-        });
+        }, { once: true });
         let readableStream;
         getReadableStream = () => {
             if (!readableStream) {
@@ -205,7 +205,7 @@ export function sendResponseToUwsOpts(uwsResponse, fetchResponse, controller, fe
         if (!fetchResponse.body?.locked) {
             fetchResponse.body?.cancel(controller.signal.reason);
         }
-    });
+    }, { once: true });
     return fetchResponse.body
         .pipeTo(createWritableFromUWS(uwsResponse, fetchAPI), {
         signal: controller.signal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.9.66-alpha-20250205000734-b48a2e64484147e8ccb74c205803bb5cd4b7e948",
+  "version": "0.9.66",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {

package/typings/utils.d.cts

@@ -40,7 +40,7 @@ export interface DeferredPromise<T = void> {
     reject: (reason: any) => void;
 }
 export declare function createDeferredPromise<T = void>(): DeferredPromise<T>;
-export declare function handleAbortSignalAndPromiseResponse(response$: Promise<Response> | Response, abortSignal?: AbortSignal | null): Response | Promise<Response>;
+export declare function handleAbortSignalAndPromiseResponse(response$: Promise<Response> | Response, abortSignal: AbortSignal): Response | Promise<Response>;
 export declare const decompressedResponseMap: WeakMap<Response, Response>;
 export declare function getSupportedEncodings(fetchAPI: FetchAPI): CompressionFormat[];
 export declare function handleResponseDecompression(response: Response, fetchAPI: FetchAPI): Response;

package/typings/utils.d.ts

@@ -40,7 +40,7 @@ export interface DeferredPromise<T = void> {
     reject: (reason: any) => void;
 }
 export declare function createDeferredPromise<T = void>(): DeferredPromise<T>;
-export declare function handleAbortSignalAndPromiseResponse(response$: Promise<Response> | Response, abortSignal?: AbortSignal | null): Response | Promise<Response>;
+export declare function handleAbortSignalAndPromiseResponse(response$: Promise<Response> | Response, abortSignal: AbortSignal): Response | Promise<Response>;
 export declare const decompressedResponseMap: WeakMap<Response, Response>;
 export declare function getSupportedEncodings(fetchAPI: FetchAPI): CompressionFormat[];
 export declare function handleResponseDecompression(response: Response, fetchAPI: FetchAPI): Response;