waibu 1.1.6 → 1.1.8

package/bajo/hook/on-request.js

@@ -1,7 +1,7 @@
 const onRequest = {
   level: 5,
   handler: async function onRequest (req, reply) {
-    const { get } = this.app.bajo.lib._
+    const { get } = this.lib._
 
     req.site = this.config.siteInfo
     req.ns = get(reply.request, 'routeOptions.config.ns') ?? this.name

package/bajo/hook/on-response.js

@@ -1,7 +1,7 @@
 const onResponse = {
   level: 5,
   handler: async function onResponse (req, reply) {
-    const { get } = this.app.bajo.lib._
+    const { get } = this.lib._
     let method = 'info'
     if (reply.statusCode >= 300 && reply.statusCode < 400) method = 'warn'
     else if (reply.statusCode >= 400) method = 'error'

package/lib/app.js

@@ -2,7 +2,7 @@ import home from './home.js'
 
 export async function collect (glob = 'boot.js', baseNs) {
   const { eachPlugins, importModule } = this.app.bajo
-  const { orderBy, get } = this.app.bajo.lib._
+  const { orderBy, get } = this.lib._
   if (!baseNs) baseNs = this.name
   const mods = []
 

package/lib/build-locals.js

@@ -1,5 +1,5 @@
 function buildHomesMenu () {
-  const { get, find, orderBy } = this.app.bajo.lib._
+  const { get, find, orderBy } = this.lib._
   const routes = []
   for (const ns of this.app.bajo.pluginNames) {
     const href = get(this, `app.${ns}.config.waibuMpa.home`)
@@ -12,7 +12,7 @@ function buildHomesMenu () {
 
 async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
   const { runHook } = this.app.bajo
-  const { set, merge, pick, get, isEmpty, find } = this.app.bajo.lib._
+  const { set, merge, pick, get, isEmpty, find } = this.lib._
   const { req, reply } = opts
 
   const appTitle = this.app.waibuMpa ? this.app.waibuMpa.getAppTitle(req.ns) : undefined
@@ -36,8 +36,12 @@ async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
   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
+      params.page.appTitle = this.app.waibuMpa.getAppTitle(params.error.ns)
+    }
     this.log.error('error%s', params.error.message)
-    if (this.app.bajo.config.env === 'dev') console.log(params.err)
+    if (this.app.bajo.config.env === 'dev') console.log(params.error)
   }
   if (reply && req.session && req.flash && !opts.partial) _meta.flash = reply.flash()
   const merged = merge({}, params, { _meta })

package/lib/collect-route-path-handlers.js

@@ -1,6 +1,6 @@
 async function collectRoutePathHandlers () {
   const { eachPlugins } = this.app.bajo
-  const { isEmpty } = this.app.bajo.lib._
+  const { isEmpty } = this.lib._
   this.routePathHandlers = this.routePathHandlers ?? {}
   const me = this
 

package/lib/home.js

@@ -1,6 +1,6 @@
 async function home () {
   const { defaultsDeep } = this.app.bajo
-  const { isString, pick } = this.app.bajo.lib._
+  const { isString, pick } = this.lib._
   const config = this.getConfig()
   if (config.home) {
     if (isString(config.home)) config.home = { path: config.home }

package/lib/log-routes.js

@@ -1,5 +1,5 @@
 function printRoutes () {
-  const { findIndex, orderBy, isArray } = this.app.bajo.lib._
+  const { findIndex, orderBy, isArray } = this.lib._
   let items = []
   this.routes.forEach(r => {
     const idx = findIndex(items, { url: r.url })

package/lib/webapp-scope/attach-intl.js

@@ -1,5 +1,5 @@
 function detect (detector = [], req, reply) {
-  const { get, map, trim, orderBy } = this.app.bajo.lib._
+  const { get, map, trim, orderBy } = this.lib._
   const supported = get(this, 'app.bajo.config.intl.supported', [this.app.bajo.config.lang])
   const defLang = get(this, 'app.bajo.config.intl.fallback', this.app.bajo.config.lang)
   let lang = null
@@ -49,7 +49,7 @@ function detect (detector = [], req, reply) {
 }
 
 async function attachIntl (detector = [], req, reply) {
-  const { get } = this.app.bajo.lib._
+  const { get } = this.lib._
   detect.call(this, detector, req, reply)
   const defNs = get(req, 'routeOptions.config.ns', this.name)
   req.t = (text, ...args) => {

package/lib/webapp-scope/error-handler.js

@@ -6,7 +6,7 @@ async function errorHandler (ctx, extHandler) {
       reply.send(err.print)
       return
     }
-    if (me.app.bajo.config.env !== 'prod' && me.app.bajo.config.log.level === 'trace' &&
+    if (me.app.bajo.config.env !== 'prod' &&
       !['_notfound', '_redirect'].includes(err.message.toLowerCase())) console.error(err)
     if (extHandler) return await extHandler.call(me, err, req, reply, ctx)
     if (err.message === '_notFound' || err.statusCode === 404) {

package/lib/webapp-scope/handle-multipart-body.js

@@ -6,7 +6,7 @@ const pump = promisify(pipeline)
 
 async function onFileHandler () {
   const { getPluginDataDir } = this.app.bajo
-  const { fs } = this.app.bajo.lib
+  const { fs } = this.lib
   const dir = `${getPluginDataDir('waibu')}/upload`
   return async function (part) {
     // 'this' is the fastify context here
@@ -18,8 +18,8 @@ async function onFileHandler () {
 
 async function handleMultipartBody (ctx, options = {}) {
   const { defaultsDeep, importPkg, isSet } = this.app.bajo
-  const { isArray, map, trim, isPlainObject, isEmpty } = this.app.bajo.lib._
-  const parseVar = await importPkg('dotenv-parse-variables')
+  const { isArray, map, trim, isPlainObject, isEmpty } = this.lib._
+  const parseVar = await importPkg('bajo:dotenv-parse-variables')
   if (options === false) return this.log.warn('middlewareDisabled%s', 'multipart')
   const opts = defaultsDeep(options, this.app.waibu.config.multipart)
   const onFile = await onFileHandler.call(this)

package/lib/webapp-scope/handle-rate-limit.js

@@ -1,7 +1,7 @@
 import rateLimit from '@fastify/rate-limit'
 
 async function handleRateLimit (ctx, options = {}) {
-  const { cloneDeep } = this.app.bajo.lib._
+  const { cloneDeep } = this.lib._
   const { defaultsDeep } = this.app.bajo
   if (options === false) return this.log.warn('middlewareDisabled%s', 'rateLimit')
   const opts = defaultsDeep(options, this.app.waibu.config.rateLimit)

package/lib/webapp-scope/is-route-disabled.js

@@ -6,7 +6,7 @@ function santizeMethods (methods = '*') {
 
 async function isRouteDisabled (url, method, matchers = []) {
   const { outmatch } = this.app.bajo
-  const { intersection, cloneDeep } = this.app.bajo.lib._
+  const { intersection, cloneDeep } = this.lib._
   const items = []
   for (const m of cloneDeep(matchers)) {
     m.path = this.app.waibu.routePath(m.path)

package/lib/webapp-scope/merge-route-hooks.js

@@ -1,5 +1,5 @@
 async function mergeRouteHooks (def, withHandler = true) {
-  const { last, isFunction } = this.app.bajo.lib._
+  const { last, isFunction } = this.lib._
   const { hookTypes } = this.app.waibu
   const hooks = [...hookTypes]
   const me = this

package/package.json

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

package/plugin/config-prod.json

@@ -0,0 +1,3 @@
+{
+  "logRoutes": false
+}

package/plugin/factory.js

@@ -44,7 +44,7 @@ async function factory (pkgName) {
           lang: 'lang'
         },
         paramsCharMap: {},
-        logRoutes: false,
+        logRoutes: true,
         siteInfo: {
           title: 'My Website',
           orgName: 'My Organization'
@@ -129,8 +129,21 @@ async function factory (pkgName) {
       this.instance.close()
     }
 
+    findRoute (route) {
+      const { outmatch } = this.lib
+      const { find } = this.lib._
+      const { breakNsPath } = this.app.bajo
+      const { ns, subNs = '', path } = breakNsPath(route)
+      return find(this.routes, r => {
+        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
+      })
+    }
+
     escape = (text) => {
-      const { forOwn } = this.app.bajo.lib._
+      const { forOwn } = this.lib._
       forOwn(this.escapeChars, (v, k) => {
         text = text.replaceAll(k, v)
       })
@@ -160,7 +173,7 @@ async function factory (pkgName) {
     }
 
     getPluginByPrefix = (prefix) => {
-      const { get } = this.app.bajo.lib._
+      const { get } = this.lib._
       let plugin
       for (const p of this.app.bajo.pluginNames) {
         if (get(this, `app.${p}.config.waibu.prefix`) === prefix) {
@@ -172,7 +185,7 @@ async function factory (pkgName) {
     }
 
     getPluginPrefix = (base, webApp = 'waibuMpa') => {
-      const { get, trim } = this.app.bajo.lib._
+      const { get, trim } = this.lib._
       let prefix = get(this, `app.${base}.config.waibu.prefix`, this.app[base].alias)
       if (base === 'main') {
         const cfg = this.app[webApp].config
@@ -183,7 +196,7 @@ async function factory (pkgName) {
     }
 
     getRoutes = (grouped, lite) => {
-      const { groupBy, orderBy, mapValues, map, pick } = this.app.bajo.lib._
+      const { groupBy, orderBy, mapValues, map, pick } = this.lib._
       const all = this.routes
       let routes
       if (grouped) {
@@ -196,7 +209,7 @@ async function factory (pkgName) {
 
     getUploadedFiles = async (reqId, fileUrl, returnDir) => {
       const { getPluginDataDir, resolvePath } = this.app.bajo
-      const { fastGlob } = this.app.bajo.lib
+      const { fastGlob } = this.lib
       const dir = `${getPluginDataDir(this.name)}/upload/${reqId}`
       const result = await fastGlob(`${dir}/*`)
       if (!fileUrl) return returnDir ? { dir, files: result } : result
@@ -205,7 +218,7 @@ async function factory (pkgName) {
     }
 
     isIntlPath = (ns) => {
-      const { get } = this.app.bajo.lib._
+      const { get } = this.lib._
       return get(this.app[ns], 'config.intl.detectors', []).includes('path')
     }
 
@@ -223,7 +236,7 @@ async function factory (pkgName) {
     }
 
     routeDir = (ns, base) => {
-      const { get } = this.app.bajo.lib._
+      const { get } = this.lib._
       if (!base) base = ns
       const cfg = this.app[base].config
       const prefix = get(cfg, 'waibu.prefix', this.app[base].alias)
@@ -237,7 +250,7 @@ async function factory (pkgName) {
 
     routePath = (name = '', options = {}) => {
       const { defaultsDeep, getPlugin } = this.app.bajo
-      const { isEmpty, get, trimEnd, trimStart } = this.app.bajo.lib._
+      const { isEmpty, get, trimEnd, trimStart } = this.lib._
       const { breakNsPath } = this.app.bajo
       const { query = {}, base = 'waibu', params = {}, guessHost } = options
 
@@ -268,7 +281,7 @@ async function factory (pkgName) {
 
     sendMail = async (tpl, { to, cc, bcc, from, subject, data = {}, conn, options = {} }) => {
       if (!this.app.masohiMail) return
-      const { get, isString } = this.app.bajo.lib._
+      const { get, isString } = this.lib._
       const { generateId } = this.app.bajo
       const { render } = this.app.bajoTemplate
       if (isString(tpl)) tpl = [tpl]
@@ -294,7 +307,7 @@ async function factory (pkgName) {
     }
 
     unescape = (text) => {
-      const { forOwn, invert } = this.app.bajo.lib._
+      const { forOwn, invert } = this.lib._
       const mapping = invert(this.escapeChars)
       forOwn(mapping, (v, k) => {
         text = text.replaceAll(k, v)