@jsenv/server 16.0.6 → 16.0.8

package/dist/client/default_body_4xx_5xx/4xx.html

@@ -121,6 +121,9 @@
             };
       
             const initialWebSocket = await connect();
+            if (!initialWebSocket) {
+              return;
+            }
             initialWebSocket.onclose = async () => {
               console.info("connection to server lost, trying to reconnect");
               const retry = async () => {
@@ -165,12 +168,16 @@
         );
       }
       
+      const websocketEndpoint =
+        document.currentScript.getAttribute("data-ws-endpoint") ||
+        "/.internal/alive.websocket";
+      
       const jsenvAutoreloadOnServerRestartElement =
         new JsenvAutoreloadOnServerRestart({
           url: (() => {
             const websocketScheme =
               self.location.protocol === "https:" ? "wss" : "ws";
-            const websocketUrl = `${websocketScheme}://${self.location.host}/.internal/alive.websocket`;
+            const websocketUrl = `${websocketScheme}://${self.location.host}${websocketEndpoint}`;
             return websocketUrl;
           })(),
         });

package/dist/client/route_inspector/route_inspector.html

@@ -278,6 +278,9 @@
             };
       
             const initialWebSocket = await connect();
+            if (!initialWebSocket) {
+              return;
+            }
             initialWebSocket.onclose = async () => {
               console.info("connection to server lost, trying to reconnect");
               const retry = async () => {
@@ -322,12 +325,16 @@
         );
       }
       
+      const websocketEndpoint =
+        document.currentScript.getAttribute("data-ws-endpoint") ||
+        "/.internal/alive.websocket";
+      
       const jsenvAutoreloadOnServerRestartElement =
         new JsenvAutoreloadOnServerRestart({
           url: (() => {
             const websocketScheme =
               self.location.protocol === "https:" ? "wss" : "ws";
-            const websocketUrl = `${websocketScheme}://${self.location.host}/.internal/alive.websocket`;
+            const websocketUrl = `${websocketScheme}://${self.location.host}${websocketEndpoint}`;
             return websocketUrl;
           })(),
         });

package/dist/jsenv_server.js

@@ -551,6 +551,29 @@ ${
   return text;
 };
 
+const errorToHTML = (error) => {
+  const errorIsAPrimitive =
+    error === null ||
+    (typeof error !== "object" && typeof error !== "function");
+
+  if (errorIsAPrimitive) {
+    if (typeof error === "string") {
+      return `<pre>${escapeHtml(error)}</pre>`;
+    }
+    return `<pre>${JSON.stringify(error, null, "  ")}</pre>`;
+  }
+  return `<pre>${escapeHtml(error.stack)}</pre>`;
+};
+
+const escapeHtml = (string) => {
+  return string
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&#039;");
+};
+
 const LOG_LEVEL_OFF = "off";
 
 const LOG_LEVEL_DEBUG = "debug";
@@ -3166,8 +3189,11 @@ const getParentDirectoryUrl = (url) => {
   return new URL(url.endsWith("/") ? "../" : "./", url).href;
 };
 
