waibu 2.11.4 → 2.13.0

package/extend/bajo/hook/waibu@on-request.js

@@ -18,10 +18,10 @@ const onRequest = {
     const ip = plain ? this.getIp(req) : chalk.magenta(this.getIp(req))
     let msg = this.app[ns].t('httpReq%s%s%s%s', arrow, method, url.replaceAll('%', '%%'), ip)
     if (req.headers['content-length']) msg += this.app[ns].t('httpReqExt%s', req.headers['content-length'])
-    if (this.config.deferLog) {
+    if (this.config.log.defer) {
       this.reqLog = this.reqLog ?? {}
       this.reqLog[req.id] = msg
-    } else this.app[ns].log.info(msg)
+    } else if (!this.config.log.noReq) this.app[ns].log.info(msg)
     if (Object.keys(this.config.paramsCharMap).length === 0) return
     for (const key in req.params) {
       let val = req.params[key]

package/extend/bajo/hook/waibu@on-response.js

@@ -36,12 +36,12 @@ const onResponse = {
     if (elapsed < 1000) tc = 'yellow'
     if (elapsed < 500) tc = 'green'
     const time = plain ? elapsed.toFixed(2) : chalk[tc](elapsed.toFixed(2))
-    if (this.config.deferLog) {
+    if (this.config.log.defer) {
       this.reqLog = this.reqLog ?? {}
-      if (this.reqLog[req.id]) this.app[ns].log.info(this.reqLog[req.id])
+      if (this.reqLog[req.id] && !this.config.log.noReq) this.app[ns].log.info(this.reqLog[req.id])
       delete this.reqLog[req.id]
     }
-    this.app[ns].log[level]('httpResp%s%s%s%s%s', arrow, method, url, state, time)
+    if (!this.config.log.noReply) this.app[ns].log[level]('httpResp%s%s%s%s%s', arrow, method, url, state, time)
   }
 }
 

package/index.js

@@ -91,7 +91,11 @@ async function factory (pkgName) {
         intl: {
           detectors: ['qs']
         },
-        deferLog: false,
+        log: {
+          noReq: false,
+          noReply: false,
+          defer: false
+        },
         prefixVirtual: '~',
         qsKey: {
           bbox: 'bbox',
@@ -215,9 +219,9 @@ async function factory (pkgName) {
      * @param {string} name - ns based route name
      * @returns {Object} Route object
      */
-    findRoute = (name) => {
+    findRoute = (name, method = 'GET') => {
       const { outmatch } = this.app.lib
-      const { find } = this.app.lib._
+      const { find, isString } = this.app.lib._
       const { breakNsPath } = this.app.bajo
       let { ns, subNs = '', path } = breakNsPath(name)
       const params = path.split('|')
@@ -227,7 +231,8 @@ async function factory (pkgName) {
         r.config = r.config ?? {}
         const match = outmatch(r.config.pathSrc ?? r.path, { separator: false })
         if (!match(path)) return false
-        return ns === r.config.ns && r.config.subNs === subNs
+        const methods = isString(r.method) ? [r.method] : r.method
+        return ns === r.config.ns && r.config.subNs === subNs && methods.includes(method)
       })
     }
 
@@ -449,12 +454,13 @@ async function factory (pkgName) {
     /**
      * Get route path by route's name:
      * - If it is a ```mailto:``` or ```tel:``` url, it returns as is
+     * - If it starts with ```:/```, name will be prefixed with its ```ns``` automatically
      * - If it is a ns based name, it will be parsed first
      *
      * @method
      * @param {string} name
      * @param {Object} [options={}] - Options object
-     * @param {string} [options.base=waibu] - Base namespace
+     * @param {string} [options.ns=waibu] - Base namespace
      * @param {boolean} [options.guessHost] - If true, guest host if host is not set
      * @param {Object} [options.query={}] - Query string's object. If provided, it will be added to returned value
      * @param {Object} [options.params={}] - Parameter object. If provided, it will be merged to returned value
@@ -465,12 +471,13 @@ async function factory (pkgName) {
       const { defaultsDeep } = this.app.lib.aneka
       const { isEmpty, get, trimEnd, trimStart } = this.app.lib._
       const { breakNsPath } = this.app.bajo
-      const { query = {}, base = this.ns, params = {}, guessHost, defaults = {} } = options
+      const { query = {}, ns = this.ns, params = {}, guessHost, defaults = {}, uriEncoded } = options
 
-      const plugin = getPlugin(base)
+      const plugin = getPlugin(ns)
       const cfg = plugin.config ?? {}
       let info = {}
       if (name.startsWith('mailto:') || name.startsWith('tel:')) return name
+      if (name.slice(0, 2) === ':/') name = ns + name
       if (['%', '.', '/', '?', '#'].includes(name[0]) || name.slice(1, 2) === ':') info.path = name
       else if (['~'].includes(name[0])) info.path = name.slice(1)
       else {
@@ -491,7 +498,7 @@ async function factory (pkgName) {
       let url = info.path
       const langDetector = get(cfg, 'intl.detectors', [])
       if (info.ns) url = trimEnd(langDetector.includes('path') ? `/${params.lang ?? ''}${this.routeDir(info.ns)}${info.path}` : `${this.routeDir(info.ns)}${info.path}`, '/')
-      if (options.uriEncoded) url = url.split('/').map(u => encodeURI(u)).join('/')
+      if (uriEncoded) url = url.split('/').map(u => encodeURI(u)).join('/')
       info.qs = defaultsDeep({}, query, info.qs)
       if (!isEmpty(info.qs)) url += '?' + this.qs.stringify(info.qs)
       if (!url.startsWith('http') && guessHost) url = `http://${this.config.server.host}:${this.config.server.port}/${trimStart(url, '/')}`

package/lib/build-locals.js

@@ -73,7 +73,6 @@ async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
   _meta.template = tpl
   _meta.hostHeader = req.headers.host
   _meta.statusCode = 200
-  _meta.isAdmin = _meta.user && find(_meta.user.teams, { alias: 'administrator' })
   const pulled = []
   for (const k in errs) {
     if (Date.now() - errs[k] > 5000) pulled.push(k)
@@ -89,12 +88,14 @@ async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
     }
     errs[req.id] = Date.now()
   }
-  if (reply && req.session && req.flash && !opts.partial) _meta.flash = reply.flash()
-  set(params, 'menu.homes', await buildHomesMenu.call(this, req))
-  set(params, 'menu.pages', await buildPagesMenu.call(this, req))
+  _meta.flash = reply && req.session && req.flash && !opts.partial && !opts.noFlash ? reply.flash() : {}
+  if (!opts.partial) {
+    set(params, 'menu.homes', await buildHomesMenu.call(this, req))
+    set(params, 'menu.pages', await buildPagesMenu.call(this, req))
+  }
   const merged = merge({}, params, { _meta })
-  await runHook(`${this.ns}:afterBuildLocals`, merged, req)
-  if (!isEmpty(routeOpts.ns)) await runHook(`${this.ns}.${routeOpts.ns}:afterBuildLocals`, merged, req)
+  await runHook(`${this.ns}:afterBuildLocals`, merged, req, opts)
+  if (!isEmpty(routeOpts.ns)) await runHook(`${this.ns}.${routeOpts.ns}:afterBuildLocals`, merged, req, opts)
   return merged
 }
 

package/lib/decorate.js

@@ -4,6 +4,7 @@ async function decorate () {
   const me = this
   this.instance.decorateRequest('lang', null)
   this.instance.decorateRequest('t', () => {})
+  this.instance.decorateRequest('te', () => {})
   this.instance.decorateRequest('format', () => {})
   this.instance.decorateRequest('langDetector', null)
   this.instance.decorateRequest('site', null)

package/lib/handle-error.js

@@ -2,9 +2,9 @@ import { redirect } from './handle-redirect.js'
 import { notFound, writeHtml, interceptor } from './handle-not-found.js'
 
 async function error (err, req, reply) {
-  this.log.error(err)
   const resp = await interceptor.call(this, 'errorHandler', err, req, reply)
   if (resp) return resp
+  this.log.error(err)
   const payload = {
     text: this.app.log.getErrorMessage(err),
     title: req.t('internalServerError')

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,18 @@
 # Changes
 
+## 2026-05-22
+
+- [2.13.0] Add ```config.log.noReq``` & ```config.log.noReply```
+- [2.13.0] Change ```config.deferLog``` to ```config.log.defer```
+- [2.13.0] Bug fix in ```build-Locals.js```
+- [2.13.0] Add ```decorator.te```
+- [2.13.0] Bug fix in ```handle-error.js```
+
+## 2026-05-16
+
+- [2.12.0] Change in ```routeDir()```
+- [2.12.0] Change in ```routePath()```
+
 ## 2026-05-11
 
 - [2.11.4] Bug fix in ```handle-not-found.js```