reanchor media for A leg

.gitignore

@@ -42,4 +42,3 @@ ecosystem.config.js
 test/credentials/*.json
 run-tests.sh
 run-coverage.sh
-.vscode

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch Program",
+      "program": "${workspaceFolder}/test/index.js",
+      "env": {
+        "NODE_ENV": "test"
+      }
+    }
+  ]
+}

lib/config.js

@@ -130,7 +130,7 @@ const JAMBONZ_RECORD_WS_PASSWORD = process.env.JAMBONZ_RECORD_WS_PASSWORD || pro
 const JAMBONZ_DISABLE_DIAL_PAI_HEADER = process.env.JAMBONZ_DISABLE_DIAL_PAI_HEADER || false;
 const JAMBONES_DISABLE_DIRECT_P2P_CALL = process.env.JAMBONES_DISABLE_DIRECT_P2P_CALL || false;
 
-const JAMBONES_EAGERLY_PRE_CACHE_AUDIO = parseInt(process.env.JAMBONES_EAGERLY_PRE_CACHE_AUDIO, 10) || 0;
+const JAMBONES_EAGERLY_PRE_CACHE_AUDIO = process.env.JAMBONES_EAGERLY_PRE_CACHE_AUDIO;
 
 const JAMBONES_USE_FREESWITCH_TIMER_FD = process.env.JAMBONES_USE_FREESWITCH_TIMER_FD;
 

lib/session/adulting-call-session.js

@@ -53,24 +53,16 @@ class AdultingCallSession extends CallSession {
   }
 
   _callerHungup() {
-    this._hangup('caller');
-  }
-
-  _jambonzHangup() {
-    this._hangup();
-  }
-
-  _hangup(terminatedBy = 'jambonz') {
     if (this.dlg.connectTime) {
       const duration = moment().diff(this.dlg.connectTime, 'seconds');
-      this.rootSpan.setAttributes({'call.termination': `hangup by ${terminatedBy}`});
-      this.callInfo.callTerminationBy = terminatedBy;
+      this.rootSpan.setAttributes({'call.termination': 'hangup by caller'});
+      this.callInfo.callTerminationBy = 'caller';
       this.emit('callStatusChange', {
         callStatus: CallStatus.Completed,
         duration
       });
     }
-    this.logger.info(`InboundCallSession: ${terminatedBy} hung up`);
+    this.logger.info('InboundCallSession: caller hung up');
     this._callReleased();
     this.req.removeAllListeners('cancel');
   }

lib/session/call-session.js

@@ -7,8 +7,7 @@ const {
   TaskName,
   KillReason,
   RecordState,
-  AllowedSipRecVerbs,
-  AllowedConfirmSessionVerbs
+  AllowedSipRecVerbs
 } = require('../utils/constants');
 const moment = require('moment');
 const assert = require('assert');
@@ -450,47 +449,6 @@ class CallSession extends Emitter {
     this._sipRequestWithinDialogHook = url;
   }
 
-  // Bot Delay (actionHook delayed)
-  get actionHookDelayEnabled() {
-    return this._actionHookDelayEnabled;
-  }
-
-  set actionHookDelayEnabled(e) {
-    this._actionHookDelayEnabled = e;
-  }
-
-  get actionHookNoResponseTimeout() {
-    return this._actionHookNoResponseTimeout;
-  }
-
-  set actionHookNoResponseTimeout(e) {
-    this._actionHookNoResponseTimeout = e;
-  }
-
-  get actionHookNoResponseGiveUpTimeout() {
-    return this._actionHookNoResponseGiveUpTimeout;
-  }
-
-  set actionHookNoResponseGiveUpTimeout(e) {
-    this._actionHookNoResponseGiveUpTimeout = e;
-  }
-
-  get actionHookDelayRetries() {
-    return this._actionHookDelayRetries;
-  }
-
-  set actionHookDelayRetries(e) {
-    this._actionHookDelayRetries = e;
-  }
-
-  get actionHookDelayActions() {
-    return this._actionHookDelayActions;
-  }
-
-  set actionHookDelayActions(e) {
-    this._actionHookDelayActions = e;
-  }
-
   hasGlobalSttPunctuation() {
     return this._globalSttPunctuation !== undefined;
   }
@@ -622,10 +580,8 @@ class CallSession extends Emitter {
       const res = await this.dlg.request({
         method: 'INFO',
         headers: {
-          'X-Reason': 'pauseCallRecording',
-          ...(this.recordOptions.headers && {'Content-Type': 'application/json'})
-        },
-        ...(this.recordOptions.headers && {body: JSON.stringify(this.recordOptions.headers) + '\n'})
+          'X-Reason': 'pauseCallRecording'
+        }
       });
       if (res.status === 200) {
         this._recordState = RecordState.RecordingPaused;
@@ -646,10 +602,8 @@ class CallSession extends Emitter {
       const res = await this.dlg.request({
         method: 'INFO',
         headers: {
-          'X-Reason': 'resumeCallRecording',
-          ...(this.recordOptions.headers && {'Content-Type': 'application/json'})
-        },
-        ...(this.recordOptions.headers && {body: JSON.stringify(this.recordOptions.headers) + '\n'})
+          'X-Reason': 'resumeCallRecording'
+        }
       });
       if (res.status === 200) {
         this._recordState = RecordState.RecordingOn;
@@ -684,8 +638,7 @@ class CallSession extends Emitter {
       }
       task = await this.backgroundTaskManager.newTask('bargeIn', gather);
       task.sticky = autoEnable;
-      // listen to the bargein-done from background manager
-      this.backgroundTaskManager.once('bargeIn-done', () => {
+      task.once('bargeIn-done', () => {
         if (this.requestor instanceof WsRequestor) {
           try {
             this.kill(true);
@@ -883,7 +836,6 @@ class CallSession extends Emitter {
       task.on('VerbHookSpanWaitForEnd', ({span}) => {
         this.verbHookSpan = span;
       });
-      task.on('ActionHookDelayActionOptions', this._onActionHookDelayActions.bind(this));
       try {
         const resources = await this._evaluatePreconditions(task);
         let skip = false;
@@ -940,6 +892,7 @@ class CallSession extends Emitter {
     // all done - cleanup
     this.logger.info('CallSession:exec all tasks complete');
     this._stopping = true;
+    this.disableBotMode();
     this._onTasksDone();
     this._clearResources();
 
@@ -1090,30 +1043,22 @@ class CallSession extends Emitter {
    * @param {object} [opts.call_hook] - new call_status_hook
    */
   async _lccCallHook(opts) {
-    const webhooks = [];
     let sd, tasks, childTasks;
     const b3 = this.b3;
     const httpHeaders = b3 && {b3};
 
     if (opts.call_hook || opts.child_call_hook) {
       if (opts.call_hook) {
-        webhooks.push(this.requestor.request('session:redirect', opts.call_hook, this.callInfo.toJSON(), httpHeaders));
+        tasks = await this.requestor.request('session:redirect', opts.call_hook, this.callInfo.toJSON(), httpHeaders);
       }
       if (opts.child_call_hook) {
         /* child call hook only allowed from a connected Dial state */
         const task = this.currentTask;
         sd = task.sd;
         if (task && TaskName.Dial === task.name && sd) {
-          webhooks.push(this.requestor.request(
-            'session:redirect', opts.child_call_hook, sd.callInfo.toJSON(), httpHeaders));
+          childTasks = [];
         }
       }
-      const [tasks1, tasks2] = await Promise.all(webhooks);
-      if (opts.call_hook) {
-        tasks = tasks1;
-        if (opts.child_call_hook) childTasks = tasks2;
-      }
-      else childTasks = tasks1;
     }
     else if (opts.parent_call || opts.child_call) {
       const {parent_call, child_call} = opts;
@@ -1133,13 +1078,17 @@ class CallSession extends Emitter {
       const cs = await sd.doAdulting({
         logger: childLogger,
         application: this.application,
-        tasks: t
+        tasks: t,
+        call_hook_url: opts.child_call_hook
       });
 
       /* need to update the callSid of the child with its own (new) AdultingCallSession */
       sessionTracker.add(cs.callSid, cs);
     }
     if (tasks) {
+      if (!this.ep) {
+        await this.reAnchorMedia();
+      }
       const t = normalizeJambones(this.logger, tasks).map((tdata) => makeTask(this.logger, tdata));
       this.logger.info({tasks: listTaskNames(t)}, 'CallSession:_lccCallHook new task list');
       this.replaceApplication(t);
@@ -1154,9 +1103,6 @@ class CallSession extends Emitter {
       this.currentTask.kill(this);
     }
     this._endVerbHookSpan();
-    // clear all delay action hook timeout if there is
-    this._clearActionHookNoResponseGiveUpTimer();
-    this._clearActionHookNoResponseTimer();
   }
 
   /**
@@ -1344,14 +1290,6 @@ Duration=${duration} `
     task.whisper(tasks, callSid).catch((err) => this.logger.error(err, 'CallSession:_lccWhisper'));
   }
 
-  /**
-   * perform call hangup by jambonz
-   */
-
-  async hangup() {
-    return this._callerHungup();
-  }
-
 
   /**
    * perform live call control
@@ -1425,19 +1363,6 @@ Duration=${duration} `
         tasks = pruned;
       }
     }
-    else if (this.isConfirmCallSession) {
-      const pruned = tasks.filter((t) => AllowedConfirmSessionVerbs.includes(t.name));
-      if (0 === pruned.length) {
-        this.logger.info({tasks},
-          'CallSession:replaceApplication - filtering verbs allowed on an confirmSession call');
-        return;
-      }
-      if (pruned.length < tasks.length) {
-        this.logger.info(
-          'CallSession:replaceApplication - removing verbs that are not allowed for confirmSession call');
-        tasks = pruned;
-      }
-    }
     this.tasks = tasks;
     this.taskIdx = 0;
     this.stackIdx++;
@@ -1447,11 +1372,6 @@ Duration=${duration} `
       this.currentTask.kill(this, KillReason.Replaced);
       this.currentTask = null;
     }
-    else if (this.wakeupResolver) {
-      this.logger.debug('CallSession:replaceApplication - waking up');
-      this.wakeupResolver({reason: 'new tasks'});
-      this.wakeupResolver = null;
-    }
   }
 
   kill(onBackgroundGatherBargein = false) {
@@ -1476,8 +1396,7 @@ Duration=${duration} `
           this.logger.info('CallSession:kill - found bargein disabled in the stack, clearing to that point');
           break;
         }
-        const rem = this.tasks.shift();
-        this.logger.debug(`CallSession:kill - clearing task ${rem.summary}`);
+        this.tasks.shift();
       }
     }
     else this.tasks = [];
@@ -1582,9 +1501,6 @@ Duration=${duration} `
           }
           resolution = {reason: 'received command, new tasks', queue: queueCommand, command};
           resolution.command = listTaskNames(t);
-          // clear all delay action hook timeout if there is
-          this._clearActionHookNoResponseGiveUpTimer();
-          this._clearActionHookNoResponseTimer();
         }
         else this._lccCallHook(data);
         break;
@@ -1825,8 +1741,6 @@ Duration=${duration} `
     this.rootSpan && this.rootSpan.end();
     // close all background tasks
     this.backgroundTaskManager.stopAll();
-    this._clearActionHookNoResponseGiveUpTimer();
-    this._clearActionHookNoResponseTimer();
   }
 
   /**
@@ -1837,14 +1751,6 @@ Duration=${duration} `
     assert(false, 'subclass responsibility to override this method');
   }
 
-  /**
-   * called when the jambonz has hung up.  Provided for subclasses to override
-   * in order to apply logic at this point if needed.
-   */
-  _jambonzHangup() {
-    assert(false, 'subclass responsibility to override this method');
-  }
-
   /**
    * get a media server to use for this call
    */
@@ -2260,69 +2166,6 @@ Duration=${duration} `
       this.verbHookSpan = null;
     }
   }
-  // actionHook delay actions
-  _onActionHookDelayActions(options) {
-    this._actionHookDelayRetryCount = 0;
-    this._startActionHookNoResponseTimer(options);
-    this._startActionHookNoResponseGiveUpTimer(options);
-  }
-
-  _startActionHookNoResponseTimer(options) {
-    this._clearActionHookNoResponseTimer();
-    if (options.noResponseTimeoutMs) {
-      this.logger.debug(`CallSession:_startActionHookNoResponseTimer ${options.noResponseTimeoutMs}`);
-      this._actionHookNoResponseTimer = setTimeout(() => {
-        if (this._actionHookDelayRetryCount >= options.retries) {
-          this._jambonzHangup();
-        }
-        const verb = options.actions[this._actionHookDelayRetryCount % options.actions.length];
-        // Inject verb to main stack
-        const t = normalizeJambones(this.logger, [verb])
-          .map((tdata) => makeTask(this.logger, tdata));
-        if (t.length) {
-          t[0].on('playDone', (err) => {
-            if (err) this.logger.error({err}, `Call-Session:exec Error delay action, play ${verb}`);
-            this._startActionHookNoResponseTimer(options);
-          });
-        }
-        this.tasks.push(...t);
-        if (this.wakeupResolver) {
-          this.wakeupResolver({reason: 'actionHook no response, applied delay actions', verb});
-          this.wakeupResolver = null;
-        }
-
-        this.logger.debug(`CallSession:_startActionHookNoResponseTimer, executing verb ${JSON.stringify(verb)}`);
-
-        this._actionHookDelayRetryCount++;
-      }, options.noResponseTimeoutMs);
-    }
-  }
-
-  _clearActionHookNoResponseTimer() {
-    if (this._actionHookNoResponseTimer) {
-      clearTimeout(this._actionHookNoResponseTimer);
-    }
-    this._actionHookNoResponseTimer = null;
-  }
-
-  _startActionHookNoResponseGiveUpTimer(options) {
-    this._clearActionHookNoResponseGiveUpTimer();
-    if (options.noResponseGiveUpTimeoutMs) {
-      this.logger.debug(`CallSession:_startActionHookNoResponseGiveUpTimer ${options.noResponseGiveUpTimeoutMs}`);
-      this._actionHookNoResponseGiveUpTimer = setTimeout(() => {
-        this.logger.debug('CallSession:_startActionHookNoResponseGiveUpTimer Timeout');
-        this._jambonzHangup();
-        this._actionHookNoResponseGiveUpTimer = null;
-      }, options.noResponseGiveUpTimeoutMs);
-    }
-  }
-
-  _clearActionHookNoResponseGiveUpTimer() {
-    if (this._actionHookNoResponseGiveUpTimer) {
-      clearTimeout(this._actionHookNoResponseGiveUpTimer);
-    }
-    this._actionHookNoResponseGiveUpTimer = null;
-  }
 }
 
 module.exports = CallSession;

lib/session/confirm-call-session.js

@@ -34,9 +34,6 @@ class ConfirmCallSession extends CallSession {
   _callerHungup() {
   }
 
-  _jambonzHangup() {
-  }
-
 
 }
 

lib/session/inbound-call-session.js

@@ -67,27 +67,15 @@ class InboundCallSession extends CallSession {
    * This is invoked when the caller hangs up, in order to calculate the call duration.
    */
   _callerHungup() {
-    this._hangup('caller');
-  }
-
-  _jambonzHangup() {
-    this._hangup();
-  }
-
-  _hangup(terminatedBy = 'jambonz') {
-    if (this.dlg === null) {
-      this.logger.info('InboundCallSession:_hangup - race condition, dlg cleared by app hangup');
-      return;
-    }
     assert(this.dlg.connectTime);
     const duration = moment().diff(this.dlg.connectTime, 'seconds');
-    this.rootSpan.setAttributes({'call.termination': `hangup by ${terminatedBy}`});
-    this.callInfo.callTerminationBy = terminatedBy;
+    this.rootSpan.setAttributes({'call.termination': 'hangup by caller'});
+    this.callInfo.callTerminationBy = 'caller';
     this.emit('callStatusChange', {
       callStatus: CallStatus.Completed,
       duration
     });
-    this.logger.info(`InboundCallSession: ${terminatedBy} hung up`);
+    this.logger.info('InboundCallSession: caller hung up');
     this._callReleased();
     this.req.removeAllListeners('cancel');
   }

lib/session/rest-call-session.js

@@ -49,21 +49,13 @@ class RestCallSession extends CallSession {
    * This is invoked when the called party hangs up, in order to calculate the call duration.
    */
   _callerHungup() {
-    this._hangup('caller');
-  }
-
-  _jambonzHangup() {
-    this._hangup();
-  }
-
-  _hangup(terminatedBy = 'jamboz') {
     if (this.restDialTask) {
       this.restDialTask.turnOffAmd();
     }
-    this.callInfo.callTerminationBy = terminatedBy;
+    this.callInfo.callTerminationBy = 'caller';
     const duration = moment().diff(this.dlg.connectTime, 'seconds');
     this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
-    this.logger.debug(`RestCallSession: called party hung up by ${terminatedBy}`);
+    this.logger.debug('RestCallSession: called party hung up');
     this._callReleased();
   }
 

lib/tasks/config.js

@@ -10,8 +10,7 @@ class TaskConfig extends Task {
       'bargeIn',
       'record',
       'listen',
-      'transcribe',
-      'actionHookDelayAction'
+      'transcribe'
     ].forEach((k) => this[k] = this.data[k] || {});
 
     if ('notifyEvents' in this.data) {
@@ -250,14 +249,6 @@ class TaskConfig extends Task {
         cs.stopBackgroundTask('transcribe');
       }
     }
-
-    if (this.actionHookDelayAction) {
-      cs.actionHookDelayEnabled = this.actionHookDelayAction.enabled || false;
-      cs.actionHookNoResponseTimeout = this.actionHookDelayAction.noResponseTimeout || 0;
-      cs.actionHookNoResponseGiveUpTimeout = this.actionHookDelayAction.noResponseGiveUpTimeout || 0;
-      cs.actionHookDelayRetries = this.actionHookDelayAction.retries || 1;
-      cs.actionHookDelayActions = this.actionHookDelayAction.actions || [];
-    }
     if (this.data.sipRequestWithinDialogHook) {
       cs.sipRequestWithinDialogHook = this.data.sipRequestWithinDialogHook;
     }

lib/tasks/gather.js

@@ -27,7 +27,7 @@ class TaskGather extends SttTask {
     [
       'finishOnKey', 'input', 'numDigits', 'minDigits', 'maxDigits',
       'interDigitTimeout', 'partialResultHook', 'bargein', 'dtmfBargein',
-      'speechTimeout', 'timeout', 'say', 'play', 'actionHookDelayAction'
+      'speechTimeout', 'timeout', 'say', 'play'
     ].forEach((k) => this[k] = this.data[k]);
 
     // gather default input is digits
@@ -138,29 +138,6 @@ class TaskGather extends SttTask {
       this.interim = true;
       this.logger.debug('Gather:exec - early hints match enabled');
     }
-    // actionHook delay
-    this._hookDelayEn = cs.actionHookDelayEnabled || !!this.actionHookDelayAction;
-
-    this._hookDelayActions = this.actionHookDelayAction?.actions || cs.actionHookDelayActions || [];
-
-    // Only enable NoResponseTimeout if there is _hookDelayActions
-    this._hookNoResponseTimeout = (this._hookDelayActions?.length ?
-      (this.actionHookDelayAction?.noResponseTimeout || cs.actionHookNoResponseTimeout || 0)
-      : 0) * 1000;
-
-    this._hookNoResponseGiveUpTimeout = (this.actionHookDelayAction?.noResponseGiveUpTimeout ||
-      cs.actionHookNoResponseGiveUpTimeout || 0) * 1000;
-
-    this._hookDelayRetries = this.actionHookDelayAction?.retries || cs.actionHookDelayRetries || 1;
-    this._hookDelayRetryCount = 0;
-    this.hookDelayActionOpts = {
-      enabled: this._hookDelayEn,
-      actions: this._hookDelayActions,
-      noResponseTimeoutMs: this._hookNoResponseTimeout,
-      noResponseGiveUpTimeoutMs: this._hookNoResponseGiveUpTimeout,
-      retries: this._hookDelayRetries
-    };
-
     const startListening = async(cs, ep) => {
       this._startTimer();
       if (this.isContinuousAsr && 0 === this.timeout) this._startAsrTimer();
@@ -254,7 +231,6 @@ class TaskGather extends SttTask {
   kill(cs) {
     super.kill(cs);
     this._killAudio(cs);
-    this._killActionHookDelayAction();
     this.ep.removeAllListeners('dtmf');
     clearTimeout(this.interDigitTimer);
     this._clearAsrTimer();
@@ -534,7 +510,7 @@ class TaskGather extends SttTask {
     this._clearAsrTimer();
     this._asrTimer = setTimeout(() => {
       this.logger.debug('_startAsrTimer - asr timer went off');
-      const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
+      const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language);
       this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout', evt);
     }, this.asrTimeout);
     this.logger.debug(`_startAsrTimer: set for ${this.asrTimeout}ms`);
@@ -545,104 +521,6 @@ class TaskGather extends SttTask {
     this._asrTimer = null;
   }
 
-  _hangupCall() {
-    this.logger.debug('_hangupCall');
-    this.cs.hangup();
-  }
-
-  _actionHookDelaySayAction(verb) {
-    delete verb.verb;
-    this.logger.debug(`_actionHookDelaySayAction ${verb}`);
-    this._actionHookDelaySayTask = makeTask(this.logger, {say: verb}, this);
-    const {span, ctx} = this.startChildSpan(`actionHookDelayAction:${this._actionHookDelaySayTask.summary}`);
-    this._actionHookDelaySayTask.span = span;
-    this._actionHookDelaySayTask.ctx = ctx;
-    this._actionHookDelaySayTask.exec(this.cs, {ep: this.ep});
-    this._actionHookDelaySayTask.on('playDone', (err) => {
-      this._actionHookDelaySayTask = null;
-      span.end();
-      if (err) this.logger.error({err}, 'Gather:actionHookDelay Error playing tts');
-    });
-  }
-
-  _killActionHookDelayAction() {
-    this.logger.debug('_killActionHookDelayAction');
-    if (this._actionHookDelaySayTask && !this._actionHookDelaySayTask.killed) {
-      this._actionHookDelaySayTask.removeAllListeners('playDone');
-      this._actionHookDelaySayTask.kill(this.cs);
-      this._actionHookDelaySayTask.span.end();
-      this._actionHookDelaySayTask = null;
-    }
-
-    if (this._actionHookDelayPlayTask && !this._actionHookDelayPlayTask.killed) {
-      this._actionHookDelayPlayTask.removeAllListeners('playDone');
-      this._actionHookDelayPlayTask.kill(this.cs);
-      this._actionHookDelayPlayTask.span.end();
-      this._actionHookDelayPlayTask = null;
-    }
-  }
-
-  _actionHookDelayPlayAction(verb) {
-    delete verb.verb;
-    this.logger.debug(`_actionHookDelayPlayAction ${verb}`);
-    this._actionHookDelayPlayTask = makeTask(this.logger, {play: verb}, this);
-    const {span, ctx} = this.startChildSpan(`actionHookDelayAction:${this._actionHookDelayPlayTask.summary}`);
-    this._actionHookDelayPlayTask.span = span;
-    this._actionHookDelayPlayTask.ctx = ctx;
-    this._actionHookDelayPlayTask.exec(this.cs, {ep: this.ep});
-    this._actionHookDelayPlayTask.on('playDone', (err) => {
-      this._actionHookDelayPlayTask = null;
-      span.end();
-      if (err) this.logger.error({err}, 'Gather:actionHookDelay Error playing tts');
-    });
-
-  }
-
-  _startActionHookNoResponseTimer() {
-    assert(this._hookNoResponseTimeout > 0);
-    this._clearActionHookNoResponseTimer();
-    this.logger.debug('startActionHookNoResponseTimer');
-    this._actionHookNoResponseTimer = setTimeout(() => {
-      if (this._hookDelayRetryCount >= this._hookDelayRetries) {
-        this._hangupCall();
-        return;
-      }
-      const verb = this._hookDelayActions[this._hookDelayRetryCount % this._hookDelayActions.length];
-      if (verb.verb === 'say') {
-        this._actionHookDelaySayAction(verb);
-      } else if (verb.verb === 'play') {
-        this._actionHookDelayPlayAction(verb);
-      }
-      this._hookDelayRetryCount++;
-      this._startActionHookNoResponseTimer();
-
-    }, this._hookNoResponseTimeout);
-
-  }
-
-  _clearActionHookNoResponseTimer() {
-    if (this._actionHookNoResponseTimer) {
-      clearTimeout(this._actionHookNoResponseTimer);
-    }
-    this._actionHookNoResponseTimer = null;
-  }
-
-  _startActionHookNoResponseGiveUpTimer() {
-    assert(this._hookNoResponseGiveUpTimeout > 0);
-    this._clearActionHookNoResponseGiveUpTimer();
-    this.logger.debug('startActionHookNoResponseGiveUpTimer');
-    this._actionHookNoResponseGiveUpTimer = setTimeout(() => {
-      this._hangupCall();
-    }, this._hookNoResponseGiveUpTimeout);
-  }
-
-  _clearActionHookNoResponseGiveUpTimer() {
-    if (this._actionHookNoResponseGiveUpTimer) {
-      clearTimeout(this._actionHookNoResponseGiveUpTimer);
-    }
-    this._actionHookNoResponseGiveUpTimer = null;
-  }
-
   _startFastRecognitionTimer(evt) {
     assert(this.fastRecognitionTimeout > 0);
     this._clearFastRecognitionTimer();
@@ -663,7 +541,7 @@ class TaskGather extends SttTask {
     this._clearFinalAsrTimer();
     this._finalAsrTimer = setTimeout(() => {
       this.logger.debug('_startFinalAsrTimer - final asr timer went off');
-      const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
+      const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language);
       this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout', evt);
     }, 1000);
     this.logger.debug('_startFinalAsrTimer: set for 1 second');
@@ -700,10 +578,11 @@ class TaskGather extends SttTask {
     // make sure this is not a transcript from answering machine detection
     const bugname = fsEvent.getHeader('media-bugname');
     const finished = fsEvent.getHeader('transcription-session-finished');
-    this.logger.debug({evt, bugname, finished, vendor: this.vendor}, 'Gather:_onTranscription raw transcript');
+    this.logger.debug({evt, bugname, finished}, `Gather:_onTranscription for vendor ${this.vendor}`);
     if (bugname && this.bugname !== bugname) return;
 
     if (this.vendor === 'ibm' && evt?.state === 'listening') return;
+
     if (this.vendor === 'deepgram' && evt.type === 'UtteranceEnd') {
       /* we will only get this when we have set utterance_end_ms */
       if (this._bufferedTranscripts.length === 0) {
@@ -711,21 +590,15 @@ class TaskGather extends SttTask {
       }
       else {
         this.logger.debug('Gather:_onTranscription - got UtteranceEnd event from deepgram, return buffered transcript');
-        evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
+        evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language);
         this._bufferedTranscripts = [];
         this._resolve('speech', evt);
       }
       return;
     }
-    if (this.vendor === 'deepgram' && evt.type === 'Metadata') {
-      this.logger.debug('Gather:_onTranscription - discarding Metadata event from deepgram');
-      return;
-    }
 
     evt = this.normalizeTranscription(evt, this.vendor, 1, this.language,
       this.shortUtterance, this.data.recognizer.punctuation);
-    //this.logger.debug({evt, bugname, finished, vendor: this.vendor}, 'Gather:_onTranscription normalized transcript');
-
     if (evt.alternatives.length === 0) {
       this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, continue listening');
       return;
@@ -787,7 +660,7 @@ class TaskGather extends SttTask {
         this._clearTimer();
         if (this._finalAsrTimer) {
           this._clearFinalAsrTimer();
-          const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
+          const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language);
           return this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout', evt);
         }
         this._startAsrTimer();
@@ -816,7 +689,7 @@ class TaskGather extends SttTask {
 
             /* deepgram can send an empty and final transcript; only if we have any buffered should we resolve */
             if (this._bufferedTranscripts.length === 0) return;
-            evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
+            evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language);
             this._bufferedTranscripts = [];
           }
 
@@ -826,26 +699,13 @@ class TaskGather extends SttTask {
       }
     }
     else {
-      /* deepgram can send a non-final transcript but with words that are final, so we need to buffer */
-      let emptyTranscript = false;
-      if (this.vendor === 'deepgram') {
-        const originalEvent = evt.vendor.evt;
-        if (originalEvent.is_final && evt.alternatives[0].transcript !== '') {
-          this.logger.debug({evt}, 'Gather:_onTranscription - buffering a completed (partial) deepgram transcript');
-          this._bufferedTranscripts.push(evt);
-        }
-        if (evt.alternatives[0].transcript === '') emptyTranscript = true;
-      }
-
-      if (!emptyTranscript) {
-        if (this._clearTimer()) this._startTimer();
-        if (this.bargein && (words + bufferedWords) >= this.minBargeinWordCount) {
-          if (!this.playComplete) {
-            this.logger.debug({transcript: evt.alternatives[0].transcript}, 'killing audio due to speech');
-            this.emit('vad');
-          }
-          this._killAudio(cs);
+      if (this._clearTimer()) this._startTimer();
+      if (this.bargein && (words + bufferedWords) >= this.minBargeinWordCount) {
+        if (!this.playComplete) {
+          this.logger.debug({transcript: evt.alternatives[0].transcript}, 'killing audio due to speech');
+          this.emit('vad');
         }
+        this._killAudio(cs);
       }
       if (this.fastRecognitionTimeout) {
         this._startFastRecognitionTimer(evt);
@@ -863,6 +723,14 @@ class TaskGather extends SttTask {
           this._sonioxTranscripts.push(evt.vendor.finalWords);
         }
       }
+      /* deepgram can send a non-final transcript but with words that are final, so we need to buffer */
+      if (this.vendor === 'deepgram') {
+        const originalEvent = evt.vendor.evt;
+        if (originalEvent.is_final && evt.alternatives[0].transcript !== '') {
+          this.logger.debug({evt}, 'Gather:_onTranscription - buffering a completed (partial) deepgram transcript');
+          this._bufferedTranscripts.push(evt);
+        }
+      }
     }
   }
   _onEndOfUtterance(cs, ep) {
@@ -970,8 +838,10 @@ class TaskGather extends SttTask {
     // If bargin is false and ws application return ack to verb:hook
     // the gather should not play any audio
     this._killAudio(this.cs);
-    // Clear dtmf events, to avoid any case can leak the listener, just clean it
-    this.ep.removeAllListeners('dtmf');
+    // Clear dtmf event
+    if (this.dtmfBargein) {
+      this.ep.removeAllListeners('dtmf');
+    }
     clearTimeout(this.interDigitTimer);
     this._clearTimer();
     this._clearFastRecognitionTimer();
@@ -995,15 +865,6 @@ class TaskGather extends SttTask {
       return;
     }
 
-    // Enabled action Hook delay timer to applied actions
-    if (this._hookNoResponseTimeout > 0) {
-      this._startActionHookNoResponseTimer();
-    }
-
-    if (this._hookNoResponseGiveUpTimeout > 0) {
-      this._startActionHookNoResponseGiveUpTimer();
-    }
-
     try {
       if (reason.startsWith('dtmf')) {
         if (this.parentTask) this.parentTask.emit('dtmf', evt);
@@ -1034,11 +895,6 @@ class TaskGather extends SttTask {
         }
       }
     } catch (err) {  /*already logged error*/ }
-
-    // Gather got response from hook, cancel all delay timers if there is any
-    this._clearActionHookNoResponseTimer();
-    this._clearActionHookNoResponseGiveUpTimer();
-
     this.notifyTaskDone();
   }
 }

lib/tasks/say.js

@@ -103,7 +103,7 @@ class TaskSay extends Task {
       voice = this.options.voice_id || voice;
     }
 
-    ep.set({
+    this.ep.set({
       tts_engine: vendor,
       tts_voice: voice,
       cache_speech_handles: 1,
@@ -179,7 +179,7 @@ class TaskSay extends Task {
           }
           else {
             this.logger.debug('a streaming tts api will be used');
-            const modifiedPath = filePath.replace('say:{', `say:{session-uuid=${ep.uuid},`);
+            const modifiedPath = filePath.replace('say:{', `say:{session-uuid=${this.ep.uuid},`);
             return modifiedPath;
           }
           return filePath;
@@ -261,12 +261,12 @@ class TaskSay extends Task {
     }
     this.notifyStatus({event: 'start-playback'});
 
-    while (!this.killed && (this.loop === 'forever' || this.loop--) && ep?.connected) {
+    while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep?.connected) {
       let segment = 0;
       while (!this.killed && segment < filepath.length) {
         if (cs.isInConference) {
           const {memberId, confName, confUuid} = cs;
-          await this.playToConfMember(ep, memberId, confName, confUuid, filepath[segment]);
+          await this.playToConfMember(this.ep, memberId, confName, confUuid, filepath[segment]);
         }
         else {
           if (filepath[segment].startsWith('say:{')) {
@@ -274,16 +274,17 @@ class TaskSay extends Task {
             if (arr) this.logger.debug(`Say:exec sending streaming tts request: ${arr[1].substring(0, 64)}..`);
           }
           else this.logger.debug(`Say:exec sending  ${filepath[segment].substring(0, 64)}`);
-          ep.once('playback-start', (evt) => {
+          this.ep.once('playback-start', (evt) => {
             this.logger.debug({evt}, 'got playback-start');
             if (this.otelSpan) {
+              this.logger.debug({evt}, 'got playback-start');
               this._addStreamingTtsAttributes(this.otelSpan, evt);
               this.otelSpan.end();
               this.otelSpan = null;
               if (evt.variable_tts_cache_filename) cs.trackTmpFile(evt.variable_tts_cache_filename);
             }
           });
-          ep.once('playback-stop', (evt) => {
+          this.ep.once('playback-stop', (evt) => {
             this.logger.debug({evt}, 'got playback-stop');
             if (evt.variable_tts_error) {
               writeAlerts({
@@ -320,7 +321,7 @@ class TaskSay extends Task {
 
   async kill(cs) {
     super.kill(cs);
-    if (this.ep?.connected) {
+    if (this.ep.connected) {
       this.logger.debug('TaskSay:kill - killing audio');
       if (cs.isInConference) {
         const {memberId, confName} = cs;
@@ -340,13 +341,11 @@ class TaskSay extends Task {
     for (const [key, value] of Object.entries(evt)) {
       if (key.startsWith('variable_tts_')) {
         let newKey = key.substring('variable_tts_'.length)
-          .replace('whisper_', 'whisper.')
           .replace('elevenlabs_', 'elevenlabs.');
         if (spanMapping[newKey]) newKey = spanMapping[newKey];
         attrs[newKey] = value;
       }
     }
-    delete attrs['cache_filename']; //no value in adding this to the span
     span.setAttributes(attrs);
   }
 }
@@ -356,14 +355,6 @@ const spanMapping = {
   'elevenlabs.request_id': 'elevenlabs.req_id',
   'elevenlabs.history_item_id': 'elevenlabs.item_id',
   'elevenlabs.optimize_streaming_latency': 'elevenlabs.optimization',
-  'elevenlabs.name_lookup_time_ms': 'name_lookup_ms',
-  'elevenlabs.connect_time_ms': 'connect_ms',
-  'elevenlabs.final_response_time_ms': 'final_response_ms',
-  'whisper.reported_latency_ms': 'whisper.latency_ms',
-  'whisper.request_id': 'whisper.req_id',
-  'whisper.name_lookup_time_ms': 'name_lookup_ms',
-  'whisper.connect_time_ms': 'connect_ms',
-  'whisper.final_response_time_ms': 'final_response_ms',
 };
 
 module.exports = TaskSay;

lib/tasks/task.js

@@ -173,13 +173,6 @@ class Task extends Emitter {
            * first new set of verbs arrive after sending a transcript
            * */
           this.emit('VerbHookSpanWaitForEnd', {span});
-
-          // If actionHook delay action is configured, and ws application have not responded yet any verb for actionHook
-          // We have to transfer the task to call-session to await on next ws command verbs, and also run action Hook
-          // delay actions
-          if (this.hookDelayActionOpts) {
-            this.emit('ActionHookDelayActionOptions', this.hookDelayActionOpts);
-          }
         }
         if (expectResponse && json && Array.isArray(json)) {
           const makeTask = require('./make_task');

lib/tasks/transcribe.js

@@ -31,11 +31,6 @@ class TaskTranscribe extends SttTask {
       this.separateRecognitionPerChannel = this.data.recognizer.separateRecognitionPerChannel;
     }
 
-    /* for nested transcribe in dial, unless the app explicitly says so we want to transcribe both legs */
-    if (this.parentTask?.name === TaskName.Dial && this.separateRecognitionPerChannel !== false) {
-      this.separateRecognitionPerChannel = true;
-    }
-
     this.childSpan = [null, null];
 
     // Continuous asr timeout
@@ -303,12 +298,12 @@ class TaskTranscribe extends SttTask {
   async _onTranscription(cs, ep, channel, evt, fsEvent) {
     // make sure this is not a transcript from answering machine detection
     const bugname = fsEvent.getHeader('media-bugname');
-    const finished = fsEvent.getHeader('transcription-session-finished');
     if (bugname && this.bugname !== bugname) return;
     if (this.paused) {
       this.logger.debug({evt}, 'TaskTranscribe:_onTranscription - paused, ignoring transcript');
     }
 
+
     if (this.vendor === 'ibm' && evt?.state === 'listening') return;
 
     if (this.vendor === 'deepgram' && evt.type === 'UtteranceEnd') {
@@ -318,10 +313,9 @@ class TaskTranscribe extends SttTask {
       }
       else {
         this.logger.debug('Gather:_onTranscription - got UtteranceEnd event from deepgram, return buffered transcript');
-        evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
-        evt.is_final = true;
+        evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language);
         this._bufferedTranscripts = [];
-        this._resolve(channel, evt);
+        this._resolve('speech', evt);
       }
       return;
     }
@@ -335,89 +329,31 @@ class TaskTranscribe extends SttTask {
       return;
     }
 
-    let emptyTranscript = false;
-    if (evt.is_final) {
-      if (evt.alternatives[0].transcript === '' && !cs.callGone && !this.killed) {
-        emptyTranscript = true;
-        if (finished === 'true' &&
-          ['microsoft', 'deepgram'].includes(this.vendor) &&
-          this._bufferedTranscripts.length === 0) {
-          this.logger.debug({evt}, 'TaskGather:_onTranscription - got empty transcript from old gather, disregarding');
-          return;
-        }
-        else if (this.vendor !== 'deepgram') {
-          this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, continue listening');
-          return;
-        }
-        else if (this.isContinuousAsr) {
-          this.logger.info({evt},
-            'TaskGather:_onTranscription - got empty deepgram transcript during continous asr, continue listening');
-          return;
-        }
-        else if (this.vendor === 'deepgram' && this._bufferedTranscripts.length > 0) {
-          this.logger.info({evt},
-            'TaskGather:_onTranscription - got empty transcript from deepgram, return the buffered transcripts');
-        }
-      }
-      if (this.isContinuousAsr) {
-        /* append the transcript and start listening again for asrTimeout */
-        const t = evt.alternatives[0].transcript;
-        if (t) {
-          /* remove trailing punctuation */
-          if (/[,;:\.!\?]$/.test(t)) {
-            this.logger.debug('TaskGather:_onTranscription - removing trailing punctuation');
-            evt.alternatives[0].transcript = t.slice(0, -1);
-          }
-        }
-        this.logger.info({evt}, 'TaskGather:_onTranscription - got transcript during continous asr');
-        this._bufferedTranscripts.push(evt);
-        this._startAsrTimer(channel);
-
-        /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google']
-          .includes(this.vendor)) this._startTranscribing(cs, ep, channel);
+    if (evt.alternatives[0]?.transcript === '' && !cs.callGone && !this.killed) {
+      if (['microsoft', 'deepgram'].includes(this.vendor)) {
+        this.logger.info({evt}, 'TaskTranscribe:_onTranscription - got empty transcript, continue listening');
       }
       else {
-        if (this.vendor === 'soniox') {
-          /* compile transcripts into one */
-          this._sonioxTranscripts.push(evt.vendor.finalWords);
-          evt = this.compileSonioxTranscripts(this._sonioxTranscripts, 1, this.language);
-          this._sonioxTranscripts = [];
-        }
-        else if (this.vendor === 'deepgram') {
-          /* compile transcripts into one */
-          if (!emptyTranscript) this._bufferedTranscripts.push(evt);
+        this.logger.info({evt}, 'TaskTranscribe:_onTranscription - got empty transcript, listen again');
+        this._transcribe(ep);
+      }
+      return;
+    }
 
-          /* deepgram can send an empty and final transcript; only if we have any buffered should we resolve */
-          if (this._bufferedTranscripts.length === 0) return;
-          evt = this.consolidateTranscripts(this._bufferedTranscripts, channel, this.language);
-          this._bufferedTranscripts = [];
-        }
-
-        /* here is where we return a final transcript */
-        this.logger.debug({evt}, 'TaskTranscribe:_onTranscription - sending final transcript');
-        this._resolve(channel, evt);
-        /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google']
-          .includes(this.vendor)) this._startTranscribing(cs, ep, channel);
+    if (this.vendor === 'soniox') {
+      /* compile transcripts into one */
+      this._sonioxTranscripts.push(evt.vendor.finalWords);
+      if (evt.is_final) {
+        evt = this.compileSonioxTranscripts(this._sonioxTranscripts, 1, this.language);
+        this._sonioxTranscripts = [];
       }
     }
-    else {
-      /* interim transcript */
 
-      /* deepgram can send a non-final transcript but with words that are final, so we need to buffer */
-      if (this.vendor === 'deepgram') {
-        const originalEvent = evt.vendor.evt;
-        if (originalEvent.is_final && evt.alternatives[0].transcript !== '') {
-          this.logger.debug({evt}, 'Gather:_onTranscription - buffering a completed (partial) deepgram transcript');
-          this._bufferedTranscripts.push(evt);
-        }
-      }
-
-      if (this.interim) {
-        this.logger.debug({evt}, 'TaskTranscribe:_onTranscription - sending interim transcript');
-        this._resolve(channel, evt);
-      }
+    if (this.isContinuousAsr && evt.is_final) {
+      this._bufferedTranscripts.push(evt);
+      this._startAsrTimer(channel);
+    } else {
+      await this._resolve(channel, evt);
     }
   }
 
@@ -570,7 +506,7 @@ class TaskTranscribe extends SttTask {
     this._clearAsrTimer(channel);
     this._asrTimer = setTimeout(() => {
       this.logger.debug(`TaskTranscribe:_startAsrTimer - asr timer went off for channel: ${channel}`);
-      const evt = this.consolidateTranscripts(this._bufferedTranscripts, channel, this.language, this.vendor);
+      const evt = this.consolidateTranscripts(this._bufferedTranscripts, channel, this.language);
       this._bufferedTranscripts = [];
       this._resolve(channel, evt);
     }, this.asrTimeout);

lib/utils/background-task-manager.js

@@ -133,7 +133,8 @@ class BackgroundTaskManager extends Emitter {
   async _initRecord() {
     if (this.cs.accountInfo.account.record_all_calls || this.cs.application.record_all_calls) {
       if (!JAMBONZ_RECORD_WS_BASE_URL || !this.cs.accountInfo.account.bucket_credential) {
-        this.logger.error('_initRecord: invalid cfg - missing JAMBONZ_RECORD_WS_BASE_URL or bucket config');
+        this.logger.error(`_initRecord: invalid configuration,
+ missing JAMBONZ_RECORD_WS_BASE_URL or bucket configuration`);
         return undefined;
       }
       const listenOpts = {
@@ -174,7 +175,7 @@ class BackgroundTaskManager extends Emitter {
   }
 
   _taskCompleted(type, task) {
-    this.logger.debug({type, task}, `BackgroundTaskManager:_taskCompleted: task completed, sticky: ${task.sticky}`);
+    this.logger.debug({type, task}, 'BackgroundTaskManager:_taskCompleted: task completed');
     task.removeAllListeners();
     task.span.end();
     this.tasks.delete(type);
@@ -187,8 +188,7 @@ class BackgroundTaskManager extends Emitter {
   }
 
   _bargeInTaskCompleted(evt) {
-    this.logger.debug({evt},
-      'BackgroundTaskManager:_bargeInTaskCompleted on event from background bargeIn, emitting bargein-done event');
+    this.logger.debug({evt}, 'BackgroundTaskManager:_bargeInTaskCompleted on event from background bargeIn');
     this.emit('bargeIn-done', evt);
   }
 }

lib/utils/constants.json

@@ -30,7 +30,6 @@
     "Transcribe": "transcribe"
   },
   "AllowedSipRecVerbs": ["config", "gather", "transcribe", "listen", "tag"],
-  "AllowedConfirmSessionVerbs": ["config", "gather", "plays", "say", "tag"],
   "CallStatus": {
     "Trying": "trying",
     "Ringing": "ringing",

lib/utils/place-outdial.js

@@ -16,6 +16,7 @@ const uuidv4 = require('uuid-random');
 const HttpRequestor = require('./http-requestor');
 const WsRequestor = require('./ws-requestor');
 const {makeOpusFirst} = require('./sdp-utils');
+const listTaskNames = require('./summarize-tasks');
 const {
   JAMBONES_USE_FREESWITCH_TIMER_FD
 } = require('../config');
@@ -353,7 +354,6 @@ class SingleDialer extends Emitter {
       const json = await this.requestor.request('dial:confirm', confirmHook, this.callInfo.toJSON());
       if (!json || (Array.isArray(json) && json.length === 0)) {
         this.logger.info('SingleDialer:_executeApp: no tasks returned from confirm hook');
-        this.emit('accept');
         return;
       }
       const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
@@ -392,7 +392,7 @@ class SingleDialer extends Emitter {
     }
   }
 
-  async doAdulting({logger, tasks, application}) {
+  async doAdulting({logger, tasks, application, call_hook_url}) {
     this.adulting = true;
     this.emit('adulting');
     if (this.ep) {
@@ -411,6 +411,9 @@ class SingleDialer extends Emitter {
     //clone application from parent call with new requestor
     //parrent application will be closed in case the parent hangup
     const app = {...application};
+    if (call_hook_url) {
+      app.call_hook.url = call_hook_url;
+    }
     if ('WS' === app.call_hook?.method ||
       app.call_hook?.url.startsWith('ws://') || app.call_hook?.url.startsWith('wss://')) {
       const requestor = new WsRequestor(logger, this.accountInfo.account.account_sid,
@@ -427,6 +430,16 @@ class SingleDialer extends Emitter {
         this.accountInfo.account.webhook_secret);
       else app.notifier = {request: () => {}, close: () => {}};
     }
+    // Time to open session:new for adulting call
+    // If ws is used, open session:new to control the call later.
+    if (!tasks || tasks.length === 0 || app.requestor instanceof WsRequestor) {
+      const b3 = rootSpan?.getTracingPropagation();
+      const httpHeaders = b3 && {b3};
+      const newTask = await app.requestor.request(
+        'session:new', call_hook_url, this.callInfo.toJSON(), httpHeaders);
+      tasks = normalizeJambones(newLogger, newTask).map((tdata) => makeTask(newLogger, tdata));
+      newLogger.info({tasks: listTaskNames(tasks)}, 'SingleDialer:doAdulting new task list for adulting call');
+    }
     // Replace old application with new application.
     this.application = app;
     const cs = new AdultingCallSession({

lib/utils/transcription-utils.js

@@ -150,7 +150,7 @@ const selectDefaultDeepgramModel = (task, language) => {
   return 'base';
 };
 
-const consolidateTranscripts = (bufferedTranscripts, channel, language, vendor) => {
+const consolidateTranscripts = (bufferedTranscripts, channel, language) => {
   if (bufferedTranscripts.length === 1) return bufferedTranscripts[0];
   let totalConfidence = 0;
   const finalTranscript = bufferedTranscripts.reduce((acc, evt) => {
@@ -191,7 +191,7 @@ const consolidateTranscripts = (bufferedTranscripts, channel, language, vendor)
     totalConfidence / bufferedTranscripts.length;
   finalTranscript.alternatives[0].transcript = finalTranscript.alternatives[0].transcript.trim();
   finalTranscript.vendor = {
-    name: vendor,
+    name: 'deepgram',
     evt: bufferedTranscripts
   };
   return finalTranscript;
@@ -488,13 +488,6 @@ module.exports = (logger) => {
 
     if ('google' === vendor) {
       const model = task.name === TaskName.Gather ? 'command_and_search' : 'latest_long';
-      /**
-       * When we support google v2 the models are different and we will want something like:
-       * const useV2 = sttCredentials?.credentials?.project_id; //TODO: v2 pref should be set in googleOptions
-       * const model = task.name === TaskName.Gather ?
-       *  (useV2 ? 'telephony_short' : 'command_and_search') :
-       * (useV2 ? 'long' : 'latest_long');
-       */
       opts = {
         ...opts,
         ...(sttCredentials && {GOOGLE_APPLICATION_CREDENTIALS: JSON.stringify(sttCredentials.credentials)}),
@@ -527,12 +520,6 @@ module.exports = (logger) => {
         ...{GOOGLE_SPEECH_MODEL: rOpts.model || model},
         ...(rOpts.naicsCode > 0 && {GOOGLE_SPEECH_METADATA_INDUSTRY_NAICS_CODE: rOpts.naicsCode}),
         GOOGLE_SPEECH_METADATA_RECORDING_DEVICE_TYPE: 'phone_line',
-        /*
-        ...(useV2 && {
-          GOOGLE_SPEECH_RECOGNIZER_PARENT: `projects/${sttCredentials.credentials.project_id}/locations/global`,
-          GOOGLE_SPEECH_CLOUD_SERVICES_VERSION: 'v2'
-      }),
-      */
       };
     }
     else if (['aws', 'polly'].includes(vendor)) {
@@ -571,8 +558,6 @@ module.exports = (logger) => {
         ...{AZURE_USE_OUTPUT_FORMAT_DETAILED: 1},
         ...(azureOptions.speechSegmentationSilenceTimeoutMs &&
           {AZURE_SPEECH_SEGMENTATION_SILENCE_TIMEOUT_MS: azureOptions.speechSegmentationSilenceTimeoutMs}),
-        ...(azureOptions.languageIdMode &&
-          {AZURE_LANGUAGE_ID_MODE: azureOptions.languageIdMode}),
         ...(sttCredentials && {
           ...(sttCredentials.api_key && {AZURE_SUBSCRIPTION_KEY: sttCredentials.api_key}),
           ...(sttCredentials.region && {AZURE_REGION: sttCredentials.region}),

package-lock.json

@@ -15,10 +15,10 @@
         "@jambonz/http-health-check": "^0.0.1",
         "@jambonz/mw-registrar": "^0.2.4",
         "@jambonz/realtimedb-helpers": "^0.8.7",
-        "@jambonz/speech-utils": "^0.0.42",
+        "@jambonz/speech-utils": "^0.0.41",
         "@jambonz/stats-collector": "^0.1.9",
         "@jambonz/time-series": "^0.2.8",
-        "@jambonz/verb-specifications": "^0.0.63",
+        "@jambonz/verb-specifications": "^0.0.53",
         "@opentelemetry/api": "^1.4.0",
         "@opentelemetry/exporter-jaeger": "^1.9.0",
         "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
@@ -31,11 +31,11 @@
         "bent": "^7.3.12",
         "debug": "^4.3.4",
         "deepcopy": "^2.1.0",
-        "drachtio-fsmrf": "^3.0.38",
+        "drachtio-fsmrf": "^3.0.37",
         "drachtio-srf": "^4.5.31",
         "express": "^4.18.2",
         "express-validator": "^7.0.1",
-        "ip": "^1.1.9",
+        "ip": "^1.1.8",
         "moment": "^2.29.4",
         "parse-url": "^8.1.0",
         "pino": "^8.8.0",
@@ -45,7 +45,7 @@
         "short-uuid": "^4.2.2",
         "sinon": "^15.0.1",
         "to-snake-case": "^1.0.0",
-        "undici": "^5.28.3",
+        "undici": "^5.26.2",
         "uuid-random": "^1.3.2",
         "verify-aws-sns-signature": "^0.1.0",
         "ws": "^8.9.0",
@@ -3468,9 +3468,9 @@
       }
     },
     "node_modules/@jambonz/speech-utils": {
-      "version": "0.0.42",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.42.tgz",
-      "integrity": "sha512-ROYin2JqV41Q9T14SOpaXBAvalkOAiMGzCxG9Q1d3XCvxDQ/QQXHbZeFdd9cc64eq4OJNtd9lxmnCS+DSPNuXQ==",
+      "version": "0.0.41",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.41.tgz",
+      "integrity": "sha512-i07b4usrw5olnqU0WCRbTVzWauvA2IEfpFeKfdAxeTZ8VbbpKeTOTCfEpz4DlkOWGcR8kWrdM9DWbK4fjv/t1w==",
       "dependencies": {
         "@aws-sdk/client-polly": "^3.496.0",
         "@aws-sdk/client-sts": "^3.496.0",
@@ -3517,9 +3517,9 @@
       }
     },
     "node_modules/@jambonz/verb-specifications": {
-      "version": "0.0.63",
-      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.63.tgz",
-      "integrity": "sha512-eVO/W1z/y3U6xvwWdbdl3QGACJPcjgsGARcuzeqnafD5n8M22htM9HfHBXjw6L6TfQBc1NEFkRIF/1wx3GEyHA==",
+      "version": "0.0.53",
+      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.53.tgz",
+      "integrity": "sha512-CXQlFuHgPcjB8UR75Zxh41aF2Q/QegBAq+zsuegmpeD5fwI6EEvydAm2aSDICNhtp7iN13KzQ6wlh5u9TQnR0Q==",
       "dependencies": {
         "debug": "^4.3.4",
         "pino": "^8.8.0"
@@ -6110,9 +6110,9 @@
       }
     },
     "node_modules/drachtio-fsmrf": {
-      "version": "3.0.38",
-      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.38.tgz",
-      "integrity": "sha512-nR/FPEqgGxKkqYxU+afRivIyDQOpZJbLLd2ydYlubFsUWYxDugPu2rGT6/t0fYgePn6qpA418z+uMA65aB8Q/w==",
+      "version": "3.0.37",
+      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.37.tgz",
+      "integrity": "sha512-YS1H6w//Bj5Kk1pUXGaXHYWig/kowdBEoO/ApfKrnzwXIDyf9OVeSBmJ7gnAb5st6WszhByZE6S3ib3zbc68CQ==",
       "dependencies": {
         "camel-case": "^4.1.2",
         "debug": "^2.6.9",
@@ -7764,9 +7764,9 @@
       }
     },
     "node_modules/ip": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
+      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
     },
     "node_modules/ip6addr": {
       "version": "0.2.5",
@@ -10841,9 +10841,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "5.28.3",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz",
-      "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==",
+      "version": "5.26.2",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.2.tgz",
+      "integrity": "sha512-a4PDLQgLTPHVzOK+x3F79/M4GtyYPl+aX9AAK7aQxpwxDwCqkeZCScy7Gk5kWT3JtdFq1uhO3uZJdLtHI4dK9A==",
       "dependencies": {
         "@fastify/busboy": "^2.0.0"
       },
@@ -14112,9 +14112,9 @@
       }
     },
     "@jambonz/speech-utils": {
-      "version": "0.0.42",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.42.tgz",
-      "integrity": "sha512-ROYin2JqV41Q9T14SOpaXBAvalkOAiMGzCxG9Q1d3XCvxDQ/QQXHbZeFdd9cc64eq4OJNtd9lxmnCS+DSPNuXQ==",
+      "version": "0.0.41",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.41.tgz",
+      "integrity": "sha512-i07b4usrw5olnqU0WCRbTVzWauvA2IEfpFeKfdAxeTZ8VbbpKeTOTCfEpz4DlkOWGcR8kWrdM9DWbK4fjv/t1w==",
       "requires": {
         "@aws-sdk/client-polly": "^3.496.0",
         "@aws-sdk/client-sts": "^3.496.0",
@@ -14160,9 +14160,9 @@
       }
     },
     "@jambonz/verb-specifications": {
-      "version": "0.0.63",
-      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.63.tgz",
-      "integrity": "sha512-eVO/W1z/y3U6xvwWdbdl3QGACJPcjgsGARcuzeqnafD5n8M22htM9HfHBXjw6L6TfQBc1NEFkRIF/1wx3GEyHA==",
+      "version": "0.0.53",
+      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.53.tgz",
+      "integrity": "sha512-CXQlFuHgPcjB8UR75Zxh41aF2Q/QegBAq+zsuegmpeD5fwI6EEvydAm2aSDICNhtp7iN13KzQ6wlh5u9TQnR0Q==",
       "requires": {
         "debug": "^4.3.4",
         "pino": "^8.8.0"
@@ -16191,9 +16191,9 @@
       }
     },
     "drachtio-fsmrf": {
-      "version": "3.0.38",
-      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.38.tgz",
-      "integrity": "sha512-nR/FPEqgGxKkqYxU+afRivIyDQOpZJbLLd2ydYlubFsUWYxDugPu2rGT6/t0fYgePn6qpA418z+uMA65aB8Q/w==",
+      "version": "3.0.37",
+      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.37.tgz",
+      "integrity": "sha512-YS1H6w//Bj5Kk1pUXGaXHYWig/kowdBEoO/ApfKrnzwXIDyf9OVeSBmJ7gnAb5st6WszhByZE6S3ib3zbc68CQ==",
       "requires": {
         "camel-case": "^4.1.2",
         "debug": "^2.6.9",
@@ -17485,9 +17485,9 @@
       }
     },
     "ip": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
+      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
     },
     "ip6addr": {
       "version": "0.2.5",
@@ -19822,9 +19822,9 @@
       }
     },
     "undici": {
-      "version": "5.28.3",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz",
-      "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==",
+      "version": "5.26.2",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.2.tgz",
+      "integrity": "sha512-a4PDLQgLTPHVzOK+x3F79/M4GtyYPl+aX9AAK7aQxpwxDwCqkeZCScy7Gk5kWT3JtdFq1uhO3uZJdLtHI4dK9A==",
       "requires": {
         "@fastify/busboy": "^2.0.0"
       }

package.json

@@ -31,10 +31,10 @@
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/mw-registrar": "^0.2.4",
     "@jambonz/realtimedb-helpers": "^0.8.7",
-    "@jambonz/speech-utils": "^0.0.42",
+    "@jambonz/speech-utils": "^0.0.41",
     "@jambonz/stats-collector": "^0.1.9",
     "@jambonz/time-series": "^0.2.8",
-    "@jambonz/verb-specifications": "^0.0.63",
+    "@jambonz/verb-specifications": "^0.0.53",
     "@opentelemetry/api": "^1.4.0",
     "@opentelemetry/exporter-jaeger": "^1.9.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
@@ -47,11 +47,11 @@
     "bent": "^7.3.12",
     "debug": "^4.3.4",
     "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.38",
+    "drachtio-fsmrf": "^3.0.37",
     "drachtio-srf": "^4.5.31",
     "express": "^4.18.2",
     "express-validator": "^7.0.1",
-    "ip": "^1.1.9",
+    "ip": "^1.1.8",
     "moment": "^2.29.4",
     "parse-url": "^8.1.0",
     "pino": "^8.8.0",
@@ -61,7 +61,7 @@
     "short-uuid": "^4.2.2",
     "sinon": "^15.0.1",
     "to-snake-case": "^1.0.0",
-    "undici": "^5.28.3",
+    "undici": "^5.26.2",
     "uuid-random": "^1.3.2",
     "verify-aws-sns-signature": "^0.1.0",
     "ws": "^8.9.0",

test/docker-compose-testbed.yaml

@@ -42,7 +42,7 @@ services:
         ipv4_address: 172.38.0.7
 
   drachtio:
-    image: drachtio/drachtio-server:0.8.25-rc8
+    image: drachtio/drachtio-server:0.8.24
     restart: always
     command: drachtio --contact "sip:*;transport=udp" --mtu 4096 --address 0.0.0.0 --port 9022
     ports:
@@ -57,7 +57,7 @@ services:
         condition: service_healthy
 
   freeswitch:
-    image: drachtio/drachtio-freeswitch-mrf:0.6.2
+    image: drachtio/drachtio-freeswitch-mrf:0.6.1
     restart: always
     command: freeswitch --rtp-range-start 20000 --rtp-range-end 20100
     environment: