@web-widget/node 2.3.0 → 3.0.0-beta.0

package/dist/node.js

@@ -133,6 +133,16 @@ function addDuplexToInit(init) {
   }
   return init;
 }
+function isHttp2ServerResponse(serverResponse) {
+  if ("stream" in serverResponse && serverResponse.stream) return true;
+  const httpVersionMajor = serverResponse.httpVersionMajor;
+  return Number(httpVersionMajor) >= 2;
+}
+function setHttp1StatusMessage(serverResponse, statusMessage) {
+  if (!isHttp2ServerResponse(serverResponse) && statusMessage) {
+    serverResponse.statusMessage = statusMessage;
+  }
+}
 function toMiddleware(webHandler, options) {
   const toRequest = buildToRequestWithHttp2Compat(dependencies);
   const toFetchEvent = buildToFetchEvent(dependencies);
@@ -143,13 +153,15 @@ function toMiddleware(webHandler, options) {
       const event = toFetchEvent(request);
       const webResponse = await webHandler(request, env, event);
       await toServerResponse(webResponse, serverResponse);
-      await next();
+      if (!serverResponse.headersSent && !serverResponse.writableEnded) {
+        await next();
+      }
     } catch (error) {
       let responded = false;
       if (checkWritable(serverResponse) && !serverResponse.headersSent) {
         try {
           serverResponse.statusCode = 500;
-          serverResponse.statusMessage = "Internal Server Error";
+          setHttp1StatusMessage(serverResponse, "Internal Server Error");
           serverResponse.setHeader("content-type", "text/plain; charset=utf-8");
           serverResponse.end(
             error instanceof Error ? error.message : "Internal Server Error"
@@ -174,14 +186,19 @@ async function toServerResponse(webResponse, serverResponse) {
     serverResponse.end();
     return;
   }
+  const isHttp2 = isHttp2ServerResponse(serverResponse);
+  const headers = toOutgoingHeaders(webResponse.headers);
+  const status = webResponse.status;
   if (!serverResponse.headersSent) {
-    mergeIntoServerResponse(
-      toOutgoingHeaders(webResponse.headers),
-      serverResponse
-    );
+    mergeIntoServerResponse(headers, serverResponse);
+    serverResponse.statusCode = status;
+    if (!isHttp2) {
+      setHttp1StatusMessage(serverResponse, webResponse.statusText);
+    }
+  } else if (!isHttp2) {
+    serverResponse.statusCode = status;
+    setHttp1StatusMessage(serverResponse, webResponse.statusText);
   }
-  serverResponse.statusCode = webResponse.status;
-  serverResponse.statusMessage = webResponse.statusText;
   if (!webResponse.body) {
     serverResponse.end();
     return;
@@ -210,6 +227,7 @@ async function writeReadableStreamToWritable(stream, writable) {
 }
 function checkWritable(serverResponse) {
   if (serverResponse.writableEnded || serverResponse.finished) return false;
+  if ("stream" in serverResponse && serverResponse.stream) return true;
   const socket = serverResponse.socket;
   if (!socket) return true;
   return socket.writable;
@@ -227,7 +245,7 @@ function buildToNodeHandler(dependencies2, options) {
         maybePromise.then((response) => toServerResponse(response, serverResponse)).catch(() => {
           if (checkWritable(serverResponse) && !serverResponse.headersSent) {
             serverResponse.statusCode = 500;
-            serverResponse.statusMessage = "Internal Server Error";
+            setHttp1StatusMessage(serverResponse, "Internal Server Error");
             serverResponse.setHeader(
               "content-type",
               "text/plain; charset=utf-8"
@@ -239,7 +257,7 @@ function buildToNodeHandler(dependencies2, options) {
         toServerResponse(maybePromise, serverResponse).catch(() => {
           if (checkWritable(serverResponse) && !serverResponse.headersSent) {
             serverResponse.statusCode = 500;
-            serverResponse.statusMessage = "Internal Server Error";
+            setHttp1StatusMessage(serverResponse, "Internal Server Error");
             serverResponse.setHeader(
               "content-type",
               "text/plain; charset=utf-8"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@web-widget/node",
   "description": "Node.js adapter",
-  "version": "2.3.0",
+  "version": "3.0.0-beta.0",
   "homepage": "https://github.com/web-widget/web-widget#readme",
   "repository": {
     "type": "git",