update package-lock.json

update rtpengine-utils again
update to latest rtpengine-utils
2026-10-04 02:04:19 +00:00 · 2022-10-23 12:20:12 -04:00 · 2022-10-23 11:27:34 -04:00 · 2022-10-22 22:26:02 -04:00 · 2022-10-20 21:36:07 -04:00 · 2022-10-15 10:59:29 -04:00
6 changed files with 69 additions and 55 deletions
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:18.8.0-alpine as base
+FROM --platform=linux/amd64 node:18.9.0-alpine3.16 as base

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

@@ -99,10 +99,12 @@ const {initLocals, checkLimits, route} = require('./lib/middleware')(srf, logger
  host: process.env.JAMBONES_REDIS_HOST,
  port: process.env.JAMBONES_REDIS_PORT || 6379
 });
+const ngProtocol = process.env.JAMBONES_NG_PROTOCOL || 'udp';
+const ngPort = process.env.RTPENGINE_PORT || ('udp' === ngProtocol ? 22222 : 8080);
 const {getRtpEngine, setRtpEngines} = require('@jambonz/rtpengine-utils')([], logger, {
-  emitter: stats,
+  //emitter: stats,
  dtmfListenPort: process.env.DTMF_LISTEN_PORT || 22225,
-  protocol: 'udp'
+  protocol: ngProtocol
 });
 srf.locals.getRtpEngine = getRtpEngine;

@@ -194,7 +196,7 @@ const lookupRtpServiceEndpoints = (lookup, serviceName) => {
      rtpServers.length = 0;
      Array.prototype.push.apply(rtpServers, addrs);
      logger.info({rtpServers}, 'rtpserver endpoints have been updated');
-      setRtpEngines(rtpServers.map((a) => `${a}:${process.env.RTPENGINE_PORT || 22222}`));
+      setRtpEngines(rtpServers.map((a) => `${a}:${ngPort}`));
    }
  });
 };
@@ -221,7 +223,7 @@ else {
      logger.debug({newArray, rtpServers}, 'getActiveRtpServers');
      if (!equalsIgnoreOrder(newArray, rtpServers)) {
        logger.info({newArray}, 'resetting active rtpengines');
-        setRtpEngines(newArray.map((a) => `${a}:${process.env.RTPENGINE_PORT || 22222}`));
+        setRtpEngines(newArray.map((a) => `${a}:${ngPort}`));
        rtpServers.length = 0;
        Array.prototype.push.apply(rtpServers, newArray);
      }
@@ -560,11 +560,17 @@ Duration=${payload.duration} `
  async _onReinvite(dlg, req, res) {
    try {
      const reason = req.get('X-Reason');
+      const isReleasingMedia = reason && dlg.type === 'uas' && ['release-media', 'anchor-media'].includes(reason);
      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;
      const direction =  dlg.type === 'uas' ? ['private', 'public'] : ['public', 'private'];
+      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');
+      }
      let opts = {
        ...this.rtpEngineOpts.common,
        ...offerMedia,
@@ -575,19 +581,21 @@ Duration=${payload.duration} `
      };
      if (reason && opts.flags && !opts.flags.includes('reset')) opts.flags.push('reset');

-
      let response = await this.offer(opts);
      if ('ok' !== response.result) {
        res.send(488);
        throw new Error(`_onReinvite: rtpengine failed: offer: ${JSON.stringify(response)}`);
      }
+      this.logger.debug({opts, response}, 'CallSession:_onReinvite: (offer)');

      /* if this is a re-invite from the FS to change media anchoring, avoid sending the reinvite out */
      let sdp;
