include codec-accept on answer to rtpengine during reinvites (#209 )

* include codec-accept on answer to rtpengine during reinvites * attempt to simplify * fixes from testing
when far end answers with only pcma, passthrough instead of transcoding to pcmu (#208 )
2026-10-04 02:04:19 +00:00 · 2025-12-02 07:37:18 -05:00 · 2025-11-24 11:23:16 -06:00 · 2025-11-04 18:02:31 -05:00 · 2025-10-28 16:58:54 -04:00 · 2025-10-21 07:52:29 -04:00
19 changed files with 1748 additions and 5408 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  
-  }
-}
@@ -6,12 +6,17 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
        with:
-          node-version: lts/*
+          node-version: 20.x
      - run: npm ci
      - run: npm run jslint
+      - name: Install Docker Compose
+        run: |
+          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          sudo chmod +x /usr/local/bin/docker-compose
+          docker-compose --version
      - run: npm test

 
@@ -36,3 +36,4 @@ node_modules
 .DS_Store

 examples/*
+CLAUDE.md
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"

-npm run jslint
+npm run jslint
@@ -1,10 +1,10 @@
-FROM --platform=linux/amd64 node:18.15-alpine3.16 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" ]
@@ -1,6 +1,6 @@
 MIT License

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

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -50,7 +50,8 @@ const {
  lookupSipGatewaysByCarrier,
  lookupCarrierBySid,
  queryCallLimits,
-  lookupCarrierByAccountLcr
+  lookupCarrierByAccountLcr,
+  lookupSystemInformation
 } = require('@jambonz/db-helpers')({
  host: process.env.JAMBONES_MYSQL_HOST,
  port: process.env.JAMBONES_MYSQL_PORT || 3306,
@@ -67,6 +68,9 @@ const {
  decrKey,
  retrieveSet,
  isMemberOfSet,
+  addKey,
+  deleteKey,
+  retrieveKey
 } = require('@jambonz/realtimedb-helpers')({}, logger);

 const activeCallIds = new Map();
@@ -84,6 +88,7 @@ srf.locals = {...srf.locals,
  queryCdrs,
  activeCallIds,
  idleEmitter,
+  privateNetworkCidr: process.env.PRIVATE_VOIP_NETWORK_CIDR || null,
  dbHelpers: {
    ping,
    lookupOutboundCarrierForAccount,
@@ -94,10 +99,14 @@ srf.locals = {...srf.locals,
    lookupSipGatewaysByCarrier,
    lookupCarrierBySid,
    queryCallLimits,
-    lookupCarrierByAccountLcr
+    lookupCarrierByAccountLcr,
+    lookupSystemInformation
  },
  realtimeDbHelpers: {
    client: redisClient,
+    addKey,
+    deleteKey,
+    retrieveKey,
    createHash,
    retrieveHash,
    incrKey,
@@ -184,10 +193,22 @@ if (process.env.K8S || process.env.HTTP_PORT) {
    });
 }
 if ('test' !== process.env.NODE_ENV) {
-  /* update call stats periodically */
-  setInterval(() => {
+  /* update call stats periodically as well as definition of private network cidr */
+  setInterval(async() => {
    stats.gauge('sbc.sip.calls.count', activeCallIds.size, ['direction:outbound',
      `instance_id:${process.env.INSTANCE_ID || 0}`]);
+
+    const r = await lookupSystemInformation();
+    if (r) {
+      if (r.private_network_cidr !== srf.locals.privateNetworkCidr) {
+        logger.info(`updating private network cidr from ${srf.locals.privateNetworkCidr} to ${r.private_network_cidr}`);
+        srf.locals.privateNetworkCidr = r.private_network_cidr;
+      }
+      // Update system log level
+      if (r.log_level) {
+        logger.level = r.log_level;
+      }
+    }
  }, 20000);
 }

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

-module.exports = {srf};
+module.exports = {srf, logger};
@@ -3,6 +3,6 @@
  "DTLS": "off",
  "SDES": "off",
  "ICE": "remove",
-  "flags": ["media handover", "port latching"],
+  "flags": ["port latching"],
  "rtcp-mux": ["demux"]
 }
@@ -3,13 +3,13 @@
    "transport-protocol": "UDP/TLS/RTP/SAVPF",
    "ICE": "force",
    "SDES": "off",
-    "flags": ["generate mid", "SDES-no", "media handover", "port latching"],
+    "flags": ["generate mid", "SDES-no", "port latching"],
    "rtcp-mux": ["require"]  
  },
  "teams": {
    "transport-protocol": "RTP/SAVP",
    "ICE": "force",
-    "flags": ["generate mid", "media handover",
+    "flags": ["generate mid",
      "SDES-no-AES_CM_128_HMAC_SHA1_32",
      "SDES-no-F8_128_HMAC_SHA1_80",
      "SDES-no-F8_128_HMAC_SHA1_32",
@@ -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'}],
+
+      // 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
+    }
+  }
+];
@@ -1,36 +1,62 @@
 const Emitter = require('events');
-const sdpTransform = require('sdp-transform');
 const SrsClient = require('@jambonz/siprec-client-utils');
-const {makeRtpEngineOpts, nudgeCallCounts, isPrivateVoipNetwork, isBlackListedSipGateway} = require('./utils');
+const {
+  makeRtpEngineOpts,
+  nudgeCallCounts,
+  isPrivateVoipNetwork,
+  isBlackListedSipGateway,
+  makeFullMediaReleaseKey,
+  makePartnerFullMediaReleaseKey,
+  isValidDomainOrIP,
+  removeVideoSdp,
+} = require('./utils');
+const { MediaPath } = require('./constants.json');
 const {forwardInDialogRequests} = require('drachtio-fn-b2b-sugar');
 const {SipError, stringifyUri, parseUri} = require('drachtio-srf');
 const debug = require('debug')('jambonz:sbc-outbound');

 const makeInviteInProgressKey = (callid) => `sbc-out-iip${callid}`;
 const IMMUTABLE_HEADERS = ['via', 'from', 'to', 'call-id', 'cseq', 'max-forwards', 'content-length'];
