@jsenv/server 12.2.1 → 12.3.3

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.2.1",
+  "version": "12.3.3",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -13,7 +13,7 @@
     "url": "https://github.com/jsenv/server"
   },
   "engines": {
-    "node": ">=16.12.0"
+    "node": ">=16.13.0"
   },
   "publishConfig": {
     "access": "public"
@@ -38,33 +38,33 @@
     "test-with-coverage": "npm run test -- --coverage",
     "generate-html-snapshots": "node ./test/internal_error/generate_html_snapshot_files.mjs",
     "prettier": "prettier --write .",
-    "certificate-authority-install": "node ./script/certificate/certificate_authority_install.mjs",
+    "certificate-install": "node ./script/certificate/certificate_install.mjs",
     "playwright-install": "npx playwright install-deps && npx playwright install"
   },
   "dependencies": {
     "@jsenv/abort": "4.1.2",
     "@jsenv/logger": "4.0.1",
-    "@jsenv/url-meta": "6.0.1",
+    "@jsenv/url-meta": "6.0.3",
     "node-fetch": "2.6.2",
     "path-to-regexp": "6.2.0"
   },
   "devDependencies": {
-    "@jsenv/assert": "2.4.0",
-    "@jsenv/core": "24.5.0",
+    "@jsenv/assert": "2.4.1",
+    "@jsenv/core": "25.1.0",
     "@jsenv/eslint-config": "16.0.9",
-    "@jsenv/filesystem": "2.6.0",
+    "@jsenv/filesystem": "2.6.1",
     "@jsenv/github-release-package": "1.2.3",
     "@jsenv/https-local": "1.0.3",
-    "@jsenv/importmap-eslint-resolver": "5.2.1",
-    "@jsenv/importmap-node-module": "4.0.1",
+    "@jsenv/importmap-eslint-resolver": "5.2.2",
+    "@jsenv/importmap-node-module": "5.1.0",
     "@jsenv/package-publish": "1.6.2",
     "@jsenv/performance-impact": "2.2.1",
-    "eslint": "8.4.1",
-    "eslint-plugin-import": "2.25.3",
+    "eslint": "8.7.0",
+    "eslint-plugin-import": "2.25.4",
     "eventsource": "1.1.0",
-    "fastify": "3.25.0",
+    "fastify": "3.25.3",
     "fastify-static": "4.5.0",
-    "playwright": "1.17.1",
+    "playwright": "1.17.2",
     "prettier": "2.5.1"
   }
 }

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/nodeStreamToObservable.js

@@ -1,12 +1,17 @@
 // https://github.com/jamestalmage/stream-to-observable/blob/master/index.js
 import { Readable } from "node:stream"
-
 import { createObservable } from "./observable.js"
 
 const readableStreamLifetimeInSeconds = 120
 
 export const nodeStreamToObservable = (nodeStream) => {
   const observable = createObservable(({ next, error, complete }) => {
+    if (nodeStream.isPaused()) {
+      nodeStream.resume()
+    } else if (nodeStream.complete) {
+      complete()
+      return null
+    }
     const cleanup = () => {
       nodeStream.removeListener("data", next)
       nodeStream.removeListener("error", error)
@@ -14,13 +19,17 @@ export const nodeStreamToObservable = (nodeStream) => {
       nodeStream.removeListener("close", cleanup)
       nodeStream.destroy()
     }
-
     // should we do nodeStream.resume() in case the stream was paused ?
     nodeStream.once("error", error)
-    nodeStream.on("data", next)
-    nodeStream.once("close", cleanup)
-    nodeStream.once("end", complete)
-
+    nodeStream.on("data", (data) => {
+      next(data)
+    })
+    nodeStream.once("close", () => {
+      cleanup()
+    })
+    nodeStream.once("end", () => {
+      complete()
+    })
     return cleanup
   })
 

package/src/internal/populateNodeResponse.js

@@ -1,3 +1,4 @@
+import http from "node:http"
 import { Http2ServerResponse } from "node:http2"
 import { raceCallbacks } from "@jsenv/abort"
 
@@ -22,8 +23,8 @@ export const populateNodeResponse = async (
     status,
     statusText,
     headers,
+    onHeadersSent,
   })
-  onHeadersSent()
 
   if (!body) {
     onEnd()
@@ -134,41 +135,48 @@ export const populateNodeResponse = async (
   })
 }
 
