waibu 2.18.0 → 2.19.0

package/index.js

@@ -76,7 +76,7 @@ async function factory (pkgName) {
        * @type {Object}
        */
       this.config = {
-        home: undefined,
+        home: {},
         server: {
           host: '127.0.0.1',
           port: 17845
@@ -165,7 +165,6 @@ async function factory (pkgName) {
     init = async () => {
       const { isString } = this.app.lib._
       if (isString(this.config.log.disable)) this.config.log.disable = [this.config.log.disable]
-      if (this.config.home === '/') this.config.home = false
       await collectRoutePathHandlers.call(this)
     }
 
@@ -485,7 +484,7 @@ async function factory (pkgName) {
       if (['%', '.', '/', '?', '#'].includes(name[0]) || name.slice(1, 2) === ':') info.path = name
       else if (['~'].includes(name[0])) info.path = name.slice(1)
       else {
-        info = breakNsPath(name)
+        info = breakNsPath(name, false)
       }
       if (info.path.slice(0, 2) === './') info.path = info.path.slice(2)
       if (this.routePathHandlers[info.subNs]) return (neg ? '!' : '') + this.routePathHandlers[info.subNs].handler(name, options)
@@ -603,9 +602,10 @@ async function factory (pkgName) {
       const paths = path.replaceAll('/', '.').split('.')
       if (paths[0] === '') paths.shift()
       path = paths.join('.')
-      const cfgValue = get(this.app, `${ns}.config.${path}`)
-      const reqValue = get(req, `site.setting.${ns}.${path}`)
-      if (isPlainObject(cfgValue) || isArray(cfgValue)) return defaultsDeep({}, reqValue, cfgValue, defValue)
+      const cfgValue = get(this.app, `${ns}.config.${path}`, defValue)
+      const reqValue = get(req, `site.setting.${ns}.${path}`, defValue)
+      if (isPlainObject(cfgValue)) return defaultsDeep({}, reqValue, cfgValue)
+      if (isArray(cfgValue)) return reqValue.length > 0 ? reqValue : cfgValue
       return reqValue ?? cfgValue ?? defValue
     }
 

package/lib/decorate.js

@@ -1,6 +1,4 @@
 async function decorate () {
-  const { isPlainObject, isArray } = this.app.lib._
-  const { defaultsDeep } = this.app.lib.aneka
   const me = this
   this.instance.decorateRequest('lang', null)
   this.instance.decorateRequest('t', () => {})
@@ -10,9 +8,7 @@ async function decorate () {
   this.instance.decorateRequest('site', null)
   this.instance.decorateRequest('ns', null)
   this.instance.decorateRequest('getSetting', function (key, defValue) {
-    const value = me.app.waibu.getSetting(key, { req: this })
-    if (isPlainObject(value) || isArray(value)) return defaultsDeep({}, value, defValue)
-    return value ?? defValue
+    return me.app.waibu.getSetting(key, { req: this, defValue })
   })
 }
 

package/lib/handle-home.js

@@ -1,17 +1,15 @@
 async function handleHome () {
-  const { callHandler } = this.app.bajo
   const { defaultsDeep } = this.app.lib.aneka
-  const { isString, pick } = this.app.lib._
-  const config = this.getConfig()
-  if (config.home) {
-    if (isString(config.home)) config.home = { path: config.home }
-    if (config.home.pathHandler) config.home.path = await callHandler(config.home.pathHandler)
-    await this.instance.get('/', async function (req, reply) {
-      if (!config.home.forward) return reply.redirectTo(config.home.path)
-      const opts = defaultsDeep(pick(req, ['params', 'query']), pick(config.home, ['params', 'query']))
-      return reply.forwardTo(config.home.path, opts)
-    })
-  }
+  const { pick } = this.app.lib._
+  const me = this
+  this.instance.get('/', async function (req, reply) {
+    const home = req.getSetting('waibu:home', {})
+    if (!home.path) throw me.error('_notFound')
+    home.options = home.options ?? {}
+    if (!home.forward) return reply.redirectTo(home.path, home.options)
+    const opts = defaultsDeep(pick(req, ['params', 'query']), pick(home, ['params', 'query']))
+    return reply.forwardTo(home.path, opts)
+  })
 }
 
 export default handleHome

package/lib/handle-redirect.js

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

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-06-19
+
+- [2.18.1] Bug fix in ```routePath()```
+- [2.18.1] Bug fix in ```req.getSetting()```
+- [2.19.0] Add feature to read ```config.home``` from ```req.getSetting()```
+- [2.19.0] Simplify ```config.home``` to only accept object
+- [2.19.0] Add ```options.redirectCode``` to ```reply.redirectTo()```
+- [2.19.0] Home route config now read from ```req.getSetting()```
+
 ## 2026-06-12
 
 - [2.18.0] Necessary updates to ```bajo@2.18.0``` specs