waibu 2.12.0 → 2.14.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)
       })
     }
 

package/lib/build-locals.js

@@ -1,5 +1,3 @@
-const errs = {}
-
 async function buildHomesMenu (req) {
   const { callHandler } = this.app.bajo
   const { get, find, orderBy } = this.app.lib._
@@ -52,49 +50,48 @@ async function buildPagesMenu (req) {
   return orderBy(all, ['level', 'title'])
 }
 
+const omitted = ['createdAt', 'updatedAt', '_immutable']
+
 async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
   const { runHook } = this.app.bajo
-  const { set, merge, pick, get, isEmpty, find, pullAt } = this.app.lib._
+  const { set, merge, pick, get, isEmpty, find, cloneDeep, omit } = this.app.lib._
   const { req, reply } = opts
-  params.page = merge(params.page ?? {}, { ns: req.ns, features: [] })
-  params.sidebar = params.sidebar ?? []
 
-  const { site, user, lang, darkMode } = req
-  const theme = pick(find(this.themes, { name: opts.theme ?? req.theme }) ?? {}, ['name', 'framework'])
-  const iconset = pick(find(this.iconsets, { name: opts.iconset ?? req.iconset }) ?? {}, ['name'])
-  const routeOpts = get(req, 'routeOptions.config', {})
-  const _meta = { theme, iconset, site, user, lang, darkMode, routeOpts }
-  _meta.site = _meta.site ?? {}
-  merge(_meta, pick(req, ['url', 'params', 'query']))
-  _meta.env = this.app.bajo.config.env
-  _meta.url = _meta.url.split('?')[0].split('#')[0]
-  if (req.session) _meta.prevUrl = req.session.prevUrl
-  _meta.route = get(req, 'routeOptions.url')
-  _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)
-  }
-  pullAt(errs, pulled)
+  const _meta = { template: tpl }
   if (params.error) {
     if (params.error.statusCode) _meta.statusCode = params.error.statusCode
     _meta.errorMessage = params.error.message
     if (params.error.ns) params.page.ns = params.error.ns
-    if (!errs[req.id]) {
-      this.log.error('error%s', params.error.message)
-      if (this.app.bajo.config.env === 'dev') console.log(params.error)
-    }
-    errs[req.id] = Date.now()
+    this.log.error('error%s', params.error.message)
+    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)
+    _meta.site = omit(req.site, omitted)
+    _meta.user = omit(req.user, [...omitted, 'apiKey', 'salt', 'token'])
+    _meta.theme = pick(find(this.themes, { name: opts.theme ?? req.theme }) ?? {}, ['name', 'framework'])
+    _meta.iconset = pick(find(this.iconsets, { name: opts.iconset ?? req.iconset }) ?? {}, ['name'])
+    _meta.routeOpts = get(req, 'routeOptions.config', {})
+    set(params, 'menu.homes', await buildHomesMenu.call(this, req))
+    set(params, 'menu.pages', await buildPagesMenu.call(this, req))
+    _meta.env = this.app.bajo.config.env
+    _meta.url = _meta.url.split('?')[0].split('#')[0]
+    if (req.session) _meta.prevUrl = req.session.prevUrl
+    _meta.route = get(req, 'routeOptions.url')
+    _meta.hostHeader = req.headers.host
+    _meta.statusCode = 200
+    _meta.reqId = req.id
+    _meta.flash = reply && req.session && req.flash && !opts.noFlash ? reply.flash() : {}
   }
-  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))
   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)
+  if (!opts.partial) {
+    await runHook(`${this.ns}:afterBuildLocals`, merged, req, opts)
+    if (!isEmpty(merged._meta.routeOpts.ns)) await runHook(`${this.ns}.${merged._meta.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/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,18 @@
 # Changes
 
+## 2026-05-24
+
+- [2.14.0] Add auto detection of theme & iconset for all widgets incl the dynamic one
+- [2.14.0] Bug fix in ```handle-error.js```
+
+## 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()```