@whatwg-node/server 0.8.1 → 0.8.2-alpha-20230605124052-0f7729b

package/cjs/createServerAdapter.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServerAdapter = void 0;
 const tslib_1 = require("tslib");
+/* eslint-disable @typescript-eslint/ban-types */
+const repeater_1 = require("@repeaterjs/repeater");
 const DefaultFetchAPI = tslib_1.__importStar(require("@whatwg-node/fetch"));
 const utils_js_1 = require("./utils.js");
 const uwebsockets_js_1 = require("./uwebsockets.js");
@@ -128,26 +130,24 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         let resAborted = false;
         res.onAborted(function () {
             resAborted = true;
-            body?.readable.push(null);
         });
         if (method !== 'get' && method !== 'head') {
-            body = new fetchAPI.ReadableStream({});
-            res.onData(function (chunk, isLast) {
-                body?.readable.push(Buffer.from(chunk, 0, chunk.byteLength));
-                if (isLast) {
-                    body?.readable.push(null);
-                }
+            body = new repeater_1.Repeater(function (push, stop) {
+                res.onAborted(stop);
+                res.onData(function (chunk, isLast) {
+                    push(Buffer.from(chunk));
+                    if (isLast) {
+                        stop();
+                    }
+                });
             });
         }
-        const headers = {};
-        req.forEach((key, value) => {
-            headers[key] = value;
-        });
+        const headers = (0, uwebsockets_js_1.getHeadersFromUWSRequest)(req);
         const url = `http://localhost${req.getUrl()}`;
         const request = new fetchAPI.Request(url, {
             method,
             headers,
-            body,
+            body: body,
         });
         const response = await handleRequest(request, serverContext);
         if (resAborted) {

package/cjs/uwebsockets.js

@@ -1,7 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUWSResponse = void 0;
+exports.getHeadersFromUWSRequest = exports.isUWSResponse = void 0;
 function isUWSResponse(res) {
     return typeof res === 'object' && typeof res.onData === 'function';
 }
 exports.isUWSResponse = isUWSResponse;
+function throwReadOnlyHeadersError() {
+    throw new Error('You cannot modify headers for a read-only request');
+}
+function getHeadersFromUWSRequest(req) {
+    return {
+        append() {
+            throwReadOnlyHeadersError();
+        },
+        delete() {
+            throwReadOnlyHeadersError();
+        },
+        get(key) {
+            return req.getHeader(key) || null;
+        },
+        has(key) {
+            return req.getHeader(key) != null;
+        },
+        set() {
+            throwReadOnlyHeadersError();
+        },
+        forEach(callback) {
+            req.forEach((key, value) => callback(value, key, this));
+        },
+        entries() {
+            const entries = [];
+            this.forEach((value, key) => {
+                entries.push([key, value]);
+            });
+            return entries[Symbol.iterator]();
+        },
+        keys() {
+            const keys = [];
+            this.forEach((_, key) => {
+                keys.push(key);
+            });
+            return keys[Symbol.iterator]();
+        },
+        values() {
+            const values = [];
+            this.forEach(value => {
+                values.push(value);
+            });
+            return values[Symbol.iterator]();
+        },
+        [Symbol.iterator]() {
+            const entries = [];
+            this.forEach((value, key) => {
+                entries.push([key, value]);
+            });
+            return entries[Symbol.iterator]();
+        },
+    };
+}
+exports.getHeadersFromUWSRequest = getHeadersFromUWSRequest;

package/esm/createServerAdapter.js

@@ -1,6 +1,8 @@
+/* eslint-disable @typescript-eslint/ban-types */
+import { Repeater } from '@repeaterjs/repeater';
 import * as DefaultFetchAPI from '@whatwg-node/fetch';
 import { isFetchEvent, isNodeRequest, isRequestInit, isServerResponse, normalizeNodeRequest, sendNodeResponse, } from './utils.js';
-import { isUWSResponse } from './uwebsockets.js';
+import { getHeadersFromUWSRequest, isUWSResponse } from './uwebsockets.js';
 async function handleWaitUntils(waitUntilPromises) {
     const waitUntils = await Promise.allSettled(waitUntilPromises);
     waitUntils.forEach(waitUntil => {
@@ -124,26 +126,24 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         let resAborted = false;
         res.onAborted(function () {
             resAborted = true;
-            body?.readable.push(null);
         });
         if (method !== 'get' && method !== 'head') {
-            body = new fetchAPI.ReadableStream({});
-            res.onData(function (chunk, isLast) {
-                body?.readable.push(Buffer.from(chunk, 0, chunk.byteLength));
-                if (isLast) {
-                    body?.readable.push(null);
-                }
+            body = new Repeater(function (push, stop) {
+                res.onAborted(stop);
+                res.onData(function (chunk, isLast) {
+                    push(Buffer.from(chunk));
+                    if (isLast) {
+                        stop();
+                    }
+                });
             });
         }
-        const headers = {};
-        req.forEach((key, value) => {
-            headers[key] = value;
-        });
+        const headers = getHeadersFromUWSRequest(req);
         const url = `http://localhost${req.getUrl()}`;
         const request = new fetchAPI.Request(url, {
             method,
             headers,
-            body,
+            body: body,
         });
         const response = await handleRequest(request, serverContext);
         if (resAborted) {

package/esm/uwebsockets.js

@@ -1,3 +1,56 @@
 export function isUWSResponse(res) {
     return typeof res === 'object' && typeof res.onData === 'function';
 }
+function throwReadOnlyHeadersError() {
+    throw new Error('You cannot modify headers for a read-only request');
+}
+export function getHeadersFromUWSRequest(req) {
+    return {
+        append() {
+            throwReadOnlyHeadersError();
+        },
+        delete() {
+            throwReadOnlyHeadersError();
+        },
+        get(key) {
+            return req.getHeader(key) || null;
+        },
+        has(key) {
+            return req.getHeader(key) != null;
+        },
+        set() {
+            throwReadOnlyHeadersError();
+        },
+        forEach(callback) {
+            req.forEach((key, value) => callback(value, key, this));
+        },
+        entries() {
+            const entries = [];
+            this.forEach((value, key) => {
+                entries.push([key, value]);
+            });
+            return entries[Symbol.iterator]();
+        },
+        keys() {
+            const keys = [];
+            this.forEach((_, key) => {
+                keys.push(key);
+            });
+            return keys[Symbol.iterator]();
+        },
+        values() {
+            const values = [];
+            this.forEach(value => {
+                values.push(value);
+            });
+            return values[Symbol.iterator]();
+        },
+        [Symbol.iterator]() {
+            const entries = [];
+            this.forEach((value, key) => {
+                entries.push([key, value]);
+            });
+            return entries[Symbol.iterator]();
+        },
+    };
+}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.8.1",
+  "version": "0.8.2-alpha-20230605124052-0f7729b",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {
+    "@repeaterjs/repeater": "^3.0.4",
     "@whatwg-node/fetch": "^0.9.0",
     "tslib": "^2.3.1"
   },

package/typings/uwebsockets.d.cts

@@ -2,6 +2,7 @@ export interface UWSRequest {
     getMethod(): string;
     forEach(callback: (key: string, value: string) => void): void;
     getUrl(): string;
+    getHeader(key: string): string | undefined;
 }
 export interface UWSResponse {
     onData(callback: (chunk: ArrayBuffer, isLast: boolean) => void): void;
@@ -14,3 +15,4 @@ export interface UWSResponse {
 }
 export type UWSHandler = (res: UWSResponse, req: UWSRequest) => void | Promise<void>;
 export declare function isUWSResponse(res: any): res is UWSResponse;
+export declare function getHeadersFromUWSRequest(req: UWSRequest): Headers;

package/typings/uwebsockets.d.ts

@@ -2,6 +2,7 @@ export interface UWSRequest {
     getMethod(): string;
     forEach(callback: (key: string, value: string) => void): void;
     getUrl(): string;
+    getHeader(key: string): string | undefined;
 }
 export interface UWSResponse {
     onData(callback: (chunk: ArrayBuffer, isLast: boolean) => void): void;
@@ -14,3 +15,4 @@ export interface UWSResponse {
 }
 export type UWSHandler = (res: UWSResponse, req: UWSRequest) => void | Promise<void>;
 export declare function isUWSResponse(res: any): res is UWSResponse;
+export declare function getHeadersFromUWSRequest(req: UWSRequest): Headers;