@whatwg-node/server 0.9.57-alpha-20241123125835-498ddbef3a79038cbe04d8cef8c2cc1d83e7573c → 0.9.57-alpha-20241125145154-b2c748560e2a94065f9a25e55132e073f78bea40

package/cjs/createServerAdapter.js

@@ -41,29 +41,41 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             signal.sendAbort();
         }
     });
-    function handleWaitUntils() {
-        return Promise.allSettled(waitUntilPromises).then(() => { }, () => { });
-    }
-    disposableStack.defer(handleWaitUntils);
+    disposableStack.defer(() => {
+        if (waitUntilPromises.size > 0) {
+            return Promise.allSettled(waitUntilPromises).then(() => {
+                waitUntilPromises.clear();
+            }, () => {
+                waitUntilPromises.clear();
+            });
+        }
+    });
     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.add(promiseLike);
+        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) {
-                onRequestHooks.push(plugin.onRequest);
-            }
-            if (plugin.onResponse) {
-                onResponseHooks.push(plugin.onResponse);
+            if (plugin != null) {
+                if (plugin.onRequest) {
+                    onRequestHooks.push(plugin.onRequest);
+                }
+                if (plugin.onResponse) {
+                    onResponseHooks.push(plugin.onResponse);
+                }
+                const disposeFn = plugin[disposablestack_1.DisposableSymbols.asyncDispose] || plugin[disposablestack_1.DisposableSymbols.dispose];
+                if (disposeFn != null) {
+                    disposableStack.defer(disposeFn);
+                }
             }
         }
     }
@@ -74,12 +86,13 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             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);
-                },
-            });
+            let url = request['parsedUrl'] ||
+                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,
                 setRequest(newRequest) {
@@ -305,7 +318,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         handle: genericRequestHandler,
         disposableStack,
         [disposablestack_1.DisposableSymbols.asyncDispose]() {
-            return disposableStack.disposeAsync();
+            if (!disposableStack.disposed) {
+                return disposableStack.disposeAsync();
+            }
+            return (0, uwebsockets_js_1.fakePromise)(undefined);
+        },
+        dispose() {
+            if (!disposableStack.disposed) {
+                return disposableStack.disposeAsync();
+            }
+            return (0, uwebsockets_js_1.fakePromise)(undefined);
         },
     };
     const serverAdapter = new Proxy(genericRequestHandler, {

package/cjs/plugins/useContentEncoding.js

@@ -47,7 +47,6 @@ function useContentEncoding() {
             }
         },
         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);
@@ -61,8 +60,10 @@ function useContentEncoding() {
                             const bufOfRes = response._buffer;
                             if (bufOfRes) {
                                 const writer = compressionStream.writable.getWriter();
-                                waitUntil(writer.write(bufOfRes));
-                                waitUntil(writer.close());
+                                const write$ = writer.write(bufOfRes);
+                                serverContext.waitUntil?.(write$);
+                                const close$ = writer.close();
+                                serverContext.waitUntil?.(close$);
                                 const uint8Arrays$ = (0, utils_js_1.isReadable)(compressionStream.readable['readable'])
                                     ? collectReadableValues(compressionStream.readable['readable'])
                                     : (0, utils_js_1.isAsyncIterable)(compressionStream.readable)
@@ -80,7 +81,8 @@ function useContentEncoding() {
                                     });
                                     utils_js_1.decompressedResponseMap.set(compressedResponse, response);
                                     setResponse(compressedResponse);
-                                    waitUntil(compressionStream.writable.close());
+                                    const close$ = compressionStream.writable.close();
+                                    serverContext.waitUntil?.(close$);
                                 });
                             }
                         }

package/cjs/utils.js