-const writeHead = (responseStream, { status, statusText, headers }) => {
+const writeHead = (
+  responseStream,
+  { status, statusText, headers, onHeadersSent },
+) => {
   const responseIsHttp2ServerResponse =
     responseStream instanceof Http2ServerResponse
   const responseIsServerHttp2Stream =
     responseStream.constructor.name === "ServerHttp2Stream"
-
   let nodeHeaders = headersToNodeHeaders(headers, {
     // https://github.com/nodejs/node/blob/79296dc2d02c0b9872bbfcbb89148ea036a546d0/lib/internal/http2/compat.js#L112
     ignoreConnectionHeader:
       responseIsHttp2ServerResponse || responseIsServerHttp2Stream,
   })
-
+  if (statusText === undefined) {
+    statusText = statusTextFromStatus(status)
+  }
   if (responseIsServerHttp2Stream) {
     nodeHeaders = {
       ...nodeHeaders,
       ":status": status,
     }
     responseStream.respond(nodeHeaders)
+    onHeadersSent({ nodeHeaders, status, statusText })
     return
   }
-
   // 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
   ) {
     responseStream.writeHead(status, nodeHeaders)
+    onHeadersSent({ nodeHeaders, status, statusText })
     return
   }
-
   responseStream.writeHead(status, statusText, nodeHeaders)
+  onHeadersSent({ nodeHeaders, status, statusText })
 }
 
