@whatwg-node/server 0.9.10 → 0.9.11-alpha-20230821122741-21a9569

package/cjs/createServerAdapter.js

@@ -161,6 +161,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         let resAborted = false;
         res.onAborted(() => {
             resAborted = true;
+            request.signal.sendAbort();
         });
         let response$;
         try {

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleErrorFromRequestHandler = exports.iterateAsyncVoid = exports.isPromise = exports.completeAssign = exports.isRequestInit = exports.sendNodeResponse = exports.isFetchEvent = exports.isReadableStream = exports.isServerResponse = exports.isNodeRequest = exports.isReadable = exports.normalizeNodeRequest = exports.isAsyncIterable = void 0;
+exports.handleErrorFromRequestHandler = exports.iterateAsyncVoid = exports.isPromise = exports.completeAssign = exports.isRequestInit = exports.sendNodeResponse = exports.isFetchEvent = exports.isReadableStream = exports.isServerResponse = exports.isNodeRequest = exports.isReadable = exports.normalizeNodeRequest = exports.ServerAdapterRequestAbortSignal = exports.isAsyncIterable = void 0;
 const fetch_1 = require("@whatwg-node/fetch");
 function isAsyncIterable(body) {
     return (body != null && typeof body === 'object' && typeof body[Symbol.asyncIterator] === 'function');
@@ -52,6 +52,35 @@ function isRequestBody(body) {
     }
     return false;
 }
+class ServerAdapterRequestAbortSignal extends EventTarget {
+    constructor() {
+        super(...arguments);
+        this.aborted = false;
+        this._onabort = null;
+    }
+    throwIfAborted() {
+        if (this.aborted) {
+            throw new DOMException('Aborted', 'AbortError');
+        }
+    }
+    sendAbort() {
+        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);
+        }
+    }
+}
+exports.ServerAdapterRequestAbortSignal = ServerAdapterRequestAbortSignal;
 function normalizeNodeRequest(nodeRequest, RequestCtor) {
     const rawRequest = nodeRequest.raw || nodeRequest.req || nodeRequest;
     let fullUrl = buildFullUrl(rawRequest);
@@ -62,10 +91,16 @@ function normalizeNodeRequest(nodeRequest, RequestCtor) {
         }
         fullUrl = url.toString();
     }
