fix custom speech cannot update urls (#199)

Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) to 4.2.5 and updates ancestor dependencies [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser), [@aws-sdk/client-transcribe](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-transcribe), [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-s3) and [@aws-sdk/client-polly](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-polly). These dependencies need to be updated together.


Updates `fast-xml-parser` from 4.2.4 to 4.2.5
- [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases)
- [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.2.4...v4.2.5)

Updates `@aws-sdk/client-transcribe` from 3.348.0 to 3.359.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-transcribe/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.359.0/clients/client-transcribe)

Updates `@aws-sdk/client-s3` from 3.348.0 to 3.359.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.359.0/clients/client-s3)

Updates `@aws-sdk/client-polly` from 3.348.0 to 3.359.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-polly/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.359.0/clients/client-polly)

---
updated-dependencies:
- dependency-name: fast-xml-parser
  dependency-type: indirect
- dependency-name: "@aws-sdk/client-transcribe"
  dependency-type: direct:production
- dependency-name: "@aws-sdk/client-s3"
  dependency-type: direct:production
- dependency-name: "@aws-sdk/client-polly"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

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/routes/api/recent-calls.js

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

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/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

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.25",
     "@jambonz/lamejs": "^1.2.2",
     "@soniox/soniox-node": "^1.1.1",
     "argon2": "^0.30.3",

test/recent-calls.js

@@ -77,25 +77,25 @@ test('recent calls tests', async(t) => {
     });
     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`, {
+    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&filter=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=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`, {
+    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&filter=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`, {
+    result = await request.get(`/Accounts/${account_sid}/RecentCalls?page=1&count=25&filter=18`, {
       auth: authUser,
       json: true,
     });
@@ -109,25 +109,25 @@ 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`, {
+    result = await request.get(`/ServiceProviders/${service_provider_sid}/RecentCalls?page=1&count=25&filter=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=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`, {
+    result = await request.get(`/ServiceProviders/${service_provider_sid}/RecentCalls?page=1&count=25&filter=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=18`, {
       auth: authAdmin,
       json: true,
     });

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