@jsenv/server 12.3.0 → 12.3.1

package/main.js

@@ -42,6 +42,7 @@ export { pluginContentNegotiationCheck } from "./src/content_negotiation/plugin_
 
 // others
 export { fetchUrl } from "./src/fetch_url.js"
+export { fromFetchResponse } from "./src/from_fetch_response.js"
 export { composeTwoResponses } from "./src/internal/response_composition.js"
 export { pluginRessourceAliases } from "./src/ressource_aliases/plugin_ressource_aliases.js"
 export { pluginRequestWaitingCheck } from "./src/plugin_request_waiting_check.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.3.0",
+  "version": "12.3.1",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {

package/src/from_fetch_response.js

@@ -0,0 +1,15 @@
+export const fromFetchResponse = (fetchResponse) => {
+  const responseHeaders = {}
+  const headersToIgnore = ["connection"]
+  fetchResponse.headers.forEach((value, name) => {
+    if (!headersToIgnore.includes(name)) {
+      responseHeaders[name] = value
+    }
+  })
+  return {
+    status: fetchResponse.status,
+    statusText: fetchResponse.statusText,
+    headers: responseHeaders,
+    body: fetchResponse.body, // node-fetch assumed
+  }
+}

package/src/internal/populateNodeResponse.js

@@ -1,3 +1,4 @@
+import http from "node:http"
 import { Http2ServerResponse } from "node:http2"
 import { raceCallbacks } from "@jsenv/abort"
 
@@ -155,10 +156,13 @@ const writeHead = (responseStream, { status, statusText, headers }) => {
     return
   }
 
+  if (statusText === undefined) {
+    statusText = statusTextFromStatus(status)
+  }
+
   // nodejs strange signature for writeHead force this
   // https://nodejs.org/api/http.html#http_response_writehead_statuscode_statusmessage_headers
   if (
-    statusText === undefined ||
     // https://github.com/nodejs/node/blob/79296dc2d02c0b9872bbfcbb89148ea036a546d0/lib/internal/http2/compat.js#L97
     responseIsHttp2ServerResponse
   ) {
@@ -169,6 +173,9 @@ const writeHead = (responseStream, { status, statusText, headers }) => {
   responseStream.writeHead(status, statusText, nodeHeaders)
 }
 
+const statusTextFromStatus = (status) =>
+  http.STATUS_CODES[status] || "not specified"
+
 const headersToNodeHeaders = (headers, { ignoreConnectionHeader }) => {
   const nodeHeaders = {}
 

package/src/startServer.js

@@ -570,7 +570,7 @@ export const startServer = async ({
           return composeTwoResponses(
             {
               status: 500,
-              statusText: statusToStatusText(500),
+              statusText: "Internal Server Error",
               headers: {
                 // ensure error are not cached
                 "cache-control": "no-store",
@@ -580,9 +580,21 @@ export const startServer = async ({
             propertiesFromError,
           )
         }
-        const responseProperties = normalizeResponseProperties(
-          result.returnValue,
-        )
+
+        const {
+          status = 501,
+          statusText,
+          headers = {},
+          body,
+          ...rest
+        } = result.returnValue || {}
+        const responseProperties = {
+          status,
+          statusText,
+          headers,
+          body,
+          ...rest,
+        }
         return responseProperties
       }
 
@@ -742,38 +754,6 @@ const createNodeServer = async ({
   })
 }
 
-const normalizeResponseProperties = (returnValue) => {
-  if (returnValue && returnValue.constructor.name === "Response") {
-    const responseHeaders = {}
-    const headersToIgnore = ["connection"]
-    returnValue.headers.forEach((value, name) => {
-      if (!headersToIgnore.includes(name)) {
-        responseHeaders[name] = value
-      }
-    })
-    return {
-      status: returnValue.status,
-      statusText: returnValue.statusText,
-      headers: responseHeaders,
-      body: returnValue.body, // node-fetch assumed
-    }
-  }
-  const {
-    status = 501,
-    statusText = statusToStatusText(status),
-    headers = {},
-    body,
-    ...rest
-  } = returnValue || {}
-  return {
-    status,
-    statusText,
-    headers,
-    body,
-    ...rest,
-  }
-}
-
 const generateResponseDescription = async ({
   requestToResponse,
   request,
@@ -797,10 +777,6 @@ const generateResponseDescription = async ({
     }
   }
 }
-
-const statusToStatusText = (status) =>
-  http.STATUS_CODES[status] || "not specified"
-
 const testCanPushStream = (http2Stream) => {
   if (!http2Stream.pushAllowed) {
     return {