@whatwg-node/server 0.4.17 → 0.4.18-alpha-20221220104236-d3ce2f8

package/index.d.ts

@@ -9,11 +9,11 @@ export interface ServerAdapterBaseObject<TServerContext, THandleRequest extends
      */
     handle: THandleRequest;
 }
-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: (request: Request, ctx: TServerContext) => Promise<Response> | Response;
     /**
      * WHATWG Fetch spec compliant `fetch` function that can be used for testing purposes.
      */
@@ -42,9 +42,9 @@ 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 ServerAdapterRequestHandler<TServerContext> = (request: Request, ctx: TServerContext) => Promise<Response> | Response;
-export declare type DefaultServerAdapterContext = {
+export type ServerAdapter<TServerContext, TBaseObject extends ServerAdapterBaseObject<TServerContext>> = TBaseObject & ServerAdapterObject<TServerContext>['handle'] & ServerAdapterObject<TServerContext>;
+export type ServerAdapterRequestHandler<TServerContext> = (request: Request, ctx: TServerContext) => Promise<Response> | Response;
+export type DefaultServerAdapterContext = {
     req: NodeRequest;
     res: ServerResponse;
     waitUntil(promise: Promise<unknown>): void;

package/index.js

@@ -191,7 +191,18 @@ function createServerAdapter(serverAdapterBaseObject,
  * WHATWG Fetch spec compliant `Request` constructor.
  */
 RequestCtor = fetch.Request) {
-    const handleRequest = typeof serverAdapterBaseObject === 'function' ? serverAdapterBaseObject : serverAdapterBaseObject.handle;
+    const providedRequestHandler = typeof serverAdapterBaseObject === 'function' ? serverAdapterBaseObject : serverAdapterBaseObject.handle;
+    async function handleRequest(request, ctx) {
+        try {
+            return await providedRequestHandler(request, ctx);
+        }
+        catch (e) {
+            return new Response(e.stack || e.message || e.toString(), {
+                status: e.statusCode || e.status || 500,
+                statusText: e.statusText || 'Internal Server Error',
+            });
+        }
+    }
     function handleNodeRequest(nodeRequest, ...ctx) {
         const serverContext = ctx.length > 1 ? Object.assign({}, ...ctx) : ctx[0];
         const request = normalizeNodeRequest(nodeRequest, RequestCtor);

package/index.mjs

@@ -187,7 +187,18 @@ function createServerAdapter(serverAdapterBaseObject,
  * WHATWG Fetch spec compliant `Request` constructor.
  */
 RequestCtor = Request) {
-    const handleRequest = typeof serverAdapterBaseObject === 'function' ? serverAdapterBaseObject : serverAdapterBaseObject.handle;
+    const providedRequestHandler = typeof serverAdapterBaseObject === 'function' ? serverAdapterBaseObject : serverAdapterBaseObject.handle;
+    async function handleRequest(request, ctx) {
+        try {
+            return await providedRequestHandler(request, ctx);
+        }
+        catch (e) {
+            return new Response(e.stack || e.message || e.toString(), {
+                status: e.statusCode || e.status || 500,
+                statusText: e.statusText || 'Internal Server Error',
+            });
+        }
+    }
     function handleNodeRequest(nodeRequest, ...ctx) {
         const serverContext = ctx.length > 1 ? Object.assign({}, ...ctx) : ctx[0];
         const request = normalizeNodeRequest(nodeRequest, RequestCtor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.4.17",
+  "version": "0.4.18-alpha-20221220104236-d3ce2f8",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "peerDependencies": {