Feature/recent calls enhancement with sp (#47)

* write cdrs and alerts with service_provider_sid

* update to latest @jambonz/http-authenticator which sends sip headers

* add call_sid to cdr when call is connected

* write call counts by SP as well as account, bugfix to allow digit '0' in dtmf-relay

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:16.15.1-alpine as base
+FROM --platform=linux/amd64 node:18.8.0-alpine as base
 
 RUN apk --update --no-cache add --virtual .builds-deps build-base python3
 

app.js

@@ -15,6 +15,7 @@ const opts = Object.assign({
 const logger = require('pino')(opts);
 const {
   writeCallCount,
+  writeCallCountSP,
   queryCdrs,
   writeCdrs,
   writeAlerts,
@@ -71,6 +72,7 @@ const {getRtpEngine, setRtpEngines} = require('@jambonz/rtpengine-utils')([], lo
 srf.locals = {...srf.locals,
   stats,
   writeCallCount,
+  writeCallCountSP,
   queryCdrs,
   writeCdrs,
   writeAlerts,
@@ -96,12 +98,14 @@ srf.locals = {...srf.locals,
   }
 };
 const {
+  getSPForAccount,
   wasOriginatedFromCarrier,
   getApplicationForDidAndCarrier,
   getOutboundGatewayForRefer
 } = require('./lib/db-utils')(srf, logger);
 srf.locals = {
   ...srf.locals,
+  getSPForAccount,
   wasOriginatedFromCarrier,
   getApplicationForDidAndCarrier,
   getOutboundGatewayForRefer,
@@ -111,6 +115,7 @@ const activeCallIds = srf.locals.activeCallIds;
 
 const {
   initLocals,
+  handleSipRec,
   identifyAccount,
   checkLimits,
   challengeDeviceCalls
@@ -161,7 +166,13 @@ if (process.env.NODE_ENV === 'test') {
 }
 
 /* install middleware */
-srf.use('invite', [initLocals, identifyAccount, checkLimits, challengeDeviceCalls]);
+srf.use('invite', [
+  initLocals,
+  handleSipRec,
+  identifyAccount,
+  checkLimits,
+  challengeDeviceCalls
+]);
 
 srf.invite((req, res) => {
   if (req.has('Replaces')) {

lib/call-session.js

@@ -1,6 +1,6 @@
 const Emitter = require('events');
-const SrsClient = require('./srs-client');
-const {makeRtpEngineOpts, SdpWantsSrtp, makeCallCountKey} = require('./utils');
+const SrsClient = require('@jambonz/siprec-client-utils');
+const {makeRtpEngineOpts, SdpWantsSrtp, makeAccountCallCountKey, makeSPCallCountKey} = require('./utils');
 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
 const {parseUri, stringifyUri, SipError} = require('drachtio-srf');
 const debug = require('debug')('jambonz:sbc-inbound');
@@ -18,6 +18,20 @@ const createBLegFromHeader = (req) => {
   return '<sip:anonymous@localhost>';
 };
 
+const createSiprecBody = (headers, sdp, type, content) => {
+  const sep = 'uniqueBoundary';
+  headers['Content-Type'] = `multipart/mixed;boundary="${sep}"`;
+  return `--${sep}\r
+Content-Type: application/sdp\r
+\r
+${sdp}\r
+--${sep}\r
+Content-Type: ${type}\r
+Content-Disposition: recording-session\r
+\r
+${content}`;
+};
+
 class CallSession extends Emitter {
   constructor(logger, req, res) {
     super();
@@ -25,6 +39,8 @@ class CallSession extends Emitter {
     this.res = res;
     this.srf = req.srf;
     this.logger = logger.child({callId: req.get('Call-ID')});
+    this.siprec = req.locals.siprec;
+    this.xml = req.locals.xml;
 
     this.getRtpEngine = req.srf.locals.getRtpEngine;
     this.getFeatureServer = req.srf.locals.getFeatureServer;
@@ -33,7 +49,9 @@ class CallSession extends Emitter {
     this.activeCallIds = this.srf.locals.activeCallIds;
 
     this.decrKey = req.srf.locals.realtimeDbHelpers.decrKey;
-    this.callCountKey = makeCallCountKey(req.locals.account_sid);
+    this.callCountKey = makeAccountCallCountKey(req.locals.account_sid);
+    this.callCountKeySP = makeSPCallCountKey(req.locals.service_provider_sid);
+    this._mediaReleased = false;
   }
 
   get isFromMSTeams() {
@@ -44,7 +62,17 @@ class CallSession extends Emitter {
     return this.srf.locals.privateSipAddress;
   }
 
+  get isMediaReleased() {
+    return this._mediaReleased;
+  }
+
+  get callerIsUsingSrtp() {
+    const tp = this.rtpEngineOpts?.uas?.mediaOpts['transport-protocol'];
+    return tp && -1 !== tp.indexOf('SAVP');
+  }
+
   async connect() {
+    const {sdp} = this.req.locals;
     this.logger.info('inbound call accepted for routing');
     const engine = this.getRtpEngine();
     if (!engine) {
@@ -62,6 +90,7 @@ class CallSession extends Emitter {
       unblockMedia,
       blockDTMF,
       unblockDTMF,
+      playDTMF,
       subscribeDTMF,
       unsubscribeDTMF,
       subscribeRequest,
@@ -75,6 +104,7 @@ class CallSession extends Emitter {
     this.unblockMedia = unblockMedia;
     this.blockDTMF = blockDTMF;
     this.unblockDTMF = unblockDTMF;
+    this.playDTMF = playDTMF;
     this.subscribeDTMF = subscribeDTMF;
     this.unsubscribeDTMF = unsubscribeDTMF;
     this.subscribeRequest = subscribeRequest;
@@ -90,7 +120,7 @@ class CallSession extends Emitter {
     }
     this.logger.debug(`using feature server ${featureServer}`);
 
-    this.rtpEngineOpts = makeRtpEngineOpts(this.req, SdpWantsSrtp(this.req.body), false, this.isFromMSTeams);
+    this.rtpEngineOpts = makeRtpEngineOpts(this.req, SdpWantsSrtp(sdp), false, this.isFromMSTeams);
     this.rtpEngineResource = {destroy: this.del.bind(null, this.rtpEngineOpts.common)};
     const obj = parseUri(this.req.uri);
     let proxy, host, uri;
@@ -115,7 +145,7 @@ class CallSession extends Emitter {
         ...this.rtpEngineOpts.uac.mediaOpts,
         'from-tag': this.rtpEngineOpts.uas.tag,
         direction:  ['public', 'private'],
-        sdp: this.req.body
+        sdp
       };
       const response = await this.offer(opts);
       this.logger.debug({opts, response}, 'response from rtpengine to offer');
@@ -124,7 +154,6 @@ class CallSession extends Emitter {
         throw new Error('rtpengine failed: answer');
       }
 
-      // now send the INVITE in towards the feature servers
       let headers = {
         'From': createBLegFromHeader(this.req),
         'To': this.req.get('To'),
@@ -134,6 +163,10 @@ class CallSession extends Emitter {
       };
       if (this.privateSipAddress) headers = {...headers, Contact: `<sip:${this.privateSipAddress}>`};
 
+      const spdOfferB = this.siprec && this.xml ?
+        createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content) :
+        response.sdp;
+
       const responseHeaders = {};
       if (this.req.locals.carrier) {
         Object.assign(headers, {
@@ -165,6 +198,7 @@ class CallSession extends Emitter {
 
       if (this.req.canceled) throw new Error('call canceled');
 
+      // now send the INVITE in towards the feature servers
       debug(`sending INVITE to ${proxy} with ${uri}`);
       const {uas, uac} = await this.srf.createB2BUA(this.req, this.res, uri, {
         proxy,
@@ -179,7 +213,7 @@ class CallSession extends Emitter {
           '-X-Subspace-Forwarded-For'
         ],
         proxyResponseHeaders: ['all', '-X-Trace-ID'],
-        localSdpB: response.sdp,
+        localSdpB: spdOfferB,
         localSdpA: async(sdp, res) => {
           this.rtpEngineOpts.uac.tag = res.getParsedHeader('To').params.tag;
           const opts = {
@@ -250,11 +284,13 @@ class CallSession extends Emitter {
     const tags = ['accepted:yes', 'sipStatus:200', `originator:${this.req.locals.originator}`];
     this.stats.increment('sbc.terminations', tags);
     this.activeCallIds.set(this.req.get('Call-ID'), this);
+    const call_sid = uac.res?.get('X-Call-Sid');
     if (this.req.locals.cdr) {
       this.req.locals.cdr = {
         ...this.req.locals.cdr,
         answered: true,
         answered_at: callStart,
+        ...(call_sid && {call_sid}),
         trace_id: uac.res?.get('X-Trace-ID') || '00000000000000000000000000000000'
       };
     }
@@ -270,15 +306,25 @@ class CallSession extends Emitter {
         } catch (err) {}
         this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag);
         if (process.env.JAMBONES_HOSTING || process.env.JAMBONES_TRACK_ACCOUNT_CALLS) {
-          const {account_sid} = this.req.locals;
-          this.decrKey(this.callCountKey)
-            .then((count) => {
-              this.logger.info(
-                {key: this.callCountKey},
-                `after hangup there are ${count} active calls for this account`);
-              return this.req.srf.locals.writeCallCount({account_sid, calls_in_progress: count});
+          const {account_sid, service_provider_sid} = this.req.locals;
+          const {writeCallCount, writeCallCountSP} = this.req.srf.locals;
+
+          this.logger.info('going to decrement call count');
+
+          Promise.all([
+            this.decrKey(this.callCountKey),
+            this.decrKey(this.callCountKeySP)
+          ])
+            .then(([calls, callsSP]) => {
+              this.logger.info({calls, callsSP}, 'decremented call counts after call completion');
+              return Promise.all([
+                writeCallCount(account_sid, calls),
+                writeCallCountSP(service_provider_sid, callsSP)
+              ]);
             })
-            .catch((err) => this.logger.error({err}, 'Error decrementing call count'));
+            .catch((err) => {
+              this.logger.error({err}, 'error decrementing call counts after call completion');
+            });
         }
 
         /* write cdr for connected call */
@@ -287,13 +333,23 @@ class CallSession extends Emitter {
           const trunk = ['trunk', 'teams'].includes(this.req.locals.originator) ?
             this.req.locals.carrier :
             this.req.locals.originator;
+          const cdr = {...this.req.locals.cdr,
+            terminated_at: now,
+            termination_reason: dlg.type === 'uas' ? 'caller hungup' : 'called party hungup',
+            sip_status: 200,
+            duration: Math.floor((now - callStart) / 1000),
+            trunk
+          };
+          this.logger.info({cdr}, 'going to write a cdr now..');
           this.writeCdrs({...this.req.locals.cdr,
             terminated_at: now,
             termination_reason: dlg.type === 'uas' ? 'caller hungup' : 'called party hungup',
             sip_status: 200,
             duration: Math.floor((now - callStart) / 1000),
             trunk
-          }).catch((err) => this.logger.error({err}, 'Error writing cdr for completed call'));
+          })
+            .then(() => this.logger.debug('successfully wrote cdr'))
+            .catch((err) => this.logger.error({err}, 'Error writing cdr for completed call'));
         }
         /* de-link the 2 Dialogs for GC */
         dlg.removeAllListeners();
@@ -362,7 +418,19 @@ Duration=${payload.duration} `
    */
   async replaces(req, res) {
     try {
-      let opts = Object.assign({}, this.rtpEngineOpts.uas.mediaOpts, {sdp: req.body});
+      const fromTag = this.rtpEngineOpts.uas.tag;
+      const toTag =  this.rtpEngineOpts.uac.tag;
+      const offerMedia = this.rtpEngineOpts.uac.mediaOpts;
+      const answerMedia = this.rtpEngineOpts.uas.mediaOpts;
+      const direction = ['public', 'private'];
+      let opts = {
+        ...this.rtpEngineOpts.common,
+        ...offerMedia,
+        'from-tag': fromTag,
+        'to-tag': toTag,
+        direction,
+        sdp: req.body,
+      };
       let response = await this.offer(opts);
       if ('ok' !== response.result) {
         res.send(488);
@@ -370,8 +438,13 @@ Duration=${payload.duration} `
       }
       this.logger.info({opts, response}, 'sent offer for reinvite to rtpengine');
       const sdp = await this.uac.modify(response.sdp);
-      opts = Object.assign({}, this.rtpEngineOpts.uac.mediaOpts, {sdp, 'to-tag': this.toTag});
-      Object.assign(this.rtpEngineOpts.uas.mediaOpts, {'to-tag': this.toTag});
+      opts = {
+        ...this.rtpEngineOpts.common,
+        ...answerMedia,
+        'from-tag': fromTag,
+        'to-tag': toTag,
+        sdp
+      };
       response = await this.answer(opts);
       if ('ok' !== response.result) {
         res.send(488);
@@ -417,6 +490,10 @@ Duration=${payload.duration} `
         res.send(200, {body: dlg.local.sdp});
         return;
       }
+      const offeredSdp = Array.isArray(req.payload) && req.payload.length > 1 ?
+        req.payload.find((p) => p.type === 'application/sdp').content :
+        req.body;
+
       const reason = req.get('X-Reason');
       const fromTag = dlg.type === 'uas' ? this.rtpEngineOpts.uas.tag : this.rtpEngineOpts.uac.tag;
       const toTag = dlg.type === 'uas' ? this.rtpEngineOpts.uac.tag : this.rtpEngineOpts.uas.tag;
@@ -429,8 +506,9 @@ Duration=${payload.duration} `
         'from-tag': fromTag,
         'to-tag': toTag,
         direction,
-        sdp: req.body,
+        sdp: offeredSdp,
       };
+      if (reason && opts.flags && !opts.flags.includes('reset')) opts.flags.push('reset');
 
       let response = await this.offer(opts);
       if ('ok' !== response.result) {
@@ -440,9 +518,12 @@ Duration=${payload.duration} `
 
       /* if this is a re-invite from the FS to change media anchoring, avoid sending the reinvite out */
       let sdp;
-      if (reason && dlg.type === 'uac' && ['release-media', 'anchor-media'].includes(reason)) {
+      if (reason && dlg.type === 'uac' && ['release-media', 'anchor-media'].includes(reason) &&
+        !this.callerIsUsingSrtp) {
         this.logger.info({response}, `got a reinvite from FS to ${reason}`);
         sdp = dlg.other.remote.sdp;
+        answerMedia.flags = ['asymmetric', 'port latching'];
+        this._mediaReleased = 'release-media' === reason;
       }
       else {
         sdp = await dlg.other.modify(response.sdp);
@@ -468,6 +549,7 @@ Duration=${payload.duration} `
   async _onInfo(dlg, req, res) {
     const fromTag = dlg.type === 'uas' ? this.rtpEngineOpts.uas.tag : this.rtpEngineOpts.uac.tag;
     const toTag = dlg.type === 'uas' ? this.rtpEngineOpts.uac.tag : this.rtpEngineOpts.uas.tag;
+    const contentType = req.get('Content-Type');
     try {
       if (dlg.type === 'uac' && req.has('X-Reason')) {
         const reason = req.get('X-Reason');
@@ -514,6 +596,7 @@ Duration=${payload.duration} `
             }
             this.srsClient = new SrsClient(this.logger, {
               srf: dlg.srf,
+              direction: 'inbound',
               originalInvite: this.req,
               callingNumber: this.req.callingNumber,
               calledNumber: this.req.calledNumber,
@@ -572,6 +655,40 @@ Duration=${payload.duration} `
           res.send(succeeded ? 200 : 503);
         }
       }
+      else if (dlg.type === 'uas' && ['application/dtmf-relay', 'application/dtmf'].includes(contentType)) {
+        const arr = /Signal=\s*([0-9#*])/.exec(req.body);
+        if (!arr) {
+          this.logger.info({body: req.body}, '_onInfo: invalid INFO dtmf request');
+          throw new Error(`_onInfo: no dtmf in body for ${contentType}`);
+        }
+        const code = arr[1];
+        const arr2 = /Duration=\s*(\d+)/.exec(req.body);
+        const duration = arr2 ? arr2[1] : 250;
+
+        if (this.isMediaReleased) {
+          /* just relay on to the feature server */
+          this.logger.info({code, duration}, 'got SIP INFO DTMF from caller, relaying to feature server');
+          this._onDTMF(dlg.other, {event: code, duration})
+            .catch((err) => this.logger.info({err}, 'Error relaying DTMF to feature server'));
+          res.send(200);
+        }
+        else {
+          /* else convert SIP INFO to RFC 2833 telephony events */
+          this.logger.info({code, duration}, 'got SIP INFO DTMF from caller, converting to RFC 2833');
+          const opts = {
+            ...this.rtpEngineOpts.common,
+            'from-tag': this.rtpEngineOpts.uas.tag,
+            code,
+            duration
+          };
+          const response = await this.playDTMF(opts);
+          if ('ok' !== response.result) {
+            this.logger.info({response}, `rtpengine playDTMF failed with ${JSON.stringify(response)}`);
+            throw new Error('rtpengine failed: answer');
+          }
+          res.send(200);
+        }
+      }
       else {
         const immutableHdrs = ['via', 'from', 'to', 'call-id', 'cseq', 'max-forwards', 'content-length'];
         const headers = {};
@@ -626,11 +743,19 @@ Duration=${payload.duration} `
         if (e164 && !uri.user.startsWith('+')) {
           uri.user = `+${uri.user}`;
         }
+        // eslint-disable-next-line no-unused-vars
+        const {via, from, to, 'call-id':callid, cseq, 'max-forwards':maxforwards,
+          // eslint-disable-next-line no-unused-vars
+          'content-length':contentlength, 'refer-to':_referto, 'referred-by':_referredby,
+          ...customHeaders
+        } = req.headers;
+
         const response = await this.uas.request({
           method: 'REFER',
           headers: {
             'Refer-To': stringifyUri(uri),
-            'Referred-By': stringifyUri(u)
+            'Referred-By': stringifyUri(u),
+            ...customHeaders
           }
         });
         return res.send(response.status);

lib/db-utils.js

@@ -3,6 +3,8 @@ const CIDRMatcher = require('cidr-matcher');
 const {parseUri} = require('drachtio-srf');
 const {normalizeDID} = require('./utils');
 
+const sqlSelectSPForAccount = 'SELECT service_provider_sid FROM accounts WHERE account_sid = ?';
+
 const sqlSelectAllCarriersForAccountByRealm =
 `SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.account_sid,  
 vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask  
@@ -68,6 +70,12 @@ module.exports = (srf, logger) => {
   const {pool}  = srf.locals.dbHelpers;
   const pp = pool.promise();
 
+  const getSPForAccount = async(account_sid) => {
+    const [r] = await pp.query(sqlSelectSPForAccount, [account_sid]);
+    if (0 === r.length) return null;
+    return r[0].service_provider_sid;
+  };
+
   const getOutboundGatewayForRefer = async(voip_carrier_sid) => {
     try {
       const [r] = await pp.query(sqlSelectOutboundGatewayForCarrier, [voip_carrier_sid]);
@@ -115,10 +123,12 @@ module.exports = (srf, logger) => {
         const [r] = await pp.query(sqlCarriersForAccountBySid,
           [process.env.SBC_ACCOUNT_SID, req.source_address, req.source_port]);
         if (0 === r.length) return failure;
+        const service_provider_sid = await getSPForAccount(process.env.SBC_ACCOUNT_SID);
         return {
           fromCarrier: true,
           gateway: r[0],
-          account_sid: process.env.SBC_ACCOUNT_SID
+          account_sid: process.env.SBC_ACCOUNT_SID,
+          service_provider_sid
         };
       }
       else {
@@ -147,6 +157,7 @@ module.exports = (srf, logger) => {
               return {
                 fromCarrier: true,
                 gateway: matches[0],
+                service_provider_sid: accounts[0].service_provider_sid,
                 account_sid: accounts[0].account_sid,
                 account: accounts[0]
               };
@@ -158,6 +169,7 @@ module.exports = (srf, logger) => {
           return {
             fromCarrier: true,
             gateway,
+            service_provider_sid: accounts[0].service_provider_sid,
             account_sid: r[0].account_sid,
             application_sid: r[0].application_sid,
             account: accounts[0]
@@ -178,6 +190,7 @@ module.exports = (srf, logger) => {
       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]
@@ -189,6 +202,7 @@ module.exports = (srf, logger) => {
   return {
     wasOriginatedFromCarrier,
     getApplicationForDidAndCarrier,
-    getOutboundGatewayForRefer
+    getOutboundGatewayForRefer,
+    getSPForAccount
   };
 };

lib/middleware.js

@@ -2,7 +2,7 @@ const debug = require('debug')('jambonz:sbc-inbound');
 const assert = require('assert');
 const Emitter = require('events');
 const parseUri = require('drachtio-srf').parseUri;
-const {makeCallCountKey} = require('./utils');
+const {makeAccountCallCountKey, makeSPCallCountKey} = require('./utils');
 const msProxyIps = process.env.MS_TEAMS_SIP_PROXY_IPS ?
   process.env.MS_TEAMS_SIP_PROXY_IPS.split(',').map((i) => i.trim()) :
   [];
@@ -30,10 +30,10 @@ module.exports = function(srf, logger) {
           stats.histogram('app.hook.response_time', rtt, ['hook_type:auth', `status:${status}`]);
         })
         .on('error', async(err, req) => {
-          const {account_sid} = req.locals;
+          const {account_sid, account} = req.locals;
           const {writeAlerts, AlertType} = req.srf.locals;
           if (account_sid) {
-            let opts = {account_sid};
+            let opts = {account_sid, service_provider_sid: account.service_provider_sid};
             if (err.code === 'ECONNREFUSED') {
               opts = {...opts, alert_type: AlertType.WEBHOOK_CONNECTION_FAILURE, url: err.hook};
             }
@@ -70,7 +70,8 @@ module.exports = function(srf, logger) {
   });
 
   const initLocals = (req, res, next) => {
-    req.locals = req.locals || {};
+    const callId = req.get('Call-ID');
+    req.locals = req.locals || {callId};
 
     /* check if forwarded by a proxy that applied an X-Forwarded-For Header */
     if (req.has('X-Forwarded-For') || req.has('X-Subspace-Forwarded-For')) {
@@ -83,7 +84,6 @@ module.exports = function(srf, logger) {
       req.source_address = original_source_address;
     }
     req.locals.cdr = initCdr(req);
-    const callId = req.get('Call-ID');
     req.on('cancel', () => {
       logger.info({callId}, 'caller hungup before connecting to feature server');
       req.canceled = true;
@@ -109,14 +109,38 @@ module.exports = function(srf, logger) {
     next();
   };
 
+  const handleSipRec = async(req, res, next) => {
+    const {callId} = req.locals;
+    if (Array.isArray(req.payload) && req.payload.length > 1) {
+      const sdp = req.payload
+        .find((p) => p.type === 'application/sdp')
+        .content;
+      if (!sdp) {
+        logger.error({callId}, 'No SDP in multipart sdp');
+        return res.send(503);
+      }
+      const xml = req.payload.find((p) => p.type !== 'application/sdp');
+      const endPos = xml.content.indexOf('</recording>');
+      xml.content = endPos !== -1 ?
+        `${xml.content.substring(0, endPos + 12)}` :
+        xml.content;
+      logger.debug({callId, xml}, 'incoming call with SIPREC body');
+      req.locals = {...req.locals, sdp, siprec: true, xml};
+    }
+    else req.locals = {...req.locals, sdp: req.body};
+    next();
+  };
+
   const identifyAccount = async(req, res, next) => {
     try {
-      const {wasOriginatedFromCarrier, getApplicationForDidAndCarrier} = req.srf.locals;
+      const {siprec, callId} = req.locals;
+      const {getSPForAccount, wasOriginatedFromCarrier, getApplicationForDidAndCarrier} = req.srf.locals;
       const {
         fromCarrier,
         gateway,
         account_sid,
         application_sid,
+        service_provider_sid,
         account
       } = await wasOriginatedFromCarrier(req);
       /**
@@ -132,14 +156,25 @@ module.exports = function(srf, logger) {
         }
         logger.debug({gateway}, 'identifyAccount: incoming call from gateway');
 
-        /* check for phone number level routing */
-        const sid = application_sid || await getApplicationForDidAndCarrier(req, gateway.voip_carrier_sid);
+        let sid;
+        if (siprec) {
+          if (!account.siprec_hook_sid) {
+            logger.info({callId}, 'identifyAccount: rejecting call because SIPREC hook has not been provisioned');
+            return res.send(404);
+          }
+          sid = account.siprec_hook_sid;
+        }
+        else {
+          /* check for phone number level routing */
+          sid = application_sid || await getApplicationForDidAndCarrier(req, gateway.voip_carrier_sid);
+        }
         req.locals = {
           originator: 'trunk',
           carrier: gateway.name,
           gateway,
           voip_carrier_sid: gateway.voip_carrier_sid,
           application_sid: sid || gateway.application_sid,
+          service_provider_sid,
           account_sid,
           account,
           ...req.locals
@@ -155,12 +190,13 @@ module.exports = function(srf, logger) {
           res.send(404, {headers: {'X-Reason': 'no configured application'}});
           return req.srf.endSession(req);
         }
-
+        const service_provider_sid = await getSPForAccount(app.account_sid);
         req.locals = {
           originator: 'teams',
           carrier: 'Microsoft Teams',
           msTeamsTenantFqdn: uri.host,
           account_sid: app.account_sid,
+          service_provider_sid,
           ...req.locals
         };
       }
@@ -186,18 +222,21 @@ module.exports = function(srf, logger) {
           return req.srf.endSession(req);
         }
         req.locals = {
+          service_provider_sid: account.service_provider_sid,
           account_sid: account.account_sid,
           account,
           webhook_secret: account.webhook_secret,
           ...req.locals
         };
       }
+      assert(req.locals.service_provider_sid);
       assert(req.locals.account_sid);
       req.locals.cdr.account_sid = req.locals.account_sid;
 
       if (!req.locals.account) {
         req.locals.account = await lookupAccountBySid(req.locals.account_sid);
       }
+      req.locals.cdr.service_provider_sid = req.locals.account?.service_provider_sid;
 
       if (!req.locals.account.is_active) {
         stats.increment('sbc.terminations', ['sipStatus:503']);
@@ -209,7 +248,11 @@ module.exports = function(srf, logger) {
         delete req.locals.cdr;
       }
 
-      req.locals.logger = logger.child({callId: req.get('Call-ID'), account_sid: req.locals.account_sid});
+      req.locals.logger = logger.child({
+        callId: req.get('Call-ID'),
+        service_provider_sid: req.locals.service_provider_sid,
+        account_sid: req.locals.account_sid
+      });
 
       next();
     } catch (err) {
@@ -223,32 +266,35 @@ module.exports = function(srf, logger) {
     if (!process.env.JAMBONES_HOSTING && !process.env.JAMBONES_TRACK_ACCOUNT_CALLS) return next(); // skip
 
     const {incrKey, decrKey} = req.srf.locals.realtimeDbHelpers;
-    const {logger, account_sid} = req.locals;
-    const {writeCallCount, writeAlerts, AlertType} = req.srf.locals;
+    const {logger, account_sid, account, service_provider_sid} = req.locals;
+    const {writeCallCount, writeCallCountSP, writeAlerts, AlertType} = req.srf.locals;
     assert(account_sid);
-    const key = makeCallCountKey(account_sid);
+    assert(service_provider_sid);
+    const keyAccount = makeAccountCallCountKey(account_sid);
+    const keySP = makeSPCallCountKey(service_provider_sid);
 
     /* decrement count if INVITE is later rejected */
-    res.once('end', ({status}) => {
+    res.once('end', async({status}) => {
       if (status > 200) {
-        decrKey(key)
-          .then((count) => {
-            logger.info({key}, `after rejection there are ${count} active calls for this account`);
-            debug({key}, `after rejection there are ${count} active calls for this account`);
-            return count;
-          })
-          .then((count) => writeCallCount({account_sid, calls_in_progress: count}))
-          .catch((err) => logger.error({err}, 'checkLimits: decrKey err'));
+        try {
+          const [calls, callsSP] = await Promise.all([decrKey(keyAccount), decrKey(keySP)]);
+          logger.info({calls, callsSP}, `decremented call counts after ${status} response`);
+        } catch (err) {
+          logger.info({err}, 'Error decrementing call count');
+        }
       }
     });
 
     try {
       /* increment the call count */
-      const calls = await incrKey(key);
-      writeCallCount({account_sid, calls_in_progress: calls})
-        .then(() => logger.info(`checkLimits: after incrementing there are ${calls} active calls for this account`))
-        .catch((err) => logger.error({err}, 'checkLimits: error writing call count'));
-      if (!process.env.JAMBONES_HOSTING) return next();
+      const [calls, callsSP] = await Promise.all([incrKey(keyAccount), incrKey(keySP)]);
+      logger.info({calls, callsSP}, 'incremented call counts');
+
+      /* write the call counts to the database for both account and service provider */
+      Promise.all([
+        writeCallCount(account_sid, calls),
+        writeCallCountSP(service_provider_sid, callsSP)
+      ]).catch((err) => logger.error({err}, 'Error writing call counts'));
 
       /* compare to account's limit, though avoid db hit when call count is low */
       const minLimit = process.env.MIN_CALL_LIMIT ?
@@ -257,21 +303,26 @@ module.exports = function(srf, logger) {
       logger.debug(`checkLimits: call count is now ${calls}, limit is ${minLimit}`);
       if (calls <= minLimit) return next();
 
-      const capacities = await lookupAccountCapacitiesBySid(account_sid);
-      const limit = capacities.find((c) => c.category == 'voice_call_session');
-      if (!limit) throw new Error('no account_capacities found');
-      const limit_sessions = limit.quantity;
-      if (calls > limit_sessions) {
-        debug(`checkLimits: limits exceeded: call count ${calls}, limit ${limit_sessions}`);
-        logger.info({calls, limit_sessions}, 'checkLimits: limits exceeded');
-        writeAlerts({
-          alert_type: AlertType.CALL_LIMIT,
-          account_sid,
-          count: limit_sessions
-        }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
-        res.send(503, 'Maximum Calls In Progress');
-        return req.srf.endSession(req);
+      const accountCapacities = await lookupAccountCapacitiesBySid(account_sid);
+      const accountLimit = accountCapacities.find((c) => c.category == 'voice_call_session');
+      if (accountLimit) {
+        /* check account limit */
+        const limit_sessions = accountLimit.quantity;
+        if (calls > limit_sessions) {
+          debug(`checkLimits: limits exceeded: call count ${calls}, limit ${limit_sessions}`);
+          logger.info({calls, limit_sessions}, 'checkLimits: limits exceeded');
+          writeAlerts({
+            alert_type: AlertType.ACCOUNT_CALL_LIMIT,
+            service_provider_sid: account.service_provider_sid,
+            account_sid,
+            count: limit_sessions
+          }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
+          res.send(503, 'Maximum Calls In Progress');
+          return req.srf.endSession(req);
+        }
       }
+
+      //TODO: implement service provider limits
       next();
     } catch (err) {
       stats.increment('sbc.terminations', ['sipStatus:500']);
@@ -296,6 +347,7 @@ module.exports = function(srf, logger) {
 
   return {
     initLocals,
+    handleSipRec,
     challengeDeviceCalls,
     identifyAccount,
     checkLimits

lib/srs-client.js

@@ -1,249 +0,0 @@
-const Emitter = require('events');
-const assert = require('assert');
-const transform = require('sdp-transform');
-const { v4: uuidv4 } = require('uuid');
-
-const createMultipartSdp = (sdp, {
-  originalInvite,
-  srsRecordingId,
-  callSid,
-  accountSid,
-  applicationSid,
-  sipCallId,
-  aorFrom,
-  aorTo,
-  callingNumber,
-  calledNumber
-}) => {
-  const sessionId = uuidv4();
-  const uuidStream1 = uuidv4();
-  const uuidStream2 = uuidv4();
-  const participant1 = uuidv4();
-  const participant2 = uuidv4();
-  const sipSessionId = originalInvite.get('Call-ID');
-  const {originator = 'unknown', carrier = 'unknown'} = originalInvite.locals;
-
-  const x = `--uniqueBoundary
-Content-Disposition: session;handling=required
-Content-Type: application/sdp
-
---sdp-placeholder--
---uniqueBoundary
-Content-Disposition: recording-session
-Content-Type: application/rs-metadata+xml
-
-<?xml version="1.0" encoding="UTF-8"?>
-<recording xmlns="urn:ietf:params:xml:ns:recording:1">
-  <datamode>complete</datamode>
-  <session session_id="${sessionId}">
-    <sipSessionID>${sipSessionId}</sipSessionID>
-  </session>
-  <extensiondata xmlns:jb="http://jambonz.org/siprec">
-    <jb:callsid>${callSid}</jb:callsid>
-    <jb:accountsid>${accountSid}</jb:accountsid>
-    <jb:applicationsid>${applicationSid}</jb:applicationsid>
-    <jb:recordingid>${srsRecordingId}</jb:recordingid>
-    <jb:originationsource>${originator}</jb:originationsource>
-    <jb:carrier>${carrier}</jb:carrier>
-  </extensiondata>
-  <participant participant_id="${participant1}">
-    <nameID aor="${aorFrom}">
-      <name>${callingNumber}</name>
-    </nameID>
-  </participant>
-  <participantsessionassoc participant_id="${participant1}" session_id="${sessionId}">
-  </participantsessionassoc>
-  <stream stream_id="${uuidStream1}" session_id="${sessionId}">
-    <label>1</label>
-  </stream>
-  <participant participant_id="${participant2}">
-    <nameID aor="${aorTo}">
-      <name>${calledNumber}</name>
-    </nameID>
-  </participant>
-  <participantsessionassoc participant_id="${participant2}" session_id="${sessionId}">
-  </participantsessionassoc>
-  <stream stream_id="${uuidStream2}" session_id="${sessionId}">
-    <label>2</label>
-  </stream>
-  <participantstreamassoc participant_id="${participant1}">
-    <send>${uuidStream1}</send>
-    <recv>${uuidStream2}</recv>
-  </participantstreamassoc>
-  <participantstreamassoc participant_id="${participant2}">
-    <send>${uuidStream2}</send>
-    <recv>${uuidStream1}</recv>
-  </participantstreamassoc>
-</recording>`
-    .replace(/\n/g, '\r\n')
-    .replace('--sdp-placeholder--', sdp);
-
-  return `${x}\r\n`;
-};
-
-class SrsClient extends Emitter {
-  constructor(logger, opts) {
-    super();
-    const {
-      srf,
-      originalInvite,
-      calledNumber,
-      callingNumber,
-      srsUrl,
-      srsRecordingId,
-      callSid,
-      accountSid,
-      applicationSid,
-      srsDestUserName,
-      rtpEngineOpts,
-      //fromTag,
-      toTag,
-      aorFrom,
-      aorTo,
-      subscribeRequest,
-      subscribeAnswer,
-      del,
-      blockMedia,
-      unblockMedia,
-      unsubscribe
-    } = opts;
-    this.logger = logger;
-    this.srf = srf;
-    this.originalInvite = originalInvite;
-    this.callingNumber = callingNumber;
-    this.calledNumber = calledNumber;
-    this.subscribeRequest = subscribeRequest;
-    this.subscribeAnswer = subscribeAnswer;
-    this.del = del;
-    this.blockMedia = blockMedia;
-    this.unblockMedia = unblockMedia;
-    this.unsubscribe = unsubscribe;
-    this.srsUrl = srsUrl;
-    this.srsRecordingId = srsRecordingId;
-    this.callSid = callSid;
-    this.accountSid = accountSid;
-    this.applicationSid = applicationSid;
-    this.srsDestUserName = srsDestUserName;
-    this.rtpEngineOpts = rtpEngineOpts;
-    this.sipRecFromTag = toTag;
-    this.aorFrom = aorFrom;
-    this.aorTo = aorTo;
-
-    /* state */
-    this.activated = false;
-    this.paused = false;
-  }
-
-  async start() {
-    assert(!this.activated);
-
-    const opts = {
-      'call-id': this.rtpEngineOpts.common['call-id'],
-      'from-tag': this.sipRecFromTag
-    };
-
-    let response = await this.subscribeRequest({...opts, label: '1', flags: ['all'], interface: 'public'});
-    if (response.result !== 'ok') {
-      this.logger.error({response}, 'SrsClient:start error calling subscribe request');
-      throw new Error('error calling subscribe request');
-    }
-    this.siprecToTag = response['to-tag'];
-
-    const parsed = transform.parse(response.sdp);
-    parsed.name = 'jambonz SRS';
-    parsed.media[0].label = '1';
-    parsed.media[1].label = '2';
-    this.sdpOffer = transform.write(parsed);
-    const sdp = createMultipartSdp(this.sdpOffer, {
-      originalInvite: this.originalInvite,
-      srsRecordingId: this.srsRecordingId,
-      callSid: this.callSid,
-      accountSid: this.accountSid,
-      applicationSid: this.applicationSid,
-      calledNumber: this.calledNumber,
-      callingNumber: this.callingNumber,
-      aorFrom: this.aorFrom,
-      aorTo: this.aorTo
-    });
-
-    this.logger.info({response}, `SrsClient: sending SDP ${sdp}`);
-
-    /* */
-    try {
-      this.uac = await this.srf.createUAC(this.srsUrl, {
-        headers: {
-          'Content-Type': 'multipart/mixed;boundary=uniqueBoundary',
-        },
-        localSdp: sdp
-      });
-    } catch (err) {
-      this.logger.info({err}, `Error sending SIPREC INVITE to ${this.srsUrl}`);
-      throw err;
-    }
-
-    this.logger.info({sdp: this.uac.remote.sdp}, `SrsClient:start - successfully connected to SRS ${this.srsUrl}`);
-    response = await this.subscribeAnswer({
-      ...opts,
-      sdp: this.uac.remote.sdp,
-      'to-tag': response['to-tag'],
-      label: '2'
-    });
-    if (response.result !== 'ok') {
-      this.logger.error({response}, 'SrsClient:start error calling subscribe answer');
-      throw new Error('error calling subscribe answer');
-    }
-
-    this.activated = true;
-    this.logger.info('successfully established siprec connection');
-    return true;
-  }
-
-  async stop() {
-    assert(this.activated);
-    const opts = {
-      'call-id': this.rtpEngineOpts.common['call-id'],
-      'from-tag': this.sipRecFromTag
-    };
-
-    this.del(opts)
-      //.then((response) => this.logger.debug({response}, 'Successfully stopped siprec media'))
-      .catch((err) => this.logger.info({err}, 'Error deleting siprec media session'));
-    this.uac.destroy().catch(() => {});
-    this.activated = false;
-    return true;
-  }
-
-  async pause() {
-    assert(!this.paused);
-    const opts = {
-      'call-id': this.rtpEngineOpts.common['call-id'],
-      'from-tag': this.sipRecFromTag
-    };
-    try {
-      await this.blockMedia(opts);
-      await this.uac.modify(this.sdpOffer.replace(/sendonly/g, 'inactive'));
-      this.paused = true;
-      return true;
-    } catch (err) {
-      this.logger.info({err}, 'Error pausing siprec media session');
-    }
-    return false;
-  }
-
-  async resume() {
-    assert(this.paused);
-    const opts = {
-      'call-id': this.rtpEngineOpts.common['call-id'],
-      'from-tag': this.sipRecFromTag
-    };
-    try {
-      await this.blockMedia(opts);
-      await this.uac.modify(this.sdpOffer);
-    } catch (err) {
-      this.logger.info({err}, 'Error resuming siprec media session');
-    }
-    return true;
-  }
-}
-
-module.exports = SrsClient;

lib/utils.js

@@ -15,7 +15,13 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
   const from = req.getParsedHeader('from');
   const srtpOpts = teams ? srtpCharacteristics['teams'] : srtpCharacteristics['default'];
   const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCharacteristics;
-  const srctOpts = srcIsUsingSrtp ? srtpOpts : rtpCharacteristics;
+  const srcOpts = srcIsUsingSrtp ? srtpOpts : rtpCharacteristics;
+
+  /* webrtc clients (e.g. sipjs) send DMTF via SIP INFO */
+  if ((srcIsUsingSrtp || dstIsUsingSrtp) && !teams) {
+    dstOpts.flags.push('inject DTMF');
+    srcOpts.flags.push('inject DTMF');
+  }
   const common = {
     'call-id': req.get('Call-ID'),
     'replace': ['origin', 'session-connection']
@@ -24,7 +30,7 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
     common,
     uas: {
       tag: from.params.tag,
-      mediaOpts: srctOpts
+      mediaOpts: srcOpts
     },
     uac: {
       tag: null,
@@ -37,7 +43,8 @@ const SdpWantsSrtp = (sdp) => {
   return /m=audio.*SAVP/.test(sdp);
 };
 
-const makeCallCountKey = (sid) => `${sid}:incalls`;
+const makeAccountCallCountKey = (sid) => `${sid}:incalls:account`;
+const makeSPCallCountKey = (sid) => `${sid}:incalls:sp`;
 
 const normalizeDID = (tel) => {
   const regex = /^\+(\d+)$/;
@@ -81,7 +88,8 @@ module.exports = {
   SdpWantsSrtp,
   getAppserver,
   makeRtpEngineOpts,
-  makeCallCountKey,
+  makeAccountCallCountKey,
+  makeSPCallCountKey,
   normalizeDID,
   equalsIgnoreOrder,
   systemHealth,

package-lock.json

@@ -1,32 +1,33 @@
 {
   "name": "sbc-inbound",
-  "version": "v0.7.5",
+  "version": "v0.7.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sbc-inbound",
-      "version": "v0.7.5",
+      "version": "v0.7.6",
       "license": "MIT",
       "dependencies": {
         "@jambonz/db-helpers": "^0.6.18",
-        "@jambonz/http-authenticator": "^0.2.1",
+        "@jambonz/http-authenticator": "^0.2.2",
         "@jambonz/http-health-check": "^0.0.1",
         "@jambonz/realtimedb-helpers": "^0.4.29",
         "@jambonz/rtpengine-utils": "^0.3.1",
+        "@jambonz/siprec-client-utils": "^0.1.4",
         "@jambonz/stats-collector": "^0.1.6",
-        "@jambonz/time-series": "^0.1.9",
+        "@jambonz/time-series": "^0.2.1",
         "aws-sdk": "^2.1152.0",
         "bent": "^7.3.12",
         "cidr-matcher": "^2.1.1",
         "debug": "^4.3.4",
         "drachtio-fn-b2b-sugar": "0.0.12",
-        "drachtio-srf": "^4.5.0",
+        "drachtio-srf": "^4.5.1",
         "express": "^4.18.1",
         "pino": "^7.11.0",
         "sdp-transform": "^2.14.1",
         "uuid": "^8.3.2",
-        "verify-aws-sns-signature": "^0.0.7",
+        "verify-aws-sns-signature": "^0.1.0",
         "xml2js": "^0.4.23"
       },
       "devDependencies": {
@@ -583,9 +584,9 @@
       }
     },
     "node_modules/@jambonz/http-authenticator": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@jambonz/http-authenticator/-/http-authenticator-0.2.1.tgz",
-      "integrity": "sha512-AwWyUTaw2gi364xytXMttYl8VyDkO3SESUK2DAH21Mo3yCQUnE9vdiTafeYljmrKMHwOJTb75p8UxUlXlT/Xrw==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@jambonz/http-authenticator/-/http-authenticator-0.2.2.tgz",
+      "integrity": "sha512-yl6CajF8c8BOTrXEB/AbTXgqrT6XeymwVZbJWeJG8HZA21UXkKCcM26b8f0P9qqokSvFj0ObjCk22Ks2ytSLNg==",
       "dependencies": {
         "bent": "^7.3.12",
         "debug": "^4.3.1",
@@ -690,6 +691,15 @@
         }
       }
     },
+    "node_modules/@jambonz/siprec-client-utils": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.1.4.tgz",
+      "integrity": "sha512-5UZLjR9Qg06nOUQFkGw09wpc5fY7fF7Zws2poCt3ZWG2v2FXn61nXKT0DYVYsPpHIVOvPcPetxxeU/cJZtoTxw==",
+      "dependencies": {
+        "sdp-transform": "^2.14.1",
+        "uuid": "^8.3.2"
+      }
+    },
     "node_modules/@jambonz/stats-collector": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.6.tgz",
@@ -700,12 +710,12 @@
       }
     },
     "node_modules/@jambonz/time-series": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.1.9.tgz",
-      "integrity": "sha512-FLD7mLGEMToG7s6LGWr/GtNp61753RBxyYuKSxCVI6G14bm6ydgcBdG85h8EGTVQlIp9dnwbn5ebSVsGb8a46w==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.1.tgz",
+      "integrity": "sha512-uAoeZ3ibS7kEOGdT+vaY8BB8hOV4q38eEaF+d5OvLQaHCrPonNiwB8tWhhXDwtYdDompfqVRUy/plNA9fyS7Vw==",
       "dependencies": {
         "debug": "^4.3.1",
-        "influx": "^5.8.0"
+        "influx": "^5.9.3"
       }
     },
     "node_modules/@protobufjs/aspromise": {
@@ -1592,9 +1602,9 @@
       }
     },
     "node_modules/drachtio-srf": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.0.tgz",
-      "integrity": "sha512-3Y3H+HDvur5m8b8vChGFt0ywVETnhmKX6kUvpc7/k1cKIGBfoba2xluUsLcknS2p7yYu9TQWKGd5XZacPpU3Dg==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.1.tgz",
+      "integrity": "sha512-7U8hhMrVIc33ysSUcbg64fDcx2jvqY4h/NdzhYsiU6tQ2fbkd0jzNYR6KD3dqhEzGxRAeEgcaPuQEG0+K2qVIA==",
       "dependencies": {
         "debug": "^3.2.7",
         "delegates": "^0.1.0",
@@ -2799,9 +2809,9 @@
       }
     },
     "node_modules/influx": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/influx/-/influx-5.9.0.tgz",
-      "integrity": "sha512-oAG5tpxzWep7cA+1ybEK0HIptuBGK+DwObeSmsIRr9VXBf4ggN/vqSUqlvgQpjEoeUNr2tphHZJWc9n33sle9A=="
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/influx/-/influx-5.9.3.tgz",
+      "integrity": "sha512-QQU9CgwnaEV6zMrK8+vhVItsdoKFqDioXJrjJhRQaff9utvT3N0jcrQJT9qnxFLktqgJ5ngbDY68Zh4eo4uD/w=="
     },
     "node_modules/inherits": {
       "version": "2.0.4",
@@ -3011,14 +3021,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-ssh": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
-      "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
-      "dependencies": {
-        "protocols": "^2.0.1"
-      }
-    },
     "node_modules/is-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
@@ -3699,17 +3701,6 @@
         "node": ">=0.6"
       }
     },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/nyc": {
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
@@ -3920,22 +3911,19 @@
       }
     },
     "node_modules/parse-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz",
-      "integrity": "sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
+      "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
       "dependencies": {
         "protocols": "^2.0.0"
       }
     },
     "node_modules/parse-url": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz",
-      "integrity": "sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
+      "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
       "dependencies": {
-        "is-ssh": "^1.4.0",
-        "normalize-url": "^6.1.0",
-        "parse-path": "^5.0.0",
-        "protocols": "^2.0.1"
+        "parse-path": "^7.0.0"
       }
     },
     "node_modules/parseurl": {
@@ -5095,12 +5083,12 @@
       }
     },
     "node_modules/verify-aws-sns-signature": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/verify-aws-sns-signature/-/verify-aws-sns-signature-0.0.7.tgz",
-      "integrity": "sha512-j/yePIQvLqRGshOwuEs9VT7jGh++1hBoOjjt+Rl4aAffJTu+22GwTPfAD9fLY9VqRrR4Cuiid3eNHOkmxE3TNg==",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/verify-aws-sns-signature/-/verify-aws-sns-signature-0.1.0.tgz",
+      "integrity": "sha512-giPj4dIrhounlQA+AAy0CZmqARrT2o4WjIcv1GKcnQiKBDmDpJyGIaHu/ESwOGVcZf68aLHFPrEzhudXSp4Krw==",
       "dependencies": {
         "bent": "^7.3.12",
-        "parse-url": "^7.0.2"
+        "parse-url": "^8.1.0"
       }
     },
     "node_modules/verror": {
@@ -5775,9 +5763,9 @@
       }
     },
     "@jambonz/http-authenticator": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@jambonz/http-authenticator/-/http-authenticator-0.2.1.tgz",
-      "integrity": "sha512-AwWyUTaw2gi364xytXMttYl8VyDkO3SESUK2DAH21Mo3yCQUnE9vdiTafeYljmrKMHwOJTb75p8UxUlXlT/Xrw==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@jambonz/http-authenticator/-/http-authenticator-0.2.2.tgz",
+      "integrity": "sha512-yl6CajF8c8BOTrXEB/AbTXgqrT6XeymwVZbJWeJG8HZA21UXkKCcM26b8f0P9qqokSvFj0ObjCk22Ks2ytSLNg==",
       "requires": {
         "bent": "^7.3.12",
         "debug": "^4.3.1",
@@ -5852,6 +5840,15 @@
         }
       }
     },
+    "@jambonz/siprec-client-utils": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.1.4.tgz",
+      "integrity": "sha512-5UZLjR9Qg06nOUQFkGw09wpc5fY7fF7Zws2poCt3ZWG2v2FXn61nXKT0DYVYsPpHIVOvPcPetxxeU/cJZtoTxw==",
+      "requires": {
+        "sdp-transform": "^2.14.1",
+        "uuid": "^8.3.2"
+      }
+    },
     "@jambonz/stats-collector": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.6.tgz",
@@ -5862,12 +5859,12 @@
       }
     },
     "@jambonz/time-series": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.1.9.tgz",
-      "integrity": "sha512-FLD7mLGEMToG7s6LGWr/GtNp61753RBxyYuKSxCVI6G14bm6ydgcBdG85h8EGTVQlIp9dnwbn5ebSVsGb8a46w==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.1.tgz",
+      "integrity": "sha512-uAoeZ3ibS7kEOGdT+vaY8BB8hOV4q38eEaF+d5OvLQaHCrPonNiwB8tWhhXDwtYdDompfqVRUy/plNA9fyS7Vw==",
       "requires": {
         "debug": "^4.3.1",
-        "influx": "^5.8.0"
+        "influx": "^5.9.3"
       }
     },
     "@protobufjs/aspromise": {
@@ -6564,9 +6561,9 @@
       "requires": {}
     },
     "drachtio-srf": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.0.tgz",
-      "integrity": "sha512-3Y3H+HDvur5m8b8vChGFt0ywVETnhmKX6kUvpc7/k1cKIGBfoba2xluUsLcknS2p7yYu9TQWKGd5XZacPpU3Dg==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.1.tgz",
+      "integrity": "sha512-7U8hhMrVIc33ysSUcbg64fDcx2jvqY4h/NdzhYsiU6tQ2fbkd0jzNYR6KD3dqhEzGxRAeEgcaPuQEG0+K2qVIA==",
       "requires": {
         "debug": "^3.2.7",
         "delegates": "^0.1.0",
@@ -7490,9 +7487,9 @@
       }
     },
     "influx": {
-      "version": "5.9.0",
-      "resolved": "https://registry.npmjs.org/influx/-/influx-5.9.0.tgz",
-      "integrity": "sha512-oAG5tpxzWep7cA+1ybEK0HIptuBGK+DwObeSmsIRr9VXBf4ggN/vqSUqlvgQpjEoeUNr2tphHZJWc9n33sle9A=="
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/influx/-/influx-5.9.3.tgz",
+      "integrity": "sha512-QQU9CgwnaEV6zMrK8+vhVItsdoKFqDioXJrjJhRQaff9utvT3N0jcrQJT9qnxFLktqgJ5ngbDY68Zh4eo4uD/w=="
     },
     "inherits": {
       "version": "2.0.4",
@@ -7636,14 +7633,6 @@
         "call-bind": "^1.0.2"
       }
     },
-    "is-ssh": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
-      "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
-      "requires": {
-        "protocols": "^2.0.1"
-      }
-    },
     "is-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
@@ -8180,11 +8169,6 @@
       "resolved": "https://registry.npmjs.org/nonce/-/nonce-1.0.4.tgz",
       "integrity": "sha512-FVPu+tMZPP91HDwiq1DNhn9WIhg4/uo6mXR0xXAn0IMOxDmjJOkgbH0tm7qtowvAFZofWZRX+9KWZpNURrgtSA=="
     },
-    "normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
-    },
     "nyc": {
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
@@ -8344,22 +8328,19 @@
       }
     },
     "parse-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz",
-      "integrity": "sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
+      "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
       "requires": {
         "protocols": "^2.0.0"
       }
     },
     "parse-url": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz",
-      "integrity": "sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
+      "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
       "requires": {
-        "is-ssh": "^1.4.0",
-        "normalize-url": "^6.1.0",
-        "parse-path": "^5.0.0",
-        "protocols": "^2.0.1"
+        "parse-path": "^7.0.0"
       }
     },
     "parseurl": {
@@ -9250,12 +9231,12 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "verify-aws-sns-signature": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/verify-aws-sns-signature/-/verify-aws-sns-signature-0.0.7.tgz",
-      "integrity": "sha512-j/yePIQvLqRGshOwuEs9VT7jGh++1hBoOjjt+Rl4aAffJTu+22GwTPfAD9fLY9VqRrR4Cuiid3eNHOkmxE3TNg==",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/verify-aws-sns-signature/-/verify-aws-sns-signature-0.1.0.tgz",
+      "integrity": "sha512-giPj4dIrhounlQA+AAy0CZmqARrT2o4WjIcv1GKcnQiKBDmDpJyGIaHu/ESwOGVcZf68aLHFPrEzhudXSp4Krw==",
       "requires": {
         "bent": "^7.3.12",
-        "parse-url": "^7.0.2"
+        "parse-url": "^8.1.0"
       }
     },
     "verror": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbc-inbound",
-  "version": "v0.7.5",
+  "version": "v0.7.6",
   "main": "app.js",
   "engines": {
     "node": ">= 12.0.0"
@@ -20,29 +20,30 @@
   },
   "scripts": {
     "start": "node app",
-    "test": "NODE_ENV=test HTTP_PORT=3050 JAMBONES_NETWORK_CIDR='127.0.0.1/32' JAMBONES_HOSTING=1 SBC_ACCOUNT_SID=ed649e33-e771-403a-8c99-1780eabbc803 JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=info DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 JAMBONES_FEATURE_SERVERS=172.38.0.11 node test/ ",
+    "test": "NODE_ENV=test HTTP_PORT=3050 JAMBONES_NETWORK_CIDR='127.0.0.1/32' JAMBONES_HOSTING=1 SBC_ACCOUNT_SID=ed649e33-e771-403a-8c99-1780eabbc803 JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 JAMBONES_FEATURE_SERVERS=172.38.0.11 node test/ ",
     "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
     "jslint": "eslint app.js lib"
   },
   "dependencies": {
     "@jambonz/db-helpers": "^0.6.18",
-    "@jambonz/http-authenticator": "^0.2.1",
+    "@jambonz/http-authenticator": "^0.2.2",
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/realtimedb-helpers": "^0.4.29",
     "@jambonz/rtpengine-utils": "^0.3.1",
+    "@jambonz/siprec-client-utils": "^0.1.4",
     "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.1.9",
+    "@jambonz/time-series": "^0.2.1",
     "aws-sdk": "^2.1152.0",
     "bent": "^7.3.12",
     "cidr-matcher": "^2.1.1",
     "debug": "^4.3.4",
     "drachtio-fn-b2b-sugar": "0.0.12",
-    "drachtio-srf": "^4.5.0",
+    "drachtio-srf": "^4.5.1",
     "express": "^4.18.1",
     "pino": "^7.11.0",
     "sdp-transform": "^2.14.1",
     "uuid": "^8.3.2",
-    "verify-aws-sns-signature": "^0.0.7",
+    "verify-aws-sns-signature": "^0.1.0",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {

test/sip-tests.js

@@ -58,7 +58,7 @@ test('incoming call tests', async(t) => {
     t.pass('handles in-dialog requests');
   
     await sippUac('uac-pcap-carrier-max-call-limit.xml', '172.38.0.20');
-    t.pass('rejects incoming call with 503 when max calls reached')
+    t.pass('rejects incoming call with 503 when max calls per account reached')
   
     await waitFor(10);
     const res = await queryCdrs({account_sid: 'ed649e33-e771-403a-8c99-1780eabbc803'});