fix linting

Dockerfile

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

app.js

@@ -7,7 +7,7 @@ assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACH
 assert.ok(process.env.DRACHTIO_SECRET, 'missing DRACHTIO_SECRET env var');
 assert.ok(process.env.JAMBONES_FREESWITCH, 'missing JAMBONES_FREESWITCH env var');
 assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
-assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_SUBNET env var');
+assert.ok(process.env.JAMBONES_NETWORK_CIDR, 'missing JAMBONES_SUBNET env var');
 
 const Srf = require('drachtio-srf');
 const srf = new Srf();
@@ -17,7 +17,7 @@ const opts = {
   level: process.env.JAMBONES_LOGLEVEL || 'info'
 };
 const logger = require('pino')(opts);
-const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
+const {LifeCycleEvents} = require('./lib/utils/constants');
 const installSrfLocals = require('./lib/utils/install-srf-locals');
 installSrfLocals(srf, logger);
 
@@ -92,10 +92,6 @@ sessionTracker.on('idle', () => {
   }
 });
 
-const getCount = () => sessionTracker.count;
-const healthCheck = require('@jambonz/http-health-check');
-healthCheck({app, logger, path: '/', fn: getCount});
-
 setInterval(() => {
   srf.locals.stats.gauge('fs.sip.calls.count', sessionTracker.count);
 }, 5000);
@@ -117,7 +113,6 @@ function handle(signal) {
   const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
   logger.info(`got signal ${signal}, removing ${srf.locals.localSipAddress} from set ${setName}`);
   removeFromSet(setName, srf.locals.localSipAddress);
-  removeFromSet(FS_UUID_SET_NAME, srf.locals.fsUUID);
   srf.locals.disabled = true;
 }
 

bin/k8s-pre-stop-hook.js

@@ -1,29 +0,0 @@
-#!/usr/bin/env node
-const bent = require('bent');
-const getJSON = bent('json');
-const PORT = process.env.HTTP_PORT || 3000;
-
-const sleep = (ms) => {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-};
-
-(async function() {
-
-  try {
-    do {
-      const obj = await getJSON(`http://127.0.0.1:${PORT}/`);
-      const {calls} = obj;
-      if (calls === 0) {
-        console.log('no calls on the system, we can exit');
-        process.exit(0);
-      }
-      else {
-        console.log(`waiting for ${calls} to exit..`);
-      }
-      await sleep(10000);
-    } while (1);
-  } catch (err) {
-    console.error(err, 'Error querying health endpoint');
-    process.exit(-1);
-  }
-})();

lib/http-routes/api/index.js

@@ -9,4 +9,8 @@ api.use('/enqueue', require('./enqueue'));
 api.use('/messaging', require('./messaging'));            // inbound SMS
 api.use('/createMessage', require('./create-message'));   // outbound SMS (REST)
 
+// health checks
+api.get('/', (req, res) => res.sendStatus(200));
+api.get('/health', (req, res) => res.sendStatus(200));
+
 module.exports = api;

lib/http-routes/index.js

@@ -1,23 +1,16 @@
 const express = require('express');
 const api = require('./api');
 const routes = express.Router();
-const sessionTracker = require('../session/session-tracker');
-
-const readiness = (req, res) => {
-  const logger = req.app.locals.logger;
-  const {count} = sessionTracker;
-  const {srf} = require('../..');
-  const {getFreeswitch} = srf.locals;
-  if (getFreeswitch()) {
-    return res.status(200).json({calls: count});
-  }
-  logger.info('responding to /health check with failure as freeswitch is not up');
-  res.sendStatus(480);
-};
 
 routes.use('/v1', api);
 
-// health check
-routes.get('/health', readiness);
+// health checks
+routes.get('/', (req, res) => {
+  res.sendStatus(200);
+});
+
+routes.get('/health', (req, res) => {
+  res.sendStatus(200);
+});
 
 module.exports = routes;

lib/tasks/cognigy/index.js

