swagger updated for call records

.github/workflows/ci.yml

@@ -7,21 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Docker Compose
-        run: |
-          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-          docker-compose --version
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
       - run: npm install
       - run: npm run jslint
-      - name: Install Docker Compose
-        run: |
-          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-          docker-compose --version
       - run: npm test
 
  

app.js

@@ -222,7 +222,7 @@ server.on('upgrade', (request, socket, head) => {
 
   /* complete the upgrade */
   wsServer.handleUpgrade(request, socket, head, (ws) => {
-    logger.debug(`upgraded to websocket, url: ${request.url}`);
+    logger.info(`upgraded to websocket, url: ${request.url}`);
     wsServer.emit('connection', ws, request.url);
   });
 });

db/jambones-sql.sql

@@ -162,7 +162,7 @@ regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed num
 description VARCHAR(1024),
 priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) COMMENT='An ordered list of  digit patterns in an LCR table.  The pat';
+) COMMENT='An ordered list of  digit patterns in an LCR table.  The patterns are tested in sequence until one matches';
 
 CREATE TABLE lcr
 (
@@ -173,7 +173,7 @@ default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use whe
 service_provider_sid CHAR(36),
 account_sid CHAR(36),
 PRIMARY KEY (lcr_sid)
-) COMMENT='An LCR (least cost routing) table that is used by a service ';
+) COMMENT='An LCR (least cost routing) table that is used by a service provider or account to make decisions about routing outbound calls when multiple carriers are available.';
 
 CREATE TABLE password_settings
 (
@@ -351,8 +351,6 @@ speech_credential_sid CHAR(36) NOT NULL,
 model VARCHAR(512) NOT NULL,
 reported_usage ENUM('REPORTED_USAGE_UNSPECIFIED','REALTIME','OFFLINE') DEFAULT 'REALTIME',
 name VARCHAR(64) NOT NULL,
-voice_cloning_key MEDIUMTEXT,
-use_voice_cloning_key BOOLEAN DEFAULT false,
 PRIMARY KEY (google_custom_voice_sid)
 );
 
@@ -360,9 +358,7 @@ CREATE TABLE system_information
 (
 domain_name VARCHAR(255),
 sip_domain_name VARCHAR(255),
-monitoring_domain_name VARCHAR(255),
-private_network_cidr VARCHAR(8192),
-log_level ENUM('info', 'debug') NOT NULL DEFAULT 'info'
+monitoring_domain_name VARCHAR(255)
 );
 
 CREATE TABLE users
@@ -416,7 +412,6 @@ register_from_user VARCHAR(128),
 register_from_domain VARCHAR(255),
 register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
 register_status VARCHAR(4096),
-dtmf_type ENUM('rfc2833','tones','info') NOT NULL DEFAULT 'rfc2833',
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';
 
@@ -557,7 +552,6 @@ siprec_hook_sid CHAR(36),
 record_all_calls BOOLEAN NOT NULL DEFAULT false,
 record_format VARCHAR(16) NOT NULL DEFAULT 'mp3',
 bucket_credential VARCHAR(8192) COMMENT 'credential used to authenticate with storage service',
-enable_debug_log BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';
 

db/upgrade-jambonz-db.js

@@ -197,18 +197,6 @@ const sql = {
     'ALTER TABLE applications MODIFY COLUMN speech_synthesis_voice VARCHAR(256)',
     'ALTER TABLE applications MODIFY COLUMN fallback_speech_synthesis_voice VARCHAR(256)',
     'ALTER TABLE sip_gateways ADD COLUMN use_sips_scheme BOOLEAN NOT NULL DEFAULT 0',
-  ],
-  9002: [
-    'ALTER TABLE system_information ADD COLUMN private_network_cidr VARCHAR(8192)',
-    'ALTER TABLE system_information ADD COLUMN log_level ENUM(\'info\', \'debug\') NOT NULL DEFAULT \'info\'',
-    'ALTER TABLE accounts ADD COLUMN enable_debug_log BOOLEAN NOT NULL DEFAULT false',
-    'ALTER TABLE google_custom_voices ADD COLUMN use_voice_cloning_key BOOLEAN DEFAULT false',
-    'ALTER TABLE google_custom_voices ADD COLUMN voice_cloning_key MEDIUMTEXT',
-  ],
-  9003: [
-    'ALTER TABLE google_custom_voices ADD COLUMN voice_cloning_key MEDIUMTEXT',
-    'ALTER TABLE google_custom_voices ADD COLUMN use_voice_cloning_key BOOLEAN DEFAULT false',
-    'ALTER TABLE voip_carriers ADD COLUMN dtmf_type ENUM(\'rfc2833\',\'tones\',\'info\') NOT NULL DEFAULT \'rfc2833\'',
   ]
 };
 
