bajo 1.2.8 → 1.2.9

package/boot/class/bajo-core/build-config.js

@@ -12,6 +12,7 @@ const omitted = ['spawn', 'cwd', 'name', 'alias', 'applet', 'a', 'plugins']
 const defConfig = {
   log: {
     dateFormat: 'YYYY-MM-DDTHH:MM:ss.SSS[Z]',
+    plain: false,
     applet: false,
     traceHook: false
   },
@@ -65,7 +66,7 @@ export async function buildExtConfig () {
   const { defaultsDeep } = this.lib.aneka
   let resp = await readAllConfigs.call(this.app, `${this.dir.data}/config/${this.name}`)
   resp = omitDeep(pick(resp, ['log', 'exitHandler', 'env']), omitted)
-  this.config = defaultsDeep({}, resp, this.config, defConfig)
+  this.config = defaultsDeep({}, this.config, resp, defConfig)
   this.config.env = (this.config.env ?? 'dev').toLowerCase()
   if (values(this.envs).includes(this.config.env)) this.config.env = this.lib.aneka.getKeyByValue(this.envs, this.config.env)
   if (!keys(this.envs).includes(this.config.env)) throw new Error(`Unknown environment '${this.config.env}'. Supported: ${this.join(keys(this.envs))}`)

package/boot/class/bajo-core/exit-handler.js

@@ -5,7 +5,7 @@ async function exit (signal) {
     try {
       await this.stop()
     } catch (err) {}
-    this.log.debug('exited')
+    this.log.trace('exited')
   })
   this.log.debug('appShutdown')
   process.exit(0)

package/boot/class/bajo-core.js

@@ -43,7 +43,6 @@ class BajoCore extends Plugin {
       { ext: '.json', readHandler: this.readJson }
     ]
     this.whiteSpace = [' ', '\t', '\n', '\r']
-    this.logLevels = logLevels
     this.envs = { dev: 'development', staging: 'staging', prod: 'production' }
   }
 
@@ -484,7 +483,7 @@ class BajoCore extends Plugin {
   }
 
   isLogInRange = (level) => {
-    const levels = keys(this.logLevels)
+    const levels = keys(logLevels)
     const logLevel = indexOf(levels, this.app.bajo.config.log.level)
     return indexOf(levels, level) >= logLevel
   }

package/boot/class/log.js

@@ -2,8 +2,9 @@ import os from 'os'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
 import logLevels from '../lib/log-levels.js'
+import chalk from 'chalk'
 
-const { isEmpty, without, merge, upperFirst } = lodash
+const { isEmpty, without, merge } = lodash
 
 export function isIgnored (level) {
   const { filter, isArray } = this.lib._
@@ -47,6 +48,7 @@ class Log {
   formatMsg = (level, ...params) => {
     if (this.plugin.app.bajo.config.log.level === 'silent') return
     if (!this.plugin.app.bajo.isLogInRange(level)) return
+    const plain = this.plugin.app.bajo.config.log.plain
     let [data, msg, ...args] = params
     if (typeof data === 'string') {
       args.unshift(msg)
@@ -58,19 +60,23 @@ class Log {
       msg = 'error%s'
       args = [data.message]
     }
-    msg = `[${this.plugin.name}] ${this.write(msg, ...args)}`
+    msg = this.write(msg, ...args)
     if (this.plugin.app[this.bajoLog] && this.plugin.app[this.bajoLog].logger) {
-      this.plugin.app[this.bajoLog].logger[level](data, msg, ...args)
+      this.plugin.app[this.bajoLog].logger[level](data, `[${this.plugin.name}] ${msg}`, ...args)
     } else {
       let text
       const dt = new Date()
       if (this.plugin.app.bajo.config.env === 'prod') {
-        const json = { level: logLevels[level], time: dt.valueOf(), pid: process.pid, hostname: os.hostname() }
+        const json = { level: logLevels[level].number, time: dt.valueOf(), pid: process.pid, hostname: os.hostname() }
         if (!isEmpty(data)) merge(json, data)
-        merge(json, { msg })
+        merge(json, { msg: `[${this.plugin.name}] ${msg}` })
         text = JSON.stringify(json)
       } else {
-        text = `[${dayjs(dt).utc(true).format(this.format)}] ${upperFirst(level)}: ${msg}`
+        const date = dayjs(dt).utc(true).format(this.format)
+        const tdate = plain ? `[${date}]` : chalk.cyan(date)
+        const tlevel = plain ? level.toUpperCase() : chalk[logLevels[level].color](level.toUpperCase())
+        const tplugin = plain ? `[${this.plugin.name}]` : chalk.bgBlue(`${this.plugin.name}`)
+        text = `${tdate} ${tlevel}: ${tplugin} ${msg}`
         if (!isEmpty(data)) text += '\n' + JSON.stringify(data)
       }
       if (!this.isIgnored(level)) {

package/boot/lib/log-levels.js

@@ -1 +1,9 @@
-export default { trace: 10, debug: 20, info: 30, warn: 40, error: 50, fatal: 60, silent: 99 }
+export default {
+  trace: { number: 10, color: 'gray' },
+  debug: { number: 20, color: 'greenBright' },
+  info: { number: 30, color: 'blueBright' },
+  warn: { number: 40, color: 'yellowBright' },
+  error: { number: 50, color: 'redBright' },
+  fatal: { number: 60, color: 'magentaBright' },
+  silent: { number: 99, color: 'white' }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {
@@ -27,6 +27,7 @@
   "dependencies": {
     "add-filename-increment": "^1.0.0",
     "aneka": "^0.1.4",
+    "chalk": "^5.5.0",
     "dayjs": "^1.11.13",
     "deep-freeze-strict": "^1.1.1",
     "delay": "^6.0.0",