@whatwg-node/server 0.8.3 → 0.8.4

package/cjs/createServerAdapter.js

@@ -102,12 +102,20 @@ function createServerAdapter(serverAdapterBaseObject, options) {
                 }
             },
         }, ...ctx);
-        return (0, uwebsockets_js_1.handleUWSWithHandler)({
-            res,
+        const request = (0, uwebsockets_js_1.getRequestFromUWSRequest)({
             req,
-            serverContext,
+            res,
             fetchAPI,
-            handleRequest,
+        });
+        const response = await handleRequest(request, serverContext);
+        if (!response) {
+            res.writeStatus('404 Not Found');
+            res.end();
+            return;
+        }
+        return (0, uwebsockets_js_1.sendResponseToUwsOpts)({
+            response,
+            res,
         });
     }
     function handleEvent(event, ...ctx) {

package/cjs/uwebsockets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleUWSWithHandler = exports.getHeadersFromUWSRequest = exports.isUWSResponse = void 0;
+exports.sendResponseToUwsOpts = exports.getRequestFromUWSRequest = exports.getHeadersFromUWSRequest = exports.isUWSResponse = void 0;
 const repeater_1 = require("@repeaterjs/repeater");
 function isUWSResponse(res) {
     return typeof res === 'object' && typeof res.onData === 'function';
@@ -60,13 +60,9 @@ function getHeadersFromUWSRequest(req) {
     };
 }
 exports.getHeadersFromUWSRequest = getHeadersFromUWSRequest;
-async function handleUWSWithHandler({ res, req, serverContext, fetchAPI, handleRequest, }) {
+function getRequestFromUWSRequest({ req, res, fetchAPI }) {
     let body;
     const method = req.getMethod();
-    let resAborted = false;
-    res.onAborted(function () {
-        resAborted = true;
-    });
     if (method !== 'get' && method !== 'head') {
         body = new repeater_1.Repeater(function (push, stop) {
             res.onAborted(stop);
@@ -80,20 +76,18 @@ async function handleUWSWithHandler({ res, req, serverContext, fetchAPI, handleR
     }
     const headers = getHeadersFromUWSRequest(req);
     const url = `http://localhost${req.getUrl()}`;
-    const request = new fetchAPI.Request(url, {
+    return new fetchAPI.Request(url, {
         method,
         headers,
         body: body,
     });
-    const response = await handleRequest(request, serverContext);
-    if (resAborted) {
-        return;
-    }
-    if (!response) {
-        res.writeStatus('404 Not Found');
-        res.end();
-        return;
-    }
+}
+exports.getRequestFromUWSRequest = getRequestFromUWSRequest;
+async function sendResponseToUwsOpts({ res, response }) {
+    let resAborted = false;
+    res.onAborted(function () {
+        resAborted = true;
+    });
     res.cork(() => {
         res.writeStatus(`${response.status} ${response.statusText}`);
     });
@@ -127,4 +121,4 @@ async function handleUWSWithHandler({ res, req, serverContext, fetchAPI, handleR
         res.end();
     });
 }
-exports.handleUWSWithHandler = handleUWSWithHandler;
+exports.sendResponseToUwsOpts = sendResponseToUwsOpts;

package/esm/createServerAdapter.js

@@ -1,7 +1,7 @@
 /* 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 { handleUWSWithHandler, isUWSResponse, } from './uwebsockets.js';
+import { getRequestFromUWSRequest, isUWSResponse, sendResponseToUwsOpts, } from './uwebsockets.js';
 async function handleWaitUntils(waitUntilPromises) {
     const waitUntils = await Promise.allSettled(waitUntilPromises);
     waitUntils.forEach(waitUntil => {
@@ -98,12 +98,20 @@ function createServerAdapter(serverAdapterBaseObject, options) {
                 }
             },
         }, ...ctx);
-        return handleUWSWithHandler({
-            res,
+        const request = getRequestFromUWSRequest({
             req,
-            serverContext,
+            res,
             fetchAPI,
-            handleRequest,
+        });
+        const response = await handleRequest(request, serverContext);
+        if (!response) {
+            res.writeStatus('404 Not Found');
+            res.end();
+            return;
+        }
+        return sendResponseToUwsOpts({
+            response,
+            res,
         });
     }
     function handleEvent(event, ...ctx) {

package/esm/uwebsockets.js

@@ -55,13 +55,9 @@ export function getHeadersFromUWSRequest(req) {
         },
     };
 }
-export async function handleUWSWithHandler({ res, req, serverContext, fetchAPI, handleRequest, }) {
+export function getRequestFromUWSRequest({ req, res, fetchAPI }) {
     let body;
     const method = req.getMethod();
-    let resAborted = false;
-    res.onAborted(function () {
-        resAborted = true;
-    });
     if (method !== 'get' && method !== 'head') {
         body = new Repeater(function (push, stop) {
             res.onAborted(stop);
@@ -75,20 +71,17 @@ export async function handleUWSWithHandler({ res, req, serverContext, fetchAPI,
     }
     const headers = getHeadersFromUWSRequest(req);
     const url = `http://localhost${req.getUrl()}`;
-    const request = new fetchAPI.Request(url, {
+    return new fetchAPI.Request(url, {
         method,
         headers,
         body: body,
     });
-    const response = await handleRequest(request, serverContext);
-    if (resAborted) {
-        return;
-    }
-    if (!response) {
-        res.writeStatus('404 Not Found');
-        res.end();
-        return;
-    }
+}
+export async function sendResponseToUwsOpts({ res, response }) {
+    let resAborted = false;
+    res.onAborted(function () {
+        resAborted = true;
+    });
     res.cork(() => {
         res.writeStatus(`${response.status} ${response.statusText}`);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {

package/typings/uwebsockets.d.cts

@@ -17,12 +17,15 @@ 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;
-interface UWSHandlerOpts {
-    res: UWSResponse;
+interface GetRequestFromUWSOpts {
     req: UWSRequest;
-    serverContext: any;
+    res: UWSResponse;
     fetchAPI: FetchAPI;
-    handleRequest(request: Request, ctx: any): Response | void | Promise<Response | void>;
 }
-export declare function handleUWSWithHandler({ res, req, serverContext, fetchAPI, handleRequest, }: UWSHandlerOpts): Promise<void>;
+export declare function getRequestFromUWSRequest({ req, res, fetchAPI }: GetRequestFromUWSOpts): Request;
+interface SendResponseToUWSOpts {
+    res: UWSResponse;
+    response: Response;
+}
+export declare function sendResponseToUwsOpts({ res, response }: SendResponseToUWSOpts): Promise<void>;
 export {};

package/typings/uwebsockets.d.ts

@@ -17,12 +17,15 @@ 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;
-interface UWSHandlerOpts {
-    res: UWSResponse;
+interface GetRequestFromUWSOpts {
     req: UWSRequest;
-    serverContext: any;
+    res: UWSResponse;
     fetchAPI: FetchAPI;
-    handleRequest(request: Request, ctx: any): Response | void | Promise<Response | void>;
 }
-export declare function handleUWSWithHandler({ res, req, serverContext, fetchAPI, handleRequest, }: UWSHandlerOpts): Promise<void>;
+export declare function getRequestFromUWSRequest({ req, res, fetchAPI }: GetRequestFromUWSOpts): Request;
+interface SendResponseToUWSOpts {
+    res: UWSResponse;
+    response: Response;
+}
+export declare function sendResponseToUwsOpts({ res, response }: SendResponseToUWSOpts): Promise<void>;
 export {};