-      if (reason && dlg.type === 'uas' && ['release-media', 'anchor-media'].includes(reason)) {
+      if (isReleasingMedia) {
        this.logger.info(`got a reinvite from FS to ${reason}`);
        sdp = dlg.other.remote.sdp;
-        answerMedia.flags = ['asymmetric', 'port latching'];
+        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;
      }
      else {
@@ -606,7 +614,7 @@ Duration=${payload.duration} `
        res.send(488);
        throw new Error(`_onReinvite: rtpengine failed: ${JSON.stringify(response)}`);
      }
-      this.logger.info({sdp: response.sdp}, 'CallSession:_onReinvite: sending back upstream');
+      this.logger.debug({opts, sdp: response.sdp}, 'CallSession:_onReinvite: (answer) sending back upstream');
      res.send(200, {body: response.sdp});
    } catch (err) {
      this.logger.error(err, 'Error handling reinvite');
@@ -795,10 +803,10 @@ Duration=${payload.duration} `
      res.send(202);

      // invite to new fs
-      const headers = {};
-      if (req.has('X-Retain-Call-Sid')) {
-        Object.assign(headers, {'X-Retain-Call-Sid': req.get('X-Retain-Call-Sid')});
-      }
+      const headers = {
+        ...(req.has('X-Retain-Call-Sid') && {'X-Retain-Call-Sid': req.get('X-Retain-Call-Sid')}),
+        ...(req.has('X-Account-Sid') && {'X-Account-Sid': req.get('X-Account-Sid')})
+      };
      const dlg = await this.srf.createUAC(referTo.uri, {localSdp: dlg.local.sdp, headers});
      this.uas = dlg;
      this.uas.other = this.uac;
@@ -4,9 +4,11 @@ const debug = require('debug')('jambonz:sbc-outbound');

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

  /* webrtc clients (e.g. sipjs) send DMTF via SIP INFO */
  if ((srcIsUsingSrtp || dstIsUsingSrtp) && !teams) {
@@ -1,22 +1,22 @@
 {
  "name": "sbc-outbound",
-  "version": "v0.7.6",
+  "version": "v0.7.7",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "sbc-outbound",
-      "version": "v0.7.6",
+      "version": "v0.7.7",
      "license": "MIT",
      "dependencies": {
        "@jambonz/db-helpers": "^0.6.19",
        "@jambonz/http-health-check": "^0.0.1",
        "@jambonz/mw-registrar": "0.2.2",
        "@jambonz/realtimedb-helpers": "^0.4.29",
-        "@jambonz/rtpengine-utils": "^0.3.4",
+        "@jambonz/rtpengine-utils": "^0.3.10",
        "@jambonz/siprec-client-utils": "^0.1.4",
        "@jambonz/stats-collector": "^0.1.6",
-        "@jambonz/time-series": "^0.2.4",
+        "@jambonz/time-series": "^0.2.5",
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.4",
        "drachtio-fn-b2b-sugar": "^0.0.12",
@@ -617,12 +617,12 @@
      }
    },
    "node_modules/@jambonz/rtpengine-utils": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.4.tgz",
-      "integrity": "sha512-7I7Q7O/TuWgk8Z0OX/qGrQZczeDt9pDLnGSwy88NTv5lAbrOYmPyNTC/8VJGfbHISfvBaPYT88+wQn2RIpXRPg==",
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.10.tgz",
+      "integrity": "sha512-nwnHaS4vKkj5YB9HyB06ZyHu5knhSzAOeg4qMG4GS0joRAx7DVmnuPhRaQJmcVAgZm9VuDfxSFQrGIot/oVBBQ==",
      "dependencies": {
        "debug": "^4.3.1",
-        "rtpengine-client": "^0.3.6",
+        "rtpengine-client": "^0.3.9",
        "ws": "^8.5.0"
      }
    },
@@ -644,9 +644,9 @@
      }
    },
    "node_modules/@jambonz/time-series": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.4.tgz",
-      "integrity": "sha512-0rvELi9V/qdyPpM/2LidTd2EDN34iCU6U8ccuLUgqV05FaH/EW0qN0RFaVXVlFK6wCDZqEOBynd7x05De3dncw==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.5.tgz",
+      "integrity": "sha512-WrVenxY4ZgW0YYNIXdAz3ZKao8IQy612RVDAnYq7oWvHHqzgLmLrbIvTXKhycd27iYvwFAPCcUDk1EMuUoPLPA==",
      "dependencies": {
        "debug": "^4.3.1",
        "influx": "^5.9.3"
@@ -3405,8 +3405,9 @@
      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
    },
    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
      "dependencies": {
        "brace-expansion": "^1.1.7"
      },
@@ -4241,11 +4242,11 @@
      }
    },
    "node_modules/rtpengine-client": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/rtpengine-client/-/rtpengine-client-0.3.6.tgz",
-      "integrity": "sha512-V+o1j0F1bQekFifvkdB9LwdvRX8neMQ6HlG6TG6jFYFCvT1iMrh6BXaKIvn8JvJ4KcwHwTMJGJQSXpLmwa8KsQ==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/rtpengine-client/-/rtpengine-client-0.3.9.tgz",
+      "integrity": "sha512-e22oEIHK2fazQdcQNSCNlM/87xi5BHCSiqcOKbxSsGL69KEA1nPdIjihnDpzxhZltYGUokqTpb5aTz/hZhlYjA==",
      "dependencies": {
-        "bencode": "^2.0.1",
+        "bencode": "^2.0.3",
        "uuid": "^8.2.0",
        "ws": "^7.4.4"
      }
@@ -5045,9 +5046,9 @@
      }
    },
    "node_modules/ws": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
