bump version

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:20.13.0-alpine3.18 as base
+FROM --platform=linux/amd64 node:18.15-alpine3.16 as base
 
 RUN apk --update --no-cache add --virtual .builds-deps build-base python3
 

app.js

@@ -67,9 +67,6 @@ const {
 }, logger);
 const {
   client: redisClient,
-  addKey,
-  deleteKey,
-  retrieveKey,
   createSet,
   retrieveSet,
   addToSet,
@@ -111,9 +108,6 @@ srf.locals = {...srf.locals,
     lookupSystemInformation
   },
   realtimeDbHelpers: {
-    addKey,
-    deleteKey,
-    retrieveKey,
     createSet,
     incrKey,
     decrKey,
@@ -293,9 +287,6 @@ if ('test' !== process.env.NODE_ENV) {
         logger.info(`updating private network cidr from ${srf.locals.privateNetworkCidr} to ${r.private_network_cidr}`);
         srf.locals.privateNetworkCidr = r.private_network_cidr;
       }
-      if (r.log_level) {
-        logger.level = r.log_level;
-      }
     }
   }, 20000);
 }

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_ARN) {
+  if (process.env.AWS_SNS_TOPIC_ARM) {
 
     (async function() {
       try {

lib/aws-sns-lifecycle.js

@@ -69,17 +69,7 @@ class SnsNotifier extends Emitter {
             subscriptionRequestId: this.subscriptionRequestId
           }, 'response from SNS SubscribeURL');
           const data = await this.describeInstance();
-
-          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.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
           this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
           break;
 
@@ -147,13 +137,13 @@ class SnsNotifier extends Emitter {
     try {
       const params = {
         Protocol: 'http',
-        TopicArn: process.env.AWS_SNS_TOPIC_ARN,
+        TopicArn: process.env.AWS_SNS_TOPIC_ARM,
         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_ARN}`);
+      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
     } catch (err) {
-      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARN}`);
+      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
     }
   }
 
@@ -164,9 +154,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_ARN}`);
+      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
     } catch (err) {
-      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARN}`);
+      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
     }
   }
 

lib/call-session.js

@@ -7,11 +7,8 @@ const {
   nudgeCallCounts,
   roundTripTime,
   parseConnectionIp,
-  isPrivateVoipNetwork,
-  makeFullMediaReleaseKey,
-  makePartnerFullMediaReleaseKey
+  isPrivateVoipNetwork
 } = require('./utils');
-const { MediaPath } = require('./constants.json');
 
 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
 const {parseUri, stringifyUri, SipError} = require('drachtio-srf');
