@web-widget/node 0.3.0 → 0.4.1

package/dist/node.cjs

@@ -66,9 +66,9 @@ var NodeAdapter = class {
   #handler;
   #middleware;
   constructor(webRouter, options = {
-    defaultOrigin: webRouter?.options?.origin ?? "https://web-widget.js.org"
+    defaultOrigin: webRouter?.origin ?? "https://web-widget.js.org"
   }) {
-    this.#handler = (0, import_node_utils.buildToNodeHandler)(
+    this.#handler = buildToNodeHandler(
       dependencies,
       options
     )(webRouter.handler);
@@ -95,7 +95,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 +154,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 {
@@ -11,9 +20,7 @@ declare class NodeAdapter {
     #private;
     constructor(webRouter: {
         handler: WebHandler;
-        options?: {
-            origin?: string;
-        };
+        origin?: string;
     }, options?: NodeAdapterOptions);
     get middleware(): Middleware;
     get handler(): NodeHandler;

package/dist/node.js

@@ -1,7 +1,6 @@
 // src/index.ts
 import {
   buildToFetchEvent,
-  buildToNodeHandler,
   buildToRequest,
   mergeIntoServerResponse,
   toOutgoingHeaders
@@ -38,7 +37,7 @@ var NodeAdapter = class {
   #handler;
   #middleware;
   constructor(webRouter, options = {
-    defaultOrigin: webRouter?.options?.origin ?? "https://web-widget.js.org"
+    defaultOrigin: webRouter?.origin ?? "https://web-widget.js.org"
   }) {
     this.#handler = buildToNodeHandler(
       dependencies,
@@ -67,7 +66,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 +125,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.3.0",
+  "version": "0.4.1",
   "type": "module",
   "exports": {
     ".": {