@whatwg-node/server 0.9.8 → 0.9.9-rc-20230807163010-70e3d38

package/cjs/createServerAdapter.js

@@ -51,58 +51,66 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             }
         }
     }
-    function handleRequest(request, serverContext) {
-        let url = new Proxy(EMPTY_OBJECT, {
-            get(_target, prop, _receiver) {
-                url = new fetchAPI.URL(request.url, 'http://localhost');
-                return Reflect.get(url, prop, url);
-            },
-        });
-        let requestHandler = givenHandleRequest;
-        let response;
-        const onRequestHooksIteration$ = (0, utils_js_1.iterateAsyncVoid)(onRequestHooks, (onRequestHook, stopEarly) => onRequestHook({
-            request,
-            serverContext,
-            fetchAPI,
-            url,
-            requestHandler,
-            setRequestHandler(newRequestHandler) {
-                requestHandler = newRequestHandler;
-            },
-            endResponse(newResponse) {
-                response = newResponse;
-                if (newResponse) {
-                    stopEarly();
-                }
-            },
-        }));
-        function handleResponse(response) {
-            const onResponseHookPayload = {
+    const handleRequest = onRequestHooks.length > 0 || onResponseHooks.length > 0
+        ? function handleRequest(request, serverContext) {
+            let requestHandler = givenHandleRequest;
+            let response;
+            if (onRequestHooks.length === 0) {
+                return handleEarlyResponse();
+            }
+            let url = new Proxy(EMPTY_OBJECT, {
+                get(_target, prop, _receiver) {
+                    url = new fetchAPI.URL(request.url, 'http://localhost');
+                    return Reflect.get(url, prop, url);
+                },
+            });
+            const onRequestHooksIteration$ = (0, utils_js_1.iterateAsyncVoid)(onRequestHooks, (onRequestHook, stopEarly) => onRequestHook({
                 request,
-                response,
                 serverContext,
-            };
-            const onResponseHooksIteration$ = (0, utils_js_1.iterateAsyncVoid)(onResponseHooks, onResponseHook => onResponseHook(onResponseHookPayload));
-            if ((0, utils_js_1.isPromise)(onResponseHooksIteration$)) {
-                return onResponseHooksIteration$.then(() => response);
+                fetchAPI,
+                url,
+                requestHandler,
+                setRequestHandler(newRequestHandler) {
+                    requestHandler = newRequestHandler;
+                },
+                endResponse(newResponse) {
+                    response = newResponse;
+                    if (newResponse) {
+                        stopEarly();
+                    }
+                },
+            }));
+            function handleResponse(response) {
+                if (onRequestHooks.length === 0) {
+                    return response;
+                }
+                const onResponseHookPayload = {
+                    request,
+                    response,
+                    serverContext,
+                };
+                const onResponseHooksIteration$ = (0, utils_js_1.iterateAsyncVoid)(onResponseHooks, onResponseHook => onResponseHook(onResponseHookPayload));
+                if ((0, utils_js_1.isPromise)(onResponseHooksIteration$)) {
+                    return onResponseHooksIteration$.then(() => response);
+                }
+                return response;
             }
-            return response;
-        }
-        function handleEarlyResponse() {
-            if (!response) {
-                const response$ = requestHandler(request, serverContext);
-                if ((0, utils_js_1.isPromise)(response$)) {
-                    return response$.then(handleResponse);
+            function handleEarlyResponse() {
+                if (!response) {
+                    const response$ = requestHandler(request, serverContext);
+                    if ((0, utils_js_1.isPromise)(response$)) {
+                        return response$.then(handleResponse);
+                    }
+                    return handleResponse(response$);
                 }
-                return handleResponse(response$);
+                return handleResponse(response);
             }
-            return handleResponse(response);
-        }
-        if ((0, utils_js_1.isPromise)(onRequestHooksIteration$)) {
-            return onRequestHooksIteration$.then(handleEarlyResponse);
+            if ((0, utils_js_1.isPromise)(onRequestHooksIteration$)) {
+                return onRequestHooksIteration$.then(handleEarlyResponse);
+            }
+            return handleEarlyResponse();
         }
-        return handleEarlyResponse();
-    }
+        : givenHandleRequest;
     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, fetchAPI.Request);
@@ -116,25 +124,19 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         };
         addWaitUntil(defaultServerContext, waitUntilPromises);
         const response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
-        function handleFetchResponse(response) {
-            try {
-                if (serverResponse.closed || serverResponse.destroyed) {
-                    return;
-                }
-                if (response) {
-                    return (0, utils_js_1.sendNodeResponse)(response, serverResponse, nodeRequest);
-                }
-                serverResponse.statusCode = 404;
-                serverResponse.end();
-            }
-            catch (e) {
-                console.error(`Unexpected error: ${e.message || e}`);
-            }
-        }
         if ((0, utils_js_1.isPromise)(response$)) {
-            return response$.then(handleFetchResponse);
+            return response$
+                .then(response => (0, utils_js_1.sendNodeResponse)(response, serverResponse, nodeRequest))
+                .catch(err => {
+                console.error(`Unexpected error while handling request: ${err.message || err}`);
+            });
+        }
+        try {
+            return (0, utils_js_1.sendNodeResponse)(response$, serverResponse, nodeRequest);
+        }
+        catch (err) {
+            console.error(`Unexpected error while handling request: ${err.message || err}`);
         }
-        return handleFetchResponse(response$);
     }
     function handleUWS(res, req, ...ctx) {
         const waitUntilPromises = [];
@@ -154,29 +156,23 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             resAborted = true;
         });
         const response$ = handleRequest(request, serverContext);
