@jambonz/time-series 0.1.7 → 0.1.10

package/index.js

@@ -5,6 +5,7 @@ const AlertType = {
   WEBHOOK_CONNECTION_FAILURE: 'webhook-connection-failure',
   WEBHOOK_URL_NOTFOUND: 'webhook-url-notfound',
   WEBHOOK_AUTH_FAILURE: 'webhook-auth-failure',
+  INVALID_APP_PAYLOAD: 'invalid-app-payload',
   TTS_NOT_PROVISIONED: 'no-tts',
   STT_NOT_PROVISIONED: 'no-stt',
   TTS_FAILURE: 'tts-failure',
@@ -49,6 +50,15 @@ const schemas = {
       'account_sid',
       'alert_type'
     ]
+  },
+  call_counts: {
+    measurement: 'call_counts',
+    fields: {
+      calls_in_progress: Influx.FieldType.INTEGER,
+    },
+    tags: [
+      'account_sid'
+    ]
   }
 };
 
@@ -70,9 +80,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}' `;
@@ -101,8 +135,9 @@ const createCdrCountQuery = ({account_sid, trunk, direction, answered, days, sta
   return sql;
 };
 
-const createAlertsQuery = ({account_sid, alert_type, page, page_size, days, start, end}) => {
+const createAlertsQuery = ({account_sid, target_sid, alert_type, page, page_size, days, start, end}) => {
   let sql = `SELECT * FROM alerts WHERE account_sid = '${account_sid}' `;
+  if (target_sid) sql += `AND target_sid = '${target_sid}' `;
   if (alert_type) sql += `AND alert_type = '${alert_type}' `;
   if (days) sql += `AND time > now() - ${days}d `;
   else {
@@ -116,8 +151,9 @@ const createAlertsQuery = ({account_sid, alert_type, page, page_size, days, star
   return sql;
 };
 
-const createAlertsCountQuery = ({account_sid, alert_type, days, start, end}) => {
+const createAlertsCountQuery = ({account_sid, target_sid, alert_type, days, start, end}) => {
   let sql = `SELECT COUNT(message) FROM alerts WHERE account_sid = '${account_sid}' `;
+  if (target_sid) sql += `AND target_sid = '${target_sid}' `;
   if (alert_type) sql += `AND alert_type = '${alert_type}' `;
   if (days) sql += `AND time > now() - ${days}d `;
   else {
@@ -136,6 +172,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])
@@ -200,7 +287,7 @@ const writeAlerts = async(client, alerts) => {
   if (!client.locals.initialized) await initDatabase(client, 'alerts');
   alerts = (Array.isArray(alerts) ? alerts : [alerts])
     .map((alert) => {
-      const {alert_type, account_sid, url, status, vendor, count, detail, timestamp} = alert;
+      const {alert_type, account_sid, target_sid, url, status, vendor, count, detail, timestamp} = alert;
       let message = alert.message;
       if (!message) {
         switch (alert_type) {
@@ -216,6 +303,9 @@ const writeAlerts = async(client, alerts) => {
           case AlertType.WEBHOOK_URL_NOTFOUND:
             message = `webhook url not found: ${url}`;
             break;
+          case AlertType.INVALID_APP_PAYLOAD:
+            message = `${url} return invalid app payload`;
+            break;
           case AlertType.TTS_NOT_PROVISIONED:
             message = `text to speech credentials for ${vendor} have not been provisioned`;
             break;
@@ -245,7 +335,9 @@ const writeAlerts = async(client, alerts) => {
             break;
         }
       }
-      const obj = {measurement: 'alerts', fields: { message }, tags: { alert_type, account_sid }};
+      let fields =  { message };
+      if (target_sid) fields = Object.assign(fields, {target_sid});
+      const obj = {measurement: 'alerts', fields: fields, tags: { alert_type, account_sid }};
       if (timestamp) obj.timestamp = timestamp;
       if (detail) obj.fields.detail = detail;
       return obj;
@@ -295,6 +387,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',
@@ -312,13 +405,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,6 +1,6 @@
 {
   "name": "@jambonz/time-series",
-  "version": "0.1.7",
+  "version": "0.1.10",
   "description": "write and query data to time series daetabase",
   "main": "index.js",
   "scripts": {

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',
@@ -71,6 +73,12 @@ test('write cdr data', async(t) => {
       account_sid: 'yyyy',
       url: 'http://foo.bar'
     },
+    {
+      alert_type: AlertType.INVALID_APP_PAYLOAD,
+      account_sid: 'yyyy',
+      target_sid: 'zzzz',
+      message: 'invalid app payload'
+    },
     {
       alert_type: AlertType.TTS_NOT_PROVISIONED,
       account_sid: 'yyyy',
@@ -115,6 +123,27 @@ 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 === 12, 'queried alerts');
+  t.ok(result.data[0].target_sid === null)
+
+  result = await queryAlerts({account_sid: 'yyyy', target_sid: 'zzzz', page: 1, page_size: 25, days: 7});
+  t.ok(result.data.length === 1, 'queried alerts by target_sid');
+  t.ok(result.data[0].target_sid === 'zzzz')
+
+  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');
 
 });