@jsenv/server 12.4.0 → 12.5.2

package/main.js

@@ -7,7 +7,6 @@
 export { startServer } from "./src/startServer.js"
 export { composeServices } from "./src/service_composition/service_composition.js"
 export { setupRoutes } from "./src/service_composition/routing.js"
-export { jsenvServerInternalErrorToResponse } from "./src/jsenvServerInternalErrorToResponse.js"
 export { readRequestBody } from "./src/readRequestBody.js"
 export { fetchFileSystem } from "./src/fetch_filesystem.js"
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.4.0",
+  "version": "12.5.2",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -34,9 +34,9 @@
     "importmap": "node ./script/importmap/importmap.mjs",
     "eslint": "node ./node_modules/eslint/bin/eslint.js . --ext=.js,.mjs",
     "performance": "node --expose-gc ./script/performance/performance.mjs --log",
+    "snapshot": "node ./test/internal_error/generate_html_snapshot_files.mjs",
     "test": "node ./script/test/test.mjs",
     "test-with-coverage": "npm run test -- --coverage",
-    "generate-html-snapshots": "node ./test/internal_error/generate_html_snapshot_files.mjs",
     "prettier": "prettier --write .",
     "certificate-install": "node ./script/certificate/certificate_install.mjs",
     "playwright-install": "npx playwright install-deps && npx playwright install"
@@ -44,27 +44,27 @@
   "dependencies": {
     "@jsenv/abort": "4.1.2",
     "@jsenv/logger": "4.0.1",
-    "@jsenv/url-meta": "6.0.3",
-    "node-fetch": "2.6.2",
+    "@jsenv/url-meta": "6.2.0",
+    "node-fetch": "2.6.7",
     "path-to-regexp": "6.2.0"
   },
   "devDependencies": {
-    "@jsenv/assert": "2.4.1",
-    "@jsenv/core": "25.1.0",
+    "@jsenv/assert": "2.5.2",
+    "@jsenv/core": "25.4.9",
     "@jsenv/eslint-config": "16.0.9",
-    "@jsenv/filesystem": "2.6.1",
-    "@jsenv/github-release-package": "1.2.3",
-    "@jsenv/https-local": "1.0.3",
-    "@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",
+    "@jsenv/filesystem": "2.7.1",
+    "@jsenv/github-release-package": "1.3.4",
+    "@jsenv/https-local": "1.0.7",
+    "@jsenv/importmap-eslint-resolver": "5.2.5",
+    "@jsenv/importmap-node-module": "5.1.3",
+    "@jsenv/package-publish": "1.7.2",
+    "@jsenv/performance-impact": "2.2.7",
     "eslint": "8.7.0",
     "eslint-plugin-import": "2.25.4",
     "eventsource": "1.1.0",
-    "fastify": "3.25.3",
+    "fastify": "3.27.0",
     "fastify-static": "4.5.0",
-    "playwright": "1.17.2",
+    "playwright": "1.18.1",
     "prettier": "2.5.1"
   }
 }

package/src/{jsenvServerInternalErrorToResponse.js → error_to_response_default.js}

@@ -1,14 +1,18 @@
 import { negotiateContentType } from "./content_negotiation/negotiateContentType.js"
 
