avoid adding multiple reset flags to rtpengine params

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 12
       - run: npm ci
       - run: npm run jslint
       - run: npm test

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run jslint

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:17-slim
+FROM node:16
 WORKDIR /opt/app/
 COPY package.json ./
 RUN npm install

app.js

@@ -6,12 +6,12 @@ assert.ok(process.env.JAMBONES_MYSQL_HOST &&
 assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
 assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACHTIO_PORT env var');
 assert.ok(process.env.DRACHTIO_SECRET, 'missing DRACHTIO_SECRET env var');
-assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_NETWORK_CIDR env var');
+assert.ok(process.env.JAMBONES_NETWORK_CIDR, 'missing JAMBONES_NETWORK_CIDR env var');
 
 const Srf = require('drachtio-srf');
 const srf = new Srf('sbc-outbound');
 const CIDRMatcher = require('cidr-matcher');
-const {equalsIgnoreOrder, pingMsTeamsGateways, createHealthCheckApp, systemHealth} = require('./lib/utils');
+const matcher = new CIDRMatcher([process.env.JAMBONES_NETWORK_CIDR]);
 const opts = Object.assign({
   timestamp: () => {return `, "time": "${new Date().toISOString()}"`;}
 }, {level: process.env.JAMBONES_LOGLEVEL || 'info'});
@@ -32,7 +32,6 @@ const CallSession = require('./lib/call-session');
 const setNameRtp = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-rtp`;
 const rtpServers = [];
 const {
-  ping,
   performLcr,
   lookupAllTeamsFQDNs,
   lookupAccountBySipRealm,
@@ -47,15 +46,7 @@ const {
   database: process.env.JAMBONES_MYSQL_DATABASE,
   connectionLimit: process.env.JAMBONES_MYSQL_CONNECTION_LIMIT || 10
 }, logger);
-const {
-  client: redisClient,
-  createHash,
-  retrieveHash,
-  incrKey,
-  decrKey,
-  retrieveSet,
-  isMemberOfSet
-} = require('@jambonz/realtimedb-helpers')({
+const {createHash, retrieveHash, incrKey, decrKey, retrieveSet} = require('@jambonz/realtimedb-helpers')({
   host: process.env.JAMBONES_REDIS_HOST || 'localhost',
   port: process.env.JAMBONES_REDIS_PORT || 6379
 }, logger);
@@ -70,7 +61,6 @@ srf.locals = {...srf.locals,
   queryCdrs,
   activeCallIds,
   dbHelpers: {
-    ping,
     performLcr,
     lookupAllTeamsFQDNs,
     lookupAccountBySipRealm,
@@ -83,8 +73,7 @@ srf.locals = {...srf.locals,
     createHash,
     retrieveHash,
     incrKey,
-    decrKey,
-    isMemberOfSet
+    decrKey
   }
 };
 const {initLocals, checkLimits, route} = require('./lib/middleware')(srf, logger, {
@@ -93,18 +82,11 @@ const {initLocals, checkLimits, route} = require('./lib/middleware')(srf, logger
 });
 const {getRtpEngine, setRtpEngines} = require('@jambonz/rtpengine-utils')([], logger, {
   emitter: stats,
-  dtmfListenPort: process.env.DTMF_LISTEN_PORT || 22225,
-  protocol: 'udp'
+  dtmfListenPort: process.env.DTMF_LISTEN_PORT || 22225
 });
 srf.locals.getRtpEngine = getRtpEngine;
 
-if (process.env.DRACHTIO_HOST && !process.env.K8S) {
-  const cidrs = process.env.JAMBONES_NETWORK_CIDR
-    .split(',')
-    .map((s) => s.trim());
-  logger.info({cidrs}, 'internal network CIDRs');
-  const matcher = new CIDRMatcher(cidrs);
-
+if (process.env.DRACHTIO_HOST) {
   srf.connect({host: process.env.DRACHTIO_HOST, port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET });
   srf.on('connect', (err, hp) => {
     logger.info(`connected to drachtio listening on ${hp}`);
@@ -125,7 +107,6 @@ if (process.env.DRACHTIO_HOST && !process.env.K8S) {
   });
 }
 else {
-  logger.info(`listening in outbound mode on port ${process.env.DRACHTIO_PORT}`);
   srf.listen({port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET});
 }
 if (process.env.NODE_ENV === 'test') {
@@ -140,78 +121,33 @@ srf.invite((req, res) => {
   session.connect();
 });
 
-if (process.env.K8S || process.env.HTTP_PORT) {
-  const PORT = process.env.HTTP_PORT || 3000;
-  const healthCheck = require('@jambonz/http-health-check');
+/* update call stats periodically */
+setInterval(() => {
+  stats.gauge('sbc.sip.calls.count', activeCallIds.size, ['direction:outbound']);
+}, 5000);
 
-  const getCount = () => srf.locals.activeCallIds.size;
-
-  createHealthCheckApp(PORT, logger)
-    .then((app) => {
-      healthCheck({
-        app,
-        logger,
-        path: '/',
-        fn: getCount
-      });
-      healthCheck({
-        app,
-        logger,
-        path: '/system-health',
-        fn: systemHealth.bind(null, redisClient, ping, getCount)
-      });
-      return;
-    })
-    .catch((err) => {
-      logger.error({err}, 'Error creating health check server');
-    });
-}
-if ('test' !== process.env.NODE_ENV) {
-  /* update call stats periodically */
-  setInterval(() => {
-    stats.gauge('sbc.sip.calls.count', activeCallIds.size, ['direction:outbound']);
-  }, 5000);
-}
-
-const lookupRtpServiceEndpoints = (lookup, serviceName) => {
-  logger.debug(`dns lookup for ${serviceName}..`);
-  lookup(serviceName, {family: 4, all: true}, (err, addresses) => {
-    if (err) {
-      logger.error({err}, `Error looking up ${serviceName}`);
-      return;
-    }
-    logger.debug({addresses, rtpServers}, `dns lookup for ${serviceName} returned`);
-    const addrs = addresses.map((a) => a.address);
-    if (!equalsIgnoreOrder(addrs, rtpServers)) {
-      rtpServers.length = 0;
-      Array.prototype.push.apply(rtpServers, addrs);
-      logger.info({rtpServers}, 'rtpserver endpoints have been updated');
-      setRtpEngines(rtpServers.map((a) => `${a}:${process.env.RTPENGINE_PORT || 22222}`));
-    }
-  });
+const arrayCompare = (a, b) => {
+  if (a.length !== b.length) return false;
+  const uniqueValues = new Set([...a, ...b]);
+  for (const v of uniqueValues) {
+    const aCount = a.filter((e) => e === v).length;
+    const bCount = b.filter((e) => e === v).length;
+    if (aCount !== bCount) return false;
+  }
+  return true;
 };
 
-if (process.env.K8S_RTPENGINE_SERVICE_NAME) {
-  /* poll dns for endpoints every so often */
-  const arr = /^(.*):(\d+)$/.exec(process.env.K8S_RTPENGINE_SERVICE_NAME);
-  const svc = arr[1];
-  logger.info(`rtpengine(s) will be found at dns name: ${svc}`);
-  const {lookup} = require('dns');
-  lookupRtpServiceEndpoints(lookup, svc);
-  setInterval(lookupRtpServiceEndpoints.bind(null, lookup, svc), process.env.RTPENGINE_DNS_POLL_INTERVAL || 10000);
-}
-else if (process.env.JAMBONES_RTPENGINES) {
-  /* static list of rtpengines */
+/* update rtpengines periodically */
+if (process.env.JAMBONES_RTPENGINES) {
   setRtpEngines([process.env.JAMBONES_RTPENGINES]);
 }
 else {
-  /* poll redis periodically for rtpengines that have registered via OPTIONS ping */
   const getActiveRtpServers = async() => {
     try {
       const set = await retrieveSet(setNameRtp);
       const newArray = Array.from(set);
       logger.debug({newArray, rtpServers}, 'getActiveRtpServers');
-      if (!equalsIgnoreOrder(newArray, rtpServers)) {
+      if (!arrayCompare(newArray, rtpServers)) {
         logger.info({newArray}, 'resetting active rtpengines');
         setRtpEngines(newArray.map((a) => `${a}:${process.env.RTPENGINE_PORT || 22222}`));
         rtpServers.length = 0;
@@ -221,12 +157,14 @@ else {
       logger.error({err}, 'Error setting new rtpengines');
     }
   };
+
   setInterval(() => {
     getActiveRtpServers();
   }, 30000);
   getActiveRtpServers();
 }
 
+const {pingMsTeamsGateways} = require('./lib/utils');
 pingMsTeamsGateways(logger, srf);
 
 module.exports = {srf};

bin/k8s-pre-stop-hook.js

@@ -1,29 +0,0 @@
-#!/usr/bin/env node
-const bent = require('bent');
-const getJSON = bent('json');
-const PORT = process.env.HTTP_PORT || 3000;
-
-const sleep = (ms) => {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-};
-
-(async function() {
-
-  try {
-    do {
-      const obj = await getJSON(`http://127.0.0.1:${PORT}/`);
-      const {calls} = obj;
-      if (calls === 0) {
-        console.log('no calls on the system, we can exit');
-        process.exit(0);
-      }
-      else {
-        console.log(`waiting for ${calls} to exit..`);
-      }
-      await sleep(10000);
-    } while (1);
-  } catch (err) {
-    console.error(err, 'Error querying health endpoint');
-    process.exit(-1);
-  }
-})();

