0.9.7

fixed wrongly identify 3pcc call (#245 )
* fixed wrongly identify 3pcc call * update drachtio 5.0.27
2026-10-04 02:04:22 +00:00 · 2026-07-20 08:39:53 -04:00 · 2026-07-11 08:31:59 -04:00 · 2026-07-09 07:09:53 -04:00 · 2026-06-19 07:08:52 -04:00 · 2026-05-21 15:20:17 -04:00
8 changed files with 115 additions and 77 deletions
@@ -270,7 +270,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);
 });
@@ -4,7 +4,7 @@
    "ICE": "default",
    "SDES": "off",
    "flags": ["generate mid", "SDES-no", "port latching"],
-    "rtcp-mux": ["require"]  
+    "rtcp-mux": ["offer"]
  },
  "teams": {
    "transport-protocol": "RTP/SAVP",
@@ -96,7 +96,7 @@ module.exports = [
      // Variables
      'no-delete-var': 2,
      'no-undef': 2,
-      'no-unused-vars': [2, {args: 'none'}],
+      'no-unused-vars': [2, {args: 'none', ignoreRestSiblings: true}],

      // Node.js and CommonJS
      'no-mixed-requires': 2,
@@ -109,7 +109,11 @@ class CallSession extends Emitter {

  async connect() {
    const {sdp} = this.req.locals;
-    const is3pcc = this.req.body?.length === 0;
+    // 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) {
@@ -394,8 +394,13 @@ module.exports = (srf, logger) => {
            }
          }
          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,
@@ -601,8 +606,13 @@ module.exports = (srf, logger) => {
        }
      }
      else if (r.length > 1) {
-        logger.info({r},
-          'multiple accounts have added this carrier with default routing -- cannot determine which to use');
+        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,
          error: 'Multiple accounts are attempting to route the same phone number from the same carrier'
@@ -130,7 +130,8 @@ 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');
@@ -1,12 +1,12 @@
 {
  "name": "sbc-inbound",
-  "version": "0.9.5",
+  "version": "0.9.7",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "sbc-inbound",
-      "version": "0.9.5",
+      "version": "0.9.7",
      "license": "MIT",
      "dependencies": {
        "@aws-sdk/client-auto-scaling": "^3.549.0",
@@ -15,7 +15,7 @@
        "@jambonz/db-helpers": "^0.9.18",
        "@jambonz/digest-utils": "^0.0.9",
        "@jambonz/http-health-check": "^0.0.1",
-        "@jambonz/realtimedb-helpers": "^0.8.18",
+        "@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",
@@ -24,7 +24,7 @@
        "cidr-matcher": "^2.1.1",
        "debug": "^4.4.3",
        "drachtio-fn-b2b-sugar": "0.2.1",
-        "drachtio-srf": "^5.0.18",
+        "drachtio-srf": "^5.0.27",
        "express": "^4.21.2",
        "pino": "^10.1.0",
        "verify-aws-sns-signature": "^0.1.0",
@@ -723,13 +723,13 @@
      }
    },
    "node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.4.tgz",
-      "integrity": "sha512-0zJ05ANfYqI6+rGqj8samZBFod0dPPousBjLEqg8WdxSgbMAkRgLyn81lP215Do0rFJ/17LIXwr7q0yK24mP6Q==",
+      "version": "3.972.16",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.16.tgz",
+      "integrity": "sha512-iu2pyvaqmeatIJLURLqx9D+4jKAdTH20ntzB6BFwjyN7V960r4jK32mx0Zf7YbtOYAbmbtQfDNuL60ONinyw7A==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "fast-xml-parser": "5.3.4",
+        "@smithy/types": "^4.13.1",
+        "fast-xml-parser": "5.5.8",
        "tslib": "^2.6.2"
      },
      "engines": {
@@ -1538,9 +1538,10 @@
      }
    },
    "node_modules/@jambonz/realtimedb-helpers": {
-      "version": "0.8.18",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.18.tgz",
-      "integrity": "sha512-PfQRsOy/uKSA0ymRAEmTQnLxc1BZVRQWc+5mClLX6oB6vgvM/6YGgiuv5GSu26OtuKMTtS+RAxlFeT05iH/2rg==",
+      "version": "0.8.21",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.21.tgz",
+      "integrity": "sha512-Zn/Zw14U0L1pB2RlN5i160FwWqphonhQ7p880OzsKOuvg+wmj6qIkxdLjDXo6TSxFPXDHD25s33zfGOT6ZIfsw==",
+      "license": "MIT",
      "dependencies": {
        "debug": "^4.3.4",
        "ioredis": "^5.3.2"
@@ -2012,9 +2013,9 @@
      }
    },
    "node_modules/@smithy/types": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.12.0.tgz",
-      "integrity": "sha512-9YcuJVTOBDjg9LWo23Qp0lTQ3D7fQsQtwle0jVfpbUHy9qBwCEgKuVH4FqFB3VYu0nwdHKiEMA+oXz7oV8X1kw==",
+      "version": "4.13.1",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.13.1.tgz",
+      "integrity": "sha512-787F3yzE2UiJIQ+wYW1CVg2odHjmaWLGksnKQHUrK/lYZSEcy1msuLVvxaR/sI2/aDe9U+TBuLsXnr3vod1g0g==",
      "license": "Apache-2.0",
      "dependencies": {
        "tslib": "^2.6.2"
@@ -2315,10 +2316,11 @@
      }
    },
    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "fast-deep-equal": "^3.1.1",
        "fast-json-stable-stringify": "^2.0.0",
