waibu 2.15.0 → 2.15.2

package/extend/bajo/hook.js

@@ -6,6 +6,13 @@ export const methodColor = {
   DELETE: 'red'
 }
 
+const stateColor = {
+  2: 'green',
+  3: 'yellow',
+  4: 'red',
+  5: 'red'
+}
+
 async function hook () {
   return [{
     name: 'waibu:onClose',
@@ -50,6 +57,37 @@ async function hook () {
         req.params[key] = val
       }
     }
+  }, {
+    level: 5,
+    name: 'waibu:onResponse',
+    handler: async function onResponse (req, reply) {
+      const { importPkg } = this.app.bajo
+      const { get } = this.app.lib._
+      const { plain } = this.app.bajo.config.log
+      const chalk = await importPkg('bajo:chalk')
+      let level = 'info'
+      if (reply.statusCode >= 300 && reply.statusCode < 400) level = 'warn'
+      else if (reply.statusCode >= 400) level = 'error'
+      const ns = get(reply.request, 'routeOptions.config.webApp') ?? this.ns
+      const arrow = plain ? '>' : chalk.bold('🡪')
+      const mc = methodColor[req.method] ?? 'gray'
+      const method = plain ? req.method : chalk[mc](req.method)
+      const url = plain ? (':' + req.url) : chalk.gray(':' + req.url)
+      let state = plain ? reply.statusCode : chalk.gray(reply.statusCode)
+      const sc = stateColor[Math.floor(reply.statusCode / 100)]
+      if (!plain && sc) state = chalk[sc](reply.statusCode)
+      const elapsed = reply.elapsedTime ?? 0
+      let tc = 'red'
+      if (elapsed < 1000) tc = 'yellow'
+      if (elapsed < 500) tc = 'green'
+      const time = plain ? elapsed.toFixed(2) : chalk[tc](elapsed.toFixed(2))
+      if (this.config.log.defer) {
+        this.reqLog = this.reqLog ?? {}
+        if (this.reqLog[req.id] && !this.config.log.noReq) this.app[ns].log.info(this.reqLog[req.id])
+        delete this.reqLog[req.id]
+      }
+      if (!this.config.log.noReply) this.app[ns].log[level]('httpResp%s%s%s%s%s', arrow, method, url, state, time)
+    }
   }, {
     level: 5,
     name: 'waibu:onRoute',

package/lib/build-locals.js

@@ -58,6 +58,8 @@ async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
   const { req, reply } = opts
 
   const _meta = { template: tpl }
+  params.page = merge(params.page ?? {}, { ns: req.ns, features: [] })
+  params.sidebar = params.sidebar ?? []
   if (params.error) {
     if (params.error.statusCode) _meta.statusCode = params.error.statusCode
     _meta.errorMessage = params.error.message
@@ -66,8 +68,6 @@ async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
     if (this.app.bajo.config.env === 'dev') console.log(params.error)
   }
   if (!opts.partial) {
-    params.page = merge(params.page ?? {}, { ns: req.ns, features: [] })
-    params.sidebar = params.sidebar ?? []
     merge(_meta, pick(req, ['site', 'user', 'lang', 'darkMode', 'url']))
     _meta.params = cloneDeep(req.params)
     _meta.query = cloneDeep(req.query)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "2.15.0",
+  "version": "2.15.2",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-05-29
+
+- [2.15.1] Bug fix in ```build-locals.js```
+- [2.15.2] Bug fix in ```hook.js```
+
 ## 2026-05-28
 
 - [2.15.0] Change hooks to be written in one ```hook.js``` file