@whatwg-node/server 0.9.7 → 0.9.8-alpha-20230806205544-d8f5b36

package/cjs/createServerAdapter.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServerAdapter = void 0;
 const tslib_1 = require("tslib");
 /* eslint-disable @typescript-eslint/ban-types */
+const types_1 = require("util/types");
 const DefaultFetchAPI = tslib_1.__importStar(require("@whatwg-node/fetch"));
 const utils_js_1 = require("./utils.js");
 const uwebsockets_js_1 = require("./uwebsockets.js");
@@ -51,7 +52,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             }
         }
     }
-    async function handleRequest(request, serverContext) {
+    function handleRequest(request, serverContext) {
         let url = new Proxy(EMPTY_OBJECT, {
             get(_target, prop, _receiver) {
                 url = new fetchAPI.URL(request.url, 'http://localhost');
@@ -60,35 +61,48 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         });
         let requestHandler = givenHandleRequest;
         let response;
-        for (const onRequestHook of onRequestHooks) {
-            await onRequestHook({
+        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 = {
                 request,
+                response,
                 serverContext,
-                fetchAPI,
-                url,
-                requestHandler,
-                setRequestHandler(newRequestHandler) {
-                    requestHandler = newRequestHandler;
-                },
-                endResponse(newResponse) {
-                    response = newResponse;
-                },
-            });
-            if (response) {
-                break;
+            };
+            const onResponseHooksIteration$ = (0, utils_js_1.iterateAsyncVoid)(onResponseHooks, onResponseHook => onResponseHook(onResponseHookPayload));
+            if ((0, types_1.isPromise)(onResponseHooksIteration$)) {
+                return onResponseHooksIteration$.then(() => response);
             }
+            return response;
         }
-        if (!response) {
-            response = await requestHandler(request, serverContext);
+        function handleEarlyResponse() {
+            if (!response) {
+                const response$ = requestHandler(request, serverContext);
+                if ((0, types_1.isPromise)(response$)) {
+                    return response$.then(handleResponse);
+                }
+                return handleResponse(response$);
+            }
+            return handleResponse(response);
         }
-        for (const onResponseHook of onResponseHooks) {
-            await onResponseHook({
-                request,
-                response,
-                serverContext,
-            });
+        if ((0, types_1.isPromise)(onRequestHooksIteration$)) {
+            return onRequestHooksIteration$.then(handleEarlyResponse);
         }
-        return response;
+        return handleEarlyResponse();
     }
     function handleNodeRequest(nodeRequest, ...ctx) {
         const serverContext = ctx.length > 1 ? (0, utils_js_1.completeAssign)(...ctx) : ctx[0] || {};
@@ -102,8 +116,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             res: serverResponse,
         };
         addWaitUntil(defaultServerContext, waitUntilPromises);
-        return handleNodeRequest(nodeRequest, defaultServerContext, ...ctx)
-            .then(response => {
+        const response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
+        function handleFetchResponse(response) {
             try {
                 if (serverResponse.closed || serverResponse.destroyed) {
                     return;
@@ -117,12 +131,11 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             catch (e) {
                 console.error(`Unexpected error: ${e.message || e}`);
             }
-        })
-            .finally(() => {
-            if (waitUntilPromises.length > 0) {
-                return handleWaitUntils(waitUntilPromises);
-            }
-        });
+        }
+        if ((0, types_1.isPromise)(response$)) {
+            return response$.then(handleFetchResponse);
+        }
+        return handleFetchResponse(response$);
     }
     function handleUWS(res, req, ...ctx) {
         const waitUntilPromises = [];
@@ -141,7 +154,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         res.onAborted(() => {
             resAborted = true;
         });
-        return handleRequest(request, serverContext).then(response => {
+        const response$ = handleRequest(request, serverContext);
+        function handleFetchResponse(response) {
             if (resAborted) {
                 return;
             }
@@ -159,7 +173,11 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             catch (e) {
                 console.error(`Unexpected error: ${e.message || e}`);
             }
-        });
+        }
+        if ((0, types_1.isPromise)(response$)) {
+            return response$.then(handleFetchResponse);
+        }
+        return handleFetchResponse(response$);
     }
     function handleEvent(event, ...ctx) {
         if (!event.respondWith || !event.request) {

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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;
 const fetch_1 = require("@whatwg-node/fetch");
 function isAsyncIterable(body) {
     return (body != null && typeof body === 'object' && typeof body[Symbol.asyncIterator] === 'function');
@@ -244,6 +244,34 @@ function completeAssign(...args) {
 }
 exports.completeAssign = completeAssign;
 function isPromise(val) {
-    return val != null && typeof val === 'object' && typeof val.then === 'function';
+    return val?.then != null;
 }
 exports.isPromise = isPromise;
+function iterateAsyncVoid(iterable, callback) {
+    const iterator = iterable[Symbol.iterator]();
+    let stopEarlyFlag = false;
+    function stopEarlyFn() {
+        stopEarlyFlag = true;
+    }
+    function iterate() {
+        const { done: endOfIterator, value } = iterator.next();
+        if (endOfIterator) {
+            return;
+        }
+        const result$ = callback(value, stopEarlyFn);
+        if (isPromise(result$)) {
+            return result$.then(() => {
+                if (stopEarlyFlag) {
+                    return;
+                }
+                return iterate();
+            });
+        }
+        if (stopEarlyFlag) {
+            return;
+        }
+        return iterate();
+    }
+    return iterate();
+}
+exports.iterateAsyncVoid = iterateAsyncVoid;

package/esm/createServerAdapter.js

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-types */
+import { isPromise } from 'util/types';
 import * as DefaultFetchAPI from '@whatwg-node/fetch';
-import { completeAssign, isFetchEvent, isNodeRequest, isRequestInit, isServerResponse, normalizeNodeRequest, sendNodeResponse, } from './utils.js';
+import { completeAssign, isFetchEvent, isNodeRequest, isRequestInit, isServerResponse, iterateAsyncVoid, normalizeNodeRequest, sendNodeResponse, } from './utils.js';
 import { getRequestFromUWSRequest, isUWSResponse, sendResponseToUwsOpts, } from './uwebsockets.js';
 async function handleWaitUntils(waitUntilPromises) {
     const waitUntils = await Promise.allSettled(waitUntilPromises);
@@ -47,7 +48,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             }
         }
     }
-    async function handleRequest(request, serverContext) {
+    function handleRequest(request, serverContext) {
         let url = new Proxy(EMPTY_OBJECT, {
             get(_target, prop, _receiver) {
                 url = new fetchAPI.URL(request.url, 'http://localhost');
@@ -56,35 +57,48 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         });
         let requestHandler = givenHandleRequest;
         let response;
-        for (const onRequestHook of onRequestHooks) {
-            await onRequestHook({
+        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 = {
                 request,
+                response,
                 serverContext,
-                fetchAPI,
-                url,
-                requestHandler,
-                setRequestHandler(newRequestHandler) {
-                    requestHandler = newRequestHandler;
-                },
-                endResponse(newResponse) {
-                    response = newResponse;
-                },
-            });
-            if (response) {
-                break;
+            };
+            const onResponseHooksIteration$ = iterateAsyncVoid(onResponseHooks, onResponseHook => onResponseHook(onResponseHookPayload));
+            if (isPromise(onResponseHooksIteration$)) {
+                return onResponseHooksIteration$.then(() => response);
             }
+            return response;
         }
-        if (!response) {
-            response = await requestHandler(request, serverContext);
+        function handleEarlyResponse() {
+            if (!response) {
+                const response$ = requestHandler(request, serverContext);
+                if (isPromise(response$)) {
+                    return response$.then(handleResponse);
+                }
+                return handleResponse(response$);
+            }
+            return handleResponse(response);
         }
-        for (const onResponseHook of onResponseHooks) {
-            await onResponseHook({
-                request,
-                response,
-                serverContext,
-            });
+        if (isPromise(onRequestHooksIteration$)) {
+            return onRequestHooksIteration$.then(handleEarlyResponse);
         }
-        return response;
+        return handleEarlyResponse();
     }
     function handleNodeRequest(nodeRequest, ...ctx) {
         const serverContext = ctx.length > 1 ? completeAssign(...ctx) : ctx[0] || {};
@@ -98,8 +112,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             res: serverResponse,
         };
         addWaitUntil(defaultServerContext, waitUntilPromises);
-        return handleNodeRequest(nodeRequest, defaultServerContext, ...ctx)
-            .then(response => {
+        const response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
+        function handleFetchResponse(response) {
             try {
                 if (serverResponse.closed || serverResponse.destroyed) {
                     return;
@@ -113,12 +127,11 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             catch (e) {
                 console.error(`Unexpected error: ${e.message || e}`);
             }
-        })
-            .finally(() => {
-            if (waitUntilPromises.length > 0) {
-                return handleWaitUntils(waitUntilPromises);
-            }
-        });
+        }
+        if (isPromise(response$)) {
+            return response$.then(handleFetchResponse);
+        }
+        return handleFetchResponse(response$);
     }
     function handleUWS(res, req, ...ctx) {
         const waitUntilPromises = [];
@@ -137,7 +150,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         res.onAborted(() => {
             resAborted = true;
         });
-        return handleRequest(request, serverContext).then(response => {
+        const response$ = handleRequest(request, serverContext);
+        function handleFetchResponse(response) {
             if (resAborted) {
                 return;
             }
@@ -155,7 +169,11 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             catch (e) {
                 console.error(`Unexpected error: ${e.message || e}`);
             }
-        });
+        }
+        if (isPromise(response$)) {
+            return response$.then(handleFetchResponse);
+        }
+        return handleFetchResponse(response$);
     }
     function handleEvent(event, ...ctx) {
         if (!event.respondWith || !event.request) {

package/esm/utils.js

@@ -231,5 +231,32 @@ export function completeAssign(...args) {
     return target;
 }
 export function isPromise(val) {
-    return val != null && typeof val === 'object' && typeof val.then === 'function';
+    return val?.then != null;
+}
+export function iterateAsyncVoid(iterable, callback) {
+    const iterator = iterable[Symbol.iterator]();
+    let stopEarlyFlag = false;
+    function stopEarlyFn() {
+        stopEarlyFlag = true;
+    }
+    function iterate() {
+        const { done: endOfIterator, value } = iterator.next();
+        if (endOfIterator) {
+            return;
+        }
+        const result$ = callback(value, stopEarlyFn);
+        if (isPromise(result$)) {
+            return result$.then(() => {
+                if (stopEarlyFlag) {
+                    return;
+                }
+                return iterate();
+            });
+        }
+        if (stopEarlyFlag) {
+            return;
+        }
+        return iterate();
+    }
+    return iterate();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.9.7",
+  "version": "0.9.8-alpha-20230806205544-d8f5b36",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {

package/typings/types.d.cts

@@ -18,7 +18,7 @@ export interface ServerAdapterObject<TServerContext> extends EventListenerObject
     /**
      * A basic request listener that takes a `Request` with the server context and returns a `Response`.
      */
-    handleRequest: (request: Request, ctx: TServerContext) => Promise<Response>;
+    handleRequest: (request: Request, ctx: TServerContext) => Promise<Response> | Response;
     /**
      * WHATWG Fetch spec compliant `fetch` function that can be used for testing purposes.
      */

package/typings/types.d.ts

@@ -18,7 +18,7 @@ export interface ServerAdapterObject<TServerContext> extends EventListenerObject
     /**
      * A basic request listener that takes a `Request` with the server context and returns a `Response`.
      */
-    handleRequest: (request: Request, ctx: TServerContext) => Promise<Response>;
+    handleRequest: (request: Request, ctx: TServerContext) => Promise<Response> | Response;
     /**
      * WHATWG Fetch spec compliant `fetch` function that can be used for testing purposes.
      */

package/typings/utils.d.cts

@@ -31,4 +31,5 @@ export declare function isFetchEvent(event: any): event is FetchEvent;
 export declare function sendNodeResponse(fetchResponse: Response, serverResponse: NodeResponse, nodeRequest: NodeRequest): Promise<void> | undefined;
 export declare function isRequestInit(val: unknown): val is RequestInit;
 export declare function completeAssign(...args: any[]): any;
-export declare function isPromise(val: unknown): val is Promise<unknown>;
+export declare function isPromise<T>(val: T | Promise<T>): val is Promise<T>;
+export declare function iterateAsyncVoid<TInput>(iterable: Iterable<TInput>, callback: (input: TInput, stopEarly: () => void) => Promise<void> | void): Promise<void> | void;

package/typings/utils.d.ts

@@ -31,4 +31,5 @@ export declare function isFetchEvent(event: any): event is FetchEvent;
 export declare function sendNodeResponse(fetchResponse: Response, serverResponse: NodeResponse, nodeRequest: NodeRequest): Promise<void> | undefined;
 export declare function isRequestInit(val: unknown): val is RequestInit;
 export declare function completeAssign(...args: any[]): any;
-export declare function isPromise(val: unknown): val is Promise<unknown>;
+export declare function isPromise<T>(val: T | Promise<T>): val is Promise<T>;
+export declare function iterateAsyncVoid<TInput>(iterable: Iterable<TInput>, callback: (input: TInput, stopEarly: () => void) => Promise<void> | void): Promise<void> | void;