@jsenv/server 12.5.0 → 12.5.4

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.0",
+  "version": "12.5.4",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -16,7 +16,8 @@
     "node": ">=16.13.0"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "type": "module",
   "exports": {
@@ -67,4 +68,4 @@
     "playwright": "1.18.1",
     "prettier": "2.5.1"
   }
-}
+}

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 {
@@ -239,7 +175,7 @@ export const fetchFileSystem = async (
           ...(cacheControl ? { "cache-control": cacheControl } : {}),
         },
       },
-      convertFileSystemErrorToResponseProperties(e),
+      convertFileSystemErrorToResponseProperties(e) || {},
     )
   }
 }

package/src/internal/convertFileSystemErrorToResponseProperties.js

@@ -6,21 +6,18 @@ export const convertFileSystemErrorToResponseProperties = (error) => {
       statusText: `EACCES: No permission to read file at ${error.path}`,
     }
   }
-
   if (isErrorWithCode(error, "EPERM")) {
     return {
       status: 403,
       statusText: `EPERM: No permission to read file at ${error.path}`,
     }
   }
-
   if (isErrorWithCode(error, "ENOENT")) {
     return {
       status: 404,
       statusText: `ENOENT: File not found at ${error.path}`,
     }
   }
-
   // file access may be temporarily blocked
   // (by an antivirus scanning it because recently modified for instance)
   if (isErrorWithCode(error, "EBUSY")) {
@@ -32,7 +29,6 @@ export const convertFileSystemErrorToResponseProperties = (error) => {
       },
     }
   }
-
   // emfile means there is too many files currently opened
   if (isErrorWithCode(error, "EMFILE")) {
     return {
@@ -43,15 +39,13 @@ export const convertFileSystemErrorToResponseProperties = (error) => {
       },
     }
   }
-
   if (isErrorWithCode(error, "EISDIR")) {
     return {
       status: 500,
       statusText: `EISDIR: Unexpected directory operation at ${error.path}`,
     }
   }
-
-  return Promise.reject(error)
+  return null
 }
 
 const isErrorWithCode = (error, code) => {

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"]()
+}