@@ -242,8 +230,6 @@ const doIt = async() => {
         if (val < 8004) upgrades.push(...sql['8004']);
         if (val < 8005) upgrades.push(...sql['8005']);
         if (val < 9000) upgrades.push(...sql['9000']);
-        if (val < 9002) upgrades.push(...sql['9002']);
-        if (val < 9003) upgrades.push(...sql['9003']);
 
         // perform all upgrades
         logger.info({upgrades}, 'applying schema upgrades..');

lib/models/speech-credential.js

@@ -22,17 +22,13 @@ class SpeechCredential extends Model {
 
   static async getSpeechCredentialsByVendorAndLabel(service_provider_sid, account_sid, vendor, label) {
     let sql;
-    let rows = [];
     if (account_sid) {
-      sql = `SELECT * FROM speech_credentials WHERE account_sid = ? AND vendor = ?
-        AND label ${label ? '= ?' : 'is NULL'}`;
-      [rows] = await promisePool.query(sql, [account_sid, vendor, label]);
-    }
-    if (rows.length === 0) {
+      sql = `SELECT * FROM speech_credentials WHERE account_sid = ? AND vendor = ? ${label ? 'AND label = ?' : ''}`;
+    } else {
       sql = `SELECT * FROM speech_credentials WHERE service_provider_sid = ? AND vendor = ?
-        AND label ${label ? '= ?' : 'is NULL'}`;
-      [rows] = await promisePool.query(sql, [service_provider_sid, vendor, label]);
+        ${label ? 'AND label = ?' : ''}`;
     }
+    const [rows] = await promisePool.query(sql, [account_sid ? account_sid : service_provider_sid, vendor, label]);
     return rows;
   }
 

lib/models/system-information.js

@@ -33,10 +33,6 @@ SystemInformation.fields = [
     name: 'monitoring_domain_name',
     type: 'string',
   },
-  {
-    name: 'private_network_cidr',
-    type: 'string',
-  },
 ];
 
 module.exports = SystemInformation;

lib/models/voip-carrier.js

@@ -136,10 +136,6 @@ VoipCarrier.fields = [
   {
     name: 'register_status',
     type: 'string'
-  },
-  {
-    name: 'dtmf_type',
-    type: 'string'
   }
 ];
 

lib/routes/api/accounts.js

@@ -42,7 +42,7 @@ const getFsUrl = async(logger, retrieveSet, setName) => {
       return ;
     }
     const f = fs[idx++ % fs.length];
-    logger.debug({fs}, `feature servers available for createCall API request, selecting ${f}`);
+    logger.info({fs}, `feature servers available for createCall API request, selecting ${f}`);
     return `${f}/v1/createCall`;
   } catch (err) {
     logger.error({err}, 'getFsUrl: error retreving feature servers from redis');
@@ -266,8 +266,7 @@ function validateUpdateCall(opts) {
     'record',
     'tag',
     'dtmf',
-    'conferenceParticipantAction',
-    'dub'
+    'conferenceParticipantAction'
   ]
     .reduce((acc, prop) => (opts[prop] ? ++acc : acc), 0);
 

lib/routes/api/google-custom-voices.js

@@ -4,9 +4,6 @@ const SpeechCredential = require('../../models/speech-credential');
 const decorate = require('./decorate');
 const {DbErrorBadRequest, DbErrorForbidden} = require('../../utils/errors');
 const sysError = require('../error');
-const multer = require('multer');
-const upload = multer({ dest: '/tmp/csv/' });
-const fs = require('fs');
 
 const validateCredentialPermission = async(req) => {
   const credential = await SpeechCredential.retrieve(req.body.speech_credential_sid);
@@ -44,33 +41,6 @@ const preconditions = {
 
 decorate(router, GoogleCustomVoice, ['add', 'retrieve', 'update', 'delete'], preconditions);
 
-const voiceCloningKeySubString = (voice_cloning_key) => {
-  return voice_cloning_key ? voice_cloning_key.substring(0, 100) + '...' : undefined;
-};
-
-router.get('/: sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const {sid} = req.params;
-    const account_sid = req.user.account_sid;
-    const service_provider_sid = req.user.service_provider_sid;
-
-    const google_voice = await GoogleCustomVoice.retrieve(sid);
-    google_voice.voice_cloning_key = voiceCloningKeySubString(google_voice.voice_cloning_key);
-    if (!google_voice) {
-      return res.sendStatus(404);
-    }
-    if (req.user.hasScope('service_provider') && google_voice.service_provider_sid !== service_provider_sid ||
-      req.user.hasScope('account') && google_voice.account_sid !== account_sid) {
-      throw new DbErrorForbidden('Insufficient privileges');
-    }
-
-    return res.status(200).json(google_voice);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
 router.get('/', async(req, res) => {
   const logger = req.app.locals.logger;
   const account_sid = req.user.account_sid || req.query.account_sid;
@@ -97,37 +67,7 @@ router.get('/', async(req, res) => {
       }
       results = await GoogleCustomVoice.retrieveAllByLabel(service_provider_sid, account_sid, label);
     }
-    res.status(200).json(results.map((r) => {
-      r.voice_cloning_key = voiceCloningKeySubString(r.voice_cloning_key);
-      return r;
-    }));
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.post('/:sid/VoiceCloningKey', upload.single('file'), async(req, res) => {
-  const {logger} = req.app.locals;
-  const {sid} = req.params;
-  const account_sid = req.user.account_sid;
-  const service_provider_sid = req.user.service_provider_sid;
-  try {
-    const google_voice = await GoogleCustomVoice.retrieve(sid);
-    if (!google_voice) {
-      return res.sendStatus(404);
-    }
-    if (req.user.hasScope('service_provider') && google_voice.service_provider_sid !== service_provider_sid ||
-      req.user.hasScope('account') && google_voice.account_sid !== account_sid) {
-      throw new DbErrorForbidden('Insufficient privileges');
-    }
-
-    const voice_cloning_key = Buffer.from(fs.readFileSync(req.file.path)).toString();
-    await GoogleCustomVoice.update(sid, {
-      voice_cloning_key
-    });
-    fs.unlinkSync(req.file.path);
-    return res.sendStatus(204);
-
+    res.status(200).json(results);
   } catch (err) {
     sysError(logger, res, err);
   }

lib/routes/api/sip-gateways.js

@@ -41,7 +41,6 @@ const checkUserScope = async(req, voip_carrier_sid) => {
 
 const validate = async(req, sid) => {
   const {lookupSipGatewayBySid} = req.app.locals;
-  const {netmask} = req.body;
   let voip_carrier_sid;
 
   if (sid) {
@@ -53,12 +52,6 @@ const validate = async(req, sid) => {
     voip_carrier_sid = req.body.voip_carrier_sid;
     if (!voip_carrier_sid) throw new DbErrorBadRequest('missing voip_carrier_sid');
   }
-  if (netmask &&
-    process.env.JAMBONZ_MIN_GATEWAY_NETMASK &&
-    parseInt(netmask) < process.env.JAMBONZ_MIN_GATEWAY_NETMASK) {
-    throw new DbErrorBadRequest(
-      `netmask required to have value equal or greater than ${process.env.JAMBONZ_MIN_GATEWAY_NETMASK}`);
-  }
   await checkUserScope(req, voip_carrier_sid);
 };
 

lib/routes/api/speech-credentials.js

@@ -10,8 +10,7 @@ const {decryptCredential, testWhisper, testDeepgramTTS,
   testPlayHT,
   testRimelabs,
   testVerbioTts,
-  testVerbioStt,
-  testSpeechmaticsStt} = require('../../utils/speech-utils');
+  testVerbioStt} = require('../../utils/speech-utils');
 const {DbErrorUnprocessableRequest, DbErrorForbidden, DbErrorBadRequest} = require('../../utils/errors');
 const {
   testGoogleTts,
@@ -123,10 +122,8 @@ const encryptCredential = (obj) => {
     secret,
     nuance_tts_uri,
     nuance_stt_uri,
-    speechmatics_stt_uri,
     deepgram_stt_uri,
     deepgram_stt_use_tls,
-    deepgram_tts_uri,
     use_custom_tts,
     custom_tts_endpoint,
     custom_tts_endpoint_url,
@@ -207,10 +204,10 @@ const encryptCredential = (obj) => {
 
     case 'deepgram':
       // API key is optional if onprem
-      if (!deepgram_stt_uri || !deepgram_tts_uri) {
+      if (!deepgram_stt_uri) {
         assert(api_key, 'invalid deepgram speech credential: api_key is required');
       }
-      const deepgramData = JSON.stringify({api_key, deepgram_stt_uri, deepgram_stt_use_tls, deepgram_tts_uri});
+      const deepgramData = JSON.stringify({api_key, deepgram_stt_uri, deepgram_stt_use_tls});
       return encrypt(deepgramData);
 
     case 'ibm':
@@ -238,12 +235,6 @@ const encryptCredential = (obj) => {
       const elevenlabsData = JSON.stringify({api_key, model_id, options});
       return encrypt(elevenlabsData);
 
-    case 'speechmatics':
-      assert(api_key, 'invalid speechmatics speech credential: api_key is required');
-      assert(speechmatics_stt_uri, 'invalid speechmatics speech credential: speechmatics_stt_uri is required');
-      const speechmaticsData = JSON.stringify({api_key, speechmatics_stt_uri, options});
-      return encrypt(speechmaticsData);
-
     case 'playht':
       assert(api_key, 'invalid playht speech credential: api_key is required');
       assert(user_id, 'invalid playht speech credential: user_id is required');
@@ -467,7 +458,6 @@ router.put('/:sid', async(req, res) => {
           options,
           deepgram_stt_uri,
           deepgram_stt_use_tls,
-          deepgram_tts_uri,
           engine_version
         } = req.body;
 
@@ -495,7 +485,6 @@ router.put('/:sid', async(req, res) => {
           options,
           deepgram_stt_uri,
           deepgram_stt_use_tls,
-          deepgram_tts_uri,
           engine_version
         };
         logger.info({o, newCred}, 'updating speech credential with this new credential');
@@ -776,18 +765,6 @@ router.get('/:sid/test', async(req, res) => {
           SpeechCredential.ttsTestResult(sid, false);
         }
       }
-    } else if (cred.vendor === 'speechmatics') {
-      const {api_key} = credential;
-      if (cred.use_for_stt) {
-        try {
-          await testSpeechmaticsStt(logger, {api_key});
-          results.stt.status = 'ok';
-          SpeechCredential.ttsTestResult(sid, true);
-        } catch (err) {
-          results.stt = {status: 'fail', reason: err.message};
-          SpeechCredential.ttsTestResult(sid, false);
-        }
-      }
     } else if (cred.vendor === 'playht') {
       if (cred.use_for_tts) {
         try {
@@ -875,7 +852,7 @@ router.get('/:sid/test', async(req, res) => {
 router.get('/speech/supportedLanguagesAndVoices', async(req, res) => {
   const {logger, getTtsVoices} = req.app.locals;
   try {
-    const {vendor, label, create_new} = req.query;
+    const {vendor, label} = req.query;
     if (!vendor) {
       throw new DbErrorBadRequest('vendor is required');
     }
@@ -883,7 +860,7 @@ router.get('/speech/supportedLanguagesAndVoices', async(req, res) => {
     const service_provider_sid = req.user.service_provider_sid ||
       req.body.service_provider_sid || parseServiceProviderSid(req);
 
-    const credentials = create_new ? null : await SpeechCredential.getSpeechCredentialsByVendorAndLabel(
+    const credentials = await SpeechCredential.getSpeechCredentialsByVendorAndLabel(
       service_provider_sid, account_sid, vendor, label);
     const tmp = credentials && credentials.length > 0 ? credentials[0] : null;
     const cred = tmp ? JSON.parse(decrypt(tmp.credential)) : null;

lib/swagger/swagger.yaml

@@ -130,7 +130,71 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/GeneralError'      
+                $ref: '#/components/schemas/GeneralError'
+  /Accounts/{accountSid}/RecentCalls/{callSid}/record/{year}/{month}/{day}/{format}:
+    get:
+      tags:
+        - Call Records
+      summary: 'Retrieve a recording of a recent call in specified format'
+      description: 'Gets the recording of a recent call by specifying the account ID, call ID, the date of the call, and the format of the recording (e.g., MP3 or WAV).'
+      operationId: getRecordingByFormat
+      security:
+        - ApiKeyAuth: [ ]
+      parameters:
+        - name: accountSid
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: callSid
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: year
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: month
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: day
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: format
+          in: path
+          required: true
+          schema:
+            type: string
+            enum:
+              - mp3
+              - wav
+      responses:
+        200:
+          description: Successfully retrieved the recording file.
+          content:
+            audio/*:
+              schema:
+                type: string
+                format: binary
+        404:
+          description: Call record not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/GeneralError'
+        500:
+          description: System error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/GeneralError'
+
   /Sbcs:
     post:
       tags:

lib/utils/speech-data/stt-speechmatics.js

@@ -1,218 +0,0 @@
-module.exports = [
-  {
-    name: 'Automatic',
-    value: 'auto',
-  },
-  {
-    name: 'Arabic',
-    value: 'ar',
-  },
-  {
-    name: 'Bashkir',
-    value: 'ba',
-  },
-  {
-    name: 'Basque',
-    value: 'eu',
-  },
-  {
-    name: 'Belarusian',
-    value: 'be',
-  },
-  {
-    name: 'Bulgarian',
-    value: 'bg',
-  },
-  {
-    name: 'Cantonese',
-    value: 'yue',
-  },
-  {
-    name: 'Catalan',
-    value: 'ca',
-  },
-  {
-    name: 'Croatian',
-    value: 'hr',
-  },
-  {
-    name: 'Czech',
-    value: 'cs',
-  },
-  {
-    name: 'Danish',
-    value: 'da',
-  },
-  {
-    name: 'Dutch',
-    value: 'nl',
-  },
-  {
-    name: 'English',
-    value: 'en',
-  },
-  {
-    name: 'Esperanto',
-    value: 'eo',
-  },
-  {
-    name: 'Estonian',
-    value: 'et',
-  },
-  {
-    name: 'Finnish',
-    value: 'fi',
-  },
-  {
-    name: 'French',
-    value: 'fr',
-  },
-  {
-    name: 'Galician',
-    value: 'gl',
-  },
-  {
-    name: 'German',
-    value: 'de',
-  },
-  {
-    name: 'Greek',
-    value: 'el',
-  },
-  {
-    name: 'Hebrew',
-    value: 'he',
-  },
-  {
-    name: 'Hindi',
-    value: 'hi',
-  },
-  {
-    name: 'Hungarian',
-    value: 'hu',
-  },
-  {
-    name: 'Irish',
-    value: 'ga',
-  },
-  {
-    name: 'Interlingua',
-    value: 'ia',
-  },
-  {
-    name: 'Italian',
-    value: 'it',
-  },
-  {
-    name: 'Indonesian',
-    value: 'id',
-  },
-  {
-    name: 'Japanese',
-    value: 'ja',
-  },
-  {
-    name: 'Korean',
-    value: 'ko',
-  },
-  {
-    name: 'Latvian',
-    value: 'lv',
-  },
-  {
-    name: 'Lithuanian',
-    value: 'lt',
-  },
-  {
-    name: 'Maltese',
-    value: 'mt',
-  },
-  {
-    name: 'Malay',
-    value: 'ms',
-  },
-  {
-    name: 'Mandarin',
-    value: 'cmn',
-  },
-  {
-    name: 'Marathi',
-    value: 'mr',
-  },
-  {
-    name: 'Mongolian',
-    value: 'mn',
-  },
-  {
-    name: 'Norwegian',
-    value: 'no',
-  },
-  {
-    name: 'Persian',
-    value: 'fa',
-  },
-  {
-    name: 'Polish',
-    value: 'pl',
-  },
-  {
-    name: 'Portuguese',
-    value: 'pt',
-  },
-  {
-    name: 'Romanian',
-    value: 'ro',
-  },
-  {
-    name: 'Russian',
-    value: 'ru',
-  },
-  {
-    name: 'Slovakian',
-    value: 'sk',
-  },
-  {
-    name: 'Slovenian',
-    value: 'sl',
-  },
-  {
-    name: 'Spanish',
-    value: 'es',
-  },
-  {
-    name: 'Spanish & English bilingual',
-    value: 'es',
-  },
-  {
-    name: 'Swedish',
-    value: 'sv',
-  },
-  {
-    name: 'Tamil',
-    value: 'ta',
-  },
-  {
-    name: 'Thai',
-    value: 'th',
-  },
-  {
-    name: 'Turkish',
-    value: 'tr',
-  },
-  {
-    name: 'Uyghur',
-    value: 'ug',
-  },
-  {
-    name: 'Ukrainian',
-    value: 'uk',
-  },
-  {
-    name: 'Vietnamese',
-    value: 'vi',
-  },
-  {
-    name: 'Welsh',
-    value: 'cy',
-  },
-];

lib/utils/speech-data/tts-languages-playht.js

@@ -1,152 +0,0 @@
-// languages.js
-
-module.exports = [
-  {
-    name: 'English',
-    value: 'english'
-  },
-  {
-    name: 'Mandarin',
-    value: 'mandarin'
-  },
-  {
-    name: 'Hindi',
-    value: 'hindi'
-  },
-  {
-    name: 'Japanese',
-    value: 'japanese'
-  },
-  {
-    name: 'Korean',
-    value: 'korean'
-  },
-  {
-    name: 'Arabic',
-    value: 'arabic'
-  },
-  {
-    name: 'Spanish',
-    value: 'spanish'
-  },
-  {
-    name: 'French',
-    value: 'french'
-  },
-  {
-    name: 'Italian',
-    value: 'italian'
-  },
-  {
-    name: 'Portuguese',
-    value: 'portuguese'
-  },
-  {
-    name: 'German',
-    value: 'german'
-  },
-  {
-    name: 'Dutch',
-    value: 'dutch'
-  },
-  {
-    name: 'Swedish',
-    value: 'swedish'
-  },
-  {
-    name: 'Czech',
-    value: 'czech'
-  },
-  {
-    name: 'Polish',
-    value: 'polish'
-  },
-  {
-    name: 'Russian',
-    value: 'russian'
-  },
-  {
-    name: 'Bulgarian',
-    value: 'bulgarian'
-  },
-  {
-    name: 'Hebrew',
-    value: 'hebrew'
-  },
-  {
-    name: 'Greek',
-    value: 'greek'
-  },
-  {
-    name: 'Turkish',
-    value: 'turkish'
-  },
-  {
-    name: 'Afrikaans',
-    value: 'afrikaans'
-  },
-  {
-    name: 'Xhosa',
-    value: 'xhosa'
-  },
-  {
-    name: 'Tagalog',
-    value: 'tagalog'
-  },
-  {
-    name: 'Malay',
-    value: 'malay'
-  },
-  {
-    name: 'Indonesian',
-    value: 'indonesian'
-  },
-  {
-    name: 'Bengali',
-    value: 'bengali'
-  },
-  {
-    name: 'Serbian',
-    value: 'serbian'
-  },
-  {
-    name: 'Thai',
-    value: 'thai'
-  },
-  {
-    name: 'Urdu',
-    value: 'urdu'
-  },
-  {
-    name: 'Croatian',
-    value: 'croatian'
-  },
-  {
-    name: 'Hungarian',
-    value: 'hungarian'
-  },
-  {
-    name: 'Danish',
-    value: 'danish'
-  },
-  {
-    name: 'Amharic',
-    value: 'amharic'
-  },
-  {
-    name: 'Albanian',
-    value: 'albanian'
-  },
-  {
-    name: 'Catalan',
-    value: 'catalan'
-  },
-  {
-    name: 'Ukrainian',
-    value: 'ukrainian'
-  },
-  {
-    name: 'Galician',
-    value: 'galician'
-  }
-];

lib/utils/speech-data/tts-model-elevenlabs.js

@@ -1,6 +1,5 @@
 module.exports = [
   { name: 'Turbo v2', value: 'eleven_turbo_v2' },
-  { name: 'Turbo v2.5', value: 'eleven_turbo_v2_5' },
   { name: 'Multilingual v2', value: 'eleven_multilingual_v2' },
   { name: 'Multilingual v1', value: 'eleven_multilingual_v1' },
   { name: 'English v1', value: 'eleven_monolingual_v1' },

lib/utils/speech-data/tts-model-playht.js

@@ -1,5 +1,4 @@
 module.exports = [
-  { name: 'Play3.0', value: 'Play3.0' },
   { name: 'PlayHT2.0-turbo', value: 'PlayHT2.0-turbo' },
   { name: 'PlayHT2.0', value: 'PlayHT2.0' },
   { name: 'PlayHT1.0', value: 'PlayHT1.0' },

lib/utils/speech-data/tts-verbio.js

@@ -27,6 +27,12 @@ module.exports = [
         value: 'miguel_es_pe',
         name: 'Miguel-Male',
       },
+    ],
+  },
+  {
+    value: 'es-PE',
+    name: 'Peruvian Spanish',
+    voices: [
       {
         value: 'luz_es_pe',
         name: 'Luz-Female',

lib/utils/speech-utils.js

@@ -7,7 +7,6 @@ const bent = require('bent');
 const fs = require('fs');
 const { AssemblyAI } = require('assemblyai');
 const {decrypt, obscureKey} = require('./encrypt-decrypt');
-const { RealtimeSession } = require('speechmatics');
 
 const TtsGoogleLanguagesVoices = require('./speech-data/tts-google');
 const TtsAwsLanguagesVoices = require('./speech-data/tts-aws');
@@ -25,7 +24,6 @@ const TtsModelDeepgram = require('./speech-data/tts-model-deepgram');
 const TtsModelElevenLabs = require('./speech-data/tts-model-elevenlabs');
 const TtsModelWhisper = require('./speech-data/tts-model-whisper');
 const TtsModelPlayHT = require('./speech-data/tts-model-playht');
-const ttsLanguagesPlayHt = require('./speech-data/tts-languages-playht');
 const TtsModelRimelabs = require('./speech-data/tts-model-rimelabs');
 
 const SttGoogleLanguagesVoices = require('./speech-data/stt-google');
@@ -37,11 +35,9 @@ const SttIbmLanguagesVoices = require('./speech-data/stt-ibm');
 const SttNvidiaLanguagesVoices = require('./speech-data/stt-nvidia');
 const SttCobaltLanguagesVoices = require('./speech-data/stt-cobalt');
 const SttSonioxLanguagesVoices = require('./speech-data/stt-soniox');
-const SttSpeechmaticsLanguagesVoices = require('./speech-data/stt-speechmatics');
 const SttAssemblyaiLanguagesVoices = require('./speech-data/stt-assemblyai');
 const SttVerbioLanguagesVoices = require('./speech-data/stt-verbio');
 
-
 const testSonioxStt = async(logger, credentials) => {
   const api_key = credentials;
   const soniox = new SpeechClient(api_key);
@@ -58,61 +54,6 @@ const testSonioxStt = async(logger, credentials) => {
   });
 };
 
-const testSpeechmaticsStt = async(logger, credentials) => {
-  const {api_key, speechmatics_stt_uri} = credentials;
-  return new Promise(async(resolve, reject) => {
-    try {
-      const session = new RealtimeSession({ apiKey: api_key, realtimeUrl: speechmatics_stt_uri });
-      let transcription = '';
-      session.addListener('Error', (error) => {
-        reject(error);
-      });
-
-      session.addListener('AddTranscript', (message) => {
-        transcription += message.metadata.transcript;
-      });
-
-      session.addListener('EndOfTranscript', () => {
-        resolve(transcription);
-      });
-
-      session
-        .start({
-          transcription_config: {
-            language: 'en',
-            operating_point: 'enhanced',
-            enable_partials: true,
-            max_delay: 2,
-          },
-          audio_format: { type: 'file' },
-        })
-        .then(() => {
-          //prepare file stream
-          const fileStream = fs.createReadStream(`${__dirname}/../../data/test_audio.wav`);
-
-          //send it
-          fileStream.on('data', (sample) => {
-            session.sendAudio(sample);
-          });
-
-          //end the session
-          fileStream.on('end', () => {
-            session.stop();
-          });
-
-          return;
-
-        })
-        .catch((error) => {
-          reject(error);
-        });
-    } catch (error) {
-      logger.info({error}, 'failed to get speechmatics transcript');
-      reject(error);
-    }
-  });
-};
-
 const testNuanceTts = async(logger, getTtsVoices, credentials) => {
   const voices = await getTtsVoices({vendor: 'nuance', credentials});
   return voices;
@@ -151,8 +92,8 @@ const testGoogleStt = async(logger, credentials) => {
 };
 
 const testDeepgramStt = async(logger, credentials) => {
-  const {api_key, deepgram_stt_uri, deepgram_stt_use_tls} = credentials;
-  const deepgram = new Deepgram(api_key, deepgram_stt_uri, deepgram_stt_uri && deepgram_stt_use_tls);
+  const {api_key} = credentials;
+  const deepgram = new Deepgram(api_key);
 
   const mimetype = 'audio/wav';
   const source = {
@@ -329,10 +270,9 @@ const testPlayHT = async(logger, synthAudio, credentials) => {
       {
         vendor: 'playht',
         credentials,
-        language: 'english',
+        language: 'en-US',
         voice: 's3://voice-cloning-zero-shot/d9ff78ba-d016-47f6-b0ef-dd630f59414e/female-cs/manifest.json',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
     // Test if playHT can fetch voices
@@ -355,8 +295,7 @@ const testRimelabs = async(logger, synthAudio, credentials) => {
         credentials,
         language: 'en-US',
         voice: 'amber',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
   } catch (err) {
@@ -373,8 +312,7 @@ const testWhisper = async(logger, synthAudio, credentials) => {
         credentials,
         language: 'en-US',
         voice: 'alloy',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
   } catch (err) {
@@ -390,8 +328,7 @@ const testDeepgramTTS = async(logger, synthAudio, credentials) => {
         vendor: 'deepgram',
         credentials,
         model: 'aura-asteria-en',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
   } catch (err) {
@@ -446,8 +383,7 @@ const testVerbioTts = async(logger, synthAudio, credentials) => {
         credentials,
         language: 'en-US',
         voice: 'tommy_en-us',
-        text: 'Hi there and welcome to jambones!',
-        renderForCaching: true
+        text: 'Hi there and welcome to jambones!'
       }
     );
   } catch (err) {
@@ -573,7 +509,6 @@ function decryptCredential(obj, credential, logger, isObscureKey = true) {
     obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
     obj.deepgram_stt_uri = o.deepgram_stt_uri;
     obj.deepgram_stt_use_tls = o.deepgram_stt_use_tls;
-    obj.deepgram_tts_uri = o.deepgram_tts_uri;
   }
   else if ('ibm' === obj.vendor) {
     const o = JSON.parse(decrypt(credential));
@@ -591,10 +526,6 @@ function decryptCredential(obj, credential, logger, isObscureKey = true) {
   } else if ('soniox' === obj.vendor) {
     const o = JSON.parse(decrypt(credential));
     obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-  } else if ('speechmatics' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
-    obj.speechmatics_stt_uri = o.speechmatics_stt_uri;
   } else if ('elevenlabs' === obj.vendor) {
     const o = JSON.parse(decrypt(credential));
     obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
@@ -686,8 +617,6 @@ async function getLanguagesAndVoicesForVendor(logger, vendor, credential, getTts
       return await getLanguagesVoicesForWhisper(credential, getTtsVoices, logger);
     case 'verbio':
       return await getLanguagesVoicesForVerbio(credential, getTtsVoices, logger);
-    case 'speechmatics':
-      return await getLanguagesVoicesForSpeechmatics(credential, getTtsVoices, logger);
     default:
       logger.info(`invalid vendor ${vendor}, return empty result`);
       throw new Error(`Invalid vendor ${vendor}`);
@@ -800,10 +729,6 @@ async function getLanguagesVoicesForSoniox(credential) {
   return tranform(undefined, SttSonioxLanguagesVoices);
 }
 
-async function getLanguagesVoicesForSpeechmatics(credential) {
-  return tranform(undefined, SttSpeechmaticsLanguagesVoices);
-}
-
 async function getLanguagesVoicesForElevenlabs(credential) {
   if (credential) {
     const get = bent('https://api.elevenlabs.io', 'GET', 'json', {
@@ -821,35 +746,27 @@ async function getLanguagesVoicesForElevenlabs(credential) {
     }).sort((a, b) => a.name.localeCompare(b.name)) : [];
 
     if (languages && languages.length > 0) {
-      // using if condition to avoid \n character in name
       const voices = voiceResp ? voiceResp.voices.map((v) => {
-        let name = `${v.name}${v.category !== 'premade' ? ` (${v.category.trim()})` : ''} - (`;
-        if (v.labels.accent) name += `${v.labels.accent}, `;
-        if (v.labels.description) name += `${v.labels.description}, `;
-        if (v.labels.age) name += `${v.labels.age}, `;
-        if (v.labels.gender) name += `${v.labels.gender}, `;
-        if (v.labels['use case']) name += `${v.labels['use case']}, `;
-
+        let name = `${v.name}${v.category !== 'premade' ? ` (${v.category})` : ''} -
+  ${v.labels.accent ? ` ${v.labels.accent},` : ''}
+  ${v.labels.description ? ` ${v.labels.description},` : ''}
+  ${v.labels.age ? ` ${v.labels.age},` : ''}
+  ${v.labels.gender ? ` ${v.labels.gender},` : ''}
+  ${v.labels['use case'] ? ` ${v.labels['use case']},` : ''}
+  `;
         const lastIndex = name.lastIndexOf(',');
         if (lastIndex !== -1) {
           name = name.substring(0, lastIndex);
         }
-        name += ')';
         return {
           value: v.voice_id,
           name
         };
       }).sort((a, b) => a.name.localeCompare(b.name)) : [];
-      for (const language of languages) {
-        language.voices = voices;
-      }
+      languages[0].voices = voices;
     }
     return tranform(languages, undefined, TtsModelElevenLabs);
   } else {
-    const voices = TtsElevenlabsLanguagesVoices[0].voices;
-    for (const language of TtsElevenlabsLanguagesVoices) {
-      language.voices = voices;
-    }
     return tranform(TtsElevenlabsLanguagesVoices, undefined, TtsModelElevenLabs);
   }
 }
@@ -879,67 +796,42 @@ const fetchLayHTVoices = async(credential) => {
 
 async function getLanguagesVoicesForPlayHT(credential) {
   if (credential) {
-    const {voice_engine} = credential;
     const [cloned_voice, voices] = await fetchLayHTVoices(credential);
     const list_voices = [...cloned_voice, ...voices];
 
     const buildVoice = (d) => {
-      let name = `${d.name} - (${concat(d.accent)}${concat(d.age)}${concat(d.gender)}${concat(d.loudness)}` +
+      let name = `${d.name} -${concat(d.accent)}${concat(d.age)}${concat(d.gender)}${concat(d.loudness)}` +
       `${concat(d.style)}${concat(d.tempo)}${concat(d.texture)}` ;
       name = name.endsWith(',') ? name.trim().slice(0, -1) : name;
-      name += !d.language_code ? ' - Custom Voice' : '';
-      name += ')';
-      name = name.replaceAll('( ', '(');
-
       return {
         value: `${d.id}`,
         name
       };
     };
 
-    const buildPlay30Payload = () => {
-      // PlayHT3.0 can play different languages with differrent voice.
-      // all voices will be added to english language by default and orther langauges will get voices from english.
-      const ttsVoices = ttsLanguagesPlayHt.map((l) => ({
-        ...l,
-        voices: l.value === 'english' ? list_voices.map((v) => buildVoice(v)) : []
-      }));
-      return tranform(ttsVoices, undefined, TtsModelPlayHT);
-    };
-
-    const buildPayload = () => {
-      const ttsVoices = list_voices.reduce((acc, voice) => {
-        if (!voice_engine.includes(voice.voice_engine)) {
-          return acc;
-        }
-        const languageCode = voice.language_code;
-        // custom voice does not have language code
-        if (!languageCode) {
-          voice.language_code = 'en';
-          voice.language = 'Custom-English';
-        }
-        const existingLanguage = acc.find((lang) => lang.value === languageCode);
-        if (existingLanguage) {
-          existingLanguage.voices.push(buildVoice(voice));
-        } else {
-          acc.push({
-            value: voice.language_code,
-            name: voice.language,
-            voices: [buildVoice(voice)]
-          });
-        }
+    const ttsVoices = list_voices.reduce((acc, voice) => {
+      if (!credential.voice_engine.includes(voice.voice_engine)) {
         return acc;
-      }, []);
-      return tranform(ttsVoices, undefined, TtsModelPlayHT);
-    };
-
-    switch (voice_engine) {
-      case 'Play3.0':
-        return buildPlay30Payload();
-
-      default:
-        return buildPayload();
-    }
+      }
+      const languageCode = voice.language_code;
+      // custom voice does not have language code
+      if (!languageCode) {
+        voice.language_code = 'en';
+        voice.language = 'Custom-English';
+      }
+      const existingLanguage = acc.find((lang) => lang.value === languageCode);
+      if (existingLanguage) {
+        existingLanguage.voices.push(buildVoice(voice));
+      } else {
+        acc.push({
+          value: voice.language_code,
+          name: voice.language,
+          voices: [buildVoice(voice)]
+        });
+      }
+      return acc;
+    }, []);
+    return tranform(ttsVoices, undefined, TtsModelPlayHT);
   }
   return tranform(TtsPlayHtLanguagesVoices, undefined, TtsModelPlayHT);
 }
@@ -975,18 +867,15 @@ async function getLanguagesVoicesForWhisper(credential) {
 
 async function getLanguagesVoicesForVerbio(credentials, getTtsVoices, logger) {
   const stt = SttVerbioLanguagesVoices.reduce((acc, v) => {
-    if (!v.version || (credentials && credentials.engine_version === v.version)) {
+    if (!v.version || credentials.engine_version === v.version) {
       acc.push(v);
     }
     return acc;
   }, []);
   try {
-    if (credentials) {
-      const data = await getTtsVoices({vendor: 'verbio', credentials});
-      const voices = parseVerbioLanguagesVoices(data);
-      return tranform(voices, stt, undefined);
-    }
-    return tranform(TtsVerbioLanguagesVoices, stt, undefined);
+    const data = await getTtsVoices({vendor: 'verbio', credentials});
+    const voices = parseVerbioLanguagesVoices(data);
+    return tranform(voices, stt, undefined);
   } catch (err) {
     logger.info({err}, 'there is error while fetching verbio speech voices');
     return tranform(TtsVerbioLanguagesVoices, stt, undefined);
@@ -1056,7 +945,7 @@ function parseAwsLanguagesVoices(data) {
     if (existingLanguage) {
       existingLanguage.voices.push({
         value: voice.Id,
-        name: `${voice.Name} (${voice.Gender})`
+        name: `(${voice.Gender}) ${voice.Name}`
       });
     } else {
       acc.push({
@@ -1064,7 +953,7 @@ function parseAwsLanguagesVoices(data) {
         name: voice.LanguageName,
         voices: [{
           value: voice.Id,
-          name: `${voice.Name} (${voice.Gender})`
+          name: `(${voice.Gender}) ${voice.Name}`
         }]
       });
     }
@@ -1168,6 +1057,5 @@ module.exports = {
   testWhisper,
   testVerbioTts,
   testVerbioStt,
-  getLanguagesAndVoicesForVendor,
-  testSpeechmaticsStt
+  getLanguagesAndVoicesForVendor
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-api-server",
-  "version": "0.9.2",
+  "version": "0.9.0",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -28,8 +28,8 @@
     "@jambonz/db-helpers": "^0.9.3",
     "@jambonz/lamejs": "^1.2.2",
     "@jambonz/mw-registrar": "^0.2.7",
-    "@jambonz/realtimedb-helpers": "^0.8.10",
-    "@jambonz/speech-utils": "^0.1.22",
+    "@jambonz/realtimedb-helpers": "^0.8.9",
+    "@jambonz/speech-utils": "^0.1.11",
     "@jambonz/time-series": "^0.2.8",
     "@jambonz/verb-specifications": "^0.0.72",
     "@soniox/soniox-node": "^1.2.2",
@@ -46,14 +46,12 @@
     "jsonwebtoken": "^9.0.2",
     "mailgun.js": "^10.2.1",
     "microsoft-cognitiveservices-speech-sdk": "1.36.0",
-    "multer": "^1.4.5-lts.1",
-    "mysql2": "^3.11.0",
+    "mysql2": "^3.9.3",
     "nocache": "4.0.0",
     "passport": "^0.7.0",
     "passport-http-bearer": "^1.0.1",
     "pino": "^8.20.0",
     "short-uuid": "^4.2.2",
-    "speechmatics": "^4.0.0",
     "stream-buffers": "^3.0.2",
     "stripe": "^14.24.0",
     "swagger-ui-express": "^5.0.0",

test/accounts.js

@@ -152,9 +152,7 @@ test('account tests', async(t) => {
       auth: authAdmin,
       json: true,
     });
-    console.log(result);
     t.ok(result.name === 'daveh' , 'successfully retrieved account by sid');
-    t.ok(result.enable_debug_log  === 0 , 'enable_debug_log default value ok');
 
     /* update account with account level token */
     result = await request.put(`/Accounts/${sid}`, {
@@ -179,8 +177,8 @@ test('account tests', async(t) => {
           name: 'recordings',
           access_key_id: 'access_key_id',
           secret_access_key: 'secret access key'
-        },
-        enable_debug_log: true
+        }
+        
       }
     });
     t.ok(result.statusCode === 204, 'successfully updated account using account level token');
@@ -196,7 +194,6 @@ test('account tests', async(t) => {
     t.ok(result.bucket_credential.access_key_id === 'access_key_id', 'bucket_access_key_id was updated');
     t.ok(result.record_all_calls === 1, 'record_all_calls was updated');
     t.ok(result.record_format === 'wav', 'record_format was updated');
-    t.ok(result.enable_debug_log, 'enable_debug_log was updated');
 
     /* verify that account level api key last_used was updated*/
     result = await request.get(`/Accounts/${sid}/ApiKeys`, {

test/sip-gateways.js

@@ -17,53 +17,6 @@ test('sip gateway tests', async(t) => {
     let result;
     const voip_carrier_sid = await createVoipCarrier(request);
 
-    /* add a invalid sip gateway */
-    const STORED_JAMBONZ_MIN_GATEWAY_NETMASK = process.env.JAMBONZ_MIN_GATEWAY_NETMASK;
-    process.env.JAMBONZ_MIN_GATEWAY_NETMASK = 24;
-    
-    result = await request.post('/SipGateways', {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      simple: false,
-      body: {
-        voip_carrier_sid,
-        ipv4: '1.2.3.4',
-        netmask: 1,
-        inbound: true,
-        outbound: true,
-        protocol: 'tcp'
-      }
-    });
-    t.ok(result.statusCode === 400, 'successfully created sip gateway ');
-
-    result = await request.post('/SipGateways', {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      body: {
-        voip_carrier_sid,
-        ipv4: '1.2.3.4',
-        netmask: 24,
-        inbound: true,
-        outbound: true,
-        protocol: 'tcp'
-      }
-    });
-    t.ok(result.statusCode === 201, 'successfully created sip gateway ');
-
-    process.env.JAMBONZ_MIN_GATEWAY_NETMASK = STORED_JAMBONZ_MIN_GATEWAY_NETMASK;
-
-    /* delete sip gateways */
-    result = await request.delete(`/SipGateways/${result.body.sid}`, {
-      resolveWithFullResponse: true,
-      simple: false,
-      json: true,
-      auth: authAdmin
-    });
-    //console.log(`result: ${JSON.stringify(result)}`);
-    t.ok(result.statusCode === 204, 'successfully deleted sip gateway');
-
     /* add a sip gateway */
     result = await request.post('/SipGateways', {
       resolveWithFullResponse: true,

test/speech-credentials.js

@@ -371,8 +371,7 @@ test('speech credentials tests', async(t) => {
         vendor: 'deepgram',
         use_for_stt: true,
         deepgram_stt_uri: "127.0.0.1:50002",
-        deepgram_stt_use_tls: true,
-        deepgram_tts_uri: 'https://server.com'
+        deepgram_stt_use_tls: true
       }
     });
     t.ok(result.statusCode === 201, 'successfully added speech credential for deepgram');
@@ -387,7 +386,6 @@ test('speech credentials tests', async(t) => {
     t.ok(result.statusCode === 200, 'successfully get speech credential for deepgram');
     t.ok(result.body.deepgram_stt_uri === '127.0.0.1:50002', "deepgram_stt_uri is correct for deepgram");
     t.ok(result.body.deepgram_stt_use_tls === true, "deepgram_stt_use_tls is correct for deepgram");
-    t.ok(result.body.deepgram_tts_uri === 'https://server.com', "deepgram_tts_uri is correct for deepgram")
 
     result = await request.put(`/Accounts/${account_sid}/SpeechCredentials/${dg_sid}`, {
       resolveWithFullResponse: true,
@@ -397,8 +395,7 @@ test('speech credentials tests', async(t) => {
         vendor: 'deepgram',
         use_for_stt: true,
         deepgram_stt_uri: "127.0.0.2:50002",
-        deepgram_stt_use_tls: false,
-        deepgram_tts_uri: 'https://server2.com'
+        deepgram_stt_use_tls: false
       }
     });
     t.ok(result.statusCode === 204, 'successfully updated speech credential for deepgram onprem');
@@ -412,7 +409,6 @@ test('speech credentials tests', async(t) => {
     t.ok(result.statusCode === 200, 'successfully get speech credential for deepgram onprem');
     t.ok(result.body.deepgram_stt_uri === '127.0.0.2:50002', "deepgram_stt_uri is correct for deepgram onprem");
     t.ok(result.body.deepgram_stt_use_tls === false, "deepgram_stt_use_tls is correct for deepgram onprem");
-    t.ok(result.body.deepgram_tts_uri === 'https://server2.com', "deepgram_tts_uri is correct for deepgram onprem");
 
     result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${dg_sid}`, {
       auth: authUser,
@@ -532,39 +528,6 @@ test('speech credentials tests', async(t) => {
       t.ok(result.statusCode === 204, 'successfully deleted speech credential');
     }
 
-    /* add a credential for Speechmatics */
-    if (process.env.SPEECHMATICS_API_KEY) {
-      result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
-        resolveWithFullResponse: true,
-        auth: authUser,
-        json: true,
-        body: {
-          vendor: 'speechmatics',
-          use_for_stt: true,
-          api_key: process.env.SPEECHMATICS_API_KEY,
-          speechmatics_stt_uri: 'eu2.rt.speechmatics.com'
-        }
-      });
-      t.ok(result.statusCode === 201, 'successfully added speech credential for speechmatics');
-      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 speechmatics');
-
-      /* 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 nvidia */
     result = await request.post(`/Accounts/${account_sid}/SpeechCredentials`, {
       resolveWithFullResponse: true,

test/system-information.js

@@ -16,9 +16,7 @@ test('system information test', async(t) => {
       body: {
         domain_name: 'test.com',
         sip_domain_name: 'sip.test.com',
-        monitoring_domain_name: 'monitor.test.com',
-        private_network_cidr: '192.168.1.0/24, 10.10.100.1',
-        log_level: 'info'
+        monitoring_domain_name: 'monitor.test.com'
       }
     });
     t.ok(result.statusCode === 201, 'successfully created system information ');
@@ -26,8 +24,6 @@ test('system information test', async(t) => {
     t.ok(body.domain_name === 'test.com', 'added domain_name ok');
     t.ok(body.sip_domain_name === 'sip.test.com', 'added sip_domain_name ok');
     t.ok(body.monitoring_domain_name === 'monitor.test.com', 'added monitoring_domain_name ok');
-    t.ok(body.private_network_cidr === '192.168.1.0/24, 10.10.100.1', 'added private_network_cidr ok');
-    t.ok(body.log_level === 'info', 'added log_level ok');
 
     result = await request.get('/SystemInformation', {
       auth: authAdmin,
@@ -36,8 +32,6 @@ test('system information test', async(t) => {
     t.ok(result.domain_name === 'test.com', 'get domain_name ok');
     t.ok(result.sip_domain_name === 'sip.test.com', 'get sip_domain_name ok');
     t.ok(result.monitoring_domain_name === 'monitor.test.com', 'get monitoring_domain_name ok');
-    t.ok(result.private_network_cidr === '192.168.1.0/24, 10.10.100.1', 'get private_network_cidr ok'); 
-    t.ok(result.log_level === 'info', 'added log_level ok');
 
     result = await request.post('/SystemInformation', {
       resolveWithFullResponse: true,
@@ -46,9 +40,7 @@ test('system information test', async(t) => {
       body: {
         domain_name: 'test1.com',
         sip_domain_name: 'sip1.test.com',
-        monitoring_domain_name: 'monitor1.test.com',
-        private_network_cidr: '',
-        log_level: 'debug'
+        monitoring_domain_name: 'monitor1.test.com'
       }
     });
     t.ok(result.statusCode === 201, 'successfully updated system information ');
@@ -56,8 +48,6 @@ test('system information test', async(t) => {
     t.ok(body.domain_name === 'test1.com', 'updated domain_name ok');
     t.ok(body.sip_domain_name === 'sip1.test.com', 'updated sip_domain_name ok');
     t.ok(body.monitoring_domain_name === 'monitor1.test.com', 'updated monitoring_domain_name ok');
-    t.ok(body.private_network_cidr === '', 'updated private_network_cidr ok');
-    t.ok(body.log_level === 'debug', 'updated log_level ok');
 
     result = await request.get('/SystemInformation', {
       auth: authAdmin,
@@ -66,7 +56,6 @@ test('system information test', async(t) => {
     t.ok(result.domain_name === 'test1.com', 'get domain_name ok');
     t.ok(result.sip_domain_name === 'sip1.test.com', 'get sip_domain_name ok');
     t.ok(result.monitoring_domain_name === 'monitor1.test.com', 'get monitoring_domain_name ok');
-    t.ok(result.log_level === 'debug', 'updated log_level ok');
 
   } catch(err) {
     console.error(err);

test/tts-cache.js

@@ -24,24 +24,16 @@ function makeSynthKey({account_sid = '', vendor, language, voice, engine = '', t
 test('tts-cache', async(t) => {
   const app = require('../app');
   try {
-    // clear cache to start
-    let result = await request.delete('/TtsCache', {
-      auth: authAdmin,
-      resolveWithFullResponse: true,
-    });
-    t.ok(result.statusCode === 204, 'successfully purged cache for start of test');
-
     // create caches
     const minRecords = 8;
     for (const i in Array(minRecords).fill(0)) {
       await client.set(makeSynthKey({vendor: i, language: i, voice: i, engine: i, text: i}), i);
     }
 
-    result = await request.get('/TtsCache', {
+    let result = await request.get('/TtsCache', {
       auth: authAdmin,
       json: true,
     });
-    //console.log(result);
 
     t.ok(result.size === minRecords, 'get cache correctly');
 
@@ -49,7 +41,7 @@ test('tts-cache', async(t) => {
       auth: authAdmin,
       resolveWithFullResponse: true,
     });
-    t.ok(result.statusCode === 204, 'successfully purged cache');
+    t.ok(result.statusCode === 204, 'successfully deleted application after removing phone number');
 
     result = await request.get('/TtsCache', {
       auth: authAdmin,

test/voip-carriers.js

@@ -207,8 +207,7 @@ test('voip carrier tests', async(t) => {
       json: true,
       body: {
         name: 'twilio',
-        e164_leading_plus: true,
-        dtmf_type: 'tones'
+        e164_leading_plus: true
       }
     });
     t.ok(result.statusCode === 201, 'successfully created voip carrier for a service provider');
@@ -222,7 +221,6 @@ test('voip carrier tests', async(t) => {
     });
     //console.log(result.body);
     t.ok(result.statusCode === 200, 'successfully retrieved voip carrier for a service provider');
-    //console.log(result.body);
     sid = result.body[0].voip_carrier_sid;
   
     await deleteObjectBySid(request, '/VoipCarriers', sid);