-/**
- * this is to make sure the outgoing From has the number in the incoming From
- * and not the incoming PAI
- */
-const createBLegFromHeader = (req, teams, register_from_domain = null) => {
+
+const createBLegFromHeader = ({
+  logger,
+  req,
+  host,
+  fromUser,
+  register_from_domain,
+  transport,
+  teams = false,
+  scheme = 'sip'
+}) => {
  const from = req.getParsedHeader('From');
  const uri = parseUri(from.uri);
-  let user = uri.user || 'anonymous';
-  let host = 'localhost';
-  if (teams) {
-    host = req.get('X-MS-Teams-Tenant-FQDN');
-  }
-  else if (req.has('X-Preferred-From-User') || req.has('X-Preferred-From-Host')) {
-    user = req.get('X-Preferred-From-User') || user;
-    host = req.get('X-Preferred-From-Host') || host;
-  } else if (register_from_domain) {
-    host = register_from_domain;
+  const transportParam = transport ? `;transport=${transport}` : '';
+
+  logger.debug({from, fromUser, uri, host, scheme, transport, teams}, 'createBLegFromHeader');
+  /* user */
+  const user = fromUser || req.get('X-Preferred-From-User') || uri.user || 'anonymous';
+
+  /* host */
+  if (!host) {
+    if (teams) {
+      host = req.get('X-MS-Teams-Tenant-FQDN');
+    }
+    else if (req.has('X-Preferred-From-Host')) {
+      host = req.get('X-Preferred-From-Host');
+    } else if (register_from_domain) {
+      host = register_from_domain;
+    }
+    else {
+      host = 'localhost';
+    }
  }
+
  if (from.name) {
-    return `${from.name} <sip:${user}@${host}>`;
+    return `${from.name} <${scheme}:${user}@${host}${transportParam}>`;
  }
-  return `sip:${user}@${host}`;
+  return `<${scheme}:${user}@${host}${transportParam}>`;
 };
+
 const createBLegToHeader = (req, teams) => {
  const to = req.getParsedHeader('To');
  const host = teams ? req.get('X-MS-Teams-Tenant-FQDN') : 'localhost';
@@ -54,6 +80,7 @@ const initCdr = (req, invite) => {
    account_sid: req.get('X-Account-Sid'),
    call_sid: req.get('X-Call-Sid'),
    sip_callid: invite.get('Call-ID'),
+    ...(req.has('X-CID') && {sip_parent_callid: req.get('X-CID')}),
    ...(applicationSid && {application_sid: applicationSid}),
    from,
    to,
@@ -67,15 +94,6 @@ const initCdr = (req, invite) => {
  };
 };

-const updateRtpEngineFlags = (sdp, opts) => {
-  try {
-    const parsed = sdpTransform.parse(sdp);
-    const codec = parsed.media[0].rtp[0].codec;
-    if (['PCMU', 'PCMA'].includes(codec)) opts.flags.push(`codec-accept-${codec}`);
-  } catch (err) {}
-  return opts;
-};
-
 class CallSession extends Emitter {
  constructor(logger, req, res) {
    super();
@@ -90,6 +108,8 @@ class CallSession extends Emitter {
    this.writeCdrs = this.srf.locals.writeCdrs;

    this.decrKey = req.srf.locals.realtimeDbHelpers.decrKey;
+    this.addKey = req.srf.locals.realtimeDbHelpers.addKey;
+    this.retrieveKey = req.srf.locals.realtimeDbHelpers.retrieveKey;

    const {
      lookupOutboundCarrierForAccount,
@@ -102,7 +122,8 @@ class CallSession extends Emitter {
    this.lookupSipGatewaysByCarrier = lookupSipGatewaysByCarrier;
    this.lookupCarrierByAccountLcr = lookupCarrierByAccountLcr;

-    this._mediaReleased = false;
+    this._mediaPath = MediaPath.FullMedia;
+
    this.recordingNoAnswerTimeout = (process.env.JAMBONES_RECORDING_NO_ANSWER_TIMEOUT || 2) * 1000;
  }

@@ -123,12 +144,7 @@ class CallSession extends Emitter {
  }

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

  subscribeForDTMF(dlg) {
@@ -188,13 +204,12 @@ class CallSession extends Emitter {
    this.rtpEngineResource = {destroy: this.del.bind(null, this.rtpEngineOpts.common)};
    let proxy, uris = [];
    const mapGateways = new Map();
+    let encryptedMedia = false;

    try {
      // determine where to send the call
      debug(`connecting call: ${JSON.stringify(this.req.locals)}`);
-      let headers = {
-        'From': createBLegFromHeader(this.req, teams),
-        'Contact': createBLegFromHeader(this.req, teams),
+      const headers = {
        'To': createBLegToHeader(this.req, teams),
        Allow: 'INVITE, ACK, OPTIONS, CANCEL, BYE, NOTIFY, UPDATE, PRACK',
        'X-Account-Sid': this.account_sid
@@ -218,6 +233,7 @@ class CallSession extends Emitter {
        if (!contact.includes('transport=ws')) {
          proxy = this.req.locals.registration.proxy;
        }
+        this.logger.info(`sending call to registered user ${destUri}`);
      }
      else if (this.req.locals.target === 'forward') {
        uris = [{
@@ -242,10 +258,6 @@ class CallSession extends Emitter {
          private_network: false,
          uri: `sip:${this.req.calledNumber}@sip.pstnhub.microsoft.com`
        }];
-        headers = {
-          ...headers,
-          Contact: `sip:${this.req.calledNumber}@${this.req.get('X-MS-Teams-Tenant-FQDN')}:5061;transport=tls`
-        };
      }
      else {
        try {
@@ -295,17 +307,18 @@ class CallSession extends Emitter {
                this.req.calledNumber.slice(1) :
                this.req.calledNumber;
              const prefix = vc.tech_prefix || '';
-              const protocol =  o.protocol?.startsWith('tls') ? 'tls' : (o.protocol || 'udp');
+              const transport =  o.protocol?.startsWith('tls') ? 'tls' : (o.protocol || 'udp');
              const hostport = !o.port || 5060 === o.port ? o.ipv4 : `${o.ipv4}:${o.port}`;
-              const prependPlus = vc.e164_leading_plus && !this.req.calledNumber.startsWith('0') ? '+' : '';
-              const transport = `transport=${protocol}`;
-              const scheme = (protocol === 'tls' && !process.env.JAMBONES_USE_BEST_EFFORT_TLS) ? 'sips' : 'sip';
-              const u = `${scheme}:${prefix}${prependPlus}${calledNumber}@${hostport};${transport}`;
+              const prependPlus = vc.e164_leading_plus && /^[1-9]/.test(calledNumber) ? '+' : '';
+              const scheme = transport === 'tls' && !process.env.JAMBONES_USE_BEST_EFFORT_TLS && o.use_sips_scheme ?
+                'sips' : 'sip';
+              let u = `${scheme}:${prefix}${prependPlus}${calledNumber}@${hostport};transport=${transport}`;
              const obj = {
                name: vc.name,
                diversion: vc.diversion,
                hostport,
-                protocol: o.protocol,
+                transport,
+                scheme,
                register_from_domain: vc.register_from_domain
              };
              if (vc.register_username && vc.register_password) {
@@ -314,8 +327,22 @@ class CallSession extends Emitter {
                  password: vc.register_password
                };
              }
+              if (vc.requires_register && vc.register_sip_realm?.length > 0) {
+                proxy = u;
+                u = `${scheme}:${prefix}${prependPlus}${calledNumber}@${vc.register_sip_realm};transport=${transport}`;
+                this.logger.debug({uri: u}, `using outbound proxy for this registered trunk: ${proxy}`);
+              } else if (vc.outbound_sip_proxy && vc.outbound_sip_proxy.length > 0) {
+                if (vc.outbound_sip_proxy.includes('sip:') || vc.outbound_sip_proxy.includes('sips:')) {
+                  proxy = vc.outbound_sip_proxy;
+                } else if (isValidDomainOrIP(vc.outbound_sip_proxy)) {
+                  proxy =
+                    `${scheme}:${prefix}${prependPlus}${calledNumber}@${vc.outbound_sip_proxy};transport=${transport}`;
+                  this.logger.debug({uri: u}, `using outbound proxy for this trunk: ${proxy}`);
+                }
+              }
              mapGateways.set(u, obj);
              uris.push(u);
+              this.logger.debug({gateway: o}, `pushed uri ${u}`);
              if (o.protocol === 'tls/srtp') {
                /**  TODO: this is a bit of a hack in the sense that we are not
                 * supporting a scenario where you have a carrier with several outbound
@@ -325,9 +352,10 @@ class CallSession extends Emitter {
                 */
                this.logger.info({u}, `using SRTP for outbound call, pad crypto: ${o.pad_crypto ? 'yes' : 'no'}`);
                this.rtpEngineOpts = makeRtpEngineOpts(this.req, false, true, o.pad_crypto, true);
+                encryptedMedia = true;
              }
            });
-            // Check private network for each gw
+            /* Check private network for each gw */
            uris = await Promise.all(uris.map(async(u) => {
              return {
                private_network: await isPrivateVoipNetwork(u),
@@ -349,23 +377,20 @@ class CallSession extends Emitter {
        debug(`sending call to PSTN ${uris}`);
      }

-      // private_network should be called at last
+      /* private_network should be called at last - try public first */
      uris = uris.sort((a, b) => a.private_network - b.private_network);
      const toPrivate = uris.some((u) => u.private_network === true);
      const toPublic = uris.some((u) => u.private_network === false);
      let isOfferUpdatedToPrivate = toPrivate && !toPublic;

-
-      // rtpengine 'offer'
-      const opts = updateRtpEngineFlags(this.req.body, {
+      const opts = {
        ...this.rtpEngineOpts.common,
        ...this.rtpEngineOpts.uac.mediaOpts,
        'from-tag': this.rtpEngineOpts.uas.tag,
        direction:  ['private', toPublic ? 'public' : 'private'],
        sdp: this.req.body
-      });
+      };
      let response = await this.offer(opts);
-      debug(`response from rtpengine to offer ${JSON.stringify(response)}`);
      this.logger.debug({offer: opts, response}, 'initial offer to rtpengine');
      if ('ok' !== response.result) {
        this.logger.error(`rtpengine offer failed with ${JSON.stringify(response)}`);
@@ -378,10 +403,12 @@ class CallSession extends Emitter {
      // crank through the list of gateways until connected, exhausted or caller hangs up
      let earlyMedia = false;
      while (uris.length) {
-        let hdrs = { ...headers};
+        let hdrs = { ...headers };
        const {private_network, uri} = uris.shift();
+
+        /* if we've exhausted attempts to public endpoints and are switching to trying private, we need new rtp */
        if (private_network && !isOfferUpdatedToPrivate) {
-          // Cannot make call to all public Uris, now come to talk with private network Uris
+          this.logger.info('switching to attempt to deliver call via private network now..');
          this.rtpEngineResource.destroy()
            .catch((err) => this.logger.info({err}, 'Error destroying rtpe to re-connect to private network'));
          response = await this.offer({
@@ -390,8 +417,8 @@ class CallSession extends Emitter {
          });
          isOfferUpdatedToPrivate = true;
        }
-        const gw = mapGateways.get(uri);
-        const passFailure = 0 === uris.length;  // only a single target
+
+        /* on the second and subsequent attempts, use the same Call-ID and CSeq from the first attempt */
        if (0 === uris.length) {
          try {
            const key = makeInviteInProgressKey(this.req.get('Call-ID'));
@@ -407,32 +434,79 @@ class CallSession extends Emitter {
            this.logger.info({err}, 'Error retrieving iip key');
          }
        }
-        // INVITE request line and To header should be the same.
-        hdrs = {...hdrs, 'To': uri};
-        if (gw) {
-          this.logger.info({gw}, `sending INVITE to ${uri} via carrier ${gw.name}`);
-          if (gw.diversion) {
-            let div = gw.diversion;
-            if (div.startsWith('+')) {
-              div = `<sip:${div}@${gw.hostport}>;reason=unknown;counter=1;privacy=off`;
-            }
-            else div = `<sip:+${div}@${gw.hostport}>;reason=unknown;counter=1;privacy=off`;
-            hdrs = {
-              ...hdrs,
-              'Diversion': div
-            };
-          }
-          if (gw.register_from_domain) {
-            hdrs = {
-              ...hdrs,
-              'From': createBLegFromHeader(this.req, teams, gw.register_from_domain)
-            };
-          }
-        }
-        else this.logger.info(`sending INVITE to ${uri} via proxy ${proxy})`);
-        try {
-          const responseHeaders = this.privateSipAddress ? {Contact: `<sip:${this.privateSipAddress}>`} : {};

+        /* INVITE request line and To header should be the same. */
+        hdrs = {...hdrs, 'To': uri};
+
+        /* only now can we set Contact & From header since they depend on transport and scheme of gw */
+        const gw = mapGateways.get(uri);
+        if (gw) {
+          const {scheme, transport} = gw;
+          this.logger.info({gw}, `sending INVITE to ${uri} via carrier ${gw.name}`);
+          hdrs = {
+            ...hdrs,
+            From: gw.register_from_domain ?
+              createBLegFromHeader({
+                logger: this.logger,
+                req: this.req,
+                register_from_domain: gw.register_from_domain,
+                scheme,
+                transport,
+                ...(private_network && {host: this.privateSipAddress})
+              }) :
+              createBLegFromHeader({
+                logger: this.logger,
+                req: this.req,
+                scheme,
+                transport,
+                ...(private_network && {host: this.privateSipAddress})
+              }),
+            Contact: createBLegFromHeader({
+              logger: this.logger,
+              req: this.req,
+              ...(gw.auth?.username && {fromUser: gw.auth?.username}),
+              scheme,
+              transport,
+              ...(private_network && {host: this.privateSipAddress})
+            }),
+            ...(gw.diversion && {
+              Diversion: gw.diversion.startsWith('+') ?
+                `<sip:${gw.diversion}@${gw.hostport}>;reason=unknown;counter=1;privacy=off` :
+                `<sip:+${gw.diversion}@${gw.hostport}>;reason=unknown;counter=1;privacy=off`
+            })
+          };
+        }
+        else if (teams) {
+          hdrs = {
+            ...hdrs,
+            'From': createBLegFromHeader({logger: this.logger, req: this.req, teams: true, transport: 'tls'}),
+            'Contact': `sip:${this.req.calledNumber}@${this.req.get('X-MS-Teams-Tenant-FQDN')}:5061;transport=tls`
+          };
+        }
+        else {
+          const uri = parseUri(this.req.uri);
+          hdrs = {
+            ...hdrs,
+            'From': createBLegFromHeader({
+              logger: this.logger,
+              req: this.req,
+              transport: uri.params.transport,
+              ...(private_network && {host: this.privateSipAddress})
+            }),
+            'Contact': createBLegFromHeader({
+              logger: this.logger,
+              req: this.req,
+              transport: uri.params.transport,
+              ...(private_network && {host: this.privateSipAddress})
+            })
+          };
+          const p = proxy ? ` via ${proxy}` : '';
+          this.logger.info({uri, p}, `sending INVITE${p}`);
+        }
+
+        /* now launch an outbound call attempt */
+        const passFailure = 0 === uris.length;  // only propagate failure on last attempt
+        try {
          const {uas, uac} = await this.srf.createB2BUA(this.req, this.res, uri, {
            proxy,
            passFailure,
@@ -457,18 +531,27 @@ class CallSession extends Emitter {
              '-Allow',
              '-Session-Expires'
            ],
+            // Add X-CID header to feature server response.
+            // to allow calling/status hooks contains sbc_callid.
+            responseHeaders: (uacRes, headers) => {
+              headers['X-CID'] = uacRes.get('Call-ID');
+            },
            headers: hdrs,
-            responseHeaders,
            auth: gw ? gw.auth : undefined,
            localSdpB: response.sdp,
            localSdpA: async(sdp, res) => {
              this.rtpEngineOpts.uac.tag = res.getParsedHeader('To').params.tag;
+
              const opts = {
                ...this.rtpEngineOpts.common,
                ...this.rtpEngineOpts.uas.mediaOpts,
                'from-tag': this.rtpEngineOpts.uas.tag,
                'to-tag': this.rtpEngineOpts.uac.tag,
-                flags: ['single codec', 'inject DTMF'],
+                flags: [
+                  'single codec',
+                  'inject DTMF',
+                  'reuse codecs',
+                ],
                sdp
              };
              const response = await this.answer(opts);
@@ -511,6 +594,9 @@ class CallSession extends Emitter {
              } catch (err) {
                this.logger.error({err}, 'Error saving Call-ID/CSeq');
              }
+
+              this.contactHeader = inv.get('Contact');
+              this.logger.info(`outbound call attempt to ${uri} has contact header ${this.contactHeader}`);
            },
            cbProvisional: (response) => {
              if (!earlyMedia && [180, 183].includes(response.status) && response.body) earlyMedia = true;
@@ -530,14 +616,25 @@ class CallSession extends Emitter {
          // these are all final failure scenarios
          if (uris.length === 0 ||          // exhausted all targets
            earlyMedia ||                   // failure after early media
+            encryptedMedia ||               // cant crank back when using encrypted media as keys have been exchanged
            !(err instanceof SipError) ||   // unexpected error
            err.status === 487) {           // caller hung up

            const abandoned = err.message && err.message.includes('rtpengine failed: Unknown call-id');
            const status = err.status || (abandoned ? 487 : 500);
            if (err instanceof SipError) this.logger.info(`final call failure  ${status}`);
-            else if (!abandoned) this.logger.error(err, 'unexpected call failure');
-            debug(`got final outdial error: ${err}`);
+            else if (!abandoned) {
+              const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
+              this.logger.error({err}, 'unexpected call failure');
+              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.logger.debug(`got final outdial error: ${err}`);
            if (!passFailure) this.res.send(status);
            this.emit('failed');
            this.rtpEngineResource.destroy()
@@ -561,7 +658,7 @@ class CallSession extends Emitter {
        }
      }
    } catch (err) {
-      if ('abandonded' !== err.message) this.logger.error(err, `Error setting up outbound call to: ${uris}`);
+      if ('abandonded' !== err.message) this.logger.error({err}, `Error setting up outbound call to: ${uris}`);
      this.emit('failed');
      this.srf.endSession(this.req);
      this.rtpEngineResource.destroy();
@@ -580,6 +677,15 @@ class CallSession extends Emitter {
        answered_at: callStart
      };
    }
+
+    /* 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('X-CID'));
+      const sdp = uac.remote.sdp;
+      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) => {
@@ -595,8 +701,7 @@ class CallSession extends Emitter {
            if (!IMMUTABLE_HEADERS.includes(h)) headers[h] = bye.headers[h];
          });
          await other.destroy({headers});
-          await other.destroy();
-        } catch (err) {}
+        } catch {}

        const trackingOn = process.env.JAMBONES_TRACK_ACCOUNT_CALLS ||
          process.env.JAMBONES_TRACK_SP_CALLS ||
@@ -604,10 +709,12 @@ class CallSession extends Emitter {

        if (process.env.JAMBONES_HOSTING || trackingOn) {
          const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
-          await nudgeCallCounts(this.logger, {
+          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
+            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'));
        }
@@ -686,12 +793,19 @@ class CallSession extends Emitter {
  async _onRefer(dlg, req, res) {
    /* REFER coming in from a sip device, forward to feature server */
    try {
+      const customHeaders = Object.keys(req.headers)
+        .filter((h) => h.toLowerCase().startsWith('x-'))
+        .reduce((acc, h) => {
+          acc[h] = req.get(h);
+          return acc;
+        }, {});
      const response = await dlg.other.request({
        method: 'REFER',
        headers: {
          'Refer-To': req.get('Refer-To'),
          'Referred-By': req.get('Referred-By'),
-          'User-Agent': req.get('User-Agent')
+          'User-Agent': req.get('User-Agent'),
+          ...customHeaders
        }
      });
      res.send(response.status, response.reason);
@@ -732,16 +846,44 @@ Duration=${payload.duration} `
    try {
      const reason = req.get('X-Reason');
      const isReleasingMedia = reason && dlg.type === 'uas' && ['release-media', 'anchor-media'].includes(reason);
+      const isFullMediaRelease = reason === 'release-media-entirely' && process.env.JAMBONES_ENABLE_FULL_MEDIA_RELEASE;
      const fromTag = dlg.type === 'uas' ? this.rtpEngineOpts.uas.tag : this.rtpEngineOpts.uac.tag;
      const toTag = dlg.type === 'uas' ? this.rtpEngineOpts.uac.tag : this.rtpEngineOpts.uas.tag;
-      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;
+      let offerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uac.mediaOpts : this.rtpEngineOpts.uas.mediaOpts;
+      let answerMedia = dlg.type === 'uas' ? this.rtpEngineOpts.uas.mediaOpts : this.rtpEngineOpts.uac.mediaOpts;
      const direction =  dlg.type === 'uas' ? ['private', 'public'] : ['public', 'private'];
+
+      if (isFullMediaRelease) {
+        const a_sdp = await this.retrieveKey(makePartnerFullMediaReleaseKey(this.req.get('X-CID')));
+        this.logger.info({a_sdp}, 'reinvite ourselves out of the media path with this reinvite offer');
+        const answerSdp = await dlg.other.modify(a_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;
+      }
+
      if (isReleasingMedia) {
        if (!offerMedia.flags.includes('port latching')) offerMedia.flags.push('port latching');
        if (!offerMedia.flags.includes('asymmetric')) offerMedia.flags.push('asymmetric');
        offerMedia.flags = offerMedia.flags.filter((f) => f !== 'media handover');
      }
+      const acceptCodecs = process.env.JAMBONES_ACCEPT_AND_TRANSCODE ?
+        process.env.JAMBONES_ACCEPT_AND_TRANSCODE :
+        process.env.JAMBONES_ACCEPT_G729 ? 'g729' : '';
+      offerMedia = { ...offerMedia, ...(acceptCodecs && dlg.type === 'uac' &&
+        { codec: { mask: acceptCodecs, transcode: 'pcmu,pcma' } })};
+      answerMedia = { ...answerMedia, ...(process.env.JAMBONES_CODEC_OFFER_WITH_ORDER && dlg.type === 'uac' &&
+        { codec: {offer: process.env.JAMBONES_CODEC_OFFER_WITH_ORDER.split(','), strip: 'all' }})};
      let opts = {
        ...this.rtpEngineOpts.common,
        ...offerMedia,
@@ -762,17 +904,20 @@ 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.calleeIsUsingSrtp) {
+      //HL 2024-11-13: previously forwarded re-invites to webrtc clients but further testing has shown to be unnecessary
+      //if (isReleasingMedia && !this.calleeIsUsingSrtp) {
+
+      //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) {
        this.logger.info(`got a reinvite from FS to ${reason}`);
        sdp = dlg.other.remote.sdp;
        if (!answerMedia.flags.includes('port latching')) answerMedia.flags.push('port latching');
        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;
      }
      else {
        sdp = await dlg.other.modify(response.sdp);
-        this.logger.info({sdp}, 'CallSession:_onReinvite: got sdp from 200 OK to invite we sent');
      }
      opts = {
        ...this.rtpEngineOpts.common,
@@ -782,14 +927,23 @@ Duration=${payload.duration} `
        sdp
      };
      response = await this.answer(opts);
-      /* now remove asymeetric as B party (looking at you Genesys ring group) may need port re-learning on invites  */
+      /* now remove asymmetric as B party (looking at you Genesys ring group) may need port re-learning on invites  */
      answerMedia.flags = answerMedia.flags.filter((f) => f !== 'asymmetric');
      if ('ok' !== response.result) {
        res.send(488);
        throw new Error(`_onReinvite: rtpengine failed: ${JSON.stringify(response)}`);
      }
      this.logger.debug({opts, sdp: response.sdp}, 'CallSession:_onReinvite: (answer) sending back upstream');
-      res.send(200, {body: response.sdp});
+      let responseSdp = response.sdp;
+      if (process.env.JAMBONES_VIDEO_CALLS_ENABLED_IN_FS) {
+        responseSdp = removeVideoSdp(responseSdp);
+      }
+      res.send(200, {
+        body: responseSdp,
+        headers: {
+          'Contact': this.contactHeader
+        }
+      });
    } catch (err) {
      res.send(err.status || 500);
      this.logger.error(err, 'Error handling reinvite');
@@ -864,7 +1018,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);
@@ -946,11 +1101,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.uas.tag,
            code,
-            duration
+            duration,
+            volume
          };
          const response = await this.playDTMF(dtmfOpts);
          if ('ok' !== response.result) {
@@ -1016,9 +1173,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;

@@ -1028,18 +1185,17 @@ Duration=${payload.duration} `
      const arr = /context-(.*)/.exec(uri.user);
      if (!arr) {
        /* call transfer requested */
-        const referredBy = req.getParsedHeader('Referred-By');
-        if (!referredBy) return res.send(400);
-        const u = parseUri(referredBy.uri);
-        const farEnd = parseUri(this.connectedUri);
-        uri.host = farEnd.host;
-        uri.port = farEnd.port;
+        if (!req.has('Referred-By')) return res.send(400);
+
+        /* delete contact if it was there from feature server */
+        delete customHeaders['contact'];

        const response = await this.uac.request({
          method: 'REFER',
          headers: {
-            'Refer-To': stringifyUri(uri),
-            'Referred-By': stringifyUri(u),
+            'Refer-To': `<${stringifyUri(uri)}>`,
+            'Referred-By': referredby,
+            'Contact': this.contactHeader,
            ...customHeaders
          }
        });
@@ -1067,6 +1223,22 @@ Duration=${payload.duration} `
        this.activeCallIds.delete(this.req.get('Call-ID'));
        if (this.activeCallIds.size === 0) this.idleEmitter.emit('idle');
        uac.other.destroy();
+        if (this.req.locals.cdr) {
+          const now = Date.now();
+          const day = new Date();
+          const recordAllCalls = this.req.locals.record_all_calls;
+          let recording_url = `/Accounts/${this.account_sid}/RecentCalls/${this.req.locals.cdr.call_sid}/record`;
+          recording_url += `/${day.getFullYear()}/${(day.getMonth() + 1).toString().padStart(2, '0')}`;
+          recording_url += `/${day.getDate().toString().padStart(2, '0')}/${recordAllCalls}`;
+          this.writeCdrs({...this.req.locals.cdr,
+            terminated_at: now,
+            termination_reason: 'caller hungup',
+            sip_status: 200,
+            answered: true,
+            duration: Math.floor((now - this.req.locals.cdr.answered_at) / 1000),
+            ...(recordAllCalls && {recording_url})
+          }).catch((err) => this.logger.error({err}, 'Error writing cdr for completed call'));
+        }
        this.srf.endSession(this.req);
      });

@@ -0,0 +1,7 @@
+{
+  "MediaPath": {
+  "NoMedia": "no-media",
+  "PartialMedia": "partial-media",
+  "FullMedia": "full-media"
+  }
+}
@@ -1,7 +1,7 @@
 const debug = require('debug')('jambonz:sbc-outbound');
 const parseUri = require('drachtio-srf').parseUri;
 const Registrar = require('@jambonz/mw-registrar');
-const {selectHostPort, nudgeCallCounts} = require('./utils');
+const { nudgeCallCounts} = require('./utils');
 const FS_UUID_SET_NAME =  'fsUUIDs';

 module.exports = (srf, logger, redisClient) => {
@@ -17,6 +17,8 @@ module.exports = (srf, logger, redisClient) => {
  const initLocals = async(req, res, next) => {
    req.locals = req.locals || {};
    const callId = req.get('Call-ID');
+    req.locals.nudge = 0;
+    req.locals.callId = callId;
    req.locals.account_sid = req.get('X-Account-Sid');
    req.locals.application_sid = req.get('X-Application-Sid');
    req.locals.record_all_calls = req.get('X-Record-All-Calls');
@@ -60,7 +62,7 @@ module.exports = (srf, logger, redisClient) => {
          });
          return req.srf.endSession(req);
        }
-      } catch (err) {
+      } catch {
        res.send(500);
        return req.srf.endSession(req);
      }
@@ -77,7 +79,11 @@ module.exports = (srf, logger, redisClient) => {
    });

    try {
-      req.locals.account = await lookupAccountBySid(req.locals.account_sid);
+      const account = await lookupAccountBySid(req.locals.account_sid);
+      req.locals.account = account;
+      if (account.enable_debug_log) {
+        req.locals.logger.level = 'debug';
+      }
      req.locals.service_provider_sid = req.locals.account.service_provider_sid;
    } catch (err) {
      req.locals.logger.error({err}, `Error looking up account sid ${req.locals.account_sid}`);
@@ -103,10 +109,11 @@ module.exports = (srf, logger, redisClient) => {
      /* 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'));
          const tags = ['accepted:no', `sipStatus:${status}`];
@@ -119,10 +126,11 @@ module.exports = (srf, logger, redisClient) => {
      });

      /* 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 */
@@ -166,6 +174,11 @@ module.exports = (srf, logger, redisClient) => {
          });
          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({
@@ -221,9 +234,12 @@ module.exports = (srf, logger, redisClient) => {
        logger.info({details: reg}, `sending call to registered user ${aor}`);
        if (req.server.hostport !== reg.sbcAddress) {
          /* redirect to the correct SBC where this user is connected */
-          const proxyAddress = selectHostPort(reg.sbcAddress, 'tcp');
-          const redirectUri =  `<sip:${proxyAddress[1]}>`;
-          logger.info(`redirecting call to SBC at ${redirectUri}`);
+          const proxyAddress = reg.privateSbcAddress.split(':');
+          const redirectUri =  `<sip:${proxyAddress[0]}>`;
+          logger.info({
+            myHostPort: req.server.hostport,
+            registeredHostPort: reg.sbcAddress,
+          }, `redirecting call to SBC at ${redirectUri}`);
          return res.send(302, {headers: {Contact: redirectUri}});
        }
        req.locals.registration = reg;
@@ -244,9 +260,22 @@ module.exports = (srf, logger, redisClient) => {
    else if ('sip' === desiredRouting) {
      // call that needs to be forwarded to a sip endpoint
      logger.info(`forwarding call to sip endpoint ${req.uri}`);
+
+      // check if the domain is one of ours
+      if (process.env.JAMBONES_LOCAL_SIP_DOMAINS) {
+        const allowedDomains = process.env.JAMBONES_LOCAL_SIP_DOMAINS.split(',');
+        const domain = uri.host;
+        const isLoop = allowedDomains.some((allowed) =>
+          domain === allowed.trim() || domain.endsWith(`.${allowed.trim()}`)
+        );
+        if (isLoop) {
+          logger.info({ host: domain }, `returning 482 Loop Detected for attempt to send to: ${req.uri}`);
+          res.send(482, 'Loop Detected');
+          return req.srf.endSession(req);
+        }
+      }
      req.locals.target = 'forward';
-    }
-    else if ('phone' === desiredRouting) {
+    }    else if ('phone' === desiredRouting) {
      debug('sending call to LCR');
      req.locals.target = 'lcr';
    }
@@ -3,9 +3,7 @@ const srtpCharacteristics = require('../data/srtp-transcoding');
 const debug = require('debug')('jambonz:sbc-outbound');
 const CIDRMatcher = require('cidr-matcher');
 const dns = require('dns');
-
-const cidrMatcher = process.env.PRIVATE_VOIP_NETWORK_CIDR ?
-  new CIDRMatcher(process.env.PRIVATE_VOIP_NETWORK_CIDR.split(',')) : null;
+const sdpTransform = require('sdp-transform');

 function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, padCrypto, teams) {
  const from = req.getParsedHeader('from');
@@ -18,8 +16,8 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, padCrypto, teams
  }

  const srtpOpts = teams ? srtpCopy['teams'] : srtpCopy['default'];
-  const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCopy;
-  const srcOpts = srcIsUsingSrtp ? srtpOpts : rtpCopy;
+  const dstOpts = JSON.parse(JSON.stringify(dstIsUsingSrtp ? srtpOpts : rtpCopy));
+  const srcOpts = JSON.parse(JSON.stringify(srcIsUsingSrtp ? srtpOpts : rtpCopy));

  /** Allow feature server to send DTMF to the call excepts call from/to teams */
  if (!teams) {
@@ -30,11 +28,29 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, padCrypto, teams
      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 common = {
    'call-id': req.get('Call-ID'),
    'replace': ['origin', 'session-connection'],
    'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no'
  };
+
+  const codec = {
+    accept: ['PCMU', 'PCMA', 'telephone-event'],
+    ...(process.env.JAMBONES_CODEC_OFFER_WITH_ORDER &&
+      {
+        offer: process.env.JAMBONES_CODEC_OFFER_WITH_ORDER.split(','),
+        strip: 'all'
+      }),
+  };
+
  return {
    common,
    uas: {
@@ -43,7 +59,10 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, padCrypto, teams
    },
    uac: {
      tag: null,
-      mediaOpts: dstOpts
+      mediaOpts: {
+        ...dstOpts,
+        codec,
+      }
    }
  };
 }
@@ -130,13 +149,96 @@ const createHealthCheckApp = (port, logger) => {
  });
 };

-const nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
-  const {service_provider_sid, account_sid, application_sid} = sids;
+/**
+ * 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 = [];

-  logger.debug(sids, 'nudgeCallCounts');
+  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:outcalls:${account_sid}:${callId}`, new Date().toISOString(), 259200);
+    }
+    else {
+      await deleteKey(`debug:outcalls:${account_sid}:${callId}`);
+    }
+  }

  if (process.env.JAMBONES_TRACK_SP_CALLS) {
    const key = makeSPCallCountKey(service_provider_sid);
@@ -191,9 +293,13 @@ const nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
 };

 const isPrivateVoipNetwork = async(uri) => {
-  if (cidrMatcher) {
+  const {srf, logger} = require('..');
+  const {privateNetworkCidr} = srf.locals;
+
+  if (privateNetworkCidr) {
    try {
-      const arr = /sips?:.*@(.*?)(:\d+)?(;.*)$/.exec(uri);
+      const matcher = new CIDRMatcher(privateNetworkCidr.split(','));
+      const arr = /sips?:.*@(.*?)(:\d+)?(;.*)?$/.exec(uri);
      if (arr) {
        const input = arr[1];
        let addresses;
@@ -203,12 +309,15 @@ const isPrivateVoipNetwork = async(uri) => {
          addresses = await dns.resolve4(input);
        }
        for (const ip of addresses) {
-          if (cidrMatcher.contains(ip)) {
+          if (matcher.contains(ip)) {
            return true;
          }
        }
      }
-    } catch (err) {}
+    } catch (err) {
+      logger.info({err, privateNetworkCidr},
+        'Error checking private network CIDR, probably misconfigured must be a comma separated list of CIDRs');
+    }
  }
  return false;
 };
@@ -225,6 +334,31 @@ async function isBlackListedSipGateway(client, logger, sip_gateway_sid) {
  }
 }

+const makeFullMediaReleaseKey = (callId) => {
+  return `b_sdp:${callId}`;
+};
+const makePartnerFullMediaReleaseKey = (callId) => {
+  return `a_sdp:${callId}`;
+};
+
+function isValidDomainOrIP(input) {
+  const domainRegex = /^(?!:\/\/)([a-zA-Z0-9.-]+)(:\d+)?$/;
+  // eslint-disable-next-line max-len
+  const ipRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])(:\d+)?$/;
+
+  if (domainRegex.test(input) || ipRegex.test(input)) {
+    return true;
+  }
+
+  return false; // Invalid input
+}
+const removeVideoSdp = (sdp) => {
+  const parsedSdp = sdpTransform.parse(sdp);
+  // Filter out video media sections, keeping only non-video media
+  parsedSdp.media = parsedSdp.media.filter((media) => media.type !== 'video');
+  return sdpTransform.write(parsedSdp);
+};
+
 module.exports = {
  makeRtpEngineOpts,
  selectHostPort,
@@ -236,5 +370,9 @@ module.exports = {
  createHealthCheckApp,
  nudgeCallCounts,
  isPrivateVoipNetwork,
-  isBlackListedSipGateway
+  isBlackListedSipGateway,
+  makeFullMediaReleaseKey,
+  makePartnerFullMediaReleaseKey,
+  isValidDomainOrIP,
+  removeVideoSdp,
 };
@@ -1,9 +1,9 @@
 {
  "name": "sbc-outbound",
-  "version": "0.9.0",
+  "version": "0.9.5",
  "main": "app.js",
  "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 18.0.0"
  },
  "keywords": [
    "sip",
@@ -24,29 +24,30 @@
    "start": "node app",
    "test": "NODE_ENV=test HTTP_PORT=3050 JAMBONES_HOSTING=1 JAMBONES_NETWORK_CIDR=127.0.0.1/32 JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=localhost JAMBONES_REDIS_PORT=16379 JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_LOGLEVEL=error DRACHTIO_SECRET=cymru DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 JAMBONES_RTPENGINES=127.0.0.1:12222 node test/ ",
    "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
-    "jslint": "eslint app.js lib --fix"    
+    "jslint": "eslint app.js lib --fix"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.9.3",
-    "@jambonz/realtimedb-helpers": "^0.8.8",
+    "@babel/helpers": "^7.26.10",
+    "@jambonz/db-helpers": "^0.9.18",
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/mw-registrar": "0.2.7",
+    "@jambonz/realtimedb-helpers": "^0.8.13",
    "@jambonz/rtpengine-utils": "^0.4.4",
-    "@jambonz/siprec-client-utils": "^0.2.7",
-    "@jambonz/stats-collector": "^0.1.9",
-    "@jambonz/time-series": "^0.2.8",
+    "@jambonz/siprec-client-utils": "^0.2.10",
+    "@jambonz/stats-collector": "^0.1.10",
+    "@jambonz/time-series": "^0.2.10",
    "cidr-matcher": "^2.1.1",
-    "debug": "^4.3.4",
-    "drachtio-fn-b2b-sugar": "^0.1.0",
-    "drachtio-srf": "^4.5.31",
-    "express": "^4.19.2",
-    "pino": "^8.20.0",
-    "sdp-transform": "^2.14.2"
+    "debug": "^4.4.3",
+    "drachtio-fn-b2b-sugar": "^0.2.1",
+    "drachtio-srf": "^5.0.12",
+    "express": "^4.21.2",
+    "pino": "^10.1.0",
+    "sdp-transform": "^2.15.0"
  },
  "devDependencies": {
    "bent": "^7.3.12",
-    "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"
  }
@@ -1,4 +1,5 @@
 /* SQLEditor (MySQL (2))*/
+
 SET FOREIGN_KEY_CHECKS=0;

 DROP TABLE IF EXISTS account_static_ips;
@@ -13,6 +14,8 @@ DROP TABLE IF EXISTS beta_invite_codes;

 DROP TABLE IF EXISTS call_routes;

+DROP TABLE IF EXISTS clients;
+
 DROP TABLE IF EXISTS dns_records;

 DROP TABLE IF EXISTS lcr;
@@ -51,6 +54,8 @@ DROP TABLE IF EXISTS signup_history;

 DROP TABLE IF EXISTS smpp_addresses;

+DROP TABLE IF EXISTS google_custom_voices;
+
 DROP TABLE IF EXISTS speech_credentials;

 DROP TABLE IF EXISTS system_information;
@@ -127,6 +132,19 @@ application_sid CHAR(36) NOT NULL,
 PRIMARY KEY (call_route_sid)
 ) COMMENT='a regex-based pattern match for call routing';

+CREATE TABLE clients
+(
+client_sid CHAR(36) NOT NULL UNIQUE ,
+account_sid CHAR(36) NOT NULL,
+is_active BOOLEAN NOT NULL DEFAULT 1,
+username VARCHAR(64),
+password VARCHAR(1024),
+allow_direct_app_calling BOOLEAN NOT NULL DEFAULT 1,
+allow_direct_queue_calling BOOLEAN NOT NULL DEFAULT 1,
+allow_direct_user_calling BOOLEAN NOT NULL DEFAULT 1,
+PRIMARY KEY (client_sid)
+);
+
 CREATE TABLE dns_records
 (
 dns_record_sid CHAR(36) NOT NULL UNIQUE ,
@@ -322,14 +340,27 @@ last_tested DATETIME,
 tts_tested_ok BOOLEAN,
 stt_tested_ok BOOLEAN,
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+label VARCHAR(64),
 PRIMARY KEY (speech_credential_sid)
 );

+CREATE TABLE google_custom_voices
+(
+google_custom_voice_sid CHAR(36) NOT NULL UNIQUE ,
+speech_credential_sid CHAR(36) NOT NULL,
+model VARCHAR(512) NOT NULL,
+reported_usage ENUM('REPORTED_USAGE_UNSPECIFIED','REALTIME','OFFLINE') DEFAULT 'REALTIME',
+name VARCHAR(64) NOT NULL,
+PRIMARY KEY (google_custom_voice_sid)
+);
+
 CREATE TABLE system_information
 (
 domain_name VARCHAR(255),
 sip_domain_name VARCHAR(255),
-monitoring_domain_name VARCHAR(255)
+monitoring_domain_name VARCHAR(255),
+private_network_cidr VARCHAR(8192),
+log_level ENUM('info', 'debug') NOT NULL DEFAULT 'info'
 );

 CREATE TABLE users
@@ -411,7 +442,7 @@ PRIMARY KEY (smpp_gateway_sid)
 CREATE TABLE phone_numbers
 (
 phone_number_sid CHAR(36) UNIQUE ,
-number VARCHAR(132) NOT NULL UNIQUE ,
+number VARCHAR(132) NOT NULL,
 voip_carrier_sid CHAR(36),
 account_sid CHAR(36),
 application_sid CHAR(36),
@@ -424,11 +455,14 @@ CREATE TABLE sip_gateways
 sip_gateway_sid CHAR(36),
 ipv4 VARCHAR(128) NOT NULL COMMENT 'ip address or DNS name of the gateway.  For gateways providing inbound calling service, ip address is required.',
 netmask INTEGER NOT NULL DEFAULT 32,
-port INTEGER NOT NULL DEFAULT 5060 COMMENT 'sip signaling port',
+port INTEGER COMMENT 'sip signaling port',
 inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound calls from the gateway',
 outbound BOOLEAN NOT NULL COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
 voip_carrier_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
+send_options_ping BOOLEAN NOT NULL DEFAULT 0,
+use_sips_scheme BOOLEAN NOT NULL DEFAULT 0,
+pad_crypto BOOLEAN NOT NULL DEFAULT 0,
 protocol ENUM('udp','tcp','tls', 'tls/srtp') DEFAULT 'udp' COMMENT 'Outbound call protocol',
 PRIMARY KEY (sip_gateway_sid)
 ) COMMENT='A whitelisted sip gateway used for origination/termination';
@@ -465,10 +499,21 @@ 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(64),
+speech_synthesis_voice VARCHAR(256),
+speech_synthesis_label VARCHAR(64),
 speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
+speech_recognizer_label VARCHAR(64),
+use_for_fallback_speech BOOLEAN DEFAULT false,
+fallback_speech_synthesis_vendor VARCHAR(64),
+fallback_speech_synthesis_language VARCHAR(12),
+fallback_speech_synthesis_voice VARCHAR(256),
+fallback_speech_synthesis_label VARCHAR(64),
+fallback_speech_recognizer_vendor VARCHAR(64),
+fallback_speech_recognizer_language VARCHAR(64),
+fallback_speech_recognizer_label VARCHAR(64),
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+record_all_calls BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (application_sid)
 ) COMMENT='A defined set of behaviors to be applied to phone calls ';

@@ -506,6 +551,10 @@ subspace_client_secret VARCHAR(255),
 subspace_sip_teleport_id VARCHAR(255),
 subspace_sip_teleport_destinations VARCHAR(255),
 siprec_hook_sid CHAR(36),
+record_all_calls BOOLEAN NOT NULL DEFAULT false,
+record_format VARCHAR(16) NOT NULL DEFAULT 'mp3',
+bucket_credential VARCHAR(8192) COMMENT 'credential used to authenticate with storage service',
+enable_debug_log BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';

@@ -526,6 +575,9 @@ ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERE

 ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid) REFERENCES applications (application_sid);

+CREATE INDEX client_sid_idx ON clients (client_sid);
+ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid);
+
 CREATE INDEX dns_record_sid_idx ON dns_records (dns_record_sid);
 ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);

@@ -590,8 +642,6 @@ CREATE INDEX smpp_address_sid_idx ON smpp_addresses (smpp_address_sid);
 CREATE INDEX service_provider_sid_idx ON smpp_addresses (service_provider_sid);
 ALTER TABLE smpp_addresses ADD FOREIGN KEY service_provider_sid_idxfk_4 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

-CREATE UNIQUE INDEX speech_credentials_idx_1 ON speech_credentials (vendor,account_sid);
-
 CREATE INDEX speech_credential_sid_idx ON speech_credentials (speech_credential_sid);
 CREATE INDEX service_provider_sid_idx ON speech_credentials (service_provider_sid);
 ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_5 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
@@ -599,6 +649,10 @@ ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_5 (ser
 CREATE INDEX account_sid_idx ON speech_credentials (account_sid);
 ALTER TABLE speech_credentials ADD FOREIGN KEY account_sid_idxfk_8 (account_sid) REFERENCES accounts (account_sid);

+CREATE INDEX google_custom_voice_sid_idx ON google_custom_voices (google_custom_voice_sid);
+CREATE INDEX speech_credential_sid_idx ON google_custom_voices (speech_credential_sid);
+ALTER TABLE google_custom_voices ADD FOREIGN KEY speech_credential_sid_idxfk (speech_credential_sid) REFERENCES speech_credentials (speech_credential_sid) ON DELETE CASCADE;
+
 CREATE INDEX user_sid_idx ON users (user_sid);
 CREATE INDEX email_idx ON users (email);
 CREATE INDEX phone_idx ON users (phone);
@@ -628,6 +682,8 @@ CREATE INDEX smpp_gateway_sid_idx ON smpp_gateways (smpp_gateway_sid);
 CREATE INDEX voip_carrier_sid_idx ON smpp_gateways (voip_carrier_sid);
 ALTER TABLE smpp_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);

+CREATE UNIQUE INDEX phone_numbers_unique_idx_voip_carrier_number ON phone_numbers (number,voip_carrier_sid);
+
 CREATE INDEX phone_number_sid_idx ON phone_numbers (phone_number_sid);
 CREATE INDEX number_idx ON phone_numbers (number);
 CREATE INDEX voip_carrier_sid_idx ON phone_numbers (voip_carrier_sid);
@@ -24,7 +24,7 @@ services:
        ipv4_address: 172.39.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"
Author	SHA1	Message	Date
Dave Horton	b3fee43c7f	include codec-accept on answer to rtpengine during reinvites (#209 ) * include codec-accept on answer to rtpengine during reinvites * attempt to simplify * fixes from testing	2025-12-02 07:37:18 -05:00
Dave Horton	5fab8a7515	when far end answers with only pcma, passthrough instead of transcoding to pcmu (#208 )	2025-11-24 11:23:16 -06:00
Anton Voylenko	178105acd7	chore: bump node version (#205 )	2025-11-04 18:02:31 -05:00
Sam Machin	70a09c10b3	Fix/200 (#202 ) * Update call-session.js * Update call-session.js	2025-10-28 16:58:54 -04:00
Dave Horton	49bc11bbb6	update pino and eslint (#201 )	2025-10-21 07:52:29 -04:00
Sam Machin	2ebe4d3d78	bump db_helpers for cache change (#199 )	2025-10-15 11:40:12 -04:00
Sam Machin	cd0d360561	Redirect outbound user calls to private IP of other SBC (#197 ) * redirect client calls to private address of other SBC * remove unused util * use address not port	2025-10-04 20:08:57 -04:00
Sam Machin	32d82ed67d	Fix/193 (#195 ) * pass sip failure reason back to FS * Update call-session.js * update drachtio-srf dep	2025-09-12 09:21:13 -04:00
Dave Horton	c17f27ab2c	fix prev commit (#192 )	2025-09-04 07:57:38 -04:00
Dave Horton	2fc570f731	when sending to retell with user starting with call_ dont prepend plus (#191 )	2025-09-03 23:35:56 -04:00
Sam Machin	c87f831868	Fix/transport in contact (#190 ) * use the req transport param in the From and Contact headers if set. * Update call-session.js	2025-09-03 13:53:51 -04:00
Sam Machin	616228bf09	update isPrivateVoipNetwork function (#189 )	2025-09-02 08:02:59 -04:00
Dave Horton	55fef10f0e	revert change (for now) that caused audio issues when reinviting to partial media (#187 )	2025-08-18 12:45:48 -04:00
Sam Machin	9357920f76	set strict source (#185 ) * set strict source RTPBleed * change to env var for strict source * Update srtp-transcoding.json * lint * lint * reverse the logic * and argghhh * clarification * change	2025-08-03 19:44:31 -04:00
Dave Horton	6771cbdefc	bump version	2025-07-15 11:46:40 -04:00
Vinod Dharashive	e422c2ed9c	increase dtmf volume (#184 ) https://github.com/jambonz/jambonz-feature-server/issues/1272	2025-07-09 08:22:53 -04:00
rammohan-y	fd5e2f1a6c	Remove video sdp incase of reinvite (#183 ) https://github.com/jambonz/sbc-outbound/issues/182	2025-07-08 09:17:16 -04:00
sathish kumar pasham	5cc37265a9	Fix vulnerabilities by adding @babel/helpers@7.26.10 to dependencies (#181 )	2025-06-27 08:04:03 -04:00
Dave Horton	1a9c438321	update version	2025-05-14 15:42:31 -04:00
Dave Horton	fb62fd9bf4	update db-helpers	2025-05-13 10:36:08 -04:00
rammohan-y	e02e0fa8c1	Updated drachtio version to 5.0.5 (#177 ) https://github.com/drachtio/drachtio-server/issues/424	2025-04-22 11:05:45 -04:00
Hoan Luu Huu	dd198105e3	update drachtio srf 5.0.4 (#176 )	2025-04-18 07:50:21 -04:00
rammohan-y	a34491a356	Updated db-helper to 0.9.11 (#175 ) https://github.com/jambonz/jambonz-feature-server/issues/1151	2025-04-14 08:22:09 -04:00
Dave Horton	3a467921a6	return 482 loop detected if call to a sip uri would loop back to us (#173 ) * return 482 loop detected if call to a sip uri would loop back to us * this pr fixes #172 * typo * wip * wip	2025-03-20 11:25:08 -04:00
rammohan-y	9cb75a0b6b	updated realtimedb-helper to 0.8.13 (#169 )	2025-03-10 09:53:49 -04:00
Dave Horton	28dae50202	REFER should have sips contact if far end is using sips (#168 )	2025-02-24 09:47:47 -05:00
Dave Horton	0b45e766b9	update drachtio-srf	2025-02-20 10:16:59 -05:00
Dave Horton	7380457b5a	reject calls on hosted jambonz with no activ (#166 ) e subscriptions	2025-02-19 13:04:44 -05:00
Hoan Luu Huu	9feb6f3c8f	support voip carrier sip proxy (#165 ) * support voiip carrier sip proxy * wip * wip * wip	2025-02-17 09:47:59 -05:00
Hoan Luu Huu	c449feeb9c	support sip recording from siprec call (#164 ) * support sip recording from siprec call * update srsclient version	2025-02-12 09:24:33 -05:00
Dave Horton	b2abe9891e	refined the method for syncing call count updates and added debugging (#163 ) * refined the method for syncing call count updates and added debugging * wip * include callId in debug key	2025-02-05 13:01:04 -05:00
Dave Horton	a89b54b19e	update deps	2025-01-14 10:50:08 -05:00
Dave Horton	ab0f3ed2b5	update dractio-srf and mrf to main branch releases (#162 )	2025-01-14 10:06:27 -05:00
Vinod Dharashive	d8ae824559	Fresh/466 (#160 ) * Hold and unhold does not resume transcript for outbound call to webrtc * WIP * jslint * jslint * handle null * Added direction * re-invite with opus codec need to change pcmu on reinvite on unhold opus codec was been sent from rtpegine to freeswitch due to which transcripts were not getting generated , hence it needs to be changed to pcmu * jslint jslint	2024-12-23 07:20:04 -05:00
Hoan Luu Huu	334db6f84f	support referby display name (#161 )	2024-12-11 10:34:27 -05:00
Hoan Luu Huu	c762accce8	forward all refer to feature server (#156 ) * forward all refer to feature server * forwawrd extra custom header	2024-12-05 21:16:12 -05:00
Dave Horton	c6c63e26da	fix duplicate attempt to destroy dialog	2024-11-22 10:46:24 -05:00
Dave Horton	916d577b75	wip (#155 )	2024-11-19 09:37:53 -05:00
Dave Horton	b976a62a60	when forcing PCMU or PCMA we must also include telephone-event (#153 )	2024-11-14 08:37:40 -05:00
Hoan Luu Huu	5e2369e5e8	support opus transcode (#150 ) * support opus transcode * dont resend reinvite when release media for srtp * wip * fix review comment	2024-11-13 07:41:43 -05:00
Dave Horton	41528db630	fix call count race condition #151 (#152 ) * fix call count race condition #151 * logging fix	2024-11-12 14:57:04 -05:00
Hoan Luu Huu	c22104fbe2	allow outbound cdr has sip_parent_callid (#149 ) * allow outbound cdr has sip_parent_callid * update time series version	2024-10-17 08:05:25 -04:00
Hoan Luu Huu	3701e20295	fix sbc crash while outbound calling to user (#148 )	2024-10-15 07:28:40 -04:00
Hoan Luu Huu	821275cb67	support X-CID for feature server to detect sip callid (#147 ) * support X-CID for feature server to detect sip callid * fixed review comment * fix review comment	2024-10-15 07:19:25 -04:00
Dave Horton	f5ac51a8f7	minor logging	2024-10-13 10:12:55 -04:00
Hoan Luu Huu	0cf90f37b8	support change log level runtime (#146 )	2024-10-07 09:52:22 -04:00
Dave Horton	62fb716236	bump version	2024-09-04 13:42:02 +01:00
Dave Horton	b8fdf9f429	when sending out registered trunk use auth.username as userinfo in Contact header of INVITE	2024-09-04 13:40:59 +01:00
Dave Horton	503aa73bc6	Fix/invite use realm to registered trunk (#144 ) * special header X-Preferred-From-Host was ignored * when sending INVITE to registered trunk with a sip realm, use realm in the uri and send via proxy as defined in outbound gateway	2024-08-29 15:26:44 -04:00
Dave Horton	a7406ddb8a	use system_information.private_network_cidr (#143 ) * use system_information.private_network_cidr * make gh actions work * fix: export logger	2024-08-18 12:50:19 -04:00
Dave HortonandMarkus Frindt	bf1c670b40	Fix/tls transport (#141 ) * fix scheme * add missing initialization of scheme * delete contact header explicitly * wip * wip * wip * fix bug with cseq * wip * deps * wip * wip --------- Co-authored-by: Markus Frindt <m.frindt@cognigy.com>	2024-07-24 15:27:01 -04:00
Markus FrindtandMarkus Frindt	b21eaad1ff	Support contact header with sips or sip over tls (#139 ) Co-authored-by: Markus Frindt <m.frindt@cognigy.com>	2024-07-23 08:53:38 -04:00
Dave Horton	c671fbdbd0	after challenge register with creds should stay tls if it started that way (#137 )	2024-06-24 15:08:43 -04:00
Hoan Luu Huu	73e3779eb1	only send Sips if it's enabled in outbound gateway configuration (#136 ) * only send Sips if it's enabled in outbound gateway configuration * update license	2024-06-15 09:12:02 -04:00
Dave Horton	9ad7dc76c7	fix for #133 (#134 )	2024-05-17 07:21:19 -04:00
Hoan Luu Huu	1baf7fa824	Feat/refer support conplex uri for refer-to refered-by header (#131 ) * respond to reinvite request incase error * support complex refer-to refer-by uri * wip	2024-05-07 08:28:08 -04:00
Hoan Luu Huu	d2807c69ed	Feat/stats version (#132 ) * respond to reinvite request incase error * update stats colector version	2024-05-06 20:06:23 -04:00