fix record format (#210)

* fix record format

* fix assert require

* fix assert require

db/upgrade-jambonz-db.js

@@ -157,7 +157,8 @@ const sql = {
     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)'
+    'ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid)',
+    'ALTER TABLE sip_gateways ADD COLUMN protocol ENUM(\'udp\',\'tcp\',\'tls\', \'tls/srtp\') DEFAULT \'udp\''
   ]
 };
 

lib/logger.js

@@ -1,11 +1,7 @@
-const opts = Object.assign({
-  timestamp: () => {
-    return `, "time": "${new Date().toISOString()}"`;
-  }
-}, {
+const opts = {
   level: process.env.JAMBONES_LOGLEVEL || 'info'
-});
-
-const logger = require('pino')(opts);
+};
+const pino = require('pino');
+const logger = pino(opts, pino.destination(1, {sync: false}));
 
 module.exports = logger;

lib/models/account.js

@@ -34,7 +34,7 @@ AND effective_end_date IS NULL
 AND pending=0`;
 
 const updatePaymentInfoSql = `UPDATE account_subscriptions 
-SET last4 = ?, exp_month = ?, exp_year = ?, card_type = ? 
+SET last4 = ?, stripe_payment_method_id=?, exp_month = ?, exp_year = ?, card_type = ? 
 WHERE account_sid = ? 
 AND effective_end_date IS NULL`;
 
@@ -206,10 +206,10 @@ class Account extends Model {
   }
 
   static async updatePaymentInfo(logger, account_sid, pm) {
-    const {card} = pm;
+    const {id, card} = pm;
     const last4_encrypted = encrypt(card.last4);
     await promisePool.execute(updatePaymentInfoSql,
-      [last4_encrypted, card.exp_month, card.exp_year, card.brand, account_sid]);
+      [last4_encrypted, id, card.exp_month, card.exp_year, card.brand, account_sid]);
   }
 
   static async provisionPendingSubscription(logger, account_sid, products, payment_method, subscription_id) {

lib/record/google-storage.js

@@ -0,0 +1,41 @@
+const { Storage } = require('@google-cloud/storage');
+const { Writable } = require('stream');
+
+class GoogleStorageUploadStream extends Writable {
+
+  constructor(logger, opts) {
+    super(opts);
+    this.logger = logger;
+    this.metadata = opts.metadata;
+
+    const storage = new Storage(opts.bucketCredential);
+    this.gcsFile = storage.bucket(opts.bucketName).file(opts.Key);
+    this.writeStream = this.gcsFile.createWriteStream();
+
+    this.writeStream.on('error', (err) => this.logger.error(err));
+    this.writeStream.on('finish', () => {
+      this.logger.info('google storage Upload completed.');
+      this._addMetadata();
+    });
+  }
+
+  _write(chunk, encoding, callback) {
+    this.writeStream.write(chunk, encoding, callback);
+  }
+
+  _final(callback) {
+    this.writeStream.end();
+    this.writeStream.once('finish', callback);
+  }
+
+  async _addMetadata() {
+    try {
+      await this.gcsFile.setMetadata({metadata: this.metadata});
+      this.logger.info('Google storage Upload and metadata setting completed.');
+    } catch (err) {
+      this.logger.error(err, 'Google storage  An error occurred while setting metadata');
+    }
+  }
+}
+
+module.exports = GoogleStorageUploadStream;

lib/record/index.js

@@ -1,17 +1,6 @@
 
-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();
-  }
+async function record(logger, socket) {
+  return require('./upload')(logger, socket);
 }
 
 module.exports = record;

lib/record/upload.js

@@ -1,8 +1,8 @@
 const Account = require('../models/account');
 const Websocket = require('ws');
 const PCMToMP3Encoder = require('./encoder');
-const S3MultipartUploadStream = require('./s3-multipart-upload-stream');
 const wav = require('wav');
+const { getUploader } = require('./utils');
 
 async function upload(logger, socket) {
 
@@ -43,23 +43,15 @@ async function upload(logger, socket) {
           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);
+          const uploadStream = getUploader(Key, metadata, obj, logger);
+          if (!uploadStream) {
+            logger.info('There is no available record uploader, close the socket.');
+            socket.close();
+          }
 
           /**encoder */
           let encoder;
-          if (obj.output_format === 'wav') {
+          if (obj.record_format === 'wav') {
             encoder = new wav.Writer({ channels: 2, sampleRate, bitDepth: 16 });
           } else {
             // default is mp3

lib/record/utils.js

@@ -0,0 +1,40 @@
+const GoogleStorageUploadStream = require('./google-storage');
+const S3MultipartUploadStream = require('./s3-multipart-upload-stream');
+
+const getUploader = (Key, metadata, bucket_credential, logger) => {
+  const uploaderOpts = {
+    bucketName: bucket_credential.name,
+    Key,
+    metadata
+  };
+  switch (bucket_credential.vendor) {
+    case 'aws_s3':
+      uploaderOpts.bucketCredential = {
+        credentials: {
+          accessKeyId: bucket_credential.access_key_id,
+          secretAccessKey: bucket_credential.secret_access_key,
+        },
+        region: bucket_credential.region || 'us-east-1'
+      };
+      return new S3MultipartUploadStream(logger, uploaderOpts);
+    case 'google':
+      const serviceKey = JSON.parse(bucket_credential.service_key);
+      uploaderOpts.bucketCredential = {
+        projectId: serviceKey.project_id,
+        credentials: {
+          client_email: serviceKey.client_email,
+          private_key: serviceKey.private_key
+        }
+      };
+      return new GoogleStorageUploadStream(logger, uploaderOpts);
+
+    default:
+      logger.error(`unknown bucket vendor: ${bucket_credential.vendor}`);
+      break;
+  }
+  return null;
+};
+
+module.exports = {
+  getUploader
+};

lib/routes/api/accounts.js

@@ -1,7 +1,7 @@
 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 +23,8 @@ 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 { encrypt } = require('../../utils/encrypt-decrypt');
+const { testAwsS3, testGoogleStorage } = require('../../utils/storage-utils');
 const translator = short();
 
 let idx = 0;
@@ -216,8 +216,8 @@ function validateUpdateCall(opts) {
     throw new DbErrorBadRequest('invalid conf_mute_status');
   }
   if (opts.sip_request &&
-    (!opts.sip_request.method && !opts.sip_request.content_type ||  !opts.sip_request.content_type)) {
-    throw new DbErrorBadRequest('sip_request requires content_type and content properties');
+    (!opts.sip_request.method || !opts.sip_request.content_type ||  !opts.sip_request.content)) {
+    throw new DbErrorBadRequest('sip_request requires method, content_type and content properties');
   }
   if (opts.record && !opts.record.action) {
     throw new DbErrorBadRequest('record requires action property');
@@ -541,7 +541,8 @@ function encryptBucketCredential(obj) {
     name,
     access_key_id,
     secret_access_key,
-    tags
+    tags,
+    service_key
   } = obj.bucket_credential;
 
   switch (vendor) {
@@ -554,6 +555,11 @@ function encryptBucketCredential(obj) {
         secret_access_key, tags});
       obj.bucket_credential = encrypt(awsData);
       break;
+    case 'google':
+      assert(service_key, 'invalid aws S3 bucket credential: service_key is required');
+      const googleData = JSON.stringify({vendor, name, service_key, tags});
+      obj.bucket_credential = encrypt(googleData);
+      break;
     case 'none':
       obj.bucket_credential = null;
       break;
@@ -708,35 +714,20 @@ router.post('/:sid/BucketCredentialTest', async(req, res) => {
   try {
     const account_sid = parseAccountSid(req);
     await validateRequest(req, account_sid);
-    let {vendor, name, region, access_key_id, secret_access_key} = req.body;
+    const {vendor, name, region, access_key_id, secret_access_key, service_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;
+      case 'google':
+        await testGoogleStorage(logger, {vendor, name, service_key});
+        ret.status = 'ok';
+        break;
       default:
         throw new DbErrorBadRequest(`Does not support test for ${vendor}`);
     }

lib/routes/api/forgot-password.js

@@ -6,6 +6,7 @@ const {validateEmail, emailSimpleText} = require('../../utils/email-utils');
 const {promisePool} = require('../../db');
 const {cacheClient} = require('../../helpers');
 const sysError = require('../error');
+const assert = require('assert');
 const sql = `SELECT * from users user 
 LEFT JOIN accounts AS acc 
 ON acc.account_sid = user.account_sid 
