@whatwg-node/server 0.8.5 → 0.8.6-alpha-20230608092002-31ae5e4

package/cjs/createServerAdapter.js

@@ -44,13 +44,35 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         }
     }
     async function handleRequest(request, serverContext) {
-        const { requestHandler, response = await requestHandler(request, serverContext) } = await (0, utils_js_1.handleOnRequestHook)({
-            request,
-            serverContext,
-            onRequestHooks,
-            givenHandleRequest,
-            fetchAPI,
+        let url = new Proxy({}, {
+            get: (_target, prop, _receiver) => {
+                url = new fetchAPI.URL(request.url, 'http://localhost');
+                return Reflect.get(url, prop, url);
+            },
         });
+        let requestHandler = givenHandleRequest;
+        let response;
+        for (const onRequestHook of onRequestHooks) {
+            await onRequestHook({
+                request,
+                serverContext,
+                fetchAPI,
+                url,
+                requestHandler,
+                setRequestHandler(newRequestHandler) {
+                    requestHandler = newRequestHandler;
+                },
+                endResponse(newResponse) {
+                    response = newResponse;
+                },
+            });
+            if (response) {
+                break;
+            }
+        }
+        if (!response) {
+            response = await requestHandler(request, serverContext);
+        }
         for (const onResponseHook of onResponseHooks) {
             await onResponseHook({
                 request,

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleOnRequestHook = exports.completeAssign = exports.isRequestInit = exports.sendNodeResponse = exports.getHeadersObj = exports.isFetchEvent = exports.isReadableStream = exports.isServerResponse = exports.isNodeRequest = exports.isReadable = exports.normalizeNodeRequest = exports.isAsyncIterable = void 0;
+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');
@@ -145,39 +145,10 @@ function endResponse(serverResponse) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame
     serverResponse.end(null, null, null);
 }
-function getHeadersObj(headers) {
-    return new Proxy({}, {
-        get(_target, prop) {
-            return headers.get(prop) || undefined;
-        },
-        set(_target, prop, value) {
-            headers.set(prop, value);
-            return true;
-        },
-        has(_target, prop) {
-            return headers.has(prop);
-        },
-        deleteProperty(_target, prop) {
-            headers.delete(prop);
-            return true;
-        },
-        ownKeys() {
-            const keys = [];
-            headers.forEach((_, key) => keys.push(key));
-            return keys;
-        },
-        getOwnPropertyDescriptor() {
-            return {
-                enumerable: true,
-                configurable: true,
-            };
-        },
-    });
-}
-exports.getHeadersObj = getHeadersObj;
 async function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
-    const headersObj = getHeadersObj(fetchResponse.headers);
-    serverResponse.writeHead(fetchResponse.status, fetchResponse.statusText, headersObj);
+    serverResponse.writeHead(fetchResponse.status, fetchResponse.statusText, [
+        ...fetchResponse.headers,
+    ]);
     // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve) => {
         serverResponse.once('close', resolve);
@@ -265,36 +236,3 @@ function completeAssign(target, ...sources) {
     return target;
 }
 exports.completeAssign = completeAssign;
-async function handleOnRequestHook({ fetchAPI, request, givenHandleRequest, serverContext, onRequestHooks, }) {
-    let url = new Proxy({}, {
-        get: (_target, prop, _receiver) => {
-            url = new fetchAPI.URL(request.url, 'http://localhost');
-            return Reflect.get(url, prop, url);
-        },
-    });
-    let requestHandler = givenHandleRequest;
-    let response;
-    for (const onRequestHook of onRequestHooks) {
-        await onRequestHook({
-            request,
-            serverContext,
-            fetchAPI,
-            url,
-            requestHandler,
-            setRequestHandler(newRequestHandler) {
-                requestHandler = newRequestHandler;
-            },
-            endResponse(newResponse) {
-                response = newResponse;
-            },
-        });
-        if (response) {
-            break;
-        }
-    }
-    return {
-        response,
-        requestHandler,
-    };
-}
-exports.handleOnRequestHook = handleOnRequestHook;

package/cjs/uwebsockets.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendResponseToUwsOpts = exports.getRequestFromUWSRequest = exports.isUWSResponse = void 0;
-const repeater_1 = require("@repeaterjs/repeater");
 function isUWSResponse(res) {
     return typeof res === 'object' && typeof res.onData === 'function';
 }
@@ -10,19 +9,21 @@ function getRequestFromUWSRequest({ req, res, fetchAPI }) {
     let body;
     const method = req.getMethod();
     if (method !== 'get' && method !== 'head') {
-        body = new repeater_1.Repeater(function (push, stop) {
-            res.onAborted(stop);
-            res.onData(function (chunk, isLast) {
-                push(Buffer.from(chunk, 0, chunk.byteLength));
-                if (isLast) {
-                    stop();
-                }
-            });
+        body = new fetchAPI.ReadableStream({});
+        const readable = body.readable;
+        res.onAborted(() => {
+            readable.push(null);
+        });
+        res.onData(function (chunk, isLast) {
+            readable.push(Buffer.from(chunk, 0, chunk.byteLength));
+            if (isLast) {
+                readable.push(null);
+            }
         });
     }
-    const headers = {};
+    const headers = new fetchAPI.Headers();
     req.forEach((key, value) => {
-        headers[key] = value;
+        headers.set(key, value);
     });
     const url = `http://localhost${req.getUrl()}`;
     return new fetchAPI.Request(url, {
@@ -48,17 +49,17 @@ async function sendResponseToUwsOpts({ res, response }) {
             });
         }
     });
-    if (!response.body) {
-        res.end();
-        return;
-    }
     if (response.bodyType === 'String' || response.bodyType === 'Uint8Array') {
         res.cork(() => {
             res.end(response.bodyInit);
         });
         return;
     }
-    for await (const chunk of response.body.readable) {
+    if (!response.body) {
+        res.end();
+        return;
+    }
+    for await (const chunk of response.body) {
         if (resAborted) {
             return;
         }

package/esm/createServerAdapter.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-types */
 import * as DefaultFetchAPI from '@whatwg-node/fetch';
-import { completeAssign, handleOnRequestHook, isFetchEvent, isNodeRequest, isRequestInit, isServerResponse, normalizeNodeRequest, sendNodeResponse, } from './utils.js';
+import { completeAssign, isFetchEvent, isNodeRequest, isRequestInit, isServerResponse, normalizeNodeRequest, sendNodeResponse, } from './utils.js';
 import { getRequestFromUWSRequest, isUWSResponse, sendResponseToUwsOpts, } from './uwebsockets.js';
 async function handleWaitUntils(waitUntilPromises) {
     const waitUntils = await Promise.allSettled(waitUntilPromises);
@@ -40,13 +40,35 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         }
     }
     async function handleRequest(request, serverContext) {
-        const { requestHandler, response = await requestHandler(request, serverContext) } = await handleOnRequestHook({
-            request,
-            serverContext,
-            onRequestHooks,
-            givenHandleRequest,
-            fetchAPI,
+        let url = new Proxy({}, {
+            get: (_target, prop, _receiver) => {
+                url = new fetchAPI.URL(request.url, 'http://localhost');
+                return Reflect.get(url, prop, url);
+            },
         });
+        let requestHandler = givenHandleRequest;
+        let response;
+        for (const onRequestHook of onRequestHooks) {
+            await onRequestHook({
+                request,
+                serverContext,
+                fetchAPI,
+                url,
+                requestHandler,
+                setRequestHandler(newRequestHandler) {
+                    requestHandler = newRequestHandler;
+                },
+                endResponse(newResponse) {
+                    response = newResponse;
+                },
+            });
+            if (response) {
+                break;
+            }
+        }
+        if (!response) {
+            response = await requestHandler(request, serverContext);
+        }
         for (const onResponseHook of onResponseHooks) {
             await onResponseHook({
                 request,

package/esm/utils.js

@@ -135,38 +135,10 @@ function endResponse(serverResponse) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame
     serverResponse.end(null, null, null);
 }
-export function getHeadersObj(headers) {
-    return new Proxy({}, {
-        get(_target, prop) {
-            return headers.get(prop) || undefined;
-        },
-        set(_target, prop, value) {
-            headers.set(prop, value);
-            return true;
-        },
-        has(_target, prop) {
-            return headers.has(prop);
-        },
-        deleteProperty(_target, prop) {
-            headers.delete(prop);
-            return true;
-        },
-        ownKeys() {
-            const keys = [];
-            headers.forEach((_, key) => keys.push(key));
-            return keys;
-        },
-        getOwnPropertyDescriptor() {
-            return {
-                enumerable: true,
-                configurable: true,
-            };
-        },
-    });
-}
 export async function sendNodeResponse(fetchResponse, serverResponse, nodeRequest) {
-    const headersObj = getHeadersObj(fetchResponse.headers);
-    serverResponse.writeHead(fetchResponse.status, fetchResponse.statusText, headersObj);
+    serverResponse.writeHead(fetchResponse.status, fetchResponse.statusText, [
+        ...fetchResponse.headers,
+    ]);
     // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve) => {
         serverResponse.once('close', resolve);
@@ -251,35 +223,3 @@ export function completeAssign(target, ...sources) {
     });
     return target;
 }
-export async function handleOnRequestHook({ fetchAPI, request, givenHandleRequest, serverContext, onRequestHooks, }) {
-    let url = new Proxy({}, {
-        get: (_target, prop, _receiver) => {
-            url = new fetchAPI.URL(request.url, 'http://localhost');
-            return Reflect.get(url, prop, url);
-        },
-    });
-    let requestHandler = givenHandleRequest;
-    let response;
-    for (const onRequestHook of onRequestHooks) {
-        await onRequestHook({
-            request,
-            serverContext,
-            fetchAPI,
-            url,
-            requestHandler,
-            setRequestHandler(newRequestHandler) {
-                requestHandler = newRequestHandler;
-            },
-            endResponse(newResponse) {
-                response = newResponse;
-            },
-        });
-        if (response) {
-            break;
-        }
-    }
-    return {
-        response,
-        requestHandler,
-    };
-}

package/esm/uwebsockets.js

@@ -1,4 +1,3 @@
-import { Repeater } from '@repeaterjs/repeater';
 export function isUWSResponse(res) {
     return typeof res === 'object' && typeof res.onData === 'function';
 }
@@ -6,19 +5,21 @@ export function getRequestFromUWSRequest({ req, res, fetchAPI }) {
     let body;
     const method = req.getMethod();
     if (method !== 'get' && method !== 'head') {
-        body = new Repeater(function (push, stop) {
-            res.onAborted(stop);
-            res.onData(function (chunk, isLast) {
-                push(Buffer.from(chunk, 0, chunk.byteLength));
-                if (isLast) {
-                    stop();
-                }
-            });
+        body = new fetchAPI.ReadableStream({});
+        const readable = body.readable;
+        res.onAborted(() => {
+            readable.push(null);
+        });
+        res.onData(function (chunk, isLast) {
+            readable.push(Buffer.from(chunk, 0, chunk.byteLength));
+            if (isLast) {
+                readable.push(null);
+            }
         });
     }
-    const headers = {};
+    const headers = new fetchAPI.Headers();
     req.forEach((key, value) => {
-        headers[key] = value;
+        headers.set(key, value);
     });
     const url = `http://localhost${req.getUrl()}`;
     return new fetchAPI.Request(url, {
@@ -43,17 +44,17 @@ export async function sendResponseToUwsOpts({ res, response }) {
             });
         }
     });
-    if (!response.body) {
-        res.end();
-        return;
-    }
     if (response.bodyType === 'String' || response.bodyType === 'Uint8Array') {
         res.cork(() => {
             res.end(response.bodyInit);
         });
         return;
     }
-    for await (const chunk of response.body.readable) {
+    if (!response.body) {
+        res.end();
+        return;
+    }
+    for await (const chunk of response.body) {
         if (resAborted) {
             return;
         }

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.8.5",
+  "version": "0.8.6-alpha-20230608092002-31ae5e4",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {
-    "@repeaterjs/repeater": "^3.0.4",
     "@whatwg-node/fetch": "^0.9.3",
     "tslib": "^2.3.1"
   },

package/typings/utils.d.cts

@@ -3,11 +3,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { Http2ServerRequest, Http2ServerResponse, OutgoingHttpHeaders } from 'node:http2';
+import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
 import type { Socket } from 'node:net';
 import type { Readable } from 'node:stream';
-import type { OnRequestHook } from './plugins/types.cjs';
-import type { FetchAPI, FetchEvent, ServerAdapterRequestHandler } from './types.cjs';
+import type { FetchEvent } from './types.cjs';
 export declare function isAsyncIterable(body: any): body is AsyncIterable<any>;
 export interface NodeRequest {
     protocol?: string;
@@ -29,18 +28,6 @@ export declare function isNodeRequest(request: any): request is NodeRequest;
 export declare function isServerResponse(stream: any): stream is NodeResponse;
 export declare function isReadableStream(stream: any): stream is ReadableStream;
 export declare function isFetchEvent(event: any): event is FetchEvent;
-export declare function getHeadersObj(headers: Headers): OutgoingHttpHeaders;
 export declare function sendNodeResponse(fetchResponse: Response, serverResponse: NodeResponse, nodeRequest: NodeRequest): Promise<void>;
 export declare function isRequestInit(val: unknown): val is RequestInit;
 export declare function completeAssign(target: any, ...sources: any[]): any;
-export interface HandleOnRequestHookOpts {
-    fetchAPI: FetchAPI;
-    request: Request;
-    givenHandleRequest: ServerAdapterRequestHandler<any>;
-    serverContext: any;
-    onRequestHooks: OnRequestHook<any>[];
-}
-export declare function handleOnRequestHook({ fetchAPI, request, givenHandleRequest, serverContext, onRequestHooks, }: HandleOnRequestHookOpts): Promise<{
-    response?: Response;
-    requestHandler: ServerAdapterRequestHandler<any>;
-}>;

package/typings/utils.d.ts

@@ -3,11 +3,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { Http2ServerRequest, Http2ServerResponse, OutgoingHttpHeaders } from 'node:http2';
+import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
 import type { Socket } from 'node:net';
 import type { Readable } from 'node:stream';
-import type { OnRequestHook } from './plugins/types.js';
-import type { FetchAPI, FetchEvent, ServerAdapterRequestHandler } from './types.js';
+import type { FetchEvent } from './types.js';
 export declare function isAsyncIterable(body: any): body is AsyncIterable<any>;
 export interface NodeRequest {
     protocol?: string;
@@ -29,18 +28,6 @@ export declare function isNodeRequest(request: any): request is NodeRequest;
 export declare function isServerResponse(stream: any): stream is NodeResponse;
 export declare function isReadableStream(stream: any): stream is ReadableStream;
 export declare function isFetchEvent(event: any): event is FetchEvent;
-export declare function getHeadersObj(headers: Headers): OutgoingHttpHeaders;
 export declare function sendNodeResponse(fetchResponse: Response, serverResponse: NodeResponse, nodeRequest: NodeRequest): Promise<void>;
 export declare function isRequestInit(val: unknown): val is RequestInit;
 export declare function completeAssign(target: any, ...sources: any[]): any;
-export interface HandleOnRequestHookOpts {
-    fetchAPI: FetchAPI;
-    request: Request;
-    givenHandleRequest: ServerAdapterRequestHandler<any>;
-    serverContext: any;
-    onRequestHooks: OnRequestHook<any>[];
-}
-export declare function handleOnRequestHook({ fetchAPI, request, givenHandleRequest, serverContext, onRequestHooks, }: HandleOnRequestHookOpts): Promise<{
-    response?: Response;
-    requestHandler: ServerAdapterRequestHandler<any>;
-}>;

package/typings/uwebsockets.d.cts

@@ -4,6 +4,7 @@ export interface UWSRequest {
     forEach(callback: (key: string, value: string) => void): void;
     getUrl(): string;
     getHeader(key: string): string | undefined;
+    setYield(y: boolean): void;
 }
 export interface UWSResponse {
     onData(callback: (chunk: ArrayBuffer, isLast: boolean) => void): void;
@@ -11,6 +12,7 @@ export interface UWSResponse {
     writeStatus(status: string): void;
     writeHeader(key: string, value: string): void;
     end(body?: any): void;
+    close(): void;
     write(body: any): boolean;
     cork(callback: () => void): void;
 }

package/typings/uwebsockets.d.ts

@@ -4,6 +4,7 @@ export interface UWSRequest {
     forEach(callback: (key: string, value: string) => void): void;
     getUrl(): string;
     getHeader(key: string): string | undefined;
+    setYield(y: boolean): void;
 }
 export interface UWSResponse {
     onData(callback: (chunk: ArrayBuffer, isLast: boolean) => void): void;
@@ -11,6 +12,7 @@ export interface UWSResponse {
     writeStatus(status: string): void;
     writeHeader(key: string, value: string): void;
     end(body?: any): void;
+    close(): void;
     write(body: any): boolean;
     cork(callback: () => void): void;
 }