@whatwg-node/server 0.9.62-rc-20241212140811-17d867cd8c5fe89df0d3471ca2e58da244e38bc5 → 0.9.63-alpha-20241212150911-36df5929a304522e501744daf167032d4b7994c0

package/cjs/createServerAdapter.js

@@ -186,7 +186,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 ctrl = new fetchAPI.AbortController();
         const originalResEnd = res.end.bind(res);
         let resEnded = false;
         res.end = function (data) {
@@ -195,16 +195,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         };
         const originalOnAborted = res.onAborted.bind(res);
         originalOnAborted(function () {
-            signal.sendAbort();
+            ctrl.abort();
         });
         res.onAborted = function (cb) {
-            signal.addEventListener('abort', cb);
+            ctrl.signal.addEventListener('abort', cb);
         };
         const request = (0, uwebsockets_js_1.getRequestFromUWSRequest)({
             req,
             res,
             fetchAPI,
-            signal,
+            ctrl,
         });
         let response$;
         try {
@@ -217,8 +217,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 (!ctrl.signal.aborted && !resEnded) {
+                    return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response, ctrl, fetchAPI);
                 }
             })
                 .catch(err => {
@@ -226,8 +226,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             });
         }
         try {
-            if (!signal.aborted && !resEnded) {
-                return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response$, signal, fetchAPI);
+            if (!ctrl.signal.aborted && !resEnded) {
+                return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response$, ctrl, 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, registerAbortCtrl) {
     const rawRequest = nodeRequest.raw || nodeRequest.req || nodeRequest;
     let fullUrl = buildFullUrl(rawRequest);
     if (nodeRequest.query) {
@@ -125,23 +94,13 @@ function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
         }
     }
     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 controller = new fetchAPI.AbortController();
+        signal = controller.signal;
+        registerAbortCtrl?.(controller);
         const closeEventListener = () => {
             if (signal && !signal.aborted) {
                 rawRequest.aborted = true;
-                sendAbortSignal();
+                controller.abort();
             }
         };
         nodeResponse.once('error', closeEventListener);

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, ctrl }) {
     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', () => {
+        ctrl.signal.addEventListener('abort', () => {
             stop();
         });
         let readableStream;
@@ -97,7 +97,7 @@ function getRequestFromUWSRequest({ req, res, fetchAPI, signal }) {
         get body() {
             return getBody();
         },
-        signal,
+        signal: ctrl.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, ctrl, fetchAPI) {
     if (!fetchResponse) {
         uwsResponse.writeStatus('404 Not Found');
         uwsResponse.end();
         return;
     }
     const bufferOfRes = fetchResponse._buffer;
-    if (signal.aborted) {
+    if (ctrl.signal.aborted) {
         return;
     }
     uwsResponse.cork(() => {
@@ -208,17 +208,17 @@ function sendResponseToUwsOpts(uwsResponse, fetchResponse, signal, fetchAPI) {
     if (bufferOfRes || !fetchResponse.body) {
         return;
     }
-    signal.addEventListener('abort', () => {
+    ctrl.signal.addEventListener('abort', () => {
         if (!fetchResponse.body?.locked) {
-            fetchResponse.body?.cancel(signal.reason);
+            fetchResponse.body?.cancel(ctrl.signal.reason);
         }
     });
     return fetchResponse.body
         .pipeTo(createWritableFromUWS(uwsResponse, fetchAPI), {
-        signal,
+        signal: ctrl.signal,
     })
         .catch(err => {
-        if (signal.aborted) {
+        if (ctrl.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) {
@@ -182,7 +182,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         const serverContext = filteredCtxParts.length > 0
             ? completeAssign(defaultServerContext, ...ctx)
             : defaultServerContext;
-        const signal = new ServerAdapterRequestAbortSignal();
+        const ctrl = new fetchAPI.AbortController();
         const originalResEnd = res.end.bind(res);
         let resEnded = false;
         res.end = function (data) {
@@ -191,16 +191,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         };
         const originalOnAborted = res.onAborted.bind(res);
         originalOnAborted(function () {
-            signal.sendAbort();
+            ctrl.abort();
         });
         res.onAborted = function (cb) {
-            signal.addEventListener('abort', cb);
+            ctrl.signal.addEventListener('abort', cb);
         };
         const request = getRequestFromUWSRequest({
             req,
             res,
             fetchAPI,
-            signal,
+            ctrl,
         });
         let response$;
         try {
@@ -213,8 +213,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 (!ctrl.signal.aborted && !resEnded) {
+                    return sendResponseToUwsOpts(res, response, ctrl, fetchAPI);
                 }
             })
                 .catch(err => {
@@ -222,8 +222,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             });
         }
         try {
-            if (!signal.aborted && !resEnded) {
-                return sendResponseToUwsOpts(res, response$, signal, fetchAPI);
+            if (!ctrl.signal.aborted && !resEnded) {
+                return sendResponseToUwsOpts(res, response$, ctrl, 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, registerAbortCtrl) {
     const rawRequest = nodeRequest.raw || nodeRequest.req || nodeRequest;
     let fullUrl = buildFullUrl(rawRequest);
     if (nodeRequest.query) {
@@ -102,23 +72,13 @@ export function normalizeNodeRequest(nodeRequest, fetchAPI, registerSignal) {
         }
     }
     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 controller = new fetchAPI.AbortController();
+        signal = controller.signal;
+        registerAbortCtrl?.(controller);
         const closeEventListener = () => {
             if (signal && !signal.aborted) {
                 rawRequest.aborted = true;
-                sendAbortSignal();
+                controller.abort();
             }
         };
         nodeResponse.once('error', closeEventListener);

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, ctrl }) {
     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', () => {
+        ctrl.signal.addEventListener('abort', () => {
             stop();
         });
         let readableStream;
@@ -90,7 +90,7 @@ export function getRequestFromUWSRequest({ req, res, fetchAPI, signal }) {
         get body() {
             return getBody();
         },
-        signal,
+        signal: ctrl.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, ctrl, fetchAPI) {
     if (!fetchResponse) {
         uwsResponse.writeStatus('404 Not Found');
         uwsResponse.end();
         return;
     }
     const bufferOfRes = fetchResponse._buffer;
-    if (signal.aborted) {
+    if (ctrl.signal.aborted) {
         return;
     }
     uwsResponse.cork(() => {
@@ -201,17 +201,17 @@ export function sendResponseToUwsOpts(uwsResponse, fetchResponse, signal, fetchA
     if (bufferOfRes || !fetchResponse.body) {
         return;
     }
-    signal.addEventListener('abort', () => {
+    ctrl.signal.addEventListener('abort', () => {
         if (!fetchResponse.body?.locked) {
-            fetchResponse.body?.cancel(signal.reason);
+            fetchResponse.body?.cancel(ctrl.signal.reason);
         }
     });
     return fetchResponse.body
         .pipeTo(createWritableFromUWS(uwsResponse, fetchAPI), {
-        signal,
+        signal: ctrl.signal,
     })
         .catch(err => {
-        if (signal.aborted) {
+        if (ctrl.signal.aborted) {
             return;
         }
         throw err;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.9.62-rc-20241212140811-17d867cd8c5fe89df0d3471ca2e58da244e38bc5",
+  "version": "0.9.63-alpha-20241212150911-36df5929a304522e501744daf167032d4b7994c0",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {
     "@whatwg-node/disposablestack": "^0.0.5",
-    "@whatwg-node/fetch": "^0.10.0",
+    "@whatwg-node/fetch": "0.11.0-alpha-20241212150911-36df5929a304522e501744daf167032d4b7994c0",
     "tslib": "^2.6.3"
   },
   "repository": {

package/typings/utils.d.cts

@@ -20,18 +20,8 @@ export interface NodeRequest {
     aborted?: boolean;
 }
 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, registerAbortCtrl?: (ctrl: AbortController) => void): 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

@@ -20,18 +20,8 @@ export interface NodeRequest {
     aborted?: boolean;
 }
 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, registerAbortCtrl?: (ctrl: AbortController) => void): 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;
+    ctrl: AbortController;
 }
-export declare function getRequestFromUWSRequest({ req, res, fetchAPI, signal }: GetRequestFromUWSOpts): Request;
+export declare function getRequestFromUWSRequest({ req, res, fetchAPI, ctrl }: 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, ctrl: 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;
+    ctrl: AbortController;
 }
-export declare function getRequestFromUWSRequest({ req, res, fetchAPI, signal }: GetRequestFromUWSOpts): Request;
+export declare function getRequestFromUWSRequest({ req, res, fetchAPI, ctrl }: 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, ctrl: AbortController, fetchAPI: FetchAPI): Promise<void> | undefined;
 export declare function fakePromise<T>(value: T): Promise<T>;
 export {};