@whatwg-node/server 0.4.8 → 0.4.10-alpha-20220926221307-730c2a6

package/index.d.ts

@@ -2,18 +2,18 @@
 /// <reference lib="webworker" />
 import type { RequestListener, ServerResponse } from 'node:http';
 import { NodeRequest } from './utils';
-export interface ServerAdapterBaseObject<TServerContext, THandleRequest extends ServerAdapterRequestHandler<TServerContext> = ServerAdapterRequestHandler<TServerContext>> {
+export interface ServerAdapterBaseObject<TServerContext> {
     /**
      * An async function that takes `Request` and the server context and returns a `Response`.
      * If you use `requestListener`, the server context is `{ req: IncomingMessage, res: ServerResponse }`.
      */
-    handle: THandleRequest;
+    handle: ServerAdapterRequestHandler<TServerContext>;
 }
-export interface ServerAdapterObject<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext, ServerAdapterRequestHandler<TServerContext>>> extends EventListenerObject {
+export interface ServerAdapterObject<TServerContext> extends EventListenerObject {
     /**
      * A basic request listener that takes a `Request` with the server context and returns a `Response`.
      */
-    handleRequest: TBaseObject['handle'];
+    handleRequest: ServerAdapterRequestHandler<TServerContext>;
     /**
      * WHATWG Fetch spec compliant `fetch` function that can be used for testing purposes.
      */
@@ -35,6 +35,9 @@ export interface ServerAdapterObject<TServerContext, TBaseObject extends ServerA
      * A request listener function that can be used with any Node server variation.
      */
     requestListener: RequestListener;
+    /**
+     * Flexible and generic request handler for all environments.
+     */
     handle(req: NodeRequest, res: ServerResponse, ...ctx: Partial<TServerContext>[]): Promise<void>;
     handle(request: Request, ...ctx: Partial<TServerContext>[]): Promise<Response> | Response;
     handle(fetchEvent: FetchEvent & Partial<TServerContext>, ...ctx: Partial<TServerContext>[]): void;
@@ -42,13 +45,13 @@ export interface ServerAdapterObject<TServerContext, TBaseObject extends ServerA
         request: Request;
     } & Partial<TServerContext>, ...ctx: Partial<TServerContext>[]): Promise<Response> | Response;
 }
-export declare type ServerAdapter<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext>> = TBaseObject & ServerAdapterObject<TServerContext, TBaseObject>['handle'] & ServerAdapterObject<TServerContext, TBaseObject>;
+export declare type ServerAdapter<TServerContext> = ServerAdapterObject<TServerContext>['handle'] & ServerAdapterObject<TServerContext>['requestListener'] & ServerAdapterObject<TServerContext>;
 export declare type ServerAdapterRequestHandler<TServerContext> = (request: Request, ctx: TServerContext) => Promise<Response> | Response;
-export declare type DefaultServerAdapterContext = {
+export interface NodeServerAdapterContext {
     req: NodeRequest;
     res: ServerResponse;
     waitUntil(promise: Promise<unknown>): void;
-};
-declare function createServerAdapter<TServerContext = DefaultServerAdapterContext, THandleRequest extends ServerAdapterRequestHandler<TServerContext> = ServerAdapterRequestHandler<TServerContext>>(serverAdapterRequestHandler: THandleRequest, RequestCtor?: typeof Request): ServerAdapter<TServerContext, ServerAdapterBaseObject<TServerContext, THandleRequest>>;
-declare function createServerAdapter<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext>>(serverAdapterBaseObject: TBaseObject, RequestCtor?: typeof Request): ServerAdapter<TServerContext, TBaseObject>;
+}
+declare function createServerAdapter<TServerContext>(serverAdapterRequestHandler: ServerAdapterRequestHandler<TServerContext>, RequestCtor?: typeof Request): ServerAdapter<TServerContext>;
+declare function createServerAdapter<TServerContext>(serverAdapterBaseObject: ServerAdapterBaseObject<TServerContext>, RequestCtor?: typeof Request): ServerAdapter<TServerContext>;
 export { createServerAdapter };

package/index.js

@@ -156,17 +156,23 @@ async function sendNodeResponse({ headers, status, statusText, body }, serverRes
         else if (isReadableStream(body)) {
             const reader = body.getReader();
             serverResponse.once('close', () => {
-                reader.cancel();
+                reader.cancel().finally(() => {
+                    reader.releaseLock();
+                    body.cancel();
+                });
             });
             // eslint-disable-next-line no-inner-declarations
             function pump() {
-                reader.read().then(({ done, value }) => {
+                reader
+                    .read()
+                    .then(({ done, value }) => {
                     if (done) {
                         serverResponse.end(resolve);
                         return;
                     }
                     serverResponse.write(value, pump);
-                }).catch(error => {
+                })
+                    .catch(error => {
                     console.error(error);
                     serverResponse.end(resolve);
                 });
@@ -224,14 +230,14 @@ RequestCtor = fetch.Request) {
     }
     async function requestListener(nodeRequest, serverResponse, ...ctx) {
         const waitUntilPromises = [];
-        const defaultServerContext = {
+        const nodeServerContext = {
             req: nodeRequest,
             res: serverResponse,
             waitUntil(p) {
                 waitUntilPromises.push(p);
             },
         };
-        const response = await handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
+        const response = await handleNodeRequest(nodeRequest, nodeServerContext, ...ctx);
         if (response) {
             await sendNodeResponse(response, serverResponse);
         }

package/index.mjs

@@ -152,17 +152,23 @@ async function sendNodeResponse({ headers, status, statusText, body }, serverRes
         else if (isReadableStream(body)) {
             const reader = body.getReader();
             serverResponse.once('close', () => {
-                reader.cancel();
+                reader.cancel().finally(() => {
+                    reader.releaseLock();
+                    body.cancel();
+                });
             });
             // eslint-disable-next-line no-inner-declarations
             function pump() {
-                reader.read().then(({ done, value }) => {
+                reader
+                    .read()
+                    .then(({ done, value }) => {
                     if (done) {
                         serverResponse.end(resolve);
                         return;
                     }
                     serverResponse.write(value, pump);
-                }).catch(error => {
+                })
+                    .catch(error => {
                     console.error(error);
                     serverResponse.end(resolve);
                 });
@@ -220,14 +226,14 @@ RequestCtor = Request) {
     }
     async function requestListener(nodeRequest, serverResponse, ...ctx) {
         const waitUntilPromises = [];
-        const defaultServerContext = {
+        const nodeServerContext = {
             req: nodeRequest,
             res: serverResponse,
             waitUntil(p) {
                 waitUntilPromises.push(p);
             },
         };
-        const response = await handleNodeRequest(nodeRequest, defaultServerContext, ...ctx);
+        const response = await handleNodeRequest(nodeRequest, nodeServerContext, ...ctx);
         if (response) {
             await sendNodeResponse(response, serverResponse);
         }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.4.8",
+  "version": "0.4.10-alpha-20220926221307-730c2a6",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "peerDependencies": {
     "@types/node": "^18.0.6"
   },
   "dependencies": {
-    "@whatwg-node/fetch": "0.4.5",
+    "@whatwg-node/fetch": "0.4.6-alpha-20220926221307-730c2a6",
     "tslib": "^2.3.1"
   },
   "repository": {