waibu 1.2.9 → 1.2.11

package/bajo/hook/on-request.js

@@ -1,14 +1,27 @@
+import { methodColor } from './on-response.js'
+
 const onRequest = {
   level: 5,
   handler: async function onRequest (req, reply) {
+    const { importPkg } = this.app.bajo
     const { get } = this.lib._
+    const chalk = await importPkg('bajo:chalk')
+    const { plain } = this.app.bajo.config.log
 
     req.site = this.config.siteInfo
     req.ns = get(reply.request, 'routeOptions.config.ns') ?? this.name
     const ns = get(reply.request, 'routeOptions.config.webApp') ?? this.name
-    let msg = '< %s:%s from IP %s'
-    if (req.headers['content-length']) msg += ', content length: %s'
-    this.app[ns].log.info(msg, req.method, req.url, this.getIp(req), req.headers['content-length'])
+    const arrow = plain ? '<' : chalk.bold('🡨')
+    const c = methodColor[req.method] ?? 'gray'
+    const method = plain ? req.method : chalk[c](req.method)
+    const url = plain ? (':' + req.url) : chalk.gray(':' + req.url)
+    const ip = plain ? this.getIp(req) : chalk.magenta(this.getIp(req))
+    let msg = this.app[ns].print.write('httpReq%s%s%s%s', arrow, method, url.replaceAll('%', '%%'), ip)
+    if (req.headers['content-length']) msg += this.app[ns].print.write('httpReqExt%s', req.headers['content-length'])
+    if (this.config.deferLog) {
+      this.reqLog = this.reqLog ?? {}
+      this.reqLog[req.id] = msg
+    } else this.app[ns].log.info(msg)
     if (Object.keys(this.config.paramsCharMap).length === 0) return
     for (const key in req.params) {
       let val = req.params[key]

package/bajo/hook/on-response.js

@@ -1,13 +1,47 @@
+export const methodColor = {
+  GET: 'blue',
+  POST: 'green',
+  UPDATE: 'yellow',
+  PATCH: 'yellow',
+  DELETE: 'red'
+}
+
+const stateColor = {
+  2: 'green',
+  3: 'yellow',
+  4: 'red',
+  5: 'red'
+}
+
 const onResponse = {
   level: 5,
   handler: async function onResponse (req, reply) {
+    const { importPkg } = this.app.bajo
     const { get } = this.lib._
-    let method = 'info'
-    if (reply.statusCode >= 300 && reply.statusCode < 400) method = 'warn'
-    else if (reply.statusCode >= 400) method = 'error'
+    const { plain } = this.app.bajo.config.log
+    const chalk = await importPkg('bajo:chalk')
+    let level = 'info'
+    if (reply.statusCode >= 300 && reply.statusCode < 400) level = 'warn'
+    else if (reply.statusCode >= 400) level = 'error'
     const ns = get(reply.request, 'routeOptions.config.webApp') ?? this.name
-    this.app[ns].log[method]('> %s:%s with a %d-status took %dms', req.method, req.url, reply.statusCode,
-      (reply.elapsedTime ?? 0).toFixed(3))
+    const arrow = plain ? '>' : chalk.bold('🡪')
+    const mc = methodColor[req.method] ?? 'gray'
+    const method = plain ? req.method : chalk[mc](req.method)
+    const url = plain ? (':' + req.url) : chalk.gray(':' + req.url)
+    let state = plain ? reply.statusCode : chalk.gray(reply.statusCode)
+    const sc = stateColor[Math.floor(reply.statusCode / 100)]
+    if (!plain && sc) state = chalk[sc](reply.statusCode)
+    const elapsed = reply.elapsedTime ?? 0
+    let tc = 'red'
+    if (elapsed < 1000) tc = 'yellow'
+    if (elapsed < 500) tc = 'green'
+    const time = plain ? elapsed.toFixed(2) : chalk[tc](elapsed.toFixed(2))
+    if (this.config.deferLog) {
+      this.reqLog = this.reqLog ?? {}
+      if (this.reqLog[req.id]) this.app[ns].log.info(this.reqLog[req.id])
+      delete this.reqLog[req.id]
+    }
+    this.app[ns].log[level]('httpResp%s%s%s%s%s', arrow, method, url, state, time)
   }
 }
 

package/bajo/intl/en-US.json

@@ -11,5 +11,8 @@
   "rerouted%s%s": "Rerouted %s -> %s",
   "bootSubApp%s": "Boot sub app: %s",
   "routeNotFound%s%s": "Route '%s (%s)' not found",
-  "middlewareDisabled%s": "Middleware '%s' is disabled"
+  "middlewareDisabled%s": "Middleware '%s' is disabled",
+  "httpResp%s%s%s%s%s": "%s %s%s with a %s-status took %sms",
+  "httpReq%s%s%s%s": "%s %s%s from IP %s",
+  "httpReqExt%s": ", content length: %s"
 }

package/bajo/intl/id.json

@@ -11,5 +11,8 @@
   "rerouted%s%s": "Jalur dipindahkan %s -> %s",
   "bootSubApp%s": "Boot sub app: %s",
   "routeNotFound%s%s": "Jalur '%s (%s)' tidak ditemukan",
-  "middlewareDisabled%s": "Middleware '%s' dimatikan"
+  "middlewareDisabled%s": "Middleware '%s' dimatikan",
+  "httpResp%s%s%s%s%s": "%s %s:%s dengan status %s selama %sms",
+  "httpReq%s%s%s%s": "%s %s:%s dari IP %s",
+  "httpReqExt%s": ", panjang konten: %s"
 }

package/index.js

@@ -19,7 +19,7 @@ async function factory (pkgName) {
     constructor () {
       super(pkgName, me.app)
       this.alias = 'w'
-      this.dependencies = ['bajo-logger', 'bajo-extra']
+      this.dependencies = ['bajo-extra']
       this.config = {
         server: {
           host: '127.0.0.1',
@@ -30,6 +30,7 @@ async function factory (pkgName) {
           bodyLimit: 10485760,
           pluginTimeout: 30000
         },
+        deferLog: false,
         prefixVirtual: '~',
         qsKey: {
           bbox: 'bbox',
@@ -104,10 +105,12 @@ async function factory (pkgName) {
     start = async () => {
       const { generateId, runHook } = this.app.bajo
       const cfg = this.getConfig()
-      cfg.factory.loggerInstance = this.app.bajoLogger.instance.child(
-        {},
-        { msgPrefix: '[waibu] ' }
-      )
+      if (this.app.bajoLogger) {
+        cfg.factory.loggerInstance = this.app.bajoLogger.instance.child(
+          {},
+          { msgPrefix: '[waibu] ' }
+        )
+      }
       cfg.factory.genReqId = req => generateId()
       cfg.factory.disableRequestLogging = true
       cfg.factory.querystringParser = str => this.qs.parse(str)
@@ -180,9 +183,10 @@ async function factory (pkgName) {
     }
 
     getIp = (req) => {
+      const { isEmpty } = this.lib._
       let fwd = req.headers['x-forwarded-for'] ?? ''
       if (!Array.isArray(fwd)) fwd = fwd.split(',').map(ip => ip.trim())
-      return fwd[0] ?? req.ip
+      return isEmpty(fwd[0]) ? req.ip : fwd[0]
     }
 
     getOrigin = (req) => {

package/package.json

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