@jsenv/server 12.4.2 → 12.5.0

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