@jambonz/time-series 0.2.0 → 0.2.2

package/index.js

@@ -11,9 +11,12 @@ const AlertType = {
   TTS_FAILURE: 'tts-failure',
   STT_FAILURE: 'stt-failure',
   CARRIER_NOT_PROVISIONED: 'no-carrier',
-  CALL_LIMIT: 'call-limit',
-  DEVICE_LIMIT: 'device-limit',
-  API_LIMIT: 'api-limit',
+  ACCOUNT_CALL_LIMIT: 'account-call-limit',
+  ACCOUNT_DEVICE_LIMIT: 'account-device-limit',
+  ACCOUNT_API_LIMIT: 'account-api-limit',
+  SP_CALL_LIMIT: 'service-provider-call-limit',
+  SP_DEVICE_LIMIT: 'service-provider-device-limit',
+  SP_API_LIMIT: 'service-provider-api-limit',
   ACCOUNT_INACTIVE: 'account is inactive or suspended'
 };
 
@@ -22,6 +25,7 @@ const schemas = {
     measurement: 'cdrs',
     fields: {
       call_sid: Influx.FieldType.STRING,
+      application_sid: Influx.FieldType.STRING,
       from: Influx.FieldType.STRING,
       to: Influx.FieldType.STRING,
       sip_callid: Influx.FieldType.STRING,
@@ -62,6 +66,15 @@ const schemas = {
       'service_provider_sid',
       'account_sid'
     ]
+  },
+  sp_call_counts: {
+    measurement: 'sp_call_counts',
+    fields: {
+      calls_in_progress: Influx.FieldType.INTEGER,
+    },
+    tags: [
+      'service_provider_sid'
+    ]
   }
 };
 