@@ -557,9 +557,10 @@ function ensureEventListenerForDisposableStacks() {
     eventListenerRegistered = true;
     for (const event of terminateEvents) {
         globalThis.process.once(event, function terminateHandler() {
-            return Promise.allSettled([...disposableStacks].map(stack => stack.disposeAsync().catch(e => {
-                console.error('Error while disposing:', e);
-            })));
+            return Promise.allSettled([...disposableStacks].map(stack => !stack.disposed &&
+                stack.disposeAsync().catch(e => {
+                    console.error('Error while disposing:', e);
+                })));
         });
     }
 }

package/esm/createServerAdapter.js

@@ -2,7 +2,7 @@
 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 { getRequestFromUWSRequest, isUWSResponse, sendResponseToUwsOpts, } from './uwebsockets.js';
+import { fakePromise, getRequestFromUWSRequest, isUWSResponse, sendResponseToUwsOpts, } from './uwebsockets.js';
 // Required for envs like nextjs edge runtime
 function isRequestAccessible(serverContext) {
     try {
@@ -37,29 +37,41 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             signal.sendAbort();
         }
     });
-    function handleWaitUntils() {
-        return Promise.allSettled(waitUntilPromises).then(() => { }, () => { });
-    }
-    disposableStack.defer(handleWaitUntils);
+    disposableStack.defer(() => {
+        if (waitUntilPromises.size > 0) {
+            return Promise.allSettled(waitUntilPromises).then(() => {
+                waitUntilPromises.clear();
+            }, () => {
+                waitUntilPromises.clear();
+            });
+        }
+    });
     function waitUntil(promiseLike) {
         // If it is a Node.js environment, we should register the disposable stack to handle process termination events
         if (globalThis.process) {
             ensureDisposableStackRegisteredForTerminateEvents(disposableStack);
         }
-        waitUntilPromises.add(promiseLike.then(() => {
+        waitUntilPromises.add(promiseLike);
+        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) {
-                onRequestHooks.push(plugin.onRequest);
-            }
-            if (plugin.onResponse) {
-                onResponseHooks.push(plugin.onResponse);
+            if (plugin != null) {
+                if (plugin.onRequest) {
+                    onRequestHooks.push(plugin.onRequest);
+                }
+                if (plugin.onResponse) {
+                    onResponseHooks.push(plugin.onResponse);
+                }
+                const disposeFn = plugin[DisposableSymbols.asyncDispose] || plugin[DisposableSymbols.dispose];
+                if (disposeFn != null) {
+                    disposableStack.defer(disposeFn);
+                }
             }
         }
     }
@@ -70,12 +82,13 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             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);
-                },
-            });
+            let url = request['parsedUrl'] ||
+                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,
                 setRequest(newRequest) {
@@ -301,7 +314,16 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         handle: genericRequestHandler,
         disposableStack,
         [DisposableSymbols.asyncDispose]() {
-            return disposableStack.disposeAsync();
+            if (!disposableStack.disposed) {
+                return disposableStack.disposeAsync();
+            }
+            return fakePromise(undefined);
+        },
+        dispose() {
+            if (!disposableStack.disposed) {
+                return disposableStack.disposeAsync();
+            }
+            return fakePromise(undefined);
         },
     };
     const serverAdapter = new Proxy(genericRequestHandler, {

package/esm/plugins/useContentEncoding.js

@@ -44,7 +44,6 @@ export function useContentEncoding() {
             }
         },
         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);
@@ -58,8 +57,10 @@ export function useContentEncoding() {
                             const bufOfRes = response._buffer;
                             if (bufOfRes) {
                                 const writer = compressionStream.writable.getWriter();
-                                waitUntil(writer.write(bufOfRes));
-                                waitUntil(writer.close());
+                                const write$ = writer.write(bufOfRes);
+                                serverContext.waitUntil?.(write$);
+                                const close$ = writer.close();
+                                serverContext.waitUntil?.(close$);
                                 const uint8Arrays$ = isReadable(compressionStream.readable['readable'])
                                     ? collectReadableValues(compressionStream.readable['readable'])
                                     : isAsyncIterable(compressionStream.readable)
@@ -77,7 +78,8 @@ export function useContentEncoding() {
                                     });
                                     decompressedResponseMap.set(compressedResponse, response);
                                     setResponse(compressedResponse);
-                                    waitUntil(compressionStream.writable.close());
+                                    const close$ = compressionStream.writable.close();
+                                    serverContext.waitUntil?.(close$);
                                 });
                             }
                         }

