fix query sp alerts & bump time-series (#547)

* fix query sp alerts & bump time-series

* add package-lock.json back

* fix: use shared parseAccountSid/parseServiceProviderSid from utils in alerts and recent-calls routes

* fix/update tests

* fix tests

---------

Co-authored-by: Dave Horton <daveh@beachdognet.com>

test/create-test-db.js

@@ -2,7 +2,7 @@ const test = require('tape') ;
 const exec = require('child_process').exec ;
 
 test('creating jambones_test database', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360 < ${__dirname}/../db/create_test_db.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root < ${__dirname}/../db/create_test_db.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('database successfully created');
     t.end();
@@ -10,7 +10,7 @@ test('creating jambones_test database', (t) => {
 });
 
 test('creating schema', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/jambones-sql.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/jambones-sql.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('schema successfully created');
     t.end();
@@ -18,7 +18,7 @@ test('creating schema', (t) => {
 });
 
 test('creating auth token', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/create-admin-token.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/create-admin-token.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('auth token successfully created');
     t.end();
@@ -26,7 +26,7 @@ test('creating auth token', (t) => {
 });
 
 test('add predefined carriers', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/add-predefined-carriers.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/add-predefined-carriers.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('predefined carriers added');
     t.end();
@@ -34,7 +34,7 @@ test('add predefined carriers', (t) => {
 });
 
 test('prepare permissions', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('permissions prepared');
     t.end();

test/docker-compose-testbed.yaml

@@ -1,5 +1,3 @@
-version: '3'
-
 networks:
   jambonz-api:
     driver: bridge
@@ -10,11 +8,11 @@ networks:
 
 services:  
   mysql:
-    # platform: linux/x86_64
+    container_name: mysql-jambonz-test
     image: mysql:5.7
     ports:
       - "3360:3306"
-    environment: 
+    environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "127.0.0.1", "--protocol", "tcp"]

test/docker_start.js

@@ -1,11 +1,25 @@
 const test = require('tape');
 const exec = require('child_process').exec ;
 
+const waitForMySQL = (attempts = 0, maxAttempts = 30) => {
+  return new Promise((resolve, reject) => {
+    const check = () => {
+      exec('docker exec mysql-jambonz-test mysqladmin ping -u root --silent', (err) => {
+        if (!err) return resolve();
+        if (++attempts >= maxAttempts) return reject(new Error('MySQL did not become ready in time'));
+        setTimeout(check, 2000);
+      });
+    };
+    check();
+  });
+};
+
 test('starting docker network..', (t) => {
   t.plan(1);
-  exec(`docker-compose -f ${__dirname}/docker-compose-testbed.yaml up -d`, (err, stdout, stderr) => {
-    setTimeout(() => {
-      t.pass('docker started');
-    }, 15000);
+  exec(`docker compose -f ${__dirname}/docker-compose-testbed.yaml up -d`, (err, stdout, stderr) => {
+    if (err) return t.fail(err.message);
+    waitForMySQL()
+      .then(() => t.pass('docker started'))
+      .catch((err) => t.fail(err.message));
   });
 });

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);
   });

test/remove-test-db.js

@@ -1,9 +1,8 @@
 const test = require('tape').test ;
 const exec = require('child_process').exec ;
-const pwd = process.env.CI ? '' : '-p$MYSQL_ROOT_PASSWORD';
 
 test('dropping jambones_test database', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root ${pwd} --protocol=tcp < ${__dirname}/../db/remove_test_db.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root < ${__dirname}/../db/remove_test_db.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('database successfully dropped');
     t.end();

test/serve-integration.js

@@ -13,7 +13,7 @@ process.on('SIGINT', async() => {
 const startDocker = () => {
   return new Promise((resolve, reject) => {
     console.log('starting dockerized mysql and redis..')
-    exec(`docker-compose -f ${__dirname}/docker-compose-testbed.yaml up -d`, (err) => {
+    exec(`docker compose -f ${__dirname}/docker-compose-testbed.yaml up -d`, (err) => {
       if (err) return reject(err);
       setTimeout(() => {
         console.log('mysql is running');
@@ -26,7 +26,7 @@ const startDocker = () => {
 const createDb = () => {
   return new Promise((resolve, reject) => {
     console.log('creating database..')
-    exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360 < ${__dirname}/../db/create_test_db.sql`, (err) => {
+    exec(`docker exec -i mysql-jambonz-test mysql -u root < ${__dirname}/../db/create_test_db.sql`, (err) => {
       if (err) return reject(err);
       resolve();
     });
@@ -36,7 +36,7 @@ const createDb = () => {
 const createSchema = () => {
   return new Promise((resolve, reject) => {
     console.log('creating schema..')
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/jambones-sql.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/jambones-sql.sql`, (err, stdout, stderr) => {
       if (err) return reject(err);
       resolve();
     });
@@ -46,7 +46,7 @@ const createSchema = () => {
 const seedDb = () => {
   return new Promise((resolve, reject) => {
     console.log('seeding database..')
-    exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/seed-integration-test.sql`, (err) => {
+    exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/seed-integration-test.sql`, (err) => {
       if (err) return reject(err);
       resolve();
     });
@@ -78,7 +78,7 @@ const generateSipTrace = async() => {
 const stopDocker = () => {
   return new Promise((resolve, reject) => {
     console.log('stopping docker network..')
-    exec(`docker-compose -f ${__dirname}/docker-compose-testbed.yaml down`, (err) => {
+    exec(`docker compose -f ${__dirname}/docker-compose-testbed.yaml down`, (err) => {
       if (err) return reject(err);
       resolve();
     });

test/speech-credentials.js

@@ -422,85 +422,7 @@ test('speech credentials tests', async(t) => {
     });
     t.ok(result.statusCode === 204, 'successfully deleted speech credential for deepgram onprem');
 
-    /* add a credential for ibm tts */
-    if (process.env.IBM_TTS_API_KEY && process.env.IBM_TTS_REGION) {
-      result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,
-        body: {
-          vendor: 'ibm',
-          use_for_tts: true,
-          tts_api_key: process.env.IBM_TTS_API_KEY,
-          tts_region: process.env.IBM_TTS_REGION
-        }
-      });
-      t.ok(result.statusCode === 201, 'successfully added speech credential for ibm');
-      const ms_sid = result.body.sid;
 
-      /* test the speech credential */
-      result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}/test`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,   
-      });
-      //console.log(JSON.stringify(result));
-      t.ok(result.statusCode === 200 && result.body.tts.status === 'ok', 'successfully tested speech credential for ibm tts');
-
-      /* delete the credential */
-      result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}`, {
-        auth: authUser,
-        resolveWithFullResponse: true,
-      });
-      t.ok(result.statusCode === 204, 'successfully deleted speech credential');
-    }
-
-    /* add a credential for ibm stt */
-    if (process.env.IBM_STT_API_KEY && process.env.IBM_STT_REGION) {
-      result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,
-        body: {
-          vendor: 'ibm',
-          use_for_stt: true,
-          stt_api_key: process.env.IBM_STT_API_KEY,
-          stt_region: process.env.IBM_STT_REGION
-        }
-      });
-      t.ok(result.statusCode === 201, 'successfully added speech credential for ibm');
-      const ms_sid = result.body.sid;
-
-      /* test the speech credential */
-      result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}/test`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,   
-      });
-      //console.log(JSON.stringify(result));
-      t.ok(result.statusCode === 200 && result.body.stt.status === 'ok', 'successfully tested speech credential for ibm stt');
-
-      result = await request.post(`/Accounts/${account_sid}/TtsCache/Synthesize`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,
-        body: {
-          speech_credential_sid: ms_sid,
-          text: "Hello How are you",
-          language: "en-US",
-          voice: "en-US_MichaelExpressive"
-        }
-      });
-
-      t.ok(result.statusCode === 200, 'successfully IBM tested synthesize');
-
-      /* delete the credential */
-      result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${ms_sid}`, {
-        auth: authUser,
-        resolveWithFullResponse: true,
-      });
-      t.ok(result.statusCode === 204, 'successfully deleted speech credential');
-    }
 
     /* add a credential for Siniox */
     if (process.env.SONIOX_API_KEY) {
@@ -1051,17 +973,7 @@ test('speech credentials tests', async(t) => {
     t.ok(result.body.stt.length !== 0, 'successfully get deepgram supported languages and voices');
     t.ok(result.body.models.length !== 0, 'successfully get deepgram supported languages and voices');
 
-    /* Check ibm supportedLanguagesAndVoices */
-    result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/speech/supportedLanguagesAndVoices?vendor=ibm`, {
-      resolveWithFullResponse: true,
-      simple: false,
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.body.tts.length !== 0, 'successfully get ibm supported languages and voices');
-    t.ok(result.body.stt.length !== 0, 'successfully get ibm supported languages and voices');
-
-    /* Check ibm supportedLanguagesAndVoices */
+    /* Check nvidia supportedLanguagesAndVoices */
     result = await request.get(`/Accounts/${account_sid}/SpeechCredentials/speech/supportedLanguagesAndVoices?vendor=nvidia`, {
       resolveWithFullResponse: true,
       simple: false,

test/users-view-only.js

@@ -22,7 +22,7 @@ test('add an admin user', (t) => {
 
 
 test('prepare permissions', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('permissions prepared');
     t.end();

test/users.js

@@ -22,7 +22,7 @@ test('add an admin user', (t) => {
   });
 });
 test('prepare permissions', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('permissions prepared');
     t.end();

test/webapp_tests.js

@@ -11,7 +11,7 @@ const {createApiKey} = require('./utils');
 const sleepFor = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 test('re-creating schema', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/jambones-sql.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/jambones-sql.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('schema successfully created');
     t.end();
@@ -19,14 +19,14 @@ test('re-creating schema', (t) => {
 });
 
 test('seeding database for webapp tests', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/webapp-tests.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/webapp-tests.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('successfully re-seeded database');
     t.end();
   });
 });
 test('prepare permissions', (t) => {
-  exec(`mysql -h 127.0.0.1 -u root  --protocol=tcp --port=3360 -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
+  exec(`docker exec -i mysql-jambonz-test mysql -u root -D jambones_test < ${__dirname}/../db/prepare-permissions-test.sql`, (err, stdout, stderr) => {
     if (err) return t.end(err);
     t.pass('permissions prepared');
     t.end();