#142 add option to transcode incoming g729 calls to pcmu (#144 )

discover local ip address based on authentication response from drachtio-server (#143 )
support complex refer-to and refered-by uri (#140 )
2026-10-04 18:44:43 +00:00 · 2024-05-22 12:42:06 -04:00 · 2024-05-16 10:50:07 -04:00 · 2024-05-07 08:27:32 -04:00 · 2024-05-06 20:07:05 -04:00
5 changed files with 44 additions and 26 deletions
@@ -145,11 +145,28 @@ if (process.env.DRACHTIO_HOST && !process.env.K8S) {
  const matcher = new CIDRMatcher(cidrs);

  srf.connect({host: process.env.DRACHTIO_HOST, port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET });
-  srf.on('connect', (err, hp) => {
+  srf.on('connect', (err, hp, version, localHostports) => {
    if (err) return this.logger.error({err}, 'Error connecting to drachtio server');
-    logger.info(`connected to drachtio listening on ${hp}`);
+    let addedPrivateIp = false;
+    logger.info(`connected to drachtio ${version} listening on ${hp}, local hostports: ${localHostports}`);

    const hostports = hp.split(',');
+
+    if (localHostports) {
+      const locals = localHostports.split(',');
+      for (const hp of locals) {
+        const arr = /^(.*)\/(.*):(\d+)$/.exec(hp);
+        if (arr && 'tcp' === arr[1] && matcher.contains(arr[2])) {
+          const hostport = `${arr[2]}:${arr[3]}`;
+          logger.info(`adding sbc private address to redis: ${hostport}`);
+          srf.locals.privateSipAddress = hostport;
+          srf.locals.addToRedis = () => addToSet(setName, hostport);
+          srf.locals.removeFromRedis = () => removeFromSet(setName, hostport);
+          srf.locals.addToRedis();
+          addedPrivateIp = true;
+        }
+      }
+    }
    for (const hp of hostports) {
      const arr = /^(.*)\/(.*):(\d+)$/.exec(hp);
      if (arr && 'udp' === arr[1] && !matcher.contains(arr[2])) {
@@ -157,7 +174,7 @@ if (process.env.DRACHTIO_HOST && !process.env.K8S) {
        srf.locals.sipAddress = arr[2];
        if (!process.env.SBC_ACCOUNT_SID) addSbcAddress(arr[2]);
      }
-      else if (arr && 'tcp' === arr[1] && matcher.contains(arr[2])) {
+      else if (!addedPrivateIp && arr && 'tcp' === arr[1] && matcher.contains(arr[2])) {
        const hostport = `${arr[2]}:${arr[3]}`;
        logger.info(`adding sbc private address to redis: ${hostport}`);
        srf.locals.privateSipAddress = hostport;
@@ -173,13 +190,13 @@ else {
    logger.info(`listening in outbound mode on port ${process.env.DRACHTIO_PORT}`);
  });
  srf.listen({port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET});
-  srf.on('connect', (err, hp) => {
+  srf.on('connect', (err, hp, version, localHostports) => {
    if (err) return this.logger.error({err}, 'Error connecting to drachtio server');
-    logger.info(`connected to drachtio listening on ${hp}`);
+    logger.info(`connected to drachtio ${version} listening on ${hp}, local hostports: ${localHostports}`);

    if (process.env.K8S_FEATURE_SERVER_TRANSPORT === 'tcp') {
      const matcher = new CIDRMatcher(['192.168.0.0/24', '172.16.0.0/16', '10.0.0.0/8']);
-      const hostports = hp.split(',');
+      const hostports = localHostports ? localHostports.split(',') : hp.split(',');
      for (const hp of hostports) {
        const arr = /^(.*)\/(.*):(\d+)$/.exec(hp);
        if (arr && matcher.contains(arr[2])) {
@@ -971,8 +971,8 @@ Duration=${payload.duration} `
        const response = await this.uas.request({
          method: 'REFER',
          headers: {
-            'Refer-To': stringifyUri(uri),
-            'Referred-By': stringifyUri(u),
+            'Refer-To': `<${stringifyUri(uri)}>`,
+            'Referred-By': `<${stringifyUri(u)}>`,
            ...customHeaders
          }
        });
@@ -22,7 +22,7 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
  const dstOpts = dstIsUsingSrtp ? srtpOpts : rtpCopy;
  const srcOpts = srcIsUsingSrtp ? srtpOpts : rtpCopy;

-  /* Allow Feature server to inject DTMF to both leg except call from Teams*/
+  /* Allow Feature server to inject DTMF to both leg except call from Teams */
  if (!teams) {
    dstOpts.flags.push('inject DTMF');
    srcOpts.flags.push('inject DTMF');
@@ -30,7 +30,8 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
  const common = {
    'call-id': req.get('Call-ID'),
    'replace': ['origin', 'session-connection'],
-    'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no'
+    'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no',
+    ...(process.env.JAMBONES_ACCEPT_G729 && { codec: { mask: 'g729', transcode: 'pcmu'}})
  };
  return {
    common,
@@ -17,13 +17,13 @@
        "@jambonz/realtimedb-helpers": "^0.8.8",
        "@jambonz/rtpengine-utils": "^0.4.4",
        "@jambonz/siprec-client-utils": "^0.2.7",
-        "@jambonz/stats-collector": "^0.1.9",
+        "@jambonz/stats-collector": "^0.1.10",
        "@jambonz/time-series": "^0.2.8",
        "bent": "^7.3.12",
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.4",
        "drachtio-fn-b2b-sugar": "0.1.0",
-        "drachtio-srf": "^4.5.31",
+        "drachtio-srf": "^4.5.38",
        "express": "^4.19.2",
        "pino": "^8.20.0",
        "verify-aws-sns-signature": "^0.1.0",
@@ -1431,9 +1431,9 @@
      }
    },
    "node_modules/@jambonz/stats-collector": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.9.tgz",
-      "integrity": "sha512-JNRBaHQ47pWsXydj4gUp7zc64/0pM89a6E9pA8uQ15l1KxPGYYTrNRdone5aJqLTFOoPl3tYeF1kXj+3nU1nEA==",
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.10.tgz",
+      "integrity": "sha512-TTqE56/Mf0JDcR+JTB2aRheAYgiEqRWCeh1cxHKAXAuD3pvc9FKPt0TxZw797BZfkqMhK1inSPMe8HRUzm1wCQ==",
      "dependencies": {
        "debug": "^4.3.2",
        "hot-shots": "^8.5.0"
@@ -2899,9 +2899,9 @@
      }
    },
    "node_modules/drachtio-srf": {
-      "version": "4.5.31",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.31.tgz",
-      "integrity": "sha512-/M4J8h2aqHtMXWr8/UHngKQsY9sQQxjdd23jDTSpNVpCwgZ2/xZFhbg/B/UCjrarSRzbyDCvuluOAtaPRSw7Hw==",
+      "version": "4.5.38",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.38.tgz",
+      "integrity": "sha512-dEafgn1OPfkc30Gq3JwJBF4Q7O96fsuqMnE2OO1NqRG0DkwworMIPsusWDo0ePbi+NH74rMjLPmVyC/owA0HXg==",
      "dependencies": {
        "debug": "^3.2.7",
        "delegates": "^0.1.0",
@@ -7879,9 +7879,9 @@
      }
    },
    "@jambonz/stats-collector": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.9.tgz",
-      "integrity": "sha512-JNRBaHQ47pWsXydj4gUp7zc64/0pM89a6E9pA8uQ15l1KxPGYYTrNRdone5aJqLTFOoPl3tYeF1kXj+3nU1nEA==",
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.10.tgz",
+      "integrity": "sha512-TTqE56/Mf0JDcR+JTB2aRheAYgiEqRWCeh1cxHKAXAuD3pvc9FKPt0TxZw797BZfkqMhK1inSPMe8HRUzm1wCQ==",
      "requires": {
        "debug": "^4.3.2",
        "hot-shots": "^8.5.0"
@@ -8974,9 +8974,9 @@
      "requires": {}
    },
    "drachtio-srf": {
-      "version": "4.5.31",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.31.tgz",
-      "integrity": "sha512-/M4J8h2aqHtMXWr8/UHngKQsY9sQQxjdd23jDTSpNVpCwgZ2/xZFhbg/B/UCjrarSRzbyDCvuluOAtaPRSw7Hw==",
+      "version": "4.5.38",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.38.tgz",
+      "integrity": "sha512-dEafgn1OPfkc30Gq3JwJBF4Q7O96fsuqMnE2OO1NqRG0DkwworMIPsusWDo0ePbi+NH74rMjLPmVyC/owA0HXg==",
      "requires": {
        "debug": "^3.2.7",
        "delegates": "^0.1.0",
@@ -30,7 +30,7 @@
    "@jambonz/realtimedb-helpers": "^0.8.8",
    "@jambonz/rtpengine-utils": "^0.4.4",
    "@jambonz/siprec-client-utils": "^0.2.7",
-    "@jambonz/stats-collector": "^0.1.9",
+    "@jambonz/stats-collector": "^0.1.10",
    "@jambonz/time-series": "^0.2.8",
    "@jambonz/digest-utils": "^0.0.5",
    "@aws-sdk/client-sns": "^3.549.0",
@@ -39,7 +39,7 @@
    "cidr-matcher": "^2.1.1",
    "debug": "^4.3.4",
    "drachtio-fn-b2b-sugar": "0.1.0",
-    "drachtio-srf": "^4.5.31",
+    "drachtio-srf": "^4.5.38",
    "express": "^4.19.2",
    "pino": "^8.20.0",
    "verify-aws-sns-signature": "^0.1.0",
Author	SHA1	Message	Date
Dave Horton	f9ae466709	#142 add option to transcode incoming g729 calls to pcmu (#144 )	2024-05-22 12:42:06 -04:00
Dave Horton	831005f7a1	discover local ip address based on authentication response from drachtio-server (#143 )	2024-05-16 10:50:07 -04:00
Hoan Luu Huu	a46ad934a8	support complex refer-to and refered-by uri (#140 ) * support complex refer-to and refered-by uri * wip	2024-05-07 08:27:32 -04:00
Hoan Luu Huu	d200799997	update stats version (#141 )	2024-05-06 20:07:05 -04:00