@jambonz/time-series 0.2.16 → 0.2.18

package/index.js

@@ -103,6 +103,17 @@ const schemas = {
       'system_component',
       'state'
     ]
+  },
+  krisp_usage: {
+    measurement: 'krisp_usage',
+    fields: {
+      usage_seconds: Influx.FieldType.INTEGER
+    },
+    tags: [
+      'service_provider_sid',
+      'account_sid',
+      'feature'
+    ]
   }
 };
 
@@ -261,7 +272,7 @@ const createCdrCountQuery = ({trunk, direction, answered, filter, days, start, e
 /* for Service Provider */
 const createAlertsQuerySP = ({target_sid, alert_type, page, page_size, days, start, end}) => {
   // eslint-disable-next-line max-len
-  let sql = 'SELECT service_provider_sid, message, detail FROM alerts WHERE service_provider_sid = $service_provider_sid ';
+  let sql = 'SELECT * 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 ';
@@ -528,6 +539,26 @@ const writeSystemAlerts = async(client, systemAlerts) => {
   await writeData(client);
   return;
 };
+
+const writeKrispUsage = async(client, usage) => {
+  if (!client.locals.initialized) await initDatabase(client, 'krisp_usage');
+  const {service_provider_sid, account_sid, feature, ...fields} = usage;
+  const data = {
+    measurement: 'krisp_usage',
+    timestamp: new Date(),
+    fields,
+    tags: {
+      service_provider_sid,
+      account_sid,
+      feature
+    }
+  };
+  client.locals.data = [...client.locals.data, ...[data]];
+  if (client.locals.data.length >= client.locals.commitSize) {
+    await writeData(client);
+  }
+};
+
 const queryCdrsSP = async(client, opts) => {
   if (!client.locals.initialized) await initDatabase(client, 'cdrs');
   const response = {
@@ -784,6 +815,8 @@ module.exports = (logger, opts) => {
   // eslint-disable-next-line max-len
   const callCountAppClient = new Influx.InfluxDB({database: 'app_call_counts', schemas: schemas.app_call_counts, ...opts});
   const systemAlertClient = new Influx.InfluxDB({database: 'system_alerts', schemas: schemas.system_alerts, ...opts});
+  // eslint-disable-next-line max-len
+  const krispUsageClient = new Influx.InfluxDB({database: 'krisp_usage', schemas: schemas.krisp_usage, ...opts});
 
   cdrClient.locals = {
     db: 'cdrs',
@@ -833,6 +866,14 @@ module.exports = (logger, opts) => {
     commitInterval: opts.commitInterval || 10,
     data: []
   };
+  krispUsageClient.locals = {
+    db: 'krisp_usage',
+    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);
@@ -840,6 +881,7 @@ module.exports = (logger, opts) => {
     setInterval(writeData.bind(null, callCountAppClient), opts.commitInterval * 1000);
     setInterval(writeData.bind(null, cdrClient), opts.commitInterval * 1000);
     setInterval(writeData.bind(null, alertClient), opts.commitInterval * 1000);
+    setInterval(writeData.bind(null, krispUsageClient), opts.commitInterval * 1000);
   }
 
   return {
@@ -856,6 +898,7 @@ module.exports = (logger, opts) => {
     queryAlerts: queryAlerts.bind(null, alertClient),
     queryAlertsSP: queryAlertsSP.bind(null, alertClient),
     writeSystemAlerts: writeSystemAlerts.bind(null, systemAlertClient),
+    writeKrispUsage: writeKrispUsage.bind(null, krispUsageClient),
     AlertType: { ...AlertType }
   };
 };

package/package.json

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

package/test/docker_start.js

@@ -2,7 +2,7 @@ const test = require('tape');
 const exec = require('child_process').exec ;
 
 test('starting docker network..', (t) => {
-  exec(`docker-compose -f ${__dirname}/docker-compose-testbed.yaml up -d`, (err, stdout, stderr) => {
+  exec(`docker compose -f "${__dirname}/docker-compose-testbed.yaml" up -d`, (err, stdout, stderr) => {
     setTimeout(() => {
       t.pass('docker started');
       t.end(err);    

package/test/docker_stop.js

@@ -3,7 +3,7 @@ const exec = require('child_process').exec ;
 
 test('stopping docker network..', (t) => {
   t.timeoutAfter(10000);
-  exec(`docker-compose -f ${__dirname}/docker-compose-testbed.yaml down`, (err, stdout, stderr) => {
+  exec(`docker compose -f "${__dirname}/docker-compose-testbed.yaml" down`, (err, stdout, stderr) => {
     //console.log(`stderr: ${stderr}`);
     process.exit(0);
   });

package/test/unit-tests.js

@@ -15,6 +15,7 @@ const {
   writeAlerts,
   queryAlerts,
   queryAlertsSP,
+  writeKrispUsage,
   AlertType
 } = require('..')(consoleLogger, '127.0.0.1', {commitSize: 1});
 
@@ -266,4 +267,20 @@ test('write timeseries data', async(t) => {
   //console.log(JSON.stringify(result));
   t.ok(result.data.length === 2 && result.data[0].calls_in_progress === 21, 'queried call counts by application_sid');
 
+  result = await writeKrispUsage({
+    service_provider_sid: 'zzzzz',
+    account_sid: 'yyyy',
+    feature: 'noise_cancellation',
+    usage_seconds: 120
+  });
+  t.pass('wrote krisp usage for noise cancellation');
+
+  result = await writeKrispUsage({
+    service_provider_sid: 'zzzzz',
+    account_sid: 'yyyy',
+    feature: 'turn_taking',
+    usage_seconds: 45
+  });
+  t.pass('wrote krisp usage for turn taking');
+
 });