bajo 2.1.0 → 2.2.1

package/class/helper/bajo.js

@@ -1,7 +1,5 @@
-import currentLoc from '../../lib/current-loc.js'
-import resolvePath from '../../lib/resolve-path.js'
-import Print from '../misc/print.js'
-import Log from '../misc/log.js'
+import Print from '../plugin/print.js'
+import Log from '../app/log.js'
 import omitDeep from 'omit-deep'
 import os from 'os'
 import fs from 'fs-extra'
@@ -10,15 +8,14 @@ import {
   buildConfigs,
   checkDependencies,
   checkNameAliases,
-  attachMethods,
   collectHooks,
   run
 } from './base.js'
+import aneka from 'aneka'
+
+const { currentLoc, resolvePath } = aneka
 
 const {
-  reduce,
-  isNaN,
-  forOwn,
   orderBy,
   isFunction,
   isPlainObject,
@@ -40,6 +37,9 @@ const omitted = ['spawn', 'cwd', 'name', 'alias', 'applet', 'a', 'plugins']
 
 const defConfig = {
   env: 'dev',
+  runtime: {
+    noWarning: false
+  },
   log: {
     timeTaken: false,
     dateFormat: 'YYYY-MM-DDTHH:mm:ss.SSS',
@@ -81,7 +81,7 @@ const defConfig = {
 const defMain = `async function factory (pkgName) {
   const me = this
 
-  return class Main extends this.app.pluginClass.base {
+  return class Main extends this.app.baseClass.Base {
     constructor () {
       super(pkgName, me.app)
       this.config = {}
@@ -115,20 +115,24 @@ export async function buildBaseConfig () {
   this.config = defaultsDeep({}, this.app.envVars._, this.app.argv._)
   set(this, 'dir.base', this.app.dir)
   const path = currentLoc(import.meta).dir + '/../..'
-  set(this, 'dir.pkg', this.resolvePath(path))
+  set(this, 'dir.pkg', resolvePath(path))
   if (get(this, 'config.dir.data')) set(this, 'dir.data', this.config.dir.data)
   if (!get(this, 'dir.data')) set(this, 'dir.data', `${this.dir.base}/data`)
-  this.dir.data = this.resolvePath(this.dir.data)
+  this.dir.data = resolvePath(this.dir.data)
   fs.ensureDirSync(`${this.dir.data}/config`)
   if (!this.dir.tmp) {
-    this.dir.tmp = `${this.resolvePath(os.tmpdir())}/${this.ns}`
+    this.dir.tmp = `${resolvePath(os.tmpdir())}/${this.ns}`
     fs.ensureDirSync(this.dir.tmp)
   }
+  this.pkg = await this.getPkgInfo()
   // collect list of plugins
-  let pluginPkgs = []
-  const pluginsFile = `${this.dir.data}/config/.plugins`
-  if (fs.existsSync(pluginsFile)) {
-    pluginPkgs = pluginPkgs.concat(filter(map(trim(fs.readFileSync(pluginsFile, 'utf8')).split('\n'), p => trim(p)), b => !isEmpty(b)))
+  const mainPkg = await this.getPkgInfo(this.app.dir)
+  let pluginPkgs = get(mainPkg, 'bajo.plugins', [])
+  if (isEmpty(pluginPkgs)) {
+    const pluginsFile = `${this.dir.data}/config/.plugins`
+    if (fs.existsSync(pluginsFile)) {
+      pluginPkgs = pluginPkgs.concat(filter(map(trim(fs.readFileSync(pluginsFile, 'utf8')).split('\n'), p => trim(p)), b => !isEmpty(b)))
+    }
   }
   this.app.pluginPkgs = map(filter(without(uniq(pluginPkgs), this.app.mainNs), p => {
     return p[0] !== '#'
@@ -164,7 +168,10 @@ export async function buildPlugins () {
     const { default: builder } = await import(resolvePath(factory, true))
     const ClassDef = await builder.call(this, pkg)
     const plugin = new ClassDef()
-    if (!(plugin instanceof this.app.pluginClass.base)) throw this.error('pluginPackageInvalid%s', pkg)
+    if (!(plugin instanceof this.app.baseClass.Base)) throw this.error('pluginPackageInvalid%s', pkg)
+    plugin.pkg = plugin.getPkgInfo(ns === 'main' ? this.dir.base : dir)
+    plugin.alias = ns === 'main' ? this.app.mainNs : get(plugin.pkg, 'bajo.alias', (pkg.slice(0, 5) === 'bajo-' ? pkg.slice(5) : ns).toLowerCase())
+    plugin.dependencies = get(plugin.pkg, 'bajo.dependencies', [])
     this.app.addPlugin(plugin, ClassDef)
     this.log.trace('- ' + pkg)
   }
@@ -190,7 +197,6 @@ export async function collectConfigHandlers () {
     if (isPlainObject(mod)) mod = [mod]
     this.app.configHandlers = this.app.configHandlers.concat(mod)
   }
-  this.app.log = new Log(this.app)
 }
 
 /**
@@ -204,9 +210,11 @@ export async function collectConfigHandlers () {
 export async function buildExtConfig () {
   // config merging
   const { defaultsDeep } = this.app.lib.aneka
+  const { parseObject } = this.app.lib
+
   let resp = await this.readAllConfigs(`${this.dir.data}/config/${this.ns}`)
-  resp = omitDeep(pick(resp, ['log', 'exitHandler', 'env']), omitted)
-  const envs = this.app.constructor.envs
+  resp = omitDeep(pick(resp, ['log', 'exitHandler', 'env', 'runtime']), omitted)
+  const envs = this.app.envs
   this.config = defaultsDeep({}, this.config, resp, defConfig)
   // language
   this.config.lang = (this.config.lang ?? '').split('.')[0]
@@ -219,13 +227,15 @@ export async function buildExtConfig () {
   if (!this.config.log.level) this.config.log.level = this.config.env === 'dev' ? 'debug' : 'info'
   // misc
   const obj = this.app.applet ? this.config : pick(this.config, keys(defConfig))
-  this.config = this.parseObject(obj, { parseValue: true })
+  this.config = parseObject(obj, { parseValue: true })
   const exts = this.app.getConfigFormats()
   if (this.app.applet) {
     if (!this.app.pluginPkgs.includes('bajo-cli')) throw this.error('appletNeedsBajoCli')
     if (!this.config.log.applet) this.config.log.level = 'silent'
     this.config.exitHandler = false
   }
+  if (this.config.runtime.noWarning) process.removeAllListeners('warning')
+  this.app.log = new Log(this.app)
   this.log.trace('dataDir%s', this.dir.data)
   this.log.debug('configHandlers%s', this.join(exts))
 }
@@ -236,32 +246,26 @@ export async function buildExtConfig () {
  * @async
  */
 export async function bootOrder () {
+  const { freeze } = this.app.lib
+  const { isNumber } = this.app.lib._
   this.log.debug('setupBootOrder')
-  const order = reduce(this.app.pluginPkgs, (o, k, i) => {
-    const key = map(k.split(':'), m => trim(m))
-    if (key[1] && !isNaN(Number(key[1]))) o[key[0]] = Number(key[1])
-    else o[key[0]] = 10000 + i
-    return o
-  }, {})
-  const norder = {}
-  for (let n of this.app.pluginPkgs) {
-    n = map(n.split(':'), m => trim(m))[0]
-    const dir = n === this.app.mainNs ? (`${this.dir.base}/${this.app.mainNs}`) : this.getModuleDir(n)
-    if (n !== this.app.mainNs && !fs.existsSync(dir)) throw this.error('packageNotFoundOrNotBajo%s', n)
-    norder[n] = NaN
-    try {
-      norder[n] = Number(trim(await fs.readFile(`${dir}/.bootorder`, 'utf8')))
-    } catch (err) {}
+  let counter = 1000
+  const orders = []
+  for (const pkg of this.app.pluginPkgs) {
+    const item = { pkg }
+    const ns = camelCase(pkg)
+    const order = get(this.app[ns], 'pkg.bajo.bootorder')
+    if (isNumber(order)) item.val = order
+    else {
+      item.val = counter
+      counter++
+    }
+    orders.push(item)
   }
-  const result = []
-  forOwn(order, (v, k) => {
-    const item = { k, v: isNaN(norder[k]) ? v : norder[k] }
-    result.push(item)
-  })
-  this.app.pluginPkgs = map(orderBy(result, ['v']), 'k')
-  this.log.debug('runInEnv%s', this.t(this.app.constructor.envs[this.config.env]))
+  this.app.pluginPkgs = map(orderBy(orders, ['val']), 'pkg')
+  this.log.debug('runInEnv%s', this.t(this.app.envs[this.config.env]))
   // misc
-  this.freeze(this.config)
+  freeze(this.config)
 }
 
 /**
@@ -270,9 +274,8 @@ export async function bootOrder () {
  * 1. {@link module:Helper/Base.buildConfigs|build configs}
  * 2. {@link module:Helper/Base.checkNameAliases|ensure names & aliases uniqueness}
  * 3. {@link module:Helper/Base.checkDependencies|ensure dependencies are met}
- * 4. {@link module:Helper/Base.attachMethods|build and attach dynamic methods}
- * 5. {@link module:Helper/Base.collectHooks|collect hooks}
- * 6. {@link module:Helper/Base.run|run plugins}
+ * 4. {@link module:Helper/Base.collectHooks|collect hooks}
+ * 5. {@link module:Helper/Base.run|run plugins}
  *
  * @async
  */
@@ -280,7 +283,6 @@ export async function bootPlugins () {
   await buildConfigs.call(this.app)
   await checkNameAliases.call(this.app)
   await checkDependencies.call(this.app)
-  await attachMethods.call(this.app)
   await collectHooks.call(this.app)
   await run.call(this.app)
 }
@@ -296,11 +298,12 @@ export async function exitHandler () {
   async function exit (signal) {
     const { eachPlugins } = this
     if (signal) this.log.warn('signalReceived%s', signal)
+    const me = this
     await eachPlugins(async function ({ ns }) {
       try {
         await this.exit()
       } catch (err) {}
-      this.log.trace('exited')
+      me.log.trace('exited%s', this.ns)
     })
     this.log.debug('appShutdown')
     process.exit(0)
@@ -356,8 +359,7 @@ export async function exitHandler () {
 export async function runAsApplet () {
   const { isString, map, find } = this.app.lib._
   await this.eachPlugins(async function ({ file }) {
-    const { ns } = this
-    const { alias } = this.constructor
+    const { ns, alias } = this
     this.app.applets.push({ ns, file, alias })
   }, { glob: 'applet.js', prefix: 'bajoCli' })
 
@@ -385,7 +387,7 @@ export async function runAsApplet () {
    * @see {@tutorial hook}
    * @see module:Helper/Bajo.runAsApplet
    */
-  await this.runHook(`${this.app[applet.ns]}:beforeAppletRun`, ...this.app.args)
+  await this.runHook(`${applet.ns}:beforeAppletRun`, ...this.app.args)
   await this.app.bajoCli.runApplet(applet, path, ...this.app.args)
   /**
    * Run after applet is run. ```[ns]``` is applet's namespace
@@ -396,5 +398,5 @@ export async function runAsApplet () {
    * @see {@tutorial hook}
    * @see module:Helper/Bajo.runAsApplet
    */
-  await this.runHook(`${this.app[applet.ns]}:afterAppletRun`, ...this.app.args)
+  await this.runHook(`${applet.ns}:afterAppletRun`, ...this.app.args)
 }

package/class/helper/base.js

@@ -1,11 +1,8 @@
 import semver from 'semver'
 import lodash from 'lodash'
-import Print from '../misc/print.js'
-import path from 'path'
-import resolvePath from '../../lib/resolve-path.js'
+import Print from '../plugin/print.js'
 
 const {
-  isFunction,
   merge,
   forOwn,
   groupBy,
@@ -27,41 +24,6 @@ const {
  * @module Helper/Base
  */
 
-/**
- * Scan plugins ```method``` directories, and turn + attach its found files as methods dynamically.
- *
- * @async
- */
-export async function attachMethods () {
-  const { fastGlob } = this.lib
-
-  async function createMethod (dir) {
-    dir = resolvePath(dir)
-    const files = await fastGlob([`!${dir}/**/_*.{js,json}`, `${dir}/**/*.{js,json}`])
-    for (const f of files) {
-      const ext = path.extname(f)
-      const base = f.replace(dir, '').slice(0, -ext.length)
-      const name = camelCase(base)
-      let mod
-      if (ext === '.json') mod = this.app.bajo.readJson(f)
-      else mod = await this.app.bajo.importModule(f)
-      if (isFunction(mod)) mod = mod.bind(this)
-      this[name] = mod
-    }
-    return files.length
-  }
-
-  const { eachPlugins } = this.bajo
-  const me = this // the app
-  me.bajo.log.debug('attachMethods')
-  await eachPlugins(async function () {
-    const { ns, pkgName } = this
-    const dir = ns === me.mainNs ? (`${me.bajo.dir.base}/${me.mainNs}`) : me.bajo.getModuleDir(pkgName)
-    const num = await createMethod.call(me[ns], `${dir}/method`, pkgName)
-    me.bajo.log.trace('- %s (%d)', ns, num)
-  })
-}
-
 /**
  * Build configurations
  *
@@ -82,18 +44,17 @@ export async function buildConfigs () {
  * @async
  */
 export async function checkNameAliases () {
-  const { eachPlugins } = this.bajo
   this.bajo.log.debug('checkAliasNameClash')
   const refs = []
-  await eachPlugins(async function () {
-    const { ns, pkgName } = this
-    const { alias } = this.constructor
+  for (const pkg of this.bajo.app.pluginPkgs) {
+    const plugin = this.bajo.app[camelCase(pkg)]
+    const { ns, alias } = plugin
     let item = find(refs, { ns })
-    if (item) throw this.error('pluginNameClash%s%s%s%s', ns, pkgName, item.ns, item.pkgName, { code: 'BAJO_NAME_CLASH' })
+    if (item) throw this.error('pluginNameClash%s%s%s%s', ns, pkg, item.ns, item.pkg, { code: 'BAJO_NAME_CLASH' })
     item = find(refs, { alias })
-    if (item) throw this.error('pluginNameClash%s%s%s%s', alias, pkgName, item.alias, item.pkgName, { code: 'BAJO_ALIAS_CLASH' })
-    refs.push({ ns, alias, pkgName })
-  })
+    if (item) throw this.error('pluginNameClash%s%s%s%s', alias, pkg, item.alias, item.pkg, { code: 'BAJO_ALIAS_CLASH' })
+    refs.push({ ns, alias, pkg })
+  }
 }
 
 /**
@@ -102,11 +63,12 @@ export async function checkNameAliases () {
  * @async
  */
 export async function checkDependencies () {
-  async function runner () {
-    const { ns, pkgName } = this
-    const { join } = this.app.bajo
-    this.app.bajo.log.trace('- %s', ns)
-    const { dependencies } = this.app.pluginClass[this.ns]
+  const { join } = this.bajo
+  this.bajo.log.debug('checkDeps')
+  for (const pkg of this.bajo.app.pluginPkgs) {
+    const plugin = this.bajo.app[camelCase(pkg)]
+    const { ns, dependencies } = plugin
+    this.bajo.log.trace('- %s', ns)
     const odep = reduce(dependencies, (o, k) => {
       const item = map(k.split('@'), m => trim(m))
       if (k[0] === '@') o['@' + item[1]] = item[2]
@@ -115,25 +77,19 @@ export async function checkDependencies () {
     }, {})
     const deps = keys(odep)
     if (deps.length > 0) {
-      if (intersection(this.app.pluginPkgs, deps).length !== deps.length) {
-        throw this.error('dependencyUnfulfilled%s%s', pkgName, join(deps), { code: 'BAJO_DEPENDENCY' })
+      if (intersection(this.bajo.app.pluginPkgs, deps).length !== deps.length) {
+        throw this.error('dependencyUnfulfilled%s%s', pkg, join(deps), { code: 'BAJO_DEPENDENCY' })
       }
       each(deps, d => {
         if (!odep[d]) return
-        const ver = get(this.app[camelCase(d)], 'config.pkg.version')
+        const ver = get(this.bajo.app[camelCase(d)], 'pkg.version')
         if (!ver) return
         if (!semver.satisfies(ver, odep[d])) {
-          throw this.error('semverCheckFailed%s%s', pkgName, `${d}@${odep[d]}`, { code: 'BAJO_DEPENDENCY_SEMVER' })
+          throw this.error('semverCheckFailed%s%s', pkg, `${d}@${odep[d]}`, { code: 'BAJO_DEPENDENCY_SEMVER' })
         }
       })
     }
   }
-
-  const { eachPlugins } = this.bajo
-  this.bajo.log.debug('checkDeps')
-  await eachPlugins(async function () {
-    await runner.call(this)
-  })
 }
 
 /**
@@ -146,25 +102,26 @@ export async function collectHooks () {
   const { eachPlugins, runHook, isLogInRange, importModule, breakNsPathFromFile } = this.bajo
   const me = this
   me.bajo.hooks = this.bajo.hooks ?? []
-  me.bajo.log.debug('collectHooks')
+  me.bajo.log.trace('collecting%s', this.t('hooks'))
   // collects
   await eachPlugins(async function ({ dir, file }) {
-    const { ns } = this
-    const { fullNs, path } = breakNsPathFromFile({ file, dir, baseNs: ns, suffix: '/hook/' })
+    const { ns: baseNs } = this
+    const { ns, subNs, path } = breakNsPathFromFile({ file, dir, baseNs, suffix: '/hook/' })
     const mod = await importModule(file, { asHandler: true })
     if (!mod) return undefined
-    merge(mod, { ns: fullNs, path, src: ns })
+    merge(mod, { ns, subNs, path, src: baseNs })
     me.bajo.hooks.push(mod)
   }, { glob: 'hook/**/*.js', prefix: me.bajo.ns })
   // for log trace purpose only
-  if (!isLogInRange('trace')) return
-  const items = groupBy(me.bajo.hooks, 'ns')
-  forOwn(items, (v, k) => {
-    const hooks = groupBy(v, 'path')
-    forOwn(hooks, (v1, k1) => {
-      me.bajo.log.trace('- %s:%s (%d)', k, k1, v1.length)
+  if (isLogInRange('trace')) {
+    const items = groupBy(me.bajo.hooks, item => item.ns + (item.subNs ? `.${item.subNs}` : ''))
+    forOwn(items, (v, k) => {
+      const hooks = groupBy(v, 'path')
+      forOwn(hooks, (v1, k1) => {
+        me.bajo.log.trace('- %s:%s (%d)', k, k1, v1.length)
+      })
     })
-  })
+  }
 
   /**
    * Run after hooks are collected
@@ -176,6 +133,7 @@ export async function collectHooks () {
    * @see module:Helper/Base.collectHooks
    */
   await runHook('bajo:afterCollectHooks', this.bajo.hooks)
+  me.bajo.log.debug('collected%s%d', this.t('hooks'), me.bajo.hooks.length)
 }
 
 /**
@@ -190,10 +148,9 @@ export async function collectHooks () {
 export async function run () {
   const me = this
   const { runHook, eachPlugins, join } = me.bajo
-  const { freeze } = me.bajo
+  const { freeze } = me.lib
   const methods = ['init']
   if (!me.applet) methods.push('start')
-  me.bajo.log.debug('loadedPlugins%s', join(map(me.bajo.app.pluginPkgs, b => camelCase(b))))
   for (const method of methods) {
     /**
      * Run before all ```{method}``` executed. Accepted ```{method}```: ```Init``` or ```Start```
@@ -240,4 +197,9 @@ export async function run () {
      */
     await runHook(`bajo:${camelCase(`after all ${method}`)}`)
   }
+  if (me.bajo.config.log.level === 'trace') {
+    let text = join(map(me.bajo.app.pluginPkgs, b => camelCase(b)))
+    text += ` (${me.bajo.app.pluginPkgs.length})`
+    me.bajo.log.trace('loadedPlugins%s', text)
+  } else me.bajo.log.debug('loadedPlugins%s', me.bajo.app.pluginPkgs.length)
 }

package/class/{misc → plugin}/err.js

@@ -1,4 +1,6 @@
 import lodash from 'lodash'
+import Tools from './tools.js'
+
 const { isPlainObject, each, isArray, get, isEmpty, merge } = lodash
 
 Error.stackTraceLimit = 15
@@ -14,24 +16,14 @@ Error.stackTraceLimit = 15
  * if (notfound) throw this.error('Sorry, item is nowhere to be found!')
  * ```
  */
-class Err {
+class Err extends Tools {
   /**
    * @param {Plugin} plugin - Plugin instance
    * @param {string} msg - Error message
    * @param  {...any} [args] - Variables to interpolate with error message. Payload object can be pushed at the very last argument
    */
   constructor (plugin, msg, ...args) {
-    /**
-     * Attached plugin
-     * @type {Plugin}
-     */
-    this.plugin = plugin
-
-    /**
-     * The app instance
-     * @type {App}
-     */
-    this.app = plugin.app
+    super(plugin)
 
     /**
      * Error payload extracted from the last arguments
@@ -50,7 +42,6 @@ class Err {
      * @type {string}
      */
     this.message = this.payload.noTrans ? msg : this.plugin.t(msg, ...args)
-    this.write()
   }
 
   /**
@@ -69,10 +60,12 @@ class Err {
     stacks.splice(1, 1)
     err.stack = stacks.join('\n')
     const values = {}
+    let detailsMessage
     for (const key in this.payload) {
       const value = this.payload[key]
       if (key === 'details' && isArray(value)) {
-        const result = this.formatErrorDetails(value)
+        const { result, detailsMessage: dm } = this.formatErrorDetails(value)
+        if (!isEmpty(dm)) detailsMessage = dm
         if (result) merge(values, result)
       }
       err[key] = value
@@ -80,6 +73,7 @@ class Err {
     if (!isEmpty(values)) err.values = values
     err.ns = this.plugin.ns
     err.orgMessage = this.orgMessage
+    if (detailsMessage) err.detailsMessage = detailsMessage
     return err
   }
 
@@ -91,7 +85,7 @@ class Err {
   fatal = () => {
     const err = this.write()
     console.error(err)
-    this.app.exit()
+    this.app.exit(true)
   }
 
   /**
@@ -102,9 +96,10 @@ class Err {
    * @returns {Object}
    */
   formatErrorDetails = (value) => {
-    const { isString } = this.app.lib._
+    const { isString, last } = this.app.lib._
     const result = {}
     const me = this
+    const detailsMessage = []
     each(value, (v, i) => {
       if (isString(v)) v = { error: v }
       if (!v.context) return undefined
@@ -112,14 +107,24 @@ class Err {
       if (v.type === 'any.only') v.context.ref = get(v, 'context.valids', []).join(', ')
       const field = get(v, 'context.key')
       const val = get(v, 'context.value')
+      let error = me.plugin.t(`validation.${v.type}`, v.context ?? {}, {})
+      if (error.includes(' ref:')) {
+        const item = last(error.split(' '))
+        const [, rfield] = item.split(':')
+        error = error.replace(item, `'${me.plugin.t('field.' + rfield)}'`)
+      }
       value[i] = {
         field,
-        error: me.plugin.t(`validation.${v.type}`, v.context ?? {}, {}),
+        error,
         value: val,
         ext: { type: v.type, context: v.context }
       }
+      detailsMessage.push(me.plugin.t('fieldError%s%s', field, value[i].error))
     })
-    return result
+    return {
+      result,
+      detailsMessage: detailsMessage.length > 0 ? (me.plugin.t('error') + ': ' + detailsMessage.join(', ')) : ''
+    }
   }
 }
 

package/class/{misc → plugin}/print.js

@@ -1,7 +1,8 @@
 import ora from 'ora'
 import lodash from 'lodash'
-import aneka from 'aneka'
-const { defaultsDeep } = aneka
+import defaultsDeep from 'aneka/src/defaults-deep.js'
+import secToHms from 'aneka/src/sec-to-hms.js'
+import Tools from './tools.js'
 
 const { isPlainObject } = lodash
 
@@ -22,29 +23,19 @@ const { isPlainObject } = lodash
  *
  * @class
  */
-class Print {
+class Print extends Tools {
   /**
    * @param {Plugin} plugin - Plugin instance
    * @param {TPrintOptions} [options={}] - Options object
    */
   constructor (plugin, options = {}) {
+    super(plugin)
+
     /**
      * Options object
      * @type {TPrintOptions}
      */
     this.options = options
-
-    /**
-     * Attached plugin
-     * @type {Plugin}
-     */
-    this.plugin = plugin
-
-    /**
-     * The app instance
-     * @type {App}
-     */
-    this.app = plugin.app
     if (this.app.applet) {
       if (this.app.bajo.config.counter) this.options.showCounter = true
       if (this.app.bajo.config.datetime) this.options.showDatetime = true
@@ -122,7 +113,7 @@ class Print {
   getElapsed = (unit = 'hms') => {
     const u = unit === 'hms' ? 'second' : unit
     const elapsed = this.app.lib.dayjs().diff(this.startTime, u)
-    return unit === 'hms' ? this.app.lib.aneka.secToHms(elapsed) : elapsed
+    return unit === 'hms' ? secToHms(elapsed) : elapsed
   }
 
   /**

package/class/plugin/tools.js

@@ -0,0 +1,42 @@
+/**
+ * Base tools class
+ *
+ * @class
+ */
+
+class Tools {
+  constructor (plugin) {
+    /**
+     * Attached plugin
+     * @type {Plugin}
+     */
+    this.plugin = plugin
+
+    /**
+     * The app instance
+     * @type {App}
+     */
+    this.app = plugin.app
+  }
+
+  /**
+   * Force bind methods to self (```this```)
+   *
+   * @param {string[]} names - Method's names
+   */
+  selfBind (names) {
+    for (const name of names) {
+      this[name] = this[name].bind(this)
+    }
+  }
+
+  /**
+   * Dispose internal references
+   */
+  dispose () {
+    this.app = null
+    this.plugin = null
+  }
+}
+
+export default Tools