@web-widget/node 0.4.0 → 0.4.2

package/dist/node.cjs

@@ -68,11 +68,9 @@ var NodeAdapter = class {
   constructor(webRouter, options = {
     defaultOrigin: webRouter?.origin ?? "https://web-widget.js.org"
   }) {
-    this.#handler = (0, import_node_utils.buildToNodeHandler)(
-      dependencies,
-      options
-    )(webRouter.handler);
-    this.#middleware = toMiddleware(webRouter.handler, options);
+    const handler = webRouter.handler.bind(webRouter);
+    this.#handler = buildToNodeHandler(dependencies, options)(handler);
+    this.#middleware = toMiddleware(handler, options);
   }
   get middleware() {
     return this.#middleware;
@@ -95,7 +93,11 @@ function toMiddleware(webHandler, options) {
   const toFetchEvent = (0, import_node_utils.buildToFetchEvent)(dependencies);
   return async function middleware(incomingMessage, serverResponse, next) {
     const request = toRequest(incomingMessage, options);
-    const webResponse = await webHandler(request, toFetchEvent(request));
+    const webResponse = await webHandler(
+      request,
+      process.env,
+      toFetchEvent(request)
+    );
     await toServerResponse(webResponse, serverResponse);
     await next();
   };
@@ -150,3 +152,24 @@ function checkWritable(serverResponse) {
     return true;
   return socket.writable;
 }
+function buildToNodeHandler(dependencies2, options) {
+  const toRequest = (0, import_node_utils.buildToRequest)(dependencies2);
+  const toFetchEvent = (0, import_node_utils.buildToFetchEvent)(dependencies2);
+  return function toNodeHandler(webHandler) {
+    return (incomingMessage, serverResponse) => {
+      const request = toRequest(incomingMessage, options);
+      const maybePromise = webHandler(
+        request,
+        process.env,
+        toFetchEvent(request)
+      );
+      if (maybePromise instanceof Promise) {
+        maybePromise.then(
+          (response) => toServerResponse(response, serverResponse)
+        );
+      } else {
+        toServerResponse(maybePromise, serverResponse);
+      }
+    };
+  };
+}

package/dist/node.d.ts

@@ -1,7 +1,16 @@
-import { RequestOptions, WebHandler, NodeHandler } from '@edge-runtime/node-utils';
+import { RequestOptions, NodeHandler } from '@edge-runtime/node-utils';
 import primitives from '@edge-runtime/primitives';
 import { IncomingMessage, ServerResponse } from 'node:http';
 
+type WebHandler = (req: Request, env: Record<string, unknown>, event: FetchEvent) => Promise<Response> | Response | null | undefined;
+declare class FetchEvent {
+    request: Request;
+    awaiting: Set<Promise<void>>;
+    response: Response | null;
+    constructor(request: Request);
+    respondWith(response: Response): void;
+    waitUntil(): void;
+}
 interface NodeAdapterOptions extends RequestOptions {
 }
 interface Middleware {

package/dist/node.js

@@ -1,7 +1,6 @@
 // src/index.ts
 import {
   buildToFetchEvent,
-  buildToNodeHandler,
   buildToRequest,
   mergeIntoServerResponse,
   toOutgoingHeaders
@@ -40,11 +39,9 @@ var NodeAdapter = class {
   constructor(webRouter, options = {
     defaultOrigin: webRouter?.origin ?? "https://web-widget.js.org"
   }) {
-    this.#handler = buildToNodeHandler(
-      dependencies,
-      options
-    )(webRouter.handler);
-    this.#middleware = toMiddleware(webRouter.handler, options);
+    const handler = webRouter.handler.bind(webRouter);
+    this.#handler = buildToNodeHandler(dependencies, options)(handler);
+    this.#middleware = toMiddleware(handler, options);
   }
   get middleware() {
     return this.#middleware;
@@ -67,7 +64,11 @@ function toMiddleware(webHandler, options) {
   const toFetchEvent = buildToFetchEvent(dependencies);
   return async function middleware(incomingMessage, serverResponse, next) {
     const request = toRequest(incomingMessage, options);
-    const webResponse = await webHandler(request, toFetchEvent(request));
+    const webResponse = await webHandler(
+      request,
+      process.env,
+      toFetchEvent(request)
+    );
     await toServerResponse(webResponse, serverResponse);
     await next();
   };
@@ -122,6 +123,27 @@ function checkWritable(serverResponse) {
     return true;
   return socket.writable;
 }
+function buildToNodeHandler(dependencies2, options) {
+  const toRequest = buildToRequest(dependencies2);
+  const toFetchEvent = buildToFetchEvent(dependencies2);
+  return function toNodeHandler(webHandler) {
+    return (incomingMessage, serverResponse) => {
+      const request = toRequest(incomingMessage, options);
+      const maybePromise = webHandler(
+        request,
+        process.env,
+        toFetchEvent(request)
+      );
+      if (maybePromise instanceof Promise) {
+        maybePromise.then(
+          (response) => toServerResponse(response, serverResponse)
+        );
+      } else {
+        toServerResponse(maybePromise, serverResponse);
+      }
+    };
+  };
+}
 export {
   NodeAdapter as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-widget/node",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
   "exports": {
     ".": {