@@ -64,10 +61,7 @@ class CallSession extends Emitter {
     this.activeCallIds = this.srf.locals.activeCallIds;
 
     this.decrKey = req.srf.locals.realtimeDbHelpers.decrKey;
-    this.addKey = req.srf.locals.realtimeDbHelpers.addKey;
-    this.retrieveKey = req.srf.locals.realtimeDbHelpers.retrieveKey;
-
-    this._mediaPath = MediaPath.FullMedia;
+    this._mediaReleased = false;
 
     this.application_sid = req.locals.application_sid;
     this.account_sid = req.locals.account_sid;
@@ -85,7 +79,12 @@ class CallSession extends Emitter {
   }
 
   get isMediaReleased() {
-    return this._mediaPath !== MediaPath.FullMedia;
+    return this._mediaReleased;
+  }
+
+  get callerIsUsingSrtp() {
+    const tp = this.rtpEngineOpts?.uas?.mediaOpts['transport-protocol'];
+    return tp && -1 !== tp.indexOf('SAVP');
   }
 
   get isFive9VoiceStream() {
@@ -108,8 +107,7 @@ class CallSession extends Emitter {
 
   async connect() {
     const {sdp} = this.req.locals;
-    const is3pcc = this.req.body?.length === 0;
-    this.logger.info(`inbound ${is3pcc ? '3pcc ' : ''}call accepted for routing`);
+    this.logger.info('inbound call accepted for routing');
     const engine = this.getRtpEngine();
     if (!engine) {
       this.logger.info('No available rtpengines, rejecting call!');
@@ -180,17 +178,17 @@ class CallSession extends Emitter {
       host = obj.host;
       proxy = `sip:${featureServer}`;
     }
-    if (obj.user) uri = `sip:${obj.user}@${host}`;
-    else uri = `sip:${host}`;
+    if (obj.user) uri = `${scheme}:${obj.user}@${host}`;
+    else uri = `${scheme}:${host}`;
     this.logger.info(`uri will be: ${uri}, proxy ${proxy}`);
 
-    const sendOfferToRtpEngine = async(remoteSdp) => {
+    try {
       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: remoteSdp
+        sdp
       };
       const startAt = process.hrtime();
       const response = await this.offer(opts);
@@ -203,11 +201,7 @@ 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'),
@@ -217,13 +211,9 @@ class CallSession extends Emitter {
       };
       if (this.privateSipAddress) headers = {...headers, Contact: `<sip:${this.privateSipAddress}>`};
 
-      let spdOfferB;
-      if (this.siprec && this.xml) {
-        spdOfferB = createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content);
-      }
-      else if (!is3pcc) {
-        spdOfferB = response.sdp;
-      }
+      const spdOfferB = this.siprec && this.xml ?
+        createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content) :
+        response.sdp;
 
       if (this.req.locals.carrier) {
         Object.assign(headers, {
@@ -290,10 +280,7 @@ class CallSession extends Emitter {
           '-X-Authenticated-User'
         ],
         proxyResponseHeaders: ['all', '-X-Trace-ID'],
-        localSdpB: spdOfferB ? spdOfferB : async(ackBody) => {
-          const response = await sendOfferToRtpEngine(ackBody);
-          return response.sdp;
-        },
+        localSdpB: spdOfferB,
         localSdpA: async(sdp, res) => {
           this.rtpEngineOpts.uac.tag = res.getParsedHeader('To').params.tag;
           const opts = {
@@ -304,12 +291,8 @@ class CallSession extends Emitter {
             sdp
           };
           const startAt = process.hrtime();
-          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 response = await this.answer(opts);
+          this.logger.debug({response, opts}, 'response from rtpengine to answer');
           const rtt = roundTripTime(startAt);
           this.stats.histogram('app.rtpengine.response_time', rtt, [
             'direction:inbound', 'command:answer', `rtpengine:${this.rtpengineIp}`]);
@@ -329,7 +312,7 @@ class CallSession extends Emitter {
           }
 
           return response.sdp;
-        },
+        }
       });
 
       // successfully connected
@@ -347,16 +330,7 @@ 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);
     }
@@ -423,14 +397,6 @@ 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) => {
@@ -462,17 +428,12 @@ class CallSession extends Emitter {
 
         if (process.env.JAMBONES_HOSTING || trackingOn) {
           const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
-          if (!this.req.locals.callCountNudged) {
-            this.req.locals.callCountNudged = true;
-            this.logger.debug('decrementing call count at end of call');
-            await nudgeCallCounts(this.req, 'complete', {
-              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'));
-          }
+          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'));
         }
 
         /* write cdr for connected call */
@@ -645,7 +606,6 @@ 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'];
@@ -707,26 +667,6 @@ 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;
@@ -754,16 +694,12 @@ Duration=${payload.duration} `
 
       /* if this is a re-invite from the FS to change media anchoring, avoid sending the reinvite out */
       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) {
-
-      //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) {
+      if (isReleasingMedia && !this.callerIsUsingSrtp) {
+        this.logger.info({response}, `got a reinvite from FS to ${reason}`);
         sdp = dlg.other.remote.sdp;
         if (!answerMedia.flags.includes('asymmetric')) answerMedia.flags.push('asymmetric');
         answerMedia.flags = answerMedia.flags.filter((f) => f !== 'media handover');
-        this._mediaPath = 'release-media' === reason ? MediaPath.PartialMedia : MediaPath.FullMedia;
-        this.logger.debug(`media path is now ${this._mediaPath}`);
+        this._mediaReleased = 'release-media' === reason;
       }
       else {
         sdp = await dlg.other.modify(response.sdp);
@@ -864,8 +800,7 @@ Duration=${payload.duration} `
               blockMedia: this.blockMedia,
               unblockMedia: this.unblockMedia,
               unsubscribe: this.unsubscribe,
-              headers,
-              isSipRecCall: Array.isArray(this.req.payload) && this.req.payload.length > 1
+              headers
             }));
             try {
               this._startRecordingNoAnswerTimer(res);
@@ -1025,7 +960,9 @@ Duration=${payload.duration} `
       if (!arr) {
         /* call transfer requested */
         const {gateway} = this.req.locals;
-        if (!req.has('Referred-By')) return res.send(400);
+        const referredBy = req.getParsedHeader('Referred-By');
+        if (!referredBy) return res.send(400);
+        const u = parseUri(referredBy.uri);
         const leaveReferToAlone = req.has('X-Refer-To-Leave-Untouched');
         if (leaveReferToAlone) {
           this.logger.debug({referTo}, 'passing Refer-To header through untouched');
@@ -1055,9 +992,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, contact: _contact,
+          'X-Refer-To-Leave-Untouched': _leave,
           ...customHeaders
         } = req.headers;
 
@@ -1065,8 +1002,7 @@ Duration=${payload.duration} `
           method: 'REFER',
           headers: {
             'Refer-To': `<${stringifyUri(uri)}>`,
-            'Referred-By': referredby,
-            'Contact': this.contactHeader,
+            'Referred-By': `<${stringifyUri(u)}>`,
             ...customHeaders
           }
         });

lib/constants.json

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

lib/db-utils.js

@@ -7,7 +7,7 @@ const sqlSelectSPForAccount = 'SELECT service_provider_sid FROM accounts WHERE a
 
 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, sg.pad_crypto
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask  
 FROM sip_gateways sg, voip_carriers vc, accounts acc 
 WHERE acc.sip_realm = ? 
 AND vc.account_sid = acc.account_sid 
@@ -17,7 +17,7 @@ AND sg.voip_carrier_sid = vc.voip_carrier_sid`;
 
 const sqlSelectAllCarriersForSPByRealm =
 `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, sg.pad_crypto
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask  
 FROM sip_gateways sg, voip_carriers vc, accounts acc 
 WHERE acc.sip_realm = ? 
 AND vc.service_provider_sid = acc.service_provider_sid  
@@ -28,13 +28,23 @@ AND sg.voip_carrier_sid = vc.voip_carrier_sid`;
 
 const sqlSelectAllGatewaysForSP =
 `SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid,  
-vc.account_sid, vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
+vc.account_sid, vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask  
 FROM sip_gateways sg, voip_carriers vc
 WHERE sg.voip_carrier_sid = vc.voip_carrier_sid 
 AND vc.service_provider_sid IS NOT NULL 
 AND vc.is_active = 1 
 AND sg.inbound = 1`;
 
+const sqlCarriersForAccountBySid =
+`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  
+FROM sip_gateways sg, voip_carriers vc, accounts acc 
+WHERE acc.account_sid = ? 
+AND vc.account_sid = acc.account_sid 
+AND vc.is_active = 1 
+AND sg.inbound = 1 
+AND sg.voip_carrier_sid = vc.voip_carrier_sid`;
+
 const sqlAccountByRealm = 'SELECT * from accounts WHERE sip_realm = ? AND is_active = 1';
 const sqlAccountBySid = 'SELECT * from accounts WHERE account_sid = ?';
 const sqlApplicationBySid = 'SELECT * from applications WHERE application_sid = ?';
@@ -57,7 +67,7 @@ AND outbound = 1`;
 
 const sqlSelectCarrierRequiringRegistration = `
 SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid, vc.account_sid, 
-vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask  
 FROM sip_gateways sg, voip_carriers vc 
 WHERE sg.voip_carrier_sid = vc.voip_carrier_sid 
 AND vc.requires_register = 1 
@@ -107,22 +117,6 @@ module.exports = (srf, logger) => {
     }
   };
 
-  /**
-   * Retrieves the application for a given DID (phone number) and carrier combination.
-   * First attempts an exact DID match, then falls back to pattern/wildcard matching
-   * if no exact match is found. Pattern matching is done in order of pattern length
-   * (longest/most specific first) and handles both regex and wildcard (*) patterns.
-   *
-   * @param {Object} req - The request object containing the called number
-   * @param {string} voip_carrier_sid - The SID of the VoIP carrier
-   * @returns {Promise<(string|Object|null)>} Returns either:
-   *   - application_sid (string) if appObject is false
-   *   - full application object if appObject is true
-   *   - null if no matching application is found
-   * @throws {Error} Database errors or other unexpected errors
-   */
-  // Refactored to handle invalid regular expressions gracefully as part of
-  // https://github.com/jambonz/sbc-inbound/issues/201
   const getApplicationForDidAndCarrier = async(req, voip_carrier_sid) => {
     const did = normalizeDID(req.calledNumber) || 'anonymous';
 
@@ -133,75 +127,17 @@ module.exports = (srf, logger) => {
 
       /* wildcard / regex match */
       const [r2] = await pp.query(sqlQueryAllDidsForCarrier, [voip_carrier_sid]);
-      const patterns = r2
+      const match = r2
         .filter((o) => o.number.match(/\D/))                  // look at anything with non-digit characters
-        .sort((a, b) => b.number.length - a.number.length);
-      for (const pattern of patterns) {
-        try {
-          const regexPattern = pattern.number.endsWith('*') ?
-            `${pattern.number.slice(0, -1)}\\d*` :
-            pattern.number;
-          if (did.match(new RegExp(regexPattern))) {
-            logger.debug({voip_carrier_sid, 'pattern':pattern.number, 'did':did}, 'Found a matching pattern');
-            return pattern.application_sid;
-          }
-        } catch (err) {
-          logger.warn({err, voip_carrier_sid, pattern: pattern.number}, 'Invalid regex pattern encountered - skipping');
-          continue;
-        }
-      }
-      logger.debug({voip_carrier_sid, did}, 'No matching pattern found');
+        .sort((a, b) => b.number.length - a.number.length)    // prefer longest match
+        .find((o) => did.match(new RegExp(o.number.endsWith('*') ? `${o.number.slice(0, -1)}\\d*` : o.number)));
+      if (match) return match.application_sid;
       return null;
     } catch (err) {
       logger.error({err}, 'getApplicationForDidAndCarrier');
     }
   };
 
-  /**
-   * Searches for a matching application across multiple carriers using pattern/wildcard matching.
-   * This function is similar to getApplicationForDidAndCarrier but operates on multiple carriers
-   * simultaneously for better performance. It searches through all patterns from the specified
-   * carriers, ordered by pattern length (longest/most specific first).
-   *
-   * @param {Object} req - The request object containing the called number
-   * @param {string} voip_carrier_sids - Comma-separated string of carrier SIDs, formatted for SQL IN clause
-   *                                     (e.g., "'carrier1','carrier2'")
-   * @returns {Promise<Object|null>} Returns either:
-   *   - The matching phone_numbers record containing application_sid, voip_carrier_sid, and account_sid
-   *   - null if no matching pattern is found
-   * @throws {Error} Database errors or other unexpected errors
-   */
-  const getApplicationForDidAndCarriers = async(req, voip_carrier_sids) => {
-    const did = normalizeDID(req.calledNumber) || 'anonymous';
-    const sql = `SELECT * FROM phone_numbers WHERE voip_carrier_sid IN (${voip_carrier_sids})`;
-
-    try {
-      /* wildcard / regex match */
-      const [r2] = await pp.query(sql);
-      const patterns = r2
-        .filter((o) => o.number.match(/\D/))                  // look at anything with non-digit characters
-        .sort((a, b) => b.number.length - a.number.length);
-      for (const pattern of patterns) {
-        try {
-          const regexPattern = pattern.number.endsWith('*') ?
-            `${pattern.number.slice(0, -1)}\\d*` :
-            pattern.number;
-          if (did.match(new RegExp(regexPattern))) {
-            logger.debug({'pattern':pattern.number, 'did':did}, 'Found a matching pattern');
-            return pattern;
-          }
-        } catch (err) {
-          logger.warn({err, pattern: pattern.number}, 'Invalid regex pattern encountered - skipping');
-          continue;
-        }
-      }
-      logger.debug('No matching pattern found');
-      return null;
-    } catch (err) {
-      logger.error({err}, 'getApplicationForDidAndCarriers');
-    }
-  };
-
   const wasOriginatedFromCarrier = async(req) => {
     const failure = {fromCarrier: false};
     const uri = parseUri(req.uri);
@@ -261,28 +197,6 @@ module.exports = (srf, logger) => {
           logger.debug({voip_carriers, sql, did}, 'looking up DID');
 
           const [r] = await pp.query(sql);
-          if (r.length === 0) {
-            // if no matching phone number is found, find whether there are any applications having phone numbers
-            // matching the regex pattern or wild card
-            logger.debug({isDotDecimal},
-              'Did not find a matching phone number, checking for applications with Regex or wildcard');
-            const vc_sids = voip_carriers.map((m) => `'${m.voip_carrier_sid}'`).join(',');
-            const application = await getApplicationForDidAndCarriers(req, vc_sids);
-            if (application) {
-              logger.debug({application}, 'sip_realm looking up DID: found application with Regex or wildcard ');
-              const gateway = gateways.find((m) => m.voip_carrier_sid === application.voip_carrier_sid);
-              // the gateway may belong to "all accounts", so we need to use the account_sid of the application
-              gateway.account_sid = gateway.account_sid ? gateway.account_sid : application.account_sid;
-              return {
-                fromCarrier: true,
-                gateway: gateway,
-                service_provider_sid: a[0].service_provider_sid,
-                account_sid: gateway.account_sid,
-                application_sid: application.application_sid,
-                account: a[0]
-              };
-            }
-          }
           if (r.length > 1) {
             logger.info({r},
               'multiple carriers with the same gateway have the same number provisioned for the same account'
@@ -359,120 +273,114 @@ module.exports = (srf, logger) => {
       /* no match, so fall through  */
     }
 
-    /* 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}`);
-    let matches = gw
-      .sort((a, b) => b.netmask - a.netmask)
-      .filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address))
-      .map((gw) => {
-        return {
-          voip_carrier_sid: gw.voip_carrier_sid,
-          name: gw.name,
-          service_provider_sid: gw.service_provider_sid,
-          account_sid: gw.account_sid,
-          application_sid: gw.application_sid,
-          pad_crypto: gw.pad_crypto
-        };
-      });
-    /* remove duplicates, winnow down to voip_carriers, not gateways */
-    if (matches.length > 1) {
-      matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
-    }
-    //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(',');
-      const sql =  `SELECT * FROM phone_numbers WHERE number = '${did}' AND voip_carrier_sid IN (${vc_sids})`;
-      logger.debug({matches, sql, did, vc_sids}, 'looking up DID');
-      const [r] = await pp.query(sql);
-      if (0 === r.length) {
-        // if no matching phone number is found, find whether there are any applications having phone numbers
-        // matching the regex pattern or wild card
-        logger.debug({isDotDecimal},
-          'Did not find a matching phone number, checking for applications with Regex or wildcard');
-        const vc_sids = matches.map((m) => `'${m.voip_carrier_sid}'`).join(',');
-        const application = await getApplicationForDidAndCarriers(req, vc_sids);
-        if (application) {
-          logger.debug({application}, 'looking up DID: found application with Regex or wildcard');
-          const gateway = matches.find((m) => m.voip_carrier_sid === application.voip_carrier_sid);
-          // the gateway may belong to "all accounts", so we need to use the account_sid of the application
-          const [a] = await pp.query(sqlAccountBySid, [application.account_sid]);
-          return {
-            fromCarrier: true,
-            gateway: gateway,
-            service_provider_sid: gateway.service_provider_sid,
-            account_sid: application.account_sid,
-            application_sid: application.application_sid,
-            account: a[0],
-          };
-        }
+    if (isDotDecimal && process.env.JAMBONES_HOSTING) {
+      if (!process.env.SBC_ACCOUNT_SID) return failure;
 
-        /* came from a provisioned carrier, but the dialed number is not provisioned.
-            check if we have an account with default routing of that carrier to an application
-        */
-        const accountLevelGateways = matches.filter((m) => m.account_sid && m.application_sid);
-        if (accountLevelGateways.length > 1) {
-          logger.info({accounts: accountLevelGateways.map((m) => m.account_sid)},
-            'multiple accounts have added this carrier with default routing -- cannot determine which to use');
+      /* look for carrier only within that account */
+      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,
+        service_provider_sid
+      };
+    }
+    else {
+      /* find all carrier entries that have an inbound gateway matching the source IP */
+      const [gw] = await pp.query(sqlSelectAllGatewaysForSP);
+      let matches = gw
+        .sort((a, b) => b.netmask - a.netmask)
+        .filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address))
+        .map((gw) => {
           return {
-            fromCarrier: true,
-            error: 'Multiple accounts are attempting to default route this carrier'
+            voip_carrier_sid: gw.voip_carrier_sid,
+            name: gw.name,
+            service_provider_sid: gw.service_provider_sid,
+            account_sid: gw.account_sid,
+            application_sid: gw.application_sid
           };
-        }
-        else if (accountLevelGateways.length === 1) {
-          const [accounts] = await pp.query('SELECT * from accounts where account_sid = ?',
-            [accountLevelGateways[0].account_sid]);
-          return {
-            fromCarrier: true,
-            gateway: accountLevelGateways[0],
-            service_provider_sid: accountLevelGateways[0].service_provider_sid,
-            account_sid: accountLevelGateways[0].account_sid,
-            application_sid: accountLevelGateways[0].application_sid,
-            account: accounts[0]
-          };
-        }
-        else {
-          /* check if we only have a single account, otherwise we have no
--               way of knowing which account this is for
+        });
+      /* remove duplicates, winnow down to voip_carriers, not gateways */
+      if (matches.length > 1) {
+        matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
+      }
+      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(',');
+        const sql =  `SELECT * FROM phone_numbers WHERE number = '${did}' AND voip_carrier_sid IN (${vc_sids})`;
+        logger.debug({matches, sql, did, vc_sids}, 'looking up DID');
+
+        const [r] = await pp.query(sql);
+        if (0 === r.length) {
+          /* came from a provisioned carrier, but the dialed number is not provisioned.
+              check if we have an account with default routing of that carrier to an application
           */
-          const [r] = await pp.query('SELECT count(*) as count from accounts where service_provider_sid = ?',
-            [matches[0].service_provider_sid]);
-          if (r[0].count === 0 || r[0].count > 1) return {fromCarrier: true};
-          else {
-            const [accounts] = await pp.query('SELECT * from accounts where service_provider_sid = ?',
-              [matches[0].service_provider_sid]);
+          const accountLevelGateways = matches.filter((m) => m.account_sid && m.application_sid);
+          if (accountLevelGateways.length > 1) {
+            logger.info({accounts: accountLevelGateways.map((m) => m.account_sid)},
+              'multiple accounts have added this carrier with default routing -- cannot determine which to use');
             return {
               fromCarrier: true,
-              gateway: matches[0],
-              service_provider_sid: accounts[0].service_provider_sid,
-              account_sid: accounts[0].account_sid,
+              error: 'Multiple accounts are attempting to default route this carrier'
+            };
+          }
+          else if (accountLevelGateways.length === 1) {
+            const [accounts] = await pp.query('SELECT * from accounts where account_sid = ?',
+              [accountLevelGateways[0].account_sid]);
+            return {
+              fromCarrier: true,
+              gateway: accountLevelGateways[0],
+              service_provider_sid: accountLevelGateways[0].service_provider_sid,
+              account_sid: accountLevelGateways[0].account_sid,
+              application_sid: accountLevelGateways[0].application_sid,
               account: accounts[0]
             };
           }
+          else {
+            /* check if we only have a single account, otherwise we have no
+-               way of knowing which account this is for
+            */
+            const [r] = await pp.query('SELECT count(*) as count from accounts where service_provider_sid = ?',
+              [matches[0].service_provider_sid]);
+            if (r[0].count === 0 || r[0].count > 1) return {fromCarrier: true};
+            else {
+              const [accounts] = await pp.query('SELECT * from accounts where service_provider_sid = ?',
+                [matches[0].service_provider_sid]);
+              return {
+                fromCarrier: true,
+                gateway: matches[0],
+                service_provider_sid: accounts[0].service_provider_sid,
+                account_sid: accounts[0].account_sid,
+                account: accounts[0]
+              };
+            }
+          }
         }
-      }
-      else if (r.length > 1) {
-        logger.info({r},
-          'multiple accounts have added this carrier with default routing -- cannot determine which to use');
+        else if (r.length > 1) {
+          logger.info({r},
+            'multiple accounts have added this carrier with default routing -- cannot determine which to use');
+          return {
+            fromCarrier: true,
+            error: 'Multiple accounts are attempting to route the same phone number from the same carrier'
+          };
+        }
+
+        /* we have a route for this phone number and carrier combination */
+        const gateway = matches.find((m) => m.voip_carrier_sid === r[0].voip_carrier_sid);
+        const [accounts] = await pp.query(sqlAccountBySid, [r[0].account_sid]);
+        assert(accounts.length);
         return {
           fromCarrier: true,
-          error: 'Multiple accounts are attempting to route the same phone number from the same carrier'
+          gateway,
+          service_provider_sid: accounts[0].service_provider_sid,
+          account_sid: r[0].account_sid,
+          application_sid: r[0].application_sid,
+          account: accounts[0]
         };
       }
-
-      /* we have a route for this phone number and carrier combination */
-      const gateway = matches.find((m) => m.voip_carrier_sid === r[0].voip_carrier_sid);
-      const [accounts] = await pp.query(sqlAccountBySid, [r[0].account_sid]);
-      assert(accounts.length);
-      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]
-      };
     }
     return failure;
   };
