Updated express and koa

vishr · vishr · commit 3179a94d47fd · 2018-03-08T13:39:28.000-08:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/README.md b/README.md
@@ -7,31 +7,4 @@
 NPM `npm install --save labstack`<br>
 Yarn `yarn add labstack`
 
-## Quick Start
-
-[Sign up](https://labstack.com/signup) to get an API key
-
-Create a file `app.js` with the following content:
-
-```js
-const {Client, APIError} = require('labstack')
-
-const client = new Client('<ACCOUNT_ID>', '<API_KEY>')
-
-client.geocodeAddress({
-  location: 'eiffel tower'
-}).then(response => {
-  console.info(response)
-})
-.catch(error => {
-  console.error(error)
-})
-```
-
-From terminal run your app:
-
-```sh
-node app.js
-```
-
 ## [Docs](https://labstack.com/docs) | [Forum](https://forum.labstack.com)
diff --git a/lib/cube.js b/lib/cube.js
@@ -1,31 +1,49 @@
+const os = require('os')
+const pusage = require('pidusage')
 const got = require('got')
 
 class Cube {
   constructor(key, options) {
-    this._started = false
     this.url = 'https://api.labstack.com/cube'
     this.key = key
-    options = {} || options
+    options = options || {}
+    this.node = options.node || os.hostname()
     this.batchSize = options.batchSize || 60
     this.dispatchInterval = options.dispatchInterval || 60
+    this.tags = options.tags
     this.activeRequests = 0
     this.requests = []
+
+    // Dispatch daemon
+    setInterval(() => {
+      this._dispatch()
+    }, this.dispatchInterval * 1000)
+
+    // System daemon
+    setInterval(() => {
+      pusage.stat(process.pid, (err, stat) => {
+        this.uptime = Math.floor(process.uptime())
+        this.cpu = stat.cpu
+        this.memory = stat.memory
+      })
+    }, 1000)
   }
 
   _requestID(request, response) {
+    console.log(request.headers,  response)
     return request.headers['x-request-id'] ||
-      response._headers['x-request-id']
+      response.headers['x-request-id']
   }
   
   _realIP(request) {
-    let ip = request.headers['x-forwarded-for'] ||
-    request.headers['x-real-ip'] ||
-    request.connection.remoteAddress
-    if (Array.isArray(ip)) {
-      return ip.split(', ')[0]
-    } else {
-      return ip
-    }
+    // let ip = request.headers['x-forwarded-for'] ||
+    // request.headers['x-real-ip'] ||
+    // request.connection.remoteAddress
+    // if (Array.isArray(ip)) {
+    //   return ip.split(', ')[0]
+    // } else {
+    //   return ip
+    // }
   }
   
   _resetRequests() {
@@ -37,6 +55,8 @@ class Cube {
       return
     }
 
+    console.log(this.requests)
+
     // TODO: handler error
     got.post(this.url, {
       headers: {
@@ -58,40 +78,25 @@ class Cube {
     // Reset requests
     this.requests.length = 0
   }
-  
-  start(request, response) {
+
+  start(request) {
     this.activeRequests++
 
-    // Daemon
-    if (!this.started) {
-      setInterval(() => {
-        this._dispatch()
-      }, this.dispatchInterval * 1000);
-      this.started = true
-    }
+    request.time = Date.now()
+    request.active = this.activeRequests
+    request.node = this.node
+    request.uptime = this.uptime
+    request.cpu = this.cpu
+    request.memory = this.memory
+    this.requests.push(request)
 
-    const req = {} 
-    req.id = this._requestID(request, response)
-    req.time = Date.now()
-    req.host = request.headers.host
-    req.path = request.url
-    req.method = request.method
-    req.bytes_in = parseInt(request.headers['content-length'])
-    if (!req.bytes_in) {
-      req.bytes_in = 0
-    } 
-    req.remote_ip = this._realIP(request)
-    req.client_id = req.remote_ip
-    req.user_agent = request.headers['user-agent']
-    this.requests.push(req)
-    return req
+    return request
   }
   
-  stop(request, response) {
+  stop(request) {
     this.activeRequests--
-    
-    request.status = response.statusCode
-    request.bytes_out = response._headers['content-length']
+   
+    // r.id = this._realIP(response)
     request.latency = Date.now() - request.time
 
     // Dispatch batch
@@ -113,4 +118,3 @@ class Cube {
 module.exports = {
   Cube
 }
-
diff --git a/lib/express.js b/lib/express.js
@@ -1,12 +1,26 @@
 const {Cube} = require('./cube')
 
 function cube(key, options) {
+    const c = new Cube(key, options)
+
     return (request, response, next) => {
-        const cube = new Cube(key, options)
-        response.headers = response._headers
-        const req = cube.start(request, response)
+        const req = c.start({
+            id: request.get('x-request-id'),
+            host: request.hostname,
+            path: request.path,
+            method: request.method,
+            bytes_in: parseInt(request.get('content-length')) || 0,
+            remote_ip: request.ip,
+            client_id: request.ip,
+            user_agent: request.get('user-agent')
+        })
+
         next()
-        cube.stop(req, response)
+
+        req.id = req.id || response.get('x-request-id')
+        req.status = response.statusCode
+        req.bytes_out = parseInt(response.get('content-length')) || 0,
+        c.stop(req)
     }
 }
 
diff --git a/lib/koa.js b/lib/koa.js
@@ -1,13 +1,26 @@
 const {Cube} = require('./cube')
 
 function cube(key, options) {
-    return (context, next) => {
-        const cube = new Cube(key, options)
-        const {request, response} = context
-        const req = cube.start(request, response)
+    const c = new Cube(key, options)
+
+    return (ctx, next) => {
+        const req = c.start({
+            id: ctx.request.get('x-request-id'),
+            host: ctx.hostname,
+            path: ctx.path,
+            method: ctx.method,
+            bytes_in: parseInt(ctx.request.get('content-length')) || 0,
+            remote_ip: ctx.ip,
+            client_id: ctx.ip,
+            user_agent: ctx.request.get('user-agent')
+        })
+
         next()
-        response.statusCode = response.status
-        cube.stop(req, response)
+
+        req.id = req.id || ctx.response.get('x-request-id')
+        req.status = ctx.status
+        req.bytes_out = ctx.length
+        c.stop(req)
     }
 }
 
diff --git a/package.json b/package.json
@@ -19,7 +19,8 @@
   "homepage": "https://github.com/labstack/labstack-node#readme",
   "dependencies": {
     "form-data": "^2.3.1",
-    "got": "^7.1.0"
+    "got": "^7.1.0",
+    "pidusage": "^1.2.0"
   },
   "engines": {
     "node": ">= 6"
diff --git a/test/express.js b/test/express.js
@@ -8,8 +8,7 @@ app.use(cube(process.env.LABSTACK_KEY, {
     batchSize: 1
 }))
 app.get('/', (req, res) => {
-    console.log(res.statusCode)
     res.send('Hello World!')
 })
 
-app.listen(3001, () => console.log('Example app listening on port 3000!'))
+app.listen(3001, () => console.log('Example app listening on port 3001!'))
diff --git a/test/koa.js b/test/koa.js
@@ -2,16 +2,16 @@ const Koa = require('koa')
 const Router = require('koa-router')
 const labstack = require('..')
 
-const koa = new Koa();
-const app = new Router();
+const koa = new Koa()
+const app = new Router()
 const {cube} = labstack.koa
 
-app.get('/:name', async (ctx) => {
-  ctx.body = `Hello, ${ctx.params.name}!\n`;
-});
+app.get('/', ctx => {
+  ctx.body = 'Hello, World!'
+})
 
 koa.use(cube(process.env.LABSTACK_KEY, {
     batchSize: 1
 }))
-koa.use(app.routes());
-koa.listen(3001);
+koa.use(app.routes())
+koa.listen(3002)
diff --git a/yarn.lock b/yarn.lock
@@ -449,6 +449,10 @@ path-to-regexp@^1.1.1:
   dependencies:
     isarray "0.0.1"
 
+pidusage@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-1.2.0.tgz#65ee96ace4e08a4cd3f9240996c85b367171ee92"
+
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