@@ -2592,9 +2594,9 @@
      "license": "MIT"
    },
    "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -3087,9 +3089,9 @@
      "integrity": "sha512-bMtje8GWVTze+UG6WSGnlUfBaYCuFiApNXl/XxWc+X9uATZiZkV2jIqhf+Y4SY3nS8dZclJIVKd9qwoCa+i+Vw=="
    },
    "node_modules/drachtio-srf": {
-      "version": "5.0.18",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.18.tgz",
-      "integrity": "sha512-gm8kc+w0FuWozR6oprcMqa2oPf9dpMABOrbUZle9XcsvJ+DZxpOk11gBBmtj12oSjPgb5hIi+jxzmI6blKVDRw==",
+      "version": "5.0.27",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.27.tgz",
+      "integrity": "sha512-UCNITDPJreCurG5reM2TSmWSbT52azPaNqoc42L4nljy0aVuDt0Am9ExpAy5RfsP8ioxSY2VdSJehr1ARRJL+Q==",
      "license": "MIT",
      "dependencies": {
        "debug": "^4.4.3",
@@ -3097,7 +3099,7 @@
        "node-noop": "^1.0.0",
        "only": "^0.0.2",
        "sdp-transform": "^2.15.0",
-        "short-uuid": "^5.2.0",
+        "short-uuid": "^6.0.3",
        "sip-methods": "^0.3.0",
        "sip-status": "^0.1.0",
        "utils-merge": "^1.0.1",
@@ -3649,10 +3651,10 @@
      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
      "dev": true
    },
-    "node_modules/fast-xml-parser": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.4.tgz",
-      "integrity": "sha512-EFd6afGmXlCx8H8WTZHhAoDaWaGyuIBoZJ2mknrNxug+aZKjkp0a0dlars9Izl+jF+7Gu1/5f/2h68cQpe0IiA==",
+    "node_modules/fast-xml-builder": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
+      "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
      "funding": [
        {
          "type": "github",
@@ -3661,7 +3663,24 @@
      ],
      "license": "MIT",
      "dependencies": {
-        "strnum": "^2.1.0"
+        "path-expression-matcher": "^1.1.3"
+      }
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "5.5.8",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.8.tgz",
+      "integrity": "sha512-Z7Fh2nVQSb2d+poDViM063ix2ZGt9jmY1nWhPfHBOK2Hgnb/OW3P4Et3P/81SEej0J7QbWtJqxO05h8QYfK7LQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "fast-xml-builder": "^1.1.4",
+        "path-expression-matcher": "^1.2.0",
+        "strnum": "^2.2.0"
      },
      "bin": {
        "fxparser": "src/cli/cli.js"
@@ -3760,10 +3779,11 @@
      }
    },
    "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
