healthcheck improvements

Dockerfile

@@ -1,23 +1,10 @@
-FROM --platform=linux/amd64 node:18.12.1-alpine3.16 as base
-
-RUN apk --update --no-cache add --virtual .builds-deps build-base python3
-
+FROM node:17-slim
 WORKDIR /opt/app/
-
-FROM base as build
-
-COPY package.json package-lock.json ./
-
-RUN npm ci
-
-COPY . .
-
-FROM base
-
-COPY --from=build /opt/app /opt/app/
-
+COPY package.json ./
+RUN npm install
+RUN npm prune
+COPY . /opt/app
 ARG NODE_ENV
-
 ENV NODE_ENV $NODE_ENV
 
-CMD [ "node", "app.js" ]
+CMD [ "npm", "start" ]

app.js

@@ -17,9 +17,6 @@ const opts = Object.assign({
 }, {level: process.env.JAMBONES_LOGLEVEL || 'info'});
 const logger = require('pino')(opts);
 const {
-  writeCallCount,
-  writeCallCountSP,
-  writeCallCountApp,
   writeCdrs,
   queryCdrs,
   writeAlerts,
@@ -42,8 +39,7 @@ const {
   lookupAccountBySid,
   lookupAccountCapacitiesBySid,
   lookupSipGatewaysByCarrier,
-  lookupCarrierBySid,
-  queryCallLimits
+  lookupCarrierBySid
 } = require('@jambonz/db-helpers')({
   host: process.env.JAMBONES_MYSQL_HOST,
   user: process.env.JAMBONES_MYSQL_USER,
@@ -68,9 +64,6 @@ const activeCallIds = new Map();
 
 srf.locals = {...srf.locals,
   stats,
-  writeCallCount,
-  writeCallCountSP,
-  writeCallCountApp,
   writeCdrs,
   writeAlerts,
   AlertType,
@@ -84,8 +77,7 @@ srf.locals = {...srf.locals,
     lookupAccountBySid,
     lookupAccountCapacitiesBySid,
     lookupSipGatewaysByCarrier,
-    lookupCarrierBySid,
-    queryCallLimits
+    lookupCarrierBySid
   },
   realtimeDbHelpers: {
     createHash,
@@ -99,12 +91,10 @@ const {initLocals, checkLimits, route} = require('./lib/middleware')(srf, logger
   host: process.env.JAMBONES_REDIS_HOST,
   port: process.env.JAMBONES_REDIS_PORT || 6379
 });
-const ngProtocol = process.env.JAMBONES_NG_PROTOCOL || 'udp';
-const ngPort = process.env.RTPENGINE_PORT || ('udp' === ngProtocol ? 22222 : 8080);
 const {getRtpEngine, setRtpEngines} = require('@jambonz/rtpengine-utils')([], logger, {
-  //emitter: stats,
+  emitter: stats,
   dtmfListenPort: process.env.DTMF_LISTEN_PORT || 22225,
-  protocol: ngProtocol
+  protocol: 'udp'
 });
 srf.locals.getRtpEngine = getRtpEngine;
 
@@ -184,6 +174,7 @@ if ('test' !== process.env.NODE_ENV) {
 }
 
 const lookupRtpServiceEndpoints = (lookup, serviceName) => {
+  logger.debug(`dns lookup for ${serviceName}..`);
   lookup(serviceName, {family: 4, all: true}, (err, addresses) => {
     if (err) {
       logger.error({err}, `Error looking up ${serviceName}`);
@@ -195,7 +186,7 @@ const lookupRtpServiceEndpoints = (lookup, serviceName) => {
       rtpServers.length = 0;
       Array.prototype.push.apply(rtpServers, addrs);
       logger.info({rtpServers}, 'rtpserver endpoints have been updated');
-      setRtpEngines(rtpServers.map((a) => `${a}:${ngPort}`));
+      setRtpEngines(rtpServers.map((a) => `${a}:${process.env.RTPENGINE_PORT || 22222}`));
     }
   });
 };
@@ -222,7 +213,7 @@ else {
       logger.debug({newArray, rtpServers}, 'getActiveRtpServers');
       if (!equalsIgnoreOrder(newArray, rtpServers)) {
         logger.info({newArray}, 'resetting active rtpengines');
-        setRtpEngines(newArray.map((a) => `${a}:${ngPort}`));
+        setRtpEngines(newArray.map((a) => `${a}:${process.env.RTPENGINE_PORT || 22222}`));
         rtpServers.length = 0;
         Array.prototype.push.apply(rtpServers, newArray);
       }

lib/call-session.js

@@ -1,7 +1,5 @@
 const Emitter = require('events');
-const sdpTransform = require('sdp-transform');
-const SrsClient = require('@jambonz/siprec-client-utils');
-const {makeRtpEngineOpts, nudgeCallCounts} = require('./utils');
+const {makeRtpEngineOpts, makeCallCountKey} = require('./utils');
 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
 const {SipError, stringifyUri, parseUri} = require('drachtio-srf');
 const debug = require('debug')('jambonz:sbc-outbound');
@@ -13,17 +11,10 @@ const makeInviteInProgressKey = (callid) => `sbc-out-iip${callid}`;
  */
 const createBLegFromHeader = (req, teams) => {
   const from = req.getParsedHeader('From');
+  const host = teams ? req.get('X-MS-Teams-Tenant-FQDN') : 'localhost';
   const uri = parseUri(from.uri);
-  let user = uri.user || 'anonymous';
-  let host = 'localhost';
-  if (teams) {
-    host = req.get('X-MS-Teams-Tenant-FQDN');
-  }
-  else if (req.has('X-Preferred-From-User') || req.has('X-Preferred-From-Host')) {
-    user = req.get('X-Preferred-From-User') || user;
-    host = req.get('X-Preferred-From-Host') || host;
-  }
-  return `sip:${user}@${host}`;
+  if (uri && uri.user) return `sip:${uri.user}@${host}`;
+  return `sip:anonymous@${host}`;
 };
 const createBLegToHeader = (req, teams) => {
   const to = req.getParsedHeader('To');
@@ -40,13 +31,11 @@ const initCdr = (srf, req) => {
   const to = arr ? arr[1] : req.calledNumber;
   arr = regex.exec(req.callingNumber);
   const from = arr ? arr[1] : req.callingNumber;
-  const applicationSid = req.get('X-Application-Sid');
 
   return {
     account_sid: req.get('X-Account-Sid'),
     call_sid: req.get('X-Call-Sid'),
     sip_callid: req.get('Call-ID'),
-    ...(applicationSid && {application_sid: applicationSid}),
     from,
     to,
     duration: 0,
@@ -59,15 +48,6 @@ const initCdr = (srf, req) => {
   };
 };
 
-const updateRtpEngineFlags = (sdp, opts) => {
-  try {
-    const parsed = sdpTransform.parse(sdp);
-    const codec = parsed.media[0].rtp[0].codec;
-    if (['PCMU', 'PCMA'].includes(codec)) opts.flags.push(`codec-accept-${codec}`);
-  } catch (err) {}
-  return opts;
-};
-
 class CallSession extends Emitter {
   constructor(logger, req, res) {
     super();
@@ -80,32 +60,24 @@ class CallSession extends Emitter {
     this.activeCallIds = this.srf.locals.activeCallIds;
     this.writeCdrs = this.srf.locals.writeCdrs;
 
+    this.incrKey = req.srf.locals.realtimeDbHelpers.incrKey;
     this.decrKey = req.srf.locals.realtimeDbHelpers.decrKey;
+    this.callCountKey = makeCallCountKey(req.locals.account_sid);
 
     const {performLcr, lookupCarrierBySid, lookupSipGatewaysByCarrier} = this.srf.locals.dbHelpers;
     this.performLcr = performLcr;
     this.lookupCarrierBySid = lookupCarrierBySid;
     this.lookupSipGatewaysByCarrier = lookupSipGatewaysByCarrier;
-
-    this._mediaReleased = false;
   }
 
   get account_sid() {
     return this.req.locals.account_sid;
   }
 
-  get application_sid() {
-    return this.req.locals.application_sid;
-  }
-
   get privateSipAddress() {
     return this.srf.locals.privateSipAddress;
   }
 
-  get isMediaReleased() {
-    return this._mediaReleased;
-  }
-
   async connect() {
     const teams = this.teams = this.req.locals.target === 'teams';
     const engine = this.srf.locals.getRtpEngine();
@@ -122,12 +94,8 @@ class CallSession extends Emitter {
       unblockMedia,
       blockDTMF,
       unblockDTMF,
-      playDTMF,
       subscribeDTMF,
-      unsubscribeDTMF,
-      subscribeRequest,
-      subscribeAnswer,
-      unsubscribe
+      unsubscribeDTMF
     } = engine;
     const {createHash, retrieveHash} = this.srf.locals.realtimeDbHelpers;
     this.offer = offer;
@@ -137,12 +105,8 @@ 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;
-    this.subscribeAnswer = subscribeAnswer;
-    this.unsubscribe = unsubscribe;
 
     this.rtpEngineOpts = makeRtpEngineOpts(this.req, false, this.useWss || teams, teams);
     this.rtpEngineResource = {destroy: this.del.bind(null, this.rtpEngineOpts.common)};
@@ -257,13 +221,13 @@ class CallSession extends Emitter {
       }
 
       // rtpengine 'offer'
-      const opts = updateRtpEngineFlags(this.req.body, {
+      const opts = {
         ...this.rtpEngineOpts.common,
         ...this.rtpEngineOpts.uac.mediaOpts,
         'from-tag': this.rtpEngineOpts.uas.tag,
         direction:  ['private', 'public'],
         sdp: this.req.body
-      });
+      };
       const response = await this.offer(opts);
       debug(`response from rtpengine to offer ${JSON.stringify(response)}`);
       this.logger.debug({offer: opts, response}, 'initial offer to rtpengine');
@@ -324,14 +288,13 @@ class CallSession extends Emitter {
               '-X-MS-Teams-FQDN',
               '-X-MS-Teams-Tenant-FQDN',
               '-X-Trace-ID',
+              'X-CID',
               '-Allow',
               '-Session-Expires',
               '-X-Requested-Carrier-Sid',
               '-X-Jambonz-Routing',
               '-X-Jambonz-FS-UUID',
-              '-X-Preferred-From-User',
-              'X-Preferred-From-Host',
-              '-X-Jambonz-FS-UUID',
+              'Min-SE'
             ],
             proxyResponseHeaders: [
               'all',
@@ -373,9 +336,7 @@ class CallSession extends Emitter {
               if (!this.req.locals.account.disable_cdrs) {
                 this.req.locals.cdr = {
                   ...initCdr(this.req.srf, inv),
-                  service_provider_sid: this.req.locals.service_provider_sid,
                   account_sid: this.req.locals.account_sid,
-                  ...(this.req.locals.application_sid && {application_sid: this.req.locals.application_sid}),
                   trunk
                 };
               }
@@ -431,7 +392,6 @@ class CallSession extends Emitter {
                 sip_status: status
               }).catch((err) => this.logger.error({err}, 'Error writing cdr for call failure'));
             }
-            return;
           }
           else {
             this.logger.info(`got ${err.status}, cranking back to next destination`);
@@ -470,19 +430,13 @@ class CallSession extends Emitter {
           await other.destroy();
         } catch (err) {}
 
-        const trackingOn = process.env.JAMBONES_TRACK_ACCOUNT_CALLS ||
-          process.env.JAMBONES_TRACK_SP_CALLS ||
-          process.env.JAMBONES_TRACK_APP_CALLS;
-
-        if (process.env.JAMBONES_HOSTING || trackingOn) {
-          const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
-          await nudgeCallCounts(this.logger, {
-            service_provider_sid: this.service_provider_sid,
-            account_sid: this.account_sid,
-            application_sid: this.application_sid
-          }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
-            .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
-        }
+        this.decrKey(this.callCountKey)
+          .then((count) => {
+            this.logger.debug(`after hangup there are ${count} active calls for this account`);
+            debug(`after hangup there are ${count} active calls for this account`);
+            return;
+          })
+          .catch((err) => this.logger.error({err}, 'Error decrementing call count'));
 
         /* write cdr for connected call */
         if (this.req.locals.cdr) {
@@ -571,17 +525,11 @@ Duration=${payload.duration} `
   async _onReinvite(dlg, req, res) {
     try {
       const reason = req.get('X-Reason');
-      const isReleasingMedia = reason && dlg.type === 'uas' && ['release-media', 'anchor-media'].includes(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;
       const offerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uac.mediaOpts : this.rtpEngineOpts.uas.mediaOpts;
       const answerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uas.mediaOpts : this.rtpEngineOpts.uac.mediaOpts;
       const direction =  dlg.type === 'uas' ? ['private', 'public'] : ['public', 'private'];
-      if (isReleasingMedia) {
-        if (!offerMedia.flags.includes('port latching')) offerMedia.flags.push('port latching');
-        if (!offerMedia.flags.includes('asymmetric')) offerMedia.flags.push('asymmetric');
-        offerMedia.flags = offerMedia.flags.filter((f) => f !== 'media handover');
-      }
       let opts = {
         ...this.rtpEngineOpts.common,
         ...offerMedia,
@@ -592,22 +540,18 @@ Duration=${payload.duration} `
       };
       if (reason && opts.flags && !opts.flags.includes('reset')) opts.flags.push('reset');
 
+
       let response = await this.offer(opts);
       if ('ok' !== response.result) {
         res.send(488);
         throw new Error(`_onReinvite: rtpengine failed: offer: ${JSON.stringify(response)}`);
       }
-      this.logger.debug({opts, response}, 'CallSession:_onReinvite: (offer)');
 
       /* if this is a re-invite from the FS to change media anchoring, avoid sending the reinvite out */
       let sdp;
-      if (isReleasingMedia) {
+      if (reason && dlg.type === 'uas' && ['release-media', 'anchor-media'].includes(reason)) {
         this.logger.info(`got a reinvite from FS to ${reason}`);
         sdp = dlg.other.remote.sdp;
-        if (!answerMedia.flags.includes('port latching')) answerMedia.flags.push('port latching');
-        if (!answerMedia.flags.includes('asymmetric')) answerMedia.flags.push('asymmetric');
-        answerMedia.flags = answerMedia.flags.filter((f) => f !== 'media handover');
-        this._mediaReleased = 'release-media' === reason;
       }
       else {
         sdp = await dlg.other.modify(response.sdp);
@@ -625,7 +569,7 @@ Duration=${payload.duration} `
         res.send(488);
         throw new Error(`_onReinvite: rtpengine failed: ${JSON.stringify(response)}`);
       }
-      this.logger.debug({opts, sdp: response.sdp}, 'CallSession:_onReinvite: (answer) sending back upstream');
+      this.logger.info({sdp: response.sdp}, 'CallSession:_onReinvite: sending back upstream');
       res.send(200, {body: response.sdp});
     } catch (err) {
       this.logger.error(err, 'Error handling reinvite');
@@ -634,7 +578,6 @@ Duration=${payload.duration} `
 
   async _onInfo(dlg, req, res) {
     try {
-      const contentType = req.get('Content-Type');
       if (dlg.type === 'uas' && req.has('X-Reason')) {
         const toTag = this.rtpEngineOpts.uac.tag;
         const reason = req.get('X-Reason');
@@ -653,123 +596,6 @@ Duration=${payload.duration} `
           const response = Promise.all([this.unblockMedia(opts), this.unblockDTMF(opts)]);
           this.logger.info({response}, `_onInfo: response to rtpengine command for ${reason}`);
         }
-        else if (reason.includes('CallRecording')) {
-          let succeeded = false;
-          if (reason === 'startCallRecording') {
-            const from = this.req.getParsedHeader('From');
-            const to = this.req.getParsedHeader('To');
-            const aorFrom = from.uri;
-            const aorTo = to.uri;
-            this.logger.info({to, from}, 'startCallRecording request for an outbound call');
-
-            const srsUrl = req.get('X-Srs-Url');
-            const srsRecordingId = req.get('X-Srs-Recording-ID');
-            const callSid = req.get('X-Call-Sid');
-            const accountSid = req.get('X-Account-Sid');
-            const applicationSid = req.get('X-Application-Sid');
-            if (this.srsClient) {
-              res.send(400);
-              this.logger.info('discarding duplicate startCallRecording request for a call');
-              return;
-            }
-            if (!srsUrl) {
-              this.logger.info('startCallRecording request is missing X-Srs-Url header');
-              res.send(400);
-              return;
-            }
-            this.srsClient = new SrsClient(this.logger, {
-              srf: dlg.srf,
-              direction: 'outbound',
-              originalInvite: this.req,
-              callingNumber: this.req.callingNumber,
-              calledNumber: this.req.calledNumber,
-              srsUrl,
-              srsRecordingId,
-              callSid,
-              accountSid,
-              applicationSid,
-              rtpEngineOpts: this.rtpEngineOpts,
-              toTag,
-              aorFrom,
-              aorTo,
-              subscribeRequest: this.subscribeRequest,
-              subscribeAnswer: this.subscribeAnswer,
-              del: this.del,
-              blockMedia: this.blockMedia,
-              unblockMedia: this.unblockMedia,
-              unsubscribe: this.unsubscribe
-            });
-            try {
-              succeeded = await this.srsClient.start();
-            } catch (err) {
-              this.logger.error({err}, 'Error starting SipRec call recording');
-            }
-          }
-          else if (reason === 'stopCallRecording') {
-            if (!this.srsClient) {
-              res.send(400);
-              this.logger.info('discarding stopCallRecording request because we are not recording');
-              return;
-            }
-            try {
-              succeeded = await this.srsClient.stop();
-            } catch (err) {
-              this.logger.error({err}, 'Error stopping SipRec call recording');
-            }
-            this.srsClient = null;
-          }
-          else if (reason === 'pauseCallRecording') {
-            if (!this.srsClient || this.srsClient.paused) {
-              this.logger.info('discarding invalid pauseCallRecording request');
-              res.send(400);
-              return;
-            }
-            succeeded = await this.srsClient.pause();
-          }
-          else if (reason === 'resumeCallRecording') {
-            if (!this.srsClient || !this.srsClient.paused) {
-              res.send(400);
-              this.logger.info('discarding invalid resumeCallRecording request');
-              return;
-            }
-            succeeded = await this.srsClient.resume();
-          }
-          res.send(succeeded ? 200 : 503);
-        }
-      }
-      else if (dlg.type === 'uac' && ['application/dtmf-relay', 'application/dtmf'].includes(contentType)) {
-        const arr = /Signal=\s*([1-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.uac.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 response = await dlg.other.request({
@@ -814,10 +640,10 @@ Duration=${payload.duration} `
       res.send(202);
 
       // invite to new fs
-      const headers = {
-        ...(req.has('X-Retain-Call-Sid') && {'X-Retain-Call-Sid': req.get('X-Retain-Call-Sid')}),
-        ...(req.has('X-Account-Sid') && {'X-Account-Sid': req.get('X-Account-Sid')})
-      };
+      const headers = {};
+      if (req.has('X-Retain-Call-Sid')) {
+        Object.assign(headers, {'X-Retain-Call-Sid': req.get('X-Retain-Call-Sid')});
+      }
       const dlg = await this.srf.createUAC(referTo.uri, {localSdp: dlg.local.sdp, headers});
       this.uas = dlg;
       this.uas.other = this.uac;

lib/middleware.js

@@ -1,7 +1,7 @@
 const debug = require('debug')('jambonz:sbc-outbound');
 const parseUri = require('drachtio-srf').parseUri;
 const Registrar = require('@jambonz/mw-registrar');
-const {selectHostPort, nudgeCallCounts} = require('./utils');
+const {selectHostPort, makeCallCountKey} = require('./utils');
 const FS_UUID_SET_NAME =  'fsUUIDs';
 
 module.exports = (srf, logger, opts) => {
@@ -10,15 +10,13 @@ module.exports = (srf, logger, opts) => {
   const registrar = new Registrar(opts);
   const {
     lookupAccountCapacitiesBySid,
-    lookupAccountBySid,
-    queryCallLimits
+    lookupAccountBySid
   }  = srf.locals.dbHelpers;
 
   const initLocals = async(req, res, next) => {
     req.locals = req.locals || {};
     const callId = req.get('Call-ID');
     req.locals.account_sid = req.get('X-Account-Sid');
-    req.locals.application_sid = req.get('X-Application-Sid');
     const traceId = req.locals.trace_id = req.get('X-Trace-ID');
     req.locals.logger = logger.child({
       callId,
@@ -65,6 +63,7 @@ module.exports = (srf, logger, opts) => {
       }
     }
 
+
     stats.increment('sbc.invites', ['direction:outbound']);
 
     req.on('cancel', () => {
@@ -77,7 +76,6 @@ module.exports = (srf, logger, opts) => {
 
     try {
       req.locals.account = await lookupAccountBySid(req.locals.account_sid);
-      req.locals.service_provider_sid = req.locals.account.service_provider_sid;
     } catch (err) {
       req.locals.logger.error({err}, `Error looking up account sid ${req.locals.account_sid}`);
       res.send(500);
@@ -87,27 +85,26 @@ module.exports = (srf, logger, opts) => {
   };
 
   const checkLimits = async(req, res, next) => {
-    const {logger, account_sid, service_provider_sid, application_sid} = req.locals;
-    const trackingOn = process.env.JAMBONES_TRACK_ACCOUNT_CALLS ||
-      process.env.JAMBONES_TRACK_SP_CALLS ||
-      process.env.JAMBONES_TRACK_APP_CALLS;
-    if (!process.env.JAMBONES_HOSTING && !trackingOn) {
-      logger.debug('tracking is off, skipping call limit checks');
-      return next(); // skip
-    }
-
-    const {writeCallCount, writeCallCountSP, writeCallCountApp, writeAlerts, AlertType} = req.srf.locals;
+    const {logger, account_sid} = req.locals;
+    const {writeAlerts, AlertType} = req.srf.locals;
 
+    const key = makeCallCountKey(account_sid);
     try {
+      /* increment the call count */
+      const calls = await incrKey(key);
+      debug(`checkLimits: call count is now ${calls}`);
+
       /* decrement count if INVITE is later rejected */
-      res.once('end', async({status}) => {
+      res.once('end', ({status}) => {
         if (status > 200) {
-          nudgeCallCounts(logger, {
-            service_provider_sid,
-            account_sid,
-            application_sid
-          }, decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
-            .catch((err) => logger.error(err, 'Error decrementing call counts'));
+          debug('checkLimits: decrementing call count due to rejection');
+          decrKey(key)
+            .then((count) => {
+              logger.debug({key}, `after rejection there are ${count} active calls for this account`);
+              debug({key}, `after rejection there are ${count} active calls for this account`);
+              return;
+            })
+            .catch((err) => logger.error({err}, 'checkLimits: decrKey err'));
           const tags = ['accepted:no', `sipStatus:${status}`];
           stats.increment('sbc.originations', tags);
         }
@@ -117,13 +114,6 @@ module.exports = (srf, logger, opts) => {
         }
       });
 
-      /* increment the call count */
-      const  {callsSP, calls} = await nudgeCallCounts(logger, {
-        service_provider_sid,
-        account_sid,
-        application_sid
-      }, incrKey, {writeCallCountSP, writeCallCount, writeCallCountApp});
-
       /* compare to account's limit, though avoid db hit when call count is low */
       const minLimit = process.env.MIN_CALL_LIMIT ?
         parseInt(process.env.MIN_CALL_LIMIT) :
@@ -132,54 +122,23 @@ module.exports = (srf, logger, opts) => {
 
       const capacities = await lookupAccountCapacitiesBySid(account_sid);
       const limit = capacities.find((c) => c.category == 'voice_call_session');
-      if (limit) {
-        const limit_sessions = limit.quantity;
-
-        if (calls > limit_sessions) {
-          logger.info({calls, limit_sessions}, 'checkLimits: limits exceeded');
-          writeAlerts({
-            alert_type: AlertType.ACCOUNT_CALL_LIMIT,
-            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);
-        }
+      if (!limit) {
+        logger.debug('checkLimits: no call limits specified');
+        return next();
       }
-      else if (trackingOn) {
-        const {account_limit, sp_limit} = await queryCallLimits(service_provider_sid, account_sid);
-        if (process.env.JAMBONES_TRACK_ACCOUNT_CALLS && account_limit > 0 && calls > account_limit) {
-          logger.info({calls, account_limit}, 'checkLimits: account limits exceeded');
-          writeAlerts({
-            alert_type: AlertType.ACCOUNT_CALL_LIMIT,
-            service_provider_sid: service_provider_sid,
-            account_sid,
-            count: calls
-          }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
-          res.send(503, 'Max Account Calls In Progress', {
-            headers: {
-              'X-Account-Sid': account_sid,
-              'X-Call-Limit': account_limit
-            }
-          });
-          return req.srf.endSession(req);
-        }
-        if (process.env.JAMBONES_TRACK_SP_CALLS && sp_limit > 0 && callsSP > sp_limit) {
-          logger.info({callsSP, sp_limit}, 'checkLimits: service provider limits exceeded');
-          writeAlerts({
-            alert_type: AlertType.SP_CALL_LIMIT,
-            service_provider_sid: service_provider_sid,
-            count: callsSP
-          }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
-          res.send(503, 'Max Service Provider Calls In Progress', {
-            headers: {
-              'X-Service-Provider-Sid': service_provider_sid,
-              'X-Call-Limit': sp_limit
-            }
-          });
-          return req.srf.endSession(req);
-        }
+      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);
       }
       next();
     } catch (err) {

lib/utils.js

@@ -4,21 +4,12 @@ const debug = require('debug')('jambonz:sbc-outbound');
 
 function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
   const from = req.getParsedHeader('from');
-  const rtpCopy = JSON.parse(JSON.stringify(rtpCharacteristics));
-  const srtpCopy = JSON.parse(JSON.stringify(srtpCharacteristics));
-  const srtpOpts = teams ? srtpCopy['teams'] : srtpCopy['default'];
-  const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCopy;
-  const srcOpts = srcIsUsingSrtp ? srtpOpts : rtpCopy;
-
-  /* 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 srtpOpts = teams ? srtpCharacteristics['teams'] : srtpCharacteristics['default'];
+  const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCharacteristics;
+  const srcOpts = srcIsUsingSrtp ? srtpOpts : rtpCharacteristics;
   const common = {
     'call-id': req.get('Call-ID'),
-    'replace': ['origin', 'session-connection'],
-    'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no'
+    'replace': ['origin', 'session-connection']
   };
   return {
     common,
@@ -80,9 +71,7 @@ const pingMsTeamsGateways = (logger, srf) => {
     });
 };
 
-const makeAccountCallCountKey = (sid) => `outcalls:account:${sid}`;
-const makeSPCallCountKey = (sid) => `outcalls:sp:${sid}`;
-const makeAppCallCountKey = (sid) => `outcalls:app:${sid}`;
+const makeCallCountKey = (sid) => `${sid}:outcalls`;
 
 const equalsIgnoreOrder = (a, b) => {
   if (a.length !== b.length) return false;
@@ -115,74 +104,12 @@ const createHealthCheckApp = (port, logger) => {
   });
 };
 
-const nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
-  const {service_provider_sid, account_sid, application_sid} = sids;
-  const {writeCallCount, writeCallCountSP, writeCallCountApp} = writers;
-  const nudges = [];
-  const writes = [];
-
-  logger.debug(sids, 'nudgeCallCounts');
-
-  if (process.env.JAMBONES_TRACK_SP_CALLS) {
-    const key = makeSPCallCountKey(service_provider_sid);
-    nudges.push(nudgeOperator(key));
-  }
-  else {
-    nudges.push(() => Promise.resolve(null));
-  }
-
-  if (process.env.JAMBONES_TRACK_ACCOUNT_CALLS || process.env.JAMBONES_HOSTING) {
-    const key = makeAccountCallCountKey(account_sid);
-    nudges.push(nudgeOperator(key));
-  }
-  else {
-    nudges.push(() => Promise.resolve(null));
-  }
-
-  if (process.env.JAMBONES_TRACK_APP_CALLS && application_sid) {
-    const key = makeAppCallCountKey(application_sid);
-    nudges.push(nudgeOperator(key));
-  }
-  else {
-    nudges.push(() => Promise.resolve(null));
-  }
-
-  try {
-    const [callsSP, calls, callsApp] = await Promise.all(nudges);
-    logger.debug({
-      calls, callsSP, callsApp,
-      service_provider_sid, account_sid, application_sid}, 'call counts after adjustment');
-    if (process.env.JAMBONES_TRACK_SP_CALLS) {
-      writes.push(writeCallCountSP({service_provider_sid, calls_in_progress: callsSP}));
-    }
-
-    if (process.env.JAMBONES_TRACK_ACCOUNT_CALLS || process.env.JAMBONES_HOSTING) {
-      writes.push(writeCallCount({service_provider_sid, account_sid, calls_in_progress: calls}));
-    }
-
-    if (process.env.JAMBONES_TRACK_APP_CALLS && application_sid) {
-      writes.push(writeCallCountApp({service_provider_sid, account_sid, application_sid, calls_in_progress: callsApp}));
-    }
-
-    /* write the call counts to the database */
-    Promise.all(writes).catch((err) => logger.error({err}, 'Error writing call counts'));
-
-    return {callsSP, calls, callsApp};
-  } catch (err) {
-    logger.error(err, 'error incrementing call counts');
-  }
-
-  return {callsSP: null, calls: null, callsApp: null};
-};
-
 module.exports = {
   makeRtpEngineOpts,
   selectHostPort,
   pingMsTeamsGateways,
-  makeAccountCallCountKey,
-  makeSPCallCountKey,
+  makeCallCountKey,
   equalsIgnoreOrder,
   systemHealth,
-  createHealthCheckApp,
-  nudgeCallCounts
+  createHealthCheckApp
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbc-outbound",
-  "version": "v0.7.7",
+  "version": "v0.7.5",
   "main": "app.js",
   "engines": {
     "node": ">= 12.0.0"
@@ -22,32 +22,29 @@
   "description": "jambonz session border controller application for outbound calls",
   "scripts": {
     "start": "node app",
-    "test": "NODE_ENV=test HTTP_PORT=3050 JAMBONES_HOSTING=1 JAMBONES_NETWORK_CIDR=127.0.0.1/32 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_TIME_SERIES_HOST=127.0.0.1 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 node test/ ",
+    "test": "NODE_ENV=test HTTP_PORT=3050 JAMBONZ_HOSTING=1 JAMBONES_NETWORK_CIDR=127.0.0.1/32 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_TIME_SERIES_HOST=127.0.0.1 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 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.7.3",
-    "@jambonz/realtimedb-helpers": "^0.4.35",
+    "@jambonz/db-helpers": "^0.6.18",
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/mw-registrar": "0.2.2",
-    "@jambonz/rtpengine-utils": "^0.3.10",
-    "@jambonz/siprec-client-utils": "^0.1.4",
+    "@jambonz/realtimedb-helpers": "^0.4.24",
+    "@jambonz/rtpengine-utils": "^0.3.1",
     "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.2.5",
+    "@jambonz/time-series": "^0.1.9",
     "cidr-matcher": "^2.1.1",
-    "debug": "^4.3.4",
+    "debug": "^4.3.3",
     "drachtio-fn-b2b-sugar": "^0.0.12",
-    "drachtio-srf": "^4.5.1",
-    "express": "^4.18.1",
-    "pino": "^7.11.0",
-    "sdp-transform": "^2.14.1"
+    "drachtio-srf": "^4.4.59",
+    "husky": "^7.0.4",
+    "pino": "^7.4.1"
   },
   "devDependencies": {
-    "bent": "^7.3.12",
     "eslint": "^7.32.0",
-    "eslint-plugin-promise": "^5.2.0",
+    "eslint-plugin-promise": "^5.1.1",
     "nyc": "^15.1.0",
-    "tape": "^5.5.3"
+    "tape": "^5.3.2"
   }
 }

test/registrar.env

@@ -5,7 +5,3 @@ DRACHTIO_SECRET=cymru
 JAMBONES_REDIS_HOST=172.39.0.11
 JAMBONES_REDIS_PORT=6379
 JAMBONES_LOGLEVEL=info
-JAMBONES_MYSQL_HOST=172.39.0.2
-JAMBONES_MYSQL_USER=jambones_test
-JAMBONES_MYSQL_PASSWORD=jambones_test
-JAMBONES_MYSQL_DATABASE=jambones_test

test/sip-tests.js

@@ -84,7 +84,7 @@ test('sbc-outbound tests', async(t) => {
 
     const res = await queryCdrs({account_sid: 'ed649e33-e771-403a-8c99-1780eabbc803'});
     //console.log(`cdrs: ${JSON.stringify(res)}`);
-    t.ok(res.total === 5, 'wrote 5 cdrs');
+    t.ok(res.total === 6, 'wrote 6 cdrs');
 
     srf.disconnect();
   } catch (err) {