update version

https://github.com/drachtio/drachtio-server/issues/424

app.js

@@ -67,6 +67,9 @@ const {
 }, logger);
 const {
   client: redisClient,
+  addKey,
+  deleteKey,
+  retrieveKey,
   createSet,
   retrieveSet,
   addToSet,
@@ -108,6 +111,9 @@ srf.locals = {...srf.locals,
     lookupSystemInformation
   },
   realtimeDbHelpers: {
+    addKey,
+    deleteKey,
+    retrieveKey,
     createSet,
     incrKey,
     decrKey,
@@ -240,10 +246,6 @@ srf.invite((req, res) => {
     }
     return session.replaces(req, res);
   }
-  if (req.locals.sdp === '') {
-    logger.info('no sdp in invite');
-    return res.send(488, {headers: {'X-Reason': '3pcc INVITEs without SDP are not currently supported'}});
-  }
   const session = new CallSession(logger, req, res);
   session.connect();
 });

lib/autoscale-manager.js

@@ -8,7 +8,7 @@ module.exports = (logger) => {
   // listen for SNS lifecycle changes
   let lifecycleEmitter = new Emitter();
   lifecycleEmitter.dryUpCalls = false;
-  if (process.env.AWS_SNS_TOPIC_ARM) {
+  if (process.env.AWS_SNS_TOPIC_ARN) {
 
     (async function() {
       try {

lib/aws-sns-lifecycle.js

@@ -69,7 +69,17 @@ class SnsNotifier extends Emitter {
             subscriptionRequestId: this.subscriptionRequestId
           }, 'response from SNS SubscribeURL');
           const data = await this.describeInstance();
-          this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
+
+          const group = data.AutoScalingGroups.find((group) =>
+            group.Instances && group.Instances.some((instance) => instance.InstanceId === this.instanceId)
+          );
+          if (!group) {
+            this.logger.error('Current instance not found in any Auto Scaling group', data);
+          } else {
+            const instance = group.Instances.find((instance) => instance.InstanceId === this.instanceId);
+            this.lifecycleState = instance.LifecycleState;
+          }
+
           this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
           break;
 
@@ -137,13 +147,13 @@ class SnsNotifier extends Emitter {
     try {
       const params = {
         Protocol: 'http',
-        TopicArn: process.env.AWS_SNS_TOPIC_ARM,
+        TopicArn: process.env.AWS_SNS_TOPIC_ARN,
         Endpoint: this.snsEndpoint
       };
       const response = await snsClient.send(new SubscribeCommand(params));
-      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARN}`);
     } catch (err) {
-      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARN}`);
     }
   }
 
@@ -154,9 +164,9 @@ class SnsNotifier extends Emitter {
         SubscriptionArn: this.subscriptionArn
       };
       const response = await snsClient.send(new UnsubscribeCommand(params));
-      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARN}`);
     } catch (err) {
-      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARN}`);
     }
   }
 

lib/call-session.js

@@ -7,8 +7,11 @@ const {
   nudgeCallCounts,
   roundTripTime,
   parseConnectionIp,
-  isPrivateVoipNetwork
+  isPrivateVoipNetwork,
+  makeFullMediaReleaseKey,
+  makePartnerFullMediaReleaseKey
 } = require('./utils');
+const { MediaPath } = require('./constants.json');
 
 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
 const {parseUri, stringifyUri, SipError} = require('drachtio-srf');
