@jsenv/server 16.1.2 → 16.2.0

package/dist/jsenv_server.js

@@ -1563,6 +1563,10 @@ const createRequestLogger = (nodeRequest, write) => {
         write(type, value);
       };
       const writeLogs = (loggerToWrite, depth) => {
+        const logArray = loggerToWrite.logArray;
+        if (logArray.length === 0) {
+          return;
+        }
         let someLogIsError = false;
         let someLogIsWarn = false;
         for (const log of loggerToWrite.logArray) {
@@ -1573,12 +1577,9 @@ const createRequestLogger = (nodeRequest, write) => {
             someLogIsWarn = true;
           }
         }
-        const firstLog = loggerToWrite.logArray.shift();
-        const lastLog = loggerToWrite.logArray.pop();
-        const middleLogs = loggerToWrite.logArray;
-        if (!firstLog) {
-          debugger;
-        }
+        const firstLog = logArray.shift();
+        const lastLog = logArray.pop();
+        const middleLogs = logArray;
         writeLog(firstLog, {
           someLogIsError,
           someLogIsWarn,
@@ -3877,6 +3878,8 @@ const createPattern = (
     namedGroupDelimiter,
     prepareStringToGenerate = (stringToBuild) => stringToBuild,
     finalizeGeneratedString = (generatedString) => generatedString,
+    // encode = encodeURIComponent,
+    // decode = decodeURIComponent,
   } = {},
 ) => {
   if (pattern === "*") {
@@ -4148,7 +4151,7 @@ const createResourcePattern = (pattern) => {
   return {
     match: (resource) => {
       const [pathname, search, hash] = resourceToParts(resource);
-      let result = pathnamePattern.match(pathname);
+      let result = pathnamePattern.match(decodeURIComponent(pathname));
       if (!result) {
         return null;
       }
@@ -5523,6 +5526,18 @@ const createServiceController = (services) => {
       }
     }
   };
+  const callAsyncHooks = async (hookName, info, context, callback) => {
+    const hookSet = hookSetMap.get(hookName);
+    if (!hookSet) {
+      return;
+    }
+    for (const hook of hookSet) {
+      const returnValue = await callAsyncHook(hook, info, context);
+      if (returnValue && callback) {
+        await callback(returnValue, hook.plugin);
+      }
+    }
+  };
   const callHooksUntil = (
     hookName,
     info,
@@ -5573,6 +5588,7 @@ const createServiceController = (services) => {
 
     callHooks,
     callHooksUntil,
+    callAsyncHooks,
     callAsyncHooksUntil,
 
     getCurrentService: () => currentService,
@@ -6273,7 +6289,15 @@ const jsenvServiceOpenFile = () => {
               body: "Missing file in url",
             };
           }
-          const fileUrl = new URL(file);
+          let fileUrl;
+          try {
+            fileUrl = new URL(file);
+          } catch {
+            return {
+              status: 400,
+              body: `"${file}" is not a file url`,
+            };
+          }
           const filePath = urlToFileSystemPath(fileUrl);
           const require = createRequire(import.meta.url);
           const launch = require("launch-editor");
@@ -6965,7 +6989,7 @@ const startServer = async ({
             );
           },
         };
-        serviceController.callHooks(
+        await serviceController.callAsyncHooks(
           "augmentRouteFetchSecondArg",
           request,
           fetchSecondArg,

package/dist/ws/ws.js

@@ -743,6 +743,14 @@ function requirePermessageDeflate () {
 	  this[kError].code = 'WS_ERR_UNSUPPORTED_MESSAGE_LENGTH';
 	  this[kError][kStatusCode] = 1009;
 	  this.removeListener('data', inflateOnData);
+
+	  //
+	  // The choice to employ `zlib.reset()` over `zlib.close()` is dictated by the
+	  // fact that in Node.js versions prior to 13.10.0, the callback for
+	  // `zlib.flush()` is not called if `zlib.close()` is used. Utilizing
+	  // `zlib.reset()` ensures that either the callback is invoked or an error is
+	  // emitted.
+	  //
 	  this.reset();
 	}
 
@@ -758,6 +766,12 @@ function requirePermessageDeflate () {
 	  // closed when an error is emitted.
 	  //
 	  this[kPerMessageDeflate]._inflate = null;
+
+	  if (this[kError]) {
+	    this[kCallback](this[kError]);
+	    return;
+	  }
+
 	  err[kStatusCode] = 1007;
 	  this[kCallback](err);
 	}
@@ -3475,7 +3489,7 @@ function requireWebsocket () {
 	  if (parsedUrl.protocol !== 'ws:' && !isSecure && !isIpcUrl) {
 	    invalidUrlMessage =
 	      'The URL\'s protocol must be one of "ws:", "wss:", ' +
-	      '"http:", "https", or "ws+unix:"';
+	      '"http:", "https:", or "ws+unix:"';
 	  } else if (isIpcUrl && !parsedUrl.pathname) {
 	    invalidUrlMessage = "The URL's pathname is empty";
 	  } else if (parsedUrl.hash) {

package/package.json

@@ -1,23 +1,20 @@
 {
   "name": "@jsenv/server",
-  "version": "16.1.2",
+  "version": "16.2.0",
   "description": "A modern Node.js HTTP server with declarative routing, content negotiation, and WebSocket support",
-  "license": "MIT",
-  "author": {
-    "name": "dmail",
-    "email": "dmaillard06@gmail.com"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/jsenv/core",
-    "directory": "packages/independent/backend/server"
+    "directory": "packages/backend/server"
   },
-  "engines": {
-    "node": ">=22.13.1"
-  },
-  "publishConfig": {
-    "access": "public"
+  "license": "MIT",
+  "author": {
+    "name": "dmail",
+    "email": "dmaillard06@gmail.com"
   },
+  "sideEffects": [
+    "./dist/jsenv_server.js"
+  ],
   "type": "module",
   "exports": {
     ".": {
@@ -33,22 +30,37 @@
     "/dist/",
     "/src/"
   ],
-  "sideEffects": [
-    "./dist/jsenv_server_node_modules.js"
-  ],
   "scripts": {
     "build": "node --experimental-import-meta-resolve ./scripts/build.mjs",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "launch-editor": "2.10.0",
-    "@jsenv/abort": "file:../../shared/abort",
-    "@jsenv/humanize": "file:../../tooling/humanize",
-    "@jsenv/url-meta": "file:../../tooling/url_meta",
-    "@jsenv/utils": "file:../../tooling/utils",
-    "ws": "8.18.1",
-    "formidable": "3.5.2",
+    "@jsenv/abort": "../../tooling/abort",
+    "@jsenv/assert": "../../tooling/assert",
+    "@jsenv/core": "../../../",
+    "@jsenv/fetch": "../../tooling/fetch",
+    "@jsenv/filesystem": "../../tooling/filesystem",
+    "@jsenv/https-local": "../../tooling/https-local",
+    "@jsenv/humanize": "../../tooling/humanize",
+    "@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",
-    "undici": "7.8.0"
+    "formidable": "3.5.4",
+    "launch-editor": "2.10.0",
+    "playwright": "1.52.0",
+    "undici": "7.8.0",
+    "ws": "8.18.2"
+  },
+  "engines": {
+    "node": ">=22.13.1"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }

package/src/cookies/cookie.js

@@ -0,0 +1,42 @@
+// https://bun.sh/docs/api/cookie
+
+export const COOKIE = {
+  from: (name, value, options = {}) => {
+    return { name, value, options };
+  },
+  parse: (cookieString) => {
+    const parts = cookieString.split("; ");
+    const [nameValue, ...attributes] = parts;
+    const [name, value] = nameValue.split("=");
+    const options = {};
+    for (const attr of attributes) {
+      const [key, val] = attr.split("=");
+      if (key === "expires") {
+        options.expires = new Date(val);
+        continue;
+      }
+
+      if (key === "path") {
+        options.path = val;
+        continue;
+      }
+      if (key === "domain") {
+        options.domain = val;
+        continue;
+      }
+      if (key === "secure") {
+        options.secure = true;
+        continue;
+      }
+      if (key === "httponly") {
+        options.httpOnly = true;
+        continue;
+      }
+    }
+
+    return { name, value, options };
+  },
+  stringify: ({ name, value, options }) => {
+    return `${name}=${value}${options.expires ? `; Expires=${options.expires.toUTCString()}` : ""}${options.path ? `; Path=${options.path}` : ""}${options.domain ? `; Domain=${options.domain}` : ""}${options.secure ? "; Secure" : ""}${options.httpOnly ? "; HttpOnly" : ""}`;
+  },
+};

package/src/cookies/cookie_map.js

@@ -0,0 +1,18 @@
+import { COOKIE } from "./cookie.js";
+
+export const createCookieMap = (setCookieString) => {
+  const map = new Map();
+
+  if (setCookieString) {
+    const cookies = setCookieString.split(", ");
+    for (const cookie of cookies) {
+      const parsedCookie = COOKIE.parse(cookie);
+      map.set(parsedCookie.name, parsedCookie);
+    }
+  }
+
+  return {
+    map,
+    toSetCookieHeaders: () => {},
+  };
+};

package/src/interfacing_with_node/from_node_request.js

@@ -290,6 +290,10 @@ const createRequestLogger = (nodeRequest, write) => {
         write(type, value);
       };
       const writeLogs = (loggerToWrite, depth) => {
+        const logArray = loggerToWrite.logArray;
+        if (logArray.length === 0) {
+          return;
+        }
         let someLogIsError = false;
         let someLogIsWarn = false;
         for (const log of loggerToWrite.logArray) {
@@ -300,12 +304,9 @@ const createRequestLogger = (nodeRequest, write) => {
             someLogIsWarn = true;
           }
         }
-        const firstLog = loggerToWrite.logArray.shift();
-        const lastLog = loggerToWrite.logArray.pop();
-        const middleLogs = loggerToWrite.logArray;
-        if (!firstLog) {
-          debugger;
-        }
+        const firstLog = logArray.shift();
+        const lastLog = logArray.pop();
+        const middleLogs = logArray;
         writeLog(firstLog, {
           someLogIsError,
           someLogIsWarn,

package/src/router/router.js

@@ -1,8 +1,10 @@
 import { parseFunction } from "@jsenv/assert/src/utils/function_parser.js";
 import { lookupPackageDirectory } from "@jsenv/filesystem";
-import { createHeadersPattern } from "@jsenv/router/src/shared/headers_pattern.js";
-import { PATTERN } from "@jsenv/router/src/shared/pattern.js";
-import { createResourcePattern } from "@jsenv/router/src/shared/resource_pattern.js";
+import {
+  createHeadersPattern,
+  createResourcePattern,
+  PATTERN,
+} from "@jsenv/url-pattern";
 import { resourceToExtension, urlToRelativeUrl } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
 import { readFileSync } from "node:fs";

package/src/service_controller.js

@@ -89,6 +89,18 @@ export const createServiceController = (services) => {
       }
     }
   };
+  const callAsyncHooks = async (hookName, info, context, callback) => {
+    const hookSet = hookSetMap.get(hookName);
+    if (!hookSet) {
+      return;
+    }
+    for (const hook of hookSet) {
+      const returnValue = await callAsyncHook(hook, info, context);
+      if (returnValue && callback) {
+        await callback(returnValue, hook.plugin);
+      }
+    }
+  };
   const callHooksUntil = (
     hookName,
     info,
@@ -139,6 +151,7 @@ export const createServiceController = (services) => {
 
     callHooks,
     callHooksUntil,
+    callAsyncHooks,
     callAsyncHooksUntil,
 
     getCurrentService: () => currentService,

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

@@ -1,33 +1,34 @@
 const css = /* css */ `
-dialog {
-  opacity: 0;
-  transition: all 0.3s allow-discrete;
-}
-dialog::backdrop {
-   background-image: linear-gradient(
-    45deg,
-    magenta,
-    rebeccapurple,
-    dodgerblue,
-    green
-  );
-  opacity: 0;
-  transition: all 0.3s allow-discrete;
-}
-dialog:open {
-  opacity: 1;
-}
-dialog:open::backdrop {
-  opacity: 0.75;
-}`;
+  dialog {
+    opacity: 0;
+    transition: all 0.3s allow-discrete;
+  }
+  dialog::backdrop {
+    background-image: linear-gradient(
+      45deg,
+      magenta,
+      rebeccapurple,
+      dodgerblue,
+      green
+    );
+    opacity: 0;
+    transition: all 0.3s allow-discrete;
+  }
+  dialog:open {
+    opacity: 1;
+  }
+  dialog:open::backdrop {
+    opacity: 0.75;
+  }
+`;
 
 const html = /* html */ `<style>
     ${css}
-</style>
-<dialog>
+  </style>
+  <dialog>
     <p>Connection with server is lost</p>
     <button autofocus name="reconnect">Retry</button>
-</dialog>`;
+  </dialog>`;
 
 class JsenvAutoreloadOnServerRestart extends HTMLElement {
   constructor({ url } = {}) {

package/src/services/open_file/jsenv_service_open_file.js

@@ -17,7 +17,15 @@ export const jsenvServiceOpenFile = () => {
               body: "Missing file in url",
             };
           }
-          const fileUrl = new URL(file);
+          let fileUrl;
+          try {
+            fileUrl = new URL(file);
+          } catch {
+            return {
+              status: 400,
+              body: `"${file}" is not a file url`,
+            };
+          }
           const filePath = urlToFileSystemPath(fileUrl);
           const require = createRequire(import.meta.url);
           const launch = require("launch-editor");

package/src/services/route_inspector/client/code_block.js

@@ -47,19 +47,38 @@ button:hover {
 `;
 
   const html = /* html */ `<style>
-${css}
-</style>
-<div class="clipboard_container">
-  <div id="copied_notif" aria-hidden="true">Copied !</div>
-  <button id="copy_button">
-    <svg id="copy_icon" aria-hidden="true" viewBox="0 0 16 16" width="16" height="16">
-        <path d="M0 6.75C0 5.784.784 5 1.75 5h1.5a.75.75 0 0 1 0 1.5h-1.5a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-1.5a.75.75 0 0 1 1.5 0v1.5A1.75 1.75 0 0 1 9.25 16h-7.5A1.75 1.75 0 0 1 0 14.25Z"></path><path d="M5 1.75C5 .784 5.784 0 6.75 0h7.5C15.216 0 16 .784 16 1.75v7.5A1.75 1.75 0 0 1 14.25 11h-7.5A1.75 1.75 0 0 1 5 9.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"></path>
-    </svg>
-    <svg id="copied_icon" aria-hidden="true" viewBox="0 0 16 16" width="16" height="16">
-        <path d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"></path>
-    </svg>
-  </button>
-</div>`;
+      ${css}
+    </style>
+    <div class="clipboard_container">
+      <div id="copied_notif" aria-hidden="true">Copied !</div>
+      <button id="copy_button">
+        <svg
+          id="copy_icon"
+          aria-hidden="true"
+          viewBox="0 0 16 16"
+          width="16"
+          height="16"
+        >
+          <path
+            d="M0 6.75C0 5.784.784 5 1.75 5h1.5a.75.75 0 0 1 0 1.5h-1.5a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-1.5a.75.75 0 0 1 1.5 0v1.5A1.75 1.75 0 0 1 9.25 16h-7.5A1.75 1.75 0 0 1 0 14.25Z"
+          ></path>
+          <path
+            d="M5 1.75C5 .784 5.784 0 6.75 0h7.5C15.216 0 16 .784 16 1.75v7.5A1.75 1.75 0 0 1 14.25 11h-7.5A1.75 1.75 0 0 1 5 9.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+          ></path>
+        </svg>
+        <svg
+          id="copied_icon"
+          aria-hidden="true"
+          viewBox="0 0 16 16"
+          width="16"
+          height="16"
+        >
+          <path
+            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+          ></path>
+        </svg>
+      </button>
+    </div>`;
   class ClipboardCopy extends HTMLElement {
     constructor() {
       super();
@@ -130,14 +149,17 @@ ${css}
 `;
 
   const html = /* html */ `<style>
-${css}
-</style>
-<div id="code_block">
-  <pre id="pre"><code></code></pre>
-  <div id="clipboard_copy_container" style="position: absolute; right: 0; top: 0">
-    <clipboard-copy></clipboard-copy>
-  </div>
-</div>
+      ${css}
+    </style>
+    <div id="code_block">
+      <pre id="pre"><code></code></pre>
+      <div
+        id="clipboard_copy_container"
+        style="position: absolute; right: 0; top: 0"
+      >
+        <clipboard-copy></clipboard-copy>
+      </div>
+    </div>
 `;
 
   let loadPromise;