@@ -1,279 +0,0 @@
-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;
-  if (_default) {
-    const {_gallery} = _default;
-    if (_gallery) return _gallery.fallbackText;
-  }
-};
-
-const parseQuickReplies = (obj) => {
-  const {_default} = obj;
-  if (_default) {
-    const {_quickReplies} = _default;
-    if (_quickReplies) return _quickReplies.text || _quickReplies.fallbackText;
-  }
-};
-
-const parseBotText = (evt) => {
-  const {text, data} = evt;
-  if (text) return text;
-
-  switch (data?.type) {
-    case 'quickReplies':
-      return parseQuickReplies(data?._cognigy);
-    case 'gallery':
-      return parseGallery(data?._cognigy);
-    default:
-      break;
-  }
-};
-
-class Cognigy extends Task {
-  constructor(logger, opts) {
-    super(logger, opts);
-    this.preconditions = TaskPreconditions.Endpoint;
-
-    this.url = this.data.url;
-    this.token = this.data.token;
-    this.prompt = this.data.prompt;
-    this.eventHook = this.data?.eventHook;
-    this.actionHook = this.data?.actionHook;
-    this.data = this.data.data || {};
-    this.prompts = [];
-    this.retry = {};
-    this.timeoutCount = 0;
-  }
-
-  get name() { return TaskName.Cognigy; }
-
-  get hasReportedFinalAction() {
-    return this.reportedFinalAction || this.isReplacingApplication;
-  }
-
-  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));
-
-      /* connect to the bot and send initial data */
-      this.client = new SocketClient(
-        this.url,
-        this.token,
-        {
-          sessionId: cs.callSid,
-          channel: 'jambonz',
-          forceWebsockets: true,
-          reconnection: true,
-          settings: {
-            enableTypingIndicator: false
-          }
-        }
-      );
-      this.client.on('output', this._onBotUtterance.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();
-      this.client.sendMessage('', {...this.data, ...cs.callInfo});
-
-      await this.awaitTaskDone();
-    } catch (err) {
-      this.logger.error({err}, 'Cognigy error');
-      throw err;
-    }
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-    this.logger.debug('Cognigy:kill');
-
-    this.removeAllListeners();
-    this.transcribeTask && this.transcribeTask.kill();
-
-    this.client.removeAllListeners();
-    if (this.client && this.client.connected) this.client.disconnect();
-
-    if (!this.hasReportedFinalAction) {
-      this.reportedFinalAction = true;
-      this.performAction({cognigyResult: 'caller hungup'})
-        .catch((err) => this.logger.info({err}, 'cognigy - error w/ action webook'));
-    }
-
-    if (this.ep.connected) {
-      await this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
-    }
-    this.notifyTaskDone();
-  }
-
-  _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) {
-    const opts = {
-      text,
-      synthesizer: this.data.synthesizer ||
-      {
-        vendor: 'default',
-        language: 'default',
-        voice: 'default'
-      }
-    };
-    const say = makeTask(this.logger, {say: opts}, this);
-    return say;
-  }
-
-  async _onBotError(cs, ep, evt) {
-    this.logger.info({evt}, 'Cognigy:_onBotError');
-    this.performAction({cognigyResult: 'botError', message: evt.message });
-    this.reportedFinalAction = true;
-    this.notifyTaskDone();
-  }
-
-  async _onBotFinalPing(cs, ep) {
-    this.logger.info({prompts: this.prompts}, 'Cognigy:_onBotFinalPing');
-    if (this.prompts.length) {
-      const text = this.prompts.join('.');
-      if (text && !this.killed) {
-        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) {
-    this.logger.debug({evt}, 'Cognigy:_onBotUtterance');
-
-    if (this.eventHook) {
-      this.performHook(cs, this.eventHook, {event: 'botMessage', message: evt})
-        .then((redirected) => {
-          if (redirected) {
-            this.logger.info('Cognigy_onTranscription: event handler for bot message redirected us to new webhook');
-            this.reportedFinalAction = true;
-            this.performAction({cognigyResult: 'redirect'}, false);
-          }
-          return;
-        })
-        .catch(({err}) => {
-          this.logger.info({err}, 'Cognigy_onTranscription: error sending event hook');
-        });
-    }
-    const text = parseBotText(evt);
-    if (evt.data) this.config.update(evt.data);
-    if (text) this.prompts.push(text);
-  }
-
-  async _onTranscription(cs, ep, evt) {
-    this.logger.debug({evt}, `Cognigy: got transcription for callSid ${cs.callSid}`);
-    const utterance = evt.alternatives[0].transcript;
-
-    if (this.eventHook) {
-      this.performHook(cs, this.eventHook, {event: 'userMessage', message: utterance})
-        .then((redirected) => {
-          if (redirected) {
-            this.logger.info('Cognigy_onTranscription: event handler for user message redirected us to new webhook');
-            this.reportedFinalAction = true;
-            this.performAction({cognigyResult: 'redirect'}, false);
-            if (this.transcribeTask) this.transcribeTask.kill(cs);
-          }
-          return;
-        })
-        .catch(({err}) => {
-          this.logger.info({err}, 'Cognigy_onTranscription: error sending event hook');
-        });
-    }
-
-    /* send the user utterance to the bot */
-    try {
-      if (this.client && this.client.connected) {
-        this.client.sendMessage(utterance);
-      }
-      else {
-        this.logger.info('Cognigy_onTranscription - not sending user utterance as bot is disconnected');
-      }
-    } catch (err) {
-      this.logger.error({err}, 'Cognigy_onTranscription: Error sending user utterance to Cognigy - ending task');
-      this.performAction({cognigyResult: 'socketError'});
-      this.reportedFinalAction = true;
-      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.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

@@ -1,90 +0,0 @@
-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/dial.js

@@ -161,10 +161,6 @@ class TaskDial extends Task {
 
   async kill(cs, reason) {
     super.kill(cs);
-    if (this.dialMusic && this.epOther) {
-      this.epOther.api('uuid_break', this.epOther.uuid)
-        .catch((err) => this.logger.info(err, 'Error killing dialMusic'));
-    }
     this.killReason = reason || KillReason.Hangup;
     if (this.timerMaxCallDuration) {
       clearTimeout(this.timerMaxCallDuration);
@@ -554,7 +550,8 @@ class TaskDial extends Task {
     try {
       const aLegSdp = cs.ep.remote.sdp;
       const bLegSdp = sd.dlg.remote.sdp;
-      await Promise.all[sd.releaseMediaToSBC(aLegSdp, cs.ep.local.sdp), cs.releaseMediaToSBC(bLegSdp)];
+      this.logger.debug({aLegSdp, bLegSdp}, 'Dial:_releaseMedia - releasing media from freewitch');
+      await Promise.all[sd.releaseMediaToSBC(aLegSdp), cs.releaseMediaToSBC(bLegSdp)];
       this.epOther = null;
       this.logger.info('Dial:_releaseMedia - successfully released media from freewitch');
     } catch (err) {

lib/tasks/dialogflow/index.js

@@ -452,8 +452,8 @@ class Dialogflow extends Task {
     this.noinputTimer = setTimeout(this._onNoInput.bind(this, ep, cs), this.noInputTimeout);
   }
 
-  async _performHook(cs, hook, results = {}) {
-    const json = await this.cs.requestor.request(hook, {...results, ...cs.callInfo.toJSON()});
+  async _performHook(cs, hook, results) {
+    const json = await this.cs.requestor.request(hook, results);
     if (json && Array.isArray(json)) {
       const makeTask = require('../make_task');
       const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));

lib/tasks/gather.js

@@ -16,15 +16,13 @@ class TaskGather extends Task {
     this.preconditions = TaskPreconditions.Endpoint;
 
     [
-      'finishOnKey', 'hints', 'input', 'numDigits', 'minDigits', 'maxDigits',
-      'interDigitTimeout', 'submitDigit', 'partialResultHook', 'bargein', 'dtmfBargein',
-      'retries', 'retryPromptTts', 'retryPromptUrl',
+      'finishOnKey', 'hints', 'input', 'numDigits',
+      'partialResultHook',
       'speechTimeout', 'timeout', 'say', 'play'
     ].forEach((k) => this[k] = this.data[k]);
-    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;
+
+    this.timeout = (this.timeout || 5) * 1000;
+    this.interim = this.partialResultCallback;
     if (this.data.recognizer) {
       const recognizer = this.data.recognizer;
       this.vendor = recognizer.vendor;
@@ -82,50 +80,33 @@ 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', 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);
+        this.sayTask.on('playDone', (err) => {
+          if (!this.killed) this._startTimer();
         });
       }
       else if (this.playTask) {
         this.playTask.exec(cs, ep);  // kicked off, _not_ waiting for it to complete
-        this.playTask.on('playDone', async(err) => {
-          if (err) return this.logger.error({err}, 'Gather:exec Error playing url');
-          if (!this.killed) startListening(cs, ep);
+        this.playTask.on('playDone', (err) => {
+          if (!this.killed) this._startTimer();
         });
       }
       else this._startTimer();
 
-      if (this.input.includes('speech') && this.listenDuringPrompt) {
+      if (this.input.includes('speech')) {
         await this._initSpeech(cs, ep);
         this._startTranscribing(ep);
         updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
           .catch(() => {/*already logged error */});
       }
 
-      if (this.input.includes('digits') || this.dtmfBargein) {
+      if (this.input.includes('digits')) {
         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');
     }
@@ -137,7 +118,6 @@ class TaskGather extends Task {
   }
 
   kill(cs) {
-    this.logger.debug('Gather:kill');
     super.kill(cs);
     this._killAudio(cs);
     this.ep.removeAllListeners('dtmf');
@@ -146,28 +126,12 @@ class TaskGather extends Task {
 
   _onDtmf(cs, ep, evt) {
     this.logger.debug(evt, 'TaskGather:_onDtmf');
-    clearTimeout(this.interDigitTimer);
-    let resolved = false;
-    if (this.dtmfBargein) this._killAudio(cs);
-    if (evt.dtmf === this.finishOnKey) {
-      resolved = true;
-      this._resolve('dtmf-terminator-key');
-    }
+    if (evt.dtmf === this.finishOnKey) this._resolve('dtmf-terminator-key');
     else {
       this.digitBuffer += evt.dtmf;
-      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);
+      if (this.digitBuffer.length === this.numDigits) this._resolve('dtmf-num-digits');
     }
+    this._killAudio(cs);
   }
 
   async _initSpeech(cs, ep) {
@@ -233,7 +197,7 @@ class TaskGather extends Task {
     ep.startTranscription({
       vendor: this.vendor,
       locale: this.language,
-      interim: this.interim,
+      interim: this.partialResultCallback ? true : false,
     }).catch((err) => {
       const {writeAlerts, AlertType} = this.cs.srf.locals;
       this.logger.error(err, 'TaskGather:_startTranscribing error');
@@ -273,43 +237,25 @@ 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 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
-            }
-          ]
-        };
-      }
+      const nbest = evt.NBest;
+      const newEvent = {
+        is_final: evt.RecognitionStatus === 'Success',
+        alternatives: [
+          {
+            confidence: nbest[0].Confidence,
+            transcript: nbest[0].Display
+          }
+        ]
+      };
+      evt = newEvent;
     }
+    this.logger.debug(evt, 'TaskGather:_onTranscription');
     if (evt.is_final) this._resolve('speech', evt);
-    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'));
-      }
+    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'));
     }
   }
   _onEndOfUtterance(cs, ep) {
@@ -335,8 +281,7 @@ class TaskGather extends Task {
 
     this._clearTimer();
     if (reason.startsWith('dtmf')) {
-      if (this.parentTask) this.parentTask.emit('dtmf-collected', {reason, digits: this.digitBuffer});
-      else await this.performAction({digits: this.digitBuffer, reason: 'dtmfDetected'});
+      await this.performAction({digits: this.digitBuffer, reason: 'dtmfDetected'});
     }
     else if (reason.startsWith('speech')) {
       if (this.parentTask) this.parentTask.emit('transcription', evt);

lib/tasks/make_task.js

@@ -20,9 +20,6 @@ function makeTask(logger, obj, parent) {
     case TaskName.SipRefer:
       const TaskSipRefer = require('./sip_refer');
       return new TaskSipRefer(logger, data, parent);
-    case TaskName.Cognigy:
-      const TaskCognigy = require('./cognigy');
-      return new TaskCognigy(logger, data, parent);
     case TaskName.Conference:
       const TaskConference = require('./conference');
       return new TaskConference(logger, data, parent);

lib/tasks/message.js

@@ -42,7 +42,7 @@ class TaskMessage extends Task {
       }
       if (gw) {
         this.logger.info({gw, accountSid}, 'Message:exec - using smpp to send message');
-        url = process.env.K8S ? 'http://smpp' : getSmpp();
+        url = getSmpp();
         relativeUrl = '/sms';
         payload = {
           ...payload,

lib/tasks/say.js

@@ -25,7 +25,7 @@ class TaskSay extends Task {
     const vendor = hasVerbLevelTts ? this.synthesizer.vendor : cs.speechSynthesisVendor ;
     const language = hasVerbLevelTts ? this.synthesizer.language : cs.speechSynthesisLanguage ;
     const voice = hasVerbLevelTts ? this.synthesizer.voice : cs.speechSynthesisVoice ;
-    const engine = this.synthesizer.engine || 'standard';
+
     const salt = cs.callSid;
     const credentials = cs.getSpeechCredentials(vendor, 'tts');
 
@@ -48,7 +48,6 @@ class TaskSay extends Task {
           vendor,
           language,
           voice,
-          engine,
           salt,
           credentials
         }).catch((err) => {
@@ -79,11 +78,7 @@ class TaskSay extends Task {
             const {memberId, confName, confUuid} = cs;
             await this.playToConfMember(this.ep, memberId, confName, confUuid, 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]}`);
-          }
+          else await ep.play(filepath[segment]);
         } while (!this.killed && ++segment < filepath.length);
       }
     } catch (err) {

lib/tasks/specs.json

@@ -21,22 +21,6 @@
       "referTo"
     ]
   },
-  "cognigy": {
-    "properties": {
-      "url": "string",
-      "token": "string",
-      "recognizer": "#recognizer",
-      "tts": "#synthesizer",
-      "prompt": "string",
-      "actionHook": "object|string",
-      "eventHook": "object|string",
-      "data": "object"
-    },
-    "required": [
-      "url",
-      "token"
-    ]
-  },
   "dequeue": {
     "properties": {
       "name": "string",
@@ -100,13 +84,6 @@
       "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",
@@ -331,6 +308,7 @@
       "earlyMedia": "boolean"
     },
     "required": [
+      "transcriptionHook",
       "recognizer"
     ]
   },
@@ -376,10 +354,6 @@
       },
       "language": "string",
       "voice": "string",
-      "engine": {
-        "type": "string",
-        "enum": ["standard", "neural"]
-      },
       "gender": {
         "type": "string",
         "enum": ["MALE", "FEMALE", "NEUTRAL"]

lib/tasks/transcribe.js

@@ -11,7 +11,6 @@ class TaskTranscribe extends Task {
   constructor(logger, opts, parentTask) {
     super(logger, opts);
     this.preconditions = TaskPreconditions.Endpoint;
-    this.parentTask = parentTask;
 
     this.transcriptionHook = this.data.transcriptionHook;
     this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
@@ -77,7 +76,6 @@ class TaskTranscribe extends Task {
       await this.awaitTaskDone();
     } catch (err) {
       this.logger.info(err, 'TaskTranscribe:exec - error');
-      this.parentTask && this.parentTask.emit('error', err);
     }
     ep.removeCustomEventListener(GoogleTranscriptionEvents.Transcription);
     ep.removeCustomEventListener(GoogleTranscriptionEvents.NoAudioDetected);
@@ -212,36 +210,25 @@ class TaskTranscribe extends Task {
   }
 
   _onTranscription(cs, ep, evt) {
-    this.logger.debug(evt, 'TaskTranscribe:_onTranscription');
     if ('aws' === this.vendor && Array.isArray(evt) && evt.length > 0) evt = evt[0];
     if ('microsoft' === this.vendor) {
       const nbest = evt.NBest;
-      const alternatives = nbest ? nbest.map((n) => {
+      const alternatives = nbest.map((n) => {
         return {
           confidence: n.Confidence,
           transcript: n.Display
         };
-      }) :
-        [
-          {
-            transcript: evt.DisplayText
-          }
-        ];
-
+      });
       const newEvent = {
         is_final: evt.RecognitionStatus === 'Success',
         alternatives
       };
       evt = newEvent;
     }
+    this.logger.debug(evt, 'TaskTranscribe:_onTranscription');
 
-    if (this.transcriptionHook) {
-      this.cs.requestor.request(this.transcriptionHook, Object.assign({speech: evt}, this.cs.callInfo))
-        .catch((err) => this.logger.info(err, 'TranscribeTask:_onTranscription error'));
-    }
-    if (this.parentTask) {
-      this.parentTask.emit('transcription', evt);
-    }
+    this.cs.requestor.request(this.transcriptionHook, Object.assign({speech: evt}, this.cs.callInfo))
+      .catch((err) => this.logger.info(err, 'TranscribeTask:_onTranscription error'));
     if (this.killed) {
       this.logger.debug('TaskTranscribe:_onTranscription exiting after receiving final transcription');
       this._clearTimer();

lib/utils/constants.json

@@ -1,6 +1,5 @@
 {
   "TaskName": {
-    "Cognigy": "cognigy",
     "Conference": "conference",
     "Dequeue": "dequeue",
     "Dial": "dial",
@@ -106,6 +105,5 @@
     "Replaced": "replaced"
   },
   "MAX_SIMRINGS": 10,
-  "BONG_TONE": "tone_stream://v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)",
-  "FS_UUID_SET_NAME": "fsUUIDs"
+  "BONG_TONE": "tone_stream://v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"
 }

lib/utils/place-outdial.js

@@ -5,10 +5,15 @@ const {TaskPreconditions, CallDirection} = require('../utils/constants');
 const CallInfo = require('../session/call-info');
 const assert = require('assert');
 const ConfirmCallSession = require('../session/confirm-call-session');
+const selectSbc = require('./select-sbc');
+const Registrar = require('@jambonz/mw-registrar');
 const AdultingCallSession = require('../session/adulting-call-session');
+const registrar = new Registrar({
+  host: process.env.JAMBONES_REDIS_HOST,
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+});
 const deepcopy = require('deepcopy');
 const moment = require('moment');
-const stripCodecs = require('./strip-ancillary-codecs');
 const { v4: uuidv4 } = require('uuid');
 
 class SingleDialer extends Emitter {
@@ -58,12 +63,7 @@ class SingleDialer extends Emitter {
   async exec(srf, ms, opts) {
     opts = opts || {};
     opts.headers = opts.headers || {};
-    opts.headers = {
-      ...opts.headers,
-      'X-Jambonz-Routing': this.target.type,
-      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
-      'X-Call-Sid': this.callSid
-    };
+    opts.headers = {...opts.headers, 'X-Call-Sid': this.callSid};
     this.ms = ms;
     let uri, to;
     try {
@@ -84,6 +84,7 @@ class SingleDialer extends Emitter {
           break;
         case 'user':
           assert(this.target.name);
+          const aor = this.target.name;
           uri = `sip:${this.target.name}`;
           to = this.target.name;
 
@@ -92,6 +93,16 @@ class SingleDialer extends Emitter {
               'X-Override-To': this.target.overrideTo
             });
           }
+
+          // need to send to the SBC registered on
+          const reg = await registrar.query(aor);
+          if (reg) {
+            const sbc = selectSbc(reg.sbcAddress);
+            if (sbc) {
+              this.logger.debug(`SingleDialer:exec retrieved registration details for ${aor}, using sbc at ${sbc}`);
+              this.sbcAddress = sbc;
+            }
+          }
           break;
         case 'sip':
           assert(this.target.sipUri);
@@ -317,10 +328,9 @@ class SingleDialer extends Emitter {
     return cs;
   }
 
-  async releaseMediaToSBC(remoteSdp, localSdp) {
+  async releaseMediaToSBC(remoteSdp) {
     assert(this.dlg && this.dlg.connected && this.ep && typeof remoteSdp === 'string');
-    const sdp = stripCodecs(this.logger, remoteSdp, localSdp) || remoteSdp;
-    await this.dlg.modify(sdp, {
+    await this.dlg.modify(remoteSdp, {
       headers: {
         'X-Reason': 'release-media'
       }

lib/utils/sbc-pinger.js

@@ -1,9 +1,8 @@
 const assert = require('assert');
-const { v4: uuidv4 } = require('uuid');
-const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./constants');
+const noopLogger = {info: () => {}, error: () => {}};
+const {LifeCycleEvents} = require('./constants');
 const Emitter = require('events');
 const debug = require('debug')('jambonz:feature-server');
-const noopLogger = {info: () => {}, error: () => {}};
 
 module.exports = (logger) => {
   logger = logger || noopLogger;
@@ -68,6 +67,7 @@ module.exports = (logger) => {
     })();
   }
 
+  // send OPTIONS pings to SBCs
   async function pingProxies(srf) {
     if (process.env.NODE_ENV === 'test') return;
 
@@ -90,40 +90,29 @@ module.exports = (logger) => {
       }
     }
   }
-  if (process.env.K8S) {
-    setImmediate(() => {
-      logger.info('disabling OPTIONS pings since we are running as a kubernetes service');
-      const {srf} = require('../..');
-      const {addToSet} = srf.locals.dbHelpers;
-      const uuid = srf.locals.fsUUID = uuidv4();
-      addToSet(FS_UUID_SET_NAME, uuid)
-        .catch((err) => logger.info({err}, `Error adding ${uuid} to set ${FS_UUID_SET_NAME}`));
-    });
-  }
-  else {
-    // OPTIONS ping the SBCs from each feature server every 60 seconds
-    setInterval(() => {
-      const {srf} = require('../..');
-      pingProxies(srf);
-    }, process.env.OPTIONS_PING_INTERVAL || 30000);
 
-    // initial ping once we are up
-    setTimeout(async() => {
+  // OPTIONS ping the SBCs from each feature server every 60 seconds
+  setInterval(() => {
+    const {srf} = require('../..');
+    pingProxies(srf);
+  }, process.env.OPTIONS_PING_INTERVAL || 30000);
 
-      // if SBCs are auto-scaling, monitor them as they come and go
-      const {srf} = require('../..');
-      if (!process.env.JAMBONES_SBCS) {
-        const {monitorSet} = srf.locals.dbHelpers;
-        const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-sip`;
-        await monitorSet(setName, 10, (members) => {
-          sbcs = members;
-          logger.info(`sbc-pinger: SBC roster has changed, list of active SBCs is now ${sbcs}`);
-        });
-      }
+  // initial ping once we are up
+  setTimeout(async() => {
+    const {srf} = require('../..');
 
-      pingProxies(srf);
-    }, 1000);
-  }
+    // if SBCs are auto-scaling, monitor them as they come and go
+    if (!process.env.JAMBONES_SBCS) {
+      const {monitorSet} = srf.locals.dbHelpers;
+      const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-sip`;
+      await monitorSet(setName, 10, (members) => {
+        sbcs = members;
+        logger.info(`sbc-pinger: SBC roster has changed, list of active SBCs is now ${sbcs}`);
+      });
+    }
+
+    pingProxies(srf);
+  }, 1000);
 
   return {
     lifecycleEmitter,

lib/utils/select-sbc.js

@@ -0,0 +1,13 @@
+const CIDRMatcher = require('cidr-matcher');
+const matcher = new CIDRMatcher([process.env.JAMBONES_NETWORK_CIDR]);
+
+module.exports = (sbcList) => {
+  const obj = sbcList
+    .split(',')
+    .map((str) => {
+      const arr = /^(.*)\/(.*):(\d+)$/.exec(str);
+      return {protocol: arr[1], host: arr[2], port: arr[3]};
+    })
+    .find((obj) => 'udp' == obj.protocol && matcher.contains(obj.host));
+  if (obj) return `${obj.host}:${obj.port}`;
+};

lib/utils/strip-ancillary-codecs.js

@@ -1,30 +0,0 @@
-const sdpTransform = require('sdp-transform');
-
-const stripCodecs = (logger, remoteSdp, localSdp) => {
-  try {
-    const sdp = sdpTransform.parse(remoteSdp);
-    const local = sdpTransform.parse(localSdp);
-    const m = local.media
-      .find((m) => 'audio' === m.type);
-    const pt = m.rtp[0].payload;
-
-    /* manipulate on the audio section */
-    const audio = sdp.media.find((m) => 'audio' === m.type);
-
-    /* discard all of the codecs except the first in our 200 OK, and telephony-events */
-    const ptSaves = audio.rtp
-      .filter((r) => r.codec === 'telephone-event' || r.payload === pt)
-      .map((r) => r.payload);
-    const rtp = audio.rtp.filter((r) => ptSaves.includes(r.payload));
-
-    /* reattach the new rtp sections and  stripped payload list */
-    audio.rtp = rtp;
-    audio.payloads = rtp.map((r) => r.payload).join(' ');
-    return sdpTransform.write(sdp);
-  } catch (err) {
-    logger.error({err, remoteSdp, localSdp}, 'strip-ancillary-codecs error');
-  }
-};
-
-module.exports = stripCodecs;
-

package.json

@@ -26,25 +26,23 @@
     "jslint": "eslint app.js lib"
   },
   "dependencies": {
-    "@cognigy/socket-client": "^4.5.5",
     "@jambonz/db-helpers": "^0.6.16",
-    "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/mw-registrar": "^0.2.1",
-    "@jambonz/realtimedb-helpers": "^0.4.17",
-    "@jambonz/stats-collector": "^0.1.6",
+    "@jambonz/realtimedb-helpers": "^0.4.14",
+    "@jambonz/stats-collector": "^0.1.5",
     "@jambonz/time-series": "^0.1.5",
-    "aws-sdk": "^2.1060.0",
+    "aws-sdk": "^2.846.0",
     "bent": "^7.3.12",
     "cidr-matcher": "^2.1.1",
-    "debug": "^4.3.2",
+    "debug": "^4.3.1",
     "deepcopy": "^2.1.0",
     "drachtio-fsmrf": "^2.0.13",
     "drachtio-srf": "^4.4.55",
     "express": "^4.17.1",
     "ip": "^1.1.5",
     "moment": "^2.29.1",
-    "parse-url": "^5.0.7",
-    "pino": "^6.13.2",
+    "parse-url": "^5.0.2",
+    "pino": "^6.11.2",
     "to-snake-case": "^1.0.0",
     "uuid": "^8.3.2",
     "verify-aws-sns-signature": "^0.0.6",

test/docker-compose-testbed.yaml

@@ -124,7 +124,7 @@ services:
         ipv4_address: 172.38.0.63
 
   influxdb:
-    image: influxdb:1.8
+    image: influxdb:1.8-alpine
     ports:
       - "8086:8086"
     networks: