patch fix for #962

support SIP Privacy (#970 )
Dial: fix error when receiving a REFER without a Referred-By header (#954 )
2026-04-03 22:16:28 +00:00 · 2025-02-03 09:51:40 -05:00 · 2024-11-24 21:43:04 -05:00 · 2024-10-30 13:01:36 -04:00 · 2024-10-29 07:34:49 -04:00 · 2024-10-26 10:21:16 -04:00
8 changed files with 43 additions and 41 deletions
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -385,7 +385,7 @@ module.exports = function(srf, logger) {
    const {rootSpan, siprec, application:app} = req.locals;
    let span;
    try {
-      if (app.tasks && !JAMBONES_MYSQL_REFRESH_TTL) {
+      if (app.tasks && app.tasks?.length > 0 && !JAMBONES_MYSQL_REFRESH_TTL) {
        app.tasks = normalizeJambones(logger, app.tasks).map((tdata) => makeTask(logger, tdata));
        if (0 === app.tasks.length) throw new Error('no application provided');
        return next();
--- a/lib/session/inbound-call-session.js
+++ b/lib/session/inbound-call-session.js
@@ -72,6 +72,8 @@ class InboundCallSession extends CallSession {

  _jambonzHangup() {
    this.dlg?.destroy();
+    // kill current task or wakeup the call session.
+    this._callReleased();
  }

  _hangup(terminatedBy = 'jambonz') {
--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -340,15 +340,17 @@ class TaskDial extends Task {

        const to = parseUri(req.getParsedHeader('Refer-To').uri);
        const by = parseUri(req.getParsedHeader('Referred-By').uri);
+        const referredBy = req.get('Referred-By');
+        const userAgent = req.get('User-Agent');
        this.logger.info({to}, 'refer to parsed');
        const json = await cs.requestor.request('verb:hook', this.referHook, {
          ...(callInfo.toJSON()),
          refer_details: {
            sip_refer_to: req.get('Refer-To'),
-            sip_referred_by: req.get('Referred-By'),
-            sip_user_agent: req.get('User-Agent'),
            refer_to_user: to.scheme === 'tel' ? to.number : to.user,
-            referred_by_user: by.scheme === 'tel' ? by.number : by.user,
+            ...(referredBy && {sip_referred_by: referredBy}),
+            ...(userAgent && {sip_user_agent: userAgent}),
+            ...(by && {referred_by_user: by.scheme === 'tel' ? by.number : by.user}),
            referring_call_sid,
            referred_call_sid
          }
@@ -379,6 +381,7 @@ class TaskDial extends Task {
        res.send(202);
        this.logger.info('DialTask:handleRefer - sent 202 Accepted');
      } catch (err) {
+        this.logger.info({err}, 'DialTask:handleRefer - error processing incoming REFER');
        res.send(err.statusCode || 501);
      }
    }
@@ -484,7 +487,7 @@ class TaskDial extends Task {
  }

  async _attemptCalls(cs) {
-    const {req, srf} = cs;
+    const {req, callInfo, direction, srf} = cs;
    const {getSBC} = srf.locals;
    const {lookupTeamsByAccount, lookupAccountBySid} = srf.locals.dbHelpers;
    const {lookupCarrier, lookupCarrierByPhoneNumber} = dbUtils(this.logger, cs.srf);
@@ -496,8 +499,11 @@ class TaskDial extends Task {
    this.headers = {
      'X-Account-Sid': cs.accountSid,
      ...(req && req.has('X-CID') && {'X-CID': req.get('X-CID')}),
-      ...(req && req.has('P-Asserted-Identity') && !JAMBONZ_DISABLE_DIAL_PAI_HEADER &&
-        {'P-Asserted-Identity': req.get('P-Asserted-Identity')}),
+      ...(direction === 'outbound' && callInfo.sbcCallid && {'X-CID': callInfo.sbcCallid}),
+      ...(!JAMBONZ_DISABLE_DIAL_PAI_HEADER && req && {
+        ...(req.has('P-Asserted-Identity') && {'P-Asserted-Identity': req.get('P-Asserted-Identity')}),
+        ...(req.has('Privacy') && {'Privacy': req.get('Privacy')}),
+      }),
      ...(req && req.has('X-Voip-Carrier-Sid') && {'X-Voip-Carrier-Sid': req.get('X-Voip-Carrier-Sid')}),
      // Put headers at the end to make sure opt.headers override all default behavior.
      ...this.headers
--- a/lib/tasks/gather.js
+++ b/lib/tasks/gather.js
@@ -924,7 +924,7 @@ class TaskGather extends SttTask {
        }
      }
      // If transcription received, reset timeout timer.
-      if (this._timeoutTimer) {
+      if (this._timeoutTimer && !emptyTranscript) {
        this._startTimer();
      }
      /* restart asr timer if we get a partial transcript (only if the asr timer is already running) */
--- a/lib/tasks/say.js
+++ b/lib/tasks/say.js
@@ -177,32 +177,22 @@ class TaskSay extends TtsTask {
                account_sid,
                alert_type: AlertType.TTS_FAILURE,
                vendor,
-                detail: evt.variable_tts_error
+                detail: evt.variable_tts_error,
+                target_sid
              }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
            }
-            else {
-              this.logger.debug({evt}, 'Say got playback-stop');
-              if (evt.variable_tts_error) {
-                writeAlerts({
-                  account_sid,
-                  alert_type: AlertType.TTS_FAILURE,
-                  vendor,
-                  detail: evt.variable_tts_error,
-                  target_sid
-                }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
-              }
-              if (evt.variable_tts_cache_filename && !this.killed) {
-                const text = parseTextFromSayString(this.text[segment]);
-                addFileToCache(evt.variable_tts_cache_filename, {
-                  account_sid,
-                  vendor,
-                  language,
-                  voice,
-                  engine,
-                  text
-                }).catch((err) => this.logger.info({err}, 'Error adding file to cache'));
-              }
+            if (evt.variable_tts_cache_filename && !this.killed) {
+              const text = parseTextFromSayString(this.text[segment]);
+              addFileToCache(evt.variable_tts_cache_filename, {
+                account_sid,
+                vendor,
+                language,
+                voice,
+                engine,
+                text
+              }).catch((err) => this.logger.info({err}, 'Error adding file to cache'));
            }
+
            if (this._playResolve) {
              evt.variable_tts_error ? this._playReject(new Error(evt.variable_tts_error)) : this._playResolve();
            }
--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -161,7 +161,12 @@ const selectDefaultDeepgramModel = (task, language) => {

 const optimalGoogleModels = {
  'v1' : {
-    'en-IN':['telephony', 'latest_long']
+    'en-IN':['telephony', 'telephony'],
+    'es-DO':['default', 'default'],
+    'es-MX':['default', 'default'],
+    'en-AU':['telephony', 'telephony'],
+    'en-GB':['telephony', 'telephony'],
+    'en-NZ':['telephony', 'telephony']
  },
  'v2' : {
    'en-IN':['telephony', 'long']
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
        "@jambonz/http-health-check": "^0.0.1",
        "@jambonz/mw-registrar": "^0.2.7",
        "@jambonz/realtimedb-helpers": "^0.8.8",
-        "@jambonz/speech-utils": "^0.1.19",
+        "@jambonz/speech-utils": "^0.1.20",
        "@jambonz/stats-collector": "^0.1.10",
        "@jambonz/time-series": "^0.2.9",
        "@jambonz/verb-specifications": "^0.0.83",
@@ -1539,10 +1539,9 @@
      }
    },
    "node_modules/@jambonz/speech-utils": {
-      "version": "0.1.19",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.1.19.tgz",
-      "integrity": "sha512-3R4o1zJYnUIqMsT2GmYAItcAnhEz6NVTNqk5aHSAvBLFSMpqdeEPrTPaKVmQAPS8aIY7crhbJmJx8L3i2xDzDg==",
-      "license": "MIT",
+      "version": "0.1.20",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.1.20.tgz",
+      "integrity": "sha512-3Ff9zLcFoVZhrI4jBKyjgWpv/fEMx1BpJP85daRwZNC2S0BFshULJ54fQxc8S63IsdgFf6g1cLD5VxqPaqCfbQ==",
      "dependencies": {
        "@aws-sdk/client-polly": "^3.496.0",
        "@aws-sdk/client-sts": "^3.496.0",
@@ -10637,9 +10636,9 @@
      }
    },
    "@jambonz/speech-utils": {
-      "version": "0.1.19",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.1.19.tgz",
-      "integrity": "sha512-3R4o1zJYnUIqMsT2GmYAItcAnhEz6NVTNqk5aHSAvBLFSMpqdeEPrTPaKVmQAPS8aIY7crhbJmJx8L3i2xDzDg==",
+      "version": "0.1.20",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.1.20.tgz",
+      "integrity": "sha512-3Ff9zLcFoVZhrI4jBKyjgWpv/fEMx1BpJP85daRwZNC2S0BFshULJ54fQxc8S63IsdgFf6g1cLD5VxqPaqCfbQ==",
      "requires": {
        "@aws-sdk/client-polly": "^3.496.0",
        "@aws-sdk/client-sts": "^3.496.0",
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/mw-registrar": "^0.2.7",
    "@jambonz/realtimedb-helpers": "^0.8.8",
-    "@jambonz/speech-utils": "^0.1.19",
+    "@jambonz/speech-utils": "^0.1.20",
    "@jambonz/stats-collector": "^0.1.10",
    "@jambonz/time-series": "^0.2.9",
    "@jambonz/verb-specifications": "^0.0.83",
Author	SHA1	Message	Date
Dave Horton	380cd7f792	patch fix for #962	2025-02-03 09:51:40 -05:00
Hoan Luu Huu	6889f0e4ab	support SIP Privacy (#970 )	2024-11-24 21:43:04 -05:00
Dave Horton	1efb198f72	Dial: fix error when receiving a REFER without a Referred-By header (#954 )	2024-10-30 13:01:36 -04:00
rammohan-y	4b5df855e1	feat/952: removed unnecessary condition which is not logging the target_sid (#953 )	2024-10-29 07:34:49 -04:00
Hoan Luu Huu	24126ef1ec	fixed feature server kill currenttask if jambonz hangup the call (#948 )	2024-10-26 10:21:16 -04:00
Dave Horton	8e4995ec02	fix bug where middleware produces a cached app.tasks with an empty array (#947 )	2024-10-24 20:43:27 -04:00
Dave Horton	a005253a9f	update to latest speech-utils	2024-10-18 12:27:29 -04:00
rammohan-y	10efc5d608	feat/942: updated optimal google models (#943 )	2024-10-18 10:03:56 -04:00
Hoan Luu Huu	1c48c40496	Support sip_parent_callid for sbc-outbound (#939 ) * include X-CID for dial outbound if the call-session is outbound * include X-CID for dial outbound if the call-session is outbound * include X-CID for dial outbound if the call-session is outbound * include X-CID for dial outbound if the call-session is outbound	2024-10-17 07:18:58 -04:00