feat: lcr

2026-01-25 02:07:56 +00:00 · 2023-04-24 21:50:02 +07:00 · 2023-04-24 21:48:59 +07:00 · 2023-04-24 21:45:21 +07:00 · 2023-04-24 21:41:48 +07:00 · 2023-04-24 21:40:19 +07:00
48 changed files with 2912 additions and 7484 deletions
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -2,8 +2,6 @@ name: Docker

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

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

            # Strip git ref prefix from version
            VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
--- a/app.js
+++ b/app.js
@@ -20,9 +20,7 @@ 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');
@@ -120,15 +118,10 @@ 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,12 +8,7 @@ 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');
-  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_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
  assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_SUBNET env var');
 };

@@ -56,7 +51,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;

@@ -124,30 +119,6 @@ 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,
@@ -167,7 +138,6 @@ module.exports = {
  JAMBONES_FREESWITCH,
  JAMBONES_REDIS_HOST,
  JAMBONES_REDIS_PORT,
-  JAMBONES_REDIS_SENTINELS,
  SMPP_URL,
  JAMBONES_NETWORK_CIDR,
  JAMBONES_API_BASE_URL,
@@ -216,14 +186,10 @@ 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,
-  JAMBONZ_RECORD_WS_BASE_URL,
-  JAMBONZ_RECORD_WS_USERNAME,
-  JAMBONZ_RECORD_WS_PASSWORD
+  DEEPGRAM_API_KEY
 };
--- a/lib/http-routes/api/create-call.js
+++ b/lib/http-routes/api/create-call.js
@@ -19,16 +19,8 @@ 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});
-    restDial.appJson = app_json;
-    const {lookupAccountDetails, lookupCarrierByPhoneNumber, lookupCarrier} = dbUtils(logger, srf);
-    const {
-      lookupAppBySid
-    }  = srf.locals.dbHelpers;
+    const {lookupAccountDetails} = dbUtils(logger, srf);
    const {getSBC, getFreeswitch} = srf.locals;
    const sbcAddress = getSBC();
    if (!sbcAddress) throw new Error('no available SBCs for outbound call creation');
