further fixes for #210

allow redirect to ws(s) url after starting with http(s) #210
2026-02-10 08:21:33 +00:00 · 2023-01-07 14:49:59 -05:00 · 2023-01-07 14:13:11 -05:00
46 changed files with 1553 additions and 3191 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,7 @@
 name: CI

-on: [push, pull_request]
+on:
+  push:

 jobs:
  build:
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,4 @@ examples/*
 ecosystem.config.js
 .vscode
 test/credentials/*.json
-run-tests.sh
-run-coverage.sh
+run-tests.sh
--- a/app.js
+++ b/app.js
@@ -106,25 +106,16 @@ const disconnect = () => {
  });
 };

+process.on('SIGUSR2', handle);
 process.on('SIGTERM', handle);

 function handle(signal) {
  const {removeFromSet} = srf.locals.dbHelpers;
-  srf.locals.disabled = true;
-  logger.info(`got signal ${signal}`);
  const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
-  if (setName && srf.locals.localSipAddress) {
-    logger.info(`got signal ${signal}, removing ${srf.locals.localSipAddress} from set ${setName}`);
-    removeFromSet(setName, srf.locals.localSipAddress);
-  }
+  logger.info(`got signal ${signal}, removing ${srf.locals.localSipAddress} from set ${setName}`);
+  removeFromSet(setName, srf.locals.localSipAddress);
  removeFromSet(FS_UUID_SET_NAME, srf.locals.fsUUID);
-  if (process.env.K8S) {
-    srf.locals.lifecycleEmitter.operationalState = LifeCycleEvents.ScaleIn;
-  }
-  if (getCount() === 0) {
-    logger.info('no calls in progress, exiting');
-    process.exit(0);
-  }
+  srf.locals.disabled = true;
 }

 if (process.env.JAMBONZ_CLEANUP_INTERVAL_MINS) {
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -245,9 +245,7 @@ module.exports = function(srf, logger) {

      // eslint-disable-next-line no-unused-vars
      const {call_hook, call_status_hook, ...appInfo} = app;  // mask sensitive data like user/pass on webhook
-      // eslint-disable-next-line no-unused-vars
-      const {requestor, notifier, ...loggable} = appInfo;
-      logger.info({app: loggable}, `retrieved application for incoming call to ${req.locals.calledNumber}`);
+      logger.info({app: appInfo}, `retrieved application for incoming call to ${req.locals.calledNumber}`);
      req.locals.callInfo = new CallInfo({
        req,
        app: app2,
@@ -276,39 +274,34 @@ module.exports = function(srf, logger) {
        return next();
      }
      /* retrieve the application to execute for this inbound call */
