waibu 2.16.0 → 2.16.2

package/lib/build-locals.js

@@ -54,15 +54,16 @@ const omitted = ['createdAt', 'updatedAt', '_immutable']
 
 async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
   const { runHook } = this.app.bajo
-  const { set, merge, pick, get, isEmpty, find, cloneDeep, omit } = this.app.lib._
+  const { set, merge, pick, get, isEmpty, find, cloneDeep, omit, isFunction } = this.app.lib._
   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
+    for (const ns of this.app.getAllNs()) {
+      if (isFunction(this.app[ns].sanitizeError)) this.app[ns].sanitizeError(params.error)
+    }
     if (params.error.ns) params.page.ns = params.error.ns
     this.log.error('error%s', params.error.message)
     if (this.app.bajo.config.env === 'dev') console.log(params.error)

package/lib/handle-not-found.js

@@ -13,10 +13,12 @@ export function writeHtml (req, reply, tpl, payload) {
 export async function interceptor (name, err, req, reply) {
   const { get, trim } = this.app.lib._
   let webApp = get(req, 'routeOptions.config.webApp')
+  const all = this.webApps.map(item => item.ns)
   if (!webApp) {
     const url = req.url ?? req.raw.url
     const [prefix] = trim(url, '/').split('/')
-    webApp = this.getPluginByPrefix(prefix, true)
+    const ns = this.getPluginByPrefix(prefix, true)
+    if (all.includes(ns)) webApp = ns
   }
   if (!webApp) {
     const wa = this.webApps.find(item => item.prefix === '')
@@ -30,27 +32,42 @@ export async function interceptor (name, err, req, reply) {
 }
 
 function redirSvc (req) {
-  const { trim, find, get } = this.app.lib._
+  const { trim, get } = this.app.lib._
   const { outmatch } = this.app.lib
-  let match = false
-  let [prefix, ...args] = trim(req.url, '/').split('/')
-  args = '/' + args.join('/')
-  let plugin = find(this.app.getAllNs(), p => {
-    return get(this, `app.${p}.config.waibu.prefix`) === prefix
-  })
-  if (!plugin) {
-    plugin = 'main'
-    args = `/${prefix}`
-  }
-  const items = get(this, `app.${plugin}.config.waibuMpa.redirect`, {})
-  for (const k in items) {
-    const isMatch = outmatch(k)
-    if (isMatch(args)) {
-      match = items[k]
-      break
+
+  const matchRoute = (path, items) => {
+    let match = false
+    for (const k in items) {
+      const isMatch = outmatch(k)
+      if (isMatch(path)) {
+        match = items[k]
+        const parts = path.split('/')
+        const patterns = k.split('/')
+        for (const idx in patterns) {
+          if (patterns[idx] === '*') match = match.replace(`{${idx}}`, parts[idx])
+        }
+        break
+      }
     }
+    return match
+  }
+
+  const [prefix, subPrefix, ...args] = trim(req.url.split('?')[0].split('#')[0], '/').split('/')
+  let plugin = this.getPluginByPrefix(prefix)
+  const subPlugin = this.getPluginByPrefix(subPrefix)
+  if (!plugin && !subPlugin) plugin = this.app.main
+  let route = false
+  if (plugin && subPlugin) {
+    const items = get(this, `app.${subPlugin.ns}.config.waibuMpa.redirectSubRoute.${plugin.ns}`, {})
+    route = matchRoute(`/${args.join('/')}`, items)
+    if (route) return route
+  }
+  if (plugin) {
+    const items = get(this, `app.${plugin.ns}.config.waibuMpa.redirect`, {})
+    route = matchRoute(subPrefix ? `/${subPrefix}/${args.join('/')}` : '/', items)
+    if (route) return route
   }
-  return match
+  return route
 }
 
 export async function notFound (err, req, reply) {

package/lib/handle-redirect.js

@@ -9,7 +9,7 @@ export function redirect (err = {}, req, reply) {
 async function handleRedirect (options) {
   const me = this
   this.instance.decorateReply('redirectTo', function (url, options = {}) {
-    return redirect.call(me, { redirect: url, options }, null, this, url, options)
+    return redirect.call(me, { redirect: url, options }, null, this)
   })
 }
 

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-06-05
+
+- [2.16.2] Bug fix in ```build-locals.js```
+- [2.16.2] Bug fix in ```handle-not-found.js```
+
+## 2026-06-03
+
+- [2.16.1] Bug fix in ```handle-redirect.js```
+
 ## 2026-05-30
 
 - [2.16.0] Change ```config.log.[noReq|noReply]``` to array ```config.log.disable``` with possible values: ```request``` and ```response```. Defaults to empty values