fix: remove X-Voip-Carrier-Sid for outbound INVITE

2026-10-04 02:04:19 +00:00 · 2023-05-29 20:15:22 +07:00
15 changed files with 4654 additions and 2197 deletions
@@ -6,17 +6,12 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
        with:
-          node-version: 20.x
+          node-version: lts/*
      - run: npm ci
      - run: npm run jslint
-      - name: Install Docker Compose
-        run: |
-          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-          docker-compose --version
      - run: npm test

 
@@ -2,8 +2,6 @@ name: Docker

 on:
  push:
-    branches:
-      - main
    tags:
      - '*'

@@ -20,7 +18,7 @@ jobs:
      - name: prepare tag 
        id: prepare_tag
        run: |
-            IMAGE_ID=jambonz/sbc-outbound
+            IMAGE_ID=$GITHUB_REPOSITORY

            # Strip git ref prefix from version
            VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"

-npm run jslint
+npm run jslint
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2018-2024 FirstFive8, Inc.
+Copyright (c) 2021 Drachtio Communications Services, LLC

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3,12 +3,7 @@ assert.ok(process.env.JAMBONES_MYSQL_HOST &&
  process.env.JAMBONES_MYSQL_USER &&
  process.env.JAMBONES_MYSQL_PASSWORD &&
  process.env.JAMBONES_MYSQL_DATABASE, 'missing JAMBONES_MYSQL_XXX env vars');
-if (process.env.JAMBONES_REDIS_SENTINELS) {
-  assert.ok(process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
-    'missing JAMBONES_REDIS_SENTINEL_MASTER_NAME env var, JAMBONES_REDIS_SENTINEL_PASSWORD env var is optional');
-} else {
-  assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
-}
+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');
@@ -50,8 +45,7 @@ const {
  lookupSipGatewaysByCarrier,
  lookupCarrierBySid,
  queryCallLimits,
-  lookupCarrierByAccountLcr,
-  lookupSystemInformation
+  lookupCarrierByAccountLcr
 } = require('@jambonz/db-helpers')({
  host: process.env.JAMBONES_MYSQL_HOST,
  port: process.env.JAMBONES_MYSQL_PORT || 3306,
@@ -67,8 +61,11 @@ const {
  incrKey,
  decrKey,
  retrieveSet,
-  isMemberOfSet,
-} = require('@jambonz/realtimedb-helpers')({}, logger);
+  isMemberOfSet
+} = require('@jambonz/realtimedb-helpers')({
+  host: process.env.JAMBONES_REDIS_HOST,
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+}, logger);

 const activeCallIds = new Map();
 const Emitter = require('events');
@@ -85,7 +82,6 @@ srf.locals = {...srf.locals,
  queryCdrs,
  activeCallIds,
  idleEmitter,
-  privateNetworkCidr: process.env.PRIVATE_VOIP_NETWORK_CIDR || null,
  dbHelpers: {
    ping,
    lookupOutboundCarrierForAccount,
@@ -96,11 +92,9 @@ srf.locals = {...srf.locals,
    lookupSipGatewaysByCarrier,
    lookupCarrierBySid,
    queryCallLimits,
-    lookupCarrierByAccountLcr,
-    lookupSystemInformation
+    lookupCarrierByAccountLcr
  },
  realtimeDbHelpers: {
-    client: redisClient,
    createHash,
    retrieveHash,
    incrKey,
@@ -108,7 +102,10 @@ srf.locals = {...srf.locals,
    isMemberOfSet
  }
 };
-const {initLocals, checkLimits, route} = require('./lib/middleware')(srf, logger, redisClient);
+const {initLocals, checkLimits, route} = require('./lib/middleware')(srf, logger, {
+  host: process.env.JAMBONES_REDIS_HOST,
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+});
 const ngProtocol = process.env.JAMBONES_NG_PROTOCOL || 'udp';
 const ngPort = process.env.RTPENGINE_PORT || ('udp' === ngProtocol ? 22222 : 8080);
 const {getRtpEngine, setRtpEngines} = require('@jambonz/rtpengine-utils')([], logger, {
@@ -187,22 +184,10 @@ if (process.env.K8S || process.env.HTTP_PORT) {
    });
 }
 if ('test' !== process.env.NODE_ENV) {
-  /* update call stats periodically as well as definition of private network cidr */
-  setInterval(async() => {
+  /* update call stats periodically */
+  setInterval(() => {
    stats.gauge('sbc.sip.calls.count', activeCallIds.size, ['direction:outbound',
      `instance_id:${process.env.INSTANCE_ID || 0}`]);
-
-    const r = await lookupSystemInformation();
-    if (r) {
-      if (r.private_network_cidr !== srf.locals.privateNetworkCidr) {
-        logger.info(`updating private network cidr from ${srf.locals.privateNetworkCidr} to ${r.private_network_cidr}`);
-        srf.locals.privateNetworkCidr = r.private_network_cidr;
-      }
-      // Update system log level
-      if (r.log_level) {
-        logger.level = r.log_level;
-      }
-    }
  }, 20000);
 }

@@ -277,4 +262,4 @@ function handle(signal) {
  }
 }

-module.exports = {srf, logger};
+module.exports = {srf};
@@ -1,53 +1,30 @@
 const Emitter = require('events');
 const sdpTransform = require('sdp-transform');
 const SrsClient = require('@jambonz/siprec-client-utils');
-const {makeRtpEngineOpts, nudgeCallCounts, isPrivateVoipNetwork, isBlackListedSipGateway} = require('./utils');
+const {makeRtpEngineOpts, nudgeCallCounts} = require('./utils');
 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
 const {SipError, stringifyUri, parseUri} = require('drachtio-srf');
 const debug = require('debug')('jambonz:sbc-outbound');

 const makeInviteInProgressKey = (callid) => `sbc-out-iip${callid}`;
