@bakery-framework/cli 2.3.0 → 2.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakery-framework/cli",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "description": "Bakery entry point and process supervision: mode dispatch, dev watcher, cluster.",
   "keywords": [
     "bakery",
@@ -39,10 +39,10 @@
     "bun": ">=1.4.0"
   },
   "dependencies": {
-    "@bakery-framework/core": "^2.3.0"
+    "@bakery-framework/core": "^2.4.1"
   },
   "peerDependencies": {
-    "@bakery-framework/orm": "^2.3.0"
+    "@bakery-framework/orm": "^2.4.1"
   },
   "peerDependenciesMeta": {
     "@bakery-framework/orm": {

package/src/worker.ts

@@ -4,6 +4,8 @@ import {
   hostStore,
 } from '@bakery-framework/core/core/bakery'
 import {
+  checkHostMounts,
+  checkHosts,
   initConfig,
   resolveHostConfig,
 } from '@bakery-framework/core/core/config'
@@ -15,6 +17,7 @@ import {
   handleRequest,
   handleRequestError,
   processResponse,
+  routeOf,
   serveWebSocket,
 } from '@bakery-framework/core/router'
 import { Session } from '@bakery-framework/core/session'
@@ -247,8 +250,11 @@ function settleRequest(
 try {
   // Before anything binds: a rate limit that cannot mean anything (a refill
   // of 0, a prefix without its slash) stops the boot here, naming the field,
-  // in the catch below.
+  // in the catch below. So does a host mount (a path without its slash, a
+  // pattern with '*' inside a label) and a `domains` entry that is no domain.
   checkRateLimits(Bakery.config)
+  checkHosts(Bakery.config)
+  checkHostMounts(Bakery.config)
 
   Bakery.server = Bun.serve({
     port: PORT,
@@ -266,6 +272,9 @@ try {
       const hostConfig = resolveHostConfig(hostname)
 
       return hostStore.run({ config: hostConfig, hostname, req }, async () => {
+        // The limiter keys on the path as sent. An error page is looked up
+        // from `routeOf(req).path` instead, the path routing resolved, so a
+        // page request on a mounted host finds the subtree's error page.
         const path = url.pathname
         req.startNs = Bun.nanoseconds()
         req.__hostname = hostname
@@ -281,7 +290,7 @@ try {
             Bakery.sharedPool.incrementCounter(COUNTER_SLOTS.TOTAL_ERRORS, 1)
             serveLog.SESSION_LOAD_ERR({ error: errorMsg(loadError) })
             return await processResponse(
-              await handleRequestError(path, req, loadError),
+              await handleRequestError(routeOf(req).path, req, loadError),
               req,
             )
           }
@@ -303,7 +312,7 @@ try {
 
             if (isErrorResult(res)) {
               Bakery.sharedPool.incrementCounter(COUNTER_SLOTS.TOTAL_ERRORS, 1)
-              return await handleRequestError(path, req, res)
+              return await handleRequestError(routeOf(req).path, req, res)
             }
             // The app's own error page (see `hasOwnDocument`): sent as written,
             // and still an error answer for the counter.
@@ -316,7 +325,7 @@ try {
           async function errorHandler(error) {
             Bakery.sharedPool.incrementCounter(COUNTER_SLOTS.TOTAL_ERRORS, 1)
             serveLog.UNHANDLED_ERR({ error: errorMsg(error) })
-            return await handleRequestError(path, req, error)
+            return await handleRequestError(routeOf(req).path, req, error)
           },
         )