@@ -85,7 +98,7 @@ const writeData = async(client) => {
 
 /* for Service Provider */
 const createCallCountsQuerySP = ({page, page_size, days, start, end}) => {
-  let sql = 'SELECT * from call_counts WHERE service_provider_sid = $service_provider_sid ';
+  let sql = 'SELECT * from sp_call_counts WHERE service_provider_sid = $service_provider_sid ';
   if (days) sql += 'AND time > $timestamp ';
   else {
     if (start) sql += 'AND time >= $start ';
@@ -98,7 +111,7 @@ const createCallCountsQuerySP = ({page, page_size, days, start, end}) => {
 };
 
 const createCallCountsCountQuerySP = ({days, start, end}) => {
-  let sql = 'SELECT COUNT(calls_in_progress) from call_counts WHERE service_provider_sid = $service_provider_sid ';
+  let sql = 'SELECT COUNT(calls_in_progress) from sp_call_counts WHERE service_provider_sid = $service_provider_sid ';
   if (days) sql += 'AND time > $timestamp ';
   else {
     if (start) sql += 'AND time >= $start ';
@@ -191,7 +204,8 @@ const createCdrCountQuery = ({trunk, direction, answered, days, start, end}) =>
 
 /* for Service Provider */
 const createAlertsQuerySP = ({target_sid, alert_type, page, page_size, days, start, end}) => {
-  let sql = 'SELECT * FROM alerts WHERE service_provider_sid = $service_provider_sid ';
+  // eslint-disable-next-line max-len
+  let sql = 'SELECT service_provider_sid, message, detail FROM alerts WHERE service_provider_sid = $service_provider_sid ';
   if (target_sid) sql += 'AND target_sid = $target_sid ';
   if (alert_type) sql += 'AND alert_type = $alert_type ';
   if (days) sql += 'AND time > $timestamp ';
@@ -271,8 +285,25 @@ const writeCallCount = async(client, count) => {
   return;
 };
 
+const writeCallCountSP = async(client, count) => {
+  if (!client.locals.initialized) await initDatabase(client, 'sp_call_counts');
+  const {service_provider_sid, ...fields} = count;
+  const data = {
+    measurement: 'sp_call_counts',
+    fields,
+    tags: {
+      service_provider_sid
+    }
+  };
+  client.locals.data = [...client.locals.data, ...[data]];
+  if (client.locals.data.length >= client.locals.commitSize) {
+    await writeData(client);
+  }
+  return;
+};
+
 const queryCallCountsSP = async(client, opts) => {
-  if (!client.locals.initialized) await initDatabase(client, 'call_counts');
+  if (!client.locals.initialized) await initDatabase(client, 'sp_call_counts');
   const response = {
     total: 0,
     page_size: opts.page_size,
@@ -420,6 +451,7 @@ const queryCdrs = async(client, opts) => {
 
   const sql = createCdrQuery(opts);
   const res = await client.queryRaw(sql, { placeholders: params});
+  //console.log(JSON.stringify(res.results[0]));
   if (res.results[0].series && res.results[0].series.length) {
     const {columns, values} = res.results[0].series[0];
     const data = values.map((v) => {
@@ -487,15 +519,29 @@ const writeAlerts = async(client, alerts) => {
           case AlertType.CARRIER_NOT_PROVISIONED:
             message = 'outbound call failure: no carriers have been provisioned';
             break;
-          case AlertType.CALL_LIMIT:
-            message = `you have exceeded your provisioned call limit of ${count}; please consider upgrading your plan`;
+          case AlertType.ACCOUNT_CALL_LIMIT:
+            message = `you have exceeded your account call limit of ${count}; please consider upgrading your plan`;
+            break;
+          case AlertType.ACCOUNT_DEVICE_LIMIT:
+            message =
+              // eslint-disable-next-line max-len
+              `you have exceeded your account limit of ${count} registered devices; please consider upgrading your plan`;
+            break;
+          case AlertType.ACCOUNT_API_LIMIT:
+            message = `you have exceeded your account api limit of ${count}; please consider upgrading your plan`;
             break;
-          case AlertType.DEVICE_LIMIT:
+          case AlertType.SP_CALL_LIMIT:
+            // eslint-disable-next-line max-len
+            message = `you have exceeded your service provider call limit of ${count}; please consider upgrading your plan`;
+            break;
+          case AlertType.SP_DEVICE_LIMIT:
             message =
-              `you have exceeded your device registration limit of ${count}; please consider upgrading your plan`;
+              // eslint-disable-next-line max-len
+              `you have exceeded your service provider limit of ${count} registered devices; please consider upgrading your plan`;
             break;
-          case AlertType.API_LIMIT:
-            message = `you have exceeded your api limit of ${count}; please consider upgrading your plan`;
+          case AlertType.SP_API_LIMIT:
+            // eslint-disable-next-line max-len
+            message = `you have exceeded your service provider api limit of ${count}; please consider upgrading your plan`;
             break;
           default:
             break;
@@ -595,6 +641,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});
+  const callCountSPClient = new Influx.InfluxDB({database: 'sp_call_counts', schemas: schemas.sp_call_counts, ...opts});
 
   cdrClient.locals = {
     db: 'cdrs',
@@ -612,6 +659,14 @@ module.exports = (logger, opts) => {
     commitInterval: opts.commitInterval || 10,
     data: []
   };
+  callCountSPClient.locals = {
+    db: 'sp_call_counts',
+    initialized: false,
+    writing: false,
+    commitSize: opts.commitSize || 1,
+    commitInterval: opts.commitInterval || 10,
+    data: []
+  };
   callCountClient.locals = {
     db: 'call_counts',
     initialized: false,
@@ -629,8 +684,9 @@ module.exports = (logger, opts) => {
 
   return {
     writeCallCount: writeCallCount.bind(null, callCountClient),
+    writeCallCountSP: writeCallCountSP.bind(null, callCountSPClient),
     queryCallCounts: queryCallCounts.bind(null, callCountClient),
-    queryCallCountsSP: queryCallCountsSP.bind(null, callCountClient),
+    queryCallCountsSP: queryCallCountsSP.bind(null, callCountSPClient),
     writeCdrs: writeCdrs.bind(null, cdrClient),
     queryCdrsSP: queryCdrsSP.bind(null, cdrClient),
     queryCdrs: queryCdrs.bind(null, cdrClient),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/time-series",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "write and query data to time series daetabase",
   "main": "index.js",
   "scripts": {

package/test/unit-tests.js

@@ -4,6 +4,7 @@ const consoleLogger = {error: console.error, info: console.log, debug: console.l
 
 const {
   writeCallCount,
+  writeCallCountSP,
   queryCallCounts,
   queryCallCountsSP,
   writeCdrs,
@@ -32,7 +33,6 @@ test('write timeseries data', async(t) => {
     trunk: 'device',
     service_provider_sid: 'zzzzz',
     account_sid: 'xxxx',
-    call_sid: 'foo'
   },
   {
     from: 'me2',
@@ -50,12 +50,13 @@ test('write timeseries data', async(t) => {
     trunk: 'twilio',
     service_provider_sid: 'zzzzz',
     account_sid: 'yyyy',
-    call_sid: 'bar'
+    call_sid: 'bar',
+    application_sid: 'app-sid'
   }]);
   t.pass('wrote cdr');
 
   result = await queryCdrs({account_sid: 'xxxx', page: 1, page_size:25});
-  //npm tesconsole.log(JSON.stringify(result));
+  //console.log(JSON.stringify(result));
   t.ok(result.data.length === 1, 'queried cdrs by account sid')
 
   result = await queryCdrs({account_sid: 'yyyy', trunk: 'twilio', page: 1, page_size:25});
@@ -121,22 +122,37 @@ test('write timeseries data', async(t) => {
       account_sid: 'yyyy',
     },
     {
-      alert_type: AlertType.CALL_LIMIT,
+      alert_type: AlertType.SP_CALL_LIMIT,
+      service_provider_sid: 'zzzzz',
+      count: 50,
+    },
+    {
+      alert_type: AlertType.ACCOUNT_CALL_LIMIT,
       service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       count: 50,
     },
     {
-      alert_type: AlertType.DEVICE_LIMIT,
+      alert_type: AlertType.SP_DEVICE_LIMIT,
+      service_provider_sid: 'zzzzz',
+      count: 500,
+    },
+    {
+      alert_type: AlertType.ACCOUNT_DEVICE_LIMIT,
       service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       count: 250,
     },
     {
-      alert_type: AlertType.API_LIMIT,
+      alert_type: AlertType.ACCOUNT_API_LIMIT,
       service_provider_sid: 'zzzzz',
       account_sid: 'yyyy',
       count: 120,
+    },
+    {
+      alert_type: AlertType.SP_API_LIMIT,
+      service_provider_sid: 'zzzzz',
+      count: 300,
     }
   ]);
   t.pass('wrote alerts');
@@ -158,7 +174,8 @@ test('write timeseries data', async(t) => {
   t.ok(result.data[0].target_sid === 'zzzz')
 
   result = await queryAlertsSP({service_provider_sid: 'zzzzz', page: 1, page_size: 25, days: 7});
-  t.ok(result.data.length === 12, 'queried alerts by service_provider_sid');
+  //console.log(result);
+  t.ok(result.data.length === 15, 'queried alerts by service_provider_sid');
 
   result = await writeCallCount(
     {
@@ -172,14 +189,25 @@ test('write timeseries data', async(t) => {
       service_provider_sid: 'zzzzz',
       account_sid: 'yyyy'
     });
-  t.pass('wrote call counts');
+  t.pass('wrote call counts for account');
 
-  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 by account_sid');
+  result = await writeCallCountSP(
+    {
+      calls_in_progress: 500,
+      service_provider_sid: 'zzzzz'
+    });
+  result = await writeCallCountSP(
+    {
+      calls_in_progress: 501,
+      service_provider_sid: 'zzzzz'
+    });
+  t.pass('wrote call counts for service provider');
 
   result = await queryCallCountsSP({service_provider_sid: 'zzzzz', page: 1, page_size: 25, days: 7});
   //console.log(JSON.stringify(result));
   t.ok(result.data.length === 2, 'queried call counts by service provider sid');
 
+  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 by account_sid');
 });