-      "dev": true
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "dev": true,
+      "license": "ISC"
    },
    "node_modules/for-each": {
      "version": "0.3.3",
@@ -4998,10 +5018,11 @@
      }
    },
    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
      "dev": true,
+      "license": "ISC",
      "dependencies": {
        "brace-expansion": "^1.1.7"
      },
@@ -5500,6 +5521,21 @@
        "node": ">=8"
      }
    },
+    "node_modules/path-expression-matcher": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.0.tgz",
+      "integrity": "sha512-DwmPWeFn+tq7TiyJ2CxezCAirXjFxvaiD03npak3cRjlP9+OjTmSy1EpIrEbh+l6JgUundniloMLDQ/6VTdhLQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
    "node_modules/path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -5525,9 +5561,10 @@
      "dev": true
    },
    "node_modules/path-to-regexp": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz",
+      "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==",
+      "license": "MIT"
    },
    "node_modules/picocolors": {
      "version": "1.1.1",
@@ -5652,9 +5689,9 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
-      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
+      "version": "6.14.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
+      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
      "license": "BSD-3-Clause",
      "dependencies": {
        "side-channel": "^1.1.0"
@@ -6074,29 +6111,15 @@
      }
    },
    "node_modules/short-uuid": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/short-uuid/-/short-uuid-5.2.0.tgz",
-      "integrity": "sha512-296/Nzi4DmANh93iYBwT4NoYRJuHnKEzefrkSagQbTH/A6NTaB68hSPDjm5IlbI5dx9FXdmtqPcj6N5H+CPm6w==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/short-uuid/-/short-uuid-6.0.3.tgz",
+      "integrity": "sha512-UMZ3rYOoid307EqWsPTnoBUSOB51Fi28vUMPigUsSCmbaSvslyf/SlXZWOn4btj8tokhBTBkPFKVKKlIolEG1w==",
      "license": "MIT",
      "dependencies": {
-        "any-base": "^1.1.0",
-        "uuid": "^9.0.1"
+        "any-base": "^1.1.0"
      },
      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/short-uuid/node_modules/uuid": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
+        "node": ">=14.17.0"
      }
    },
    "node_modules/side-channel": {
@@ -6365,9 +6388,9 @@
      }
    },
    "node_modules/strnum": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
-      "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.2.tgz",
+      "integrity": "sha512-DnR90I+jtXNSTXWdwrEy9FakW7UX+qUZg28gj5fk2vxxl7uS/3bpI4fjFYVmdK9etptYBPNkpahuQnEwhwECqA==",
      "funding": [
        {
          "type": "github",
@@ -1,6 +1,6 @@
 {
  "name": "sbc-inbound",
-  "version": "0.9.5",
+  "version": "0.9.7",
  "main": "app.js",
  "engines": {
    "node": ">= 20.0.0"
@@ -32,7 +32,7 @@
    "@jambonz/db-helpers": "^0.9.18",
    "@jambonz/digest-utils": "^0.0.9",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.8.18",
+    "@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",
@@ -41,7 +41,7 @@
    "cidr-matcher": "^2.1.1",
    "debug": "^4.4.3",
    "drachtio-fn-b2b-sugar": "0.2.1",
-    "drachtio-srf": "^5.0.18",
+    "drachtio-srf": "^5.0.27",
    "express": "^4.21.2",
    "pino": "^10.1.0",
    "verify-aws-sns-signature": "^0.1.0",
Author	SHA1	Message	Date
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