Fix/replace application issue (#692)

* fix scenario where ws replace application from gather while awaiting command and no tasks on execution stack

* lint

* remove some debug logging

.gitignore

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

.vscode/launch.json

@@ -1,17 +0,0 @@
-{
-  // 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/session/adulting-call-session.js

@@ -53,16 +53,24 @@ 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 caller'});
-      this.callInfo.callTerminationBy = 'caller';
+      this.rootSpan.setAttributes({'call.termination': `hangup by ${terminatedBy}`});
+      this.callInfo.callTerminationBy = terminatedBy;
       this.emit('callStatusChange', {
         callStatus: CallStatus.Completed,
         duration
       });
     }
-    this.logger.info('InboundCallSession: caller hung up');
+    this.logger.info(`InboundCallSession: ${terminatedBy} hung up`);
     this._callReleased();
     this.req.removeAllListeners('cancel');
   }

lib/session/call-session.js

@@ -622,8 +622,10 @@ class CallSession extends Emitter {
       const res = await this.dlg.request({
         method: 'INFO',
         headers: {
-          'X-Reason': 'pauseCallRecording'
-        }
+          'X-Reason': 'pauseCallRecording',
+          ...(this.recordOptions.headers && {'Content-Type': 'application/json'})
+        },
+        ...(this.recordOptions.headers && {body: JSON.stringify(this.recordOptions.headers) + '\n'})
       });
       if (res.status === 200) {
         this._recordState = RecordState.RecordingPaused;
@@ -644,8 +646,10 @@ class CallSession extends Emitter {
       const res = await this.dlg.request({
         method: 'INFO',
         headers: {
-          'X-Reason': 'resumeCallRecording'
-        }
+          'X-Reason': 'resumeCallRecording',
+          ...(this.recordOptions.headers && {'Content-Type': 'application/json'})
+        },
+        ...(this.recordOptions.headers && {body: JSON.stringify(this.recordOptions.headers) + '\n'})
       });
       if (res.status === 200) {
         this._recordState = RecordState.RecordingOn;
@@ -680,7 +684,8 @@ class CallSession extends Emitter {
       }
       task = await this.backgroundTaskManager.newTask('bargeIn', gather);
       task.sticky = autoEnable;
-      task.once('bargeIn-done', () => {
+      // listen to the bargein-done from background manager
+      this.backgroundTaskManager.once('bargeIn-done', () => {
         if (this.requestor instanceof WsRequestor) {
           try {
             this.kill(true);
@@ -935,7 +940,6 @@ class CallSession extends Emitter {
     // all done - cleanup
     this.logger.info('CallSession:exec all tasks complete');
     this._stopping = true;
-    this.disableBotMode();
     this._onTasksDone();
     this._clearResources();
 
@@ -1443,6 +1447,11 @@ 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) {
@@ -1467,7 +1476,8 @@ Duration=${duration} `
           this.logger.info('CallSession:kill - found bargein disabled in the stack, clearing to that point');
           break;
         }
-        this.tasks.shift();
+        const rem = this.tasks.shift();
+        this.logger.debug(`CallSession:kill - clearing task ${rem.summary}`);
       }
     }
     else this.tasks = [];
@@ -1827,6 +1837,14 @@ 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
    */
@@ -2255,7 +2273,7 @@ Duration=${duration} `
       this.logger.debug(`CallSession:_startActionHookNoResponseTimer ${options.noResponseTimeoutMs}`);
       this._actionHookNoResponseTimer = setTimeout(() => {
         if (this._actionHookDelayRetryCount >= options.retries) {
-          this._callerHungup();
+          this._jambonzHangup();
         }
         const verb = options.actions[this._actionHookDelayRetryCount % options.actions.length];
         // Inject verb to main stack
@@ -2293,7 +2311,7 @@ Duration=${duration} `
       this.logger.debug(`CallSession:_startActionHookNoResponseGiveUpTimer ${options.noResponseGiveUpTimeoutMs}`);
       this._actionHookNoResponseGiveUpTimer = setTimeout(() => {
         this.logger.debug('CallSession:_startActionHookNoResponseGiveUpTimer Timeout');
-        this._callerHungup();
+        this._jambonzHangup();
         this._actionHookNoResponseGiveUpTimer = null;
       }, options.noResponseGiveUpTimeoutMs);
     }

lib/session/confirm-call-session.js

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

lib/session/inbound-call-session.js

@@ -67,19 +67,27 @@ 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:_callerHungup - race condition, dlg cleared by app hangup');
+      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 caller'});
-    this.callInfo.callTerminationBy = 'caller';
+    this.rootSpan.setAttributes({'call.termination': `hangup by ${terminatedBy}`});
+    this.callInfo.callTerminationBy = terminatedBy;
     this.emit('callStatusChange', {
       callStatus: CallStatus.Completed,
       duration
     });
-    this.logger.info('InboundCallSession: caller hung up');
+    this.logger.info(`InboundCallSession: ${terminatedBy} hung up`);
     this._callReleased();
     this.req.removeAllListeners('cancel');
   }

lib/session/rest-call-session.js

@@ -49,13 +49,21 @@ 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 = 'caller';
+    this.callInfo.callTerminationBy = terminatedBy;
     const duration = moment().diff(this.dlg.connectTime, 'seconds');
     this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
-    this.logger.debug('RestCallSession: called party hung up');
+    this.logger.debug(`RestCallSession: called party hung up by ${terminatedBy}`);
     this._callReleased();
   }
 

lib/tasks/gather.js

@@ -139,28 +139,27 @@ class TaskGather extends SttTask {
       this.logger.debug('Gather:exec - early hints match enabled');
     }
     // actionHook delay
-    this._actionHookDelayEnabled = cs.actionHookDelayEnabled || !!this.actionHookDelayAction;
-    this._actionHookDelayActions = this.actionHookDelayAction && this.actionHookDelayAction.actions ?
-      this.actionHookDelayAction.actions : cs.actionHookDelayActions || [];
-    if (this._actionHookDelayEnabled && this._actionHookDelayActions.length > 0) {
-      this._actionHookNoResponseTimeout = (this.actionHookDelayAction && this.actionHookDelayAction.noResponseTimeout ?
-        this.actionHookDelayAction.noResponseTimeout : cs.actionHookNoResponseTimeout || 0) * 1000;
+    this._hookDelayEn = cs.actionHookDelayEnabled || !!this.actionHookDelayAction;
 
-      this._actionHookNoResponseGiveUpTimeout = (this.actionHookDelayAction &&
-        this.actionHookDelayAction.noResponseGiveUpTimeout ?
-        this.actionHookDelayAction.noResponseGiveUpTimeout : cs.actionHookNoResponseGiveUpTimeout || 0) * 1000;
+    this._hookDelayActions = this.actionHookDelayAction?.actions || cs.actionHookDelayActions || [];
 
-      this._actionHookDelayRetries = this.actionHookDelayAction && this.actionHookDelayAction.retries ?
-        this.actionHookDelayAction.retries : cs.actionHookDelayRetries || 1;
-      this._actionHookDelayTryCount = 0;
-      this.actionHookDelayActionOptions = {
-        enabled: this._actionHookDelayEnabled,
-        actions: this._actionHookDelayActions,
-        noResponseTimeoutMs: this._actionHookNoResponseTimeout,
-        noResponseGiveUpTimeoutMs: this._actionHookNoResponseGiveUpTimeout,
-        retries: this._actionHookDelayRetries
-      };
-    }
+    // 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();
@@ -535,7 +534,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);
+      const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
       this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout', evt);
     }, this.asrTimeout);
     this.logger.debug(`_startAsrTimer: set for ${this.asrTimeout}ms`);
@@ -600,24 +599,24 @@ class TaskGather extends SttTask {
   }
 
   _startActionHookNoResponseTimer() {
-    assert(this._actionHookNoResponseTimeout > 0);
+    assert(this._hookNoResponseTimeout > 0);
     this._clearActionHookNoResponseTimer();
     this.logger.debug('startActionHookNoResponseTimer');
     this._actionHookNoResponseTimer = setTimeout(() => {
-      if (this._actionHookDelayTryCount >= this._actionHookDelayRetries) {
+      if (this._hookDelayRetryCount >= this._hookDelayRetries) {
         this._hangupCall();
         return;
       }
-      const verb = this._actionHookDelayActions[this._actionHookDelayTryCount % this._actionHookDelayActions.length];
+      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._actionHookDelayTryCount++;
+      this._hookDelayRetryCount++;
       this._startActionHookNoResponseTimer();
 
-    }, this._actionHookNoResponseTimeout);
+    }, this._hookNoResponseTimeout);
 
   }
 
@@ -629,12 +628,12 @@ class TaskGather extends SttTask {
   }
 
   _startActionHookNoResponseGiveUpTimer() {
-    assert(this._actionHookNoResponseGiveUpTimeout > 0);
+    assert(this._hookNoResponseGiveUpTimeout > 0);
     this._clearActionHookNoResponseGiveUpTimer();
     this.logger.debug('startActionHookNoResponseGiveUpTimer');
     this._actionHookNoResponseGiveUpTimer = setTimeout(() => {
       this._hangupCall();
-    }, this._actionHookNoResponseGiveUpTimeout);
+    }, this._hookNoResponseGiveUpTimeout);
   }
 
   _clearActionHookNoResponseGiveUpTimer() {
@@ -664,7 +663,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);
+      const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
       this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout', evt);
     }, 1000);
     this.logger.debug('_startFinalAsrTimer: set for 1 second');
@@ -701,11 +700,10 @@ 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}, `Gather:_onTranscription for vendor ${this.vendor}`);
+    this.logger.debug({evt, bugname, finished, vendor: this.vendor}, 'Gather:_onTranscription raw transcript');
     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) {
@@ -713,15 +711,21 @@ 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);
+        evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
         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;
@@ -783,7 +787,7 @@ class TaskGather extends SttTask {
         this._clearTimer();
         if (this._finalAsrTimer) {
           this._clearFinalAsrTimer();
-          const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language);
+          const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
           return this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout', evt);
         }
         this._startAsrTimer();
@@ -812,7 +816,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);
+            evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
             this._bufferedTranscripts = [];
           }
 
@@ -966,10 +970,8 @@ 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 event
-    if (this.dtmfBargein) {
-      this.ep.removeAllListeners('dtmf');
-    }
+    // Clear dtmf events, to avoid any case can leak the listener, just clean it
+    this.ep.removeAllListeners('dtmf');
     clearTimeout(this.interDigitTimer);
     this._clearTimer();
     this._clearFastRecognitionTimer();
@@ -994,11 +996,11 @@ class TaskGather extends SttTask {
     }
 
     // Enabled action Hook delay timer to applied actions
-    if (this._actionHookNoResponseTimeout > 0) {
+    if (this._hookNoResponseTimeout > 0) {
       this._startActionHookNoResponseTimer();
     }
 
-    if (this._actionHookNoResponseGiveUpTimeout > 0) {
+    if (this._hookNoResponseGiveUpTimeout > 0) {
       this._startActionHookNoResponseGiveUpTimer();
     }
 

lib/tasks/say.js

@@ -277,7 +277,6 @@ class TaskSay extends Task {
           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;
@@ -341,11 +340,13 @@ 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);
   }
 }
@@ -355,6 +356,14 @@ 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

@@ -177,8 +177,8 @@ class Task extends Emitter {
           // 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.actionHookDelayActionOptions) {
-            this.emit('ActionHookDelayActionOptions', this.actionHookDelayActionOptions);
+          if (this.hookDelayActionOpts) {
+            this.emit('ActionHookDelayActionOptions', this.hookDelayActionOpts);
           }
         }
         if (expectResponse && json && Array.isArray(json)) {

lib/tasks/transcribe.js

@@ -31,6 +31,11 @@ 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
@@ -313,7 +318,7 @@ 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);
+        evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
         this._bufferedTranscripts = [];
         this._resolve('speech', evt);
       }
@@ -506,7 +511,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);
+      const evt = this.consolidateTranscripts(this._bufferedTranscripts, channel, this.language, this.vendor);
       this._bufferedTranscripts = [];
       this._resolve(channel, evt);
     }, this.asrTimeout);

lib/utils/background-task-manager.js

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

lib/utils/transcription-utils.js

@@ -150,7 +150,7 @@ const selectDefaultDeepgramModel = (task, language) => {
   return 'base';
 };
 
-const consolidateTranscripts = (bufferedTranscripts, channel, language) => {
+const consolidateTranscripts = (bufferedTranscripts, channel, language, vendor) => {
   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) => {
     totalConfidence / bufferedTranscripts.length;
   finalTranscript.alternatives[0].transcript = finalTranscript.alternatives[0].transcript.trim();
   finalTranscript.vendor = {
-    name: 'deepgram',
+    name: vendor,
     evt: bufferedTranscripts
   };
   return finalTranscript;
@@ -488,6 +488,13 @@ 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)}),
@@ -520,6 +527,12 @@ 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)) {
@@ -558,6 +571,8 @@ 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.41",
+        "@jambonz/speech-utils": "^0.0.42",
         "@jambonz/stats-collector": "^0.1.9",
         "@jambonz/time-series": "^0.2.8",
-        "@jambonz/verb-specifications": "^0.0.53",
+        "@jambonz/verb-specifications": "^0.0.63",
         "@opentelemetry/api": "^1.4.0",
         "@opentelemetry/exporter-jaeger": "^1.9.0",
         "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
@@ -31,7 +31,7 @@
         "bent": "^7.3.12",
         "debug": "^4.3.4",
         "deepcopy": "^2.1.0",
-        "drachtio-fsmrf": "^3.0.37",
+        "drachtio-fsmrf": "^3.0.38",
         "drachtio-srf": "^4.5.31",
         "express": "^4.18.2",
         "express-validator": "^7.0.1",
@@ -3468,9 +3468,9 @@
       }
     },
     "node_modules/@jambonz/speech-utils": {
-      "version": "0.0.41",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.41.tgz",
-      "integrity": "sha512-i07b4usrw5olnqU0WCRbTVzWauvA2IEfpFeKfdAxeTZ8VbbpKeTOTCfEpz4DlkOWGcR8kWrdM9DWbK4fjv/t1w==",
+      "version": "0.0.42",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.42.tgz",
+      "integrity": "sha512-ROYin2JqV41Q9T14SOpaXBAvalkOAiMGzCxG9Q1d3XCvxDQ/QQXHbZeFdd9cc64eq4OJNtd9lxmnCS+DSPNuXQ==",
       "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.53",
-      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.53.tgz",
-      "integrity": "sha512-CXQlFuHgPcjB8UR75Zxh41aF2Q/QegBAq+zsuegmpeD5fwI6EEvydAm2aSDICNhtp7iN13KzQ6wlh5u9TQnR0Q==",
+      "version": "0.0.63",
+      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.63.tgz",
+      "integrity": "sha512-eVO/W1z/y3U6xvwWdbdl3QGACJPcjgsGARcuzeqnafD5n8M22htM9HfHBXjw6L6TfQBc1NEFkRIF/1wx3GEyHA==",
       "dependencies": {
         "debug": "^4.3.4",
         "pino": "^8.8.0"
@@ -6110,9 +6110,9 @@
       }
     },
     "node_modules/drachtio-fsmrf": {
-      "version": "3.0.37",
-      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.37.tgz",
-      "integrity": "sha512-YS1H6w//Bj5Kk1pUXGaXHYWig/kowdBEoO/ApfKrnzwXIDyf9OVeSBmJ7gnAb5st6WszhByZE6S3ib3zbc68CQ==",
+      "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==",
       "dependencies": {
         "camel-case": "^4.1.2",
         "debug": "^2.6.9",
@@ -14112,9 +14112,9 @@
       }
     },
     "@jambonz/speech-utils": {
-      "version": "0.0.41",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.41.tgz",
-      "integrity": "sha512-i07b4usrw5olnqU0WCRbTVzWauvA2IEfpFeKfdAxeTZ8VbbpKeTOTCfEpz4DlkOWGcR8kWrdM9DWbK4fjv/t1w==",
+      "version": "0.0.42",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.42.tgz",
+      "integrity": "sha512-ROYin2JqV41Q9T14SOpaXBAvalkOAiMGzCxG9Q1d3XCvxDQ/QQXHbZeFdd9cc64eq4OJNtd9lxmnCS+DSPNuXQ==",
       "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.53",
-      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.53.tgz",
-      "integrity": "sha512-CXQlFuHgPcjB8UR75Zxh41aF2Q/QegBAq+zsuegmpeD5fwI6EEvydAm2aSDICNhtp7iN13KzQ6wlh5u9TQnR0Q==",
+      "version": "0.0.63",
+      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.63.tgz",
+      "integrity": "sha512-eVO/W1z/y3U6xvwWdbdl3QGACJPcjgsGARcuzeqnafD5n8M22htM9HfHBXjw6L6TfQBc1NEFkRIF/1wx3GEyHA==",
       "requires": {
         "debug": "^4.3.4",
         "pino": "^8.8.0"
@@ -16191,9 +16191,9 @@
       }
     },
     "drachtio-fsmrf": {
-      "version": "3.0.37",
-      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.37.tgz",
-      "integrity": "sha512-YS1H6w//Bj5Kk1pUXGaXHYWig/kowdBEoO/ApfKrnzwXIDyf9OVeSBmJ7gnAb5st6WszhByZE6S3ib3zbc68CQ==",
+      "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==",
       "requires": {
         "camel-case": "^4.1.2",
         "debug": "^2.6.9",

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.41",
+    "@jambonz/speech-utils": "^0.0.42",
     "@jambonz/stats-collector": "^0.1.9",
     "@jambonz/time-series": "^0.2.8",
-    "@jambonz/verb-specifications": "^0.0.53",
+    "@jambonz/verb-specifications": "^0.0.63",
     "@opentelemetry/api": "^1.4.0",
     "@opentelemetry/exporter-jaeger": "^1.9.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
@@ -47,7 +47,7 @@
     "bent": "^7.3.12",
     "debug": "^4.3.4",
     "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.37",
+    "drachtio-fsmrf": "^3.0.38",
     "drachtio-srf": "^4.5.31",
     "express": "^4.18.2",
     "express-validator": "^7.0.1",