waibu 1.2.5 → 1.2.7

package/index.js

@@ -22,7 +22,7 @@ async function factory (pkgName) {
       this.dependencies = ['bajo-logger', 'bajo-extra']
       this.config = {
         server: {
-          address: '127.0.0.1',
+          host: '127.0.0.1',
           port: 7771
         },
         factory: {
@@ -188,7 +188,7 @@ async function factory (pkgName) {
     getOrigin = (req) => {
       const { isEmpty } = this.lib._
       let host = req.host
-      if (isEmpty(host) || host === ':authority') host = `${this.config.server.address}:${this.config.server.port}`
+      if (isEmpty(host) || host === ':authority') host = `${this.config.server.host}:${this.config.server.port}`
       return `${req.protocol}://${host}`
     }
 
@@ -294,7 +294,7 @@ async function factory (pkgName) {
       if (options.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.address}:${this.config.server.port}/${trimStart(url, '/')}`
+      if (!url.startsWith('http') && guessHost) url = `http://${this.config.server.host}:${this.config.server.port}/${trimStart(url, '/')}`
       return url
     }
 

package/lib/build-locals.js

@@ -5,7 +5,7 @@ async function buildHomesMenu (req) {
   for (const ns of this.app.bajo.pluginNames) {
     let home = get(this, `app.${ns}.config.waibuMpa.home`)
     const homeHandler = get(this, `app.${ns}.config.waibuMpa.homeHandler`)
-    if (homeHandler) home = await callHandler(homeHandler)
+    if (homeHandler) home = await callHandler(this.app[ns], homeHandler)
     if (!home) continue
     const item = { href: home, ns, title: get(this, `app.${ns}.config.waibu.title`, this.app[ns].title) }
     if (!find(routes, { href: home })) routes.push(item)
@@ -15,13 +15,14 @@ async function buildHomesMenu (req) {
 
 async function buildPagesMenu (req) {
   const { find, orderBy, merge, isString } = this.lib._
-  const { callHandler } = this.app.bajo
+  const { callHandler, runHook } = this.app.bajo
   const all = [{ icon: 'house', href: '/', level: 1 }]
   for (const ns of this.app.bajo.pluginNames) {
     const items = []
     let pages = this.app[ns].getConfig('waibuMpa.menuHandler', { defValue: [] })
-    if (isString(pages)) pages = await callHandler(pages, req)
+    if (isString(pages)) pages = await callHandler(this.app[ns], pages, req)
     if (pages.length === 0) continue
+    await runHook(`${this.name}.${ns}:afterBuildPagesMenu`, pages, req)
     for (const page of pages) {
       const existing = find(all, { title: page.title })
       page.level = page.level ?? 1000

package/lib/handle-forward.js

@@ -11,7 +11,7 @@ async function handleForward (ctx) {
     }
   }
 
-  const base = `http://${this.config.server.address}:${this.config.server.port}`
+  const base = `http://${this.config.server.host}:${this.config.server.port}`
   const options = defaultsDeep({ base }, this.config.forwardOpts)
   await ctx.register(replyFrom, options)
 

package/package.json

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