feat: add metadata for create call

.github/workflows/docker-publish-dbcreate.yml

@@ -2,10 +2,16 @@ name: Docker
 
 on:
   push:
+    # Publish `main` as Docker `latest` image.
     branches:
       - main
+
+    # Publish `v1.2.3` tags as releases.
     tags:
-      - '*'
+      - v*
+
+env:
+  IMAGE_NAME: db-create
 
 jobs:
   push:
@@ -14,42 +20,32 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-      - name: prepare tag 
-        id: prepare_tag
+      - name: Build image
+        run: docker build . --file Dockerfile.db-create --tag $IMAGE_NAME
+
+      - name: Log into registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push image
         run: |
-            IMAGE_ID=jambonz/db-create
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
 
-            # Strip git ref prefix from version
-            VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
 
-            # Strip "v" prefix from tag name
-            [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
 
-            # Use Docker `latest` tag convention
-            [ "$VERSION" == "main" ] && VERSION=latest
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
 
-            echo IMAGE_ID=$IMAGE_ID
-            echo VERSION=$VERSION
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest
 
-            echo "image_id=$IMAGE_ID" >> $GITHUB_OUTPUT
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
 
-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./Dockerfile.db-create
-          push: true
-          tags: ${{ steps.prepare_tag.outputs.image_id }}:${{ steps.prepare_tag.outputs.version }}
-          build-args: |
-            GITHUB_REPOSITORY=$GITHUB_REPOSITORY
-            GITHUB_REF=$GITHUB_REF
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

.github/workflows/docker-publish.yml

@@ -2,8 +2,6 @@ name: Docker
 
 on:
   push:
-    branches:
-      - main
     tags:
       - '*'
 
@@ -20,7 +18,7 @@ jobs:
       - name: prepare tag 
         id: prepare_tag
         run: |
-            IMAGE_ID=jambonz/api-server
+            IMAGE_ID=$GITHUB_REPOSITORY
 
             # Strip git ref prefix from version
             VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')

app.js

@@ -13,12 +13,7 @@ assert.ok(process.env.JAMBONES_MYSQL_HOST &&
   process.env.JAMBONES_MYSQL_USER &&
   process.env.JAMBONES_MYSQL_PASSWORD &&
   process.env.JAMBONES_MYSQL_DATABASE, 'missing JAMBONES_MYSQL_XXX env vars');
-if (process.env.JAMBONES_REDIS_SENTINELS) {
-  assert.ok(process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
-    'missing JAMBONES_REDIS_SENTINEL_MASTER_NAME env var, JAMBONES_REDIS_SENTINEL_PASSWORD env var is optional');
-} else {
-  assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
-}
+assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
 assert.ok(process.env.JAMBONES_TIME_SERIES_HOST, 'missing JAMBONES_TIME_SERIES_HOST env var');
 assert.ok(process.env.ENCRYPTION_SECRET || process.env.JWT_SECRET, 'missing ENCRYPTION_SECRET env var');
 assert.ok(process.env.JWT_SECRET, 'missing JWT_SECRET env var');
@@ -38,20 +33,17 @@ const {
   retrieveCall,
   deleteCall,
   listCalls,
-  listSortedSets,
+  listQueues,
   purgeCalls,
   retrieveSet,
   addKey,
   retrieveKey,
   deleteKey,
-  incrKey,
-  JAMBONES_REDIS_SENTINELS
+  incrKey
 } = require('./lib/helpers/realtimedb-helpers');
 const {
-  getTtsVoices,
-  getTtsSize,
-  purgeTtsCache
-} = require('@jambonz/speech-utils')(JAMBONES_REDIS_SENTINELS || {
+  getTtsVoices
+} = require('@jambonz/speech-utils')({
   host: process.env.JAMBONES_REDIS_HOST,
   port: process.env.JAMBONES_REDIS_PORT || 6379
 }, logger);
@@ -74,7 +66,6 @@ const {
 const PORT = process.env.HTTP_PORT || 3000;
 const authStrategy = require('./lib/auth')(logger, retrieveKey);
 const {delayLoginMiddleware} = require('./lib/middleware');
-const Websocket = require('ws');
 
 passport.use(authStrategy);
 
@@ -85,7 +76,7 @@ app.locals = {
   retrieveCall,
   deleteCall,
   listCalls,
-  listSortedSets,
+  listQueues,
   purgeCalls,
   retrieveSet,
   addKey,
@@ -93,8 +84,6 @@ app.locals = {
   retrieveKey,
   deleteKey,
   getTtsVoices,
-  getTtsSize,
-  purgeTtsCache,
   lookupAppBySid,
   lookupAccountBySid,
   lookupAccountByPhoneNumber,
@@ -125,12 +114,6 @@ const limiter = rateLimit({
   legacyHeaders: false, // Disable the `X-RateLimit-*` headers
 });
 
-// Setup websocket for recording audio
-const recordWsServer = require('./lib/record');
-const wsServer = new Websocket.Server({ noServer: true });
-wsServer.setMaxListeners(0);
-wsServer.on('connection', recordWsServer.bind(null, logger));
-
 if (process.env.JAMBONES_TRUST_PROXY) {
   const proxyCount = parseInt(process.env.JAMBONES_TRUST_PROXY);
   if (!isNaN(proxyCount) && proxyCount > 0) {
@@ -171,41 +154,7 @@ app.use((err, req, res, next) => {
   });
 });
 logger.info(`listening for HTTP traffic on port ${PORT}`);
-const server = app.listen(PORT);
-
-
-const isValidWsKey = (hdr) => {
-  const username = process.env.JAMBONZ_RECORD_WS_USERNAME;
-  const password = process.env.JAMBONZ_RECORD_WS_PASSWORD;
-  const token = Buffer.from(`${username}:${password}`).toString('base64');
-  const arr = /^Basic (.*)$/.exec(hdr);
-  return arr[1] === token;
-};
-
-server.on('upgrade', (request, socket, head) => {
-  logger.debug({
-    url: request.url,
-    headers: request.headers,
-  }, 'received upgrade request');
-
-  /* verify the path starts with /transcribe */
-  if (!request.url.includes('/record/')) {
-    logger.info(`unhandled path: ${request.url}`);
-    return socket.write('HTTP/1.1 404 Not Found \r\n\r\n', () => socket.destroy());
-  }
-
-  /* verify the api key */
-  if (!isValidWsKey(request.headers['authorization'])) {
-    logger.info(`invalid auth header: ${request.headers['authorization']}`);
-    return socket.write('HTTP/1.1 403 Forbidden \r\n\r\n', () => socket.destroy());
-  }
-
-  /* complete the upgrade */
-  wsServer.handleUpgrade(request, socket, head, (ws) => {
-    logger.info(`upgraded to websocket, url: ${request.url}`);
-    wsServer.emit('connection', ws, request.url);
-  });
-});
+app.listen(PORT);
 
 // purge old calls from active call set every 10 mins
 async function purge() {

db/jambones-sql.sql

@@ -1,4 +1,5 @@
 /* SQLEditor (MySQL (2))*/
+
 SET FOREIGN_KEY_CHECKS=0;
 
 DROP TABLE IF EXISTS account_static_ips;
@@ -13,8 +14,6 @@ DROP TABLE IF EXISTS beta_invite_codes;
 
 DROP TABLE IF EXISTS call_routes;
 
-DROP TABLE IF EXISTS clients;
-
 DROP TABLE IF EXISTS dns_records;
 
 DROP TABLE IF EXISTS lcr;
@@ -129,16 +128,6 @@ application_sid CHAR(36) NOT NULL,
 PRIMARY KEY (call_route_sid)
 ) COMMENT='a regex-based pattern match for call routing';
 
-CREATE TABLE clients
-(
-client_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-is_active BOOLEAN NOT NULL DEFAULT 1,
-username VARCHAR(64),
-password VARCHAR(1024),
-PRIMARY KEY (client_sid)
-);
-
 CREATE TABLE dns_records
 (
 dns_record_sid CHAR(36) NOT NULL UNIQUE ,
@@ -156,7 +145,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 patterns are tested in sequence until one matches';
+) COMMENT='An ordered list of  digit patterns in an LCR table.  The pat';
 
 CREATE TABLE lcr
 (
@@ -167,7 +156,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 provider or account to make decisions about routing outbound calls when multiple carriers are available.';
+) COMMENT='An LCR (least cost routing) table that is used by a service ';
 
 CREATE TABLE password_settings
 (
@@ -423,7 +412,7 @@ PRIMARY KEY (smpp_gateway_sid)
 CREATE TABLE phone_numbers
 (
 phone_number_sid CHAR(36) UNIQUE ,
-number VARCHAR(132) NOT NULL,
+number VARCHAR(132) NOT NULL UNIQUE ,
 voip_carrier_sid CHAR(36),
 account_sid CHAR(36),
 application_sid CHAR(36),
@@ -441,7 +430,6 @@ inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound ca
 outbound BOOLEAN NOT NULL COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
 voip_carrier_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
-protocol ENUM('udp','tcp','tls', 'tls/srtp') DEFAULT 'udp' COMMENT 'Outbound call protocol',
 PRIMARY KEY (sip_gateway_sid)
 ) COMMENT='A whitelisted sip gateway used for origination/termination';
 
@@ -481,7 +469,6 @@ speech_synthesis_voice VARCHAR(64),
 speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-record_all_calls BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (application_sid)
 ) COMMENT='A defined set of behaviors to be applied to phone calls ';
 
@@ -519,9 +506,6 @@ subspace_client_secret VARCHAR(255),
 subspace_sip_teleport_id VARCHAR(255),
 subspace_sip_teleport_destinations VARCHAR(255),
 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',
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';
 
@@ -542,9 +526,6 @@ ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERE
 
 ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid) REFERENCES applications (application_sid);
 
-CREATE INDEX client_sid_idx ON clients (client_sid);
-ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid);
-
 CREATE INDEX dns_record_sid_idx ON dns_records (dns_record_sid);
 ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);
 
@@ -647,8 +628,6 @@ CREATE INDEX smpp_gateway_sid_idx ON smpp_gateways (smpp_gateway_sid);
 CREATE INDEX voip_carrier_sid_idx ON smpp_gateways (voip_carrier_sid);
 ALTER TABLE smpp_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);
 
-CREATE UNIQUE INDEX phone_numbers_unique_idx_voip_carrier_number ON phone_numbers (number,voip_carrier_sid);
-
 CREATE INDEX phone_number_sid_idx ON phone_numbers (phone_number_sid);
 CREATE INDEX number_idx ON phone_numbers (number);
 CREATE INDEX voip_carrier_sid_idx ON phone_numbers (voip_carrier_sid);
@@ -703,4 +682,5 @@ ALTER TABLE accounts ADD FOREIGN KEY queue_event_hook_sid_idxfk (queue_event_hoo
 ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (device_calling_application_sid) REFERENCES applications (application_sid);
 
 ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);
-SET FOREIGN_KEY_CHECKS=1;
+
+SET FOREIGN_KEY_CHECKS=1;

db/seed-production-database-open-source.sql

@@ -68,6 +68,9 @@ VALUES
 ('d2ccfcb1-9198-4fe9-a0ca-6e49395837c4', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.172.60.0', 30, 5060, 1, 0),
 ('6b1d0032-4430-41f1-87c6-f22233d394ef', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.244.51.0', 30, 5060, 1, 0),
 ('0de40217-8bd5-4aa8-a9fd-1994282953c6', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.192', 30, 5060, 1, 0),
+('48b108e3-1ce7-4f18-a4cb-e41e63688bdf', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.193', 30, 5060, 1, 0),
+('d9131a69-fe44-4c2a-ba82-4adc81f628dd', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.194', 30, 5060, 1, 0),
+('34a6a311-4bd6-49ca-aa77-edd3cb92c6e1', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.171.127.195', 30, 5060, 1, 0),
 ('37bc0b20-b53c-4c31-95a6-f82b1c3713e3', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '35.156.191.128', 30, 5060, 1, 0),
 ('39791f4e-b612-4882-a37e-e92711a39f3f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.65.63.192', 30, 5060, 1, 0),
 ('81a0c8cb-a33e-42da-8f20-99083da6f02f', '7d509a18-bbff-4c5d-b21e-b99bf8f8c49a', '54.252.254.64', 30, 5060, 1, 0),

db/upgrade-jambonz-db.js

@@ -89,7 +89,6 @@ const sql = {
     'ALTER TABLE `users` ADD COLUMN `is_active` BOOLEAN NOT NULL default true',
   ],
   8003: [
-    'SET FOREIGN_KEY_CHECKS=0',
     'ALTER TABLE `voip_carriers` ADD COLUMN `register_status` VARCHAR(4096)',
     'ALTER TABLE `sbc_addresses` ADD COLUMN `last_updated` DATETIME',
     'ALTER TABLE `sbc_addresses` ADD COLUMN `tls_port` INTEGER',
@@ -100,64 +99,6 @@ const sql = {
     sip_domain_name VARCHAR(255),
     monitoring_domain_name VARCHAR(255)
     )`,
-    'DROP TABLE IF EXISTS `lcr_routes`',
-    'DROP TABLE IF EXISTS `lcr_carrier_set_entry`',
-    `CREATE TABLE lcr_routes
-    (
-    lcr_route_sid CHAR(36),
-    lcr_sid CHAR(36) NOT NULL,
-    regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed number, used for LCR routing of PSTN calls',
-    description VARCHAR(1024),
-    priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
-    PRIMARY KEY (lcr_route_sid)
-    )`,
-    `CREATE TABLE lcr
-    (
-    lcr_sid CHAR(36) NOT NULL UNIQUE ,
-    name VARCHAR(64) COMMENT 'User-assigned name for this LCR table',
-    is_active BOOLEAN NOT NULL DEFAULT 1,
-    default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use when no digit match based results are found.',
-    service_provider_sid CHAR(36),
-    account_sid CHAR(36),
-    PRIMARY KEY (lcr_sid)
-    )`,
-    `CREATE TABLE lcr_carrier_set_entry
-    (
-    lcr_carrier_set_entry_sid CHAR(36),
-    workload INTEGER NOT NULL DEFAULT 1 COMMENT 'represents a proportion of traffic to send through the associated carrier; can be used for load balancing traffic across carriers with a common priority for a destination',
-    lcr_route_sid CHAR(36) NOT NULL,
-    voip_carrier_sid CHAR(36) NOT NULL,
-    priority INTEGER NOT NULL DEFAULT 0 COMMENT 'lower priority carriers are attempted first',
-    PRIMARY KEY (lcr_carrier_set_entry_sid)
-    )`,
-    'CREATE INDEX lcr_sid_idx ON lcr_routes (lcr_sid)',
-    'ALTER TABLE lcr_routes ADD FOREIGN KEY lcr_sid_idxfk (lcr_sid) REFERENCES lcr (lcr_sid)',
-    'CREATE INDEX lcr_sid_idx ON lcr (lcr_sid)',
-    'ALTER TABLE lcr ADD FOREIGN KEY default_carrier_set_entry_sid_idxfk (default_carrier_set_entry_sid) REFERENCES lcr_carrier_set_entry (lcr_carrier_set_entry_sid)',
-    'CREATE INDEX service_provider_sid_idx ON lcr (service_provider_sid)',
-    'CREATE INDEX account_sid_idx ON lcr (account_sid)',
-    'ALTER TABLE lcr_carrier_set_entry ADD FOREIGN KEY lcr_route_sid_idxfk (lcr_route_sid) REFERENCES lcr_routes (lcr_route_sid)',
-    'ALTER TABLE lcr_carrier_set_entry ADD FOREIGN KEY voip_carrier_sid_idxfk_3 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid)',
-    'SET FOREIGN_KEY_CHECKS=1',
-  ],
-  8004: [
-    'alter table accounts add column record_all_calls BOOLEAN NOT NULL DEFAULT false',
-    'alter table accounts add column bucket_credential VARCHAR(8192)',
-    'alter table accounts add column record_format VARCHAR(16) NOT NULL DEFAULT \'mp3\'',
-    'alter table applications add column record_all_calls BOOLEAN NOT NULL DEFAULT false',
-    'alter table phone_numbers DROP INDEX number',
-    'create unique index phone_numbers_unique_idx_voip_carrier_number ON phone_numbers (number,voip_carrier_sid)',
-    `CREATE TABLE clients
-    (
-    client_sid CHAR(36) NOT NULL UNIQUE ,
-    account_sid CHAR(36) NOT NULL,
-    is_active BOOLEAN NOT NULL DEFAULT 1,
-    username VARCHAR(64),
-    password VARCHAR(1024),
-    PRIMARY KEY (client_sid)
-    )`,
-    'CREATE INDEX client_sid_idx ON clients (client_sid)',
-    'ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid)'
   ]
 };
 
@@ -188,7 +129,6 @@ const doIt = async() => {
         if (val < 7007) upgrades.push(...sql['7007']);
         if (val < 8000) upgrades.push(...sql['8000']);
         if (val < 8003) upgrades.push(...sql['8003']);
-        if (val < 8004) upgrades.push(...sql['8004']);
 
         // perform all upgrades
         logger.info({upgrades}, 'applying schema upgrades..');

lib/helpers/realtimedb-helpers.js

@@ -1,31 +1,10 @@
 const logger = require('../logger');
 
-const JAMBONES_REDIS_SENTINELS = process.env.JAMBONES_REDIS_SENTINELS ? {
-  sentinels: process.env.JAMBONES_REDIS_SENTINELS.split(',').map((sentinel) => {
-    let host, port = 26379;
-    if (sentinel.includes(':')) {
-      const arr = sentinel.split(':');
-      host = arr[0];
-      port = parseInt(arr[1], 10);
-    } else {
-      host = sentinel;
-    }
-    return {host, port};
-  }),
-  name: process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
-  ...(process.env.JAMBONES_REDIS_SENTINEL_PASSWORD && {
-    password: process.env.JAMBONES_REDIS_SENTINEL_PASSWORD
-  }),
-  ...(process.env.JAMBONES_REDIS_SENTINEL_USERNAME && {
-    username: process.env.JAMBONES_REDIS_SENTINEL_USERNAME
-  })
-} : null;
-
 const {
   retrieveCall,
   deleteCall,
   listCalls,
-  listSortedSets,
+  listQueues,
   purgeCalls,
   retrieveSet,
   addKey,
@@ -33,7 +12,7 @@ const {
   deleteKey,
   incrKey,
   client: redisClient,
-} = require('@jambonz/realtimedb-helpers')(JAMBONES_REDIS_SENTINELS || {
+} = require('@jambonz/realtimedb-helpers')({
   host: process.env.JAMBONES_REDIS_HOST || 'localhost',
   port: process.env.JAMBONES_REDIS_PORT || 6379
 }, logger);
@@ -42,13 +21,12 @@ module.exports = {
   retrieveCall,
   deleteCall,
   listCalls,
-  listSortedSets,
+  listQueues,
   purgeCalls,
   retrieveSet,
   addKey,
   retrieveKey,
   deleteKey,
   redisClient,
-  incrKey,
-  JAMBONES_REDIS_SENTINELS
+  incrKey
 };

lib/models/account.js

@@ -4,7 +4,7 @@ const {getMysqlConnection} = require('../db');
 const {promisePool} = require('../db');
 const { v4: uuid } = require('uuid');
 
-const {encrypt, decrypt} = require('../utils/encrypt-decrypt');
+const {encrypt} = require('../utils/encrypt-decrypt');
 
 const retrieveSql = `SELECT * from accounts acc
 LEFT JOIN webhooks AS rh
@@ -55,13 +55,6 @@ WHERE account_sid = ?
 AND effective_end_date IS NULL 
 AND pending = 0`;
 
-const extractBucketCredential = (obj) => {
-  const {bucket_credential} = obj;
-  if (bucket_credential) {
-    obj.bucket_credential = JSON.parse(decrypt(bucket_credential));
-  }
-};
-
 function transmogrifyResults(results) {
   return results.map((row) => {
     const obj = row.acc;
@@ -82,8 +75,6 @@ function transmogrifyResults(results) {
     else obj.queue_event_hook = null;
     delete obj.queue_event_hook_sid;
 
-    extractBucketCredential(obj);
-
     return obj;
   });
 }
@@ -247,6 +238,7 @@ class Account extends Model {
     }));
     return account_subscription_sid;
   }
+
 }
 
 Account.table = 'accounts';
@@ -327,15 +319,7 @@ Account.fields = [
     type: 'string',
   },
   {
-    name: 'record_all_calls',
-    type: 'number'
-  },
-  {
-    name: 'record_format',
-    type: 'string'
-  },
-  {
-    name: 'bucket_credential',
+    name: 'lcr_sid',
     type: 'string'
   }
 ];

lib/models/application.js

@@ -120,10 +120,6 @@ Application.fields = [
   {
     name: 'messaging_hook_sid',
     type: 'string',
-  },
-  {
-    name: 'record_all_calls',
-    type: 'number',
   }
 ];
 

lib/models/client.js

@@ -1,58 +0,0 @@
-const Model = require('./model');
-const {promisePool} = require('../db');
-
-class Client extends Model {
-  constructor() {
-    super();
-  }
-
-  static async retrieveAllByAccountSid(account_sid) {
-    const sql = `SELECT * FROM ${this.table} WHERE account_sid = ?`;
-    const [rows] = await promisePool.query(sql, account_sid);
-    return rows;
-  }
-
-  static async retrieveAllByServiceProviderSid(service_provider_sid) {
-    const sql = `SELECT c.client_sid, c.account_sid, c.is_active, c.username, c.hashed_password
-      FROM ${this.table} AS c LEFT JOIN accounts AS acc ON c.account_sid = acc.account_sid
-      LEFT JOIN service_providers AS sp ON sp.service_provider_sid = accs.service_provider_sid
-      WHERE sp.service_provider_sid = ?`;
-    const [rows] = await promisePool.query(sql, service_provider_sid);
-    return rows;
-  }
-
-  static async retrieveByAccountSidAndUserName(account_sid, username) {
-    const sql = `SELECT * FROM ${this.table} WHERE account_sid = ? AND username = ?`;
-    const [rows] = await promisePool.query(sql, [account_sid, username]);
-    return rows;
-  }
-}
-
-Client.table = 'clients';
-Client.fields = [
-  {
-    name: 'client_sid',
-    type: 'string',
-    primaryKey: true
-  },
-  {
-    name: 'account_sid',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'is_active',
-    type: 'number'
-  },
-  {
-    name: 'username',
-    type: 'string',
-    required: true
-  },
-  {
-    name: 'password',
-    type: 'string'
-  }
-];
-
-module.exports = Client;

lib/models/phone-number.js

@@ -1,6 +1,6 @@
 const Model = require('./model');
 const {promisePool} = require('../db');
-const sql = 'SELECT * from phone_numbers WHERE account_sid = ? ORDER BY number';
+const sql = 'SELECT * from phone_numbers WHERE account_sid = ?';
 const sqlSP = `SELECT * 
 FROM phone_numbers 
 WHERE account_sid IN 
@@ -8,7 +8,7 @@ WHERE account_sid IN
   SELECT account_sid 
   FROM accounts 
   WHERE service_provider_sid = ?
-) ORDER BY number`;
+)`;
 
 class PhoneNumber extends Model {
   constructor() {

lib/models/sip-gateway.js

@@ -58,10 +58,6 @@ SipGateway.fields = [
   {
     name: 'application_sid',
     type: 'string'
-  },
-  {
-    name: 'protocol',
-    type: 'string'
   }
 ];
 

lib/models/speech-credential.js

@@ -1,7 +1,7 @@
 const Model = require('./model');
 const {promisePool} = require('../db');
 const retrieveSql = 'SELECT * from speech_credentials WHERE account_sid = ?';
-const retrieveSqlForSP = 'SELECT * from speech_credentials WHERE service_provider_sid = ? and account_sid is null';
+const retrieveSqlForSP = 'SELECT * from speech_credentials WHERE service_provider_sid = ?';
 
 class SpeechCredential extends Model {
   constructor() {

lib/record/encoder.js

@@ -1,54 +0,0 @@
-const { Transform } = require('stream');
-const lamejs = require('@jambonz/lamejs');
-
-class PCMToMP3Encoder extends Transform {
-  constructor(options) {
-    super(options);
-
-    const channels = options.channels || 1;
-    const sampleRate = options.sampleRate || 8000;
-    const bitRate = options.bitRate || 128;
-
-    this.encoder = new lamejs.Mp3Encoder(channels, sampleRate, bitRate);
-    this.channels = channels;
-  }
-
-  _transform(chunk, encoding, callback) {
-    // Convert chunk buffer into Int16Array for lamejs
-    const samples = new Int16Array(chunk.buffer, chunk.byteOffset, chunk.length / 2);
-
-    // Split input samples into left and right channel arrays if stereo
-    let leftChannel, rightChannel;
-    if (this.channels === 2) {
-      leftChannel = new Int16Array(samples.length / 2);
-      rightChannel = new Int16Array(samples.length / 2);
-
-      for (let i = 0; i < samples.length; i += 2) {
-        leftChannel[i / 2] = samples[i];
-        rightChannel[i / 2] = samples[i + 1];
-      }
-    } else {
-      leftChannel = samples;
-    }
-
-    // Encode the input data
-    const mp3Data = this.encoder.encodeBuffer(leftChannel, rightChannel);
-
-    if (mp3Data.length > 0) {
-      this.push(Buffer.from(mp3Data));
-    }
-    callback();
-  }
-
-  _flush(callback) {
-    // Finalize encoding and flush the internal buffers
-    const mp3Data = this.encoder.flush();
-
-    if (mp3Data.length > 0) {
-      this.push(Buffer.from(mp3Data));
-    }
-    callback();
-  }
-}
-
-module.exports = PCMToMP3Encoder;

lib/record/index.js

@@ -1,17 +0,0 @@
-
-const path = require('node:path');
-async function record(logger, socket, url) {
-  const p = path.basename(url);
-  const idx = p.lastIndexOf('/');
-  const vendor = p.substring(idx + 1);
-  switch (vendor) {
-    case 'aws_s3':
-      return require('./s3')(logger, socket);
-    default:
-      logger.info(`unknown bucket vendor: ${vendor}`);
-      socket.send(`unknown bucket vendor: ${vendor}`);
-      socket.close();
-  }
-}
-
-module.exports = record;

lib/record/s3-multipart-upload-stream.js

@@ -1,103 +0,0 @@
-const { Writable } = require('stream');
-const {
-  S3Client,
-  CreateMultipartUploadCommand,
-  UploadPartCommand,
-  CompleteMultipartUploadCommand,
-} = require('@aws-sdk/client-s3');
-
-class S3MultipartUploadStream extends Writable {
-  constructor(logger, opts) {
-    super(opts);
-    this.logger = logger;
-    this.bucketName = opts.bucketName;
-    this.objectKey = opts.Key;
-    this.uploadId = null;
-    this.partNumber = 1;
-    this.multipartETags = [];
-    this.buffer = Buffer.alloc(0);
-    this.minPartSize = 5 * 1024 * 1024; // 5 MB
-    this.s3 = new S3Client(opts.bucketCredential);
-    this.metadata = opts.metadata;
-  }
-
-  async _initMultipartUpload() {
-    const command = new CreateMultipartUploadCommand({
-      Bucket: this.bucketName,
-      Key: this.objectKey,
-      Metadata: this.metadata
-    });
-    const response = await this.s3.send(command);
-    return response.UploadId;
-  }
-
-  async _uploadBuffer() {
-    const uploadPartCommand = new UploadPartCommand({
-      Bucket: this.bucketName,
-      Key: this.objectKey,
-      PartNumber: this.partNumber,
-      UploadId: this.uploadId,
-      Body: this.buffer,
-    });
-
-    const uploadPartResponse = await this.s3.send(uploadPartCommand);
-    this.multipartETags.push({
-      ETag: uploadPartResponse.ETag,
-      PartNumber: this.partNumber,
-    });
-    this.partNumber += 1;
-  }
-
-  async _write(chunk, encoding, callback) {
-    try {
-      if (!this.uploadId) {
-        this.uploadId = await this._initMultipartUpload();
-      }
-
-      this.buffer = Buffer.concat([this.buffer, chunk]);
-
-      if (this.buffer.length >= this.minPartSize) {
-        await this._uploadBuffer();
-        this.buffer = Buffer.alloc(0);
-      }
-
-      callback(null);
-    } catch (error) {
-      callback(error);
-    }
-  }
-
-  async _finalize(err) {
-    try {
-      if (this.buffer.length > 0) {
-        await this._uploadBuffer();
-      }
-
-      const completeMultipartUploadCommand = new CompleteMultipartUploadCommand({
-        Bucket: this.bucketName,
-        Key: this.objectKey,
-        MultipartUpload: {
-          Parts: this.multipartETags.sort((a, b) => a.PartNumber - b.PartNumber),
-        },
-        UploadId: this.uploadId,
-      });
-
-      await this.s3.send(completeMultipartUploadCommand);
-      this.logger.info('Finished upload to S3');
-    } catch (error) {
-      this.logger.error('Error completing multipart upload:', error);
-      throw error;
-    }
-  }
-
-  async _final(callback) {
-    try {
-      await this._finalize();
-      callback(null);
-    } catch (error) {
-      callback(error);
-    }
-  }
-}
-
-module.exports = S3MultipartUploadStream;

lib/record/s3.js

@@ -1,95 +0,0 @@
-const Account = require('../models/account');
-const Websocket = require('ws');
-const PCMToMP3Encoder = require('./encoder');
-const S3MultipartUploadStream = require('./s3-multipart-upload-stream');
-const wav = require('wav');
-
-async function upload(logger, socket) {
-
-  socket._recvInitialMetadata = false;
-  socket.on('message', async function(data, isBinary) {
-    try {
-      if (!isBinary && !socket._recvInitialMetadata) {
-        socket._recvInitialMetadata = true;
-        logger.debug(`initial metadata: ${data}`);
-        const obj = JSON.parse(data.toString());
-        logger.info({obj}, 'received JSON message from jambonz');
-        const {sampleRate, accountSid, callSid, direction, from, to,
-          callId, applicationSid, originatingSipIp, originatingSipTrunkName} = obj;
-        const account = await Account.retrieve(accountSid);
-        if (account && account.length && account[0].bucket_credential) {
-          const obj = account[0].bucket_credential;
-          // add tags to metadata
-          const metadata = {
-            accountSid,
-            callSid,
-            direction,
-            from,
-            to,
-            callId,
-            applicationSid,
-            originatingSipIp,
-            originatingSipTrunkName,
-            sampleRate: `${sampleRate}`
-          };
-          if (obj.tags && obj.tags.length) {
-            obj.tags.forEach((tag) => {
-              metadata[tag.Key] = tag.Value;
-            });
-          }
-          // create S3 path
-          const day = new Date();
-          let Key = `${day.getFullYear()}/${(day.getMonth() + 1).toString().padStart(2, '0')}`;
-          Key += `/${day.getDate().toString().padStart(2, '0')}/${callSid}.${account[0].record_format}`;
-
-          // Uploader
-          const uploaderOpts = {
-            bucketName: obj.name,
-            Key,
-            metadata,
-            bucketCredential: {
-              credentials: {
-                accessKeyId: obj.access_key_id,
-                secretAccessKey: obj.secret_access_key,
-              },
-              region: obj.region || 'us-east-1'
-            }
-          };
-          const uploadStream = new S3MultipartUploadStream(logger, uploaderOpts);
-
-          /**encoder */
-          let encoder;
-          if (obj.output_format === 'wav') {
-            encoder = new wav.Writer({ channels: 2, sampleRate, bitDepth: 16 });
-          } else {
-            // default is mp3
-            encoder = new PCMToMP3Encoder({
-              channels: 2,
-              sampleRate: sampleRate,
-              bitrate: 128
-            });
-          }
-          /* start streaming data */
-          const duplex = Websocket.createWebSocketStream(socket);
-          duplex.pipe(encoder).pipe(uploadStream);
-        } else {
-          logger.info(`account ${accountSid} does not have any bucket credential, close the socket`);
-          socket.close();
-        }
-      }
-    } catch (err) {
-      logger.error({err, data}, 'error parsing message during connection');
-    }
-  });
-  socket.on('error', function(err) {
-    logger.error({err}, 'aws upload: error');
-  });
-  socket.on('close', (data) => {
-    logger.info({data}, 'aws_s3: close');
-  });
-  socket.on('end', function(err) {
-    logger.error({err}, 'aws upload: socket closed from jambonz');
-  });
-}
-
-module.exports = upload;

lib/routes/api/accounts.js

@@ -1,7 +1,6 @@
 const router = require('express').Router();
-const assert = require('assert');
 const request = require('request');
-const {DbErrorBadRequest, DbErrorForbidden, DbErrorUnprocessableRequest, DbError} = require('../../utils/errors');
+const {DbErrorBadRequest, DbErrorForbidden, DbErrorUnprocessableRequest} = require('../../utils/errors');
 const Account = require('../../models/account');
 const Application = require('../../models/application');
 const Webhook = require('../../models/webhook');
@@ -23,8 +22,6 @@ const {
 } = require('./utils');
 const short = require('short-uuid');
 const VoipCarrier = require('../../models/voip-carrier');
-const { encrypt, decrypt } = require('../../utils/encrypt-decrypt');
-const { testAwsS3 } = require('../../utils/storage-utils');
 const translator = short();
 
 let idx = 0;
@@ -41,14 +38,20 @@ const getFsUrl = async(logger, retrieveSet, setName) => {
       logger.info('No available feature servers to handle createCall API request');
       return ;
     }
-    const f = fs[idx++ % fs.length];
-    logger.info({fs}, `feature servers available for createCall API request, selecting ${f}`);
-    return `${f}/v1/createCall`;
+    const ip = stripPort(fs[idx++ % fs.length]);
+    logger.info({fs}, `feature servers available for createCall API request, selecting ${ip}`);
+    return `http://${ip}:3000/v1/createCall`;
   } catch (err) {
     logger.error({err}, 'getFsUrl: error retreving feature servers from redis');
   }
 };
 
+const stripPort = (hostport) => {
+  const arr = /^(.*):(.*)$/.exec(hostport);
+  if (arr) return arr[1];
+  return hostport;
+};
+
 const validateRequest = async(req, account_sid) => {
   try {
     if (req.user.hasScope('admin')) {
@@ -86,7 +89,6 @@ router.use('/:sid/Charges', hasAccountPermissions, require('./charges'));
 router.use('/:sid/SipRealms', hasAccountPermissions, require('./sip-realm'));
 router.use('/:sid/PredefinedCarriers', hasAccountPermissions, require('./add-from-predefined-carrier'));
 router.use('/:sid/Limits', hasAccountPermissions, require('./limits'));
-router.use('/:sid/TtsCache', hasAccountPermissions, require('./tts-cache'));
 router.get('/:sid/Applications', async(req, res) => {
   const logger = req.app.locals.logger;
   try {
@@ -261,7 +263,6 @@ async function validateCreateCall(logger, sid, req) {
       const application = await lookupAppBySid(obj.application_sid);
       Object.assign(obj, {
         call_hook: application.call_hook,
-        app_json: application.app_json,
         call_status_hook: application.call_status_hook,
         speech_synthesis_vendor: application.speech_synthesis_vendor,
         speech_synthesis_language: application.speech_synthesis_language,
@@ -448,6 +449,7 @@ router.get('/:sid', async(req, res) => {
   try {
     const account_sid = parseAccountSid(req);
     await validateRequest(req, account_sid);
+
     const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
     const results = await Account.retrieve(account_sid, service_provider_sid);
     if (results.length === 0) return res.status(404).end();
@@ -533,35 +535,6 @@ router.delete('/:sid/SubspaceTeleport', async(req, res) => {
   }
 });
 
-function encryptBucketCredential(obj) {
-  if (!obj.bucket_credential) return;
-  const {
-    vendor,
-    region,
-    name,
-    access_key_id,
-    secret_access_key,
-    tags
-  } = obj.bucket_credential;
-
-  switch (vendor) {
-    case 'aws_s3':
-      assert(access_key_id, 'invalid aws S3 bucket credential: access_key_id is required');
-      assert(secret_access_key, 'invalid aws S3 bucket credential: secret_access_key is required');
-      assert(name, 'invalid aws bucket name: name is required');
-      assert(region, 'invalid aws bucket region: region is required');
-      const awsData = JSON.stringify({vendor, region, name, access_key_id,
-        secret_access_key, tags});
-      obj.bucket_credential = encrypt(awsData);
-      break;
-    case 'none':
-      obj.bucket_credential = null;
-      break;
-    default:
-      throw DbErrorBadRequest(`unknow storage vendor: ${vendor}`);
-  }
-}
-
 /**
  * update
  */
@@ -608,8 +581,6 @@ router.put('/:sid', async(req, res) => {
       delete obj.registration_hook;
       delete obj.queue_event_hook;
 
-      encryptBucketCredential(obj);
-
       const rowsAffected = await Account.update(sid, obj);
       if (rowsAffected === 0) {
         return res.status(404).end();
@@ -702,51 +673,6 @@ account_subscriptions WHERE account_sid = ?)
   }
 });
 
-/* Test Bucket credential Keys */
-router.post('/:sid/BucketCredentialTest', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const account_sid = parseAccountSid(req);
-    await validateRequest(req, account_sid);
-    let {vendor, name, region, access_key_id, secret_access_key} = req.body;
-    const ret = {
-      status: 'not tested'
-    };
-
-    if (secret_access_key.endsWith('XXXXXX')) {
-      // this is when the password already saved in account
-      const service_provider_sid = req.user.hasServiceProviderAuth ? req.user.service_provider_sid : null;
-      const results = await Account.retrieve(account_sid, service_provider_sid);
-      if (results.length === 0) throw new DbError('Invalid Account Sid');
-      const {bucket_credential} = results[0];
-      if (bucket_credential) {
-        const o = JSON.parse(decrypt(bucket_credential));
-        vendor = o.vendor;
-        switch (vendor) {
-          case 'aws_s3':
-            name = o.name;
-            region = o.region;
-            access_key_id = o.access_key_id;
-            secret_access_key = o.secret_access_key;
-            break;
-        }
-      }
-    }
-    switch (vendor) {
-      case 'aws_s3':
-        await testAwsS3(logger, {vendor, name, region, access_key_id, secret_access_key});
-        ret.status = 'ok';
-        break;
-      default:
-        throw new DbErrorBadRequest(`Does not support test for ${vendor}`);
-    }
-    return res.status(200).json(ret);
-  }
-  catch (err) {
-    return res.status(200).json({status: 'failed', reason: err.message});
-  }
-});
-
 /**
  * retrieve account level api keys
  */
@@ -770,7 +696,7 @@ router.get('/:sid/ApiKeys', async(req, res) => {
  */
 router.post('/:sid/Calls', async(req, res) => {
   const {retrieveSet, logger} = req.app.locals;
-  const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:fs-service-url`;
+  const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
   const serviceUrl = await getFsUrl(logger, retrieveSet, setName);
 
   if (!serviceUrl) {
@@ -931,7 +857,7 @@ router.post('/:sid/Messages', async(req, res) => {
     const account_sid = parseAccountSid(req);
     await validateRequest(req, account_sid);
 
-    const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:fs-service-url`;
+    const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
     const serviceUrl = await getFsUrl(logger, retrieveSet, setName);
     if (!serviceUrl) res.json({msg: 'no available feature servers at this time'}).status(480);
     await validateCreateMessage(logger, account_sid, req);
@@ -968,12 +894,12 @@ router.post('/:sid/Messages', async(req, res) => {
  * retrieve info for a group of queues under an account
  */
 router.get('/:sid/Queues', async(req, res) => {
-  const {logger, listSortedSets} = req.app.locals;
+  const {logger, listQueues} = req.app.locals;
   const { search } = req.query || {};
   try {
     const accountSid = parseAccountSid(req);
     await validateRequest(req, accountSid);
-    const queues = search ? await listSortedSets(accountSid, search) : await listSortedSets(accountSid);
+    const queues = search ? await listQueues(accountSid, search) : await listQueues(accountSid);
     logger.debug(`retrieved ${queues.length} queues for account sid ${accountSid}`);
     res.status(200).json(queues);
     updateLastUsed(logger, accountSid, req).catch((err) => {});

lib/routes/api/clients.js

@@ -1,88 +0,0 @@
-const router = require('express').Router();
-const decorate = require('./decorate');
-const sysError = require('../error');
-const Client = require('../../models/client');
-const Account = require('../../models/account');
-const { DbErrorBadRequest, DbErrorForbidden } = require('../../utils/errors');
-const { encrypt, decrypt, obscureKey } = require('../../utils/encrypt-decrypt');
-
-const commonCheck = async(req) => {
-  if (req.user.hasAccountAuth) {
-    req.body.account_sid = req.user.account_sid;
-  } else if (req.user.hasServiceProviderAuth && req.body.account_sid) {
-    const accounts = await Account.retrieve(req.body.account_sid, req.user.service_provider_sid);
-    if (accounts.length === 0) {
-      throw new DbErrorForbidden('insufficient permissions');
-    }
-  }
-
-  if (req.body.password) {
-    req.body.password = encrypt(req.body.password);
-  }
-};
-
-const validateAdd = async(req) => {
-  await commonCheck(req);
-
-  const clients = await Client.retrieveByAccountSidAndUserName(req.body.account_sid, req.body.username);
-  if (clients.length) {
-    throw new DbErrorBadRequest('the client\'s username already exists');
-  }
-};
-
-const validateUpdate = async(req, sid) => {
-  await commonCheck(req);
-
-  const clients = await Client.retrieveByAccountSidAndUserName(req.body.account_sid, req.body.username);
-  if (clients.length && clients[0].client_sid !== sid) {
-    throw new DbErrorBadRequest('the client\'s username already exists');
-  }
-};
-
-
-const preconditions = {
-  add: validateAdd,
-  update: validateUpdate,
-};
-
-decorate(router, Client, ['add', 'update', 'delete'], preconditions);
-
-router.get('/', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const results = req.user.hasAdminAuth ?
-      await Client.retrieveAll() : req.user.hasAccountAuth ?
-        await Client.retrieveAllByAccountSid(req.user.hasAccountAuth ? req.user.account_sid : null) :
-        await Client.retrieveAllByServiceProviderSid(req.user.service_provider_sid);
-    const ret = results.map((c) => {
-      c.password = obscureKey(decrypt(c.password), 1);
-      return c;
-    });
-    res.status(200).json(ret);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-router.get('/:sid', async(req, res) => {
-  const logger = req.app.locals.logger;
-  try {
-    const results = await Client.retrieve(req.params.sid);
-    if (results.length === 0) return res.sendStatus(404);
-    const client = results[0];
-    client.password = obscureKey(decrypt(client.password), 1);
-    if (req.user.hasAccountAuth && client.account_sid !== req.user.account_sid) {
-      return res.sendStatus(404);
-    } else if (req.user.hasServiceProviderAuth) {
-      const accounts = await Account.retrieve(client.account_sid, req.user.service_provider_sid);
-      if (!accounts.length) {
-        return res.sendStatus(404);
-      }
-    }
-    return res.status(200).json(client);
-  } catch (err) {
-    sysError(logger, res, err);
-  }
-});
-
-module.exports = router;

lib/routes/api/index.js

@@ -17,7 +17,6 @@ const isAdminScope = (req, res, next) => {
 
 api.use('/BetaInviteCodes', isAdminScope, require('./beta-invite-codes'));
 api.use('/SystemInformation', isAdminScope, require('./system-information'));
-api.use('/TtsCache', isAdminScope, require('./tts-cache'));
 api.use('/ServiceProviders', require('./service-providers'));
 api.use('/VoipCarriers', require('./voip-carriers'));
 api.use('/Webhooks', require('./webhooks'));
@@ -51,7 +50,6 @@ api.use('/PasswordSettings', require('./password-settings'));
 api.use('/Lcrs', require('./lcrs'));
 api.use('/LcrRoutes', require('./lcr-routes'));
 api.use('/LcrCarrierSetEntries', require('./lcr-carrier-set-entries'));
-api.use('/Clients', require('./clients'));
 
 // messaging
 api.use('/Smpps', require('./smpps'));   // our smpp server info

lib/routes/api/recent-calls.js

@@ -3,8 +3,6 @@ const sysError = require('../error');
 const {DbErrorBadRequest} = require('../../utils/errors');
 const {getHomerApiKey, getHomerSipTrace, getHomerPcap} = require('../../utils/homer-utils');
 const {getJaegerTrace} = require('../../utils/jaeger-utils');
-const Account = require('../../models/account');
-const { getS3Object } = require('../../utils/storage-utils');
 
 const parseAccountSid = (url) => {
   const arr = /Accounts\/([^\/]*)/.exec(url);
@@ -22,7 +20,7 @@ router.get('/', async(req, res) => {
     logger.debug({opts: req.query}, 'GET /RecentCalls');
     const account_sid = parseAccountSid(req.originalUrl);
     const service_provider_sid = account_sid ? null : parseServiceProviderSid(req.originalUrl);
-    const {page, count, trunk, direction, days, answered, start, end, from, to} = req.query || {};
+    const {page, count, trunk, direction, days, answered, start, end} = req.query || {};
     if (!page || page < 1) throw new DbErrorBadRequest('missing or invalid "page" query arg');
     if (!count || count < 25 || count > 500) throw new DbErrorBadRequest('missing or invalid "count" query arg');
 
@@ -37,8 +35,6 @@ router.get('/', async(req, res) => {
         answered,
         start: days ? undefined : start,
         end: days ? undefined : end,
-        from,
-        to
       });
       res.status(200).json(data);
     }
@@ -53,8 +49,6 @@ router.get('/', async(req, res) => {
         answered,
         start: days ? undefined : start,
         end: days ? undefined : end,
-        from,
-        to
       });
       res.status(200).json(data);
     }
@@ -80,12 +74,12 @@ router.get('/:call_id', async(req, res) => {
   }
 });
 
-router.get('/:call_id/:method/pcap', async(req, res) => {
+router.get('/:call_id/pcap', async(req, res) => {
   const {logger} = req.app.locals;
   try {
     const token = await getHomerApiKey(logger);
     if (!token) return res.sendStatus(400, {msg: 'getHomerApiKey: Failed to get Homer API token; check server config'});
-    const stream = await getHomerPcap(logger, token, [req.params.call_id], req.params.method);
+    const stream = await getHomerPcap(logger, token, [req.params.call_id]);
     if (!stream) {
       logger.info(`getHomerApiKey: unable to get sip traces from Homer for ${req.params.call_id}`);
       return res.sendStatus(404);
@@ -117,34 +111,4 @@ router.get('/trace/:trace_id', async(req, res) => {
   }
 });
 
-router.get('/:call_sid/record/:year/:month/:day/:format', async(req, res) => {
-  const {logger} = req.app.locals;
-  const {call_sid, year, month, day, format} = req.params;
-
-  try {
-    const account_sid = parseAccountSid(req.originalUrl);
-    const r = await Account.retrieve(account_sid);
-    if (r.length === 0 || !r[0].bucket_credential) return res.sendStatus(404);
-    const {bucket_credential} = r[0];
-    switch (bucket_credential.vendor) {
-      case 'aws_s3':
-        const getS3Options  = {
-          ...bucket_credential,
-          key: `${year}/${month}/${day}/${call_sid}.${format || 'mp3'}`
-        };
-        const stream = await getS3Object(logger, getS3Options);
-        res.set({
-          'Content-Type': `audio/${format || 'mp3'}`
-        });
-        stream.pipe(res);
-        break;
-      default:
-        logger.error(`There is no handler for fetching record from ${bucket_credential.vendor}`);
-        return res.sendStatus(500);
-    }
-  }  catch (err) {
-    logger.error({err}, ` error retrieving recording ${call_sid}`);
-    res.sendStatus(404);
-  }
-});
 module.exports = router;

lib/routes/api/sms-inbound.js

@@ -14,14 +14,20 @@ const getFsUrl = async(logger, retrieveSet, setName, provider) => {
       logger.info('No available feature servers to handle createCall API request');
       return ;
     }
-    const f = fs[idx++ % fs.length];
-    logger.info({fs}, `feature servers available for createCall API request, selecting ${f}`);
-    return `${f}/v1/messaging/${provider}`;
+    const ip = stripPort(fs[idx++ % fs.length]);
+    logger.info({fs}, `feature servers available for createCall API request, selecting ${ip}`);
+    return `http://${ip}:3000/v1/messaging/${provider}`;
   } catch (err) {
     logger.error({err}, 'getFsUrl: error retreving feature servers from redis');
   }
 };
 
+const stripPort = (hostport) => {
+  const arr = /^(.*):(.*)$/.exec(hostport);
+  if (arr) return arr[1];
+  return hostport;
+};
+
 const doSendResponse = async(res, respondFn, body) => {
   if (typeof respondFn === 'number') res.sendStatus(respondFn);
   else if (typeof respondFn !== 'function') res.sendStatus(200);
@@ -38,7 +44,7 @@ router.post('/:provider', async(req, res) => {
     lookupAppByPhoneNumber,
     logger
   } = req.app.locals;
-  const setName = `${process.env.JAMBONES_CLUSTER_ID || 'default'}:fs-service-url`;
+  const setName = `${process.env.JAMBONES_CLUSTER_ID || 'default'}:active-fs`;
   logger.debug({path: req.path, body: req.body}, 'incomingSMS from carrier');
 
   // search for provider module

lib/routes/api/speech-credentials.js

@@ -3,7 +3,7 @@ const assert = require('assert');
 const Account = require('../../models/account');
 const SpeechCredential = require('../../models/speech-credential');
 const sysError = require('../error');
-const {decrypt, encrypt, obscureKey} = require('../../utils/encrypt-decrypt');
+const {decrypt, encrypt} = require('../../utils/encrypt-decrypt');
 const {parseAccountSid, parseServiceProviderSid, parseSpeechCredentialSid} = require('./utils');
 const {DbErrorUnprocessableRequest, DbErrorForbidden} = require('../../utils/errors');
 const {
@@ -99,6 +99,17 @@ const validateTest = async(req, speech_credentials) => {
   }
 };
 
+const obscureKey = (key) => {
+  const key_spoiler_length = 6;
+  const key_spoiler_char = 'X';
+
+  if (key.length <= key_spoiler_length) {
+    return key;
+  }
+
+  return `${key.slice(0, key_spoiler_length)}${key_spoiler_char.repeat(key.length - key_spoiler_length)}`;
+};
+
 const encryptCredential = (obj) => {
   const {
     vendor,

lib/routes/api/system-information.js

@@ -8,7 +8,7 @@ router.post('/', async(req, res) => {
 
 router.get('/', async(req, res) => {
   const [sysInfo] = await SystemInformation.retrieveAll();
-  res.status(200).json(sysInfo || {});
+  res.status(200).json(sysInfo);
 });
 
 module.exports = router;

lib/routes/api/tts-cache.js

@@ -1,29 +0,0 @@
-const router = require('express').Router();
-const {
-  parseAccountSid
-} = require('./utils');
-
-router.delete('/', async(req, res) => {
-  const {purgeTtsCache} = req.app.locals;
-  const account_sid = parseAccountSid(req);
-  if (account_sid) {
-    await purgeTtsCache({account_sid});
-  } else {
-    await purgeTtsCache();
-  }
-  res.sendStatus(204);
-});
-
-router.get('/', async(req, res) => {
-  const {getTtsSize} = req.app.locals;
-  const account_sid = parseAccountSid(req);
-  let size = 0;
-  if (account_sid) {
-    size = await getTtsSize(`tts:${account_sid}:*`);
-  } else {
-    size = await getTtsSize();
-  }
-  res.status(200).json({size});
-});
-
-module.exports = router;

lib/swagger/swagger.yaml

@@ -3046,18 +3046,6 @@ paths:
           enum:
             - inbound
             - outbound
-      - in: query
-        name: from
-        required: false
-        schema:
-          type: string
-        description: calling number to retrieve
-      - in: query
-        name: to
-        required: false
-        schema:
-          type: string
-        description: called number to retrieve
     get:
       tags:
         - Accounts
@@ -3257,18 +3245,6 @@ paths:
           enum:
             - inbound
             - outbound
-      - in: query
-        name: from
-        required: false
-        schema:
-          type: string
-        description: calling number to retrieve
-      - in: query
-        name: to
-        required: false
-        schema:
-          type: string
-        description: called number to retrieve
     get:
       tags:
         - Service Providers
@@ -3855,6 +3831,10 @@ paths:
                   type: object
                   description: Initial set of customer-supplied metadata to associate with the call (see jambonz 'tag' verb)
                   example: {"callCount": 10}
+                metadata:
+                  type: object
+                  description: Customer-supplied metadata to associate with the call that to be included in customerData for call_hook and call_status_hook.
+                  example: {"customer": "jambonz"}
                 to:
                   $ref: '#/components/schemas/Target'
                   description: Destination for call

lib/utils/encrypt-decrypt.js

@@ -23,18 +23,7 @@ const decrypt = (data) => {
   return decrpyted.toString();
 };
 
-const obscureKey = (key, key_spoiler_length = 6) => {
-  const key_spoiler_char = 'X';
-
-  if (!key || key.length <= key_spoiler_length) {
-    return key;
-  }
-
-  return `${key.slice(0, key_spoiler_length)}${key_spoiler_char.repeat(key.length - key_spoiler_length)}`;
-};
-
 module.exports = {
   encrypt,
-  decrypt,
-  obscureKey
+  decrypt
 };

lib/utils/homer-utils.js

@@ -64,7 +64,7 @@ const getHomerSipTrace = async(logger, apiKey, callId) => {
   }
 };
 
-const getHomerPcap = async(logger, apiKey, callIds, method) => {
+const getHomerPcap = async(logger, apiKey, callIds) => {
   if (!process.env.HOMER_BASE_URL || !process.env.HOMER_USERNAME || !process.env.HOMER_PASSWORD) {
     logger.debug('getHomerPcap: Homer integration not installed');
   }
@@ -73,23 +73,18 @@ const getHomerPcap = async(logger, apiKey, callIds, method) => {
     const stream = await postPcap('/api/v3/export/call/messages/pcap', {
       param: {
         transaction: {
-          call: method === 'invite',
-          registration: method === 'register',
+          call: true,
+          registration: true,
           rest: false
         },
         orlogic: true,
         search: {
-          ...(method === 'invite' && {
-            '1_call': {
-              callid: callIds
-            }
-          })
-          ,
-          ...(method === 'register' && {
-            '1_registration': {
-              callid: callIds
-            }
-          })
+          '1_call': {
+            callid: callIds
+          },
+          '1_registration': {
+            callid: callIds
+          }
         },
       },
       timestamp: {

lib/utils/jaeger-utils.js

@@ -9,8 +9,7 @@ const getJaegerTrace = async(logger, traceId) => {
   try {
     return await getJSON(`/api/v3/traces/${traceId}`);
   } catch (err) {
-    const url = `${process.env.JAEGER_BASE_URL}/api/traces/${traceId}`;
-    logger.error({err, traceId}, `getJaegerTrace: Error retrieving spans from ${url}`);
+    logger.error({err}, `getJaegerTrace: Error retrieving spans for traceId ${traceId}`);
   }
 };
 

lib/utils/storage-utils.js

@@ -1,42 +0,0 @@
-const { S3Client, PutObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3');
-
-async function testAwsS3(logger, opts) {
-  const s3 = new S3Client({
-    credentials: {
-      accessKeyId: opts.access_key_id,
-      secretAccessKey: opts.secret_access_key,
-    },
-    region: opts.region || 'us-east-1'
-  });
-
-  const input = {
-    'Body': 'Hello From Jambonz',
-    'Bucket': opts.name,
-    'Key': 'jambonz-sample.text'
-  };
-
-  const command = new PutObjectCommand(input);
-
-  await s3.send(command);
-}
-
-async function getS3Object(logger, opts) {
-  const s3 = new S3Client({
-    credentials: {
-      accessKeyId: opts.access_key_id,
-      secretAccessKey: opts.secret_access_key,
-    },
-    region: opts.region || 'us-east-1'
-  });
-  const command = new GetObjectCommand({
-    Bucket: opts.name,
-    Key: opts.key
-  });
-  const res = await s3.send(command);
-  return res.Body;
-}
-
-module.exports = {
-  testAwsS3,
-  getS3Object
-};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-api-server",
-  "version": "0.8.4",
+  "version": "v0.8.2",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -19,17 +19,15 @@
     "url": "https://github.com/jambonz/jambonz-api-server.git"
   },
   "dependencies": {
-    "@aws-sdk/client-transcribe": "^3.348.0",
-    "@aws-sdk/client-s3": "^3.348.0",
-    "@deepgram/sdk": "^1.21.0",
-    "@google-cloud/speech": "^5.2.0",
-    "@jambonz/db-helpers": "^0.9.0",
-    "@jambonz/realtimedb-helpers": "^0.8.6",
-    "@jambonz/speech-utils": "^0.0.15",
-    "@jambonz/time-series": "^0.2.7",
-    "@jambonz/verb-specifications": "^0.0.24",
-    "@jambonz/lamejs": "^1.2.2",
-    "@soniox/soniox-node": "^1.1.1",
+    "@aws-sdk/client-transcribe": "^3.290.0",
+    "@deepgram/sdk": "^1.10.2",
+    "@google-cloud/speech": "^5.1.0",
+    "@jambonz/db-helpers": "^0.7.8",
+    "@jambonz/realtimedb-helpers": "^0.7.1",
+    "@jambonz/speech-utils": "^0.0.12",
+    "@jambonz/time-series": "^0.2.5",
+    "@jambonz/verb-specifications": "^0.0.17",
+    "@soniox/soniox-node": "^1.1.0",
     "argon2": "^0.30.3",
     "bent": "^7.3.12",
     "cors": "^2.8.5",
@@ -51,9 +49,7 @@
     "stripe": "^8.222.0",
     "swagger-ui-express": "^4.4.0",
     "uuid": "^8.3.2",
-    "yamljs": "^0.3.0",
-    "ws": "^8.12.1",
-    "wav": "^1.0.2"
+    "yamljs": "^0.3.0"
   },
   "devDependencies": {
     "eslint": "^8.39.0",

test/accounts.js

@@ -14,7 +14,7 @@ const {
   createPhoneNumber, 
   deleteObjectBySid} = require('./utils');
 const logger = require('../lib/logger');
-const { addToSortedSet } = require('@jambonz/realtimedb-helpers')({
+const { pushBack } = require('@jambonz/realtimedb-helpers')({
   host: process.env.JAMBONES_REDIS_HOST,
   port: process.env.JAMBONES_REDIS_PORT || 6379
 }, logger);
@@ -168,33 +168,11 @@ test('account tests', async(t) => {
         queue_event_hook: {
           url: 'http://example.com/q',
           method: 'post'
-        },
-        record_all_calls: true,
-        record_format: 'wav',
-        bucket_credential: {
-          vendor: 'aws_s3',
-          region: 'us-east-1',
-          name: 'recordings',
-          access_key_id: 'access_key_id',
-          secret_access_key: 'secret access key'
         }
-        
       }
     });
     t.ok(result.statusCode === 204, 'successfully updated account using account level token');
 
-    /* verify that bucket credential is updated*/
-    result = await request.get(`/Accounts/${sid}`, {
-      auth: {bearer: accountLevelToken},
-      json: true,
-    });
-
-    t.ok(result.bucket_credential.vendor === 'aws_s3', 'bucket_vendor was updated');
-    t.ok(result.bucket_credential.name === 'recordings', 'bucket_name was updated');
-    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');
-
     /* verify that account level api key last_used was updated*/
     result = await request.get(`/Accounts/${sid}/ApiKeys`, {
       auth: {bearer: accountLevelToken},
@@ -290,8 +268,8 @@ test('account tests', async(t) => {
     t.ok(result.statusCode === 204, 'successfully deleted a call session limit for an account');
 
     /* query account queues */
-    await addToSortedSet(`queue:${sid}:test`, 'url1');
-    await addToSortedSet(`queue:${sid}:dummy`, 'url2');
+    await pushBack(`queue:${sid}:test`, 'url1');
+    await pushBack(`queue:${sid}:dummy`, 'url2');
 
     result = await request.get(`/Accounts/${sid}/Queues`, {
       auth: authAdmin,

test/applications.js

@@ -125,8 +125,7 @@ test('application tests', async(t) => {
               "X-Reason" : "maximum call duration exceeded"\
             }\
           }\
-        ]',
-        record_all_calls: true
+        ]'
       }
     });
     t.ok(result.statusCode === 204, 'successfully updated application');
@@ -139,7 +138,6 @@ test('application tests', async(t) => {
     t.ok(result.messaging_hook.url === 'http://example2.com/mms' , 'successfully updated messaging_hook');
     app_json = JSON.parse(result.app_json);
     t.ok(app_json[0].verb === 'hangup', 'successfully updated app_json from application')
-    t.ok(result.record_all_calls === 1, 'successfully updated record_all_calls from application')
 
     /* remove applications app_json*/
     result = await request.put(`/Applications/${sid}`, {

test/call-test.js

@@ -83,74 +83,4 @@ test('Create Call Success Without Synthesizer in Payload', async (t) => {
     }
   }).then(data => { t.ok(false, 'Create Call should not be success') })
     .catch(error => { t.ok(error.response.statusCode === 400, 'Call failed for no synthesizer') });
-});
-
-test("Create call with application sid and app_json", async(t) => {
-  const app = require('../app');
-
-  const service_provider_sid = await createServiceProvider(request, 'account3_has_synthesizer');
-  const account_sid = await createAccount(request, service_provider_sid, 'account3_has_synthesizer');
-
-  const token = jwt.sign({
-    account_sid,
-    scope: "account",
-    permissions: ["PROVISION_USERS", "PROVISION_SERVICES", "VIEW_ONLY"]
-  }, process.env.JWT_SECRET, { expiresIn: '1h' });
-  const authUser = { bearer: token };
-  const speech_sid = await createGoogleSpeechCredentials(request, account_sid, null, authUser, true, true);
-
-  // GIVEN
-/* add an application */
-
-const app_json = '[\
-  {\
-    "verb": "play",\
-    "url": "https://example.com/example.mp3",\
-    "timeoutSecs": 10,\
-    "seekOffset": 8000,\
-    "actionHook": "/play/action"\
-}\
-]';
-let result = await request.post('/Applications', {
-  resolveWithFullResponse: true,
-  auth: authUser,
-  json: true,
-  body: {
-    name: 'daveh',
-    account_sid,
-    call_hook: {
-      url: 'http://example.com'
-    },
-    call_status_hook: {
-      url: 'http://example.com/status',
-      method: 'POST'
-    },
-    messaging_hook: {
-      url: 'http://example.com/sms'
-    },
-    app_json
-  }
-});
-t.ok(result.statusCode === 201, 'successfully created application');
-const sid = result.body.sid;
-
-// WHEN
-result = await request.post(`/Accounts/${account_sid}/Calls`, {
-  resolveWithFullResponse: true,
-  auth: authUser,
-  json: true,
-  body: {
-    application_sid: sid,
-    from: "15083778299",
-    to: {
-      type: "phone",
-      number: "15089084809"
-    },
-  }
-});
-// THEN
-t.ok(result.statusCode === 201, 'successfully created Call without Synthesizer && application_sid');
-const fs_request = await getLastRequestFromFeatureServer('15083778299_createCall');
-const obj = JSON.parse(fs_request);
-t.ok(obj.body.app_json == app_json, 'app_json successfully added')
 });

test/clients.js

@@ -1,119 +0,0 @@
-const test = require('tape') ;
-const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
-const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
-  baseUrl: 'http://127.0.0.1:3000/v1'
-});
-
-
-process.on('unhandledRejection', (reason, p) => {
-  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-test('client test', async(t) => {
-  const app = require('../app');
-
-  try {
-    let result;
-    /* add a service provider */
-    result = await request.post('/ServiceProviders', {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      body: {
-        name: 'client_sp',
-      }
-    });
-    t.ok(result.statusCode === 201, 'successfully created client service provider');
-    const sp_sid = result.body.sid;
-
-    /* add an account */
-    result = await request.post('/Accounts', {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      body: {
-        name: 'sample_account',
-        service_provider_sid: sp_sid,
-        registration_hook: {
-          url: 'http://example.com/reg',
-          method: 'get'
-        },
-        webhook_secret: 'foobar'
-      }
-    });
-    t.ok(result.statusCode === 201, 'successfully created account');
-    const account_sid = result.body.sid;
-
-    /* add new entity */
-    result = await request.post('/Clients', {
-      resolveWithFullResponse: true,
-      auth: authAdmin,
-      json: true,
-      body: {
-        account_sid,
-        username: 'client1',
-        password: 'sdf12412',
-        is_active: 1
-      }
-    });
-    t.ok(result.statusCode === 201, 'successfully created Client');
-    const sid = result.body.sid;
-
-    /* query all entity */
-    result = await request.get('/Clients', {
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.length === 1 , 'successfully queried all Clients');
-
-    /* query one entity */
-    result = await request.get(`/Clients/${sid}`, {
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.account_sid === account_sid , 'successfully retrieved Client by sid');
-    t.ok(result.client_sid, 'successfully retrieved Client by sid');
-    t.ok(result.username ===  'client1', 'successfully retrieved Client by sid');
-    t.ok(result.is_active === 1 , 'successfully retrieved Client by sid');
-    t.ok(result.password === 'sXXXXXXX' , 'successfully retrieved Client by sid');
-
-    /* update the entity */
-    result = await request.put(`/Clients/${sid}`, {
-      auth: authAdmin,
-      json: true,
-      resolveWithFullResponse: true,
-      body: {
-        is_active: 0
-      }
-    });
-    t.ok(result.statusCode === 204, 'successfully updated Client');
-    /* query one entity */
-    result = await request.get(`/Clients/${sid}`, {
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.is_active === 0 , 'successfully updated Client');
-    t.ok(result.password === 'sXXXXXXX' , 'successfully retrieved Client by sid');
-
-    /* delete Client */
-    result = await request.delete(`/Clients/${sid}`, {
-      resolveWithFullResponse: true,
-      simple: false,
-      json: true,
-      auth: authAdmin
-    });
-    t.ok(result.statusCode === 204, 'successfully deleted Clients');
-
-    /* query all entity */
-    result = await request.get('/Clients', {
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.length === 0 , 'successfully queried all Clients');
-    
-  } catch (err) {
-    console.error(err);
-    t.end(err);
-  }
-})

test/index.js

@@ -23,6 +23,4 @@ require('./system-information');
 require('./lcr-carriers-set-entries');
 require('./lcr-routes');
 require('./lcrs');
-require('./tts-cache');
-require('./clients');
 require('./docker_stop');

test/recent-calls.js

@@ -76,30 +76,6 @@ test('recent calls tests', async(t) => {
       json: true,
     });
     t.ok(result.data.length === 5, 'retrieved 5 recent calls by account');
-
-    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&from=16`, {
-      auth: authUser,
-      json: true,
-    });
-    t.ok(result.data.length === 0, 'retrieved 5 recent calls by account and from');
-
-    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&from=15`, {
-      auth: authUser,
-      json: true,
-    });
-    t.ok(result.data.length === 5, 'retrieved 5 recent calls by account and from');
-
-    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&to=19`, {
-      auth: authUser,
-      json: true,
-    });
-    t.ok(result.data.length === 0, 'retrieved 5 recent calls by account and to');
-
-    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&to=18`, {
-      auth: authUser,
-      json: true,
-    });
-    t.ok(result.data.length === 5, 'retrieved 5 recent calls by account and to');
     //console.log({data: result.data}, 'Account recent calls');
 
     /* query last 7 days by service provider */
@@ -108,30 +84,6 @@ test('recent calls tests', async(t) => {
       json: true,
     });
     t.ok(result.data.length === 5, 'retrieved 5 recent calls by service provider');
-
-    result = await request.get(`/ServiceProviders/${service_provider_sid}/RecentCalls?page=1&count=25&from=16`, {
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.data.length === 0, 'retrieved 5 recent calls by service provider and from');
-
-    result = await request.get(`/ServiceProviders/${service_provider_sid}/RecentCalls?page=1&count=25&from=15`, {
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.data.length === 5, 'retrieved 5 recent calls by service provider and from');
-
-    result = await request.get(`/ServiceProviders/${service_provider_sid}/RecentCalls?page=1&count=25&to=19`, {
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.data.length === 0, 'retrieved 5 recent calls by service provider and to');
-
-    result = await request.get(`/ServiceProviders/${service_provider_sid}/RecentCalls?page=1&count=25&to=18`, {
-      auth: authAdmin,
-      json: true,
-    });
-    t.ok(result.data.length === 5, 'retrieved 5 recent calls by service provider and to');
     //console.log({data: result.data}, 'SP recent calls');
 
     /* pull sip traces and pcap from homer */

test/sip-gateways.js

@@ -27,8 +27,7 @@ test('sip gateway tests', async(t) => {
         ipv4: '192.168.1.1',
         netmask: 32,
         inbound: true,
-        outbound: true,
-        protocol: 'tcp'
+        outbound: true
       }
     });
     t.ok(result.statusCode === 201, 'successfully created sip gateway ');
@@ -49,7 +48,6 @@ test('sip gateway tests', async(t) => {
     });
     //console.log(`result: ${JSON.stringify(result)}`);
     t.ok(result.ipv4 === '192.168.1.1' , 'successfully retrieved voip carrier by sid');
-    t.ok(result.protocol === 'tcp' , 'successfully retrieved voip carrier by sid');
 
 
     /* update sip gateway */
@@ -60,8 +58,7 @@ test('sip gateway tests', async(t) => {
       body: {
         port: 5061,
         netmask:24,
-        outbound: false,
-        protocol: 'udp'
+        outbound: false
       }
     });
     t.ok(result.statusCode === 204, 'successfully updated voip carrier');

test/tts-cache.js

@@ -1,56 +0,0 @@
-const test = require('tape') ;
-const jwt = require('jsonwebtoken');
-const ADMIN_TOKEN = '38700987-c7a4-4685-a5bb-af378f9734de';
-const authAdmin = {bearer: ADMIN_TOKEN};
-const request = require('request-promise-native').defaults({
-  baseUrl: 'http://127.0.0.1:3000/v1'
-});
-const crypto = require('crypto');
-const logger = require('../lib/logger');
-
-const {
-  client,
-} = require('@jambonz/speech-utils')({
-  host: process.env.JAMBONES_REDIS_HOST,
-  port: process.env.JAMBONES_REDIS_PORT || 6379
-}, logger);
-
-function makeSynthKey({account_sid = '', vendor, language, voice, engine = '', text}) {
-  const hash = crypto.createHash('sha1');
-  hash.update(`${language}:${vendor}:${voice}:${engine}:${text}`);
-  return `tts${account_sid ? (':' + account_sid) : ''}:${hash.digest('hex')}`;
-}
-
-test('tts-cache', async(t) => {
-  const app = require('../app');
-  try {
-    // 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);
-    }
-
-    let result = await request.get('/TtsCache', {
-      auth: authAdmin,
-      json: true,
-    });
-
-    t.ok(result.size === minRecords, 'get cache correctly');
-
-    result = await request.delete('/TtsCache', {
-      auth: authAdmin,
-      resolveWithFullResponse: true,
-    });
-    t.ok(result.statusCode === 204, 'successfully deleted application after removing phone number');
-
-    result = await request.get('/TtsCache', {
-      auth: authAdmin,
-      json: true,
-    });
-
-    t.ok(result.size === 0, 'deleted cache successfully');
-  } catch(err) {
-    console.error(err);
-    t.end(err);
-  }
-});