@jsenv/server 17.6.9 → 17.7.1

package/dist/jsenv_server.js

@@ -5899,37 +5899,36 @@ const createResourcePattern = (pattern) => {
     });
   }
 
-  const patternEndsWithSlash = pathnamePatternString.endsWith("/");
+  // "/docs/*" also answers the directory itself ("/docs/" and "/docs") with an
+  // empty star, so one route serves a directory and its index. Only a star
+  // widens a pattern: "/docs/" is that one path and "/" the home page.
+  const directoryPattern = pathnamePatternString.endsWith("/*")
+    ? PATTERN.create(pathnamePatternString.slice(0, -1), {
+        namedGroupDelimiter: "/",
+      })
+    : null;
   // a pattern constraining nothing: every resource matches it, so whoever uses
   // it cannot name the resource that matched
   const matchesEveryResource =
     !searchPattern &&
     !hashPattern &&
-    (pathnamePatternString === "*" ||
-      pathnamePatternString === "/" ||
-      pathnamePatternString === "/*");
+    (pathnamePatternString === "*" || pathnamePatternString === "/*");
 
   return {
     matchesEveryResource,
     match: (resource) => {
       const [pathname, search, hash] = resourceToParts(resource);
       let decodedPathname = decodeURIComponent(pathname);
-      let result;
-      if (patternEndsWithSlash && !searchPattern && !hashPattern) {
-        // also match the path without trailing slash (e.g. /foo matches /foo/)
-        const pathnamePatternWithoutSlash = pathnamePatternString.slice(0, -1);
-        if (decodedPathname === pathnamePatternWithoutSlash) {
-          result = { named: {}, stars: [""] };
-        } else if (!decodedPathname.startsWith(pathnamePatternString)) {
-          return null;
-        } else {
-          result = {
-            named: {},
-            stars: [decodedPathname.slice(pathnamePatternString.length)],
-          };
+      let result = pathnamePattern.match(decodedPathname);
+      if (!result && directoryPattern) {
+        result = directoryPattern.match(
+          decodedPathname.endsWith("/")
+            ? decodedPathname
+            : `${decodedPathname}/`,
+        );
+        if (result) {
+          result.stars = [...(result.stars || []), ""];
         }
-      } else {
-        result = pathnamePattern.match(decodedPathname);
       }
       if (!result) {
         return null;
@@ -6318,9 +6317,7 @@ const createRouter = (
     };
   };
   const forEachMethodAllowed = (route, onMethodAllowed) => {
-    const supportedMethods =
-      route.method === "*" ? HTTP_METHODS : [route.method];
-    for (const supportedMethod of supportedMethods) {
+    for (const supportedMethod of route.methods) {
       onMethodAllowed(supportedMethod);
     }
   };
@@ -6553,10 +6550,12 @@ It should be should be one of route.${routePropertyName}: ${availableValues.join
         }
         if (!route.matchMethod(request.method)) {
           // a 405 asserts the resource exists with other methods: a route
-          // matching every resource ("GET *", "GET /") names no resource, so
+          // matching every resource ("GET *", "GET /*") names no resource, so
           // it cannot make that assertion and an unknown address stays a 404
           if (!route.isFallback && !route.matchesEveryResource) {
-            wouldHaveMatched.methodSet.add(route.method);
+            for (const routeMethod of route.methods) {
+              wouldHaveMatched.methodSet.add(routeMethod);
+            }
           }
           continue;
         }
@@ -6877,6 +6876,14 @@ const createRoute = ({
   ) {
     availableMediaTypes.push(extensionWellKnownContentType);
   }
+  // HEAD is GET without the body (RFC 9110 §9.3.2): a GET route answers it and
+  // the server drops the body when sending
+  const methods =
+    method === "*"
+      ? HTTP_METHODS
+      : method === "GET"
+        ? ["GET", "HEAD"]
+        : [method];
   const resourcePattern = createResourcePattern(resource);
   const headersPattern = headers ? createHeadersPattern(headers) : null;
 
@@ -6896,8 +6903,11 @@ const createRoute = ({
     availableVersions,
     availableEncodings,
     acceptedMediaTypes,
+    methods,
     matchMethod:
-      method === "*" ? () => true : (requestMethod) => requestMethod === method,
+      method === "*"
+        ? () => true
+        : (requestMethod) => methods.includes(requestMethod),
     matchResource:
       resource === "*"
         ? () => true
@@ -7318,7 +7328,10 @@ const TIMING_NOOP = () => {
  *   - `endpoint` {string} — Required. `"GET /users/:id"`: an http method (or `*` for any)
  *     and a resource pattern. `:name` captures a segment and `*` a run of segments, both
  *     land in `request.params`; `?page=:page` captures a search param. `"*"` alone
- *     matches everything. An endpoint ending in `.websocket` marks a websocket route.
+ *     matches everything. Only `*` widens a pattern: `GET /` is the root alone and
+ *     `GET /docs/` that one path, while `GET /docs/*` answers `/docs`, `/docs/` and
+ *     everything under it (`request.params[0]` is `""` for the first two): declare the
+ *     routes it covers before it. An endpoint ending in `.websocket` marks a websocket route.
  *   - `fetch` {Function} — Required. `(request, helpers) => response`, async or not.
  *     Returns a `Response`, a plain `{ status, statusText, statusMessage, headers, body,
  *     timing }` object (`status` defaults to 404, `statusMessage` feeds the body of 4xx/5xx

package/docs/handling_requests.md

@@ -19,16 +19,21 @@ await startServer({
 
 `endpoint` is an http method (or `*`) followed by a resource pattern:
 
-| endpoint               | matches                                                             |
-| ---------------------- | ------------------------------------------------------------------- |
-| `GET /`                | exactly `/`                                                         |
-| `GET /users/:id`       | `/users/42`, with `request.params.id === "42"`                      |
-| `GET /assets/*`        | `/assets/css/main.css`, with `request.params[0] === "css/main.css"` |
-| `GET /search?q=:query` | `/search?q=hello`, with `request.params.query === "hello"`          |
-| `* /api/*`             | any method                                                          |
-| `GET *`                | anything: a catch-all, put it last                                  |
-
-Routes are tried in order. `fetch` can be async; returning `null` or `undefined` declines the request and the next route is tried.
+| endpoint               | matches                                                                                                 |
+| ---------------------- | ------------------------------------------------------------------------------------------------------- |
+| `GET /`                | `/` alone, whatever its search (`/?page=2`): the home page                                              |
+| `GET /users/:id`       | `/users/42`, with `request.params.id === "42"`                                                          |
+| `GET /docs/`           | `/docs/` alone                                                                                          |
+| `GET /docs/*`          | `/docs/intro`, with `request.params[0] === "intro"`, and the directory itself: `/docs`, `/docs/` (`""`) |
+| `GET /assets/*`        | `/assets/css/main.css`, with `request.params[0] === "css/main.css"`                                     |
+| `GET /search?q=:query` | `/search?q=hello`, with `request.params.query === "hello"`                                              |
+| `* /api/*`             | any method                                                                                              |
+| `GET /*`               | anything, with the path in `request.params[0]`                                                          |
+| `GET *`                | anything: a catch-all, put it last                                                                      |
+
+A `GET` route also answers `HEAD`: the response is built the same way and sent without its body.
+
+Only `*` widens a pattern. Routes are tried in order, so a route covering others (`GET /docs/*`, `GET *`) goes after them. `fetch` can be async; returning `null` or `undefined` declines the request and the next route is tried.
 
 When no route answers, the router builds the response from what almost matched:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "17.6.9",
+  "version": "17.7.1",
   "type": "module",
   "description": "A modern Node.js HTTP server with declarative routing, content negotiation, and WebSocket support",
   "repository": {
@@ -37,7 +37,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "launch-editor": "2.14.1"
+    "launch-editor": "2.14.2"
   },
   "devDependencies": {
     "@jsenv/abort": "../../tooling/abort",

package/src/router/router.js

@@ -121,9 +121,7 @@ export const createRouter = (
     };
   };
   const forEachMethodAllowed = (route, onMethodAllowed) => {
-    const supportedMethods =
-      route.method === "*" ? HTTP_METHODS : [route.method];
-    for (const supportedMethod of supportedMethods) {
+    for (const supportedMethod of route.methods) {
       onMethodAllowed(supportedMethod);
     }
   };
@@ -356,10 +354,12 @@ It should be should be one of route.${routePropertyName}: ${availableValues.join
         }
         if (!route.matchMethod(request.method)) {
           // a 405 asserts the resource exists with other methods: a route
-          // matching every resource ("GET *", "GET /") names no resource, so
+          // matching every resource ("GET *", "GET /*") names no resource, so
           // it cannot make that assertion and an unknown address stays a 404
           if (!route.isFallback && !route.matchesEveryResource) {
-            wouldHaveMatched.methodSet.add(route.method);
+            for (const routeMethod of route.methods) {
+              wouldHaveMatched.methodSet.add(routeMethod);
+            }
           }
           continue;
         }
@@ -683,6 +683,14 @@ const createRoute = ({
   ) {
     availableMediaTypes.push(extensionWellKnownContentType);
   }
+  // HEAD is GET without the body (RFC 9110 §9.3.2): a GET route answers it and
+  // the server drops the body when sending
+  const methods =
+    method === "*"
+      ? HTTP_METHODS
+      : method === "GET"
+        ? ["GET", "HEAD"]
+        : [method];
   const resourcePattern = createResourcePattern(resource);
   const headersPattern = headers ? createHeadersPattern(headers) : null;
 
@@ -702,8 +710,11 @@ const createRoute = ({
     availableVersions,
     availableEncodings,
     acceptedMediaTypes,
+    methods,
     matchMethod:
-      method === "*" ? () => true : (requestMethod) => requestMethod === method,
+      method === "*"
+        ? () => true
+        : (requestMethod) => methods.includes(requestMethod),
     matchResource:
       resource === "*"
         ? () => true

package/src/start_server.js

@@ -59,7 +59,10 @@ const TIMING_NOOP = () => {
  *   - `endpoint` {string} — Required. `"GET /users/:id"`: an http method (or `*` for any)
  *     and a resource pattern. `:name` captures a segment and `*` a run of segments, both
  *     land in `request.params`; `?page=:page` captures a search param. `"*"` alone
- *     matches everything. An endpoint ending in `.websocket` marks a websocket route.
+ *     matches everything. Only `*` widens a pattern: `GET /` is the root alone and
+ *     `GET /docs/` that one path, while `GET /docs/*` answers `/docs`, `/docs/` and
+ *     everything under it (`request.params[0]` is `""` for the first two): declare the
+ *     routes it covers before it. An endpoint ending in `.websocket` marks a websocket route.
  *   - `fetch` {Function} — Required. `(request, helpers) => response`, async or not.
  *     Returns a `Response`, a plain `{ status, statusText, statusMessage, headers, body,
  *     timing }` object (`status` defaults to 404, `statusMessage` feeds the body of 4xx/5xx