update deps, only subscribe for DTMF when client is possibly webrtc

update to latest db-helpers
update to db-helpers with caching fix
2026-10-04 02:04:22 +00:00 · 2022-11-06 10:12:18 -05:00 · 2022-11-05 10:42:14 -04:00 · 2022-11-01 20:40:53 -04:00 · 2022-11-01 18:57:31 -04:00 · 2022-11-01 15:40:37 -04:00
4 changed files with 70 additions and 34 deletions
@@ -84,6 +84,24 @@ class CallSession extends Emitter {
    return this.req.has('X-Five9-StreamingPairId');
  }

+  get isPossibleWebRtcClient() {
+    return this.req.locals.isPossibleWebRtcClient;
+  }
+
+  subscribeForDTMF(dlg) {
+    if (!this._subscribedForDTMF) {
+      this._subscribedForDTMF = true;
+      this.subscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag,
+        this._onDTMF.bind(this, dlg));
+    }
+  }
+  unsubscribeForDTMF() {
+    if (this._subscribedForDTMF) {
+      this._subscribedForDTMF = false;
+      this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag);
+    }
+  }
+
  async connect() {
    const {sdp} = this.req.locals;
    this.logger.info('inbound call accepted for routing');
@@ -133,7 +151,8 @@ class CallSession extends Emitter {
    }
    this.logger.debug(`using feature server ${featureServer}`);

-    this.rtpEngineOpts = makeRtpEngineOpts(this.req, SdpWantsSrtp(sdp), false, this.isFromMSTeams);
+    const wantsSrtp = this.req.locals.possibleWebRtcClient = SdpWantsSrtp(sdp);
+    this.rtpEngineOpts = makeRtpEngineOpts(this.req, wantsSrtp, false, this.isFromMSTeams);
    this.rtpEngineResource = {destroy: this.del.bind(null, this.rtpEngineOpts.common)};
    const obj = parseUri(this.req.uri);
    let proxy, host, uri;
@@ -290,8 +309,7 @@ class CallSession extends Emitter {
  _setDlgHandlers(dlg) {
    const {callId} = dlg.sip;
    this.activeCallIds.set(callId, this);
-    this.subscribeDTMF(this.logger, callId, this.rtpEngineOpts.uas.tag,
-      this._onDTMF.bind(this));
+    if (this.isPossibleWebRtcClient) this.subscribeForDTMF(dlg);
    dlg.on('destroy', () => {
      debug('call ended with normal termination');
      this.logger.info('call ended with normal termination');
@@ -339,7 +357,8 @@ class CallSession extends Emitter {
        try {
          await other.destroy();
        } catch (err) {}
-        this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag);
+        this.unsubscribeForDTMF();
+

        const trackingOn = process.env.JAMBONES_TRACK_ACCOUNT_CALLS ||
          process.env.JAMBONES_TRACK_SP_CALLS ||
@@ -395,8 +414,7 @@ class CallSession extends Emitter {
      });
    });

-    this.subscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag,
-      this._onDTMF.bind(this, uac));
+    if (this.isPossibleWebRtcClient) this.subscribeForDTMF(uac);

    uas.on('modify', this._onReinvite.bind(this, uas));
    uac.on('modify', this._onReinvite.bind(this, uac));
@@ -490,7 +508,7 @@ Duration=${payload.duration} `
        });
      }

-      this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag);
+      this.unsubscribeForDTMF();

      const uas = await this.srf.createUAS(req, res, {
        localSdp: response.sdp,
@@ -883,7 +901,7 @@ Duration=${payload.duration} `

        // successfully connected
        this.logger.info('successfully connected new call leg for REFER');
-        this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uas.tag);
+        this.unsubscribeForDTMF();
        this.referInvite = null;
        sendNotify(this.uas, '200 OK');
        this.uas.destroy();
@@ -2,7 +2,7 @@ const debug = require('debug')('jambonz:sbc-inbound');
 const assert = require('assert');
 const Emitter = require('events');
 const parseUri = require('drachtio-srf').parseUri;
-const {nudgeCallCounts} = require('./utils');
+const {nudgeCallCounts, roundTripTime} = require('./utils');
 const msProxyIps = process.env.MS_TEAMS_SIP_PROXY_IPS ?
  process.env.MS_TEAMS_SIP_PROXY_IPS.split(',').map((i) => i.trim()) :
  [];