-const IMMUTABLE_HEADERS = ['via', 'from', 'to', 'call-id', 'cseq', 'max-forwards', 'content-length'];
-
-const createBLegFromHeader = ({
-  logger,
-  req,
-  host,
-  fromUser,
-  register_from_domain,
-  transport,
-  teams = false,
-  scheme = 'sip'
-}) => {
+/**
+ * this is to make sure the outgoing From has the number in the incoming From
+ * and not the incoming PAI
+ */
+const createBLegFromHeader = (req, teams) => {
  const from = req.getParsedHeader('From');
  const uri = parseUri(from.uri);
-  const transportParam = transport ? `;transport=${transport}` : '';
-
-  logger.debug({from, fromUser, uri, host, scheme, transport, teams}, 'createBLegFromHeader');
-  /* user */
-  const user = fromUser || req.get('X-Preferred-From-User') || uri.user || 'anonymous';
-
-  /* host */
-  if (!host) {
-    if (teams) {
-      host = req.get('X-MS-Teams-Tenant-FQDN');
-    }
-    else if (req.has('X-Preferred-From-Host')) {
-      host = req.get('X-Preferred-From-Host');
-    } else if (register_from_domain) {
-      host = register_from_domain;
-    }
-    else {
-      host = 'localhost';
-    }
+  let user = uri.user || 'anonymous';
+  let host = 'localhost';
+  if (teams) {
+    host = req.get('X-MS-Teams-Tenant-FQDN');
  }
-
-  if (from.name) {
-    return `${from.name} <${scheme}:${user}@${host}${transportParam}>`;
+  else if (req.has('X-Preferred-From-User') || req.has('X-Preferred-From-Host')) {
+    user = req.get('X-Preferred-From-User') || user;
+    host = req.get('X-Preferred-From-Host') || host;
  }
-  return `<${scheme}:${user}@${host}${transportParam}>`;
+  return `sip:${user}@${host}`;
 };
-
 const createBLegToHeader = (req, teams) => {
  const to = req.getParsedHeader('To');
  const host = teams ? req.get('X-MS-Teams-Tenant-FQDN') : 'localhost';
@@ -56,22 +33,19 @@ const createBLegToHeader = (req, teams) => {
  return `sip:anonymous@${host}`;
 };

-const initCdr = (req, invite) => {
-  const {srf} = req;
-  const {trace_id} = req.locals;
-  const uri = parseUri(invite.uri);
+const initCdr = (srf, req) => {
+  const uri = parseUri(req.uri);
  const regex = /^\+(\d+)$/;
-  let arr = regex.exec(invite.calledNumber);
-  const to = arr ? arr[1] : invite.calledNumber;
-  arr = regex.exec(invite.callingNumber);
-  const from = arr ? arr[1] : invite.callingNumber;
+  let arr = regex.exec(req.calledNumber);
+  const to = arr ? arr[1] : req.calledNumber;
+  arr = regex.exec(req.callingNumber);
+  const from = arr ? arr[1] : req.callingNumber;
  const applicationSid = req.get('X-Application-Sid');

  return {
    account_sid: req.get('X-Account-Sid'),
    call_sid: req.get('X-Call-Sid'),
-    sip_callid: invite.get('Call-ID'),
-    ...(req.has('X-CID') && {sip_parent_callid: req.get('X-CID')}),
+    sip_callid: req.get('Call-ID'),
    ...(applicationSid && {application_sid: applicationSid}),
    from,
    to,
@@ -81,7 +55,7 @@ const initCdr = (req, invite) => {
    direction: 'outbound',
    host: srf.locals.sipAddress,
    remote_host: uri.host,
-    trace_id: trace_id || '00000000000000000000000000000000'
+    trace_id: req.get('X-Trace-ID') || '00000000000000000000000000000000'
  };
 };

@@ -121,11 +95,6 @@ class CallSession extends Emitter {
    this.lookupCarrierByAccountLcr = lookupCarrierByAccountLcr;

    this._mediaReleased = false;
-    this.recordingNoAnswerTimeout = (process.env.JAMBONES_RECORDING_NO_ANSWER_TIMEOUT || 2) * 1000;
-  }
-
-  get service_provider_sid() {
-    return this.req.locals.service_provider_sid;
  }

  get account_sid() {
@@ -186,7 +155,7 @@ class CallSession extends Emitter {
      subscribeAnswer,
      unsubscribe
    } = engine;
-    const {client, createHash, retrieveHash} = this.srf.locals.realtimeDbHelpers;
+    const {createHash, retrieveHash} = this.srf.locals.realtimeDbHelpers;
    this.offer = offer;
    this.answer = answer;
    this.del = del;
@@ -200,18 +169,18 @@ class CallSession extends Emitter {
    this.subscribeRequest = subscribeRequest;
    this.subscribeAnswer = subscribeAnswer;
    this.unsubscribe = unsubscribe;
-    this.srsClients = [];

-    this.rtpEngineOpts = makeRtpEngineOpts(this.req, false, this.useWss || teams, false, teams);
+    this.rtpEngineOpts = makeRtpEngineOpts(this.req, false, this.useWss || teams, teams);
    this.rtpEngineResource = {destroy: this.del.bind(null, this.rtpEngineOpts.common)};
-    let proxy, uris = [];
+    let proxy, uris;
    const mapGateways = new Map();
-    let encryptedMedia = false;

    try {
      // determine where to send the call
      debug(`connecting call: ${JSON.stringify(this.req.locals)}`);
-      const headers = {
+      let headers = {
+        'From': createBLegFromHeader(this.req, teams),
+        'Contact': createBLegFromHeader(this.req, teams),
        'To': createBLegToHeader(this.req, teams),
        Allow: 'INVITE, ACK, OPTIONS, CANCEL, BYE, NOTIFY, UPDATE, PRACK',
        'X-Account-Sid': this.account_sid
@@ -228,38 +197,25 @@ class CallSession extends Emitter {
          destUri = stringifyUri(uri);
          this.logger.info(`overriding destination user with ${dest}, so final uri is ${destUri}`);
        }
-        uris = [{
-          private_network: contact.includes('transport=ws') ? false : await isPrivateVoipNetwork(destUri),
-          uri: destUri
-        }];
+        uris = [destUri];
        if (!contact.includes('transport=ws')) {
          proxy = this.req.locals.registration.proxy;
        }
-        this.logger.info(`sending call to registered user ${destUri}`);
      }
      else if (this.req.locals.target === 'forward') {
-        uris = [{
-          private_network: await isPrivateVoipNetwork(this.req.uri),
-          uri: this.req.uri
-        }];
-        if (this.req.has('X-SIP-Proxy')) {
-          proxy = this.req.get('X-SIP-Proxy');
-          if (!proxy.startsWith('sip:') && !proxy.startsWith('sips:')) proxy = `sip:${proxy}`;
-        }
+        uris = [this.req.uri];
      }
      else if (teams) {
        const vmailParam = 'opaque=app:voicemail';
        proxy = `sip:${this.req.calledNumber}@sip.pstnhub.microsoft.com:5061;transport=tls`;
        if (this.req.uri.includes(vmailParam)) {
-          uris = [{
-            private_network: false,
-            uri: `sip:${this.req.calledNumber}@sip.pstnhub.microsoft.com;${vmailParam}`
-          }];
+          uris = [`sip:${this.req.calledNumber}@sip.pstnhub.microsoft.com;${vmailParam}`];
        }
-        else uris = [{
-          private_network: false,
-          uri: `sip:${this.req.calledNumber}@sip.pstnhub.microsoft.com`
-        }];
+        else uris = [`sip:${this.req.calledNumber}@sip.pstnhub.microsoft.com`];
+        headers = {
+          ...headers,
+          Contact: `sip:${this.req.calledNumber}@${this.req.get('X-MS-Teams-Tenant-FQDN')}:5061;transport=tls`
+        };
      }
      else {
        try {
@@ -294,13 +250,7 @@ class CallSession extends Emitter {
          }
          const vc = await this.lookupCarrierBySid(voip_carrier_sid);
          const gateways = await this.lookupSipGatewaysByCarrier(voip_carrier_sid);
-          const goodGateways = [];
-          for (const g of gateways) {
-            if (!await isBlackListedSipGateway(client, this.logger, g.sip_gateway_sid)) {
-              goodGateways.push(g);
-            }
-          }
-          const gws = (goodGateways || [])
+          const gws = (gateways || [])
            .filter((gw) => gw.outbound);
          if (gws.length) {
            uris = [];
@@ -309,19 +259,17 @@ class CallSession extends Emitter {
                this.req.calledNumber.slice(1) :
                this.req.calledNumber;
              const prefix = vc.tech_prefix || '';
-              const transport =  o.protocol?.startsWith('tls') ? 'tls' : (o.protocol || 'udp');
+              const protocol =  o.protocol?.startsWith('tls') ? 'tls' : (o.protocol || 'udp');
              const hostport = !o.port || 5060 === o.port ? o.ipv4 : `${o.ipv4}:${o.port}`;
              const prependPlus = vc.e164_leading_plus && !this.req.calledNumber.startsWith('0') ? '+' : '';
-              const scheme = transport === 'tls' && !process.env.JAMBONES_USE_BEST_EFFORT_TLS && o.use_sips_scheme ?
-                'sips' : 'sip';
-              let u = `${scheme}:${prefix}${prependPlus}${calledNumber}@${hostport};transport=${transport}`;
+              const transport = `transport=${protocol}`;
+              const scheme = protocol === 'tls' ? 'sips' : 'sip';
+              const u = `${scheme}:${prefix}${prependPlus}${calledNumber}@${hostport};${transport}`;
              const obj = {
                name: vc.name,
                diversion: vc.diversion,
                hostport,
-                transport,
-                scheme,
-                register_from_domain: vc.register_from_domain
+                protocol: o.protocol
              };
              if (vc.register_username && vc.register_password) {
                obj.auth = {
@@ -329,14 +277,8 @@ class CallSession extends Emitter {
                  password: vc.register_password
                };
              }
-              if (vc.requires_register && vc.register_sip_realm?.length > 0) {
-                proxy = u;
-                u = `${scheme}:${prefix}${prependPlus}${calledNumber}@${vc.register_sip_realm};transport=${transport}`;
-                this.logger.debug({uri: u}, `using outbound proxy for this registered trunk: ${proxy}`);
-              }
              mapGateways.set(u, obj);
              uris.push(u);
-              this.logger.debug({gateway: o}, `pushed uri ${u}`);
              if (o.protocol === 'tls/srtp') {
                /**  TODO: this is a bit of a hack in the sense that we are not
                 * supporting a scenario where you have a carrier with several outbound
@@ -344,23 +286,14 @@ class CallSession extends Emitter {
                 * but it will require more significant changes and right now it seems
                 * like a rare use case -- encryption is usually an all or nothing requirement.
                 */
-                this.logger.info({u}, `using SRTP for outbound call, pad crypto: ${o.pad_crypto ? 'yes' : 'no'}`);
-                this.rtpEngineOpts = makeRtpEngineOpts(this.req, false, true, o.pad_crypto, true);
-                encryptedMedia = true;
+                this.logger.info({u}, 'using SRTP for outbound call');
+                this.rtpEngineOpts = makeRtpEngineOpts(this.req, false, true, true);
              }
            });
-            /* Check private network for each gw */
-            uris = await Promise.all(uris.map(async(u) => {
-              return {
-                private_network: await isPrivateVoipNetwork(u),
-                uri: u
-              };
-            }));
            this.logger.debug({uris, voip_carrier_sid}, 'selected outbound gateways for requested carrier');
          }
          else {
            this.logger.info({voip_carrier_sid}, 'no outbound gateways found for requested carrier');
-            this.res.send(603);
          }
        } catch (err) {
          debug(err);
@@ -371,20 +304,16 @@ class CallSession extends Emitter {
        debug(`sending call to PSTN ${uris}`);
      }

-      /* private_network should be called at last - try public first */
-      uris = uris.sort((a, b) => a.private_network - b.private_network);
-      const toPrivate = uris.some((u) => u.private_network === true);
-      const toPublic = uris.some((u) => u.private_network === false);
-      let isOfferUpdatedToPrivate = toPrivate && !toPublic;
-
+      // rtpengine 'offer'
      const opts = updateRtpEngineFlags(this.req.body, {
        ...this.rtpEngineOpts.common,
        ...this.rtpEngineOpts.uac.mediaOpts,
        'from-tag': this.rtpEngineOpts.uas.tag,
-        direction:  ['private', toPublic ? 'public' : 'private'],
+        direction:  ['private', 'public'],
        sdp: this.req.body
      });
-      let response = await this.offer(opts);
+      const response = await this.offer(opts);
+      debug(`response from rtpengine to offer ${JSON.stringify(response)}`);
      this.logger.debug({offer: opts, response}, 'initial offer to rtpengine');
      if ('ok' !== response.result) {
        this.logger.error(`rtpengine offer failed with ${JSON.stringify(response)}`);
@@ -397,22 +326,10 @@ class CallSession extends Emitter {
      // crank through the list of gateways until connected, exhausted or caller hangs up
      let earlyMedia = false;
      while (uris.length) {
-        let hdrs = { ...headers };
-        const {private_network, uri} = uris.shift();
-
-        /* if we've exhausted attempts to public endpoints and are switching to trying private, we need new rtp */
-        if (private_network && !isOfferUpdatedToPrivate) {
-          this.logger.info('switching to attempt to deliver call via private network now..');
-          this.rtpEngineResource.destroy()
-            .catch((err) => this.logger.info({err}, 'Error destroying rtpe to re-connect to private network'));
-          response = await this.offer({
-            ...opts,
-            direction: ['private', 'private']
-          });
-          isOfferUpdatedToPrivate = true;
-        }
-
-        /* on the second and subsequent attempts, use the same Call-ID and CSeq from the first attempt */
+        let hdrs = { ...headers};
+        const uri = uris.shift();
+        const gw = mapGateways.get(uri);
+        const passFailure = 0 === uris.length;  // only a single target
        if (0 === uris.length) {
          try {
            const key = makeInviteInProgressKey(this.req.get('Call-ID'));
@@ -428,76 +345,25 @@ class CallSession extends Emitter {
            this.logger.info({err}, 'Error retrieving iip key');
          }
        }
-
-        /* INVITE request line and To header should be the same. */
-        hdrs = {...hdrs, 'To': uri};
-
-        /* only now can we set Contact & From header since they depend on transport and scheme of gw */
-        const gw = mapGateways.get(uri);
        if (gw) {
-          const {scheme, transport} = gw;
          this.logger.info({gw}, `sending INVITE to ${uri} via carrier ${gw.name}`);
-          hdrs = {
-            ...hdrs,
-            From: gw.register_from_domain ?
-              createBLegFromHeader({
-                logger: this.logger,
-                req: this.req,
-                register_from_domain: gw.register_from_domain,
-                scheme,
-                transport,
-                ...(private_network && {host: this.privateSipAddress})
-              }) :
-              createBLegFromHeader({
-                logger: this.logger,
-                req: this.req,
-                scheme,
-                transport,
-                ...(private_network && {host: this.privateSipAddress})
-              }),
-            Contact: createBLegFromHeader({
-              logger: this.logger,
-              req: this.req,
-              ...(gw.auth?.username && {fromUser: gw.auth?.username}),
-              scheme,
-              transport,
-              ...(private_network && {host: this.privateSipAddress})
-            }),
-            ...(gw.diversion && {
-              Diversion: gw.diversion.startsWith('+') ?
-                `<sip:${gw.diversion}@${gw.hostport}>;reason=unknown;counter=1;privacy=off` :
-                `<sip:+${gw.diversion}@${gw.hostport}>;reason=unknown;counter=1;privacy=off`
-            })
-          };
+          hdrs = {...hdrs, 'To': uri};
+          if (gw.diversion) {
+            let div = gw.diversion;
+            if (div.startsWith('+')) {
+              div = `<sip:${div}@${gw.hostport}>;reason=unknown;counter=1;privacy=off`;
+            }
+            else div = `<sip:+${div}@${gw.hostport}>;reason=unknown;counter=1;privacy=off`;
+            hdrs = {
+              ...hdrs,
+              'Diversion': div
+            };
+          }
        }
-        else if (teams) {
-          hdrs = {
-            ...hdrs,
-            'From': createBLegFromHeader({logger: this.logger, req: this.req, teams: true, transport: 'tls'}),
-            'Contact': `sip:${this.req.calledNumber}@${this.req.get('X-MS-Teams-Tenant-FQDN')}:5061;transport=tls`
-          };
-        }
-        else {
-          hdrs = {
-            ...hdrs,
-            'From': createBLegFromHeader({
-              logger: this.logger,
-              req: this.req,
-              ...(private_network && {host: this.privateSipAddress})
-            }),
-            'Contact': createBLegFromHeader({
-              logger: this.logger,
-              req: this.req,
-              ...(private_network && {host: this.privateSipAddress})
-            })
-          };
-          const p = proxy ? ` via ${proxy}` : '';
-          this.logger.info({uri, p}, `sending INVITE to ${uri}${p}`);
-        }
-
-        /* now launch an outbound call attempt */
-        const passFailure = 0 === uris.length;  // only propagate failure on last attempt
+        else this.logger.info(`sending INVITE to ${uri} via proxy ${proxy})`);
        try {
+          const responseHeaders = this.privateSipAddress ? {Contact: `<sip:${this.privateSipAddress}>`} : {};
+
          const {uas, uac} = await this.srf.createB2BUA(this.req, this.res, uri, {
            proxy,
            passFailure,
@@ -512,22 +378,17 @@ class CallSession extends Emitter {
              '-X-Jambonz-Routing',
              '-X-Jambonz-FS-UUID',
              '-X-Preferred-From-User',
-              '-X-Preferred-From-Host',
+              'X-Preferred-From-Host',
              '-X-Jambonz-FS-UUID',
              '-X-Voip-Carrier-Sid',
-              '-X-SIP-Proxy'
            ],
            proxyResponseHeaders: [
              'all',
              '-Allow',
              '-Session-Expires'
            ],
-            // Add X-CID header to feature server response.
-            // to allow calling/status hooks contains sbc_callid.
-            responseHeaders: (uacRes, headers) => {
-              headers['X-CID'] = uacRes.get('Call-ID');
-            },
            headers: hdrs,
+            responseHeaders,
            auth: gw ? gw.auth : undefined,
            localSdpB: response.sdp,
            localSdpA: async(sdp, res) => {
@@ -537,7 +398,7 @@ class CallSession extends Emitter {
                ...this.rtpEngineOpts.uas.mediaOpts,
                'from-tag': this.rtpEngineOpts.uas.tag,
                'to-tag': this.rtpEngineOpts.uac.tag,
-                flags: ['single codec', 'inject DTMF'],
+                flags: ['single codec'],
                sdp
              };
              const response = await this.answer(opts);
@@ -563,7 +424,7 @@ class CallSession extends Emitter {
              }
              else {
                this.req.locals.cdr = {
-                  ...initCdr(this.req, inv),
+                  ...initCdr(this.req.srf, inv),
                  service_provider_sid: this.req.locals.service_provider_sid,
                  account_sid: this.req.locals.account_sid,
                  ...(this.req.locals.application_sid && {application_sid: this.req.locals.application_sid}),
@@ -580,9 +441,6 @@ class CallSession extends Emitter {
              } catch (err) {
                this.logger.error({err}, 'Error saving Call-ID/CSeq');
              }
-
-              this.contactHeader = inv.get('Contact');
-              this.logger.info(`outbound call attempt to ${uri} has contact header ${this.contactHeader}`);
            },
            cbProvisional: (response) => {
              if (!earlyMedia && [180, 183].includes(response.status) && response.body) earlyMedia = true;
@@ -602,7 +460,6 @@ class CallSession extends Emitter {
          // these are all final failure scenarios
          if (uris.length === 0 ||          // exhausted all targets
            earlyMedia ||                   // failure after early media
-            encryptedMedia ||               // cant crank back when using encrypted media as keys have been exchanged
            !(err instanceof SipError) ||   // unexpected error
            err.status === 487) {           // caller hung up

@@ -656,18 +513,13 @@ class CallSession extends Emitter {
    this.uas = uas;
    this.uac = uac;
    [uas, uac].forEach((dlg) => {
-      dlg.on('destroy', async(bye) => {
+      dlg.on('destroy', async() => {
        const other = dlg.other;
        this.rtpEngineResource.destroy();
        this.activeCallIds.delete(this.req.get('Call-ID'));
        this.unsubscribeForDTMF();
        //this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uac.tag);
        try {
-          const headers = {};
-          Object.keys(bye.headers).forEach((h) => {
-            if (!IMMUTABLE_HEADERS.includes(h)) headers[h] = bye.headers[h];
-          });
-          await other.destroy({headers});
          await other.destroy();
        } catch (err) {}

@@ -688,18 +540,12 @@ class CallSession extends Emitter {
        /* write cdr for connected call */
        if (this.req.locals.cdr) {
          const now = Date.now();
-          const day = new Date();
-          const recordAllCalls = this.req.locals.record_all_calls;
-          let recording_url = `/Accounts/${this.account_sid}/RecentCalls/${this.req.locals.cdr.call_sid}/record`;
-          recording_url += `/${day.getFullYear()}/${(day.getMonth() + 1).toString().padStart(2, '0')}`;
-          recording_url += `/${day.getDate().toString().padStart(2, '0')}/${recordAllCalls}`;
          this.writeCdrs({...this.req.locals.cdr,
            terminated_at: now,
            termination_reason: dlg.type === 'uas' ? 'caller hungup' : 'called party hungup',
            sip_status: 200,
            answered: true,
-            duration: Math.floor((now - callStart) / 1000),
-            ...(recordAllCalls && {recording_url})
+            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 */
@@ -708,7 +554,10 @@ class CallSession extends Emitter {
        dlg.other = null;
        other.other = null;

-        this._stopRecording();
+        if (this.srsClient) {
+          this.srsClient.stop();
+          this.srsClient = null;
+        }

        this.logger.info(`call ended with normal termination, there are ${this.activeCallIds.size} active`);
        if (this.activeCallIds.size === 0) this.idleEmitter.emit('idle');
@@ -733,29 +582,6 @@ class CallSession extends Emitter {
    forwardInDialogRequests(uac,  ['notify', 'options', 'message']);
  }

-  _startRecordingNoAnswerTimer(res) {
-    this._clearRecordingNoAnswerTimer();
-    this.recordingNoAnswerTimer = setTimeout(() => {
-      this.logger.info('No response from SipRec server, return error to feature server');
-      this.isRecordingNoAnswerResponded = true;
-      res.send(400);
-    }, this.recordingNoAnswerTimeout);
-  }
-
-  _clearRecordingNoAnswerTimer() {
-    if (this.recordingNoAnswerTimer) {
-      clearTimeout(this.recordingNoAnswerTimer);
-      this.recordingNoAnswerTimer = null;
-    }
-  }
-
-  _stopRecording() {
-    if (this.srsClients.length) {
-      this.srsClients.forEach((c) => c.stop());
-      this.srsClients = [];
-    }
-  }
-
  async _onRefer(dlg, req, res) {
    /* REFER coming in from a sip device, forward to feature server */
    try {
@@ -855,21 +681,13 @@ Duration=${payload.duration} `
        sdp
      };
      response = await this.answer(opts);
-      /* now remove asymmetric as B party (looking at you Genesys ring group) may need port re-learning on invites  */
-      answerMedia.flags = answerMedia.flags.filter((f) => f !== 'asymmetric');
      if ('ok' !== response.result) {
        res.send(488);
        throw new Error(`_onReinvite: rtpengine failed: ${JSON.stringify(response)}`);
      }
      this.logger.debug({opts, sdp: response.sdp}, 'CallSession:_onReinvite: (answer) sending back upstream');
-      res.send(200, {
-        body: response.sdp,
-        headers: {
-          'Contact': this.contactHeader
-        }
-      });
+      res.send(200, {body: response.sdp});
    } catch (err) {
-      res.send(err.status || 500);
      this.logger.error(err, 'Error handling reinvite');
    }
  }
@@ -897,7 +715,6 @@ Duration=${payload.duration} `
        }
        else if (reason.includes('CallRecording')) {
          let succeeded = false;
-          const headers = contentType === 'application/json' && req.body ? JSON.parse(req.body) : {};
          if (reason === 'startCallRecording') {
            const from = this.req.getParsedHeader('From');
            const to = this.req.getParsedHeader('To');
@@ -910,7 +727,7 @@ Duration=${payload.duration} `
            const callSid = req.get('X-Call-Sid');
            const accountSid = req.get('X-Account-Sid');
            const applicationSid = req.get('X-Application-Sid');
-            if (this.srsClients.length) {
+            if (this.srsClient) {
              res.send(400);
              this.logger.info('discarding duplicate startCallRecording request for a call');
              return;
@@ -920,14 +737,13 @@ Duration=${payload.duration} `
              res.send(400);
              return;
            }
-            const arr = srsUrl.split(',');
-            this.srsClients = arr.map((url) => new SrsClient(this.logger, {
+            this.srsClient = new SrsClient(this.logger, {
              srf: dlg.srf,
              direction: 'outbound',
              originalInvite: this.req,
              callingNumber: this.req.callingNumber,
              calledNumber: this.req.calledNumber,
-              srsUrl: url,
+              srsUrl,
              srsRecordingId,
              callSid,
              accountSid,
@@ -941,100 +757,44 @@ Duration=${payload.duration} `
              del: this.del,
              blockMedia: this.blockMedia,
              unblockMedia: this.unblockMedia,
-              unsubscribe: this.unsubscribe,
-              headers
-            }));
+              unsubscribe: this.unsubscribe
+            });
            try {
-              this._startRecordingNoAnswerTimer(res);
-              await Promise.any(this.srsClients.map((c) => c.start()));
-              succeeded = true;
+              succeeded = await this.srsClient.start();
            } catch (err) {
              this.logger.error({err}, 'Error starting SipRec call recording');
-              succeeded = false;
            }
          }
          else if (reason === 'stopCallRecording') {
-            if (!this.srsClients.length || !this.srsClients.some((c) => c.activated)) {
+            if (!this.srsClient) {
              res.send(400);
              this.logger.info('discarding stopCallRecording request because we are not recording');
              return;
            }
            try {
-              this._startRecordingNoAnswerTimer(res);
-              await Promise.any(this.srsClients.map((c) => {
-                if (c.activated) {
-                  c.stop();
-                }
-              }));
-              succeeded = true;
+              succeeded = await this.srsClient.stop();
            } catch (err) {
              this.logger.error({err}, 'Error stopping SipRec call recording');
-              succeeded = false;
            }
-            this.srsClients = [];
+            this.srsClient = null;
          }
          else if (reason === 'pauseCallRecording') {
-            if (!this.srsClients.length || !this.srsClients.some((c) => c.activated && !c.paused)) {
+            if (!this.srsClient || this.srsClient.paused) {
              this.logger.info('discarding invalid pauseCallRecording request');
              res.send(400);
              return;
            }
-            try {
-              this._startRecordingNoAnswerTimer(res);
-              await Promise.any(this.srsClients.map((c) => {
-                if (c.activated && !c.paused) {
-                  c.pause({headers});
-                }
-              }));
-              succeeded = true;
-            } catch (err) {
-              this.logger.error({err}, 'Error pausing SipRec call recording');
-              succeeded = false;
-            }
+            succeeded = await this.srsClient.pause();
          }
          else if (reason === 'resumeCallRecording') {
-            if (!this.srsClients.length || !this.srsClients.some((c) => c.activated && c.paused)) {
+            if (!this.srsClient || !this.srsClient.paused) {
              res.send(400);
              this.logger.info('discarding invalid resumeCallRecording request');
              return;
            }
-            try {
-              this._startRecordingNoAnswerTimer(res);
-              await Promise.any(this.srsClients.map((c) => {
-                if (c.activated && c.paused) {
-                  c.resume({headers});
-                }
-              }));
-              succeeded = true;
-            } catch (err) {
-              this.logger.error({err}, 'Error resuming SipRec call recording');
-              succeeded = false;
-            }
-          }
-          if (!this.isRecordingNoAnswerResponded) {
-            this._clearRecordingNoAnswerTimer();
-            res.send(succeeded ? 200 : 503);
-          }
-        } else if (reason.includes('Dtmf')) {
-          const arr = /Signal=\s*([0-9#*])/.exec(req.body);
-          if (!arr) {
-            this.logger.info({body: req.body}, '_onInfo: invalid INFO Dtmf');
-            throw new Error(`_onInfo: no dtmf in body for ${contentType}`);
-          }
-          const code = arr[1];
-          const arr2 = /Duration=\s*(\d+)/.exec(req.body);
-          const duration = arr2 ? arr2[1] : 250;
-          const dtmfOpts = {
-            ...this.rtpEngineOpts.common,
-            'from-tag': this.rtpEngineOpts.uas.tag,
-            code,
-            duration
-          };
-          const response = await this.playDTMF(dtmfOpts);
-          if ('ok' !== response.result) {
-            this.logger.info({response}, `rtpengine play Dtmf failed with ${JSON.stringify(response)}`);
-            throw new Error('rtpengine failed: answer');
+            succeeded = await this.srsClient.resume();
          }
+          res.send(succeeded ? 200 : 503);
        }
      }
      else if (dlg.type === 'uac' && ['application/dtmf-relay', 'application/dtmf'].includes(contentType)) {
@@ -1072,16 +832,15 @@ Duration=${payload.duration} `
        }
      }
      else {
-        const headers = {};
-        Object.keys(req.headers).forEach((h) => {
-          if (!IMMUTABLE_HEADERS.includes(h)) headers[h] = req.headers[h];
+        const response = await dlg.other.request({
+          method: 'INFO',
+          headers: req.headers,
+          body: req.body
+        });
+        res.send(response.status, {
+          headers: response.headers,
+          body: response.body
        });
-        const response = await dlg.other.request({method: 'INFO', headers, body: req.body});
-        const responseHeaders = {};
-        if (response.has('Content-Type')) {
-          Object.assign(responseHeaders, {'Content-Type': response.get('Content-Type')});
-        }
-        res.send(response.status, {headers: responseHeaders, body: response.body});
      }
    } catch (err) {
      this.logger.info({err}, `Error handing INFO request on ${dlg.type} leg`);
@@ -1090,16 +849,6 @@ Duration=${payload.duration} `

  async _onFeatureServerTransfer(dlg, req, res) {
    try {
-      // the following properties are ignored in the REFER headers
-      // 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,
-        // eslint-disable-next-line no-unused-vars
-        'X-Refer-To-Leave-Untouched': _leave,
-        ...customHeaders
-      } = req.headers;
-
      const referTo = req.getParsedHeader('Refer-To');
      const uri = parseUri(referTo.uri);
      this.logger.info({uri, referTo}, 'received REFER from feature server');
@@ -1109,16 +858,15 @@ Duration=${payload.duration} `
        const referredBy = req.getParsedHeader('Referred-By');
        if (!referredBy) return res.send(400);
        const u = parseUri(referredBy.uri);
-
-        /* delete contact if it was there from feature server */
-        delete customHeaders['contact'];
+        const farEnd = parseUri(this.connectedUri);
+        uri.host = farEnd.host;
+        uri.port = farEnd.port;

        const response = await this.uac.request({
          method: 'REFER',
          headers: {
-            'Refer-To': `<${stringifyUri(uri)}>`,
-            'Referred-By': `<${stringifyUri(u)}>`,
-            ...customHeaders
+            'Refer-To': stringifyUri(uri),
+            'Referred-By': stringifyUri(u)
          }
        });
        return res.send(response.status);
@@ -1130,38 +878,35 @@ Duration=${payload.duration} `
        ...(req.has('X-Retain-Call-Sid') && {'X-Retain-Call-Sid': req.get('X-Retain-Call-Sid')}),
        ...(req.has('X-Account-Sid') && {'X-Account-Sid': req.get('X-Account-Sid')})
      };
-
-      const uac = await this.srf.createUAC(referTo.uri, {localSdp: dlg.local.sdp, headers});
-      this.uas = uac;
-      uac.type = 'uas';
-      uac.other = this.uac;
-      this.uac.other = uac;
-      uac.on('info', this._onInfo.bind(this, uac));
-      uac.on('modify', this._onReinvite.bind(this, uac));
-      uac.on('refer', this._onFeatureServerTransfer.bind(this, uac));
-      uac.on('destroy', () => {
+      const dlg = await this.srf.createUAC(referTo.uri, {localSdp: dlg.local.sdp, headers});
+      this.uas = dlg;
+      this.uas.other = this.uac;
+      this.uac.other = this.uas;
+      this.uas.on('modify', this._onReinvite.bind(this, this.uas));
+      this.uas.on('refer', this._onFeatureServerTransfer.bind(this, this.uas));
+      this.uas.on('destroy', () => {
        this.logger.info('call ended with normal termination');
        this.rtpEngineResource.destroy();
        this.activeCallIds.delete(this.req.get('Call-ID'));
        if (this.activeCallIds.size === 0) this.idleEmitter.emit('idle');
-        uac.other.destroy();
+        this.uas.other.destroy();
        this.srf.endSession(this.req);
      });

-      const opts = {
-        ...this.rtpEngineOpts.common,
-        'from-tag': this.rtpEngineOpts.uas.tag,
-        sdp: uac.remote.sdp,
-        flags: ['port latching']
-      };
-      const response = await this.offer(opts);
+      // modify rtpengine to stream to new feature server
+      let response = await this.offer(Object.assign(this.rtpEngineOpts.offer, {sdp: this.uas.remote.sdp}));
      if ('ok' !== response.result) {
-        throw new Error(`_onFeatureServerTransfer: rtpengine offer failed: ${JSON.stringify(response)}`);
+        throw new Error(`_onReinvite: rtpengine failed: offer: ${JSON.stringify(response)}`);
+      }
+      const sdp = await this.uas.other.modify(response.sdp);
+      const opts = Object.assign({sdp, 'to-tag': res.getParsedHeader('To').params.tag},
+        this.rtpEngineOpts.answer);
+      response = await this.answer(opts);
+      if ('ok' !== response.result) {
+        throw new Error(`_onReinvite: rtpengine failed: ${JSON.stringify(response)}`);
      }
-      dlg.destroy().catch(() => {});
      this.logger.info('successfully moved call to new feature server');
    } catch (err) {
-      res.send(488);
      this.logger.error(err, 'Error handling refer from feature server');
    }
  }
@@ -4,10 +4,10 @@ const Registrar = require('@jambonz/mw-registrar');
 const {selectHostPort, nudgeCallCounts} = require('./utils');
 const FS_UUID_SET_NAME =  'fsUUIDs';

-module.exports = (srf, logger, redisClient) => {
+module.exports = (srf, logger, opts) => {
  const {incrKey, decrKey, isMemberOfSet} = srf.locals.realtimeDbHelpers;
  const {stats} = srf.locals;
-  const registrar = new Registrar(logger, redisClient);
+  const registrar = new Registrar(opts);
  const {
    lookupAccountCapacitiesBySid,
    lookupAccountBySid,
@@ -19,7 +19,6 @@ module.exports = (srf, logger, redisClient) => {
    const callId = req.get('Call-ID');
    req.locals.account_sid = req.get('X-Account-Sid');
    req.locals.application_sid = req.get('X-Application-Sid');
-    req.locals.record_all_calls = req.get('X-Record-All-Calls');
    const traceId = req.locals.trace_id = req.get('X-Trace-ID');
    req.locals.logger = logger.child({
      callId,
@@ -77,11 +76,7 @@ module.exports = (srf, logger, redisClient) => {
    });

    try {
-      const account = await lookupAccountBySid(req.locals.account_sid);
-      req.locals.account = account;
-      if (account.enable_debug_log) {
-        req.locals.logger.level = 'debug';
-      }
+      req.locals.account = await lookupAccountBySid(req.locals.account_sid);
      req.locals.service_provider_sid = req.locals.account.service_provider_sid;
    } catch (err) {
      req.locals.logger.error({err}, `Error looking up account sid ${req.locals.account_sid}`);
@@ -227,10 +222,7 @@ module.exports = (srf, logger, redisClient) => {
          /* redirect to the correct SBC where this user is connected */
          const proxyAddress = selectHostPort(reg.sbcAddress, 'tcp');
          const redirectUri =  `<sip:${proxyAddress[1]}>`;
-          logger.info({
-            myHostPort: req.server.hostport,
-            registeredHostPort: reg.sbcAddress,
-          }, `redirecting call to SBC at ${redirectUri}`);
+          logger.info(`redirecting call to SBC at ${redirectUri}`);
          return res.send(302, {headers: {Contact: redirectUri}});
        }
        req.locals.registration = reg;
@@ -1,31 +1,19 @@
 const rtpCharacteristics = require('../data/rtp-transcoding');
 const srtpCharacteristics = require('../data/srtp-transcoding');
 const debug = require('debug')('jambonz:sbc-outbound');
-const CIDRMatcher = require('cidr-matcher');
-const dns = require('dns');

-function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, padCrypto, teams) {
+function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
  const from = req.getParsedHeader('from');
  const rtpCopy = JSON.parse(JSON.stringify(rtpCharacteristics));
  const srtpCopy = JSON.parse(JSON.stringify(srtpCharacteristics));
-
-  if (padCrypto) {
-    srtpCopy['default'].flags.push('SDES-pad');
-    srtpCopy['teams'].flags.push('SDES-pad');
-  }
-
  const srtpOpts = teams ? srtpCopy['teams'] : srtpCopy['default'];
  const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCopy;
  const srcOpts = srcIsUsingSrtp ? srtpOpts : rtpCopy;

-  /** Allow feature server to send DTMF to the call excepts call from/to teams */
-  if (!teams) {
-    if (!dstOpts.flags.includes('inject DTMF')) {
-      dstOpts.flags.push('inject DTMF');
-    }
-    if (!srcOpts.flags.includes('inject DTMF')) {
-      srcOpts.flags.push('inject DTMF');
-    }
+  /* webrtc clients (e.g. sipjs) send DMTF via SIP INFO */
+  if ((srcIsUsingSrtp || dstIsUsingSrtp) && !teams) {
+    dstOpts.flags.push('inject DTMF');
+    srcOpts.flags.push('inject DTMF');
  }
  const common = {
    'call-id': req.get('Call-ID'),
@@ -187,48 +175,6 @@ const nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
  return {callsSP: null, calls: null, callsApp: null};
 };

-const isPrivateVoipNetwork = async(uri) => {
-  const {srf, logger} = require('..');
-  const {privateNetworkCidr} = srf.locals;
-
-  if (privateNetworkCidr) {
-    try {
-      const matcher = new CIDRMatcher(privateNetworkCidr.split(','));
-      const arr = /sips?:.*@(.*?)(:\d+)?(;.*)$/.exec(uri);
-      if (arr) {
-        const input = arr[1];
-        let addresses;
-        if (input.match(/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/)) {
-          addresses = [input];
-        } else {
-          addresses = await dns.resolve4(input);
-        }
-        for (const ip of addresses) {
-          if (matcher.contains(ip)) {
-            return true;
-          }
-        }
-      }
-    } catch (err) {
-      logger.info({err, privateNetworkCidr},
-        'Error checking private network CIDR, probably misconfigured must be a comma separated list of CIDRs');
-    }
-  }
-  return false;
-};
-
-function makeBlacklistGatewayKey(key) {
-  return `blacklist-sip-gateway:${key}`;
-}
-
-async function isBlackListedSipGateway(client, logger, sip_gateway_sid) {
-  try {
-    return await client.exists(makeBlacklistGatewayKey(sip_gateway_sid)) === 1;
-  } catch (err) {
-    logger.error({err}, `isBlackListedSipGateway: error while checking blacklist for ${sip_gateway_sid}`);
-  }
-}
-
 module.exports = {
  makeRtpEngineOpts,
  selectHostPort,
@@ -238,7 +184,5 @@ module.exports = {
  equalsIgnoreOrder,
  systemHealth,
  createHealthCheckApp,
-  nudgeCallCounts,
-  isPrivateVoipNetwork,
-  isBlackListedSipGateway
+  nudgeCallCounts
 };
@@ -1,9 +1,9 @@
 {
  "name": "sbc-outbound",
-  "version": "0.9.2",
+  "version": "0.8.3",
  "main": "app.js",
  "engines": {
-    "node": ">= 18.0.0"
+    "node": ">= 12.0.0"
  },
  "keywords": [
    "sip",
@@ -24,30 +24,30 @@
    "start": "node app",
    "test": "NODE_ENV=test HTTP_PORT=3050 JAMBONES_HOSTING=1 JAMBONES_NETWORK_CIDR=127.0.0.1/32 JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 node test/ ",
    "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
-    "jslint": "eslint app.js lib --fix"    
+    "jslint": "eslint app.js lib"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.9.7",
-    "@jambonz/realtimedb-helpers": "^0.8.9",
+    "@jambonz/db-helpers": "^0.8.0",
+    "@jambonz/realtimedb-helpers": "^0.7.2",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/mw-registrar": "0.2.7",
-    "@jambonz/rtpengine-utils": "^0.4.4",
-    "@jambonz/siprec-client-utils": "^0.2.7",
-    "@jambonz/stats-collector": "^0.1.10",
-    "@jambonz/time-series": "^0.2.10",
+    "@jambonz/mw-registrar": "0.2.2",
+    "@jambonz/rtpengine-utils": "^0.4.3",
+    "@jambonz/siprec-client-utils": "^0.2.4",
+    "@jambonz/stats-collector": "^0.1.8",
+    "@jambonz/time-series": "^0.2.5",
    "cidr-matcher": "^2.1.1",
    "debug": "^4.3.4",
-    "drachtio-fn-b2b-sugar": "^0.1.0",
-    "drachtio-srf": "^4.5.39",
-    "express": "^4.19.2",
-    "pino": "^8.20.0",
-    "sdp-transform": "^2.14.2"
+    "drachtio-fn-b2b-sugar": "^0.0.12",
+    "drachtio-srf": "^4.5.21",
+    "express": "^4.18.1",
+    "pino": "^7.11.0",
+    "sdp-transform": "^2.14.1"
  },
  "devDependencies": {
    "bent": "^7.3.12",
    "eslint": "^7.32.0",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-promise": "^5.2.0",
    "nyc": "^15.1.0",
-    "tape": "^5.7.5"
+    "tape": "^5.5.3"
  }
 }
@@ -1,5 +1,4 @@
 /* SQLEditor (MySQL (2))*/
-
 SET FOREIGN_KEY_CHECKS=0;

 DROP TABLE IF EXISTS account_static_ips;
@@ -14,8 +13,6 @@ 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;
@@ -54,8 +51,6 @@ 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;
@@ -132,19 +127,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 ,
@@ -340,27 +322,14 @@ 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'
+monitoring_domain_name VARCHAR(255)
 );

 CREATE TABLE users
@@ -442,7 +411,7 @@ PRIMARY KEY (smpp_gateway_sid)
 CREATE TABLE phone_numbers
 (
 phone_number_sid CHAR(36) UNIQUE ,
-number VARCHAR(132) NOT NULL,
+number VARCHAR(132) NOT NULL UNIQUE ,
 voip_carrier_sid CHAR(36),
 account_sid CHAR(36),
 application_sid CHAR(36),
@@ -455,14 +424,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';
@@ -499,21 +465,10 @@ 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 +506,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,9 +526,6 @@ 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);

@@ -642,6 +590,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 +599,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);
@@ -682,8 +628,6 @@ 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);
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="UAC with media">
-
-  <send retrans="500">
-    <![CDATA[
-
-      INVITE sip:16173333456@127.0.0.1 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@127.0.0.1>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      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]
-
-      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="603" rtd="true" crlf="true">
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      ACK sip:sip:+16173333456@127.0.0.1 SIP/2.0
-      [last_Via]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
-      To: <sip:sip:+16173333456@127.0.0.1>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Subject: uac-pcap-carrier-fail-blacklist
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-
-</scenario>
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="UAC with media">
-
-  <send retrans="500">
-    <![CDATA[
-
-      INVITE sip:16173333456@172.39.0.20 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@172.39.0.20>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
-      X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
-      X-Jambonz-Routing: sip
-      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>
-
-  <recv response="200" rtd="true" crlf="true">
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      ACK sip:sip:+16173333456@127.0.0.1 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:sip:+16173333456@127.0.0.1>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      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="2000"/>
-
-  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:sip:+16173333456@127.0.0.1 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:sip:+16173333456@127.0.0.1>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 BYE
-      Max-Forwards: 70
-      Subject: uac-pcap-carrier-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" crlf="true">
-  </recv>
-
-</scenario>
@@ -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:john@foo.bar 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:john@foo.bar>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-sip-uri-proxy
-      X-Account-Sid: ed649e33-e771-403a-8c99-1780eabbc803
-      X-Call-Sid: fff49e33-e771-403a-8c99-1780eabbc803
-      X-Jambonz-Routing: sip
-      X-SIP-Proxy: 172.39.0.20:5060
-      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>
-
-  <recv response="200">
-  </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:john@foo.bar SIP/2.0
-      [last_Via:]
-      [last_From:]
-      To: <sip:sip:john@jambonz.org>[peer_tag_param]
-      [last_Call-ID:]
-      CSeq: 2 ACK
-      Subject: 
-      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="2000"/>
-
-  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:john@foo.bar SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      [last_From:]
-      [last_To:]
-      [last_Call-ID:]
-      CSeq: 3 BYE
-      Max-Forwards: 70
-      Subject: uac-sip-uri-proxy
-      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>
@@ -26,7 +26,6 @@ function connect(connectable) {
 test('sbc-outbound tests', async(t) => {
  const {srf} = require('../app');
  const { queryCdrs } = srf.locals;
-  const redisClient = srf.locals.realtimeDbHelpers.client;

  try {
    await connect(srf);
@@ -45,10 +44,6 @@ test('sbc-outbound tests', async(t) => {
    await sippUac('uac-pcap-carrier-success.xml');
    t.pass('successfully completed outbound call to sip trunk');

-    /* call to Sip URI with no lcr configured */
-    await sippUac('uac-pcap-sip-routing-success.xml');
-    t.pass('successfully completed outbound call to sip routing trunk');
-
    /* call to PSTN with no lcr configured */
    await sippUac('uac-pcap-inbound-carrier-success.xml');
    t.pass('successfully completed outbound call to sip trunk');
@@ -85,10 +80,6 @@ test('sbc-outbound tests', async(t) => {
    await sippUac('uac-sip-uri-auth-success.xml');
    t.pass('successfully connected to sip uri that requires auth');
  
-    /* invite to sipUri through proxy */
-    await sippUac('uac-sip-uri-proxy.xml');
-    t.pass('successfully connected to sip uri through proxy');
-  
    // re-rack test data
    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/jambones-sql.sql`);
    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/populate-test-data5.sql`);
@@ -96,22 +87,12 @@ test('sbc-outbound tests', async(t) => {
    /* fails when session limit exceeded */
    await sippUac('uac-pcap-carrier-fail-limits.xml');
    t.pass('fails when max calls in progress');
-
-    // re-rack test data
-    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/jambones-sql.sql`);
-    execSync(`mysql -h 127.0.0.1 -u root  --protocol=tcp -D jambones_test < ${__dirname}/db/populate-test-data.sql`);
-
-    // Black list good carrier for some seconds
-    await redisClient.setex('blacklist-sip-gateway:124a5339-c62c-4075-9e19-f4de70a96597', 3, '');
-    await sippUac('uac-pcap-carrier-fail-blacklist.xml');
-    t.pass('fails when carrier is blacklisted');
-    await redisClient.del('blacklist-sip-gateway:124a5339-c62c-4075-9e19-f4de70a96597');
-
+      
    await waitFor(25);

    const res = await queryCdrs({account_sid: 'ed649e33-e771-403a-8c99-1780eabbc803'});
    console.log(`${res.total} cdrs: ${JSON.stringify(res)}`);
-    t.ok(res.total === 9, 'wrote 9 cdrs');
+    t.ok(res.total === 7, 'wrote 7 cdrs');

    srf.disconnect();
  } catch (err) {