@@ -44,9 +36,6 @@ 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';

    opts.headers = {
      ...opts.headers,
@@ -54,9 +43,7 @@ router.post('/', async(req, res) => {
      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
      'X-Call-Sid': callSid,
      'X-Account-Sid': accountSid,
-      ...(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})
+      ...(restDial.fromHost && {'X-Preferred-From-Host': restDial.fromHost})
    };

    switch (target.type) {
@@ -90,6 +77,7 @@ 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'})`);
@@ -103,11 +91,15 @@ router.post('/', async(req, res) => {
     * check if from-number matches any existing numbers on Jambonz
     *  */
    if (target.type === 'phone' && !target.trunk) {
-      const str = restDial.from || '';
-      const callingNumber = str.startsWith('+') ? str.substring(1) : str;
-      const voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, callingNumber);
+      const {lookupCarrierByPhoneNumber, lookupCarrierByLcr} = dbUtils(this.logger, srf);
+      // firstly LCR
+      let voip_carrier_sid = await lookupCarrierByLcr(req.body.account_sid, to);
+      if (!voip_carrier_sid) {
+        // later by phone
+        voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, restDial.from);
+      }
      logger.info(
-        `createCall: selected ${voip_carrier_sid} for requested phone number: ${callingNumber || 'unspecified'})`);
+        `createCall: selected ${voip_carrier_sid} for requested phone number: ${restDial.from || 'unspecified'})`);
      if (voip_carrier_sid) {
        opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
      }
--- 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,7 +322,6 @@ 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,10 +19,7 @@ const HttpRequestor = require('../utils/http-requestor');
 const WsRequestor = require('../utils/ws-requestor');
 const {
  JAMBONES_INJECT_CONTENT,
-  AWS_REGION,
-  JAMBONZ_RECORD_WS_BASE_URL,
-  JAMBONZ_RECORD_WS_USERNAME,
-  JAMBONZ_RECORD_WS_PASSWORD,
+  AWS_REGION
 } = require('../config');
 const BADPRECONDITIONS = 'preconditions not met';
 const CALLER_CANCELLED_ERR_MSG = 'Response not sent due to unknown transaction';
@@ -67,16 +64,6 @@ 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;
@@ -135,11 +122,6 @@ class CallSession extends Emitter {
    return this.callInfo.callStatus;
  }

-  get isBackGroundListen() {
-    return !(this.backgroundListenTask === null ||
-    this.backgroundListenTask === undefined);
-  }
-
  /**
   * SIP call-id for the call
   */
@@ -342,22 +324,6 @@ 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');
@@ -503,7 +469,7 @@ class CallSession extends Emitter {
    }
  }

-  async startBackgroundListen(opts, bugname) {
+  async startBackgroundListen(opts) {
    if (this.isListenEnabled) {
      this.logger.info('CallSession:startBackgroundListen - listen is already enabled, ignoring request');
      return;
@@ -512,9 +478,8 @@ 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;
      const resources = await this._evaluatePreconditions(this.backgroundListenTask);
-      const {span, ctx} = this.rootSpan.startChildSpan(`background-listen:${this.backgroundListenTask.summary}`);
+      const {span, ctx} = this.rootSpan.startChildSpan(`background-gather:${this.backgroundListenTask.summary}`);
      this.backgroundListenTask.span = span;
      this.backgroundListenTask.ctx = ctx;
      this.backgroundListenTask.exec(this, resources)
@@ -537,7 +502,6 @@ class CallSession extends Emitter {
  }

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

  async enableBotMode(gather, autoEnable) {
@@ -715,12 +680,6 @@ 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,
@@ -770,7 +729,6 @@ 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);
@@ -792,22 +750,19 @@ class CallSession extends Emitter {
      }

      if (0 === this.tasks.length && this.requestor instanceof WsRequestor && !this.callGone) {
-        //let span;
+        let span;
        try {
-          //const {span} = this.rootSpan.startChildSpan('waiting for commands');
-          //const {reason, queue, command} = await this._awaitCommandsOrHangup();
-          /*
+          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();
+          span.end();
          this.logger.info(err, 'CallSession:exec - error waiting for new commands');
          break;
        }
@@ -1300,17 +1255,15 @@ 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() {
@@ -1350,10 +1303,7 @@ class CallSession extends Emitter {
      }

      // we are going from an early media connection to answer
-      if (this.direction === CallDirection.Inbound) {
-        // only do this for inbound call.
-        await this.propagateAnswer();
-      }
+      await this.propagateAnswer();
      return {
        ...resources,
        ...(this.isSipRecCallSession && {ep2: this.ep2})
@@ -1524,6 +1474,7 @@ 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}`);
    }
  }
@@ -1598,7 +1549,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;
@@ -1760,13 +1711,6 @@ 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) {
-      await this.stopBackgroundListen();
-    }
-
    /* race condition: we hang up at the same time as the caller */
    if (callStatus === CallStatus.Completed) {
      if (this.notifiedComplete) return;
@@ -1797,23 +1741,6 @@ class CallSession extends Emitter {
      .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
-        },
-        mixType : 'stereo',
-        passDtmf: true
-      };
-
-      this.logger.debug({listenOpts}, 'Record all calls: enabling listen');
-      await this.startBackgroundListen({verb: 'listen', ...listenOpts}, 'jambonz-session-record');
-    }
-  }
-
  /**
   * notifyTaskError - only used when websocket connection is used instead of webhooks
   */
--- a/lib/session/rest-call-session.js
+++ b/lib/session/rest-call-session.js
@@ -21,10 +21,6 @@ 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({
@@ -48,10 +44,6 @@ 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.logger.info('RestCallSession: releasing AMD');
-      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,12 +114,7 @@ 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::*');
-      this.ep.api(`conference ${this.confName} kick ${this.memberId}`)
-        .catch((err) => this.logger.info({err}, 'Error kicking participant'));
-    }
-    cs.clearConferenceDetails();
+    if (this.ep && this.ep.connected) this.ep.conn.removeAllListeners('esl::event::CUSTOM::*') ;
    this.notifyTaskDone();
  }

--- a/lib/tasks/config.js
+++ b/lib/tasks/config.js
@@ -30,12 +30,6 @@ 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 :
@@ -51,10 +45,6 @@ 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;
@@ -72,7 +62,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} = {}) {
@@ -96,11 +86,6 @@ 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
--- a/lib/tasks/dequeue.js
+++ b/lib/tasks/dequeue.js
@@ -16,7 +16,6 @@ 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;
@@ -54,7 +53,7 @@ class TaskDequeue extends Task {
  }

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

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

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

  get canReleaseMedia() {
    const keepAnchor = this.data.anchorMedia ||
-    this.cs.isBackGroundListen ||
    ANCHOR_MEDIA_ALWAYS ||
    this.listenTask ||
    this.transcribeTask ||
@@ -167,16 +166,6 @@ 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;
@@ -234,12 +223,10 @@ 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();
@@ -412,7 +399,7 @@ class TaskDial extends Task {
    const {req, srf} = cs;
    const {getSBC} = srf.locals;
    const {lookupTeamsByAccount, lookupAccountBySid} = srf.locals.dbHelpers;
-    const {lookupCarrier, lookupCarrierByPhoneNumber} = dbUtils(this.logger, cs.srf);
+    const {lookupCarrier, lookupCarrierByLcr} = dbUtils(this.logger, cs.srf);
    const sbcAddress = this.proxy || getSBC();
    const teamsInfo = {};
    let fqdn;
@@ -422,7 +409,6 @@ 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
    };
@@ -473,7 +459,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;
          }
@@ -481,14 +467,12 @@ class TaskDial extends Task {

        /**
         * trunk isn't specified,
-         * check if number matches any existing numbers
+         * check if number matches any LCR routes
         *  */
        if (t.type === 'phone' && !t.trunk) {
-          const str = this.callerId || req.callingNumber || '';
-          const callingNumber = str.startsWith('+') ? str.substring(1) : str;
-          const voip_carrier_sid = await lookupCarrierByPhoneNumber(cs.accountSid, callingNumber);
+          const voip_carrier_sid = lookupCarrierByLcr(req.body.account_sid, t.number);
          this.logger.info(
-            `Dial:_attemptCalls: selected ${voip_carrier_sid} for requested phone number: ${callingNumber}`);
+            `Dial:_attemptCalls: selected ${voip_carrier_sid} for requested phone number: ${t.number})`);
          if (voip_carrier_sid) {
            opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
          }
@@ -669,7 +653,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, {ep: this.epOther, ep2:this.ep});
+    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep2: this.epOther, ep: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
@@ -222,7 +222,6 @@ class Dialogflow extends Task {

      try {
        const obj = {
-          account_sid: cs.accountSid,
          text: intent.fulfillmentText,
          vendor: this.vendor,
          language: this.language,
--- a/lib/tasks/enqueue.js
+++ b/lib/tasks/enqueue.js
@@ -18,7 +18,6 @@ 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();
@@ -71,22 +70,12 @@ class TaskEnqueue extends Task {
  }

  async _addToQueue(cs, dlg) {
-    const {addToSortedSet, sortedSetLength} = cs.srf.locals.dbHelpers;
+    const {pushBack} = cs.srf.locals.dbHelpers;
    const url = getUrl(cs);
    this.waitStartTime = Date.now();
    this.logger.debug({queue: this.queueName, url}, 'pushing url onto queue');
-    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);
-
+    const members = await pushBack(this.queueName, url);
+    this.logger.info(`TaskEnqueue:_addToQueue: added to queue, length now ${members}`);
    this.notifyUrl = url;

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

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

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

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

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

@@ -324,14 +313,9 @@ class TaskEnqueue extends Task {
      queueTime: getElapsedTime(this.waitStartTime)
    };
    try {
-      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,
-      });
+      const queueSize = await lengthOfList(this.queueName);
+      const queuePosition = await getListPosition(this.queueName, this.notifyUrl);
+      Object.assign(params, {queueSize, queuePosition});
    } 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
@@ -817,11 +817,7 @@ class TaskGather extends Task {
      this.logger.debug({evt}, 'TaskGather:resolve buffered results');
    }

-    this.span.setAttributes({
-      channel: 1,
-      'stt.resolve': reason,
-      'stt.result': JSON.stringify(evt)
-    });
+    this.span.setAttributes({'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
@@ -189,7 +189,6 @@ class Lex extends Task {
          this.logger.debug(`tts with ${this.vendor} ${this.voice}`);
          // eslint-disable-next-line no-unused-vars
          const {filePath, servedFromCache} = await synthAudio(stats, {
-            account_sid: cs.accountSid,
            text: msg,
            vendor: this.vendor,
            language: this.language,
--- a/lib/tasks/listen.js
+++ b/lib/tasks/listen.js
@@ -3,7 +3,6 @@ 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) {
@@ -30,8 +29,6 @@ class TaskListen extends Task {

  get name() { return TaskName.Listen; }

-  set bugname(name) { this._bugname = name; }
-
  async exec(cs, {ep}) {
    await super.exec(cs);
    this.ep = ep;
@@ -68,8 +65,7 @@ class TaskListen extends Task {
    if (this.ep && this.ep.connected) {
      this.logger.debug('TaskListen:kill closing websocket');
      try {
-        const args = this._bugname ? [this._bugname] : [];
-        await this.ep.forkAudioStop(...args);
+        await this.ep.forkAudioStop();
        this.logger.debug('TaskListen:kill successfully closed websocket');
      } catch (err) {
        this.logger.info(err, 'TaskListen:kill');
@@ -89,16 +85,13 @@ 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(...args)
-            .catch((err) => this.logger.info(err, 'TaskListen: error pausing audio'));
+          await this.ep.forkAudioPause().catch((err) => this.logger.info(err, 'TaskListen: error pausing audio'));
          break;
        case ListenStatus.Resume:
-          await this.ep.forkAudioResume(...args)
-            .catch((err) => this.logger.info(err, 'TaskListen: error resuming audio'));
+          await this.ep.forkAudioResume().catch((err) => this.logger.info(err, 'TaskListen: error resuming audio'));
          break;
      }
    }
@@ -127,7 +120,6 @@ class TaskListen extends Task {
      wsUrl: this.hook.url,
      mixType: this.mixType,
      sampling: this.sampleRate,
-      ...(this._bugname && {bugname: this._bugname}),
      metadata
    });
    this.recordStartTime = moment();
@@ -169,25 +161,12 @@ class TaskListen extends Task {
  }

  _onDtmf(ep, evt) {
-    const {dtmf, duration} = evt;
-    this.logger.debug({evt}, `TaskListen:_onDtmf received dtmf ${dtmf}`);
+    this.logger.debug({evt}, `TaskListen:_onDtmf received dtmf ${evt.dtmf}`);
    if (this.passDtmf && this.ep?.connected) {
-      const obj = {event: 'dtmf', dtmf, duration};
-      const args = this._bugname ? [this._bugname, obj] : [obj];
-      this.ep.forkAudioSendText(...args)
+      const obj = {event: 'dtmf', dtmf: evt.dtmf, duration: evt.duration};
+      this.ep.forkAudioSendText(obj)
        .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;
@@ -213,15 +192,7 @@ class TaskListen extends Task {
    try {
      const results = await ep.play(evt.file);
      logger.debug(`Finished playing file, result: ${JSON.stringify(results)}`);
-      const obj = {
-        type: 'playDone',
-        data: {
-          id: evt.id,
-          ...results
-        }
-      };
-      const args = this._bugname ? [this._bugname, obj] : [obj];
-      ep.forkAudioSendText(...args);
+      ep.forkAudioSendText({type: 'playDone', data: Object.assign({id: evt.id}, results)});
    } catch (err) {
      logger.error({err}, 'Error playing file');
    }
--- a/lib/tasks/rest_dial.js
+++ b/lib/tasks/rest_dial.js
@@ -23,38 +23,23 @@ 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) {
+    if (this.canCancel && cs?.req) {
      this.canCancel = false;
-      cs?.req?.cancel();
+      cs.req.cancel();
    }
    this.notifyTaskDone();
  }
@@ -81,19 +66,7 @@ class TaskRestDial extends Task {
          }
        }
      };
-      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) {
-        tasks = JSON.parse(this.app_json);
-      } else {
-        tasks = await cs.requestor.request('session:new', this.call_hook, params, httpHeaders);
-      }
+      const 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)));
@@ -125,16 +98,7 @@ class TaskRestDial extends Task {
  _onCallTimeout() {
    this.logger.debug('TaskRestDial: timeout expired without answer, killing task');
    this.timer = null;
-    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');
-      });
+    this.kill();
  }
 }

--- a/lib/tasks/say.js
+++ b/lib/tasks/say.js
@@ -36,7 +36,6 @@ 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; }
@@ -67,7 +66,7 @@ class TaskSay extends Task {
      cs.speechSynthesisVoice;
    const engine = this.synthesizer.engine || 'standard';
    const salt = cs.callSid;
-    let credentials = cs.getSpeechCredentials(vendor, 'tts');
+    const credentials = cs.getSpeechCredentials(vendor, 'tts');

    /* parse Nuance voices into name and model */
    let model;
@@ -79,16 +78,6 @@ 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 {
@@ -120,7 +109,6 @@ class TaskSay extends Task {
        });
        try {
          const {filePath, servedFromCache, rtt} = await synthAudio(stats, {
-            account_sid: cs.accountSid,
            text,
            vendor,
            language,
--- 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} (${this.actionHook})`);
+      const span = this.startSpan(type, {'hook.url': 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
@@ -14,8 +14,6 @@ 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);
@@ -37,25 +35,20 @@ class TaskTranscribe extends Task {
    this.transcriptionHook = this.data.transcriptionHook;
    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);

-    if (this.data.recognizer) {
-      const recognizer = this.data.recognizer;
-      this.vendor = recognizer.vendor;
-      this.language = recognizer.language;
-      /* let credentials be supplied in the recognizer object at runtime */
-      this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);
+    const recognizer = this.data.recognizer;
+    this.vendor = recognizer.vendor;
+    this.language = recognizer.language;
+    this.interim = !!recognizer.interim;
+    this.separateRecognitionPerChannel = recognizer.separateRecognitionPerChannel;

-      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: []};
+    /* let credentials be supplied in the recognizer object at runtime */
+    this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);

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

-    this.childSpan = [null, null];
+    recognizer.hints = recognizer.hints || [];
+    recognizer.altLanguages = recognizer.altLanguages || [];
  }

  get name() { return TaskName.Transcribe; }
@@ -243,10 +236,6 @@ 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) {
@@ -296,16 +285,6 @@ class TaskTranscribe extends Task {
      }
    }

-    /* 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};
@@ -336,44 +315,16 @@ 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() {
@@ -386,7 +337,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');
@@ -397,14 +348,6 @@ 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();
  }

@@ -412,7 +355,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');
@@ -423,14 +366,6 @@ 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) {
--- a/lib/utils/amd-utils.js
+++ b/lib/utils/amd-utils.js
@@ -1,16 +1,9 @@
 const Emitter = require('events');
 const {readFile} = require('fs');
 const {
-  TaskName,
  GoogleTranscriptionEvents,
  AwsTranscriptionEvents,
  AzureTranscriptionEvents,
-  NuanceTranscriptionEvents,
-  NvidiaTranscriptionEvents,
-  IbmTranscriptionEvents,
-  SonioxTranscriptionEvents,
-  DeepgramTranscriptionEvents,
-  JambonzTranscriptionEvents,
  AmdEvents,
  AvmdEvents
 } = require('./constants');
@@ -61,11 +54,6 @@ class Amd extends Emitter {
    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,
@@ -241,92 +229,51 @@ module.exports = (logger) => {

  const startAmd = async(cs, ep, task, opts) => {
    const amd = ep.amd = new Amd(logger, cs, opts);
-    const {vendor, language} = amd;
-    let sttCredentials = amd.sttCredentials;
+    const {vendor, language, sttCredentials} = amd;
+    const sttOpts = {};
    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}`);
-    const sttOpts = amd.setChannelVarsForStt({name: TaskName.Gather}, sttCredentials, {
-      vendor,
-      hints,
-      enhancedModel: true,
-      altLanguages: opts.recognizer?.altLanguages || [],
-      initialSpeechTimeoutMs: opts.resolveTimeoutMs,
-    });
+    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;

+      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 {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -334,7 +281,7 @@ module.exports = (logger) => {
      .on(AmdEvents.HumanDetected, (evt) => {
        task.emit('amd', {type: AmdEvents.HumanDetected, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -345,7 +292,7 @@ module.exports = (logger) => {
      .on(AmdEvents.DecisionTimeout, (evt) => {
        task.emit('amd', {type: AmdEvents.DecisionTimeout, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -353,7 +300,7 @@ module.exports = (logger) => {
      .on(AmdEvents.ToneTimeout, (evt) => {
        //task.emit('amd', {type: AmdEvents.ToneTimeout, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.execute('avmd_stop').catch((err) => logger.info(err, 'Error stopping avmd'));
        } catch (err) {
          logger.info({err}, 'Error stopping avmd');
        }
@@ -361,7 +308,7 @@ module.exports = (logger) => {
      .on(AmdEvents.MachineStoppedSpeaking, () => {
        task.emit('amd', {type: AmdEvents.MachineStoppedSpeaking});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -380,19 +327,6 @@ 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,20 +11,15 @@ const {LifeCycleEvents} = require('./constants');
 const express = require('express');
 const app = express();
 const getString = bent('string');
-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 AWS = require('aws-sdk');
+const sns = new AWS.SNS({apiVersion: '2010-03-31'});
+const autoscaling = new AWS.AutoScaling({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();
@@ -74,7 +69,7 @@ class SnsNotifier extends Emitter {
            subscriptionRequestId: this.subscriptionRequestId
          }, 'response from SNS SubscribeURL');
          const data = await this.describeInstance();
-          this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
+          this.lifecycleState = data.AutoScalingInstances[0].LifecycleState;
          this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
          break;

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

  async subscribe() {
    try {
-      const params = {
+      const response = await sns.subscribe({
        Protocol: 'http',
        TopicArn: AWS_SNS_TOPIC_ARM,
        Endpoint: this.snsEndpoint
-      };
-      const response = await snsClient.send(new SubscribeCommand(params));
+      }).promise();
      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}`);
@@ -155,10 +149,9 @@ class SnsNotifier extends Emitter {
  async unsubscribe() {
    if (!this.subscriptionArn) throw new Error('SnsNotifier#unsubscribe called without an active subscription');
    try {
-      const params = {
+      const response = await sns.unsubscribe({
        SubscriptionArn: this.subscriptionArn
-      };
-      const response = await snsClient.send(new UnsubscribeCommand(params));
+      }).promise();
      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}`);
@@ -167,29 +160,26 @@ class SnsNotifier extends Emitter {

  completeScaleIn() {
    assert(this.scaleInParams);
-    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');
-      });
+    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');
+    });
  }

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

@@ -203,7 +193,7 @@ module.exports = async function(logger) {
  process.on('SIGHUP', async() => {
    try {
      const data = await notifier.describeInstance();
-      const state = data.AutoScalingGroups[0].Instances[0].LifecycleState;
+      const state = data.AutoScalingInstances[0].LifecycleState;
      if (state !== notifier.lifecycleState) {
        notifier.lifecycleState = state;
        switch (state) {
--- a/lib/utils/db-utils.js
+++ b/lib/utils/db-utils.js
@@ -78,10 +78,6 @@ 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;
@@ -94,35 +90,27 @@ 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 {
-      ...account,
+      ...r[0],
      speech
    };
  };
@@ -162,10 +150,41 @@ module.exports = (logger, srf) => {
    }
  };

+  const sqlQueryLcrByAccountSid = `SELECT lcr_sid FROM lcr WHERE account_sid = ? OR
+    service_provider_sid = (SELECT service_provider_sid from accounts where account_sid = ?)`;
+  const sqlQueryLcrRouteByLcrSid = 'SELECT * FROM lcr_routes WHERE lcr_sid = ? ORDER BY priority';
+  const sqlQueryLcrCarrierSetEntryByLcrRouteSid = `SELECT * FROM lcr_carrier_set_entry 
+    WHERE lcr_route_sid = ? ORDER BY priority`;
+  const lookupCarrierByLcr = async(account_sid, toNumber) => {
+    const pp = pool.promise();
+    try {
+      const [lcrs] = await pp.query(sqlQueryLcrByAccountSid, [account_sid, account_sid]);
+      if (lcrs.length) {
+        const lcr_sid = lcrs[0];
+        const [lcr_routes] = await pp.query(sqlQueryLcrRouteByLcrSid, [lcr_sid]);
+        if (lcr_routes.length) {
+          for (const r of lcr_routes) {
+            var matcher = new RegExp(r.regex);
+            if (matcher.test(toNumber)) {
+              const [entries] = await pp.query(sqlQueryLcrCarrierSetEntryByLcrRouteSid, [r.lcr_route_sid]);
+              // Currently just support first entry;
+              if (entries.length) {
+                return entries[0].voip_carrier_sid;
+              }
+            }
+          }
+        }
+      }
+    } catch (error) {
+      logger.error({error}, `lookupCarrierByLcr: Error ${account_sid}:${toNumber}`);
+    }
+  };
+
  return {
    lookupAccountDetails,
    updateSpeechCredentialLastUsed,
    lookupCarrier,
-    lookupCarrierByPhoneNumber
+    lookupCarrierByPhoneNumber,
+    lookupCarrierByLcr
  };
 };
--- a/lib/utils/install-srf-locals.js
+++ b/lib/utils/install-srf-locals.js
@@ -10,7 +10,6 @@ const {
  JAMBONES_FREESWITCH,
  JAMBONES_REDIS_HOST,
  JAMBONES_REDIS_PORT,
-  JAMBONES_REDIS_SENTINELS,
  SMPP_URL,
  JAMBONES_TIME_SERIES_HOST,
  JAMBONES_ESL_LISTEN_ADDRESS,
@@ -147,7 +146,7 @@ function installSrfLocals(srf, logger) {
    password: JAMBONES_MYSQL_PASSWORD,
    database: JAMBONES_MYSQL_DATABASE,
    connectionLimit: JAMBONES_MYSQL_CONNECTION_LIMIT || 10
-  }, logger);
+  }, logger, tracer);
  const {
    client,
    updateCallStatus,
@@ -168,12 +167,7 @@ function installSrfLocals(srf, logger) {
    removeFromList,
    getListPosition,
    lengthOfList,
-    addToSortedSet,
-    retrieveFromSortedSet,
-    retrieveByPatternSortedSet,
-    sortedSetLength,
-    sortedSetPositionByPattern
-  } = require('@jambonz/realtimedb-helpers')(JAMBONES_REDIS_SENTINELS || {
+  } = require('@jambonz/realtimedb-helpers')({
    host: JAMBONES_REDIS_HOST,
    port: JAMBONES_REDIS_PORT || 6379
  }, logger, tracer);
@@ -181,7 +175,7 @@ function installSrfLocals(srf, logger) {
    synthAudio,
    getNuanceAccessToken,
    getIbmAccessToken,
-  } = require('@jambonz/speech-utils')(JAMBONES_REDIS_SENTINELS || {
+  } = require('@jambonz/speech-utils')({
    host: JAMBONES_REDIS_HOST,
    port: JAMBONES_REDIS_PORT || 6379
  }, logger, tracer);
@@ -234,12 +228,7 @@ function installSrfLocals(srf, logger) {
      lengthOfList,
      getListPosition,
      getNuanceAccessToken,
-      getIbmAccessToken,
-      addToSortedSet,
-      retrieveFromSortedSet,
-      retrieveByPatternSortedSet,
-      sortedSetLength,
-      sortedSetPositionByPattern
+      getIbmAccessToken
    },
    parentLogger: logger,
    getSBC,
--- a/lib/utils/place-outdial.js
+++ b/lib/utils/place-outdial.js
@@ -45,10 +45,6 @@ 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,8 +101,7 @@ module.exports = (logger) => {
          method: 'OPTIONS',
          headers: {
            'X-FS-Status': ms && !dryUpCalls ? 'open' : 'closed',
-            'X-FS-Calls': srf.locals.sessionTracker.count,
-            'X-FS-ServiceUrl': srf.locals.serviceUrl
+            'X-FS-Calls': srf.locals.sessionTracker.count
          }
        });
        req.on('response', (res) => {
--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -549,7 +549,6 @@ 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}),
@@ -561,7 +560,7 @@ module.exports = (logger) => {
        ...(nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: nvidiaOptions.maxAlternatives}),
        ...(!nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: 1}),
        ...(rOpts.model && {NVIDIA_MODEL: rOpts.model}),
-        ...(rivaUri && {NVIDIA_RIVA_URI: rivaUri}),
+        ...(nvidiaOptions.rivaUri && {NVIDIA_RIVA_URI: nvidiaOptions.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,7 +6,6 @@ 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
@@ -179,17 +178,9 @@ 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);
@@ -204,7 +195,6 @@ 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) :
@@ -265,15 +255,10 @@ 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');
@@ -298,7 +283,6 @@ 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": "0.8.4",
+  "version": "v0.8.2",
  "main": "app.js",
  "engines": {
    "node": ">= 10.16.0"
@@ -25,13 +25,13 @@
    "jslint:fix": "eslint app.js tracer.js lib --fix"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.9.0",
+    "@jambonz/db-helpers": "^0.7.4",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.8.6",
-    "@jambonz/speech-utils": "^0.0.15",
+    "@jambonz/realtimedb-helpers": "^0.7.0",
+    "@jambonz/speech-utils": "^0.0.12",
    "@jambonz/stats-collector": "^0.1.8",
-    "@jambonz/time-series": "^0.2.7",
-    "@jambonz/verb-specifications": "^0.0.25",
+    "@jambonz/time-series": "^0.2.5",
+    "@jambonz/verb-specifications": "^0.0.16",
    "@opentelemetry/api": "^1.4.0",
    "@opentelemetry/exporter-jaeger": "^1.9.0",
    "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
@@ -41,13 +41,12 @@
    "@opentelemetry/sdk-trace-base": "^1.9.0",
    "@opentelemetry/sdk-trace-node": "^1.9.0",
    "@opentelemetry/semantic-conventions": "^1.9.0",
-    "@aws-sdk/client-sns": "^3.360.0",
-    "@aws-sdk/client-auto-scaling": "^3.360.0",
+    "aws-sdk": "^2.1313.0",
    "bent": "^7.3.12",
    "debug": "^4.3.4",
    "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.23",
-    "drachtio-srf": "^4.5.26",
+    "drachtio-fsmrf": "^3.0.21",
+    "drachtio-srf": "^4.5.23",
    "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) => {
      }
    ];

-    await provisionCallHook(from, verbs);
+    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) => {
      }
    ];

-    await provisionCallHook(from, verbs);
+    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"
      }
    ];
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    //THEN
    await p;

@@ -106,117 +106,3 @@ 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,4 +1,5 @@
 /* SQLEditor (MySQL (2))*/
+
 SET FOREIGN_KEY_CHECKS=0;

 DROP TABLE IF EXISTS account_static_ips;
@@ -15,8 +16,6 @@ DROP TABLE IF EXISTS call_routes;

 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;
@@ -53,8 +52,6 @@ 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;
@@ -139,23 +136,11 @@ 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 COMMENT 'lower priority routes are attempted first',
+priority INTEGER NOT NULL UNIQUE  COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) 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.';
+) COMMENT='Least cost routing table';

 CREATE TABLE password_settings
 (
@@ -263,10 +248,7 @@ 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)
 );

@@ -325,13 +307,6 @@ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 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 ,
@@ -382,7 +357,6 @@ 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';

@@ -429,7 +403,6 @@ 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';

@@ -462,7 +435,7 @@ 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 TEXT,
+app_json VARCHAR(16384),
 speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
 speech_synthesis_voice VARCHAR(64),
@@ -529,14 +502,6 @@ ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_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);
@@ -683,4 +648,4 @@ ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (devic

 ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);

-SET FOREIGN_KEY_CHECKS=1;
+SET FOREIGN_KEY_CHECKS=1;
--- a/test/dial-tests.js
+++ b/test/dial-tests.js
@@ -43,7 +43,7 @@ test('\'dial-phone\'', async(t) => {
      }
    ];

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

    // THEN
    const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
@@ -102,7 +102,7 @@ test('\'dial-sip\'', async(t) => {
        }
      ];
  
-      await provisionCallHook(from, verbs);
+      provisionCallHook(from, verbs);
  
      // THEN
      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
@@ -169,7 +169,7 @@ test('\'dial-user\'', async(t) => {
        }
      ];
  
-      await provisionCallHook(from, verbs);
+      provisionCallHook(from, verbs);
  
      // THEN
      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
--- a/test/gather-tests.js
+++ b/test/gather-tests.js
@@ -50,7 +50,7 @@ test('\'gather\' test - google', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    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";
-    await provisionCallHook(from, verbs);
+    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,53 +102,6 @@ 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');
@@ -173,7 +126,7 @@ test('\'gather\' test - microsoft', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    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`);
@@ -213,7 +166,7 @@ test('\'gather\' test - aws', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    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`);
@@ -256,12 +209,12 @@ test('\'gather\' test - deepgram', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    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().includes('like to speak to customer support'),
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
      'gather: succeeds when using deepgram credentials');
    disconnect();
  } catch (err) {
@@ -298,7 +251,7 @@ test('\'gather\' test - soniox', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    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,6 +14,5 @@ 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) => {
      }
    ];

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

-    await provisionCallHook(from, verbs);
+    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) => {
      }
    ];

-    await provisionCallHook(from, verbs);
+    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';
-    await provisionCallHook(from, verbs)
+    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';
-    await provisionCallHook(from, verbs)
+    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`
      }
    ];
-    await provisionCustomHook(from, waitHookVerbs)
-    await provisionCallHook(from, verbs)
+    provisionCustomHook(from, waitHookVerbs)
+    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`
      }
    ];
-    await provisionCustomHook(from, waitHookVerbs)
-    await provisionCallHook(from, verbs)
+    provisionCustomHook(from, waitHookVerbs)
+    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';
-    await provisionCallHook(from, verbs)
-    await provisionCustomHook(from, waitHookVerbs)
+    provisionCallHook(from, verbs)
+    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';
-    await provisionCallHook(from, verbs)
+    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
@@ -1,127 +0,0 @@
-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';
-    await provisionCallHook(from, verbs)
+    provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -43,84 +43,3 @@ 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';
-    await provisionCallHook(from, verbs);
-    await provisionActionHook(from, noVerbs)
+    provisionCallHook(from, verbs);
+    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';
-    await provisionCallHook(from, verbs);
-    await provisionActionHook(from, noVerbs)
+    provisionCallHook(from, verbs);
+    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";
-    await provisionCallHook(from, verbs);
+    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', '-trace_err'
+    '-key','to', to, '-trace_msg'
  ];

  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";
-    await provisionCallHook(from, verbs);
+    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";
-    await provisionCallHook(from, verbs);
+    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";
-    await provisionCallHook(from, verbs);
+    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";
-    await provisionCallHook(from, verbs);
+    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().includes('like to speak to customer support'),
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
      'transcribe: succeeds when using deepgram credentials');

    disconnect();
@@ -202,11 +202,11 @@ test('\'transcribe\' test - soniox', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    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');

--- a/test/utils.js
+++ b/test/utils.js
@@ -6,40 +6,31 @@ 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 = async (from, verbs) => {
+const provisionCallHook = (from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  await post('/appMapping', mapping);
+  post('/appMapping', mapping);
 }

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

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

-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}
+module.exports = { provisionCallHook, provisionCustomHook, provisionActionHook}
--- a/test/webhook/app.js
+++ b/test/webhook/app.js
@@ -2,7 +2,6 @@ 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();
@@ -62,7 +61,7 @@ app.all('/', (req, res) => {
  console.log(req.body, 'POST /');
  const key = req.body.from
  addRequestToMap(key, req, hook_mapping);
-  return getJsonFromMap(json_mapping, key, req, res);
+  return getJsonFromMap(key, req, res);
 });

 app.post('/appMapping', (req, res) => {
@@ -107,7 +106,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(json_mapping, key, req, res);
+  return getJsonFromMap(key, req, res);
 });

 app.post('/customHookMapping', (req, res) => {
@@ -117,23 +116,6 @@ 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;
@@ -180,9 +162,9 @@ app.get('/ws_metadata/:key', (req, res) => {
 * private function
 */

-function getJsonFromMap(map, key, req, res) {
-  if (!map.has(key)) return res.sendStatus(404);
-  const retData = JSON.parse(map.get(key));
+function getJsonFromMap(key, req, res) {
+  if (!json_mapping.has(key)) return res.sendStatus(404);
+  const retData = JSON.parse(json_mapping.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';
-    await provisionCallHook(from, verbs)
+    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';
-    await provisionCallHook(from, verbs)
+    provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-invite-expect-480.xml', '172.38.0.10', from);
Author	SHA1	Message	Date
Quan HL	6c4c5b6ba8	feat: lcr	2023-04-24 21:50:02 +07:00
Quan HL	381eee9bcb	feat: lcr	2023-04-24 21:48:59 +07:00
Quan HL	7dc6b782f5	feat: lcr	2023-04-24 21:45:21 +07:00
Quan HL	18d2dfa053	feat: lcr	2023-04-24 21:41:48 +07:00
Quan HL	2e3d783dee	feat: lcr	2023-04-24 21:40:19 +07:00