@jsenv/server 12.5.3 → 12.5.6

package/package.json

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

package/src/fetch_filesystem.js

@@ -89,11 +89,17 @@ export const fetchFileSystem = async (
       () => statSync(sourceFilesystemPath),
     )
     if (sourceStat.isDirectory()) {
-      return serveDirectory(urlString, {
-        headers,
-        canReadDirectory,
-        rootDirectoryUrl,
-      })
+      if (canReadDirectory) {
+        return serveDirectory(urlString, {
+          headers,
+          canReadDirectory,
+          rootDirectoryUrl,
+        })
+      }
+      return {
+        status: 403,
+        statusText: "not allowed to read directory",
+      }
     }
     // not a file, give up
     if (!sourceStat.isFile()) {

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

@@ -5,18 +5,8 @@ import { negotiateContentType } from "./content_negotiation/negotiateContentType
 
 export const serveDirectory = (
   url,
-  {
-    headers = {},
-    canReadDirectory = false,
-    rootDirectoryUrl = `${pathToFileURL(process.cwd())}/`,
-  } = {},
+  { headers = {}, rootDirectoryUrl = `${pathToFileURL(process.cwd())}/` } = {},
 ) => {
-  if (canReadDirectory === false) {
-    return {
-      status: 403,
-      statusText: "not allowed to read directory",
-    }
-  }
   url = String(url)
   url = url[url.length - 1] === "/" ? url : `${url}/`
   const directoryContentArray = readdirSync(new URL(url))

package/src/startServer.js

@@ -291,26 +291,30 @@ export const startServer = async ({
         // keep buffering until root request write logs for everyone
         return
       }
-
+      const prefixLines = (string, prefix) => {
+        return string.replace(/^(?!\s*$)/gm, prefix)
+      }
       const writeLog = ({ type, value }, depth) => {
         if (depth > 0) {
-          value = value.replace(/^(?!\s*$)/gm, "  ".repeat(depth))
+          value = prefixLines(value, "  ".repeat(depth))
         }
         logger[type](value)
       }
-
       const visitRequestNodeToLog = (requestNode, depth) => {
-        const logsExceptLast = requestNode.logs.slice(0, -1)
-        logsExceptLast.forEach((log) => {
+        const firstLog = requestNode.logs.shift()
+        const lastLog = requestNode.logs.pop()
+        const middleLogs = requestNode.logs
+        writeLog(firstLog, depth)
+        middleLogs.forEach((log) => {
           writeLog(log, depth)
         })
         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 +593,7 @@ export const startServer = async ({
         const {
           status = 501,
           statusText,
+          statusMessage,
           headers = {},
           body,
           ...rest
@@ -596,6 +601,7 @@ export const startServer = async ({
         const responseProperties = {
           status,
           statusText,
+          statusMessage,
           headers,
           body,
           ...rest,
@@ -672,7 +678,9 @@ export const startServer = async ({
         onHeadersSent: ({ status, statusText }) => {
           addRequestLog(requestNode, {
             type: "info",
-            value: `${colorizeResponseStatus(status)} ${statusText}`,
+            value: `${colorizeResponseStatus(status)} ${
+              responseProperties.statusMessage || statusText
+            }`,
           })
         },
         onEnd: () => {