include application_sid in cdr

update deps
update db-helpers
2026-10-04 02:04:19 +00:00 · 2022-11-07 18:34:13 -05:00 · 2022-11-02 13:38:02 -04:00 · 2022-11-01 21:22:55 -04:00 · 2022-10-26 09:35:11 -04:00 · 2022-10-23 15:27:03 -04:00
4 changed files with 1093 additions and 335 deletions
@@ -102,7 +102,7 @@ const {initLocals, checkLimits, route} = require('./lib/middleware')(srf, logger
 const ngProtocol = process.env.JAMBONES_NG_PROTOCOL || 'udp';
 const ngPort = process.env.RTPENGINE_PORT || ('udp' === ngProtocol ? 22222 : 8080);
 const {getRtpEngine, setRtpEngines} = require('@jambonz/rtpengine-utils')([], logger, {
-  emitter: stats,
+  //emitter: stats,
  dtmfListenPort: process.env.DTMF_LISTEN_PORT || 22225,
  protocol: ngProtocol
 });
@@ -13,10 +13,17 @@ const makeInviteInProgressKey = (callid) => `sbc-out-iip${callid}`;
 */
 const createBLegFromHeader = (req, teams) => {
  const from = req.getParsedHeader('From');
-  const host = teams ? req.get('X-MS-Teams-Tenant-FQDN') : 'localhost';
  const uri = parseUri(from.uri);
-  if (uri && uri.user) return `sip:${uri.user}@${host}`;
-  return `sip:anonymous@${host}`;
+  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;
+  }
+  return `sip:${user}@${host}`;
 };
 const createBLegToHeader = (req, teams) => {
  const to = req.getParsedHeader('To');
@@ -33,11 +40,13 @@ const initCdr = (srf, req) => {
  const to = arr ? arr[1] : req.calledNumber;
  arr = regex.exec(req.callingNumber);
  const from = arr ? arr[1] : req.callingNumber;
+  const applicationSid = req.get('X-Application-Sid');

  return {
    account_sid: req.get('X-Account-Sid'),
    call_sid: req.get('X-Call-Sid'),
    sip_callid: req.get('Call-ID'),
+    ...(applicationSid && {application_sid: applicationSid}),
    from,
    to,
    duration: 0,
@@ -315,13 +324,14 @@ class CallSession extends Emitter {
              '-X-MS-Teams-FQDN',
              '-X-MS-Teams-Tenant-FQDN',
              '-X-Trace-ID',
-              'X-CID',
              '-Allow',
              '-Session-Expires',
              '-X-Requested-Carrier-Sid',
              '-X-Jambonz-Routing',
              '-X-Jambonz-FS-UUID',
-              'Min-SE'
+              '-X-Preferred-From-User',
+              'X-Preferred-From-Host',
+              '-X-Jambonz-FS-UUID',
            ],
            proxyResponseHeaders: [
              'all',
@@ -27,11 +27,11 @@
    "jslint": "eslint app.js lib"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.6.19",
+    "@jambonz/db-helpers": "^0.7.3",
+    "@jambonz/realtimedb-helpers": "^0.4.35",
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/mw-registrar": "0.2.2",
-    "@jambonz/realtimedb-helpers": "^0.4.29",
-    "@jambonz/rtpengine-utils": "^0.3.5",
+    "@jambonz/rtpengine-utils": "^0.3.10",
    "@jambonz/siprec-client-utils": "^0.1.4",
    "@jambonz/stats-collector": "^0.1.6",
    "@jambonz/time-series": "^0.2.5",
Author	SHA1	Message	Date
Dave Horton	775e63518a	include application_sid in cdr	2022-11-07 18:34:13 -05:00
Dave Horton	307cf9bd65	update deps	2022-11-02 13:38:02 -04:00
Dave Horton	f48ca4821e	update db-helpers	2022-11-01 21:22:55 -04:00
Dave Horton	43ed2bafe1	strip X-Preferred-From-User and X-Preferred-From-Host from outgoing call	2022-10-26 09:35:11 -04:00
Dave Horton	5ee041bdee	feature: specify user or host part of From on outdial	2022-10-23 15:27:03 -04:00
Dave Horton	5bbe6a8752	update package-lock.json	2022-10-23 12:20:12 -04:00
Dave Horton	2e5d609bab	update rtpengine-utils again	2022-10-23 11:27:34 -04:00
Dave Horton	8f598bf7b0	update to latest rtpengine-utils	2022-10-22 22:26:02 -04:00