@whatwg-node/server 0.9.37-alpha-20240717115453-841375873174d7ac5a1bce22dc9ea9c5ee6d9060 → 0.10.0-alpha-20240717144936-662ea5088eb83ec5b55025307193fac81a8ea190

package/cjs/createServerAdapter.js

@@ -99,30 +99,24 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             return handleEarlyResponse();
         }
         : givenHandleRequest;
-    // 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, fetchAPI.Request);
-        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);
+        const serverContext = ctx.length > 1 ? (0, utils_js_1.completeAssign)(...ctx) : ctx[0] || {};
+        const request = (0, utils_js_1.normalizeNodeRequest)(nodeRequest, nodeResponse, fetchAPI.Request);
+        return handleRequest(request, serverContext);
     }
-    function requestListener(nodeRequest, serverResponse, ...ctx) {
+    function requestListener(nodeRequest, nodeResponse, ...ctx) {
         const waitUntilPromises = [];
         const defaultServerContext = {
             req: nodeRequest,
-            res: serverResponse,
+            res: nodeResponse,
             waitUntil(cb) {
                 waitUntilPromises.push(cb.catch(err => console.error(err)));
             },
         };
-        utils_js_1.nodeRequestResponseMap.set(nodeRequest, serverResponse);
         let response$;
         try {
-            response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
+            response$ = handleNodeRequestAndResponse(nodeRequest, nodeResponse, defaultServerContext, ...ctx);
         }
         catch (err) {
             response$ = (0, utils_js_1.handleErrorFromRequestHandler)(err, fetchAPI.Response);
@@ -130,13 +124,13 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         if ((0, utils_js_1.isPromise)(response$)) {
             return response$
                 .catch((e) => (0, utils_js_1.handleErrorFromRequestHandler)(e, fetchAPI.Response))
-                .then(response => (0, utils_js_1.sendNodeResponse)(response, serverResponse, nodeRequest))
+                .then(response => (0, utils_js_1.sendNodeResponse)(response, nodeResponse, nodeRequest))
                 .catch(err => {
                 console.error(`Unexpected error while handling request: ${err.message || err}`);
             });
         }
         try {
-            return (0, utils_js_1.sendNodeResponse)(response$, serverResponse, nodeRequest);
+            return (0, utils_js_1.sendNodeResponse)(response$, nodeResponse, nodeRequest);
         }
         catch (err) {
             console.error(`Unexpected error while handling request: ${err.message || err}`);
@@ -271,9 +265,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         return fetchFn(input, ...maybeCtx);
     };
     const adapterObj = {
-        handleRequest,
+        handleRequest: handleRequestWithWaitUntil,
         fetch: fetchFn,
-        handleNodeRequest,
         handleNodeRequestAndResponse,
         requestListener,
         handleEvent,

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nodeRequestResponseMap = exports.ServerAdapterRequestAbortSignal = void 0;
+exports.ServerAdapterRequestAbortSignal = void 0;
 exports.isAsyncIterable = isAsyncIterable;
 exports.normalizeNodeRequest = normalizeNodeRequest;
 exports.isReadable = isReadable;
@@ -101,8 +101,7 @@ class ServerAdapterRequestAbortSignal extends EventTarget {
 }
 exports.ServerAdapterRequestAbortSignal = ServerAdapterRequestAbortSignal;
 let bunNodeCompatModeWarned = false;
-exports.nodeRequestResponseMap = new WeakMap();
-function normalizeNodeRequest(nodeRequest, RequestCtor) {
+function normalizeNodeRequest(nodeRequest, nodeResponse, RequestCtor) {
     const rawRequest = nodeRequest.raw || nodeRequest.req || nodeRequest;
     let fullUrl = buildFullUrl(rawRequest);
     if (nodeRequest.query) {
@@ -113,9 +112,7 @@ function normalizeNodeRequest(nodeRequest, RequestCtor) {
         fullUrl = url.toString();
     }
     let signal;
-    const nodeResponse = exports.nodeRequestResponseMap.get(nodeRequest);
-    exports.nodeRequestResponseMap.delete(nodeRequest);
-    if (nodeResponse?.once) {
+    if (nodeResponse.once) {
         let sendAbortSignal;
         // If ponyfilled
         if (RequestCtor !== globalThis.Request) {

package/esm/createServerAdapter.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-types */
 import * as DefaultFetchAPI from '@whatwg-node/fetch';
-import { completeAssign, handleAbortSignalAndPromiseResponse, handleErrorFromRequestHandler, isFetchEvent, isNodeRequest, isolateObject, isPromise, isRequestInit, isServerResponse, iterateAsyncVoid, nodeRequestResponseMap, normalizeNodeRequest, sendNodeResponse, ServerAdapterRequestAbortSignal, } from './utils.js';
+import { completeAssign, handleAbortSignalAndPromiseResponse, handleErrorFromRequestHandler, isFetchEvent, isNodeRequest, isolateObject, isPromise, isRequestInit, isServerResponse, iterateAsyncVoid, normalizeNodeRequest, sendNodeResponse, ServerAdapterRequestAbortSignal, } from './utils.js';
 import { getRequestFromUWSRequest, isUWSResponse, sendResponseToUwsOpts, } from './uwebsockets.js';
 async function handleWaitUntils(waitUntilPromises) {
     await Promise.allSettled(waitUntilPromises);
@@ -95,30 +95,24 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             return handleEarlyResponse();
         }
         : givenHandleRequest;
-    // TODO: Remove this on the next major version
-    function handleNodeRequest(nodeRequest, ...ctx) {
-        const serverContext = ctx.length > 1 ? completeAssign(...ctx) : ctx[0] || {};
-        const request = normalizeNodeRequest(nodeRequest, fetchAPI.Request);
-        return handleRequest(request, serverContext);
-    }
     function handleNodeRequestAndResponse(nodeRequest, nodeResponseOrContainer, ...ctx) {
         const nodeResponse = nodeResponseOrContainer.raw || nodeResponseOrContainer;
-        nodeRequestResponseMap.set(nodeRequest, nodeResponse);
-        return handleNodeRequest(nodeRequest, ...ctx);
+        const serverContext = ctx.length > 1 ? completeAssign(...ctx) : ctx[0] || {};
+        const request = normalizeNodeRequest(nodeRequest, nodeResponse, fetchAPI.Request);
+        return handleRequest(request, serverContext);
     }
-    function requestListener(nodeRequest, serverResponse, ...ctx) {
+    function requestListener(nodeRequest, nodeResponse, ...ctx) {
         const waitUntilPromises = [];
         const defaultServerContext = {
             req: nodeRequest,
-            res: serverResponse,
+            res: nodeResponse,
             waitUntil(cb) {
                 waitUntilPromises.push(cb.catch(err => console.error(err)));
             },
         };
-        nodeRequestResponseMap.set(nodeRequest, serverResponse);
         let response$;
         try {
-            response$ = handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
+            response$ = handleNodeRequestAndResponse(nodeRequest, nodeResponse, defaultServerContext, ...ctx);
         }
         catch (err) {
             response$ = handleErrorFromRequestHandler(err, fetchAPI.Response);
@@ -126,13 +120,13 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         if (isPromise(response$)) {
             return response$
                 .catch((e) => handleErrorFromRequestHandler(e, fetchAPI.Response))
-                .then(response => sendNodeResponse(response, serverResponse, nodeRequest))
+                .then(response => sendNodeResponse(response, nodeResponse, nodeRequest))
                 .catch(err => {
                 console.error(`Unexpected error while handling request: ${err.message || err}`);
             });
         }
         try {
-            return sendNodeResponse(response$, serverResponse, nodeRequest);
+            return sendNodeResponse(response$, nodeResponse, nodeRequest);
         }
         catch (err) {
             console.error(`Unexpected error while handling request: ${err.message || err}`);
@@ -267,9 +261,8 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         return fetchFn(input, ...maybeCtx);
     };
     const adapterObj = {
-        handleRequest,
+        handleRequest: handleRequestWithWaitUntil,
         fetch: fetchFn,
-        handleNodeRequest,
         handleNodeRequestAndResponse,
         requestListener,
         handleEvent,

package/esm/utils.js

@@ -81,8 +81,7 @@ export class ServerAdapterRequestAbortSignal extends EventTarget {
     }
 }
 let bunNodeCompatModeWarned = false;
-export const nodeRequestResponseMap = new WeakMap();
-export function normalizeNodeRequest(nodeRequest, RequestCtor) {
+export function normalizeNodeRequest(nodeRequest, nodeResponse, RequestCtor) {
     const rawRequest = nodeRequest.raw || nodeRequest.req || nodeRequest;
     let fullUrl = buildFullUrl(rawRequest);
     if (nodeRequest.query) {
@@ -93,9 +92,7 @@ export function normalizeNodeRequest(nodeRequest, RequestCtor) {
         fullUrl = url.toString();
     }
     let signal;
-    const nodeResponse = nodeRequestResponseMap.get(nodeRequest);
-    nodeRequestResponseMap.delete(nodeRequest);
-    if (nodeResponse?.once) {
+    if (nodeResponse.once) {
         let sendAbortSignal;
         // If ponyfilled
         if (RequestCtor !== globalThis.Request) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.9.37-alpha-20240717115453-841375873174d7ac5a1bce22dc9ea9c5ee6d9060",
+  "version": "0.10.0-alpha-20240717144936-662ea5088eb83ec5b55025307193fac81a8ea190",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {

package/typings/types.d.cts

@@ -17,7 +17,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 & ServerAdapterInitialContext) => Promise<Response> | Response;
+    handleRequest: (request: Request, ctx: TServerContext & Partial<ServerAdapterInitialContext>) => Promise<Response> | Response;
     /**
      * WHATWG Fetch spec compliant `fetch` function that can be used for testing purposes.
      */
@@ -31,10 +31,6 @@ export interface ServerAdapterObject<TServerContext> extends EventListenerObject
     fetch(url: URL, ...ctx: Partial<TServerContext>[]): Promise<Response> | Response;
     fetch(url: URL, init: RequestInit, ctx: TServerContext): Promise<Response> | Response;
     fetch(url: URL, init: RequestInit, ...ctx: Partial<TServerContext>[]): Promise<Response> | Response;
-    /**
-     * This function takes Node's request object and returns a WHATWG Fetch spec compliant `Response` object.
-     **/
-    handleNodeRequest(nodeRequest: NodeRequest, ...ctx: Partial<TServerContext & ServerAdapterInitialContext>[]): Promise<Response> | Response;
     /**
      * This function takes Node's request and response objects and returns a WHATWG Fetch spec compliant `Response` object.
      */
@@ -72,7 +68,7 @@ export type ServerAdapterNodeContext = {
     req: NodeRequest;
     res: NodeResponse;
 };
-export type WaitUntilFn = (promise: Promise<void> | void) => void;
+export type WaitUntilFn = (promise: Promise<unknown>) => void;
 export type FetchAPI = ReturnType<typeof import('@whatwg-node/fetch').createFetch>;
 export type ServerAdapterInitialContext = {
     /**

package/typings/types.d.ts

@@ -17,7 +17,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 & ServerAdapterInitialContext) => Promise<Response> | Response;
+    handleRequest: (request: Request, ctx: TServerContext & Partial<ServerAdapterInitialContext>) => Promise<Response> | Response;
     /**
      * WHATWG Fetch spec compliant `fetch` function that can be used for testing purposes.
      */
@@ -31,10 +31,6 @@ export interface ServerAdapterObject<TServerContext> extends EventListenerObject
     fetch(url: URL, ...ctx: Partial<TServerContext>[]): Promise<Response> | Response;
     fetch(url: URL, init: RequestInit, ctx: TServerContext): Promise<Response> | Response;
     fetch(url: URL, init: RequestInit, ...ctx: Partial<TServerContext>[]): Promise<Response> | Response;
-    /**
-     * This function takes Node's request object and returns a WHATWG Fetch spec compliant `Response` object.
-     **/
-    handleNodeRequest(nodeRequest: NodeRequest, ...ctx: Partial<TServerContext & ServerAdapterInitialContext>[]): Promise<Response> | Response;
     /**
      * This function takes Node's request and response objects and returns a WHATWG Fetch spec compliant `Response` object.
      */
@@ -72,7 +68,7 @@ export type ServerAdapterNodeContext = {
     req: NodeRequest;
     res: NodeResponse;
 };
-export type WaitUntilFn = (promise: Promise<void> | void) => void;
+export type WaitUntilFn = (promise: Promise<unknown>) => void;
 export type FetchAPI = ReturnType<typeof import('@whatwg-node/fetch').createFetch>;
 export type ServerAdapterInitialContext = {
     /**

package/typings/utils.d.cts

@@ -30,8 +30,7 @@ export declare class ServerAdapterRequestAbortSignal extends EventTarget impleme
     set onabort(value: ((this: AbortSignal, ev: Event) => any) | null);
     any(signals: Iterable<AbortSignal>): AbortSignal;
 }
-export declare const nodeRequestResponseMap: WeakMap<NodeRequest, NodeResponse>;
-export declare function normalizeNodeRequest(nodeRequest: NodeRequest, RequestCtor: typeof Request): Request;
+export declare function normalizeNodeRequest(nodeRequest: NodeRequest, nodeResponse: NodeResponse, RequestCtor: typeof Request): Request;
 export declare function isReadable(stream: any): stream is Readable;
 export declare function isNodeRequest(request: any): request is NodeRequest;
 export declare function isServerResponse(stream: any): stream is NodeResponse;

package/typings/utils.d.ts

@@ -30,8 +30,7 @@ export declare class ServerAdapterRequestAbortSignal extends EventTarget impleme
     set onabort(value: ((this: AbortSignal, ev: Event) => any) | null);
     any(signals: Iterable<AbortSignal>): AbortSignal;
 }
-export declare const nodeRequestResponseMap: WeakMap<NodeRequest, NodeResponse>;
-export declare function normalizeNodeRequest(nodeRequest: NodeRequest, RequestCtor: typeof Request): Request;
+export declare function normalizeNodeRequest(nodeRequest: NodeRequest, nodeResponse: NodeResponse, RequestCtor: typeof Request): Request;
 export declare function isReadable(stream: any): stream is Readable;
 export declare function isNodeRequest(request: any): request is NodeRequest;
 export declare function isServerResponse(stream: any): stream is NodeResponse;