@whatwg-node/server 0.9.63-rc-20241213082454-841c7fefb06e73c59003a91397fe3b1830666c7f → 0.9.64-alpha-20241217102918-0325896dc8d5dcea60bb717d44cccfdb5bd69677

package/cjs/createServerAdapter.js

@@ -31,7 +31,9 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     function ensureDisposableStack() {
         if (!_disposableStack) {
             _disposableStack = new disposablestack_1.AsyncDisposableStack();
-            (0, utils_js_1.ensureDisposableStackRegisteredForTerminateEvents)(_disposableStack);
+            if (options?.disposeOnProcessTerminate) {
+                (0, utils_js_1.ensureDisposableStackRegisteredForTerminateEvents)(_disposableStack);
+            }
             _disposableStack.defer(() => {
                 if (waitUntilPromises.size > 0) {
                     return Promise.allSettled(waitUntilPromises).then(() => {
@@ -63,10 +65,17 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             if (plugin.onResponse) {
                 onResponseHooks.push(plugin.onResponse);
             }
-            const disposeFn = plugin[disposablestack_1.DisposableSymbols.asyncDispose] || plugin[disposablestack_1.DisposableSymbols.dispose];
-            if (disposeFn != null) {
+            const disposeFn = plugin[disposablestack_1.DisposableSymbols.dispose];
+            if (disposeFn) {
                 ensureDisposableStack().defer(disposeFn);
             }
+            const asyncDisposeFn = plugin[disposablestack_1.DisposableSymbols.asyncDispose];
+            if (asyncDisposeFn) {
+                ensureDisposableStack().defer(asyncDisposeFn);
+            }
+            if (plugin.onDispose) {
+                ensureDisposableStack().defer(plugin.onDispose);
+            }
         }
     }
     const handleRequest = onRequestHooks.length > 0 || onResponseHooks.length > 0

package/esm/createServerAdapter.js

@@ -27,7 +27,9 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     function ensureDisposableStack() {
         if (!_disposableStack) {
             _disposableStack = new AsyncDisposableStack();
-            ensureDisposableStackRegisteredForTerminateEvents(_disposableStack);
+            if (options?.disposeOnProcessTerminate) {
+                ensureDisposableStackRegisteredForTerminateEvents(_disposableStack);
+            }
             _disposableStack.defer(() => {
                 if (waitUntilPromises.size > 0) {
                     return Promise.allSettled(waitUntilPromises).then(() => {
@@ -59,10 +61,17 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             if (plugin.onResponse) {
                 onResponseHooks.push(plugin.onResponse);
             }
-            const disposeFn = plugin[DisposableSymbols.asyncDispose] || plugin[DisposableSymbols.dispose];
-            if (disposeFn != null) {
+            const disposeFn = plugin[DisposableSymbols.dispose];
+            if (disposeFn) {
                 ensureDisposableStack().defer(disposeFn);
             }
+            const asyncDisposeFn = plugin[DisposableSymbols.asyncDispose];
+            if (asyncDisposeFn) {
+                ensureDisposableStack().defer(asyncDisposeFn);
+            }
+            if (plugin.onDispose) {
+                ensureDisposableStack().defer(plugin.onDispose);
+            }
         }
     }
     const handleRequest = onRequestHooks.length > 0 || onResponseHooks.length > 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.9.63-rc-20241213082454-841c7fefb06e73c59003a91397fe3b1830666c7f",
+  "version": "0.9.64-alpha-20241217102918-0325896dc8d5dcea60bb717d44cccfdb5bd69677",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {

package/typings/createServerAdapter.d.cts

@@ -3,6 +3,14 @@ import { FetchAPI, ServerAdapter, ServerAdapterBaseObject, ServerAdapterRequestH
 export interface ServerAdapterOptions<TServerContext> {
     plugins?: ServerAdapterPlugin<TServerContext>[];
     fetchAPI?: Partial<FetchAPI>;
+    /**
+     * Node.js only!
+     *
+     * If true, the server adapter will dispose itself when the process is terminated.
+     * If false, you have to dispose the server adapter by using the `dispose` method,
+     * or [Explicit Resource Management](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html)
+     */
+    disposeOnProcessTerminate?: boolean;
 }
 declare function createServerAdapter<TServerContext = {}, THandleRequest extends ServerAdapterRequestHandler<TServerContext> = ServerAdapterRequestHandler<TServerContext>>(serverAdapterRequestHandler: THandleRequest, options?: ServerAdapterOptions<TServerContext>): ServerAdapter<TServerContext, ServerAdapterBaseObject<TServerContext, THandleRequest>>;
 declare function createServerAdapter<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext>>(serverAdapterBaseObject: TBaseObject, options?: ServerAdapterOptions<TServerContext>): ServerAdapter<TServerContext, TBaseObject>;

package/typings/createServerAdapter.d.ts

@@ -3,6 +3,14 @@ import { FetchAPI, ServerAdapter, ServerAdapterBaseObject, ServerAdapterRequestH
 export interface ServerAdapterOptions<TServerContext> {
     plugins?: ServerAdapterPlugin<TServerContext>[];
     fetchAPI?: Partial<FetchAPI>;
+    /**
+     * Node.js only!
+     *
+     * If true, the server adapter will dispose itself when the process is terminated.
+     * If false, you have to dispose the server adapter by using the `dispose` method,
+     * or [Explicit Resource Management](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html)
+     */
+    disposeOnProcessTerminate?: boolean;
 }
 declare function createServerAdapter<TServerContext = {}, THandleRequest extends ServerAdapterRequestHandler<TServerContext> = ServerAdapterRequestHandler<TServerContext>>(serverAdapterRequestHandler: THandleRequest, options?: ServerAdapterOptions<TServerContext>): ServerAdapter<TServerContext, ServerAdapterBaseObject<TServerContext, THandleRequest>>;
 declare function createServerAdapter<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext>>(serverAdapterBaseObject: TBaseObject, options?: ServerAdapterOptions<TServerContext>): ServerAdapter<TServerContext, TBaseObject>;

package/typings/plugins/types.d.cts

@@ -21,16 +21,22 @@ export interface ServerAdapterPlugin<TServerContext = {}> {
     onResponse?: OnResponseHook<TServerContext & ServerAdapterInitialContext>;
     /**
      * This hook is invoked when the server is being disposed.
-     * The server disposal is triggered either by the request termination or the explicit server disposal.
+     * The server disposal is triggered either by the process termination or the explicit server disposal.
      * @see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html
      */
     [Symbol.dispose]?: () => void;
     /**
      * This hook is invoked when the server is being disposed.
-     * The server disposal is triggered either by the request termination or the explicit server disposal.
+     * The server disposal is triggered either by the process termination or the explicit server disposal.
      * @see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html
      */
     [Symbol.asyncDispose]?: () => PromiseLike<void> | void;
+    /**
+     * This hook is invoked when the server is being disposed.
+     * The server disposal is triggered either by the process termination or the explicit server disposal.
+     * @see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html
+     */
+    onDispose?: () => PromiseLike<void> | void;
 }
 export type OnRequestHook<TServerContext> = (payload: OnRequestEventPayload<TServerContext>) => Promise<void> | void;
 export interface OnRequestEventPayload<TServerContext> {

package/typings/plugins/types.d.ts

@@ -21,16 +21,22 @@ export interface ServerAdapterPlugin<TServerContext = {}> {
     onResponse?: OnResponseHook<TServerContext & ServerAdapterInitialContext>;
     /**
      * This hook is invoked when the server is being disposed.
-     * The server disposal is triggered either by the request termination or the explicit server disposal.
+     * The server disposal is triggered either by the process termination or the explicit server disposal.
      * @see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html
      */
     [Symbol.dispose]?: () => void;
     /**
      * This hook is invoked when the server is being disposed.
-     * The server disposal is triggered either by the request termination or the explicit server disposal.
+     * The server disposal is triggered either by the process termination or the explicit server disposal.
      * @see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html
      */
     [Symbol.asyncDispose]?: () => PromiseLike<void> | void;
+    /**
+     * This hook is invoked when the server is being disposed.
+     * The server disposal is triggered either by the process termination or the explicit server disposal.
+     * @see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html
+     */
+    onDispose?: () => PromiseLike<void> | void;
 }
 export type OnRequestHook<TServerContext> = (payload: OnRequestEventPayload<TServerContext>) => Promise<void> | void;
 export interface OnRequestEventPayload<TServerContext> {