@@ -61,7 +64,10 @@ class CallSession extends Emitter {
     this.activeCallIds = this.srf.locals.activeCallIds;
 
     this.decrKey = req.srf.locals.realtimeDbHelpers.decrKey;
-    this._mediaReleased = false;
+    this.addKey = req.srf.locals.realtimeDbHelpers.addKey;
+    this.retrieveKey = req.srf.locals.realtimeDbHelpers.retrieveKey;
+
+    this._mediaPath = MediaPath.FullMedia;
 
     this.application_sid = req.locals.application_sid;
     this.account_sid = req.locals.account_sid;
@@ -79,7 +85,7 @@ class CallSession extends Emitter {
   }
 
   get isMediaReleased() {
-    return this._mediaReleased;
+    return this._mediaPath !== MediaPath.FullMedia;
   }
 
   get isFive9VoiceStream() {
@@ -102,7 +108,8 @@ class CallSession extends Emitter {
 
   async connect() {
     const {sdp} = this.req.locals;
-    this.logger.info('inbound call accepted for routing');
+    const is3pcc = this.req.body?.length === 0;
+    this.logger.info(`inbound ${is3pcc ? '3pcc ' : ''}call accepted for routing`);
     const engine = this.getRtpEngine();
     if (!engine) {
       this.logger.info('No available rtpengines, rejecting call!');
@@ -173,17 +180,17 @@ class CallSession extends Emitter {
       host = obj.host;
       proxy = `sip:${featureServer}`;
     }
-    if (obj.user) uri = `${scheme}:${obj.user}@${host}`;
-    else uri = `${scheme}:${host}`;
+    if (obj.user) uri = `sip:${obj.user}@${host}`;
+    else uri = `sip:${host}`;
     this.logger.info(`uri will be: ${uri}, proxy ${proxy}`);
 
-    try {
+    const sendOfferToRtpEngine = async(remoteSdp) => {
       const opts = {
         ...this.rtpEngineOpts.common,
         ...this.rtpEngineOpts.uac.mediaOpts,
         'from-tag': this.rtpEngineOpts.uas.tag,
         direction:  [isPrivateVoipNetwork(this.req.source_address) ? 'private' : 'public', 'private'],
-        sdp
+        sdp: remoteSdp
       };
       const startAt = process.hrtime();
       const response = await this.offer(opts);
@@ -196,7 +203,11 @@ class CallSession extends Emitter {
         this.logger.error({}, `rtpengine offer failed with ${JSON.stringify(response)}`);
         throw new Error('rtpengine failed: answer');
       }
+      return response;
+    };
 
+    try {
+      const response = await sendOfferToRtpEngine(sdp);
       let headers = {
         'From': createBLegFromHeader(this.req),
         'To': this.req.get('To'),
@@ -206,9 +217,13 @@ 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;
+      let spdOfferB;
+      if (this.siprec && this.xml) {
+        spdOfferB = createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content);
+      }
+      else if (!is3pcc) {
+        spdOfferB = response.sdp;
+      }
 
       if (this.req.locals.carrier) {
         Object.assign(headers, {
@@ -275,7 +290,10 @@ class CallSession extends Emitter {
           '-X-Authenticated-User'
         ],
         proxyResponseHeaders: ['all', '-X-Trace-ID'],
-        localSdpB: spdOfferB,
+        localSdpB: spdOfferB ? spdOfferB : async(ackBody) => {
+          const response = await sendOfferToRtpEngine(ackBody);
+          return response.sdp;
+        },
         localSdpA: async(sdp, res) => {
           this.rtpEngineOpts.uac.tag = res.getParsedHeader('To').params.tag;
           const opts = {
@@ -286,8 +304,12 @@ class CallSession extends Emitter {
             sdp
           };
           const startAt = process.hrtime();
-          const response = await this.answer(opts);
-          this.logger.debug({response, opts}, 'response from rtpengine to answer');
+          const aOpts = {
+            ...opts,
+            ...(is3pcc && {direction: ['private', 'public']})
+          };
+          const response = await this.answer(aOpts);
+          this.logger.debug({response, opts: aOpts}, 'response from rtpengine to answer');
           const rtt = roundTripTime(startAt);
           this.stats.histogram('app.rtpengine.response_time', rtt, [
             'direction:inbound', 'command:answer', `rtpengine:${this.rtpengineIp}`]);
@@ -307,7 +329,7 @@ class CallSession extends Emitter {
           }
 
           return response.sdp;
-        }
+        },
       });
 
       // successfully connected
@@ -325,7 +347,16 @@ class CallSession extends Emitter {
         this.emit('failed');
       }
       else if (err.message !== 'call canceled') {
+        const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
         this.logger.error(err, 'unexpected error routing inbound call');
+        nudgeCallCounts(this.req, 'failure', {
+          service_provider_sid: this.service_provider_sid,
+          account_sid: this.account_sid,
+          application_sid: this.application_sid,
+          callId: this.req.locals.callId
+        }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
+          .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
+
       }
       this.srf.endSession(this.req);
     }
@@ -392,6 +423,14 @@ class CallSession extends Emitter {
         trace_id: uac.res?.get('X-Trace-ID') || '00000000000000000000000000000000'
       };
     }
+
+    /* save far end SDP for later use if we do a full media release */
+    if (process.env.JAMBONES_ENABLE_FULL_MEDIA_RELEASE) {
+      const key = makeFullMediaReleaseKey(this.req.get('Call-ID'));
+      const sdp = this.req.body;
+      this.logger.info({key, sdp}, 'saving far end sdp for full media release feature');
+      this.addKey(key, sdp, 3600).catch((err) => this.logger.error(err, 'Error saving far end sdp'));
+    }
     this.uas = uas;
     this.uac = uac;
     [uas, uac].forEach((dlg) => {
@@ -426,10 +465,11 @@ class CallSession extends Emitter {
           if (!this.req.locals.callCountNudged) {
             this.req.locals.callCountNudged = true;
             this.logger.debug('decrementing call count at end of call');
-            await nudgeCallCounts(this.logger, {
+            await nudgeCallCounts(this.req, 'complete', {
               service_provider_sid: this.service_provider_sid,
               account_sid: this.account_sid,
-              application_sid: this.application_sid
+              application_sid: this.application_sid,
+              callId: this.req.locals.callId
             }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
               .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
           }
@@ -605,6 +645,7 @@ Duration=${payload.duration} `
     const toTag = dlg.type === 'uas' ? this.rtpEngineOpts.uac.tag : this.rtpEngineOpts.uas.tag;
     const reason = req.get('X-Reason');
     const isReleasingMedia = reason && dlg.type === 'uac' && ['release-media', 'anchor-media'].includes(reason);
+    const isFullMediaRelease = reason === 'release-media-entirely' && process.env.JAMBONES_ENABLE_FULL_MEDIA_RELEASE;
     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' ? ['public', 'private'] : ['private', 'public'];
@@ -666,6 +707,26 @@ Duration=${payload.duration} `
         }
         return;
       }
+
+      if (isFullMediaRelease) {
+        const b_sdp = await this.retrieveKey(makePartnerFullMediaReleaseKey(this.req.get('Call-ID')));
+        this.logger.info({b_sdp}, 'reinvite ourselves out of the media path with this reinvite offer');
+        const answerSdp = await dlg.other.modify(b_sdp);
+        this.logger.info({answerSdp}, 'far end response to full media release');
+        res.send(200, {
+          body: dlg.local.sdp,
+          headers: {
+            'Contact': this.contactHeader
+          }
+        });
+        /* no media going through us now we can destroy the rtpengine resource */
+        this.rtpEngineResource.destroy().catch((err) => {
+          this.logger.info({err}, 'Error destroying rtpengine resource after full media release');
+        });
+        this._mediaPath = MediaPath.NoMedia;
+        return;
+      }
+
       const offeredSdp = Array.isArray(req.payload) && req.payload.length > 1 ?
         req.payload.find((p) => p.type === 'application/sdp').content :
         req.body;
@@ -695,12 +756,14 @@ Duration=${payload.duration} `
       let sdp;
       //HL 2024-11-13: previously forwarded re-invites to webrtc clients but further testing has shown to be unnecessary
       //if (isReleasingMedia && !this.callerIsUsingSrtp) {
-      if (isReleasingMedia) {
-        this.logger.info({response}, `got a reinvite from FS to ${reason}`);
+
+      //DH 2024-11- 18: if we are going from no-media to either partial or full media, we need reinvite the far end
+      if (isReleasingMedia && this._mediaPath !== MediaPath.NoMedia) {
         sdp = dlg.other.remote.sdp;
         if (!answerMedia.flags.includes('asymmetric')) answerMedia.flags.push('asymmetric');
         answerMedia.flags = answerMedia.flags.filter((f) => f !== 'media handover');
-        this._mediaReleased = 'release-media' === reason;
+        this._mediaPath = 'release-media' === reason ? MediaPath.PartialMedia : MediaPath.FullMedia;
+        this.logger.debug(`media path is now ${this._mediaPath}`);
       }
       else {
         sdp = await dlg.other.modify(response.sdp);
@@ -801,7 +864,8 @@ Duration=${payload.duration} `
               blockMedia: this.blockMedia,
               unblockMedia: this.unblockMedia,
               unsubscribe: this.unsubscribe,
-              headers
+              headers,
+              isSipRecCall: Array.isArray(this.req.payload) && this.req.payload.length > 1
             }));
             try {
               this._startRecordingNoAnswerTimer(res);
@@ -961,9 +1025,7 @@ Duration=${payload.duration} `
       if (!arr) {
         /* call transfer requested */
         const {gateway} = this.req.locals;
-        const referredBy = req.getParsedHeader('Referred-By');
-        if (!referredBy) return res.send(400);
-        const u = parseUri(referredBy.uri);
+        if (!req.has('Referred-By')) return res.send(400);
         const leaveReferToAlone = req.has('X-Refer-To-Leave-Untouched');
         if (leaveReferToAlone) {
           this.logger.debug({referTo}, 'passing Refer-To header through untouched');
@@ -993,9 +1055,9 @@ Duration=${payload.duration} `
         // 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,
+          'content-length':contentlength, 'refer-to':_referto, 'referred-by': referredby,
           // eslint-disable-next-line no-unused-vars
-          'X-Refer-To-Leave-Untouched': _leave,
+          'X-Refer-To-Leave-Untouched': _leave, contact: _contact,
           ...customHeaders
         } = req.headers;
 
@@ -1003,7 +1065,8 @@ Duration=${payload.duration} `
           method: 'REFER',
           headers: {
             'Refer-To': `<${stringifyUri(uri)}>`,
-            'Referred-By': `<${stringifyUri(u)}>`,
+            'Referred-By': referredby,
+            'Contact': this.contactHeader,
             ...customHeaders
           }
         });

lib/constants.json

@@ -3,5 +3,10 @@
     "ScaleIn": "scale-in",
     "StandbyEnter": "standby-enter",
     "StandbyExit": "standby-exit"
+  },
+  "MediaPath": {
+    "NoMedia": "no-media",
+    "PartialMedia": "partial-media",
+    "FullMedia": "full-media"
   }
 }

lib/db-utils.js

@@ -265,7 +265,7 @@ module.exports = (srf, logger) => {
 
     /* find all carrier entries that have an inbound gateway matching the source IP */
     const [gw] = await pp.query(sqlSelectAllGatewaysForSP);
-    logger.debug({gw}, `checking gateways for source address ${req.source_address}`);
+    //logger.debug({gw}, `checking gateways for source address ${req.source_address}`);
     let matches = gw
       .sort((a, b) => b.netmask - a.netmask)
       .filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address))
@@ -283,7 +283,7 @@ module.exports = (srf, logger) => {
     if (matches.length > 1) {
       matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
     }
-    logger.debug({matches}, `matches for source address ${req.source_address}`);
+    //logger.debug({matches}, `matches for source address ${req.source_address}`);
     if (matches.length) {
       /* we have one or more matches.  Now check for one with a provisioned phone number matching the DID */
       const vc_sids = matches.map((m) => `'${m.voip_carrier_sid}'`).join(',');

lib/middleware.js

@@ -35,6 +35,7 @@ module.exports = function(srf, logger) {
   const initLocals = (req, res, next) => {
     const callId = req.get('Call-ID');
     req.locals = req.locals || {callId};
+    req.locals.nudge = 0;
 
     /* 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')) {
@@ -259,15 +260,20 @@ module.exports = function(srf, logger) {
     assert(account_sid);
     assert(service_provider_sid);
 
+    /* if quick cancel then we are done */
+    if (req.canceled) {
+      logger.info('checkLimits: call was immediately canceled, no need to increment call count as we are done');
+      return;
+    }
+
     /* decrement count if INVITE is later rejected */
     res.once('end', async({status}) => {
-      if (status > 200 && !req.locals.callCountNudged) {
-        req.locals.callCountNudged = true;
-        logger.debug('decrementing call count due to call rejection');
-        nudgeCallCounts(logger, {
+      if (status > 200) {
+        nudgeCallCounts(req, 'failure', {
           service_provider_sid,
           account_sid,
-          application_sid
+          application_sid,
+          callId: req.locals.callId
         }, decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
           .catch((err) => logger.error(err, 'Error decrementing call counts'));
       }
@@ -275,10 +281,11 @@ module.exports = function(srf, logger) {
 
     try {
       /* increment the call count */
-      const  {callsSP, calls} = await nudgeCallCounts(logger, {
+      const  {callsSP, calls} = await nudgeCallCounts(req, 'init', {
         service_provider_sid,
         account_sid,
-        application_sid
+        application_sid,
+        callId: req.locals.callId
       }, incrKey, {writeCallCountSP, writeCallCount, writeCallCountApp});
 
       /* compare to account's limit, though avoid db hit when call count is low */
@@ -288,24 +295,22 @@ module.exports = function(srf, logger) {
       logger.debug(`checkLimits: call count is now ${calls}, limit is ${minLimit}`);
       if (calls <= minLimit) return next();
 
-      if (process.env.JAMBONES_HOSTING) {
-        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);
-          }
+      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);
         }
       }
       else if (trackingOn) {
@@ -326,6 +331,11 @@ module.exports = function(srf, logger) {
           });
           return req.srf.endSession(req);
         }
+        if (!account_limit && !sp_limit && process.env.JAMBONES_HOSTING) {
+          logger.info(`checkLimits: no active subscription found for account ${account_sid}, rejecting call`);
+          res.send(503, 'No Active Subscription');
+          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({

lib/utils.js

@@ -117,12 +117,97 @@ 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;
+/**
+ * nudgeCallCounts - increment or decrement call counts in redis
+ *
+ *              current nudge value
+ * -----------------------------------------
+ *  why    |     -1     |    0    |    1    |
+ * -----------------------------------------
+ *  init   |    no-op   |    +1   |    N/A  |
+ * failure |    N/A     |    -1   |    -1   |
+ * complete|    N/A     |    N/A  |    -1   |
+ *
+ *
+ */
+
+const shouldNudge = (why, req) => {
+  const {nudge, logger} = req.locals;
+  let modifyCount = false;
+  const originalNudge = nudge;
+
+  switch (why) {
+    case 'init':
+      if (nudge === 0) {
+        // normal case: new call, increment call count
+        req.locals.nudge = 1;
+        modifyCount = true;
+      }
+      else if (nudge === -1) {
+        // extremely quick cancel, don't increment call count
+        req.locals.nudge = 0;
+      }
+      else {
+        logger.info(`shouldNudge: unexpected nudge value ${nudge} for ${why}`);
+      }
+      break;
+    case 'failure':
+      if (nudge === 1) {
+        // normal case of call failed for any reason, decrement call count
+        req.locals.nudge = 0;
+        modifyCount = true;
+      }
+      else if (nudge === 0) {
+        // very quick failure dont decrement call count
+        req.locals.nudge = -1;
+      }
+      else {
+        logger.info(`shouldNudge: unexpected nudge value ${nudge} for ${why}`);
+      }
+      break;
+    case 'complete':
+      if (nudge === 1) {
+        // normal case of call completed, decrement call count
+        req.locals.nudge = 0;
+        modifyCount = true;
+      }
+      else {
+        logger.info(`shouldNudge: unexpected nudge value ${nudge} for ${why}`);
+      }
+      break;
+    default:
+      logger.info(`shouldNudge: unexpected why value ${why}`);
+      break;
+  }
+
+  logger.info(`shouldNudge: '${why}': updating count: ${modifyCount}, nudge: ${originalNudge} -> ${req.locals.nudge}`);
+  return modifyCount;
+};
+
+const nudgeCallCounts = async(req, why, sids, nudgeOperator, writers) => {
+  const {logger} = req.locals;
+  const {service_provider_sid, account_sid, application_sid, callId} = sids;
+  const {writeCallCount, writeCallCountSP, writeCallCountApp} = writers;
   const nudges = [];
   const writes = [];
 
+  if (!shouldNudge(why, req)) {
+    return {callsSP: null, calls: null, callsApp: null};
+  }
+
+  if (process.env.JAMBONES_DEBUG_CALL_COUNTS) {
+    const {srf} = require('..');
+    const {addKey, deleteKey} = srf.locals.realtimeDbHelpers;
+
+    if (why === 'init') {
+      // save for 3 days
+      await addKey(`debug:incalls:${account_sid}:${callId}`, new Date().toISOString(), 259200);
+    }
+    else {
+      await deleteKey(`debug:incalls:${account_sid}:${callId}`);
+    }
+  }
+
   if (process.env.JAMBONES_TRACK_SP_CALLS) {
     const key = makeSPCallCountKey(service_provider_sid);
     nudges.push(nudgeOperator(key));
@@ -151,33 +236,28 @@ const nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
     const [callsSP, calls, callsApp] = await Promise.all(nudges);
     logger.debug({
       calls, callsSP, callsApp,
-      service_provider_sid, account_sid, application_sid
-    }, 'call counts after adjustment');
+      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 }));
+      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 }));
+      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
-      }));
+      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'));
+    Promise.all(writes).catch((err) => logger.error({err}, 'Error writing call counts'));
 
-    return { callsSP, calls, callsApp };
+    return {callsSP, calls, callsApp};
   } catch (err) {
     logger.error(err, 'error incrementing call counts');
   }
 
-  return { callsSP: null, calls: null, callsApp: null };
+  return {callsSP: null, calls: null, callsApp: null};
 };
 
 const roundTripTime = (startAt) => {
@@ -246,6 +326,12 @@ const parseHostPorts = (logger, hostports, srf) => {
   return obj;
 };
 
+const makeFullMediaReleaseKey = (callId) => {
+  return `a_sdp:${callId}`;
+};
+const makePartnerFullMediaReleaseKey = (callId) => {
+  return `b_sdp:${callId}`;
+};
 
 module.exports = {
   isWSS,
@@ -265,6 +351,8 @@ module.exports = {
   parseConnectionIp,
   isMSTeamsCIDR,
   isPrivateVoipNetwork,
-  parseHostPorts
+  parseHostPorts,
+  makeFullMediaReleaseKey,
+  makePartnerFullMediaReleaseKey
 };
 

package-lock.json

@@ -1,29 +1,29 @@
 {
   "name": "sbc-inbound",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sbc-inbound",
-      "version": "0.9.2",
+      "version": "0.9.4",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-auto-scaling": "^3.549.0",
         "@aws-sdk/client-sns": "^3.549.0",
-        "@jambonz/db-helpers": "^0.9.7",
-        "@jambonz/digest-utils": "^0.0.5",
+        "@jambonz/db-helpers": "^0.9.12",
+        "@jambonz/digest-utils": "^0.0.6",
         "@jambonz/http-health-check": "^0.0.1",
-        "@jambonz/realtimedb-helpers": "^0.8.8",
+        "@jambonz/realtimedb-helpers": "^0.8.13",
         "@jambonz/rtpengine-utils": "^0.4.4",
-        "@jambonz/siprec-client-utils": "^0.2.7",
+        "@jambonz/siprec-client-utils": "^0.2.10",
         "@jambonz/stats-collector": "^0.1.10",
         "@jambonz/time-series": "^0.2.10",
         "bent": "^7.3.12",
         "cidr-matcher": "^2.1.1",
         "debug": "^4.3.4",
-        "drachtio-fn-b2b-sugar": "0.1.0",
-        "drachtio-srf": "^4.5.38",
+        "drachtio-fn-b2b-sugar": "0.2.1",
+        "drachtio-srf": "^5.0.5",
         "express": "^4.19.2",
         "pino": "^8.20.0",
         "verify-aws-sns-signature": "^0.1.0",
@@ -1410,9 +1410,9 @@
       }
     },
     "node_modules/@jambonz/db-helpers": {
-      "version": "0.9.7",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.7.tgz",
-      "integrity": "sha512-5qN/CJZJXpbMkMn+8gFn8PpQ0ZImZxp1EjKyxLUlmMn+xgjeNb29c3pjeVt/6EQnBB65jAax6TNsVzVIfpvE2w==",
+      "version": "0.9.12",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.12.tgz",
+      "integrity": "sha512-cmUuh6G2yqsPZxx0v0iKq0puCaWPz6RGaHvMxBZlolEfLHxTcHshgm+Y/L7J3/4bEKaovzP4z7TXh/pab7mZig==",
       "dependencies": {
         "cidr-matcher": "^2.1.1",
         "debug": "^4.3.4",
@@ -1422,11 +1422,11 @@
       }
     },
     "node_modules/@jambonz/digest-utils": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@jambonz/digest-utils/-/digest-utils-0.0.5.tgz",
-      "integrity": "sha512-x9/ptEnmZTpasiVRHVAabBN7borzj9QScAokr3InpFMulvCLdCvSUYRmsqUna2Kw2lWTIs9D1BQXnQLDDgNHxA==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@jambonz/digest-utils/-/digest-utils-0.0.6.tgz",
+      "integrity": "sha512-7ogpe14+Ibh3yLZbi+yoanTL/6HJw3fLEghPB2YXLNh0cyGWcqrpnE8tM9YLhYSLOE14VFanlpiyaKCNX244kQ==",
+      "license": "MIT",
       "dependencies": {
-        "bent": "^7.3.12",
         "debug": "^4.3.4",
         "nonce": "^1.0.4",
         "qs": "^6.9.4"
@@ -1444,9 +1444,9 @@
       }
     },
     "node_modules/@jambonz/realtimedb-helpers": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.8.tgz",
-      "integrity": "sha512-bzVz2EqJ7Gma5ysOh8J8Z1amw7szCBS1RSCLWEhtwPgYt6yWRdjgXbH7wHJ1qbZYYEfetfn7jeEaee8BYnoQlg==",
+      "version": "0.8.13",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.13.tgz",
+      "integrity": "sha512-/7c8kCu/dMSk8CWTYdEv4xU/7+vmVL30VCjtHPRAXVBRIVejAPDf1xK5n0rXwG8Fda1Oa+0TFsymkiRpew8P6w==",
       "dependencies": {
         "debug": "^4.3.4",
         "ioredis": "^5.3.2"
@@ -1463,9 +1463,10 @@
       }
     },
     "node_modules/@jambonz/siprec-client-utils": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.7.tgz",
-      "integrity": "sha512-VztOToBfXnOphg/y6kO+lBYqoDH7X5Ci0daXT5zQ8v5NnaZw+UwxGeFPX3knIR3r5pmzUld0f2giFOuD4ZOF8w==",
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.10.tgz",
+      "integrity": "sha512-Ns7rWK6cXVCr/1IoqPuVg9UKVRZNcs5EMvnhuoPhRD6L0HzLnfB0/BAq29bkHj0sr0bu0dp3hD5B+BnOcJuhaQ==",
+      "license": "MIT",
       "dependencies": {
         "sdp-transform": "^2.14.1",
         "uuid": "^8.3.2"
@@ -2685,9 +2686,9 @@
       "dev": true
     },
     "node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -2703,9 +2704,9 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
@@ -2942,23 +2943,20 @@
       }
     },
     "node_modules/drachtio-fn-b2b-sugar": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/drachtio-fn-b2b-sugar/-/drachtio-fn-b2b-sugar-0.1.0.tgz",
-      "integrity": "sha512-3m5oVLJzXhtrGFAYuMV4BPhnB0f4sEn9+NZSopFOcwBq1f4Z1Pi6NlyfAPg2LgDJfdop5VqGFbcgKJhzkp3dFA==",
-      "peerDependencies": {
-        "drachtio-srf": "^4.5.x"
-      }
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/drachtio-fn-b2b-sugar/-/drachtio-fn-b2b-sugar-0.2.1.tgz",
+      "integrity": "sha512-bMtje8GWVTze+UG6WSGnlUfBaYCuFiApNXl/XxWc+X9uATZiZkV2jIqhf+Y4SY3nS8dZclJIVKd9qwoCa+i+Vw=="
     },
     "node_modules/drachtio-srf": {
-      "version": "4.5.38",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.38.tgz",
-      "integrity": "sha512-dEafgn1OPfkc30Gq3JwJBF4Q7O96fsuqMnE2OO1NqRG0DkwworMIPsusWDo0ePbi+NH74rMjLPmVyC/owA0HXg==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.5.tgz",
+      "integrity": "sha512-dKdOf+zonTvk1eVu0IVc4a/Hdah2KspXngAeLQ3NZHdAkjQCJjYQZubVP6ho2QT1pzu8wA3U4M/atL1O99Ujzw==",
       "dependencies": {
         "debug": "^3.2.7",
         "delegates": "^0.1.0",
         "node-noop": "^0.0.1",
         "only": "^0.0.2",
-        "sdp-transform": "^2.14.1",
+        "sdp-transform": "^2.15.0",
         "short-uuid": "^4.2.2",
         "sip-methods": "^0.3.0",
         "sip-status": "^0.1.0",
@@ -2966,7 +2964,7 @@
         "uuid-random": "^1.3.2"
       },
       "engines": {
-        "node": ">= 10.x"
+        "node": ">= 18.x"
       }
     },
     "node_modules/drachtio-srf/node_modules/debug": {
@@ -3424,16 +3422,16 @@
       }
     },
     "node_modules/express": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
         "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -3447,7 +3445,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -3462,6 +3460,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/debug": {
@@ -5392,9 +5394,9 @@
       "dev": true
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
@@ -5820,9 +5822,9 @@
       "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
     },
     "node_modules/sdp-transform": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.14.1.tgz",
-      "integrity": "sha512-RjZyX3nVwJyCuTo5tGPx+PZWkDMCg7oOLpSlhjDdZfwUoNqG1mM8nyj31IGHyaPWXhjbP7cdK3qZ2bmkJ1GzRw==",
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.15.0.tgz",
+      "integrity": "sha512-KrOH82c/W+GYQ0LHqtr3caRpM3ITglq3ljGUIb8LTki7ByacJZ9z+piSGiwZDsRyhQbYBOBJgr2k6X4BZXi3Kw==",
       "bin": {
         "sdp-verify": "checker.js"
       }
@@ -7905,9 +7907,9 @@
       "dev": true
     },
     "@jambonz/db-helpers": {
-      "version": "0.9.7",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.7.tgz",
-      "integrity": "sha512-5qN/CJZJXpbMkMn+8gFn8PpQ0ZImZxp1EjKyxLUlmMn+xgjeNb29c3pjeVt/6EQnBB65jAax6TNsVzVIfpvE2w==",
+      "version": "0.9.12",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.12.tgz",
+      "integrity": "sha512-cmUuh6G2yqsPZxx0v0iKq0puCaWPz6RGaHvMxBZlolEfLHxTcHshgm+Y/L7J3/4bEKaovzP4z7TXh/pab7mZig==",
       "requires": {
         "cidr-matcher": "^2.1.1",
         "debug": "^4.3.4",
@@ -7917,11 +7919,10 @@
       }
     },
     "@jambonz/digest-utils": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@jambonz/digest-utils/-/digest-utils-0.0.5.tgz",
-      "integrity": "sha512-x9/ptEnmZTpasiVRHVAabBN7borzj9QScAokr3InpFMulvCLdCvSUYRmsqUna2Kw2lWTIs9D1BQXnQLDDgNHxA==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@jambonz/digest-utils/-/digest-utils-0.0.6.tgz",
+      "integrity": "sha512-7ogpe14+Ibh3yLZbi+yoanTL/6HJw3fLEghPB2YXLNh0cyGWcqrpnE8tM9YLhYSLOE14VFanlpiyaKCNX244kQ==",
       "requires": {
-        "bent": "^7.3.12",
         "debug": "^4.3.4",
         "nonce": "^1.0.4",
         "qs": "^6.9.4"
@@ -7936,9 +7937,9 @@
       }
     },
     "@jambonz/realtimedb-helpers": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.8.tgz",
-      "integrity": "sha512-bzVz2EqJ7Gma5ysOh8J8Z1amw7szCBS1RSCLWEhtwPgYt6yWRdjgXbH7wHJ1qbZYYEfetfn7jeEaee8BYnoQlg==",
+      "version": "0.8.13",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.13.tgz",
+      "integrity": "sha512-/7c8kCu/dMSk8CWTYdEv4xU/7+vmVL30VCjtHPRAXVBRIVejAPDf1xK5n0rXwG8Fda1Oa+0TFsymkiRpew8P6w==",
       "requires": {
         "debug": "^4.3.4",
         "ioredis": "^5.3.2"
@@ -7955,9 +7956,9 @@
       }
     },
     "@jambonz/siprec-client-utils": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.7.tgz",
-      "integrity": "sha512-VztOToBfXnOphg/y6kO+lBYqoDH7X5Ci0daXT5zQ8v5NnaZw+UwxGeFPX3knIR3r5pmzUld0f2giFOuD4ZOF8w==",
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.10.tgz",
+      "integrity": "sha512-Ns7rWK6cXVCr/1IoqPuVg9UKVRZNcs5EMvnhuoPhRD6L0HzLnfB0/BAq29bkHj0sr0bu0dp3hD5B+BnOcJuhaQ==",
       "requires": {
         "sdp-transform": "^2.14.1",
         "uuid": "^8.3.2"
@@ -8880,9 +8881,9 @@
       "dev": true
     },
     "cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="
     },
     "cookie-signature": {
       "version": "1.0.6",
@@ -8895,9 +8896,9 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
     "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "requires": {
         "path-key": "^3.1.0",
@@ -9059,21 +9060,20 @@
       }
     },
     "drachtio-fn-b2b-sugar": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/drachtio-fn-b2b-sugar/-/drachtio-fn-b2b-sugar-0.1.0.tgz",
-      "integrity": "sha512-3m5oVLJzXhtrGFAYuMV4BPhnB0f4sEn9+NZSopFOcwBq1f4Z1Pi6NlyfAPg2LgDJfdop5VqGFbcgKJhzkp3dFA==",
-      "requires": {}
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/drachtio-fn-b2b-sugar/-/drachtio-fn-b2b-sugar-0.2.1.tgz",
+      "integrity": "sha512-bMtje8GWVTze+UG6WSGnlUfBaYCuFiApNXl/XxWc+X9uATZiZkV2jIqhf+Y4SY3nS8dZclJIVKd9qwoCa+i+Vw=="
     },
     "drachtio-srf": {
-      "version": "4.5.38",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.38.tgz",
-      "integrity": "sha512-dEafgn1OPfkc30Gq3JwJBF4Q7O96fsuqMnE2OO1NqRG0DkwworMIPsusWDo0ePbi+NH74rMjLPmVyC/owA0HXg==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.5.tgz",
+      "integrity": "sha512-dKdOf+zonTvk1eVu0IVc4a/Hdah2KspXngAeLQ3NZHdAkjQCJjYQZubVP6ho2QT1pzu8wA3U4M/atL1O99Ujzw==",
       "requires": {
         "debug": "^3.2.7",
         "delegates": "^0.1.0",
         "node-noop": "^0.0.1",
         "only": "^0.0.2",
-        "sdp-transform": "^2.14.1",
+        "sdp-transform": "^2.15.0",
         "short-uuid": "^4.2.2",
         "sip-methods": "^0.3.0",
         "sip-status": "^0.1.0",
@@ -9435,16 +9435,16 @@
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
     },
     "express": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
         "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -9458,7 +9458,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -10868,9 +10868,9 @@
       "dev": true
     },
     "path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "picocolors": {
       "version": "1.0.0",
@@ -11168,9 +11168,9 @@
       "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
     },
     "sdp-transform": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.14.1.tgz",
-      "integrity": "sha512-RjZyX3nVwJyCuTo5tGPx+PZWkDMCg7oOLpSlhjDdZfwUoNqG1mM8nyj31IGHyaPWXhjbP7cdK3qZ2bmkJ1GzRw=="
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.15.0.tgz",
+      "integrity": "sha512-KrOH82c/W+GYQ0LHqtr3caRpM3ITglq3ljGUIb8LTki7ByacJZ9z+piSGiwZDsRyhQbYBOBJgr2k6X4BZXi3Kw=="
     },
     "semver": {
       "version": "7.5.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbc-inbound",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "main": "app.js",
   "engines": {
     "node": ">= 18.0.0"
@@ -26,21 +26,21 @@
     "jslint:fix": "npm run jslint --fix"
   },
   "dependencies": {
-    "@jambonz/db-helpers": "^0.9.7",
+    "@jambonz/db-helpers": "^0.9.12",
     "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.8.8",
+    "@jambonz/realtimedb-helpers": "^0.8.13",
     "@jambonz/rtpengine-utils": "^0.4.4",
-    "@jambonz/siprec-client-utils": "^0.2.7",
+    "@jambonz/siprec-client-utils": "^0.2.10",
     "@jambonz/stats-collector": "^0.1.10",
     "@jambonz/time-series": "^0.2.10",
-    "@jambonz/digest-utils": "^0.0.5",
+    "@jambonz/digest-utils": "^0.0.6",
     "@aws-sdk/client-sns": "^3.549.0",
     "@aws-sdk/client-auto-scaling": "^3.549.0",
     "bent": "^7.3.12",
     "cidr-matcher": "^2.1.1",
     "debug": "^4.3.4",
-    "drachtio-fn-b2b-sugar": "0.1.0",
-    "drachtio-srf": "^4.5.38",
+    "drachtio-fn-b2b-sugar": "0.2.1",
+    "drachtio-srf": "^5.0.5",
     "express": "^4.19.2",
     "pino": "^8.20.0",
     "verify-aws-sns-signature": "^0.1.0",

test/scenarios/uac-late-media.xml

@@ -19,22 +19,21 @@
 <!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
 <!--                                                                    -->
 
-<scenario name="UAC with late media">
+<scenario name="UAC with media">
   <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
   <!-- generated by sipp. To do so, use [call_id] keyword.                -->
   <send retrans="500">
     <![CDATA[
 
-      INVITE sip:16173333456@[remote_ip]:[remote_port] SIP/2.0
+      INVITE sip:+16173333456@jambonz.org SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
-      To: sut <sip:[service]@[remote_ip]:[remote_port]>
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:16173333456@jambonz.org>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
-      Subject: uac-no-3pcc
-      Content-Type: application/sdp
+      Subject: uac-late-media
       Content-Length: 0
 
     ]]>
@@ -43,27 +42,79 @@
   <recv response="100" optional="true">
   </recv>
 
-  <recv response="488">
+  <recv response="180" optional="true">
   </recv>
 
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rtd="true" crlf="true">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
   <send>
     <![CDATA[
 
-      ACK sip:16173333456@[remote_ip]:[remote_port] SIP/2.0
-      [last_Via]
+      ACK sip:16173333456@jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
-      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
+      To: <sip:16173333456@jambonz.org>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Subject: uac-no-3pcc
+      Max-Forwards: 70
+      Subject: uac-late-media
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[local_ip_type] [local_ip]
+      t=0 0
+      m=audio [auto_media_port] RTP/AVP 8 101
+      a=rtpmap:8 PCMA/8000
+      a=rtpmap:101 telephone-event/8000
+      a=fmtp:101 0-11,16
+
+
+    ]]>
+  </send>
+
+  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
+  <nop>
+    <action>
+      <exec play_pcap_audio="pcap/g711a.pcap"/>
+    </action>
+  </nop>
+
+  <!-- Pause briefly      -->
+  <pause milliseconds="3000"/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:16173333456@jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:16173333456@jambonz.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Subject: uac-late-media
       Content-Length: 0
 
     ]]>
   </send>
 
-    <!-- definition of the response time repartition table (unit is ms)   -->
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
   <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
 
   <!-- definition of the call length repartition table (unit is ms)     -->
   <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-</scenario>
+
+</scenario>
+