+const statusTextFromStatus = (status) =>
+  http.STATUS_CODES[status] || "not specified"
+
 const headersToNodeHeaders = (headers, { ignoreConnectionHeader }) => {
   const nodeHeaders = {}
 

package/src/startServer.js

@@ -230,6 +230,10 @@ export const startServer = async ({
   })
 
   const requestCallback = async (nodeRequest, nodeResponse) => {
+    // pause the stream to let a chance to "requestToResponse"
+    // to call "requestRequestBody". Without this the request body readable stream
+    // might be closed when we'll try to attach "data" and "end" listeners to it
+    nodeRequest.pause()
     if (!nagle) {
       nodeRequest.connection.setNoDelay(true)
     }
@@ -309,7 +313,6 @@ export const startServer = async ({
 
       visitRequestNodeToLog(rootRequestNode, 0)
     }
-
     nodeRequest.on("error", (error) => {
       if (error.message === "aborted") {
         addRequestLog(rootRequestNode, {
@@ -472,8 +475,8 @@ export const startServer = async ({
           }
         }
       })
-      let { aborted, error, responseProperties } = responseFromShortcircuit
-        ? { responseProperties: responseFromShortcircuit }
+      const result = responseFromShortcircuit
+        ? { returnValue: responseFromShortcircuit }
         : await generateResponseDescription({
             requestToResponse,
             request,
@@ -533,65 +536,72 @@ export const startServer = async ({
             },
           })
 
+      const { aborted } = result
       if (aborted) {
         return ABORTED_RESPONSE_PROPERTIES
       }
-
-      // internal error, create 500 response
-      if (error) {
-        if (
-          // stopOnInternalError stops server only if requestToResponse generated
-          // a non controlled error (internal error).
-          // if requestToResponse gracefully produced a 500 response (it did not throw)
-          // then we can assume we are still in control of what we are doing
-          stopOnInternalError
-        ) {
-          // il faudrais pouvoir stop que les autres response ?
-          stop(STOP_REASON_INTERNAL_ERROR)
-        }
-
-        const propertiesFromError = await serverInternalErrorToResponse(error, {
-          request,
-          sendServerInternalErrorDetails,
-        })
-        responseProperties = composeTwoResponses(
-          {
-            status: 500,
-            statusText: statusToStatusText(500),
-            headers: {
-              // ensure error are not cached
-              "cache-control": "no-store",
-              "content-type": "text/plain",
+      const readResponseProperties = async () => {
+        const { error } = result
+        // internal error, create 500 response
+        if (error) {
+          if (
+            // stopOnInternalError stops server only if requestToResponse generated
+            // a non controlled error (internal error).
+            // if requestToResponse gracefully produced a 500 response (it did not throw)
+            // then we can assume we are still in control of what we are doing
+            stopOnInternalError
+          ) {
+            // il faudrais pouvoir stop que les autres response ?
+            stop(STOP_REASON_INTERNAL_ERROR)
+          }
+          const propertiesFromError = await serverInternalErrorToResponse(
+            error,
+            {
+              request,
+              sendServerInternalErrorDetails,
             },
-          },
-          propertiesFromError,
-        )
-        addRequestLog(requestNode, {
-          type: "error",
-          value: createDetailedMessage(
-            `internal error while handling request`,
+          )
+          addRequestLog(requestNode, {
+            type: "error",
+            value: createDetailedMessage(
+              `internal error while handling request`,
+              {
+                "error stack": error.stack,
+              },
+            ),
+          })
+          return composeTwoResponses(
             {
-              "error stack": error.stack,
+              status: 500,
+              statusText: "Internal Server Error",
+              headers: {
+                // ensure error are not cached
+                "cache-control": "no-store",
+                "content-type": "text/plain",
+              },
             },
-          ),
-        })
-      } else {
+            propertiesFromError,
+          )
+        }
+
         const {
           status = 501,
-          statusText = statusToStatusText(status),
+          statusText,
           headers = {},
           body,
           ...rest
-        } = responseProperties || {}
-        responseProperties = {
+        } = result.returnValue || {}
+        const responseProperties = {
           status,
           statusText,
           headers,
           body,
           ...rest,
         }
+        return responseProperties
       }
 
+      let responseProperties = await readResponseProperties()
       // call every plugin "onResponse" hook
       requestPlugins.forEach((requestPlugin) => {
         const { onResponse } = requestPlugin
@@ -605,7 +615,6 @@ export const startServer = async ({
           }
         }
       })
-
       if (
         request.method !== "HEAD" &&
         responseProperties.headers["content-length"] > 0 &&
@@ -616,7 +625,6 @@ export const startServer = async ({
           value: `content-length header is ${responseProperties.headers["content-length"]} but body is empty`,
         })
       }
-
       return responseProperties
     }
 
@@ -659,12 +667,10 @@ export const startServer = async ({
           })
           onRequestHandled(requestNode)
         },
-        onHeadersSent: () => {
+        onHeadersSent: ({ status, statusText }) => {
           addRequestLog(requestNode, {
             type: "info",
-            value: `${colorizeResponseStatus(responseProperties.status)} ${
-              responseProperties.statusText
-            }`,
+            value: `${colorizeResponseStatus(status)} ${statusText}`,
           })
         },
         onEnd: () => {
@@ -680,6 +686,7 @@ export const startServer = async ({
       const responseProperties = await handleRequest(request, {
         requestNode: rootRequestNode,
       })
+      nodeRequest.resume()
       if (receiveRequestOperation.signal.aborted) {
         return
       }
@@ -759,7 +766,7 @@ const generateResponseDescription = async ({
       pushResponse,
     })
     return {
-      responseProperties: returnValue,
+      returnValue,
     }
   } catch (error) {
     if (error.name === "AbortError" && request.signal.aborted) {
@@ -772,10 +779,6 @@ const generateResponseDescription = async ({
     }
   }
 }
-
-const statusToStatusText = (status) =>
-  http.STATUS_CODES[status] || "not specified"
-
 const testCanPushStream = (http2Stream) => {
   if (!http2Stream.pushAllowed) {
     return {