Update main.civet

main.civet

@@ -22,33 +22,26 @@ snakeToCamel := (str: string) -> str.replace snakeRgx, (_, g) -> g.toUpperCase()
 logger := (...args: any[]) ->
   console.log new Date().toLocaleTimeString('fr', { timeZone }), ...args
 
-byteKeysRgx := /memory|heap|rss|size|available|committed|used|total/i
-prettifyMetrics := (obj: any): any ->
-  return obj unless typeof obj is 'object' and obj?
-  return (obj.map (v) -> prettifyMetrics v) if Array.isArray obj
-
-  result := {}
-  for key in obj
-    val := obj[key]
-    newKey := snakeToCamel key
-    result[newKey] = if isNumber val and byteKeysRgx.test key then formatBytes val else prettifyMetrics val
-  result
+prettifyMetrics := (obj: any, condition?: (k: string, v: any) -> boolean) ->
+  condition ?= (_, v) -> isNumber v
+  jsonStr := JSON.stringify obj, (key, val) ->
+    if condition key, val then formatBytes val else val
+  cleanJson := jsonStr.replace /_(\w)/g, (_, g) -> g.toUpperCase()
+  JSON.parse cleanJson
 
 getServerStats := ->
-  stats := {
-    uptime: prettyMs procUptime() * 1e3
-    osUptime: prettyMs osUptime() * 1e3
-  }
-
-  rep := report?.getReport?()
-  if rep
-    { header: getReport, javascriptHeap, resourceUsage, uvthreadResourceUsage } := rep
-    Object.assign stats, {
-      getReport
-      uvthreadResourceUsage
-      javascriptHeap: prettifyMetrics javascriptHeap, (k) -> not /(ContextCount|Garbage)/i.test k
-      resourceUsage: prettifyMetrics resourceUsage, (k) -> not /(Percent|IO|reads|write)/i.test k
-    }
+  stats := {}
+  stats.uptime = prettyMs procUptime() * 1e3
+  stats.osUptime = prettyMs osUptime() * 1e3
+
+  if rep := report?.getReport?()
+    Object.assign stats,
+      getReport: rep.header
+      javascriptHeap: prettifyMetrics rep.javascriptHeap, (k, v) ->
+        isNumber v and not /(ContextCount|Garbage)/i.test k
+      resourceUsage: prettifyMetrics rep.resourceUsage, (k, v) ->
+        isNumber v and not /(Percent|IO|reads|write)/i.test k
+      uvthreadResourceUsage: rep.uvthreadResourceUsage
 
   stats.memoryUsage = prettifyMetrics memoryUsage()
   stats