0.9.11

0.9.10
Fix/siprec survives fs transfer (#249 )
2026-10-04 02:04:22 +00:00 · 2026-09-15 12:38:35 -04:00 · 2026-09-15 12:38:16 -04:00 · 2026-09-07 18:42:20 +01:00 · 2026-08-31 08:54:19 -04:00 · 2026-08-20 09:16:38 -04:00
27 changed files with 3275 additions and 7048 deletions
@@ -1 +0,0 @@
-test/*
@@ -1,126 +0,0 @@
-{
-  "env": {
-    "node": true,
-    "es6": true  
-  },
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": false,
-      "modules": false
-    },
-    "ecmaVersion": 2020
-  },
-  "plugins": ["promise"],
-  "rules": {
-    "promise/always-return": "error",
-    "promise/no-return-wrap": "error",
-    "promise/param-names": "error",
-    "promise/catch-or-return": "error",
-    "promise/no-native": "off",
-    "promise/no-nesting": "warn",
-    "promise/no-promise-in-callback": "warn",
-    "promise/no-callback-in-promise": "warn",
-    "promise/no-return-in-finally": "warn",
-
-    // Possible Errors
-    // http://eslint.org/docs/rules/#possible-errors
-    "comma-dangle": [2, "only-multiline"],
-    "no-control-regex": 2,
-    "no-debugger": 2,
-    "no-dupe-args": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-empty-character-class": 2,
-    "no-ex-assign": 2,
-    "no-extra-boolean-cast" : 2,
-    "no-extra-parens": [2, "functions"],
-    "no-extra-semi": 2,
-    "no-func-assign": 2,
-    "no-invalid-regexp": 2,
-    "no-irregular-whitespace": 2,
-    "no-negated-in-lhs": 2,
-    "no-obj-calls": 2,
-    "no-proto": 2,
-    "no-unexpected-multiline": 2,
-    "no-unreachable": 2,
-    "use-isnan": 2,
-    "valid-typeof": 2,
-
-    // Best Practices
-    // http://eslint.org/docs/rules/#best-practices
-    "no-fallthrough": 2,
-    "no-octal": 2,
-    "no-redeclare": 2,
-    "no-self-assign": 2,
-    "no-unused-labels": 2,
-
-    // Strict Mode
-    // http://eslint.org/docs/rules/#strict-mode
-    "strict": [2, "never"],
-
-    // Variables
-    // http://eslint.org/docs/rules/#variables
-    "no-delete-var": 2,
-    "no-undef": 2,
-    "no-unused-vars": [2, {"args": "none"}],
-
-    // Node.js and CommonJS
-    // http://eslint.org/docs/rules/#nodejs-and-commonjs
-    "no-mixed-requires": 2,
-    "no-new-require": 2,
-    "no-path-concat": 2,
-    "no-restricted-modules": [2, "sys", "_linklist"],
-
-    // Stylistic Issues
-    // http://eslint.org/docs/rules/#stylistic-issues
-    "comma-spacing": 2,
-    "eol-last": 2,
-    "indent": [2, 2, {"SwitchCase": 1}],
-    "keyword-spacing": 2,
-    "max-len": [2, 120, 2],
-    "new-parens": 2,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multiple-empty-lines": [2, {"max": 2}],
-    "no-trailing-spaces": [2, {"skipBlankLines": false }],
-    "quotes": [2, "single", "avoid-escape"],
-    "semi": 2,
-    "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [2, "never"],
-    "space-in-parens": [2, "never"],
-    "space-infix-ops": 2,
-    "space-unary-ops": 2,
-
-    // ECMAScript 6
-    // http://eslint.org/docs/rules/#ecmascript-6
-    "arrow-parens": [2, "always"],
-    "arrow-spacing": [2, {"before": true, "after": true}],
-    "constructor-super": 2,
-    "no-class-assign": 2,
-    "no-confusing-arrow": 2,
-    "no-const-assign": 2,
-    "no-dupe-class-members": 2,
-    "no-new-symbol": 2,
-    "no-this-before-super": 2,
-    "prefer-const": 2
-  },
-  "globals": {
-    "DTRACE_HTTP_CLIENT_REQUEST"           : false,
-    "LTTNG_HTTP_CLIENT_REQUEST"            : false,
-    "COUNTER_HTTP_CLIENT_REQUEST"          : false,
-    "DTRACE_HTTP_CLIENT_RESPONSE"          : false,
-    "LTTNG_HTTP_CLIENT_RESPONSE"           : false,
-    "COUNTER_HTTP_CLIENT_RESPONSE"         : false,
-    "DTRACE_HTTP_SERVER_REQUEST"           : false,
-    "LTTNG_HTTP_SERVER_REQUEST"            : false,
-    "COUNTER_HTTP_SERVER_REQUEST"          : false,
-    "DTRACE_HTTP_SERVER_RESPONSE"          : false,
-    "LTTNG_HTTP_SERVER_RESPONSE"           : false,
-    "COUNTER_HTTP_SERVER_RESPONSE"         : false,
-    "DTRACE_NET_STREAM_END"                : false,
-    "LTTNG_NET_STREAM_END"                 : false,
-    "COUNTER_NET_SERVER_CONNECTION_CLOSE"  : false,
-    "DTRACE_NET_SERVER_CONNECTION"         : false,
-    "LTTNG_NET_SERVER_CONNECTION"          : false,
-    "COUNTER_NET_SERVER_CONNECTION"        : false  
-  }
-}
@@ -15,7 +15,7 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: prepare tag 
        id: prepare_tag
@@ -37,14 +37,14 @@ jobs:
            echo "image_id=$IMAGE_ID" >> $GITHUB_OUTPUT
            echo "version=$VERSION" >> $GITHUB_OUTPUT

-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: true
@@ -1,10 +1,10 @@
-FROM --platform=linux/amd64 node:20.13.0-alpine3.18 as base
+FROM --platform=linux/amd64 node:24-alpine AS base

 RUN apk --update --no-cache add --virtual .builds-deps build-base python3

 WORKDIR /opt/app/

-FROM base as build
+FROM base AS build

 COPY package.json package-lock.json ./

@@ -18,6 +18,6 @@ COPY --from=build /opt/app /opt/app/

 ARG NODE_ENV

-ENV NODE_ENV $NODE_ENV
+ENV NODE_ENV=$NODE_ENV

 CMD [ "node", "app.js" ]
@@ -64,15 +64,30 @@ const {
  password: process.env.JAMBONES_MYSQL_PASSWORD,
  database: process.env.JAMBONES_MYSQL_DATABASE,
  connectionLimit: process.env.JAMBONES_MYSQL_CONNECTION_LIMIT || 10
-}, logger);
+}, logger, process.env.JAMBONES_MYSQL_WRITE_HOST && process.env.JAMBONES_MYSQL_WRITE_USER &&
+  process.env.JAMBONES_MYSQL_WRITE_PASSWORD && process.env.JAMBONES_MYSQL_WRITE_DATABASE ? {
+    host: process.env.JAMBONES_MYSQL_WRITE_HOST,
+    port: process.env.JAMBONES_MYSQL_WRITE_PORT || 3306,
+    user: process.env.JAMBONES_MYSQL_WRITE_USER,
+    password: process.env.JAMBONES_MYSQL_WRITE_PASSWORD,
+    database: process.env.JAMBONES_MYSQL_WRITE_DATABASE,
+    connectionLimit: process.env.JAMBONES_MYSQL_CONNECTION_LIMIT || 10
+  } : null);
 const {
  client: redisClient,
+  addKey,
+  deleteKey,
+  retrieveKey,
+  retrieveHash,
  createSet,
  retrieveSet,
  addToSet,
  removeFromSet,
  incrKey,
-  decrKey} = require('@jambonz/realtimedb-helpers')({}, logger);
+  decrKey,
+  createEphemeralGateway,
+  queryEphemeralGateways
+} = require('@jambonz/realtimedb-helpers')({}, logger);

 const ngProtocol = process.env.JAMBONES_NG_PROTOCOL || 'udp';
 const ngPort = process.env.RTPENGINE_PORT || ('udp' === ngProtocol ? 22222 : 8080);
@@ -108,10 +123,16 @@ srf.locals = {...srf.locals,
    lookupSystemInformation
  },
  realtimeDbHelpers: {
+    addKey,
+    deleteKey,
+    retrieveKey,
+    retrieveHash,
    createSet,
    incrKey,
    decrKey,
-    retrieveSet
+    retrieveSet,
+    createEphemeralGateway,
+    queryEphemeralGateways
  }
 };
 const {
@@ -119,7 +140,8 @@ const {
  wasOriginatedFromCarrier,
  getApplicationForDidAndCarrier,
  getOutboundGatewayForRefer,
-  getApplicationBySid
+  getApplicationBySid,
+  lookupAuthCarriersForAccountAndSP
 } = require('./lib/db-utils')(srf, logger);
 srf.locals = {
  ...srf.locals,
@@ -128,16 +150,29 @@ srf.locals = {
  getApplicationForDidAndCarrier,
  getOutboundGatewayForRefer,
  getFeatureServer: require('./lib/fs-tracking')(srf, logger),
-  getApplicationBySid
+  getApplicationBySid,
+  lookupAuthCarriersForAccountAndSP
 };
 const activeCallIds = srf.locals.activeCallIds;

+/* report our call count to redis so a draining process can count calls across
+   all sbc-inbound and sbc-outbound processes on this server */
+if (!process.env.K8S && 'test' !== process.env.NODE_ENV) {
+  srf.locals.callCountReporter = require('./lib/call-count-reporter')({
+    logger,
+    addKey,
+    addToSet,
+    getCount: () => activeCallIds.size
+  });
+}
+
 const {
  initLocals,
  handleSipRec,
  identifyAccount,
  checkLimits,
-  challengeDeviceCalls
+  challengeDeviceCalls,
+  identifyAuthTrunk
 } = require('./lib/middleware')(srf, logger);
 const CallSession = require('./lib/call-session');

@@ -225,7 +260,9 @@ srf.use('invite', [
  handleSipRec,
  identifyAccount,
  checkLimits,
-  challengeDeviceCalls
+  challengeDeviceCalls,
+  // challengeDeviceCalls will detect auth_trunk or device calls, identifyAuthTrunk have to be after that
+  identifyAuthTrunk
 ]);

 srf.invite((req, res) => {
@@ -244,7 +281,7 @@ srf.invite((req, res) => {
  session.connect();
 });

-srf.use((req, res, next, err) => {
+srf.use((err, req, res, next) => {
  logger.error(err, 'hit top-level error handler');
  res.send(500);
 });
@@ -3,6 +3,6 @@
  "DTLS": "off",
  "SDES": "off",
  "ICE": "remove",
-  "flags": ["media handover", "port latching"],
+  "flags": ["port latching"],
  "rtcp-mux": ["accept"]
 }
@@ -3,14 +3,14 @@
    "transport-protocol": "UDP/TLS/RTP/SAVPF",
    "ICE": "default",
    "SDES": "off",
-    "flags": ["generate mid", "SDES-no", "media handover", "port latching"],
-    "rtcp-mux": ["require"]  
+    "flags": ["generate mid", "SDES-no", "port latching"],
+    "rtcp-mux": ["offer"]
  },
  "teams": {
    "transport-protocol": "RTP/SAVP",
    "ICE": "default",
    "SDES": "off",
-    "flags": ["generate mid", "SDES-no", "media handover", "port latching"],
+    "flags": ["generate mid", "SDES-no", "port latching"],
    "rtcp-mux": ["accept"]
  }
 }
@@ -0,0 +1,137 @@
+const promisePlugin = require('eslint-plugin-promise');
+
+module.exports = [
+  {
+    ignores: ['test/*']
+  },
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      ecmaVersion: 2020,
+      sourceType: 'commonjs',
+      globals: {
+        // Node.js globals
+        console: 'readonly',
+        process: 'readonly',
+        Buffer: 'readonly',
+        __dirname: 'readonly',
+        __filename: 'readonly',
+        module: 'readonly',
+        require: 'readonly',
+        exports: 'readonly',
+        setTimeout: 'readonly',
+        clearTimeout: 'readonly',
+        setInterval: 'readonly',
+        clearInterval: 'readonly',
+        setImmediate: 'readonly',
+        clearImmediate: 'readonly',
+        // DTrace/LTTNG globals
+        DTRACE_HTTP_CLIENT_REQUEST: false,
+        LTTNG_HTTP_CLIENT_REQUEST: false,
+        COUNTER_HTTP_CLIENT_REQUEST: false,
+        DTRACE_HTTP_CLIENT_RESPONSE: false,
+        LTTNG_HTTP_CLIENT_RESPONSE: false,
+        COUNTER_HTTP_CLIENT_RESPONSE: false,
+        DTRACE_HTTP_SERVER_REQUEST: false,
+        LTTNG_HTTP_SERVER_REQUEST: false,
+        COUNTER_HTTP_SERVER_REQUEST: false,
+        DTRACE_HTTP_SERVER_RESPONSE: false,
+        LTTNG_HTTP_SERVER_RESPONSE: false,
+        COUNTER_HTTP_SERVER_RESPONSE: false,
+        DTRACE_NET_STREAM_END: false,
+        LTTNG_NET_STREAM_END: false,
+        COUNTER_NET_SERVER_CONNECTION_CLOSE: false,
+        DTRACE_NET_SERVER_CONNECTION: false,
+        LTTNG_NET_SERVER_CONNECTION: false,
+        COUNTER_NET_SERVER_CONNECTION: false
+      }
+    },
+    plugins: {
+      promise: promisePlugin
+    },
+    rules: {
+      // Promise plugin rules
+      'promise/always-return': 'error',
+      'promise/no-return-wrap': 'error',
+      'promise/param-names': 'error',
+      'promise/catch-or-return': 'error',
+      'promise/no-native': 'off',
+      'promise/no-nesting': 'warn',
+      'promise/no-promise-in-callback': 'warn',
+      'promise/no-callback-in-promise': 'warn',
+      'promise/no-return-in-finally': 'warn',
+
+      // Possible Errors
+      'comma-dangle': [2, 'only-multiline'],
+      'no-control-regex': 2,
+      'no-debugger': 2,
+      'no-dupe-args': 2,
+      'no-dupe-keys': 2,
+      'no-duplicate-case': 2,
+      'no-empty-character-class': 2,
+      'no-ex-assign': 2,
+      'no-extra-boolean-cast': 2,
+      'no-extra-parens': [2, 'functions'],
+      'no-extra-semi': 2,
+      'no-func-assign': 2,
+      'no-invalid-regexp': 2,
+      'no-irregular-whitespace': 2,
+      'no-obj-calls': 2,
+      'no-proto': 2,
+      'no-unexpected-multiline': 2,
+      'no-unreachable': 2,
+      'use-isnan': 2,
+      'valid-typeof': 2,
+
+      // Best Practices
+      'no-fallthrough': 2,
+      'no-octal': 2,
+      'no-redeclare': 2,
+      'no-self-assign': 2,
+      'no-unused-labels': 2,
+
+      // Strict Mode
+      'strict': [2, 'never'],
+
+      // Variables
+      'no-delete-var': 2,
+      'no-undef': 2,
+      'no-unused-vars': [2, {args: 'none', ignoreRestSiblings: true}],
+
+      // Node.js and CommonJS
+      'no-mixed-requires': 2,
+      'no-new-require': 2,
+      'no-path-concat': 2,
+
+      // Stylistic Issues
+      'comma-spacing': 2,
+      'eol-last': 2,
+      'indent': [2, 2, {SwitchCase: 1}],
+      'keyword-spacing': 2,
+      'max-len': [2, 120, 2],
+      'new-parens': 2,
+      'no-mixed-spaces-and-tabs': 2,
+      'no-multiple-empty-lines': [2, {max: 2}],
+      'no-trailing-spaces': [2, {skipBlankLines: false}],
+      'quotes': [2, 'single', 'avoid-escape'],
+      'semi': 2,
+      'space-before-blocks': [2, 'always'],
+      'space-before-function-paren': [2, 'never'],
+      'space-in-parens': [2, 'never'],
+      'space-infix-ops': 2,
+      'space-unary-ops': 2,
+
+      // ECMAScript 6
+      'arrow-parens': [2, 'always'],
+      'arrow-spacing': [2, {before: true, after: true}],
+      'constructor-super': 2,
+      'no-class-assign': 2,
+      'no-confusing-arrow': 2,
+      'no-const-assign': 2,
+      'no-dupe-class-members': 2,
+      'no-new-symbol': 2,
+      'no-this-before-super': 2,
+      'prefer-const': 2
+    }
+  }
+];
@@ -8,7 +8,7 @@ module.exports = (logger) => {
  // listen for SNS lifecycle changes
  let lifecycleEmitter = new Emitter();
  lifecycleEmitter.dryUpCalls = false;
-  if (process.env.AWS_SNS_TOPIC_ARM) {
+  if (process.env.AWS_SNS_TOPIC_ARN) {

    (async function() {
      try {
@@ -23,23 +23,55 @@ module.exports = (logger) => {
            const {srf} = require('..');
            const {activeCallIds, removeFromRedis} = srf.locals;

+            /* reject new INVITEs with 503 so senders fail over to another SBC */
+            srf.locals.dryUpCalls = true;
+
            /* remove our private IP from the set of active SBCs so rtp and fs know we are gone */
            removeFromRedis();

-            /* if we have zero calls, we can complete the scale-in right now */
-            const calls = activeCallIds.size;
-            if (0 === calls) {
-              logger.info('scale-in can complete immediately as we have no calls in progress');
-              lifecycleEmitter.completeScaleIn();
-            }
-            else {
-              logger.info(`${calls} calls in progress; scale-in will complete when they are done`);
-            }
+            /* count calls in progress across all sbc-inbound and sbc-outbound
+               processes on this server, if they are reporting; otherwise
+               fall back to counting only our own */
+            const countServerCalls = async() => {
+              const reporter = srf.locals.callCountReporter;
+              if (!reporter) return activeCallIds.size;
+              const {retrieveSet, retrieveKey} = srf.locals.realtimeDbHelpers;
+              const keys = await retrieveSet(reporter.setName);
+              let count = 0;
+              for (const key of keys) {
+                count += parseInt(await retrieveKey(key), 10) || 0;
+              }
+              return Math.max(count, activeCallIds.size);
+            };
+
+            /* poll until calls have dried up, then complete the scale-in;
+               require two consecutive zero readings since reported counts
+               may be up to 15s stale */
+            let consecutiveZeroCounts = 0;
+            const timer = setInterval(async() => {
+              try {
+                const calls = await countServerCalls();
+                if (0 === calls) {
+                  if (++consecutiveZeroCounts >= 2) {
+                    clearInterval(timer);
+                    logger.info('scale-in complete now that calls have dried up');
+                    lifecycleEmitter.completeScaleIn();
+                  }
+                }
+                else {
+                  consecutiveZeroCounts = 0;
+                  logger.info(`${calls} calls in progress on this server; scale-in will complete when they are done`);
+                }
+              } catch (err) {
+                logger.error({err}, 'Error counting calls in progress during scale-in');
+              }
+            }, 20000);
          })
          .on(LifeCycleEvents.StandbyEnter, () => {
            lifecycleEmitter.dryUpCalls = true;
            const {srf} = require('..');
            const {removeFromRedis} = srf.locals;
+            srf.locals.dryUpCalls = true;
            removeFromRedis();

            logger.info('AWS enter pending state notification: begin drying up calls');
@@ -48,6 +80,7 @@ module.exports = (logger) => {
            lifecycleEmitter.dryUpCalls = false;
            const {srf} = require('..');
            const {addToRedis} = srf.locals;
+            srf.locals.dryUpCalls = false;
            addToRedis();

            logger.info('AWS exit pending state notification: re-enable calls');
@@ -69,7 +69,17 @@ class SnsNotifier extends Emitter {
            subscriptionRequestId: this.subscriptionRequestId
          }, 'response from SNS SubscribeURL');
          const data = await this.describeInstance();
-          this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
+
+          const group = data.AutoScalingGroups.find((group) =>
+            group.Instances && group.Instances.some((instance) => instance.InstanceId === this.instanceId)
+          );
+          if (!group) {
+            this.logger.error('Current instance not found in any Auto Scaling group', data);
+          } else {
+            const instance = group.Instances.find((instance) => instance.InstanceId === this.instanceId);
+            this.lifecycleState = instance.LifecycleState;
+          }
+
          this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
          break;

@@ -137,13 +147,13 @@ class SnsNotifier extends Emitter {
    try {
      const params = {
        Protocol: 'http',
-        TopicArn: process.env.AWS_SNS_TOPIC_ARM,
+        TopicArn: process.env.AWS_SNS_TOPIC_ARN,
        Endpoint: this.snsEndpoint
      };
      const response = await snsClient.send(new SubscribeCommand(params));
-      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARN}`);
    } catch (err) {
-      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARN}`);
    }
  }

@@ -154,9 +164,9 @@ class SnsNotifier extends Emitter {
        SubscriptionArn: this.subscriptionArn
      };
      const response = await snsClient.send(new UnsubscribeCommand(params));
-      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARN}`);
    } catch (err) {
-      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARN}`);
    }
  }

@@ -0,0 +1,31 @@
+const os = require('os');
+
+/**
+ * Periodically report this process's count of calls in progress to redis.
+ * A server may host several sbc-inbound and sbc-outbound processes; when one
+ * of them handles an autoscale drain it needs to know when the entire server
+ * has no calls in progress, not just its own process.  Each process writes
+ * its own count under a per-pid key (with a short expiry, so keys from dead
+ * processes evaporate) and registers that key in a per-host set that the
+ * draining process can enumerate.
+ */
+const REPORT_INTERVAL = 15000;
+const KEY_EXPIRY_SECS = 120;
+
+module.exports = ({logger, addKey, addToSet, getCount}) => {
+  const prefix = process.env.JAMBONES_CLUSTER_ID || 'default';
+  const setName = `${prefix}:call-count-keys:${os.hostname()}`;
+  const key = `${prefix}:call-count:${os.hostname()}:${process.pid}`;
+
+  const report = () => {
+    addKey(key, `${getCount()}`, KEY_EXPIRY_SECS)
+      .catch((err) => logger.error({err}, 'call-count-reporter: error writing call count'));
+  };
+
+  addToSet(setName, key)
+    .catch((err) => logger.error({err}, `call-count-reporter: error adding ${key} to ${setName}`));
+  setInterval(report, REPORT_INTERVAL);
+  report();
+
+  return {key, setName};
+};
@@ -7,8 +7,11 @@ const {
  nudgeCallCounts,
  roundTripTime,
  parseConnectionIp,
-  isPrivateVoipNetwork
+  isPrivateVoipNetwork,
+  makeFullMediaReleaseKey,
+  makePartnerFullMediaReleaseKey
 } = require('./utils');
+const { MediaPath } = require('./constants.json');

 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
 const {parseUri, stringifyUri, SipError} = require('drachtio-srf');
@@ -61,7 +64,11 @@ class CallSession extends Emitter {
    this.activeCallIds = this.srf.locals.activeCallIds;

    this.decrKey = req.srf.locals.realtimeDbHelpers.decrKey;
-    this._mediaReleased = false;
+    this.addKey = req.srf.locals.realtimeDbHelpers.addKey;
+    this.retrieveKey = req.srf.locals.realtimeDbHelpers.retrieveKey;
+    this.retrieveHash = req.srf.locals.realtimeDbHelpers.retrieveHash;
+
+    this._mediaPath = MediaPath.FullMedia;

    this.application_sid = req.locals.application_sid;
    this.account_sid = req.locals.account_sid;
@@ -79,12 +86,7 @@ class CallSession extends Emitter {
  }

  get isMediaReleased() {
-    return this._mediaReleased;
-  }
-
-  get callerIsUsingSrtp() {
-    const tp = this.rtpEngineOpts?.uas?.mediaOpts['transport-protocol'];
-    return tp && -1 !== tp.indexOf('SAVP');
+    return this._mediaPath !== MediaPath.FullMedia;
  }

  get isFive9VoiceStream() {
@@ -107,7 +109,12 @@ class CallSession extends Emitter {

  async connect() {
    const {sdp} = this.req.locals;
-    this.logger.info('inbound call accepted for routing');
+    // use the parsed SDP from middleware (req.locals.sdp), not req.body:
+    // for multipart (SIPREC) or IWF-originated bodies req.body may be empty
+    // or not represent the actual offer, which would wrongly send an
+    // SDP-bearing call down the no-offer 3pcc path.
+    const is3pcc = !sdp || sdp.length === 0;
+    this.logger.info(`inbound ${is3pcc ? '3pcc ' : ''}call accepted for routing`);
    const engine = this.getRtpEngine();
    if (!engine) {
      this.logger.info('No available rtpengines, rejecting call!');
@@ -178,17 +185,17 @@ class CallSession extends Emitter {
      host = obj.host;
      proxy = `sip:${featureServer}`;
    }
-    if (obj.user) uri = `${scheme}:${obj.user}@${host}`;
-    else uri = `${scheme}:${host}`;
+    if (obj.user) uri = `sip:${obj.user}@${host}`;
+    else uri = `sip:${host}`;
    this.logger.info(`uri will be: ${uri}, proxy ${proxy}`);

-    try {
+    const sendOfferToRtpEngine = async(remoteSdp) => {
      const opts = {
        ...this.rtpEngineOpts.common,
        ...this.rtpEngineOpts.uac.mediaOpts,
        'from-tag': this.rtpEngineOpts.uas.tag,
        direction:  [isPrivateVoipNetwork(this.req.source_address) ? 'private' : 'public', 'private'],
-        sdp
+        sdp: remoteSdp
      };
      const startAt = process.hrtime();
      const response = await this.offer(opts);
@@ -201,7 +208,11 @@ class CallSession extends Emitter {
        this.logger.error({}, `rtpengine offer failed with ${JSON.stringify(response)}`);
        throw new Error('rtpengine failed: answer');
      }
+      return response;
+    };

+    try {
+      const response = await sendOfferToRtpEngine(sdp);
      let headers = {
        'From': createBLegFromHeader(this.req),
        'To': this.req.get('To'),
@@ -211,9 +222,13 @@ class CallSession extends Emitter {
      };
      if (this.privateSipAddress) headers = {...headers, Contact: `<sip:${this.privateSipAddress}>`};

-      const spdOfferB = this.siprec && this.xml ?
-        createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content) :
-        response.sdp;
+      let spdOfferB;
+      if (this.siprec && this.xml) {
+        spdOfferB = createSiprecBody(headers, response.sdp, this.xml.type, this.xml.content);
+      }
+      else if (!is3pcc) {
+        spdOfferB = response.sdp;
+      }

      if (this.req.locals.carrier) {
        Object.assign(headers, {
@@ -280,7 +295,10 @@ class CallSession extends Emitter {
          '-X-Authenticated-User'
        ],
        proxyResponseHeaders: ['all', '-X-Trace-ID'],
-        localSdpB: spdOfferB,
+        localSdpB: spdOfferB ? spdOfferB : async(ackBody) => {
+          const response = await sendOfferToRtpEngine(ackBody);
+          return response.sdp;
+        },
        localSdpA: async(sdp, res) => {
          this.rtpEngineOpts.uac.tag = res.getParsedHeader('To').params.tag;
          const opts = {
@@ -291,8 +309,12 @@ class CallSession extends Emitter {
            sdp
          };
          const startAt = process.hrtime();
-          const response = await this.answer(opts);
-          this.logger.debug({response, opts}, 'response from rtpengine to answer');
+          const aOpts = {
+            ...opts,
+            ...(is3pcc && {direction: ['private', 'public']})
+          };
+          const response = await this.answer(aOpts);
+          this.logger.debug({response, opts: aOpts}, 'response from rtpengine to answer');
          const rtt = roundTripTime(startAt);
          this.stats.histogram('app.rtpengine.response_time', rtt, [
            'direction:inbound', 'command:answer', `rtpengine:${this.rtpengineIp}`]);
@@ -312,9 +334,18 @@ class CallSession extends Emitter {
          }

          return response.sdp;
-        }
+        },
      });

+      // passing gateway outbound auth that sbc-inbound can send RE-INVITE with authentication process on UAS side
+      const {gateway} = this.req.locals;
+      if (gateway && gateway.register_username && gateway.register_password) {
+        this.logger.debug('passing outbound gateway auth to CallSession for reinvite processing');
+        uas.auth = {
+          username: gateway.register_username,
+          password: gateway.register_password
+        };
+      }
      // successfully connected
      this.logger.info('call connected successfully to feature server');
      debug('call connected successfully to feature server');
@@ -330,7 +361,16 @@ class CallSession extends Emitter {
        this.emit('failed');
      }
      else if (err.message !== 'call canceled') {
+        const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
        this.logger.error(err, 'unexpected error routing inbound call');
+        nudgeCallCounts(this.req, 'failure', {
+          service_provider_sid: this.service_provider_sid,
+          account_sid: this.account_sid,
+          application_sid: this.application_sid,
+          callId: this.req.locals.callId
+        }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
+          .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
+
      }
      this.srf.endSession(this.req);
    }
@@ -397,6 +437,14 @@ class CallSession extends Emitter {
        trace_id: uac.res?.get('X-Trace-ID') || '00000000000000000000000000000000'
      };
    }
+
+    /* save far end SDP for later use if we do a full media release */
+    if (process.env.JAMBONES_ENABLE_FULL_MEDIA_RELEASE) {
+      const key = makeFullMediaReleaseKey(this.req.get('Call-ID'));
+      const sdp = this.req.body;
+      this.logger.info({key, sdp}, 'saving far end sdp for full media release feature');
+      this.addKey(key, sdp, 3600).catch((err) => this.logger.error(err, 'Error saving far end sdp'));
+    }
    this.uas = uas;
    this.uac = uac;
    [uas, uac].forEach((dlg) => {
@@ -418,7 +466,7 @@ class CallSession extends Emitter {
            if (!IMMUTABLE_HEADERS.includes(h)) headers[h] = bye.headers[h];
          });
          await other.destroy({headers});
-        } catch (err) {}
+        } catch {}
        this.unsubscribeForDTMF();


@@ -428,12 +476,17 @@ class CallSession extends Emitter {

        if (process.env.JAMBONES_HOSTING || trackingOn) {
          const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
-          await nudgeCallCounts(this.logger, {
-            service_provider_sid: this.service_provider_sid,
-            account_sid: this.account_sid,
-            application_sid: this.application_sid
-          }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
-            .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
+          if (!this.req.locals.callCountNudged) {
+            this.req.locals.callCountNudged = true;
+            this.logger.debug('decrementing call count at end of call');
+            await nudgeCallCounts(this.req, 'complete', {
+              service_provider_sid: this.service_provider_sid,
+              account_sid: this.account_sid,
+              application_sid: this.application_sid,
+              callId: this.req.locals.callId
+            }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
+              .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
+          }
        }

        /* write cdr for connected call */
@@ -443,7 +496,9 @@ class CallSession extends Emitter {
            this.req.locals.carrier :
            this.req.locals.originator;
          const application = await this.srf.locals.getApplicationBySid(application_sid);
-          const isRecording = this.req.locals.account.record_all_calls || (application && application.record_all_calls);
+          const {hasRecording} = await this.retrieveHash(`call:${this.account_sid}:${call_sid}`) ?? {};
+          const isRecording = this.req.locals.account.record_all_calls ||
+          (application && application.record_all_calls) || hasRecording;
          const day = new Date();
          let recording_url = `/Accounts/${this.account_sid}/RecentCalls/${call_sid}/record`;
          recording_url += `/${day.getFullYear()}/${(day.getMonth() + 1).toString().padStart(2, '0')}`;
@@ -606,6 +661,7 @@ Duration=${payload.duration} `
    const toTag = dlg.type === 'uas' ? this.rtpEngineOpts.uac.tag : this.rtpEngineOpts.uas.tag;
    const reason = req.get('X-Reason');
    const isReleasingMedia = reason && dlg.type === 'uac' && ['release-media', 'anchor-media'].includes(reason);
+    const isFullMediaRelease = reason === 'release-media-entirely' && process.env.JAMBONES_ENABLE_FULL_MEDIA_RELEASE;
    const offerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uac.mediaOpts : this.rtpEngineOpts.uas.mediaOpts;
    const answerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uas.mediaOpts : this.rtpEngineOpts.uac.mediaOpts;
    const direction =  dlg.type === 'uas' ? ['public', 'private'] : ['private', 'public'];
@@ -667,6 +723,26 @@ Duration=${payload.duration} `
        }
        return;
      }
+
+      if (isFullMediaRelease) {
+        const b_sdp = await this.retrieveKey(makePartnerFullMediaReleaseKey(this.req.get('Call-ID')));
+        this.logger.info({b_sdp}, 'reinvite ourselves out of the media path with this reinvite offer');
+        const answerSdp = await dlg.other.modify(b_sdp);
+        this.logger.info({answerSdp}, 'far end response to full media release');
+        res.send(200, {
+          body: dlg.local.sdp,
+          headers: {
+            'Contact': this.contactHeader
+          }
+        });
+        /* no media going through us now we can destroy the rtpengine resource */
+        this.rtpEngineResource.destroy().catch((err) => {
+          this.logger.info({err}, 'Error destroying rtpengine resource after full media release');
+        });
+        this._mediaPath = MediaPath.NoMedia;
+        return;
+      }
+
      const offeredSdp = Array.isArray(req.payload) && req.payload.length > 1 ?
        req.payload.find((p) => p.type === 'application/sdp').content :
        req.body;
@@ -694,12 +770,16 @@ Duration=${payload.duration} `

      /* if this is a re-invite from the FS to change media anchoring, avoid sending the reinvite out */
      let sdp;
-      if (isReleasingMedia && !this.callerIsUsingSrtp) {
-        this.logger.info({response}, `got a reinvite from FS to ${reason}`);
+      //HL 2024-11-13: previously forwarded re-invites to webrtc clients but further testing has shown to be unnecessary
+      //if (isReleasingMedia && !this.callerIsUsingSrtp) {
+
+      //DH 2024-11- 18: if we are going from no-media to either partial or full media, we need reinvite the far end
+      if (isReleasingMedia && this._mediaPath !== MediaPath.NoMedia) {
        sdp = dlg.other.remote.sdp;
        if (!answerMedia.flags.includes('asymmetric')) answerMedia.flags.push('asymmetric');
        answerMedia.flags = answerMedia.flags.filter((f) => f !== 'media handover');
-        this._mediaReleased = 'release-media' === reason;
+        this._mediaPath = 'release-media' === reason ? MediaPath.PartialMedia : MediaPath.FullMedia;
+        this.logger.debug(`media path is now ${this._mediaPath}`);
      }
      else {
        sdp = await dlg.other.modify(response.sdp);
@@ -800,7 +880,8 @@ Duration=${payload.duration} `
              blockMedia: this.blockMedia,
              unblockMedia: this.unblockMedia,
              unsubscribe: this.unsubscribe,
-              headers
+              headers,
+              isSipRecCall: Array.isArray(this.req.payload) && this.req.payload.length > 1
            }));
            try {
              this._startRecordingNoAnswerTimer(res);
@@ -882,11 +963,13 @@ Duration=${payload.duration} `
          const code = arr[1];
          const arr2 = /Duration=\s*(\d+)/.exec(req.body);
          const duration = arr2 ? arr2[1] : 250;
+          const volume = 13;
          const dtmfOpts = {
            ...this.rtpEngineOpts.common,
            'from-tag': this.rtpEngineOpts.uac.tag,
            code,
-            duration
+            duration,
+            volume
          };
          const response = await this.playDTMF(dtmfOpts);
          if ('ok' !== response.result) {
@@ -960,9 +1043,7 @@ Duration=${payload.duration} `
      if (!arr) {
        /* call transfer requested */
        const {gateway} = this.req.locals;
-        const referredBy = req.getParsedHeader('Referred-By');
-        if (!referredBy) return res.send(400);
-        const u = parseUri(referredBy.uri);
+        if (!req.has('Referred-By')) return res.send(400);
        const leaveReferToAlone = req.has('X-Refer-To-Leave-Untouched');
        if (leaveReferToAlone) {
          this.logger.debug({referTo}, 'passing Refer-To header through untouched');
@@ -992,9 +1073,9 @@ Duration=${payload.duration} `
        // eslint-disable-next-line no-unused-vars
        const {via, from, to, 'call-id':callid, cseq, 'max-forwards':maxforwards,
          // eslint-disable-next-line no-unused-vars
-          'content-length':contentlength, 'refer-to':_referto, 'referred-by':_referredby,
+          'content-length':contentlength, 'refer-to':_referto, 'referred-by': referredby,
          // eslint-disable-next-line no-unused-vars
-          'X-Refer-To-Leave-Untouched': _leave,
+          'X-Refer-To-Leave-Untouched': _leave, contact: _contact,
          ...customHeaders
        } = req.headers;

@@ -1002,7 +1083,8 @@ Duration=${payload.duration} `
          method: 'REFER',
          headers: {
            'Refer-To': `<${stringifyUri(uri)}>`,
-            'Referred-By': `<${stringifyUri(u)}>`,
+            'Referred-By': referredby,
+            'Contact': this.contactHeader,
            ...customHeaders
          }
        });
@@ -1027,6 +1109,7 @@ Duration=${payload.duration} `
        this.rtpEngineResource.destroy();
        this.activeCallIds.delete(this.req.get('Call-ID'));
        uac.other.destroy();
+        this._stopRecording();
        this.srf.endSession(this.req);
      });

@@ -3,5 +3,10 @@
    "ScaleIn": "scale-in",
    "StandbyEnter": "standby-enter",
    "StandbyExit": "standby-exit"
+  },
+  "MediaPath": {
+    "NoMedia": "no-media",
+    "PartialMedia": "partial-media",
+    "FullMedia": "full-media"
  }
 }
@@ -7,7 +7,8 @@ const sqlSelectSPForAccount = 'SELECT service_provider_sid FROM accounts WHERE a

 const sqlSelectAllCarriersForAccountByRealm =
 `SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.account_sid,  
-vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto,
+vc.register_username, vc.register_password
 FROM sip_gateways sg, voip_carriers vc, accounts acc 
 WHERE acc.sip_realm = ? 
 AND vc.account_sid = acc.account_sid 
@@ -17,7 +18,8 @@ AND sg.voip_carrier_sid = vc.voip_carrier_sid`;

 const sqlSelectAllCarriersForSPByRealm =
 `SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.account_sid,  
-vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto,
+vc.register_username, vc.register_password
 FROM sip_gateways sg, voip_carriers vc, accounts acc 
 WHERE acc.sip_realm = ? 
 AND vc.service_provider_sid = acc.service_provider_sid  
@@ -26,24 +28,30 @@ AND vc.is_active = 1
 AND sg.inbound = 1 
 AND sg.voip_carrier_sid = vc.voip_carrier_sid`;

-const sqlSelectAllGatewaysForSP =
-`SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid,  
-vc.account_sid, vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
+const sqlSelectExactGatewayForSP =
+`SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid,
+vc.account_sid, vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto,
+vc.register_username, vc.register_password
 FROM sip_gateways sg, voip_carriers vc
-WHERE sg.voip_carrier_sid = vc.voip_carrier_sid 
-AND vc.service_provider_sid IS NOT NULL 
-AND vc.is_active = 1 
-AND sg.inbound = 1`;
+WHERE sg.voip_carrier_sid = vc.voip_carrier_sid
+AND vc.service_provider_sid IS NOT NULL
+AND vc.is_active = 1
+AND sg.inbound = 1
+AND sg.netmask = 32
+AND sg.ipv4 = ?
+ORDER BY vc.account_sid IS NOT NULL DESC`;

-const sqlCarriersForAccountBySid =
-`SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.account_sid,  
-vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
-FROM sip_gateways sg, voip_carriers vc, accounts acc 
-WHERE acc.account_sid = ? 
-AND vc.account_sid = acc.account_sid 
-AND vc.is_active = 1 
-AND sg.inbound = 1 
-AND sg.voip_carrier_sid = vc.voip_carrier_sid`;
+const sqlSelectCIDRGatewaysForSP =
+`SELECT STRAIGHT_JOIN sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid,
+vc.account_sid, vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto,
+vc.register_username, vc.register_password
+FROM sip_gateways sg, voip_carriers vc
+WHERE sg.voip_carrier_sid = vc.voip_carrier_sid
+AND vc.service_provider_sid IS NOT NULL
+AND vc.is_active = 1
+AND sg.inbound = 1
+AND sg.netmask < 32
+ORDER BY sg.netmask DESC`;

 const sqlAccountByRealm = 'SELECT * from accounts WHERE sip_realm = ? AND is_active = 1';
 const sqlAccountBySid = 'SELECT * from accounts WHERE account_sid = ?';
@@ -66,15 +74,35 @@ AND sg.voip_carrier_sid = vc.voip_carrier_sid
 AND outbound = 1`;

 const sqlSelectCarrierRequiringRegistration = `
-SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid, vc.account_sid, 
-vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto
-FROM sip_gateways sg, voip_carriers vc 
-WHERE sg.voip_carrier_sid = vc.voip_carrier_sid 
-AND vc.requires_register = 1 
-AND vc.is_active = 1 
-AND vc.register_sip_realm = ? 
+SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid, vc.account_sid,
+vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto,
+vc.register_username, vc.register_password
+FROM sip_gateways sg, voip_carriers vc
+WHERE sg.voip_carrier_sid = vc.voip_carrier_sid
+AND vc.requires_register = 1
+AND vc.is_active = 1
+AND vc.register_sip_realm = ?
 AND vc.register_username = ?`;

+const sqlSelectAuthCarriersForAccountAndSP = `
+SELECT * FROM voip_carriers 
+WHERE trunk_type = 'auth' 
+AND is_active = 1 
+AND (
+  (account_sid = ?) 
+  OR 
+  (service_provider_sid = ? AND account_sid IS NULL)
+)`;
+
+const sqlSelectGatewaysByVoipCarrierSids = `
+SELECT sg.sip_gateway_sid, sg.voip_carrier_sid, vc.name, vc.service_provider_sid,
+vc.account_sid, vc.application_sid, sg.inbound, sg.outbound, sg.is_active, sg.ipv4, sg.netmask, sg.pad_crypto,
+vc.register_username, vc.register_password
+FROM sip_gateways sg, voip_carriers vc
+WHERE sg.voip_carrier_sid IN (?)
+AND sg.voip_carrier_sid = vc.voip_carrier_sid
+AND vc.is_active = 1`;
+
 const gatewayMatchesSourceAddress = (logger, source_address, gw) => {
  if (32 === gw.netmask && gw.ipv4 === source_address) return true;
  if (gw.netmask < 32) {
@@ -90,6 +118,7 @@ const gatewayMatchesSourceAddress = (logger, source_address, gw) => {

 module.exports = (srf, logger) => {
  const {pool}  = srf.locals.dbHelpers;
+  const {queryEphemeralGateways} = srf.locals.realtimeDbHelpers;
  const pp = pool.promise();

  const getApplicationBySid = async(application_sid) => {
@@ -117,6 +146,22 @@ module.exports = (srf, logger) => {
    }
  };

+  /**
+   * Retrieves the application for a given DID (phone number) and carrier combination.
+   * First attempts an exact DID match, then falls back to pattern/wildcard matching
+   * if no exact match is found. Pattern matching is done in order of pattern length
+   * (longest/most specific first) and handles both regex and wildcard (*) patterns.
+   *
+   * @param {Object} req - The request object containing the called number
+   * @param {string} voip_carrier_sid - The SID of the VoIP carrier
+   * @returns {Promise<(string|Object|null)>} Returns either:
+   *   - application_sid (string) if appObject is false
+   *   - full application object if appObject is true
+   *   - null if no matching application is found
+   * @throws {Error} Database errors or other unexpected errors
+   */
+  // Refactored to handle invalid regular expressions gracefully as part of
+  // https://github.com/jambonz/sbc-inbound/issues/201
  const getApplicationForDidAndCarrier = async(req, voip_carrier_sid) => {
    const did = normalizeDID(req.calledNumber) || 'anonymous';

@@ -127,17 +172,117 @@ module.exports = (srf, logger) => {

      /* wildcard / regex match */
      const [r2] = await pp.query(sqlQueryAllDidsForCarrier, [voip_carrier_sid]);
-      const match = r2
+      const patterns = r2
        .filter((o) => o.number.match(/\D/))                  // look at anything with non-digit characters
-        .sort((a, b) => b.number.length - a.number.length)    // prefer longest match
-        .find((o) => did.match(new RegExp(o.number.endsWith('*') ? `${o.number.slice(0, -1)}\\d*` : o.number)));
-      if (match) return match.application_sid;
+        .sort((a, b) => b.number.length - a.number.length);
+      for (const pattern of patterns) {
+        try {
+          const regexPattern = pattern.number.endsWith('*') ?
+            `${pattern.number.slice(0, -1)}\\d*` :
+            pattern.number;
+          if (did.match(new RegExp(regexPattern))) {
+            logger.debug({voip_carrier_sid, 'pattern':pattern.number, 'did':did}, 'Found a matching pattern');
+            return pattern.application_sid;
+          }
+        } catch (err) {
+          logger.warn({err, voip_carrier_sid, pattern: pattern.number}, 'Invalid regex pattern encountered - skipping');
+          continue;
+        }
+      }
+      logger.debug({voip_carrier_sid, did}, 'No matching pattern found');
      return null;
    } catch (err) {
      logger.error({err}, 'getApplicationForDidAndCarrier');
    }
  };

+  /**
+   * Searches for a matching application across multiple carriers using pattern/wildcard matching.
+   * This function is similar to getApplicationForDidAndCarrier but operates on multiple carriers
+   * simultaneously for better performance. It searches through all patterns from the specified
+   * carriers, ordered by pattern length (longest/most specific first).
+   *
+   * @param {Object} req - The request object containing the called number
+   * @param {string} voip_carrier_sids - Comma-separated string of carrier SIDs, formatted for SQL IN clause
+   *                                     (e.g., "'carrier1','carrier2'")
+   * @returns {Promise<Object|null>} Returns either:
+   *   - The matching phone_numbers record containing application_sid, voip_carrier_sid, and account_sid
+   *   - null if no matching pattern is found
+   * @throws {Error} Database errors or other unexpected errors
+   */
+  const getApplicationForDidAndCarriers = async(req, voip_carrier_sids) => {
+    const did = normalizeDID(req.calledNumber) || 'anonymous';
+    const sql = `SELECT * FROM phone_numbers WHERE voip_carrier_sid IN (${voip_carrier_sids})`;
+
+    try {
+      /* wildcard / regex match */
+      const [r2] = await pp.query(sql);
+      const patterns = r2
+        .filter((o) => o.number.match(/\D/))                  // look at anything with non-digit characters
+        .sort((a, b) => b.number.length - a.number.length);
+      for (const pattern of patterns) {
+        try {
+          const regexPattern = pattern.number.endsWith('*') ?
+            `${pattern.number.slice(0, -1)}\\d*` :
+            pattern.number;
+          if (did.match(new RegExp(regexPattern))) {
+            logger.debug({'pattern':pattern.number, 'did':did}, 'Found a matching pattern');
+            return pattern;
+          }
+        } catch (err) {
+          logger.warn({err, pattern: pattern.number}, 'Invalid regex pattern encountered - skipping');
+          continue;
+        }
+      }
+      logger.debug('No matching pattern found');
+      return null;
+    } catch (err) {
+      logger.error({err}, 'getApplicationForDidAndCarriers');
+    }
+  };
+
+  /**
+   * Queries ephemeral gateways in Redis for the given source IP address.
+   * Returns an array of active voip_carrier_sid values.
+   *
+   * @param {string} source_address - The source IP address to query
+   * @returns {Promise<Array<string>>} Array of voip_carrier_sid values, or empty array on error
+   */
+  const lookupEphemeralGatewayCarriers = async(source_address) => {
+    try {
+      logger.debug({source_address}, 'querying ephemeral gateways');
+      const carriers = await queryEphemeralGateways(source_address);
+      if (carriers.length > 0) {
+        logger.info({source_address, count: carriers.length, carriers},
+          'found ephemeral gateway carriers');
+      }
+      return carriers;
+    } catch (err) {
+      logger.error({err, source_address}, 'Error querying ephemeral gateways');
+      return [];
+    }
+  };
+
+  /**
+   * Retrieves full gateway details (with carrier info) for the given voip_carrier_sid array.
+   * Returns gateway records (joined with carrier data) matching the structure of other gateway queries.
+   *
+   * @param {Array<string>} voipCarrierSids - Array of voip_carrier_sid values
+   * @returns {Promise<Array<Object>>} Array of gateway objects (with carrier fields included)
+   */
+  const lookupGatewaysByCarrierSids = async(voipCarrierSids) => {
+    if (!voipCarrierSids || voipCarrierSids.length === 0) return [];
+
+    try {
+      const [r] = await pp.query(sqlSelectGatewaysByVoipCarrierSids, [voipCarrierSids]);
+      logger.debug({count: r.length, voipCarrierSids}, 'retrieved gateway details for ephemeral gateways');
+      return r;
+    } catch (err) {
+      logger.error({err, voipCarrierSids}, 'Error retrieving gateway details by carrier IDs');
+      return [];
+    }
+  };
+
  const wasOriginatedFromCarrier = async(req) => {
    const failure = {fromCarrier: false};
    const uri = parseUri(req.uri);
@@ -169,7 +314,7 @@ module.exports = (srf, logger) => {

        /* get all the carriers and gateways for the account owning this sip realm */
        const [gwAcc] = await pp.query(sqlSelectAllCarriersForAccountByRealm, [uri.host]);
-        const [gwSP] = gwAcc.length ? [[]] : await pp.query(sqlSelectAllCarriersForSPByRealm, uri.host);
+        const [gwSP] = await pp.query(sqlSelectAllCarriersForSPByRealm, uri.host);
        const gw = gwAcc
          .concat(gwSP)
          .sort((a, b) => b.netmask - a.netmask);
@@ -180,13 +325,42 @@ module.exports = (srf, logger) => {
            name: gw.name,
            service_provider_sid: gw.service_provider_sid,
            account_sid: gw.account_sid,
-            application_sid: gw.application_sid
+            application_sid: gw.application_sid,
+            register_username: gw.register_username,
+            register_password: gw.register_password
          };
        });
        /* remove duplicates, winnow down to voip_carriers, not gateways */
        if (voip_carriers.length > 1) {
          voip_carriers = [...new Set(voip_carriers.map(JSON.stringify))].map(JSON.parse);
        }
+
+        /* if no static gateway matches, check ephemeral gateways in Redis */
+        if (voip_carriers.length === 0 && gateways.length === 0) {
+          const ephemeralCarrierSids = await lookupEphemeralGatewayCarriers(req.source_address);
+          if (ephemeralCarrierSids.length > 0) {
+            const ephemeralGateways = await lookupGatewaysByCarrierSids(ephemeralCarrierSids);
+            gateways.push(...ephemeralGateways);
+            voip_carriers = ephemeralGateways.map((gw) => {
+              return {
+                voip_carrier_sid: gw.voip_carrier_sid,
+                name: gw.name,
+                service_provider_sid: gw.service_provider_sid,
+                account_sid: gw.account_sid,
+                application_sid: gw.application_sid,
+                register_username: gw.register_username,
+                register_password: gw.register_password
+              };
+            });
+            /* remove duplicates */
+            if (voip_carriers.length > 1) {
+              voip_carriers = [...new Set(voip_carriers.map(JSON.stringify))].map(JSON.parse);
+            }
+            logger.info({source_address: req.source_address, count: voip_carriers.length},
+              'matched call to ephemeral gateway(s) from registration trunk');
+          }
+        }
+
        if (voip_carriers.length) {
          /* we have one or more matches.  Now check for one with a provisioned phone number matching the DID */
          const vc_sids = voip_carriers.map((m) => `'${m.voip_carrier_sid}'`).join(',');
@@ -194,12 +368,39 @@ module.exports = (srf, logger) => {
            `SELECT * FROM phone_numbers WHERE number = '${did}'
            AND voip_carrier_sid IN (${vc_sids})
            AND account_sid = '${a[0].account_sid}'`;
-          logger.debug({voip_carriers, sql, did}, 'looking up DID');
+          //logger.debug({voip_carriers, sql, did}, 'looking up DID');

          const [r] = await pp.query(sql);
+          if (r.length === 0) {
+            // if no matching phone number is found, find whether there are any applications having phone numbers
+            // matching the regex pattern or wild card
+            logger.debug({isDotDecimal},
+              'Did not find a matching phone number, checking for applications with Regex or wildcard');
+            const vc_sids = voip_carriers.map((m) => `'${m.voip_carrier_sid}'`).join(',');
+            const application = await getApplicationForDidAndCarriers(req, vc_sids);
+            if (application) {
+              logger.debug({application}, 'sip_realm looking up DID: found application with Regex or wildcard ');
+              const gateway = gateways.find((m) => m.voip_carrier_sid === application.voip_carrier_sid);
+              // the gateway may belong to "all accounts", so we need to use the account_sid of the application
+              gateway.account_sid = gateway.account_sid ? gateway.account_sid : application.account_sid;
+              return {
+                fromCarrier: true,
+                gateway: gateway,
+                service_provider_sid: a[0].service_provider_sid,
+                account_sid: gateway.account_sid,
+                application_sid: application.application_sid,
+                account: a[0]
+              };
+            }
+          }
          if (r.length > 1) {
-            logger.info({r},
-              'multiple carriers with the same gateway have the same number provisioned for the same account'
+            const all = r.map(({account_sid, voip_carrier_sid}) => ({account_sid, voip_carrier_sid}));
+            logger.info({
+              number: r[0].number,
+              total: all.length,
+              matches: all.slice(0, 5)
+            },
+            'multiple carriers with the same gateway have the same number provisioned for the same account'
              + ' -- cannot determine which one to use');
            return {
              fromCarrier: true,
@@ -248,7 +449,7 @@ module.exports = (srf, logger) => {
            `SELECT application_sid FROM phone_numbers WHERE number = '${did}'
            AND voip_carrier_sid = '${matches[0].voip_carrier_sid}'
            AND account_sid = '${matches[0].account_sid}'`;
-          logger.debug({matches: matches[0], sql, did}, 'looking up DID');
+          //logger.debug({matches: matches[0], sql, did}, 'looking up DID');

          const [r] = await pp.query(sql);
          return {
@@ -273,124 +474,194 @@ module.exports = (srf, logger) => {
      /* no match, so fall through  */
    }

-    if (isDotDecimal && process.env.JAMBONES_HOSTING) {
-      if (!process.env.SBC_ACCOUNT_SID) return failure;
+    /* find all carrier entries that have an inbound gateway matching the source IP */
+    /* Query both exact IP matches AND CIDR ranges in parallel to handle the case where
+       multiple accounts have configured the same carrier with different netmasks.
+       The phone number lookup will disambiguate which account owns the call. */
+    const [[gwExact], [gwCidr]] = await Promise.all([
+      pp.query(sqlSelectExactGatewayForSP, [req.source_address]),
+      pp.query(sqlSelectCIDRGatewaysForSP)
+    ]);

-      /* look for carrier only within that account */
-      const [r] = await pp.query(sqlCarriersForAccountBySid,
-        [process.env.SBC_ACCOUNT_SID, req.source_address, req.source_port]);
-      if (0 === r.length) return failure;
-      const service_provider_sid = await getSPForAccount(process.env.SBC_ACCOUNT_SID);
-      return {
-        fromCarrier: true,
-        gateway: r[0],
-        account_sid: process.env.SBC_ACCOUNT_SID,
-        service_provider_sid
-      };
+    /* Merge both result sets - exact matches first, then CIDR ranges (already sorted by netmask DESC) */
+    const gw = [...gwExact, ...gwCidr];
+
+    //logger.debug({gw}, `checking gateways for source address ${req.source_address}`);
+    let matches = gw
+      .filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address))
+      .map((gw) => {
+        return {
+          voip_carrier_sid: gw.voip_carrier_sid,
+          name: gw.name,
+          service_provider_sid: gw.service_provider_sid,
+          account_sid: gw.account_sid,
+          application_sid: gw.application_sid,
+          pad_crypto: gw.pad_crypto,
+          register_username: gw.register_username,
+          register_password: gw.register_password
+        };
+      });
+    /* remove duplicates, winnow down to voip_carriers, not gateways */
+    if (matches.length > 1) {
+      matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
    }
-    else {
-      /* find all carrier entries that have an inbound gateway matching the source IP */
-      const [gw] = await pp.query(sqlSelectAllGatewaysForSP);
-      let matches = gw
-        .sort((a, b) => b.netmask - a.netmask)
-        .filter(gatewayMatchesSourceAddress.bind(null, logger, req.source_address))
-        .map((gw) => {
+
+    /* if no static gateway matches, check ephemeral gateways in Redis */
+    if (matches.length === 0) {
+      const ephemeralCarrierSids = await lookupEphemeralGatewayCarriers(req.source_address);
+      if (ephemeralCarrierSids.length > 0) {
+        const ephemeralGateways = await lookupGatewaysByCarrierSids(ephemeralCarrierSids);
+        matches = ephemeralGateways.map((gw) => {
          return {
            voip_carrier_sid: gw.voip_carrier_sid,
            name: gw.name,
            service_provider_sid: gw.service_provider_sid,
            account_sid: gw.account_sid,
            application_sid: gw.application_sid,
-            pad_crypto: gw.pad_crypto
+            pad_crypto: gw.pad_crypto,
+            register_username: gw.register_username,
+            register_password: gw.register_password
          };
        });
-      /* remove duplicates, winnow down to voip_carriers, not gateways */
-      if (matches.length > 1) {
-        matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
-      }
-      if (matches.length) {
-        /* we have one or more matches.  Now check for one with a provisioned phone number matching the DID */
-        const vc_sids = matches.map((m) => `'${m.voip_carrier_sid}'`).join(',');
-        const sql =  `SELECT * FROM phone_numbers WHERE number = '${did}' AND voip_carrier_sid IN (${vc_sids})`;
-        logger.debug({matches, sql, did, vc_sids}, 'looking up DID');
-
-        const [r] = await pp.query(sql);
-        if (0 === r.length) {
-          /* came from a provisioned carrier, but the dialed number is not provisioned.
-              check if we have an account with default routing of that carrier to an application
-          */
-          const accountLevelGateways = matches.filter((m) => m.account_sid && m.application_sid);
-          if (accountLevelGateways.length > 1) {
-            logger.info({accounts: accountLevelGateways.map((m) => m.account_sid)},
-              'multiple accounts have added this carrier with default routing -- cannot determine which to use');
-            return {
-              fromCarrier: true,
-              error: 'Multiple accounts are attempting to default route this carrier'
-            };
-          }
-          else if (accountLevelGateways.length === 1) {
-            const [accounts] = await pp.query('SELECT * from accounts where account_sid = ?',
-              [accountLevelGateways[0].account_sid]);
-            return {
-              fromCarrier: true,
-              gateway: accountLevelGateways[0],
-              service_provider_sid: accountLevelGateways[0].service_provider_sid,
-              account_sid: accountLevelGateways[0].account_sid,
-              application_sid: accountLevelGateways[0].application_sid,
-              account: accounts[0]
-            };
-          }
-          else {
-            /* check if we only have a single account, otherwise we have no
-               way of knowing which account this is for
-            */
-            const [r] = await pp.query('SELECT count(*) as count from accounts where service_provider_sid = ?',
-              [matches[0].service_provider_sid]);
-            if (r[0].count === 0 || r[0].count > 1) return {fromCarrier: true};
-            else {
-              const [accounts] = await pp.query('SELECT * from accounts where service_provider_sid = ?',
-                [matches[0].service_provider_sid]);
-              return {
-                fromCarrier: true,
-                gateway: matches[0],
-                service_provider_sid: accounts[0].service_provider_sid,
-                account_sid: accounts[0].account_sid,
-                account: accounts[0]
-              };
-            }
-          }
+        /* remove duplicates */
+        if (matches.length > 1) {
+          matches = [...new Set(matches.map(JSON.stringify))].map(JSON.parse);
        }
-        else if (r.length > 1) {
-          logger.info({r},
+        logger.info({source_address: req.source_address, count: matches.length},
+          'matched call to ephemeral gateway(s) from registration trunk');
+      }
+    }
+
+    //logger.debug({matches}, `matches for source address ${req.source_address}`);
+    if (matches.length) {
+      /* we have one or more matches.  Now check for one with a provisioned phone number matching the DID */
+      const vc_sids = matches.map((m) => `'${m.voip_carrier_sid}'`).join(',');
+      const sql =  `SELECT * FROM phone_numbers WHERE number = '${did}' AND voip_carrier_sid IN (${vc_sids})`;
+      logger.debug({matches, sql, did, vc_sids}, 'looking up DID');
+      const [r] = await pp.query(sql);
+      if (0 === r.length) {
+        // if no matching phone number is found, find whether there are any applications having phone numbers
+        // matching the regex pattern or wild card
+        logger.debug({isDotDecimal},
+          'Did not find a matching phone number, checking for applications with Regex or wildcard');
+        const vc_sids = matches.map((m) => `'${m.voip_carrier_sid}'`).join(',');
+        const application = await getApplicationForDidAndCarriers(req, vc_sids);
+        if (application) {
+          logger.debug({application}, 'looking up DID: found application with Regex or wildcard');
+          const gateway = matches.find((m) => m.voip_carrier_sid === application.voip_carrier_sid);
+          // the gateway may belong to "all accounts", so we need to use the account_sid of the application
+          const [a] = await pp.query(sqlAccountBySid, [application.account_sid]);
+          return {
+            fromCarrier: true,
+            gateway: gateway,
+            service_provider_sid: gateway.service_provider_sid,
+            account_sid: application.account_sid,
+            application_sid: application.application_sid,
+            account: a[0],
+          };
+        }
+
+        /* came from a provisioned carrier, but the dialed number is not provisioned.
+            check if we have an account with default routing of that carrier to an application
+        */
+        const accountLevelGateways = matches.filter((m) => m.account_sid && m.application_sid);
+        if (accountLevelGateways.length > 1) {
+          logger.info({accounts: accountLevelGateways.map((m) => m.account_sid)},
            'multiple accounts have added this carrier with default routing -- cannot determine which to use');
          return {
            fromCarrier: true,
-            error: 'Multiple accounts are attempting to route the same phone number from the same carrier'
+            error: 'Multiple accounts are attempting to default route this carrier'
          };
        }
-
-        /* we have a route for this phone number and carrier combination */
-        const gateway = matches.find((m) => m.voip_carrier_sid === r[0].voip_carrier_sid);
-        const [accounts] = await pp.query(sqlAccountBySid, [r[0].account_sid]);
-        assert(accounts.length);
+        else if (accountLevelGateways.length === 1) {
+          const [accounts] = await pp.query('SELECT * from accounts where account_sid = ?',
+            [accountLevelGateways[0].account_sid]);
+          return {
+            fromCarrier: true,
+            gateway: accountLevelGateways[0],
+            service_provider_sid: accountLevelGateways[0].service_provider_sid,
+            account_sid: accountLevelGateways[0].account_sid,
+            application_sid: accountLevelGateways[0].application_sid,
+            account: accounts[0]
+          };
+        }
+        else {
+          /* check if we only have a single account, otherwise we have no
+-               way of knowing which account this is for
+          */
+          const [r] = await pp.query('SELECT count(*) as count from accounts where service_provider_sid = ?',
+            [matches[0].service_provider_sid]);
+          if (r[0].count === 0 || r[0].count > 1) return {fromCarrier: true};
+          else {
+            const [accounts] = await pp.query('SELECT * from accounts where service_provider_sid = ?',
+              [matches[0].service_provider_sid]);
+            return {
+              fromCarrier: true,
+              gateway: matches[0],
+              service_provider_sid: accounts[0].service_provider_sid,
+              account_sid: accounts[0].account_sid,
+              account: accounts[0]
+            };
+          }
+        }
+      }
+      else if (r.length > 1) {
+        const all = r.map(({account_sid, voip_carrier_sid}) => ({account_sid, voip_carrier_sid}));
+        logger.info({
+          number: r[0].number,
+          total: all.length,
+          matches: all.slice(0, 5)
+        },
+        'multiple accounts have added this carrier with default routing -- cannot determine which to use');
        return {
          fromCarrier: true,
-          gateway,
-          service_provider_sid: accounts[0].service_provider_sid,
-          account_sid: r[0].account_sid,
-          application_sid: r[0].application_sid,
-          account: accounts[0]
+          error: 'Multiple accounts are attempting to route the same phone number from the same carrier'
        };
      }
+
+      /* we have a route for this phone number and carrier combination */
+      const gateway = matches.find((m) => m.voip_carrier_sid === r[0].voip_carrier_sid);
+      const [accounts] = await pp.query(sqlAccountBySid, [r[0].account_sid]);
+      assert(accounts.length);
+      return {
+        fromCarrier: true,
+        gateway,
+        service_provider_sid: accounts[0].service_provider_sid,
+        account_sid: r[0].account_sid,
+        application_sid: r[0].application_sid,
+        account: accounts[0]
+      };
    }
    return failure;
  };

+  /**
+   * Retrieves voip_carriers with trunk_type 'auth' that belong to either:
+   * 1. The specified account (account_sid matches), OR
+   * 2. The service provider but with null account_sid (shared across service provider)
+   *
+   * @param {string} account_sid - The SID of the account
+   * @param {string} service_provider_sid - The SID of the service provider
+   * @returns {Promise<Array>} Array of voip_carrier records matching the criteria
+   * @throws {Error} Database errors or other unexpected errors
+   */
+  const lookupAuthCarriersForAccountAndSP = async(account_sid, service_provider_sid) => {
+    try {
+      const [rows] = await pp.query(sqlSelectAuthCarriersForAccountAndSP, [account_sid, service_provider_sid]);
+      return rows;
+    } catch (err) {
+      logger.error({err, account_sid, service_provider_sid}, 'lookupAuthCarriersForAccountAndSP');
+      throw err;
+    }
+  };
+
  return {
    wasOriginatedFromCarrier,
    getApplicationForDidAndCarrier,
+    getApplicationForDidAndCarriers,
    getOutboundGatewayForRefer,
    getSPForAccount,
-    getApplicationBySid
+    getApplicationBySid,
+    lookupAuthCarriersForAccountAndSP
  };
 };
@@ -28,13 +28,23 @@ module.exports = function(srf, logger) {
    lookupAccountBySipRealm,
    lookupAccountBySid,
    lookupAccountCapacitiesBySid,
-    queryCallLimits
+    queryCallLimits,
  }  = srf.locals.dbHelpers;
-  const {stats, writeCdrs} = srf.locals;
+  const {stats, writeCdrs, lookupAuthCarriersForAccountAndSP, getApplicationForDidAndCarrier} = srf.locals;

  const initLocals = (req, res, next) => {
    const callId = req.get('Call-ID');
+
+    /* if we are drying up calls prior to scale-in, reject new INVITEs so the
+       sender fails over to another SBC; allow INVITE with Replaces through
+       since it targets a call already in progress on this server */
+    if (srf.locals.dryUpCalls && !req.has('Replaces')) {
+      logger.info({callId}, 'rejecting INVITE with 503 as we are drying up calls before scale-in');
+      return res.send(503);
+    }
+
    req.locals = req.locals || {callId};
+    req.locals.nudge = 0;

    /* check if forwarded by a proxy that applied an X-Forwarded-For Header */
    if (req.has('X-Forwarded-For') || req.has('X-Subspace-Forwarded-For')) {
@@ -129,8 +139,13 @@ module.exports = function(srf, logger) {
          logger.info('identifyAccount: rejecting call from carrier because DID has not been provisioned');
          return res.send(404, 'Number Not Provisioned');
        }
-        logger.info({gateway}, 'identifyAccount: incoming call from gateway');
-
+        const {register_password, ...gatewayForLog} = gateway;
+        logger.info({gateway: gatewayForLog}, 'identifyAccount: incoming call from gateway');
+        const appSidHeader = req.get('x-application-sid');
+        if (appSidHeader && appSidHeader == application_sid) {
+          logger.info({callId}, 'Loop Detected, x-application-sid header on incoming call matches applicationSid');
+          return res.send(482, 'Loop Detected on x-application-sid');
+        }
        let sid;
        if (siprec) {
          if (!account.siprec_hook_sid) {
@@ -186,6 +201,10 @@ module.exports = function(srf, logger) {
          res.send(404);
          return req.srf.endSession(req);
        }
+        const auth_trunks = await lookupAuthCarriersForAccountAndSP(
+          account.account_sid,
+          account.service_provider_sid
+        );

        /* if this is a dedicated SBC (static IP) only take calls for that account's sip realm */
        if (process.env.SBC_ACCOUNT_SID && account.account_sid !== process.env.SBC_ACCOUNT_SID) {
@@ -209,6 +228,7 @@ module.exports = function(srf, logger) {
            registration_hook_username: account.registration_hook.username,
            registration_hook_password: account.registration_hook.password
          }),
+          ...(auth_trunks?.length && {auth_trunks}),
          ...req.locals
        };
      }
@@ -259,13 +279,20 @@ module.exports = function(srf, logger) {
    assert(account_sid);
    assert(service_provider_sid);

+    /* if quick cancel then we are done */
+    if (req.canceled) {
+      logger.info('checkLimits: call was immediately canceled, no need to increment call count as we are done');
+      return;
+    }
+
    /* decrement count if INVITE is later rejected */
    res.once('end', async({status}) => {
      if (status > 200) {
-        nudgeCallCounts(logger, {
+        nudgeCallCounts(req, 'failure', {
          service_provider_sid,
          account_sid,
-          application_sid
+          application_sid,
+          callId: req.locals.callId
        }, decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
          .catch((err) => logger.error(err, 'Error decrementing call counts'));
      }
@@ -273,10 +300,11 @@ module.exports = function(srf, logger) {

    try {
      /* increment the call count */
-      const  {callsSP, calls} = await nudgeCallCounts(logger, {
+      const  {callsSP, calls} = await nudgeCallCounts(req, 'init', {
        service_provider_sid,
        account_sid,
-        application_sid
+        application_sid,
+        callId: req.locals.callId
      }, incrKey, {writeCallCountSP, writeCallCount, writeCallCountApp});

      /* compare to account's limit, though avoid db hit when call count is low */
@@ -286,24 +314,22 @@ module.exports = function(srf, logger) {
      logger.debug(`checkLimits: call count is now ${calls}, limit is ${minLimit}`);
      if (calls <= minLimit) return next();

-      if (process.env.JAMBONES_HOSTING) {
-        const accountCapacities = await lookupAccountCapacitiesBySid(account_sid);
-        const accountLimit = accountCapacities.find((c) => c.category == 'voice_call_session');
-        if (accountLimit) {
-          /* check account limit */
-          const limit_sessions = accountLimit.quantity;
-          if (calls > limit_sessions) {
-            debug(`checkLimits: limits exceeded: call count ${calls}, limit ${limit_sessions}`);
-            logger.info({calls, limit_sessions}, 'checkLimits: limits exceeded');
-            writeAlerts({
-              alert_type: AlertType.ACCOUNT_CALL_LIMIT,
-              service_provider_sid: account.service_provider_sid,
-              account_sid,
-              count: limit_sessions
-            }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
-            res.send(503, 'Maximum Calls In Progress');
-            return req.srf.endSession(req);
-          }
+      const accountCapacities = await lookupAccountCapacitiesBySid(account_sid);
+      const accountLimit = accountCapacities.find((c) => c.category == 'voice_call_session');
+      if (accountLimit) {
+        /* check account limit */
+        const limit_sessions = accountLimit.quantity;
+        if (calls > limit_sessions) {
+          debug(`checkLimits: limits exceeded: call count ${calls}, limit ${limit_sessions}`);
+          logger.info({calls, limit_sessions}, 'checkLimits: limits exceeded');
+          writeAlerts({
+            alert_type: AlertType.ACCOUNT_CALL_LIMIT,
+            service_provider_sid: account.service_provider_sid,
+            account_sid,
+            count: limit_sessions
+          }).catch((err) => logger.info({err}, 'checkLimits: error writing alert'));
+          res.send(503, 'Maximum Calls In Progress');
+          return req.srf.endSession(req);
        }
      }
      else if (trackingOn) {
@@ -324,6 +350,11 @@ module.exports = function(srf, logger) {
          });
          return req.srf.endSession(req);
        }
+        if (!account_limit && !sp_limit && process.env.JAMBONES_HOSTING) {
+          logger.info(`checkLimits: no active subscription found for account ${account_sid}, rejecting call`);
+          res.send(503, 'No Active Subscription');
+          return req.srf.endSession(req);
+        }
        if (process.env.JAMBONES_TRACK_SP_CALLS && sp_limit > 0 && callsSP > sp_limit) {
          logger.info({callsSP, sp_limit}, 'checkLimits: service provider limits exceeded');
          writeAlerts({
@@ -349,6 +380,38 @@ module.exports = function(srf, logger) {
    }
  };

+  const identifyAuthTrunk = async(req, res, next) => {
+    try {
+      if (req.authorization) {
+        const {grant} = req.authorization;
+        if (grant && grant.status === 'ok' && grant.auth_trunk) {
+          // we have successfully authenticated the call for an auth_trunk
+          const application_sid = await getApplicationForDidAndCarrier(req, grant.auth_trunk.voip_carrier_sid);
+
+          req.locals = {
+            ...req.locals,
+            originator: 'trunk',
+            carrier: grant.auth_trunk.name,
+            gateway: grant.auth_trunk,
+            voip_carrier_sid: grant.auth_trunk.voip_carrier_sid,
+            application_sid: application_sid || grant.auth_trunk.application_sid,
+          };
+          // as call from auth carrier, clean req.authorization that impact on legacy logic for authenticated user
+          delete req.authorization;
+
+          logger.debug({callId: req.locals.callId, auth_trunk: grant.auth_trunk.name},
+            'identifyAuthTrunk: call authenticated for auth trunk');
+        }
+      }
+      next();
+    } catch (err) {
+      stats.increment('sbc.terminations', ['sipStatus:500']);
+      logger.error(err, `${req.get('Call-ID')} Error challenging auth trunk`);
+      res.send(500);
+      req.srf.endSession(req);
+    }
+  };
+
  const challengeDeviceCalls = async(req, res, next) => {
    try {
      /* TODO: check if this is a gateway that we have an ACL for */
@@ -367,6 +430,7 @@ module.exports = function(srf, logger) {
    handleSipRec,
    challengeDeviceCalls,
    identifyAccount,
+    identifyAuthTrunk,
    checkLimits
  };
 };
@@ -30,11 +30,21 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
    dstOpts.flags.push('inject DTMF');
    srcOpts.flags.push('inject DTMF');
  }
+
+  /** By default, and for backwards compatibility, use media handover
+   * set env var to true to use strict source instead (needed for rtpbleed vulnerability)
+   */
+  const enableStrictSource = !!process.env.RTPENGINE_ENABLE_STRICT_SOURCE;
+  dstOpts.flags.push(enableStrictSource ? 'strict source' : 'media handover');
+  srcOpts.flags.push(enableStrictSource ?  'strict source' : 'media handover');
+  const acceptCodecs = process.env.JAMBONES_ACCEPT_AND_TRANSCODE ?
+    process.env.JAMBONES_ACCEPT_AND_TRANSCODE :
+    process.env.JAMBONES_ACCEPT_G729 ? 'g729' : '';
  const common = {
    'call-id': req.get('Call-ID'),
    'replace': ['origin', 'session-connection'],
    'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no',
-    ...(process.env.JAMBONES_ACCEPT_G729 && { codec: { mask: 'g729', transcode: 'pcmu' } })
+    ...(acceptCodecs && { codec: { mask: acceptCodecs, transcode: 'pcmu,pcma' } })
  };
  return {
    common,
@@ -114,12 +124,97 @@ const createHealthCheckApp = (port, logger) => {
  });
 };

-const nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
-  const { service_provider_sid, account_sid, application_sid } = sids;
-  const { writeCallCount, writeCallCountSP, writeCallCountApp } = writers;
+/**
+ * nudgeCallCounts - increment or decrement call counts in redis
+ *
+ *              current nudge value
+ * -----------------------------------------
+ *  why    |     -1     |    0    |    1    |
+ * -----------------------------------------
+ *  init   |    no-op   |    +1   |    N/A  |
+ * failure |    N/A     |    -1   |    -1   |
+ * complete|    N/A     |    N/A  |    -1   |
+ *
+ *
+ */
+
+const shouldNudge = (why, req) => {
+  const {nudge, logger} = req.locals;
+  let modifyCount = false;
+  const originalNudge = nudge;
+
+  switch (why) {
+    case 'init':
+      if (nudge === 0) {
+        // normal case: new call, increment call count
+        req.locals.nudge = 1;
+        modifyCount = true;
+      }
+      else if (nudge === -1) {
+        // extremely quick cancel, don't increment call count
+        req.locals.nudge = 0;
+      }
+      else {
+        logger.info(`shouldNudge: unexpected nudge value ${nudge} for ${why}`);
+      }
+      break;
+    case 'failure':
+      if (nudge === 1) {
+        // normal case of call failed for any reason, decrement call count
+        req.locals.nudge = 0;
+        modifyCount = true;
+      }
+      else if (nudge === 0) {
+        // very quick failure dont decrement call count
+        req.locals.nudge = -1;
+      }
+      else {
+        logger.info(`shouldNudge: unexpected nudge value ${nudge} for ${why}`);
+      }
+      break;
+    case 'complete':
+      if (nudge === 1) {
+        // normal case of call completed, decrement call count
+        req.locals.nudge = 0;
+        modifyCount = true;
+      }
+      else {
+        logger.info(`shouldNudge: unexpected nudge value ${nudge} for ${why}`);
+      }
+      break;
+    default:
+      logger.info(`shouldNudge: unexpected why value ${why}`);
+      break;
+  }
+
+  logger.info(`shouldNudge: '${why}': updating count: ${modifyCount}, nudge: ${originalNudge} -> ${req.locals.nudge}`);
+  return modifyCount;
+};
+
+const nudgeCallCounts = async(req, why, sids, nudgeOperator, writers) => {
+  const {logger} = req.locals;
+  const {service_provider_sid, account_sid, application_sid, callId} = sids;
+  const {writeCallCount, writeCallCountSP, writeCallCountApp} = writers;
  const nudges = [];
  const writes = [];

+  if (!shouldNudge(why, req)) {
+    return {callsSP: null, calls: null, callsApp: null};
+  }
+
+  if (process.env.JAMBONES_DEBUG_CALL_COUNTS) {
+    const {srf} = require('..');
+    const {addKey, deleteKey} = srf.locals.realtimeDbHelpers;
+
+    if (why === 'init') {
+      // save for 3 days
+      await addKey(`debug:incalls:${account_sid}:${callId}`, new Date().toISOString(), 259200);
+    }
+    else {
+      await deleteKey(`debug:incalls:${account_sid}:${callId}`);
+    }
+  }
+
  if (process.env.JAMBONES_TRACK_SP_CALLS) {
    const key = makeSPCallCountKey(service_provider_sid);
    nudges.push(nudgeOperator(key));
@@ -148,33 +243,28 @@ const nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
    const [callsSP, calls, callsApp] = await Promise.all(nudges);
    logger.debug({
      calls, callsSP, callsApp,
-      service_provider_sid, account_sid, application_sid
-    }, 'call counts after adjustment');
+      service_provider_sid, account_sid, application_sid}, 'call counts after adjustment');
    if (process.env.JAMBONES_TRACK_SP_CALLS) {
-      writes.push(writeCallCountSP({ service_provider_sid, calls_in_progress: callsSP }));
+      writes.push(writeCallCountSP({service_provider_sid, calls_in_progress: callsSP}));
    }

    if (process.env.JAMBONES_TRACK_ACCOUNT_CALLS || process.env.JAMBONES_HOSTING) {
-      writes.push(writeCallCount({ service_provider_sid, account_sid, calls_in_progress: calls }));
+      writes.push(writeCallCount({service_provider_sid, account_sid, calls_in_progress: calls}));
    }

    if (process.env.JAMBONES_TRACK_APP_CALLS && application_sid) {
-      writes.push(writeCallCountApp({
-        service_provider_sid,
-        account_sid, application_sid,
-        calls_in_progress: callsApp
-      }));
+      writes.push(writeCallCountApp({service_provider_sid, account_sid, application_sid, calls_in_progress: callsApp}));
    }

    /* write the call counts to the database */
-    Promise.all(writes).catch((err) => logger.error({ err }, 'Error writing call counts'));
+    Promise.all(writes).catch((err) => logger.error({err}, 'Error writing call counts'));

-    return { callsSP, calls, callsApp };
+    return {callsSP, calls, callsApp};
  } catch (err) {
    logger.error(err, 'error incrementing call counts');
  }

-  return { callsSP: null, calls: null, callsApp: null };
+  return {callsSP: null, calls: null, callsApp: null};
 };

 const roundTripTime = (startAt) => {
@@ -243,6 +333,12 @@ const parseHostPorts = (logger, hostports, srf) => {
  return obj;
 };

+const makeFullMediaReleaseKey = (callId) => {
+  return `a_sdp:${callId}`;
+};
+const makePartnerFullMediaReleaseKey = (callId) => {
+  return `b_sdp:${callId}`;
+};

 module.exports = {
  isWSS,
@@ -262,6 +358,8 @@ module.exports = {
  parseConnectionIp,
  isMSTeamsCIDR,
  isPrivateVoipNetwork,
-  parseHostPorts
+  parseHostPorts,
+  makeFullMediaReleaseKey,
+  makePartnerFullMediaReleaseKey
 };

@@ -1,9 +1,9 @@
 {
  "name": "sbc-inbound",
-  "version": "0.9.2",
+  "version": "0.9.11",
  "main": "app.js",
  "engines": {
-    "node": ">= 18.0.0"
+    "node": ">= 20.0.0"
  },
  "keywords": [
    "sip",
@@ -26,29 +26,30 @@
    "jslint:fix": "npm run jslint --fix"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.9.7",
-    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.8.8",
-    "@jambonz/rtpengine-utils": "^0.4.4",
-    "@jambonz/siprec-client-utils": "^0.2.7",
-    "@jambonz/stats-collector": "^0.1.10",
-    "@jambonz/time-series": "^0.2.8",
-    "@jambonz/digest-utils": "^0.0.5",
-    "@aws-sdk/client-sns": "^3.549.0",
    "@aws-sdk/client-auto-scaling": "^3.549.0",
+    "@aws-sdk/client-sns": "^3.549.0",
+    "@babel/helpers": "^7.26.10",
+    "@jambonz/db-helpers": "^0.9.18",
+    "@jambonz/digest-utils": "^0.0.9",
+    "@jambonz/http-health-check": "^0.0.1",
+    "@jambonz/realtimedb-helpers": "^0.8.21",
+    "@jambonz/rtpengine-utils": "^0.4.4",
+    "@jambonz/siprec-client-utils": "^0.2.10",
+    "@jambonz/stats-collector": "^0.1.10",
+    "@jambonz/time-series": "^0.2.10",
    "bent": "^7.3.12",
    "cidr-matcher": "^2.1.1",
-    "debug": "^4.3.4",
-    "drachtio-fn-b2b-sugar": "0.1.0",
-    "drachtio-srf": "^4.5.38",
-    "express": "^4.19.2",
-    "pino": "^8.20.0",
+    "debug": "^4.4.3",
+    "drachtio-fn-b2b-sugar": "0.2.1",
+    "drachtio-srf": "^5.0.27",
+    "express": "^4.21.2",
+    "pino": "^10.1.0",
    "verify-aws-sns-signature": "^0.1.0",
    "xml2js": "^0.6.2"
  },
  "devDependencies": {
-    "eslint": "^7.32.0",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint": "^9.17.0",
+    "eslint-plugin-promise": "^7.2.1",
    "nyc": "^15.1.0",
    "tape": "^5.7.5"
  }
@@ -162,7 +162,7 @@ regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed num
 description VARCHAR(1024),
 priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) COMMENT='An ordered list of  digit patterns in an LCR table.  The patterns are tested in sequence until one matches';
+) COMMENT='An ordered list of  digit patterns in an LCR table.  The pat';

 CREATE TABLE lcr
 (
@@ -173,7 +173,7 @@ default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use whe
 service_provider_sid CHAR(36),
 account_sid CHAR(36),
 PRIMARY KEY (lcr_sid)
-) COMMENT='An LCR (least cost routing) table that is used by a service provider or account to make decisions about routing outbound calls when multiple carriers are available.';
+) COMMENT='An LCR (least cost routing) table that is used by a service ';

 CREATE TABLE password_settings
 (
@@ -204,6 +204,7 @@ tech_prefix VARCHAR(16) COMMENT 'tech prefix to prepend to outbound calls to thi
 inbound_auth_username VARCHAR(64),
 inbound_auth_password VARCHAR(64),
 diversion VARCHAR(32),
+trunk_type ENUM('static_ip','auth','reg') NOT NULL DEFAULT 'static_ip',
 PRIMARY KEY (predefined_carrier_sid)
 );

@@ -351,6 +352,8 @@ 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,
+voice_cloning_key MEDIUMTEXT,
+use_voice_cloning_key BOOLEAN DEFAULT false,
 PRIMARY KEY (google_custom_voice_sid)
 );

@@ -414,6 +417,9 @@ register_from_user VARCHAR(128),
 register_from_domain VARCHAR(255),
 register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
 register_status VARCHAR(4096),
+dtmf_type ENUM('rfc2833','tones','info') NOT NULL DEFAULT 'rfc2833',
+outbound_sip_proxy VARCHAR(255),
+trunk_type ENUM('static_ip','auth','reg') NOT NULL DEFAULT 'static_ip',
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';

@@ -499,7 +505,7 @@ 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_voice VARCHAR(256) DEFAULT 'en-US-Standard-C',
 speech_synthesis_label VARCHAR(64),
 speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
@@ -512,6 +518,7 @@ fallback_speech_synthesis_label VARCHAR(64),
 fallback_speech_recognizer_vendor VARCHAR(64),
 fallback_speech_recognizer_language VARCHAR(64),
 fallback_speech_recognizer_label VARCHAR(64),
+env_vars TEXT,
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 record_all_calls BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (application_sid)
@@ -698,6 +705,12 @@ ALTER TABLE phone_numbers ADD FOREIGN KEY service_provider_sid_idxfk_8 (service_

 CREATE INDEX sip_gateway_idx_hostport ON sip_gateways (ipv4,port);

+CREATE INDEX idx_sip_gateways_inbound_carrier ON sip_gateways (inbound,voip_carrier_sid);
+
+CREATE INDEX idx_sip_gateways_inbound_lookup ON sip_gateways (inbound,netmask,ipv4);
+
+CREATE INDEX idx_sip_gateways_inbound_netmask ON sip_gateways (inbound,netmask);
+
 CREATE INDEX voip_carrier_sid_idx ON sip_gateways (voip_carrier_sid);
 ALTER TABLE sip_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk_2 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);

@@ -739,4 +752,4 @@ ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (devic

 ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);

-SET FOREIGN_KEY_CHECKS=1;
+SET FOREIGN_KEY_CHECKS=0;
@@ -19,7 +19,8 @@ values ('f4e1848d-3ff8-40eb-b9c1-30e1ef053f94','ed649e33-e771-403a-8c99-1780eabb
 insert into account_products(account_product_sid, account_subscription_sid, product_sid,quantity)
 values ('f23ff996-6534-4aba-8666-4b347391eca2', 'f4e1848d-3ff8-40eb-b9c1-30e1ef053f94', 'c4403cdb-8e75-4b27-9726-7d8315e3216d', 10);

-insert into voip_carriers (voip_carrier_sid, name, account_sid) values ('287c1452-620d-4195-9f19-c9814ef90d78', 'westco', 'ed649e33-e771-403a-8c99-1780eabbc803');
+insert into voip_carriers (voip_carrier_sid, name, account_sid, service_provider_sid) 
+values ('287c1452-620d-4195-9f19-c9814ef90d78', 'westco', 'ed649e33-e771-403a-8c99-1780eabbc803', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('124a5339-c62c-4075-9e19-f4de70a96597', '287c1452-620d-4195-9f19-c9814ef90d78', '172.38.0.20', true, true);
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, port, inbound, outbound) 
@@ -42,7 +43,8 @@ insert into account_products(account_product_sid, account_subscription_sid, prod
 values ('92f137f7-4bc3-4157-b096-6817e54b1874', '73bbcc5d-512f-4cea-8535-9a6e3d2bd19d', 'c4403cdb-8e75-4b27-9726-7d8315e3216d', 0);
 insert into account_limits(account_limits_sid, account_sid, category, quantity) values('a1b2c3d4-e5f6-7a8b-9c0d-1e2f3a4b5c6d', 'd7cc37cb-d152-49ef-a51b-485f6e917089', 'voice_call_session', 0);

-insert into voip_carriers (voip_carrier_sid, name, account_sid) values ('9b1abdc7-0220-4964-bc66-32b5c70cd9ab', 'westco', 'd7cc37cb-d152-49ef-a51b-485f6e917089');
+insert into voip_carriers (voip_carrier_sid, name, account_sid, service_provider_sid) 
+values ('9b1abdc7-0220-4964-bc66-32b5c70cd9ab', 'westco', 'd7cc37cb-d152-49ef-a51b-485f6e917089', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('12f401d9-cbb1-49e5-bd33-cefbca0badc3', '9b1abdc7-0220-4964-bc66-32b5c70cd9ab', '172.38.0.20', true, true);
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, port, inbound, outbound) 
@@ -52,7 +54,8 @@ values ('1401eb72-0daf-4471-aba6-038a0a2587b3', '9b1abdc7-0220-4964-bc66-32b5c70
 insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
 values ('3b43e39f-4346-4218-8434-a53130e8be49', 'test', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '4d7ce0aa-5ead-4e61-9a6b-3daa732218b1');

-insert into voip_carriers (voip_carrier_sid, name, account_sid, application_sid) values ('999c1452-620d-4195-9f19-c9814ef90d78', 'customer PBX', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '3b43e39f-4346-4218-8434-a53130e8be49');
+insert into voip_carriers (voip_carrier_sid, name, account_sid, application_sid, service_provider_sid) 
+values ('999c1452-620d-4195-9f19-c9814ef90d78', 'customer PBX', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '3b43e39f-4346-4218-8434-a53130e8be49', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('888a5339-c62c-4075-9e19-f4de70a96597', '999c1452-620d-4195-9f19-c9814ef90d78', '172.38.0.21', true, false);
 
@@ -69,6 +72,9 @@ values ('d458bf7a-bcea-47b2-ac96-66dfc9c5c220', '150822233*', '287c1452-620d-419
 insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid)
 values ('f7ad205d-b92f-4363-8160-f8b5216b40d3', '15083871234', '287c1452-620d-4195-9f19-c9814ef90d78', 'd7cc37cb-d152-49ef-a51b-485f6e917089');

+insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
+values ('c17d5a7d-9328-4663-92c0-f65aa8381264', '12125551212', '287c1452-620d-4195-9f19-c9814ef90d78', 'ed649e33-e771-403a-8c99-1780eabbc803', '3b43e39f-4346-4218-8434-a53130e8be49');
+
 -- two accounts that both have the same carrier with default routing (ambiguity test)
 insert into accounts (account_sid, name, service_provider_sid, webhook_secret, sip_realm)
 values ('239d7d49-b3e4-4fdb-9d66-661149f717e8', 'Account B1', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'foobar', 'echo2.sip.jambonz.org');
@@ -89,3 +95,48 @@ insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outb
 values ('664a5339-c62c-4075-9e19-f4de70a96597', '731abdc7-0220-4964-bc66-32b5c70cd9ab', '172.38.0.40', true, false);
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
 values ('554a5339-c62c-4075-9e19-f4de70a96597', '987abdc7-0220-4964-bc66-32b5c70cd9ab', '172.38.0.40', true, false);
+
+-- voip carrier belonging to all accounts
+insert into voip_carriers (voip_carrier_sid, name, service_provider_sid) 
+values ('voip100', 'test-voip-carrier', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
+insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
+values ('sip100', 'voip100', '172.38.0.50', true, false);
+
+insert into voip_carriers (voip_carrier_sid, name, service_provider_sid) 
+values ('voip101', 'test-voip-carrier-101', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0');
+insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
+values ('sip101', 'voip101', '172.38.0.50', true, false);
+insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
+values ('sip102', 'voip101', '172.38.0.51', true, false);
+
+insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
+values ('app100', 'app100', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '90dda62e-0ea2-47d1-8164-5bd49003476c');
+insert into applications (application_sid, name, account_sid, call_hook_sid, call_status_hook_sid)
+values ('app101', 'app101', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', '90dda62e-0ea2-47d1-8164-5bd49003476c', '90dda62e-0ea2-47d1-8164-5bd49003476c');
+insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
+values ('phone100', '^100', 'voip101', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', 'app100');
+insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
+values ('phone101', '^10012', 'voip100', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', 'app101');
+-- insert an invalid regex pattern, the below pattern should be ignored during pattern
+insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
+values ('phone102', '\\dkjfhmdf\\', 'voip100', 'ee9d7d49-b3e4-4fdb-9d66-661149f717e8', 'app101');
+
+-- account with a sip realm that is not associated with any voip carriers
+insert into accounts (account_sid, name, service_provider_sid, webhook_secret, sip_realm)
+values ('acct-100', 'Account 100', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'foobar', 'ram.sip.jambonz.org');
+
+-- registration trunk carrier for ephemeral gateway testing
+insert into voip_carriers (voip_carrier_sid, name, account_sid, service_provider_sid, trunk_type,
+    requires_register, register_username, register_sip_realm, register_password, is_active)
+values ('4a7d1c8e-5f2b-4d9a-8e3c-6b5a9f1e4c7d', 'test-registration-trunk', 'ed649e33-e771-403a-8c99-1780eabbc803',
+    '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'reg', true, 'testuser',
+    'sip.carrier.example.com', 'testpass', true);
+
+-- sip_gateway for outbound only (inbound will use ephemeral gateway from Redis)
+insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound)
+values ('8b3e5f9a-2c1d-4e7b-9a6c-3d8f1e5a7b2c', '4a7d1c8e-5f2b-4d9a-8e3c-6b5a9f1e4c7d', '3.3.3.3', false, true);
+
+-- phone number for ephemeral gateway test
+insert into phone_numbers (phone_number_sid, number, voip_carrier_sid, account_sid, application_sid)
+values ('7c2d4e6f-8a1b-4c9d-7e5f-2a8b3c6d9e1f', '16175551000', '4a7d1c8e-5f2b-4d9a-8e3c-6b5a9f1e4c7d', 'ed649e33-e771-403a-8c99-1780eabbc803',
+    '3b43e39f-4346-4218-8434-a53130e8be49');
@@ -23,7 +23,7 @@ services:
      sbc-inbound:
        ipv4_address: 172.38.0.2
  sbc:
-    image: drachtio/drachtio-server:latest
+    image: drachtio/drachtio-server:0.8.26
    command: drachtio --contact "sip:*;transport=udp" --loglevel debug --sofia-loglevel 9
    ports:
      - "9060:9022/tcp"
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+<scenario name="UAC with x-application-sid header">
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:+12125551212@jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:12125551212@jambonz.org>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: uac-pcap-carrier-success
+      Content-Type: application/sdp
+      Content-Length: [len]
+      X-Application-Sid: 3b43e39f-4346-4218-8434-a53130e8be49
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[media_ip_type] [media_ip]
+      t=0 0
+      m=audio [media_port] RTP/AVP 0
+      a=rtpmap:0 PCMU/8000
+]]>
+  </send>
+
+  <recv response="100" optional="true">
+  </recv>
+                
+  <recv response="482" rtd="true" >
+  </recv>
+
+</scenario>
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
+<!--                                                                    -->
+
+<scenario name="UAC with media">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:100678@172.38.0.10:5060 SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:100678@172.38.0.10:5060>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: uac-pcap-carrier-success
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[local_ip_type] [local_ip]
+      t=0 0
+      m=audio [auto_media_port] RTP/AVP 8 101
+      a=rtpmap:8 PCMA/8000
+      a=rtpmap:101 telephone-event/8000
+      a=fmtp:101 0-11,16
+
+    ]]>
+  </send>
+
+  <recv response="100" optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rtd="true" crlf="true">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
+  <send>
+    <![CDATA[
+
+      ACK sip:100678@172.38.0.10:5060 SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:100678@172.38.0.10:5060>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Max-Forwards: 70
+      Subject: uac-pcap-carrier-success
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
+  <nop>
+    <action>
+      <exec play_pcap_audio="pcap/g711a.pcap"/>
+    </action>
+  </nop>
+
+  <!-- Pause briefly      -->
+  <pause milliseconds="3000"/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:100678@172.38.0.10:5060 SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:100678@172.38.0.10:5060>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Subject: uac-pcap-carrier-success
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
+<!--                                                                    -->
+
+<scenario name="UAC with media">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:+100678@ram.sip.jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:100678@ram.sip.jambonz.org>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: uac-pcap-carrier-success
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[local_ip_type] [local_ip]
+      t=0 0
+      m=audio [auto_media_port] RTP/AVP 8 101
+      a=rtpmap:8 PCMA/8000
+      a=rtpmap:101 telephone-event/8000
+      a=fmtp:101 0-11,16
+
+    ]]>
+  </send>
+
+  <recv response="100" optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rtd="true" crlf="true">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
+  <send>
+    <![CDATA[
+
+      ACK sip:100678@ram.sip.jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:100678@ram.sip.jambonz.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Max-Forwards: 70
+      Subject: uac-pcap-carrier-success
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
+  <nop>
+    <action>
+      <exec play_pcap_audio="pcap/g711a.pcap"/>
+    </action>
+  </nop>
+
+  <!-- Pause briefly      -->
+  <pause milliseconds="3000"/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:100678@ram.sip.jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:100678@ram.sip.jambonz.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Subject: uac-pcap-carrier-success
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+<!--                                                                    -->
+<!--                 Sipp 'uac' scenario with pcap (rtp) play           -->
+<!--                                                                    -->
+
+<scenario name="UAC with media">
+  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
+  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
+  <send retrans="500">
+    <![CDATA[
+
+      INVITE sip:+16173333456@jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:16173333456@jambonz.org>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: uac-late-media
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="100" optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rtd="true" crlf="true">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
+  <send>
+    <![CDATA[
+
+      ACK sip:16173333456@jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:16173333456@jambonz.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Max-Forwards: 70
+      Subject: uac-late-media
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[local_ip_type] [local_ip]
+      t=0 0
+      m=audio [auto_media_port] RTP/AVP 8 101
+      a=rtpmap:8 PCMA/8000
+      a=rtpmap:101 telephone-event/8000
+      a=fmtp:101 0-11,16
+
+
+    ]]>
+  </send>
+
+  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
+  <nop>
+    <action>
+      <exec play_pcap_audio="pcap/g711a.pcap"/>
+    </action>
+  </nop>
+
+  <!-- Pause briefly      -->
+  <pause milliseconds="3000"/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:16173333456@jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:16173333456@jambonz.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Subject: uac-late-media
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
@@ -0,0 +1,119 @@
+<?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:+16175551000@jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:16175551000@jambonz.org>
+      Call-ID: [call_id]
+      CSeq: 1 INVITE
+      Contact: sip:sipp@[local_ip]:[local_port]
+      Max-Forwards: 70
+      Subject: uac-pcap-ephemeral-gateway-success
+      Content-Type: application/sdp
+      Content-Length: [len]
+
+      v=0
+      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
+      s=-
+      c=IN IP[local_ip_type] [local_ip]
+      t=0 0
+      m=audio [auto_media_port] RTP/AVP 8 101
+      a=rtpmap:8 PCMA/8000
+      a=rtpmap:101 telephone-event/8000
+      a=fmtp:101 0-11,16
+
+    ]]>
+  </send>
+
+  <recv response="100" optional="true">
+  </recv>
+
+  <recv response="180" optional="true">
+  </recv>
+
+  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
+  <!-- are saved and used for following messages sent. Useful to test   -->
+  <!-- against stateful SIP proxies/B2BUAs.                             -->
+  <recv response="200" rtd="true" crlf="true">
+  </recv>
+
+  <!-- Packet lost can be simulated in any send/recv message by         -->
+  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
+  <send>
+    <![CDATA[
+
+      ACK sip:16175551000@jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:16175551000@jambonz.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 1 ACK
+      Max-Forwards: 70
+      Subject: uac-pcap-ephemeral-gateway-success
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <!-- Play a pre-recorded PCAP file (RTP stream)                       -->
+  <nop>
+    <action>
+      <exec play_pcap_audio="pcap/g711a.pcap"/>
+    </action>
+  </nop>
+
+  <!-- Pause briefly      -->
+  <pause milliseconds="3000"/>
+
+  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
+  <send retrans="500">
+    <![CDATA[
+
+      BYE sip:16175551000@jambonz.org SIP/2.0
+      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
+      To: <sip:16175551000@jambonz.org>[peer_tag_param]
+      Call-ID: [call_id]
+      CSeq: 2 BYE
+      Subject: uac-pcap-ephemeral-gateway-success
+      Content-Length: 0
+
+    ]]>
+  </send>
+
+  <recv response="200" crlf="true">
+  </recv>
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
@@ -33,9 +33,22 @@ test('incoming call tests', async(t) => {
    t.ok(obj.calls === 0, 'HTTP GET / works (current call count)')
    obj = await getJSON('http://127.0.0.1:3050/system-health');
    t.ok(obj.calls === 0, 'HTTP GET /system-health works (health check)')
+
+    await sippUac('uac-late-media.xml', '172.38.0.20');
+    t.pass('incoming call with no SDP packet is rejected with a 488');
+
+    await sippUac('uac-did-applicationsid-loop.xml', '172.38.0.20');
+    t.pass('incoming call with x-application-sid header is rejected with 482');
+
    await sippUac('uac-pcap-carrier-success.xml', '172.38.0.20');
    t.pass('incoming call from carrier completed successfully');

+    // Test ephemeral gateway (registration trunk)
+    const { createEphemeralGateway } = srf.locals.realtimeDbHelpers;
+    await createEphemeralGateway('172.38.0.60', '4a7d1c8e-5f2b-4d9a-8e3c-6b5a9f1e4c7d', 3600);
+    await sippUac('uac-pcap-ephemeral-gateway-success.xml', '172.38.0.60');
+    t.pass('incoming call from ephemeral gateway (registration trunk) completed successfully');
+
    await sippUac('uac-pcap-pbx-success.xml', '172.38.0.21');
    t.pass('incoming call from account-level carrier completed successfully');
  
@@ -60,6 +73,15 @@ test('incoming call tests', async(t) => {
    await sippUac('uac-pcap-carrier-max-call-limit.xml', '172.38.0.20');
    t.pass('rejects incoming call with 503 when max calls per account reached');

+    await sippUac('uac-did-regex-match-vc-all-accts.xml', '172.38.0.50');
+    t.pass('incoming call matched by trailing wildcard *, voice gateway belongs to all accounts, with sip realm');
+
+    await sippUac('uac-did-regex-match-vc-all-accts-nosiprealm.xml', '172.38.0.51');
+    t.pass('incoming call matched by trailing wildcard *, voice gateway belongs to all accounts, without sip realm');
+
+    await sippUac('uac-did-regex-match-vc-all-accts-nosiprealm.xml', '172.38.0.50');
+    t.pass('incoming call matched by trailing wildcard *, voice gateway belongs to all accounts, without sip realm');
+
    /* switch off this env for remaining tests (JAMBONES_HOSTING is for Saas sts) */
    delete process.env.JAMBONES_HOSTING;
    await sippUac('uac-pcap-carrier-fail-ambiguous.xml', '172.38.0.40');
@@ -67,8 +89,9 @@ test('incoming call tests', async(t) => {
  
    await waitFor(12);
    const res = await queryCdrs({account_sid: 'ed649e33-e771-403a-8c99-1780eabbc803'});
+    console.log(`cdrs res.total: ${res.total}`);
    //console.log(`cdrs: ${JSON.stringify(res)}`);
-    t.ok(7 === res.total, 'successfully wrote 7 cdrs for calls');
+    t.ok(8 === res.total, 'successfully wrote 8 cdrs for calls (including ephemeral gateway)');

    srf.disconnect();
    t.end();
Author	SHA1	Message	Date
Dave Horton	d0d8ba93b2	0.9.11	2026-09-15 12:38:35 -04:00
Dave Horton	3f729e232e	0.9.10	2026-09-15 12:38:16 -04:00
Hoan Luu HuuandClaude Opus 5	509fdf6c37	Fix/siprec survives fs transfer (#249 ) * fix: keep siprec recording alive across a feature server transfer A cross-feature-server move (enqueue/dequeue or conference) re-negotiates the feature-server leg in _onFeatureServerTransfer, but nothing rebuilt the rtpengine subscription the SIPREC recording forks from, so the recorder went silent from the moment the call moved. The fresh destroy handler installed on the new leg also dropped the _stopRecording() call the original handlers have, so the SIPREC dialog was never BYEd and the recorder had to wait out its media timeout. Rebuild the subscription after the transfer re-negotiates media, and stop the recording when the transferred leg ends. The resubscribe call is guarded so this is safe to deploy before @jambonz/siprec-client-utils is bumped. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix: drop the siprec re-subscribe, keep the missing teardown Running the cross-feature-server move against a real two-feature-server cluster showed the rtpengine subscription survives the REFER on its own: with resubscribe() removed, the fork still carried the post-transfer conversation (50 packets/s on both streams, and the words spoken after the move transcribed straight out of the recording). rtpengine keeps non-offer-answer subscriptions across an answer, so there was never anything to rebuild - the earlier commit was fixing a fault that does not exist. What does fail, and what this branch still fixes, is the teardown: the destroy handler installed on the transferred leg never stopped the recording, so the recorder was left without a BYE. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>	2026-09-07 18:42:20 +01:00
Dave HortonandClaude Fable 5	b7b707cc2e	fix: complete autoscale scale-in reliably and reject new INVITEs while draining (#248 ) Scale-in completion never happened: app.js holds the placeholder Emitter that autoscale-manager returns synchronously (the real SnsNotifier replaces it later inside an async IIFE), so the completion poller never saw operationalState change; it also called the nonexistent scaleIn() rather than completeScaleIn(). Instances in Terminating:Wait therefore always burned the full lifecycle hook heartbeat timeout. In addition, nothing consumed dryUpCalls: a draining SBC kept accepting new INVITEs sent directly to its public address right up until termination. Changes: - complete the scale-in from within the ScaleIn handler in autoscale-manager, where the real notifier is in scope - while draining, reject new INVITEs with 503 so senders fail over to another SBC (INVITE with Replaces is allowed through since it targets a call already in progress here) - a server may run several sbc-inbound and sbc-outbound processes, and completing the hook when only this process is idle would terminate the instance while sibling processes still have calls; each process now reports its call count to redis (lib/call-count-reporter.js, with a companion change in sbc-outbound) and the draining process completes only when the server-wide count is zero on two consecutive checks, falling back to its own count if no reports are present Co-authored-by: Claude Fable 5 <noreply@anthropic.com>	2026-08-31 08:54:19 -04:00
Dave Horton	ccbebc015f	0.9.9	2026-08-20 09:16:38 -04:00
Dave Horton	320a30e328	0.9.8	2026-07-20 08:42:25 -04:00
Dave Horton	cd2fde360d	0.9.7	2026-07-20 08:39:53 -04:00
Hoan Luu Huu	e353b751c0	fixed wrongly identify 3pcc call (#245 ) * fixed wrongly identify 3pcc call * update drachtio 5.0.27	2026-07-11 08:31:59 -04:00
Hoan Luu Huu	53b46f7e51	update rtcp-mux to default for srtp (#246 )	2026-07-09 07:09:53 -04:00
Hoan Luu Huu	6608286e8c	fixed: don't log carrier register_credential to log (#244 ) * fixed: don't log carrier register_credential to log * upgrade realtimedb helper 0.8.21	2026-06-19 07:08:52 -04:00
Dave HortonandClaude Opus 4.5	6ddfbc9373	fix error handler middleware parameter order (#243 ) The error handler was using (req, res, next, err) but drachtio-srf error middleware expects (err, req, res, next). This caused "res.send is not a function" errors when the handler was invoked. Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>	2026-05-21 15:20:17 -04:00
Dave Horton	cd48675499	curtail massive log msg (#242 )	2026-04-23 07:35:27 -04:00
Hoan Luu Huu	cecdbdccef	update drachtio srf 5.0.21 (#241 )	2026-04-13 21:24:28 -04:00
Dave Horton	6586919c86	update deps	2026-03-30 21:07:53 -04:00
Dave Horton	c919438af5	update to drachtio-srf latest (#239 )	2026-03-05 09:24:49 -05:00
Dave Horton	ab39525467	update drachtio-srf (#236 )	2026-02-09 10:28:42 -05:00
Hoan Luu Huu	61a66ab181	update drachtio srf version (#231 )	2026-01-22 08:13:11 -05:00
Dave Horton	48dd7ebfcd	Parallelize independent exact IP and CIDR gateway database queries to reduce latency in inbound call routing (#234 )	2026-01-18 09:34:48 -05:00
Dave Horton	678fe9d9a8	Fix/sql query optimize (#233 ) * Add STRAIGHT_JOIN to CIDR gateway query to prevent MySQL optimizer from choosing inefficient full table scan on voip_carriers table. * update tests with latest schema * fix test data * security issues * update workflow actions	2026-01-16 08:53:22 -05:00
Dave Horton	39bd65fb97	improve slow sql query and fix support for readonly endpoints (#232 )	2026-01-15 08:47:04 -05:00
Sam Machin	3f0fd794ce	Recording update (#229 ) * new hasRecording flag on call info for setting recording URL in cdr * lint * use nullish coalescing for null response	2026-01-02 10:29:00 -05:00
Dave Horton	876cb393f9	fix vulnerability	2025-12-09 09:58:46 -05:00
Sam Machin	fa2259d6e5	fix build (#228 ) * update dependenices * Update package-lock.json * fix buold	2025-12-08 10:43:47 -05:00
Sam Machin	2405190dcc	update dependenices (#227 )	2025-12-08 09:22:27 -05:00
Hoan Luu Huu	e9a5921b19	allow uas leg can send re-invite with outbound gatway credential (#221 ) * allow uas leg can send re-invite with outbound gatway credential * fix cannot get register username/password * fix cannot get register username/password * fix cannot get register username/password * fixed failing test cases	2025-11-24 20:16:28 -06:00
Dave Horton	6efe714d49	fix package lock	2025-11-14 07:36:42 -05:00
Sam Machin	4150454736	remove no SP gateways if Account Gateways (#219 )	2025-11-11 08:30:30 -05:00
Anton Voylenko	73eb8e8d17	chore: bump node version (#220 )	2025-11-04 18:07:01 -05:00
Hoan Luu Huu	9beba4330a	support auth trunk for incoming call (#213 ) * support auth trunk for incoming call * wip * wip * wip * update digest-utils version * update sql file from api-server * update sql file from api-server * wip	2025-10-23 17:00:34 -04:00
Dave Horton	b2868842ad	support incoming calls from registration trunks with ephemeral gateways (#216 ) * support incoming calls from registration trunks with ephemeral gateways * fix bug with multiple ephemeral gateways * update to pino 10.1.0 * update eslint	2025-10-21 07:33:21 -04:00
Hoan Luu Huu	4f1b4815c4	update digest utils 0.0.8 (#215 )	2025-10-19 10:39:40 -04:00
Sam Machin	025853934e	bump dbhelpers for cache change (#214 )	2025-10-15 11:39:42 -04:00
Dave Horton	8ce531ec81	revert change (for now) that caused audio issues when reinviting to partial media (#212 )	2025-08-18 12:46:13 -04:00
Sam Machin	7bc2a1a6f4	Check for loops (#211 ) * check for matching x-application-sid header and tests * lint * update test scenario * rename file * now with valid test data!	2025-08-18 07:24:45 -04:00
Sam Machin	83461f99e8	Set strict source on rtpengine (#210 ) * Set strict source on rtpengine RTPBleed * use env var for strict source * lint * Update utils.js * arghhhh * clarification * change	2025-08-03 19:44:47 -04:00
Dave Horton	45684aa337	bump version	2025-07-15 11:46:09 -04:00
Vinod Dharashive	9d0c829ae8	increase dtmf volume (#208 ) https://github.com/jambonz/jambonz-feature-server/issues/1272	2025-07-09 08:23:17 -04:00
sathish kumar pasham	7a6551c141	Fix security vulnerabilities by upgrading to @babel/helpers version 7.26.10. (#207 )	2025-06-27 08:14:26 -04:00
rammohan-y	5f267906b1	Fixed issue when wild cards or regex is used in phone number for multiple carriers (#202 ) * Fixed issue when wild cards or regex is used in phone number for multiple carriers https://github.com/jambonz/sbc-inbound/issues/201 * Implemanted the regex/pattern based logic when url is a sip_realm * Refactored getApplicationForDidAndCarrier as it is failing to parse other regex if first regex is invalid In gateway is defined at "all accounts" using the phone number's account_sid * Performance improvements * Exported getApplicationForDidAndCarriers method * Added additional unit test cases	2025-06-18 21:11:05 +02:00
Dave Horton	680d32e9a2	update version	2025-05-14 15:42:00 -04:00
Dave Horton	71c437ee07	update db-helpers	2025-05-13 10:35:46 -04:00
rammohan-y	35c38685a9	Updated drachtio-srf version (#199 ) https://github.com/drachtio/drachtio-server/issues/424	2025-04-22 11:05:30 -04:00
Hoan Luu Huu	8d15098b77	update drachtio srf 5.0.4 (#198 )	2025-04-18 07:45:18 -04:00
Hoan Luu Huu	656ad3b6cb	update digest-utils version (#197 )	2025-04-17 19:45:39 -04:00
rammohan-y	7eccb6816d	Updated db-helper to 0.9.11 (#196 ) https://github.com/jambonz/jambonz-feature-server/issues/1151	2025-04-14 08:22:17 -04:00
rammohan-y	f58cf8eecf	updated realtimedb-helper to 0.8.13 (#195 )	2025-03-10 09:54:03 -04:00
Dave Horton	638c003dfc	fix aws sns topic subscribe (#193 )	2025-02-24 12:57:23 -05:00
Dave Horton	23c748046d	REFER should have sips contact if far end is using sips (#192 )	2025-02-24 09:37:18 -05:00
Dave Horton	086adfbeef	update drachtio-srf	2025-02-20 10:15:25 -05:00
Dave Horton	d9b375738b	reject calls on hosted jambonz with no active subscriptions (#191 )	2025-02-19 13:05:56 -05:00
Hoan Luu Huu	ec3af43a41	support sip recording from a siprec call (#190 ) * support sip recording from a siprec call * update srsClient version	2025-02-12 09:24:12 -05:00
Dave Horton	0ba5cb53bb	refined the method for syncing call count updates and added debugging (#189 ) * refined the method for syncing call count updates and added debugging * include callId in debug key * fix debug key name	2025-02-05 13:00:13 -05:00
Dave Horton	25415c0be9	logging	2025-01-17 09:11:08 -05:00
Dave Horton	c0e42bcdaa	update deps	2025-01-14 10:49:31 -05:00
Dave Horton	8f3ea260ca	fix race condition with call counts when quick cancel is received (#188 ) * fix race condition with call counts when quick cancel is received * wip * update dractio-srf and mrf to main branch releases	2025-01-14 10:04:03 -05:00
Dave Horton	c807fdb93d	Feat/3pcc invite (#187 ) * wip * wip * wip * add test for late media / 3pcc invite, which should now work	2024-12-12 18:39:01 -05:00
Hoan Luu Huu	a7d6cf5a31	support referby with display name (#186 ) * support referby with display name * update siprec client utils	2024-12-11 10:34:54 -05:00
Dave Horton	1cd526c684	wip (#182 )	2024-11-19 09:38:19 -05:00
Dave Horton	50b249544e	fix #180 (#181 )	2024-11-14 17:52:34 -05:00
Hoan Luu Huu	4add329102	support force opus pcmu transcode (#175 ) * support force opus pcmu transcode * fix review comment * wip	2024-11-14 12:22:45 -05:00
André HeberandAndre Heber	06b3122571	reject late media call with 488 and X-Reason (#179 ) * reject late media call with 488 and X-Reason * test added * changed X-Reason, clarified test --------- Co-authored-by: Andre Heber <a.heber@cognigy.com>	2024-11-14 09:13:39 -05:00
Hoan Luu Huu	bcfbe9a0fc	fixed incase srtp, dont need to send reinvite when release media (#176 ) * fixed, srtp dont need to send reinvite when release media * fix review comment	2024-11-13 07:42:42 -05:00
Dave Horton	bb9e5e98f5	minor logging	2024-11-12 09:27:12 -05:00
Dave Horton	a714190aa4	fix race condition #177 (#178 )	2024-11-12 09:15:19 -05:00
Hoan Luu Huu	e6d41dec71	update time series version (#171 )	2024-10-17 08:07:10 -04:00