lib/call-session.js

@@ -43,8 +43,7 @@ const initCdr = (srf, req) => {
     attempted_at: Date.now(),
     direction: 'outbound',
     host: srf.locals.sipAddress,
-    remote_host: uri.host,
-    trace_id: req.get('X-Trace-ID') || '00000000000000000000000000000000'
+    remote_host: uri.host
   };
 };
 
@@ -125,19 +124,14 @@ class CallSession extends Emitter {
       };
 
       if (this.req.locals.registration) {
-        debug(`sending call to registered user ${JSON.stringify(this.req.locals.registration)}`);
+        debug(`sending call to user ${JSON.stringify(this.req.locals.registration)}`);
         const contact = this.req.locals.registration.contact;
-        let destUri = contact;
-        if (this.req.has('X-Override-To')) {
-          const dest = this.req.get('X-Override-To');
-          const uri = parseUri(contact);
-          uri.user = dest;
-          destUri = stringifyUri(uri);
-          this.logger.info(`overriding destination user with ${dest}, so final uri is ${destUri}`);
+        if (contact.includes('transport=ws')) {
+          uris = [contact];
         }
-        uris = [destUri];
-        if (!contact.includes('transport=ws')) {
+        else {
           proxy = this.req.locals.registration.proxy;
+          uris = [this.req.uri];
         }
       }
       else if (this.req.locals.target === 'forward') {
@@ -214,8 +208,7 @@ class CallSession extends Emitter {
         } catch (err) {
           debug(err);
           this.logger.error(err, 'Error performing lcr');
-          this.res.send(488);
-          return this.srf.endSession(this.req);
+          return this.res.send(488);
         }
         debug(`sending call to PSTN ${uris}`);
       }
@@ -283,24 +276,9 @@ class CallSession extends Emitter {
           const {uas, uac} = await this.srf.createB2BUA(this.req, this.res, uri, {
             proxy,
             passFailure,
-            proxyRequestHeaders: [
-              'all',
-              '-X-MS-Teams-FQDN',
-              '-X-MS-Teams-Tenant-FQDN',
-              '-X-Trace-ID',
-              'X-CID',
-              '-Allow',
-              '-Session-Expires',
-              '-X-Requested-Carrier-Sid',
-              '-X-Jambonz-Routing',
-              '-X-Jambonz-FS-UUID',
-              'Min-SE'
-            ],
-            proxyResponseHeaders: [
-              'all',
-              '-Allow',
-              '-Session-Expires'
-            ],
+            proxyRequestHeaders: ['all', '-X-MS-Teams-FQDN', '-X-MS-Teams-Tenant-FQDN', 'X-CID', '-Allow',
+              '-Session-Expires', '-X-Requested-Carrier-Sid', 'Min-SE'],
+            proxyResponseHeaders: ['all', '-Allow', '-Session-Expires'],
             headers: hdrs,
             responseHeaders,
             auth: gw ? gw.auth : undefined,
@@ -379,9 +357,7 @@ class CallSession extends Emitter {
             debug(`got final outdial error: ${err}`);
             if (!passFailure) this.res.send(status);
             this.emit('failed');
-            this.rtpEngineResource.destroy()
-              .catch((err) => this.logger.info({err}, 'Error destroying rtpe after failure'));
-            this.srf.endSession(this.req);
+            this.rtpEngineResource.destroy();
             const tags = ['accepted:no', `sipStatus:${status}`];
             this.stats.increment('sbc.originations', tags);
 
@@ -389,7 +365,7 @@ class CallSession extends Emitter {
               this.writeCdrs({...this.req.locals.cdr,
                 terminated_at: Date.now(),
                 termination_reason: 487 === status ? 'caller abandoned' : 'failed',
-                sip_status: status
+                sip_status: status,
               }).catch((err) => this.logger.error({err}, 'Error writing cdr for call failure'));
             }
           }
@@ -399,9 +375,8 @@ class CallSession extends Emitter {
         }
       }
     } catch (err) {
-      if ('abandonded' !== err.message) this.logger.error(err, `Error setting up outbound call to: ${uris}`);
+      if ('abandonded' !== err.message) this.logger.error(err, `Error setting up outbonund call to: ${uris}`);
       this.emit('failed');
-      this.srf.endSession(this.req);
       this.rtpEngineResource.destroy();
     }
   }
@@ -421,14 +396,12 @@ class CallSession extends Emitter {
     this.uas = uas;
     this.uac = uac;
     [uas, uac].forEach((dlg) => {
-      dlg.on('destroy', async() => {
-        const other = dlg.other;
+      dlg.on('destroy', () => {
+        this.logger.info('call ended');
         this.rtpEngineResource.destroy();
         this.activeCallIds.delete(this.req.get('Call-ID'));
         this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uac.tag);
-        try {
-          await other.destroy();
-        } catch (err) {}
+        dlg.other.destroy();
 
         this.decrKey(this.callCountKey)
           .then((count) => {
@@ -449,15 +422,6 @@ class CallSession extends Emitter {
             duration: Math.floor((now - callStart) / 1000)
           }).catch((err) => this.logger.error({err}, 'Error writing cdr for completed call'));
         }
-        /* de-link the 2 Dialogs for GC */
-        dlg.removeAllListeners();
-        other.removeAllListeners();
-        dlg.other = null;
-        other.other = null;
-
-        this.logger.info(`call ended with normal termination, there are ${this.activeCallIds.size} active`);
-
-        this.srf.endSession(this.req);
       });
     });
 
@@ -468,7 +432,6 @@ class CallSession extends Emitter {
     uac.on('modify', this._onReinvite.bind(this, uac));
 
     uas.on('refer', this._onFeatureServerTransfer.bind(this, uas));
-    uac.on('refer', this._onRefer.bind(this, uac));
 
     uas.on('info', this._onInfo.bind(this, uas));
     uac.on('info', this._onInfo.bind(this, uac));
@@ -477,23 +440,6 @@ class CallSession extends Emitter {
     forwardInDialogRequests(uac,  ['notify', 'options', 'message']);
   }
 
-  async _onRefer(dlg, req, res) {
-    /* REFER coming in from a sip device, forward to feature server */
-    try {
-      const response = await dlg.other.request({
-        method: 'REFER',
-        headers: {
-          'Refer-To': req.get('Refer-To'),
-          'Referred-By': req.get('Referred-By'),
-          'User-Agent': req.get('User-Agent')
-        }
-      });
-      res.send(response.status, response.reason);
-    } catch (err) {
-      this.logger.error({err}, 'CallSession:_onRefer: error handling incoming REFER');
-    }
-  }
-
   async _onDTMF(dlg, payload) {
     this.logger.info({payload}, '_onDTMF');
     try {
@@ -555,7 +501,6 @@ Duration=${payload.duration} `
       }
       else {
         sdp = await dlg.other.modify(response.sdp);
-        this.logger.info({sdp}, 'CallSession:_onReinvite: got sdp from 200 OK to invite we sent');
       }
       opts = {
         ...this.rtpEngineOpts.common,
@@ -569,7 +514,6 @@ Duration=${payload.duration} `
         res.send(488);
         throw new Error(`_onReinvite: rtpengine failed: ${JSON.stringify(response)}`);
       }
-      this.logger.info({sdp: response.sdp}, 'CallSession:_onReinvite: sending back upstream');
       res.send(200, {body: response.sdp});
     } catch (err) {
       this.logger.error(err, 'Error handling reinvite');
@@ -655,7 +599,6 @@ Duration=${payload.duration} `
         this.rtpEngineResource.destroy();
         this.activeCallIds.delete(this.req.get('Call-ID'));
         this.uas.other.destroy();
-        this.srf.endSession(this.req);
       });
 
       // modify rtpengine to stream to new feature server

lib/middleware.js

@@ -2,10 +2,15 @@ const debug = require('debug')('jambonz:sbc-outbound');
 const parseUri = require('drachtio-srf').parseUri;
 const Registrar = require('@jambonz/mw-registrar');
 const {selectHostPort, makeCallCountKey} = require('./utils');
-const FS_UUID_SET_NAME =  'fsUUIDs';
+
+const isLocalUri = (host, req) => {
+  debug({hostport: req.server.hostport}, `is ${host} local?`);
+  return req.server.hostport.includes(host);
+};
+
 
 module.exports = (srf, logger, opts) => {
-  const {incrKey, decrKey, isMemberOfSet} = srf.locals.realtimeDbHelpers;
+  const {incrKey, decrKey} = srf.locals.realtimeDbHelpers;
   const {stats} = srf.locals;
   const registrar = new Registrar(opts);
   const {
@@ -17,53 +22,17 @@ module.exports = (srf, logger, opts) => {
     req.locals = req.locals || {};
     const callId = req.get('Call-ID');
     req.locals.account_sid = req.get('X-Account-Sid');
-    const traceId = req.locals.trace_id = req.get('X-Trace-ID');
-    req.locals.logger = logger.child({
-      callId,
-      traceId,
-      account_sid:
-      req.locals.account_sid});
+    req.locals.logger = logger.child({callId, account_sid: req.locals.account_sid});
 
     if (!req.locals.account_sid) {
       logger.info('missing X-Account-Sid on outbound call');
-      res.send(403, {
+      return res.send(403, {
         headers: {
           'X-Reason': 'missing X-Account-Sid'
         }
       });
-      return req.srf.endSession(req);
     }
 
-    /* must come from a valid FS */
-    if (!req.has('X-Jambonz-Routing')) {
-      logger.info({msg: req.msg}, 'missing X-Jambonz-Routing header');
-      res.send(403, {
-        headers: {
-          'X-Reason': 'missing required jambonz headers'
-        }
-      });
-      return req.srf.endSession(req);
-    }
-    if (process.env.K8S) {
-      /* for K8S we do not use JAMBONES_CIDR so we must validate the sender by uuid FS creates */
-      const fsUUID = req.get('X-Jambonz-FS-UUID');
-      try {
-        const exists = await isMemberOfSet(FS_UUID_SET_NAME, fsUUID);
-        if (!exists || !fsUUID) {
-          res.send(403, {
-            headers: {
-              'X-Reason': `missing or invalid FS-UUID ${fsUUID}`
-            }
-          });
-          return req.srf.endSession(req);
-        }
-      } catch (err) {
-        res.send(500);
-        return req.srf.endSession(req);
-      }
-    }
-
-
     stats.increment('sbc.invites', ['direction:outbound']);
 
     req.on('cancel', () => {
@@ -78,8 +47,7 @@ module.exports = (srf, logger, opts) => {
       req.locals.account = await lookupAccountBySid(req.locals.account_sid);
     } catch (err) {
       req.locals.logger.error({err}, `Error looking up account sid ${req.locals.account_sid}`);
-      res.send(500);
-      return req.srf.endSession(req);
+      return res.send(500);
     }
     next();
   };
@@ -138,7 +106,6 @@ module.exports = (srf, logger, opts) => {
         }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
 
         res.send(503, 'Maximum Calls In Progress');
-        return req.srf.endSession(req);
       }
       next();
     } catch (err) {
@@ -152,7 +119,6 @@ module.exports = (srf, logger, opts) => {
     const {lookupAccountBySipRealm} = req.srf.locals.dbHelpers;
     logger.info(`received outbound INVITE to ${req.uri} from server at ${req.server.hostport}`);
     const uri = parseUri(req.uri);
-    const desiredRouting = req.get('X-Jambonz-Routing');
 
     if (!uri || !uri.user || !uri.host) {
       logger.info({uri: req.uri}, 'invalid request-uri on outbound call, rejecting');
@@ -161,17 +127,23 @@ module.exports = (srf, logger, opts) => {
           'X-Reason': 'invalid request-uri'
         }
       });
-      return req.srf.endSession(req);
+      return;
     }
+    const aor = `${uri.user}@${uri.host}`;
+    let reg;
+    const dotDecimalHost = /^[0-9\.]+$/.test(uri.host);
+
     debug(`received outbound INVITE to ${req.calledNumber} from server at ${req.server.hostport}`);
 
-    if ('teams' === desiredRouting) {
+    if (req.has('X-MS-Teams-FQDN') && req.has('X-MS-Teams-Tenant-FQDN')) {
       logger.debug('This is a call to ms teams');
       req.locals.target = 'teams';
+      return next();
     }
-    else if ('user' === desiredRouting) {
-      const aor = `${uri.user}@${uri.host}`;
-      const reg = await registrar.query(aor);
+    else if (!dotDecimalHost) {
+      // uri host is not a dot-decimal address, so try to look up user
+      logger.debug(`searching for registered user ${aor}`);
+      reg = await registrar.query(aor);
       if (reg) {
         // user is registered..find out which sbc is handling it
         // us => we can put the call through
@@ -186,28 +158,34 @@ module.exports = (srf, logger, opts) => {
         }
         req.locals.registration = reg;
         req.locals.target = 'user';
+        return next();
       }
       else {
+        // if the sip domain is one of ours return 404
         const account = await lookupAccountBySipRealm(uri.host);
         if (account) {
           logger.info({host: uri.host, account}, `returning 404 to unregistered user in valid domain: ${req.uri}`);
+          res.send(404);
+          return;
         }
-        else {
-          logger.info({host: uri.host, account}, `returning 404 to user in invalid domain: ${req.uri}`);
-        }
-        res.send(404);
-        return req.srf.endSession(req);
       }
     }
-    else if ('sip' === desiredRouting) {
+    if (!dotDecimalHost || !isLocalUri(uri.host, req)) {
       // call that needs to be forwarded to a sip endpoint
       logger.info(`forwarding call to sip endpoint ${req.uri}`);
       req.locals.target = 'forward';
+      return next();
     }
-    else if ('phone' === desiredRouting) {
-      debug('sending call to LCR');
-      req.locals.target = 'lcr';
+
+    // if the called number is digits only (after possible leading plus sign), do lcr
+    if (!/^\d+$/.test(req.calledNumber.slice(1))) {
+      debug(`unable to route call to ${aor}; no registered user found`);
+      logger.info(`unable to route call to ${aor}; no registered user found`);
+      return res.send(404);
     }
+
+    debug('sending call to LCR');
+    req.locals.target = 'lcr';
     next();
   };
 

lib/utils.js

@@ -73,43 +73,9 @@ const pingMsTeamsGateways = (logger, srf) => {
 
 const makeCallCountKey = (sid) => `${sid}:outcalls`;
 
-const equalsIgnoreOrder = (a, b) => {
-  if (a.length !== b.length) return false;
-  const uniqueValues = new Set([...a, ...b]);
-  for (const v of uniqueValues) {
-    const aCount = a.filter((e) => e === v).length;
-    const bCount = b.filter((e) => e === v).length;
-    if (aCount !== bCount) return false;
-  }
-  return true;
-};
-
-const  systemHealth = async(redisClient, ping, getCount) => {
-  await Promise.all([redisClient.ping(), ping()]);
-  return getCount();
-};
-
-const createHealthCheckApp = (port, logger) => {
-  const express = require('express');
-  const app = express();
-
-  app.use(express.urlencoded({ extended: true }));
-  app.use(express.json());
-
-  return new Promise((resolve) => {
-    app.listen(port, () => {
-      logger.info(`Health check server started at http://localhost:${port}`);
-      resolve(app);
-    });
-  });
-};
-
 module.exports = {
   makeRtpEngineOpts,
   selectHostPort,
   pingMsTeamsGateways,
-  makeCallCountKey,
-  equalsIgnoreOrder,
-  systemHealth,
-  createHealthCheckApp
+  makeCallCountKey
 };

package.json

@@ -1,9 +1,9 @@
 {
   "name": "sbc-outbound",
-  "version": "v0.7.5",
+  "version": "v0.7.1",
   "main": "app.js",
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 8.10.0"
   },
   "keywords": [
     "sip",
@@ -22,23 +22,21 @@
   "description": "jambonz session border controller application for outbound calls",
   "scripts": {
     "start": "node app",
-    "test": "NODE_ENV=test HTTP_PORT=3050 JAMBONZ_HOSTING=1 JAMBONES_NETWORK_CIDR=127.0.0.1/32 JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 node test/ ",
+    "test": "NODE_ENV=test JAMBONZ_HOSTING=1 JAMBONES_NETWORK_CIDR=127.0.0.1/32 JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 node test/ ",
     "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
     "jslint": "eslint app.js lib"
   },
   "dependencies": {
-    "@jambonz/db-helpers": "^0.6.18",
-    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/mw-registrar": "0.2.2",
-    "@jambonz/realtimedb-helpers": "^0.4.24",
-    "@jambonz/rtpengine-utils": "^0.3.1",
+    "@jambonz/db-helpers": "^0.6.14",
+    "@jambonz/mw-registrar": "0.2.1",
+    "@jambonz/realtimedb-helpers": "^0.4.9",
+    "@jambonz/rtpengine-utils": "^0.1.21",
     "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.1.9",
+    "@jambonz/time-series": "^0.1.6",
     "cidr-matcher": "^2.1.1",
     "debug": "^4.3.3",
     "drachtio-fn-b2b-sugar": "^0.0.12",
     "drachtio-srf": "^4.4.59",
-    "husky": "^7.0.4",
     "pino": "^7.4.1"
   },
   "devDependencies": {

test/docker-compose-testbed.yaml

@@ -10,7 +10,6 @@ networks:
 services:
   mysql:
     image: mysql:5.7
-    platform: linux/x86_64
     ports:
       - "3306:3306"
     environment: 
@@ -119,7 +118,7 @@ services:
         ipv4_address: 172.39.0.24
 
   influxdb:
-    image: influxdb:1.8
+    image: influxdb:1.8-alpine
     ports:
       - "8086:8086"
     networks:

test/scenarios/uac-cancel.xml

@@ -36,7 +36,6 @@
       Subject: uac-pcap-carrier-success
       X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
       X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
-      X-Jambonz-Routing: phone
       Content-Type: application/sdp
       Content-Length: [len]
 
@@ -104,3 +103,4 @@
   <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
 
 </scenario>
+

test/scenarios/uac-device-invalid-password.xml

@@ -34,7 +34,6 @@
       Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-device-unknown-user
-      X-Jambonz-Routing: user
       Content-Type: application/sdp
       Content-Length: [len]
 

test/scenarios/uac-device-unknown-realm.xml

@@ -34,7 +34,6 @@
       Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-device-unknown-user
-      X-Jambonz-Routing: user
       Content-Type: application/sdp
       Content-Length: [len]
 

test/scenarios/uac-device-unknown-user.xml

@@ -34,7 +34,6 @@
       Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-device-unknown-user
-      X-Jambonz-Routing: user
       Content-Type: application/sdp
       Content-Length: [len]
 

test/scenarios/uac-pcap-carrier-fail-limits.xml

@@ -16,7 +16,6 @@
       Max-Forwards: 70
       X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
       X-Call-Sid: ff49e33-e771-403a-8c99-1780eabbc803
-      X-Jambonz-Routing: phone
       Subject: uac-pcap-carrier-fail-limits
       Content-Type: application/sdp
       Content-Length: [len]

test/scenarios/uac-pcap-carrier-success-reinvite.xml

@@ -17,7 +17,6 @@
       Subject: uac-pcap-carrier-success
       X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
       X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
-      X-Jambonz-Routing: phone
       Content-Type: application/sdp
       Content-Length: [len]
 

test/scenarios/uac-pcap-carrier-success.xml

@@ -16,7 +16,6 @@
       Max-Forwards: 70
       X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
       X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
-      X-Jambonz-Routing: phone
       Subject: uac-pcap-carrier-success
       Content-Type: application/sdp
       Content-Length: [len]

test/scenarios/uac-pcap-device-404.xml

@@ -37,7 +37,6 @@
       Subject: uac-pcap-device-success
       X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
       X-Call-Sid: ff649e33-e771-403a-8c99-1780eabbc803
-      X-Jambonz-Routing: user
       Content-Type: application/sdp
       Content-Length: [len]
 

test/scenarios/uac-pcap-device-success-in-dialog-request.xml

@@ -34,7 +34,6 @@
       Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-pcap-device-success
-      X-Jambonz-Routing: user
       Content-Type: application/sdp
       Content-Length: [len]
 

test/scenarios/uac-pcap-device-success.xml

@@ -35,7 +35,6 @@
       Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-pcap-device-success
-      X-Jambonz-Routing: user
       Content-Type: application/sdp
       Content-Length: [len]
 

test/scenarios/uac-sip-uri-auth-success.xml

@@ -37,7 +37,6 @@
       Subject: uac-sip-uri-auth-success
       X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
       X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
-      X-Jambonz-Routing: sip
       Content-Type: application/sdp
       Content-Length: [len]
 
@@ -91,7 +90,6 @@
       Subject: uac-sip-uri-auth-success
       X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
       X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
-      X-Jambonz-Routing: sip
       Content-Type: application/sdp
       Content-Length: [len]
 
@@ -128,7 +126,7 @@
       To: <sip:sip:john@jambonz.org>[peer_tag_param]
       [last_Call-ID:]
       CSeq: 2 ACK
-      Subject: 
+      Subject: uac-sip-uri-auth-success
       Content-Length: 0
 
     ]]>

test/sip-tests.js

@@ -2,8 +2,7 @@ const test = require('tape');
 const { output, sippUac } = require('./sipp')('test_sbc-outbound');
 const {execSync} = require('child_process');
 const debug = require('debug')('jambonz:sbc-outbound');
-const bent = require('bent');
-const getJSON = bent('json');
+const consoleLogger = {error: console.error, info: console.log, debug: console.log};
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -30,11 +29,6 @@ test('sbc-outbound tests', async(t) => {
   try {
     await connect(srf);
   
-    let obj = await getJSON('http://127.0.0.1:3050/');
-    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)')
-
     /* call to unregistered user */
     debug('successfully connected to drachtio server');
     await sippUac('uac-pcap-device-404.xml');