-      let json;
-      if (app.app_json) {
-        json = JSON.parse(app.app_json);
-      } else {
-        const params = Object.assign(['POST', 'WS'].includes(app.call_hook.method) ? { sip: req.msg } : {},
-          req.locals.callInfo,
-          { service_provider_sid: req.locals.service_provider_sid },
-          {
-            defaults: {
-              synthesizer: {
-                vendor: app.speech_synthesis_vendor,
-                language: app.speech_synthesis_language,
-                voice: app.speech_synthesis_voice
-              },
-              recognizer: {
-                vendor: app.speech_recognizer_vendor,
-                language: app.speech_recognizer_language
-              }
+      const params = Object.assign(['POST', 'WS'].includes(app.call_hook.method) ? {sip: req.msg} : {},
+        req.locals.callInfo,
+        {service_provider_sid: req.locals.service_provider_sid},
+        {
+          defaults: {
+            synthesizer: {
+              vendor: app.speech_synthesis_vendor,
+              language: app.speech_synthesis_language,
+              voice: app.speech_synthesis_voice
+            },
+            recognizer: {
+              vendor: app.speech_recognizer_vendor,
+              language: app.speech_recognizer_language
            }
-          });
-        logger.debug({ params }, 'sending initial webhook');
-        const obj = rootSpan.startChildSpan('performAppWebhook');
-        span = obj.span;
-        const b3 = rootSpan.getTracingPropagation();
-        const httpHeaders = b3 && { b3 };
-        json = await app.requestor.request('session:new', app.call_hook, params, httpHeaders);
-      }
+          }
+        });
+      logger.debug({params}, 'sending initial webhook');
+      const obj = rootSpan.startChildSpan('performAppWebhook');
+      span = obj.span;
+      const b3 = rootSpan.getTracingPropagation();
+      const httpHeaders = b3 && {b3};
+      const json = await app.requestor.request('session:new', app.call_hook, params, httpHeaders);
      app.tasks = normalizeJambones(logger, json).map((tdata) => makeTask(logger, tdata));
-      span?.setAttributes({
+      span.setAttributes({
        'http.statusCode': 200,
        'app.tasks': listTaskNames(app.tasks)
      });
-      span?.end();
+      span.end();
      if (0 === app.tasks.length) throw new Error('no application provided');

      if (siprec) {
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -114,10 +114,6 @@ class CallSession extends Emitter {
    return this.callInfo.applicationSid;
  }

-  get callStatus() {
-    return this.callInfo.callStatus;
-  }
-
  /**
   * SIP call-id for the call
   */
@@ -270,10 +266,6 @@ class CallSession extends Emitter {
    return this.backgroundGatherTask;
  }

-  get isListenEnabled() {
-    return this.backgroundListenTask;
-  }
-
  get b3() {
    return this.rootSpan?.getTracingPropagation();
  }
@@ -465,50 +457,6 @@ class CallSession extends Emitter {
    }
  }

-  async startBackgroundListen(opts) {
-    if (this.isListenEnabled) {
-      this.logger.info('CallSession:startBackgroundListen - listen is already enabled, ignoring request');
-      return;
-    }
-    try {
-      this.logger.debug({opts}, 'CallSession:startBackgroundListen');
-      const t = normalizeJambones(this.logger, [opts]);
-      this.backgroundListenTask = makeTask(this.logger, t[0]);
-      const resources = await this._evaluatePreconditions(this.backgroundListenTask);
-      const {span, ctx} = this.rootSpan.startChildSpan(`background-gather:${this.backgroundListenTask.summary}`);
-      this.backgroundListenTask.span = span;
-      this.backgroundListenTask.ctx = ctx;
-      this.backgroundListenTask.exec(this, resources)
-        .then(() => {
-          this.logger.info('CallSession:startBackgroundListen: listen completed');
-          this.backgroundListenTask && this.backgroundListenTask.removeAllListeners();
-          this.backgroundListenTask && this.backgroundListenTask.span.end();
-          this.backgroundListenTask = null;
-          return;
-        })
-        .catch((err) => {
-          this.logger.info({err}, 'CallSession:startBackgroundListen: listen threw error');
-          this.backgroundListenTask && this.backgroundListenTask.removeAllListeners();
-          this.backgroundListenTask && this.backgroundListenTask.span.end();
-          this.backgroundListenTask = null;
-        });
-    } catch (err) {
-      this.logger.info({err, opts}, 'CallSession:startBackgroundListen - Error creating listen task');
-    }
-  }
-
-  async stopBackgroundListen() {
-    try {
-      if (this.backgroundListenTask) {
-        this.backgroundListenTask.removeAllListeners();
-        this.backgroundListenTask.kill().catch(() => {});
-      }
-    } catch (err) {
-      this.logger.info({err}, 'CallSession:stopBackgroundListen - Error stopping listen task');
-    }
-    this.backgroundListenTask = null;
-  }
-
  async enableBotMode(gather, autoEnable) {
    try {
      if (this.backgroundGatherTask) {
@@ -519,10 +467,10 @@ class CallSession extends Emitter {
      this.backgroundGatherTask = makeTask(this.logger, t[0]);
      this._bargeInEnabled = true;
      this.backgroundGatherTask
-        .once('dtmf', this._clearTasks.bind(this, this.backgroundGatherTask))
-        .once('vad', this._clearTasks.bind(this, this.backgroundGatherTask))
-        .once('transcription', this._clearTasks.bind(this, this.backgroundGatherTask))
-        .once('timeout', this._clearTasks.bind(this, this.backgroundGatherTask));
+        .once('dtmf', this._clearTasks.bind(this))
+        .once('vad', this._clearTasks.bind(this))
+        .once('transcription', this._clearTasks.bind(this))
+        .once('timeout', this._clearTasks.bind(this));
      this.logger.info({gather}, 'CallSession:enableBotMode - starting background gather');
      const resources = await this._evaluatePreconditions(this.backgroundGatherTask);
      const {span, ctx} = this.rootSpan.startChildSpan(`background-gather:${this.backgroundGatherTask.summary}`);
@@ -715,7 +663,7 @@ class CallSession extends Emitter {
        }
      }

-      if (0 === this.tasks.length && this.requestor instanceof WsRequestor && !this.callGone) {
+      if (0 === this.tasks.length && this.hasStableDialog && this.requestor instanceof WsRequestor) {
        let span;
        try {
          const {span} = this.rootSpan.startChildSpan('waiting for commands');
@@ -726,7 +674,7 @@ class CallSession extends Emitter {
            'async.request.command': command
          });
          span.end();
-          if (this.callGone) break;
+          if (!this.hasStableDialog || this.callGone) break;
        } catch (err) {
          span.end();
          this.logger.info(err, 'CallSession:exec - error waiting for new commands');
@@ -1085,32 +1033,14 @@ class CallSession extends Emitter {
    }
  }

-  kill(onBackgroundGatherBargein = false) {
+  kill() {
    if (this.isConfirmCallSession) this.logger.debug('CallSession:kill (ConfirmSession)');
    else this.logger.info('CallSession:kill');
    if (this.currentTask) {
      this.currentTask.kill(this);
      this.currentTask = null;
    }
-    if (onBackgroundGatherBargein) {
-      /* search for a config with bargein disabled */
-      while (this.tasks.length) {
-        const t = this.tasks[0];
-        if (t.name === TaskName.Config && t.bargeIn?.enable === false) {
-          /* found it, clear to that point and remove the disable
-            because we likely already received a partial transcription
-            and we don't want to kill the background gather before we
-            get the full transcription.
-          */
-          delete t.bargeIn.enable;
-          this._bargeInEnabled = false;
-          this.logger.info('CallSession:kill - found bargein disabled in the stack, clearing to that point');
-          break;
-        }
-        this.tasks.shift();
-      }
-    }
-    else this.tasks = [];
+    this.tasks = [];
    this.taskIdx = 0;
  }

@@ -1670,7 +1600,7 @@ class CallSession extends Emitter {
   * @param {number} sipStatus - current sip status
   * @param {number} [duration] - duration of a completed call, in seconds
   */
-  async _notifyCallStatusChange({callStatus, sipStatus, sipReason, duration}) {
+  _notifyCallStatusChange({callStatus, sipStatus, sipReason, duration}) {
    if (this.callMoved) return;

    /* race condition: we hang up at the same time as the caller */
@@ -1690,7 +1620,7 @@ class CallSession extends Emitter {
    try {
      const b3 = this.b3;
      const httpHeaders = b3 && {b3};
-      await this.notifier.request('call:status', this.call_status_hook, this.callInfo.toJSON(), httpHeaders);
+      this.notifier.request('call:status', this.call_status_hook, this.callInfo.toJSON(), httpHeaders);
      span.end();
    } catch (err) {
      span.end();
@@ -1730,12 +1660,11 @@ class CallSession extends Emitter {
    });
  }

-  _clearTasks(backgroundGather, evt) {
-    if (this.requestor instanceof WsRequestor && !backgroundGather.cleared) {
+  _clearTasks(evt) {
+    if (this.requestor instanceof WsRequestor) {
      this.logger.info({evt}, 'CallSession:_clearTasks on event from background gather');
      try {
-        backgroundGather.cleared = true;
-        this.kill(true);
+        this.kill();
      } catch (err) {}
    }
  }
--- a/lib/tasks/conference.js
+++ b/lib/tasks/conference.js
@@ -108,10 +108,6 @@ class Conference extends Task {
  async kill(cs) {
    super.kill(cs);
    this.logger.info(`Conference:kill ${this.confName}`);
-    if (this._playSession) {
-      this._playSession.kill();
-      this._playSession = null;
-    }
    this.emitter.emit('kill');
    await this._doFinalMemberCheck(cs);
    if (this.ep && this.ep.connected) this.ep.conn.removeAllListeners('esl::event::CUSTOM::*') ;
@@ -431,19 +427,13 @@ class Conference extends Task {
        .catch((err) => this.logger.info({err}, 'Error deafing or undeafing participant'));
    }

-    if (wait_hook) {
-      if (this.wait_hook)
-        delete this.wait_hook.url;
-      this.wait_hook = {url: wait_hook};
-    }
-
    if (hookOnly && this._playSession) {
      this._playSession.kill();
      this._playSession = null;
    }
-    if (this.wait_hook?.url && this.conf_hold_status === 'hold') {
+    if (wait_hook && this.conf_hold_status === 'hold') {
      const {dlg} = cs;
-      this._doWaitHookWhileOnHold(cs, dlg, this.wait_hook);
+      this._doWaitHookWhileOnHold(cs, dlg, wait_hook);
    }
    else if (this.conf_hold_status !== 'hold' && this._playSession) {
      this._playSession.kill();
@@ -454,9 +444,7 @@ class Conference extends Task {
  async _doWaitHookWhileOnHold(cs, dlg, wait_hook) {
    do {
      try {
-        let tasks = [];
-        if (wait_hook.url)
-          tasks = await this._playHook(cs, dlg, wait_hook.url);
+        const tasks = await this._playHook(cs, dlg, wait_hook);
        if (0 === tasks.length) break;
      } catch (err) {
        if (!this.killed) {
@@ -583,10 +571,6 @@ class Conference extends Task {
   */
  _kicked(cs, dlg) {
    this.logger.info(`Conference:kicked - I was dropped from conference ${this.confName}, task is complete`);
-    if (this._playSession) {
-      this._playSession.kill();
-      this._playSession = null;
-    }
    this.replaceEndpointAndEnd(cs);
  }

--- a/lib/tasks/config.js
+++ b/lib/tasks/config.js
@@ -8,8 +8,7 @@ class TaskConfig extends Task {
      'synthesizer',
      'recognizer',
      'bargeIn',
-      'record',
-      'listen'
+      'record'
    ].forEach((k) => this[k] = this.data[k] || {});

    if ('notifyEvents' in this.data) {
@@ -31,7 +30,7 @@ class TaskConfig extends Task {
      });
    }
    if (this.bargeIn.sticky) this.autoEnable = true;
-    this.preconditions = (this.bargeIn.enable || this.record?.action || this.listen?.url || this.data.amd) ?
+    this.preconditions = (this.bargeIn.enable || this.record?.action || this.data.amd) ?
      TaskPreconditions.Endpoint :
      TaskPreconditions.None;
  }
@@ -39,9 +38,8 @@ class TaskConfig extends Task {
  get name() { return TaskName.Config; }

  get hasSynthesizer() { return Object.keys(this.synthesizer).length; }
+
  get hasRecognizer() { return Object.keys(this.recognizer).length; }
-  get hasRecording() { return Object.keys(this.record).length; }
-  get hasListen() { return Object.keys(this.listen).length; }

  get summary() {
    const phrase = [];
@@ -56,10 +54,6 @@ class TaskConfig extends Task {
      const s = `{${v},${l}}`;
      phrase.push(`set recognizer${s}`);
    }
-    if (this.hasRecording) phrase.push(this.record.action);
-    if (this.hasListen) {
-      phrase.push(this.listen.enable ? `listen ${this.listen.url}` : 'stop listen');
-    }
    if (this.data.amd) phrase.push('enable amd');
    if (this.notifyEvents) phrase.push(`event notification ${this.notifyEvents ? 'on' : 'off'}`);
    return `${this.name}{${phrase.join(',')}`;
@@ -70,7 +64,8 @@ class TaskConfig extends Task {

    if (this.notifyEvents) {
      this.logger.debug(`turning event notification ${this.notifyEvents ? 'on' : 'off'}`);
-      cs.notifyEvents = !!this.data.notifyEvents;
+      cs.notifyEvents = !!this.data.notifEvents;
+
    }

    if (this.data.amd) {
@@ -152,21 +147,11 @@ class TaskConfig extends Task {
        this.logger.info({err}, 'Config: error starting recording');
      }
    }
-    if (this.hasListen) {
-      const {enable, ...opts} = this.listen;
-      if (enable) {
-        this.logger.debug({opts}, 'Config: enabling listen');
-        cs.startBackgroundListen({verb: 'listen', ...opts});
-      } else {
-        this.logger.info('Config: disabling listen');
-        cs.stopBackgroundListen();
-      }
-    }
  }

  async kill(cs) {
    super.kill(cs);
-    //if (this.ep && this.stopAmd) this.stopAmd(this.ep, this);
+    if (this.ep && this.stopAmd) this.stopAmd(this.ep, this);
  }

  _onAmdEvent(cs, evt) {
--- a/lib/tasks/gather.js
+++ b/lib/tasks/gather.js
@@ -39,7 +39,7 @@ class TaskGather extends Task {
    this.removeSpeechListeners = removeSpeechListeners;

    [
-      'finishOnKey', 'input', 'numDigits', 'minDigits', 'maxDigits',
+      'finishOnKey', 'hints', 'input', 'numDigits', 'minDigits', 'maxDigits',
      'interDigitTimeout', 'partialResultHook', 'bargein', 'dtmfBargein',
      'speechTimeout', 'timeout', 'say', 'play'
    ].forEach((k) => this[k] = this.data[k]);
@@ -141,23 +141,9 @@ class TaskGather extends Task {
        asrDtmfTerminationDigit: this.asrDtmfTerminationDigit
      }, 'Gather:exec - enabling continuous ASR since it is turned on for the session');
    }
-    if (process.env.JAMBONZ_GATHER_EARLY_HINTS_MATCH && this.needsStt &&
-      !this.isContinuousAsr &&
-      this.data.recognizer?.hints?.length > 0 && this.data.recognizer?.hints?.length <= 10) {
-      this.earlyHintsMatch = true;
-      this.interim = true;
-      this.logger.debug('Gather:exec - early hints match enabled');
-    }
-
    this.ep = ep;
-    if ('default' === this.vendor || !this.vendor) {
-      this.vendor = cs.speechRecognizerVendor;
-      if (this.data.recognizer) this.data.recognizer.vendor = this.vendor;
-    }
-    if ('default' === this.language || !this.language) {
-      this.language = cs.speechRecognizerLanguage;
-      if (this.data.recognizer) this.data.recognizer.language = this.language;
-    }
+    if ('default' === this.vendor || !this.vendor) this.vendor = cs.speechRecognizerVendor;
+    if ('default' === this.language || !this.language) this.language = cs.speechRecognizerLanguage;
    if (!this.data.recognizer.vendor) {
      this.data.recognizer.vendor = this.vendor;
    }
@@ -170,13 +156,8 @@ class TaskGather extends Task {
        alert_type: AlertType.STT_NOT_PROVISIONED,
        vendor: this.vendor
      }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
-      // Notify application that STT vender is wrong.
-      this.notifyError({
-        msg: 'ASR error',
-        details: `No speech-to-text service credentials for ${this.vendor} have been configured`
-      });
-      this.notifyTaskDone();
-      throw new Error(`No speech-to-text service credentials for ${this.vendor} have been configured`);
+
+      throw new Error(`no speech-to-text service credentials for ${this.vendor} have been configured`);
    }

    this.logger.info({sttCredentials: this.sttCredentials}, 'Gather:exec - sttCredentials');
@@ -398,8 +379,6 @@ class TaskGather extends Task {
        break;

      default:
-        this.notifyError({ msg: 'ASR error', details:`Invalid vendor ${this.vendor}`});
-        this.notifyTaskDone();
        throw new Error(`Invalid vendor ${this.vendor}`);
    }

@@ -505,10 +484,6 @@ class TaskGather extends Task {
    this.logger.debug({evt, bugname, finished}, 'Gather:_onTranscription');
    if (bugname && this.bugname !== bugname) return;

-    if (this.vendor === 'ibm') {
-      if (evt?.state === 'listening') return;
-    }
-
    evt = this.normalizeTranscription(evt, this.vendor, 1, this.language);

    /* count words for bargein feature */
@@ -626,7 +601,7 @@ class TaskGather extends Task {
      message: `Failed connecting to Deepgram speech recognizer: ${reason}`,
      vendor: 'deepgram',
    }).catch((err) => this.logger.info({err}, 'Error generating alert for deepgram connection failure'));
-    this.notifyError({msg: 'ASR error', details:`Failed connecting to speech vendor deepgram: ${reason}`});
+    this.notifyError(`Failed connecting to speech vendor deepgram: ${reason}`);
    this.notifyTaskDone();
  }

@@ -644,7 +619,7 @@ class TaskGather extends Task {
      message: `Failed connecting to IBM watson speech recognizer: ${reason}`,
      vendor: 'ibm',
    }).catch((err) => this.logger.info({err}, 'Error generating alert for IBM connection failure'));
-    this.notifyError({msg: 'ASR error', details:`Failed connecting to speech vendor IBM: ${reason}`});
+    this.notifyError(`Failed connecting to speech vendor IBM: ${reason}`);
    this.notifyTaskDone();
  }

--- a/lib/tasks/hangup.js
+++ b/lib/tasks/hangup.js
@@ -18,7 +18,6 @@ class TaskHangup extends Task {
    await super.exec(cs);
    try {
      await dlg.destroy({headers: this.headers});
-      cs._callReleased();
    } catch (err) {
      this.logger.error(err, 'TaskHangup:exec - Error hanging up call');
    }
--- a/lib/tasks/listen.js
+++ b/lib/tasks/listen.js
@@ -10,7 +10,7 @@ class TaskListen extends Task {

    [
      'action', 'auth', 'method', 'url', 'finishOnKey', 'maxLength', 'metadata', 'mixType', 'passDtmf', 'playBeep',
-      'sampleRate', 'timeout', 'transcribe', 'wsAuth', 'disableBidirectionalAudio'
+      'sampleRate', 'timeout', 'transcribe', 'wsAuth'
    ].forEach((k) => this[k] = this.data[k]);

    this.mixType = this.mixType || 'mono';
@@ -136,9 +136,7 @@ class TaskListen extends Task {
    }

    /* support bi-directional audio */
-    if (!this.disableBiDirectionalAudio) {
-      ep.addCustomEventListener(ListenEvents.PlayAudio, this._onPlayAudio.bind(this, ep));
-    }
+    ep.addCustomEventListener(ListenEvents.PlayAudio, this._onPlayAudio.bind(this, ep));
    ep.addCustomEventListener(ListenEvents.KillAudio, this._onKillAudio.bind(this, ep));
    ep.addCustomEventListener(ListenEvents.Disconnect, this._onDisconnect.bind(this, ep));
  }
--- a/lib/tasks/play.js
+++ b/lib/tasks/play.js
@@ -22,20 +22,6 @@ class TaskPlay extends Task {
  async exec(cs, {ep}) {
    await super.exec(cs);
    this.ep = ep;
-    let timeout;
-    let playbackSeconds = 0;
-    let playbackMilliseconds = 0;
-    let completed = !(this.timeoutSecs > 0 || this.loop);
-    if (this.timeoutSecs > 0) {
-      timeout = setTimeout(async() => {
-        completed = true;
-        try {
-          await this.kill(cs);
-        } catch (err) {
-          this.logger.info(err, 'Error killing audio on timeoutSecs');
-        }
-      }, this.timeoutSecs * 1000);
-    }
    try {
      while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep.connected) {
        if (cs.isInConference) {
@@ -48,24 +34,14 @@ class TaskPlay extends Task {
            await this.playToConfMember(this.ep, memberId, confName, confUuid, this.url);
          }
        } else {
-          let file = this.url;
-          if (this.seekOffset >= 0) {
-            file = {file: this.url, seekOffset: this.seekOffset};
-            this.seekOffset = -1;
-          }
+          const file = (this.timeoutSecs >= 0 || this.seekOffset >= 0) ?
+            {file: this.url, seekOffset: this.seekOffset, timeoutSecs: this.timeoutSecs} : this.url;
          const result = await ep.play(file);
-          playbackSeconds += parseInt(result.playbackSeconds);
-          playbackMilliseconds += parseInt(result.playbackMilliseconds);
-          if (this.killed || !this.loop || completed) {
-            if (timeout) clearTimeout(timeout);
-            await this.performAction(
-              Object.assign(result, {reason: 'playCompleted', playbackSeconds, playbackMilliseconds}),
-              !(this.parentTask || cs.isConfirmCallSession));
-          }
+          await this.performAction(Object.assign(result, {reason: 'playCompleted'}),
+            !(this.parentTask || cs.isConfirmCallSession));
        }
      }
    } catch (err) {
-      if (timeout) clearTimeout(timeout);
      this.logger.info(err, `TaskPlay:exec - error playing ${this.url}`);
    }
    this.emit('playDone');
--- a/lib/tasks/say.js
+++ b/lib/tasks/say.js
@@ -1,26 +1,96 @@
 const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
-const pollySSMLSplit = require('polly-ssml-split');

 const breakLengthyTextIfNeeded = (logger,  text) => {
  const chunkSize = 1000;
+  if (text.length <= chunkSize) return [text];
+
+  const result = [];
  const isSSML = text.startsWith('<speak>');
-  if (text.length <= chunkSize || !isSSML) return [text];
-  const options = {
-    // MIN length
-    softLimit: 100,
-    // MAX length, exclude 15 characters <speak></speak>
-    hardLimit: chunkSize - 15,
-    // Set of extra split characters (Optional property)
-    extraSplitChars: ',;!?',
-  };
-  pollySSMLSplit.configure(options);
-  try {
-    return pollySSMLSplit.split(text);
-  } catch (err) {
-    logger.info({err}, 'Error spliting SSML long text');
-    return [text];
+  let startPos = 0;
+  let charPos = isSSML ? 7 : 0;  // skip <speak>
+  let tag;
+  //logger.debug({isSSML}, `breakLengthyTextIfNeeded: handling text of length ${text.length}`);
+  while (startPos + charPos < text.length) {
+    if (isSSML && !tag && text[startPos + charPos] === '<') {
+      const tagStartPos = ++charPos;
+      while (startPos + charPos < text.length) {
+        if (text[startPos + charPos] === '>') {
+          if (text[startPos + charPos - 1] === '\\') tag = null;
+          else if (!tag) tag = text.substring(startPos + tagStartPos, startPos + charPos - 1);
+          break;
+        }
+        if (!tag) {
+          const c = text[startPos + charPos];
+          if (c === ' ') {
+            tag = text.substring(startPos + tagStartPos, startPos + charPos);
+            //logger.debug(`breakLengthyTextIfNeeded: enter tag ${tag} (space)`);
+            break;
+          }
+        }
+        charPos++;
+      }
+      if (tag) {
+        //search for end of tag
+        //logger.debug(`breakLengthyTextIfNeeded: searching forward for </${tag}>`);
+        const e1 = text.indexOf(`</${tag}>`, startPos + charPos);
+        const e2 = text.indexOf('/>', startPos + charPos);
+        const tagEndPos = e1 === -1 ? e2 : e2 === -1 ? e1 : Math.min(e1, e2);
+        if (tagEndPos === -1) {
+          //logger.debug(`breakLengthyTextIfNeeded: exit tag ${tag} not found, exiting`);
+        } else {
+          //logger.debug(`breakLengthyTextIfNeeded: exit tag ${tag} found at ${tagEndPos}`);
+          charPos = tagEndPos + 1;
+        }
+        tag = null;
+      }
+      continue;
+    }
+
+    if (charPos < chunkSize) {
+      charPos++;
+      continue;
+    }
+
+    // start looking for a good break point
+    let chunkIt = false;
+    const a = text[startPos + charPos];
+    const b = text[startPos + charPos + 1];
+    if (/[\.!\?]/.test(a) && /\s/.test(b)) {
+      //logger.debug('breakLengthyTextIfNeeded: breaking at sentence end');
+      chunkIt = true;
+    }
+    if (chunkIt) {
+      charPos++;
+      const chunk = text.substr(startPos, charPos);
+      if (isSSML) {
+        result.push(0 === startPos ? `${chunk}</speak>` : `<speak>${chunk}</speak>`);
+      }
+      else result.push(chunk);
+      charPos = 0;
+      startPos += chunk.length;
+
+      //logger.debug({chunk: result[result.length - 1]},
+      //  `breakLengthyTextIfNeeded: chunked; new starting pos ${startPos}`);
+
+    }
+    else charPos++;
  }
+
+  // final chunk
+  if (startPos < text.length) {
+    const chunk = text.substr(startPos);
+    if (isSSML) {
+      result.push(0 === startPos ? `${chunk}</speak>` : `<speak>${chunk}`);
+    }
+    else result.push(chunk);
+
+    //logger.debug({chunk: result[result.length - 1]},
+    //  `breakLengthyTextIfNeeded: final chunk; starting pos ${startPos} length ${chunk.length}`);
+
+  }
+
+  return result;
 };

 class TaskSay extends Task {
--- a/lib/tasks/sip_refer.js
+++ b/lib/tasks/sip_refer.js
@@ -47,17 +47,7 @@ class TaskSipRefer extends Task {

      /* if we fail, fall through to next verb.  If success, we should get BYE from far end */
      if (this.referStatus === 202) {
-        this._notifyTimer = setTimeout(() => {
-          this.logger.info('TaskSipRefer:exec - no NOTIFY received in 15 secs, exiting');
-          this.performAction({refer_status: this.referStatus})
-            .catch((err) => this.logger.error(err, 'TaskSipRefer:exec - error performing action'));
-          this.notifyTaskDone();
-        }, 15000);
        await this.awaitTaskDone();
-        if (this._notifyTimer) {
-          clearTimeout(this._notifyTimer);
-          this._notifyTimer = null;
-        }
      }
      else {
        await this.performAction({refer_status: this.referStatus});
@@ -81,10 +71,10 @@ class TaskSipRefer extends Task {
    const contentType = req.get('Content-Type');
    this.logger.debug({body: req.body}, `TaskSipRefer:_handleNotify got ${contentType}`);

-    if (contentType?.includes('message/sipfrag')) {
+    if (contentType === 'message/sipfrag') {
      const arr = /SIP\/2\.0\s+(\d+)/.exec(req.body);
      if (arr) {
-        const status = typeof arr[1] === 'string' ? parseInt(arr[1], 10) : arr[1];
+        const status = arr[1];
        this.logger.debug(`TaskSipRefer:_handleNotify: call got status ${status}`);
        if (this.eventHook) {
          const b3 = this.getTracingPropagation();
--- a/lib/tasks/specs.json
+++ b/lib/tasks/specs.json
@@ -42,28 +42,11 @@
      "recognizer": "#recognizer",
      "bargeIn": "#bargeIn",
      "record": "#recordOptions",
-      "listen": "#listenOptions",
      "amd": "#amd",
      "notifyEvents": "boolean"
    },
    "required": []
  },
-  "listenOptions": {
-    "properties": {
-      "enable": "boolean",
-      "url": "string",
-      "sampleRate": "number",
-      "wsAuth": "#auth",
-      "mixType": {
-        "type": "string",
-        "enum": ["mono", "stereo", "mixed"]
-      },
-      "metadata": "object"
-    },
-    "required": [
-      "enable"
-    ]
-  },
  "bargeIn": {
    "properties": {
      "enable": "boolean",
@@ -292,7 +275,6 @@
      },
      "passDtmf": "boolean",
      "playBeep": "boolean",
-      "disableBidirectionalAudio": "boolean",
      "sampleRate": "number",
      "timeout": "number",
      "transcribe": "#transcribe",
--- a/lib/tasks/transcribe.js
+++ b/lib/tasks/transcribe.js
@@ -68,14 +68,8 @@ class TaskTranscribe extends Task {

    this.ep = ep;
    this.ep2 = ep2;
-    if ('default' === this.vendor || !this.vendor) {
-      this.vendor = cs.speechRecognizerVendor;
-      if (this.data.recognizer) this.data.recognizer.vendor = this.vendor;
-    }
-    if ('default' === this.language || !this.language) {
-      this.language = cs.speechRecognizerLanguage;
-      if (this.data.recognizer) this.data.recognizer.language = this.language;
-    }
+    if ('default' === this.vendor || !this.vendor) this.vendor = cs.speechRecognizerVendor;
+    if ('default' === this.language || !this.language) this.language = cs.speechRecognizerLanguage;
    if (!this.data.recognizer.vendor) {
      this.data.recognizer.vendor = this.vendor;
    }
@@ -232,9 +226,6 @@ class TaskTranscribe extends Task {
    const bugname = fsEvent.getHeader('media-bugname');
    if (bugname && this.bugname !== bugname) return;

-    if (this.vendor === 'ibm') {
-      if (evt?.state === 'listening') return;
-    }
    this.logger.debug({evt}, 'TaskTranscribe:_onTranscription - before normalization');

    evt = this.normalizeTranscription(evt, this.vendor, channel, this.language);
--- a/lib/utils/db-utils.js
+++ b/lib/utils/db-utils.js
@@ -87,7 +87,7 @@ module.exports = (logger, srf) => {
    const haveNuance = speech.find((s) => s.vendor === 'nuance');
    const haveDeepgram = speech.find((s) => s.vendor === 'deepgram');
    const haveIbm = speech.find((s) => s.vendor === 'ibm');
-    if (!haveGoogle || !haveAws || !haveMicrosoft || !haveWellsaid || !haveNuance || !haveIbm || !haveDeepgram) {
+    if (!haveGoogle || !haveAws || !haveMicrosoft || !haveWellsaid || !haveNuance) {
      const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid);
      if (r3.length) {
        if (!haveGoogle) {
--- a/lib/utils/sbc-pinger.js
+++ b/lib/utils/sbc-pinger.js
@@ -75,10 +75,6 @@ module.exports = (logger) => {
      }
    })();
  }
-  else if (process.env.K8S) {
-    lifecycleEmitter.scaleIn = () => process.exit(0);
-  }
-

  async function pingProxies(srf) {
    if (process.env.NODE_ENV === 'test') return;
--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -7,86 +7,6 @@ const {
  DeepgramTranscriptionEvents,
 } = require('./constants');

-const stickyVars = {
-  google: [
-    'GOOGLE_SPEECH_HINTS',
-    'GOOGLE_SPEECH_SEPARATE_RECOGNITION_PER_CHANNEL',
-    'GOOGLE_SPEECH_PROFANITY_FILTER',
-    'GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION',
-    'GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS',
-    'GOOGLE_SPEECH_SINGLE_UTTERANCE',
-    'GOOGLE_SPEECH_SPEAKER_DIARIZATION',
-    'GOOGLE_SPEECH_USE_ENHANCED',
-    'GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES',
-    'GOOGLE_SPEECH_METADATA_INTERACTION_TYPE',
-    'GOOGLE_SPEECH_METADATA_INDUSTRY_NAICS_CODE'
-  ],
-  microsoft: [
-    'AZURE_SPEECH_HINTS',
-    'AZURE_SERVICE_ENDPOINT_ID',
-    'AZURE_REQUEST_SNR',
-    'AZURE_PROFANITY_OPTION',
-    'AZURE_SERVICE_ENDPOINT',
-    'AZURE_INITIAL_SPEECH_TIMEOUT_MS',
-    'AZURE_USE_OUTPUT_FORMAT_DETAILED',
-  ],
-  deepgram: [
-    'DEEPGRAM_SPEECH_KEYWORDS',
-    'DEEPGRAM_API_KEY',
-    'DEEPGRAM_SPEECH_TIER',
-    'DEEPGRAM_SPEECH_MODEL',
-    'DEEPGRAM_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION',
-    'DEEPGRAM_SPEECH_PROFANITY_FILTER',
-    'DEEPGRAM_SPEECH_REDACT',
-    'DEEPGRAM_SPEECH_DIARIZE',
-    'DEEPGRAM_SPEECH_NER',
-    'DEEPGRAM_SPEECH_ALTERNATIVES',
-    'DEEPGRAM_SPEECH_NUMERALS',
-    'DEEPGRAM_SPEECH_SEARCH',
-    'DEEPGRAM_SPEECH_REPLACE',
-    'DEEPGRAM_SPEECH_ENDPOINTING',
-    'DEEPGRAM_SPEECH_VAD_TURNOFF',
-    'DEEPGRAM_SPEECH_TAG'
-  ],
-  aws: [
-    'AWS_VOCABULARY_NAME',
-    'AWS_VOCABULARY_FILTER_METHOD',
-    'AWS_VOCABULARY_FILTER_NAME'
-  ],
-  nuance: [
-    'NUANCE_ACCESS_TOKEN',
-    'NUANCE_KRYPTON_ENDPOINT',
-    'NUANCE_TOPIC',
-    'NUANCE_UTTERANCE_DETECTION_MODE',
-    'NUANCE_FILTER_PROFANITY',
-    'NUANCE_INCLUDE_TOKENIZATION',
-    'NUANCE_DISCARD_SPEAKER_ADAPTATION',
-    'NUANCE_SUPPRESS_CALL_RECORDING',
-    'NUANCE_MASK_LOAD_FAILURES',
-    'NUANCE_SUPPRESS_INITIAL_CAPITALIZATION',
-    'NUANCE_ALLOW_ZERO_BASE_LM_WEIGHT',
-    'NUANCE_FILTER_WAKEUP_WORD',
-    'NUANCE_NO_INPUT_TIMEOUT_MS',
-    'NUANCE_RECOGNITION_TIMEOUT_MS',
-    'NUANCE_UTTERANCE_END_SILENCE_MS',
-    'NUANCE_MAX_HYPOTHESES',
-    'NUANCE_SPEECH_DOMAIN',
-    'NUANCE_FORMATTING',
-    'NUANCE_RESOURCES'
-  ],
-  ibm: [
-    'IBM_ACCESS_TOKEN',
-    'IBM_SPEECH_REGION',
-    'IBM_SPEECH_INSTANCE_ID',
-    'IBM_SPEECH_MODEL',
-    'IBM_SPEECH_LANGUAGE_CUSTOMIZATION_ID',
-    'IBM_SPEECH_ACOUSTIC_CUSTOMIZATION_ID',
-    'IBM_SPEECH_BASE_MODEL_VERSION',
-    'IBM_SPEECH_WATSON_METADATA',
-    'IBM_SPEECH_WATSON_LEARNING_OPT_OUT'
-  ]
-};
-
 const normalizeDeepgram = (evt, channel, language) => {
  const copy = JSON.parse(JSON.stringify(evt));
  const alternatives = (evt.channel?.alternatives || [])
@@ -99,7 +19,7 @@ const normalizeDeepgram = (evt, channel, language) => {
    language_code: language,
    channel_tag: channel,
    is_final: evt.is_final,
-    alternatives: [alternatives[0]],
+    alternatives,
    vendor: {
      name: 'deepgram',
      evt: copy
@@ -130,7 +50,7 @@ const normalizeGoogle = (evt, channel, language) => {
    language_code: language,
    channel_tag: channel,
    is_final: evt.is_final,
-    alternatives: [evt.alternatives[0]],
+    alternatives: evt.alternatives,
    vendor: {
      name: 'google',
      evt: copy
@@ -144,7 +64,7 @@ const normalizeNuance = (evt, channel, language) => {
    language_code: language,
    channel_tag: channel,
    is_final: evt.is_final,
-    alternatives: [evt.alternatives[0]],
+    alternatives: evt.alternatives,
    vendor: {
      name: 'nuance',
      evt: copy
@@ -172,7 +92,7 @@ const normalizeMicrosoft = (evt, channel, language) => {
    language_code,
    channel_tag: channel,
    is_final: evt.RecognitionStatus === 'Success',
-    alternatives: [alternatives[0]],
+    alternatives,
    vendor: {
      name: 'microsoft',
      evt: copy
@@ -278,7 +198,7 @@ module.exports = (logger) => {
          {GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES: rOpts.altLanguages.join(',')}),
        ...(rOpts.interactionType &&
          {GOOGLE_SPEECH_METADATA_INTERACTION_TYPE: rOpts.interactionType}),
-        ...{GOOGLE_SPEECH_MODEL: rOpts.model || (task.name === TaskName.Gather ? 'latest_short' : 'phone_call')},
+        ...{GOOGLE_SPEECH_MODEL: rOpts.model || (task.name === TaskName.Gather ? 'command_and_search' : 'phone_call')},
        ...(rOpts.naicsCode > 0 &&
          {GOOGLE_SPEECH_METADATA_INDUSTRY_NAICS_CODE: rOpts.naicsCode}),
      };
@@ -337,7 +257,7 @@ module.exports = (logger) => {
          {NUANCE_TOPIC: nuanceOptions.topic},
        ...(nuanceOptions.utteranceDetectionMode) &&
          {NUANCE_UTTERANCE_DETECTION_MODE: nuanceOptions.utteranceDetectionMode},
-        ...(nuanceOptions.punctuation || rOpts.punctuation) && {NUANCE_PUNCTUATION: nuanceOptions.punctuation},
+        ...(nuanceOptions.punctuation) && {NUANCE_PUNCTUATION: nuanceOptions.punctuation},
        ...(nuanceOptions.profanityFilter) &&
          {NUANCE_FILTER_PROFANITY: nuanceOptions.profanityFilter},
        ...(nuanceOptions.includeTokenization) &&
@@ -413,7 +333,7 @@ module.exports = (logger) => {
        ...(deepgramOptions.vadTurnoff) &&
          {DEEPGRAM_SPEECH_VAD_TURNOFF: deepgramOptions.vadTurnoff},
        ...(deepgramOptions.tag) &&
-          {DEEPGRAM_SPEECH_TAG: deepgramOptions.tag}
+          {DEEPGRAM_SPEECH_VAD_TURNOFF: deepgramOptions.tag}
      };
    }
    else if ('ibm' === rOpts.vendor) {
@@ -440,9 +360,7 @@ module.exports = (logger) => {
          {IBM_SPEECH_WATSON_LEARNING_OPT_OUT: ibmOptions.watsonLearningOptOut}
      };
    }
-    stickyVars[rOpts.vendor].forEach((key) => {
-      if (!opts[key]) opts[key] = '';
-    });
+
    logger.debug({opts}, 'recognizer channel vars');
    return opts;
  };
--- a/lib/utils/ws-requestor.js
+++ b/lib/utils/ws-requestor.js
@@ -45,7 +45,7 @@ class WsRequestor extends BaseRequestor {
      return;
    }
    if (this.closedGracefully) {
-      this.logger.debug(`WsRequestor:request - discarding ${type} because socket was closed gracefully`);
+      this.logger.debug(`WsRequestor:request - discarding ${type} because we closed the socket`);
      return;
    }

@@ -96,9 +96,6 @@ class WsRequestor extends BaseRequestor {
    assert.ok(url, 'WsRequestor:request url was not provided');

    const msgid = short.generate();
-    // save initial msgid in case we need to reconnect during initial session:new
-    if (type === 'session:new') this._initMsgId = msgid;
-
    const b3 = httpHeaders?.b3 ? {b3: httpHeaders.b3} : {};
    const obj = {
      type,
@@ -121,18 +118,8 @@ class WsRequestor extends BaseRequestor {

    //this.logger.debug({obj}, `websocket: sending (${url})`);

-    /* special case: reconnecting before we received ack to session:new */
-    let reconnectingWithoutAck = false;
-    if (type === 'session:reconnect' && this._initMsgId) {
-      reconnectingWithoutAck = true;
-      const obj = this.messagesInFlight.get(this._initMsgId);
-      this.messagesInFlight.delete(this._initMsgId);
-      this.messagesInFlight.set(msgid, obj);
-      this._initMsgId = msgid;
-    }
-
    /* simple notifications */
-    if (['call:status', 'verb:status', 'jambonz:error'].includes(type) || reconnectingWithoutAck) {
+    if (['call:status', 'jambonz:error', 'session:reconnect'].includes(type)) {
      this.ws.send(JSON.stringify(obj), () => {
        this.logger.debug({obj}, `WsRequestor:request websocket: sent (${url})`);
        sendQueuedMsgs();
@@ -179,11 +166,17 @@ class WsRequestor extends BaseRequestor {
    this.logger.debug('WsRequestor:close closing socket');
    try {
      if (this.ws) {
-        this.ws.close(1000);
+        this.ws.close();
        this.ws.removeAllListeners();
-        this.ws = null;
      }
-      this._clearPendingMessages();
+
+      for (const [msgid, obj] of this.messagesInFlight) {
+        const {timer} = obj;
+        clearTimeout(timer);
+        obj.failure(`abandoning msgid ${msgid} since we have closed the socket`);
+      }
+      this.messagesInFlight.clear();
+
    } catch (err) {
      this.logger.info({err}, 'WsRequestor: Error closing socket');
    }
@@ -228,15 +221,6 @@ class WsRequestor extends BaseRequestor {
      .on('error', this._onError.bind(this));
  }

-  _clearPendingMessages() {
-    for (const [msgid, obj] of this.messagesInFlight) {
-      const {timer} = obj;
-      clearTimeout(timer);
-      if (!this._initMsgId) obj.failure(`abandoning msgid ${msgid} since socket is closed`);
-    }
-    this.messagesInFlight.clear();
-  }
-
  _onError(err) {
    if (this.connections > 0) {
      this.logger.info({url: this.url, err}, 'WsRequestor:_onError');
@@ -280,7 +264,6 @@ class WsRequestor extends BaseRequestor {
    this.ws = null;
    this.emit('connection-dropped');
    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`);
      setTimeout(() => {
        this.logger.debug(
@@ -332,7 +315,6 @@ class WsRequestor extends BaseRequestor {
  }

  _recvAck(msgid, data) {
-    this._initMsgId = null;
    const obj = this.messagesInFlight.get(msgid);
    if (!obj) {
      this.logger.info({url: this.url}, `WsRequestor:_recvAck - ack to unknown msgid ${msgid}, discarding`);
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jambonz-feature-server",
-  "version": "v0.8.0",
+  "version": "v0.7.8",
  "main": "app.js",
  "engines": {
    "node": ">= 10.16.0"
@@ -24,38 +24,35 @@
    "jslint": "eslint app.js lib"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.7.4",
+    "@jambonz/db-helpers": "^0.7.3",
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/realtimedb-helpers": "^0.6.3",
    "@jambonz/stats-collector": "^0.1.6",
    "@jambonz/time-series": "^0.2.5",
-    "@opentelemetry/api": "^1.4.0",
-    "@opentelemetry/exporter-jaeger": "^1.9.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
-    "@opentelemetry/exporter-zipkin": "^1.9.0",
-    "@opentelemetry/instrumentation": "^0.35.0",
-    "@opentelemetry/resources": "^1.9.0",
-    "@opentelemetry/sdk-trace-base": "^1.9.0",
-    "@opentelemetry/sdk-trace-node": "^1.9.0",
-    "@opentelemetry/semantic-conventions": "^1.9.0",
-    "aws-sdk": "^2.1304.0",
+    "@opentelemetry/api": "^1.2.0",
+    "@opentelemetry/exporter-jaeger": "^1.7.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.27.0",
+    "@opentelemetry/exporter-zipkin": "^1.7.0",
+    "@opentelemetry/instrumentation": "^0.27.0",
+    "@opentelemetry/resources": "^1.7.0",
+    "@opentelemetry/sdk-trace-base": "^1.7.0",
+    "@opentelemetry/sdk-trace-node": "^1.7.0",
+    "@opentelemetry/semantic-conventions": "^1.7.0",
+    "aws-sdk": "^2.1233.0",
    "bent": "^7.3.12",
    "debug": "^4.3.4",
    "deepcopy": "^2.1.0",
    "drachtio-fsmrf": "^3.0.16",
-    "drachtio-srf": "^4.5.23  ",
+    "drachtio-srf": "^4.5.21",
    "express": "^4.18.2",
    "ip": "^1.1.8",
    "moment": "^2.29.4",
    "parse-url": "^8.1.0",
-    "pino": "^8.8.0",
-    "polly-ssml-split": "^0.1.0",
-    "proxyquire": "^2.1.3",
+    "pino": "^6.14.0",
    "sdp-transform": "^2.14.1",
-    "short-uuid": "^4.2.2",
-    "sinon": "^15.0.1",
+    "short-uuid": "^4.2.0",
    "to-snake-case": "^1.0.0",
-    "undici": "^5.16.0",
+    "undici": "^5.11.0",
    "uuid-random": "^1.3.2",
    "verify-aws-sns-signature": "^0.1.0",
    "ws": "^8.9.0",
--- a/test/config-test.js
+++ b/test/config-test.js
@@ -1,102 +0,0 @@
-const test = require('tape');
-const { sippUac } = require('./sipp')('test_fs');
-const bent = require('bent');
-const getJSON = bent('json')
-const clearModule = require('clear-module');
-const {provisionCallHook} = require('./utils')
-
-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();
-    });
-  });
-}
-
-test('\'config: listen\'', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const from = "config_listen_success";
-    let verbs = [
-      {
-        "verb": "config",
-        "listen": {
-          "enable": true,
-          "url": `ws://172.38.0.60:3000/${from}`
-        }
-      },
-      {
-        "verb": "pause",
-        "length": 5
-      }
-    ];
-
-    provisionCallHook(from, verbs);
-
-    // THEN
-    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/ws_packet_count/${from}`);
-    t.pass('config: successfully started background listen');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'config: listen - stop\'', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const from = "config_listen_success";
-    let verbs = [
-      {
-        "verb": "config",
-        "listen": {
-          "enable": true,
-          "url": `ws://172.38.0.60:3000/${from}`
-        }
-      },
-      {
-        "verb": "pause",
-        "length": 1
-      },
-      {
-        "verb": "config",
-        "listen": {
-          "enable": false
-        }
-      },
-      {
-        "verb": "pause",
-        "length": 3
-      }
-    ];
-
-    provisionCallHook(from, verbs);
-
-    // THEN
-    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/ws_packet_count/${from}`);
-    t.pass('config: successfully started then stopped background listen');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
--- a/test/data/bad/bad-say-ssml.json
+++ b/test/data/bad/bad-say-ssml.json
@@ -1,9 +0,0 @@
-{
-  "say": {
-    "text": "<speak>I already told you <emphasis level=\"strong\">I already told you I already told you I already told you I already told you! I already told you I already told you I already told you I already told you? I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you told I already told you I already told you told I already told you I already told you. I already told you <break time=\"3s\"/> I really like that person!</emphasis> this is another long text.</speak>",
-    "synthesizer": {
-      "vendor": "google",
-      "language": "en-US"
-    }
-  }
-}
--- a/test/data/good/say-ssml.json
+++ b/test/data/good/say-ssml.json
@@ -1,9 +0,0 @@
-{
-  "say": {
-    "text": "<speak>I already told you I already told you I already told you I already told you I already told you! I already told you I already told you I already told you I already told you? I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you I already told you told I already told you I already told you told I already told you I already told you. I already told you <break time=\"3s\"/> I <emphasis level=\"strong\">really like that person!</emphasis> this is another long text.</speak>",
-    "synthesizer": {
-      "vendor": "google",
-      "language": "en-US"
-    }
-  }
-}
--- a/test/db/create-and-populate-schema.sql
+++ b/test/db/create-and-populate-schema.sql
@@ -217,7 +217,6 @@ CREATE TABLE `applications` (
  `call_hook_sid` char(36) DEFAULT NULL COMMENT 'webhook to call for inbound calls ',
  `call_status_hook_sid` char(36) DEFAULT NULL COMMENT 'webhook to call for call status events',
  `messaging_hook_sid` char(36) DEFAULT NULL COMMENT 'webhook to call for inbound SMS/MMS ',
-  `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) DEFAULT NULL,
@@ -246,14 +245,13 @@ CREATE TABLE `applications` (

 LOCK TABLES `applications` WRITE;
 /*!40000 ALTER TABLE `applications` DISABLE KEYS */;
-INSERT INTO `applications` VALUES ('0dddaabf-0a30-43e3-84e8-426873b1a78b','decline call',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','c71e79db-24f2-4866-a3ee-febb0f97b341','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,NULL,'google','en-US','en-US-Standard-C','google','en-US');
-INSERT INTO `applications` VALUES ('308b4f41-1a18-4052-b89a-c054e75ce242','say',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','54ab0976-a6c0-45d8-89a4-d90d45bf9d96','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,NULL,'google','en-US','en-US-Standard-C','google','en-US');
-INSERT INTO `applications` VALUES ('24d0f6af-e976-44dd-a2e8-41c7b55abe33','say account 2',NULL,'622f62e4-303a-49f2-bbe0-eb1e1714e37a','54ab0976-a6c0-45d8-89a4-d90d45bf9d96','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,NULL,'google','en-US','en-US-Standard-C','google','en-US');
-INSERT INTO `applications` VALUES ('17461c69-56b5-4dab-ad83-1c43a0f93a3d','gather',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','10692465-a511-4277-9807-b7157e4f81e1','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,NULL,'google','en-US','en-US-Standard-C','google','en-US');
-INSERT INTO `applications` VALUES ('baf9213b-5556-4c20-870c-586392ed246f','transcribe',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','ecb67a8f-f7ce-4919-abf0-bbc69c1001e5','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,NULL,'google','en-US','en-US-Standard-C','google','en-US');
-INSERT INTO `applications` VALUES ('ae026ab5-3029-47b4-9d7c-236e3a4b4ebe','transcribe account 2',NULL,'622f62e4-303a-49f2-bbe0-eb1e1714e37a','ecb67a8f-f7ce-4919-abf0-bbc69c1001e5','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,NULL,'google','en-US','en-US-Standard-C','google','en-US');
-INSERT INTO `applications` VALUES ('195d9507-6a42-46a8-825f-f009e729d023','sip info',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','c9113e7a-741f-48b9-96c1-f2f78176eeb3','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,NULL,'google','en-US','en-US-Standard-C','google','en-US');
-INSERT INTO `applications` VALUES ('0dddaabf-0a30-43e3-84e8-426873b1a78c','app json',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','c71e79db-24f2-4866-a3ee-febb0f97b341','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'[{"verb": "play","url": "silence_stream://5000"}]','google','en-US','en-US-Standard-C','google','en-US');
+INSERT INTO `applications` VALUES ('0dddaabf-0a30-43e3-84e8-426873b1a78b','decline call',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','c71e79db-24f2-4866-a3ee-febb0f97b341','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
+INSERT INTO `applications` VALUES ('308b4f41-1a18-4052-b89a-c054e75ce242','say',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','54ab0976-a6c0-45d8-89a4-d90d45bf9d96','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
+INSERT INTO `applications` VALUES ('24d0f6af-e976-44dd-a2e8-41c7b55abe33','say account 2',NULL,'622f62e4-303a-49f2-bbe0-eb1e1714e37a','54ab0976-a6c0-45d8-89a4-d90d45bf9d96','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
+INSERT INTO `applications` VALUES ('17461c69-56b5-4dab-ad83-1c43a0f93a3d','gather',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','10692465-a511-4277-9807-b7157e4f81e1','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
+INSERT INTO `applications` VALUES ('baf9213b-5556-4c20-870c-586392ed246f','transcribe',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','ecb67a8f-f7ce-4919-abf0-bbc69c1001e5','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
+INSERT INTO `applications` VALUES ('ae026ab5-3029-47b4-9d7c-236e3a4b4ebe','transcribe account 2',NULL,'622f62e4-303a-49f2-bbe0-eb1e1714e37a','ecb67a8f-f7ce-4919-abf0-bbc69c1001e5','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
+INSERT INTO `applications` VALUES ('195d9507-6a42-46a8-825f-f009e729d023','sip info',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','c9113e7a-741f-48b9-96c1-f2f78176eeb3','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
 /*!40000 ALTER TABLE `applications` ENABLE KEYS */;
 UNLOCK TABLES;

@@ -453,7 +451,6 @@ INSERT INTO `phone_numbers` VALUES ('05eeed62-b29b-4679-bf38-d7a4e318be44','1617
 INSERT INTO `phone_numbers` VALUES ('f3c53863-b629-4cf6-9dcb-c7fb7072314b','16174000004','5145b436-2f38-4029-8d4c-fd8c67831c7a','bb845d4b-83a9-4cde-a6e9-50f3743bab3f','baf9213b-5556-4c20-870c-586392ed246f', NULL);
 INSERT INTO `phone_numbers` VALUES ('f6416c17-829a-4f11-9c32-f0d00e4a9ae9','16174000005','5145b436-2f38-4029-8d4c-fd8c67831c7a','622f62e4-303a-49f2-bbe0-eb1e1714e37a','ae026ab5-3029-47b4-9d7c-236e3a4b4ebe', NULL);
 INSERT INTO `phone_numbers` VALUES ('964d0581-9627-44cb-be20-8118050406b2','16174000006','5145b436-2f38-4029-8d4c-fd8c67831c7a','bb845d4b-83a9-4cde-a6e9-50f3743bab3f','195d9507-6a42-46a8-825f-f009e729d023', NULL);
-INSERT INTO `phone_numbers` VALUES ('964d0581-9627-44cb-be20-8118050406b3','16174000007','5145b436-2f38-4029-8d4c-fd8c67831c7a','bb845d4b-83a9-4cde-a6e9-50f3743bab3f','0dddaabf-0a30-43e3-84e8-426873b1a78c', NULL);
 /*!40000 ALTER TABLE `phone_numbers` ENABLE KEYS */;
 UNLOCK TABLES;

--- a/test/db/jambones-sql.sql
+++ b/test/db/jambones-sql.sql
@@ -4,8 +4,6 @@ SET FOREIGN_KEY_CHECKS=0;

 DROP TABLE IF EXISTS account_static_ips;

-DROP TABLE IF EXISTS account_limits;
-
 DROP TABLE IF EXISTS account_products;

 DROP TABLE IF EXISTS account_subscriptions;
@@ -20,12 +18,6 @@ DROP TABLE IF EXISTS lcr_carrier_set_entry;

 DROP TABLE IF EXISTS lcr_routes;

-DROP TABLE IF EXISTS password_settings;
-
-DROP TABLE IF EXISTS user_permissions;
-
-DROP TABLE IF EXISTS permissions;
-
 DROP TABLE IF EXISTS predefined_sip_gateways;

 DROP TABLE IF EXISTS predefined_smpp_gateways;
@@ -44,8 +36,6 @@ DROP TABLE IF EXISTS sbc_addresses;

 DROP TABLE IF EXISTS ms_teams_tenants;

-DROP TABLE IF EXISTS service_provider_limits;
-
 DROP TABLE IF EXISTS signup_history;

 DROP TABLE IF EXISTS smpp_addresses;
@@ -79,15 +69,6 @@ private_ipv4 VARBINARY(16) NOT NULL UNIQUE ,
 PRIMARY KEY (account_static_ip_sid)
 );

-CREATE TABLE account_limits
-(
-account_limits_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-category ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license') NOT NULL,
-quantity INTEGER NOT NULL,
-PRIMARY KEY (account_limits_sid)
-);
-
 CREATE TABLE account_subscriptions
 (
 account_subscription_sid CHAR(36) NOT NULL UNIQUE ,
@@ -142,21 +123,6 @@ priority INTEGER NOT NULL UNIQUE  COMMENT 'lower priority routes are attempted f
 PRIMARY KEY (lcr_route_sid)
 ) COMMENT='Least cost routing table';

-CREATE TABLE password_settings
-(
-min_password_length INTEGER NOT NULL DEFAULT 8,
-require_digit BOOLEAN NOT NULL DEFAULT false,
-require_special_character BOOLEAN NOT NULL DEFAULT false
-);
-
-CREATE TABLE permissions
-(
-permission_sid CHAR(36) NOT NULL UNIQUE ,
-name VARCHAR(32) NOT NULL UNIQUE ,
-description VARCHAR(255),
-PRIMARY KEY (permission_sid)
-);
-
 CREATE TABLE predefined_carriers
 (
 predefined_carrier_sid CHAR(36) NOT NULL UNIQUE ,
@@ -262,15 +228,6 @@ tenant_fqdn VARCHAR(255) NOT NULL UNIQUE ,
 PRIMARY KEY (ms_teams_tenant_sid)
 ) COMMENT='A Microsoft Teams customer tenant';

-CREATE TABLE service_provider_limits
-(
-service_provider_limits_sid CHAR(36) NOT NULL UNIQUE ,
-service_provider_sid CHAR(36) NOT NULL,
-category ENUM('api_rate','voice_call_session', 'device','voice_call_minutes','voice_call_session_license', 'voice_call_minutes_license') NOT NULL,
-quantity INTEGER NOT NULL,
-PRIMARY KEY (service_provider_limits_sid)
-);
-
 CREATE TABLE signup_history
 (
 email VARCHAR(255) NOT NULL,
@@ -326,7 +283,6 @@ email_activation_code VARCHAR(16),
 email_validated BOOLEAN NOT NULL DEFAULT false,
 phone_validated BOOLEAN NOT NULL DEFAULT false,
 email_content_opt_out BOOLEAN NOT NULL DEFAULT false,
-is_active BOOLEAN NOT NULL DEFAULT true,
 PRIMARY KEY (user_sid)
 );

@@ -354,20 +310,9 @@ smpp_password VARCHAR(64),
 smpp_enquire_link_interval INTEGER DEFAULT 0,
 smpp_inbound_system_id VARCHAR(255),
 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,
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';

-CREATE TABLE user_permissions
-(
-user_permissions_sid CHAR(36) NOT NULL UNIQUE ,
-user_sid CHAR(36) NOT NULL,
-permission_sid CHAR(36) NOT NULL,
-PRIMARY KEY (user_permissions_sid)
-);
-
 CREATE TABLE smpp_gateways
 (
 smpp_gateway_sid CHAR(36) NOT NULL UNIQUE ,
@@ -385,7 +330,7 @@ PRIMARY KEY (smpp_gateway_sid)
 CREATE TABLE phone_numbers
 (
 phone_number_sid CHAR(36) UNIQUE ,
-number VARCHAR(132) NOT NULL UNIQUE ,
+number VARCHAR(32) NOT NULL UNIQUE ,
 voip_carrier_sid CHAR(36),
 account_sid CHAR(36),
 application_sid CHAR(36),
@@ -435,7 +380,6 @@ account_sid CHAR(36) COMMENT 'account that this application belongs to (if null,
 call_hook_sid CHAR(36) COMMENT 'webhook to call for inbound calls ',
 call_status_hook_sid CHAR(36) COMMENT 'webhook to call for call status events',
 messaging_hook_sid CHAR(36) COMMENT 'webhook to call for inbound SMS/MMS ',
-app_json VARCHAR(16384),
 speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
 speech_synthesis_voice VARCHAR(64),
@@ -474,11 +418,6 @@ disable_cdrs BOOLEAN NOT NULL DEFAULT 0,
 trial_end_date DATETIME,
 deactivated_reason VARCHAR(255),
 device_to_call_ratio INTEGER NOT NULL DEFAULT 5,
-subspace_client_id VARCHAR(255),
-subspace_client_secret VARCHAR(255),
-subspace_sip_teleport_id VARCHAR(255),
-subspace_sip_teleport_destinations VARCHAR(255),
-siprec_hook_sid CHAR(36),
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';

@@ -486,23 +425,19 @@ CREATE INDEX account_static_ip_sid_idx ON account_static_ips (account_static_ip_
 CREATE INDEX account_sid_idx ON account_static_ips (account_sid);
 ALTER TABLE account_static_ips ADD FOREIGN KEY account_sid_idxfk (account_sid) REFERENCES accounts (account_sid);

-CREATE INDEX account_sid_idx ON account_limits (account_sid);
-ALTER TABLE account_limits ADD FOREIGN KEY account_sid_idxfk_1 (account_sid) REFERENCES accounts (account_sid) ON DELETE CASCADE;
-
 CREATE INDEX account_subscription_sid_idx ON account_subscriptions (account_subscription_sid);
 CREATE INDEX account_sid_idx ON account_subscriptions (account_sid);
-ALTER TABLE account_subscriptions ADD FOREIGN KEY account_sid_idxfk_2 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE account_subscriptions ADD FOREIGN KEY account_sid_idxfk_1 (account_sid) REFERENCES accounts (account_sid);

 CREATE INDEX invite_code_idx ON beta_invite_codes (invite_code);
 CREATE INDEX call_route_sid_idx ON call_routes (call_route_sid);
-ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_2 (account_sid) REFERENCES accounts (account_sid);

 ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid) REFERENCES applications (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);
+ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERENCES accounts (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);
 CREATE INDEX predefined_carrier_sid_idx ON predefined_sip_gateways (predefined_carrier_sid);
@@ -521,14 +456,14 @@ ALTER TABLE account_products ADD FOREIGN KEY product_sid_idxfk (product_sid) REF

 CREATE INDEX account_offer_sid_idx ON account_offers (account_offer_sid);
 CREATE INDEX account_sid_idx ON account_offers (account_sid);
-ALTER TABLE account_offers ADD FOREIGN KEY account_sid_idxfk_5 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE account_offers ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);

 CREATE INDEX product_sid_idx ON account_offers (product_sid);
 ALTER TABLE account_offers ADD FOREIGN KEY product_sid_idxfk_1 (product_sid) REFERENCES products (product_sid);

 CREATE INDEX api_key_sid_idx ON api_keys (api_key_sid);
 CREATE INDEX account_sid_idx ON api_keys (account_sid);
-ALTER TABLE api_keys ADD FOREIGN KEY account_sid_idxfk_6 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE api_keys ADD FOREIGN KEY account_sid_idxfk_5 (account_sid) REFERENCES accounts (account_sid);

 CREATE INDEX service_provider_sid_idx ON api_keys (service_provider_sid);
 ALTER TABLE api_keys ADD FOREIGN KEY service_provider_sid_idxfk (service_provider_sid) REFERENCES service_providers (service_provider_sid);
@@ -542,53 +477,44 @@ ALTER TABLE sbc_addresses ADD FOREIGN KEY service_provider_sid_idxfk_1 (service_
 CREATE INDEX ms_teams_tenant_sid_idx ON ms_teams_tenants (ms_teams_tenant_sid);
 ALTER TABLE ms_teams_tenants ADD FOREIGN KEY service_provider_sid_idxfk_2 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

-ALTER TABLE ms_teams_tenants ADD FOREIGN KEY account_sid_idxfk_7 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE ms_teams_tenants ADD FOREIGN KEY account_sid_idxfk_6 (account_sid) REFERENCES accounts (account_sid);

 ALTER TABLE ms_teams_tenants ADD FOREIGN KEY application_sid_idxfk_1 (application_sid) REFERENCES applications (application_sid);

 CREATE INDEX tenant_fqdn_idx ON ms_teams_tenants (tenant_fqdn);
-CREATE INDEX service_provider_sid_idx ON service_provider_limits (service_provider_sid);
-ALTER TABLE service_provider_limits ADD FOREIGN KEY service_provider_sid_idxfk_3 (service_provider_sid) REFERENCES service_providers (service_provider_sid) ON DELETE CASCADE;
-
 CREATE INDEX email_idx ON signup_history (email);
 CREATE INDEX smpp_address_sid_idx ON smpp_addresses (smpp_address_sid);
 CREATE INDEX service_provider_sid_idx ON smpp_addresses (service_provider_sid);
-ALTER TABLE smpp_addresses ADD FOREIGN KEY service_provider_sid_idxfk_4 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE smpp_addresses ADD FOREIGN KEY service_provider_sid_idxfk_3 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

 CREATE UNIQUE INDEX speech_credentials_idx_1 ON speech_credentials (vendor,account_sid);

 CREATE INDEX speech_credential_sid_idx ON speech_credentials (speech_credential_sid);
 CREATE INDEX service_provider_sid_idx ON speech_credentials (service_provider_sid);
-ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_5 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_4 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

 CREATE INDEX account_sid_idx ON speech_credentials (account_sid);
-ALTER TABLE speech_credentials ADD FOREIGN KEY account_sid_idxfk_8 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE speech_credentials ADD FOREIGN KEY account_sid_idxfk_7 (account_sid) REFERENCES accounts (account_sid);

 CREATE INDEX user_sid_idx ON users (user_sid);
 CREATE INDEX email_idx ON users (email);
 CREATE INDEX phone_idx ON users (phone);
 CREATE INDEX account_sid_idx ON users (account_sid);
-ALTER TABLE users ADD FOREIGN KEY account_sid_idxfk_9 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE users ADD FOREIGN KEY account_sid_idxfk_8 (account_sid) REFERENCES accounts (account_sid);

 CREATE INDEX service_provider_sid_idx ON users (service_provider_sid);
-ALTER TABLE users ADD FOREIGN KEY service_provider_sid_idxfk_6 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE users ADD FOREIGN KEY service_provider_sid_idxfk_5 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

 CREATE INDEX email_activation_code_idx ON users (email_activation_code);
 CREATE INDEX voip_carrier_sid_idx ON voip_carriers (voip_carrier_sid);
 CREATE INDEX account_sid_idx ON voip_carriers (account_sid);
-ALTER TABLE voip_carriers ADD FOREIGN KEY account_sid_idxfk_10 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE voip_carriers ADD FOREIGN KEY account_sid_idxfk_9 (account_sid) REFERENCES accounts (account_sid);

 CREATE INDEX service_provider_sid_idx ON voip_carriers (service_provider_sid);
-ALTER TABLE voip_carriers ADD FOREIGN KEY service_provider_sid_idxfk_7 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE voip_carriers ADD FOREIGN KEY service_provider_sid_idxfk_6 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

 ALTER TABLE voip_carriers ADD FOREIGN KEY application_sid_idxfk_2 (application_sid) REFERENCES applications (application_sid);

-CREATE INDEX user_permissions_sid_idx ON user_permissions (user_permissions_sid);
-CREATE INDEX user_sid_idx ON user_permissions (user_sid);
-ALTER TABLE user_permissions ADD FOREIGN KEY user_sid_idxfk (user_sid) REFERENCES users (user_sid) ON DELETE CASCADE;
-
-ALTER TABLE user_permissions ADD FOREIGN KEY permission_sid_idxfk (permission_sid) REFERENCES permissions (permission_sid);
-
 CREATE INDEX smpp_gateway_sid_idx ON smpp_gateways (smpp_gateway_sid);
 CREATE INDEX voip_carrier_sid_idx ON smpp_gateways (voip_carrier_sid);
 ALTER TABLE smpp_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);
@@ -598,12 +524,12 @@ CREATE INDEX number_idx ON phone_numbers (number);
 CREATE INDEX voip_carrier_sid_idx ON phone_numbers (voip_carrier_sid);
 ALTER TABLE phone_numbers ADD FOREIGN KEY voip_carrier_sid_idxfk_1 (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);

-ALTER TABLE phone_numbers ADD FOREIGN KEY account_sid_idxfk_11 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE phone_numbers ADD FOREIGN KEY account_sid_idxfk_10 (account_sid) REFERENCES accounts (account_sid);

 ALTER TABLE phone_numbers ADD FOREIGN KEY application_sid_idxfk_3 (application_sid) REFERENCES applications (application_sid);

 CREATE INDEX service_provider_sid_idx ON phone_numbers (service_provider_sid);
-ALTER TABLE phone_numbers ADD FOREIGN KEY service_provider_sid_idxfk_8 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE phone_numbers ADD FOREIGN KEY service_provider_sid_idxfk_7 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

 CREATE INDEX sip_gateway_idx_hostport ON sip_gateways (ipv4,port);

@@ -619,10 +545,10 @@ CREATE UNIQUE INDEX applications_idx_name ON applications (account_sid,name);

 CREATE INDEX application_sid_idx ON applications (application_sid);
 CREATE INDEX service_provider_sid_idx ON applications (service_provider_sid);
-ALTER TABLE applications ADD FOREIGN KEY service_provider_sid_idxfk_9 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE applications ADD FOREIGN KEY service_provider_sid_idxfk_8 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

 CREATE INDEX account_sid_idx ON applications (account_sid);
-ALTER TABLE applications ADD FOREIGN KEY account_sid_idxfk_12 (account_sid) REFERENCES accounts (account_sid);
+ALTER TABLE applications ADD FOREIGN KEY account_sid_idxfk_11 (account_sid) REFERENCES accounts (account_sid);

 ALTER TABLE applications ADD FOREIGN KEY call_hook_sid_idxfk (call_hook_sid) REFERENCES webhooks (webhook_sid);

@@ -638,7 +564,7 @@ ALTER TABLE service_providers ADD FOREIGN KEY registration_hook_sid_idxfk (regis
 CREATE INDEX account_sid_idx ON accounts (account_sid);
 CREATE INDEX sip_realm_idx ON accounts (sip_realm);
 CREATE INDEX service_provider_sid_idx ON accounts (service_provider_sid);
-ALTER TABLE accounts ADD FOREIGN KEY service_provider_sid_idxfk_10 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
+ALTER TABLE accounts ADD FOREIGN KEY service_provider_sid_idxfk_9 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

 ALTER TABLE accounts ADD FOREIGN KEY registration_hook_sid_idxfk_1 (registration_hook_sid) REFERENCES webhooks (webhook_sid);

@@ -646,6 +572,4 @@ ALTER TABLE accounts ADD FOREIGN KEY queue_event_hook_sid_idxfk (queue_event_hoo

 ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (device_calling_application_sid) REFERENCES applications (application_sid);

-ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);
-
-SET FOREIGN_KEY_CHECKS=1;
+SET FOREIGN_KEY_CHECKS=0;
--- a/test/dial-tests.js
+++ b/test/dial-tests.js
@@ -1,212 +0,0 @@
-const test = require('tape');
-const { sippUac } = require('./sipp')('test_fs');
-const bent = require('bent');
-const getJSON = bent('json')
-const clearModule = require('clear-module');
-const {provisionCallHook} = require('./utils')
-
-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();
-    });
-  });
-}
-
-test('\'dial-phone\'', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-  try {
-    await connect(srf);
-    // wait for fs connected to drachtio server.
-    await new Promise(r => setTimeout(r, 1000));
-
-    // GIVEN
-    const from = "dial_success";
-    let verbs = [
-      {
-        "verb": "dial",
-        "callerId": from,
-        "actionHook": "/actionHook",
-        "timeLimit": 5,
-        "target": [
-            {
-                "type": "phone",
-                "number": "15083084809"
-            }
-        ]
-      }
-    ];
-
-    provisionCallHook(from, verbs);
-
-    // THEN
-    const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
-
-    let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a';
-    let 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",
-      },
-      "from": from,
-      "to": {
-        "type": "phone",
-        "number": "15583084808"
-    }});
-
-    await p;
-
-    obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.from === from,
-      'dial: succeeds actionHook');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-
-test('\'dial-sip\'', async(t) => {
-    clearModule.all();
-    const {srf, disconnect} = require('../app');
-    try {
-      await connect(srf);
-      // wait for fs connected to drachtio server.
-      await new Promise(r => setTimeout(r, 1000));
-      // GIVEN
-      const from = "dial_sip";
-      let verbs = [
-        {
-          "verb": "dial",
-          "callerId": from,
-          "actionHook": "/actionHook",
-          "dtmfCapture":["*2", "*3"],
-          "target": [
-              {
-                  "type": "sip",
-                  "sipUri": "sip:15083084809@jambonz.com"
-              }
-          ]
-        }
-      ];
-  
-      provisionCallHook(from, verbs);
-  
-      // THEN
-      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
-  
-      let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a';
-  
-      let 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",
-        },
-        "from": from,
-        "to": {
-          "type": "phone",
-          "number": "15583084808"
-      }});
-  
-      await new Promise(r => setTimeout(r, 2000));
-  
-      let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}`);
-      const callSid = obj.body.call_sid;
-  
-      post = bent('http://127.0.0.1:3000/', 'POST', 202);
-      await post(`v1/updateCall/${callSid}`, {
-          "call_status": "completed"
-      });
-  
-      await p;
-  
-      obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-      t.ok(obj.body.from === from,
-        'dial: succeeds actionHook');
-  
-      disconnect();
-    } catch (err) {
-      console.log(`error received: ${err}`);
-      disconnect();
-      t.error(err);
-    }
-});
-
-test('\'dial-user\'', async(t) => {
-    clearModule.all();
-    const {srf, disconnect} = require('../app');
-    try {
-      await connect(srf);
-      // wait for fs connected to drachtio server.
-      await new Promise(r => setTimeout(r, 1000));
-      // GIVEN
-      const from = "dial_user";
-      let verbs = [
-        {
-          "verb": "dial",
-          "callerId": from,
-          "actionHook": "/actionHook",
-          "target": [
-              {
-                  "type": "user",
-                  "name": "user110@jambonz.com"
-              }
-          ]
-        }
-      ];
-  
-      provisionCallHook(from, verbs);
-  
-      // THEN
-      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
-  
-      let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a';
-  
-      let 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",
-        },
-        "from": from,
-        "to": {
-          "type": "phone",
-          "number": "15583084808"
-      }});
-  
-      await new Promise(r => setTimeout(r, 2000));
-  
-      let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}`);
-      const callSid = obj.body.call_sid;
-  
-      post = bent('http://127.0.0.1:3000/', 'POST', 202);
-      await post(`v1/updateCall/${callSid}`, {
-          "call_status": "completed"
-      });
-  
-      await p;
-  
-      obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-      t.ok(obj.body.from === from,
-        'dial: succeeds actionHook');
-  
-      disconnect();
-    } catch (err) {
-      console.log(`error received: ${err}`);
-      disconnect();
-      t.error(err);
-    }
-});
--- a/test/docker-compose-testbed.yaml
+++ b/test/docker-compose-testbed.yaml
@@ -44,7 +44,7 @@ services:
  drachtio:
    image: drachtio/drachtio-server:latest
    restart: always
-    command: drachtio --contact "sip:*;transport=udp" --mtu 4096 --address 0.0.0.0 --port 9022
+    command: drachtio --contact "sip:*;transport=udp,tcp" --address 0.0.0.0 --port 9022
    ports:
      - "9060:9022/tcp"
    networks:
--- a/test/index.js
+++ b/test/index.js
@@ -1,9 +1,7 @@
-require('./ws-requestor-unit-test')
 require('./unit-tests');
 require('./docker_start');
 require('./create-test-db');
 require('./account-validation-tests');
-require('./dial-tests');
 require('./webhooks-tests');
 require('./say-tests');
 require('./gather-tests');
@@ -11,8 +9,5 @@ require('./transcribe-tests');
 require('./sip-request-tests');
 require('./create-call-test');
 require('./play-tests');
-require('./sip-refer-tests');
-require('./listen-tests');
-require('./config-test');
 require('./remove-test-db');
-require('./docker_stop');
+require('./docker_stop');
--- a/test/listen-tests.js
+++ b/test/listen-tests.js
@@ -1,149 +0,0 @@
-const test = require('tape');
-const { sippUac } = require('./sipp')('test_fs');
-const bent = require('bent');
-const getJSON = bent('json')
-const clearModule = require('clear-module');
-const {provisionCallHook} = require('./utils')
-
-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();
-    });
-  });
-}
-
-test('\'listen-success\'', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const from = "listen_success";
-    let verbs = [
-      {
-        "verb": "listen",
-        "url": `ws://172.38.0.60:3000/${from}`,
-        "mixType" : "mono",
-        "actionHook": "/actionHook",
-        "playBeep": true,
-      }
-    ];
-
-    provisionCallHook(from, verbs);
-
-    // THEN
-    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/ws_packet_count/${from}`);
-    t.ok(38000 <= obj.count, 'listen: success incoming call audio');
-
-    obj = await getJSON(`http://127.0.0.1:3100/ws_metadata/${from}`);
-    t.ok(obj.metadata.from === from && obj.metadata.sampleRate === 8000, 'listen: success metadata');
-
-    obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.from === from,
-      'listen: succeeds actionHook');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'listen-maxLength\'', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-  try {
-    await connect(srf);
-
-    // GIVEN
-    let from = "listen_timeout";
-    let verbs = [
-      {
-        "verb": "listen",
-        "url": `ws://172.38.0.60:3000/${from}`,
-        "mixType" : "mixed",
-        "timeout": 2,
-        "maxLength": 2
-      }
-    ];
-
-    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/ws_packet_count/${from}`);
-    t.ok(30000 <= obj.count, 'listen: success maxLength incoming call audio');
-
-    obj = await getJSON(`http://127.0.0.1:3100/ws_metadata/${from}`);
-    t.ok(obj.metadata.from === from && obj.metadata.sampleRate === 8000, 'listen: success maxLength metadata');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'listen-pause-resume\'', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-  try {
-    await connect(srf);
-
-    // GIVEN
-    let from = "listen_timeout";
-    let verbs = [
-      {
-        "verb": "listen",
-        "url": `ws://172.38.0.60:3000/${from}`,
-        "mixType" : "mixed"
-      }
-    ];
-
-    provisionCallHook(from, verbs);
-
-    // THEN
-    const p = sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    await new Promise(r => setTimeout(r, 2000));
-
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}`);
-    const callSid = obj.body.call_sid;
-
-    // GIVEN
-    // Pause listen
-    let post = bent('http://127.0.0.1:3000/', 'POST', 202);
-    await post(`v1/updateCall/${callSid}`, {
-        "listen_status": "pause"
-    });
-
-    await new Promise(r => setTimeout(r, 2000));
-
-    // Resume listen
-    post = bent('http://127.0.0.1:3000/', 'POST', 202);
-    await post(`v1/updateCall/${callSid}`, {
-        "listen_status": "resume"
-    });
-
-    // turn off the call
-    post = bent('http://127.0.0.1:3000/', 'POST', 202);
-    await post(`v1/updateCall/${callSid}`, {
-        "call_status": "completed"
-    });
-
-    await p;
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
--- a/test/play-tests.js
+++ b/test/play-tests.js
@@ -184,67 +184,11 @@ test('\'play\' tests with seekOffset and actionHook', async(t) => {
    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
    t.pass('play: succeeds');
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_customHook`);
-    const seconds = parseInt(obj.body.playback_seconds);
-    const milliseconds = parseInt(obj.body.playback_milliseconds);
-    const lastOffsetPos = parseInt(obj.body.playback_last_offset_pos);
-    //console.log({obj}, 'lastRequest');
-    t.ok(obj.body.reason === "playCompleted", "play: actionHook success received");
-    t.ok(seconds === 2, "playback_seconds: actionHook success received");
-    t.ok(milliseconds === 2048, "playback_milliseconds: actionHook success received");
-    t.ok(lastOffsetPos > 15500 && lastOffsetPos < 16500, "playback_last_offset_pos: actionHook success received")
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'play\' tests with earlymedia', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'play',
-        url: 'silence_stream://5000',
-        earlyMedia: true
-      }
-    ];
-
-    const from = 'play_early_media';
-    provisionCallHook(from, verbs)
-
-    // THEN
-    await sippUac('uac-invite-expect-183-cancel.xml', '172.38.0.10', from);
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_callStatus`);
-    t.ok(obj.body.sip_status === 487, "play: actionHook success received");
-    t.ok(obj.body.sip_reason === 'Request Terminated', "play: actionHook success received");
-    t.ok(obj.body.call_termination_by === 'caller', "play: actionHook success received");
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'play\' tests with initial app_json', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    const from = 'play_initial_app_json';
-
-    // THEN
-    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from, "16174000007");
-    t.pass('application can use app_json for initial instructions');
+    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_customHook`)
+    t.ok(obj.body.reason === "playCompleted", "play: actionHook success received")
+    t.ok(obj.body.playback_seconds === "2", "playback_seconds: actionHook success received")
+    t.ok(obj.body.playback_milliseconds === "2048", "playback_milliseconds: actionHook success received")
+    t.ok(obj.body.playback_last_offset_pos === "16000", "playback_last_offset_pos: actionHook success received")
    disconnect();
  } catch (err) {
    console.log(`error received: ${err}`);
--- a/test/scenarios/uac-gather-account-creds-success-send-bye.xml
+++ b/test/scenarios/uac-gather-account-creds-success-send-bye.xml
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-
-<scenario name="Basic Sipstone UAC">
-  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
-  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
-  <send retrans="500">
-    <![CDATA[
-
-      INVITE sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[to]@[remote_ip]:[remote_port]>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:[from]@[local_ip]:[local_port]
-      Max-Forwards: 70
-      X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
-      Subject: uac-gather-account-creds-success
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
-  <!-- are saved and used for following messages sent. Useful to test   -->
-  <!-- against stateful SIP proxies/B2BUAs.                             -->
-  <recv response="200" rtd="true">
-  </recv>
-
-  <!-- Packet lost can be simulated in any send/recv message by         -->
-  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
-  <send>
-    <![CDATA[
-
-      ACK sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: [to] <sip:[to]@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Contact: sip:[from]@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-gather-account-creds-success
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <nop>
-    <action>
-	    <exec rtp_stream="/tmp/scenarios/wav/speak-to-customer-support.wav,1,0"/>
-    </action>
-  </nop>
-
-  <!-- Pause briefly      -->
-  <pause milliseconds="3000"/>
-
-  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: [to] <sip:[to]@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 3 BYE
-      Contact: sip:[from]@[local_ip]:[local_port]
-      Max-Forwards: 70
-
-    ]]>
-  </send>
-
-  <recv response="200" crlf="true">
-  </recv>
-
-</scenario>
-
--- a/test/scenarios/uac-invite-expect-183-cancel.xml
+++ b/test/scenarios/uac-invite-expect-183-cancel.xml
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-
-<scenario name="Basic Sipstone UAC">
-    <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
-    <!-- generated by sipp. To do so, use [call_id] keyword.                -->
-    <send retrans="500">
-        <![CDATA[
-
-      INVITE sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[to]@[remote_ip]:[remote_port]>
-      Call-ID: [call_id]
-      CSeq: 1 INVITE
-      Contact: sip:[from]@[local_ip]:[local_port]
-      Max-Forwards: 70
-      X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
-      Subject: uac-say
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-
-    ]]>
-    </send>
-
-    <recv response="100"
-          optional="true">
-    </recv>
-
-    <recv response="180" optional="true">
-    </recv>
-
-    <recv response="183" rtd="true">
-    <action>
-      <ereg regexp=";branch=[^;]*" search_in="hdr" header="Via" check_it="false" assign_to="1"/>
-    </action>
-    </recv>
-
-    <send>
-      <![CDATA[
-        CANCEL sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-        Via: SIP/2.0/[transport] [local_ip]:[local_port][$1]
-        From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-        To: [to] <sip:[to]@[remote_ip]:[remote_port]>
-        Call-ID: [call_id]
-        CSeq: [cseq] CANCEL
-        Contact: sip:[from]@[local_ip]:[local_port]
-        Max-Forwards: 70
-      ]]>
-    </send>
-
-    <recv response="200" rtd="true">
-    </recv>
-
-    <recv response="487" rtd="true">
-    </recv>
-
-    <!-- Packet lost can be simulated in any send/recv message by         -->
-    <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
-    <send>
-        <![CDATA[
-
-      ACK sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port][$1]
-      From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: [to] <sip:[to]@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Contact: sip:[from]@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-say
-      Content-Length: 0
-
-    ]]>
-    </send>
-
-</scenario>
--- a/test/scenarios/uac-refer-no-notify.xml
+++ b/test/scenarios/uac-refer-no-notify.xml
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
-  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
-  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
-  <send retrans="500">
-    <![CDATA[
-
-    INVITE sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-    Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-    From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-    To: <sip:[to]@[remote_ip]:[remote_port]>
-    Call-ID: [call_id]
-    CSeq: 1 INVITE
-    Contact: sip:[from]@[local_ip]:[local_port]
-    Max-Forwards: 70
-    X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
-    Subject: uac-refer-no-notify.xml
-    Content-Type: application/sdp
-    Content-Length: [len]
-
-    v=0
-    o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-    s=-
-    c=IN IP[media_ip_type] [media_ip]
-    t=0 0
-    m=audio [media_port] RTP/AVP 0
-    a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
-  <!-- are saved and used for following messages sent. Useful to test   -->
-  <!-- against stateful SIP proxies/B2BUAs.                             -->
-  <recv response="200" rtd="true">
-  </recv>
-
-  <!-- Packet lost can be simulated in any send/recv message by         -->
-  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
-  <send>
-    <![CDATA[
-
-      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: REFER test with no NOT
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- receive re-invite -->
-  <recv request="REFER" crlf="true"/>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 202 Accepted
-      [last_Via:]
-      [last_From:]
-      [last_To:]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-</scenario>
--- a/test/scenarios/uac-refer-with-notify.xml
+++ b/test/scenarios/uac-refer-with-notify.xml
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
-  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
-  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
-  <send retrans="500">
-    <![CDATA[
-
-    INVITE sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-    Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-    From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-    To: <sip:16174000000@[remote_ip]:[remote_port]>
-    Call-ID: [call_id]
-    CSeq: 1 INVITE
-    Contact: sip:[from]@[local_ip]:[local_port]
-    Max-Forwards: 70
-    X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
-    Subject: uac-refer-with-notify.xml
-    Content-Type: application/sdp
-    Content-Length: [len]
-
-    v=0
-    o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-    s=-
-    c=IN IP[media_ip_type] [media_ip]
-    t=0 0
-    m=audio [media_port] RTP/AVP 0
-    a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
-  <!-- are saved and used for following messages sent. Useful to test   -->
-  <!-- against stateful SIP proxies/B2BUAs.                             -->
-  <recv response="200" rtd="true">
-  </recv>
-
-  <!-- Packet lost can be simulated in any send/recv message by         -->
-  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
-  <send>
-    <![CDATA[
-
-      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:16174000000@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: uac-refer-with-notify.xml
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- receive re-invite -->
-  <recv request="REFER" crlf="true"/>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 202 Accepted
-      [last_Via:]
-      [last_From:]
-      [last_To:]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-  <send retrans="500">
-    <![CDATA[
-
-      NOTIFY sip:[service]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:16174000000@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 NOTIFY
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-refer-with-notify.xml
-      Content-Type: message/sipfrag;version=2.0
-      Content-Length: 16
-      
-      SIP/2.0 200 OK
-    ]]>
-  </send>
-  <recv response="200"</recv>
-      
-</scenario>
--- a/test/scenarios/uas-dial.xml
+++ b/test/scenarios/uas-dial.xml
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<!-- This program is free software; you can redistribute it and/or      -->
-<!-- modify it under the terms of the GNU General Public License as     -->
-<!-- published by the Free Software Foundation; either version 2 of the -->
-<!-- License, or (at your option) any later version.                    -->
-<!--                                                                    -->
-<!-- This program is distributed in the hope that it will be useful,    -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
-<!-- GNU General Public License for more details.                       -->
-<!--                                                                    -->
-<!-- You should have received a copy of the GNU General Public License  -->
-<!-- along with this program; if not, write to the                      -->
-<!-- Free Software Foundation, Inc.,                                    -->
-<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
-<!--                                                                    -->
-<!--                 Sipp default 'uas' scenario.                       -->
-<!--                                                                    -->
-
-<scenario name="Basic UAS responder">
-  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
-  <!-- are saved and used for following messages sent. Useful to test   -->
-  <!-- against stateful SIP proxies/B2BUAs.                             -->
-  <recv request="INVITE" crlf="true">
-    <action>
-      <ereg regexp=".*" search_in="hdr" header="Subject:" assign_to="1" />
-    </action>
-  </recv>
-
-  <!-- The '[last_*]' keyword is replaced automatically by the          -->
-  <!-- specified header if it was present in the last message received  -->
-  <!-- (except if it was a retransmission). If the header was not       -->
-  <!-- present or if no message has been received, the '[last_*]'       -->
-  <!-- keyword is discarded, and all bytes until the end of the line    -->
-  <!-- are also discarded.                                              -->
-  <!--                                                                  -->
-  <!-- If the specified header was present several times in the         -->
-  <!-- message, all occurrences are concatenated (CRLF separated)       -->
-  <!-- to be used in place of the '[last_*]' keyword.                   -->
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 180 Ringing
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      [last_Record-Route:]
-      Subject:[$1]
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      [last_Record-Route:]
-      Subject:[$1]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-  <recv request="ACK"
-        rtd="true"
-        crlf="true">
-  </recv>
-
-  <recv request="INFO" optional="true" next="1">
-  </recv>
-
-  <recv request="INVITE" crlf="true">
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      [last_Record-Route:]
-      Subject:[$1]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-  <recv request="ACK"
-        rtd="true"
-        crlf="true">
-  </recv>
-
-  <recv request="BYE">
-  </recv>
-
-  <send next="2">
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <label id="1"/>
-  <send>
-  <![CDATA[
-
-    SIP/2.0 200 OK
-    [last_Via:]
-    [last_From:]
-    [last_To:]
-    [last_Call-ID:]
-    [last_CSeq:]
-    Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-    Content-Length: 0
-
-  ]]>
-</send>
-
-<label id="2"/>
-
-</scenario>
-
--- a/test/sip-refer-tests.js
+++ b/test/sip-refer-tests.js
@@ -1,100 +0,0 @@
-const test = require('tape');
-const { sippUac } = require('./sipp')('test_fs');
-const clearModule = require('clear-module');
-const {provisionCallHook, provisionCustomHook, provisionActionHook} = require('./utils')
-const bent = require('bent');
-const getJSON = bent('json')
-
-const sleepFor = async(ms) => new Promise(resolve => setTimeout(resolve, ms));
-
-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();
-    });
-  });
-}
-
-test('\'refer\' tests w/202 and NOTIFY', {timeout: 25000}, async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'say',
-        text: 'silence_stream://100'
-      },
-      {
-        verb: 'sip:refer',
-        referTo: '123456',
-        actionHook: '/actionHook'
-      }
-    ];
-    const noVerbs = [];
-
-    const from = 'refer_with_notify';
-    provisionCallHook(from, verbs);
-    provisionActionHook(from, noVerbs)
-
-    // THEN
-    await sippUac('uac-refer-with-notify.xml', '172.38.0.10', from);
-    t.pass('refer: successfully received 202 Accepted');
-    await sleepFor(1000);
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.final_referred_call_status === 200, 'refer: successfully received NOTIFY with 200 OK');
-    //console.log(`obj: ${JSON.stringify(obj)}`);
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'refer\' tests w/202 but no NOTIFY', {timeout: 25000}, async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'say',
-        text: 'silence_stream://100'
-      },
-      {
-        verb: 'sip:refer',
-        referTo: '123456',
-        actionHook: '/actionHook'
-      }
-    ];
-    const noVerbs = [];
-
-    const from = 'refer_no_notify';
-    provisionCallHook(from, verbs);
-    provisionActionHook(from, noVerbs)
-
-    // THEN
-    await sippUac('uac-refer-no-notify.xml', '172.38.0.10', from);
-    t.pass('refer: successfully received 202 Accepted w/o NOTIFY');
-    await sleepFor(17000);
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    console.log(`obj: ${JSON.stringify(obj)}`);
-    t.ok(obj.body.refer_status === 202, 'refer: successfully timed out and reported 202');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
--- a/test/sip-tests.js
+++ b/test/sip-tests.js
@@ -53,13 +53,6 @@ test('incoming call tests', (t) => {
    .then(() => {
      return t.pass('handles in-dialog requests');
    })
-    .then(() => {
-      return sippUac('uac-refer-no-notify.xml', '172.38.0.30');
-    })
-    .then(() => {
-      return t.pass('handles sip:refer where we get 202 but no NOTIFY');
-    })
-
    .then(() => {
      srf.disconnect();
      t.end();
--- a/test/sipp.js
+++ b/test/sipp.js
@@ -24,13 +24,13 @@ obj.output = () => {
  return output;
 };

-obj.sippUac = (file, bindAddress, from='sipp', to='16174000000', loop=1) => {
+obj.sippUac = (file, bindAddress, from='sipp', to='16174000000') => {
  const cmd = 'docker';
  const args = [
    'run', '-t', '--rm', '--net', `${network}`,
    '-v', `${__dirname}/scenarios:/tmp/scenarios`,
    'drachtio/sipp', 'sipp', '-sf', `/tmp/scenarios/${file}`,
-    '-m', loop,
+    '-m', '1',
    '-sleep', '250ms',
    '-nostdin',
    '-cid_str', `%u-%p@%s-${idx++}`,
--- a/test/unit-tests.js
+++ b/test/unit-tests.js
@@ -44,22 +44,7 @@ test('unit tests', (t) => {

  task = makeTask(logger, require('./data/good/say-text-array'));
  t.ok(task.name === 'say', 'parsed say with multiple segments');
-  
-  task = makeTask(logger, require('./data/good/say-ssml'));
-  // the ssml is more than 1000 chars, 
-  // expecting first chunk is length > 100, stop at ? instead of first .
-  // 2nd chunk is long text < 1000 char, stop at .
-  // 3rd chunk is the rest.
-  t.ok(task.text.length === 3 &&
-    task.text[0].length === 187 &&
-    task.text[1].length === 882 &&
-    task.text[2].length === 123, 'parsed say');

-  task = makeTask(logger, require('./data/bad/bad-say-ssml'));
-  t.ok(task.text.length === 1 &&
-    task.text[0].length === 1162, 'parsed bad say');
-
-  
  const alt = require('./data/good/alternate-syntax');
  const normalize = require('../lib/utils/normalize-jambones');
  normalize(logger, alt).forEach((t) => {
--- a/test/utils.js
+++ b/test/utils.js
@@ -24,13 +24,4 @@ const provisionCustomHook = (from, verbs) => {
  post(`/customHookMapping`, mapping);
 }

-const provisionActionHook = (from, verbs) => {
-  const mapping = {
-    from,
-    data: JSON.stringify(verbs)
-  };
-  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post(`/actionHook`, mapping);
-}
-
-module.exports = { provisionCallHook, provisionCustomHook, provisionActionHook}
+module.exports = { provisionCallHook, provisionCustomHook}
--- a/test/webhook/app.js
+++ b/test/webhook/app.js
@@ -1,54 +1,14 @@
+const assert = require('assert');
+const fs = require('fs');
 const express = require('express');
 const app = express();
-const Websocket = require('ws');
 const listenPort = process.env.HTTP_PORT || 3000;
 let json_mapping = new Map();
 let hook_mapping = new Map();
-let ws_packet_count = new Map();
-let ws_metadata = new Map();

-/** websocket server for listen audio  */
-const recvAudio = (socket, req) => {
-  let packets = 0;
-  let path = req.url;
-  console.log('received websocket connection');
-  socket.on('message', (data, isBinary) => {
-    if (!isBinary) {
-      try {
-        const msg = JSON.parse(data);
-        console.log({msg}, 'received websocket message');
-        ws_metadata.set(path, msg);
-      }
-      catch (err) {
-        console.log({err}, 'error parsing websocket message');
-      }
-    }
-    else {
-      packets += data.length;
-    }
-  });
-  socket.on('error', (err) => {
-    console.log({err}, 'listen websocket: error');
-  });
-
-  socket.on('close', () => {
-    ws_packet_count.set(path, packets);
-  })
-};
-
-const wsServer = new Websocket.Server({ noServer: true });
-wsServer.setMaxListeners(0);
-wsServer.on('connection', recvAudio.bind(null));
-
-const server = app.listen(listenPort, () => {
+app.listen(listenPort, () => {
  console.log(`sample jambones app server listening on ${listenPort}`);
 });
-server.on('upgrade', (request, socket, head) => {
-  console.log('received upgrade request');
-  wsServer.handleUpgrade(request, socket, head, (socket) => {
-    wsServer.emit('connection', socket, request);
-  });
-});

 app.use(express.urlencoded({ extended: true }));
 app.use(express.json());
@@ -60,7 +20,6 @@ app.use(express.json());
 app.all('/', (req, res) => {
  console.log(req.body, 'POST /');
  const key = req.body.from
-  addRequestToMap(key, req, hook_mapping);
  return getJsonFromMap(key, req, res);
 });

@@ -137,27 +96,6 @@ app.get('/lastRequest/:key', (req, res) => {
  }
 })

-// WS Fetch
-app.get('/ws_packet_count/:key', (req, res) => {
-  let key = `/${req.params.key}`;
-  console.log(key, ws_packet_count);
-  if (ws_packet_count.has(key)) {
-    return res.json({ count: ws_packet_count.get(key) });
-  } else {
-    return res.sendStatus(404);
-  }
-})
-
-app.get('/ws_metadata/:key', (req, res) => {
-  let key = `/${req.params.key}`;
-  console.log(key, ws_packet_count);
-  if (ws_metadata.has(key)) {
-    return res.json({ metadata: ws_metadata.get(key) });
-  } else {
-    return res.sendStatus(404);
-  }
-})
-
 /*
 * private function
 */
--- a/test/webhook/package-lock.json
+++ b/test/webhook/package-lock.json
@@ -9,8 +9,7 @@
      "version": "1.0.0",
      "license": "MIT",
      "dependencies": {
-        "express": "^4.18.2",
-        "ws": "^8.12.0"
+        "express": "^4.18.2"
      }
    },
    "node_modules/accepts": {
@@ -588,26 +587,6 @@
      "engines": {
        "node": ">= 0.8"
      }
-    },
-    "node_modules/ws": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
-      "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
    }
  },
  "dependencies": {
@@ -1034,12 +1013,6 @@
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
-    "ws": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
-      "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
-      "requires": {}
    }
  }
 }
--- a/test/webhook/package.json
+++ b/test/webhook/package.json
@@ -9,7 +9,6 @@
  "author": "Dave Horton",
  "license": "MIT",
  "dependencies": {
-    "express": "^4.18.2",
-    "ws": "^8.12.0"
+    "express": "^4.18.2"
  }
 }
--- a/test/ws-mock.js
+++ b/test/ws-mock.js
@@ -1,97 +0,0 @@
-class MockWebsocket {
-    static eventResponses = new Map();
-    static actionLoops = new Map();
-    eventListeners = new Map();
-
-    constructor(url, protocols, options) {
-        this.u = url;
-        this.pros = protocols;
-        this.opts = options;
-        setTimeout(() => {
-            this.open();
-        }, 500)
-    }
-
-    static addJsonMapping(key, value) {
-        MockWebsocket.eventResponses.set(key, value);
-    }
-
-    static getAndIncreaseActionLoops(key) {
-        const ret = MockWebsocket.actionLoops.has(key) ? MockWebsocket.actionLoops.get(key) : 0;
-        MockWebsocket.actionLoops.set(key, ret + 1);
-        return ret;
-    }
-
-    once(event, listener) {
-        // Websocket.ws = this;
-        this.eventListeners.set(event, listener);
-        return this;
-    }
-
-    on(event, listener) {
-        // Websocket.ws = this;
-        this.eventListeners.set(event, listener);
-        return this;
-    }
-
-    open() {
-        if (this.eventListeners.has('open')) {
-            this.eventListeners.get('open')();
-        }
-    }
-
-    removeAllListeners() {
-        this.eventListeners.clear();
-    }
-
-    send(data, callback) {
-        const json = JSON.parse(data);
-        console.log({json}, 'got message from ws-requestor');
-        if (MockWebsocket.eventResponses.has(json.call_sid)) {
-
-            const resp_data = MockWebsocket.eventResponses.get(json.call_sid);
-            const action = resp_data.action[MockWebsocket.getAndIncreaseActionLoops(json.call_sid)];
-            if (action === 'connect') {
-                setTimeout(()=> {
-                    const msg = {
-                        type: 'ack',
-                        msgid: json.msgid,
-                        command: 'command',
-                        call_sid: json.call_sid,
-                        queueCommand: false, 
-                        data: resp_data.body}
-                    console.log({msg}, 'sending ack to ws-requestor');
-                    this.mockOnMessage(JSON.stringify(msg));
-                }, 100);
-            } else if (action === 'close') {
-                if (this.eventListeners.has('close')) {
-                    this.eventListeners.get('close')(500);
-                }
-            } else if (action === 'terminate') {
-                if (this.eventListeners.has('close')) {
-                    this.eventListeners.get('close')(1000);
-                }
-            } else if (action === 'error') {
-                if (this.eventListeners.has('error')) {
-                    this.eventListeners.get('error')();
-                }
-            } else if (action === 'unexpected-response') {
-                if (this.eventListeners.has('unexpected-response')) {
-                    this.eventListeners.get('unexpected-response')();
-                }
-            }
-            
-        }
-        if (callback) {
-            callback();
-        }
-    }
-
-    mockOnMessage(message, isBinary=false) {
-        if (this.eventListeners.has('message')) {
-            this.eventListeners.get('message')(message, isBinary);
-        }
-    }
-}
-
-module.exports = MockWebsocket;
--- a/test/ws-requestor-unit-test.js
+++ b/test/ws-requestor-unit-test.js
@@ -1,198 +0,0 @@
-const test = require('tape');
-const sinon = require('sinon');
-const proxyquire = require("proxyquire");
-proxyquire.noCallThru();
-const MockWebsocket = require('./ws-mock')
-const logger = require('pino')({level: process.env.JAMBONES_LOGLEVEL || 'error'});
-
-const BaseRequestor = proxyquire(
-  "../lib/utils/base-requestor",
-  {
-    "../../": {
-      srf: {
-        locals: {
-          stats: {
-            histogram: () => {}
-          }
-        }
-      }
-    },
-    "@jambonz/time-series": sinon.stub()
-  }
- );
-
- const WsRequestor = proxyquire(
-  "../lib/utils/ws-requestor",
-  {
-    "./base-requestor": BaseRequestor,
-    "ws": MockWebsocket
-  }
- );
-
-test('ws success', async (t) => {
-  // GIVEN
-
-  const json = '[{\"verb\": \"play\",\"url\": \"silence_stream://5000\"}]';
-  const ws_response = {
-    action: ['connect'],
-    body: json
-  }
-  const call_sid = 'ws_success';
-
-  MockWebsocket.addJsonMapping(call_sid, ws_response);
-
-  const hook = {
-    url: 'ws://localhost:3000',
-    username: 'username',
-    password: 'password'
-  }
-
-  const params = {
-    callSid: call_sid
-  }
-
-  // WHEN
-  
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  const result = await requestor.request('session:new',hook, params, {});
-
-  // THEN
-  t.ok(result == json,'ws successfully sent session:new and got initial jambonz app');
-
-  t.end();
-});
-
-test('ws close success reconnect', async (t) => {
-  // GIVEN
-
-  const call_sid = 'ws_closed'
-  const json = '[{\"verb\": \"play\",\"url\": \"silence_stream://5000\"}]';
-  const ws_response = {
-    action: ['close', 'connect'],
-    body: json
-  }
-  MockWebsocket.addJsonMapping(call_sid, ws_response);
-
-  const hook = {
-    url: 'ws://localhost:3000',
-    username: 'username',
-    password: 'password'
-  }
-
-  const params = {
-    callSid: call_sid
-  }
-
-  // WHEN
-  
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  const result = await requestor.request('session:new',hook, params, {});
-
-  // THEN
-  t.ok(result == json,'ws successfully reconnect after close from far end');
-
-  t.end();
-});
-
-
-test('ws response error 1000', async (t) => {
-  // GIVEN
-
-  const call_sid = 'ws_terminated'
-  const json = '[{\"verb\": \"play\",\"url\": \"silence_stream://5000\"}]';
-  const ws_response = {
-    action: ['terminate'],
-    body: json
-  }
-  MockWebsocket.addJsonMapping(call_sid, ws_response);
-
-  const hook = {
-    url: 'ws://localhost:3000',
-    username: 'username',
-    password: 'password'
-  }
-
-  const params = {
-    callSid: call_sid
-  }
-
-  // WHEN
-  
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  try {
-    await requestor.request('session:new',hook, params, {});
-  }
-  catch (err) {
-    // THEN
-    t.ok(err.startsWith('timeout from far end for msgid'), 'ws does not reconnect if far end closes gracefully');
-    t.end();
-  }
-});
-
-test('ws response error', async (t) => {
-  // GIVEN
-
-  const call_sid = 'ws_error'
-  const json = '[{\"verb\": \"play\",\"url\": \"silence_stream://5000\"}]';
-  const ws_response = {
-    action: ['error'],
-    body: json
-  }
-  MockWebsocket.addJsonMapping(call_sid, ws_response);
-
-  const hook = {
-    url: 'ws://localhost:3000',
-    username: 'username',
-    password: 'password'
-  }
-
-  const params = {
-    callSid: call_sid
-  }
-
-  // WHEN
-  
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  try {
-    await requestor.request('session:new',hook, params, {});
-  }
-  catch (err) {
-    // THEN
-    t.ok(err.startsWith('timeout from far end for msgid'), 'ws does not reconnect if far end closes gracefully');
-    t.end();
-  }
-});
-
-test('ws unexpected-response', async (t) => {
-  // GIVEN
-
-  const call_sid = 'ws_unexpected-response'
-  const json = '[{\"verb\": \"play\",\"url\": \"silence_stream://5000\"}]';
-  const ws_response = {
-    action: ['unexpected-response'],
-    body: json
-  }
-  MockWebsocket.addJsonMapping(call_sid, ws_response);
-
-  const hook = {
-    url: 'ws://localhost:3000',
-    username: 'username',
-    password: 'password'
-  }
-
-  const params = {
-    callSid: call_sid
-  }
-
-  // WHEN
-  
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  try {
-    await requestor.request('session:new',hook, params, {});
-  }
-  catch (err) {
-    // THEN
-    t.ok(err.code = 'ERR_ASSERTION', 'ws does not reconnect if far end closes gracefully');
-    t.end();
-  }
-});
Author	SHA1	Message	Date
Dave Horton	38185426e2	further fixes for #210	2023-01-07 14:49:59 -05:00
Dave Horton	0f6b7e860d	allow redirect to ws(s) url after starting with http(s) #210	2023-01-07 14:13:11 -05:00