@whatwg-node/server 0.9.66-alpha-20250103124756-16736115b8febf6d963c207e6d75d57aa24645e6 → 0.9.66-alpha-20250205000734-b48a2e64484147e8ccb74c205803bb5cd4b7e948

package/README.md

@@ -167,10 +167,15 @@ app.route({
   url: '/mypath',
   method: ['GET', 'POST', 'OPTIONS'],
   handler: async (req, reply) => {
-    const response = await myServerAdapter.handleNodeRequestAndResponse(req, reply, {
+    const response: Response = await myServerAdapter.handleNodeRequestAndResponse(req, reply, {
       req,
       reply
     })
+
+    if (!response) {
+      return reply.status(404).send('Not Found')
+    }
+
     response.headers.forEach((value, key) => {
       reply.header(key, value)
     })
@@ -200,7 +205,7 @@ import myServerAdapter from './myServerAdapter'
 const app = new Koa()
 
 app.use(async ctx => {
-  const response = await myServerAdapter.handleNodeRequest(ctx.req)
+  const response = await myServerAdapter.handleNodeRequestAndResponse(ctx.request, ctx.res, ctx)
 
   // Set status code
   ctx.status = response.status

package/cjs/createServerAdapter.js

@@ -201,7 +201,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         const serverContext = filteredCtxParts.length > 0
             ? (0, utils_js_1.completeAssign)(defaultServerContext, ...ctx)
             : defaultServerContext;
-        const signal = new utils_js_1.ServerAdapterRequestAbortSignal();
+        const controller = new AbortController();
         const originalResEnd = res.end.bind(res);
         let resEnded = false;
         res.end = function (data) {
@@ -210,16 +210,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         };
         const originalOnAborted = res.onAborted.bind(res);
         originalOnAborted(function () {
-            signal.sendAbort();
+            controller.abort();
         });
         res.onAborted = function (cb) {
-            signal.addEventListener('abort', cb);
+            controller.signal.addEventListener('abort', cb);
         };
         const request = (0, uwebsockets_js_1.getRequestFromUWSRequest)({
             req,
             res,
             fetchAPI,
-            signal,
+            controller,
         });
         let response$;
         try {
@@ -232,8 +232,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             return response$
                 .catch((e) => (0, utils_js_1.handleErrorFromRequestHandler)(e, fetchAPI.Response))
                 .then(response => {
-                if (!signal.aborted && !resEnded) {
-                    return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response, signal, fetchAPI);
+                if (!controller.signal.aborted && !resEnded) {
+                    return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response, controller, fetchAPI);
                 }
             })
                 .catch(err => {
@@ -241,8 +241,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             });
         }
         try {
-            if (!signal.aborted && !resEnded) {
-                return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response$, signal, fetchAPI);
+            if (!controller.signal.aborted && !resEnded) {
+                return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response$, controller, fetchAPI);
             }
         }
         catch (err) {

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decompressedResponseMap = exports.nodeRequestResponseMap = exports.ServerAdapterRequestAbortSignal = void 0;
+exports.decompressedResponseMap = exports.nodeRequestResponseMap = void 0;
 exports.isAsyncIterable = isAsyncIterable;
 exports.normalizeNodeRequest = normalizeNodeRequest;
 exports.isReadable = isReadable;
@@ -69,40 +69,9 @@ function isRequestBody(body) {
     }
     return false;
 }
-class ServerAdapterRequestAbortSignal extends EventTarget {
-    aborted = false;
-    _onabort = null;
-    reason;
-    throwIfAborted() {
-        if (this.aborted) {
-            throw this.reason;
-        }
-    }
-    sendAbort() {
-        this.reason = new DOMException('This operation was aborted', 'AbortError');
-        this.aborted = true;
-        this.dispatchEvent(new Event('abort'));
-    }
-    get onabort() {
-        return this._onabort;
-    }
-    set onabort(value) {
-        this._onabort = value;
-        if (value) {
-            this.addEventListener('abort', value);
-        }
-        else {
-            this.removeEventListener('abort', value);
-        }
-    }
-    any(signals) {
-        return AbortSignal.any([...signals]);
-    }
-}
-exports.ServerAdapterRequestAbortSignal = ServerAdapterRequestAbortSignal;
 let bunNodeCompatModeWarned = false;
 exports.nodeRequestResponseMap = new WeakMap();
-function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
+function normalizeNodeRequest(nodeRequest, fetchAPI) {
     const rawRequest = nodeRequest.raw || nodeRequest.req || nodeRequest;
     let fullUrl = buildFullUrl(rawRequest);
     if (nodeRequest.query) {
@@ -112,7 +81,6 @@ function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
         }
         fullUrl = url.toString();
     }
-    let signal;
     const nodeResponse = exports.nodeRequestResponseMap.get(nodeRequest);
     exports.nodeRequestResponseMap.delete(nodeRequest);
     let normalizedHeaders = nodeRequest.headers;
@@ -124,24 +92,12 @@ function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
             }
         }
     }
+    const controller = new AbortController();
     if (nodeResponse?.once) {
-        let sendAbortSignal;
-        // If ponyfilled
-        if (fetchAPI.Request !== globalThis.Request) {
-            const newSignal = new ServerAdapterRequestAbortSignal();
-            registerSignal?.(newSignal);
-            signal = newSignal;
-            sendAbortSignal = () => signal.sendAbort();
-        }
-        else {
-            const controller = new AbortController();
-            signal = controller.signal;
-            sendAbortSignal = () => controller.abort();
-        }
         const closeEventListener = () => {
-            if (signal && !signal.aborted) {
-                rawRequest.aborted = true;
-                sendAbortSignal();
+            if (!controller.signal.aborted) {
+                Object.defineProperty(rawRequest, 'aborted', { value: true });
+                controller.abort();
             }
         };
         nodeResponse.once('error', closeEventListener);
@@ -154,7 +110,7 @@ function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
         return new fetchAPI.Request(fullUrl, {
             method: nodeRequest.method,
             headers: normalizedHeaders,
-            signal: signal || null,
+            signal: controller.signal,
         });
     }
     /**
@@ -170,13 +126,13 @@ function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
                 method: nodeRequest.method || 'GET',
                 headers: normalizedHeaders,
                 body: maybeParsedBody,
-                signal: signal || null,
+                signal: controller.signal,
             });
         }
         const request = new fetchAPI.Request(fullUrl, {
             method: nodeRequest.method || 'GET',
             headers: normalizedHeaders,
-            signal: signal || null,
+            signal: controller.signal,
         });
         if (!request.headers.get('content-type')?.includes('json')) {
             request.headers.set('content-type', 'application/json; charset=utf-8');
@@ -221,16 +177,17 @@ It will affect your performance. Please check our Bun integration recipe, and av
                     rawRequest.destroy(e);
                 },
             }),
-            signal,
+            signal: controller.signal,
         });
     }
     // perf: instead of spreading the object, we can just pass it as is and it performs better
     return new fetchAPI.Request(fullUrl, {
         method: nodeRequest.method,
         headers: normalizedHeaders,
+        signal: controller.signal,
+        // @ts-expect-error - AsyncIterable is supported as body
         body: rawRequest,
         duplex: 'half',
-        signal,
     });
 }
 function isReadable(stream) {
@@ -276,13 +233,25 @@ async function sendAsyncIterable(serverResponse, asyncIterable) {
         if (closed) {
             break;
         }
-        if (!serverResponse
-            // @ts-expect-error http and http2 writes are actually compatible
-            .write(chunk)) {
-            if (closed) {
-                break;
+        const shouldBreak = await new Promise(resolve => {
+            if (!serverResponse
+                // @ts-expect-error http and http2 writes are actually compatible
+                .write(chunk, err => {
+                if (err) {
+                    resolve(true);
+                }
+            })) {
+                if (closed) {
+                    resolve(true);
+                    return;
+                }
+                serverResponse.once('drain', () => {
+                    resolve(false);
+                });
             }
-            await new Promise(resolve => serverResponse.once('drain', resolve));
+        });
+        if (shouldBreak) {
+            break;
         }
     }
     endResponse(serverResponse);
@@ -343,15 +312,15 @@ function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
         return;
     }
     if (isReadableStream(fetchBody)) {
-        return sendReadableStream(serverResponse, fetchBody);
+        return sendReadableStream(nodeRequest, serverResponse, fetchBody);
     }
     if (isAsyncIterable(fetchBody)) {
         return sendAsyncIterable(serverResponse, fetchBody);
     }
 }
-async function sendReadableStream(serverResponse, readableStream) {
+async function sendReadableStream(nodeRequest, serverResponse, readableStream) {
     const reader = readableStream.getReader();
-    serverResponse.req.once('error', err => {
+    nodeRequest?.once?.('error', err => {
         reader.cancel(err);
     });
     while (true) {

package/cjs/uwebsockets.js

@@ -9,7 +9,7 @@ const utils_js_1 = require("./utils.js");
 function isUWSResponse(res) {
     return !!res.onData;
 }
-function getRequestFromUWSRequest({ req, res, fetchAPI, signal }) {
+function getRequestFromUWSRequest({ req, res, fetchAPI, controller, }) {
     const method = req.getMethod();
     let duplex;
     const chunks = [];
@@ -43,7 +43,7 @@ function getRequestFromUWSRequest({ req, res, fetchAPI, signal }) {
     let getReadableStream;
     if (method !== 'get' && method !== 'head') {
         duplex = 'half';
-        signal.addEventListener('abort', () => {
+        controller.signal.addEventListener('abort', () => {
             stop();
         });
         let readableStream;
@@ -97,7 +97,7 @@ function getRequestFromUWSRequest({ req, res, fetchAPI, signal }) {
         get body() {
             return getBody();
         },
-        signal,
+        signal: controller.signal,
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore - not in the TS types yet
         duplex,
@@ -171,14 +171,14 @@ function createWritableFromUWS(uwsResponse, fetchAPI) {
         },
     });
 }
-function sendResponseToUwsOpts(uwsResponse, fetchResponse, signal, fetchAPI) {
+function sendResponseToUwsOpts(uwsResponse, fetchResponse, controller, fetchAPI) {
     if (!fetchResponse) {
         uwsResponse.writeStatus('404 Not Found');
         uwsResponse.end();
         return;
     }
     const bufferOfRes = fetchResponse._buffer;
-    if (signal.aborted) {
+    if (controller.signal.aborted) {
         return;
     }
     uwsResponse.cork(() => {
@@ -208,17 +208,17 @@ function sendResponseToUwsOpts(uwsResponse, fetchResponse, signal, fetchAPI) {
     if (bufferOfRes || !fetchResponse.body) {
         return;
     }
-    signal.addEventListener('abort', () => {
+    controller.signal.addEventListener('abort', () => {
         if (!fetchResponse.body?.locked) {
-            fetchResponse.body?.cancel(signal.reason);
+            fetchResponse.body?.cancel(controller.signal.reason);
         }
     });
     return fetchResponse.body
         .pipeTo(createWritableFromUWS(uwsResponse, fetchAPI), {
-        signal,
+        signal: controller.signal,
     })
         .catch(err => {
-        if (signal.aborted) {
+        if (controller.signal.aborted) {
             return;
         }
         throw err;

package/esm/createServerAdapter.js

@@ -1,6 +1,6 @@
 import { AsyncDisposableStack, DisposableSymbols } from '@whatwg-node/disposablestack';
 import * as DefaultFetchAPI from '@whatwg-node/fetch';
-import { completeAssign, ensureDisposableStackRegisteredForTerminateEvents, handleAbortSignalAndPromiseResponse, handleErrorFromRequestHandler, isFetchEvent, isNodeRequest, isolateObject, isPromise, isRequestInit, isServerResponse, iterateAsyncVoid, nodeRequestResponseMap, normalizeNodeRequest, sendNodeResponse, ServerAdapterRequestAbortSignal, } from './utils.js';
+import { completeAssign, ensureDisposableStackRegisteredForTerminateEvents, handleAbortSignalAndPromiseResponse, handleErrorFromRequestHandler, isFetchEvent, isNodeRequest, isolateObject, isPromise, isRequestInit, isServerResponse, iterateAsyncVoid, nodeRequestResponseMap, normalizeNodeRequest, sendNodeResponse, } from './utils.js';
 import { fakePromise, getRequestFromUWSRequest, isUWSResponse, sendResponseToUwsOpts, } from './uwebsockets.js';
 // Required for envs like nextjs edge runtime
 function isRequestAccessible(serverContext) {
@@ -197,7 +197,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         const serverContext = filteredCtxParts.length > 0
             ? completeAssign(defaultServerContext, ...ctx)
             : defaultServerContext;
-        const signal = new ServerAdapterRequestAbortSignal();
+        const controller = new AbortController();
         const originalResEnd = res.end.bind(res);
         let resEnded = false;
         res.end = function (data) {
@@ -206,16 +206,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         };
         const originalOnAborted = res.onAborted.bind(res);
         originalOnAborted(function () {
-            signal.sendAbort();
+            controller.abort();
         });
         res.onAborted = function (cb) {
-            signal.addEventListener('abort', cb);
+            controller.signal.addEventListener('abort', cb);
         };
         const request = getRequestFromUWSRequest({
             req,
             res,
             fetchAPI,
-            signal,
+            controller,
         });
         let response$;
         try {
@@ -228,8 +228,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             return response$
                 .catch((e) => handleErrorFromRequestHandler(e, fetchAPI.Response))
                 .then(response => {
-                if (!signal.aborted && !resEnded) {
-                    return sendResponseToUwsOpts(res, response, signal, fetchAPI);
+                if (!controller.signal.aborted && !resEnded) {
+                    return sendResponseToUwsOpts(res, response, controller, fetchAPI);
                 }
             })
                 .catch(err => {
@@ -237,8 +237,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             });
         }
         try {
-            if (!signal.aborted && !resEnded) {
-                return sendResponseToUwsOpts(res, response$, signal, fetchAPI);
+            if (!controller.signal.aborted && !resEnded) {
+                return sendResponseToUwsOpts(res, response$, controller, fetchAPI);
             }
         }
         catch (err) {

package/esm/utils.js

@@ -47,39 +47,9 @@ function isRequestBody(body) {
     }
     return false;
 }
-export class ServerAdapterRequestAbortSignal extends EventTarget {
-    aborted = false;
-    _onabort = null;
-    reason;
-    throwIfAborted() {
-        if (this.aborted) {
-            throw this.reason;
-        }
-    }
-    sendAbort() {
-        this.reason = new DOMException('This operation was aborted', 'AbortError');
-        this.aborted = true;
-        this.dispatchEvent(new Event('abort'));
-    }
-    get onabort() {
-        return this._onabort;
-    }
-    set onabort(value) {
-        this._onabort = value;
-        if (value) {
-            this.addEventListener('abort', value);
-        }
-        else {
-            this.removeEventListener('abort', value);
-        }
-    }
-    any(signals) {
-        return AbortSignal.any([...signals]);
-    }
-}
 let bunNodeCompatModeWarned = false;
 export const nodeRequestResponseMap = new WeakMap();
-export function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
+export function normalizeNodeRequest(nodeRequest, fetchAPI) {
     const rawRequest = nodeRequest.raw || nodeRequest.req || nodeRequest;
     let fullUrl = buildFullUrl(rawRequest);
     if (nodeRequest.query) {
@@ -89,7 +59,6 @@ export function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
         }
         fullUrl = url.toString();
     }
-    let signal;
     const nodeResponse = nodeRequestResponseMap.get(nodeRequest);
     nodeRequestResponseMap.delete(nodeRequest);
     let normalizedHeaders = nodeRequest.headers;
@@ -101,24 +70,12 @@ export function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
             }
         }
     }
+    const controller = new AbortController();
     if (nodeResponse?.once) {
-        let sendAbortSignal;
-        // If ponyfilled
-        if (fetchAPI.Request !== globalThis.Request) {
-            const newSignal = new ServerAdapterRequestAbortSignal();
-            registerSignal?.(newSignal);
-            signal = newSignal;
-            sendAbortSignal = () => signal.sendAbort();
-        }
-        else {
-            const controller = new AbortController();
-            signal = controller.signal;
-            sendAbortSignal = () => controller.abort();
-        }
         const closeEventListener = () => {
-            if (signal && !signal.aborted) {
-                rawRequest.aborted = true;
-                sendAbortSignal();
+            if (!controller.signal.aborted) {
+                Object.defineProperty(rawRequest, 'aborted', { value: true });
+                controller.abort();
             }
         };
         nodeResponse.once('error', closeEventListener);
@@ -131,7 +88,7 @@ export function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
         return new fetchAPI.Request(fullUrl, {
             method: nodeRequest.method,
             headers: normalizedHeaders,
-            signal: signal || null,
+            signal: controller.signal,
         });
     }
     /**
@@ -147,13 +104,13 @@ export function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
                 method: nodeRequest.method || 'GET',
                 headers: normalizedHeaders,
                 body: maybeParsedBody,
-                signal: signal || null,
+                signal: controller.signal,
             });
         }
         const request = new fetchAPI.Request(fullUrl, {
             method: nodeRequest.method || 'GET',
             headers: normalizedHeaders,
-            signal: signal || null,
+            signal: controller.signal,
         });
         if (!request.headers.get('content-type')?.includes('json')) {
             request.headers.set('content-type', 'application/json; charset=utf-8');
@@ -198,16 +155,17 @@ It will affect your performance. Please check our Bun integration recipe, and av
                     rawRequest.destroy(e);
                 },
             }),
-            signal,
+            signal: controller.signal,
         });
     }
     // perf: instead of spreading the object, we can just pass it as is and it performs better
     return new fetchAPI.Request(fullUrl, {
         method: nodeRequest.method,
         headers: normalizedHeaders,
+        signal: controller.signal,
+        // @ts-expect-error - AsyncIterable is supported as body
         body: rawRequest,
         duplex: 'half',
-        signal,
     });
 }
 export function isReadable(stream) {
@@ -253,13 +211,25 @@ async function sendAsyncIterable(serverResponse, asyncIterable) {
         if (closed) {
             break;
         }
-        if (!serverResponse
-            // @ts-expect-error http and http2 writes are actually compatible
-            .write(chunk)) {
-            if (closed) {
-                break;
+        const shouldBreak = await new Promise(resolve => {
+            if (!serverResponse
+                // @ts-expect-error http and http2 writes are actually compatible
+                .write(chunk, err => {
+                if (err) {
+                    resolve(true);
+                }
+            })) {
+                if (closed) {
+                    resolve(true);
+                    return;
+                }
+                serverResponse.once('drain', () => {
+                    resolve(false);
+                });
             }
-            await new Promise(resolve => serverResponse.once('drain', resolve));
+        });
+        if (shouldBreak) {
+            break;
         }
     }
     endResponse(serverResponse);
@@ -320,15 +290,15 @@ export function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
         return;
     }
     if (isReadableStream(fetchBody)) {
-        return sendReadableStream(serverResponse, fetchBody);
+        return sendReadableStream(nodeRequest, serverResponse, fetchBody);
     }
     if (isAsyncIterable(fetchBody)) {
         return sendAsyncIterable(serverResponse, fetchBody);
     }
 }
-async function sendReadableStream(serverResponse, readableStream) {
+async function sendReadableStream(nodeRequest, serverResponse, readableStream) {
     const reader = readableStream.getReader();
-    serverResponse.req.once('error', err => {
+    nodeRequest?.once?.('error', err => {
         reader.cancel(err);
     });
     while (true) {

package/esm/uwebsockets.js

@@ -2,7 +2,7 @@ import { isPromise } from './utils.js';
 export function isUWSResponse(res) {
     return !!res.onData;
 }
-export function getRequestFromUWSRequest({ req, res, fetchAPI, signal }) {
+export function getRequestFromUWSRequest({ req, res, fetchAPI, controller, }) {
     const method = req.getMethod();
     let duplex;
     const chunks = [];
@@ -36,7 +36,7 @@ export function getRequestFromUWSRequest({ req, res, fetchAPI, signal }) {
     let getReadableStream;
     if (method !== 'get' && method !== 'head') {
         duplex = 'half';
-        signal.addEventListener('abort', () => {
+        controller.signal.addEventListener('abort', () => {
             stop();
         });
         let readableStream;
@@ -90,7 +90,7 @@ export function getRequestFromUWSRequest({ req, res, fetchAPI, signal }) {
         get body() {
             return getBody();
         },
-        signal,
+        signal: controller.signal,
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore - not in the TS types yet
         duplex,
@@ -164,14 +164,14 @@ export function createWritableFromUWS(uwsResponse, fetchAPI) {
         },
     });
 }
-export function sendResponseToUwsOpts(uwsResponse, fetchResponse, signal, fetchAPI) {
+export function sendResponseToUwsOpts(uwsResponse, fetchResponse, controller, fetchAPI) {
     if (!fetchResponse) {
         uwsResponse.writeStatus('404 Not Found');
         uwsResponse.end();
         return;
     }
     const bufferOfRes = fetchResponse._buffer;
-    if (signal.aborted) {
+    if (controller.signal.aborted) {
         return;
     }
     uwsResponse.cork(() => {
@@ -201,17 +201,17 @@ export function sendResponseToUwsOpts(uwsResponse, fetchResponse, signal, fetchA
     if (bufferOfRes || !fetchResponse.body) {
         return;
     }
-    signal.addEventListener('abort', () => {
+    controller.signal.addEventListener('abort', () => {
         if (!fetchResponse.body?.locked) {
-            fetchResponse.body?.cancel(signal.reason);
+            fetchResponse.body?.cancel(controller.signal.reason);
         }
     });
     return fetchResponse.body
         .pipeTo(createWritableFromUWS(uwsResponse, fetchAPI), {
-        signal,
+        signal: controller.signal,
     })
         .catch(err => {
-        if (signal.aborted) {
+        if (controller.signal.aborted) {
             return;
         }
         throw err;

package/package.json

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

package/typings/plugins/useErrorHandling.d.cts

@@ -8,5 +8,5 @@ export declare class HTTPError extends Error {
     name: string;
     constructor(status: number | undefined, message: string, headers?: HeadersInit, details?: any | undefined);
 }
-export type ErrorHandler<TServerContext> = (e: any, request: Request, ctx: TServerContext) => Response | Promise<Response>;
+export type ErrorHandler<TServerContext> = (e: any, request: Request, ctx: TServerContext) => Response | Promise<Response> | void;
 export declare function useErrorHandling<TServerContext>(onError?: ErrorHandler<TServerContext>): ServerAdapterPlugin<TServerContext>;

package/typings/plugins/useErrorHandling.d.ts

@@ -8,5 +8,5 @@ export declare class HTTPError extends Error {
     name: string;
     constructor(status: number | undefined, message: string, headers?: HeadersInit, details?: any | undefined);
 }
-export type ErrorHandler<TServerContext> = (e: any, request: Request, ctx: TServerContext) => Response | Promise<Response>;
+export type ErrorHandler<TServerContext> = (e: any, request: Request, ctx: TServerContext) => Response | Promise<Response> | void;
 export declare function useErrorHandling<TServerContext>(onError?: ErrorHandler<TServerContext>): ServerAdapterPlugin<TServerContext>;

package/typings/types.d.cts

@@ -1,4 +1,4 @@
-import type { RequestListener } from 'http';
+import type { RequestListener } from 'node:http';
 import type { NodeRequest, NodeResponse } from './utils.cjs';
 import { UWSHandler, UWSRequest, UWSResponse } from './uwebsockets.cjs';
 export interface FetchEvent extends Event {

package/typings/types.d.ts

@@ -1,4 +1,4 @@
-import type { RequestListener } from 'http';
+import type { RequestListener } from 'node:http';
 import type { NodeRequest, NodeResponse } from './utils.js';
 import { UWSHandler, UWSRequest, UWSResponse } from './uwebsockets.js';
 export interface FetchEvent extends Event {

package/typings/utils.d.cts

@@ -1,7 +1,7 @@
-import type { IncomingMessage, ServerResponse } from 'http';
-import type { Http2ServerRequest, Http2ServerResponse } from 'http2';
-import type { Socket } from 'net';
-import type { Readable } from 'stream';
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
+import type { Socket } from 'node:net';
+import type { Readable } from 'node:stream';
 import type { FetchAPI, FetchEvent } from './types.cjs';
 export declare function isAsyncIterable(body: any): body is AsyncIterable<any>;
 export interface NodeRequest {
@@ -20,18 +20,8 @@ export interface NodeRequest {
     aborted?: boolean | undefined;
 }
 export type NodeResponse = ServerResponse | Http2ServerResponse;
-export declare class ServerAdapterRequestAbortSignal extends EventTarget implements AbortSignal {
-    aborted: boolean;
-    private _onabort;
-    reason: any;
-    throwIfAborted(): void;
-    sendAbort(): void;
-    get onabort(): ((this: AbortSignal, ev: Event) => any) | null;
-    set onabort(value: ((this: AbortSignal, ev: Event) => any) | null);
-    any(signals: Iterable<AbortSignal>): AbortSignal;
-}
 export declare const nodeRequestResponseMap: WeakMap<NodeRequest, NodeResponse>;
-export declare function normalizeNodeRequest(nodeRequest: NodeRequest, fetchAPI: FetchAPI, registerSignal?: (signal: ServerAdapterRequestAbortSignal) => void): Request;
+export declare function normalizeNodeRequest(nodeRequest: NodeRequest, fetchAPI: FetchAPI): Request;
 export declare function isReadable(stream: any): stream is Readable;
 export declare function isNodeRequest(request: any): request is NodeRequest;
 export declare function isServerResponse(stream: any): stream is NodeResponse;

package/typings/utils.d.ts

@@ -1,7 +1,7 @@
-import type { IncomingMessage, ServerResponse } from 'http';
-import type { Http2ServerRequest, Http2ServerResponse } from 'http2';
-import type { Socket } from 'net';
-import type { Readable } from 'stream';
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
+import type { Socket } from 'node:net';
+import type { Readable } from 'node:stream';
 import type { FetchAPI, FetchEvent } from './types.js';
 export declare function isAsyncIterable(body: any): body is AsyncIterable<any>;
 export interface NodeRequest {
@@ -20,18 +20,8 @@ export interface NodeRequest {
     aborted?: boolean | undefined;
 }
 export type NodeResponse = ServerResponse | Http2ServerResponse;
-export declare class ServerAdapterRequestAbortSignal extends EventTarget implements AbortSignal {
-    aborted: boolean;
-    private _onabort;
-    reason: any;
-    throwIfAborted(): void;
-    sendAbort(): void;
-    get onabort(): ((this: AbortSignal, ev: Event) => any) | null;
-    set onabort(value: ((this: AbortSignal, ev: Event) => any) | null);
-    any(signals: Iterable<AbortSignal>): AbortSignal;
-}
 export declare const nodeRequestResponseMap: WeakMap<NodeRequest, NodeResponse>;
-export declare function normalizeNodeRequest(nodeRequest: NodeRequest, fetchAPI: FetchAPI, registerSignal?: (signal: ServerAdapterRequestAbortSignal) => void): Request;
+export declare function normalizeNodeRequest(nodeRequest: NodeRequest, fetchAPI: FetchAPI): Request;
 export declare function isReadable(stream: any): stream is Readable;
 export declare function isNodeRequest(request: any): request is NodeRequest;
 export declare function isServerResponse(stream: any): stream is NodeResponse;

package/typings/uwebsockets.d.cts

@@ -1,5 +1,4 @@
 import type { FetchAPI } from './types.cjs';
-import { ServerAdapterRequestAbortSignal } from './utils.cjs';
 export interface UWSRequest {
     getMethod(): string;
     forEach(callback: (key: string, value: string) => void): void;
@@ -24,10 +23,10 @@ interface GetRequestFromUWSOpts {
     req: UWSRequest;
     res: UWSResponse;
     fetchAPI: FetchAPI;
-    signal: AbortSignal;
+    controller: AbortController;
 }
-export declare function getRequestFromUWSRequest({ req, res, fetchAPI, signal }: GetRequestFromUWSOpts): Request;
+export declare function getRequestFromUWSRequest({ req, res, fetchAPI, controller, }: GetRequestFromUWSOpts): Request;
 export declare function createWritableFromUWS(uwsResponse: UWSResponse, fetchAPI: FetchAPI): WritableStream<any>;
-export declare function sendResponseToUwsOpts(uwsResponse: UWSResponse, fetchResponse: Response, signal: ServerAdapterRequestAbortSignal, fetchAPI: FetchAPI): Promise<void> | undefined;
+export declare function sendResponseToUwsOpts(uwsResponse: UWSResponse, fetchResponse: Response, controller: AbortController, fetchAPI: FetchAPI): Promise<void> | undefined;
 export declare function fakePromise<T>(value: T): Promise<T>;
 export {};

package/typings/uwebsockets.d.ts

@@ -1,5 +1,4 @@
 import type { FetchAPI } from './types.js';
-import { ServerAdapterRequestAbortSignal } from './utils.js';
 export interface UWSRequest {
     getMethod(): string;
     forEach(callback: (key: string, value: string) => void): void;
@@ -24,10 +23,10 @@ interface GetRequestFromUWSOpts {
     req: UWSRequest;
     res: UWSResponse;
     fetchAPI: FetchAPI;
-    signal: AbortSignal;
+    controller: AbortController;
 }
-export declare function getRequestFromUWSRequest({ req, res, fetchAPI, signal }: GetRequestFromUWSOpts): Request;
+export declare function getRequestFromUWSRequest({ req, res, fetchAPI, controller, }: GetRequestFromUWSOpts): Request;
 export declare function createWritableFromUWS(uwsResponse: UWSResponse, fetchAPI: FetchAPI): WritableStream<any>;
-export declare function sendResponseToUwsOpts(uwsResponse: UWSResponse, fetchResponse: Response, signal: ServerAdapterRequestAbortSignal, fetchAPI: FetchAPI): Promise<void> | undefined;
+export declare function sendResponseToUwsOpts(uwsResponse: UWSResponse, fetchResponse: Response, controller: AbortController, fetchAPI: FetchAPI): Promise<void> | undefined;
 export declare function fakePromise<T>(value: T): Promise<T>;
 export {};