@jsenv/server 16.2.1 → 16.3.1

package/dist/client/route_inspector/route_inspector.html

@@ -1000,6 +1000,7 @@ label .filter_text {
 .filter_count {
   color: #666;
   opacity: .8;
+  white-space: nowrap;
   background-color: #eee;
   border-radius: 12px;
   margin-left: auto;

package/dist/jsenv_server.js

@@ -2036,7 +2036,7 @@ const writeHead = (
   if (statusText === undefined) {
     statusText = statusTextFromStatus(status);
   } else {
-    statusText = statusText.replace(/\n/g, "");
+    statusText = statusText.replace(/\n/g, "").replaceAll("✅", "");
   }
   if (responseIsServerHttp2Stream) {
     nodeHeaders = {
@@ -4516,8 +4516,9 @@ const HTTP_METHODS = [
 
 const createRouter = (
   routeDescriptionArray,
-  { optionsFallback } = {},
+  { optionsFallback, logLevel } = {},
 ) => {
+  const logger = createLogger({ logLevel });
   const routeSet = new Set();
 
   const constructAvailableEndpoints = () => {
@@ -4695,6 +4696,7 @@ const createRouter = (
       }
     };
     const onRouteMatch = (route) => {
+      logger.debug(`Matched route: ${route}`);
       onRouteGroupEnd();
     };
 
@@ -4906,7 +4908,7 @@ It should be should be one of route.${routePropertyName}: ${availableValues.join
       if (fetchReturnValue === null || fetchReturnValue === undefined) {
         continue;
       }
-      onRouteMatch();
+      onRouteMatch(route);
       if (fetchReturnValue instanceof Response) {
         const headers = Object.fromEntries(fetchReturnValue.headers);
         onResponseHeaders(request, route, headers);
@@ -6488,6 +6490,7 @@ const TIMING_NOOP = () => {
 const startServer = async ({
   signal = new AbortController().signal,
   logLevel,
+  routerLogLevel,
   startLog = true,
   serverName = "server",
 
@@ -6611,6 +6614,7 @@ const startServer = async ({
 
   const router = createRouter(allRouteArray, {
     optionsFallback: true,
+    logLevel: routerLogLevel,
   });
 
   const server = {};

package/dist/ws/ws.js

@@ -4681,9 +4681,11 @@ function requireWebsocketServer () {
 	      return;
 	    }
 
-	    if (version !== 8 && version !== 13) {
+	    if (version !== 13 && version !== 8) {
 	      const message = 'Missing or invalid Sec-WebSocket-Version header';
-	      abortHandshakeOrEmitwsClientError(this, req, socket, 400, message);
+	      abortHandshakeOrEmitwsClientError(this, req, socket, 400, message, {
+	        'Sec-WebSocket-Version': '13, 8'
+	      });
 	      return;
 	    }
 
@@ -4951,16 +4953,24 @@ function requireWebsocketServer () {
 	 * @param {Duplex} socket The socket of the upgrade request
 	 * @param {Number} code The HTTP response status code
 	 * @param {String} message The HTTP response body
+	 * @param {Object} [headers] The HTTP response headers
 	 * @private
 	 */
-	function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
+	function abortHandshakeOrEmitwsClientError(
+	  server,
+	  req,
+	  socket,
+	  code,
+	  message,
+	  headers
+	) {
 	  if (server.listenerCount('wsClientError')) {
 	    const err = new Error(message);
 	    Error.captureStackTrace(err, abortHandshakeOrEmitwsClientError);
 
 	    server.emit('wsClientError', err, socket, req);
 	  } else {
-	    abortHandshake(socket, code, message);
+	    abortHandshake(socket, code, message, headers);
 	  }
 	}
 	return websocketServer$1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "16.2.1",
+  "version": "16.3.1",
   "description": "A modern Node.js HTTP server with declarative routing, content negotiation, and WebSocket support",
   "repository": {
     "type": "git",
@@ -35,7 +35,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "launch-editor": "2.10.0"
+    "launch-editor": "2.11.0"
   },
   "devDependencies": {
     "@jsenv/abort": "../../tooling/abort",
@@ -45,19 +45,19 @@
     "@jsenv/filesystem": "../../tooling/filesystem",
     "@jsenv/https-local": "../../tooling/https-local",
     "@jsenv/humanize": "../../tooling/humanize",
+    "@jsenv/navi": "../../frontend/navi",
     "@jsenv/plugin-commonjs": "../../related/plugin-commonjs",
-    "@jsenv/router": "../../frontend/router",
     "@jsenv/server": "./",
     "@jsenv/snapshot": "../../tooling/snapshot",
     "@jsenv/url-meta": "../../tooling/url_meta",
     "@jsenv/url-pattern": "../../tooling/url-pattern",
     "@jsenv/urls": "../../tooling/urls",
     "@jsenv/utils": "../../tooling/utils",
-    "eventsource": "3.0.6",
+    "eventsource": "4.0.0",
     "formidable": "3.5.4",
-    "playwright": "1.52.0",
-    "undici": "7.8.0",
-    "ws": "8.18.2"
+    "playwright": "1.54.1",
+    "undici": "7.12.0",
+    "ws": "8.18.3"
   },
   "engines": {
     "node": ">=22.13.1"

package/src/interfacing_with_node/write_node_response.js

@@ -186,7 +186,7 @@ const writeHead = (
   if (statusText === undefined) {
     statusText = statusTextFromStatus(status);
   } else {
-    statusText = statusText.replace(/\n/g, "");
+    statusText = statusText.replace(/\n/g, "").replaceAll("✅", "");
   }
   if (responseIsServerHttp2Stream) {
     nodeHeaders = {

package/src/router/router.js

@@ -1,5 +1,6 @@
 import { parseFunction } from "@jsenv/assert/src/utils/function_parser.js";
 import { lookupPackageDirectory } from "@jsenv/filesystem";
+import { createLogger } from "@jsenv/humanize";
 import {
   createHeadersPattern,
   createResourcePattern,
@@ -27,8 +28,9 @@ const HTTP_METHODS = [
 
 export const createRouter = (
   routeDescriptionArray,
-  { optionsFallback } = {},
+  { optionsFallback, logLevel } = {},
 ) => {
+  const logger = createLogger({ logLevel });
   const routeSet = new Set();
 
   const constructAvailableEndpoints = () => {
@@ -206,6 +208,7 @@ export const createRouter = (
       }
     };
     const onRouteMatch = (route) => {
+      logger.debug(`Matched route: ${route}`);
       onRouteGroupEnd(route);
     };
 

package/src/services/route_inspector/client/route_inspector.html

@@ -614,6 +614,7 @@
         border-radius: 12px;
         font-size: 0.8rem;
         margin-left: auto;
+        white-space: nowrap;
       }
 
       .filter_actions {

package/src/start_server.js

@@ -56,6 +56,7 @@ const TIMING_NOOP = () => {
 export const startServer = async ({
   signal = new AbortController().signal,
   logLevel,
+  routerLogLevel,
   startLog = true,
   serverName = "server",
 
@@ -179,6 +180,7 @@ export const startServer = async ({
 
   const router = createRouter(allRouteArray, {
     optionsFallback: true,
+    logLevel: routerLogLevel,
   });
 
   const server = {};