@jambonz/time-series 0.1.6 → 0.1.9

package/index.js

@@ -28,7 +28,8 @@ const schemas = {
       duration: Influx.FieldType.INTEGER,
       terminated_at: Influx.FieldType.INTEGER,
       termination_reason: Influx.FieldType.STRING,
-      remote_host: Influx.FieldType.STRING
+      remote_host: Influx.FieldType.STRING,
+      trace_id: Influx.FieldType.STRING
     },
     tags: [
       'account_sid',
@@ -48,6 +49,15 @@ const schemas = {
       'account_sid',
       'alert_type'
     ]
+  },
+  call_counts: {
+    measurement: 'call_counts',
+    fields: {
+      calls_in_progress: Influx.FieldType.INTEGER,
+    },
+    tags: [
+      'account_sid'
+    ]
   }
 };
 
@@ -69,9 +79,33 @@ const writeData = async(client) => {
   }
 };
 
+const createCallCountsQuery = ({account_sid, page, page_size, days, start, end}) => {
+  let sql = `SELECT * from call_counts WHERE account_sid = '${account_sid}'`;
+  if (days) sql += `AND time > now() - ${days}d `;
+  else {
+    if (start) sql += `AND time >= '${start}' `;
+    if (end) sql += `AND time <= '${end}' `;
+  }
+  sql += ' ORDER BY time DESC';
+  if (page_size) sql += ` LIMIT ${page_size}`;
+  if (page) sql += ` OFFSET ${(page - 1) * page_size}`;
+  //console.log(sql);
+  return sql;
+};
+
+const createCallCountsCountQuery = ({account_sid, days, start, end}) => {
+  let sql = `SELECT COUNT(calls_in_progress) from call_counts WHERE account_sid = '${account_sid}' `;
+  if (days) sql += `AND time > now() - ${days}d `;
+  else {
+    if (start) sql += `AND time >= '${start}' `;
+    if (end) sql += `AND time <= '${end}' `;
+  }
+  //console.log(sql);
+  return sql;
+};
 
 const createCdrQuery = ({account_sid, page, page_size, trunk, direction, answered, days, start, end}) => {
-  let sql = `SELECT * from cdrs WHERE account_sid = '${account_sid}' `;
+  let sql = `SELECT * from cdrs WHERE account_sid = '${account_sid}'`;
   if (trunk) sql += `AND trunk = '${trunk}' `;
   if (direction) sql += `AND direction = '${direction}' `;
   if (['true', 'false'].includes(answered)) sql += `AND answered = '${answered}' `;
@@ -135,6 +169,57 @@ const initDatabase = async(client, dbName) => {
   client.locals.initialized = true;
 };
 
+const writeCallCount = async(client, count) => {
+  if (!client.locals.initialized) await initDatabase(client, 'call_counts');
+  const {account_sid, ...fields} = count;
+  const data = {
+    measurement: 'call_counts',
+    fields,
+    tags: {
+      account_sid
+    }
+  };
+  client.locals.data = [...client.locals.data, ...[data]];
+  if (client.locals.data.length >= client.locals.commitSize) {
+    await writeData(client);
+  }
+  return;
+};
+
+const queryCallCounts = async(client, opts) => {
+  if (!client.locals.initialized) await initDatabase(client, 'call_counts');
+  const response = {
+    total: 0,
+    page_size: opts.page_size,
+    page: opts.page,
+    data: []
+  };
+  const sqlTotal = createCallCountsCountQuery(opts);
+  const obj = await client.queryRaw(sqlTotal);
+  //console.log(`sqlTotal: ${sqlTotal}, results: ${JSON.stringify(obj)}`);
+  if (!obj.results || !obj.results[0].series) return response;
+  response.total = obj.results[0].series[0].values[0][1];
+
+  const sql = createCallCountsQuery(opts);
+  const res = await client.queryRaw(sql);
+  //console.log(`sql: ${sqlTotal}, results: ${JSON.stringify(res)}`);
+  if (res.results[0].series && res.results[0].series.length) {
+    const {columns, values} = res.results[0].series[0];
+    const data = values.map((v) => {
+      const obj = {};
+      v.forEach((val, idx) => {
+        v.forEach((val, idx) => {
+          const key = columns[idx];
+          obj[key] = val;
+        });
+      });
+      return obj;
+    });
+    response.data = data;
+  }
+  return response;
+};
+
 const writeCdrs = async(client, cdrs) => {
   if (!client.locals.initialized) await initDatabase(client, 'cdrs');
   cdrs = (Array.isArray(cdrs) ? cdrs : [cdrs])
@@ -294,6 +379,7 @@ module.exports = (logger, opts) => {
 
   const cdrClient = new Influx.InfluxDB({database: 'cdrs', schemas: schemas.cdr, ...opts});
   const alertClient = new Influx.InfluxDB({database: 'alerts', schemas: schemas.alerts, ...opts});
+  const callCountClient = new Influx.InfluxDB({database: 'call_counts', schemas: schemas.call_counts, ...opts});
 
   cdrClient.locals = {
     db: 'cdrs',
@@ -311,13 +397,24 @@ module.exports = (logger, opts) => {
     commitInterval: opts.commitInterval || 10,
     data: []
   };
+  callCountClient.locals = {
+    db: 'call_counts',
+    initialized: false,
+    writing: false,
+    commitSize: opts.commitSize || 1,
+    commitInterval: opts.commitInterval || 10,
+    data: []
+  };
 
   if (opts.commitSize > 1 && opts.commitInterval && opts.commitInterval > 2) {
+    setInterval(writeData.bind(null, callCountClient), opts.commitInterval * 1000);
     setInterval(writeData.bind(null, cdrClient), opts.commitInterval * 1000);
     setInterval(writeData.bind(null, alertClient), opts.commitInterval * 1000);
   }
 
   return {
+    writeCallCount: writeCallCount.bind(null, callCountClient),
+    queryCallCounts: queryCallCounts.bind(null, callCountClient),
     writeCdrs: writeCdrs.bind(null, cdrClient),
     queryCdrs: queryCdrs.bind(null, cdrClient),
     writeAlerts: writeAlerts.bind(null, alertClient),

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@jambonz/time-series",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "write and query data to time series daetabase",
   "main": "index.js",
   "scripts": {
-    "test": "node test/ | ./node_modules/.bin/tap-spec",
+    "test": "node test/",
     "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
     "jslint": "eslint index.js"
   },
@@ -18,7 +18,6 @@
     "eslint": "^7.23.0",
     "eslint-plugin-promise": "^4.3.1",
     "nyc": "^15.1.0",
-    "tap-spec": "^5.0.0",
     "tape": "^5.2.2"
   }
 }

package/test/docker-compose-testbed.yaml

@@ -2,6 +2,6 @@ version: '3'
 
 services:  
   influxdb:
-    image: influxdb:1.8-alpine
+    image: influxdb:1.8
     ports:
       - "8086:8086"

package/test/unit-tests.js

@@ -3,6 +3,8 @@ const Influx = require('influx');
 const consoleLogger = {error: console.error, info: console.log, debug: console.log};
 
 const {
+  writeCallCount,
+  queryCallCounts,
   writeCdrs,
   queryCdrs,
   writeAlerts,
@@ -10,7 +12,7 @@ const {
   AlertType
 } = require('..')(consoleLogger, '127.0.0.1', {commitSize: 1});
 
-test('write cdr data', async(t) => {
+test('write timeseries data', async(t) => {
   let result = await writeCdrs([{
     from: 'me',
     to: 'you',
@@ -115,6 +117,22 @@ test('write cdr data', async(t) => {
 
   result = await queryAlerts({account_sid: 'yyyy', page: 1, page_size: 25, days: 7});
   //console.log(JSON.stringify(result));
-  t.ok(result.data.length === 11, 'queried alerts')
+  t.ok(result.data.length === 11, 'queried alerts');
+
+  result = await writeCallCount(
+    {
+      calls_in_progress: 49,
+      account_sid: 'yyyy'
+    });
+  result = await writeCallCount(
+    {
+      calls_in_progress: 50,
+      account_sid: 'yyyy'
+    });
+  t.pass('wrote call counts');
+
+  result = await queryCallCounts({account_sid: 'yyyy', page: 1, page_size: 25, days: 7});
+  //console.log(JSON.stringify(result));
+  t.ok(result.data.length === 2, 'queried call counts');
 
 });