+      "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
      "engines": {
        "node": ">=10.0.0"
      },
@@ -5571,12 +5572,12 @@
      }
    },
    "@jambonz/rtpengine-utils": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.4.tgz",
-      "integrity": "sha512-7I7Q7O/TuWgk8Z0OX/qGrQZczeDt9pDLnGSwy88NTv5lAbrOYmPyNTC/8VJGfbHISfvBaPYT88+wQn2RIpXRPg==",
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.10.tgz",
+      "integrity": "sha512-nwnHaS4vKkj5YB9HyB06ZyHu5knhSzAOeg4qMG4GS0joRAx7DVmnuPhRaQJmcVAgZm9VuDfxSFQrGIot/oVBBQ==",
      "requires": {
        "debug": "^4.3.1",
-        "rtpengine-client": "^0.3.6",
+        "rtpengine-client": "^0.3.9",
        "ws": "^8.5.0"
      }
    },
@@ -5598,9 +5599,9 @@
      }
    },
    "@jambonz/time-series": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.4.tgz",
-      "integrity": "sha512-0rvELi9V/qdyPpM/2LidTd2EDN34iCU6U8ccuLUgqV05FaH/EW0qN0RFaVXVlFK6wCDZqEOBynd7x05De3dncw==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.5.tgz",
+      "integrity": "sha512-WrVenxY4ZgW0YYNIXdAz3ZKao8IQy612RVDAnYq7oWvHHqzgLmLrbIvTXKhycd27iYvwFAPCcUDk1EMuUoPLPA==",
      "requires": {
        "debug": "^4.3.1",
        "influx": "^5.9.3"
@@ -7683,8 +7684,9 @@
      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
    },
    "minimatch": {
-      "version": "3.0.4",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
      "requires": {
        "brace-expansion": "^1.1.7"
      }
@@ -8311,11 +8313,11 @@
      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="
    },
    "rtpengine-client": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/rtpengine-client/-/rtpengine-client-0.3.6.tgz",
-      "integrity": "sha512-V+o1j0F1bQekFifvkdB9LwdvRX8neMQ6HlG6TG6jFYFCvT1iMrh6BXaKIvn8JvJ4KcwHwTMJGJQSXpLmwa8KsQ==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/rtpengine-client/-/rtpengine-client-0.3.9.tgz",
+      "integrity": "sha512-e22oEIHK2fazQdcQNSCNlM/87xi5BHCSiqcOKbxSsGL69KEA1nPdIjihnDpzxhZltYGUokqTpb5aTz/hZhlYjA==",
      "requires": {
-        "bencode": "^2.0.1",
+        "bencode": "^2.0.3",
        "uuid": "^8.2.0",
        "ws": "^7.4.4"
      },
@@ -8930,9 +8932,9 @@
      }
    },
    "ws": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
+      "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
      "requires": {}
    },
    "xml2js": {
@@ -1,6 +1,6 @@
 {
  "name": "sbc-outbound",
-  "version": "v0.7.6",
+  "version": "v0.7.7",
  "main": "app.js",
  "engines": {
    "node": ">= 12.0.0"
@@ -31,10 +31,10 @@
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/mw-registrar": "0.2.2",
    "@jambonz/realtimedb-helpers": "^0.4.29",
-    "@jambonz/rtpengine-utils": "^0.3.4",
+    "@jambonz/rtpengine-utils": "^0.3.10",
    "@jambonz/siprec-client-utils": "^0.1.4",
    "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.2.4",
+    "@jambonz/time-series": "^0.2.5",
    "cidr-matcher": "^2.1.1",
    "debug": "^4.3.4",
    "drachtio-fn-b2b-sugar": "^0.0.12",
Author	SHA1	Message	Date
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
Markus FrindtandMarkus Frindt	c7d717b3ee	[snyk] fix vulnerability (#55 ) Co-authored-by: Markus Frindt <m.frindt@cognigy.com>	2022-10-20 21:36:07 -04:00
Dave Horton	e9209b37ca	include X-Account-Sid header when moving call between FS	2022-10-15 10:59:29 -04:00
Dave Horton	3b98dc6ec2	Bugfix/release media investigation (#54 ) * added logging * when releasing media, include asymettric flag on offer * update package-lock.json * remove media handover flag when releasing media	2022-10-14 12:46:14 -04:00
Dave Horton	1c84dd799c	update time-series	2022-10-10 09:16:42 +01:00
Dave Horton	4338ae9411	bugfix: inject DMTF flag was inserted over and over	2022-10-07 11:52:36 +01:00
Dave Horton	e17e7dbddd	add support for connecting to rtpengine via ws	2022-09-27 09:43:05 +01:00