-export const jsenvServerInternalErrorToResponse = (
+export const applyDefaultErrorToResponse = (
   serverInternalError,
-  { request, sendServerInternalErrorDetails = false },
+  { request, sendErrorDetails = false },
 ) => {
   const serverInternalErrorIsAPrimitive =
     serverInternalError === null ||
     (typeof serverInternalError !== "object" &&
       typeof serverInternalError !== "function")
 
+  if (!serverInternalErrorIsAPrimitive && serverInternalError.asResponse) {
+    return serverInternalError.asResponse()
+  }
+
   const dataToSend = serverInternalErrorIsAPrimitive
     ? {
         code: "VALUE_THROWED",
@@ -16,7 +20,7 @@ export const jsenvServerInternalErrorToResponse = (
       }
     : {
         code: serverInternalError.code || "UNKNOWN_ERROR",
-        ...(sendServerInternalErrorDetails
+        ...(sendErrorDetails
           ? {
               stack: serverInternalError.stack,
               ...serverInternalError,
@@ -27,7 +31,7 @@ export const jsenvServerInternalErrorToResponse = (
   const availableContentTypes = {
     "text/html": () => {
       const renderHtmlForErrorWithoutDetails = () => {
-        return `<p>Details not available: to enable them server must be started with sendServerInternalErrorDetails: true.</p>`
+        return `<p>Details not available: to enable them server must be started with sendErrorDetails: true.</p>`
       }
 
       const renderHtmlForErrorWithDetails = () => {
@@ -55,7 +59,7 @@ export const jsenvServerInternalErrorToResponse = (
     <details>
       <summary>See internal error details</summary>
       ${
-        sendServerInternalErrorDetails
+        sendErrorDetails
           ? renderHtmlForErrorWithDetails()
           : renderHtmlForErrorWithoutDetails()
       }

package/src/fetch_filesystem.js

@@ -239,7 +239,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/ressource_aliases/plugin_ressource_aliases.js

@@ -1,63 +1,26 @@
-import { urlToMeta, normalizeStructuredMetaMap } from "@jsenv/url-meta"
-
-import { escapeRegexpSpecialCharacters } from "./regex_escape.js"
+import { applyAliases } from "@jsenv/url-meta"
 
 export const pluginRessourceAliases = (ressourceAliases) => {
-  const alias = {}
+  const aliases = {}
   Object.keys(ressourceAliases).forEach((key) => {
-    alias[key] = {
-      pattern: key,
-      replacement: ressourceAliases[key],
-    }
+    aliases[asFileUrl(key)] = asFileUrl(ressourceAliases[key])
   })
-  const structuredMetaMap = normalizeStructuredMetaMap(
-    {
-      alias,
-    },
-    "file:///",
-  )
-  const getRessourceAlias = (pathname) => {
-    const { alias } = urlToMeta({
-      url: `file://${pathname}`,
-      structuredMetaMap,
-    })
-    return alias
-  }
-
   return {
     ressource_aliases: {
       onRequest: (request, { redirectRequest }) => {
-        const ressourceAlias = getRessourceAlias(request.pathname)
-        if (!ressourceAlias) {
-          return
-        }
-        const { pattern, replacement } = ressourceAlias
-        let newValue
         const ressourceBeforeAlias = request.ressource
-        if (replacement.includes("*")) {
-          let regexsource = ""
-          let i = 0
-          while (i < pattern.length) {
-            const char = pattern[i]
-            i++
-            if (char === "*") {
-              regexsource += "(.+)"
-            } else {
-              regexsource += escapeRegexpSpecialCharacters(char)
-            }
-          }
-          const regex = new RegExp(regexsource)
-          const matchResult = ressourceBeforeAlias.match(regex)
-          const parts = replacement.split("*")
-          newValue = parts.reduce((previous, value, index) => {
-            return `${previous}${value}${
-              index === parts.length - 1 ? "" : matchResult[index + 1]
-            }`
-          }, "")
-        } else {
-          newValue = replacement
+        const urlAfterAliasing = applyAliases({
+          url: asFileUrl(request.pathname),
+          aliases,
+        })
+        const ressourceAfterAlias = urlAfterAliasing.slice("file://".length)
+        if (ressourceBeforeAlias === ressourceAfterAlias) {
+          return
         }
-        const ressource = replaceRessource(ressourceBeforeAlias, newValue)
+        const ressource = replaceRessource(
+          ressourceBeforeAlias,
+          ressourceAfterAlias,
+        )
         redirectRequest({
           ressourceBeforeAlias,
           ressource,
@@ -67,6 +30,8 @@ export const pluginRessourceAliases = (ressourceAliases) => {
   }
 }
 
+const asFileUrl = (specifier) => new URL(specifier, "file:///").href
+
 const replaceRessource = (ressourceBeforeAlias, newValue) => {
   const urlObject = new URL(ressourceBeforeAlias, "file://")
   const searchSeparatorIndex = newValue.indexOf("?")

package/src/startServer.js

@@ -23,7 +23,7 @@ import { composeTwoResponses } from "./internal/response_composition.js"
 import { listenRequest } from "./internal/listenRequest.js"
 import { listenServerConnectionError } from "./internal/listenServerConnectionError.js"
 import { memoize } from "./internal/memoize.js"
-import { jsenvServerInternalErrorToResponse } from "./jsenvServerInternalErrorToResponse.js"
+import { applyDefaultErrorToResponse } from "./error_to_response_default.js"
 import {
   STOP_REASON_INTERNAL_ERROR,
   STOP_REASON_PROCESS_SIGHUP,
@@ -62,8 +62,8 @@ export const startServer = async ({
   requestToResponse = () => null,
   plugins = {},
 
-  sendServerInternalErrorDetails = false,
-  serverInternalErrorToResponse = jsenvServerInternalErrorToResponse,
+  sendErrorDetails = false,
+  errorToResponse = () => null,
 
   onListenStart = () => {},
   onListenEnd = () => {},
@@ -554,13 +554,15 @@ export const startServer = async ({
             // il faudrais pouvoir stop que les autres response ?
             stop(STOP_REASON_INTERNAL_ERROR)
           }
-          const propertiesFromError = await serverInternalErrorToResponse(
-            error,
-            {
+          const responseDescriptionFromError =
+            (await errorToResponse(error, {
               request,
-              sendServerInternalErrorDetails,
-            },
-          )
+              sendErrorDetails,
+            })) ||
+            (await applyDefaultErrorToResponse(error, {
+              request,
+              sendErrorDetails,
+            }))
           addRequestLog(requestNode, {
             type: "error",
             value: createDetailedMessage(
@@ -580,7 +582,7 @@ export const startServer = async ({
                 "content-type": "text/plain",
               },
             },
-            propertiesFromError,
+            responseDescriptionFromError,
           )
         }
 

package/src/ressource_aliases/regex_escape.js

@@ -1,34 +0,0 @@
-// https://github.com/benjamingr/RegExp.escape/blob/master/polyfill.js
-
-export const escapeRegexpSpecialCharacters = (string) => {
-  string = String(string)
-  let i = 0
-  let escapedString = ""
-
-  while (i < string.length) {
-    const char = string[i]
-    i++
-    escapedString += isRegExpSpecialChar(char) ? `\\${char}` : char
-  }
-  return escapedString
-}
-
-const isRegExpSpecialChar = (char) => regexpSpecialChars.indexOf(char) > -1
-
-const regexpSpecialChars = [
-  "/",
-  "^",
-  "\\",
-  "[",
-  "]",
-  "(",
-  ")",
-  "{",
-  "}",
-  "?",
-  "+",
-  "*",
-  ".",
-  "|",
-  "$",
-]