sumba 2.0.0 → 2.0.1

package/extend/bajo/hook/waibu@after-app-boot.js

@@ -3,7 +3,7 @@ import collectTeam from '../../../lib/collect-team.js'
 
 async function afterAppBoot () {
   const { runHook } = this.app.bajo
-  await runHook(`${this.name}:beforeBoot`)
+  await runHook(`${this.ns}:beforeBoot`)
   this.log.trace('collectingRouteGuards')
   await collectRoutes.call(this, 'secure')
   this.log.trace('secureRoutes%d', this.secureRoutes.length)
@@ -15,7 +15,7 @@ async function afterAppBoot () {
   await collectTeam.call(this)
   this.log.trace('teamRoutes%d', this.teamRoutes.length)
   this.log.trace('teamNegRoutes%d', this.teamNegRoutes.length)
-  await runHook(`${this.name}:afterBoot`)
+  await runHook(`${this.ns}:afterBoot`)
 }
 
 export default afterAppBoot

package/extend/dobo/feature/lat-lng.js

@@ -1,7 +1,7 @@
 import latLngHook from '../../../lib/lat-lng-hook.js'
 
 async function latLng (opts = {}) {
-  const { merge } = this.lib._
+  const { merge } = this.app.lib._
   opts.fieldNameLat = opts.fieldNameLat ?? 'lat'
   opts.fieldNameLng = opts.fieldNameLng ?? 'lng'
   opts.scale = opts.scale ?? 5

package/extend/dobo/feature/slug.js

@@ -2,7 +2,7 @@ import slug from 'slug'
 
 async function autoInc ({ schema, body, opts }) {
   const { recordFind } = this.app.dobo
-  const { set, last } = this.lib._
+  const { set, last } = this.app.lib._
   const query = set({}, opts.fieldName, { $regex: new RegExp('^' + body[opts.fieldName]) })
   const sort = set({}, opts.fieldName, -1)
   const options = { noHook: true, skipCache: true, thrownNotFound: false }
@@ -40,7 +40,7 @@ async function mainFn (opts = {}) {
     hook: {
       beforeCreate: async function ({ schema, body }) {
         const { error } = this.app.bajo
-        const { isEmpty, isString } = this.lib._
+        const { isEmpty, isString } = this.app.lib._
         if (isEmpty(body[opts.fieldName])) {
           if (isString(opts.fieldSource)) opts.fieldSource = [opts.fieldSource]
           const source = []

package/extend/dobo/feature/status.js

@@ -10,7 +10,7 @@ async function status (opts = {}) {
     }],
     hook: {
       beforeCreate: async function ({ body }) {
-        const { isSet } = this.lib.aneka
+        const { isSet } = this.app.lib.aneka
         if (!isSet(body[opts.fieldName])) body[opts.fieldName] = opts.default
       }
     }

package/extend/dobo/feature/url.js

@@ -1,5 +1,5 @@
 async function hook (schema, body, options) {
-  const { isSet } = this.lib.aneka
+  const { isSet } = this.app.lib.aneka
   let val = body[options.fieldName]
   if (!isSet(val)) return
   const [, ...params] = val.split('://')

package/extend/masohiSocketIo/middleware/server/auth.js

@@ -1,7 +1,7 @@
 const auth = {
   level: 5,
   handler: async function (socket) {
-    const { camelCase } = this.lib._
+    const { camelCase } = this.app.lib._
     const { req } = socket
     const { session } = req
     const site = await this.getSite(session.siteId)

package/extend/waibuBootstrap/theme/component/factory/nav-dropdown-user.js

@@ -1,7 +1,7 @@
 async function navDropdownUser () {
   return class NavDropdownUser extends this.baseFactory {
     build = async () => {
-      const { has, omit, find, filter } = this.plugin.lib._
+      const { has, omit, find, filter } = this.app.lib._
       const { routePath } = this.plugin.app.waibu
       const { req } = this.component
       const icon = this.component.req.iconset ? await this.component.buildTag({ tag: 'icon', attr: { name: 'person' } }) : ''

package/extend/waibuMpa/extend/waibuAdmin/route/reset-user-password.js

@@ -6,7 +6,7 @@ const resetUserPassword = {
   handler: async function (req, reply) {
     const { importPkg } = this.app.bajo
     const { recordFindOne, recordUpdate } = this.app.dobo
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     const Joi = await importPkg('dobo:joi')
     const model = 'SumbaUser'
     const form = defaultsDeep(req.body, { username: req.query.username })
@@ -22,7 +22,7 @@ const resetUserPassword = {
         try {
           await schema.validateAsync(req.body, this.app.dobo.config.validationParams)
         } catch (err) {
-          throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
+          throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
         const rec = await recordFindOne(model, { query: { username: req.body.username } })
         if (!rec) throw this.error('unknownUser', { details: [{ field: 'username', error: 'unknownUser' }], statusCode: 400 })

package/extend/waibuMpa/route/help/contact-form.js

@@ -1,8 +1,8 @@
 const contactForm = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
-    const { pick } = this.lib._
+    const { defaultsDeep } = this.app.lib.aneka
+    const { pick } = this.app.lib._
     const { recordCreate, recordFind } = this.app.waibuDb
 
     const def = req.user ? pick(req.user, ['firstName', 'lastName', 'email']) : {}

package/extend/waibuMpa/route/help/trouble-tickets/add.js

@@ -3,7 +3,7 @@ const model = 'SumbaTicket'
 const add = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     const { recordCreate, recordFind } = this.app.waibuDb
     const options = {}
     const form = defaultsDeep(req.body, {})

package/extend/waibuMpa/route/help/trouble-tickets/details/@id.js

@@ -3,7 +3,7 @@ const model = 'SumbaTicketDetail'
 const id = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { cloneDeep } = this.lib._
+    const { cloneDeep } = this.app.lib._
     const { recordCreate, recordFind, getSchemaExt } = this.app.waibuDb
     const { schema } = await getSchemaExt(model, 'list')
 

package/extend/waibuMpa/route/signout.js

@@ -2,7 +2,7 @@ const signout = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { runHook } = this.app.bajo
-    // const { isEmpty } = this.lib._
+    // const { isEmpty } = this.app.lib._
     const { getSessionId } = this.app.waibuMpa
 
     let { referer } = req.body || {}
@@ -11,7 +11,7 @@ const signout = {
     if (req.method === 'POST') {
       const sid = await getSessionId(req.headers.cookie)
       req.session.userId = null
-      await runHook(`${this.name}:afterSignout`, sid, req)
+      await runHook(`${this.ns}:afterSignout`, sid, req)
       const { query, params } = req
       // const url = !isEmpty(referer) ? referer : this.config.redirect.home
       const url = this.config.redirect.afterSignout

package/extend/waibuMpa/route/user/activation.js

@@ -3,7 +3,7 @@ const model = 'SumbaUser'
 const userActivation = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     const { recordFind, recordUpdate } = this.app.dobo
     const form = defaultsDeep(req.body, { key: req.query.key })
     let error

package/extend/waibuMpa/route/user/forgot-password/@fpl.js

@@ -2,7 +2,7 @@ import passwordRule from '../../../../../lib/password-rule.js'
 const model = 'SumbaUser'
 
 async function getUser (req, reply) {
-  const { dayjs } = this.lib
+  const { dayjs } = this.app.lib
   const { recordFind } = this.app.waibuDb
   const invalidFpl = 'sumba.template:/user/fpl-invalid.html'
   if (Buffer.from(req.params.fpl, 'base64').toString('base64') !== req.params.fpl) return invalidFpl
@@ -19,9 +19,9 @@ const forgotPasswordLink = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { sendMail } = this.app.waibu
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     const { importPkg } = this.app.bajo
-    const { isString } = this.lib._
+    const { isString } = this.app.lib._
     const { recordUpdate } = this.app.dobo
     const Joi = await importPkg('dobo:joi')
 
@@ -40,7 +40,7 @@ const forgotPasswordLink = {
         try {
           await schema.validateAsync(req.body, this.app.dobo.config.validationParams)
         } catch (err) {
-          throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
+          throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
         await recordUpdate(model, user.id, { password: req.body.newPassword }, { noFlash: true })
         const to = `${user.firstName} ${user.lastName} <${user.email}>`
@@ -48,7 +48,7 @@ const forgotPasswordLink = {
         const options = { req, reply, tpl: '' }
         await sendMail(
           'sumba.template:/_mail/user-forgot-password-changed.html',
-          { to, subject, data: user, options, source: this.name }
+          { to, subject, data: user, options, source: this.ns }
         )
         req.flash('notify', req.t('passwordChangedReSignin'))
         return reply.redirectTo(this.config.redirect.signin)

package/extend/waibuMpa/route/user/forgot-password.js

@@ -5,8 +5,8 @@ const profile = {
   handler: async function (req, reply) {
     if (!this.app.masohiMail) return await reply.view('sumba.template:/user/forgot-password.html')
     const { sendMail } = this.app.waibu
-    const { defaultsDeep } = this.lib.aneka
-    const { dayjs } = this.lib
+    const { defaultsDeep } = this.app.lib.aneka
+    const { dayjs } = this.app.lib
     const { recordFind } = this.app.dobo
     const form = defaultsDeep(req.body, {})
     let error
@@ -24,7 +24,7 @@ const profile = {
         data._meta = { hostHeader: req.headers.host }
         await sendMail(
           'sumba.template:/_mail/user-forgot-password-link.html',
-          { to, subject, data, options, source: this.name }
+          { to, subject, data, options, source: this.ns }
         )
         req.flash('notify', req.t('emailSent'))
         return reply.redirectTo(this.config.redirect.signin)

package/extend/waibuMpa/route/user/signup.js

@@ -1,7 +1,7 @@
 const signup = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     const { generateId } = this.app.bajo
     const { recordCreate } = this.app.waibuDb
 

package/extend/waibuMpa/route/your-stuff/change-password.js

@@ -3,7 +3,7 @@ import passwordRule from '../../../../lib/password-rule.js'
 const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     const { importPkg } = this.app.bajo
     const { recordGet, recordUpdate } = this.app.dobo
     const bcrypt = await importPkg('bajoExtra:bcrypt')
@@ -22,7 +22,7 @@ const profile = {
         try {
           await schema.validateAsync(req.body, this.app.dobo.config.validationParams)
         } catch (err) {
-          throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
+          throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
         const rec = await recordGet(model, req.user.id, { forceNoHidden: true })
         const verified = await bcrypt.compare(req.body.currentPassword, rec.password)

package/extend/waibuMpa/route/your-stuff/profile/edit.js

@@ -1,10 +1,10 @@
 const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     // const { attachmentCopyUploaded } = this.app.dobo
     const { recordUpdate, recordGet } = this.app.waibuDb
-    const { omit, pick } = this.lib._
+    const { omit, pick } = this.app.lib._
     const { hash } = this.app.bajoExtra
     const resp = await recordGet({ model: 'SumbaUser', req, id: req.user.id, options: { forceNoHidden: true, noHook: true, noCache: true } })
     let form = defaultsDeep(req.body, omit(resp.data, ['password']))

package/extend/waibuMpa/route/your-stuff/reset-api-key.js

@@ -3,7 +3,7 @@ const model = 'SumbaUser'
 const resetApiKey = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     const { importPkg, generateId } = this.app.bajo
     const { recordGet, recordUpdate } = this.app.dobo
     const { hash } = this.app.bajoExtra
@@ -20,7 +20,7 @@ const resetApiKey = {
         try {
           await schema.validateAsync(req.body, this.app.dobo.config.validationParams)
         } catch (err) {
-          throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
+          throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
         const rec = await recordGet(model, req.user.id, { forceNoHidden: true })
         const verified = await bcrypt.compare(req.body.password, rec.password)

package/extend/waibuRestApi/route/your-stuff/profile/update.js

@@ -3,7 +3,7 @@ const hidden = ['password', 'token', 'siteId']
 
 async function get ({ ctx }) {
   const { recordUpdate } = this.app.waibuDb
-  const { omit } = this.lib._
+  const { omit } = this.app.lib._
 
   const { docSchemaModel } = this.app.waibuRestApi
   const schema = await docSchemaModel({ model, method: 'update', ctx, options: { hidden, noId: true } })

package/extend/waibuSocketIo/middleware/server/auth.js

@@ -1,7 +1,7 @@
 export default {
   level: 1,
   handler: async function (socket) {
-    const { merge } = this.lib._
+    const { merge } = this.app.lib._
     const { recordGet } = this.app.dobo
     const { getSessionId } = this.app.waibuMpa
 

package/index.js

@@ -1,13 +1,25 @@
 import path from 'path'
 
+/**
+ * Plugin factory
+ *
+ * @param {string} pkgName - NPM package name
+ * @returns {class}
+ */
 async function factory (pkgName) {
   const me = this
 
-  return class Sumba extends this.lib.Plugin {
+  /**
+   * Sumba class
+   *
+   * @class
+   */
+  class Sumba extends this.app.pluginClass.base {
+    static alias = 'sumba'
+    static dependencies = ['bajo-extra', 'bajo-common-db', 'bajo-config']
+
     constructor () {
       super(pkgName, me.app)
-      this.alias = 'sumba'
-      this.dependencies = ['bajo-extra', 'bajo-common-db', 'bajo-config']
       this.config = {
         multiSite: false,
         waibu: {
@@ -119,8 +131,8 @@ async function factory (pkgName) {
 
     init = async () => {
       const { getPluginDataDir } = this.app.bajo
-      this.downloadDir = `${getPluginDataDir(this.name)}/download`
-      this.lib.fs.ensureDirSync(this.downloadDir)
+      this.downloadDir = `${getPluginDataDir(this.ns)}/download`
+      this.app.lib.fs.ensureDirSync(this.downloadDir)
       for (const type of ['secure', 'anonymous', 'team']) {
         this[`${type}Routes`] = this[`${type}Routes`] ?? []
         this[`${type}NegRoutes`] = this[`${type}NegRoutes`] ?? []
@@ -128,8 +140,8 @@ async function factory (pkgName) {
     }
 
     _getSetting = async (type, source) => {
-      const { defaultsDeep } = this.lib.aneka
-      const { get } = this.lib._
+      const { defaultsDeep } = this.app.lib.aneka
+      const { get } = this.app.lib._
 
       const setting = defaultsDeep(get(this.config, `auth.${source}.${type}`, {}), get(this.config, `auth.common.${type}`, {}))
       if (type === 'basic') setting.type = 'Basic'
@@ -137,7 +149,7 @@ async function factory (pkgName) {
     }
 
     _getToken = async (type, req, source) => {
-      const { isEmpty } = this.lib._
+      const { isEmpty } = this.app.lib._
 
       const setting = await this._getSetting(type, source)
       let token = req.headers[setting.headerKey.toLowerCase()]
@@ -153,7 +165,7 @@ async function factory (pkgName) {
     adminMenu = async (locals, req) => {
       if (!this.app.waibuAdmin) return
       const { getPluginPrefix } = this.app.waibu
-      const prefix = getPluginPrefix(this.name)
+      const prefix = getPluginPrefix(this.ns)
       return [{
         title: 'supportSystem',
         children: [
@@ -182,7 +194,7 @@ async function factory (pkgName) {
 
     getUser = async (rec, safe = true) => {
       const { recordGet } = this.app.dobo
-      const { omit, isPlainObject } = this.lib._
+      const { omit, isPlainObject } = this.app.lib._
       let user
       if (isPlainObject(rec)) user = rec
       else user = await recordGet('SumbaUser', rec, { noHook: true })
@@ -191,7 +203,7 @@ async function factory (pkgName) {
 
     mergeTeam = async (user, site) => {
       if (!user) return
-      const { map, pick } = this.lib._
+      const { map, pick } = this.app.lib._
       const { recordFindAll } = this.app.dobo
       user.teams = []
       const query = { userId: user.id, siteId: site.id }
@@ -222,9 +234,9 @@ async function factory (pkgName) {
 
     createJwtFromUserRecord = async (rec) => {
       const { importPkg } = this.app.bajo
-      const { dayjs } = this.lib
+      const { dayjs } = this.app.lib
       const { hash } = this.app.bajoExtra
-      const { get, pick } = this.lib._
+      const { get, pick } = this.app.lib._
 
       const fastJwt = await importPkg('bajoExtra:fast-jwt')
       const { createSigner } = fastJwt
@@ -254,7 +266,7 @@ async function factory (pkgName) {
     }
 
     verifyApiKey = async (req, reply, source, payload) => {
-      const { merge } = this.lib._
+      const { merge } = this.app.lib._
       const { isMd5, hash } = this.app.bajoExtra
       const { getUser } = this
       const { recordFind } = this.app.dobo
@@ -273,10 +285,10 @@ async function factory (pkgName) {
     verifyBasic = async (req, reply, source, payload) => {
       const { getUserFromUsernamePassword } = this
       const { getUser } = this
-      const { isEmpty, merge } = this.lib._
+      const { isEmpty, merge } = this.app.lib._
 
       const setHeader = async (setting, reply) => {
-        const { isString } = this.lib._
+        const { isString } = this.app.lib._
 
         let header = setting.type
         const exts = []
@@ -316,7 +328,7 @@ async function factory (pkgName) {
       const { importPkg } = this.app.bajo
       const { recordGet } = this.app.dobo
       const { getUser } = this
-      const { isEmpty, merge } = this.lib._
+      const { isEmpty, merge } = this.app.lib._
 
       const fastJwt = await importPkg('bajoExtra:fast-jwt')
       const { createVerifier } = fastJwt
@@ -342,8 +354,8 @@ async function factory (pkgName) {
     }
 
     checkPathsByTeam = ({ paths = [], method = 'GET', teams = [], guards = [] }) => {
-      const { includes } = this.lib.aneka
-      const { outmatch } = this.lib
+      const { includes } = this.app.lib.aneka
+      const { outmatch } = this.app.lib
 
       for (const item of guards) {
         const matchPath = outmatch(item.path)
@@ -360,7 +372,7 @@ async function factory (pkgName) {
     }
 
     checkPathsByRoute = ({ paths = [], method = 'GET', guards = [] }) => {
-      const { outmatch } = this.lib
+      const { outmatch } = this.app.lib
 
       for (const item of guards) {
         const matchPath = outmatch(item.path)
@@ -374,7 +386,7 @@ async function factory (pkgName) {
     }
 
     checkPathsByGuard = ({ guards, paths }) => {
-      const { outmatch } = this.lib
+      const { outmatch } = this.app.lib
       const matcher = outmatch(guards)
       let guarded
       for (const path of paths) {
@@ -384,23 +396,24 @@ async function factory (pkgName) {
     }
 
     getSite = async (hostname, useId) => {
-      const { omit } = this.lib._
+      const { omit } = this.app.lib._
       const { recordFind } = this.app.dobo
       const omitted = ['status']
 
       const mergeSetting = async (site) => {
-        const { defaultsDeep } = this.lib.aneka
+        const { defaultsDeep } = this.app.lib.aneka
         const { parseObject } = this.app.bajo
-        const { trim, get, filter } = this.lib._
+        const { trim, get, filter } = this.app.lib._
         const { recordFind, recordGet } = this.app.dobo
         const defSetting = {}
         const nsSetting = {}
+        const names = this.app.getAllNs()
         const query = {
-          ns: { $in: this.app.bajo.pluginNames },
+          ns: { $in: names },
           siteId: site.id
         }
         const all = await recordFind('SumbaSiteSetting', { query, limit: -1 })
-        for (const ns of this.app.bajo.pluginNames) {
+        for (const ns of names) {
           nsSetting[ns] = {}
           defSetting[ns] = get(this, `app.${ns}.config.siteSetting`, {})
           const items = filter(all, { ns })
@@ -449,14 +462,14 @@ async function factory (pkgName) {
     signin = async ({ user, req, reply }) => {
       const { getSessionId } = this.app.waibuMpa
       const { runHook } = this.app.bajo
-      const { isEmpty, omit } = this.lib._
+      const { isEmpty, omit } = this.app.lib._
       let { referer } = req.body || {}
       if (req.session.ref) referer = req.session.ref
       req.session.ref = null
       const _user = omit(user, ['password', 'token'])
       req.session.userId = _user.id
       const sid = await getSessionId(req.headers.cookie)
-      await runHook(`${this.name}:afterSignin`, _user, sid, req)
+      await runHook(`${this.ns}:afterSignin`, _user, sid, req)
       const { query, params } = req
       const url = !isEmpty(referer) ? referer : this.config.redirect.afterSignin
       req.flash('notify', req.t('signinSuccessfully'))
@@ -503,6 +516,8 @@ async function factory (pkgName) {
       return await hash(resp.salt)
     }
   }
+
+  return Sumba
 }
 
 export default factory

package/lib/check-iconset.js

@@ -1,5 +1,5 @@
 async function checkIconset (req, reply) {
-  const { get } = this.lib._
+  const { get } = this.app.lib._
   const mpa = this.app.waibuMpa
 
   if (!req.site) return

package/lib/check-team.js

@@ -2,7 +2,7 @@ import { pathsToCheck } from './check-user-id.js'
 
 async function checkTeam (req, reply, source) {
   if (!req.user) return
-  const { map } = this.lib._
+  const { map } = this.app.lib._
   await this.mergeTeam(req.user, req.site)
   const paths = pathsToCheck.call(this, req, true)
   const teams = map(req.user.teams, 'alias')

package/lib/check-theme.js

@@ -1,5 +1,5 @@
 async function checkTheme (req, reply) {
-  const { get } = this.lib._
+  const { get } = this.app.lib._
   const mpa = this.app.waibuMpa
 
   if (!req.site) return

package/lib/check-user-id.js

@@ -1,10 +1,10 @@
 export function pathsToCheck (req, withHome) {
-  const { uniq, without } = this.lib._
+  const { uniq, without } = this.app.lib._
   return uniq(without([req.routeOptions.url, req.url], undefined, null))
 }
 
 async function setUser (req) {
-  const { get } = this.lib._
+  const { get } = this.app.lib._
   const id = get(req, 'session.userId')
   if (!id) return
   try {
@@ -17,7 +17,7 @@ async function setUser (req) {
 }
 
 async function checkUserId (req, reply, source) {
-  const { merge, isEmpty, camelCase, get } = this.lib._
+  const { merge, isEmpty, camelCase, get } = this.app.lib._
   const { routePath } = this.app.waibu
   const userId = get(req, 'session.userId')
   if (req.session) req.session.siteId = req.site.id

package/lib/collect-routes.js

@@ -1,7 +1,7 @@
 export async function collect ({ type = '', handler, container, file, ns, dir }) {
   const { readConfig } = this.app.bajo
   const { routePath, routePathHandlers } = this.app.waibu
-  const { camelCase, find, isString, isEmpty } = this.lib._
+  const { camelCase, find, isString, isEmpty } = this.app.lib._
   let items = await readConfig(file, { ignoreError: true })
   if (isEmpty(items)) items = []
 
@@ -24,7 +24,7 @@ export async function collect ({ type = '', handler, container, file, ns, dir })
 }
 
 function handler (item) {
-  const { isString } = this.lib._
+  const { isString } = this.app.lib._
   for (const k of ['methods']) {
     item[k] = item[k] ?? []
     if (isString(item[k])) item[k] = item[k].split(',')
@@ -35,9 +35,9 @@ async function collectRoutes (type) {
   const { eachPlugins } = this.app.bajo
   const me = this
   await eachPlugins(async function ({ file, dir }) {
-    const { name: ns } = this
+    const { ns } = this
     await collect.call(me, { type, container: 'Routes', handler, file, ns, dir })
-  }, { glob: `route/${type}.*`, prefix: this.name })
+  }, { glob: `route/${type}.*`, prefix: this.ns })
 }
 
 export default collectRoutes

package/lib/collect-team.js

@@ -1,7 +1,7 @@
 import { collect } from './collect-routes.js'
 
 function handler (item) {
-  const { isString } = this.lib._
+  const { isString } = this.app.lib._
   for (const k of ['methods', 'teams', 'features']) {
     item[k] = item[k] ?? []
     if (isString(item[k])) item[k] = item[k].split(',')
@@ -12,9 +12,9 @@ async function collectTeam () {
   const { eachPlugins } = this.app.bajo
   const me = this
   await eachPlugins(async function ({ file, dir }) {
-    const { name: ns } = this
+    const { ns } = this
     await collect.call(me, { type: 'team', container: 'Routes', handler, file, ns, dir })
-  }, { glob: 'route/team.*', prefix: this.name })
+  }, { glob: 'route/team.*', prefix: this.ns })
 }
 
 export default collectTeam

package/lib/lat-lng-hook.js

@@ -1,6 +1,6 @@
 async function hook (body, options) {
-  const { isSet } = this.lib.aneka
-  const { round } = this.lib.aneka
+  const { isSet } = this.app.lib.aneka
+  const { round } = this.app.lib.aneka
   if (!isSet(body[options.fieldName])) return
   body[options.fieldName] = round(body[options.fieldName], options.scale)
 }