-        function handleFetchResponse(response) {
-            if (resAborted) {
-                return;
-            }
-            try {
-                if (!response) {
-                    res.writeStatus('404 Not Found');
-                    res.end();
-                    return;
+        if ((0, utils_js_1.isPromise)(response$)) {
+            return response$
+                .then(response => {
+                if (!resAborted) {
+                    return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response);
                 }
-                return (0, uwebsockets_js_1.sendResponseToUwsOpts)({
-                    response,
-                    res,
-                });
-            }
-            catch (e) {
-                console.error(`Unexpected error: ${e.message || e}`);
-            }
+            })
+                .catch(err => {
+                console.error(`Unexpected error while handling request: ${err.message || err}`);
+            });
         }
-        if ((0, utils_js_1.isPromise)(response$)) {
-            return response$.then(handleFetchResponse);
+        try {
+            return (0, uwebsockets_js_1.sendResponseToUwsOpts)(res, response$);
+        }
+        catch (err) {
+            console.error(`Unexpected error while handling request: ${err.message || err}`);
         }
-        return handleFetchResponse(response$);
     }
     function handleEvent(event, ...ctx) {
         if (!event.respondWith || !event.request) {

package/cjs/utils.js

@@ -156,6 +156,14 @@ async function sendAsyncIterable(serverResponse, asyncIterable) {
     endResponse(serverResponse);
 }
 function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
+    if (serverResponse.closed || serverResponse.destroyed) {
+        return;
+    }
+    if (!fetchResponse) {
+        serverResponse.statusCode = 404;
+        serverResponse.end();
+        return;
+    }
     serverResponse.statusCode = fetchResponse.status;
     serverResponse.statusMessage = fetchResponse.statusText;
     fetchResponse.headers.forEach((value, key) => {

package/cjs/uwebsockets.js

@@ -70,55 +70,60 @@ function getRequestFromUWSRequest({ req, res, fetchAPI }) {
     });
 }
 exports.getRequestFromUWSRequest = getRequestFromUWSRequest;
-async function forwardResponseBodyToUWSResponse({ res, response }) {
+async function forwardResponseBodyToUWSResponse(uwsResponse, fetchResponse) {
     let resAborted = false;
-    res.onAborted(function () {
+    uwsResponse.onAborted(function () {
         resAborted = true;
     });
-    for await (const chunk of response.body) {
+    for await (const chunk of fetchResponse.body) {
         if (resAborted) {
             return;
         }
-        res.cork(() => {
-            res.write(chunk);
+        uwsResponse.cork(() => {
+            uwsResponse.write(chunk);
         });
     }
-    res.cork(() => {
-        res.end();
+    uwsResponse.cork(() => {
+        uwsResponse.end();
     });
 }
-function sendResponseToUwsOpts({ res, response }) {
-    const isStringOrBuffer = response.bodyType === 'Buffer' ||
-        response.bodyType === 'String' ||
-        response.bodyType === 'Uint8Array';
-    res.cork(() => {
-        res.writeStatus(`${response.status} ${response.statusText}`);
-        for (const [key, value] of response.headers) {
+function sendResponseToUwsOpts(uwsResponse, fetchResponse) {
+    if (!fetchResponse) {
+        uwsResponse.writeStatus('404 Not Found');
+        uwsResponse.end();
+        return;
+    }
+    const isStringOrBuffer = fetchResponse.bodyType === 'Buffer' ||
+        fetchResponse.bodyType === 'String' ||
+        fetchResponse.bodyType === 'Uint8Array';
+    uwsResponse.cork(() => {
+        uwsResponse.writeStatus(`${fetchResponse.status} ${fetchResponse.statusText}`);
+        for (const [key, value] of fetchResponse.headers) {
             // content-length causes an error with Node.js's fetch
             if (key !== 'content-length') {
                 if (key === 'set-cookie') {
-                    const setCookies = response.headers.getSetCookie?.();
+                    const setCookies = fetchResponse.headers.getSetCookie?.();
                     if (setCookies) {
                         for (const setCookie of setCookies) {
-                            res.writeHeader(key, setCookie);
+                            uwsResponse.writeHeader(key, setCookie);
                         }
                         continue;
                     }
                 }
-                res.writeHeader(key, value);
+                uwsResponse.writeHeader(key, value);
             }
         }
         if (isStringOrBuffer) {
-            res.end(response.bodyInit);
+            uwsResponse.end(fetchResponse.bodyInit);
         }
     });
     if (isStringOrBuffer) {
         return;
     }
-    if (!response.body) {
-        res.end();
+    if (!fetchResponse.body) {
+        uwsResponse.end();
         return;
     }
-    return forwardResponseBodyToUWSResponse({ res, response });
+    return forwardResponseBodyToUWSResponse(uwsResponse, fetchResponse);
 }
 exports.sendResponseToUwsOpts = sendResponseToUwsOpts;

package/esm/createServerAdapter.js

@@ -47,58 +47,66 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             }
         }
     }
-    function handleRequest(request, serverContext) {
-        let url = new Proxy(EMPTY_OBJECT, {
-            get(_target, prop, _receiver) {
-                url = new fetchAPI.URL(request.url, 'http://localhost');
-                return Reflect.get(url, prop, url);
-            },
-        });
-        let requestHandler = givenHandleRequest;
-        let response;
-        const onRequestHooksIteration$ = iterateAsyncVoid(onRequestHooks, (onRequestHook, stopEarly) => onRequestHook({
-            request,
-            serverContext,
-            fetchAPI,
-            url,
-            requestHandler,
-            setRequestHandler(newRequestHandler) {
-                requestHandler = newRequestHandler;
-            },
-            endResponse(newResponse) {
-                response = newResponse;
-                if (newResponse) {
-                    stopEarly();
-                }
-            },
-        }));
-        function handleResponse(response) {
-            const onResponseHookPayload = {
+    const handleRequest = onRequestHooks.length > 0 || onResponseHooks.length > 0
+        ? function handleRequest(request, serverContext) {
+            let requestHandler = givenHandleRequest;
+            let response;
+            if (onRequestHooks.length === 0) {
+                return handleEarlyResponse();
+            }
+            let url = new Proxy(EMPTY_OBJECT, {
+                get(_target, prop, _receiver) {
+                    url = new fetchAPI.URL(request.url, 'http://localhost');
+                    return Reflect.get(url, prop, url);
+                },
+            });
+            const onRequestHooksIteration$ = iterateAsyncVoid(onRequestHooks, (onRequestHook, stopEarly) => onRequestHook({
                 request,
-                response,
                 serverContext,
-            };
-            const onResponseHooksIteration$ = iterateAsyncVoid(onResponseHooks, onResponseHook => onResponseHook(onResponseHookPayload));
-            if (isPromise(onResponseHooksIteration$)) {
-                return onResponseHooksIteration$.then(() => response);
+                fetchAPI,
+                url,
+                requestHandler,
+                setRequestHandler(newRequestHandler) {
+                    requestHandler = newRequestHandler;
+                },
+                endResponse(newResponse) {
+                    response = newResponse;
+                    if (newResponse) {
+                        stopEarly();
+                    }
+                },
+            }));
+            function handleResponse(response) {
+                if (onRequestHooks.length === 0) {
+                    return response;
+                }
+                const onResponseHookPayload = {
+                    request,
+                    response,
+                    serverContext,
+                };
+                const onResponseHooksIteration$ = iterateAsyncVoid(onResponseHooks, onResponseHook => onResponseHook(onResponseHookPayload));
+                if (isPromise(onResponseHooksIteration$)) {
+                    return onResponseHooksIteration$.then(() => response);
+                }
+                return response;
             }
-            return response;
-        }
-        function handleEarlyResponse() {
-            if (!response) {
-                const response$ = requestHandler(request, serverContext);
-                if (isPromise(response$)) {
-                    return response$.then(handleResponse);
+            function handleEarlyResponse() {
+                if (!response) {
+                    const response$ = requestHandler(request, serverContext);
+                    if (isPromise(response$)) {
+                        return response$.then(handleResponse);
+                    }
+                    return handleResponse(response$);
                 }
-                return handleResponse(response$);
+                return handleResponse(response);
             }
-            return handleResponse(response);
-        }
-        if (isPromise(onRequestHooksIteration$)) {
-            return onRequestHooksIteration$.then(handleEarlyResponse);
+            if (isPromise(onRequestHooksIteration$)) {
+                return onRequestHooksIteration$.then(handleEarlyResponse);
+            }
+            return handleEarlyResponse();
         }
-        return handleEarlyResponse();
-    }
+        : givenHandleRequest;
     function handleNodeRequest(nodeRequest, ...ctx) {
         const serverContext = ctx.length > 1 ? completeAssign(...ctx) : ctx[0] || {};
         const request = normalizeNodeRequest(nodeRequest, fetchAPI.Request);
@@ -112,25 +120,19 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         };
         addWaitUntil(defaultServerContext, waitUntilPromises);
         const response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
-        function handleFetchResponse(response) {
-            try {
-                if (serverResponse.closed || serverResponse.destroyed) {
-                    return;
-                }
-                if (response) {
-                    return sendNodeResponse(response, serverResponse, nodeRequest);
-                }
-                serverResponse.statusCode = 404;
-                serverResponse.end();
-            }
-            catch (e) {
-                console.error(`Unexpected error: ${e.message || e}`);
-            }
-        }
         if (isPromise(response$)) {
-            return response$.then(handleFetchResponse);
+            return response$
+                .then(response => sendNodeResponse(response, serverResponse, nodeRequest))
+                .catch(err => {
+                console.error(`Unexpected error while handling request: ${err.message || err}`);
+            });
+        }
+        try {
+            return sendNodeResponse(response$, serverResponse, nodeRequest);
+        }
+        catch (err) {
+            console.error(`Unexpected error while handling request: ${err.message || err}`);
         }
-        return handleFetchResponse(response$);
     }
     function handleUWS(res, req, ...ctx) {
         const waitUntilPromises = [];
@@ -150,29 +152,23 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             resAborted = true;
         });
         const response$ = handleRequest(request, serverContext);
-        function handleFetchResponse(response) {
-            if (resAborted) {
-                return;
-            }
-            try {
-                if (!response) {
-                    res.writeStatus('404 Not Found');
-                    res.end();
-                    return;
+        if (isPromise(response$)) {
+            return response$
+                .then(response => {
+                if (!resAborted) {
+                    return sendResponseToUwsOpts(res, response);
                 }
-                return sendResponseToUwsOpts({
-                    response,
-                    res,
-                });
-            }
-            catch (e) {
-                console.error(`Unexpected error: ${e.message || e}`);
-            }
+            })
+                .catch(err => {
+                console.error(`Unexpected error while handling request: ${err.message || err}`);
+            });
         }
-        if (isPromise(response$)) {
-            return response$.then(handleFetchResponse);
+        try {
+            return sendResponseToUwsOpts(res, response$);
+        }
+        catch (err) {
+            console.error(`Unexpected error while handling request: ${err.message || err}`);
         }
-        return handleFetchResponse(response$);
     }
     function handleEvent(event, ...ctx) {
         if (!event.respondWith || !event.request) {

package/esm/utils.js

@@ -146,6 +146,14 @@ async function sendAsyncIterable(serverResponse, asyncIterable) {
     endResponse(serverResponse);
 }
 export function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
+    if (serverResponse.closed || serverResponse.destroyed) {
+        return;
+    }
+    if (!fetchResponse) {
+        serverResponse.statusCode = 404;
+        serverResponse.end();
+        return;
+    }
     serverResponse.statusCode = fetchResponse.status;
     serverResponse.statusMessage = fetchResponse.statusText;
     fetchResponse.headers.forEach((value, key) => {

package/esm/uwebsockets.js

@@ -65,54 +65,59 @@ export function getRequestFromUWSRequest({ req, res, fetchAPI }) {
         signal: new UWSAbortSignal(res),
     });
 }
-async function forwardResponseBodyToUWSResponse({ res, response }) {
+async function forwardResponseBodyToUWSResponse(uwsResponse, fetchResponse) {
     let resAborted = false;
-    res.onAborted(function () {
+    uwsResponse.onAborted(function () {
         resAborted = true;
     });
-    for await (const chunk of response.body) {
+    for await (const chunk of fetchResponse.body) {
         if (resAborted) {
             return;
         }
-        res.cork(() => {
-            res.write(chunk);
+        uwsResponse.cork(() => {
+            uwsResponse.write(chunk);
         });
     }
-    res.cork(() => {
-        res.end();
+    uwsResponse.cork(() => {
+        uwsResponse.end();
     });
 }
-export function sendResponseToUwsOpts({ res, response }) {
-    const isStringOrBuffer = response.bodyType === 'Buffer' ||
-        response.bodyType === 'String' ||
-        response.bodyType === 'Uint8Array';
-    res.cork(() => {
-        res.writeStatus(`${response.status} ${response.statusText}`);
-        for (const [key, value] of response.headers) {
+export function sendResponseToUwsOpts(uwsResponse, fetchResponse) {
+    if (!fetchResponse) {
+        uwsResponse.writeStatus('404 Not Found');
+        uwsResponse.end();
+        return;
+    }
+    const isStringOrBuffer = fetchResponse.bodyType === 'Buffer' ||
+        fetchResponse.bodyType === 'String' ||
+        fetchResponse.bodyType === 'Uint8Array';
+    uwsResponse.cork(() => {
+        uwsResponse.writeStatus(`${fetchResponse.status} ${fetchResponse.statusText}`);
+        for (const [key, value] of fetchResponse.headers) {
             // content-length causes an error with Node.js's fetch
             if (key !== 'content-length') {
                 if (key === 'set-cookie') {
-                    const setCookies = response.headers.getSetCookie?.();
+                    const setCookies = fetchResponse.headers.getSetCookie?.();
                     if (setCookies) {
                         for (const setCookie of setCookies) {
-                            res.writeHeader(key, setCookie);
+                            uwsResponse.writeHeader(key, setCookie);
                         }
                         continue;
                     }
                 }
-                res.writeHeader(key, value);
+                uwsResponse.writeHeader(key, value);
             }
         }
         if (isStringOrBuffer) {
-            res.end(response.bodyInit);
+            uwsResponse.end(fetchResponse.bodyInit);
         }
     });
     if (isStringOrBuffer) {
         return;
     }
-    if (!response.body) {
-        res.end();
+    if (!fetchResponse.body) {
+        uwsResponse.end();
         return;
     }
-    return forwardResponseBodyToUWSResponse({ res, response });
+    return forwardResponseBodyToUWSResponse(uwsResponse, fetchResponse);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.9.8",
+  "version": "0.9.9-rc-20230807163010-70e3d38",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {

package/typings/uwebsockets.d.cts

@@ -24,9 +24,5 @@ interface GetRequestFromUWSOpts {
     fetchAPI: FetchAPI;
 }
 export declare function getRequestFromUWSRequest({ req, res, fetchAPI }: GetRequestFromUWSOpts): Request;
-interface SendResponseToUWSOpts {
-    res: UWSResponse;
-    response: Response;
-}
-export declare function sendResponseToUwsOpts({ res, response }: SendResponseToUWSOpts): Promise<void> | undefined;
+export declare function sendResponseToUwsOpts(uwsResponse: UWSResponse, fetchResponse: Response): Promise<void> | undefined;
 export {};

package/typings/uwebsockets.d.ts

@@ -24,9 +24,5 @@ interface GetRequestFromUWSOpts {
     fetchAPI: FetchAPI;
 }
 export declare function getRequestFromUWSRequest({ req, res, fetchAPI }: GetRequestFromUWSOpts): Request;
-interface SendResponseToUWSOpts {
-    res: UWSResponse;
-    response: Response;
-}
-export declare function sendResponseToUwsOpts({ res, response }: SendResponseToUWSOpts): Promise<void> | undefined;
+export declare function sendResponseToUwsOpts(uwsResponse: UWSResponse, fetchResponse: Response): Promise<void> | undefined;
 export {};