@whatwg-node/server 0.10.0-alpha-20240717150008-1474b9d9b679a0e8f6225f44f11b95a6f4bf24ea → 0.10.0-alpha-20241123133536-975c9068dde45574fcfa26567e4bab96f45d1f85

package/cjs/createServerAdapter.js

@@ -3,12 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServerAdapter = createServerAdapter;
 const tslib_1 = require("tslib");
 /* eslint-disable @typescript-eslint/ban-types */
+const disposablestack_1 = require("@whatwg-node/disposablestack");
 const DefaultFetchAPI = tslib_1.__importStar(require("@whatwg-node/fetch"));
 const utils_js_1 = require("./utils.js");
 const uwebsockets_js_1 = require("./uwebsockets.js");
-async function handleWaitUntils(waitUntilPromises) {
-    await Promise.allSettled(waitUntilPromises);
-}
 // Required for envs like nextjs edge runtime
 function isRequestAccessible(serverContext) {
     try {
@@ -29,6 +27,36 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         : serverAdapterBaseObject.handle;
     const onRequestHooks = [];
     const onResponseHooks = [];
+    const waitUntilPromises = new Set();
+    const disposableStack = new disposablestack_1.AsyncDisposableStack();
+    const signals = new Set();
+    function registerSignal(signal) {
+        signals.add(signal);
+        signal.addEventListener('abort', () => {
+            signals.delete(signal);
+        });
+    }
+    disposableStack.defer(() => {
+        for (const signal of signals) {
+            signal.sendAbort();
+        }
+    });
+    function handleWaitUntils() {
+        return Promise.allSettled(waitUntilPromises).then(() => { }, () => { });
+    }
+    disposableStack.defer(handleWaitUntils);
+    function waitUntil(promiseLike) {
+        // If it is a Node.js environment, we should register the disposable stack to handle process termination events
+        if (globalThis.process) {
+            (0, utils_js_1.ensureDisposableStackRegisteredForTerminateEvents)(disposableStack);
+        }
+        waitUntilPromises.add(promiseLike.then(() => {
+            waitUntilPromises.delete(promiseLike);
+        }, err => {
+            console.error(`Unexpected error while waiting: ${err.message || err}`);
+            waitUntilPromises.delete(promiseLike);
+        }));
+    }
     if (options?.plugins != null) {
         for (const plugin of options.plugins) {
             if (plugin.onRequest) {
@@ -54,6 +82,9 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             });
             const onRequestHooksIteration$ = (0, utils_js_1.iterateAsyncVoid)(onRequestHooks, (onRequestHook, stopEarly) => onRequestHook({
                 request,
+                setRequest(newRequest) {
+                    request = newRequest;
+                },
                 serverContext,
                 fetchAPI,
                 url,
@@ -69,13 +100,17 @@ function createServerAdapter(serverAdapterBaseObject, options) {
                 },
             }));
             function handleResponse(response) {
-                if (onRequestHooks.length === 0) {
+                if (onResponseHooks.length === 0) {
                     return response;
                 }
                 const onResponseHookPayload = {
                     request,
                     response,
                     serverContext,
+                    setResponse(newResponse) {
+                        response = newResponse;
+                    },
+                    fetchAPI,
                 };
                 const onResponseHooksIteration$ = (0, utils_js_1.iterateAsyncVoid)(onResponseHooks, onResponseHook => onResponseHook(onResponseHookPayload));
                 if ((0, utils_js_1.isPromise)(onResponseHooksIteration$)) {
@@ -99,20 +134,22 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             return handleEarlyResponse();
         }
         : givenHandleRequest;
-    function handleNodeRequestAndResponse(nodeRequest, nodeResponseOrContainer, ...ctx) {
-        const nodeResponse = nodeResponseOrContainer.raw || nodeResponseOrContainer;
+    // TODO: Remove this on the next major version
+    function handleNodeRequest(nodeRequest, ...ctx) {
         const serverContext = ctx.length > 1 ? (0, utils_js_1.completeAssign)(...ctx) : ctx[0] || {};
-        const request = (0, utils_js_1.normalizeNodeRequest)(nodeRequest, nodeResponse, fetchAPI.Request);
+        const request = (0, utils_js_1.normalizeNodeRequest)(nodeRequest, fetchAPI, registerSignal);
         return handleRequest(request, serverContext);
     }
+    function handleNodeRequestAndResponse(nodeRequest, nodeResponseOrContainer, ...ctx) {
+        const nodeResponse = nodeResponseOrContainer.raw || nodeResponseOrContainer;
+        utils_js_1.nodeRequestResponseMap.set(nodeRequest, nodeResponse);
+        return handleNodeRequest(nodeRequest, ...ctx);
+    }
     function requestListener(nodeRequest, nodeResponse, ...ctx) {
-        const waitUntilPromises = [];
         const defaultServerContext = {
             req: nodeRequest,
             res: nodeResponse,
-            waitUntil(cb) {
-                waitUntilPromises.push(cb.catch(err => console.error(err)));
-            },
+            waitUntil,
         };
         let response$;
         try {
@@ -137,19 +174,17 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         }
     }
     function handleUWS(res, req, ...ctx) {
-        const waitUntilPromises = [];
         const defaultServerContext = {
             res,
             req,
-            waitUntil(cb) {
-                waitUntilPromises.push(cb.catch(err => console.error(err)));
-            },
+            waitUntil,
         };
         const filteredCtxParts = ctx.filter(partCtx => partCtx != null);
         const serverContext = filteredCtxParts.length > 0
             ? (0, utils_js_1.completeAssign)(defaultServerContext, ...ctx)
             : defaultServerContext;
         const signal = new utils_js_1.ServerAdapterRequestAbortSignal();
+        registerSignal(signal);
         const originalResEnd = res.end.bind(res);
         let resEnded = false;
         res.end = function (data) {
@@ -181,7 +216,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
                 .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);
+                    return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response, signal, fetchAPI);
                 }
             })
                 .catch(err => {
@@ -190,7 +225,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         }
         try {
             if (!signal.aborted && !resEnded) {
-                return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response$, signal);
+                return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response$, signal, fetchAPI);
             }
         }
         catch (err) {
@@ -210,17 +245,12 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     }
     function handleRequestWithWaitUntil(request, ...ctx) {
         const filteredCtxParts = ctx.filter(partCtx => partCtx != null);
-        let waitUntilPromises;
         const serverContext = filteredCtxParts.length > 1
             ? (0, utils_js_1.completeAssign)({}, ...filteredCtxParts)
             : (0, utils_js_1.isolateObject)(filteredCtxParts[0], filteredCtxParts[0] == null || filteredCtxParts[0].waitUntil == null
-                ? (waitUntilPromises = [])
+                ? waitUntil
                 : undefined);
-        const response$ = handleRequest(request, serverContext);
-        if (waitUntilPromises?.length) {
-            return handleWaitUntils(waitUntilPromises).then(() => response$);
-        }
-        return response$;
+        return handleRequest(request, serverContext);
     }
     const fetchFn = (input, ...maybeCtx) => {
         if (typeof input === 'string' || 'href' in input) {
@@ -267,11 +297,19 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     const adapterObj = {
         handleRequest: handleRequestWithWaitUntil,
         fetch: fetchFn,
+        handleNodeRequest,
         handleNodeRequestAndResponse,
         requestListener,
         handleEvent,
         handleUWS,
         handle: genericRequestHandler,
+        disposableStack,
+        [disposablestack_1.DisposableSymbols.asyncDispose]() {
+            return disposableStack.disposeAsync();
+        },
+        dispose() {
+            return disposableStack.disposeAsync();
+        },
     };
     const serverAdapter = new Proxy(genericRequestHandler, {
         // It should have all the attributes of the handler function and the server instance

package/cjs/index.js

@@ -8,6 +8,7 @@ tslib_1.__exportStar(require("./utils.js"), exports);
 tslib_1.__exportStar(require("./plugins/types.js"), exports);
 tslib_1.__exportStar(require("./plugins/useCors.js"), exports);
 tslib_1.__exportStar(require("./plugins/useErrorHandling.js"), exports);
+tslib_1.__exportStar(require("./plugins/useContentEncoding.js"), exports);
 tslib_1.__exportStar(require("./uwebsockets.js"), exports);
 var fetch_1 = require("@whatwg-node/fetch");
 Object.defineProperty(exports, "Response", { enumerable: true, get: function () { return fetch_1.Response; } });

package/cjs/plugins/useContentEncoding.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useContentEncoding = useContentEncoding;
+const utils_js_1 = require("../utils.js");
+function useContentEncoding() {
+    const encodingMap = new WeakMap();
+    return {
+        onRequest({ request, setRequest, fetchAPI, endResponse }) {
+            if (request.body) {
+                const contentEncodingHeader = request.headers.get('content-encoding');
+                if (contentEncodingHeader && contentEncodingHeader !== 'none') {
+                    const contentEncodings = contentEncodingHeader?.split(',');
+                    if (!contentEncodings.every(encoding => (0, utils_js_1.getSupportedEncodings)(fetchAPI).includes(encoding))) {
+                        endResponse(new fetchAPI.Response(`Unsupported 'Content-Encoding': ${contentEncodingHeader}`, {
+                            status: 415,
+                            statusText: 'Unsupported Media Type',
+                        }));
+                        return;
+                    }
+                    let newBody = request.body;
+                    for (const contentEncoding of contentEncodings) {
+                        newBody = newBody.pipeThrough(new fetchAPI.DecompressionStream(contentEncoding));
+                    }
+                    request = new fetchAPI.Request(request.url, {
+                        body: newBody,
+                        cache: request.cache,
+                        credentials: request.credentials,
+                        headers: request.headers,
+                        integrity: request.integrity,
+                        keepalive: request.keepalive,
+                        method: request.method,
+                        mode: request.mode,
+                        redirect: request.redirect,
+                        referrer: request.referrer,
+                        referrerPolicy: request.referrerPolicy,
+                        signal: request.signal,
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-ignore - not in the TS types yet
+                        duplex: 'half',
+                    });
+                    setRequest(request);
+                }
+            }
+            const acceptEncoding = request.headers.get('accept-encoding');
+            if (acceptEncoding) {
+                encodingMap.set(request, acceptEncoding.split(','));
+            }
+        },
+        onResponse({ request, response, setResponse, fetchAPI, serverContext }) {
+            const waitUntil = serverContext.waitUntil?.bind(serverContext) || (() => { });
+            // Hack for avoiding to create whatwg-node to create a readable stream until it's needed
+            if (response['bodyInit'] || response.body) {
+                const encodings = encodingMap.get(request);
+                if (encodings) {
+                    const supportedEncoding = encodings.find(encoding => (0, utils_js_1.getSupportedEncodings)(fetchAPI).includes(encoding));
+                    if (supportedEncoding) {
+                        const compressionStream = new fetchAPI.CompressionStream(supportedEncoding);
+                        // To calculate final content-length
+                        const contentLength = response.headers.get('content-length');
+                        if (contentLength) {
+                            const bufOfRes = response._buffer;
+                            if (bufOfRes) {
+                                const writer = compressionStream.writable.getWriter();
+                                waitUntil(writer.write(bufOfRes));
+                                waitUntil(writer.close());
+                                const uint8Arrays$ = (0, utils_js_1.isReadable)(compressionStream.readable['readable'])
+                                    ? collectReadableValues(compressionStream.readable['readable'])
+                                    : (0, utils_js_1.isAsyncIterable)(compressionStream.readable)
+                                        ? collectAsyncIterableValues(compressionStream.readable)
+                                        : collectReadableStreamValues(compressionStream.readable);
+                                return uint8Arrays$.then(uint8Arrays => {
+                                    const chunks = uint8Arrays.flatMap(uint8Array => [...uint8Array]);
+                                    const uint8Array = new Uint8Array(chunks);
+                                    const newHeaders = new fetchAPI.Headers(response.headers);
+                                    newHeaders.set('content-encoding', supportedEncoding);
+                                    newHeaders.set('content-length', uint8Array.byteLength.toString());
+                                    const compressedResponse = new fetchAPI.Response(uint8Array, {
+                                        ...response,
+                                        headers: newHeaders,
+                                    });
+                                    utils_js_1.decompressedResponseMap.set(compressedResponse, response);
+                                    setResponse(compressedResponse);
+                                    waitUntil(compressionStream.writable.close());
+                                });
+                            }
+                        }
+                        const newHeaders = new fetchAPI.Headers(response.headers);
+                        newHeaders.set('content-encoding', supportedEncoding);
+                        newHeaders.delete('content-length');
+                        const compressedBody = response.body.pipeThrough(compressionStream);
+                        const compressedResponse = new fetchAPI.Response(compressedBody, {
+                            status: response.status,
+                            statusText: response.statusText,
+                            headers: newHeaders,
+                        });
+                        utils_js_1.decompressedResponseMap.set(compressedResponse, response);
+                        setResponse(compressedResponse);
+                    }
+                }
+            }
+        },
+    };
+}
+function collectReadableValues(readable) {
+    const values = [];
+    readable.on('data', value => values.push(value));
+    return new Promise((resolve, reject) => {
+        readable.once('end', () => resolve(values));
+        readable.once('error', reject);
+    });
+}
+async function collectAsyncIterableValues(asyncIterable) {
+    const values = [];
+    for await (const value of asyncIterable) {
+        values.push(value);
+    }
+    return values;
+}
+async function collectReadableStreamValues(readableStream) {
+    const reader = readableStream.getReader();
+    const values = [];
+    while (true) {
+        const { done, value } = await reader.read();
+        if (done) {
+            reader.releaseLock();
+            break;
+        }
+        else if (value) {
+            values.push(value);
+        }
+    }
+    return values;
+}

package/cjs/plugins/useErrorHandling.js

@@ -24,13 +24,17 @@ function createDefaultErrorResponse(ResponseCtor) {
     return new ResponseCtor(null, { status: 500 });
 }
 class HTTPError extends Error {
+    status;
+    message;
+    headers;
+    details;
+    name = 'HTTPError';
     constructor(status = 500, message, headers = {}, details) {
         super(message);
         this.status = status;
         this.message = message;
         this.headers = headers;
         this.details = details;
-        this.name = 'HTTPError';
         Error.captureStackTrace(this, HTTPError);
     }
 }