package/esm/utils.js

@@ -534,9 +534,10 @@ function ensureEventListenerForDisposableStacks() {
     eventListenerRegistered = true;
     for (const event of terminateEvents) {
         globalThis.process.once(event, function terminateHandler() {
-            return Promise.allSettled([...disposableStacks].map(stack => stack.disposeAsync().catch(e => {
-                console.error('Error while disposing:', e);
-            })));
+            return Promise.allSettled([...disposableStacks].map(stack => !stack.disposed &&
+                stack.disposeAsync().catch(e => {
+                    console.error('Error while disposing:', e);
+                })));
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.9.57-alpha-20241123125835-498ddbef3a79038cbe04d8cef8c2cc1d83e7573c",
+  "version": "0.9.57-alpha-20241125145154-b2c748560e2a94065f9a25e55132e073f78bea40",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {

package/typings/plugins/types.d.cts

@@ -1,8 +1,10 @@
 import { FetchAPI, ServerAdapterRequestHandler, type ServerAdapterInitialContext } from '../types.cjs';
-export interface ServerAdapterPlugin<TServerContext = {}> {
+export type ServerAdapterPlugin<TServerContext = {}> = {
     onRequest?: OnRequestHook<TServerContext & ServerAdapterInitialContext>;
     onResponse?: OnResponseHook<TServerContext & ServerAdapterInitialContext>;
-}
+    [Symbol.dispose]?: () => void;
+    [Symbol.asyncDispose]?: () => PromiseLike<void> | void;
+} | undefined;
 export type OnRequestHook<TServerContext> = (payload: OnRequestEventPayload<TServerContext>) => Promise<void> | void;
 export interface OnRequestEventPayload<TServerContext> {
     request: Request;

package/typings/plugins/types.d.ts

@@ -1,8 +1,10 @@
 import { FetchAPI, ServerAdapterRequestHandler, type ServerAdapterInitialContext } from '../types.js';
-export interface ServerAdapterPlugin<TServerContext = {}> {
+export type ServerAdapterPlugin<TServerContext = {}> = {
     onRequest?: OnRequestHook<TServerContext & ServerAdapterInitialContext>;
     onResponse?: OnResponseHook<TServerContext & ServerAdapterInitialContext>;
-}
+    [Symbol.dispose]?: () => void;
+    [Symbol.asyncDispose]?: () => PromiseLike<void> | void;
+} | undefined;
 export type OnRequestHook<TServerContext> = (payload: OnRequestEventPayload<TServerContext>) => Promise<void> | void;
 export interface OnRequestEventPayload<TServerContext> {
     request: Request;

package/typings/types.d.cts

@@ -57,6 +57,7 @@ export interface ServerAdapterObject<TServerContext> extends EventListenerObject
         request: Request;
     } & Partial<TServerContext & ServerAdapterInitialContext>, ...ctx: Partial<TServerContext & ServerAdapterInitialContext>[]): Promise<Response> | Response;
     disposableStack: AsyncDisposableStack;
+    dispose(): Promise<void> | void;
 }
 export interface RequestLike {
     url: string;

package/typings/types.d.ts

@@ -57,6 +57,7 @@ export interface ServerAdapterObject<TServerContext> extends EventListenerObject
         request: Request;
     } & Partial<TServerContext & ServerAdapterInitialContext>, ...ctx: Partial<TServerContext & ServerAdapterInitialContext>[]): Promise<Response> | Response;
     disposableStack: AsyncDisposableStack;
+    dispose(): Promise<void> | void;
 }
 export interface RequestLike {
     url: string;