@jsenv/server 12.5.2 → 12.5.5

package/main.js

@@ -41,6 +41,7 @@ export { pluginContentNegotiationCheck } from "./src/content_negotiation/plugin_
 
 // others
 export { fetchUrl } from "./src/fetch_url.js"
+export { serveDirectory } from "./src/serve_directory.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"

package/package.json

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

package/src/fetch_filesystem.js

@@ -16,9 +16,9 @@ import { composeTwoResponses } from "./internal/response_composition.js"
 import { convertFileSystemErrorToResponseProperties } from "./internal/convertFileSystemErrorToResponseProperties.js"
 import { jsenvContentTypeMap } from "./jsenvContentTypeMap.js"
 import { timeFunction } from "./server_timing/timing_measure.js"
-import { negotiateContentType } from "./content_negotiation/negotiateContentType.js"
 import { negotiateContentEncoding } from "./content_negotiation/negotiateContentEncoding.js"
 import { urlToContentType } from "./urlToContentType.js"
+import { serveDirectory } from "./serve_directory.js"
 
 const ETAG_MEMORY_MAP = new Map()
 
@@ -39,7 +39,7 @@ export const fetchFileSystem = async (
       ? "private,max-age=0,must-revalidate"
       : "no-store",
     canReadDirectory = false,
-    rootDirectoryUrl = `${fileSystemPathToUrl(process.cwd())}/`,
+    rootDirectoryUrl,
   } = {},
 ) => {
   const urlString = asUrlString(filesystemUrl)
@@ -88,83 +88,19 @@ export const fetchFileSystem = async (
       "file service>read file stat",
       () => statSync(sourceFilesystemPath),
     )
-
     if (sourceStat.isDirectory()) {
-      sourceUrl =
-        urlString[urlString.length - 1] === "/" ? urlString : `${urlString}/`
-
-      if (canReadDirectory === false) {
-        return {
-          status: 403,
-          statusText: "not allowed to read directory",
-          timing: readStatTiming,
-        }
+      if (canReadDirectory) {
+        return serveDirectory(urlString, {
+          headers,
+          canReadDirectory,
+          rootDirectoryUrl,
+        })
       }
-
-      const [readDirectoryTiming, directoryContentArray] = await timeFunction(
-        "file service>read directory",
-        () => promises.readdir(sourceFilesystemPath),
-      )
-
-      const responseProducers = {
-        "application/json": () => {
-          const directoryContentJson = JSON.stringify(directoryContentArray)
-          return {
-            status: 200,
-            headers: {
-              "content-type": "application/json",
-              "content-length": directoryContentJson.length,
-            },
-            body: directoryContentJson,
-            timing: {
-              ...readStatTiming,
-              ...readDirectoryTiming,
-            },
-          }
-        },
-        "text/html": () => {
-          const directoryAsHtml = `<!DOCTYPE html>
-<html>
-  <head>
-    <title>Directory explorer</title>
-    <meta charset="utf-8" />
-    <link rel="icon" href="data:," />
-  </head>
-
-  <body>
-    <h1>Content of directory ${sourceUrl}</h1>
-    <ul>
-      ${directoryContentArray.map((filename) => {
-        const fileUrl = String(new URL(filename, sourceUrl))
-        const fileUrlRelativeToServer = fileUrl.slice(
-          String(rootDirectoryUrl).length,
-        )
-        return `<li>
-        <a href="/${fileUrlRelativeToServer}">${fileUrlRelativeToServer}</a>
-      </li>`
-      }).join(`
-      `)}
-    </ul>
-  </body>
-</html>`
-
-          return {
-            status: 200,
-            headers: {
-              "content-type": "text/html",
-              "content-length": Buffer.byteLength(directoryAsHtml),
-            },
-            body: directoryAsHtml,
-          }
-        },
+      return {
+        status: 403,
+        statusText: "not allowed to read directory",
       }
-      const bestContentType = negotiateContentType(
-        { headers },
-        Object.keys(responseProducers),
-      )
-      return responseProducers[bestContentType || "application/json"]()
     }
-
     // not a file, give up
     if (!sourceStat.isFile()) {
       return {

package/src/internal/response_composition.js

@@ -11,6 +11,7 @@ export const composeTwoResponses = (firstResponse, secondResponse) => {
 const RESPONSE_KEYS_COMPOSITION = {
   status: (prevStatus, status) => status,
   statusText: (prevStatusText, statusText) => statusText,
+  statusMessage: (prevStatusMessage, statusMessage) => statusMessage,
   headers: composeTwoHeaders,
   body: (prevBody, body) => body,
   bodyEncoding: (prevEncoding, encoding) => encoding,

package/src/serve_directory.js

@@ -0,0 +1,66 @@
+import { readdirSync } from "node:fs"
+import { pathToFileURL } from "node:url"
+
+import { negotiateContentType } from "./content_negotiation/negotiateContentType.js"
+
+export const serveDirectory = (
+  url,
+  { headers = {}, rootDirectoryUrl = `${pathToFileURL(process.cwd())}/` } = {},
+) => {
+  url = String(url)
+  url = url[url.length - 1] === "/" ? url : `${url}/`
+  const directoryContentArray = readdirSync(new URL(url))
+  const responseProducers = {
+    "application/json": () => {
+      const directoryContentJson = JSON.stringify(directoryContentArray)
+      return {
+        status: 200,
+        headers: {
+          "content-type": "application/json",
+          "content-length": directoryContentJson.length,
+        },
+        body: directoryContentJson,
+      }
+    },
+    "text/html": () => {
+      const directoryAsHtml = `<!DOCTYPE html>
+<html>
+  <head>
+    <title>Directory explorer</title>
+    <meta charset="utf-8" />
+    <link rel="icon" href="data:," />
+  </head>
+
+  <body>
+    <h1>Content of directory ${url}</h1>
+    <ul>
+      ${directoryContentArray.map((filename) => {
+        const fileUrl = String(new URL(filename, url))
+        const fileUrlRelativeToServer = fileUrl.slice(
+          String(rootDirectoryUrl).length,
+        )
+        return `<li>
+        <a href="/${fileUrlRelativeToServer}">${fileUrlRelativeToServer}</a>
+      </li>`
+      }).join(`
+      `)}
+    </ul>
+  </body>
+</html>`
+
+      return {
+        status: 200,
+        headers: {
+          "content-type": "text/html",
+          "content-length": Buffer.byteLength(directoryAsHtml),
+        },
+        body: directoryAsHtml,
+      }
+    },
+  }
+  const bestContentType = negotiateContentType(
+    { headers },
+    Object.keys(responseProducers),
+  )
+  return responseProducers[bestContentType || "application/json"]()
+}

package/src/startServer.js

@@ -291,26 +291,27 @@ export const startServer = async ({
         // keep buffering until root request write logs for everyone
         return
       }
-
       const writeLog = ({ type, value }, depth) => {
         if (depth > 0) {
           value = value.replace(/^(?!\s*$)/gm, "  ".repeat(depth))
         }
         logger[type](value)
       }
-
       const visitRequestNodeToLog = (requestNode, depth) => {
-        const logsExceptLast = requestNode.logs.slice(0, -1)
-        logsExceptLast.forEach((log) => {
-          writeLog(log, depth)
+        const firstLog = requestNode.logs.shift()
+        const lastLog = requestNode.logs.pop()
+        const middleLogs = requestNode.logs
+        writeLog(firstLog, depth)
+        middleLogs.forEach((log) => {
+          writeLog(log, depth + 1)
         })
         requestNode.children.forEach((child) => {
           visitRequestNodeToLog(child, depth + 1)
         })
-        const lastLog = requestNode.logs.pop()
-        writeLog(lastLog, depth)
+        if (lastLog) {
+          writeLog(lastLog, depth + 1)
+        }
       }
-
       visitRequestNodeToLog(rootRequestNode, 0)
     }
     nodeRequest.on("error", (error) => {
@@ -589,6 +590,7 @@ export const startServer = async ({
         const {
           status = 501,
           statusText,
+          statusMessage,
           headers = {},
           body,
           ...rest
@@ -596,6 +598,7 @@ export const startServer = async ({
         const responseProperties = {
           status,
           statusText,
+          statusMessage,
           headers,
           body,
           ...rest,
@@ -669,10 +672,12 @@ export const startServer = async ({
           })
           onRequestHandled(requestNode)
         },
-        onHeadersSent: ({ status, statusText }) => {
+        onHeadersSent: ({ status, statusText, statusMessage }) => {
           addRequestLog(requestNode, {
             type: "info",
-            value: `${colorizeResponseStatus(status)} ${statusText}`,
+            value: `${colorizeResponseStatus(status)} ${
+              statusMessage || statusText
+            }`,
           })
         },
         onEnd: () => {