fix

2026-01-25 02:07:56 +00:00 · 2023-08-18 14:06:46 +07:00 · 2023-08-18 13:38:23 +07:00 · 2023-08-18 12:17:30 +07:00 · 2023-08-18 11:24:14 +07:00 · 2023-08-18 11:18:01 +07:00
50 changed files with 8661 additions and 3390 deletions
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -2,6 +2,8 @@ name: Docker

 on:
  push:
+    branches:
+      - main
    tags:
      - '*'

@@ -18,7 +20,7 @@ jobs:
      - name: prepare tag 
        id: prepare_tag
        run: |
-            IMAGE_ID=$GITHUB_REPOSITORY
+            IMAGE_ID=jambonz/feature-server

            # Strip git ref prefix from version
            VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
--- a/app.js
+++ b/app.js
@@ -20,7 +20,9 @@ const tracer = require('./tracer')(JAMBONES_OTEL_SERVICE_NAME);
 const api = require('@opentelemetry/api');
 srf.locals = {...srf.locals, otel: {tracer, api}};

-const opts = {level: JAMBONES_LOGLEVEL};
+const opts = {
+  level: JAMBONES_LOGLEVEL
+};
 const pino = require('pino');
 const logger = pino(opts, pino.destination({sync: false}));
 const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
@@ -118,10 +120,15 @@ function handle(signal) {
  srf.locals.disabled = true;
  logger.info(`got signal ${signal}`);
  const setName = `${(JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
+  const fsServiceUrlSetName = `${(JAMBONES_CLUSTER_ID || 'default')}:fs-service-url`;
  if (setName && srf.locals.localSipAddress) {
    logger.info(`got signal ${signal}, removing ${srf.locals.localSipAddress} from set ${setName}`);
    removeFromSet(setName, srf.locals.localSipAddress);
  }
+  if (fsServiceUrlSetName && srf.locals.serviceUrl) {
+    logger.info(`got signal ${signal}, removing ${srf.locals.serviceUrl} from set ${fsServiceUrlSetName}`);
+    removeFromSet(fsServiceUrlSetName, srf.locals.serviceUrl);
+  }
  removeFromSet(FS_UUID_SET_NAME, srf.locals.fsUUID);
  if (K8S) {
    srf.locals.lifecycleEmitter.operationalState = LifeCycleEvents.ScaleIn;
--- a/lib/config.js
+++ b/lib/config.js
@@ -8,7 +8,12 @@ const checkEnvs = () => {
  assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACHTIO_PORT env var');
  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');
+  if (process.env.JAMBONES_REDIS_SENTINELS) {
+    assert.ok(process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
+      'missing JAMBONES_REDIS_SENTINEL_MASTER_NAME env var, JAMBONES_REDIS_SENTINEL_PASSWORD env var is optional');
+  } else {
+    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');
 };

@@ -51,7 +56,7 @@ const JAMBONES_SBCS = process.env.JAMBONES_SBCS;
 /* websockets */
 const JAMBONES_WS_HANDSHAKE_TIMEOUT_MS = parseInt(process.env.JAMBONES_WS_HANDSHAKE_TIMEOUT_MS, 10) || 1500;
 const JAMBONES_WS_MAX_PAYLOAD = parseInt(process.env.JAMBONES_WS_MAX_PAYLOAD, 10) || 24 * 1024;
-
+const JAMBONES_WS_PING_INTERVAL_MS = parseInt(process.env.JAMBONES_WS_PING_INTERVAL_MS, 10) || 0;
 const MAX_RECONNECTS = 5;
 const RESPONSE_TIMEOUT_MS = parseInt(process.env.JAMBONES_WS_API_MSG_RESPONSE_TIMEOUT, 10) || 5000;

@@ -119,6 +124,30 @@ const HTTP_TIMEOUT = 10000;

 const OPTIONS_PING_INTERVAL = parseInt(process.env.OPTIONS_PING_INTERVAL, 10) || 30000;

+const JAMBONES_REDIS_SENTINELS = process.env.JAMBONES_REDIS_SENTINELS ? {
+  sentinels: process.env.JAMBONES_REDIS_SENTINELS.split(',').map((sentinel) => {
+    let host, port = 26379;
+    if (sentinel.includes(':')) {
+      const arr = sentinel.split(':');
+      host = arr[0];
+      port = parseInt(arr[1], 10);
+    } else {
+      host = sentinel;
+    }
+    return {host, port};
+  }),
+  name: process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
+  ...(process.env.JAMBONES_REDIS_SENTINEL_PASSWORD && {
+    password: process.env.JAMBONES_REDIS_SENTINEL_PASSWORD
+  }),
+  ...(process.env.JAMBONES_REDIS_SENTINEL_USERNAME && {
+    username: process.env.JAMBONES_REDIS_SENTINEL_USERNAME
+  })
+} : null;
+const JAMBONZ_RECORD_WS_BASE_URL = process.env.JAMBONZ_RECORD_WS_BASE_URL;
+const JAMBONZ_RECORD_WS_USERNAME = process.env.JAMBONZ_RECORD_WS_USERNAME;
+const JAMBONZ_RECORD_WS_PASSWORD = process.env.JAMBONZ_RECORD_WS_PASSWORD;
+
 module.exports = {
  JAMBONES_MYSQL_HOST,
  JAMBONES_MYSQL_USER,
@@ -138,6 +167,7 @@ module.exports = {
  JAMBONES_FREESWITCH,
  JAMBONES_REDIS_HOST,
  JAMBONES_REDIS_PORT,
+  JAMBONES_REDIS_SENTINELS,
  SMPP_URL,
  JAMBONES_NETWORK_CIDR,
  JAMBONES_API_BASE_URL,
@@ -186,10 +216,14 @@ module.exports = {
  RESPONSE_TIMEOUT_MS,
  JAMBONES_WS_HANDSHAKE_TIMEOUT_MS,
  JAMBONES_WS_MAX_PAYLOAD,
+  JAMBONES_WS_PING_INTERVAL_MS,
  MAX_RECONNECTS,
  GCP_JSON_KEY,
  MICROSOFT_REGION,
  MICROSOFT_API_KEY,
  SONIOX_API_KEY,
-  DEEPGRAM_API_KEY
+  DEEPGRAM_API_KEY,
+  JAMBONZ_RECORD_WS_BASE_URL,
+  JAMBONZ_RECORD_WS_USERNAME,
+  JAMBONZ_RECORD_WS_PASSWORD
 };
--- a/lib/http-routes/api/create-call.js
+++ b/lib/http-routes/api/create-call.js
@@ -19,8 +19,16 @@ router.post('/', async(req, res) => {
  logger.debug({body: req.body}, 'got createCall request');
  try {
    let uri, cs, to;
+    // app_json is creaeted by only api-server.
+    // if it available, take it and delete before creating task
+    const app_json = req.body.app_json;
+    delete req.body.app_json;
    const restDial = makeTask(logger, {'rest:dial': req.body});
-    const {lookupAccountDetails} = dbUtils(logger, srf);
+    restDial.appJson = app_json;
+    const {lookupAccountDetails, lookupCarrierByPhoneNumber, lookupCarrier} = dbUtils(logger, srf);
+    const {
+      lookupAppBySid
+    }  = srf.locals.dbHelpers;
    const {getSBC, getFreeswitch} = srf.locals;
    const sbcAddress = getSBC();
    if (!sbcAddress) throw new Error('no available SBCs for outbound call creation');
@@ -36,6 +44,14 @@ router.post('/', async(req, res) => {
    const account = await lookupAccountBySid(req.body.account_sid);
    const accountInfo = await lookupAccountDetails(req.body.account_sid);
    const callSid = uuidv4();
+    const application = req.body.application_sid ? await lookupAppBySid(req.body.application_sid) : null;
+    const record_all_calls = account.record_all_calls || (application && application.record_all_calls);
+    const recordOutputFormat = account.record_format || 'mp3';
+    const rootSpan = new RootSpan('rest-call', {
+      callSid,
+      accountSid,
+      ...(req.body?.application_sid && {'X-Application-Sid': req.body.application_sid})
+    });

    opts.headers = {
      ...opts.headers,
@@ -43,7 +59,10 @@ router.post('/', async(req, res) => {
      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
      'X-Call-Sid': callSid,
      'X-Account-Sid': accountSid,
-      ...(restDial.fromHost && {'X-Preferred-From-Host': restDial.fromHost})
+      'X-Trace-ID': rootSpan.traceId,
+      ...(req.body?.application_sid && {'X-Application-Sid': req.body.application_sid}),
+      ...(restDial.fromHost && {'X-Preferred-From-Host': restDial.fromHost}),
+      ...(record_all_calls && {'X-Record-All-Calls': recordOutputFormat})
    };

    switch (target.type) {
@@ -77,7 +96,6 @@ router.post('/', async(req, res) => {
    }

    if (target.type === 'phone' && target.trunk) {
-      const {lookupCarrier} = dbUtils(this.logger, srf);
      const voip_carrier_sid = await lookupCarrier(req.body.account_sid, target.trunk);
      logger.info(
        `createCall: selected ${voip_carrier_sid} for requested carrier: ${target.trunk || 'unspecified'})`);
@@ -91,10 +109,11 @@ router.post('/', async(req, res) => {
     * check if from-number matches any existing numbers on Jambonz
     *  */
    if (target.type === 'phone' && !target.trunk) {
-      const {lookupCarrierByPhoneNumber} = dbUtils(this.logger, srf);
-      const voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, restDial.from);
+      const str = restDial.from || '';
+      const callingNumber = str.startsWith('+') ? str.substring(1) : str;
+      const voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, callingNumber);
      logger.info(
-        `createCall: selected ${voip_carrier_sid} for requested phone number: ${restDial.from || 'unspecified'})`);
+        `createCall: selected ${voip_carrier_sid} for requested phone number: ${callingNumber || 'unspecified'})`);
      if (voip_carrier_sid) {
        opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
      }
@@ -181,7 +200,6 @@ router.post('/', async(req, res) => {
          /* ok our outbound INVITE is in flight */

          const tasks = [restDial];
-          const rootSpan = new RootSpan('rest-call', inviteReq);
          sipLogger = logger.child({
            callSid,
            callId: inviteReq.get('Call-ID'),
@@ -245,6 +263,7 @@ router.post('/', async(req, res) => {
          sipStatus: err.status,
          sipReason: err.reason
        });
+        cs.callGone = true;
      }
      else {
        if (cs) cs.emit('callStatusChange', {
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -11,7 +11,7 @@ const dbUtils = require('./utils/db-utils');
 const RootSpan = require('./utils/call-tracer');
 const listTaskNames = require('./utils/summarize-tasks');
 const {
-  JAMBONES_MYSQL_REFRESH_TTL,
+  JAMBONES_MYSQL_REFRESH_TTL
 } = require('./config');

 module.exports = function(srf, logger) {
@@ -322,6 +322,7 @@ module.exports = function(srf, logger) {
        const httpHeaders = b3 && { b3 };
        json = await app.requestor.request('session:new', app.call_hook, params, httpHeaders);
      }
+
      app.tasks = normalizeJambones(logger, json).map((tdata) => makeTask(logger, tdata));
      span?.setAttributes({
        'http.statusCode': 200,
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -19,7 +19,10 @@ const HttpRequestor = require('../utils/http-requestor');
 const WsRequestor = require('../utils/ws-requestor');
 const {
  JAMBONES_INJECT_CONTENT,
-  AWS_REGION
+  AWS_REGION,
+  JAMBONZ_RECORD_WS_BASE_URL,
+  JAMBONZ_RECORD_WS_USERNAME,
+  JAMBONZ_RECORD_WS_PASSWORD,
 } = require('../config');
 const BADPRECONDITIONS = 'preconditions not met';
 const CALLER_CANCELLED_ERR_MSG = 'Response not sent due to unknown transaction';
@@ -64,6 +67,16 @@ class CallSession extends Emitter {
    this.notifiedComplete = false;
    this.rootSpan = rootSpan;

+    this._origRecognizerSettings = {
+      vendor: this.application?.speech_recognizer_vendor,
+      language: this.application?.speech_recognizer_language,
+    };
+    this._origSynthesizerSettings = {
+      vendor: this.application?.speech_synthesis_vendor,
+      language: this.application?.speech_synthesis_language,
+      voice: this.application?.speech_synthesis_voice,
+    };
+
    assert(rootSpan);

    this._recordState = RecordState.RecordingOff;
@@ -122,6 +135,11 @@ class CallSession extends Emitter {
    return this.callInfo.callStatus;
  }

+  get isBackGroundListen() {
+    return !(this.backgroundListenTask === null ||
+    this.backgroundListenTask === undefined);
+  }
+
  /**
   * SIP call-id for the call
   */
@@ -161,6 +179,30 @@ class CallSession extends Emitter {
  set speechSynthesisVendor(vendor) {
    this.application.speech_synthesis_vendor = vendor;
  }
+
+  get fallbackSpeechSynthesisVendor() {
+    return this.application.use_for_fallback_speech ? this.application.fallback_speech_synthesis_vendor : null;
+  }
+  set fallbackSpeechSynthesisVendor(vendor) {
+    this.application.fallback_speech_synthesis_vendor = vendor;
+  }
+
+  /**
+   * default label to use for speech synthesis if not provided in the app
+   */
+  get speechSynthesisLabel() {
+    return this.application.speech_synthesis_label;
+  }
+  set speechSynthesisLabel(label) {
+    this.application.speech_synthesis_label = label;
+  }
+
+  get fallbackSpeechSynthesisLabel() {
+    return this.application.fallback_speech_synthesis_label;
+  }
+  set fallbackSpeechSynthesisLabel(label) {
+    this.application.fallback_speech_synthesis_label = label;
+  }
  /**
   * default voice to use for speech synthesis if not provided in the app
   */
@@ -170,6 +212,13 @@ class CallSession extends Emitter {
  set speechSynthesisVoice(voice) {
    this.application.speech_synthesis_voice = voice;
  }
+
+  get fallbackSpeechSynthesisVoice() {
+    return this.application.fallback_speech_synthesis_voice;
+  }
+  set fallbackSpeechSynthesisVoice(voice) {
+    this.application.fallback_speech_synthesis_voice = voice;
+  }
  /**
   * default language to use for speech synthesis if not provided in the app
   */
@@ -180,6 +229,13 @@ class CallSession extends Emitter {
    this.application.speech_synthesis_language = language;
  }

+  get fallbackSpeechSynthesisLanguage() {
+    return this.application.fallback_speech_synthesis_language;
+  }
+  set fallbackSpeechSynthesisLanguage(language) {
+    this.application.fallback_speech_synthesis_language = language;
+  }
+
  /**
   * default vendor to use for speech recognition if not provided in the app
   */
@@ -189,6 +245,29 @@ class CallSession extends Emitter {
  set speechRecognizerVendor(vendor) {
    this.application.speech_recognizer_vendor = vendor;
  }
+
+  get fallbackSpeechRecognizerVendor() {
+    return this.application.fallback_speech_recognizer_vendor;
+  }
+  set fallbackSpeechRecognizerVendor(vendor) {
+    this.application.fallback_speech_recognizer_vendor = vendor;
+  }
+  /**
+   * default vendor to use for speech recognition if not provided in the app
+   */
+  get speechRecognizerLabel() {
+    return this.application.speech_recognizer_label;
+  }
+  set speechRecognizerLabel(label) {
+    this.application.speech_recognizer_label = label;
+  }
+
+  get fallbackSpeechRecognizerLabel() {
+    return this.application.fallback_speech_recognizer_label;
+  }
+  set fallbackSpeechRecognizerLabel(label) {
+    this.application.fallback_speech_recognizer_label = label;
+  }
  /**
 * default language to use for speech recognition if not provided in the app
 */
@@ -199,6 +278,13 @@ class CallSession extends Emitter {
    this.application.speech_recognizer_language = language;
  }

+  get fallbackSpeechRecognizerLanguage() {
+    return this.application.fallback_speech_recognizer_language;
+  }
+  set fallbackSpeechRecognizerLanguage(language) {
+    this.application.fallback_speech_recognizer_language = language;
+  }
+
  /**
   * indicates whether the call currently in progress
   */
@@ -324,6 +410,22 @@ class CallSession extends Emitter {
    return this._globalSttPunctuation !== undefined;
  }

+  resetRecognizer() {
+    this._globalSttHints = undefined;
+    this._globalSttPunctuation = undefined;
+    this._globalAltLanguages = undefined;
+    this.isContinuousAsr = false;
+    this.asrDtmfTerminationDigits = undefined;
+    this.speechRecognizerLanguage = this._origRecognizerSettings.language;
+    this.speechRecognizerVendor = this._origRecognizerSettings.vendor;
+  }
+
+  resetSynthesizer() {
+    this.speechSynthesisLanguage = this._origSynthesizerSettings.language;
+    this.speechSynthesisVendor = this._origSynthesizerSettings.vendor;
+    this.speechSynthesisVoice = this._origSynthesizerSettings.voice;
+  }
+
  async notifyRecordOptions(opts) {
    const {action} = opts;
    this.logger.debug({opts}, 'CallSession:notifyRecordOptions');
@@ -389,7 +491,10 @@ class CallSession extends Emitter {
          'X-Call-Sid': this.callSid,
          'X-Account-Sid': this.accountSid,
          'X-Application-Sid': this.applicationSid,
-        }
+          ...(this.recordOptions.headers && {'Content-Type': 'application/json'})
+        },
+        // Siprect Client is initiated from startCallRecording, so just need to pass custom headers in startRecording
+        ...(this.recordOptions.headers && {body: JSON.stringify(this.recordOptions.headers) + '\n'})
      });
      if (res.status === 200) {
        this._recordState = RecordState.RecordingOn;
@@ -410,7 +515,7 @@ class CallSession extends Emitter {
      const res = await this.dlg.request({
        method: 'INFO',
        headers: {
-          'X-Reason': 'stopCallRecording',
+          'X-Reason': 'stopCallRecording'
        }
      });
      if (res.status === 200) {
@@ -432,7 +537,7 @@ class CallSession extends Emitter {
      const res = await this.dlg.request({
        method: 'INFO',
        headers: {
-          'X-Reason': 'pauseCallRecording',
+          'X-Reason': 'pauseCallRecording'
        }
      });
      if (res.status === 200) {
@@ -454,7 +559,7 @@ class CallSession extends Emitter {
      const res = await this.dlg.request({
        method: 'INFO',
        headers: {
-          'X-Reason': 'resumeCallRecording',
+          'X-Reason': 'resumeCallRecording'
        }
      });
      if (res.status === 200) {
@@ -469,7 +574,7 @@ class CallSession extends Emitter {
    }
  }

-  async startBackgroundListen(opts) {
+  async startBackgroundListen(opts, bugname) {
    if (this.isListenEnabled) {
      this.logger.info('CallSession:startBackgroundListen - listen is already enabled, ignoring request');
      return;
@@ -478,8 +583,11 @@ class CallSession extends Emitter {
      this.logger.debug({opts}, 'CallSession:startBackgroundListen');
      const t = normalizeJambones(this.logger, [opts]);
      this.backgroundListenTask = makeTask(this.logger, t[0]);
+      this.backgroundListenTask.bugname = bugname;
+      // Remove unneeded customer data to be sent to api server.
+      this.backgroundListenTask.ignoreCustomerData = true;
      const resources = await this._evaluatePreconditions(this.backgroundListenTask);
-      const {span, ctx} = this.rootSpan.startChildSpan(`background-gather:${this.backgroundListenTask.summary}`);
+      const {span, ctx} = this.rootSpan.startChildSpan(`background-listen:${this.backgroundListenTask.summary}`);
      this.backgroundListenTask.span = span;
      this.backgroundListenTask.ctx = ctx;
      this.backgroundListenTask.exec(this, resources)
@@ -502,6 +610,7 @@ class CallSession extends Emitter {
  }

  async stopBackgroundListen() {
+    this.logger.debug('CallSession:stopBackgroundListen');
    try {
      if (this.backgroundListenTask) {
        this.backgroundListenTask.removeAllListeners();
@@ -510,7 +619,6 @@ class CallSession extends Emitter {
    } catch (err) {
      this.logger.info({err}, 'CallSession:stopBackgroundListen - Error stopping listen task');
    }
-    this.backgroundListenTask = null;
  }

  async enableBotMode(gather, autoEnable) {
@@ -600,14 +708,17 @@ class CallSession extends Emitter {
   * Check for speech credentials for the specified vendor
   * @param {*} vendor - google or aws
   */
-  getSpeechCredentials(vendor, type) {
+  getSpeechCredentials(vendor, type, label = null) {
    const {writeAlerts, AlertType} = this.srf.locals;
    if (this.accountInfo.speech && this.accountInfo.speech.length > 0) {
-      const credential = this.accountInfo.speech.find((s) => s.vendor === vendor);
+      const credential = this.accountInfo.speech.find((s) => s.vendor === vendor &&
+        ((label && s.label === label) || label === null));
      if (credential && (
        (type === 'tts' && credential.use_for_tts) ||
        (type === 'stt' && credential.use_for_stt)
      )) {
+        this.logger.info(`Speech credential vendor: ${credential.vendor} 
+          ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
        if ('google' === vendor) {
          try {
            const cred = JSON.parse(credential.service_key.replace(/\n/g, '\\n'));
@@ -680,6 +791,12 @@ class CallSession extends Emitter {
            stt_region: credential.stt_region
          };
        }
+        else if ('nvidia' === vendor) {
+          return {
+            speech_credential_sid: credential.speech_credential_sid,
+            riva_server_uri: credential.riva_server_uri
+          };
+        }
        else if (vendor.startsWith('custom:')) {
          return {
            speech_credential_sid: credential.speech_credential_sid,
@@ -729,6 +846,7 @@ class CallSession extends Emitter {
        }
        if (!skip) {
          const {span, ctx} = this.rootSpan.startChildSpan(`verb:${task.summary}`);
+          span.setAttributes({'verb.summary': task.summary});
          task.span = span;
          task.ctx = ctx;
          await task.exec(this, resources);
@@ -749,20 +867,15 @@ class CallSession extends Emitter {
        }
      }

-      if (0 === this.tasks.length && this.requestor instanceof WsRequestor && !this.callGone) {
-        let span;
+      if (0 === this.tasks.length &&
+        this.requestor instanceof WsRequestor &&
+        !this.requestor.closedGracefully &&
+        !this.callGone
+      ) {
        try {
-          const {span} = this.rootSpan.startChildSpan('waiting for commands');
-          const {reason, queue, command} = await this._awaitCommandsOrHangup();
-          span.setAttributes({
-            'completion.reason': reason,
-            'async.request.queue': queue,
-            'async.request.command': command
-          });
-          span.end();
+          await this._awaitCommandsOrHangup();
          if (this.callGone) break;
        } catch (err) {
-          span.end();
          this.logger.info(err, 'CallSession:exec - error waiting for new commands');
          break;
        }
@@ -1255,15 +1368,17 @@ class CallSession extends Emitter {
      this.wakeupResolver(resolution);
      this.wakeupResolver = null;
    }
+    /*
    else {
-      const {span} = this.rootSpan.startChildSpan('async command');
      const {queue, command} = resolution;
+      const {span} = this.rootSpan.startChildSpan(`recv cmd: ${command}`);
      span.setAttributes({
        'async.request.queue': queue,
        'async.request.command': command
      });
      span.end();
    }
+    */
  }

  _onWsConnectionDropped() {
@@ -1303,7 +1418,10 @@ class CallSession extends Emitter {
      }

      // we are going from an early media connection to answer
-      await this.propagateAnswer();
+      if (this.direction === CallDirection.Inbound) {
+        // only do this for inbound call.
+        await this.propagateAnswer();
+      }
      return {
        ...resources,
        ...(this.isSipRecCallSession && {ep2: this.ep2})
@@ -1474,7 +1592,6 @@ class CallSession extends Emitter {
      }
      this.dlg.on('modify', this._onReinvite.bind(this));
      this.dlg.on('refer', this._onRefer.bind(this));
-
      this.logger.debug(`CallSession:propagateAnswer - answered callSid ${this.callSid}`);
    }
  }
@@ -1549,7 +1666,7 @@ class CallSession extends Emitter {
      const pp = this._pool.promise();
      try {
        this.logger.info({accountSid: this.accountSid}, 'performQueueWebhook: looking up account');
-        const [r] = await pp.query(sqlRetrieveQueueEventHook, this.accountSid);
+        const [r] = await pp.query(sqlRetrieveQueueEventHook, [this.accountSid]);
        if (0 === r.length) {
          this.logger.info({accountSid: this.accountSid}, 'performQueueWebhook: no webhook provisioned');
          this.queueEventHookRequestor = null;
@@ -1711,6 +1828,14 @@ class CallSession extends Emitter {
  async _notifyCallStatusChange({callStatus, sipStatus, sipReason, duration}) {
    if (this.callMoved) return;

+    if (callStatus === CallStatus.InProgress) {
+      // nice, call is in progress, good time to enable record
+      await this.enableRecordAllCall();
+    } else if (callStatus == CallStatus.Completed && this.isBackGroundListen) {
+      this.stopBackgroundListen().catch((err) => this.logger.error(
+        {err}, 'CallSession:_notifyCallStatusChange - error stopping background listen'));
+    }
+
    /* race condition: we hang up at the same time as the caller */
    if (callStatus === CallStatus.Completed) {
      if (this.notifiedComplete) return;
@@ -1723,6 +1848,15 @@ class CallSession extends Emitter {

    this.callInfo.updateCallStatus(callStatus, sipStatus, sipReason);
    if (typeof duration === 'number') this.callInfo.duration = duration;
+    this.executeStatusCallback(callStatus, sipStatus);
+
+    // update calls db
+    //this.logger.debug(`updating redis with ${JSON.stringify(this.callInfo)}`);
+    this.updateCallStatus(Object.assign({}, this.callInfo.toJSON()), this.serviceUrl)
+      .catch((err) => this.logger.error(err, 'redis error'));
+  }
+
+  async executeStatusCallback(callStatus, sipStatus) {
    const {span} = this.rootSpan.startChildSpan(`call-status:${this.callInfo.callStatus}`);
    span.setAttributes(this.callInfo.toJSON());
    try {
@@ -1734,11 +1868,24 @@ class CallSession extends Emitter {
      span.end();
      this.logger.info(err, `CallSession:_notifyCallStatusChange error sending ${callStatus} ${sipStatus}`);
    }
+  }

-    // update calls db
-    //this.logger.debug(`updating redis with ${JSON.stringify(this.callInfo)}`);
-    this.updateCallStatus(Object.assign({}, this.callInfo.toJSON()), this.serviceUrl)
-      .catch((err) => this.logger.error(err, 'redis error'));
+  async enableRecordAllCall() {
+    if (this.accountInfo.account.record_all_calls || this.application.record_all_calls) {
+      const listenOpts = {
+        url: `${JAMBONZ_RECORD_WS_BASE_URL}/record/${this.accountInfo.account.bucket_credential.vendor}`,
+        wsAuth: {
+          username: JAMBONZ_RECORD_WS_USERNAME,
+          password: JAMBONZ_RECORD_WS_PASSWORD
+        },
+        disableBidirectionalAudio: true,
+        mixType : 'stereo',
+        passDtmf: true
+      };
+
+      this.logger.debug({listenOpts}, 'Record all calls: enabling listen');
+      await this.startBackgroundListen({verb: 'listen', ...listenOpts}, 'jambonz-session-record');
+    }
  }

  /**
--- a/lib/session/rest-call-session.js
+++ b/lib/session/rest-call-session.js
@@ -21,6 +21,10 @@ class RestCallSession extends CallSession {
    });
    this.req = req;
    this.ep = ep;
+    // keep restDialTask reference for closing AMD
+    if (tasks.length) {
+      this.restDialTask = tasks[0];
+    }

    this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
    this._notifyCallStatusChange({
@@ -44,6 +48,9 @@ class RestCallSession extends CallSession {
   * This is invoked when the called party hangs up, in order to calculate the call duration.
   */
  _callerHungup() {
+    if (this.restDialTask) {
+      this.restDialTask.turnOffAmd();
+    }
    this.callInfo.callTerminationBy = 'caller';
    const duration = moment().diff(this.dlg.connectTime, 'seconds');
    this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
--- a/lib/tasks/conference.js
+++ b/lib/tasks/conference.js
@@ -114,7 +114,12 @@ class Conference extends Task {
    }
    this.emitter.emit('kill');
    await this._doFinalMemberCheck(cs);
-    if (this.ep && this.ep.connected) this.ep.conn.removeAllListeners('esl::event::CUSTOM::*') ;
+    if (this.ep && this.ep.connected) {
+      this.ep.conn.removeAllListeners('esl::event::CUSTOM::*');
+      this.ep.api(`conference ${this.confName} kick ${this.memberId}`)
+        .catch((err) => this.logger.info({err}, 'Error kicking participant'));
+    }
+    cs.clearConferenceDetails();
    this.notifyTaskDone();
  }

--- a/lib/tasks/config.js
+++ b/lib/tasks/config.js
@@ -30,6 +30,12 @@ class TaskConfig extends Task {
        if (this.bargeIn[k]) this.gatherOpts[k] = this.bargeIn[k];
      });
    }
+
+    if (this.data.reset) {
+      if (typeof this.data.reset === 'string') this.data.reset = [this.data.reset];
+    }
+    else this.data.reset = [];
+
    if (this.bargeIn.sticky) this.autoEnable = true;
    this.preconditions = (this.bargeIn.enable || this.record?.action || this.listen?.url || this.data.amd) ?
      TaskPreconditions.Endpoint :
@@ -45,6 +51,10 @@ class TaskConfig extends Task {

  get summary() {
    const phrase = [];
+
+    /* reset recognizer and/or synthesizer to default values? */
+    if (this.data.reset.length) phrase.push(`reset ${this.data.reset.join(',')}`);
+
    if (this.bargeIn.enable) phrase.push('enable barge-in');
    if (this.hasSynthesizer) {
      const {vendor:v, language:l, voice} = this.synthesizer;
@@ -62,7 +72,7 @@ class TaskConfig extends Task {
    }
    if (this.data.amd) phrase.push('enable amd');
    if (this.notifyEvents) phrase.push(`event notification ${this.notifyEvents ? 'on' : 'off'}`);
-    return `${this.name}{${phrase.join(',')}`;
+    return `${this.name}{${phrase.join(',')}}`;
  }

  async exec(cs, {ep} = {}) {
@@ -86,25 +96,60 @@ class TaskConfig extends Task {
      }
    }

+    this.data.reset.forEach((k) => {
+      if (k === 'synthesizer') cs.resetSynthesizer();
+      else if (k === 'recognizer') cs.resetRecognizer();
+    });
+
    if (this.hasSynthesizer) {
      cs.speechSynthesisVendor = this.synthesizer.vendor !== 'default'
        ? this.synthesizer.vendor
        : cs.speechSynthesisVendor;
+      cs.speechSynthesisLabel = this.synthesizer.label !== 'default'
+        ? this.synthesizer.label
+        : cs.speechSynthesisLabel;
      cs.speechSynthesisLanguage = this.synthesizer.language !== 'default'
        ?  this.synthesizer.language
        : cs.speechSynthesisLanguage;
      cs.speechSynthesisVoice = this.synthesizer.voice !== 'default'
        ? this.synthesizer.voice
        : cs.speechSynthesisVoice;
+      // fallback vendor
+      cs.fallbackSpeechSynthesisVendor = this.synthesizer.fallbackVendor !== 'default'
+        ? this.synthesizer.fallbackVendor
+        : cs.fallbackSpeechSynthesisVendor;
+      cs.fallbackSpeechSynthesisLabel = this.synthesizer.fallbackLabel !== 'default'
+        ? this.synthesizer.fallbackLabel
+        : cs.fallbackSpeechSynthesisLabel;
+      cs.fallbackSpeechSynthesisLanguage = this.synthesizer.fallbackLanguage !== 'default'
+        ?  this.synthesizer.fallbackLanguage
+        : cs.fallbackSpeechSynthesisLanguage;
+      cs.fallbackSpeechSynthesisVoice = this.synthesizer.fallbackVoice !== 'default'
+        ? this.synthesizer.fallbackVoice
+        : cs.fallbackSpeechSynthesisVoice;
      this.logger.info({synthesizer: this.synthesizer}, 'Config: updated synthesizer');
    }
    if (this.hasRecognizer) {
      cs.speechRecognizerVendor = this.recognizer.vendor !== 'default'
        ? this.recognizer.vendor
        : cs.speechRecognizerVendor;
+      cs.speechRecognizerLabel = this.recognizer.label !== 'default'
+        ? this.recognizer.label
+        : cs.speechRecognizerLabel;
      cs.speechRecognizerLanguage = this.recognizer.language !== 'default'
        ? this.recognizer.language
        : cs.speechRecognizerLanguage;
+
+      //fallback
+      cs.fallbackSpeechRecognizerVendor = this.recognizer.fallbackVendor !== 'default'
+        ? this.recognizer.fallbackVendor
+        : cs.fallbackSpeechRecognizerVendor;
+      cs.fallbackSpeechRecognizerLabel = this.recognizer.fallbackLabel !== 'default'
+        ? this.recognizer.fallbackLabel
+        : cs.fallbackSpeechRecognizerLabel;
+      cs.fallbackSpeechRecognizerLanguage = this.recognizer.fallbackLanguage !== 'default'
+        ? this.recognizer.fallbackLanguage
+        : cs.fallbackSpeechRecognizerLanguage;
      cs.isContinuousAsr = typeof this.recognizer.asrTimeout === 'number' ? true : false;
      if (cs.isContinuousAsr) {
        cs.asrTimeout = this.recognizer.asrTimeout;
--- a/lib/tasks/dequeue.js
+++ b/lib/tasks/dequeue.js
@@ -16,6 +16,7 @@ class TaskDequeue extends Task {
    this.queueName = this.data.name;
    this.timeout = this.data.timeout || 0;
    this.beep = this.data.beep === true;
+    this.callSid = this.data.callSid;

    this.emitter = new Emitter();
    this.state = DequeueResults.Timeout;
@@ -53,7 +54,7 @@ class TaskDequeue extends Task {
  }

  _getMemberFromQueue(cs) {
-    const {popFront} = cs.srf.locals.dbHelpers;
+    const {retrieveFromSortedSet, retrieveByPatternSortedSet} = cs.srf.locals.dbHelpers;

    return new Promise(async(resolve) => {
      let timer;
@@ -70,7 +71,12 @@ class TaskDequeue extends Task {

      do {
        try {
-          const url = await popFront(this.queueName);
+          let url;
+          if (this.callSid) {
+            url = await retrieveByPatternSortedSet(this.queueName, `*${this.callSid}`);
+          } else {
+            url = await retrieveFromSortedSet(this.queueName);
+          }
          if (url) {
            found = true;
            clearTimeout(timer);
@@ -78,7 +84,7 @@ class TaskDequeue extends Task {
            resolve(url);
          }
        } catch (err) {
-          this.logger.debug({err}, 'TaskDequeue:_getMemberFromQueue error popFront');
+          this.logger.debug({err}, 'TaskDequeue:_getMemberFromQueue error Sorted Set');
        }
        await sleepFor(5000);
      } while (!this.killed && !timedout && !found);
--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -137,6 +137,7 @@ class TaskDial extends Task {

  get canReleaseMedia() {
    const keepAnchor = this.data.anchorMedia ||
+    this.cs.isBackGroundListen ||
    ANCHOR_MEDIA_ALWAYS ||
    this.listenTask ||
    this.transcribeTask ||
@@ -166,6 +167,16 @@ class TaskDial extends Task {
  async exec(cs) {
    await super.exec(cs);
    try {
+      if (this.listenTask) {
+        const {span, ctx} = this.startChildSpan(`nested:${this.listenTask.summary}`);
+        this.listenTask.span = span;
+        this.listenTask.ctx = ctx;
+      }
+      if (this.transcribeTask) {
+        const {span, ctx} = this.startChildSpan(`nested:${this.transcribeTask.summary}`);
+        this.transcribeTask.span = span;
+        this.transcribeTask.ctx = ctx;
+      }
      if (this.data.amd) {
        this.startAmd = cs.startAmd;
        this.stopAmd = cs.stopAmd;
@@ -223,10 +234,12 @@ class TaskDial extends Task {
    if (this.callSid) sessionTracker.remove(this.callSid);
    if (this.listenTask) {
      await this.listenTask.kill(cs);
+      this.listenTask.span.end();
      this.listenTask = null;
    }
    if (this.transcribeTask) {
      await this.transcribeTask.kill(cs);
+      this.transcribeTask.span.end();
      this.transcribeTask = null;
    }
    this.notifyTaskDone();
@@ -409,6 +422,7 @@ class TaskDial extends Task {
      'X-Account-Sid': cs.accountSid,
      ...(req && req.has('X-CID') && {'X-CID': req.get('X-CID')}),
      ...(req && req.has('P-Asserted-Identity') && {'P-Asserted-Identity': req.get('P-Asserted-Identity')}),
+      ...(req && req.has('X-Voip-Carrier-Sid') && {'X-Voip-Carrier-Sid': req.get('X-Voip-Carrier-Sid')}),
      // Put headers at the end to make sure opt.headers override all default behavior.
      ...this.headers
    };
@@ -459,7 +473,7 @@ class TaskDial extends Task {
        }
        if (t.type === 'phone' && t.trunk) {
          const voip_carrier_sid = await lookupCarrier(cs.accountSid, t.trunk);
-          this.logger.info(`Dial:_attemptCalls: selected ${voip_carrier_sid} for requested carrier: ${t.trunk})`);
+          this.logger.info(`Dial:_attemptCalls: selected ${voip_carrier_sid} for requested carrier: ${t.trunk}`);
          if (voip_carrier_sid) {
            opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
          }
@@ -470,9 +484,11 @@ class TaskDial extends Task {
         * check if number matches any existing numbers
         *  */
        if (t.type === 'phone' && !t.trunk) {
-          const voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, t.number);
+          const str = this.callerId || req.callingNumber || '';
+          const callingNumber = str.startsWith('+') ? str.substring(1) : str;
+          const voip_carrier_sid = await lookupCarrierByPhoneNumber(cs.accountSid, callingNumber);
          this.logger.info(
-            `Dial:_attemptCalls: selected ${voip_carrier_sid} for requested phone number: ${t.number})`);
+            `Dial:_attemptCalls: selected ${voip_carrier_sid} for requested phone number: ${callingNumber}`);
          if (voip_carrier_sid) {
            opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
          }
@@ -653,7 +669,7 @@ class TaskDial extends Task {
    if (this.parentDtmfCollector) this._installDtmfDetection(cs, cs.dlg);
    if (this.childDtmfCollector) this._installDtmfDetection(cs, this.dlg);

-    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep2: this.epOther, ep:this.ep});
+    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep: this.epOther, ep2:this.ep});
    if (this.listenTask) this.listenTask.exec(cs, {ep: this.epOther});
    if (this.startAmd) {
      try {
--- a/lib/tasks/dialogflow/index.js
+++ b/lib/tasks/dialogflow/index.js
@@ -58,6 +58,13 @@ class Dialogflow extends Task {
      this.vendor = this.data.tts.vendor || 'default';
      this.language = this.data.tts.language || 'default';
      this.voice = this.data.tts.voice || 'default';
+      this.speechSynthesisLabel = this.data.tts.label || null;
+
+      // fallback tts
+      this.fallbackVendor = this.data.tts.fallbackVendor || 'default';
+      this.fallbackLanguage = this.data.tts.fallbackLanguage || 'default';
+      this.fallbackVoice = this.data.tts.fallbackLanguage || 'default';
+      this.fallbackLabel = this.data.tts.fallbackLabel || 'default';
    }
    this.bargein = this.data.bargein;
  }
@@ -118,8 +125,15 @@ class Dialogflow extends Task {
        this.vendor = cs.speechSynthesisVendor;
        this.language = cs.speechSynthesisLanguage;
        this.voice = cs.speechSynthesisVoice;
+        this.speechSynthesisLabel = cs.speechSynthesisLabel;
      }
-      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts');
+      if (this.fallbackVendor === 'default') {
+        this.fallbackVendor = cs.fallbackSpeechSynthesisVendor;
+        this.fallbackLanguage = cs.fallbackSpeechSynthesisLanguage;
+        this.fallbackVoice = cs.fallbackSpeechSynthesisVoice;
+        this.fallbackLabel = cs.fallbackSpeechSynthesisLabel;
+      }
+      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts', this.speechSynthesisLabel);

      this.ep.addCustomEventListener('dialogflow::intent', this._onIntent.bind(this, ep, cs));
      this.ep.addCustomEventListener('dialogflow::transcription', this._onTranscription.bind(this, ep, cs));
@@ -221,16 +235,7 @@ class Dialogflow extends Task {
      }

      try {
-        const obj = {
-          text: intent.fulfillmentText,
-          vendor: this.vendor,
-          language: this.language,
-          voice: this.voice,
-          salt: cs.callSid,
-          credentials: this.ttsCredentials
-        };
-        this.logger.debug({obj}, 'Dialogflow:_onIntent - playing message via tts');
-        const {filePath, servedFromCache} = await synthAudio(stats, obj);
+        const {filePath, servedFromCache} = await this.fallbackSynthAudio(cs, intent, stats, synthAudio);
        if (filePath) cs.trackTmpFile(filePath);
        if (!this.ttsCredentials && !servedFromCache) cs.billForTts(intent.fulfillmentText.length);

@@ -276,6 +281,46 @@ class Dialogflow extends Task {
    }
  }

+  async fallbackSynthAudio(cs, intent, stats, synthAudio) {
+    try {
+      const obj = {
+        account_sid: cs.accountSid,
+        text: intent.fulfillmentText,
+        vendor: this.vendor,
+        language: this.language,
+        voice: this.voice,
+        salt: cs.callSid,
+        credentials: this.ttsCredentials
+      };
+      this.logger.debug({obj}, 'Dialogflow:_onIntent - playing message via tts');
+
+      return await synthAudio(stats, obj);
+    } catch (error) {
+      this.logger.info({error}, 'Failed to synthesize audio from primary vendor');
+
+      try {
+        if (this.fallbackVendor) {
+          const credentials = cs.getSpeechCredentials(this.fallbackVendor, 'tts', this.fallbackLabel);
+          const obj = {
+            account_sid: cs.accountSid,
+            text: intent.fulfillmentText,
+            vendor: this.fallbackVendor,
+            language: this.fallbackLanguage,
+            voice: this.fallbackVoice,
+            salt: cs.callSid,
+            credentials
+          };
+          this.logger.debug({obj}, 'Dialogflow:_onIntent - playing message via fallback tts');
+          return await synthAudio(stats, obj);
+        }
+      } catch (err) {
+        this.logger.info({err}, 'Failed to synthesize audio from falllback vendor');
+        throw err;
+      }
+      throw error;
+    }
+  }
+
  /**
   * A transcription - either interim or final - has been returned.
   * If we are doing barge-in based on hotword detection, check for the hotword or phrase.
--- a/lib/tasks/enqueue.js
+++ b/lib/tasks/enqueue.js
@@ -18,6 +18,7 @@ class TaskEnqueue extends Task {
    this.preconditions = TaskPreconditions.Endpoint;

    this.queueName = this.data.name;
+    this.priority = this.data.priority;
    this.waitHook = this.data.waitHook;

    this.emitter = new Emitter();
@@ -70,12 +71,22 @@ class TaskEnqueue extends Task {
  }

  async _addToQueue(cs, dlg) {
-    const {pushBack} = cs.srf.locals.dbHelpers;
+    const {addToSortedSet, sortedSetLength} = cs.srf.locals.dbHelpers;
    const url = getUrl(cs);
    this.waitStartTime = Date.now();
    this.logger.debug({queue: this.queueName, url}, 'pushing url onto queue');
-    const members = await pushBack(this.queueName, url);
-    this.logger.info(`TaskEnqueue:_addToQueue: added to queue, length now ${members}`);
+    if (this.priority < 0) {
+      this.logger.warn(`priority ${this.priority} is invalid, need to be non-negative integer,
+      999 will be used for priority`);
+    }
+    let members = await addToSortedSet(this.queueName, url, this.priority);
+    if (members === 1) {
+      this.logger.info('TaskEnqueue:_addToQueue: added to queue');
+    } else {
+      this.logger.info('TaskEnqueue:_addToQueue: failed to add to queue');
+    }
+    members = await sortedSetLength(this.queueName);
+
    this.notifyUrl = url;

    /* invoke account-level webhook for queue event notifications */
@@ -90,9 +101,9 @@ class TaskEnqueue extends Task {
  }

  async _removeFromQueue(cs) {
-    const {removeFromList, lengthOfList} = cs.srf.locals.dbHelpers;
-    await removeFromList(this.queueName, getUrl(cs));
-    return await lengthOfList(this.queueName);
+    const {retrieveByPatternSortedSet, sortedSetLength} = cs.srf.locals.dbHelpers;
+    await retrieveByPatternSortedSet(this.queueName, `*${getUrl(cs)}`);
+    return await sortedSetLength(this.queueName);
  }

  async performAction() {
@@ -279,13 +290,13 @@ class TaskEnqueue extends Task {
      this.emitter.emit('dequeue', opts);

      try {
-        const {lengthOfList} = cs.srf.locals.dbHelpers;
-        const members = await lengthOfList(this.queueName);
+        const {sortedSetLength} = cs.srf.locals.dbHelpers;
+        const members = await sortedSetLength(this.queueName);
        this.dequeued = true;
        cs.performQueueWebhook({
          event: 'leave',
          queue: this.data.name,
-          length: Math.max(members - 1, 0),
+          length: Math.max(members, 0),
          leaveReason: 'dequeued',
          leaveTime: Date.now(),
          dequeuer: opts.dequeuer
@@ -301,7 +312,7 @@ class TaskEnqueue extends Task {
  }

  async _playHook(cs, dlg, hook, allowed = [TaskName.Play, TaskName.Say, TaskName.Pause, TaskName.Leave]) {
-    const {lengthOfList, getListPosition} = cs.srf.locals.dbHelpers;
+    const {sortedSetLength, sortedSetPositionByPattern} = cs.srf.locals.dbHelpers;
    const b3 = this.getTracingPropagation();
    const httpHeaders = b3 && {b3};

@@ -313,9 +324,14 @@ class TaskEnqueue extends Task {
      queueTime: getElapsedTime(this.waitStartTime)
    };
    try {
-      const queueSize = await lengthOfList(this.queueName);
-      const queuePosition = await getListPosition(this.queueName, this.notifyUrl);
-      Object.assign(params, {queueSize, queuePosition});
+      const queueSize = await sortedSetLength(this.queueName);
+      const queuePosition = await sortedSetPositionByPattern(this.queueName, `*${this.notifyUrl}`);
+      Object.assign(params, {
+        queueSize,
+        queuePosition: queuePosition.length ? queuePosition[0] : 0,
+        callSid: this.cs.callSid,
+        callId: this.cs.callId,
+      });
    } catch (err) {
      this.logger.error({err}, `TaskEnqueue:_playHook error retrieving list info for queue ${this.queueName}`);
    }
--- a/lib/tasks/gather.js
+++ b/lib/tasks/gather.js
@@ -65,6 +65,11 @@ class TaskGather extends Task {
      const recognizer = this.data.recognizer;
      this.vendor = recognizer.vendor;
      this.language = recognizer.language;
+      this.label = recognizer.label;
+
+      this.fallbackVendor = recognizer.fallbackVendor || 'default';
+      this.fallbackLanguage = recognizer.fallbackLanguage || 'default';
+      this.fallbackLabel = recognizer.fallbackLabel || 'default';

      /* let credentials be supplied in the recognizer object at runtime */
      this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);
@@ -133,11 +138,60 @@ class TaskGather extends Task {
    return s;
  }

+  async _initSpeechCredentials(cs, vendor, label) {
+    const {getNuanceAccessToken, getIbmAccessToken} = this.cs.srf.locals.dbHelpers;
+    let credentials = cs.getSpeechCredentials(vendor, 'stt', label);
+
+    if (!credentials) {
+      const {writeAlerts, AlertType} = cs.srf.locals;
+      this.logger.info(`TaskGather:exec - ERROR stt using ${vendor} requested but creds not supplied`);
+      writeAlerts({
+        account_sid: cs.accountSid,
+        alert_type: AlertType.STT_NOT_PROVISIONED,
+        vendor
+      }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
+      // Notify application that STT vender is wrong.
+      this.notifyError({
+        msg: 'ASR error',
+        details: `No speech-to-text service credentials for ${vendor} have been configured`
+      });
+      this.notifyTaskDone();
+      throw new Error(`No speech-to-text service credentials for ${vendor} have been configured`);
+    }
+
+    if (vendor === 'nuance' && credentials.client_id) {
+      /* get nuance access token */
+      const {client_id, secret} = credentials;
+      const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
+      this.logger.debug({client_id}, `Gather:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
+      credentials = {...credentials, access_token};
+    }
+    else if (vendor == 'ibm' && credentials.stt_api_key) {
+      /* get ibm access token */
+      const {stt_api_key, stt_region} = credentials;
+      const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
+      this.logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
+      credentials = {...credentials, access_token, stt_region};
+    }
+    return credentials;
+  }
+
+  async _startTranscribeForSpeech(cs, ep, vendor, language, credentials) {
+    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
+    await this._initSpeech(cs, ep, vendor, credentials);
+    if (this.killed) {
+      this.logger.info(`Gather:exec - task was quickly killed so do not transcribe for vendor: ${vendor}`);
+      return;
+    }
+    this.execVendor = vendor;
+    this.execLanguage = language;
+    this._startTranscribing(ep);
+    return updateSpeechCredentialLastUsed(credentials.speech_credential_sid);
+  }
+
  async exec(cs, {ep}) {
    this.logger.debug({options: this.data}, 'Gather:exec');
    await super.exec(cs);
-    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
-    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;

    if (cs.hasGlobalSttHints && !this.maskGlobalSttHints) {
      const {hints, hintsBoost} = cs.globalSttHints;
@@ -184,57 +238,55 @@ class TaskGather extends Task {
      this.language = cs.speechRecognizerLanguage;
      if (this.data.recognizer) this.data.recognizer.language = this.language;
    }
+    if ('default' === this.label || !this.label) {
+      this.label = cs.speechRecognizerLabel;
+      if (this.data.recognizer) this.data.recognizer.label = this.label;
+    }
+    // Fallback options
+    if ('default' === this.fallbackVendor || !this.fallbackVendor) {
+      this.fallbackVendor = cs.fallbackSpeechRecognizerVendor;
+      if (this.data.recognizer) this.data.recognizer.fallbackVendor = this.fallbackVendor;
+    }
+    if ('default' === this.fallbackLanguage || !this.fallbackLanguage) {
+      this.fallbackLanguage = cs.fallbackSpeechRecognizerLanguage;
+      if (this.data.recognizer) this.data.recognizer.fallbackLanguage = this.fallbackLanguage;
+    }
+    if ('default' === this.fallbackLabel || !this.fallbackLabel) {
+      this.fallbackLabel = cs.fallbackSpeechRecognizerLabel;
+      if (this.data.recognizer) this.data.recognizer.fallbackLabel = this.fallbackLabel;
+    }
+
    if (!this.data.recognizer.vendor) {
      this.data.recognizer.vendor = this.vendor;
    }
-    if (this.needsStt && !this.sttCredentials) this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
+
    if (this.needsStt && !this.sttCredentials) {
-      const {writeAlerts, AlertType} = cs.srf.locals;
-      this.logger.info(`TaskGather:exec - ERROR stt using ${this.vendor} requested but creds not supplied`);
-      writeAlerts({
-        account_sid: cs.accountSid,
-        alert_type: AlertType.STT_NOT_PROVISIONED,
-        vendor: this.vendor
-      }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
-      // Notify application that STT vender is wrong.
-      this.notifyError({
-        msg: 'ASR error',
-        details: `No speech-to-text service credentials for ${this.vendor} have been configured`
-      });
-      this.notifyTaskDone();
-      throw new Error(`No speech-to-text service credentials for ${this.vendor} have been configured`);
+      this.sttCredentials = await this._initSpeechCredentials(cs, this.vendor, this.label);
    }

-    if (this.vendor === 'nuance' && this.sttCredentials.client_id) {
-      /* get nuance access token */
-      const {client_id, secret} = this.sttCredentials;
-      const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
-      this.logger.debug({client_id}, `Gather:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
-      this.sttCredentials = {...this.sttCredentials, access_token};
+    // Fetch credential for fallback recognizer
+    if (this.needsStt && !this.fallbackSttCredentials && this.fallbackVendor) {
+      this.fallbackSttCredentials = await this._initSpeechCredentials(
+        cs, this.fallbackSttCredentials, this.fallbackLabel);
    }
-    else if (this.vendor == 'ibm' && this.sttCredentials.stt_api_key) {
-      /* get ibm access token */
-      const {stt_api_key, stt_region} = this.sttCredentials;
-      const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
-      this.logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
-      this.sttCredentials = {...this.sttCredentials, access_token, stt_region};
-    }
-    const startListening = (cs, ep) => {
+
+    const startListening = async(cs, ep) => {
      this._startTimer();
      if (this.isContinuousAsr && 0 === this.timeout) this._startAsrTimer();
      if (this.input.includes('speech') && !this.listenDuringPrompt) {
-        this._initSpeech(cs, ep)
-          .then(() => {
-            if (this.killed) {
-              this.logger.info('Gather:exec - task was quickly killed so do not transcribe');
-              return;
+        try {
+          return await this._startTranscribeForSpeech(cs, ep, this.vendor, this.language, this.sttCredentials);
+        } catch (error) {
+          this.logger.error({error}, 'error in initSpeech');
+          if (this.fallbackSttCredentials) {
+            try {
+              return await this._startTranscribeForSpeech(cs, ep, this.fallbackVendor,
+                this.fallbackLanguage, this.fallbackSttCredentials);
+            } catch (err) {
+              this.logger.error({err}, `error in initSpeech for fallback STT provider ${this.fallbackVendor}`);
            }
-            this._startTranscribing(ep);
-            return updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
-          })
-          .catch((err) => {
-            this.logger.error({err}, 'error in initSpeech');
-          });
+          }
+        }
      }
    };

@@ -288,10 +340,19 @@ class TaskGather extends Task {
      }

      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 */});
+        try {
+          await this._startTranscribeForSpeech(cs, ep, this.vendor, this.language, this.sttCredentials);
+        } catch (error) {
+          this.logger.error({error}, 'error in initSpeech');
+          if (this.fallbackSttCredentials) {
+            try {
+              await this._startTranscribeForSpeech(cs, ep, this.fallbackVendor,
+                this.fallbackLanguage, this.fallbackSttCredentials);
+            } catch (err) {
+              this.logger.error({err}, `error in initSpeech for fallback STT provider ${this.fallbackVendor}`);
+            }
+          }
+        }
      }

      if (this.input.includes('digits') || this.dtmfBargein || this.asrDtmfTerminationDigit) {
@@ -362,9 +423,9 @@ class TaskGather extends Task {
    }
  }

-  async _initSpeech(cs, ep) {
-    const opts = this.setChannelVarsForStt(this, this.sttCredentials, this.data.recognizer);
-    switch (this.vendor) {
+  async _initSpeech(cs, ep, vendor, credentials) {
+    const opts = this.setChannelVarsForStt(this, credentials, this.data.recognizer);
+    switch (vendor) {
      case 'google':
        this.bugname = 'google_transcribe';
        ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
@@ -450,9 +511,9 @@ class TaskGather extends Task {
          break;
        }
        else {
-          this.notifyError({ msg: 'ASR error', details:`Invalid vendor ${this.vendor}`});
+          this.notifyError({ msg: 'ASR error', details:`Invalid vendor ${credentials.vendor}`});
          this.notifyTaskDone();
-          throw new Error(`Invalid vendor ${this.vendor}`);
+          throw new Error(`Invalid vendor ${credentials.vendor}`);
        }
    }

@@ -464,14 +525,14 @@ class TaskGather extends Task {

  _startTranscribing(ep) {
    this.logger.debug({
-      vendor: this.vendor,
-      locale: this.language,
+      vendor: this.execVendor,
+      locale: this.execLanguage,
      interim: this.interim,
      bugname: this.bugname
    }, 'Gather:_startTranscribing');
    ep.startTranscription({
-      vendor: this.vendor,
-      locale: this.language,
+      vendor: this.execVendor,
+      locale: this.execLanguage,
      interim: this.interim,
      bugname: this.bugname,
    }).catch((err) => {
@@ -480,7 +541,7 @@ class TaskGather extends Task {
      writeAlerts({
        account_sid: this.cs.accountSid,
        alert_type: AlertType.STT_FAILURE,
-        vendor: this.vendor,
+        vendor: this.execVendor,
        detail: err.message
      });
    }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
@@ -817,7 +878,11 @@ class TaskGather extends Task {
      this.logger.debug({evt}, 'TaskGather:resolve buffered results');
    }

-    this.span.setAttributes({'stt.resolve': reason, 'stt.result': JSON.stringify(evt)});
+    this.span.setAttributes({
+      channel: 1,
+      'stt.resolve': reason,
+      'stt.result': JSON.stringify(evt)
+    });
    if (this.needsStt && this.ep && this.ep.connected) {
      this.ep.stopTranscription({vendor: this.vendor})
        .catch((err) => this.logger.error({err}, 'Error stopping transcription'));
--- a/lib/tasks/lex.js
+++ b/lib/tasks/lex.js
@@ -25,6 +25,13 @@ class Lex extends Task {
      this.vendor = this.data.tts.vendor || 'default';
      this.language = this.data.tts.language || 'default';
      this.voice = this.data.tts.voice || 'default';
+      this.speechCredentialLabel = this.data.tts.label || null;
+
+      // fallback tts
+      this.fallbackVendor = this.data.tts.fallbackVendor || 'default';
+      this.fallbackLanguage = this.data.tts.fallbackLanguage || 'default';
+      this.fallbackVoice = this.data.tts.fallbackLanguage || 'default';
+      this.fallbackLabel = this.data.tts.fallbackLabel || 'default';
    }

    this.botName = `${this.bot}:${this.alias}:${this.region}`;
@@ -102,8 +109,15 @@ class Lex extends Task {
        this.vendor = cs.speechSynthesisVendor;
        this.language = cs.speechSynthesisLanguage;
        this.voice = cs.speechSynthesisVoice;
+        this.speechCredentialLabel = cs.speechSynthesisLabel;
      }
-      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts');
+      if (this.fallbackVendor === 'default') {
+        this.fallbackVendor = cs.fallbackSpeechSynthesisVendor;
+        this.fallbackLanguage = cs.fallbackSpeechSynthesisLanguage;
+        this.fallbackVoice = cs.fallbackSpeechSynthesisVoice;
+        this.fallbackLabel = cs.fallbackSpeechSynthesisLabel;
+      }
+      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts', this.speechCredentialLabel);

      this.ep.addCustomEventListener('lex::intent', this._onIntent.bind(this, ep, cs));
      this.ep.addCustomEventListener('lex::transcription', this._onTranscription.bind(this, ep, cs));
@@ -168,6 +182,41 @@ class Lex extends Task {
    }
  }

+  async fallbackSynthAudio(cs, msg, stats, synthAudio) {
+    try {
+      const {filePath} = await synthAudio(stats, {
+        account_sid: cs.accountSid,
+        text: msg,
+        vendor: this.vendor,
+        language: this.language,
+        voice: this.voice,
+        salt: cs.callSid,
+        credentials: this.ttsCredentials
+      });
+
+      return filePath;
+    } catch (error) {
+      this.logger.info({error}, 'failed to synth audio from primary vendor');
+      if (this.fallbackVendor) {
+        try {
+          const credential = cs.getSpeechCredentials(this.fallbackVendor, 'tts', this.fallbackLabel);
+          const {filePath} = await synthAudio(stats, {
+            account_sid: cs.accountSid,
+            text: msg,
+            vendor: this.fallbackVendor,
+            language: this.fallbackLanguage,
+            voice: this.fallbackVoice,
+            salt: cs.callSid,
+            credentials: credential
+          });
+          return filePath;
+        } catch (err) {
+          this.logger.info({err}, 'failed to synth audio from fallback vendor');
+        }
+      }
+    }
+  }
+
  /**
   * @param {*} evt - event data
   */
@@ -187,15 +236,7 @@ class Lex extends Task {

        try {
          this.logger.debug(`tts with ${this.vendor} ${this.voice}`);
-          // eslint-disable-next-line no-unused-vars
-          const {filePath, servedFromCache} = await synthAudio(stats, {
-            text: msg,
-            vendor: this.vendor,
-            language: this.language,
-            voice: this.voice,
-            salt: cs.callSid,
-            credentials: this.ttsCredentials
-          });
+          const filePath = await this.fallbackSynthAudio(cs, msg, stats, synthAudio);
          if (filePath) cs.trackTmpFile(filePath);

          if (this.events.includes('start-play')) {
--- a/lib/tasks/listen.js
+++ b/lib/tasks/listen.js
@@ -3,10 +3,12 @@ const {TaskName, TaskPreconditions, ListenEvents, ListenStatus} = require('../ut
 const makeTask = require('./make_task');
 const moment = require('moment');
 const MAX_PLAY_AUDIO_QUEUE_SIZE = 10;
+const DTMF_SPAN_NAME = 'dtmf';

 class TaskListen extends Task {
  constructor(logger, opts, parentTask) {
    super(logger, opts);
+    this.disableBidirectionalAudio = opts.disableBidirectionalAudio;
    this.preconditions = TaskPreconditions.Endpoint;

    [
@@ -29,6 +31,10 @@ class TaskListen extends Task {

  get name() { return TaskName.Listen; }

+  set bugname(name) { this._bugname = name; }
+
+  set ignoreCustomerData(val) { this._ignoreCustomerData = val; }
+
  async exec(cs, {ep}) {
    await super.exec(cs);
    this.ep = ep;
@@ -65,7 +71,8 @@ class TaskListen extends Task {
    if (this.ep && this.ep.connected) {
      this.logger.debug('TaskListen:kill closing websocket');
      try {
-        await this.ep.forkAudioStop();
+        const args = this._bugname ? [this._bugname] : [];
+        await this.ep.forkAudioStop(...args);
        this.logger.debug('TaskListen:kill successfully closed websocket');
      } catch (err) {
        this.logger.info(err, 'TaskListen:kill');
@@ -85,13 +92,16 @@ class TaskListen extends Task {

  async updateListen(status) {
    if (!this.killed && this.ep && this.ep.connected) {
+      const args = this._bugname ? [this._bugname] : [];
      this.logger.info(`TaskListen:updateListen status ${status}`);
      switch (status) {
        case ListenStatus.Pause:
-          await this.ep.forkAudioPause().catch((err) => this.logger.info(err, 'TaskListen: error pausing audio'));
+          await this.ep.forkAudioPause(...args)
+            .catch((err) => this.logger.info(err, 'TaskListen: error pausing audio'));
          break;
        case ListenStatus.Resume:
-          await this.ep.forkAudioResume().catch((err) => this.logger.info(err, 'TaskListen: error resuming audio'));
+          await this.ep.forkAudioResume(...args)
+            .catch((err) => this.logger.info(err, 'TaskListen: error resuming audio'));
          break;
      }
    }
@@ -104,9 +114,13 @@ class TaskListen extends Task {

  async _startListening(cs, ep) {
    this._initListeners(ep);
+    const ci = this.nested ? this.parentTask.sd.callInfo : cs.callInfo.toJSON();
+    if (this._ignoreCustomerData) {
+      delete ci.customerData;
+    }
    const metadata = Object.assign(
      {sampleRate: this.sampleRate, mixType: this.mixType},
-      this.nested ? this.parentTask.sd.callInfo : cs.callInfo.toJSON(),
+      ci,
      this.metadata);
    if (this.hook.auth) {
      this.logger.debug({username: this.hook.auth.username, password: this.hook.auth.password},
@@ -120,6 +134,7 @@ class TaskListen extends Task {
      wsUrl: this.hook.url,
      mixType: this.mixType,
      sampling: this.sampleRate,
+      ...(this._bugname && {bugname: this._bugname}),
      metadata
    });
    this.recordStartTime = moment();
@@ -140,7 +155,7 @@ class TaskListen extends Task {
    }

    /* support bi-directional audio */
-    if (!this.disableBiDirectionalAudio) {
+    if (!this.disableBidirectionalAudio) {
      ep.addCustomEventListener(ListenEvents.PlayAudio, this._onPlayAudio.bind(this, ep));
    }
    ep.addCustomEventListener(ListenEvents.KillAudio, this._onKillAudio.bind(this, ep));
@@ -161,12 +176,25 @@ class TaskListen extends Task {
  }

  _onDtmf(ep, evt) {
-    this.logger.debug({evt}, `TaskListen:_onDtmf received dtmf ${evt.dtmf}`);
+    const {dtmf, duration} = evt;
+    this.logger.debug({evt}, `TaskListen:_onDtmf received dtmf ${dtmf}`);
    if (this.passDtmf && this.ep?.connected) {
-      const obj = {event: 'dtmf', dtmf: evt.dtmf, duration: evt.duration};
-      this.ep.forkAudioSendText(obj)
+      const obj = {event: 'dtmf', dtmf, duration};
+      const args = this._bugname ? [this._bugname, obj] : [obj];
+      this.ep.forkAudioSendText(...args)
        .catch((err) => this.logger.info({err}, 'TaskListen:_onDtmf error sending dtmf'));
    }
+
+    /* add a child span for the dtmf event */
+    const msDuration = Math.floor((duration / 8000) * 1000);
+    const {span} = this.startChildSpan(`${DTMF_SPAN_NAME}:${dtmf}`);
+    span.setAttributes({
+      channel: 1,
+      dtmf,
+      duration: `${msDuration}ms`
+    });
+    span.end();
+
    if (evt.dtmf === this.finishOnKey) {
      this.logger.info(`TaskListen:_onDtmf terminating task due to dtmf ${evt.dtmf}`);
      this.results.digits = evt.dtmf;
@@ -192,7 +220,15 @@ class TaskListen extends Task {
    try {
      const results = await ep.play(evt.file);
      logger.debug(`Finished playing file, result: ${JSON.stringify(results)}`);
-      ep.forkAudioSendText({type: 'playDone', data: Object.assign({id: evt.id}, results)});
+      const obj = {
+        type: 'playDone',
+        data: {
+          id: evt.id,
+          ...results
+        }
+      };
+      const args = this._bugname ? [this._bugname, obj] : [obj];
+      ep.forkAudioSendText(...args);
    } catch (err) {
      logger.error({err}, 'Error playing file');
    }
--- a/lib/tasks/rest_dial.js
+++ b/lib/tasks/rest_dial.js
@@ -23,23 +23,38 @@ class TaskRestDial extends Task {

  get name() { return TaskName.RestDial; }

+  set appJson(app_json) {
+    this.app_json = app_json;
+  }
+
  /**
   * INVITE has just been sent at this point
  */
  async exec(cs) {
    await super.exec(cs);
+    this.cs = cs;
    this.canCancel = true;

+    if (this.data.amd) {
+      this.startAmd = cs.startAmd;
+      this.stopAmd = cs.stopAmd;
+      this.on('amd', this._onAmdEvent.bind(this, cs));
+    }
+
    this._setCallTimer();
    await this.awaitTaskDone();
  }

+  turnOffAmd() {
+    if (this.callSession.ep && this.callSession.ep.amd) this.stopAmd(this.callSession.ep, this);
+  }
+
  kill(cs) {
    super.kill(cs);
    this._clearCallTimer();
-    if (this.canCancel && cs?.req) {
+    if (this.canCancel) {
      this.canCancel = false;
-      cs.req.cancel();
+      cs?.req?.cancel();
    }
    this.notifyTaskDone();
  }
@@ -48,12 +63,13 @@ class TaskRestDial extends Task {
    this.canCancel = false;
    const cs = this.callSession;
    cs.setDialog(dlg);
+    this.logger.debug('TaskRestDial:_onConnect - call connected');

    try {
      const b3 = this.getTracingPropagation();
      const httpHeaders = b3 && {b3};
      const params = {
-        ...cs.callInfo,
+        ...(cs.callInfo.toJSON()),
        defaults: {
          synthesizer: {
            vendor: cs.speechSynthesisVendor,
@@ -66,7 +82,21 @@ class TaskRestDial extends Task {
          }
        }
      };
-      const tasks = await cs.requestor.request('session:new', this.call_hook, params, httpHeaders);
+      if (this.startAmd) {
+        try {
+          this.startAmd(this.callSession, this.callSession.ep, this, this.data.amd);
+        } catch (err) {
+          this.logger.info({err}, 'Rest:dial:Call established - Error calling startAmd');
+        }
+      }
+      let tasks;
+      if (this.app_json) {
+        this.logger.debug('TaskRestDial: using app_json from task data');
+        tasks = JSON.parse(this.app_json);
+      } else {
+        this.logger.debug({call_hook: this.call_hook}, 'TaskRestDial: retrieving application');
+        tasks = await cs.requestor.request('session:new', this.call_hook, params, httpHeaders);
+      }
      if (tasks && Array.isArray(tasks)) {
        this.logger.debug({tasks: tasks}, `TaskRestDial: replacing application with ${tasks.length} tasks`);
        cs.replaceApplication(normalizeJambones(this.logger, tasks).map((tdata) => makeTask(this.logger, tdata)));
@@ -98,7 +128,16 @@ class TaskRestDial extends Task {
  _onCallTimeout() {
    this.logger.debug('TaskRestDial: timeout expired without answer, killing task');
    this.timer = null;
-    this.kill();
+    this.kill(this.cs);
+  }
+
+  _onAmdEvent(cs, evt) {
+    this.logger.info({evt}, 'Rest:dial:_onAmdEvent');
+    const {actionHook} = this.data.amd;
+    this.performHook(cs, actionHook, evt)
+      .catch((err) => {
+        this.logger.error({err}, 'Rest:dial:_onAmdEvent - error calling actionHook');
+      });
  }
 }

--- a/lib/tasks/say.js
+++ b/lib/tasks/say.js
@@ -36,6 +36,7 @@ class TaskSay extends Task {
    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
    this.synthesizer = this.data.synthesizer || {};
    this.disableTtsCache = this.data.disableTtsCache;
+    this.options = this.synthesizer.options || {};
  }

  get name() { return TaskName.Say; }
@@ -58,15 +59,30 @@ class TaskSay extends Task {
    const vendor = this.synthesizer.vendor && this.synthesizer.vendor !== 'default' ?
      this.synthesizer.vendor :
      cs.speechSynthesisVendor;
+    const fallbackVendor = this.synthesizer.fallbackVendor && this.synthesizer.fallbackVendor !== 'default' ?
+      this.synthesizer.fallbackVendor :
+      cs.fallbackSpeechSynthesisVendor;
    const language = this.synthesizer.language && this.synthesizer.language !== 'default' ?
      this.synthesizer.language :
      cs.speechSynthesisLanguage ;
+    const fallbackLanguage = this.synthesizer.fallbackLanguage && this.synthesizer.fallbackLanguage !== 'default' ?
+      this.synthesizer.fallbackLanguage :
+      cs.fallbackSpeechSynthesisLanguage ;
    let voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
      this.synthesizer.voice :
      cs.speechSynthesisVoice;
+    const fallbackVoice = this.synthesizer.fallbackVoice && this.synthesizer.fallbackVoice !== 'default' ?
+      this.synthesizer.fallbackVoice :
+      cs.fallbackSpeechSynthesisVoice;
+    const label = this.synthesizer.label && this.synthesizer.label !== 'default' ?
+      this.synthesizer.label :
+      cs.speechSynthesisLabel;
+    const fallbackLabel = this.synthesizer.fallbackLabel && this.synthesizer.fallbackLabel !== 'default' ?
+      this.synthesizer.fallbackLabel :
+      cs.fallbackSpeechSynthesisLabel;
    const engine = this.synthesizer.engine || 'standard';
    const salt = cs.callSid;
-    const credentials = cs.getSpeechCredentials(vendor, 'tts');
+    let credentials = cs.getSpeechCredentials(vendor, 'tts', label);

    /* parse Nuance voices into name and model */
    let model;
@@ -78,6 +94,16 @@ class TaskSay extends Task {
      }
    }

+    /* allow for microsoft custom region voice and api_key to be specified as an override */
+    if (vendor === 'microsoft' && this.options.deploymentId) {
+      credentials = credentials || {};
+      credentials.use_custom_tts = true;
+      credentials.custom_tts_endpoint = this.options.deploymentId;
+      credentials.api_key = this.options.apiKey || credentials.apiKey;
+      credentials.region = this.options.region || credentials.region;
+      voice = this.options.voice || voice;
+    }
+
    this.logger.info({vendor, language, voice, model}, 'TaskSay:exec');
    this.ep = ep;
    try {
@@ -107,8 +133,11 @@ class TaskSay extends Task {
          'tts.language': language,
          'tts.voice': voice
        });
+        let filePathUrl, isFromCache, roundTripTime;
+        let executedVendor, executedLanguage;
        try {
          const {filePath, servedFromCache, rtt} = await synthAudio(stats, {
+            account_sid: cs.accountSid,
            text,
            vendor,
            language,
@@ -119,37 +148,101 @@ class TaskSay extends Task {
            credentials,
            disableTtsCache : this.disableTtsCache
          });
-          this.logger.debug(`file ${filePath}, served from cache ${servedFromCache}`);
-          if (filePath) cs.trackTmpFile(filePath);
+
+          span.setAttributes({'tts.cached': servedFromCache});
+          span.end();
+
          if (!servedFromCache && !lastUpdated) {
            lastUpdated = true;
            updateSpeechCredentialLastUsed(credentials.speech_credential_sid)
              .catch(() => {/*already logged error */});
          }
-          span.setAttributes({'tts.cached': servedFromCache});
-          span.end();
-          if (!servedFromCache && rtt) {
-            this.notifyStatus({
-              event: 'synthesized-audio',
-              vendor,
-              language,
-              characters: text.length,
-              elapsedTime: rtt
+
+          filePathUrl = filePath;
+          isFromCache = servedFromCache;
+          roundTripTime = rtt;
+          executedVendor = vendor;
+          executedLanguage = language;
+
+        } catch (error) {
+          let isFallbackSuccess = false;
+          if (fallbackVendor) {
+            const fallbackcredentials = cs.getSpeechCredentials(fallbackVendor, 'tts', fallbackLabel);
+            const {span: fallbackSpan} = this.startChildSpan('fallback-tts-generation', {
+              'tts.vendor': fallbackVendor,
+              'tts.language': fallbackLanguage,
+              'tts.voice': fallbackVoice
            });
+
+            try {
+              const {filePath, servedFromCache, rtt} = await synthAudio(stats, {
+                account_sid: cs.accountSid,
+                text,
+                vendor: fallbackVendor,
+                language: fallbackLanguage,
+                voice: fallbackVoice,
+                engine,
+                model,
+                salt,
+                credentials: fallbackcredentials,
+                disableTtsCache : this.disableTtsCache
+              });
+              isFallbackSuccess = true;
+
+              fallbackSpan.setAttributes({'tts.cached': servedFromCache});
+              fallbackSpan.end();
+
+              if (!servedFromCache && !lastUpdated) {
+                lastUpdated = true;
+                updateSpeechCredentialLastUsed(credentials.speech_credential_sid)
+                  .catch(() => {/*already logged error */});
+              }
+
+              filePathUrl = filePath;
+              isFromCache = servedFromCache;
+              roundTripTime = rtt;
+              executedVendor = fallbackVendor;
+              executedLanguage = fallbackLanguage;
+
+            } catch (err) {
+              this.logger.info({err}, 'fallback Speech failed to synthesize audio');
+              fallbackSpan.end();
+              writeAlerts({
+                account_sid: cs.accountSid,
+                alert_type: AlertType.TTS_FAILURE,
+                vendor: fallbackVendor,
+                detail: err.message
+              }).catch((err) => this.logger.info({err}, 'Error generating alert for fallback tts failure'));
+            }
+          }
+          if (!isFallbackSuccess) {
+            this.logger.info({error}, 'Error synthesizing tts');
+            span.end();
+            writeAlerts({
+              account_sid: cs.accountSid,
+              alert_type: AlertType.TTS_FAILURE,
+              vendor,
+              detail: error.message
+            }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
+            this.notifyError({msg: 'TTS error', details: error.message || error});
+            return;
          }
-          return filePath;
-        } catch (err) {
-          this.logger.info({err}, 'Error synthesizing tts');
-          span.end();
-          writeAlerts({
-            account_sid: cs.accountSid,
-            alert_type: AlertType.TTS_FAILURE,
-            vendor,
-            detail: err.message
-          }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
-          this.notifyError({msg: 'TTS error', details: err.message || err});
-          return;
        }
+
+        this.logger.debug(`file ${filePathUrl}, served from cache ${isFromCache}`);
+        if (filePathUrl) cs.trackTmpFile(filePathUrl);
+
+        if (!isFromCache && roundTripTime) {
+          this.notifyStatus({
+            event: 'synthesized-audio',
+            vendor: executedVendor,
+            language: executedLanguage,
+            characters: text.length,
+            elapsedTime: roundTripTime
+          });
+        }
+
+        return filePathUrl;
      };

      const arr = this.text.map((t) => generateAudio(t));
--- a/lib/tasks/task.js
+++ b/lib/tasks/task.js
@@ -155,7 +155,7 @@ class Task extends Emitter {
    if (this.actionHook) {
      const type = this.name === TaskName.Redirect ? 'session:redirect' : 'verb:hook';
      const params = results ? Object.assign(this.cs.callInfo.toJSON(), results) : this.cs.callInfo.toJSON();
-      const span = this.startSpan(type, {'hook.url': this.actionHook});
+      const span = this.startSpan(`${type} (${this.actionHook})`);
      const b3 = this.getTracingPropagation('b3', span);
      const httpHeaders = b3 && {b3};
      span.setAttributes({'http.body': JSON.stringify(params)});
--- a/lib/tasks/transcribe.js
+++ b/lib/tasks/transcribe.js
@@ -1,4 +1,5 @@
 const Task = require('./task');
+const assert = require('assert');
 const {
  TaskName,
  TaskPreconditions,
@@ -14,6 +15,8 @@ const {
 } = require('../utils/constants');
 const { normalizeJambones } = require('@jambonz/verb-specifications');

+const STT_LISTEN_SPAN_NAME = 'stt-listen';
+
 class TaskTranscribe extends Task {
  constructor(logger, opts, parentTask) {
    super(logger, opts);
@@ -35,28 +38,77 @@ class TaskTranscribe extends Task {
    this.transcriptionHook = this.data.transcriptionHook;
    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);

-    const recognizer = this.data.recognizer;
-    this.vendor = recognizer.vendor;
-    this.language = recognizer.language;
-    this.interim = !!recognizer.interim;
-    this.separateRecognitionPerChannel = recognizer.separateRecognitionPerChannel;
+    if (this.data.recognizer) {
+      const recognizer = this.data.recognizer;
+      this.vendor = recognizer.vendor;
+      this.language = recognizer.language;
+      this.label = recognizer.label;

-    /* let credentials be supplied in the recognizer object at runtime */
-    this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);
+      this.fallbackVendor = recognizer.fallbackVendor || 'default';
+      this.fallbackLanguage = recognizer.fallbackLanguage || 'default';
+      this.fallbackLabel = recognizer.fallbackLabel || 'default';
+      /* let credentials be supplied in the recognizer object at runtime */
+      this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);
+
+      this.interim = !!recognizer.interim;
+      this.separateRecognitionPerChannel = recognizer.separateRecognitionPerChannel;
+
+      this.data.recognizer.hints = this.data.recognizer.hints || [];
+      this.data.recognizer.altLanguages = this.data.recognizer.altLanguages || [];
+    }
+    else this.data.recognizer = {hints: [], altLanguages: []};

    /* buffer for soniox transcripts */
    this._sonioxTranscripts = [];

-    recognizer.hints = recognizer.hints || [];
-    recognizer.altLanguages = recognizer.altLanguages || [];
+    this.childSpan = [null, null];
+
+    // Continuos asr timeout
+    this.asrTimeout = typeof this.data.recognizer.asrTimeout === 'number' ? this.data.recognizer.asrTimeout * 1000 : 0;
+    this.isContinuousAsr = this.asrTimeout > 0;
+    /* buffer speech for continuous asr */
+    this._bufferedTranscripts = [];
  }

  get name() { return TaskName.Transcribe; }

+  async _initSpeechCredential(cs, vendor, label) {
+    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;
+    let credentials = cs.getSpeechCredentials(vendor, 'stt', label);
+
+    if (!credentials) {
+      const {writeAlerts, AlertType} = cs.srf.locals;
+      this.logger.info(`TaskTranscribe:exec - ERROR stt using ${vendor} requested but creds not supplied`);
+      writeAlerts({
+        account_sid: cs.accountSid,
+        alert_type: AlertType.STT_NOT_PROVISIONED,
+        vendor: vendor
+      }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
+      throw new Error('no provisioned speech credentials for TTS');
+    }
+
+    if (vendor === 'nuance' && credentials.client_id) {
+      /* get nuance access token */
+      const {client_id, secret} = credentials;
+      const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
+      this.logger.debug({client_id},
+        `Transcribe:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
+      credentials = {...credentials, access_token};
+    }
+    else if (vendor == 'ibm' && credentials.stt_api_key) {
+      /* get ibm access token */
+      const {stt_api_key, stt_region} = credentials;
+      const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
+      this.logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
+      credentials = {...credentials, access_token, stt_region};
+    }
+
+    return credentials;
+  }
+
  async exec(cs, {ep, ep2}) {
    super.exec(cs);
    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
-    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;

    if (cs.hasGlobalSttHints) {
      const {hints, hintsBoost} = cs.globalSttHints;
@@ -84,50 +136,60 @@ class TaskTranscribe extends Task {
      this.language = cs.speechRecognizerLanguage;
      if (this.data.recognizer) this.data.recognizer.language = this.language;
    }
+    if ('default' === this.label || !this.label) {
+      this.label = cs.speechRecognizerLabel;
+      if (this.data.recognizer) this.data.recognizer.label = this.label;
+    }
+    // fallback options
+    if ('default' === this.fallbackVendor || !this.fallbackVendor) {
+      this.fallbackVendor = cs.fallbackSpeechRecognizerVendor;
+      if (this.data.recognizer) this.data.recognizer.fallbackVendor = this.fallbackVendor;
+    }
+    if ('default' === this.fallbackLanguage || !this.fallbackLanguage) {
+      this.fallbackLanguage = cs.fallbackSpeechRecognizerLanguage;
+      if (this.data.recognizer) this.data.recognizer.fallbackLanguage = this.fallbackLanguage;
+    }
+    if ('default' === this.fallbackLabel || !this.fallbackLabel) {
+      this.label = cs.fallbackSpeechRecognizerLabel;
+      if (this.data.recognizer) this.data.recognizer.fallbackLabel = this.fallbackLabel;
+    }
    if (!this.data.recognizer.vendor) {
      this.data.recognizer.vendor = this.vendor;
    }
-    if (!this.sttCredentials) this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
+    if (!this.sttCredentials) {
+      this.sttCredentials = await this._initSpeechCredential(cs, this.vendor, this.label);
+    }

+    if (!this.fallbackSttCredentials) {
+      this.fallbackSttCredentials = await this._initSpeechCredential(cs, this.fallbackVendor, this.fallbackLabel);
+    }
    try {
-      if (!this.sttCredentials) {
-        const {writeAlerts, AlertType} = cs.srf.locals;
-        this.logger.info(`TaskTranscribe:exec - ERROR stt using ${this.vendor} requested but creds not supplied`);
-        writeAlerts({
-          account_sid: cs.accountSid,
-          alert_type: AlertType.STT_NOT_PROVISIONED,
-          vendor: this.vendor
-        }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
-        throw new Error('no provisioned speech credentials for TTS');
-      }
-
-      if (this.vendor === 'nuance' && this.sttCredentials.client_id) {
-        /* get nuance access token */
-        const {client_id, secret} = this.sttCredentials;
-        const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
-        this.logger.debug({client_id},
-          `Transcribe:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
-        this.sttCredentials = {...this.sttCredentials, access_token};
-      }
-      else if (this.vendor == 'ibm' && this.sttCredentials.stt_api_key) {
-        /* get ibm access token */
-        const {stt_api_key, stt_region} = this.sttCredentials;
-        const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
-        this.logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
-        this.sttCredentials = {...this.sttCredentials, access_token, stt_region};
-      }
-      await this._startTranscribing(cs, ep, 1);
+      await this._startTranscribing(cs, ep, 1, this.sttCredentials);
      if (this.separateRecognitionPerChannel && ep2) {
-        await this._startTranscribing(cs, ep2, 2);
+        await this._startTranscribing(cs, ep2, 2, this.sttCredentials);
      }
-
-      updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
-        .catch(() => {/*already logged error */});
-
+      updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
      await this.awaitTaskDone();
    } catch (err) {
      this.logger.info(err, 'TaskTranscribe:exec - error');
-      this.parentTask && this.parentTask.emit('error', err);
+      let isFallbackSuccess = false;
+      if (this.fallbackSttCredentials) {
+        this.logger.info(err, 'TaskTranscribe:exec - fallback to 2nd speech provider');
+        try {
+          await this._startTranscribing(cs, ep, 1, this.fallbackSttCredentials);
+          if (this.separateRecognitionPerChannel && ep2) {
+            await this._startTranscribing(cs, ep2, 2, this.fallbackSttCredentials);
+          }
+          updateSpeechCredentialLastUsed(this.fallbackSttCredentials.speech_credential_sid);
+          await this.awaitTaskDone();
+          isFallbackSuccess = true;
+        } catch (error) {
+          this.logger.info(err, 'TaskTranscribe:exec - fallback error');
+        }
+      }
+      if (!isFallbackSuccess) {
+        this.parentTask && this.parentTask.emit('error', err);
+      }
    }
    this.removeSpeechListeners(ep);
  }
@@ -152,8 +214,8 @@ class TaskTranscribe extends Task {
    await this.awaitTaskDone();
  }

-  async _startTranscribing(cs, ep, channel) {
-    const opts = this.setChannelVarsForStt(this, this.sttCredentials, this.data.recognizer);
+  async _startTranscribing(cs, ep, channel, credentials) {
+    const opts = this.setChannelVarsForStt(this, credentials, this.data.recognizer);
    switch (this.vendor) {
      case 'google':
        this.bugname = 'google_transcribe';
@@ -227,7 +289,19 @@ class TaskTranscribe extends Task {
          this._onVadDetected.bind(this, cs, ep));
        break;
      default:
-        throw new Error(`Invalid vendor ${this.vendor}`);
+        if (this.vendor.startsWith('custom:')) {
+          this.bugname = `${this.vendor}_transcribe`;
+          ep.addCustomEventListener(JambonzTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+          ep.addCustomEventListener(JambonzTranscriptionEvents.Connect, this._onJambonzConnect.bind(this, cs, ep));
+          ep.addCustomEventListener(JambonzTranscriptionEvents.ConnectFailure,
+            this._onJambonzConnectFailure.bind(this, cs, ep));
+          break;
+        }
+        else {
+          this.notifyError({ msg: 'ASR error', details:`Invalid vendor ${this.vendor}`});
+          this.notifyTaskDone();
+          throw new Error(`Invalid vendor ${this.vendor}`);
+        }
    }

    /* common handler for all stt engine errors */
@@ -236,6 +310,10 @@ class TaskTranscribe extends Task {
      .catch((err) => this.logger.info(err, 'Error setting channel variables'));

    await this._transcribe(ep);
+
+    /* start child span for this channel */
+    const {span, ctx} = this.startChildSpan(`${STT_LISTEN_SPAN_NAME}:${channel}`);
+    this.childSpan[channel - 1] = {span, ctx};
  }

  async _transcribe(ep) {
@@ -285,6 +363,36 @@ class TaskTranscribe extends Task {
      }
    }

+    if (this.isContinuousAsr && evt.is_final) {
+      this._bufferedTranscripts.push(evt);
+      this._startAsrTimer(channel);
+    } else {
+      await this._resolve(channel, evt);
+    }
+  }
+
+  _compileTranscripts() {
+    assert(this._bufferedTranscripts.length);
+    const evt = this._bufferedTranscripts[0];
+    let t = '';
+    for (const a of this._bufferedTranscripts) {
+      t += ` ${a.alternatives[0].transcript}`;
+    }
+    evt.alternatives[0].transcript = t.trim();
+    return evt;
+  }
+
+  async _resolve(channel, evt) {
+    /* we've got a transcript, so end the otel child span for this channel */
+    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
+      this.childSpan[channel - 1].span.setAttributes({
+        channel,
+        'stt.resolve': 'transcript',
+        'stt.result': JSON.stringify(evt)
+      });
+      this.childSpan[channel - 1].span.end();
+    }
+
    if (this.transcriptionHook) {
      const b3 = this.getTracingPropagation();
      const httpHeaders = b3 && {b3};
@@ -315,16 +423,44 @@ class TaskTranscribe extends Task {
      this._clearTimer();
      this.notifyTaskDone();
    }
+    else {
+      /* start another child span for this channel */
+      const {span, ctx} = this.startChildSpan(`${STT_LISTEN_SPAN_NAME}:${channel}`);
+      this.childSpan[channel - 1] = {span, ctx};
+    }
  }

  _onNoAudio(cs, ep, channel) {
    this.logger.debug(`TaskTranscribe:_onNoAudio restarting transcription on channel ${channel}`);
+    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
+      this.childSpan[channel - 1].span.setAttributes({
+        channel,
+        'stt.resolve': 'timeout'
+      });
+      this.childSpan[channel - 1].span.end();
+    }
    this._transcribe(ep);
+
+    /* start new child span for this channel */
+    const {span, ctx} = this.startChildSpan(`${STT_LISTEN_SPAN_NAME}:${channel}`);
+    this.childSpan[channel - 1] = {span, ctx};
  }

  _onMaxDurationExceeded(cs, ep, channel) {
    this.logger.debug(`TaskTranscribe:_onMaxDurationExceeded restarting transcription on channel ${channel}`);
+    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
+      this.childSpan[channel - 1].span.setAttributes({
+        channel,
+        'stt.resolve': 'max duration exceeded'
+      });
+      this.childSpan[channel - 1].span.end();
+    }
+
    this._transcribe(ep);
+
+    /* start new child span for this channel */
+    const {span, ctx} = this.startChildSpan(`${STT_LISTEN_SPAN_NAME}:${channel}`);
+    this.childSpan[channel - 1] = {span, ctx};
  }

  _clearTimer() {
@@ -337,7 +473,7 @@ class TaskTranscribe extends Task {
    this.logger.debug('TaskTranscribe:_onDeepgramConnect');
  }

-  _onDeepGramConnectFailure(cs, _ep, _channel, evt) {
+  _onDeepGramConnectFailure(cs, _ep, channel, evt) {
    const {reason} = evt;
    const {writeAlerts, AlertType} = cs.srf.locals;
    this.logger.info({evt}, 'TaskTranscribe:_onDeepgramConnectFailure');
@@ -348,6 +484,32 @@ class TaskTranscribe extends Task {
      vendor: 'deepgram',
    }).catch((err) => this.logger.info({err}, 'Error generating alert for deepgram connection failure'));
    this.notifyError(`Failed connecting to speech vendor deepgram: ${reason}`);
+
+    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
+      this.childSpan[channel - 1].span.setAttributes({
+        channel,
+        'stt.resolve': 'connection failure'
+      });
+      this.childSpan[channel - 1].span.end();
+    }
+    this.notifyTaskDone();
+  }
+
+  _onJambonzConnect(_cs, _ep) {
+    this.logger.debug('TaskTranscribe:_onJambonzConnect');
+  }
+
+  _onJambonzConnectFailure(cs, _ep, evt) {
+    const {reason} = evt;
+    const {writeAlerts, AlertType} = cs.srf.locals;
+    this.logger.info({evt}, 'TaskTranscribe:_onJambonzConnectFailure');
+    writeAlerts({
+      account_sid: cs.accountSid,
+      alert_type: AlertType.STT_FAILURE,
+      message: `Failed connecting to ${this.vendor} speech recognizer: ${reason}`,
+      vendor: this.vendor,
+    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
+    this.notifyError({msg: 'ASR error', details:`Failed connecting to speech vendor ${this.vendor}: ${reason}`});
    this.notifyTaskDone();
  }

@@ -355,7 +517,7 @@ class TaskTranscribe extends Task {
    this.logger.debug('TaskTranscribe:_onIbmConnect');
  }

-  _onIbmConnectFailure(cs, _ep, _channel, evt) {
+  _onIbmConnectFailure(cs, _ep, channel, evt) {
    const {reason} = evt;
    const {writeAlerts, AlertType} = cs.srf.locals;
    this.logger.info({evt}, 'TaskTranscribe:_onIbmConnectFailure');
@@ -366,6 +528,14 @@ class TaskTranscribe extends Task {
      vendor: 'ibm',
    }).catch((err) => this.logger.info({err}, 'Error generating alert for IBM connection failure'));
    this.notifyError(`Failed connecting to speech vendor IBM: ${reason}`);
+
+    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
+      this.childSpan[channel - 1].span.setAttributes({
+        channel,
+        'stt.resolve': 'connection failure'
+      });
+      this.childSpan[channel - 1].span.end();
+    }
    this.notifyTaskDone();
  }
  _onIbmError(cs, _ep, _channel, evt) {
@@ -390,7 +560,22 @@ class TaskTranscribe extends Task {
    this.notifyError({msg: 'ASR error', details:`Custom speech vendor ${this.vendor} error: ${evt.error}`});
  }

+  _startAsrTimer(channel) {
+    assert(this.isContinuousAsr);
+    this._clearAsrTimer(channel);
+    this._asrTimer = setTimeout(() => {
+      this.logger.debug(`TaskTranscribe:_startAsrTimer - asr timer went off for channel: ${channel}`);
+      const evt = this._compileTranscripts();
+      this._bufferedTranscripts = [];
+      this._resolve(channel, evt);
+    }, this.asrTimeout);
+    this.logger.debug(`TaskTranscribe:_startAsrTimer: set for ${this.asrTimeout}ms for channel ${channel}`);
+  }

+  _clearAsrTimer(channel) {
+    if (this._asrTimer) clearTimeout(this._asrTimer);
+    this._asrTimer = null;
+  }
 }

 module.exports = TaskTranscribe;
--- a/lib/utils/amd-utils.js
+++ b/lib/utils/amd-utils.js
@@ -1,9 +1,16 @@
 const Emitter = require('events');
 const {readFile} = require('fs');
 const {
+  TaskName,
  GoogleTranscriptionEvents,
  AwsTranscriptionEvents,
  AzureTranscriptionEvents,
+  NuanceTranscriptionEvents,
+  NvidiaTranscriptionEvents,
+  IbmTranscriptionEvents,
+  SonioxTranscriptionEvents,
+  DeepgramTranscriptionEvents,
+  JambonzTranscriptionEvents,
  AmdEvents,
  AvmdEvents
 } = require('./constants');
@@ -47,13 +54,19 @@ class Amd extends Emitter {
    this.language = opts.recognizer?.language || cs.speechRecognizerLanguage;
    if ('default' === this.language) this.language = cs.speechRecognizerLanguage;

-    this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
+    this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt',
+      opts.recognizer?.label || cs.speechRecognizerLabel);

    if (!this.sttCredentials) throw new Error(`No speech credentials found for vendor ${this.vendor}`);

    this.thresholdWordCount = opts.thresholdWordCount || 9;
    const {normalizeTranscription} = require('./transcription-utils')(logger);
    this.normalizeTranscription = normalizeTranscription;
+    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;
+    this.getNuanceAccessToken = getNuanceAccessToken;
+    this.getIbmAccessToken = getIbmAccessToken;
+    const {setChannelVarsForStt} = require('./transcription-utils')(logger);
+    this.setChannelVarsForStt = setChannelVarsForStt;

    const {
      noSpeechTimeoutMs = 5000,
@@ -229,51 +242,92 @@ module.exports = (logger) => {

  const startAmd = async(cs, ep, task, opts) => {
    const amd = ep.amd = new Amd(logger, cs, opts);
-    const {vendor, language, sttCredentials} = amd;
-    const sttOpts = {};
+    const {vendor, language} = amd;
+    let sttCredentials = amd.sttCredentials;
    const hints = voicemailHints[language] || [];

+    if (vendor === 'nuance' && sttCredentials.client_id) {
+      /* get nuance access token */
+      const {getNuanceAccessToken} = amd;
+      const {client_id, secret} = sttCredentials;
+      const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
+      logger.debug({client_id}, `Gather:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
+      sttCredentials = {...sttCredentials, access_token};
+    }
+    else if (vendor == 'ibm' && sttCredentials.stt_api_key) {
+      /* get ibm access token */
+      const {getIbmAccessToken} = amd;
+      const {stt_api_key, stt_region} = sttCredentials;
+      const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
+      logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
+      sttCredentials = {...sttCredentials, access_token, stt_region};
+    }
+
    /* set stt options */
    logger.info(`starting amd for vendor ${vendor} and language ${language}`);
-    if ('google' === vendor) {
-      sttOpts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(sttCredentials.credentials);
-      sttOpts.GOOGLE_SPEECH_USE_ENHANCED = true;
-      sttOpts.GOOGLE_SPEECH_HINTS = hints.join(',');
-      if (opts.recognizer?.altLanguages) {
-        sttOpts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = opts.recognizer.altLanguages.join(',');
-      }
-      ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
-      ep.addCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance, onEndOfUtterance.bind(null, cs, ep, task));
-    }
-    else if (['aws', 'polly'].includes(vendor)) {
-      Object.assign(sttOpts, {
-        AWS_ACCESS_KEY_ID: sttCredentials.accessKeyId,
-        AWS_SECRET_ACCESS_KEY: sttCredentials.secretAccessKey,
-        AWS_REGION: sttCredentials.region
-      });
-      ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
-    }
-    else if ('microsoft' === vendor) {
-      Object.assign(sttOpts, {
-        'AZURE_SUBSCRIPTION_KEY': sttCredentials.api_key,
-        'AZURE_REGION': sttCredentials.region
-      });
-      sttOpts.AZURE_SPEECH_HINTS = hints.join(',');
-      if (opts.recognizer?.altLanguages) {
-        sttOpts.AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = opts.recognizer.altLanguages.join(',');
-      }
-      sttOpts.AZURE_INITIAL_SPEECH_TIMEOUT_MS = opts.resolveTimeoutMs || 20000;
+    const sttOpts = amd.setChannelVarsForStt({name: TaskName.Gather}, sttCredentials, {
+      vendor,
+      hints,
+      enhancedModel: true,
+      altLanguages: opts.recognizer?.altLanguages || [],
+      initialSpeechTimeoutMs: opts.resolveTimeoutMs,
+    });

-      ep.addCustomEventListener(AzureTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
-      ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, onNoSpeechDetected.bind(null, cs, ep, task));
-    }
    await ep.set(sttOpts).catch((err) => logger.info(err, 'Error setting channel variables'));

+    amd.transcriptionHandler = onTranscription.bind(null, cs, ep, task);
+    amd.EndOfUtteranceHandler = onEndOfUtterance.bind(null, cs, ep, task);
+    amd.noSpeechHandler = onNoSpeechDetected.bind(null, cs, ep, task);
+
+    switch (vendor) {
+      case 'google':
+        ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, amd.transcriptionHandler);
+        ep.addCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance, amd.EndOfUtteranceHandler);
+        break;
+
+      case 'aws':
+      case 'polly':
+        ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, amd.transcriptionHandler);
+        break;
+      case 'microsoft':
+        ep.addCustomEventListener(AzureTranscriptionEvents.Transcription, amd.transcriptionHandler);
+        ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, amd.noSpeechHandler);
+        break;
+      case 'nuance':
+        ep.addCustomEventListener(NuanceTranscriptionEvents.Transcription, amd.transcriptionHandler);
+        break;
+
+      case 'deepgram':
+        ep.addCustomEventListener(DeepgramTranscriptionEvents.Transcription, amd.transcriptionHandler);
+        break;
+
+      case 'soniox':
+        amd.bugname = 'soniox_amd_transcribe';
+        ep.addCustomEventListener(SonioxTranscriptionEvents.Transcription, amd.transcriptionHandler);
+        break;
+
+      case 'ibm':
+        ep.addCustomEventListener(IbmTranscriptionEvents.Transcription, amd.transcriptionHandler);
+        break;
+
+      case 'nvidia':
+        ep.addCustomEventListener(NvidiaTranscriptionEvents.Transcription, amd.transcriptionHandler);
+        break;
+
+      default:
+        if (vendor.startsWith('custom:')) {
+          ep.addCustomEventListener(JambonzTranscriptionEvents.Transcription, amd.transcriptionHandler);
+          break;
+        }
+        else {
+          throw new Error(`Invalid vendor ${this.vendor}`);
+        }
+    }
    amd
      .on(AmdEvents.NoSpeechDetected, (evt) => {
        task.emit('amd', {type: AmdEvents.NoSpeechDetected, ...evt});
        try {
-          ep.connected && ep.stopTranscription({vendor, bugname});
+          stopAmd(ep, task);
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -281,7 +335,7 @@ module.exports = (logger) => {
      .on(AmdEvents.HumanDetected, (evt) => {
        task.emit('amd', {type: AmdEvents.HumanDetected, ...evt});
        try {
-          ep.connected && ep.stopTranscription({vendor, bugname});
+          stopAmd(ep, task);
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -292,7 +346,7 @@ module.exports = (logger) => {
      .on(AmdEvents.DecisionTimeout, (evt) => {
        task.emit('amd', {type: AmdEvents.DecisionTimeout, ...evt});
        try {
-          ep.connected && ep.stopTranscription({vendor, bugname});
+          stopAmd(ep, task);
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -300,7 +354,7 @@ module.exports = (logger) => {
      .on(AmdEvents.ToneTimeout, (evt) => {
        //task.emit('amd', {type: AmdEvents.ToneTimeout, ...evt});
        try {
-          ep.connected && ep.execute('avmd_stop').catch((err) => logger.info(err, 'Error stopping avmd'));
+          stopAmd(ep, task);
        } catch (err) {
          logger.info({err}, 'Error stopping avmd');
        }
@@ -308,7 +362,7 @@ module.exports = (logger) => {
      .on(AmdEvents.MachineStoppedSpeaking, () => {
        task.emit('amd', {type: AmdEvents.MachineStoppedSpeaking});
        try {
-          ep.connected && ep.stopTranscription({vendor, bugname});
+          stopAmd(ep, task);
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -327,6 +381,19 @@ module.exports = (logger) => {
    if (ep.amd) {
      vendor = ep.amd.vendor;
      ep.amd.stopAllTimers();
+
+      ep.removeListener(GoogleTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(GoogleTranscriptionEvents.EndOfUtterance, ep.amd.EndOfUtteranceHandler);
+      ep.removeListener(AwsTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(AzureTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(AzureTranscriptionEvents.NoSpeechDetected, ep.amd.noSpeechHandler);
+      ep.removeListener(NuanceTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(DeepgramTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(SonioxTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(IbmTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(NvidiaTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(JambonzTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+
      ep.amd = null;
    }

--- a/lib/utils/aws-sns-lifecycle.js
+++ b/lib/utils/aws-sns-lifecycle.js
@@ -11,15 +11,20 @@ const {LifeCycleEvents} = require('./constants');
 const express = require('express');
 const app = express();
 const getString = bent('string');
-const AWS = require('aws-sdk');
-const sns = new AWS.SNS({apiVersion: '2010-03-31'});
-const autoscaling = new AWS.AutoScaling({apiVersion: '2011-01-01'});
+const {
+  SNSClient,
+  SubscribeCommand,
+  UnsubscribeCommand } = require('@aws-sdk/client-sns');
+const snsClient = new SNSClient({ region: AWS_REGION, apiVersion: '2010-03-31' });
+const {
+  AutoScalingClient,
+  DescribeAutoScalingGroupsCommand,
+  CompleteLifecycleActionCommand } = require('@aws-sdk/client-auto-scaling');
+const autoScalingClient = new AutoScalingClient({ region: AWS_REGION, apiVersion: '2011-01-01' });
 const {Parser} = require('xml2js');
 const parser = new Parser();
 const {validatePayload} = require('verify-aws-sns-signature');

-AWS.config.update({region: AWS_REGION});
-
 class SnsNotifier extends Emitter {
  constructor(logger) {
    super();
@@ -69,7 +74,7 @@ class SnsNotifier extends Emitter {
            subscriptionRequestId: this.subscriptionRequestId
          }, 'response from SNS SubscribeURL');
          const data = await this.describeInstance();
-          this.lifecycleState = data.AutoScalingInstances[0].LifecycleState;
+          this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
          this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
          break;

@@ -135,11 +140,12 @@ class SnsNotifier extends Emitter {

  async subscribe() {
    try {
-      const response = await sns.subscribe({
+      const params = {
        Protocol: 'http',
        TopicArn: AWS_SNS_TOPIC_ARM,
        Endpoint: this.snsEndpoint
-      }).promise();
+      };
+      const response = await snsClient.send(new SubscribeCommand(params));
      this.logger.info({response}, `response to SNS subscribe to ${AWS_SNS_TOPIC_ARM}`);
    } catch (err) {
      this.logger.error({err}, `Error subscribing to SNS topic arn ${AWS_SNS_TOPIC_ARM}`);
@@ -149,9 +155,10 @@ class SnsNotifier extends Emitter {
  async unsubscribe() {
    if (!this.subscriptionArn) throw new Error('SnsNotifier#unsubscribe called without an active subscription');
    try {
-      const response = await sns.unsubscribe({
+      const params = {
        SubscriptionArn: this.subscriptionArn
-      }).promise();
+      };
+      const response = await snsClient.send(new UnsubscribeCommand(params));
      this.logger.info({response}, `response to SNS unsubscribe to ${AWS_SNS_TOPIC_ARM}`);
    } catch (err) {
      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${AWS_SNS_TOPIC_ARM}`);
@@ -160,26 +167,29 @@ class SnsNotifier extends Emitter {

  completeScaleIn() {
    assert(this.scaleInParams);
-    autoscaling.completeLifecycleAction(this.scaleInParams, (err, response) => {
-      if (err) return this.logger.error({err}, 'Error completing scale-in');
-      this.logger.info({response}, 'Successfully completed scale-in action');
-    });
+    autoScalingClient.send(new CompleteLifecycleActionCommand(this.scaleInParams))
+      .then((data) => {
+        return this.logger.info({data}, 'Successfully completed scale-in action');
+      })
+      .catch((err) => {
+        this.logger.error({err}, 'Error completing scale-in');
+      });
  }

  describeInstance() {
    return new Promise((resolve, reject) => {
      if (!this.instanceId) return reject('instance-id unknown');
-      autoscaling.describeAutoScalingInstances({
+      autoScalingClient.send(new DescribeAutoScalingGroupsCommand({
        InstanceIds: [this.instanceId]
-      }, (err, data) => {
-        if (err) {
+      }))
+        .then((data) => {
+          this.logger.info({data}, 'SnsNotifier: describeInstance');
+          return resolve(data);
+        })
+        .catch((err) => {
          this.logger.error({err}, 'Error describing instances');
          reject(err);
-        } else {
-          this.logger.info({data}, 'SnsNotifier: describeInstance');
-          resolve(data);
-        }
-      });
+        });
    });
  }

@@ -193,7 +203,7 @@ module.exports = async function(logger) {
  process.on('SIGHUP', async() => {
    try {
      const data = await notifier.describeInstance();
-      const state = data.AutoScalingInstances[0].LifecycleState;
+      const state = data.AutoScalingGroups[0].Instances[0].LifecycleState;
      if (state !== notifier.lifecycleState) {
        notifier.lifecycleState = state;
        switch (state) {
--- a/lib/utils/call-tracer.js
+++ b/lib/utils/call-tracer.js
@@ -2,17 +2,24 @@ const {context, trace} = require('@opentelemetry/api');
 const {Dialog} = require('drachtio-srf');
 class RootSpan {
  constructor(callType, req) {
-    let tracer, callSid, linkedSpanId;
+    const {srf} = require('../../');
+    const tracer = srf.locals.otel.tracer;
+    let callSid, accountSid, applicationSid, linkedSpanId;

    if (req instanceof Dialog) {
      const dlg = req;
-      tracer = dlg.srf.locals.otel.tracer;
      callSid = dlg.callSid;
      linkedSpanId = dlg.linkedSpanId;
    }
-    else {
-      tracer = req.srf.locals.otel.tracer;
+    else if (req.srf) {
      callSid = req.locals.callSid;
+      accountSid = req.get('X-Account-Sid'),
+      applicationSid = req.locals.application_sid;
+    }
+    else {
+      callSid = req.callSid;
+      accountSid = req.accountSid;
+      applicationSid = req.applicationSid;
    }
    this._span = tracer.startSpan(callType || 'incoming-call');
    if (req instanceof Dialog) {
@@ -22,13 +29,20 @@ class RootSpan {
        callId: dlg.sip.callId
      });
    }
+    else if (req.srf) {
+      this._span.setAttributes({
+        callSid,
+        accountSid,
+        applicationSid,
+        callId: req.get('Call-ID'),
+        externalCallId: req.get('X-CID')
+      });
+    }
    else {
      this._span.setAttributes({
        callSid,
-        accountSid: req.get('X-Account-Sid'),
-        applicationSid: req.locals.application_sid,
-        callId: req.get('Call-ID'),
-        externalCallId: req.get('X-CID')
+        accountSid,
+        applicationSid
      });
    }

--- a/lib/utils/db-utils.js
+++ b/lib/utils/db-utils.js
@@ -78,6 +78,10 @@ const speechMapper = (cred) => {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
    }
+    else if ('nvidia' === obj.vendor) {
+      const o = JSON.parse(decrypt(credential));
+      obj.riva_server_uri = o.riva_server_uri;
+    }
    else if (obj.vendor.startsWith('custom:')) {
      const o = JSON.parse(decrypt(credential));
      obj.auth_token = o.auth_token;
@@ -90,27 +94,35 @@ const speechMapper = (cred) => {
  return obj;
 };

+const bucketCredentialDecrypt = (account) => {
+  const { bucket_credential } = account.account;
+  if (!bucket_credential || bucket_credential.vendor) return;
+  account.account.bucket_credential = JSON.parse(decrypt(bucket_credential));
+};
+
 module.exports = (logger, srf) => {
  const {pool}  = srf.locals.dbHelpers;
  const pp = pool.promise();

  const lookupAccountDetails = async(account_sid) => {

-    const [r] = await pp.query({sql: sqlAccountDetails, nestTables: true}, account_sid);
+    const [r] = await pp.query({sql: sqlAccountDetails, nestTables: true}, [account_sid]);
    if (0 === r.length) throw new Error(`invalid accountSid: ${account_sid}`);
-    const [r2] = await pp.query(sqlSpeechCredentials, account_sid);
+    const [r2] = await pp.query(sqlSpeechCredentials, [account_sid]);
    const speech = r2.map(speechMapper);

    /* add service provider creds unless we have that vendor at the account level */
-    const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid);
+    const [r3] = await pp.query(sqlSpeechCredentialsForSP, [account_sid]);
    r3.forEach((s) => {
      if (!speech.find((s2) => s2.vendor === s.vendor)) {
        speech.push(speechMapper(s));
      }
    });
+    const account = r[0];
+    bucketCredentialDecrypt(account);

    return {
-      ...r[0],
+      ...account,
      speech
    };
  };
--- a/lib/utils/install-srf-locals.js
+++ b/lib/utils/install-srf-locals.js
@@ -10,6 +10,7 @@ const {
  JAMBONES_FREESWITCH,
  JAMBONES_REDIS_HOST,
  JAMBONES_REDIS_PORT,
+  JAMBONES_REDIS_SENTINELS,
  SMPP_URL,
  JAMBONES_TIME_SERIES_HOST,
  JAMBONES_ESL_LISTEN_ADDRESS,
@@ -146,7 +147,7 @@ function installSrfLocals(srf, logger) {
    password: JAMBONES_MYSQL_PASSWORD,
    database: JAMBONES_MYSQL_DATABASE,
    connectionLimit: JAMBONES_MYSQL_CONNECTION_LIMIT || 10
-  }, logger, tracer);
+  }, logger);
  const {
    client,
    updateCallStatus,
@@ -167,7 +168,12 @@ function installSrfLocals(srf, logger) {
    removeFromList,
    getListPosition,
    lengthOfList,
-  } = require('@jambonz/realtimedb-helpers')({
+    addToSortedSet,
+    retrieveFromSortedSet,
+    retrieveByPatternSortedSet,
+    sortedSetLength,
+    sortedSetPositionByPattern
+  } = require('@jambonz/realtimedb-helpers')(JAMBONES_REDIS_SENTINELS || {
    host: JAMBONES_REDIS_HOST,
    port: JAMBONES_REDIS_PORT || 6379
  }, logger, tracer);
@@ -175,7 +181,7 @@ function installSrfLocals(srf, logger) {
    synthAudio,
    getNuanceAccessToken,
    getIbmAccessToken,
-  } = require('@jambonz/speech-utils')({
+  } = require('@jambonz/speech-utils')(JAMBONES_REDIS_SENTINELS || {
    host: JAMBONES_REDIS_HOST,
    port: JAMBONES_REDIS_PORT || 6379
  }, logger, tracer);
@@ -228,7 +234,12 @@ function installSrfLocals(srf, logger) {
      lengthOfList,
      getListPosition,
      getNuanceAccessToken,
-      getIbmAccessToken
+      getIbmAccessToken,
+      addToSortedSet,
+      retrieveFromSortedSet,
+      retrieveByPatternSortedSet,
+      sortedSetLength,
+      sortedSetPositionByPattern
    },
    parentLogger: logger,
    getSBC,
--- a/lib/utils/place-outdial.js
+++ b/lib/utils/place-outdial.js
@@ -45,6 +45,10 @@ class SingleDialer extends Emitter {
    return this.callInfo.callStatus;
  }

+  get applicationSid() {
+    return this.application?.application_sid || this.callInfo?.applicationSid;
+  }
+
  /**
   * can be used for all http requests within this session
   */
--- a/lib/utils/sbc-pinger.js
+++ b/lib/utils/sbc-pinger.js
@@ -101,7 +101,8 @@ module.exports = (logger) => {
          method: 'OPTIONS',
          headers: {
            'X-FS-Status': ms && !dryUpCalls ? 'open' : 'closed',
-            'X-FS-Calls': srf.locals.sessionTracker.count
+            'X-FS-Calls': srf.locals.sessionTracker.count,
+            'X-FS-ServiceUrl': srf.locals.serviceUrl
          }
        });
        req.on('response', (res) => {
--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -549,6 +549,7 @@ module.exports = (logger) => {
    }
    else if ('nvidia' === vendor) {
      const {nvidiaOptions = {}} = rOpts;
+      const rivaUri = nvidiaOptions.rivaUri || sttCredentials.riva_server_uri;
      opts = {
        ...opts,
        ...((nvidiaOptions.profanityFilter || rOpts.profanityFilter) && {NVIDIA_PROFANITY_FILTER: 1}),
@@ -560,7 +561,7 @@ module.exports = (logger) => {
        ...(nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: nvidiaOptions.maxAlternatives}),
        ...(!nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: 1}),
        ...(rOpts.model && {NVIDIA_MODEL: rOpts.model}),
-        ...(nvidiaOptions.rivaUri && {NVIDIA_RIVA_URI: nvidiaOptions.rivaUri}),
+        ...(rivaUri && {NVIDIA_RIVA_URI: rivaUri}),
        ...(nvidiaOptions.verbatimTranscripts && {NVIDIA_VERBATIM_TRANSCRIPTS: 1}),
        ...(rOpts.diarization && {NVIDIA_SPEAKER_DIARIZATION: 1}),
        ...(rOpts.diarization && rOpts.diarizationMaxSpeakers > 0 &&
--- a/lib/utils/ws-requestor.js
+++ b/lib/utils/ws-requestor.js
@@ -6,6 +6,7 @@ const Websocket = require('ws');
 const snakeCaseKeys = require('./snakecase-keys');
 const {
  RESPONSE_TIMEOUT_MS,
+  JAMBONES_WS_PING_INTERVAL_MS,
  MAX_RECONNECTS,
  JAMBONES_WS_HANDSHAKE_TIMEOUT_MS,
  JAMBONES_WS_MAX_PAYLOAD
@@ -42,6 +43,7 @@ class WsRequestor extends BaseRequestor {
  async request(type, hook, params, httpHeaders = {}) {
    assert(HookMsgTypes.includes(type));
    const url = hook.url || hook;
+    const wantsAck = !['call:status', 'verb:status', 'jambonz:error'].includes(type);

    if (this.maliciousClient) {
      this.logger.info({url: this.url}, 'WsRequestor:request - discarding msg to malicious client');
@@ -72,11 +74,19 @@ class WsRequestor extends BaseRequestor {
      if (this.connectInProgress) {
        this.logger.debug(
          `WsRequestor:request(${this.id}) - queueing ${type} message since we are connecting`);
-        this.queuedMsg.push({type, hook, params, httpHeaders});
+        if (wantsAck) {
+          const p = new Promise((resolve, reject) => {
+            this.queuedMsg.push({type, hook, params, httpHeaders, promise: {resolve, reject}});
+          });
+          return p;
+        }
+        else {
+          this.queuedMsg.push({type, hook, params, httpHeaders});
+        }
        return;
      }
      this.connectInProgress = true;
-      this.logger.debug(`WsRequestor:request(${this.id}) - connecting since we do not have a connection`);
+      this.logger.debug(`WsRequestor:request(${this.id}) - connecting since we do not have a connection for ${type}`);
      if (this.connections >= MAX_RECONNECTS) {
        return Promise.reject(`max attempts connecting to ${this.url}`);
      }
@@ -115,9 +125,14 @@ class WsRequestor extends BaseRequestor {

    const sendQueuedMsgs = () => {
      if (this.queuedMsg.length > 0) {
-        for (const {type, hook, params, httpHeaders} of this.queuedMsg) {
+        for (const {type, hook, params, httpHeaders, promise} of this.queuedMsg) {
          this.logger.debug(`WsRequestor:request - preparing queued ${type} for sending`);
-          setImmediate(this.request.bind(this, type, hook, params, httpHeaders));
+          if (promise) {
+            this.request(type, hook, params, httpHeaders)
+              .then((res) => promise.resolve(res))
+              .catch((err) => promise.reject(err));
+          }
+          else setImmediate(this.request.bind(this, type, hook, params, httpHeaders));
        }
        this.queuedMsg.length = 0;
      }
@@ -136,8 +151,8 @@ class WsRequestor extends BaseRequestor {
    }

    /* simple notifications */
-    if (['call:status', 'verb:status', 'jambonz:error'].includes(type) || reconnectingWithoutAck) {
-      this.ws.send(JSON.stringify(obj), () => {
+    if (!wantsAck || reconnectingWithoutAck) {
+      this.ws?.send(JSON.stringify(obj), () => {
        this.logger.debug({obj}, `WsRequestor:request websocket: sent (${url})`);
        sendQueuedMsgs();
      });
@@ -178,9 +193,17 @@ class WsRequestor extends BaseRequestor {
    });
  }

+  _stopPingTimer() {
+    if (this._pingTimer) {
+      clearInterval(this._pingTimer);
+      this._pingTimer = null;
+    }
+  }
+
  close() {
    this.closedGracefully = true;
    this.logger.debug('WsRequestor:close closing socket');
+    this._stopPingTimer();
    try {
      if (this.ws) {
        this.ws.close(1000);
@@ -195,6 +218,7 @@ class WsRequestor extends BaseRequestor {

  _connect() {
    assert(!this.ws);
+    this._stopPingTimer();
    return new Promise((resolve, reject) => {
      const handshakeTimeout = JAMBONES_WS_HANDSHAKE_TIMEOUT_MS ?
        parseInt(JAMBONES_WS_HANDSHAKE_TIMEOUT_MS) :
@@ -255,10 +279,15 @@ class WsRequestor extends BaseRequestor {
    this.connectInProgress = false;
    this.connections++;
    this.emit('ready', ws);
+
+    if (JAMBONES_WS_PING_INTERVAL_MS > 15000) {
+      this._pingTimer = setInterval(() => this.ws?.ping(), JAMBONES_WS_PING_INTERVAL_MS);
+    }
  }

  _onClose(code) {
    this.logger.info(`WsRequestor(${this.id}) - closed from far end ${code}`);
+    this._stopPingTimer();
    if (this.connections > 0 && code !== 1000) {
      this.logger.info({url: this.url}, 'WsRequestor - socket closed unexpectedly from remote side');
      this.emit('socket-closed');
@@ -283,6 +312,7 @@ class WsRequestor extends BaseRequestor {
  _onSocketClosed() {
    this.ws = null;
    this.emit('connection-dropped');
+    this._stopPingTimer();
    if (this.connections > 0 && this.connections < MAX_RECONNECTS && !this.closedGracefully) {
      if (!this._initMsgId) this._clearPendingMessages();
      this.logger.debug(`WsRequestor:_onSocketClosed waiting ${this.backoffMs} to reconnect`);
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jambonz-feature-server",
-  "version": "v0.8.2",
+  "version": "0.8.4",
  "main": "app.js",
  "engines": {
    "node": ">= 10.16.0"
@@ -19,19 +19,19 @@
  "bugs": {},
  "scripts": {
    "start": "node app",
-    "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=1 ENCRYPTION_SECRET=foobar DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:JambonzR0ck$:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ",
+    "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=1 JAMBONES_TTS_TRIM_SILENCE=1 ENCRYPTION_SECRET=foobar DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:JambonzR0ck$:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ",
    "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
    "jslint": "eslint app.js tracer.js lib",
    "jslint:fix": "eslint app.js tracer.js lib --fix"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.7.4",
+    "@jambonz/db-helpers": "^0.9.1",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.7.0",
-    "@jambonz/speech-utils": "^0.0.12",
-    "@jambonz/stats-collector": "^0.1.8",
-    "@jambonz/time-series": "^0.2.5",
-    "@jambonz/verb-specifications": "^0.0.17",
+    "@jambonz/realtimedb-helpers": "^0.8.6",
+    "@jambonz/speech-utils": "^0.0.19",
+    "@jambonz/stats-collector": "^0.1.9",
+    "@jambonz/time-series": "^0.2.8",
+    "@jambonz/verb-specifications": "^0.0.29",
    "@opentelemetry/api": "^1.4.0",
    "@opentelemetry/exporter-jaeger": "^1.9.0",
    "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
@@ -41,12 +41,13 @@
    "@opentelemetry/sdk-trace-base": "^1.9.0",
    "@opentelemetry/sdk-trace-node": "^1.9.0",
    "@opentelemetry/semantic-conventions": "^1.9.0",
-    "aws-sdk": "^2.1313.0",
+    "@aws-sdk/client-sns": "^3.360.0",
+    "@aws-sdk/client-auto-scaling": "^3.360.0",
    "bent": "^7.3.12",
    "debug": "^4.3.4",
    "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.21",
-    "drachtio-srf": "^4.5.23",
+    "drachtio-fsmrf": "^3.0.23",
+    "drachtio-srf": "^4.5.26",
    "express": "^4.18.2",
    "ip": "^1.1.8",
    "moment": "^2.29.4",
--- a/test/config-test.js
+++ b/test/config-test.js
@@ -39,7 +39,7 @@ test('\'config: listen\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
@@ -86,7 +86,7 @@ test('\'config: listen - stop\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
--- a/test/create-call-test.js
+++ b/test/create-call-test.js
@@ -92,7 +92,7 @@ test('test create-call call-hook basic authentication', async(t) => {
        "text": "hello"
      }
    ];
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    //THEN
    await p;

@@ -106,3 +106,117 @@ test('test create-call call-hook basic authentication', async(t) => {
    t.error(err);
  }
 });
+
+test('test create-call amd', async(t) => {
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+
+  try {
+    await connect(srf);
+
+
+    // GIVEN
+    let from = 'create-call-amd';
+    let account_sid = 'bb845d4b-83a9-4cde-a6e9-50f3743bab3f';
+
+    // Give UAS app time to come up
+    const p = sippUac('uas.xml', '172.38.0.10', from);
+    await waitFor(1000);
+
+    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
+    post('v1/createCall', {
+      'account_sid':account_sid,
+      "call_hook": {
+        "url": "http://127.0.0.1:3100/",
+        "method": "POST",
+        "username": "username",
+        "password": "password"
+      },
+      "from": from,
+      "to": {
+        "type": "phone",
+        "number": "15583084809"
+      },
+      "amd": {
+        "actionHook": "/actionHook"
+      },
+      "speech_recognizer_vendor": "google",
+      "speech_recognizer_language": "en"
+    });
+
+    let verbs = [
+      {
+        "verb": "pause",
+        "length": 7
+      }
+    ];
+    await provisionCallHook(from, verbs);
+    //THEN
+    await p;
+
+    let obj = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`)
+    t.ok(obj.body.type = 'amd_no_speech_detected',
+      'create-call: AMD detected');
+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});
+
+test('test create-call app_json', async(t) => {
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+
+  try {
+    await connect(srf);
+
+
+    // GIVEN
+    let from = 'create-call-app-json';
+    let account_sid = 'bb845d4b-83a9-4cde-a6e9-50f3743bab3f';
+
+    // Give UAS app time to come up
+    const p = sippUac('uas.xml', '172.38.0.10', from);
+    await waitFor(1000);
+
+    const app_json = `[
+      {
+        "verb": "pause",
+        "length": 7
+      }
+    ]`;
+
+    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
+    post('v1/createCall', {
+      'account_sid':account_sid,
+      "call_hook": {
+        "url": "http://127.0.0.1:3100/",
+        "method": "POST",
+        "username": "username",
+        "password": "password"
+      },
+      app_json,
+      "from": from,
+      "to": {
+        "type": "phone",
+        "number": "15583084809"
+      },
+      "amd": {
+        "actionHook": "/actionHook"
+      },
+      "speech_recognizer_vendor": "google",
+      "speech_recognizer_language": "en"
+    });
+
+    //THEN
+    await p;
+
+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});
--- a/test/db/create-and-populate-schema.sql
+++ b/test/db/create-and-populate-schema.sql
--- a/test/db/jambones-sql.sql
+++ b/test/db/jambones-sql.sql
@@ -1,5 +1,4 @@
 /* SQLEditor (MySQL (2))*/
-
 SET FOREIGN_KEY_CHECKS=0;

 DROP TABLE IF EXISTS account_static_ips;
@@ -14,8 +13,12 @@ DROP TABLE IF EXISTS beta_invite_codes;

 DROP TABLE IF EXISTS call_routes;

+DROP TABLE IF EXISTS clients;
+
 DROP TABLE IF EXISTS dns_records;

+DROP TABLE IF EXISTS lcr;
+
 DROP TABLE IF EXISTS lcr_carrier_set_entry;

 DROP TABLE IF EXISTS lcr_routes;
@@ -52,6 +55,8 @@ DROP TABLE IF EXISTS smpp_addresses;

 DROP TABLE IF EXISTS speech_credentials;

+DROP TABLE IF EXISTS system_information;
+
 DROP TABLE IF EXISTS users;

 DROP TABLE IF EXISTS smpp_gateways;
@@ -124,6 +129,16 @@ application_sid CHAR(36) NOT NULL,
 PRIMARY KEY (call_route_sid)
 ) COMMENT='a regex-based pattern match for call routing';

+CREATE TABLE clients
+(
+client_sid CHAR(36) NOT NULL UNIQUE ,
+account_sid CHAR(36) NOT NULL,
+is_active BOOLEAN NOT NULL DEFAULT 1,
+username VARCHAR(64),
+password VARCHAR(1024),
+PRIMARY KEY (client_sid)
+);
+
 CREATE TABLE dns_records
 (
 dns_record_sid CHAR(36) NOT NULL UNIQUE ,
@@ -136,11 +151,23 @@ PRIMARY KEY (dns_record_sid)
 CREATE TABLE lcr_routes
 (
 lcr_route_sid CHAR(36),
+lcr_sid CHAR(36) NOT NULL,
 regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed number, used for LCR routing of PSTN calls',
 description VARCHAR(1024),
-priority INTEGER NOT NULL UNIQUE  COMMENT 'lower priority routes are attempted first',
+priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) COMMENT='Least cost routing table';
+) COMMENT='An ordered list of  digit patterns in an LCR table.  The patterns are tested in sequence until one matches';
+
+CREATE TABLE lcr
+(
+lcr_sid CHAR(36) NOT NULL UNIQUE ,
+name VARCHAR(64) COMMENT 'User-assigned name for this LCR table',
+is_active BOOLEAN NOT NULL DEFAULT 1,
+default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use when no digit match based results are found.',
+service_provider_sid CHAR(36),
+account_sid CHAR(36),
+PRIMARY KEY (lcr_sid)
+) COMMENT='An LCR (least cost routing) table that is used by a service provider or account to make decisions about routing outbound calls when multiple carriers are available.';

 CREATE TABLE password_settings
 (
@@ -248,7 +275,10 @@ CREATE TABLE sbc_addresses
 sbc_address_sid CHAR(36) NOT NULL UNIQUE ,
 ipv4 VARCHAR(255) NOT NULL,
 port INTEGER NOT NULL DEFAULT 5060,
+tls_port INTEGER,
+wss_port INTEGER,
 service_provider_sid CHAR(36),
+last_updated DATETIME,
 PRIMARY KEY (sbc_address_sid)
 );

@@ -304,9 +334,17 @@ last_tested DATETIME,
 tts_tested_ok BOOLEAN,
 stt_tested_ok BOOLEAN,
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+label VARCHAR(64),
 PRIMARY KEY (speech_credential_sid)
 );

+CREATE TABLE system_information
+(
+domain_name VARCHAR(255),
+sip_domain_name VARCHAR(255),
+monitoring_domain_name VARCHAR(255)
+);
+
 CREATE TABLE users
 (
 user_sid CHAR(36) NOT NULL UNIQUE ,
@@ -357,6 +395,7 @@ smpp_inbound_password VARCHAR(64),
 register_from_user VARCHAR(128),
 register_from_domain VARCHAR(255),
 register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
+register_status VARCHAR(4096),
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';

@@ -385,7 +424,7 @@ PRIMARY KEY (smpp_gateway_sid)
 CREATE TABLE phone_numbers
 (
 phone_number_sid CHAR(36) UNIQUE ,
-number VARCHAR(132) NOT NULL UNIQUE ,
+number VARCHAR(132) NOT NULL,
 voip_carrier_sid CHAR(36),
 account_sid CHAR(36),
 application_sid CHAR(36),
@@ -403,6 +442,7 @@ inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound ca
 outbound BOOLEAN NOT NULL COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
 voip_carrier_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
+protocol ENUM('udp','tcp','tls', 'tls/srtp') DEFAULT 'udp' COMMENT 'Outbound call protocol',
 PRIMARY KEY (sip_gateway_sid)
 ) COMMENT='A whitelisted sip gateway used for origination/termination';

@@ -435,13 +475,14 @@ account_sid CHAR(36) COMMENT 'account that this application belongs to (if null,
 call_hook_sid CHAR(36) COMMENT 'webhook to call for inbound calls ',
 call_status_hook_sid CHAR(36) COMMENT 'webhook to call for call status events',
 messaging_hook_sid CHAR(36) COMMENT 'webhook to call for inbound SMS/MMS ',
-app_json VARCHAR(16384),
+app_json TEXT,
 speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
 speech_synthesis_voice VARCHAR(64),
 speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+record_all_calls BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (application_sid)
 ) COMMENT='A defined set of behaviors to be applied to phone calls ';

@@ -479,6 +520,9 @@ subspace_client_secret VARCHAR(255),
 subspace_sip_teleport_id VARCHAR(255),
 subspace_sip_teleport_destinations VARCHAR(255),
 siprec_hook_sid CHAR(36),
+record_all_calls BOOLEAN NOT NULL DEFAULT false,
+record_format VARCHAR(16) NOT NULL DEFAULT 'mp3',
+bucket_credential VARCHAR(8192) COMMENT 'credential used to authenticate with storage service',
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';

@@ -499,9 +543,20 @@ ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERE

 ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid) REFERENCES applications (application_sid);

+CREATE INDEX client_sid_idx ON clients (client_sid);
+ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid);
+
 CREATE INDEX dns_record_sid_idx ON dns_records (dns_record_sid);
 ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);

+CREATE INDEX lcr_sid_idx ON lcr_routes (lcr_sid);
+ALTER TABLE lcr_routes ADD FOREIGN KEY lcr_sid_idxfk (lcr_sid) REFERENCES lcr (lcr_sid);
+
+CREATE INDEX lcr_sid_idx ON lcr (lcr_sid);
+ALTER TABLE lcr ADD FOREIGN KEY default_carrier_set_entry_sid_idxfk (default_carrier_set_entry_sid) REFERENCES lcr_carrier_set_entry (lcr_carrier_set_entry_sid);
+
+CREATE INDEX service_provider_sid_idx ON lcr (service_provider_sid);
+CREATE INDEX account_sid_idx ON lcr (account_sid);
 CREATE INDEX permission_sid_idx ON permissions (permission_sid);
 CREATE INDEX predefined_carrier_sid_idx ON predefined_carriers (predefined_carrier_sid);
 CREATE INDEX predefined_sip_gateway_sid_idx ON predefined_sip_gateways (predefined_sip_gateway_sid);
@@ -555,8 +610,6 @@ CREATE INDEX smpp_address_sid_idx ON smpp_addresses (smpp_address_sid);
 CREATE INDEX service_provider_sid_idx ON smpp_addresses (service_provider_sid);
 ALTER TABLE smpp_addresses ADD FOREIGN KEY service_provider_sid_idxfk_4 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

-CREATE UNIQUE INDEX speech_credentials_idx_1 ON speech_credentials (vendor,account_sid);
-
 CREATE INDEX speech_credential_sid_idx ON speech_credentials (speech_credential_sid);
 CREATE INDEX service_provider_sid_idx ON speech_credentials (service_provider_sid);
 ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_5 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
@@ -593,6 +646,8 @@ CREATE INDEX smpp_gateway_sid_idx ON smpp_gateways (smpp_gateway_sid);
 CREATE INDEX voip_carrier_sid_idx ON smpp_gateways (voip_carrier_sid);
 ALTER TABLE smpp_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);

+CREATE UNIQUE INDEX phone_numbers_unique_idx_voip_carrier_number ON phone_numbers (number,voip_carrier_sid);
+
 CREATE INDEX phone_number_sid_idx ON phone_numbers (phone_number_sid);
 CREATE INDEX number_idx ON phone_numbers (number);
 CREATE INDEX voip_carrier_sid_idx ON phone_numbers (voip_carrier_sid);
@@ -647,5 +702,4 @@ ALTER TABLE accounts ADD FOREIGN KEY queue_event_hook_sid_idxfk (queue_event_hoo
 ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (device_calling_application_sid) REFERENCES applications (application_sid);

 ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);
-
 SET FOREIGN_KEY_CHECKS=1;
--- a/test/dial-tests.js
+++ b/test/dial-tests.js
@@ -5,6 +5,8 @@ const getJSON = bent('json')
 const clearModule = require('clear-module');
 const {provisionCallHook} = require('./utils')

+const sleepFor = (ms) => new Promise((r) => setTimeout(r, ms));
+
 process.on('unhandledRejection', (reason, p) => {
  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
@@ -43,10 +45,11 @@ test('\'dial-phone\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
+    await sleepFor(1000);

    let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a';
    let post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
@@ -84,7 +87,7 @@ test('\'dial-sip\'', async(t) => {
    try {
      await connect(srf);
      // wait for fs connected to drachtio server.
-      await new Promise(r => setTimeout(r, 1000));
+      await sleepFor(1000);
      // GIVEN
      const from = "dial_sip";
      let verbs = [
@@ -102,7 +105,7 @@ test('\'dial-sip\'', async(t) => {
        }
      ];
  
-      provisionCallHook(from, verbs);
+      await provisionCallHook(from, verbs);
  
      // THEN
      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
@@ -169,7 +172,7 @@ test('\'dial-user\'', async(t) => {
        }
      ];
  
-      provisionCallHook(from, verbs);
+      await provisionCallHook(from, verbs);
  
      // THEN
      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
--- a/test/docker-compose-testbed.yaml
+++ b/test/docker-compose-testbed.yaml
@@ -42,7 +42,7 @@ services:
        ipv4_address: 172.38.0.7

  drachtio:
-    image: drachtio/drachtio-server:latest
+    image: drachtio/drachtio-server:0.8.22
    restart: always
    command: drachtio --contact "sip:*;transport=udp" --mtu 4096 --address 0.0.0.0 --port 9022
    ports:
@@ -57,7 +57,7 @@ services:
        condition: service_healthy

  freeswitch:
-    image: drachtio/drachtio-freeswitch-mrf:0.4.18
+    image: drachtio/drachtio-freeswitch-mrf:0.4.33
    restart: always
    command: freeswitch --rtp-range-start 20000 --rtp-range-end 20100
    environment:
--- a/test/gather-tests.js
+++ b/test/gather-tests.js
@@ -50,7 +50,7 @@ test('\'gather\' test - google', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -86,7 +86,7 @@ test('\'gather\' test - default (google)', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -102,6 +102,53 @@ test('\'gather\' test - default (google)', async(t) => {
  }
 });

+test('\'config\' test - reset to app defaults', async(t) => {
+  if (!GCP_JSON_KEY) {
+    t.pass('skipping config tests');
+    return t.end();
+  }
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+
+  try {
+    await connect(srf);
+    // GIVEN
+    let verbs = [
+      {
+        "verb": "config",
+        "recognizer": {
+          "vendor": "google",
+          "language": "fr-FR"
+        },
+      },
+      {
+        "verb": "config",
+        "reset": ['recognizer'],
+      },
+      {
+        "verb": "gather",
+        "input": ["speech"],
+        "timeout": 10,
+        "actionHook": "/actionHook"
+      }
+    ];
+    let from = "gather_success";
+    await provisionCallHook(from, verbs);
+    // THEN
+    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
+    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
+    //console.log(JSON.stringify(obj));
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase() === 'i\'d like to speak to customer support',
+      'config: resets recognizer to app defaults');
+
+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});
+
 test('\'gather\' test - microsoft', async(t) => {
  if (!MICROSOFT_REGION || !MICROSOFT_API_KEY) {
    t.pass('skipping microsoft tests');
@@ -126,7 +173,7 @@ test('\'gather\' test - microsoft', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -166,7 +213,7 @@ test('\'gather\' test - aws', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -209,12 +256,12 @@ test('\'gather\' test - deepgram', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().includes('like to speak to customer support'),
      'gather: succeeds when using deepgram credentials');
    disconnect();
  } catch (err) {
@@ -251,7 +298,7 @@ test('\'gather\' test - soniox', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
--- a/test/index.js
+++ b/test/index.js
@@ -14,5 +14,6 @@ require('./play-tests');
 require('./sip-refer-tests');
 require('./listen-tests');
 require('./config-test');
+require('./queue-test');
 require('./remove-test-db');
 require('./docker_stop');
--- a/test/listen-tests.js
+++ b/test/listen-tests.js
@@ -35,7 +35,7 @@ test('\'listen-success\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
@@ -57,7 +57,7 @@ test('\'listen-success\'', async(t) => {
  }
 });

-test('\'listen-maxLength\'', async(t) => {
+test.skip('\'listen-maxLength\'', async(t) => {
  clearModule.all();
  const {srf, disconnect} = require('../app');
  try {
@@ -69,13 +69,13 @@ test('\'listen-maxLength\'', async(t) => {
      {
        "verb": "listen",
        "url": `ws://172.38.0.60:3000/${from}`,
-        "mixType" : "mixed",
+        "mixType" : "stereo",
        "timeout": 2,
        "maxLength": 2
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
@@ -109,7 +109,7 @@ test('\'listen-pause-resume\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    const p = sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
--- a/test/play-tests.js
+++ b/test/play-tests.js
@@ -33,7 +33,7 @@ test('\'play\' tests single link in plain text', async(t) => {
    ];

    const from = 'play_single_link';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -62,7 +62,7 @@ test('\'play\' tests multi links in array', async(t) => {
    ];

    const from = 'play_multi_links_in_array';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -100,8 +100,8 @@ test('\'play\' tests single link in conference', async(t) => {
        waitHook: `/customHook`
      }
    ];
-    provisionCustomHook(from, waitHookVerbs)
-    provisionCallHook(from, verbs)
+    await provisionCustomHook(from, waitHookVerbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-send-bye.xml', '172.38.0.10', from);
@@ -141,8 +141,8 @@ test('\'play\' tests multi links in array in conference', async(t) => {
        waitHook: `/customHook`
      }
    ];
-    provisionCustomHook(from, waitHookVerbs)
-    provisionCallHook(from, verbs)
+    await provisionCustomHook(from, waitHookVerbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-send-bye.xml', '172.38.0.10', from);
@@ -178,8 +178,8 @@ test('\'play\' tests with seekOffset and actionHook', async(t) => {
    const waitHookVerbs = [];

    const from = 'play_action_hook';
-    provisionCallHook(from, verbs)
-    provisionCustomHook(from, waitHookVerbs)
+    await provisionCallHook(from, verbs)
+    await provisionCustomHook(from, waitHookVerbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -218,7 +218,7 @@ test('\'play\' tests with earlymedia', async(t) => {
    ];

    const from = 'play_early_media';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-invite-expect-183-cancel.xml', '172.38.0.10', from);
--- a/test/queue-test.js
+++ b/test/queue-test.js
@@ -0,0 +1,127 @@
+const test = require('tape');
+const { sippUac } = require('./sipp')('test_fs');
+const clearModule = require('clear-module');
+const {provisionCallHook, provisionActionHook, provisionAnyHook} = require('./utils');
+const bent = require('bent');
+const getJSON = bent('json');
+
+process.on('unhandledRejection', (reason, p) => {
+  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+function connect(connectable) {
+  return new Promise((resolve, reject) => {
+    connectable.on('connect', () => {
+      return resolve();
+    });
+  });
+}
+
+const sleepFor = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
+
+test('\'enqueue-dequeue\' tests', async(t) => {
+
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+  try {
+    await connect(srf);
+    // GIVEN
+    const verbs = [
+      {
+        verb: 'enqueue',
+        name: 'support',
+        actionHook: '/actionHook'
+      }
+    ];
+
+    const verbs2 = [
+      {
+        verb: 'dequeue',
+        name: 'support'
+      }
+    ];
+
+    const actionVerbs = [
+      {
+        verb: 'play',
+        url: 'silence_stream://1000',
+        earlyMedia: true
+      }
+    ];
+
+    const from = 'enqueue_success';
+    await provisionCallHook(from, verbs);
+    await provisionActionHook(from, actionVerbs)
+
+    const from2 = 'dequeue_success';
+    await provisionCallHook(from2, verbs2);
+    
+
+    // THEN
+    const p1 = sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
+
+    await sleepFor(1000);
+
+    const p2 = sippUac('uac-success-send-bye.xml', '172.38.0.11', from2);
+    await Promise.all([p1, p2]);
+    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
+    t.ok(obj.body.queue_result === 'bridged');
+    t.pass('enqueue-dequeue: succeeds connect');
+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});
+
+test('\leave\' tests', async(t) => {
+
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+  try {
+    await connect(srf);
+    // GIVEN
+    const verbs = [
+      {
+        verb: 'enqueue',
+        name: 'support1',
+        waitHook: '/anyHook/enqueue_success_leave',
+        actionHook: '/actionHook'
+      }
+    ];
+
+    const anyHookVerbs = [
+      {
+        verb: 'leave'
+      }
+    ];
+
+        const actionVerbs = [
+      {
+        verb: 'play',
+        url: 'silence_stream://1000',
+        earlyMedia: true
+      }
+    ];
+
+    const from = 'enqueue_success_leave';
+    await provisionCallHook(from, verbs);
+    await provisionAnyHook(from, anyHookVerbs);
+    await provisionActionHook(from, actionVerbs)
+    
+
+    // THEN
+    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
+    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/enqueue_success_leave`);
+    t.ok(obj.body.queue_position === 0);
+    const obj1  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
+    t.ok(obj1.body.queue_result === 'leave');
+    t.pass('enqueue-dequeue: succeeds connect');
+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});
--- a/test/say-tests.js
+++ b/test/say-tests.js
@@ -31,7 +31,7 @@ test('\'say\' tests', async(t) => {
    ];

    const from = 'say_test_success';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -43,3 +43,84 @@ test('\'say\' tests', async(t) => {
    t.error(err);
  }
 });
+
+test('\'config\' reset synthesizer tests', async(t) => {
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+
+  try {
+    await connect(srf);
+
+    // GIVEN
+    const verbs = [
+      {
+        "verb": "config",
+        "synthesizer": {
+          "vendor": "microsft",
+          "voice": "foobar"
+        },
+      },
+      {
+        "verb": "config",
+        "reset": 'synthesizer',
+      },
+      {
+        verb: 'say',
+        text: 'hello'
+      }
+    ];
+
+    const from = 'say_test_success';
+    await provisionCallHook(from, verbs)
+
+    // THEN
+    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
+    t.pass('say: succeeds when using using account credentials');
+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});
+
+const {MICROSOFT_CUSTOM_API_KEY, MICROSOFT_DEPLOYMENT_ID, MICROSOFT_CUSTOM_REGION, MICROSOFT_CUSTOM_VOICE} = process.env;
+if (MICROSOFT_CUSTOM_API_KEY && MICROSOFT_DEPLOYMENT_ID && MICROSOFT_CUSTOM_REGION && MICROSOFT_CUSTOM_VOICE) {
+  test('\'say\' tests - microsoft custom voice', async(t) => {
+    clearModule.all();
+    const {srf, disconnect} = require('../app');
+
+    try {
+      await connect(srf);
+
+      // GIVEN
+      const verbs = [
+        {
+          verb: 'say',
+          text: 'hello',
+          synthesizer: {
+            vendor: 'microsoft',
+            voice: MICROSOFT_CUSTOM_VOICE,
+            options: {
+              deploymentId: MICROSOFT_DEPLOYMENT_ID,
+              apiKey: MICROSOFT_CUSTOM_API_KEY,
+              region: MICROSOFT_CUSTOM_REGION,
+            }
+          }
+        }
+      ];
+
+      const from = 'say_test_success';
+      await provisionCallHook(from, verbs)
+
+      // THEN
+      await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
+      t.pass('say: succeeds when using microsoft custom voice');
+      disconnect();
+    } catch (err) {
+      console.log(`error received: ${err}`);
+      disconnect();
+      t.error(err);
+    }
+  });
+}
--- a/test/sip-refer-tests.js
+++ b/test/sip-refer-tests.js
@@ -41,8 +41,8 @@ test('\'refer\' tests w/202 and NOTIFY', {timeout: 25000}, async(t) => {
    const noVerbs = [];

    const from = 'refer_with_notify';
-    provisionCallHook(from, verbs);
-    provisionActionHook(from, noVerbs)
+    await provisionCallHook(from, verbs);
+    await provisionActionHook(from, noVerbs)

    // THEN
    await sippUac('uac-refer-with-notify.xml', '172.38.0.10', from);
@@ -81,8 +81,8 @@ test('\'refer\' tests w/202 but no NOTIFY', {timeout: 25000}, async(t) => {
    const noVerbs = [];

    const from = 'refer_no_notify';
-    provisionCallHook(from, verbs);
-    provisionActionHook(from, noVerbs)
+    await provisionCallHook(from, verbs);
+    await provisionActionHook(from, noVerbs)

    // THEN
    await sippUac('uac-refer-no-notify.xml', '172.38.0.10', from);
--- a/test/sip-request-tests.js
+++ b/test/sip-request-tests.js
@@ -40,7 +40,7 @@ test('sending SIP in-dialog requests tests', async(t) => {
      }
    ];
    let from = "sip_indialog_test";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-send-info-during-dialog.xml', '172.38.0.10', from);
    const obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
--- a/test/sipp.js
+++ b/test/sipp.js
@@ -36,7 +36,7 @@ obj.sippUac = (file, bindAddress, from='sipp', to='16174000000', loop=1) => {
    '-cid_str', `%u-%p@%s-${idx++}`,
    '172.38.0.50',
    '-key','from', from,
-    '-key','to', to, '-trace_msg'
+    '-key','to', to, '-trace_msg', '-trace_err'
  ];

  if (bindAddress) args.splice(5, 0, '--ip', bindAddress);
--- a/test/transcribe-tests.js
+++ b/test/transcribe-tests.js
@@ -48,7 +48,7 @@ test('\'transcribe\' test - google', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -85,7 +85,7 @@ test('\'transcribe\' test - microsoft', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -122,7 +122,7 @@ test('\'transcribe\' test - aws', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -162,11 +162,11 @@ test('\'transcribe\' test - deepgram', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().includes('like to speak to customer support'),
      'transcribe: succeeds when using deepgram credentials');

    disconnect();
@@ -202,14 +202,52 @@ test('\'transcribe\' test - soniox', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    console.log(JSON.stringify(obj));
+    //console.log(JSON.stringify(obj));
    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
      'transcribe: succeeds when using soniox credentials');

+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});
+
+test('\'transcribe\' test - google with asrTimeout', async(t) => {
+  if (!GCP_JSON_KEY) {
+    t.pass('skipping google tests');
+    return t.end();
+  }
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+
+  try {
+    await connect(srf);
+    // GIVEN
+    let verbs = [
+      {
+        "verb": "transcribe",
+        "recognizer": {
+          "vendor": "google",
+          "hints": ["customer support", "sales", "human resources", "HR"],
+          "asrTimeout": 4
+        },
+        "transcriptionHook": "/transcriptionHook"
+      }
+    ];
+    let from = "gather_success";
+    await provisionCallHook(from, verbs);
+    // THEN
+    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
+    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
+      'transcribe: succeeds when using google credentials');
+
    disconnect();
  } catch (err) {
    console.log(`error received: ${err}`);
--- a/test/utils.js
+++ b/test/utils.js
@@ -6,31 +6,40 @@ const bent = require('bent');
 * The function help testcase to register desired jambonz json response for an application call
 * When a call has From number match the registered hook event, the desired jambonz json will be responded.
 */
-const provisionCallHook = (from, verbs) => {
+const provisionCallHook = async (from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post('/appMapping', mapping);
+  await post('/appMapping', mapping);
 }

-const provisionCustomHook = (from, verbs) => {
+const provisionCustomHook = async(from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post(`/customHookMapping`, mapping);
+  await post(`/customHookMapping`, mapping);
 }

-const provisionActionHook = (from, verbs) => {
+const provisionActionHook = async(from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post(`/actionHook`, mapping);
+  await post(`/actionHook`, mapping);
 }

-module.exports = { provisionCallHook, provisionCustomHook, provisionActionHook}
+const provisionAnyHook = async(key, verbs) => {
+  const mapping = {
+    key,
+    data: JSON.stringify(verbs)
+  };
+  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
+  await post(`/anyHookMapping`, mapping);
+}
+
+module.exports = { provisionCallHook, provisionCustomHook, provisionActionHook, provisionAnyHook}
--- a/test/webhook/app.js
+++ b/test/webhook/app.js
@@ -2,6 +2,7 @@ const express = require('express');
 const app = express();
 const Websocket = require('ws');
 const listenPort = process.env.HTTP_PORT || 3000;
+const any_hook_json_mapping = new Map();
 let json_mapping = new Map();
 let hook_mapping = new Map();
 let ws_packet_count = new Map();
@@ -61,7 +62,7 @@ app.all('/', (req, res) => {
  console.log(req.body, 'POST /');
  const key = req.body.from
  addRequestToMap(key, req, hook_mapping);
-  return getJsonFromMap(key, req, res);
+  return getJsonFromMap(json_mapping, key, req, res);
 });

 app.post('/appMapping', (req, res) => {
@@ -106,7 +107,7 @@ app.post('/actionHook', (req, res) => {
 app.all('/customHook', (req, res) => {
  let key = `${req.body.from}_customHook`;;
  console.log(req.body, `POST /customHook`);
-  return getJsonFromMap(key, req, res);
+  return getJsonFromMap(json_mapping, key, req, res);
 });

 app.post('/customHookMapping', (req, res) => {
@@ -116,6 +117,23 @@ app.post('/customHookMapping', (req, res) => {
  return res.sendStatus(200);
 });

+/**
+ * Any Hook
+ */
+
+app.all('/anyHook/:key', (req, res) => {
+  let key = req.params.key;
+  console.log(req.body, `POST /anyHook/${key}`);
+  return getJsonFromMap(any_hook_json_mapping, key, req, res);
+});
+
+app.post('/anyHookMapping', (req, res) => {
+  let key = req.body.key;
+  console.log(req.body, `POST /anyHookMapping/${key}`);
+  any_hook_json_mapping.set(key, req.body.data);
+  return res.sendStatus(200);
+});
+
 // Fetch Requests
 app.get('/requests/:key', (req, res) => {
  let key = req.params.key;
@@ -162,9 +180,9 @@ app.get('/ws_metadata/:key', (req, res) => {
 * private function
 */

-function getJsonFromMap(key, req, res) {
-  if (!json_mapping.has(key)) return res.sendStatus(404);
-  const retData = JSON.parse(json_mapping.get(key));
+function getJsonFromMap(map, key, req, res) {
+  if (!map.has(key)) return res.sendStatus(404);
+  const retData = JSON.parse(map.get(key));
  console.log(retData, ` Response to ${req.method} ${req.url}`);
  addRequestToMap(key, req, hook_mapping);
  return res.json(retData);
--- a/test/webhooks-tests.js
+++ b/test/webhooks-tests.js
@@ -45,7 +45,7 @@ test('basic webhook tests', async(t) => {
    ];

    const from = 'sip_decline_test_success';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    await sippUac('uac-expect-603.xml', '172.38.0.10', from);
    t.pass('webhook successfully declines call');
@@ -73,7 +73,7 @@ test('invalid jambonz json create alert tests', async(t) => {
    };

    const from = 'invalid_json_create_alert';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-invite-expect-480.xml', '172.38.0.10', from);
Author	SHA1	Message	Date
Quan HL	8ad047b605	fix	2023-08-18 14:06:46 +07:00
Quan HL	b6c307db70	fix	2023-08-18 13:38:23 +07:00
Quan HL	aa161290c7	fix	2023-08-18 12:17:30 +07:00
Quan HL	4322159a41	fix gather verb	2023-08-18 11:24:14 +07:00
Quan HL	848aa43dcb	fix gather verb	2023-08-18 11:18:01 +07:00
Quan HL	18d7ea3e37	fix transcribe	2023-08-18 10:38:27 +07:00
Quan HL	09961f564a	fix transcribe	2023-08-18 10:24:41 +07:00
Quan HL	e9f2837370	fix gather	2023-08-18 09:57:02 +07:00
Quan HL	a97d99650c	wip	2023-08-17 17:04:38 +07:00
Quan HL	541cb1458d	wip	2023-08-17 16:58:46 +07:00
Quan HL	5754c386d3	feat fallback speech	2023-08-17 14:28:50 +07:00
Quan HL	b1c0478051	feat fallback speech	2023-08-17 14:25:26 +07:00
Hoan Luu Huu	f8c5abe9e9	feat: multi speech credential diff labels but same vendor (#426 ) * feat: multi speech credential diff labels but same vendor * update sql * fix * fix * fix jslint * fix review comment * update verb spec version	2023-08-15 08:57:49 -04:00
Dave Horton	ad722a55ee	generate trace id before outdial so we can include it in custom header (#418 ) * generate trace id before outdial so we can include it in custom header * logging * logging * fix #420 race condition on rest outdial when ws is used * revert unnecessary logging change	2023-08-08 13:00:34 -04:00
Hoan Luu Huu	82939214a2	update stats-collector version (#421 )	2023-08-07 21:22:10 -04:00
Dave Horton	043a171f41	remove log message	2023-08-07 15:22:03 -04:00
Dave Horton	c8e9b34b53	fix typo that caused record to fail on rest calls	2023-08-07 14:46:51 -04:00
Hoan Luu Huu	d7dcdb1d0c	Continuos ASR for transcribe (#398 ) * asrTimeout * fix jslint * change log * fix interrim	2023-08-03 09:49:44 -04:00
Dave Horton	fbd0782258	#388 - support custom speech vendor in transcribe verb (#414 ) Co-authored-by: Hoan Luu Huu <110280845+xquanluu@users.noreply.github.com>	2023-08-02 19:06:31 -04:00
Fábio Gomes	38f9329b12	When recordings are enabled, disable bidirectional audio on jambonz-session-record (#415 )	2023-08-02 14:21:59 -04:00
Dave Horton	d4bfdf0916	#412 - dont delay sending call status when stopping background listen (#413 )	2023-08-02 12:50:13 -04:00
Dave Horton	9203deef0f	fix bug in prev commit	2023-08-02 10:27:50 -04:00
Dave Horton	48b182c891	Fix/rest outdial failure session hangs (#411 ) * fix #410 * on rest outdial failure, if remote end closed gracefully don't wait for a reconnection	2023-08-01 12:59:30 -04:00
Dave Horton	e8e987cb9d	Fix/snake case customer data issue 406 (#409 ) * revert recent change on silence trimming * fix issue with incorrectly snake-casing customer data (#406)	2023-07-27 22:31:43 -04:00
Dave Horton	38ea9e7411	update to speech-utils@0.0.18 which ignores trimming of silence on azure ssml audio	2023-07-25 07:51:46 -04:00
Hoan Luu Huu	7b11a56a53	feat siprec custom header (#400 ) * feat siprec custom header * wip * update verb specification * add newline to info siprec body * add newline to info siprec body	2023-07-20 09:10:41 -04:00
Dave Horton	66305b5aea	feature: optionally trim silence from azure tts (#399 )	2023-07-19 10:36:24 -04:00
Dave Horton	6793bbf330	fix exception that appears in logs if session ends before last call status update	2023-07-18 13:20:53 -04:00
Hoan Luu Huu	d8543f73f2	execute status callback async (#394 ) * execute status callback async * fix review comment * revert fix review comment	2023-07-18 12:40:57 -04:00
Hoan Luu Huu	e1dad569dc	Fix/background listen tag (#391 ) * fix background listen send customerData to api server * test listen * fix review comment	2023-07-11 16:03:32 +01:00
Hoan Luu Huu	643bee48c5	feat multi srs (#381 )	2023-07-05 08:16:59 +01:00
Dave Horton	487bfd90d9	0.8.4	2023-06-28 09:23:40 +01:00
Hoan Luu Huu	810f6eb695	fix aws-sdk v3 (#387 ) * fix aws-sdk v3 * fix jslint * fix jslint * fix aws response parser	2023-06-28 09:20:43 +01:00
Hoan Luu Huu	62bc6b4bac	feat: add fs service url to sbc ping option (#383 ) * feat multi srs * add fs service URL to SBC ping option	2023-06-23 11:13:08 +01:00
two56	91fe3ceb06	Clear conference details in both Jambonz and FreeSWITCH (#350 ) Co-authored-by: Matt Preskett <matt.preskett@netcall.com>	2023-06-14 15:35:04 -04:00
Dave Horton	a7d07ce7ae	add channel to transcribe, gather, and dtmf spans (#376 )	2023-06-13 09:12:26 -04:00
Dave Horton	7cd6c27f90	update deps (#375 ) * update deps * added fixes	2023-06-09 15:40:50 -04:00
Hoan Luu Huu	aad24744f3	feat: record all calls (#352 ) * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * fix jslint * fix * wip * wip * wip * wip * wip * wip * wip * wip * fix: add file ext * fix: record format * fix outbound * update to drachtio-fsmrf with support for multiple recording streams on a call * enable DTMF during background listen recording * fix merge commit --------- Co-authored-by: Dave Horton <daveh@beachdognet.com>	2023-06-09 14:54:53 -04:00
Dave Horton	ab0452879e	add X-Application-Sid in outdials so it ends up in cdr (#374 )	2023-06-09 12:57:35 -04:00
Dave Horton	ffdb7a0bb5	create transcribe and listen child spans properly for dial (#373 ) * create transcribe and listen child spans properly for dial * fix prev commit: proper time to start span is in dial exec	2023-06-08 13:57:10 -04:00
Hoan Luu Huu	354818b974	feat: sentinel configuraiton (#372 ) * feat: sentinel configuraiton * fixed * fix jslint	2023-06-07 10:40:31 -04:00
Dave Horton	30beb9c093	transcribe: default hints and altLanguages (#371 )	2023-06-06 13:41:31 -04:00
Dave Horton	b978b3bc2f	add optional ws ping (#370 )	2023-06-05 11:00:14 -04:00
Hoan Luu Huu	a1c38f8a2e	fix: queue length in account event hook (#369 )	2023-06-05 08:41:10 -04:00
Dave Horton	37f3668016	update to speech-utils 0.0.15	2023-06-03 09:19:26 -04:00
Dave Horton	55935e3f35	skip flaky test	2023-06-03 09:09:49 -04:00
Hoan Luu Huu	b7070121ee	feat: advanced queues (#362 ) * feat: advanced queues * feat: advanced queues * feat: advanced queues * feat: advanced queues * update verb specification * add testcase * add testcase * add testcase * updte testcase * fixed * update queue * fix: fix waithook params * fix: fix waithook params * fix: performQueueWebhook with correct members length * fix merge conflict * debug log * debug listen test * debug listen test * debug listen test * debug listen test * debug listen test * debug listen issue * feat: add tts on account level --------- Co-authored-by: Dave Horton <daveh@beachdognet.com>	2023-06-03 08:16:05 -04:00
Dave Horton	01260ad054	transcribe: create otel child spans for each stt result that is returned in a long-running transcribe (#368 )	2023-06-02 14:25:32 -04:00
Dave Horton	bd911c88f9	in verb transcribe, recognizer should be optional (default to application default) but transcriptionHook mudt be mandatory (#367 )	2023-06-02 13:15:32 -04:00
Hoan Luu Huu	d96712a8d6	feat: add tts on account level (#366 )	2023-06-02 09:31:28 -04:00
Dave Horton	fdd8f7e743	Fix/logger reference (#365 ) * fix logger reference * fix undefined logger reference	2023-06-01 09:46:08 -04:00
Hoan Luu Huu	bb852600c0	fix: app_json is used for outbound call (#358 ) * fix: app_json is used for outbound call * fix jslint * fix: app_json setter in rest:dial task	2023-06-01 08:52:53 -04:00
Quan HL	210bbcbdbf	forward inbound carrier sid to outbound dial	2023-05-29 09:10:33 -04:00
Dave Horton	5910dbf0d3	fix for carrier selection on dial based on calling number	2023-05-26 12:27:51 -04:00
Dave Horton	90468ffe48	handle missing callerId property for anonymous calls	2023-05-25 13:28:42 -04:00
Dave Horton	863c4dfa34	fix docker publish build gh action	2023-05-25 13:19:46 -04:00
Dave Horton	484be8442c	fix for #359 - selection of outbound carrier based on calling number	2023-05-25 13:19:46 -04:00
Dave Horton	7393e3bcb7	standardize on passing .query args as array (#356 )	2023-05-22 09:56:05 -04:00
Hoan Luu Huu	32a84b7b19	feat: rest:dial amd (#339 ) Add support for sending 'amd' property in createCall REST API and also added support for using any of the speech vendors for STT --------- Co-authored-by: Dave Horton <daveh@beachdognet.com>	2023-05-16 16:20:08 -04:00
Dave Horton	6933e82d46	fix docker build	2023-05-15 14:04:29 -04:00
Dave Horton	fb1801ce11	0.8.3	2023-05-11 10:51:08 -04:00
Dave Horton	09abb23968	minor test change	2023-05-11 10:50:56 -04:00
two56	eb1e0d3bf5	Fix: REST dial timeout (#351 ) * Fix #343 by cancelling the request if the session isn't available * Commit that works for 302's calls --------- Co-authored-by: Matt Preskett <matt.preskett@netcall.com>	2023-05-11 10:17:39 -04:00
Hoan Luu Huu	3b6c103618	feat: update db-helper and speech-utils (#347 )	2023-05-10 08:04:56 -04:00
Dave Horton	feccc0fca7	add support for azure custom voices on a per-say basis (#346 )	2023-05-09 13:25:43 -04:00
Hoan Luu Huu	51bcb5a2d2	fix: rivauri (#345 ) * fix: rivauri * fix: rivauri	2023-05-09 10:27:15 -04:00
Dave Horton	7a184a8bbc	Fix/tracing cleanup (#342 ) * tracing usability * fix bug in prev commit * more cleanup * further tracing UI cleanup	2023-05-08 14:35:07 -04:00
Dave Horton	5043edfd4e	addresses #340 and #331 (#341 )	2023-05-08 12:23:32 -04:00