@jambonz/time-series 0.1.9 → 0.1.12

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',
@@ -79,85 +80,81 @@ 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 `;
+const createCallCountsQuery = ({page, page_size, days, start, end}) => {
+  let sql = 'SELECT * from call_counts WHERE account_sid = $account_sid ';
+  if (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    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);
+  if (page_size) sql += ' LIMIT $page_size';
+  if (page) sql += ' OFFSET $offset';
   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 `;
+const createCallCountsCountQuery = ({days, start, end}) => {
+  let sql = 'SELECT COUNT(calls_in_progress) from call_counts WHERE account_sid = $account_sid ';
+  if (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    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}'`;
-  if (trunk) sql += `AND trunk = '${trunk}' `;
-  if (direction) sql += `AND direction = '${direction}' `;
-  if (['true', 'false'].includes(answered)) sql += `AND answered = '${answered}' `;
-  if (days) sql += `AND time > now() - ${days}d `;
+const createCdrQuery = ({page, page_size, trunk, direction, answered, days, start, end}) => {
+  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 ';
+  if (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    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);
+  if (page_size) sql += ' LIMIT $page_size';
+  if (page) sql += ' OFFSET $offset';
   return sql;
 };
-const createCdrCountQuery = ({account_sid, trunk, direction, answered, days, start, end}) => {
-  let sql = `SELECT COUNT(sip_callid) 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}' `;
-  if (days) sql += `AND time > now() - ${days}d `;
+const createCdrCountQuery = ({trunk, direction, answered, days, start, end}) => {
+  let sql = 'SELECT COUNT(sip_callid) 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 ';
+  if (days) sql += 'AND time > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    if (start) sql += 'AND time >= $start ';
+    if (end) sql += 'AND time <= $end ';
   }
-  //console.log(sql);
   return sql;
 };
 
-const createAlertsQuery = ({account_sid, alert_type, page, page_size, days, start, end}) => {
-  let sql = `SELECT * FROM alerts WHERE account_sid = '${account_sid}' `;
-  if (alert_type) sql += `AND alert_type = '${alert_type}' `;
-  if (days) sql += `AND time > now() - ${days}d `;
+const createAlertsQuery = ({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 > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    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);
+  if (page_size) sql += ' LIMIT $page_size';
+  if (page) sql += ' OFFSET $offset';
   return sql;
 };
 
-const createAlertsCountQuery = ({account_sid, alert_type, days, start, end}) => {
-  let sql = `SELECT COUNT(message) FROM alerts WHERE account_sid = '${account_sid}' `;
-  if (alert_type) sql += `AND alert_type = '${alert_type}' `;
-  if (days) sql += `AND time > now() - ${days}d `;
+const createAlertsCountQuery = ({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 > $timestamp ';
   else {
-    if (start) sql += `AND time >= '${start}' `;
-    if (end) sql += `AND time <= '${end}' `;
+    if (start) sql += 'AND time >= $start ';
+    if (end) sql += 'AND time <= $end ';
   }
-  //console.log(sql);
   return sql;
 };
 
@@ -194,14 +191,15 @@ const queryCallCounts = async(client, opts) => {
     page: opts.page,
     data: []
   };
+  const params = generateBindParameters(opts);
   const sqlTotal = createCallCountsCountQuery(opts);
-  const obj = await client.queryRaw(sqlTotal);
+  const obj = await client.queryRaw(sqlTotal, { placeholders: params});
   //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);
+  const res = await client.queryRaw(sql, { placeholders: params});
   //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];
@@ -254,14 +252,15 @@ const queryCdrs = async(client, opts) => {
     page: opts.page,
     data: []
   };
+  const params = generateBindParameters(opts);
   const sqlTotal = createCdrCountQuery(opts);
-  const obj = await client.queryRaw(sqlTotal);
+  const obj = await client.queryRaw(sqlTotal, { placeholders: params});
   //console.log(`sql: ${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 = createCdrQuery(opts);
-  const res = await client.queryRaw(sql);
+  const res = await client.queryRaw(sql, { placeholders: params});
   if (res.results[0].series && res.results[0].series.length) {
     const {columns, values} = res.results[0].series[0];
     const data = values.map((v) => {
@@ -284,7 +283,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) {
@@ -300,6 +299,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;
@@ -329,7 +331,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;
@@ -342,6 +346,14 @@ const writeAlerts = async(client, alerts) => {
   return;
 };
 
+const generateBindParameters = (opts) => {
+  const params = {...opts};
+  if (opts.days) params.timestamp = Date.now() * 1000000 - opts.days * 24 * 60 * 60 * 1000000000;
+  if (opts.page) params.offset = opts.page  - 1 >= 0 && opts.page_size >= 0 ? (opts.page  - 1) * opts.page_size : 0;
+  if (opts.page_size) params.page_size = parseInt(opts.page_size);
+  return params;
+};
+
 const queryAlerts = async(client, opts) => {
   if (!client.locals.initialized) await initDatabase(client, 'alerts');
   const response = {
@@ -350,14 +362,15 @@ const queryAlerts = async(client, opts) => {
     page: opts.page,
     data: []
   };
+  const params = generateBindParameters(opts);
   const sqlTotal = createAlertsCountQuery(opts);
-  const obj = await client.queryRaw(sqlTotal);
+  const obj = await client.queryRaw(sqlTotal, { placeholders: params});
   //console.log(`query total alerts: ${sqlTotal}: ${JSON.stringify(obj)}`);
   if (!obj.results || !obj.results[0].series) return response;
   response.total = obj.results[0].series[0].values[0][1];
 
   const sql = createAlertsQuery(opts);
-  const res = await client.queryRaw(sql);
+  const res = await client.queryRaw(sql, { placeholders: params});
   if (res.results[0].series && res.results[0].series.length) {
     const {columns, values} = res.results[0].series[0];
     const data = values.map((v) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/time-series",
-  "version": "0.1.9",
+  "version": "0.1.12",
   "description": "write and query data to time series daetabase",
   "main": "index.js",
   "scripts": {
@@ -12,7 +12,7 @@
   "license": "MIT",
   "dependencies": {
     "debug": "^4.3.1",
-    "influx": "^5.8.0"
+    "influx": "^5.9.3"
   },
   "devDependencies": {
     "eslint": "^7.23.0",

package/test/unit-tests.js

@@ -73,6 +73,12 @@ test('write timeseries 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',
@@ -117,7 +123,19 @@ test('write timeseries 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)
+
+  // Make sure that page, page_size and days support both string and int
+  result = await queryAlerts({account_sid: 'yyyy', page: '1', page_size: '10', days: '7'});
+  t.ok(result.data.length === 10, 'queried alerts');
+
+  result = await queryAlerts({account_sid: 'yyyy', page: '2', page_size: '10', days: '7'});
+  t.ok(result.data.length === 2, 'queried alerts');
+
+  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(
     {