@@ -480,7 +388,6 @@ module.exports = (srf, logger) => {
   return {
     wasOriginatedFromCarrier,
     getApplicationForDidAndCarrier,
-    getApplicationForDidAndCarriers,
     getOutboundGatewayForRefer,
     getSPForAccount,
     getApplicationBySid

lib/middleware.js

@@ -35,7 +35,6 @@ 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')) {
@@ -236,8 +235,6 @@ module.exports = function(srf, logger) {
         callId: req.get('Call-ID'),
         service_provider_sid: req.locals.service_provider_sid,
         account_sid: req.locals.account_sid
-      }, {
-        ...(req.locals.account.enable_debug_log && {level: 'debug'})
       });
 
       next();
@@ -260,20 +257,13 @@ 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) {
-        nudgeCallCounts(req, 'failure', {
+        nudgeCallCounts(logger, {
           service_provider_sid,
           account_sid,
-          application_sid,
-          callId: req.locals.callId
+          application_sid
         }, decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
           .catch((err) => logger.error(err, 'Error decrementing call counts'));
       }
@@ -281,11 +271,10 @@ module.exports = function(srf, logger) {
 
     try {
       /* increment the call count */
-      const  {callsSP, calls} = await nudgeCallCounts(req, 'init', {
+      const  {callsSP, calls} = await nudgeCallCounts(logger, {
         service_provider_sid,
         account_sid,
-        application_sid,
-        callId: req.locals.callId
+        application_sid
       }, incrKey, {writeCallCountSP, writeCallCount, writeCallCountApp});
 
       /* compare to account's limit, though avoid db hit when call count is low */
@@ -295,22 +284,24 @@ module.exports = function(srf, logger) {
       logger.debug(`checkLimits: call count is now ${calls}, limit is ${minLimit}`);
       if (calls <= minLimit) return next();
 
-      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);
+      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);
+          }
         }
       }
       else if (trackingOn) {
@@ -321,7 +312,7 @@ module.exports = function(srf, logger) {
             alert_type: AlertType.ACCOUNT_CALL_LIMIT,
             service_provider_sid: service_provider_sid,
             account_sid,
-            count: account_limit
+            count: calls
           }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
           res.send(503, 'Max Account Calls In Progress', {
             headers: {
@@ -331,17 +322,12 @@ 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({
             alert_type: AlertType.SP_CALL_LIMIT,
             service_provider_sid: service_provider_sid,
-            count: sp_limit
+            count: callsSP
           }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
           res.send(503, 'Max Service Provider Calls In Progress', {
             headers: {

lib/utils.js

@@ -19,9 +19,6 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
   const srtpCopy = JSON.parse(JSON.stringify(srtpCharacteristics));
   const from = req.getParsedHeader('from');
   const srtpOpts = teams ? srtpCopy['teams'] : srtpCopy['default'];
-  if ((req.locals.gateway?.pad_crypto || 0) > 0) {
-    srtpOpts.flags.push('pad crypto');
-  }
   const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCopy;
   const srcOpts = srcIsUsingSrtp ? srtpOpts : rtpCopy;
 
@@ -30,14 +27,11 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
     dstOpts.flags.push('inject DTMF');
     srcOpts.flags.push('inject DTMF');
   }
-  const acceptCodecs = process.env.JAMBONES_ACCEPT_AND_TRANSCODE ?
-    process.env.JAMBONES_ACCEPT_AND_TRANSCODE :
-    process.env.JAMBONES_ACCEPT_G729 ? 'g729' : '';
   const common = {
     'call-id': req.get('Call-ID'),
     'replace': ['origin', 'session-connection'],
     'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no',
-    ...(acceptCodecs && { codec: { mask: acceptCodecs, transcode: 'pcmu,pcma' } })
+    ...(process.env.JAMBONES_ACCEPT_G729 && { codec: { mask: 'g729', transcode: 'pcmu' } })
   };
   return {
     common,
@@ -117,97 +111,12 @@ const createHealthCheckApp = (port, logger) => {
   });
 };
 
-/**
- * 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 nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
+  const { service_provider_sid, account_sid, application_sid } = 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));
@@ -236,28 +145,33 @@ const nudgeCallCounts = async(req, why, 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) => {
@@ -326,12 +240,6 @@ const parseHostPorts = (logger, hostports, srf) => {
   return obj;
 };
 
-const makeFullMediaReleaseKey = (callId) => {
-  return `a_sdp:${callId}`;
-};
-const makePartnerFullMediaReleaseKey = (callId) => {
-  return `b_sdp:${callId}`;
-};
 
 module.exports = {
   isWSS,
@@ -351,8 +259,6 @@ module.exports = {
   parseConnectionIp,
   isMSTeamsCIDR,
   isPrivateVoipNetwork,
-  parseHostPorts,
-  makeFullMediaReleaseKey,
-  makePartnerFullMediaReleaseKey
+  parseHostPorts
 };
 

package.json

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

test/db/jambones-sql.sql

@@ -14,22 +14,14 @@ DROP TABLE IF EXISTS beta_invite_codes;
 
 DROP TABLE IF EXISTS call_routes;
 
-DROP TABLE IF EXISTS clients;
-
 DROP TABLE IF EXISTS dns_records;
 
-DROP TABLE IF EXISTS lcr;
-
 DROP TABLE IF EXISTS lcr_carrier_set_entry;
 
 DROP TABLE IF EXISTS lcr_routes;
 
 DROP TABLE IF EXISTS password_settings;
 
-DROP TABLE IF EXISTS user_permissions;
-
-DROP TABLE IF EXISTS permissions;
-
 DROP TABLE IF EXISTS predefined_sip_gateways;
 
 DROP TABLE IF EXISTS predefined_smpp_gateways;
@@ -54,12 +46,8 @@ DROP TABLE IF EXISTS signup_history;
 
 DROP TABLE IF EXISTS smpp_addresses;
 
-DROP TABLE IF EXISTS google_custom_voices;
-
 DROP TABLE IF EXISTS speech_credentials;
 
-DROP TABLE IF EXISTS system_information;
-
 DROP TABLE IF EXISTS users;
 
 DROP TABLE IF EXISTS smpp_gateways;
@@ -132,19 +120,6 @@ application_sid CHAR(36) NOT NULL,
 PRIMARY KEY (call_route_sid)
 ) COMMENT='a regex-based pattern match for call routing';
 
-CREATE TABLE clients
-(
-client_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-is_active BOOLEAN NOT NULL DEFAULT 1,
-username VARCHAR(64),
-password VARCHAR(1024),
-allow_direct_app_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_queue_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_user_calling BOOLEAN NOT NULL DEFAULT 1,
-PRIMARY KEY (client_sid)
-);
-
 CREATE TABLE dns_records
 (
 dns_record_sid CHAR(36) NOT NULL UNIQUE ,
@@ -157,23 +132,11 @@ PRIMARY KEY (dns_record_sid)
 CREATE TABLE lcr_routes
 (
 lcr_route_sid CHAR(36),
-lcr_sid CHAR(36) NOT NULL,
 regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed number, used for LCR routing of PSTN calls',
 description VARCHAR(1024),
-priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
+priority INTEGER NOT NULL UNIQUE  COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) COMMENT='An ordered list of  digit patterns in an LCR table.  The patterns are tested in sequence until one matches';
-
-CREATE TABLE lcr
-(
-lcr_sid CHAR(36) NOT NULL UNIQUE ,
-name VARCHAR(64) COMMENT 'User-assigned name for this LCR table',
-is_active BOOLEAN NOT NULL DEFAULT 1,
-default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use when no digit match based results are found.',
-service_provider_sid CHAR(36),
-account_sid CHAR(36),
-PRIMARY KEY (lcr_sid)
-) COMMENT='An LCR (least cost routing) table that is used by a service provider or account to make decisions about routing outbound calls when multiple carriers are available.';
+) COMMENT='Least cost routing table';
 
 CREATE TABLE password_settings
 (
@@ -182,14 +145,6 @@ require_digit BOOLEAN NOT NULL DEFAULT false,
 require_special_character BOOLEAN NOT NULL DEFAULT false
 );
 
-CREATE TABLE permissions
-(
-permission_sid CHAR(36) NOT NULL UNIQUE ,
-name VARCHAR(32) NOT NULL UNIQUE ,
-description VARCHAR(255),
-PRIMARY KEY (permission_sid)
-);
-
 CREATE TABLE predefined_carriers
 (
 predefined_carrier_sid CHAR(36) NOT NULL UNIQUE ,
@@ -281,10 +236,7 @@ CREATE TABLE sbc_addresses
 sbc_address_sid CHAR(36) NOT NULL UNIQUE ,
 ipv4 VARCHAR(255) NOT NULL,
 port INTEGER NOT NULL DEFAULT 5060,
-tls_port INTEGER,
-wss_port INTEGER,
 service_provider_sid CHAR(36),
-last_updated DATETIME,
 PRIMARY KEY (sbc_address_sid)
 );
 
@@ -340,29 +292,9 @@ last_tested DATETIME,
 tts_tested_ok BOOLEAN,
 stt_tested_ok BOOLEAN,
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-label VARCHAR(64),
 PRIMARY KEY (speech_credential_sid)
 );
 
-CREATE TABLE google_custom_voices
-(
-google_custom_voice_sid CHAR(36) NOT NULL UNIQUE ,
-speech_credential_sid CHAR(36) NOT NULL,
-model VARCHAR(512) NOT NULL,
-reported_usage ENUM('REPORTED_USAGE_UNSPECIFIED','REALTIME','OFFLINE') DEFAULT 'REALTIME',
-name VARCHAR(64) NOT NULL,
-PRIMARY KEY (google_custom_voice_sid)
-);
-
-CREATE TABLE system_information
-(
-domain_name VARCHAR(255),
-sip_domain_name VARCHAR(255),
-monitoring_domain_name VARCHAR(255),
-private_network_cidr VARCHAR(8192),
-log_level ENUM('info', 'debug') NOT NULL DEFAULT 'info'
-);
-
 CREATE TABLE users
 (
 user_sid CHAR(36) NOT NULL UNIQUE ,
@@ -413,18 +345,9 @@ smpp_inbound_password VARCHAR(64),
 register_from_user VARCHAR(128),
 register_from_domain VARCHAR(255),
 register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
-register_status VARCHAR(4096),
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';
 
-CREATE TABLE user_permissions
-(
-user_permissions_sid CHAR(36) NOT NULL UNIQUE ,
-user_sid CHAR(36) NOT NULL,
-permission_sid CHAR(36) NOT NULL,
-PRIMARY KEY (user_permissions_sid)
-);
-
 CREATE TABLE smpp_gateways
 (
 smpp_gateway_sid CHAR(36) NOT NULL UNIQUE ,
@@ -442,7 +365,7 @@ PRIMARY KEY (smpp_gateway_sid)
 CREATE TABLE phone_numbers
 (
 phone_number_sid CHAR(36) UNIQUE ,
-number VARCHAR(132) NOT NULL,
+number VARCHAR(32) NOT NULL UNIQUE ,
 voip_carrier_sid CHAR(36),
 account_sid CHAR(36),
 application_sid CHAR(36),
@@ -455,15 +378,11 @@ CREATE TABLE sip_gateways
 sip_gateway_sid CHAR(36),
 ipv4 VARCHAR(128) NOT NULL COMMENT 'ip address or DNS name of the gateway.  For gateways providing inbound calling service, ip address is required.',
 netmask INTEGER NOT NULL DEFAULT 32,
-port INTEGER COMMENT 'sip signaling port',
+port INTEGER NOT NULL DEFAULT 5060 COMMENT 'sip signaling port',
 inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound calls from the gateway',
 outbound BOOLEAN NOT NULL COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
 voip_carrier_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
-send_options_ping BOOLEAN NOT NULL DEFAULT 0,
-use_sips_scheme BOOLEAN NOT NULL DEFAULT 0,
-pad_crypto BOOLEAN NOT NULL DEFAULT 0,
-protocol ENUM('udp','tcp','tls', 'tls/srtp') DEFAULT 'udp' COMMENT 'Outbound call protocol',
 PRIMARY KEY (sip_gateway_sid)
 ) COMMENT='A whitelisted sip gateway used for origination/termination';
 
@@ -496,24 +415,12 @@ account_sid CHAR(36) COMMENT 'account that this application belongs to (if null,
 call_hook_sid CHAR(36) COMMENT 'webhook to call for inbound calls ',
 call_status_hook_sid CHAR(36) COMMENT 'webhook to call for call status events',
 messaging_hook_sid CHAR(36) COMMENT 'webhook to call for inbound SMS/MMS ',
-app_json TEXT,
 speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
-speech_synthesis_voice VARCHAR(256),
-speech_synthesis_label VARCHAR(64),
+speech_synthesis_voice VARCHAR(64),
 speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
-speech_recognizer_label VARCHAR(64),
-use_for_fallback_speech BOOLEAN DEFAULT false,
-fallback_speech_synthesis_vendor VARCHAR(64),
-fallback_speech_synthesis_language VARCHAR(12),
-fallback_speech_synthesis_voice VARCHAR(256),
-fallback_speech_synthesis_label VARCHAR(64),
-fallback_speech_recognizer_vendor VARCHAR(64),
-fallback_speech_recognizer_language VARCHAR(64),
-fallback_speech_recognizer_label VARCHAR(64),
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-record_all_calls BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (application_sid)
 ) COMMENT='A defined set of behaviors to be applied to phone calls ';
 
@@ -551,10 +458,6 @@ subspace_client_secret VARCHAR(255),
 subspace_sip_teleport_id VARCHAR(255),
 subspace_sip_teleport_destinations VARCHAR(255),
 siprec_hook_sid CHAR(36),
-record_all_calls BOOLEAN NOT NULL DEFAULT false,
-record_format VARCHAR(16) NOT NULL DEFAULT 'mp3',
-bucket_credential VARCHAR(8192) COMMENT 'credential used to authenticate with storage service',
-enable_debug_log BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';
 
@@ -575,21 +478,9 @@ ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERE
 
 ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid) REFERENCES applications (application_sid);
 
-CREATE INDEX client_sid_idx ON clients (client_sid);
-ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid);
-
 CREATE INDEX dns_record_sid_idx ON dns_records (dns_record_sid);
 ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);
 
-CREATE INDEX lcr_sid_idx ON lcr_routes (lcr_sid);
-ALTER TABLE lcr_routes ADD FOREIGN KEY lcr_sid_idxfk (lcr_sid) REFERENCES lcr (lcr_sid);
-
-CREATE INDEX lcr_sid_idx ON lcr (lcr_sid);
-ALTER TABLE lcr ADD FOREIGN KEY default_carrier_set_entry_sid_idxfk (default_carrier_set_entry_sid) REFERENCES lcr_carrier_set_entry (lcr_carrier_set_entry_sid);
-
-CREATE INDEX service_provider_sid_idx ON lcr (service_provider_sid);
-CREATE INDEX account_sid_idx ON lcr (account_sid);
-CREATE INDEX permission_sid_idx ON permissions (permission_sid);
 CREATE INDEX predefined_carrier_sid_idx ON predefined_carriers (predefined_carrier_sid);
 CREATE INDEX predefined_sip_gateway_sid_idx ON predefined_sip_gateways (predefined_sip_gateway_sid);
 CREATE INDEX predefined_carrier_sid_idx ON predefined_sip_gateways (predefined_carrier_sid);
@@ -642,6 +533,8 @@ CREATE INDEX smpp_address_sid_idx ON smpp_addresses (smpp_address_sid);
 CREATE INDEX service_provider_sid_idx ON smpp_addresses (service_provider_sid);
 ALTER TABLE smpp_addresses ADD FOREIGN KEY service_provider_sid_idxfk_4 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
 
+CREATE UNIQUE INDEX speech_credentials_idx_1 ON speech_credentials (vendor,account_sid);
+
 CREATE INDEX speech_credential_sid_idx ON speech_credentials (speech_credential_sid);
 CREATE INDEX service_provider_sid_idx ON speech_credentials (service_provider_sid);
 ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_5 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
@@ -649,10 +542,6 @@ ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_5 (ser
 CREATE INDEX account_sid_idx ON speech_credentials (account_sid);
 ALTER TABLE speech_credentials ADD FOREIGN KEY account_sid_idxfk_8 (account_sid) REFERENCES accounts (account_sid);
 
-CREATE INDEX google_custom_voice_sid_idx ON google_custom_voices (google_custom_voice_sid);
-CREATE INDEX speech_credential_sid_idx ON google_custom_voices (speech_credential_sid);
-ALTER TABLE google_custom_voices ADD FOREIGN KEY speech_credential_sid_idxfk (speech_credential_sid) REFERENCES speech_credentials (speech_credential_sid) ON DELETE CASCADE;
-
 CREATE INDEX user_sid_idx ON users (user_sid);
 CREATE INDEX email_idx ON users (email);
 CREATE INDEX phone_idx ON users (phone);
@@ -672,18 +561,10 @@ ALTER TABLE voip_carriers ADD FOREIGN KEY service_provider_sid_idxfk_7 (service_
 
 ALTER TABLE voip_carriers ADD FOREIGN KEY application_sid_idxfk_2 (application_sid) REFERENCES applications (application_sid);
 
-CREATE INDEX user_permissions_sid_idx ON user_permissions (user_permissions_sid);
-CREATE INDEX user_sid_idx ON user_permissions (user_sid);
-ALTER TABLE user_permissions ADD FOREIGN KEY user_sid_idxfk (user_sid) REFERENCES users (user_sid) ON DELETE CASCADE;
-
-ALTER TABLE user_permissions ADD FOREIGN KEY permission_sid_idxfk (permission_sid) REFERENCES permissions (permission_sid);
-
 CREATE INDEX smpp_gateway_sid_idx ON smpp_gateways (smpp_gateway_sid);
 CREATE INDEX voip_carrier_sid_idx ON smpp_gateways (voip_carrier_sid);
 ALTER TABLE smpp_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);
 
-CREATE UNIQUE INDEX phone_numbers_unique_idx_voip_carrier_number ON phone_numbers (number,voip_carrier_sid);
-
 CREATE INDEX phone_number_sid_idx ON phone_numbers (phone_number_sid);
 CREATE INDEX number_idx ON phone_numbers (number);
 CREATE INDEX voip_carrier_sid_idx ON phone_numbers (voip_carrier_sid);

test/db/populate-test-data.sql

@@ -19,8 +19,7 @@ values ('f4e1848d-3ff8-40eb-b9c1-30e1ef053f94','ed649e33-e771-403a-8c99-1780eabb
 insert into account_products(account_product_sid, account_subscription_sid, product_sid,quantity)
 values ('f23ff996-6534-4aba-8666-4b347391eca2', 'f4e1848d-3ff8-40eb-b9c1-30e1ef053f94', 'c4403cdb-8e75-4b27-9726-7d8315e3216d', 10);
 
-insert into voip_carriers (voip_carrier_sid, name, account_sid, service_provider_sid) 
-values ('287c1452-620d-4195-9f19-c9814ef90d78', 'westco', 'ed649e33-e771-403a-8c99-1780eabbc803', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
+insert into voip_carriers (voip_carrier_sid, name, account_sid) values ('287c1452-620d-4195-9f19-c9814ef90d78', 'westco', 'ed649e33-e771-403a-8c99-1780eabbc803');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('124a5339-c62c-4075-9e19-f4de70a96597', '287c1452-620d-4195-9f19-c9814ef90d78', '172.38.0.20', true, true);
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, port, inbound, outbound) 
@@ -43,8 +42,7 @@ insert into account_products(account_product_sid, account_subscription_sid, prod
 values ('92f137f7-4bc3-4157-b096-6817e54b1874', '73bbcc5d-512f-4cea-8535-9a6e3d2bd19d', 'c4403cdb-8e75-4b27-9726-7d8315e3216d', 0);
 insert into account_limits(account_limits_sid, account_sid, category, quantity) values('a1b2c3d4-e5f6-7a8b-9c0d-1e2f3a4b5c6d', 'd7cc37cb-d152-49ef-a51b-485f6e917089', 'voice_call_session', 0);
 
-insert into voip_carriers (voip_carrier_sid, name, account_sid, service_provider_sid) 
-values ('9b1abdc7-0220-4964-bc66-32b5c70cd9ab', 'westco', 'd7cc37cb-d152-49ef-a51b-485f6e917089', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
+insert into voip_carriers (voip_carrier_sid, name, account_sid) values ('9b1abdc7-0220-4964-bc66-32b5c70cd9ab', 'westco', 'd7cc37cb-d152-49ef-a51b-485f6e917089');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('12f401d9-cbb1-49e5-bd33-cefbca0badc3', '9b1abdc7-0220-4964-bc66-32b5c70cd9ab', '172.38.0.20', true, true);
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, port, inbound, outbound) 
@@ -54,8 +52,7 @@ values ('1401eb72-0daf-4471-aba6-038a0a2587b3', '9b1abdc7-0220-4964-bc66-32b5c70
 insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
 values ('3b43e39f-4346-4218-8434-a53130e8be49', 'test', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '4d7ce0aa-5ead-4e61-9a6b-3daa732218b1');
 
-insert into voip_carriers (voip_carrier_sid, name, account_sid, application_sid, service_provider_sid) 
-values ('999c1452-620d-4195-9f19-c9814ef90d78', 'customer PBX', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '3b43e39f-4346-4218-8434-a53130e8be49', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
+insert into voip_carriers (voip_carrier_sid, name, account_sid, application_sid) values ('999c1452-620d-4195-9f19-c9814ef90d78', 'customer PBX', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '3b43e39f-4346-4218-8434-a53130e8be49');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('888a5339-c62c-4075-9e19-f4de70a96597', '999c1452-620d-4195-9f19-c9814ef90d78', '172.38.0.21', true, false);
  
@@ -92,32 +89,3 @@ insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outb
 values ('664a5339-c62c-4075-9e19-f4de70a96597', '731abdc7-0220-4964-bc66-32b5c70cd9ab', '172.38.0.40', true, false);
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('554a5339-c62c-4075-9e19-f4de70a96597', '987abdc7-0220-4964-bc66-32b5c70cd9ab', '172.38.0.40', true, false);
-
--- voip carrier belonging to all accounts
-insert into voip_carriers (voip_carrier_sid, name, service_provider_sid) 
-values ('voip100', 'test-voip-carrier', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
-values ('sip100', 'voip100', '172.38.0.50', true, false);
-
-insert into voip_carriers (voip_carrier_sid, name, service_provider_sid) 
-values ('voip101', 'test-voip-carrier-101', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
-values ('sip101', 'voip101', '172.38.0.50', true, false);
-insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
-values ('sip102', 'voip101', '172.38.0.51', true, false);
-
-insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
-values ('app100', 'app100', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '90dda62e-0ea2-47d1-8164-5bd49003476c');
-insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
-values ('app101', 'app101', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '90dda62e-0ea2-47d1-8164-5bd49003476c');
-insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
-values ('phone100', '^100', 'voip101', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', 'app100');
-insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
-values ('phone101', '^10012', 'voip100', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', 'app101');
--- insert an invalid regex pattern, the below pattern should be ignored during pattern
-insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
-values ('phone102', '\\dkjfhmdf\\', 'voip100', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', 'app101');
-
--- account with a sip realm that is not associated with any voip carriers
-insert into accounts (account_sid, name, service_provider_sid, webhook_secret, sip_realm)
-values ('acct-100', 'Account 100', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'foobar', 'ram.sip.jambonz.org');

test/docker-compose-testbed.yaml

@@ -23,7 +23,7 @@ services:
       sbc-inbound:
         ipv4_address: 172.38.0.2
   sbc:
-    image: drachtio/drachtio-server:0.8.26
+    image: drachtio/drachtio-server:latest
     command: drachtio --contact "sip:*;transport=udp" --loglevel debug --sofia-loglevel 9
     ports:
       - "9060:9022/tcp"

test/scenarios/uac-did-regex-match-vc-all-accts-nosiprealm.xml

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<!-- This program is free software; you can redistribute it and/or      -->
-<!-- modify it under the terms of the GNU General Public License as     -->
-<!-- published by the Free Software Foundation; either version 2 of the -->
-<!-- License, or (at your option) any later version.                    -->
-<!--                                                                    -->
-<!-- This program is distributed in the hope that it will be useful,    -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
-<!-- GNU General Public License for more details.                       -->
-<!--                                                                    -->
-<!-- You should have received a copy of the GNU General Public License  -->
-<!-- along with this program; if not, write to the                      -->
-<!-- Free Software Foundation, Inc.,                                    -->
-<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
-<!--                                                                    -->
-<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
-<!--                                                                    -->
-
-<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:100678@172.38.0.10:5060 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:100678@172.38.0.10:5060>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      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>
-
-  <recv response="100" optional="true">
-  </recv>
-
-  <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:100678@172.38.0.10:5060 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:100678@172.38.0.10:5060>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      Content-Length: 0
-
-    ]]>
-  </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:100678@172.38.0.10:5060 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:100678@172.38.0.10:5060>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Subject: uac-pcap-carrier-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <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>

test/scenarios/uac-did-regex-match-vc-all-accts.xml

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<!-- This program is free software; you can redistribute it and/or      -->
-<!-- modify it under the terms of the GNU General Public License as     -->
-<!-- published by the Free Software Foundation; either version 2 of the -->
-<!-- License, or (at your option) any later version.                    -->
-<!--                                                                    -->
-<!-- This program is distributed in the hope that it will be useful,    -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
-<!-- GNU General Public License for more details.                       -->
-<!--                                                                    -->
-<!-- You should have received a copy of the GNU General Public License  -->
-<!-- along with this program; if not, write to the                      -->
-<!-- Free Software Foundation, Inc.,                                    -->
-<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
-<!--                                                                    -->
-<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
-<!--                                                                    -->
-
-<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:+100678@ram.sip.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:100678@ram.sip.jambonz.org>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      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>
-
-  <recv response="100" optional="true">
-  </recv>
-
-  <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:100678@ram.sip.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:100678@ram.sip.jambonz.org>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      Content-Length: 0
-
-    ]]>
-  </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:100678@ram.sip.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:100678@ram.sip.jambonz.org>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Subject: uac-pcap-carrier-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <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>

test/scenarios/uac-late-media.xml

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<!-- This program is free software; you can redistribute it and/or      -->
-<!-- modify it under the terms of the GNU General Public License as     -->
-<!-- published by the Free Software Foundation; either version 2 of the -->
-<!-- License, or (at your option) any later version.                    -->
-<!--                                                                    -->
-<!-- This program is distributed in the hope that it will be useful,    -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
-<!-- GNU General Public License for more details.                       -->
-<!--                                                                    -->
-<!-- You should have received a copy of the GNU General Public License  -->
-<!-- along with this program; if not, write to the                      -->
-<!-- Free Software Foundation, Inc.,                                    -->
-<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
-<!--                                                                    -->
-<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
-<!--                                                                    -->
-
-<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@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>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-late-media
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="100" optional="true">
-  </recv>
-
-  <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@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: 1 ACK
-      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>
-
-  <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>
-

test/sip-tests.js

@@ -33,10 +33,6 @@ test('incoming call tests', async(t) => {
     t.ok(obj.calls === 0, 'HTTP GET / works (current call count)')
     obj = await getJSON('http://127.0.0.1:3050/system-health');
     t.ok(obj.calls === 0, 'HTTP GET /system-health works (health check)')
-
-    await sippUac('uac-late-media.xml', '172.38.0.20');
-    t.pass('incoming call with no SDP packet is rejected with a 488');
-
     await sippUac('uac-pcap-carrier-success.xml', '172.38.0.20');
     t.pass('incoming call from carrier completed successfully');
 
@@ -64,15 +60,6 @@ test('incoming call tests', async(t) => {
     await sippUac('uac-pcap-carrier-max-call-limit.xml', '172.38.0.20');
     t.pass('rejects incoming call with 503 when max calls per account reached');
 
-    await sippUac('uac-did-regex-match-vc-all-accts.xml', '172.38.0.50');
-    t.pass('incoming call matched by trailing wildcard *, voice gateway belongs to all accounts, with sip realm');
-
-    await sippUac('uac-did-regex-match-vc-all-accts-nosiprealm.xml', '172.38.0.51');
-    t.pass('incoming call matched by trailing wildcard *, voice gateway belongs to all accounts, without sip realm');
-
-    await sippUac('uac-did-regex-match-vc-all-accts-nosiprealm.xml', '172.38.0.50');
-    t.pass('incoming call matched by trailing wildcard *, voice gateway belongs to all accounts, without sip realm');
-
     /* switch off this env for remaining tests (JAMBONES_HOSTING is for Saas sts) */
     delete process.env.JAMBONES_HOSTING;
     await sippUac('uac-pcap-carrier-fail-ambiguous.xml', '172.38.0.40');
@@ -80,9 +67,8 @@ test('incoming call tests', async(t) => {
   
     await waitFor(12);
     const res = await queryCdrs({account_sid: 'ed649e33-e771-403a-8c99-1780eabbc803'});
-    console.log(`cdrs res.total: ${res.total}`);
     //console.log(`cdrs: ${JSON.stringify(res)}`);
-    t.ok(7 === res.total, 'successfully wrote 8 cdrs for calls');
+    t.ok(7 === res.total, 'successfully wrote 7 cdrs for calls');
 
     srf.disconnect();
     t.end();