@@ -135,7 +135,8 @@ module.exports = function(srf, logger) {
  const identifyAccount = async(req, res, next) => {
    try {
      const {siprec, callId} = req.locals;
-      const {getSPForAccount, wasOriginatedFromCarrier, getApplicationForDidAndCarrier} = req.srf.locals;
+      const {getSPForAccount, wasOriginatedFromCarrier, getApplicationForDidAndCarrier, stats} = req.srf.locals;
+      const startAt = process.hrtime();
      const {
        fromCarrier,
        gateway,
@@ -144,6 +145,9 @@ module.exports = function(srf, logger) {
        service_provider_sid,
        account
      } = await wasOriginatedFromCarrier(req);
+      const rtt = roundTripTime(startAt);
+      stats.histogram('app.mysql.response_time', rtt, [
+        'query:wasOriginatedFromCarrier', 'app:sbc-inbound']);
      /**
       * calls come from 3 sources:
       * (1) A carrier
@@ -9,11 +9,11 @@
      "version": "v0.7.7",
      "license": "MIT",
      "dependencies": {
-        "@jambonz/db-helpers": "^0.7.0",
+        "@jambonz/db-helpers": "^0.7.3",
        "@jambonz/http-authenticator": "^0.2.2",
        "@jambonz/http-health-check": "^0.0.1",
-        "@jambonz/realtimedb-helpers": "^0.4.35",
-        "@jambonz/rtpengine-utils": "^0.3.10",
+        "@jambonz/realtimedb-helpers": "^0.5.7",
+        "@jambonz/rtpengine-utils": "^0.3.11",
        "@jambonz/siprec-client-utils": "^0.1.4",
        "@jambonz/stats-collector": "^0.1.6",
        "@jambonz/time-series": "^0.2.5",
@@ -572,9 +572,9 @@
      }
    },
    "node_modules/@jambonz/db-helpers": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.7.0.tgz",
-      "integrity": "sha512-Fj0q8qEwW2xKCtOyDkzKLl6kvBASFTeLljc+LW1hoF47pe+IFc3ZXPL3ntqwX39YgFCMayeUrJMdio+1GYsECA==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.7.3.tgz",
+      "integrity": "sha512-FXQPnl5AGV3P6RhvdSKfjIOdEXShYe7aKJayJjaPARPTCTGqLTDhV2tfsWirCrpQhn+vanJHAiOyzOTmbDIfzA==",
      "dependencies": {
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.3",
@@ -618,25 +618,27 @@
      }
    },
    "node_modules/@jambonz/realtimedb-helpers": {
-      "version": "0.4.35",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.35.tgz",
-      "integrity": "sha512-lfNTlWRnLbOKVRDto1nUgOmr2jlmOHxslg+Zs9dSB8eEEkIqCNZn9f5kxxXThVpRSrCtsgGsX/w1wXygGiTn5w==",
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.5.7.tgz",
+      "integrity": "sha512-TOTnFWSa4ronCdQTWfB8c5VI6DXcBEyDA4vbZnzkVAzSP90NpRPOPrvo2tEZxcGSlVIjBZew7rWgWyqkSwUT/Q==",
      "dependencies": {
        "@google-cloud/text-to-speech": "^4.0.3",
+        "@grpc/grpc-js": "^1.7.3",
        "@jambonz/promisify-redis": "^0.0.6",
        "aws-sdk": "^2.1238.0",
        "bent": "^7.3.12",
        "debug": "^4.3.3",
        "form-urlencoded": "^6.1.0",
+        "google-protobuf": "^3.21.2",
        "microsoft-cognitiveservices-speech-sdk": "^1.24.0",
        "redis": "^3.1.2",
        "undici": "^5.11.0"
      }
    },
    "node_modules/@jambonz/rtpengine-utils": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.10.tgz",
-      "integrity": "sha512-nwnHaS4vKkj5YB9HyB06ZyHu5knhSzAOeg4qMG4GS0joRAx7DVmnuPhRaQJmcVAgZm9VuDfxSFQrGIot/oVBBQ==",
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.11.tgz",
+      "integrity": "sha512-+WDZrAje2ww7zBY2+DYgPdiDg+Uh9qC4B/+EfQ/ghjseausaUWhUCDuJOdFQtHXA1qtEiMxTD1argeC5DtJBYQ==",
      "dependencies": {
        "debug": "^4.3.1",
        "rtpengine-client": "^0.3.9",
@@ -2671,6 +2673,11 @@
        "node": ">=12.0.0"
      }
    },
+    "node_modules/google-protobuf": {
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz",
+      "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA=="
+    },
    "node_modules/graceful-fs": {
      "version": "4.2.6",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
@@ -6203,9 +6210,9 @@
      "dev": true
    },
    "@jambonz/db-helpers": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.7.0.tgz",
-      "integrity": "sha512-Fj0q8qEwW2xKCtOyDkzKLl6kvBASFTeLljc+LW1hoF47pe+IFc3ZXPL3ntqwX39YgFCMayeUrJMdio+1GYsECA==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.7.3.tgz",
+      "integrity": "sha512-FXQPnl5AGV3P6RhvdSKfjIOdEXShYe7aKJayJjaPARPTCTGqLTDhV2tfsWirCrpQhn+vanJHAiOyzOTmbDIfzA==",
      "requires": {
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.3",
@@ -6243,25 +6250,27 @@
      }
    },
    "@jambonz/realtimedb-helpers": {
-      "version": "0.4.35",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.35.tgz",
-      "integrity": "sha512-lfNTlWRnLbOKVRDto1nUgOmr2jlmOHxslg+Zs9dSB8eEEkIqCNZn9f5kxxXThVpRSrCtsgGsX/w1wXygGiTn5w==",
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.5.7.tgz",
+      "integrity": "sha512-TOTnFWSa4ronCdQTWfB8c5VI6DXcBEyDA4vbZnzkVAzSP90NpRPOPrvo2tEZxcGSlVIjBZew7rWgWyqkSwUT/Q==",
      "requires": {
        "@google-cloud/text-to-speech": "^4.0.3",
+        "@grpc/grpc-js": "^1.7.3",
        "@jambonz/promisify-redis": "^0.0.6",
        "aws-sdk": "^2.1238.0",
        "bent": "^7.3.12",
        "debug": "^4.3.3",
        "form-urlencoded": "^6.1.0",
+        "google-protobuf": "^3.21.2",
        "microsoft-cognitiveservices-speech-sdk": "^1.24.0",
        "redis": "^3.1.2",
        "undici": "^5.11.0"
      }
    },
    "@jambonz/rtpengine-utils": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.10.tgz",
-      "integrity": "sha512-nwnHaS4vKkj5YB9HyB06ZyHu5knhSzAOeg4qMG4GS0joRAx7DVmnuPhRaQJmcVAgZm9VuDfxSFQrGIot/oVBBQ==",
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jambonz/rtpengine-utils/-/rtpengine-utils-0.3.11.tgz",
+      "integrity": "sha512-+WDZrAje2ww7zBY2+DYgPdiDg+Uh9qC4B/+EfQ/ghjseausaUWhUCDuJOdFQtHXA1qtEiMxTD1argeC5DtJBYQ==",
      "requires": {
        "debug": "^4.3.1",
        "rtpengine-client": "^0.3.9",
@@ -7834,6 +7843,11 @@
        "node-forge": "^1.3.1"
      }
    },
+    "google-protobuf": {
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz",
+      "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA=="
+    },
    "graceful-fs": {
      "version": "4.2.6",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
@@ -25,11 +25,11 @@
    "jslint": "eslint app.js lib"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.7.0",
-    "@jambonz/realtimedb-helpers": "^0.4.35",
+    "@jambonz/db-helpers": "^0.7.3",
+    "@jambonz/realtimedb-helpers": "^0.5.7",
    "@jambonz/http-authenticator": "^0.2.2",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/rtpengine-utils": "^0.3.10",
+    "@jambonz/rtpengine-utils": "^0.3.11",
    "@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	b072524585	update deps, only subscribe for DTMF when client is possibly webrtc	2022-11-06 10:12:18 -05:00
Dave Horton	7fb9966d20	update to latest db-helpers	2022-11-05 10:42:14 -04:00
Dave Horton	42b3317206	update to db-helpers with caching fix	2022-11-01 20:40:53 -04:00
Dave Horton	db66d98d0a	write stat for db lookup	2022-11-01 18:57:31 -04:00
Dave Horton	26169517dc	fix for dtmf handler when running multiple instances on same EC2	2022-11-01 15:40:37 -04:00