+    const signal = new ServerAdapterRequestAbortSignal();
+    if (rawRequest.once) {
+        rawRequest.once('end', () => signal.sendAbort());
+        rawRequest.once('close', () => signal.sendAbort());
+    }
     if (nodeRequest.method === 'GET' || nodeRequest.method === 'HEAD') {
         return new RequestCtor(fullUrl, {
             method: nodeRequest.method,
             headers: nodeRequest.headers,
+            signal,
         });
     }
     /**
@@ -81,11 +116,13 @@ function normalizeNodeRequest(nodeRequest, RequestCtor) {
                 method: nodeRequest.method,
                 headers: nodeRequest.headers,
                 body: maybeParsedBody,
+                signal,
             });
         }
         const request = new RequestCtor(fullUrl, {
             method: nodeRequest.method,
             headers: nodeRequest.headers,
+            signal,
         });
         if (!request.headers.get('content-type')?.includes('json')) {
             request.headers.set('content-type', 'application/json; charset=utf-8');
@@ -108,6 +145,7 @@ function normalizeNodeRequest(nodeRequest, RequestCtor) {
         method: nodeRequest.method,
         headers: nodeRequest.headers,
         body: rawRequest,
+        signal,
     });
 }
 exports.normalizeNodeRequest = normalizeNodeRequest;
@@ -177,11 +215,10 @@ function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
         serverResponse.setHeader(key, value);
     });
     // Optimizations for node-fetch
-    if (fetchResponse.bodyType === 'Buffer' ||
-        fetchResponse.bodyType === 'String' ||
-        fetchResponse.bodyType === 'Uint8Array') {
+    const bufOfRes = fetchResponse._buffer;
+    if (bufOfRes) {
         // @ts-expect-error http and http2 writes are actually compatible
-        serverResponse.write(fetchResponse.bodyInit);
+        serverResponse.write(bufOfRes);
         endResponse(serverResponse);
         return;
     }

package/cjs/uwebsockets.js

@@ -1,38 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendResponseToUwsOpts = exports.getRequestFromUWSRequest = exports.isUWSResponse = void 0;
+const utils_js_1 = require("./utils.js");
 function isUWSResponse(res) {
     return !!res.onData;
 }
 exports.isUWSResponse = isUWSResponse;
-class UWSAbortSignal extends EventTarget {
-    throwIfAborted() {
-        if (this.aborted) {
-            throw new DOMException('Aborted', 'AbortError');
-        }
-    }
-    constructor(res) {
-        super();
-        this.aborted = false;
-        this._onabort = null;
-        res.onAborted(() => {
-            this.aborted = true;
-            this.dispatchEvent(new Event('request aborted'));
-        });
-    }
-    get onabort() {
-        return this._onabort;
-    }
-    set onabort(value) {
-        this._onabort = value;
-        if (value) {
-            this.addEventListener('request aborted', value);
-        }
-        else {
-            this.removeEventListener('request aborted', value);
-        }
-    }
-}
 function getRequestFromUWSRequest({ req, res, fetchAPI }) {
     let body;
     const method = req.getMethod();
@@ -66,7 +39,7 @@ function getRequestFromUWSRequest({ req, res, fetchAPI }) {
         method,
         headers,
         body: body,
-        signal: new UWSAbortSignal(res),
+        signal: new utils_js_1.ServerAdapterRequestAbortSignal(),
     });
 }
 exports.getRequestFromUWSRequest = getRequestFromUWSRequest;
@@ -93,9 +66,7 @@ function sendResponseToUwsOpts(uwsResponse, fetchResponse) {
         uwsResponse.end();
         return;
     }
-    const isStringOrBuffer = fetchResponse.bodyType === 'Buffer' ||
-        fetchResponse.bodyType === 'String' ||
-        fetchResponse.bodyType === 'Uint8Array';
+    const bufferOfRes = fetchResponse._buffer;
     uwsResponse.cork(() => {
         uwsResponse.writeStatus(`${fetchResponse.status} ${fetchResponse.statusText}`);
         for (const [key, value] of fetchResponse.headers) {
@@ -113,11 +84,11 @@ function sendResponseToUwsOpts(uwsResponse, fetchResponse) {
                 uwsResponse.writeHeader(key, value);
             }
         }
-        if (isStringOrBuffer) {
-            uwsResponse.end(fetchResponse.bodyInit);
+        if (bufferOfRes) {
+            uwsResponse.end(bufferOfRes);
         }
     });
-    if (isStringOrBuffer) {
+    if (bufferOfRes) {
         return;
     }
     if (!fetchResponse.body) {

package/esm/createServerAdapter.js

@@ -157,6 +157,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         let resAborted = false;
         res.onAborted(() => {
             resAborted = true;
+            request.signal.sendAbort();
         });
         let response$;
         try {

package/esm/utils.js

@@ -48,6 +48,34 @@ function isRequestBody(body) {
     }
     return false;
 }
+export class ServerAdapterRequestAbortSignal extends EventTarget {
+    constructor() {
+        super(...arguments);
+        this.aborted = false;
+        this._onabort = null;
+    }
+    throwIfAborted() {
+        if (this.aborted) {
+            throw new DOMException('Aborted', 'AbortError');
+        }
+    }
+    sendAbort() {
+        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);
+        }
+    }
+}
 export function normalizeNodeRequest(nodeRequest, RequestCtor) {
     const rawRequest = nodeRequest.raw || nodeRequest.req || nodeRequest;
     let fullUrl = buildFullUrl(rawRequest);
@@ -58,10 +86,16 @@ export function normalizeNodeRequest(nodeRequest, RequestCtor) {
         }
         fullUrl = url.toString();
     }
+    const signal = new ServerAdapterRequestAbortSignal();
+    if (rawRequest.once) {
+        rawRequest.once('end', () => signal.sendAbort());
+        rawRequest.once('close', () => signal.sendAbort());
+    }
     if (nodeRequest.method === 'GET' || nodeRequest.method === 'HEAD') {
         return new RequestCtor(fullUrl, {
             method: nodeRequest.method,
             headers: nodeRequest.headers,
+            signal,
         });
     }
     /**
@@ -77,11 +111,13 @@ export function normalizeNodeRequest(nodeRequest, RequestCtor) {
                 method: nodeRequest.method,
                 headers: nodeRequest.headers,
                 body: maybeParsedBody,
+                signal,
             });
         }
         const request = new RequestCtor(fullUrl, {
             method: nodeRequest.method,
             headers: nodeRequest.headers,
+            signal,
         });
         if (!request.headers.get('content-type')?.includes('json')) {
             request.headers.set('content-type', 'application/json; charset=utf-8');
@@ -104,6 +140,7 @@ export function normalizeNodeRequest(nodeRequest, RequestCtor) {
         method: nodeRequest.method,
         headers: nodeRequest.headers,
         body: rawRequest,
+        signal,
     });
 }
 export function isReadable(stream) {
@@ -167,11 +204,10 @@ export function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
         serverResponse.setHeader(key, value);
     });
     // Optimizations for node-fetch
-    if (fetchResponse.bodyType === 'Buffer' ||
-        fetchResponse.bodyType === 'String' ||
-        fetchResponse.bodyType === 'Uint8Array') {
+    const bufOfRes = fetchResponse._buffer;
+    if (bufOfRes) {
         // @ts-expect-error http and http2 writes are actually compatible
-        serverResponse.write(fetchResponse.bodyInit);
+        serverResponse.write(bufOfRes);
         endResponse(serverResponse);
         return;
     }

package/esm/uwebsockets.js

@@ -1,34 +1,7 @@
+import { ServerAdapterRequestAbortSignal } from './utils.js';
 export function isUWSResponse(res) {
     return !!res.onData;
 }
-class UWSAbortSignal extends EventTarget {
-    throwIfAborted() {
-        if (this.aborted) {
-            throw new DOMException('Aborted', 'AbortError');
-        }
-    }
-    constructor(res) {
-        super();
-        this.aborted = false;
-        this._onabort = null;
-        res.onAborted(() => {
-            this.aborted = true;
-            this.dispatchEvent(new Event('request aborted'));
-        });
-    }
-    get onabort() {
-        return this._onabort;
-    }
-    set onabort(value) {
-        this._onabort = value;
-        if (value) {
-            this.addEventListener('request aborted', value);
-        }
-        else {
-            this.removeEventListener('request aborted', value);
-        }
-    }
-}
 export function getRequestFromUWSRequest({ req, res, fetchAPI }) {
     let body;
     const method = req.getMethod();
@@ -62,7 +35,7 @@ export function getRequestFromUWSRequest({ req, res, fetchAPI }) {
         method,
         headers,
         body: body,
-        signal: new UWSAbortSignal(res),
+        signal: new ServerAdapterRequestAbortSignal(),
     });
 }
 async function forwardResponseBodyToUWSResponse(uwsResponse, fetchResponse) {
@@ -88,9 +61,7 @@ export function sendResponseToUwsOpts(uwsResponse, fetchResponse) {
         uwsResponse.end();
         return;
     }
-    const isStringOrBuffer = fetchResponse.bodyType === 'Buffer' ||
-        fetchResponse.bodyType === 'String' ||
-        fetchResponse.bodyType === 'Uint8Array';
+    const bufferOfRes = fetchResponse._buffer;
     uwsResponse.cork(() => {
         uwsResponse.writeStatus(`${fetchResponse.status} ${fetchResponse.statusText}`);
         for (const [key, value] of fetchResponse.headers) {
@@ -108,11 +79,11 @@ export function sendResponseToUwsOpts(uwsResponse, fetchResponse) {
                 uwsResponse.writeHeader(key, value);
             }
         }
-        if (isStringOrBuffer) {
-            uwsResponse.end(fetchResponse.bodyInit);
+        if (bufferOfRes) {
+            uwsResponse.end(bufferOfRes);
         }
     });
-    if (isStringOrBuffer) {
+    if (bufferOfRes) {
         return;
     }
     if (!fetchResponse.body) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.9.10",
+  "version": "0.9.11-alpha-20230821122741-21a9569",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {

package/typings/utils.d.cts

@@ -20,8 +20,18 @@ export interface NodeRequest {
     raw?: IncomingMessage | Http2ServerRequest;
     socket?: Socket;
     query?: any;
+    once?(event: string, listener: (...args: any[]) => void): void;
 }
 export type NodeResponse = ServerResponse | Http2ServerResponse;
+export declare class ServerAdapterRequestAbortSignal extends EventTarget implements AbortSignal {
+    aborted: boolean;
+    _onabort: ((this: AbortSignal, ev: Event) => any) | null;
+    reason: any;
+    throwIfAborted(): void;
+    sendAbort(): void;
+    get onabort(): ((this: AbortSignal, ev: Event) => any) | null;
+    set onabort(value: ((this: AbortSignal, ev: Event) => any) | null);
+}
 export declare function normalizeNodeRequest(nodeRequest: NodeRequest, RequestCtor: typeof Request): Request;
 export declare function isReadable(stream: any): stream is Readable;
 export declare function isNodeRequest(request: any): request is NodeRequest;

package/typings/utils.d.ts

@@ -20,8 +20,18 @@ export interface NodeRequest {
     raw?: IncomingMessage | Http2ServerRequest;
     socket?: Socket;
     query?: any;
+    once?(event: string, listener: (...args: any[]) => void): void;
 }
 export type NodeResponse = ServerResponse | Http2ServerResponse;
+export declare class ServerAdapterRequestAbortSignal extends EventTarget implements AbortSignal {
+    aborted: boolean;
+    _onabort: ((this: AbortSignal, ev: Event) => any) | null;
+    reason: any;
+    throwIfAborted(): void;
+    sendAbort(): void;
+    get onabort(): ((this: AbortSignal, ev: Event) => any) | null;
+    set onabort(value: ((this: AbortSignal, ev: Event) => any) | null);
+}
 export declare function normalizeNodeRequest(nodeRequest: NodeRequest, RequestCtor: typeof Request): Request;
 export declare function isReadable(stream: any): stream is Readable;
 export declare function isNodeRequest(request: any): request is NodeRequest;