ben.carrasco/sbc-outbound
1
0
Fork 0
mirror of https://github.com/jambonz/sbc-outbound.git synced 2026-10-04 02:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

add support for connecting to rtpengine via ws

Browse Source
This commit is contained in:
Dave Horton
2022-09-27 09:43:05 +01:00
parent 254479e289
commit e17e7dbddd
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.js
+5 -3
View File
@@ -99,10 +99,12 @@ const {initLocals, checkLimits, route} = require('./lib/middleware')(srf, logger
host: process.env.JAMBONES_REDIS_HOST, host: process.env.JAMBONES_REDIS_HOST,
port: process.env.JAMBONES_REDIS_PORT || 6379 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, { const {getRtpEngine, setRtpEngines} = require('@jambonz/rtpengine-utils')([], logger, {
emitter: stats, emitter: stats,
dtmfListenPort: process.env.DTMF_LISTEN_PORT || 22225, dtmfListenPort: process.env.DTMF_LISTEN_PORT || 22225,
protocol: 'udp' protocol: ngProtocol
}); });
srf.locals.getRtpEngine = getRtpEngine; srf.locals.getRtpEngine = getRtpEngine;
@@ -194,7 +196,7 @@ const lookupRtpServiceEndpoints = (lookup, serviceName) => {
rtpServers.length = 0; rtpServers.length = 0;
Array.prototype.push.apply(rtpServers, addrs); Array.prototype.push.apply(rtpServers, addrs);
logger.info({rtpServers}, 'rtpserver endpoints have been updated'); 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'); logger.debug({newArray, rtpServers}, 'getActiveRtpServers');
if (!equalsIgnoreOrder(newArray, rtpServers)) { if (!equalsIgnoreOrder(newArray, rtpServers)) {
logger.info({newArray}, 'resetting active rtpengines'); 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; rtpServers.length = 0;
Array.prototype.push.apply(rtpServers, newArray); Array.prototype.push.apply(rtpServers, newArray);
} }
package-lock.json
Generated
+7 -7
View File
@@ -13,7 +13,7 @@
"@jambonz/http-health-check": "^0.0.1", "@jambonz/http-health-check": "^0.0.1",
"@jambonz/mw-registrar": "0.2.2", "@jambonz/mw-registrar": "0.2.2",
"@jambonz/realtimedb-helpers": "^0.4.29", "@jambonz/realtimedb-helpers": "^0.4.29",
"@jambonz/rtpengine-utils": "^0.3.4", "@jambonz/rtpengine-utils": "^0.3.5",
"@jambonz/siprec-client-utils": "^0.1.4", "@jambonz/siprec-client-utils": "^0.1.4",
"@jambonz/stats-collector": "^0.1.6", "@jambonz/stats-collector": "^0.1.6",
"@jambonz/time-series": "^0.2.4", "@jambonz/time-series": "^0.2.4",
@@ -617,9 +617,9 @@
} }
}, },
"node_modules/@jambonz/rtpengine-utils": { "node_modules/@jambonz/rtpengine-utils": {
"version": "0.3.4", "version": "0.3.5",
"resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.4.tgz", "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.5.tgz",
"integrity": "sha512-7I7Q7O/TuWgk8Z0OX/qGrQZczeDt9pDLnGSwy88NTv5lAbrOYmPyNTC/8VJGfbHISfvBaPYT88+wQn2RIpXRPg==", "integrity": "sha512-o3SfVaoM3cM5gY2EL7/b0z2ux4BzgCdesn18bXXnfiwFOiQz1YeSlfZA26LMxsFnOXZiDEldswhnLTRe76EhDA==",
"dependencies": { "dependencies": {
"debug": "^4.3.1", "debug": "^4.3.1",
"rtpengine-client": "^0.3.6", "rtpengine-client": "^0.3.6",
@@ -5571,9 +5571,9 @@
} }
}, },
"@jambonz/rtpengine-utils": { "@jambonz/rtpengine-utils": {
"version": "0.3.4", "version": "0.3.5",
"resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.4.tgz", "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.5.tgz",
"integrity": "sha512-7I7Q7O/TuWgk8Z0OX/qGrQZczeDt9pDLnGSwy88NTv5lAbrOYmPyNTC/8VJGfbHISfvBaPYT88+wQn2RIpXRPg==", "integrity": "sha512-o3SfVaoM3cM5gY2EL7/b0z2ux4BzgCdesn18bXXnfiwFOiQz1YeSlfZA26LMxsFnOXZiDEldswhnLTRe76EhDA==",
"requires": { "requires": {
"debug": "^4.3.1", "debug": "^4.3.1",
"rtpengine-client": "^0.3.6", "rtpengine-client": "^0.3.6",
package.json
+1 -1
View File
@@ -31,7 +31,7 @@
"@jambonz/http-health-check": "^0.0.1", "@jambonz/http-health-check": "^0.0.1",
"@jambonz/mw-registrar": "0.2.2", "@jambonz/mw-registrar": "0.2.2",
"@jambonz/realtimedb-helpers": "^0.4.29", "@jambonz/realtimedb-helpers": "^0.4.29",
"@jambonz/rtpengine-utils": "^0.3.4", "@jambonz/rtpengine-utils": "^0.3.5",
"@jambonz/siprec-client-utils": "^0.1.4", "@jambonz/siprec-client-utils": "^0.1.4",
"@jambonz/stats-collector": "^0.1.6", "@jambonz/stats-collector": "^0.1.6",
"@jambonz/time-series": "^0.2.4", "@jambonz/time-series": "^0.2.4",