linting fixes

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:17.4-slim
+FROM node:17-slim
 WORKDIR /opt/app/
 COPY package.json ./
 RUN npm install

app.js

@@ -31,7 +31,6 @@ const {
 
 // HTTP
 const express = require('express');
-const helmet = require('helmet');
 const app = express();
 Object.assign(app.locals, {
   logger,
@@ -74,8 +73,6 @@ srf.invite((req, res) => {
 });
 
 // HTTP
-app.use(helmet());
-app.use(helmet.hidePoweredBy());
 app.use(express.urlencoded({ extended: true }));
 app.use(express.json());
 app.use('/', httpRoutes);

lib/http-routes/api/create-call.js

@@ -35,8 +35,6 @@ router.post('/', async(req, res) => {
 
     opts.headers = {
       ...opts.headers,
-      'X-Jambonz-Routing': target.type,
-      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
       'X-Call-Sid': callSid,
       'X-Account-Sid': req.body.account_sid
     };

lib/session/call-info.js

@@ -1,6 +1,7 @@
 const {CallDirection, CallStatus} = require('../utils/constants');
 const parseUri = require('drachtio-srf').parseUri;
 const { v4: uuidv4 } = require('uuid');
+
 /**
  * @classdesc Represents the common information for all calls
  * that is provided in call status webhooks
@@ -8,7 +9,6 @@ const { v4: uuidv4 } = require('uuid');
 class CallInfo {
   constructor(opts) {
     let from ;
-    let srf;
     this.direction = opts.direction;
     if (opts.req) {
       const u = opts.req.getParsedHeader('from');
@@ -19,7 +19,6 @@ class CallInfo {
     if (this.direction === CallDirection.Inbound) {
       // inbound call
       const {app, req} = opts;
-      srf = req.srf;
       this.callSid = req.locals.callSid,
       this.accountSid = app.account_sid,
       this.applicationSid = app.application_sid;
@@ -34,7 +33,6 @@ class CallInfo {
     else if (opts.parentCallInfo) {
       // outbound call that is a child of an existing call
       const {req, parentCallInfo, to, callSid} = opts;
-      srf = req.srf;
       this.callSid = callSid || uuidv4();
       this.parentCallSid = parentCallInfo.callSid;
       this.accountSid = parentCallInfo.accountSid;
@@ -49,7 +47,6 @@ class CallInfo {
     else if (this.direction === CallDirection.None) {
       // outbound SMS
       const {messageSid, accountSid, applicationSid, res} = opts;
-      srf = res.srf;
       this.messageSid = messageSid;
       this.accountSid = accountSid;
       this.applicationSid = applicationSid;
@@ -58,7 +55,6 @@ class CallInfo {
     else {
       // outbound call triggered by REST
       const {req, callSid, accountSid, applicationSid, to, tag} = opts;
-      srf = req.srf;
       this.callSid = callSid;
       this.accountSid = accountSid;
       this.applicationSid = applicationSid;
@@ -69,11 +65,6 @@ class CallInfo {
       this.to = to;
       if (tag) this._customerData = tag;
     }
-
-    this.localSipAddress = srf.locals.localSipAddress;
-    if (srf.locals.publicIp) {
-      this.publicIp = srf.locals.publicIp;
-    }
   }
 
   /**
@@ -109,8 +100,7 @@ class CallInfo {
       callStatus: this.callStatus,
       callerId: this.callerId,
       accountSid: this.accountSid,
-      applicationSid: this.applicationSid,
-      fsSipAddress: this.localSipAddress
+      applicationSid: this.applicationSid
     };
     ['parentCallSid', 'originatingSipIp', 'originatingSipTrunkName'].forEach((prop) => {
       if (this[prop]) obj[prop] = this[prop];
@@ -120,13 +110,6 @@ class CallInfo {
     if (this._customerData) {
       Object.assign(obj, {customerData: this._customerData});
     }
-
-    if (process.env.JAMBONES_API_BASE_URL) {
-      Object.assign(obj, {apiBaseUrl: process.env.JAMBONES_API_BASE_URL});
-    }
-    if (this.publicIp) {
-      Object.assign(obj, {fsPublicIp: this.publicIp});
-    }
     return obj;
   }
 

lib/session/call-session.js

@@ -48,7 +48,6 @@ class CallSession extends Emitter {
     this.taskIdx = 0;
     this.stackIdx = 0;
     this.callGone = false;
-    this.notifiedComplete = false;
 
     this.tmpFiles = new Set();
 
@@ -265,12 +264,6 @@ class CallSession extends Emitter {
             region: credential.region
           };
         }
-        else if ('wellsaid' === vendor) {
-          return {
-            speech_credential_sid: credential.speech_credential_sid,
-            api_key: credential.api_key
-          };
-        }
       }
       else {
         writeAlerts({
@@ -989,12 +982,6 @@ class CallSession extends Emitter {
   _notifyCallStatusChange({callStatus, sipStatus, duration}) {
     if (this.callMoved) return;
 
-    /* race condition: we hang up at the same time as the caller */
-    if (callStatus === CallStatus.Completed) {
-      if (this.notifiedComplete) return;
-      this.notifiedComplete = true;
-    }
-
     assert((typeof duration === 'number' && callStatus === CallStatus.Completed) ||
       (!duration && callStatus !== CallStatus.Completed),
     'duration MUST be supplied when call completed AND ONLY when call completed');

lib/tasks/cognigy/index.js

@@ -1,7 +1,8 @@
-const Task = require('./task');
-const {TaskName, TaskPreconditions} = require('../utils/constants');
-const makeTask = require('./make_task');
+const Task = require('../task');
+const {TaskName, TaskPreconditions} = require('../../utils/constants');
+const makeTask = require('../make_task');
 const { SocketClient } = require('@cognigy/socket-client');
+const SpeechConfig = require('./speech-config');
 
 const parseGallery = (obj = {}) => {
   const {_default} = obj;
@@ -45,6 +46,8 @@ class Cognigy extends Task {
     this.actionHook = this.data?.actionHook;
     this.data = this.data.data || {};
     this.prompts = [];
+    this.retry = {};
+    this.timeoutCount = 0;
   }
 
   get name() { return TaskName.Cognigy; }
@@ -56,27 +59,33 @@ class Cognigy extends Task {
   async exec(cs, ep) {
     await super.exec(cs);
 
+    const opts = {
+      session: {
+        synthesizer: this.data.synthesizer || {
+          vendor: 'default',
+          language: 'default',
+          voice: 'default'
+        },
+        recognizer: this.data.recognizer || {
+          vendor: 'default',
+          language: 'default'
+        },
+        bargein: this.data.bargein || {},
+        bot: this.data.bot || {},
+        user: this.data.user || {},
+        dtmf: this.data.dtmf || {}
+      }
+    };
+    this.config = new SpeechConfig({logger: this.logger, ep, opts});
     this.ep = ep;
     try {
+
       /* set event handlers and start transcribing */
       this.on('transcription', this._onTranscription.bind(this, cs, ep));
+      this.on('dtmf-collected', this._onDtmf.bind(this, cs, ep));
+      this.on('timeout', this._onTimeout.bind(this, cs, ep));
       this.on('error', this._onError.bind(this, cs, ep));
 
-      this.transcribeTask = this._makeTranscribeTask();
-      this.transcribeTask.exec(cs, ep, this)
-        .catch((err) => {
-          this.logger.info({err}, 'Cognigy transcribe task returned error');
-          this.notifyTaskDone();
-        });
-      if (this.prompt) {
-        this.sayTask = this._makeSayTask(this.prompt);
-        this.sayTask.exec(cs, ep, this)
-          .catch((err) => {
-            this.logger.info({err}, 'Cognigy say task returned error');
-            this.notifyTaskDone();
-          });
-      }
-
       /* connect to the bot and send initial data */
       this.client = new SocketClient(
         this.url,
@@ -92,7 +101,6 @@ class Cognigy extends Task {
         }
       );
       this.client.on('output', this._onBotUtterance.bind(this, cs, ep));
-      this.client.on('typingStatus', this._onBotTypingStatus.bind(this, cs, ep));
       this.client.on('error', this._onBotError.bind(this, cs, ep));
       this.client.on('finalPing', this._onBotFinalPing.bind(this, cs, ep));
       await this.client.connect();
@@ -127,17 +135,12 @@ class Cognigy extends Task {
     this.notifyTaskDone();
   }
 
-  _makeTranscribeTask() {
-    const opts = {
-      recognizer: this.data.recognizer || {
-        vendor: 'default',
-        language: 'default',
-        outputFormat: 'detailed'
-      }
-    };
-    this.logger.debug({opts}, 'constructing a nested transcribe object');
-    const transcribe = makeTask(this.logger, {transcribe: opts}, this);
-    return transcribe;
+  _makeGatherTask({textPrompt, urlPrompt}) {
+    const config = this.config.makeGatherTaskConfig({textPrompt, urlPrompt});
+    const {retry, ...rest} = config;
+    this.retry = retry;
+    const gather = makeTask(this.logger, {gather: rest}, this);
+    return gather;
   }
 
   _makeSayTask(text) {
@@ -150,7 +153,6 @@ class Cognigy extends Task {
         voice: 'default'
       }
     };
-    this.logger.debug({opts}, 'constructing a nested say object');
     const say = makeTask(this.logger, {say: opts}, this);
     return say;
   }
@@ -162,23 +164,17 @@ class Cognigy extends Task {
     this.notifyTaskDone();
   }
 
-  async _onBotTypingStatus(cs, ep, evt) {
-    this.logger.info({evt}, 'Cognigy:_onBotTypingStatus');
-  }
   async _onBotFinalPing(cs, ep) {
-    this.logger.info('Cognigy:_onBotFinalPing');
+    this.logger.info({prompts: this.prompts}, 'Cognigy:_onBotFinalPing');
     if (this.prompts.length) {
       const text = this.prompts.join('.');
-      this.prompts = [];
       if (text && !this.killed) {
-        this.sayTask = this._makeSayTask(text);
-        this.sayTask.exec(cs, ep, this)
-          .catch((err) => {
-            this.logger.info({err}, 'Cognigy say task returned error');
-            this.notifyTaskDone();
-          });
+        this.gatherTask = this._makeGatherTask({textPrompt: text});
+        this.gatherTask.exec(cs, ep, this)
+          .catch((err) => this.logger.info({err}, 'Cognigy gather task returned error'));
       }
     }
+    this.prompts = [];
   }
 
   async _onBotUtterance(cs, ep, evt) {
@@ -199,7 +195,8 @@ class Cognigy extends Task {
         });
     }
     const text = parseBotText(evt);
-    this.prompts.push(text);
+    if (evt.data) this.config.update(evt.data);
+    if (text) this.prompts.push(text);
   }
 
   async _onTranscription(cs, ep, evt) {
@@ -237,12 +234,46 @@ class Cognigy extends Task {
       this.notifyTaskDone();
     }
   }
+
+  _onDtmf(cs, ep, evt) {
+    this.logger.info({evt}, 'got dtmf');
+
+    /* send dtmf to bot */
+    try {
+      if (this.client && this.client.connected) {
+        this.client.sendMessage(evt.digits);
+      }
+      else {
+        this.logger.info('Cognigy_onTranscription - not sending user dtmf as bot is disconnected');
+      }
+    } catch (err) {
+      this.logger.error({err}, '_onDtmf: Error sending user dtmf to Cognigy - ending task');
+      this.performAction({cognigyResult: 'socketError'});
+      this.reportedFinalAction = true;
+      this.notifyTaskDone();
+    }
+  }
   _onError(cs, ep, err) {
-    this.logger.debug({err}, 'Cognigy: got error');
+    this.logger.info({err}, 'Cognigy: got error');
     if (!this.hasReportedFinalAction) this.performAction({cognigyResult: 'error', err});
     this.reportedFinalAction = true;
     this.notifyTaskDone();
   }
+
+  _onTimeout(cs, ep, evt) {
+    const {noInputRetries, noInputSpeech, noInputUrl} = this.retry;
+    this.logger.debug({evt, retry: this.retry}, 'Cognigy: got timeout');
+    if (noInputRetries && this.timeoutCount++ < noInputRetries) {
+      this.gatherTask = this._makeGatherTask({textPrompt: noInputSpeech, urlPrompt: noInputUrl});
+      this.gatherTask.exec(cs, ep, this)
+        .catch((err) => this.logger.info({err}, 'Cognigy gather task returned error'));
+    }
+    else {
+      if (!this.hasReportedFinalAction) this.performAction({cognigyResult: 'timeout'});
+      this.reportedFinalAction = true;
+      this.notifyTaskDone();
+    }
+  }
 }
 
 module.exports = Cognigy;

lib/tasks/cognigy/speech-config.js

@@ -0,0 +1,90 @@
+const Emitter = require('events');
+
+const hasKeys = (obj) => typeof obj === 'object' && Object.keys(obj) > 0;
+
+const stripNulls = (obj) => {
+  Object.keys(obj).forEach((k) => (obj[k] === null || typeof obj[k] === 'undefined') && delete obj[k]);
+  return obj;
+};
+
+class SpeechConfig extends Emitter {
+  constructor({logger, ep, opts = {}}) {
+    super();
+    this.logger = logger;
+    this.ep = ep;
+    this.sessionConfig = opts.session || {};
+    this.turnConfig = opts.nextTurn || {};
+    this.update(opts);
+  }
+
+  update(opts = {}) {
+    const {session, nextTurn = {}} = opts;
+    if (session) this.sessionConfig = {...this.sessionConfig, ...session};
+    this.turnConfig = nextTurn;
+    this.logger.debug({opts, sessionLevel: this.sessionConfig, turnLevel: this.turnConfig}, 'SpeechConfig updated');
+  }
+
+  makeGatherTaskConfig({textPrompt, urlPrompt}) {
+    const opts = JSON.parse(JSON.stringify(this.sessionConfig || {}));
+    const nextTurnKeys = Object.keys(this.turnConfig || {});
+    const newKeys = nextTurnKeys.filter((k) => !(k in opts));
+    const bothKeys = nextTurnKeys.filter((k) => k in opts);
+
+    for (const key of newKeys) opts[key] = this.turnConfig[key];
+    for (const key of bothKeys) opts[key] = {...opts[key], ...this.turnConfig[key]};
+
+    this.logger.debug({
+      opts,
+      sessionConfig: this.sessionConfig,
+      turnConfig: this.turnConfig,
+    }, 'Congigy SpeechConfig:_makeGatherTask current options');
+
+    /* input type: speech and/or dtmf entry */
+    const input = [];
+    if (opts.recognizer) input.push('speech');
+    if (hasKeys(opts.dtmf)) input.push('digits');
+
+    /* bargein settings */
+    const bargein = opts.bargein || {};
+    const speechBargein = Array.isArray(bargein.enable) && bargein.enable.includes('speech');
+    const dtmfBargein = Array.isArray(bargein.enable) && bargein.enable.includes('dtmf');
+    const minBargeinWordCount = speechBargein ? (bargein.minWordCount || 1) : 0;
+    const {interDigitTimeout = 0, maxDigits, minDigits = 1, submitDigit} = (opts.dtmf || {});
+    const {noInputTimeout, noInputRetries, noInputSpeech, noInputUrl} = (opts.user || {});
+    const sayConfig = {
+      text: textPrompt,
+      synthesizer: opts.synthesizer
+    };
+    const playConfig = {
+      url: urlPrompt
+    };
+    const config = {
+      input,
+      listenDuringPrompt: speechBargein,
+      bargein: speechBargein,
+      minBargeinWordCount,
+      dtmfBargein,
+      minDigits,
+      maxDigits,
+      interDigitTimeout,
+      finishOnKey: submitDigit,
+      recognizer: opts?.recognizer,
+      timeout: noInputTimeout,
+      retry : {
+        noInputRetries,
+        noInputSpeech,
+        noInputUrl
+      }
+    };
+
+    const final = stripNulls(config);
+
+    /* turn config can now be emptied for next turn of conversation */
+    this.turnConfig = {};
+    return textPrompt ?
+      {...final, say: sayConfig} :
+      {...final, play: playConfig};
+  }
+}
+
+module.exports = SpeechConfig;

lib/tasks/conference.js

@@ -453,7 +453,7 @@ class Conference extends Task {
         this._playSession = null;
         break;
       }
-    } while (!this.killed && this.conf_hold_status !== 'hold');
+    } while (!this.killed && !this.conf_hold_status === 'hold');
   }
 
   /**

lib/tasks/dial.js

@@ -147,7 +147,7 @@ class TaskDial extends Task {
           this.epOther.play(this.dialMusic).catch((err) => {});
         }
       }
-      if (!this.killed) await this._attemptCalls(cs);
+      await this._attemptCalls(cs);
       await this.awaitTaskDone();
       this.logger.debug({callSid: this.cs.callSid}, 'Dial:exec task is done, sending actionHook if any');
       await this.performAction(this.results, this.killReason !== KillReason.Replaced);
@@ -179,7 +179,6 @@ class TaskDial extends Task {
     this._killOutdials();
     if (this.sd) {
       this.sd.kill();
-      this.sd.removeAllListeners();
       this.sd = null;
     }
     if (this.callSid) sessionTracker.remove(this.callSid);
@@ -367,9 +366,6 @@ class TaskDial extends Task {
             opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
           }
         }
-
-        if (this.killed) return;
-
         const sd = placeCall({
           logger: this.logger,
           application: cs.application,
@@ -385,9 +381,7 @@ class TaskDial extends Task {
 
         sd
           .on('callCreateFail', () => {
-            clearTimeout(this.timerRing);
             this.dials.delete(sd.callSid);
-            sd.removeAllListeners();
             if (this.dials.size === 0 && !this.sd) {
               this.logger.debug('Dial:_attemptCalls - all calls failed after call create err, ending task');
               this.kill(cs);
@@ -429,7 +423,6 @@ class TaskDial extends Task {
           })
           .on('accept', async() => {
             this.logger.debug(`Dial:_attemptCalls - we have a winner: ${sd.callSid}`);
-            clearTimeout(this.timerRing);
             try {
               await this._connectSingleDial(cs, sd);
             } catch (err) {
@@ -438,9 +431,7 @@ class TaskDial extends Task {
           })
           .on('decline', () => {
             this.logger.debug(`Dial:_attemptCalls - declined: ${sd.callSid}`);
-            clearTimeout(this.timerRing);
             this.dials.delete(sd.callSid);
-            sd.removeAllListeners();
             if (this.dials.size === 0 && !this.sd) {
               this.logger.debug('Dial:_attemptCalls - all calls failed after decline, ending task');
               this.kill(cs);

lib/tasks/gather.js

@@ -16,13 +16,15 @@ class TaskGather extends Task {
     this.preconditions = TaskPreconditions.Endpoint;
 
     [
-      'finishOnKey', 'hints', 'input', 'numDigits',
-      'partialResultHook',
+      'finishOnKey', 'hints', 'input', 'numDigits', 'minDigits', 'maxDigits',
+      'interDigitTimeout', 'submitDigit', 'partialResultHook', 'bargein', 'dtmfBargein',
+      'retries', 'retryPromptTts', 'retryPromptUrl',
       'speechTimeout', 'timeout', 'say', 'play'
     ].forEach((k) => this[k] = this.data[k]);
-
-    this.timeout = (this.timeout || 5) * 1000;
-    this.interim = this.partialResultCallback;
+    this.listenDuringPrompt = this.data.listenDuringPrompt === false ? false : true;
+    this.minBargeinWordCount = this.data.minBargeinWordCount || 1;
+    this.timeout = (this.timeout || 15) * 1000;
+    this.interim = this.partialResultCallback || this.bargein;
     if (this.data.recognizer) {
       const recognizer = this.data.recognizer;
       this.vendor = recognizer.vendor;
@@ -30,10 +32,6 @@ class TaskGather extends Task {
       this.hints = recognizer.hints || [];
       this.altLanguages = recognizer.altLanguages || [];
 
-      /* vad: if provided, we dont connect to recognizer until voice activity is detected */
-      const {enable, voiceMs = 0, mode = -1} = recognizer.vad || {};
-      this.vad = {enable, voiceMs, mode};
-
       /* aws options */
       this.vocabularyName = recognizer.vocabularyName;
       this.vocabularyFilterName = recognizer.vocabularyFilterName;
@@ -84,33 +82,50 @@ class TaskGather extends Task {
       throw new Error(`no speech-to-text service credentials for ${this.vendor} have been configured`);
     }
 
+    const startListening = (cs, ep) => {
+      this._startTimer();
+      if (this.input.includes('speech') && !this.listenDuringPrompt) {
+        this._initSpeech(cs, ep)
+          .then(() => {
+            this._startTranscribing(ep);
+            return updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
+          })
+          .catch(() => {});
+      }
+    };
+
     try {
       if (this.sayTask) {
+        this.logger.debug('Gather: kicking off say task');
         this.sayTask.exec(cs, ep);  // kicked off, _not_ waiting for it to complete
-        this.sayTask.on('playDone', (err) => {
-          if (!this.killed) this._startTimer();
+        this.sayTask.on('playDone', async(err) => {
+          if (err) return this.logger.error({err}, 'Gather:exec Error playing tts');
+          this.logger.debug('Gather: say task completed');
+          if (!this.killed) startListening(cs, ep);
         });
       }
       else if (this.playTask) {
         this.playTask.exec(cs, ep);  // kicked off, _not_ waiting for it to complete
-        this.playTask.on('playDone', (err) => {
-          if (!this.killed) this._startTimer();
+        this.playTask.on('playDone', async(err) => {
+          if (err) return this.logger.error({err}, 'Gather:exec Error playing url');
+          if (!this.killed) startListening(cs, ep);
         });
       }
       else this._startTimer();
 
-      if (this.input.includes('speech')) {
+      if (this.input.includes('speech') && this.listenDuringPrompt) {
         await this._initSpeech(cs, ep);
         this._startTranscribing(ep);
         updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
           .catch(() => {/*already logged error */});
       }
 
-      if (this.input.includes('digits')) {
+      if (this.input.includes('digits') || this.dtmfBargein) {
         ep.on('dtmf', this._onDtmf.bind(this, cs, ep));
       }
 
       await this.awaitTaskDone();
+      this.logger.debug('Gather:exec task has completed');
     } catch (err) {
       this.logger.error(err, 'TaskGather:exec error');
     }
@@ -122,6 +137,7 @@ class TaskGather extends Task {
   }
 
   kill(cs) {
+    this.logger.debug('Gather:kill');
     super.kill(cs);
     this._killAudio(cs);
     this.ep.removeAllListeners('dtmf');
@@ -130,23 +146,33 @@ class TaskGather extends Task {
 
   _onDtmf(cs, ep, evt) {
     this.logger.debug(evt, 'TaskGather:_onDtmf');
-    if (evt.dtmf === this.finishOnKey) this._resolve('dtmf-terminator-key');
+    clearTimeout(this.interDigitTimer);
+    let resolved = false;
+    if (this.dtmfBargein) this._killAudio(cs);
+    if (evt.dtmf === this.finishOnKey) {
+      resolved = true;
+      this._resolve('dtmf-terminator-key');
+    }
     else {
       this.digitBuffer += evt.dtmf;
-      if (this.digitBuffer.length === this.numDigits) this._resolve('dtmf-num-digits');
+      const len = this.digitBuffer.length;
+      if (len === this.numDigits || len === this.maxDigits) {
+        resolved = true;
+        this._resolve('dtmf-num-digits');
+      }
+    }
+
+    if (!resolved && this.interDigitTimeout > 0 && this.digitBuffer.length >= this.minDigits) {
+      /* start interDigitTimer */
+      const ms = this.interDigitTimeout * 1000;
+      this.logger.debug(`starting interdigit timer of ${ms}`);
+      this.interDigitTimer = setTimeout(() => this._resolve('dtmf-interdigit-timeout'), ms);
     }
-    this._killAudio(cs);
   }
 
   async _initSpeech(cs, ep) {
     const opts = {};
 
-    if (this.vad.enable) {
-      opts.START_RECOGNIZING_ON_VAD = 1;
-      if (this.vad.voiceMs) opts.RECOGNIZER_VAD_VOICE_MS = this.vad.voiceMs;
-      if (this.vad.mode >= 0 && this.vad.mode <= 3) opts.RECOGNIZER_VAD_MODE = this.vad.mode;
-    }
-
     if ('google' === this.vendor) {
       if (this.sttCredentials) opts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(this.sttCredentials.credentials);
       Object.assign(opts, {
@@ -207,7 +233,7 @@ class TaskGather extends Task {
     ep.startTranscription({
       vendor: this.vendor,
       locale: this.language,
-      interim: this.partialResultCallback ? true : false,
+      interim: this.interim,
     }).catch((err) => {
       const {writeAlerts, AlertType} = this.cs.srf.locals;
       this.logger.error(err, 'TaskGather:_startTranscribing error');
@@ -247,25 +273,43 @@ class TaskGather extends Task {
   }
 
   _onTranscription(cs, ep, evt) {
+    this.logger.debug(evt, 'TaskGather:_onTranscription');
     if ('aws' === this.vendor && Array.isArray(evt) && evt.length > 0) evt = evt[0];
     if ('microsoft' === this.vendor) {
-      const nbest = evt.NBest;
-      const newEvent = {
-        is_final: evt.RecognitionStatus === 'Success',
-        alternatives: [
-          {
-            confidence: nbest[0].Confidence,
-            transcript: nbest[0].Display
-          }
-        ]
-      };
-      evt = newEvent;
+      const final = evt.RecognitionStatus === 'Success';
+      if (final) {
+        const nbest = evt.NBest;
+        evt = {
+          is_final: true,
+          alternatives: [
+            {
+              confidence: nbest[0].Confidence,
+              transcript: nbest[0].Display
+            }
+          ]
+        };
+      }
+      else {
+        evt = {
+          is_final: false,
+          alternatives: [
+            {
+              transcript: evt.Text
+            }
+          ]
+        };
+      }
     }
-    this.logger.debug(evt, 'TaskGather:_onTranscription');
     if (evt.is_final) this._resolve('speech', evt);
-    else if (this.partialResultHook) {
-      this.cs.requestor.request(this.partialResultHook,  Object.assign({speech: evt}, this.cs.callInfo))
-        .catch((err) => this.logger.info(err, 'GatherTask:_onTranscription error'));
+    else {
+      if (this.bargein && evt.alternatives[0].transcript.split(' ').length >= this.minBargeinWordCount) {
+        this.logger.debug('Gather:_onTranscription - killing audio due to bargein');
+        this._killAudio(cs);
+      }
+      if (this.partialResultHook) {
+        this.cs.requestor.request(this.partialResultHook,  Object.assign({speech: evt}, this.cs.callInfo))
+          .catch((err) => this.logger.info(err, 'GatherTask:_onTranscription error'));
+      }
     }
   }
   _onEndOfUtterance(cs, ep) {
@@ -291,7 +335,8 @@ class TaskGather extends Task {
 
     this._clearTimer();
     if (reason.startsWith('dtmf')) {
-      await this.performAction({digits: this.digitBuffer, reason: 'dtmfDetected'});
+      if (this.parentTask) this.parentTask.emit('dtmf-collected', {reason, digits: this.digitBuffer});
+      else await this.performAction({digits: this.digitBuffer, reason: 'dtmfDetected'});
     }
     else if (reason.startsWith('speech')) {
       if (this.parentTask) this.parentTask.emit('transcription', evt);

lib/tasks/say.js

@@ -79,7 +79,11 @@ class TaskSay extends Task {
             const {memberId, confName, confUuid} = cs;
             await this.playToConfMember(this.ep, memberId, confName, confUuid, filepath[segment]);
           }
-          else await ep.play(filepath[segment]);
+          else {
+            this.logger.debug(`Say:exec sending command to play file ${filepath[segment]}`);
+            await ep.play(filepath[segment]);
+            this.logger.debug(`Say:exec completed play file ${filepath[segment]}`);
+          }
         } while (!this.killed && ++segment < filepath.length);
       }
     } catch (err) {

lib/tasks/specs.json

@@ -100,6 +100,13 @@
       "numDigits": "number",
       "partialResultHook": "object|string",
       "speechTimeout": "number",
+      "listenDuringPrompt": "boolean",
+      "bargein": "boolean",
+      "minBargeinWordCount": "number",
+      "dtmfBargein": "boolean",
+      "minDigits": "number",
+      "maxDigits": "number",
+      "interDigitTimeout": "number",
       "timeout": "number",
       "recognizer": "#recognizer",
       "play": "#play",
@@ -338,7 +345,6 @@
         "type": "string",
         "enum": ["GET", "POST"]
       },
-      "headers": "object",
       "name": "string",
       "number": "string",
       "sipUri": "string",
@@ -390,7 +396,6 @@
         "enum": ["google", "aws", "microsoft", "default"]
       },
       "language": "string",
-      "vad": "#vad",
       "hints": "array",
       "altLanguages": "array",
       "profanityFilter": "boolean",
@@ -459,15 +464,5 @@
     "required": [
       "name"
     ]
-  },
-  "vad": {
-    "properties": {
-      "enable": "boolean",
-      "voiceMs": "number",
-      "mode": "number"  
-    },
-    "required": [
-      "enable"
-    ]
   }
 }

lib/tasks/task.js

@@ -62,9 +62,7 @@ class Task extends Emitter {
   kill(cs) {
     if (this.cs && !this.cs.isConfirmCallSession) this.logger.debug(`${this.name} is being killed`);
     this._killInProgress = true;
-
-    /* remove reference to parent task or else entangled parent-child tasks will not be gc'ed */
-    setImmediate(() => this.parentTask = null);
+    // no-op
   }
 
   /**

lib/tasks/transcribe.js

@@ -22,10 +22,6 @@ class TaskTranscribe extends Task {
     this.interim = !!recognizer.interim;
     this.separateRecognitionPerChannel = recognizer.separateRecognitionPerChannel;
 
-    /* vad: if provided, we dont connect to recognizer until voice activity is detected */
-    const {enable, voiceMs = 0, mode = -1} = recognizer.vad || {};
-    this.vad = {enable, voiceMs, mode};
-
     /* google-specific options */
     this.hints = recognizer.hints || [];
     this.profanityFilter = recognizer.profanityFilter;
@@ -109,12 +105,6 @@ class TaskTranscribe extends Task {
   async _startTranscribing(cs, ep) {
     const opts = {};
 
-    if (this.vad.enable) {
-      opts.START_RECOGNIZING_ON_VAD = 1;
-      if (this.vad.voiceMs) opts.RECOGNIZER_VAD_VOICE_MS = this.vad.voiceMs;
-      if (this.vad.mode >= 0 && this.vad.mode <= 3) opts.RECOGNIZER_VAD_MODE = this.vad.mode;
-    }
-
     ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
     ep.addCustomEventListener(GoogleTranscriptionEvents.NoAudioDetected, this._onNoAudio.bind(this, cs, ep));
     ep.addCustomEventListener(GoogleTranscriptionEvents.MaxDurationExceeded,

lib/utils/aws-sns-lifecycle.js

@@ -45,7 +45,6 @@ class SnsNotifier extends Emitter {
           }, 'response from SNS SubscribeURL');
           const data = await this.describeInstance();
           this.lifecycleState = data.AutoScalingInstances[0].LifecycleState;
-          this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
           break;
 
         case 'Notification':

lib/utils/db-utils.js

@@ -36,10 +36,6 @@ const speechMapper = (cred) => {
     obj.api_key = o.api_key;
     obj.region = o.region;
   }
-  else if ('wellsaid' === obj.vendor) {
-    const o = JSON.parse(decrypt(credential));
-    obj.api_key = o.api_key;
-  }
   return obj;
 };
 
@@ -57,7 +53,6 @@ module.exports = (logger, srf) => {
     const haveGoogle = speech.find((s) => s.vendor === 'google');
     const haveAws = speech.find((s) => s.vendor === 'aws');
     const haveMicrosoft = speech.find((s) => s.vendor === 'microsoft');
-    const haveWellsaid = speech.find((s) => s.vendor === 'wellsaid');
     if (!haveGoogle || !haveAws || !haveMicrosoft) {
       const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid);
       if (r3.length) {
@@ -73,10 +68,6 @@ module.exports = (logger, srf) => {
           const ms = r3.find((s) => s.vendor === 'microsoft');
           if (ms) speech.push(speechMapper(ms));
         }
-        if (!haveWellsaid) {
-          const wellsaid = r3.find((s) => s.vendor === 'wellsaid');
-          if (wellsaid) speech.push(speechMapper(wellsaid));
-        }
       }
     }
 

lib/utils/place-outdial.js

@@ -60,16 +60,10 @@ class SingleDialer extends Emitter {
     opts.headers = opts.headers || {};
     opts.headers = {
       ...opts.headers,
-      ...(this.target.headers || {}),
       'X-Jambonz-Routing': this.target.type,
+      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
       'X-Call-Sid': this.callSid
     };
-    if (srf.locals.fsUUID) {
-      opts.headers = {
-        ...opts.headers,
-        'X-Jambonz-FS-UUID': srf.locals.fsUUID,
-      };
-    }
     this.ms = ms;
     let uri, to;
     try {
@@ -150,7 +144,6 @@ class SingleDialer extends Emitter {
            *  (a) create a CallInfo for this call
            *  (a) create a logger for this call
            */
-          req.srf = srf;
           this.callInfo = new CallInfo({
             direction: CallDirection.Outbound,
             parentCallInfo: this.parentCallInfo,
@@ -222,7 +215,6 @@ class SingleDialer extends Emitter {
       if (this.confirmHook) this._executeApp(this.confirmHook);
       else this.emit('accept');
     } catch (err) {
-      this.inviteInProgress = null;
       const status = {callStatus: CallStatus.Failed};
       if (err instanceof SipError) {
         status.sipStatus = err.status;

lib/utils/sbc-pinger.js

@@ -28,10 +28,6 @@ module.exports = (logger) => {
         lifecycleEmitter = await require('./aws-sns-lifecycle')(logger);
 
         lifecycleEmitter
-          .on('SubscriptionConfirmation', ({publicIp}) => {
-            const {srf} = require('../..');
-            srf.locals.publicIp = publicIp;
-          })
           .on(LifeCycleEvents.ScaleIn, () => {
             logger.info('AWS scale-in notification: begin drying up calls');
             dryUpCalls = true;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-feature-server",
-  "version": "v0.7.3",
+  "version": "v0.7.1",
   "main": "app.js",
   "engines": {
     "node": ">= 10.16.0"
@@ -30,22 +30,21 @@
     "@jambonz/db-helpers": "^0.6.16",
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/mw-registrar": "^0.2.1",
-    "@jambonz/realtimedb-helpers": "^0.4.24",
+    "@jambonz/realtimedb-helpers": "^0.4.17",
     "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.1.6",
+    "@jambonz/time-series": "^0.1.5",
     "aws-sdk": "^2.1060.0",
     "bent": "^7.3.12",
     "cidr-matcher": "^2.1.1",
     "debug": "^4.3.2",
     "deepcopy": "^2.1.0",
     "drachtio-fsmrf": "^2.0.13",
-    "drachtio-srf": "^4.4.61",
+    "drachtio-srf": "^4.4.55",
     "express": "^4.17.1",
-    "helmet": "^5.0.2",
     "ip": "^1.1.5",
     "moment": "^2.29.1",
     "parse-url": "^5.0.7",
-    "pino": "^6.13.4",
+    "pino": "^6.13.2",
     "to-snake-case": "^1.0.0",
     "uuid": "^8.3.2",
     "verify-aws-sns-signature": "^0.0.6",