waibu 2.3.3 → 2.4.0

package/index.js

@@ -458,7 +458,7 @@ 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 } = options
+      const { query = {}, base = this.ns, params = {}, guessHost, defaults = {} } = options
 
       const plugin = getPlugin(base)
       const cfg = plugin.config ?? {}
@@ -474,7 +474,12 @@ async function factory (pkgName) {
       if (info.path.includes('//')) return info.path
 
       info.path = info.path.split('/').map(p => {
-        return p[0] === ':' && params[p.slice(1)] ? params[p.slice(1)] : p
+        if (!(p[0] === ':' || (p[0] === '{' && p[p.length - 1] === '}'))) return p
+        const _p = p
+        p = p.replace(':', '').replace('{', '').replace('}', '')
+        if (params[p]) return params[p]
+        if (defaults[p]) return defaults[p]
+        return _p
       }).join('/')
       let url = info.path
       const langDetector = get(cfg, 'intl.detectors', [])

package/lib/handle-error.js

@@ -1,24 +1,19 @@
 import { redirect } from './handle-redirect.js'
-import { notFound, writeHtml } from './handle-not-found.js'
+import { notFound, writeHtml, interceptor } from './handle-not-found.js'
 
-async function error (req, reply, err = {}) {
-  const { get } = this.app.lib._
-  const webApp = get(req, 'routeOptions.config.webApp')
+async function error (err, req, reply) {
   this.log.error(err)
-  if (webApp) {
-    const plugin = this.app[webApp]
-    const errorHandler = get(plugin, 'waibuFactory.errorHandler')
-    if (errorHandler) return await errorHandler.call(plugin, err, req, reply)
-  }
+  const resp = await interceptor.call(this, 'errorHandler', err, req, reply)
+  if (resp) return resp
   return writeHtml.call(this, req, reply, `${this.ns}:/extend/bajoTemplate/template/500.html`, { text: this.app.log.getErrorMessage(err) })
 }
 
 async function handleError () {
   const me = this
   this.instance.setErrorHandler(async function (err, req, reply) {
-    if (err.message === '_notFound' || err.statusCode === 404) return await notFound.call(me, req, reply, err)
-    if (err.message === '_redirect' && err.redirect) return redirect.call(me, reply, err.redirect, err.options)
-    return await error.call(me, req, reply, err)
+    if (err.message === '_notFound' || err.statusCode === 404) return await notFound.call(me, err, req, reply)
+    if (err.message === '_redirect' && err.redirect) return redirect.call(me, err, req, reply)
+    return await error.call(me, err, req, reply)
   })
 }
 

package/lib/handle-not-found.js

@@ -10,15 +10,51 @@ export function writeHtml (req, reply, tpl, payload) {
   return compiled(payload)
 }
 
-export async function notFound (req, reply, err = {}) {
+export async function interceptor (err, name, req, reply) {
   const { get } = this.app.lib._
   const webApp = get(req, 'routeOptions.config.webApp')
-  reply.code(404)
   if (webApp) {
     const plugin = this.app[webApp]
-    const errorHandler = get(plugin, 'waibuFactory.errorHandler')
-    if (errorHandler) return await errorHandler.call(plugin, req, reply)
+    const handler = get(plugin, `waibuFactory.${name}`)
+    if (handler) return await handler.call(plugin, err, req, reply)
+  }
+}
+
+function redirSvc (req) {
+  const { trim, find, 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
+    }
+  }
+  return match
+}
+
+export async function notFound (err, req, reply) {
+  const { getMethod } = this.app.bajo
+  let redirectTo = await redirSvc.call(this, req, reply)
+  if (redirectTo !== false) {
+    const fn = getMethod(redirectTo, false)
+    if (fn) redirectTo = await fn(req)
+    if (redirectTo) return reply.redirectTo(redirectTo)
+  }
+  reply.code(404)
+  const resp = await interceptor.call(this, 'notFoundHandler', err, req, reply)
+  if (resp) return resp
   const text = req.t('notFound%s%s', req.t('route'), req.url)
   return writeHtml.call(this, req, reply, `${this.ns}:/extend/bajoTemplate/template/400.html`, { text })
 }
@@ -26,7 +62,7 @@ export async function notFound (req, reply, err = {}) {
 async function handleNotFound () {
   const me = this
   me.instance.setNotFoundHandler(async function (req, reply) {
-    return await notFound.call(me, req, reply)
+    return await notFound.call(me, null, req, reply)
   })
 }
 

package/lib/handle-redirect.js

@@ -1,15 +1,15 @@
 import path from 'path'
 
-export function redirect (reply, url, options = {}) {
-  if (url.startsWith('http') || path.isAbsolute(url)) reply.redirect(url)
-  else reply.redirect(this.routePath(url, options))
+export function redirect (err = {}, req, reply) {
+  if (err.redirect.startsWith('http') || path.isAbsolute(err.redirect)) reply.redirect(err.redirect)
+  else reply.redirect(this.routePath(err.redirect, err.options))
   return reply
 }
 
 async function handleRedirect (options) {
   const me = this
   this.instance.decorateReply('redirectTo', function (url, options = {}) {
-    return redirect.call(me, this, url, options)
+    return redirect.call(me, { redirect: url, options }, null, this, url, options)
   })
 }
 

package/lib/web-app.js

@@ -24,10 +24,10 @@ export async function collect (glob = 'boot.js', baseNs) {
 
 async function webApp () {
   const { runHook } = this.app.bajo
-  const mods = await collect.call(this)
+  this.webApps = await collect.call(this)
   await runHook(`${this.ns}:beforeAppBoot`)
   // build routes
-  for (const m of mods) {
+  for (const m of this.webApps) {
     const disabled = this.app[m.ns].config.disabled
     if (Array.isArray(disabled) && disabled.length === 1 && ['*', 'all'].includes(disabled[0])) {
       this.log.warn('allRoutesConfigDisabled%s', m.ns)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 2026-02-09
+
+- [2.3.4] Bug fix on error handling
+- [2.3.4] Bug fix on not found handling
+- [2.3.4] Bug fix on redirection handling
+- [2.4.0] Accept path parameter as in ```{param}``` to complement ```:param``` in ```routePath()```
+
 ## 2026-02-08
 
 - [2.3.0] Simplify all common handler calls