@@ -26,7 +27,8 @@ function createOauthEmailText(provider) {
 }
 
 function createResetEmailText(link) {
-  const baseUrl = 'http://localhost:3001';
+  assert(process.env.JAMBONZ_BASE_URL, 'process.env.JAMBONZ_BASE_URL is missing');
+  const baseUrl = process.env.JAMBONZ_BASE_URL;
 
   return `Hi there!
 

lib/routes/api/recent-calls.js

@@ -4,7 +4,7 @@ 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 { getS3Object, getGoogleStorageObject } = require('../../utils/storage-utils');
 
 const parseAccountSid = (url) => {
   const arr = /Accounts\/([^\/]*)/.exec(url);
@@ -22,7 +22,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, filter} = 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 +37,7 @@ router.get('/', async(req, res) => {
         answered,
         start: days ? undefined : start,
         end: days ? undefined : end,
-        from,
-        to
+        filter
       });
       res.status(200).json(data);
     }
@@ -53,8 +52,7 @@ router.get('/', async(req, res) => {
         answered,
         start: days ? undefined : start,
         end: days ? undefined : end,
-        from,
-        to
+        filter
       });
       res.status(200).json(data);
     }
@@ -126,22 +124,26 @@ router.get('/:call_sid/record/:year/:month/:day/:format', async(req, res) => {
     const r = await Account.retrieve(account_sid);
     if (r.length === 0 || !r[0].bucket_credential) return res.sendStatus(404);
     const {bucket_credential} = r[0];
+    const getOptions  = {
+      ...bucket_credential,
+      key: `${year}/${month}/${day}/${call_sid}.${format || 'mp3'}`
+    };
+    let stream;
     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);
+        stream = await getS3Object(logger, getOptions);
+        break;
+      case 'google':
+        stream = await getGoogleStorageObject(logger, getOptions);
         break;
       default:
         logger.error(`There is no handler for fetching record from ${bucket_credential.vendor}`);
         return res.sendStatus(500);
     }
+    res.set({
+      'Content-Type': `audio/${format || 'mp3'}`
+    });
+    stream.pipe(res);
   }  catch (err) {
     logger.error({err}, ` error retrieving recording ${call_sid}`);
     res.sendStatus(404);

lib/routes/api/register.js

@@ -16,8 +16,9 @@ const insertUserSql = `INSERT into users
 (user_sid, account_sid, name, email, provider, provider_userid, email_validated) 
 values (?, ?, ?, ?, ?, ?, 1)`;
 const insertUserLocalSql = `INSERT into users 
-(user_sid, account_sid, name, email, email_activation_code, email_validated, provider, hashed_password) 
-values (?, ?, ?, ?, ?, 0, 'local', ?)`;
+(user_sid, account_sid, name, email, email_activation_code, email_validated, provider,
+hashed_password, service_provider_sid) 
+values (?, ?, ?, ?, ?, 0, 'local', ?, ?)`;
 const insertAccountSql = `INSERT into accounts 
 (account_sid, service_provider_sid, name, is_active, webhook_secret, trial_end_date) 
 values (?, ?, ?, ?, ?, CURDATE() + INTERVAL 21 DAY)`;
@@ -36,7 +37,7 @@ const insertSignupHistorySql = `INSERT into signup_history
 values (?, ?)`;
 
 const addLocalUser = async(logger, user_sid, account_sid,
-  name, email, email_activation_code, passwordHash) => {
+  name, email, email_activation_code, passwordHash, service_provider_sid) => {
   const [r] = await promisePool.execute(insertUserLocalSql,
     [
       user_sid,
@@ -44,7 +45,8 @@ const addLocalUser = async(logger, user_sid, account_sid,
       name,
       email,
       email_activation_code,
-      passwordHash
+      passwordHash,
+      service_provider_sid
     ]);
   debug({r}, 'Result from adding user');
 };
@@ -145,7 +147,7 @@ router.post('/', async(req, res) => {
       const user = await doGithubAuth(logger, req.body);
       logger.info({user}, 'retrieved user details from github');
       Object.assign(userProfile, {
-        name: user.name,
+        name: user.email,
         email: user.email,
         email_validated: user.email_validated,
         avatar_url: user.avatar_url,
@@ -157,7 +159,7 @@ router.post('/', async(req, res) => {
       const user = await doGoogleAuth(logger, req.body);
       logger.info({user}, 'retrieved user details from google');
       Object.assign(userProfile, {
-        name: user.name || user.email,
+        name: user.email || user.email,
         email: user.email,
         email_validated: user.verified_email,
         picture: user.picture,
@@ -170,7 +172,7 @@ router.post('/', async(req, res) => {
       logger.info({user}, 'retrieved user details for local provider');
       debug({user}, 'retrieved user details for local provider');
       Object.assign(userProfile, {
-        name: user.name,
+        name: user.email,
         email: user.email,
         provider: 'local',
         email_activation_code: user.email_activation_code
@@ -280,7 +282,8 @@ router.post('/', async(req, res) => {
         const passwordHash = await generateHashedPassword(req.body.password);
         debug(`hashed password: ${passwordHash}`);
         await addLocalUser(logger, userProfile.user_sid, userProfile.account_sid,
-          userProfile.name, userProfile.email, userProfile.email_activation_code, passwordHash);
+          userProfile.name, userProfile.email, userProfile.email_activation_code,
+          passwordHash, req.body.service_provider_sid);
         debug('added local user');
       }
       else {
@@ -327,7 +330,7 @@ router.post('/', async(req, res) => {
 
         await addLocalUser(logger, userProfile.user_sid, userProfile.account_sid,
           userProfile.name, userProfile.email, userProfile.email_activation_code,
-          passwordHash);
+          passwordHash, req.body.service_provider_sid);
 
         /* note: we deactivate the old user once the new email is validated */
       }
@@ -349,6 +352,8 @@ router.post('/', async(req, res) => {
     const token = jwt.sign({
       user_sid: userProfile.user_sid,
       account_sid: userProfile.account_sid,
+      service_provider_sid: req.body.service_provider_sid,
+      scope: 'account',
       email: userProfile.email,
       name: userProfile.name
     }, process.env.JWT_SECRET, { expiresIn });

lib/routes/api/sbcs.js

@@ -28,20 +28,13 @@ router.get('/', async(req, res) => {
 
     if (req.user.hasAccountAuth) {
       const [r] = await promisePool.query('SELECT * from accounts WHERE account_sid = ?', req.user.account_sid);
-      if (0 === r.length) throw new Error('invalid account_sid');
+      if (0 === r.length) throw new DbErrorBadRequest('invalid account_sid');
 
       service_provider_sid = r[0].service_provider_sid;
     }
 
     if (req.user.hasServiceProviderAuth) {
-      const [r] = await promisePool.query(
-        'SELECT * from service_providers where service_provider_sid = ?',
-        service_provider_sid);
-      if (0 === r.length) throw new Error('invalid account_sid');
-
-      service_provider_sid = r[0].service_provider_sid;
-
-      if (!service_provider_sid) throw new DbErrorBadRequest('missing service_provider_sid in query');
+      service_provider_sid = req.user.service_provider_sid;
     }
 
     /** generally, we have a global set of SBCs that all accounts use.

lib/routes/api/speech-credentials.js

@@ -478,7 +478,9 @@ router.put('/:sid', async(req, res) => {
           use_custom_tts,
           custom_tts_endpoint,
           use_custom_stt,
-          custom_stt_endpoint
+          custom_stt_endpoint,
+          custom_stt_url,
+          custom_tts_url
         } = req.body;
 
         const newCred = {
@@ -494,7 +496,9 @@ router.put('/:sid', async(req, res) => {
           tts_region,
           riva_server_uri,
           nuance_stt_uri,
-          nuance_tts_uri
+          nuance_tts_uri,
+          custom_stt_url,
+          custom_tts_url
         };
         logger.info({o, newCred}, 'updating speech credential with this new credential');
         obj.credential = encryptCredential(newCred);

lib/routes/api/users.js

@@ -338,8 +338,8 @@ router.put('/:user_sid', async(req, res) => {
   //if (req.user.user_sid && req.user.user_sid !== user_sid) return res.sendStatus(403);
 
   if (!hasAdminAuth &&
-  !(hasAccountAuth && req.user.account_sid === user[0].account_sid) &&
-  !(hasServiceProviderAuth && req.user.service_provider_sid === user[0].service_provider_sid) &&
+  !(hasAccountAuth && user[0] && req.user.account_sid === user[0].account_sid) &&
+  !(hasServiceProviderAuth && user[0] && req.user.service_provider_sid === user[0].service_provider_sid) &&
   (req.user.user_sid && req.user.user_sid !== user_sid)) {
     return res.sendStatus(403);
   }

lib/swagger/swagger.yaml

@@ -3047,17 +3047,11 @@ paths:
             - inbound
             - outbound
       - in: query
-        name: from
+        name: filter
         required: false
         schema:
           type: string
-        description: calling number to retrieve
-      - in: query
-        name: to
-        required: false
-        schema:
-          type: string
-        description: called number to retrieve
+        description: Filter value can be caller ID, callee ID or call Sid
     get:
       tags:
         - Accounts

lib/utils/email-utils.js

@@ -47,13 +47,15 @@ const sendEmailByCustomVendor = async(logger, from, to, subject, text) => {
 };
 
 const sendEmailByMailgun = async(logger, from, to, subject, text) => {
-  const mg = mailgun.client({
-    username: 'api',
-    key: process.env.MAILGUN_API_KEY
-  });
   if (!process.env.MAILGUN_API_KEY) throw new Error('MAILGUN_API_KEY env variable is not defined!');
   if (!process.env.MAILGUN_DOMAIN) throw new Error('MAILGUN_DOMAIN env variable is not defined!');
 
+  const mg = mailgun.client({
+    username: 'api',
+    key: process.env.MAILGUN_API_KEY,
+    ...(process.env.MAILGUN_URL && {url: process.env.MAILGUN_URL})
+  });
+
   try {
     const res = await mg.messages.create(process.env.MAILGUN_DOMAIN, {
       from,

lib/utils/free_plans.json

@@ -2,7 +2,7 @@
   "trial": [
     {
       "category": "voice_call_session",
-      "quantity": 20
+      "quantity": 5
     },
     {
       "category": "device",

lib/utils/jambonz-sample.text

@@ -0,0 +1 @@
+Hello From Jambonz. This file was created because Record all call bucket credential test.

lib/utils/storage-utils.js

@@ -1,4 +1,42 @@
 const { S3Client, PutObjectCommand, GetObjectCommand } = require('@aws-sdk/client-s3');
+const {Storage} = require('@google-cloud/storage');
+const fs = require('fs');
+
+function testGoogleStorage(logger, opts) {
+  return new Promise((resolve, reject) => {
+    const serviceKey = JSON.parse(opts.service_key);
+    const storage = new Storage({
+      projectId: serviceKey.project_id,
+      credentials: {
+        client_email: serviceKey.client_email,
+        private_key: serviceKey.private_key
+      },
+    });
+
+    const blob = storage.bucket(opts.name).file('jambonz-sample.text');
+
+    fs.createReadStream(`${__dirname}/jambonz-sample.text`)
+      .pipe(blob.createWriteStream())
+      .on('error', (err) => reject(err))
+      .on('finish', () => resolve());
+  });
+}
+
+async function getGoogleStorageObject(logger, opts) {
+  const serviceKey = JSON.parse(opts.service_key);
+  const storage = new Storage({
+    projectId: serviceKey.project_id,
+    credentials: {
+      client_email: serviceKey.client_email,
+      private_key: serviceKey.private_key
+    },
+  });
+
+  const bucket = storage.bucket(opts.name);
+  const file = bucket.file(opts.key);
+
+  return file.createReadStream();
+}
 
 async function testAwsS3(logger, opts) {
   const s3 = new S3Client({
@@ -38,5 +76,7 @@ async function getS3Object(logger, opts) {
 
 module.exports = {
   testAwsS3,
-  getS3Object
+  getS3Object,
+  testGoogleStorage,
+  getGoogleStorageObject
 };

package.json

@@ -19,15 +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",
+    "@aws-sdk/client-transcribe": "^3.363.0",
+    "@aws-sdk/client-s3": "^3.363.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/time-series": "^0.2.8",
+    "@jambonz/verb-specifications": "^0.0.26",
     "@jambonz/lamejs": "^1.2.2",
     "@soniox/soniox-node": "^1.1.1",
     "argon2": "^0.30.3",
@@ -40,7 +40,7 @@
     "helmet": "^5.1.0",
     "ibm-watson": "^7.1.2",
     "jsonwebtoken": "^9.0.0",
-    "mailgun.js": "^3.7.3",
+    "mailgun.js": "^9.1.2",
     "microsoft-cognitiveservices-speech-sdk": "^1.24.1",
     "mysql2": "^2.3.3",
     "nocache": "3.0.4",
@@ -53,7 +53,8 @@
     "uuid": "^8.3.2",
     "yamljs": "^0.3.0",
     "ws": "^8.12.1",
-    "wav": "^1.0.2"
+    "wav": "^1.0.2",
+    "@google-cloud/storage" : "^6.12.0"
   },
   "devDependencies": {
     "eslint": "^8.39.0",

test/recent-calls.js

@@ -75,32 +75,29 @@ test('recent calls tests', async(t) => {
       auth: authUser,
       json: true,
     });
+    console.log(JSON.stringify(result));
     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`, {
+    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&filter=1508`, {
       auth: authUser,
       json: true,
     });
+    console.log(JSON.stringify(result));
     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`, {
+    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&filter=15080`, {
       auth: authUser,
       json: true,
     });
-    t.ok(result.data.length === 0, 'retrieved 5 recent calls by account and to');
+    console.log(JSON.stringify(result));
+    t.ok(result.data.length === 0, 'retrieved 0 recent calls by account and non-matching from');
 
-    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&to=18`, {
+    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&filter=1888`, {
       auth: authUser,
       json: true,
     });
+    console.log(JSON.stringify(result));
     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 */
     result = await request.get(`/ServiceProviders/${service_provider_sid}/RecentCalls?page=1&count=25`, {
@@ -109,29 +106,18 @@ test('recent calls tests', async(t) => {
     });
     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`, {
+    result = await request.get(`/ServiceProviders/${service_provider_sid}/RecentCalls?page=1&count=25&filter=1508`, {
       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`, {
+    result = await request.get(`/ServiceProviders/${service_provider_sid}/RecentCalls?page=1&count=25&filter=1888`, {
       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/sbcs.js

@@ -17,6 +17,37 @@ test('sbc_addresses tests', async(t) => {
     let result;
     const service_provider_sid = await createServiceProvider(request);
 
+    /* add service_provider user */
+    const sp_name = 'sbc_service_provider';
+    const sp_password = 'password';
+    result = await request.post(`/Users`, {
+      resolveWithFullResponse: true,
+      json: true,
+      auth: authAdmin,
+      body: {
+        name: sp_name,
+        email: 'sbc_sp@jambonz.com',
+        is_active: true,
+        force_change: false,
+        initial_password: sp_password,
+        service_provider_sid,
+      }
+    });
+    t.ok(result.statusCode === 201 && result.body.user_sid, 'SBC service_provider scope user created');
+    const sbc_sp_user_sid = result.body.user_sid;
+
+    result = await request.post('/login', {
+      resolveWithFullResponse: true,
+      json: true,
+      body: {
+        username: sp_name,
+        password: sp_password,  
+      }
+    });
+    t.ok(result.statusCode === 200 && result.body.token, 'successfully logged in as sbc user');
+    const authSbcSp = {bearer: result.body.token};
+
+
     /* add a service provider sbc */
     result = await request.post('/Sbcs', {
       resolveWithFullResponse: true,
@@ -38,6 +69,20 @@ test('sbc_addresses tests', async(t) => {
     //console.log(result.body)
     t.ok(result.body.length === 1 && result.body[0].ipv4 === '192.168.1.4', 'successfully retrieved service provider sbc');
 
+    result = await request.get('/Sbcs', {
+      resolveWithFullResponse: true,
+      auth: authSbcSp,
+      json: true
+    });
+    //console.log(result.body)
+    t.ok(result.body.length === 1 && result.body[0].ipv4 === '192.168.1.4', 'successfully retrieved service provider sbc');
+
+    await request.delete(`/Users/${sbc_sp_user_sid}`, {
+      resolveWithFullResponse: true,
+      json: true,
+      auth: authAdmin,
+    });
+
     await deleteObjectBySid(request, '/Sbcs', sid);
     await deleteObjectBySid(request, '/ServiceProviders', service_provider_sid);