@superhero/http-server 4.3.8 → 4.4.0

package/dispatcher/status.js

@@ -1,3 +1,5 @@
+import os from 'os'
+
 export function locate(locator)
 {
   const server = locator.locate('@superhero/http-server')
@@ -17,14 +19,48 @@ export default class StatusDispatcher
     this.server = server
   }
 
-  dispatch(_, session)
+  dispatch(request, session)
   {
-    session.view.body.name       = this.server.name
-    session.view.body.started    = this.started_json
-    session.view.body.uptime     = this.started.getTime() - new Date().getTime()
-    session.view.body.dispatched = String(this.server.dispatched)  + 'n'
-    session.view.body.completed  = String(this.server.completed)   + 'n'
-    session.view.body.abortions  = String(this.server.abortions)   + 'n'
-    session.view.body.rejections = String(this.server.rejections)  + 'n'
+    session.view.body.name    = this.server.name
+    session.view.body.started = this.started_json
+
+    // Statistics 
+    if(request.url.query.stats)
+    {
+      session.view.body.dispatched = String(this.server.dispatched)
+      session.view.body.completed  = String(this.server.completed)
+      session.view.body.abortions  = String(this.server.abortions)
+      session.view.body.rejections = String(this.server.rejections)
+    }
+
+    // Uptime
+    if(request.url.query.uptime)
+    {
+      session.view.body.uptime = String(this.started.getTime() - new Date().getTime())
+    }
+
+    // CPU usage
+    if(request.url.query.cpu)
+    {
+      session.view.body.cpu = os.cpus().map((cpu) =>
+      {
+        const
+          total = Object.values(cpu.times).reduce((a, b) => a + b, 0),
+          usage = Number(((total - cpu.times.idle) / total) * 100).toFixed(2)
+
+        return { total, usage }
+      })
+    }
+
+    // RAM usage
+    if(request.url.query.ram)
+    {
+      const
+        total = os.totalmem(),
+        free  = os.freemem(),
+        usage = Number((((total - free) / total) * 100).toFixed(2))
+
+      session.view.body.ram = { total, usage }
+    }
   }
-}
+}

package/index.js

@@ -44,7 +44,9 @@ export default class HttpServer
 
   async bootstrap(settings)
   {
-    const 
+    Object.assign(this.log.config, settings?.log)
+
+    const
       routes         = settings?.router?.routes ?? {},
       serverSettings = Object.assign({}, settings?.server)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superhero/http-server",
-  "version": "4.3.8",
+  "version": "4.4.0",
   "description": "HTTP(S) server component supporting both HTTP 1.1 and HTTP 2.0",
   "keywords": [
     "http server",
@@ -25,11 +25,11 @@
   "dependencies": {
     "@superhero/router": "^4.1.4",
     "@superhero/deep": "^4.1.0",
-    "@superhero/log": "^4.0.1",
+    "@superhero/log": "^4.0.2",
     "@superhero/id-name-generator": "^4.0.0"
   },
   "devDependencies": {
-    "@superhero/locator": "^4.3.7",
+    "@superhero/locator": "^4.3.8",
     "@superhero/http-request": "^4.0.10"
   },
   "scripts": {