fix parse aws response

lib/call-session.js

@@ -64,7 +64,6 @@ class CallSession extends Emitter {
     this.application_sid = req.locals.application_sid;
     this.account_sid = req.locals.account_sid;
     this.service_provider_sid = req.locals.service_provider_sid;
-    this.srsClients = [];
   }
 
   get isFromMSTeams() {
@@ -318,7 +317,10 @@ class CallSession extends Emitter {
       this.activeCallIds.delete(callId);
       if (dlg.other && dlg.other.connected) dlg.other.destroy().catch((e) => {});
 
-      this._stopRecording();
+      if (this.srsClient) {
+        this.srsClient.stop();
+        this.srsClient = null;
+      }
 
       this.srf.endSession(this.req);
     });
@@ -327,13 +329,6 @@ class CallSession extends Emitter {
     dlg.on('modify', this._onReinvite.bind(this, dlg));
   }
 
-  _stopRecording() {
-    if (this.srsClients.length) {
-      this.srsClients.forEach((c) => c.stop());
-      this.srsClients = [];
-    }
-  }
-
   _setHandlers({uas, uac}) {
     this.emit('connected');
     const callStart = Date.now();
@@ -417,7 +412,10 @@ class CallSession extends Emitter {
         dlg.other = null;
         other.other = null;
 
-        this._stopRecording();
+        if (this.srsClient) {
+          this.srsClient.stop();
+          this.srsClient = null;
+        }
 
         this.logger.info(`call ended with normal termination, there are ${this.activeCallIds.size} active`);
         this.srf.endSession(this.req);
@@ -691,7 +689,6 @@ Duration=${payload.duration} `
             const to = this.req.getParsedHeader('To');
             const aorFrom = from.uri;
             const aorTo = to.uri;
-            const headers = contentType === 'application/json' && req.body ? JSON.parse(req.body) : {};
             this.logger.info({to, from}, 'startCallRecording request for a call');
 
             const srsUrl = req.get('X-Srs-Url');
@@ -699,7 +696,7 @@ Duration=${payload.duration} `
             const callSid = req.get('X-Call-Sid');
             const accountSid = req.get('X-Account-Sid');
             const applicationSid = req.get('X-Application-Sid');
-            if (this.srsClients.length) {
+            if (this.srsClient) {
               res.send(400);
               this.logger.info('discarding duplicate startCallRecording request for a call');
               return;
@@ -709,14 +706,13 @@ Duration=${payload.duration} `
               res.send(400);
               return;
             }
-            const arr = srsUrl.split(',');
-            this.srsClients = arr.map((url) => new SrsClient(this.logger, {
+            this.srsClient = new SrsClient(this.logger, {
               srf: dlg.srf,
               direction: 'inbound',
               originalInvite: this.req,
               callingNumber: this.req.callingNumber,
               calledNumber: this.req.calledNumber,
-              srsUrl: url,
+              srsUrl,
               srsRecordingId,
               callSid,
               accountSid,
@@ -731,51 +727,42 @@ Duration=${payload.duration} `
               del: this.del,
               blockMedia: this.blockMedia,
               unblockMedia: this.unblockMedia,
-              unsubscribe: this.unsubscribe,
-              headers
-            }));
+              unsubscribe: this.unsubscribe
+            });
             try {
-              succeeded = (await Promise.all(
-                this.srsClients.map((c) => c.start())
-              )).every((r) => r);
+              succeeded = await this.srsClient.start();
             } catch (err) {
               this.logger.error({err}, 'Error starting SipRec call recording');
             }
           }
           else if (reason === 'stopCallRecording') {
-            if (!this.srsClients.length) {
+            if (!this.srsClient) {
               res.send(400);
               this.logger.info('discarding stopCallRecording request because we are not recording');
               return;
             }
             try {
-              succeeded = (await Promise.all(
-                this.srsClients.map((c) => c.stop())
-              )).every((r) => r);
+              succeeded = await this.srsClient.stop();
             } catch (err) {
               this.logger.error({err}, 'Error stopping SipRec call recording');
             }
-            this.srsClients = [];
+            this.srsClient = null;
           }
           else if (reason === 'pauseCallRecording') {
-            if (!this.srsClients.length || this.srsClients.every((c) => c.paused)) {
+            if (!this.srsClient || this.srsClient.paused) {
               this.logger.info('discarding invalid pauseCallRecording request');
               res.send(400);
               return;
             }
-            succeeded = (await Promise.all(
-              this.srsClients.map((c) => c.pause())
-            )).every((r) => r);
+            succeeded = await this.srsClient.pause();
           }
           else if (reason === 'resumeCallRecording') {
-            if (!this.srsClients.length || !this.srsClients.every((c) => c.paused)) {
+            if (!this.srsClient || !this.srsClient.paused) {
               res.send(400);
               this.logger.info('discarding invalid resumeCallRecording request');
               return;
             }
-            succeeded = (await Promise.all(
-              this.srsClients.map((c) => c.resume())
-            )).every((r) => r);
+            succeeded = await this.srsClient.resume();
           }
           res.send(succeeded ? 200 : 503);
         }
@@ -828,8 +815,8 @@ Duration=${payload.duration} `
         res.send(response.status, {headers: responseHeaders, body: response.body});
       }
     } catch (err) {
-      if (this.srsClients.length) {
-        this.srsClients = [];
+      if (this.srsClient) {
+        this.srsClient = null;
       }
       res.send(500);
       this.logger.info({err}, `Error handing INFO request on ${dlg.type} leg`);
@@ -904,7 +891,6 @@ Duration=${payload.duration} `
       this.uac = uac;
       uac.other = this.uas;
       this.uas.other = uac;
-      uac.on('info', this._onInfo.bind(this, uac));
       uac.on('modify', this._onReinvite.bind(this, uac));
       uac.on('refer', this._onFeatureServerTransfer.bind(this, uac));
       uac.on('destroy', () => {
@@ -914,22 +900,19 @@ Duration=${payload.duration} `
         uac.other.destroy();
         this.srf.endSession(this.req);
       });
+      // now we can destroy the old dialog
+      dlg.destroy().catch(() => {});
 
-      const opts = {
-        ...this.rtpEngineOpts.common,
-        'from-tag': this.rtpEngineOpts.uas.tag,
-        'to-tag': this.rtpEngineOpts.uac.tag,
-        sdp: uac.remote.sdp,
-        flags: ['port latching']
-      };
+      // modify rtpengine to stream to new feature server
+      const opts = Object.assign({sdp: uac.remote.sdp, 'to-tag': res.getParsedHeader('To').params.tag},
+        this.rtpEngineOpts.answer);
       const response = await this.answer(opts);
       if ('ok' !== response.result) {
-        throw new Error(`_onFeatureServerTransfer: rtpengine answer failed: ${JSON.stringify(response)}`);
+        res.send(488);
+        throw new Error(`_onFeatureServerTransfer: rtpengine failed: ${JSON.stringify(response)}`);
       }
-      dlg.destroy().catch(() => {});
       this.logger.info('successfully moved call to new feature server');
     } catch (err) {
-      res.send(488);
       this.logger.error(err, 'Error handling refer from feature server');
     }
   }

lib/db-utils.js

@@ -45,7 +45,7 @@ AND vc.is_active = 1
 AND sg.inbound = 1 
 AND sg.voip_carrier_sid = vc.voip_carrier_sid`;
 
-const sqlAccountByRealm = 'SELECT * from accounts WHERE sip_realm = ? AND is_active = 1';
+const sqlAccountByRealm = 'SELECT * from accounts WHERE sip_realm = ?';
 const sqlAccountBySid = 'SELECT * from accounts WHERE account_sid = ?';
 const sqlApplicationBySid = 'SELECT * from applications WHERE application_sid = ?';
 
@@ -153,41 +153,24 @@ module.exports = (srf, logger) => {
        * Let's look for case #1 first...
        */
 
-      /* does anyone own this sip realm? */
-      const [a] = await pp.query(sqlAccountByRealm, [uri.host]);
-      if (a.length) {
-        assert(a.length === 1);
-
-        /* yes they do */
-        logger.debug(`sip realm is associated with account_sid: ${a[0].account_sid}`);
-
-        /**
-         * We have one of two cases:
-         * (1a). The user configured his or her carrier to send to their sip realm, or
-         * (1b). The user is making a call from a sip device.
-         */
-
-        /* get all the carriers and gateways for the account owning this sip realm */
-        const [gwAcc] = await pp.query(sqlSelectAllCarriersForAccountByRealm, [uri.host]);
-        const [gwSP] = gwAcc.length ? [[]] : await pp.query(sqlSelectAllCarriersForSPByRealm, uri.host);
-        const gw = gwAcc
-          .concat(gwSP)
-          .sort((a, b) => b.netmask - a.netmask);
-        const selected = gw.find(gatewayMatchesSourceAddress.bind(null, logger, req.source_address));
-        if (selected) {
-          return {
-            fromCarrier: true,
-            gateway: selected,
-            service_provider_sid: a[0].service_provider_sid,
-            account_sid: a[0].account_sid,
-            application_sid: selected.application_sid,
-            account: a[0]
-          };
-        }
-        return failure;
+      /* get all the carriers and gateways for the account owning this sip realm */
+      const [gwAcc] = await pp.query(sqlSelectAllCarriersForAccountByRealm, [uri.host]);
+      const [gwSP] = gwAcc.length ? [[]] : await pp.query(sqlSelectAllCarriersForSPByRealm, uri.host);
+      const gw = gwAcc.concat(gwSP);
+      const selected = gw.find(gatewayMatchesSourceAddress.bind(null, logger, req.source_address));
+      if (selected) {
+        const [a] = await pp.query(sqlAccountByRealm, [uri.host]);
+        if (0 === a.length) return failure;
+        return {
+          fromCarrier: true,
+          gateway: selected,
+          service_provider_sid: a[0].service_provider_sid,
+          account_sid: a[0].account_sid,
+          application_sid: selected.application_sid,
+          account: a[0]
+        };
       }
 
-
       /* no match, so let's look for case #2 */
       try {
         logger.info({
@@ -195,9 +178,7 @@ module.exports = (srf, logger) => {
           user: uri.user
         }, 'sip realm is not associated with an account, checking carriers');
         const [gw] = await pp.query(sqlSelectCarrierRequiringRegistration, [uri.host, uri.user]);
-        const matches = gw
-          .sort((a, b) => b.netmask - a.netmask)
-          .filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address));
+        const matches = gw.filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address));
         if (1 === matches.length) {
           // bingo
           //TODO: this assumes the carrier is associate to an account, not an SP
@@ -248,7 +229,6 @@ module.exports = (srf, logger) => {
       /* find all carrier entries that have an inbound gateway matching the source IP */
       const [gw] = await pp.query(sqlSelectAllGatewaysForSP);
       let matches = gw
-        .sort((a, b) => b.netmask - a.netmask)
         .filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address))
         .map((gw) => {
           return {

lib/middleware.js

@@ -1,7 +1,7 @@
 const debug = require('debug')('jambonz:sbc-inbound');
 const assert = require('assert');
 const parseUri = require('drachtio-srf').parseUri;
-const {nudgeCallCounts, roundTripTime, isMSTeamsCIDR} = require('./utils');
+const {nudgeCallCounts, roundTripTime} = require('./utils');
 const digestChallenge = require('@jambonz/digest-utils');
 const msProxyIps = process.env.MS_TEAMS_SIP_PROXY_IPS ?
   process.env.MS_TEAMS_SIP_PROXY_IPS.split(',').map((i) => i.trim()) :
@@ -129,7 +129,7 @@ module.exports = function(srf, logger) {
           logger.info('identifyAccount: rejecting call from carrier because DID has not been provisioned');
           return res.send(404, 'Number Not Provisioned');
         }
-        logger.info({gateway}, 'identifyAccount: incoming call from gateway');
+        logger.debug({gateway}, 'identifyAccount: incoming call from gateway');
 
         let sid;
         if (siprec) {
@@ -155,8 +155,8 @@ module.exports = function(srf, logger) {
           ...req.locals
         };
       }
-      else if (msProxyIps.includes(req.source_address) || isMSTeamsCIDR(req.source_address)) {
-        logger.info({source_address: req.source_address}, 'identifyAccount: incoming call from Microsoft Teams');
+      else if (msProxyIps.includes(req.source_address)) {
+        logger.debug({source_address: req.source_address}, 'identifyAccount: incoming call from Microsoft Teams');
         const uri = parseUri(req.uri);
 
         const app = await lookupAppByTeamsTenant(uri.host);
@@ -178,7 +178,7 @@ module.exports = function(srf, logger) {
       else {
         req.locals.originator = 'user';
         const uri = parseUri(req.uri);
-        logger.info({source_address: req.source_address, realm: uri.host},
+        logger.debug({source_address: req.source_address, realm: uri.host},
           'identifyAccount: incoming user call');
         const account = await lookupAccountBySipRealm(uri.host);
         if (!account) {

lib/utils.js

@@ -1,8 +1,5 @@
-const CIDRMatcher = require('cidr-matcher');
-const express = require('express');
 const rtpCharacteristics = require('../data/rtp-transcoding');
 const srtpCharacteristics = require('../data/srtp-transcoding');
-
 let idx = 0;
 
 const isWSS = (req) => {
@@ -99,6 +96,7 @@ const handleErrors = (logger, app, resolve, reject, e) => {
 
 
 const createHealthCheckApp = (port, logger) => {
+  const express = require('express');
   const app = express();
 
   app.use(express.urlencoded({ extended: true }));
@@ -180,20 +178,6 @@ const parseConnectionIp = (sdp) => {
   return arr ? arr[1] : null;
 };
 
-/**
- * Checks if ip is one of MS Teams sip signalling ips
- * https://learn.microsoft.com/en-us/azure/communication-services/concepts
- * /telephony/direct-routing-infrastructure#sip-signaling-fqdns
- * @param ip IP address, example 172.31.0.1
- * */
-const isMSTeamsCIDR = (ip) => {
-  const cidrs = [
-    '52.112.0.0/14',
-    '52.120.0.0/14'
-  ];
-  const matcher = new CIDRMatcher(cidrs);
-  return matcher.contains(ip);
-};
 
 module.exports = {
   isWSS,
@@ -210,6 +194,5 @@ module.exports = {
   createHealthCheckApp,
   nudgeCallCounts,
   roundTripTime,
-  parseConnectionIp,
-  isMSTeamsCIDR
+  parseConnectionIp
 };

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "sbc-inbound",
-  "version": "0.8.4",
+  "version": "0.8.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sbc-inbound",
-      "version": "0.8.4",
+      "version": "0.8.3",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-auto-scaling": "^3.360.0",
@@ -16,8 +16,8 @@
         "@jambonz/http-health-check": "^0.0.1",
         "@jambonz/realtimedb-helpers": "^0.8.6",
         "@jambonz/rtpengine-utils": "^0.4.3",
-        "@jambonz/siprec-client-utils": "^0.2.6",
-        "@jambonz/stats-collector": "^0.1.9",
+        "@jambonz/siprec-client-utils": "^0.2.5",
+        "@jambonz/stats-collector": "^0.1.8",
         "@jambonz/time-series": "^0.2.5",
         "bent": "^7.3.12",
         "cidr-matcher": "^2.1.1",
@@ -1716,18 +1716,18 @@
       }
     },
     "node_modules/@jambonz/siprec-client-utils": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.6.tgz",
-      "integrity": "sha512-z2x6nghLaCfOBPcr36f+1vxsV557X3z5JW1L1RxZg8YPWkTboNIHyHxtEcAua7V9g6EB4G1qv2KDwA+iE5n5Ww==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.5.tgz",
+      "integrity": "sha512-Ib3M2ecFNxi80gZRG3hcCvxXLLImti1/0bVjAtglGjo1+qn3MyirIVYDchqdabzOC2nWl5aKBEcpG30c2saIDg==",
       "dependencies": {
         "sdp-transform": "^2.14.1",
         "uuid": "^8.3.2"
       }
     },
     "node_modules/@jambonz/stats-collector": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.9.tgz",
-      "integrity": "sha512-JNRBaHQ47pWsXydj4gUp7zc64/0pM89a6E9pA8uQ15l1KxPGYYTrNRdone5aJqLTFOoPl3tYeF1kXj+3nU1nEA==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.8.tgz",
+      "integrity": "sha512-PadBKTmcphU7bZI7pVr4awhoIi+DMLw7An6AGE0GGsLCn2x0IGnxr9k47gI4Bk3OaSF6N7RyVLEAMkJfr24l8Q==",
       "dependencies": {
         "debug": "^4.3.2",
         "hot-shots": "^8.5.0"
@@ -7684,18 +7684,18 @@
       }
     },
     "@jambonz/siprec-client-utils": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.6.tgz",
-      "integrity": "sha512-z2x6nghLaCfOBPcr36f+1vxsV557X3z5JW1L1RxZg8YPWkTboNIHyHxtEcAua7V9g6EB4G1qv2KDwA+iE5n5Ww==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.5.tgz",
+      "integrity": "sha512-Ib3M2ecFNxi80gZRG3hcCvxXLLImti1/0bVjAtglGjo1+qn3MyirIVYDchqdabzOC2nWl5aKBEcpG30c2saIDg==",
       "requires": {
         "sdp-transform": "^2.14.1",
         "uuid": "^8.3.2"
       }
     },
     "@jambonz/stats-collector": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.9.tgz",
-      "integrity": "sha512-JNRBaHQ47pWsXydj4gUp7zc64/0pM89a6E9pA8uQ15l1KxPGYYTrNRdone5aJqLTFOoPl3tYeF1kXj+3nU1nEA==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.8.tgz",
+      "integrity": "sha512-PadBKTmcphU7bZI7pVr4awhoIi+DMLw7An6AGE0GGsLCn2x0IGnxr9k47gI4Bk3OaSF6N7RyVLEAMkJfr24l8Q==",
       "requires": {
         "debug": "^4.3.2",
         "hot-shots": "^8.5.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbc-inbound",
-  "version": "0.8.4",
+  "version": "0.8.3",
   "main": "app.js",
   "engines": {
     "node": ">= 12.0.0"
@@ -29,8 +29,8 @@
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/realtimedb-helpers": "^0.8.6",
     "@jambonz/rtpengine-utils": "^0.4.3",
-    "@jambonz/siprec-client-utils": "^0.2.6",
-    "@jambonz/stats-collector": "^0.1.9",
+    "@jambonz/siprec-client-utils": "^0.2.5",
+    "@jambonz/stats-collector": "^0.1.8",
     "@jambonz/time-series": "^0.2.5",
     "@jambonz/digest-utils": "^0.0.3",
     "@aws-sdk/client-sns": "^3.360.0",