-const findAncestorDirectoryUrl = (url, callback) => {
+const findSelfOrAncestorDirectoryUrl = (url, callback) => {
   url = String(url);
+  if (!url.endsWith("/")) {
+    url = new URL("./", url).href;
+  }
   while (url !== "file:///") {
     if (callback(url)) {
       return url;
@@ -3178,7 +3204,7 @@ const findAncestorDirectoryUrl = (url, callback) => {
 };
 
 const lookupPackageDirectory = (currentUrl) => {
-  return findAncestorDirectoryUrl(currentUrl, (ancestorDirectoryUrl) => {
+  return findSelfOrAncestorDirectoryUrl(currentUrl, (ancestorDirectoryUrl) => {
     const potentialPackageJsonFileUrl = `${ancestorDirectoryUrl}package.json`;
     return existsSync(new URL(potentialPackageJsonFileUrl));
   });
@@ -7477,14 +7503,7 @@ const jsenvServiceErrorHandler = ({ sendErrorDetails = false } = {}) => {
             return `<p>Details not available: to enable them use jsenvServiceErrorHandler({ sendErrorDetails: true }).</p>`;
           };
           const renderHtmlForErrorWithDetails = () => {
-            if (serverInternalErrorIsAPrimitive) {
-              return `<pre>${JSON.stringify(
-                serverInternalError,
-                null,
-                "  ",
-              )}</pre>`;
-            }
-            return `<pre>${serverInternalError.stack}</pre>`;
+            return errorToHTML(serverInternalError);
           };
 
           const internalErrorHtmlTemplate = readFileSync(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "16.0.6",
+  "version": "16.0.8",
   "description": "A modern Node.js HTTP server with declarative routing, content negotiation, and WebSocket support",
   "license": "MIT",
   "author": {
@@ -33,7 +33,9 @@
     "/dist/",
     "/src/"
   ],
-  "sideEffects": false,
+  "sideEffects": [
+    "./dist/jsenv_server_node_modules.js"
+  ],
   "scripts": {
     "build": "node --experimental-import-meta-resolve ./scripts/build.mjs",
     "prepublishOnly": "npm run build"
@@ -41,14 +43,14 @@
   "dependencies": {
     "launch-editor": "2.10.0",
     "@jsenv/abort": "4.3.1",
-    "@jsenv/humanize": "1.4.0",
+    "@jsenv/humanize": "1.5.0",
     "@jsenv/url-meta": "8.5.6",
     "@jsenv/utils": "2.3.0",
     "ws": "8.18.1",
     "formidable": "3.5.2"
   },
   "devDependencies": {
-    "eventsource": "3.0.5",
-    "undici": "7.5.0"
+    "eventsource": "3.0.6",
+    "undici": "7.8.0"
   }
 }

package/src/services/autoreload_on_server_restart/client/autoreload_on_server_restart.js

@@ -53,6 +53,9 @@ class JsenvAutoreloadOnServerRestart extends HTMLElement {
       };
 
       const initialWebSocket = await connect();
+      if (!initialWebSocket) {
+        return;
+      }
       initialWebSocket.onclose = async () => {
         console.info("connection to server lost, trying to reconnect");
         const retry = async () => {
@@ -97,12 +100,16 @@ if (!customElements.get("jsenv-autoreload-on-server-restart")) {
   );
 }
 
+const websocketEndpoint =
+  document.currentScript.getAttribute("data-ws-endpoint") ||
+  "/.internal/alive.websocket";
+
 const jsenvAutoreloadOnServerRestartElement =
   new JsenvAutoreloadOnServerRestart({
     url: (() => {
       const websocketScheme =
         self.location.protocol === "https:" ? "wss" : "ws";
-      const websocketUrl = `${websocketScheme}://${self.location.host}/.internal/alive.websocket`;
+      const websocketUrl = `${websocketScheme}://${self.location.host}${websocketEndpoint}`;
       return websocketUrl;
     })(),
   });

package/src/services/error_handler/jsenv_service_error_handler.js

@@ -1,3 +1,4 @@
+import { errorToHTML } from "@jsenv/humanize";
 import { readFileSync } from "node:fs";
 import { pickContentType } from "../../content_negotiation/pick_content_type.js";
 import { replacePlaceholdersInHtml } from "../../replace_placeholder_in_html.js";
@@ -36,14 +37,7 @@ export const jsenvServiceErrorHandler = ({ sendErrorDetails = false } = {}) => {
             return `<p>Details not available: to enable them use jsenvServiceErrorHandler({ sendErrorDetails: true }).</p>`;
           };
           const renderHtmlForErrorWithDetails = () => {
-            if (serverInternalErrorIsAPrimitive) {
-              return `<pre>${JSON.stringify(
-                serverInternalError,
-                null,
-                "  ",
-              )}</pre>`;
-            }
-            return `<pre>${serverInternalError.stack}</pre>`;
+            return errorToHTML(serverInternalError);
           };
 
           const internalErrorHtmlTemplate = readFileSync(