remove leftover merge brackets

.eslintrc.json

@@ -8,7 +8,7 @@
       "jsx": false,
       "modules": false
     },
-    "ecmaVersion": 2020
+    "ecmaVersion": 2018
   },
   "plugins": ["promise"],
   "rules": {

.github/workflows/build.yml

@@ -1,15 +1,16 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 14
       - run: npm ci
       - run: npm run jslint
       - run: docker pull drachtio/sipp
@@ -19,5 +20,3 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
-          MICROSOFT_REGION: ${{ secrets.MICROSOFT_REGION }}
-          MICROSOFT_API_KEY: ${{ secrets.MICROSOFT_API_KEY }}

.github/workflows/docker-publish.yml

@@ -1,51 +0,0 @@
-name: Docker
-
-on:
-  push:
-    # Publish `main` as Docker `latest` image.
-    branches:
-      - main
-
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
-
-env:
-  IMAGE_NAME: feature-server
-
-jobs:
-  push:
-
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME
-
-      - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Push image
-        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-
-          # Change all uppercase to lowercase
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-
-          # Strip git ref prefix from version
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-
-          # Strip "v" prefix from tag name
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-
-          # Use Docker `latest` tag convention
-          [ "$VERSION" == "main" ] && VERSION=latest
-
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION

.gitignore

@@ -40,5 +40,4 @@ examples/*
 ecosystem.config.js
 .vscode
 test/credentials/*.json
-run-tests.sh
-run-coverage.sh
+run-tests.sh

Dockerfile

@@ -1,23 +1,16 @@
-FROM --platform=linux/amd64 node:18.14.1-alpine3.16 as base
-
-RUN apk --update --no-cache add --virtual .builds-deps build-base python3
-
+FROM node:alpine as builder
+RUN apk update && apk add --no-cache python make g++
 WORKDIR /opt/app/
+COPY package.json ./
+RUN npm install
+RUN npm prune
 
-FROM base as build
-
-COPY package.json package-lock.json ./
-
-RUN npm ci
-
-COPY . .
-
-FROM base
-
-COPY --from=build /opt/app /opt/app/
+FROM node:alpine as app
+WORKDIR /opt/app
+COPY . /opt/app
+COPY --from=builder /opt/app/node_modules ./node_modules
 
 ARG NODE_ENV
-
 ENV NODE_ENV $NODE_ENV
 
-CMD [ "node", "app.js" ]
+CMD [ "npm", "start" ]

README.md

@@ -2,8 +2,6 @@
 
 This application implements the core feature server of the jambones platform.
 
-> Note: If you are a developer looking to work on the code please read  our [how-to for that](./docs/contributing.md).
-
 ## Configuration
 
 Configuration is provided via environment variables:
@@ -18,10 +16,8 @@ Configuration is provided via environment variables:
 |DRACHTIO_PORT| listening port of drachtio server for control connections (typically 9022)|yes|
 |DRACHTIO_SECRET| shared secret|yes|
 |ENABLE_METRICS| if 1, metrics will be generated|no|
-|ENCRYPTION_SECRET| secret for credential encryption(JWT_SECRET is deprecated) |yes|
 |GOOGLE_APPLICATION_CREDENTIALS| path to gcp service key file|yes|
 |HTTP_PORT| tcp port to listen on for API requests from jambonz-api-server|yes|
-|JAMBONES_GATHER_EARLY_HINTS_MATCH| if true and hints are provided, gather will opportunistically review interim transcripts if possible to reduce ASR latency |no|
 |JAMBONES_FREESWITCH| IP:port:secret for Freeswitch server (e.g. '127.0.0.1:8021:JambonzR0ck$'|yes|
 |JAMBONES_LOGLEVEL| log level for application, 'info' or 'debug'|no|
 |JAMBONES_MYSQL_HOST| mysql host|yes|
@@ -88,5 +84,7 @@ module.exports = {
 ```
 
 #### Running the test suite
-
-Please [see this]](./docs/contributing.md#run-the-regression-test-suite).
+The test suite currently only consists of JSON-parsing unit tests.  A full end-to-end sip test suite should be added.
+```
+npm test
+```

app.js

@@ -7,34 +7,39 @@ assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACH
 assert.ok(process.env.DRACHTIO_SECRET, 'missing DRACHTIO_SECRET env var');
 assert.ok(process.env.JAMBONES_FREESWITCH, 'missing JAMBONES_FREESWITCH env var');
 assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
-assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_SUBNET env var');
-assert.ok(process.env.ENCRYPTION_SECRET || process.env.JWT_SECRET, 'missing ENCRYPTION_SECRET env var');
+assert.ok(process.env.JAMBONES_NETWORK_CIDR, 'missing JAMBONES_SUBNET env var');
 
 const Srf = require('drachtio-srf');
 const srf = new Srf();
-const tracer = require('./tracer')(process.env.JAMBONES_OTEL_SERVICE_NAME || 'jambonz-feature-server');
-const api = require('@opentelemetry/api');
-srf.locals = {...srf.locals, otel: {tracer, api}};
-
-const opts = {level: process.env.JAMBONES_LOGLEVEL || 'info'};
-const pino = require('pino');
-const logger = pino(opts, pino.destination({sync: false}));
-const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
+const PORT = process.env.HTTP_PORT || 3000;
+const opts = {
+  timestamp: () => {return `, "time": "${new Date().toISOString()}"`;},
+  level: process.env.JAMBONES_LOGLEVEL || 'info'
+};
+const logger = require('pino')(opts);
+const {LifeCycleEvents} = require('./lib/utils/constants');
 const installSrfLocals = require('./lib/utils/install-srf-locals');
 installSrfLocals(srf, logger);
 
 const {
   initLocals,
-  createRootSpan,
-  handleSipRec,
   getAccountDetails,
   normalizeNumbers,
   retrieveApplication,
   invokeWebCallback
 } = require('./lib/middleware')(srf, logger);
 
+// HTTP
+const express = require('express');
+const app = express();
+Object.assign(app.locals, {
+  logger,
+  srf
+});
+
+const httpRoutes = require('./lib/http-routes');
+
 const InboundCallSession = require('./lib/session/inbound-call-session');
-const SipRecCallSession = require('./lib/session/siprec-call-session');
 
 if (process.env.DRACHTIO_HOST) {
   srf.connect({host: process.env.DRACHTIO_HOST, port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET });
@@ -56,21 +61,29 @@ if (process.env.NODE_ENV === 'test') {
 
 srf.use('invite', [
   initLocals,
-  createRootSpan,
-  handleSipRec,
   getAccountDetails,
   normalizeNumbers,
   retrieveApplication,
   invokeWebCallback
 ]);
 
-srf.invite(async(req, res) => {
-  const isSipRec = !!req.locals.siprec;
-  const session = isSipRec ? new SipRecCallSession(req, res) : new InboundCallSession(req, res);
-  if (isSipRec) await session.answerSipRecCall();
+srf.invite((req, res) => {
+  const session = new InboundCallSession(req, res);
   session.exec();
 });
 
+// HTTP
+app.use(express.urlencoded({ extended: true }));
+app.use(express.json());
+app.use('/', httpRoutes);
+app.use((err, req, res, next) => {
+  logger.error(err, 'burped error');
+  res.status(err.status || 500).json({msg: err.message});
+});
+const httpServer = app.listen(PORT);
+
+logger.info(`listening for HTTP requests on port ${PORT}, serviceUrl is ${srf.locals.serviceUrl}`);
+
 const sessionTracker = srf.locals.sessionTracker = require('./lib/session/session-tracker');
 sessionTracker.on('idle', () => {
   if (srf.locals.lifecycleEmitter.operationalState === LifeCycleEvents.ScaleIn) {
@@ -78,67 +91,18 @@ sessionTracker.on('idle', () => {
     srf.locals.lifecycleEmitter.scaleIn();
   }
 });
-const getCount = () => sessionTracker.count;
-const healthCheck = require('@jambonz/http-health-check');
-let httpServer;
-
-const createHttpListener = require('./lib/utils/http-listener');
-createHttpListener(logger, srf)
-  .then(({server, app}) => {
-    httpServer = server;
-    healthCheck({app, logger, path: '/', fn: getCount});
-    return {server, app};
-  })
-  .catch((err) => {
-    logger.error(err, 'Error creating http listener');
-  });
-
 
 setInterval(() => {
   srf.locals.stats.gauge('fs.sip.calls.count', sessionTracker.count);
-}, 20000);
+}, 5000);
 
 const disconnect = () => {
   return new Promise ((resolve) => {
-    httpServer?.on('close', resolve);
-    httpServer?.close();
+    httpServer.on('close', resolve);
+    httpServer.close();
     srf.disconnect();
     srf.locals.mediaservers.forEach((ms) => ms.disconnect());
   });
 };
 
-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);
-  }
-  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);
-  }
-}
-
-if (process.env.JAMBONZ_CLEANUP_INTERVAL_MINS) {
-  const {clearFiles} = require('./lib/utils/cron-jobs');
-
-  /* cleanup orphaned files or channels every so often */
-  setInterval(async() => {
-    try {
-      await clearFiles();
-    } catch (err) {
-      logger.error({err}, 'app.js: error clearing files');
-    }
-  }, 1000 * 60 * (process.env.JAMBONZ_CLEANUP_INTERVAL_MINS || 60));
-}
-
 module.exports = {srf, logger, disconnect};

bin/k8s-pre-stop-hook.js

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

data/example-voicemail-greetings.json

@@ -1,52 +0,0 @@
-{
-  "en-US": [
-    "call has been forwarded",
-    "at the beep",
-    "at the tone",
-    "leave a message",
-    "leave me a message",
-    "not available right now",
-    "not available to take your call",
-    "can't take your call",
-    "I will get back to you",
-    "I'll get back to you",
-    "we will get back to you",
-    "we are unable",
-    "we are not available"
-  ],
-  "es-ES": [
-    "le pasamos la llamada",
-    "después del bip",
-    "después del tono",
-    "deja un mensaje",
-    "déjame un mensaje",
-    "no estamos disponibles",
-    "no estoy disponible",
-    "ahora no puedo",
-    "no puedo contestar",
-    "no le puedo contestar",
-    "me pondré en contacto",
-    "nos pondremos en contacto",
-    "ahora no estamos disponibles",
-    "no estamos disponibles"
-  ],
-  "ca-ES": [
-    "passem la seva trucada",
-    "després del bip",
-    "després del to",
-    "deixi un missatge",
-    "deixa un missatge",
-    "deixim un missatge",
-    "no estem disponibles",
-    "no estem a l'oficina",
-    "no estic disponible",
-    "ara no puc",
-    "no puc contestar",
-    "no puc respondre",
-    "no li puc respondre",
-    "em posaré en contacte",
-    "ens posarem en contacto",
-    "ara no estem disponibles",
-    "no hi som"
-  ]
-}

docs/contributing.md

@@ -1,123 +0,0 @@
-# Contributors are welcome!
-
-So, you want to hack on jambonz?  Maybe add some features, maybe help fix some bugs?  Awesome, welcome aboard! 
-
-This brief document should get you started.  Here you will find instructions showing how to set up your laptop to run the regression test suite (which you should always run before committing any changes), as well as some basic info on the structure of the code.
-
-## Getting oriented
-
-First of all, you are in the right place to begin hacking on jambonz. The jambonz-feature-server app is kinda the center of the universe for jambonz.  Most of the core logic in jambonz is implemented here: things like the [webhook verbs](../lib/tasks), [session management](../lib/session), and the [client-side webhook implementation](../lib/utils/http-requestor.js). A common thing you might want to do, for instance, is to add support for an all-new verb, and this code base is where would do that.
-
-This jambonz-feature-server app works together quite closely with a [drachtio server](https://github.com/drachtio/drachtio-server) and a Freeswitch.  In fact, these three components are bundled together into a single VM/instance (or a Deployment, in Kubernetes) that we more generally refer to as "Feature Server".  The Feature Server is a horizontally-scalable unit that is deployed behind the public-facing SBC elements of a jambonz cluster (the SBC is itself a separately scalable unit).  The drachtio-server handles the SIP signaling, the Freeswitch handles media operations and speech vendor integration, and the jambonz-feature-server app orchestrates all of it via the use of [drachtio-srf](https://github.com/drachtio/drachtio-srf) and [drachtio-fsmrf](https://github.com/drachtio/drachtio-fsmrf).
-
-## How to do things
-
-First of all, please join our [slack channel](https://joinslack.jambonz.org) in order to coordinate with us on the work, i.e. to notify us of what you are doing and make sure that no one else is already working on the same thing.
-
-To prepare to make changes, please fork the repo to your own Github account, make changes, test them on your own running jambonz cluster, then run the regression test suite and lint check before giving us a PR.
-
-### lint
-
-We have some opinionated conventions that you must follow - see our [eslintrc.json](../.eslintrc.json) for details. Make sure your code passes by running:
-
-```bash
-npm run jslint
-```
-
-### test suite
-
-#### Generate speech credentials and create run-tests.sh
-
-The test suite also requires you to provide speech credentials for both GCP and AWS.  You will want to create a new file named `run-tests.sh` in the project folder. Make the file executable and then copy in the text below, substituting your speech credentials where indicated:
-
-```bash
-#!/bin/bash
-GCP_JSON_KEY='{"type":"service_account","project_id":"...etc"}' \
-AWS_ACCESS_KEY_ID='your-aws-access-key-id' \
-AWS_SECRET_ACCESS_KEY='your-aws-secret-access-key' \
-AWS_REGION='us-east-1' \
-JWT_SECRET='foobar' \
-npm test
-```
->> Note: The project's .gitignore file prevents this file from being sent to Github, so you do not need to worry about exposing your credentials.  Just make sure you name if run-tests.sh and create it in the project folder
-
-The GCP credential is the JSON service key in stringified format.
-
-#### Install Docker
-
-The test suite ralso equires [Docker](https://www.docker.com/) and docker-compose to be installed on your laptop.  Docker is used to set up a network with all of the elements required to test the jambonz-feature-server in a black-box type of fashion.
-
-Once you have docker installed, you can optionally make sure everything Docker-wise is working properly by running this command from the project folder:
-
-```bash
-docker-compose -f test/docker-compose-testbed.yaml up -d
-```
-
-This may take several minutes to complete, mainly because the mysql schema needs to be installed and seeded, but if successful the output should look like this:
-
-```bash
-$ docker-compose -f test/docker-compose-testbed.yaml up -d
-Creating network "test_fs" with driver "bridge"
-Creating test_webhook-transcribe_1 ... done
-Creating test_webhook-decline_1    ... done
-Creating test_mysql_1              ... done
-Creating test_docker-host_1        ... done
-Creating test_webhook-gather_1     ... done
-Creating test_webhook-say_1        ... done
-Creating test_freeswitch_1         ... done
-Creating test_influxdb_1           ... done
-Creating test_redis_1              ... done
-Creating test_drachtio_1           ... done
-```
-
-At that point, you can run `docker ps` to see all of the containers running
-
-```bash
-docker ps
-CONTAINER ID   IMAGE                                           COMMAND                  CREATED              STATUS                   PORTS                               NAMES
-abbc3594f390   drachtio/drachtio-server:latest                 "/entrypoint.sh drac…"   About a minute ago   Up About a minute        0.0.0.0:9060->9022/tcp              test_drachtio_1
-1f384a274f87   redis:5-alpine                                  "docker-entrypoint.s…"   2 minutes ago        Up 2 minutes             0.0.0.0:16379->6379/tcp             test_redis_1
-78d0bb6ec9b1   influxdb:1.8                                    "/entrypoint.sh infl…"   2 minutes ago        Up 2 minutes             0.0.0.0:8086->8086/tcp              test_influxdb_1
-9616ff790709   jambonz/webhook-test-scaffold:latest            "/entrypoint.sh"         2 minutes ago        Up 2 minutes             0.0.0.0:3102->3000/tcp              test_webhook-gather_1
-7323ab273ff4   drachtio/drachtio-freeswitch-mrf:v1.10.1-full   "/entrypoint.sh free…"   2 minutes ago        Up 2 minutes (healthy)   0.0.0.0:8022->8021/tcp              test_freeswitch_1
-e45e7d28dbc7   mysql:5.7                                       "docker-entrypoint.s…"   2 minutes ago        Up 2 minutes (healthy)   33060/tcp, 0.0.0.0:3360->3306/tcp   test_mysql_1
-b626e5f3067e   qoomon/docker-host                              "/entrypoint.sh"         2 minutes ago        Up 2 minutes                                                 test_docker-host_1
-b0a94b5e8941   jambonz/webhook-test-scaffold:latest            "/entrypoint.sh"         2 minutes ago        Up 2 minutes             0.0.0.0:3101->3000/tcp              test_webhook-say_1
-f80adda48eb5   jambonz/webhook-test-scaffold:latest            "/entrypoint.sh"         2 minutes ago        Up 2 minutes             0.0.0.0:3103->3000/tcp              test_webhook-transcribe_1
-223db4a9c670   jambonz/webhook-test-scaffold:latest            "/entrypoint.sh"         2 minutes ago        Up 2 minutes             0.0.0.0:3100->3000/tcp              test_webhook-decline_1
-```
-
-#### Run the regression test suite
-
-The test suite has a dependency that the mysql client is installed on your laptop/machine where the test will be run.  This is needed in order to seed the mysql database that is running in the docker network.
-
-Assuming you have installed the mysql client, and done the above steps, you should now be able to run the tests:
-
-```bash
-./run-tests.sh
-```
-
-If the docker network has not been started (as described above) it will start now, and this will take a minute or two.  Otherwise, the test suite will start running immediately.
-
-In evaluating the test results, be advised that the output is fairly verbose, and also in the process of shutting down once the tests are complete you will see a bunch of errors from redis (`@jambonz/realtimedb-helpers - redis error`).  You can ignore these errors, they are just spit out by jambonz-feature-server as the test environment is torn down and it tries and fails to reconnect to redis.
-
-The final output will indicate the number of tests run and passed:
-
-```bash
-1..28
-# tests 28
-# pass  28
-
-# ok
-```
-
-#### Adding your own tests
-
-Running a successful regression test means you haven't broken anything - Great!  
-
-It doesn't, of course, mean that your shiny new feature or bugfix works.  Adding a new test case to the suite is (unfortunately) non-trivial.  We will add more documentation in the future with a how-to guide on that, but be advised it does require knowledge of the SIP protocol and the [SIPp](http://sipp.sourceforge.net/doc/reference.html) tool.
-
-For now, if you are unable to add tests to the regression suite, please do test your feature as thoroughly as you can on your own jambonz cluster before giving us a pull request.
-
-
-

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

@@ -3,23 +3,20 @@ const makeTask = require('../../tasks/make_task');
 const RestCallSession = require('../../session/rest-call-session');
 const CallInfo = require('../../session/call-info');
 const {CallDirection, CallStatus} = require('../../utils/constants');
-const uuidv4 = require('uuid-random');
+const { v4: uuidv4 } = require('uuid');
 const SipError = require('drachtio-srf').SipError;
 const sysError = require('./error');
-const HttpRequestor = require('../../utils/http-requestor');
-const WsRequestor = require('../../utils/ws-requestor');
-const RootSpan = require('../../utils/call-tracer');
+const Requestor = require('../../utils/requestor');
 const dbUtils = require('../../utils/db-utils');
 
 router.post('/', async(req, res) => {
   const {logger} = req.app.locals;
-  const accountSid = req.body.account_sid;
-  const {srf} = require('../../..');
 
   logger.debug({body: req.body}, 'got createCall request');
   try {
     let uri, cs, to;
     const restDial = makeTask(logger, {'rest:dial': req.body});
+    const {srf} = require('../../..');
     const {lookupAccountDetails} = dbUtils(logger, srf);
     const {getSBC, getFreeswitch} = srf.locals;
     const sbcAddress = getSBC();
@@ -38,11 +35,8 @@ router.post('/', async(req, res) => {
 
     opts.headers = {
       ...opts.headers,
-      'X-Jambonz-Routing': target.type,
-      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
       'X-Call-Sid': callSid,
-      'X-Account-Sid': accountSid,
-      ...(restDial.fromHost && {'X-Preferred-From-Host': restDial.fromHost})
+      'X-Account-Sid': req.body.account_sid
     };
 
     switch (target.type) {
@@ -51,7 +45,7 @@ router.post('/', async(req, res) => {
         uri = `sip:${target.number}@${sbcAddress}`;
         to = target.number;
         if ('teams' === target.type) {
-          const obj = await lookupTeamsByAccount(accountSid);
+          const obj = await lookupTeamsByAccount(req.body.account_sid);
           if (!obj) throw new Error('dial to ms teams not allowed; account must first be configured with teams info');
           Object.assign(opts.headers, {
             'X-MS-Teams-FQDN': obj.ms_teams_fqdn,
@@ -63,11 +57,6 @@ router.post('/', async(req, res) => {
       case 'user':
         uri = `sip:${target.name}`;
         to = target.name;
-        if (target.overrideTo) {
-          Object.assign(opts.headers, {
-            'X-Override-To': target.overrideTo
-          });
-        }
         break;
       case 'sip':
         uri = target.sipUri;
@@ -75,16 +64,6 @@ router.post('/', async(req, res) => {
         break;
     }
 
-    if (target.type === 'phone' && target.trunk) {
-      const {lookupCarrier} = dbUtils(this.logger, srf);
-      const voip_carrier_sid = await lookupCarrier(req.body.account_sid, target.trunk);
-      logger.info(
-        `createCall: selected ${voip_carrier_sid} for requested carrier: ${target.trunk || 'unspecified'})`);
-      if (voip_carrier_sid) {
-        opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
-      }
-    }
-
     /* create endpoint for outdial */
     const ms = getFreeswitch();
     if (!ms) throw new Error('no available Freeswitch for outbound call creation');
@@ -118,62 +97,24 @@ router.post('/', async(req, res) => {
      * attach our requestor and notifier objects
      * these will be used for all http requests we make during this call
      */
-    if ('WS' === app.call_hook?.method || /^wss?:/.test(app.call_hook.url)) {
-      logger.debug({call_hook: app.call_hook}, 'creating websocket for call hook');
-      app.requestor = new WsRequestor(logger, account.account_sid, app.call_hook, account.webhook_secret) ;
-      if (app.call_hook.url === app.call_status_hook.url  || !app.call_status_hook?.url) {
-        logger.debug('reusing websocket for call status hook');
-        app.notifier = app.requestor;
-      }
-    }
-    else {
-      logger.debug({call_hook: app.call_hook}, 'creating http client for call hook');
-      app.requestor = new HttpRequestor(logger, account.account_sid, app.call_hook, account.webhook_secret);
-    }
-    if (!app.notifier && app.call_status_hook) {
-      app.notifier = new HttpRequestor(logger, account.account_sid, app.call_status_hook, account.webhook_secret);
-      logger.debug({call_hook: app.call_hook}, 'creating http client for call status hook');
-    }
-    else if (!app.notifier) {
-      logger.debug('creating null call status hook');
-      app.notifier = {request: () => {}, close: () => {}};
+    app.requestor = new Requestor(logger, account.account_sid, app.call_hook, account.webhook_secret);
+    if (app.call_status_hook) {
+      app.notifier = new Requestor(logger, account.account_sid, app.call_status_hook, account.webhook_secret);
     }
+    else app.notifier = {request: () => {}};
 
     /* now launch the outdial */
     try {
-      const dlg = await srf.createUAC(uri, {...opts,  followRedirects: true, keepUriOnRedirect: true}, {
+      const dlg = await srf.createUAC(uri, opts, {
         cbRequest: (err, inviteReq) => {
-          /* in case of 302 redirect, this gets called twice, ignore the second
-              except to update the req so that it can later be canceled if need be
-          */
-          if (res.headersSent) {
-            logger.info(`create-call: got redirect, updating request to new call-id ${req.get('Call-ID')}`);
-            if (cs) cs.req = inviteReq;
-            return;
-          }
-
           if (err) {
             logger.error(err, 'createCall Error creating call');
             res.status(500).send('Call Failure');
             return;
           }
-          inviteReq.srf = srf;
-          inviteReq.locals = {
-            ...(inviteReq || {}),
-            callSid,
-            application_sid: app.application_sid
-          };
           /* ok our outbound INVITE is in flight */
 
           const tasks = [restDial];
-          const rootSpan = new RootSpan('rest-call', inviteReq);
-          sipLogger = logger.child({
-            callSid,
-            callId: inviteReq.get('Call-ID'),
-            accountSid,
-            traceId: rootSpan.traceId
-          });
-          app.requestor.logger = app.notifier.logger = sipLogger;
           const callInfo = new CallInfo({
             direction: CallDirection.Outbound,
             req: inviteReq,
@@ -181,26 +122,18 @@ router.post('/', async(req, res) => {
             tag: app.tag,
             callSid,
             accountSid: req.body.account_sid,
-            applicationSid: app.application_sid,
-            traceId: rootSpan.traceId
-          });
-          cs = new RestCallSession({
-            logger: sipLogger,
-            application: app,
-            srf,
-            req: inviteReq,
-            ep,
-            tasks,
-            callInfo,
-            accountInfo,
-            rootSpan
+            applicationSid: app.application_sid
           });
+          cs = new RestCallSession({logger, application: app, srf, req: inviteReq, ep, tasks, callInfo, accountInfo});
           cs.exec(req);
 
-          res.status(201).json({sid: cs.callSid, callId: inviteReq.get('Call-ID')});
+          res.status(201).json({sid: cs.callSid});
 
-          sipLogger.info({sid: cs.callSid, callId: inviteReq.get('Call-ID')},
-            `outbound REST call attempt to ${JSON.stringify(target)} has been sent`);
+          sipLogger = logger.child({
+            callSid: cs.callSid,
+            callId: callInfo.callId
+          });
+          sipLogger.info(`outbound REST call attempt to ${JSON.stringify(target)} has been sent`);
         },
         cbProvisional: (prov) => {
           const callStatus = prov.body ? CallStatus.EarlyMedia : CallStatus.Ringing;
@@ -210,11 +143,7 @@ router.post('/', async(req, res) => {
         }
       });
       connectStream(dlg.remote.sdp);
-      cs.emit('callStatusChange', {
-        callStatus: CallStatus.InProgress,
-        sipStatus: 200,
-        sipReason: 'OK'
-      });
+      cs.emit('callStatusChange', {callStatus: CallStatus.InProgress, sipStatus: 200});
       restDial.emit('callStatus', 200);
       restDial.emit('connect', dlg);
     }
@@ -225,23 +154,14 @@ router.post('/', async(req, res) => {
         else if (487 === err.status) callStatus = CallStatus.NoAnswer;
         if (sipLogger) sipLogger.info(`REST outdial failed with ${err.status}`);
         else console.log(`REST outdial failed with ${err.status}`);
-        if (cs) cs.emit('callStatusChange', {
-          callStatus,
-          sipStatus: err.status,
-          sipReason: err.reason
-        });
+        if (cs) cs.emit('callStatusChange', {callStatus, sipStatus: err.status});
       }
       else {
-        if (cs) cs.emit('callStatusChange', {
-          callStatus,
-          sipStatus: 500,
-          sipReason: 'Internal Server Error'
-        });
+        if (cs) cs.emit('callStatusChange', {callStatus, sipStatus: 500});
         if (sipLogger) sipLogger.error({err}, 'REST outdial failed');
         else console.error(err);
       }
       ep.destroy();
-      setTimeout(restDial.kill.bind(restDial), 5000);
     }
   } catch (err) {
     sysError(logger, res, err);

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

@@ -2,7 +2,7 @@ const router = require('express').Router();
 const CallInfo = require('../../session/call-info');
 const {CallDirection} = require('../../utils/constants');
 const SmsSession = require('../../session/sms-call-session');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
+const normalizeJambones = require('../../utils/normalize-jambones');
 const makeTask = require('../../tasks/make_task');
 
 router.post('/:sid', async(req, res) => {

lib/http-routes/api/index.js

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

lib/http-routes/api/messaging.js

@@ -1,10 +1,9 @@
 const router = require('express').Router();
-const HttpRequestor = require('../../utils/http-requestor');
-const WsRequestor = require('../../utils/ws-requestor');
+const Requestor = require('../../utils/requestor');
 const CallInfo = require('../../session/call-info');
 const {CallDirection} = require('../../utils/constants');
 const SmsSession = require('../../session/sms-call-session');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
+const normalizeJambones = require('../../utils/normalize-jambones');
 const {TaskPreconditions} = require('../../utils/constants');
 const makeTask = require('../../tasks/make_task');
 
@@ -19,22 +18,11 @@ router.post('/:partner', async(req, res) => {
   const app = req.body.app;
   const account = await lookupAccountBySid(app.accountSid);
   const hook = app.messaging_hook;
-  let requestor;
-
-  if ('WS' === hook?.method) {
-    app.requestor = new WsRequestor(logger, account.account_sid, hook, account.webhook_secret) ;
-    app.notifier = app.requestor;
-  }
-  else {
-    app.requestor = new HttpRequestor(logger, account.account_sid, hook, account.webhook_secret);
-    app.notifier = {request: () => {}};
-  }
-
+  const requestor = new Requestor(logger, account.account_sid, hook, account.webhook_secret);
   const payload = {
     carrier: req.params.partner,
     messageSid: app.messageSid,
     accountSid: app.accountSid,
-    serviceProviderSid: account.service_provider_sid,
     applicationSid: app.applicationSid,
     from: req.body.from,
     to: req.body.to,
@@ -45,7 +33,7 @@ router.post('/:partner', async(req, res) => {
   res.status(200).json({sid: req.body.messageSid});
 
   try {
-    tasks = await requestor.request('session:new', hook, payload);
+    tasks = await requestor.request(hook, payload);
     logger.info({tasks}, 'response from incoming SMS webhook');
   } catch (err) {
     logger.error({err, hook}, 'Error sending incoming SMS message');

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

@@ -12,9 +12,6 @@ function retrieveCallSession(callSid, opts) {
     throw new DbErrorBadRequest('call_status_hook can be updated only when call_hook is also being updated');
   }
   const cs = sessionTracker.get(callSid);
-  if (!cs) {
-    throw new DbErrorUnprocessableRequest('call session is gone');
-  }
 
   if (opts.call_status === CallStatus.Completed && !cs.hasStableDialog) {
     throw new DbErrorUnprocessableRequest('current call state is incompatible with requested action');
@@ -48,18 +45,8 @@ router.post('/:callSid', async(req, res) => {
       logger.info(`updateCall: callSid not found ${callSid}`);
       return res.sendStatus(404);
     }
-
-    if (req.body.sip_request) {
-      const response = await cs.updateCall(req.body, callSid);
-      res.status(200).json({
-        status: response.status,
-        reason: response.reason
-      });
-    }
-    else {
-      res.sendStatus(202);
-      cs.updateCall(req.body, callSid);
-    }
+    res.sendStatus(202);
+    cs.updateCall(req.body, callSid);
   } catch (err) {
     sysError(logger, res, err);
   }

lib/http-routes/index.js

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

lib/middleware.js

@@ -1,47 +1,24 @@
-const uuidv4 = require('uuid-random');
-const {CallDirection, AllowedSipRecVerbs} = require('./utils/constants');
-const {parseSiprecPayload} = require('./utils/siprec-utils');
+const { v4: uuidv4 } = require('uuid');
+const {CallDirection} = require('./utils/constants');
 const CallInfo = require('./session/call-info');
-const HttpRequestor = require('./utils/http-requestor');
-const WsRequestor = require('./utils/ws-requestor');
+const Requestor = require('./utils/requestor');
 const makeTask = require('./tasks/make_task');
 const parseUri = require('drachtio-srf').parseUri;
-const { normalizeJambones }  = require('@jambonz/verb-specifications');
+const normalizeJambones = require('./utils/normalize-jambones');
 const dbUtils = require('./utils/db-utils');
-const RootSpan = require('./utils/call-tracer');
-const listTaskNames = require('./utils/summarize-tasks');
 
 module.exports = function(srf, logger) {
-  const {
-    lookupAppByPhoneNumber,
-    lookupAppByRegex,
-    lookupAppBySid,
-    lookupAppByRealm,
-    lookupAppByTeamsTenant
-  }  = srf.locals.dbHelpers;
-  const {
-    writeAlerts,
-    AlertType
-  } = srf.locals;
+  const {lookupAppByPhoneNumber, lookupAppBySid, lookupAppByRealm, lookupAppByTeamsTenant}  = srf.locals.dbHelpers;
   const {lookupAccountDetails} = dbUtils(logger, srf);
-
   function initLocals(req, res, next) {
-    const callId = req.get('Call-ID');
-    logger.info({
-      callId,
-      callingNumber: req.callingNumber,
-      calledNumber: req.calledNumber
-    }, 'new incoming call');
-    if (!req.has('X-Account-Sid')) {
-      logger.info('getAccountDetails - rejecting call due to missing X-Account-Sid header');
-      return res.send(500);
-    }
     const callSid = req.has('X-Retain-Call-Sid') ? req.get('X-Retain-Call-Sid') : uuidv4();
-    const account_sid = req.get('X-Account-Sid');
-    req.locals = {callSid, account_sid, callId};
+    req.locals = {
+      callSid,
+      logger: logger.child({callId: req.get('Call-ID'), callSid})
+    };
     if (req.has('X-Application-Sid')) {
       const application_sid = req.get('X-Application-Sid');
-      logger.debug(`got application from X-Application-Sid header: ${application_sid}`);
+      req.locals.logger.debug(`got application from X-Application-Sid header: ${application_sid}`);
       req.locals.application_sid = application_sid;
     }
     if (req.has('X-Authenticated-User')) req.locals.originatingUser = req.get('X-Authenticated-User');
@@ -50,89 +27,27 @@ module.exports = function(srf, logger) {
     next();
   }
 
-  function createRootSpan(req, res, next) {
-    const {callId, callSid, account_sid} = req.locals;
-    const rootSpan = new RootSpan('incoming-call', req);
-    const traceId = rootSpan.traceId;
-
-    req.locals = {
-      ...req.locals,
-      traceId,
-      logger: logger.child({
-        callId,
-        callSid,
-        accountSid: account_sid,
-        callingNumber: req.callingNumber,
-        calledNumber: req.calledNumber,
-        traceId}),
-      rootSpan
-    };
-
-    /**
-     * end the span on final failure or cancel from caller;
-     * otherwise it will be closed when sip dialog is destroyed
-    */
-    req.once('cancel', () => {
-      rootSpan.setAttributes({finalStatus: 487});
-      rootSpan.end();
-    });
-    res.once('finish', () => {
-      rootSpan.setAttributes({finalStatus: res.statusCode});
-      res.statusCode >= 300 && rootSpan.end();
-    });
-
-    next();
-  }
-
-  const handleSipRec = async(req, res, next) => {
-    if (Array.isArray(req.payload) && req.payload.length > 1) {
-      const {callId, logger} = req.locals;
-      logger.debug({payload: req.payload}, 'handling siprec call');
-
-      try {
-        const sdp = req.payload
-          .find((p) => p.type === 'application/sdp')
-          .content;
-        const {sdp1, sdp2, ...metadata} = await parseSiprecPayload(req, logger);
-        req.locals.calledNumber = metadata.caller.number;
-        req.locals.callingNumber = metadata.callee.number;
-        req.locals = {
-          ...req.locals,
-          siprec: {
-            metadata,
-            sdp1,
-            sdp2
-          }
-        };
-        logger.info({callId, metadata, sdp}, 'successfully parsed SIPREC payload');
-      } catch (err) {
-        logger.info({callId}, 'Error parsing multipart payload');
-        return res.send(503);
-      }
-    }
-    next();
-  };
-
   /**
    * retrieve account information for the incoming call
    */
   async function getAccountDetails(req, res, next) {
-    const {rootSpan, account_sid} = req.locals;
 
-    const {span} = rootSpan.startChildSpan('lookupAccountDetails');
+    if (!req.has('X-Account-Sid')) {
+      logger.info('getAccountDetails - rejecting call due to missing X-Account-Sid header');
+      return res.send(500);
+    }
+    const account_sid = req.locals.account_sid = req.get('X-Account-Sid');
+
     try {
       req.locals.accountInfo = await lookupAccountDetails(account_sid);
-      req.locals.service_provider_sid = req.locals.accountInfo?.account?.service_provider_sid;
-      span.end();
       if (!req.locals.accountInfo.account.is_active) {
         logger.info(`Account is inactive or suspended ${account_sid}`);
         // TODO: alert
         return res.send(503, {headers: {'X-Reason': 'Account exists but is inactive'}});
       }
-      logger.debug({accountInfo: req.locals?.accountInfo?.account}, `retrieved account info for ${account_sid}`);
+      logger.debug({accountInfo: req.locals.accountInfo}, `retrieved account info for ${account_sid}`);
       next();
     } catch (err) {
-      span.end();
       logger.info({err}, `Error retrieving account details for account ${account_sid}`);
       res.send(503, {headers: {'X-Reason': `No Account exists for sid ${account_sid}`}});
     }
@@ -142,10 +57,7 @@ module.exports = function(srf, logger) {
    * Within the system, we deal with E.164 numbers _without_ the leading '+
    */
   function normalizeNumbers(req, res, next) {
-    const {logger, siprec} = req.locals;
-
-    if (siprec) return next();
-
+    const logger = req.locals.logger;
     Object.assign(req.locals, {
       calledNumber: req.calledNumber,
       callingNumber: req.callingNumber
@@ -166,8 +78,8 @@ module.exports = function(srf, logger) {
    * Given the dialed DID/phone number, retrieve the application to invoke
    */
   async function retrieveApplication(req, res, next) {
-    const {logger, accountInfo, account_sid, rootSpan} = req.locals;
-    const {span} = rootSpan.startChildSpan('lookupApplication');
+    const logger = req.locals.logger;
+    const {accountInfo, account_sid} = req.locals;
     try {
       let app;
       if (req.locals.application_sid) app = await lookupAppBySid(req.locals.application_sid);
@@ -187,7 +99,7 @@ module.exports = function(srf, logger) {
       }
       else {
         const uri = parseUri(req.uri);
-        const arr = /context-(.*)/.exec(uri?.user);
+        const arr = /context-(.*)/.exec(uri.user);
         if (arr) {
           // this is a transfer from another feature server
           const {retrieveKey, deleteKey} = srf.locals.dbHelpers;
@@ -200,22 +112,9 @@ module.exports = function(srf, logger) {
             logger.error(err, `Error retrieving transferred call app for ${arr[1]}`);
           }
         }
-        else {
-          const voip_carrier_sid = req.get('X-Voip-Carrier-Sid');
-          app = await lookupAppByPhoneNumber(req.locals.calledNumber, voip_carrier_sid);
-
-          if (!app) {
-            /* lookup by call_routes.regex */
-            app = await lookupAppByRegex(req.locals.calledNumber, account_sid);
-          }
-        }
+        else app = await lookupAppByPhoneNumber(req.locals.calledNumber);
       }
 
-      span.setAttributes({
-        'app.hook': app?.call_hook?.url,
-        'application_sid': req.locals.application_sid
-      });
-      span.end();
       if (!app || !app.call_hook || !app.call_hook.url) {
         logger.info(`rejecting call to ${req.locals.calledNumber}: no application or webhook url`);
         return res.send(480, {
@@ -229,38 +128,19 @@ module.exports = function(srf, logger) {
       * create a requestor that we will use for all http requests we make during the call.
       * also create a notifier for call status events (if not needed, its a no-op).
       */
+      app.requestor = new Requestor(logger, account_sid, app.call_hook, accountInfo.account.webhook_secret);
+      if (app.call_status_hook) app.notifier = new Requestor(logger, account_sid, app.call_status_hook,
+        accountInfo.account.webhook_secret);
+      else app.notifier = {request: () => {}};
 
-      /* allow for caching data - when caching treat retrieved data as immutable */
-      const app2 = process.env.JAMBONES_MYSQL_REFRESH_TTL ? JSON.parse(JSON.stringify(app)) : app;
-      if ('WS' === app.call_hook?.method ||
-        app.call_hook?.url.startsWith('ws://') || app.call_hook?.url.startsWith('wss://')) {
-        app2.requestor = new WsRequestor(logger, account_sid, app.call_hook, accountInfo.account.webhook_secret) ;
-        app2.notifier = app.requestor;
-        app2.call_hook.method = 'WS';
-      }
-      else {
-        app2.requestor = new HttpRequestor(logger, account_sid, app.call_hook, accountInfo.account.webhook_secret);
-        if (app.call_status_hook) app2.notifier = new HttpRequestor(logger, account_sid, app.call_status_hook,
-          accountInfo.account.webhook_secret);
-        else app2.notifier = {request: () => {}};
-      }
-
-      req.locals.application = app2;
-
-      // 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}`);
-      req.locals.callInfo = new CallInfo({
-        req,
-        app: app2,
-        direction: CallDirection.Inbound,
-        traceId: rootSpan.traceId
-      });
+      req.locals.application = app;
+      const obj = Object.assign({}, app);
+      delete obj.requestor;
+      delete obj.notifier;
+      logger.info({app: obj}, `retrieved application for incoming call to ${req.locals.calledNumber}`);
+      req.locals.callInfo = new CallInfo({req, app, direction: CallDirection.Inbound});
       next();
     } catch (err) {
-      span.end();
       logger.error(err, `${req.get('Call-ID')} Error looking up application for ${req.calledNumber}`);
       res.send(500);
     }
@@ -271,81 +151,29 @@ module.exports = function(srf, logger) {
    */
   async function invokeWebCallback(req, res, next) {
     const logger = req.locals.logger;
-    const {rootSpan, siprec, application:app} = req.locals;
-    let span;
+    const app = req.locals.application;
     try {
-      if (app.tasks && !process.env.JAMBONES_MYSQL_REFRESH_TTL) {
+
+      if (app.tasks) {
         app.tasks = normalizeJambones(logger, app.tasks).map((tdata) => makeTask(logger, tdata));
         if (0 === app.tasks.length) throw new Error('no application provided');
         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
-              }
-            }
-          });
-        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);
-      }
+      const params = Object.assign(app.call_hook.method === 'POST' ? {sip: req.msg} : {},
+        req.locals.callInfo);
+      const json = await app.requestor.request(app.call_hook, params);
       app.tasks = normalizeJambones(logger, json).map((tdata) => makeTask(logger, tdata));
-      span?.setAttributes({
-        'http.statusCode': 200,
-        'app.tasks': listTaskNames(app.tasks)
-      });
-      span?.end();
       if (0 === app.tasks.length) throw new Error('no application provided');
-
-      if (siprec) {
-        const tasks = app.tasks.filter((t) => AllowedSipRecVerbs.includes(t.name));
-        if (0 === tasks.length) {
-          logger.info({tasks: app.tasks}, 'no valid verbs in app found for an incoming siprec call');
-          throw new Error('invalid verbs for incoming siprec call');
-        }
-        if (tasks.length < app.tasks.length) {
-          logger.info('removing verbs that are not allowed for incoming siprec call');
-          app.tasks = tasks;
-        }
-      }
       next();
     } catch (err) {
-      span?.setAttributes({webhookStatus: err.statusCode});
-      span?.end();
-      writeAlerts({
-        account_sid: req.locals.account_sid,
-        target_sid: req.locals.callSid,
-        alert_type: AlertType.INVALID_APP_PAYLOAD,
-        message: `${err?.message}`.trim()
-      }).catch((err) => this.logger.info({err}, 'Error generating alert for parsing application'));
-      logger.info({err}, `Error retrieving or parsing application: ${err?.message}`);
-      res.send(480, {headers: {'X-Reason': err?.message || 'unknown'}});
-      app.requestor.close();
+      logger.info(`Error retrieving or parsing application: ${err.message}`);
+      res.send(480, {headers: {'X-Reason': err.message}});
     }
   }
 
   return {
     initLocals,
-    createRootSpan,
-    handleSipRec,
     getAccountDetails,
     normalizeNumbers,
     retrieveApplication,

lib/session/adulting-call-session.js

@@ -8,15 +8,13 @@ const CallSession = require('./call-session');
 
  */
 class AdultingCallSession extends CallSession {
-  constructor({logger, application, singleDialer, tasks, callInfo, accountInfo, rootSpan}) {
+  constructor({logger, application, singleDialer, tasks, callInfo}) {
     super({
       logger,
       application,
       srf: singleDialer.dlg.srf,
       tasks,
-      callInfo,
-      accountInfo,
-      rootSpan
+      callInfo
     });
     this.sd = singleDialer;
 
@@ -31,25 +29,15 @@ class AdultingCallSession extends CallSession {
     return this.sd.dlg;
   }
 
-  /**
-   * Note: this is not an error.  It is only here to avoid an assert ("no setter for dlg")
-   * when there is a call in Session:_clearResources to null out dlg and ep
-   */
-  set dlg(newDlg) {}
-
   get ep() {
     return this.sd.ep;
   }
 
-  /* see note above */
-  set ep(newEp) {}
-
   get callSid() {
     return this.callInfo.callSid;
   }
 
-  _callerHungup() {
-  }
+
 }
 
 module.exports = AdultingCallSession;

lib/session/call-info.js

@@ -1,6 +1,7 @@
 const {CallDirection, CallStatus} = require('../utils/constants');
 const parseUri = require('drachtio-srf').parseUri;
-const uuidv4 = require('uuid-random');
+const { v4: uuidv4 } = require('uuid');
+
 /**
  * @classdesc Represents the common information for all calls
  * that is provided in call status webhooks
@@ -8,10 +9,7 @@ const uuidv4 = require('uuid-random');
 class CallInfo {
   constructor(opts) {
     let from ;
-    let srf;
     this.direction = opts.direction;
-    this.traceId = opts.traceId;
-    this.callTerminationBy = undefined;
     if (opts.req) {
       const u = opts.req.getParsedHeader('from');
       const uri = parseUri(u.uri);
@@ -21,7 +19,6 @@ class CallInfo {
     if (this.direction === CallDirection.Inbound) {
       // inbound call
       const {app, req} = opts;
-      srf = req.srf;
       this.callSid = req.locals.callSid,
       this.accountSid = app.account_sid,
       this.applicationSid = app.application_sid;
@@ -29,7 +26,6 @@ class CallInfo {
       this.to = req.calledNumber;
       this.callId = req.get('Call-ID');
       this.sipStatus = 100;
-      this.sipReason = 'Trying';
       this.callStatus = CallStatus.Trying;
       this.originatingSipIp = req.get('X-Forwarded-For');
       this.originatingSipTrunkName = req.get('X-Originating-Carrier');
@@ -37,7 +33,6 @@ class CallInfo {
     else if (opts.parentCallInfo) {
       // outbound call that is a child of an existing call
       const {req, parentCallInfo, to, callSid} = opts;
-      srf = req.srf;
       this.callSid = callSid || uuidv4();
       this.parentCallSid = parentCallInfo.callSid;
       this.accountSid = parentCallInfo.accountSid;
@@ -48,12 +43,10 @@ class CallInfo {
       this.callId = req.get('Call-ID');
       this.callStatus = CallStatus.Trying,
       this.sipStatus = 100;
-      this.sipReason = 'Trying';
     }
     else if (this.direction === CallDirection.None) {
       // outbound SMS
       const {messageSid, accountSid, applicationSid, res} = opts;
-      srf = res.srf;
       this.messageSid = messageSid;
       this.accountSid = accountSid;
       this.applicationSid = applicationSid;
@@ -62,23 +55,16 @@ class CallInfo {
     else {
       // outbound call triggered by REST
       const {req, callSid, accountSid, applicationSid, to, tag} = opts;
-      srf = req.srf;
       this.callSid = callSid;
       this.accountSid = accountSid;
       this.applicationSid = applicationSid;
       this.callStatus = CallStatus.Trying,
       this.callId = req.get('Call-ID');
       this.sipStatus = 100;
-      this.sipReason = 'Trying';
       this.from = from || req.callingNumber;
       this.to = to;
       if (tag) this._customerData = tag;
     }
-
-    this.localSipAddress = srf.locals.localSipAddress;
-    if (srf.locals.publicIp) {
-      this.publicIp = srf.locals.publicIp;
-    }
   }
 
   /**
@@ -86,10 +72,9 @@ class CallInfo {
    * @param {string} callStatus - current call status
    * @param {number} sipStatus - current sip status
    */
-  updateCallStatus(callStatus, sipStatus, sipReason) {
+  updateCallStatus(callStatus, sipStatus) {
     this.callStatus = callStatus;
     if (sipStatus) this.sipStatus = sipStatus;
-    if (sipReason) this.sipReason = sipReason;
   }
 
   /**
@@ -112,15 +97,12 @@ class CallInfo {
       to: this.to,
       callId: this.callId,
       sipStatus: this.sipStatus,
-      sipReason: this.sipReason,
       callStatus: this.callStatus,
       callerId: this.callerId,
       accountSid: this.accountSid,
-      traceId: this.traceId,
-      applicationSid: this.applicationSid,
-      fsSipAddress: this.localSipAddress
+      applicationSid: this.applicationSid
     };
-    ['parentCallSid', 'originatingSipIp', 'originatingSipTrunkName', 'callTerminationBy'].forEach((prop) => {
+    ['parentCallSid', 'originatingSipIp', 'originatingSipTrunkName'].forEach((prop) => {
       if (this[prop]) obj[prop] = this[prop];
     });
     if (typeof this.duration === 'number') obj.duration = this.duration;
@@ -128,13 +110,6 @@ class CallInfo {
     if (this._customerData) {
       Object.assign(obj, {customerData: this._customerData});
     }
-
-    if (process.env.JAMBONES_API_BASE_URL) {
-      Object.assign(obj, {apiBaseUrl: process.env.JAMBONES_API_BASE_URL});
-    }
-    if (this.publicIp) {
-      Object.assign(obj, {fsPublicIp: this.publicIp});
-    }
     return obj;
   }
 

lib/session/confirm-call-session.js

@@ -8,18 +8,14 @@ const CallSession = require('./call-session');
 
  */
 class ConfirmCallSession extends CallSession {
-  constructor({logger, application, dlg, ep, tasks, callInfo, accountInfo, memberId, confName, rootSpan}) {
+  constructor({logger, application, dlg, ep, tasks, callInfo}) {
     super({
       logger,
       application,
       srf: dlg.srf,
       callSid: dlg.callSid,
       tasks,
-      callInfo,
-      accountInfo,
-      memberId,
-      confName,
-      rootSpan
+      callInfo
     });
     this.dlg = dlg;
     this.ep = ep;
@@ -31,10 +27,6 @@ class ConfirmCallSession extends CallSession {
   _clearResources() {
   }
 
-  _callerHungup() {
-  }
-
-
 }
 
 module.exports = ConfirmCallSession;

lib/session/inbound-call-session.js

@@ -16,37 +16,23 @@ class InboundCallSession extends CallSession {
       application: req.locals.application,
       callInfo: req.locals.callInfo,
       accountInfo: req.locals.accountInfo,
-      tasks: req.locals.application.tasks,
-      rootSpan: req.locals.rootSpan
+      tasks: req.locals.application.tasks
     });
     this.req = req;
     this.res = res;
 
-    req.once('cancel', this._onCancel.bind(this));
+    req.on('cancel', () => {
+      this._notifyCallStatusChange({callStatus: CallStatus.NoAnswer, sipStatus: 487});
+      this._callReleased();
+    });
 
     this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
-    this._notifyCallStatusChange({
-      callStatus: CallStatus.Trying,
-      sipStatus: 100,
-      sipReason: 'Trying'
-    });
-  }
-
-  _onCancel() {
-    this.rootSpan.setAttributes({'call.termination': 'caller abandoned'});
-    this.callInfo.callTerminationBy = 'caller';
-    this._notifyCallStatusChange({
-      callStatus: CallStatus.NoAnswer,
-      sipStatus: 487,
-      sipReason: 'Request Terminated'
-    });
-    this._callReleased();
+    this._notifyCallStatusChange({callStatus: CallStatus.Trying, sipStatus: 100});
   }
 
   _onTasksDone() {
     if (!this.res.finalResponseSent) {
       if (this._mediaServerFailure) {
-        this.rootSpan.setAttributes({'call.termination': 'media server failure'});
         this.logger.info('InboundCallSession:_onTasksDone generating 480 due to media server failure');
         this.res.send(480, {
           headers: {
@@ -55,12 +41,10 @@ class InboundCallSession extends CallSession {
         });
       }
       else {
-        this.rootSpan.setAttributes({'call.termination': 'tasks completed without answering call'});
         this.logger.info('InboundCallSession:_onTasksDone auto-generating non-success response to invite');
         this.res.send(603);
       }
     }
-    this.req.removeAllListeners('cancel');
   }
 
   /**
@@ -69,15 +53,9 @@ class InboundCallSession extends CallSession {
   _callerHungup() {
     assert(this.dlg.connectTime);
     const duration = moment().diff(this.dlg.connectTime, 'seconds');
-    this.rootSpan.setAttributes({'call.termination': 'hangup by caller'});
-    this.callInfo.callTerminationBy = 'caller';
-    this.emit('callStatusChange', {
-      callStatus: CallStatus.Completed,
-      duration
-    });
-    this.logger.info('InboundCallSession: caller hung up');
+    this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
+    this.logger.debug('InboundCallSession: caller hung up');
     this._callReleased();
-    this.req.removeAllListeners('cancel');
   }
 }
 

lib/session/rest-call-session.js

@@ -8,7 +8,7 @@ const moment = require('moment');
  * @extends CallSession
  */
 class RestCallSession extends CallSession {
-  constructor({logger, application, srf, req, ep, tasks, callInfo, accountInfo, rootSpan}) {
+  constructor({logger, application, srf, req, ep, tasks, callInfo, accountInfo}) {
     super({
       logger,
       application,
@@ -16,18 +16,13 @@ class RestCallSession extends CallSession {
       callSid: callInfo.callSid,
       tasks,
       callInfo,
-      accountInfo,
-      rootSpan
+      accountInfo
     });
     this.req = req;
     this.ep = ep;
 
     this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
-    this._notifyCallStatusChange({
-      callStatus: CallStatus.Trying,
-      sipStatus: 100,
-      sipReason: 'Trying'
-    });
+    this._notifyCallStatusChange({callStatus: CallStatus.Trying, sipStatus: 100});
   }
 
   /**
@@ -44,7 +39,6 @@ class RestCallSession extends CallSession {
    * This is invoked when the called party hangs up, in order to calculate the call duration.
    */
   _callerHungup() {
-    this.callInfo.callTerminationBy = 'caller';
     const duration = moment().diff(this.dlg.connectTime, 'seconds');
     this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
     this.logger.debug('RestCallSession: called party hung up');

lib/session/siprec-call-session.js

@@ -1,59 +0,0 @@
-const InboundCallSession = require('./inbound-call-session');
-const {createSipRecPayload} = require('../utils/siprec-utils');
-const {CallStatus} = require('../utils/constants');
-/**
- * @classdesc Subclass of InboundCallSession.  This represents a CallSession that is
- * established for an inbound SIPREC call.
- * @extends InboundCallSession
- */
-class SipRecCallSession extends InboundCallSession {
-  constructor(req, res) {
-    super(req, res);
-
-    const {sdp1, sdp2, metadata} = req.locals.siprec;
-    this.sdp1 = sdp1;
-    this.sdp2 = sdp2;
-    this.metadata = metadata;
-  }
-
-  async answerSipRecCall() {
-    try {
-      this.ms = this.getMS();
-      let remoteSdp = this.sdp1.replace(/sendonly/, 'sendrecv');
-      this.ep = await this.ms.createEndpoint({remoteSdp});
-      //this.logger.debug({remoteSdp, localSdp: this.ep.local.sdp}, 'SipRecCallSession - allocated first endpoint');
-      remoteSdp = this.sdp2.replace(/sendonly/, 'sendrecv');
-      this.ep2 = await this.ms.createEndpoint({remoteSdp});
-      //this.logger.debug({remoteSdp, localSdp: this.ep2.local.sdp}, 'SipRecCallSession - allocated second endpoint');
-      await this.ep.bridge(this.ep2);
-      const combinedSdp = await createSipRecPayload(this.ep.local.sdp, this.ep2.local.sdp, this.logger);
-      /*
-      this.logger.debug({
-        combinedSdp
-      }, 'SipRecCallSession:_answerSipRecCall - created SIPREC payload');
-      */
-      this.dlg = await this.srf.createUAS(this.req, this.res, {
-        headers: {
-          'Content-Type': 'application/sdp',
-          'X-Trace-ID': this.req.locals.traceId,
-          'X-Call-Sid': this.req.locals.callSid,
-          ...(this.applicationSid && {'X-Application-Sid': this.applicationSid})
-        },
-        localSdp: combinedSdp
-      });
-      this.dlg.on('destroy', this._callerHungup.bind(this));
-      this.wrapDialog(this.dlg);
-      this.dlg.callSid = this.callSid;
-      this.emit('callStatusChange', {sipStatus: 200, sipReason: 'OK', callStatus: CallStatus.InProgress});
-
-      this.dlg.on('modify', this._onReinvite.bind(this));
-      this.dlg.on('refer', this._onRefer.bind(this));
-    } catch (err) {
-      this.logger.error({err}, 'SipRecCallSession:_answerSipRecCall error:');
-      if (this.res && !this.res.finalResponseSent) this.res.send(500);
-      this._callReleased();
-    }
-  }
-}
-
-module.exports = SipRecCallSession;

lib/tasks/conference.js

@@ -2,7 +2,7 @@ const Task = require('./task');
 const Emitter = require('events');
 const ConfirmCallSession = require('../session/confirm-call-session');
 const {TaskName, TaskPreconditions, BONG_TONE} = require('../utils/constants');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
+const normalizeJambones = require('../utils/normalize-jambones');
 const makeTask = require('./make_task');
 const bent = require('bent');
 const assert = require('assert');
@@ -10,7 +10,6 @@ const WAIT = 'wait';
 const JOIN = 'join';
 const START = 'start';
 
-
 function confNoMatch(str) {
   return str.match(/^No active conferences/) || str.match(/Conference.*not found/);
 }
@@ -28,8 +27,7 @@ function camelize(str) {
 
 function unhandled(logger, cs, evt) {
   this.participantCount = parseInt(evt.getHeader('Conference-Size'));
-  // logger.debug({evt}, `unhandled conference event: ${evt.getHeader('Action')}`) ;
-  logger.debug(`unhandled conference event: ${evt.getHeader('Action')}`) ;
+  logger.debug({evt}, `unhandled conference event: ${evt.getHeader('Action')}`) ;
 }
 
 function capitalize(s) {
@@ -47,10 +45,10 @@ class Conference extends Task {
 
     this.confName = this.data.name;
     [
-      'beep', 'startConferenceOnEnter', 'endConferenceOnExit', 'joinMuted',
+      'beep', 'startConferenceOnEnter', 'endConferenceOnExit',
       'maxParticipants', 'waitHook', 'statusHook', 'endHook', 'enterHook'
     ].forEach((attr) => this[attr] = this.data[attr]);
-    this.record = this.data.record || {};
+
     this.statusEvents = [];
     if (this.statusHook) {
       ['start', 'end', 'join', 'leave', 'start-talking', 'stop-talking'].forEach((e) => {
@@ -69,10 +67,7 @@ class Conference extends Task {
 
   get name() { return TaskName.Conference; }
 
-  get shouldRecord() { return this.record.path; }
-  get isRecording() { return this.recordingInProgress; }
-
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
     this.ep = ep;
     const dlg = cs.dlg;
@@ -108,10 +103,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::*') ;
@@ -222,7 +213,6 @@ class Conference extends Task {
             this._playSession.kill();
             this._playSession = null;
           }
-          cs.clearConferenceDetails();
           resolve();
         });
 
@@ -340,30 +330,15 @@ class Conference extends Task {
 
     const opts = {};
     if (this.endConferenceOnExit) Object.assign(opts, {flags: {endconf: true}});
-    if (this.startConferenceOnEnter) Object.assign(opts, {flags: {moderator: true}});
-    if (this.joinMuted) Object.assign(opts, {flags: {mute: true}});
-
     try {
       const {memberId, confUuid} = await this.ep.join(this.confName, opts);
       this.logger.debug({memberId, confUuid}, `Conference:_joinConference: successfully joined ${this.confName}`);
       this.memberId = memberId;
       this.confUuid = confUuid;
-
-      cs.setConferenceDetails(memberId, this.confName, confUuid);
       const response = await this.ep.api('conference', [this.confName, 'get', 'count']);
       if (response.body && /\d+/.test(response.body)) this.participantCount = parseInt(response.body);
       this._notifyConferenceEvent(cs, 'join');
 
-      // start recording if requested and we just started the conference
-      if (startConf && this.shouldRecord) {
-        this.logger.info(`recording conference to ${this.record.path}`);
-        try {
-          await this.ep.api(`conference ${this.confName} record ${this.record.path}`);
-        } catch (err) {
-          this.logger.info({err}, 'Conference:_joinConference - failed to start recording');
-        }
-      }
-
       // listen for conference events
       this.ep.filter('Conference-Unique-ID', this.confUuid);
       this.ep.conn.on('esl::event::CUSTOM::*', this.__onConferenceEvent.bind(this, cs)) ;
@@ -396,78 +371,9 @@ class Conference extends Task {
    */
   notifyStartConference(cs, opts) {
     this.logger.info({opts}, `Conference:notifyStartConference: conference ${this.confName} has now started`);
-    this.conferenceStartTime = new Date();
     this.emitter.emit('join', opts);
   }
 
-  async doConferenceMuteNonModerators(cs, opts) {
-    const mute = opts.conf_mute_status === 'mute';
-    assert (cs.isInConference);
-
-    this.logger.info(`Conference:doConferenceMuteNonModerators ${mute ? 'muting' : 'unmuting'} non-moderators`);
-    this.ep.api(`conference ${this.confName} ${mute ? 'mute' : 'unmute'} non_moderator`)
-      .catch((err) => this.logger.info({err}, 'Error muting or unmuting non_moderators'));
-
-    if (this.conf_hold_status !== 'hold' && this._playSession) {
-      this._playSession.kill();
-      this._playSession = null;
-    }
-  }
-
-  async doConferenceHold(cs, opts) {
-    assert (cs.isInConference);
-
-    const {conf_hold_status, wait_hook} = opts;
-    let hookOnly = true;
-
-    if (this.conf_hold_status !== conf_hold_status) {
-      hookOnly = false;
-      this.conf_hold_status = conf_hold_status;
-      const hold = conf_hold_status === 'hold';
-
-      this.ep.api(`conference ${this.confName} ${hold ? 'mute' : 'unmute'} ${this.memberId}`)
-        .catch((err) => this.logger.info({err}, 'Error muting or unmuting participant'));
-      this.ep.api(`conference ${this.confName} ${hold ? 'deaf' : 'undeaf'} ${this.memberId}`)
-        .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') {
-      const {dlg} = cs;
-      this._doWaitHookWhileOnHold(cs, dlg, this.wait_hook);
-    }
-    else if (this.conf_hold_status !== 'hold' && this._playSession) {
-      this._playSession.kill();
-      this._playSession = null;
-    }
-  }
-
-  async _doWaitHookWhileOnHold(cs, dlg, wait_hook) {
-    do {
-      try {
-        let tasks = [];
-        if (wait_hook.url)
-          tasks = await this._playHook(cs, dlg, wait_hook.url);
-        if (0 === tasks.length) break;
-      } catch (err) {
-        if (!this.killed) {
-          this.logger.info(err, `Conference:_doWait: failed retrieving wait_hook for ${this.confName}`);
-        }
-        this._playSession = null;
-        break;
-      }
-    } while (!this.killed && this.conf_hold_status === 'hold');
-  }
-
   /**
    * Add ourselves to the waitlist of sessions to be notified once
    * the conference starts
@@ -541,9 +447,7 @@ class Conference extends Task {
 
   async _playHook(cs, dlg, hook, allowed = [TaskName.Play, TaskName.Say, TaskName.Pause]) {
     assert(!this._playSession);
-    const b3 = this.getTracingPropagation();
-    const httpHeaders = b3 && {b3};
-    const json = await cs.application.requestor.request('verb:hook', hook, cs.callInfo, httpHeaders);
+    const json = await cs.application.requestor.request(hook, cs.callInfo);
     const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
 
     const allowedTasks = tasks.filter((t) => allowed.includes(t.name));
@@ -553,9 +457,6 @@ class Conference extends Task {
     }
     this.logger.debug(`Conference:_playHook: executing ${tasks.length} tasks`);
 
-    /* we might have been killed while off fetching waitHook */
-    if (this.killed) return [];
-
     if (tasks.length > 0) {
       this._playSession = new ConfirmCallSession({
         logger: this.logger,
@@ -563,11 +464,7 @@ class Conference extends Task {
         dlg,
         ep: cs.ep,
         callInfo: cs.callInfo,
-        accountInfo: cs.accountInfo,
-        memberId: this.memberId,
-        confName: this.confName,
-        tasks,
-        rootSpan: cs.rootSpan
+        tasks
       });
       await this._playSession.exec();
       this._playSession = null;
@@ -583,15 +480,10 @@ 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);
   }
 
   async replaceEndpointAndEnd(cs) {
-    cs.clearConferenceDetails();
     if (this.replaced) return;
     this.replaced = true;
     try {
@@ -604,14 +496,11 @@ class Conference extends Task {
 
   _notifyConferenceEvent(cs, eventName, params = {}) {
     if (this.statusEvents.includes(eventName)) {
-      const b3 = this.getTracingPropagation();
-      const httpHeaders = b3 && {b3};
       params.event = eventName;
       params.duration = (Date.now() - this.conferenceStartTime.getTime()) / 1000;
       if (!params.time) params.time = (new Date()).toISOString();
       if (!params.members && typeof this.participantCount === 'number') params.members = this.participantCount;
-      cs.application.requestor
-        .request('verb:hook', this.statusHook, Object.assign(params, this.statusParams, httpHeaders))
+      cs.application.requestor.request(this.statusHook, Object.assign(params, this.statusParams))
         .catch((err) => this.logger.info(err, 'Conference:notifyConferenceEvent - error'));
     }
   }

lib/tasks/config.js

@@ -1,183 +0,0 @@
-const Task = require('./task');
-const {TaskName, TaskPreconditions} = require('../utils/constants');
-
-class TaskConfig extends Task {
-  constructor(logger, opts) {
-    super(logger, opts);
-    [
-      'synthesizer',
-      'recognizer',
-      'bargeIn',
-      'record',
-      'listen'
-    ].forEach((k) => this[k] = this.data[k] || {});
-
-    if ('notifyEvents' in this.data) {
-      this.notifyEvents = !!this.data.notifyEvents;
-    }
-
-    if (this.bargeIn.enable) {
-      this.gatherOpts = {
-        verb: 'gather',
-        timeout: 0,
-        bargein: true,
-        input: ['speech']
-      };
-      [
-        'finishOnKey', 'input', 'numDigits', 'minDigits', 'maxDigits',
-        'interDigitTimeout', 'bargein', 'dtmfBargein', 'minBargeinWordCount', 'actionHook'
-      ].forEach((k) => {
-        if (this.bargeIn[k]) this.gatherOpts[k] = this.bargeIn[k];
-      });
-    }
-    if (this.bargeIn.sticky) this.autoEnable = true;
-    this.preconditions = (this.bargeIn.enable || this.record?.action || this.listen?.url || this.data.amd) ?
-      TaskPreconditions.Endpoint :
-      TaskPreconditions.None;
-  }
-
-  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 = [];
-    if (this.bargeIn.enable) phrase.push('enable barge-in');
-    if (this.hasSynthesizer) {
-      const {vendor:v, language:l, voice} = this.synthesizer;
-      const s = `{${v},${l},${voice}}`;
-      phrase.push(`set synthesizer${s}`);
-    }
-    if (this.hasRecognizer) {
-      const {vendor:v, language:l} = this.recognizer;
-      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(',')}`;
-  }
-
-  async exec(cs, {ep} = {}) {
-    await super.exec(cs);
-
-    if (this.notifyEvents) {
-      this.logger.debug(`turning event notification ${this.notifyEvents ? 'on' : 'off'}`);
-      cs.notifyEvents = !!this.data.notifyEvents;
-    }
-
-    if (this.data.amd) {
-      this.startAmd = cs.startAmd;
-      this.stopAmd = cs.stopAmd;
-      this.on('amd', this._onAmdEvent.bind(this, cs));
-
-      try {
-        this.ep = ep;
-        this.startAmd(cs, ep, this, this.data.amd);
-      } catch (err) {
-        this.logger.info({err}, 'Config:exec - Error calling startAmd');
-      }
-    }
-
-    if (this.hasSynthesizer) {
-      cs.speechSynthesisVendor = this.synthesizer.vendor !== 'default'
-        ? this.synthesizer.vendor
-        : cs.speechSynthesisVendor;
-      cs.speechSynthesisLanguage = this.synthesizer.language !== 'default'
-        ?  this.synthesizer.language
-        : cs.speechSynthesisLanguage;
-      cs.speechSynthesisVoice = this.synthesizer.voice !== 'default'
-        ? this.synthesizer.voice
-        : cs.speechSynthesisVoice;
-      this.logger.info({synthesizer: this.synthesizer}, 'Config: updated synthesizer');
-    }
-    if (this.hasRecognizer) {
-      cs.speechRecognizerVendor = this.recognizer.vendor !== 'default'
-        ? this.recognizer.vendor
-        : cs.speechRecognizerVendor;
-      cs.speechRecognizerLanguage = this.recognizer.language !== 'default'
-        ? this.recognizer.language
-        : cs.speechRecognizerLanguage;
-      cs.isContinuousAsr = typeof this.recognizer.asrTimeout === 'number' ? true : false;
-      if (cs.isContinuousAsr) {
-        cs.asrTimeout = this.recognizer.asrTimeout;
-        cs.asrDtmfTerminationDigit = this.recognizer.asrDtmfTerminationDigit;
-      }
-      if (Array.isArray(this.recognizer.hints)) {
-        const obj = {hints: this.recognizer.hints};
-        if (typeof this.recognizer.hintsBoost === 'number') {
-          obj.hintsBoost = this.recognizer.hintsBoost;
-        }
-        cs.globalSttHints = obj;
-      }
-      if (Array.isArray(this.recognizer.altLanguages)) {
-        this.logger.info({altLanguages: this.recognizer.altLanguages}, 'Config: updated altLanguages');
-        cs.altLanguages = this.recognizer.altLanguages;
-      }
-      if ('punctuation' in this.recognizer) {
-        cs.globalSttPunctuation = this.recognizer.punctuation;
-      }
-      this.logger.info({
-        recognizer: this.recognizer,
-        isContinuousAsr: cs.isContinuousAsr
-      }, 'Config: updated recognizer');
-    }
-    if ('enable' in this.bargeIn) {
-      if (this.bargeIn.enable === true && this.gatherOpts) {
-        this.gatherOpts.recognizer = this.hasRecognizer ?
-          this.recognizer :
-          {
-            vendor: cs.speechRecognizerVendor,
-            language: cs.speechRecognizerLanguage
-          };
-        this.logger.info({opts: this.gatherOpts}, 'Config: enabling bargeIn');
-        cs.enableBotMode(this.gatherOpts, this.autoEnable);
-      }
-      else if (this.bargeIn.enable === false) {
-        this.logger.info('Config: disabling bargeIn');
-        cs.disableBotMode();
-      }
-    }
-    if (this.record.action) {
-      try {
-        await cs.notifyRecordOptions(this.record);
-      } catch (err) {
-        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);
-  }
-
-  _onAmdEvent(cs, evt) {
-    this.logger.info({evt}, 'Config:_onAmdEvent');
-    const {actionHook} = this.data.amd;
-    this.performHook(cs, actionHook, evt)
-      .catch((err) => {
-        this.logger.error({err}, 'Config:_onAmdEvent - error calling actionHook');
-      });
-
-  }
-}
-
-module.exports = TaskConfig;

lib/tasks/dequeue.js

@@ -23,7 +23,7 @@ class TaskDequeue extends Task {
 
   get name() { return TaskName.Dequeue; }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
     this.ep = ep;
     this.queueName = `queue:${cs.accountSid}:${this.queueName}`;

lib/tasks/dial.js

@@ -12,9 +12,7 @@ const assert = require('assert');
 const placeCall = require('../utils/place-outdial');
 const sessionTracker = require('../session/session-tracker');
 const DtmfCollector = require('../utils/dtmf-collector');
-const dbUtils = require('../utils/db-utils');
 const debug = require('debug')('jambonz:feature-server');
-const {parseUri} = require('drachtio-srf');
 
 function parseDtmfOptions(logger, dtmfCapture) {
   let parentDtmfCollector, childDtmfCollector;
@@ -92,7 +90,6 @@ class TaskDial extends Task {
     this.timeLimit = this.data.timeLimit;
     this.confirmHook = this.data.confirmHook;
     this.confirmMethod = this.data.confirmMethod;
-    this.referHook = this.data.referHook;
     this.dtmfHook = this.data.dtmfHook;
     this.proxy = this.data.proxy;
 
@@ -133,39 +130,9 @@ class TaskDial extends Task {
 
   get name() { return TaskName.Dial; }
 
-  get canReleaseMedia() {
-    return !process.env.ANCHOR_MEDIA_ALWAYS &&
-      !this.listenTask &&
-      !this.transcribeTask &&
-      !this.startAmd;
-  }
-
-  get summary() {
-    if (this.target.length === 1) {
-      const target = this.target[0];
-      switch (target.type) {
-        case 'phone':
-        case 'teams':
-          return `${this.name}{type=${target.type},number=${target.number}}`;
-        case 'user':
-          return `${this.name}{type=${target.type},name=${target.name}}`;
-        case 'sip':
-          return `${this.name}{type=${target.type},sipUri=${target.sipUri}}`;
-        default:
-          return `${this.name}`;
-      }
-    }
-    else return `${this.name}{${this.target.length} targets}`;
-  }
-
   async exec(cs) {
     await super.exec(cs);
     try {
-      if (this.data.amd) {
-        this.startAmd = cs.startAmd;
-        this.stopAmd = cs.stopAmd;
-        this.on('amd', this._onAmdEvent.bind(this, cs));
-      }
       if (cs.direction === CallDirection.Inbound) {
         await this._initializeInbound(cs);
       }
@@ -175,12 +142,13 @@ class TaskDial extends Task {
           this.epOther.play(this.dialMusic).catch((err) => {});
         }
       }
-      if (!this.killed) await this._attemptCalls(cs);
+      if (this.epOther) this._installDtmfDetection(cs, this.epOther, this.parentDtmfCollector);
+      await this._attemptCalls(cs);
       await this.awaitTaskDone();
       this.logger.debug({callSid: this.cs.callSid}, 'Dial:exec task is done, sending actionHook if any');
       await this.performAction(this.results, this.killReason !== KillReason.Replaced);
-      this._removeDtmfDetection(cs.dlg);
-      this._removeDtmfDetection(this.dlg);
+      this._removeDtmfDetection(cs, this.epOther);
+      this._removeDtmfDetection(cs, this.ep);
     } catch (err) {
       this.logger.error({err}, 'TaskDial:exec terminating with error');
       this.kill(cs);
@@ -189,41 +157,18 @@ class TaskDial extends Task {
 
   async kill(cs, reason) {
     super.kill(cs);
-    try {
-      if (this.ep && this.ep.amd) this.stopAmd(this.ep, this);
-    } catch (err) {
-      this.logger.error({err}, 'DialTask:kill - error stopping answering machine detectin');
-    }
-    if (this.dialMusic && this.epOther) {
-      this.epOther.api('uuid_break', this.epOther.uuid)
-        .catch((err) => this.logger.info(err, 'Error killing dialMusic'));
-    }
     this.killReason = reason || KillReason.Hangup;
-    if (this.timerMaxCallDuration) {
-      clearTimeout(this.timerMaxCallDuration);
-      this.timerMaxCallDuration = null;
-    }
-    if (this.timerRing) {
-      clearTimeout(this.timerRing);
-      this.timerRing = null;
-    }
-    this._removeDtmfDetection(cs.dlg);
-    this._removeDtmfDetection(this.dlg);
+    this._removeDtmfDetection(this.cs, this.epOther);
+    this._removeDtmfDetection(this.cs, this.ep);
     this._killOutdials();
     if (this.sd) {
       this.sd.kill();
-      this.sd.removeAllListeners();
       this.sd = null;
     }
     if (this.callSid) sessionTracker.remove(this.callSid);
-    if (this.listenTask) {
-      await this.listenTask.kill(cs);
-      this.listenTask = null;
-    }
-    if (this.transcribeTask) {
-      await this.transcribeTask.kill(cs);
-      this.transcribeTask = null;
-    }
+    if (this.listenTask) await this.listenTask.kill(cs);
+    if (this.transcribeTask) await this.transcribeTask.kill(cs);
+    if (this.timerMaxCallDuration) clearTimeout(this.timerMaxCallDuration);
     this.notifyTaskDone();
   }
 
@@ -232,32 +177,18 @@ class TaskDial extends Task {
    * @param {*} tasks - array of play/say tasks to execute
    */
   async whisper(tasks, callSid) {
+    if (!this.epOther || !this.ep) return this.logger.info('Dial:whisper: no paired endpoint found');
     try {
       const cs = this.callSession;
-      if (!this.ep && !this.epOther) {
-        await this.reAnchorMedia(this.callSession, this.sd);
-      }
-
-      if (!this.epOther || !this.ep) return this.logger.info('Dial:whisper: no paired endpoint found');
-
       this.logger.debug('Dial:whisper unbridging endpoints');
       await this.epOther.unbridge();
       this.logger.debug('Dial:whisper executing tasks');
       while (tasks.length && !cs.callGone) {
         const task = tasks.shift();
-        const {span, ctx} = this.startChildSpan(`whisper:${task.summary}`);
-        task.span = span;
-        task.ctx = ctx;
-        await task.exec(cs, callSid === this.callSid ? {ep: this.ep} : {ep: this.epOther});
-        span.end();
+        await task.exec(cs, callSid === this.callSid ? this.ep : this.epOther);
       }
       this.logger.debug('Dial:whisper tasks complete');
-      if (!cs.callGone && this.epOther) {
-
-        /* if we can release the media back to the SBC, do so now */
-        if (this.canReleaseMedia) this._releaseMedia(cs, this.sd);
-        else this.epOther.bridge(this.ep);
-      }
+      if (!cs.callGone && this.epOther) this.epOther.bridge(this.ep);
     } catch (err) {
       this.logger.error(err, 'Dial:whisper error');
     }
@@ -267,120 +198,64 @@ class TaskDial extends Task {
    * mute or unmute one side of the call
    */
   async mute(callSid, doMute) {
-    const parentCall = callSid !== this.callSid;
-    const dlg = parentCall ? this.callSession.dlg : this.dlg;
-    const hdr = `${doMute ? 'mute' : 'unmute'} call leg`;
+    if (!this.epOther || !this.ep) return this.logger.info('Dial:mute: no paired endpoint found');
     try {
-      /* let rtpengine do the mute / unmute */
-      await dlg.request({
-        method: 'INFO',
-        headers: {
-          'X-Reason': hdr
-        }
-      });
+      const parentCall = callSid !== this.callSid;
+      const ep = parentCall ? this.epOther : this.ep;
+      await ep[doMute ? 'mute' : 'unmute']();
+      this.logger.debug(`Dial:mute ${doMute ? 'muted' : 'unmuted'} ${parentCall ? 'parentCall' : 'childCall'}`);
     } catch (err) {
-      this.logger.info({err}, `Dial:mute - ${hdr} error`);
+      this.logger.error(err, 'Dial:mute error');
     }
   }
 
-  async handleRefer(cs, req, res, callInfo = cs.callInfo) {
-    if (this.referHook) {
-      try {
-        const isChild = !!callInfo.parentCallSid;
-        const referring_call_sid = isChild ? callInfo.callSid : cs.callSid;
-        const referred_call_sid = isChild ? callInfo.parentCallSid : this.sd.callSid;
-
-        const b3 = this.getTracingPropagation();
-        const httpHeaders = b3 && {b3};
-
-        const to = parseUri(req.getParsedHeader('Refer-To').uri);
-        const by = parseUri(req.getParsedHeader('Referred-By').uri);
-        this.logger.info({to}, 'refer to parsed');
-        await cs.requestor.request('verb:hook', this.referHook, {
-          ...callInfo,
-          refer_details: {
-            sip_refer_to: req.get('Refer-To'),
-            sip_referred_by: req.get('Referred-By'),
-            sip_user_agent: req.get('User-Agent'),
-            refer_to_user: to.user,
-            referred_by_user: by.user,
-            referring_call_sid,
-            referred_call_sid
-          }
-        }, httpHeaders);
-        res.send(202);
-        this.logger.info('DialTask:handleRefer - sent 202 Accepted');
-      } catch (err) {
-        res.send(err.statusCode || 501);
-      }
-    }
-    else {
-      this.logger.info('DialTask:handleRefer - got REFER but no referHook, responding 501');
-      res.send(501);
-    }
-  }
-
-  _removeHandlers(sd) {
-    sd.removeAllListeners('accept');
-    sd.removeAllListeners('decline');
-    sd.removeAllListeners('adulting');
-    sd.removeAllListeners('callStatusChange');
-    sd.removeAllListeners('callCreateFail');
-  }
-
   _killOutdials() {
     for (const [callSid, sd] of Array.from(this.dials)) {
       this.logger.debug(`Dial:_killOutdials killing callSid ${callSid}`);
       sd.kill().catch((err) => this.logger.info(err, `Dial:_killOutdials Error killing ${callSid}`));
-      this._removeHandlers(sd);
     }
     this.dials.clear();
   }
 
-  _installDtmfDetection(cs, dlg) {
-    dlg.on('info', this._onInfo.bind(this, cs, dlg));
+  _installDtmfDetection(cs, ep, dtmfDetector) {
+    if (ep && this.dtmfHook && !ep.dtmfDetector) {
+      ep.dtmfDetector = dtmfDetector;
+      ep.on('dtmf', this._onDtmf.bind(this, cs, ep));
+    }
   }
-  _removeDtmfDetection(dlg) {
-    dlg && dlg.removeAllListeners('info');
+  _removeDtmfDetection(cs, ep) {
+    if (ep) {
+      delete ep.dtmfDetector;
+      ep.removeAllListeners('dtmf');
+    }
   }
 
-  _onInfo(cs, dlg, req, res) {
-    res.send(200);
-    if (req.get('Content-Type') !== 'application/dtmf-relay') return;
-
-    const dtmfDetector = dlg === cs.dlg ? this.parentDtmfCollector : this.childDtmfCollector;
-    if (!dtmfDetector) return;
-    let requestor, callSid, callInfo;
-    if (dtmfDetector === this.parentDtmfCollector) {
-      requestor = cs.requestor;
-      callSid = cs.callSid;
-      callInfo = cs.callInfo;
-    }
-    else {
-      requestor = this.sd?.requestor;
-      callSid = this.sd?.callSid;
-      callInfo = this.sd?.callInfo;
-    }
-    if (!requestor) return;
-    const arr = /Signal=([0-9#*])/.exec(req.body);
-    if (!arr) return;
-    const key = arr[1];
-    const match = dtmfDetector.keyPress(key);
-    if (match) {
-      const b3 = this.getTracingPropagation();
-      const httpHeaders = b3 && {b3};
-      this.logger.info({callSid}, `Dial:_onInfo triggered dtmf match: ${match}`);
-      requestor.request('verb:hook', this.dtmfHook, {dtmf: match, ...callInfo.toJSON()}, httpHeaders)
-        .catch((err) => this.logger.info(err, 'Dial:_onDtmf - error'));
+  _onDtmf(cs, ep, evt) {
+    if (ep.dtmfDetector) {
+      const match = ep.dtmfDetector.keyPress(evt.dtmf);
+      if (match) {
+        this.logger.debug({callSid: this.cs.callSid}, `Dial:_onDtmf triggered dtmf match: ${match}`);
+        const requestor = ep.dtmfDetector === this.parentDtmfCollector ?
+          cs.requestor :
+          (this.sd ? this.sd.requestor : null);
+        if (!requestor) {
+          this.logger.info(`Dial:_onDtmf got digits on B leg after adulting: ${evt.dtmf}`);
+        }
+        else {
+          requestor.request(this.dtmfHook, {dtmf: match, ...cs.callInfo})
+            .catch((err) => this.logger.info(err, 'Dial:_onDtmf - error'));
+        }
+      }
     }
   }
 
   async _initializeInbound(cs) {
-    const {ep} = await cs._evalEndpointPrecondition(this);
+    const ep = await cs._evalEndpointPrecondition(this);
     this.epOther = ep;
+    debug(`Dial:__initializeInbound allocated ep for incoming call: ${ep.uuid}`);
 
     /* send outbound legs back to the same SBC (to support static IP feature) */
-    if (!this.proxy) this.proxy = `${cs.req.source_address}:${cs.req.source_port}`;
+    if (!this.proxy) this.proxy = `${cs.req.source_address}:${cs.req.source_port};transport=tcp`;
 
     if (this.dialMusic) {
       // play dial music to caller while we outdial
@@ -394,25 +269,20 @@ class TaskDial extends Task {
     const {req, srf} = cs;
     const {getSBC} = srf.locals;
     const {lookupTeamsByAccount, lookupAccountBySid} = srf.locals.dbHelpers;
-    const {lookupCarrier} = dbUtils(this.logger, cs.srf);
     const sbcAddress = this.proxy || getSBC();
     const teamsInfo = {};
     let fqdn;
 
     if (!sbcAddress) throw new Error('no SBC found for outbound call');
-    this.headers = {
-      'X-Account-Sid': cs.accountSid,
-      ...(req && req.has('X-CID') && {'X-CID': req.get('X-CID')}),
-      ...(req && req.has('P-Asserted-Identity') && {'P-Asserted-Identity': req.get('P-Asserted-Identity')}),
-      // Put headers at the end to make sure opt.headers override all default behavior.
-      ...this.headers
-    };
-
     const opts = {
-      headers: this.headers,
+      headers: req && req.has('X-CID') ? Object.assign(this.headers, {'X-CID': req.get('X-CID')}) : this.headers,
       proxy: `sip:${sbcAddress}`,
       callingNumber: this.callerId || req.callingNumber
     };
+    opts.headers = {
+      ...opts.headers,
+      'X-Account-Sid': cs.accountSid
+    };
 
     const t = this.target.find((t) => t.type === 'teams');
     if (t) {
@@ -422,22 +292,15 @@ class TaskDial extends Task {
     }
 
     const ms = await cs.getMS();
-    this.timerRing = setTimeout(() => {
+    const timerRing = setTimeout(() => {
       this.logger.info(`Dial:_attemptCall: ring no answer timer ${this.timeout}s exceeded`);
-      this.timerRing = null;
       this._killOutdials();
-      this.result = {
-        dialCallStatus: CallStatus.NoAnswer,
-        dialSipStatus: 487
-      };
-      this.kill(cs);
     }, this.timeout * 1000);
 
-    this.span.setAttributes({'dial.target': JSON.stringify(this.target)});
     this.target.forEach(async(t) => {
       try {
-        t.confirmHook = t.confirmHook || this.confirmHook;
-        //t.method = t.method || this.confirmMethod || 'POST';
+        t.url = t.url || this.confirmUrl;
+        t.method = t.method || this.confirmMethod || 'POST';
         if (t.type === 'teams') t.teamsInfo = teamsInfo;
         if (t.type === 'user' && !t.name.includes('@') && !fqdn) {
           const user = t.name;
@@ -451,16 +314,6 @@ class TaskDial extends Task {
             this.logger.error({err}, 'Error looking up account by sid');
           }
         }
-        if (t.type === 'phone' && t.trunk) {
-          const voip_carrier_sid = await lookupCarrier(cs.accountSid, t.trunk);
-          this.logger.info(`Dial:_attemptCalls: selected ${voip_carrier_sid} for requested carrier: ${t.trunk})`);
-          if (voip_carrier_sid) {
-            opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
-          }
-        }
-
-        if (this.killed) return;
-
         const sd = placeCall({
           logger: this.logger,
           application: cs.application,
@@ -469,19 +322,13 @@ class TaskDial extends Task {
           sbcAddress,
           target: t,
           opts,
-          callInfo: cs.callInfo,
-          accountInfo: cs.accountInfo,
-          rootSpan: cs.rootSpan,
-          startSpan: this.startSpan.bind(this)
+          callInfo: cs.callInfo
         });
         this.dials.set(sd.callSid, sd);
 
         sd
-          .on('refer', (callInfo, req, res) => this.handleRefer(cs, req, res, callInfo))
           .on('callCreateFail', () => {
-            clearTimeout(this.timerRing);
             this.dials.delete(sd.callSid);
-            sd.removeAllListeners();
             if (this.dials.size === 0 && !this.sd) {
               this.logger.debug('Dial:_attemptCalls - all calls failed after call create err, ending task');
               this.kill(cs);
@@ -505,8 +352,7 @@ class TaskDial extends Task {
                 break;
               case CallStatus.InProgress:
                 this.logger.debug('Dial:_attemptCall -- call was answered');
-                clearTimeout(this.timerRing);
-                this.timerRing = null;
+                clearTimeout(timerRing);
                 break;
               case CallStatus.Failed:
               case CallStatus.Busy:
@@ -514,41 +360,23 @@ class TaskDial extends Task {
                 this.dials.delete(sd.callSid);
                 if (this.dials.size === 0 && !this.sd) {
                   this.logger.debug('Dial:_attemptCalls - all calls failed after call failure, ending task');
-                  clearTimeout(this.timerRing);
-                  this.timerRing = null;
+                  clearTimeout(timerRing);
                   this.kill(cs);
                 }
                 break;
             }
           })
-          .on('accept', async() => {
+          .on('accept', () => {
             this.logger.debug(`Dial:_attemptCalls - we have a winner: ${sd.callSid}`);
-            clearTimeout(this.timerRing);
-            try {
-              await this._connectSingleDial(cs, sd);
-            } catch (err) {
-              this.logger.info({err}, 'Dial:_attemptCalls - Error calling _connectSingleDial ');
-            }
+            this._connectSingleDial(cs, sd);
           })
           .on('decline', () => {
             this.logger.debug(`Dial:_attemptCalls - declined: ${sd.callSid}`);
-            clearTimeout(this.timerRing);
             this.dials.delete(sd.callSid);
-            sd.removeAllListeners();
             if (this.dials.size === 0 && !this.sd) {
               this.logger.debug('Dial:_attemptCalls - all calls failed after decline, ending task');
               this.kill(cs);
             }
-          })
-          .on('reinvite', (req, res) => {
-            try {
-              cs.handleReinviteAfterMediaReleased(req, res);
-            } catch (err) {
-              this.logger.error(err, 'Error in dial einvite from B leg');
-            }
-          })
-          .on('refer', (callInfo, req, res) => {
-
           })
           .once('adulting', () => {
             /* child call just adulted and got its own session */
@@ -566,8 +394,8 @@ class TaskDial extends Task {
     });
   }
 
-  async _connectSingleDial(cs, sd) {
-    if (!this.bridged && !this.canReleaseMedia) {
+  _connectSingleDial(cs, sd) {
+    if (!this.bridged) {
       this.logger.debug('Dial:_connectSingleDial bridging endpoints');
       if (this.epOther) {
         this.epOther.api('uuid_break', this.epOther.uuid);
@@ -577,27 +405,20 @@ class TaskDial extends Task {
     }
 
     // ding! ding! ding! we have a winner
-    await this._selectSingleDial(cs, sd);
+    this._selectSingleDial(cs, sd);
     this._killOutdials();       // NB: order is important
   }
 
-  _onMaxCallDuration(cs) {
-    this.logger.info(`Dial:_onMaxCallDuration tearing down call as it has reached ${this.timeLimit}s`);
-    this.ep && this.ep.unbridge();
-    this.kill(cs);
-  }
-
   /**
    * We now have a call leg produced by the Dial action, so
    * - hangup any simrings in progress
    * - save the dialog and endpoint
    * - clock the start time of the call,
    * - start a max call length timer (optionally)
-   * - start answering machine detection (optionally)
    * - launch any nested tasks
    * - and establish a handler to clean up if the called party hangs up
    */
-  async _selectSingleDial(cs, sd) {
+  _selectSingleDial(cs, sd) {
     debug(`Dial:_selectSingleDial ep for outbound call: ${sd.ep.uuid}`);
     this.dials.delete(sd.callSid);
 
@@ -605,10 +426,14 @@ class TaskDial extends Task {
     this.callSid = sd.callSid;
     if (this.earlyMedia) {
       debug('Dial:_selectSingleDial propagating answer supervision on A leg now that B is connected');
-      await cs.propagateAnswer();
+      cs.propagateAnswer();
     }
     if (this.timeLimit) {
-      this.timerMaxCallDuration = setTimeout(this._onMaxCallDuration.bind(this, cs), this.timeLimit * 1000);
+      this.timerMaxCallDuration = setTimeout(() => {
+        this.logger.info(`Dial:_selectSingleDial tearing down call as it has reached ${this.timeLimit}s`);
+        this.ep.unbridge();
+        this.kill(cs);
+      }, this.timeLimit * 1000);
     }
     sessionTracker.add(this.callSid, cs);
     this.dlg.on('destroy', () => {
@@ -616,11 +441,8 @@ class TaskDial extends Task {
       if (this.dlg) {
         this.logger.debug('Dial:_selectSingleDial called party hungup, ending dial operation');
         sessionTracker.remove(this.callSid);
-        if (this.timerMaxCallDuration) {
-          clearTimeout(this.timerMaxCallDuration);
-          this.timerMaxCallDuration = null;
-        }
-        this.ep && this.ep.unbridge();
+        if (this.timerMaxCallDuration) clearTimeout(this.timerMaxCallDuration);
+        this.ep.unbridge();
         this.kill(cs);
       }
     });
@@ -631,21 +453,10 @@ class TaskDial extends Task {
       dialCallSid: sd.callSid,
     });
 
-    if (this.parentDtmfCollector) this._installDtmfDetection(cs, cs.dlg);
-    if (this.childDtmfCollector) this._installDtmfDetection(cs, this.dlg);
+    if (this.childDtmfCollector) this._installDtmfDetection(cs, this.ep, this.childDtmfCollector);
 
-    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep2: this.epOther, ep:this.ep});
-    if (this.listenTask) this.listenTask.exec(cs, {ep: this.epOther});
-    if (this.startAmd) {
-      try {
-        this.startAmd(cs, this.ep, this, this.data.amd);
-      } catch (err) {
-        this.logger.info({err}, 'Dial:_selectSingleDial - Error calling startAmd');
-      }
-    }
-
-    /* if we can release the media back to the SBC, do so now */
-    if (this.canReleaseMedia) setTimeout(this._releaseMedia.bind(this, cs, sd), 200);
+    if (this.transcribeTask) this.transcribeTask.exec(cs, this.ep);
+    if (this.listenTask) this.listenTask.exec(cs, this.ep);
   }
 
   _bridgeEarlyMedia(sd) {
@@ -657,47 +468,6 @@ class TaskDial extends Task {
     }
   }
 
-  /**
-   * Release the media from freeswitch
-   * @param {*} cs
-   * @param {*} sd
-   */
-  async _releaseMedia(cs, sd) {
-    assert(cs.ep && sd.ep);
-
-    try {
-      const aLegSdp = cs.ep.remote.sdp;
-      const bLegSdp = sd.dlg.remote.sdp;
-      await Promise.all[sd.releaseMediaToSBC(aLegSdp, cs.ep.local.sdp), cs.releaseMediaToSBC(bLegSdp)];
-      this.epOther = null;
-      this.logger.info('Dial:_releaseMedia - successfully released media from freewitch');
-    } catch (err) {
-      this.logger.info({err}, 'Dial:_releaseMedia error');
-    }
-  }
-
-  async reAnchorMedia(cs, sd) {
-    if (cs.ep && sd.ep) return;
-
-    this.logger.info('Dial:reAnchorMedia - re-anchoring media to freewitch');
-    await Promise.all([sd.reAnchorMedia(), cs.reAnchorMedia()]);
-    this.epOther = cs.ep;
-  }
-
-  async handleReinviteAfterMediaReleased(req, res) {
-    const sdp = await this.dlg.modify(req.body);
-    this.logger.info({sdp}, 'Dial:handleReinviteAfterMediaReleased - sent reinvite to B leg');
-    res.send(200, {body: sdp});
-  }
-
-  _onAmdEvent(cs, evt) {
-    this.logger.info({evt}, 'Dial:_onAmdEvent');
-    const {actionHook} = this.data.amd;
-    this.performHook(cs, actionHook, evt)
-      .catch((err) => {
-        this.logger.error({err}, 'Dial:_onAmdEvent - error calling actionHook');
-      });
-  }
 }
 
 module.exports = TaskDial;

lib/tasks/dialogflow/index.js

@@ -3,28 +3,16 @@ const {TaskName, TaskPreconditions} = require('../../utils/constants');
 const Intent = require('./intent');
 const DigitBuffer = require('./digit-buffer');
 const Transcription = require('./transcription');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
+const normalizeJambones = require('../../utils/normalize-jambones');
 
 class Dialogflow extends Task {
   constructor(logger, opts) {
     super(logger, opts);
     this.preconditions = TaskPreconditions.Endpoint;
+
     this.credentials = this.data.credentials;
-
-    /* set project id with environment and region (optionally) */
-    if (this.data.environment && this.data.region) {
-      this.project = `${this.data.project}:${this.data.environment}:${this.data.region}`;
-    }
-    else if (this.data.environment) {
-      this.project = `${this.data.project}:${this.data.environment}`;
-    }
-    else if (this.data.region) {
-      this.project = `${this.data.project}::${this.data.region}`;
-    }
-    else {
-      this.project = this.data.project;
-    }
-
+    if (this.data.environment) this.project = `${this.data.project}:${this.data.environment}`;
+    else this.project = this.data.project;
     this.lang = this.data.lang || 'en-US';
     this.welcomeEvent = this.data.welcomeEvent || '';
     if (this.welcomeEvent.length && this.data.welcomeEventParams && typeof this.data.welcomeEventParams === 'object') {
@@ -64,7 +52,7 @@ class Dialogflow extends Task {
 
   get name() { return TaskName.Dialogflow; }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
 
     try {
@@ -210,7 +198,6 @@ class Dialogflow extends Task {
     /* if we are using tts and a message was provided, play it out */
     if (this.vendor && intent.fulfillmentText && intent.fulfillmentText.length > 0) {
       const {srf} = cs;
-      const {stats} = srf.locals;
       const {synthAudio} = srf.locals.dbHelpers;
       this.waitingForPlayStart = false;
 
@@ -230,7 +217,7 @@ class Dialogflow extends Task {
           credentials: this.ttsCredentials
         };
         this.logger.debug({obj}, 'Dialogflow:_onIntent - playing message via tts');
-        const {filePath, servedFromCache} = await synthAudio(stats, obj);
+        const {filePath, servedFromCache} = await synthAudio(obj);
         if (filePath) cs.trackTmpFile(filePath);
         if (!this.ttsCredentials && !servedFromCache) cs.billForTts(intent.fulfillmentText.length);
 
@@ -295,9 +282,9 @@ class Dialogflow extends Task {
     }
 
     // if a final transcription, start a typing sound
-    if (this.thinkingMusic && !transcription.isEmpty && transcription.isFinal &&
+    if (this.thinkingSound > 0 && !transcription.isEmpty && transcription.isFinal &&
       transcription.confidence > 0.8) {
-      ep.play(this.data.thinkingMusic).catch((err) => this.logger.info(err, 'Error playing typing sound'));
+      ep.play(this.data.thinkingSound).catch((err) => this.logger.info(err, 'Error playing typing sound'));
     }
 
     // interrupt playback on speaking if bargein = true
@@ -405,8 +392,8 @@ class Dialogflow extends Task {
     this.dtmfEntry = dtmfEntry;
     this.digitBuffer = null;
     // if a final transcription, start a typing sound
-    if (this.thinkingMusic) {
-      ep.play(this.thinkingMusic).catch((err) => this.logger.info(err, 'Error playing typing sound'));
+    if (this.thinkingSound > 0) {
+      ep.play(this.thinkingSound).catch((err) => this.logger.info(err, 'Error playing typing sound'));
     }
 
     // kill the current dialogflow, which will result in us getting an immediate intent
@@ -452,11 +439,8 @@ class Dialogflow extends Task {
     this.noinputTimer = setTimeout(this._onNoInput.bind(this, ep, cs), this.noInputTimeout);
   }
 
-  async _performHook(cs, hook, results = {}) {
-    const b3 = this.getTracingPropagation();
-    const httpHeaders = b3 && {b3};
-    const json = await this.cs.requestor.request('verb:hook', hook,
-      {...results, ...cs.callInfo.toJSON()}, httpHeaders);
+  async _performHook(cs, hook, results) {
+    const json = await this.cs.requestor.request(hook, results);
     if (json && Array.isArray(json)) {
       const makeTask = require('../make_task');
       const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));

lib/tasks/dtmf.js

@@ -12,7 +12,7 @@ class TaskDtmf extends Task {
 
   get name() { return TaskName.Dtmf; }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
     this.ep = ep;
     try {

lib/tasks/enqueue.js

@@ -1,7 +1,7 @@
 const Task = require('./task');
 const Emitter = require('events');
 const ConfirmCallSession = require('../session/confirm-call-session');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
+const normalizeJambones = require('../utils/normalize-jambones');
 const makeTask = require('./make_task');
 const {TaskName, TaskPreconditions, QueueResults, KillReason} = require('../utils/constants');
 const bent = require('bent');
@@ -37,7 +37,7 @@ class TaskEnqueue extends Task {
 
   get name() { return TaskName.Enqueue; }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
     const dlg = cs.dlg;
     this.queueName = `queue:${cs.accountSid}:${this.queueName}`;
@@ -79,14 +79,12 @@ class TaskEnqueue extends Task {
     this.notifyUrl = url;
 
     /* invoke account-level webhook for queue event notifications */
-    try {
-      cs.performQueueWebhook({
-        event: 'join',
-        queue: this.data.name,
-        length: members,
-        joinTime: this.waitStartTime
-      });
-    } catch (err) {}
+    cs.performQueueWebhook({
+      event: 'join',
+      queue: this.data.name,
+      length: members,
+      joinTime: this.waitStartTime
+    });
   }
 
   async _removeFromQueue(cs) {
@@ -116,7 +114,6 @@ class TaskEnqueue extends Task {
           this.bridgeDetails = opts;
           this.logger.info({bridgeDetails: this.bridgeDetails}, `time to dequeue from ${this.queueName}`);
           if (this._playSession) {
-            this._leave = false;
             this._playSession.kill();
             this._playSession = null;
           }
@@ -236,7 +233,6 @@ class TaskEnqueue extends Task {
         });
 
         // resolve when either side hangs up
-        this.state = QueueResults.Bridged;
         this.emitter
           .on('hangup', () => {
             this.logger.info('TaskEnqueue:_bridgeLocal ending with hangup from dequeue party');
@@ -302,8 +298,6 @@ class TaskEnqueue extends Task {
 
   async _playHook(cs, dlg, hook, allowed = [TaskName.Play, TaskName.Say, TaskName.Pause, TaskName.Leave]) {
     const {lengthOfList, getListPosition} = cs.srf.locals.dbHelpers;
-    const b3 = this.getTracingPropagation();
-    const httpHeaders = b3 && {b3};
 
     assert(!this._playSession);
     if (this.killed) return [];
@@ -319,7 +313,7 @@ class TaskEnqueue extends Task {
     } catch (err) {
       this.logger.error({err}, `TaskEnqueue:_playHook error retrieving list info for queue ${this.queueName}`);
     }
-    const json = await cs.application.requestor.request('verb:hook', hook, params, httpHeaders);
+    const json = await cs.application.requestor.request(hook, params);
     const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
 
     const allowedTasks = tasks.filter((t) => allowed.includes(t.name));
@@ -331,15 +325,16 @@ class TaskEnqueue extends Task {
 
     // check for 'leave' verb and only execute tasks up till then
     const tasksToRun = [];
+    let leave = false;
     for (const o of tasks) {
       if (o.name === TaskName.Leave) {
-        this._leave = true;
+        leave = true;
         this.logger.info('waitHook returned a leave task');
         break;
       }
       tasksToRun.push(o);
     }
-    const cloneTasks = [...tasksToRun];
+
     if (this.killed) return [];
     else if (tasksToRun.length > 0) {
       this._playSession = new ConfirmCallSession({
@@ -348,18 +343,16 @@ class TaskEnqueue extends Task {
         dlg,
         ep: cs.ep,
         callInfo: cs.callInfo,
-        accountInfo: cs.accountInfo,
-        tasks: tasksToRun,
-        rootSpan: cs.rootSpan
+        tasks: tasksToRun
       });
       await this._playSession.exec();
       this._playSession = null;
     }
-    if (this._leave) {
+    if (leave) {
       this.state = QueueResults.Leave;
       this.kill(cs);
     }
-    return cloneTasks;
+    return tasksToRun;
   }
 }
 

lib/tasks/gather.js

@@ -3,473 +3,168 @@ const {
   TaskName,
   TaskPreconditions,
   GoogleTranscriptionEvents,
-  NuanceTranscriptionEvents,
-  AwsTranscriptionEvents,
-  AzureTranscriptionEvents,
-  DeepgramTranscriptionEvents,
-  SonioxTranscriptionEvents,
-  IbmTranscriptionEvents,
-  NvidiaTranscriptionEvents,
-  JambonzTranscriptionEvents
+  AwsTranscriptionEvents
 } = require('../utils/constants');
 
 const makeTask = require('./make_task');
 const assert = require('assert');
 
-const compileTranscripts = (logger, evt, arr) => {
-  if (!Array.isArray(arr) || arr.length === 0) return;
-  let t = '';
-  for (const a of arr) {
-    t += ` ${a.alternatives[0].transcript}`;
-  }
-  t += ` ${evt.alternatives[0].transcript}`;
-  evt.alternatives[0].transcript = t.trim();
-};
-
 class TaskGather extends Task {
-  constructor(logger, opts, parentTask) {
+  constructor(logger, opts) {
     super(logger, opts);
     this.preconditions = TaskPreconditions.Endpoint;
 
-    const {
-      setChannelVarsForStt,
-      normalizeTranscription,
-      removeSpeechListeners,
-      setSpeechCredentialsAtRuntime,
-      compileSonioxTranscripts
-    } = require('../utils/transcription-utils')(logger);
-    this.setChannelVarsForStt = setChannelVarsForStt;
-    this.normalizeTranscription = normalizeTranscription;
-    this.removeSpeechListeners = removeSpeechListeners;
-    this.compileSonioxTranscripts = compileSonioxTranscripts;
-
     [
-      'finishOnKey', 'input', 'numDigits', 'minDigits', 'maxDigits',
-      'interDigitTimeout', 'partialResultHook', 'bargein', 'dtmfBargein',
+      'finishOnKey', 'hints', 'input', 'numDigits',
+      'partialResultHook',
       'speechTimeout', 'timeout', 'say', 'play'
     ].forEach((k) => this[k] = this.data[k]);
 
-    /* when collecting dtmf, bargein on dtmf is true unless explicitly set to false */
-    if (this.dtmfBargein !== false  && this.input.includes('digits')) this.dtmfBargein = true;
-
-    /* timeout of zero means no timeout */
-    this.timeout = this.timeout === 0 ? 0 : (this.timeout || 15) * 1000;
-    this.interim = !!this.partialResultHook || this.bargein || (this.timeout > 0);
-    this.listenDuringPrompt = this.data.listenDuringPrompt === false ? false : true;
-    this.minBargeinWordCount = this.data.minBargeinWordCount || 1;
+    this.timeout = (this.timeout || 5) * 1000;
+    this.interim = this.partialResultCallback;
     if (this.data.recognizer) {
       const recognizer = this.data.recognizer;
       this.vendor = recognizer.vendor;
       this.language = recognizer.language;
+      this.hints = recognizer.hints || [];
+      this.altLanguages = recognizer.altLanguages || [];
 
-      /* let credentials be supplied in the recognizer object at runtime */
-      this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);
-
-      /* continuous ASR (i.e. compile transcripts until a special timeout or dtmf key) */
-      this.asrTimeout = typeof recognizer.asrTimeout === 'number' ? recognizer.asrTimeout * 1000 : 0;
-      if (this.asrTimeout > 0) this.asrDtmfTerminationDigit = recognizer.asrDtmfTerminationDigit;
-      this.isContinuousAsr = this.asrTimeout > 0;
-
-      if (Array.isArray(this.data.recognizer.hints) &&
-        0 == this.data.recognizer.hints.length && process.env.JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS) {
-        logger.debug('Gather: an empty hints array was supplied, so we will mask global hints');
-        this.maskGlobalSttHints = true;
-      }
-      this.data.recognizer.hints = this.data.recognizer.hints || [];
-      this.data.recognizer.altLanguages = this.data.recognizer.altLanguages || [];
+      /* aws options */
+      this.vocabularyName = recognizer.vocabularyName;
+      this.vocabularyFilterName = recognizer.vocabularyFilterName;
+      this.filterMethod = recognizer.filterMethod;
     }
-    else this.data.recognizer = {hints: [], altLanguages: []};
 
     this.digitBuffer = '';
     this._earlyMedia = this.data.earlyMedia === true;
 
-    if (this.say) {
-      this.sayTask = makeTask(this.logger, {say: this.say}, this);
-    }
-    if (this.play) {
-      this.playTask = makeTask(this.logger, {play: this.play}, this);
-    }
-    if (!this.sayTask && !this.playTask) this.listenDuringPrompt = false;
-
-    /* buffer speech for continuous asr */
-    this._bufferedTranscripts = [];
-
-    /* buffer for soniox transcripts */
-    this._sonioxTranscripts = [];
-
-    this.parentTask = parentTask;
-    this.partialTranscriptsCount = 0;
+    if (this.say) this.sayTask = makeTask(this.logger, {say: this.say}, this);
+    if (this.play) this.playTask = makeTask(this.logger, {play: this.play}, this);
   }
 
   get name() { return TaskName.Gather; }
 
-  get needsStt() { return this.input.includes('speech'); }
-
-  get wantsSingleUtterance() {
-    return this.data.recognizer?.singleUtterance === true;
-  }
-
   get earlyMedia() {
     return (this.sayTask && this.sayTask.earlyMedia) ||
       (this.playTask && this.playTask.earlyMedia);
   }
 
-  get summary() {
-    let s = `${this.name}{`;
-    if (this.input.length === 2) s += 'inputs=[speech,digits],';
-    else if (this.input.includes('digits')) s += 'inputs=digits';
-    else s += 'inputs=speech,';
-
-    if (this.input.includes('speech')) {
-      s += `vendor=${this.vendor || 'default'},language=${this.language || 'default'}`;
-    }
-    if (this.sayTask) s += ',with nested say task';
-    if (this.playTask) s += ',with nested play task';
-    s += '}';
-    return s;
-  }
-
-  async exec(cs, {ep}) {
-    this.logger.debug('Gather:exec');
+  async exec(cs, ep) {
     await super.exec(cs);
     const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
-    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;
-
-    if (cs.hasGlobalSttHints && !this.maskGlobalSttHints) {
-      const {hints, hintsBoost} = cs.globalSttHints;
-      const setOfHints = new Set(this.data.recognizer.hints
-        .concat(hints)
-        .filter((h) => typeof h === 'string' && h.length > 0));
-      this.data.recognizer.hints = [...setOfHints];
-      if (!this.data.recognizer.hintsBoost && hintsBoost) this.data.recognizer.hintsBoost = hintsBoost;
-      this.logger.debug({hints: this.data.recognizer.hints, hintsBoost: this.data.recognizer.hintsBoost},
-        'Gather:exec - applying global sttHints');
-    }
-    if (cs.hasAltLanguages) {
-      this.data.recognizer.altLanguages = this.data.recognizer.altLanguages.concat(cs.altLanguages);
-      this.logger.debug({altLanguages: this.altLanguages},
-        'Gather:exec - applying altLanguages');
-    }
-    if (cs.hasGlobalSttPunctuation && !this.data.recognizer.punctuation) {
-      this.data.recognizer.punctuation = cs.globalSttPunctuation;
-    }
-    if (!this.isContinuousAsr && cs.isContinuousAsr) {
-      this.isContinuousAsr = true;
-      this.asrTimeout = cs.asrTimeout * 1000;
-      this.asrDtmfTerminationDigit = cs.asrDtmfTerminationDigit;
-      this.logger.debug({
-        asrTimeout: this.asrTimeout,
-        asrDtmfTerminationDigit: this.asrDtmfTerminationDigit
-      }, 'Gather:exec - enabling continuous ASR since it is turned on for the session');
-    }
-    const {JAMBONZ_GATHER_EARLY_HINTS_MATCH, JAMBONES_GATHER_EARLY_HINTS_MATCH} = process.env;
-    if ((JAMBONZ_GATHER_EARLY_HINTS_MATCH || JAMBONES_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 (!this.data.recognizer.vendor) {
-      this.data.recognizer.vendor = this.vendor;
-    }
-    if (this.needsStt && !this.sttCredentials) this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
-    if (this.needsStt && !this.sttCredentials) {
+    if ('default' === this.vendor || !this.vendor) this.vendor = cs.speechRecognizerVendor;
+    if ('default' === this.language || !this.language) this.language = cs.speechRecognizerLanguage;
+    this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
+    if (!this.sttCredentials) {
       const {writeAlerts, AlertType} = cs.srf.locals;
-      this.logger.info(`TaskGather:exec - ERROR stt using ${this.vendor} requested but creds not supplied`);
+      this.logger.info(`TaskGather:exec - ERROR stt using ${this.vendor} requested but not creds supplied`);
       writeAlerts({
         account_sid: cs.accountSid,
         alert_type: AlertType.STT_NOT_PROVISIONED,
         vendor: this.vendor
       }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
-      // Notify application that STT vender is wrong.
-      this.notifyError({
-        msg: 'ASR error',
-        details: `No speech-to-text service credentials for ${this.vendor} have been configured`
-      });
-      this.notifyTaskDone();
-      throw new Error(`No speech-to-text service credentials for ${this.vendor} have been configured`);
-    }
 
-    if (this.vendor === 'nuance' && this.sttCredentials.client_id) {
-      /* get nuance access token */
-      const {client_id, secret} = this.sttCredentials;
-      const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
-      this.logger.debug({client_id}, `Gather:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
-      this.sttCredentials = {...this.sttCredentials, access_token};
+      throw new Error(`no speech-to-text service credentials for ${this.vendor} have been configured`);
     }
-    else if (this.vendor == 'ibm' && this.sttCredentials.stt_api_key) {
-      /* get ibm access token */
-      const {stt_api_key, stt_region} = this.sttCredentials;
-      const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
-      this.logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
-      this.sttCredentials = {...this.sttCredentials, access_token, stt_region};
-    }
-    const startListening = (cs, ep) => {
-      this._startTimer();
-      if (this.isContinuousAsr && 0 === this.timeout) this._startAsrTimer();
-      if (this.input.includes('speech') && !this.listenDuringPrompt) {
-        this._initSpeech(cs, ep)
-          .then(() => {
-            if (this.killed) {
-              this.logger.info('Gather:exec - task was quickly killed so do not transcribe');
-              return;
-            }
-            this._startTranscribing(ep);
-            return updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
-          })
-          .catch((err) => {
-            this.logger.error({err}, 'error in initSpeech');
-          });
-      }
-    };
 
     try {
       if (this.sayTask) {
-        const {span, ctx} = this.startChildSpan(`nested:${this.sayTask.summary}`);
-        this.sayTask.span = span;
-        this.sayTask.ctx = ctx;
-        this.sayTask.exec(cs, {ep});  // kicked off, _not_ waiting for it to complete
+        this.sayTask.exec(cs, ep);  // kicked off, _not_ waiting for it to complete
         this.sayTask.on('playDone', (err) => {
-          span.end();
-          if (err) this.logger.error({err}, 'Gather:exec Error playing tts');
-          this.logger.debug('Gather: nested say task completed');
-          if (!this.killed) {
-            startListening(cs, ep);
-            if (this.input.includes('speech') && this.vendor === 'nuance' && this.listenDuringPrompt) {
-              this.logger.debug('Gather:exec - starting transcription timers after say completes');
-              ep.startTranscriptionTimers((err) => {
-                if (err) this.logger.error({err}, 'Gather:exec - error starting transcription timers');
-              });
-            }
-          }
+          if (!this.killed) this._startTimer();
         });
       }
       else if (this.playTask) {
-        const {span, ctx} = this.startChildSpan(`nested:${this.playTask.summary}`);
-        this.playTask.span = span;
-        this.playTask.ctx = ctx;
-        this.playTask.exec(cs, {ep});  // kicked off, _not_ waiting for it to complete
+        this.playTask.exec(cs, ep);  // kicked off, _not_ waiting for it to complete
         this.playTask.on('playDone', (err) => {
-          span.end();
-          if (err) this.logger.error({err}, 'Gather:exec Error playing url');
-          this.logger.debug('Gather: nested play task completed');
-          if (!this.killed) {
-            startListening(cs, ep);
-            if (this.input.includes('speech') && this.vendor === 'nuance' && this.listenDuringPrompt) {
-              this.logger.debug('Gather:exec - starting transcription timers after play completes');
-              ep.startTranscriptionTimers((err) => {
-                if (err) this.logger.error({err}, 'Gather:exec - error starting transcription timers');
-              });
-            }
-          }
+          if (!this.killed) this._startTimer();
         });
       }
-      else {
-        if (this.killed) {
-          this.logger.info('Gather:exec - task was immediately killed so do not transcribe');
-          return;
-        }
-        startListening(cs, ep);
-      }
+      else this._startTimer();
 
-      if (this.input.includes('speech') && this.listenDuringPrompt) {
+      if (this.input.includes('speech')) {
         await this._initSpeech(cs, ep);
         this._startTranscribing(ep);
         updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
           .catch(() => {/*already logged error */});
       }
 
-      if (this.input.includes('digits') || this.dtmfBargein || this.asrDtmfTerminationDigit) {
-        ep.on('dtmf', this._onDtmf.bind(this, cs, ep));
+      if (this.input.includes('digits')) {
+        ep.on('dtmf', this._onDtmf.bind(this, ep));
       }
 
       await this.awaitTaskDone();
     } catch (err) {
       this.logger.error(err, 'TaskGather:exec error');
     }
-    this.removeSpeechListeners(ep);
+    ep.removeCustomEventListener(GoogleTranscriptionEvents.Transcription);
+    ep.removeCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance);
+    ep.removeCustomEventListener(AwsTranscriptionEvents.Transcription);
   }
 
   kill(cs) {
     super.kill(cs);
-    this._killAudio(cs);
+    this._killAudio();
     this.ep.removeAllListeners('dtmf');
-    clearTimeout(this.interDigitTimer);
-    this._clearAsrTimer();
-    this.playTask?.span.end();
-    this.sayTask?.span.end();
     this._resolve('killed');
   }
 
-  updateTaskInProgress(opts) {
-    if (!this.needsStt && opts.input.includes('speech')) {
-      this.logger.info('TaskGather:updateTaskInProgress - adding speech to a background gather');
-      return false; // this needs be handled by killing the background gather and starting a new one
-    }
-    const {timeout} = opts;
-    this.timeout = timeout;
-    this._startTimer();
-    return true;
-  }
-
-  _onDtmf(cs, ep, evt) {
+  _onDtmf(ep, evt) {
     this.logger.debug(evt, 'TaskGather:_onDtmf');
-    clearTimeout(this.interDigitTimer);
-    let resolved = false;
-    if (this.dtmfBargein) {
-      this._killAudio(cs);
-      this.emit('dtmf', evt);
-    }
-    if (evt.dtmf === this.finishOnKey && this.input.includes('digits')) {
-      resolved = true;
-      this._resolve('dtmf-terminator-key');
-    }
-    else if (this.input.includes('digits')) {
+    if (evt.dtmf === this.finishOnKey) this._resolve('dtmf-terminator-key');
+    else {
       this.digitBuffer += evt.dtmf;
-      const len = this.digitBuffer.length;
-      if (len === this.numDigits || len === this.maxDigits) {
-        resolved = true;
-        this._resolve('dtmf-num-digits');
-      }
-    }
-    else if (this.isContinuousAsr && evt.dtmf === this.asrDtmfTerminationDigit) {
-      this.logger.info(`continuousAsr triggered with dtmf ${this.asrDtmfTerminationDigit}`);
-      this._clearAsrTimer();
-      this._clearTimer();
-      this._startFinalAsrTimer();
-      return;
-    }
-    if (!resolved && this.interDigitTimeout > 0 && this.digitBuffer.length >= this.minDigits) {
-      /* start interDigitTimer */
-      const ms = this.interDigitTimeout * 1000;
-      this.logger.debug(`starting interdigit timer of ${ms}`);
-      this.interDigitTimer = setTimeout(() => this._resolve('dtmf-interdigit-timeout'), ms);
+      if (this.digitBuffer.length === this.numDigits) this._resolve('dtmf-num-digits');
     }
+    this._killAudio();
   }
 
   async _initSpeech(cs, ep) {
-    const opts = this.setChannelVarsForStt(this, this.sttCredentials, this.data.recognizer);
-    switch (this.vendor) {
-      case 'google':
-        this.bugname = 'google_transcribe';
-        ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        ep.addCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance, this._onEndOfUtterance.bind(this, cs, ep));
-        ep.addCustomEventListener(GoogleTranscriptionEvents.VadDetected, this._onVadDetected.bind(this, cs, ep));
-        break;
+    const opts = {};
 
-      case 'aws':
-      case 'polly':
-        this.bugname = 'aws_transcribe';
-        ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        ep.addCustomEventListener(AwsTranscriptionEvents.VadDetected, this._onVadDetected.bind(this, cs, ep));
-        break;
-      case 'microsoft':
-        this.bugname = 'azure_transcribe';
-        ep.addCustomEventListener(AzureTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected,
-          this._onNoSpeechDetected.bind(this, cs, ep));
-        ep.addCustomEventListener(AzureTranscriptionEvents.VadDetected, this._onVadDetected.bind(this, cs, ep));
-        break;
-      case 'nuance':
-        this.bugname = 'nuance_transcribe';
-        ep.addCustomEventListener(NuanceTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep));
-        ep.addCustomEventListener(NuanceTranscriptionEvents.StartOfSpeech,
-          this._onStartOfSpeech.bind(this, cs, ep));
-        ep.addCustomEventListener(NuanceTranscriptionEvents.TranscriptionComplete,
-          this._onTranscriptionComplete.bind(this, cs, ep));
-        ep.addCustomEventListener(NuanceTranscriptionEvents.VadDetected,
-          this._onVadDetected.bind(this, cs, ep));
-
-        /* stall timers until prompt finishes playing */
-        if ((this.sayTask || this.playTask) && this.listenDuringPrompt) {
-          opts.NUANCE_STALL_TIMERS = 1;
-        }
-        break;
-
-      case 'deepgram':
-        this.bugname = 'deepgram_transcribe';
-        ep.addCustomEventListener(DeepgramTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        ep.addCustomEventListener(DeepgramTranscriptionEvents.Connect, this._onDeepgramConnect.bind(this, cs, ep));
-        ep.addCustomEventListener(DeepgramTranscriptionEvents.ConnectFailure,
-          this._onDeepGramConnectFailure.bind(this, cs, ep));
-        break;
-
-      case 'soniox':
-        this.bugname = 'soniox_transcribe';
-        ep.addCustomEventListener(SonioxTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        break;
-
-      case 'ibm':
-        this.bugname = 'ibm_transcribe';
-        ep.addCustomEventListener(IbmTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        ep.addCustomEventListener(IbmTranscriptionEvents.Connect, this._onIbmConnect.bind(this, cs, ep));
-        ep.addCustomEventListener(IbmTranscriptionEvents.ConnectFailure,
-          this._onIbmConnectFailure.bind(this, cs, ep));
-        break;
-
-      case 'nvidia':
-        this.bugname = 'nvidia_transcribe';
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep));
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.StartOfSpeech,
-          this._onStartOfSpeech.bind(this, cs, ep));
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.TranscriptionComplete,
-          this._onTranscriptionComplete.bind(this, cs, ep));
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.VadDetected,
-          this._onVadDetected.bind(this, cs, ep));
-
-        /* I think nvidia has this (??) - stall timers until prompt finishes playing */
-        if ((this.sayTask || this.playTask) && this.listenDuringPrompt) {
-          opts.NVIDIA_STALL_TIMERS = 1;
-        }
-        break;
-
-      default:
-        if (this.vendor.startsWith('custom:')) {
-          this.bugname = `${this.vendor}_transcribe`;
-          ep.addCustomEventListener(JambonzTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-          ep.addCustomEventListener(JambonzTranscriptionEvents.Connect, this._onJambonzConnect.bind(this, cs, ep));
-          ep.addCustomEventListener(JambonzTranscriptionEvents.ConnectFailure,
-            this._onJambonzConnectFailure.bind(this, cs, ep));
-          break;
-        }
-        else {
-          this.notifyError({ msg: 'ASR error', details:`Invalid vendor ${this.vendor}`});
-          this.notifyTaskDone();
-          throw new Error(`Invalid vendor ${this.vendor}`);
-        }
+    if ('google' === this.vendor) {
+      if (this.sttCredentials) opts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(this.sttCredentials.credentials);
+      Object.assign(opts, {
+        GOOGLE_SPEECH_USE_ENHANCED: true,
+        GOOGLE_SPEECH_SINGLE_UTTERANCE: true,
+        GOOGLE_SPEECH_MODEL: 'command_and_search'
+      });
+      if (this.hints && this.hints.length > 1) opts.GOOGLE_SPEECH_HINTS = this.hints.join(',');
+      if (this.altLanguages && this.altLanguages.length > 1) {
+        opts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = this.altLanguages.join(',');
+      }
+      if (this.profanityFilter === true) {
+        Object.assign(opts, {'GOOGLE_SPEECH_PROFANITY_FILTER': true});
+      }
+      ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+      ep.addCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance, this._onEndOfUtterance.bind(this, cs, ep));
     }
-
-    /* common handler for all stt engine errors */
-    ep.addCustomEventListener(JambonzTranscriptionEvents.Error, this._onJambonzError.bind(this, cs, ep));
+    else {
+      if (this.vocabularyName) opts.AWS_VOCABULARY_NAME = this.vocabularyName;
+      if (this.vocabularyFilterName) {
+        opts.AWS_VOCABULARY_NAME = this.vocabularyFilterName;
+        opts.AWS_VOCABULARY_FILTER_METHOD = this.filterMethod || 'mask';
+      }
+      Object.assign(opts, {
+        AWS_ACCESS_KEY_ID: this.sttCredentials.accessKeyId,
+        AWS_SECRET_ACCESS_KEY: this.sttCredentials.secretAccessKey,
+        AWS_REGION: this.sttCredentials.region
+      });
+      ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+    }
+    this.logger.debug({vars: opts}, 'setting freeswitch vars');
     await ep.set(opts)
       .catch((err) => this.logger.info(err, 'Error setting channel variables'));
+
   }
 
   _startTranscribing(ep) {
-    this.logger.debug({
-      vendor: this.vendor,
-      locale: this.language,
-      interim: this.interim,
-      bugname: this.bugname
-    }, 'Gather:_startTranscribing');
     ep.startTranscription({
       vendor: this.vendor,
       locale: this.language,
-      interim: this.interim,
-      bugname: this.bugname,
+      interim: this.partialResultCallback ? true : false,
     }).catch((err) => {
       const {writeAlerts, AlertType} = this.cs.srf.locals;
       this.logger.error(err, 'TaskGather:_startTranscribing error');
@@ -483,12 +178,9 @@ class TaskGather extends Task {
   }
 
   _startTimer() {
-    if (0 === this.timeout) return;
-    this._clearTimer();
-    this._timeoutTimer = setTimeout(() => {
-      if (this.isContinuousAsr) this._startAsrTimer();
-      else this._resolve(this.digitBuffer.length >= this.minDigits ? 'dtmf-num-digits' : 'timeout');
-    }, this.timeout);
+    assert(!this._timeoutTimer);
+    this.logger.debug(`Gather:_startTimer: timeout ${this.timeout}`);
+    this._timeoutTimer = setTimeout(() => this._resolve('timeout'), this.timeout);
   }
 
   _clearTimer() {
@@ -498,356 +190,53 @@ class TaskGather extends Task {
     }
   }
 
-  _startAsrTimer() {
-    assert(this.isContinuousAsr);
-    this._clearAsrTimer();
-    this._asrTimer = setTimeout(() => {
-      this.logger.debug('_startAsrTimer - asr timer went off');
-      this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout');
-    }, this.asrTimeout);
-    this.logger.debug(`_startAsrTimer: set for ${this.asrTimeout}ms`);
-  }
-
-  _clearAsrTimer() {
-    if (this._asrTimer) clearTimeout(this._asrTimer);
-    this._asrTimer = null;
-  }
-
-  _startFinalAsrTimer() {
-    this._clearFinalAsrTimer();
-    this._finalAsrTimer = setTimeout(() => {
-      this.logger.debug('_startFinalAsrTimer - final asr timer went off');
-      this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout');
-    }, 1000);
-    this.logger.debug('_startFinalAsrTimer: set for 1 second');
-  }
-
-  _clearFinalAsrTimer() {
-    if (this._finalAsrTimer) clearTimeout(this._finalAsrTimer);
-    this._finalAsrTimer = null;
-  }
-
-  _killAudio(cs) {
-    if (!this.sayTask && !this.playTask && this.bargein) {
-      if (this.ep?.connected && !this.playComplete) {
-        this.logger.debug('Gather:_killAudio: killing playback of any audio');
-        this.playComplete = true;
-        this.ep.api('uuid_break', this.ep.uuid)
-          .catch((err) => this.logger.info(err, 'Error killing audio'));
-      }
-      return;
-    }
+  _killAudio() {
     if (this.sayTask && !this.sayTask.killed) {
       this.sayTask.removeAllListeners('playDone');
-      this.sayTask.kill(cs);
-      this.sayTask = null;
+      this.sayTask.kill();
     }
     if (this.playTask && !this.playTask.killed) {
       this.playTask.removeAllListeners('playDone');
-      this.playTask.kill(cs);
-      this.playTask = null;
+      this.playTask.kill();
     }
   }
 
-  _onTranscription(cs, ep, evt, fsEvent) {
-    // make sure this is not a transcript from answering machine detection
-    const bugname = fsEvent.getHeader('media-bugname');
-    const finished = fsEvent.getHeader('transcription-session-finished');
-    this.logger.debug({evt, bugname, finished}, `Gather:_onTranscription for vendor ${this.vendor}`);
-    if (bugname && this.bugname !== bugname) return;
-
-    if (this.vendor === 'ibm') {
-      if (evt?.state === 'listening') return;
+  _onTranscription(cs, ep, evt) {
+    if ('aws' === this.vendor && Array.isArray(evt) && evt.length > 0) evt = evt[0];
+    this.logger.debug(evt, 'TaskGather:_onTranscription');
+    const final = evt.is_final;
+    if (final) {
+      this._resolve('speech', evt);
     }
-
-    evt = this.normalizeTranscription(evt, this.vendor, 1, this.language);
-    if (evt.alternatives.length === 0) {
-      this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, continue listening');
-      return;
-    }
-
-    /* fast path: our first partial transcript exactly matches an early hint */
-    if (this.earlyHintsMatch && evt.is_final === false && this.partialTranscriptsCount++ === 0) {
-      const transcript = evt.alternatives[0].transcript?.toLowerCase();
-      const hints = this.data.recognizer?.hints || [];
-      if (hints.find((h) => h.toLowerCase() === transcript)) {
-        this.logger.debug({evt}, 'Gather:_onTranscription: early hint match');
-        this._resolve('speech', evt);
-        return;
-      }
-    }
-
-    /* count words for bargein feature */
-    const words = evt.alternatives[0]?.transcript.split(' ').length;
-    const bufferedWords = this._sonioxTranscripts.length +
-      this._bufferedTranscripts.reduce((count, e) => count + e.alternatives[0]?.transcript.split(' ').length, 0);
-
-    if (evt.is_final) {
-      if (evt.alternatives[0].transcript === '' && !this.callSession.callGone && !this.killed) {
-        if (finished === 'true' && ['microsoft', 'deepgram'].includes(this.vendor)) {
-          this.logger.debug({evt}, 'TaskGather:_onTranscription - got empty transcript from old gather, disregarding');
-        }
-        else {
-          this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, continue listening');
-        }
-        return;
-      }
-
-      if (this.isContinuousAsr) {
-        /* append the transcript and start listening again for asrTimeout */
-        const t = evt.alternatives[0].transcript;
-        if (t) {
-          /* remove trailing punctuation */
-          if (/[,;:\.!\?]$/.test(t)) {
-            this.logger.debug('TaskGather:_onTranscription - removing trailing punctuation');
-            evt.alternatives[0].transcript = t.slice(0, -1);
-          }
-          else this.logger.debug({t}, 'TaskGather:_onTranscription - no trailing punctuation');
-        }
-        this.logger.info({evt}, 'TaskGather:_onTranscription - got transcript during continous asr');
-        this._bufferedTranscripts.push(evt);
-        this._clearTimer();
-        if (this._finalAsrTimer) {
-          this._clearFinalAsrTimer();
-          return this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout');
-        }
-        this._startAsrTimer();
-
-        /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!['soniox', 'aws', 'microsoft', 'deepgram'].includes(this.vendor)) this._startTranscribing(ep);
-      }
-      else {
-        if (this.bargein && (words + bufferedWords) < this.minBargeinWordCount) {
-          this.logger.debug({evt, words, bufferedWords},
-            'TaskGather:_onTranscription - final transcript but < min barge words');
-          this._bufferedTranscripts.push(evt);
-          this._startTranscribing(ep);
-          return;
-        }
-        else {
-          if (this.vendor === 'soniox') {
-            /* compile transcripts into one */
-            this._sonioxTranscripts.push(evt.vendor.finalWords);
-            evt = this.compileSonioxTranscripts(this._sonioxTranscripts, 1, this.language);
-            this._sonioxTranscripts = [];
-          }
-          this._resolve('speech', evt);
-        }
-      }
-    }
-    else {
-      /* google has a measure of stability:
-        https://cloud.google.com/speech-to-text/docs/basics#streaming_responses
-        others do not.
-      */
-      //const isStableEnough = typeof evt.stability === 'undefined' || evt.stability > GATHER_STABILITY_THRESHOLD;
-      this._clearTimer();
-      this._startTimer();
-      if (this.bargein && (words + bufferedWords) >= this.minBargeinWordCount) {
-        if (!this.playComplete) {
-          this.logger.debug({transcript: evt.alternatives[0].transcript}, 'killing audio due to speech');
-          this.emit('vad');
-        }
-        this._killAudio(cs);
-      }
-      if (this.partialResultHook) {
-        const b3 = this.getTracingPropagation();
-        const httpHeaders = b3 && {b3};
-        this.cs.requestor.request('verb:hook', this.partialResultHook,  Object.assign({speech: evt},
-          this.cs.callInfo, httpHeaders));
-      }
-      if (this.vendor === 'soniox') {
-        this._clearTimer();
-        if (evt.vendor.finalWords.length) {
-          this.logger.debug({evt}, 'TaskGather:_onTranscription - buffering soniox transcript');
-          this._sonioxTranscripts.push(evt.vendor.finalWords);
-        }
-      }
+    else if (this.partialResultHook) {
+      this.cs.requestor.request(this.partialResultHook,  Object.assign({speech: evt}, this.cs.callInfo))
+        .catch((err) => this.logger.info(err, 'GatherTask:_onTranscription error'));
     }
   }
   _onEndOfUtterance(cs, ep) {
-    this.logger.debug('TaskGather:_onEndOfUtterance');
-    if (this.bargein && this.minBargeinWordCount === 0) {
-      this._killAudio(cs);
-    }
-
-    /**
-     * By default, Gather asks google for multiple utterances.
-     * The reason is that we can sometimes get an 'end_of_utterance' event without
-     * getting a transcription.  This can happen if someone coughs or mumbles.
-     * For that reason don't ask for a single utterance and we'll terminate the transcribe operation
-     * once we get a final transcript.
-     * However, if the usr has specified a singleUtterance, then we need to restart here
-     * since we dont have a final transcript yet.
-     */
-    if (!this.resolved && !this.killed && !this._bufferedTranscripts.length && this.wantsSingleUtterance) {
+    this.logger.info('TaskGather:_onEndOfUtterance');
+    if (!this.resolved && !this.killed) {
       this._startTranscribing(ep);
     }
   }
 
-  _onStartOfSpeech(cs, ep) {
-    this.logger.debug('TaskGather:_onStartOfSpeech');
-    if (this.bargein) {
-      this._killAudio(cs);
-    }
-  }
-  _onTranscriptionComplete(cs, ep) {
-    this.logger.debug('TaskGather:_onTranscriptionComplete');
-  }
-  _onDeepgramConnect(_cs, _ep) {
-    this.logger.debug('TaskGather:_onDeepgramConnect');
-  }
-  _onJambonzConnect(_cs, _ep) {
-    this.logger.debug('TaskGather:_onJambonzConnect');
-  }
-  _onJambonzError(cs, _ep, evt) {
-    this.logger.info({evt}, 'TaskGather:_onJambonzError');
-    const {writeAlerts, AlertType} = cs.srf.locals;
-
-    if (this.vendor === 'nuance') {
-      const {code, error} = evt;
-      if (code === 404 && error === 'No speech') return this._resolve('timeout');
-      if (code === 413 && error === 'Too much speech') return this._resolve('timeout');
-    }
-    this.logger.info({evt}, 'TaskGather:_onJambonzError');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      message: `Custom speech vendor ${this.vendor} error: ${evt.error}`,
-      vendor: this.vendor,
-    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
-    this.notifyError({msg: 'ASR error', details:`Custom speech vendor ${this.vendor} error: ${evt.error}`});
-  }
-
-  _onDeepGramConnectFailure(cs, _ep, evt) {
-    const {reason} = evt;
-    const {writeAlerts, AlertType} = cs.srf.locals;
-    this.logger.info({evt}, 'TaskGather:_onDeepgramConnectFailure');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      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.notifyTaskDone();
-  }
-  _onJambonzConnectFailure(cs, _ep, evt) {
-    const {reason} = evt;
-    const {writeAlerts, AlertType} = cs.srf.locals;
-    this.logger.info({evt}, 'TaskGather:_onJambonzConnectFailure');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      message: `Failed connecting to ${this.vendor} speech recognizer: ${reason}`,
-      vendor: this.vendor,
-    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
-    this.notifyError({msg: 'ASR error', details:`Failed connecting to speech vendor ${this.vendor}: ${reason}`});
-    this.notifyTaskDone();
-  }
-
-  _onIbmConnect(_cs, _ep) {
-    this.logger.debug('TaskGather:_onIbmConnect');
-  }
-
-  _onIbmConnectFailure(cs, _ep, evt) {
-    const {reason} = evt;
-    const {writeAlerts, AlertType} = cs.srf.locals;
-    this.logger.info({evt}, 'TaskGather:_onIbmConnectFailure');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      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.notifyTaskDone();
-  }
-
-  _onIbmError(cs, _ep, evt) {
-    this.logger.info({evt}, 'TaskGather:_onIbmError');  }
-
-  _onVadDetected(cs, ep) {
-    if (this.bargein && this.minBargeinWordCount === 0) {
-      this.logger.debug('TaskGather:_onVadDetected');
-      this._killAudio(cs);
-      this.emit('vad');
-    }
-  }
-
-  _onNoSpeechDetected(cs, ep, evt, fsEvent) {
-    if (!this.callSession.callGone && !this.killed) {
-      const finished = fsEvent.getHeader('transcription-session-finished');
-      if (this.vendor === 'microsoft' && finished === 'true') {
-        this.logger.debug('TaskGather:_onNoSpeechDetected for old gather, ignoring');
-      }
-      else {
-        this.logger.debug('TaskGather:_onNoSpeechDetected - listen again');
-        this._startTranscribing(ep);
-      }
-      return;
-    }
-  }
-
   async _resolve(reason, evt) {
-    this.logger.debug(`TaskGather:resolve with reason ${reason}`);
     if (this.resolved) return;
-
     this.resolved = true;
-    // Clear dtmf event
-    if (this.dtmfBargein) {
-      this.ep.removeAllListeners('dtmf');
-    }
-    clearTimeout(this.interDigitTimer);
-    this._clearTimer();
+    this.logger.debug(`TaskGather:resolve with reason ${reason}`);
 
-    if (this.isContinuousAsr && reason.startsWith('speech')) {
-      evt = {
-        is_final: true,
-        transcripts: this._bufferedTranscripts
-      };
-      this.logger.debug({evt}, 'TaskGather:resolve continuous asr');
-    }
-    else if (!this.isContinuousAsr && reason.startsWith('speech') && this._bufferedTranscripts.length) {
-      compileTranscripts(this.logger, evt, this._bufferedTranscripts);
-      this.logger.debug({evt}, 'TaskGather:resolve buffered results');
-    }
-
-    this.span.setAttributes({'stt.resolve': reason, 'stt.result': JSON.stringify(evt)});
-    if (this.needsStt && this.ep && this.ep.connected) {
+    if (this.ep && this.ep.connected) {
       this.ep.stopTranscription({vendor: this.vendor})
         .catch((err) => this.logger.error({err}, 'Error stopping transcription'));
     }
 
-    if (this.callSession && this.callSession.callGone) {
-      this.logger.debug('TaskGather:_resolve - call is gone, not invoking web callback');
-      this.notifyTaskDone();
-      return;
+    this._clearTimer();
+    if (reason.startsWith('dtmf')) {
+      await this.performAction({digits: this.digitBuffer});
+    }
+    else if (reason.startsWith('speech')) {
+      await this.performAction({speech: evt});
     }
-
-    try {
-      if (reason.startsWith('dtmf')) {
-        if (this.parentTask) this.parentTask.emit('dtmf', evt);
-        else {
-          this.emit('dtmf', evt);
-          await this.performAction({digits: this.digitBuffer, reason: 'dtmfDetected'});
-        }
-      }
-      else if (reason.startsWith('speech')) {
-        if (this.parentTask) this.parentTask.emit('transcription', evt);
-        else {
-          this.emit('transcription', evt);
-          await this.performAction({speech: evt, reason: 'speechDetected'});
-        }
-      }
-      else if (reason.startsWith('timeout')) {
-        if (this.parentTask) this.parentTask.emit('timeout', evt);
-        else {
-          this.emit('timeout', evt);
-          await this.performAction({reason: 'timeout'});
-        }
-      }
-    } catch (err) {  /*already logged error*/ }
     this.notifyTaskDone();
   }
 }

lib/tasks/hangup.js

@@ -14,11 +14,10 @@ class TaskHangup extends Task {
   /**
    * Hangup the call
    */
-  async exec(cs, {dlg}) {
+  async exec(cs, dlg) {
     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');
     }

lib/tasks/leave.js

@@ -8,7 +8,7 @@ class TaskLeave extends Task {
 
   get name() { return TaskName.Leave; }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
     await this.awaitTaskDone();
   }

lib/tasks/lex.js

@@ -1,6 +1,6 @@
 const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
+const normalizeJambones = require('../utils/normalize-jambones');
 
 class Lex extends Task {
   constructor(logger, opts) {
@@ -44,7 +44,7 @@ class Lex extends Task {
 
   get name() { return TaskName.Lex; }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
 
     try {
@@ -182,13 +182,12 @@ class Lex extends Task {
       const type = messages[0].type;
       if (['PlainText', 'SSML'].includes(type) && msg) {
         const {srf} = cs;
-        const {stats} = srf.locals;
         const {synthAudio} = srf.locals.dbHelpers;
 
         try {
           this.logger.debug(`tts with ${this.vendor} ${this.voice}`);
           // eslint-disable-next-line no-unused-vars
-          const {filePath, servedFromCache} = await synthAudio(stats, {
+          const {filePath, servedFromCache} = await synthAudio({
             text: msg,
             vendor: this.vendor,
             language: this.language,
@@ -289,9 +288,7 @@ class Lex extends Task {
   }
 
   async _performHook(cs, hook, results) {
-    const b3 = this.getTracingPropagation();
-    const httpHeaders = b3 && {b3};
-    const json = await this.cs.requestor.request('verb:hook', hook, results, httpHeaders);
+    const json = await this.cs.requestor.request(hook, results);
     if (json && Array.isArray(json)) {
       const makeTask = require('./make_task');
       const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));

lib/tasks/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';
@@ -22,14 +22,15 @@ class TaskListen extends Task {
     this.results = {};
 
     if (this.transcribe) this.transcribeTask = makeTask(logger, {'transcribe': opts.transcribe}, this);
+
+    this._dtmfHandler = this._onDtmf.bind(this);
   }
 
   get name() { return TaskName.Listen; }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
     this.ep = ep;
-    this._dtmfHandler = this._onDtmf.bind(this, ep);
 
     try {
       this.hook = this.normalizeUrl(this.url, 'GET', this.wsAuth);
@@ -37,12 +38,7 @@ class TaskListen extends Task {
       if (this.playBeep) await this._playBeep(ep);
       if (this.transcribeTask) {
         this.logger.debug('TaskListen:exec - starting nested transcribe task');
-        const {span, ctx} = this.startChildSpan(`nested:${this.transcribeTask.summary}`);
-        this.transcribeTask.span = span;
-        this.transcribeTask.ctx = ctx;
-        this.transcribeTask.exec(cs, {ep})
-          .then((result) => span.end())
-          .catch((err) => span.end());
+        this.transcribeTask.exec(cs, ep);
       }
       await this._startListening(cs, ep);
       await this.awaitTaskDone();
@@ -60,22 +56,14 @@ class TaskListen extends Task {
     this._clearTimer();
     if (this.ep && this.ep.connected) {
       this.logger.debug('TaskListen:kill closing websocket');
-      try {
-        await this.ep.forkAudioStop();
-        this.logger.debug('TaskListen:kill successfully closed websocket');
-      } catch (err) {
-        this.logger.info(err, 'TaskListen:kill');
-      }
+      await this.ep.forkAudioStop()
+        .catch((err) => this.logger.info(err, 'TaskListen:kill'));
     }
     if (this.recordStartTime) {
       const duration = moment().diff(this.recordStartTime, 'seconds');
       this.results.dialCallDuration = duration;
     }
-    if (this.transcribeTask) {
-      await this.transcribeTask.kill(cs);
-      this.transcribeTask = null;
-    }
-    this.ep && this._removeListeners(this.ep);
+    if (this.transcribeTask) await this.transcribeTask.kill(cs);
     this.notifyTaskDone();
   }
 
@@ -134,13 +122,6 @@ class TaskListen extends Task {
     if (this.finishOnKey || this.passDtmf) {
       ep.on('dtmf', this._dtmfHandler);
     }
-
-    /* support bi-directional audio */
-    if (!this.disableBiDirectionalAudio) {
-      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));
   }
 
   _removeListeners(ep) {
@@ -150,19 +131,9 @@ class TaskListen extends Task {
     if (this.finishOnKey || this.passDtmf) {
       ep.removeListener('dtmf', this._dtmfHandler);
     }
-    ep.removeCustomEventListener(ListenEvents.PlayAudio);
-    ep.removeCustomEventListener(ListenEvents.KillAudio);
-    ep.removeCustomEventListener(ListenEvents.Disconnect);
-
   }
 
-  _onDtmf(ep, evt) {
-    this.logger.debug({evt}, `TaskListen:_onDtmf received dtmf ${evt.dtmf}`);
-    if (this.passDtmf && this.ep?.connected) {
-      const obj = {event: 'dtmf', dtmf: evt.dtmf, duration: evt.duration};
-      this.ep.forkAudioSendText(obj)
-        .catch((err) => this.logger.info({err}, 'TaskListen:_onDtmf error sending dtmf'));
-    }
+  _onDtmf(evt) {
     if (evt.dtmf === this.finishOnKey) {
       this.logger.info(`TaskListen:_onDtmf terminating task due to dtmf ${evt.dtmf}`);
       this.results.digits = evt.dtmf;
@@ -183,29 +154,6 @@ class TaskListen extends Task {
     this.logger.info(evt, 'TaskListen:_onConnectFailure');
     this.notifyTaskDone();
   }
-
-  async _onPlayAudio(ep, evt) {
-    this.logger.info(`received play_audio event: ${JSON.stringify(evt)}`);
-    try {
-      const results = await ep.play(evt.file);
-      this.logger.debug(`Finished playing file, result: ${JSON.stringify(results)}`);
-      ep.forkAudioSendText({type: 'playDone', data: Object.assign({id: evt.id}, results)});
-    }
-    catch (err) {
-      this.logger.error({err}, 'Error playing file');
-    }
-  }
-
-  _onKillAudio(ep) {
-    this.logger.info('received kill_audio event');
-    ep.api('uuid_break', ep.uuid);
-  }
-
-  _onDisconnect(ep, cs) {
-    this.logger.debug('_onDisconnect: TaskListen terminating task');
-    this.kill(cs);
-  }
-
   _onError(ep, evt) {
     this.logger.info(evt, 'TaskListen:_onError');
     this.notifyTaskDone();
@@ -221,7 +169,7 @@ class TaskListen extends Task {
       this.logger.debug('Listen:whisper tasks starting');
       while (tasks.length && !cs.callGone) {
         const task = tasks.shift();
-        await task.exec(cs, {ep: this.ep});
+        await task.exec(cs, this.ep);
       }
       this.logger.debug('Listen:whisper tasks complete');
     } catch (err) {

lib/tasks/make_task.js

@@ -1,4 +1,4 @@
-const { validateVerb } = require('@jambonz/verb-specifications');
+const Task = require('./task');
 const {TaskName} = require('../utils/constants');
 const errBadInstruction = new Error('malformed jambonz application payload');
 
@@ -12,21 +12,13 @@ function makeTask(logger, obj, parent) {
   if (typeof data !== 'object') {
     throw errBadInstruction;
   }
-  validateVerb(name, data, logger);
+  Task.validate(name, data);
   switch (name) {
     case TaskName.SipDecline:
       const TaskSipDecline = require('./sip_decline');
       return new TaskSipDecline(logger, data, parent);
-    case TaskName.SipRequest:
-      const TaskSipRequest = require('./sip_request');
-      return new TaskSipRequest(logger, data, parent);
-    case TaskName.SipRefer:
-      const TaskSipRefer = require('./sip_refer');
-      return new TaskSipRefer(logger, data, parent);
-    case TaskName.Config:
-      const TaskConfig = require('./config');
-      return new TaskConfig(logger, data, parent);
     case TaskName.Conference:
+      logger.debug({data}, 'Conference verb');
       const TaskConference = require('./conference');
       return new TaskConference(logger, data, parent);
     case TaskName.Dial:
@@ -56,9 +48,6 @@ function makeTask(logger, obj, parent) {
     case TaskName.Message:
       const TaskMessage = require('./message');
       return new TaskMessage(logger, data, parent);
-    case TaskName.Rasa:
-      const TaskRasa = require('./rasa');
-      return new TaskRasa(logger, data, parent);
     case TaskName.Say:
       const TaskSay = require('./say');
       return new TaskSay(logger, data, parent);

lib/tasks/message.js

@@ -1,7 +1,6 @@
 const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
 const bent = require('bent');
-const uuidv4 = require('uuid-random');
 
 class TaskMessage extends Task {
   constructor(logger, opts) {
@@ -9,11 +8,13 @@ class TaskMessage extends Task {
     this.preconditions = TaskPreconditions.None;
 
     this.payload = {
-      message_sid: this.data.message_sid || uuidv4(),
-      carrier: this.data.carrier,
+      message_sid: this.data.message_sid,
+      provider: this.data.provider,
       to: this.data.to,
       from: this.data.from,
-      text: this.data.text
+      cc: this.data.cc,
+      text: this.data.text,
+      media: this.data.media
     };
 
   }
@@ -27,22 +28,20 @@ class TaskMessage extends Task {
     const {srf, accountSid} = cs;
     const {res} = cs.callInfo;
     let payload = this.payload;
-    const actionParams = {message_sid: this.payload.message_sid};
-
     await super.exec(cs);
     try {
-      const {getSmpp, dbHelpers} = srf.locals;
+      const {getSBC, getSmpp, dbHelpers} = srf.locals;
       const {lookupSmppGateways} = dbHelpers;
 
-      this.logger.debug(`looking up gateways for account_sid: ${accountSid}`);
+      this.logger.info(`looking up gateways for account_sid: ${accountSid}`);
       const r = await lookupSmppGateways(accountSid);
       let gw, url, relativeUrl;
       if (r.length > 0) {
-        gw = r.find((o) => 1 === o.sg.outbound && (!this.payload.carrier || o.vc.name === this.payload.carrier));
+        gw = r.find((o) => 1 === o.sg.outbound && (!this.payload.provider || o.vc.name === this.payload.provider));
       }
       if (gw) {
         this.logger.info({gw, accountSid}, 'Message:exec - using smpp to send message');
-        url = process.env.K8S ? 'http://smpp' : getSmpp();
+        url = getSmpp();
         relativeUrl = '/sms';
         payload = {
           ...payload,
@@ -51,75 +50,37 @@ class TaskMessage extends Task {
         };
       }
       else {
-        //TMP: smpp only at the moment, need to add http back in
-        /*
-        this.logger.info({gw, accountSid, carrier: this.payload.carrier},
+        this.logger.info({gw, accountSid, provider: this.payload.provider},
           'Message:exec - no smpp gateways found to send message');
         relativeUrl = 'v1/outboundSMS';
         const sbcAddress = getSBC();
         if (sbcAddress) url = `http://${sbcAddress}:3000/`;
-        */
-        this.performAction({
-          ...actionParams,
-          message_status: 'no carriers'
-        }).catch((err) => {});
-        if (res) res.sendStatus(404);
-        return;
+
+        //TMP: smpp only at the moment, need to add http back in
+        return res.sendStatus(404);
       }
       if (url) {
-        const post = bent(url, 'POST', 'json', 201, 480);
+        const post = bent(url, 'POST', 'json', 201);
         this.logger.info({payload, url}, 'Message:exec sending outbound SMS');
         const response = await post(relativeUrl, payload);
-        const {smpp_err_code, carrier, message_id, message} = response;
-        if (smpp_err_code) {
-          this.logger.info({response}, 'SMPP error sending SMS');
-          this.performAction({
-            ...actionParams,
-            carrier,
-            carrier_message_id: message_id,
-            message_status: 'failure',
-            message_failure_reason: message
-          }).catch((err) => {});
-          if (res) {
-            res.status(480).json({
-              ...response,
-              sid: cs.callInfo.messageSid
-            });
-          }
-        }
-        else {
-          const {message_id, carrier} = response;
-          this.logger.info({response}, 'Successfully sent SMS');
-          this.performAction({
-            ...actionParams,
-            carrier,
-            carrier_message_id: message_id,
-            message_status: 'success',
-          }).catch((err) => {});
-          if (res) {
-            res.status(200).json({
-              sid: cs.callInfo.messageSid,
-              carrierResponse: response
-            });
-          }
+        this.logger.info({response}, 'Successfully sent SMS');
+        if (cs.callInfo.res) {
+          this.logger.info('Message:exec sending 200 OK response to HTTP POST from api server');
+          res.status(200).json({
+            sid: cs.callInfo.messageSid,
+            providerResponse: response
+          });
         }
+
+        // TODO: action Hook
       }
       else {
-        this.logger.info('Message:exec - unable to send SMS as SMPP is not configured on the system');
-        this.performAction({
-          ...actionParams,
-          message_status: 'smpp configuration error'
-        }).catch((err) => {});
-        if (res) res.status(404).json({message: 'no configured SMS gateways'});
+        this.logger.info('Message:exec - unable to send SMS as there are no available SMS gateways');
+        res.status(422).json({message: 'no configured SMS gateways'});
       }
     } catch (err) {
-      this.logger.error(err, 'TaskMessage:exec - unexpected error sending SMS');
-      this.performAction({
-        ...actionParams,
-        message_status: 'system error',
-        message_failure_reason: err.message
-      });
-      if (res) res.status(422).json({message: 'no configured SMS gateways'});
+      this.logger.error(err, 'TaskMessage:exec - Error sending SMS');
+      res.status(422).json({message: 'no configured SMS gateways'});
     }
   }
 }

lib/tasks/pause.js

@@ -10,7 +10,7 @@ class TaskPause extends Task {
 
   get name() { return TaskName.Pause; }
 
-  async exec(cs) {
+  async exec(cs, ep) {
     await super.exec(cs);
     this.timer = setTimeout(this.notifyTaskDone.bind(this), this.length * 1000);
     await this.awaitTaskDone();

lib/tasks/play.js

@@ -7,66 +7,20 @@ class TaskPlay extends Task {
     this.preconditions = TaskPreconditions.Endpoint;
 
     this.url = this.data.url;
-    this.seekOffset = this.data.seekOffset || -1;
-    this.timeoutSecs = this.data.timeoutSecs || -1;
     this.loop = this.data.loop || 1;
     this.earlyMedia = this.data.earlyMedia === true;
   }
 
   get name() { return TaskName.Play; }
 
-  get summary() {
-    return `${this.name}:{url=${this.url}}`;
-  }
-
-  async exec(cs, {ep}) {
+  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 {
-      this.notifyStatus({event: 'start-playback'});
-      while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep.connected) {
-        if (cs.isInConference) {
-          const {memberId, confName, confUuid} = cs;
-          if (Array.isArray(this.url)) {
-            for (const playUrl of this.url) {
-              await this.playToConfMember(this.ep, memberId, confName, confUuid, playUrl);
-            }
-          } else {
-            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 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));
-          }
-        }
+      while (!this.killed && this.loop--) {
+        await ep.play(this.url);
       }
     } catch (err) {
-      if (timeout) clearTimeout(timeout);
       this.logger.info(err, `TaskPlay:exec - error playing ${this.url}`);
     }
     this.emit('playDone');
@@ -76,14 +30,7 @@ class TaskPlay extends Task {
     super.kill(cs);
     if (this.ep.connected && !this.playComplete) {
       this.logger.debug('TaskPlay:kill - killing audio');
-      if (cs.isInConference) {
-        const {memberId, confName} = cs;
-        this.killPlayToConfMember(this.ep, memberId, confName);
-      }
-      else {
-        this.notifyStatus({event: 'kill-playback'});
-        this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
-      }
+      await this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
     }
   }
 }

lib/tasks/rasa.js

@@ -1,170 +0,0 @@
-const Task = require('./task');
-const {TaskName, TaskPreconditions} = require('../utils/constants');
-const makeTask = require('./make_task');
-const bent = require('bent');
-
-class Rasa extends Task {
-  constructor(logger, opts) {
-    super(logger, opts);
-    this.preconditions = TaskPreconditions.Endpoint;
-
-    this.prompt = this.data.prompt;
-    this.eventHook = this.data?.eventHook;
-    this.actionHook = this.data?.actionHook;
-    this.post = bent('POST', 'json', 200);
-  }
-
-  get name() { return TaskName.Rasa; }
-
-  get hasReportedFinalAction() {
-    return this.reportedFinalAction || this.isReplacingApplication;
-  }
-
-  async exec(cs, {ep}) {
-    await super.exec(cs);
-
-    this.ep = ep;
-    try {
-      /* set event handlers */
-      this.on('transcription', this._onTranscription.bind(this, cs, ep));
-      this.on('timeout', this._onTimeout.bind(this, cs, ep));
-
-      /* start the first gather */
-      this.gatherTask = this._makeGatherTask(this.prompt);
-      const {span, ctx} = this.startChildSpan(`nested:${this.gatherTask.summary}`);
-      this.gatherTask.span = span;
-      this.gatherTask.ctx = ctx;
-      this.gatherTask.exec(cs, {ep})
-        .then(() => span.end())
-        .catch((err) => {
-          span.end();
-          this.logger.info({err}, 'Rasa gather task returned error');
-        });
-
-      await this.awaitTaskDone();
-    } catch (err) {
-      this.logger.error({err}, 'Rasa error');
-      throw err;
-    }
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-    this.logger.debug('Rasa:kill');
-
-    if (!this.hasReportedFinalAction) {
-      this.reportedFinalAction = true;
-      this.performAction({rasaResult: 'caller hungup'})
-        .catch((err) => this.logger.info({err}, 'rasa - error w/ action webook'));
-    }
-
-    if (this.ep.connected) {
-      await this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
-    }
-    this.removeAllListeners();
-    this.notifyTaskDone();
-  }
-
-  _makeGatherTask(prompt) {
-    let opts = {
-      input: ['speech'],
-      timeout: this.data.timeout || 10,
-      recognizer: this.data.recognizer || {
-        vendor: 'default',
-        language: 'default'
-      }
-    };
-    if (prompt) {
-      const sayOpts = this.data.tts ?
-        {text: prompt, synthesizer: this.data.tts} :
-        {text: prompt};
-
-      opts = {
-        ...opts,
-        say: sayOpts
-      };
-    }
-    //this.logger.debug({opts}, 'constructing a nested gather object');
-    const gather = makeTask(this.logger, {gather: opts}, this);
-    return gather;
-  }
-
-  async _onTranscription(cs, ep, evt) {
-    //this.logger.debug({evt}, `Rasa: got transcription for callSid ${cs.callSid}`);
-    const utterance = evt.alternatives[0].transcript;
-
-    if (this.eventHook) {
-      this.performHook(cs, this.eventHook, {event: 'userMessage', message: utterance})
-        .then((redirected) => {
-          if (redirected) {
-            this.logger.info('Rasa_onTranscription: event handler for user message redirected us to new webhook');
-            this.reportedFinalAction = true;
-            this.performAction({rasaResult: 'redirect'}, false);
-            if (this.gatherTask) this.gatherTask.kill(cs);
-          }
-          return;
-        })
-        .catch(({err}) => {
-          this.logger.info({err}, 'Rasa_onTranscription: error sending event hook');
-        });
-    }
-
-    try {
-      const payload = {
-        sender: cs.callSid,
-        message: utterance
-      };
-      this.logger.debug({payload}, 'Rasa:_onTranscription - sending payload to Rasa');
-      const response = await this.post(this.data.url, payload);
-      this.logger.debug({response}, 'Rasa:_onTranscription - got response from Rasa');
-      const botUtterance = Array.isArray(response) ?
-        response.reduce((prev, current) => {
-          return current.text ? `${prev} ${current.text}` : '';
-        }, '') :
-        null;
-      if (botUtterance) {
-        this.logger.debug({botUtterance}, 'Rasa:_onTranscription: got user utterance');
-        this.gatherTask = this._makeGatherTask(botUtterance);
-        const {span, ctx} = this.startChildSpan(`nested:${this.gatherTask.summary}`);
-        this.gatherTask.span = span;
-        this.gatherTask.ctx = ctx;
-        this.gatherTask.exec(cs, {ep})
-          .then(() => span.end())
-          .catch((err) => {
-            span.end();
-            this.logger.info({err}, 'Rasa gather task returned error');
-          });
-        if (this.eventHook) {
-          this.performHook(cs, this.eventHook, {event: 'botMessage', message: response})
-            .then((redirected) => {
-              if (redirected) {
-                this.logger.info('Rasa_onTranscription: event handler for bot message redirected us to new webhook');
-                this.reportedFinalAction = true;
-                this.performAction({rasaResult: 'redirect'}, false);
-                if (this.gatherTask) this.gatherTask.kill(cs);
-              }
-              return;
-            })
-            .catch(({err}) => {
-              this.logger.info({err}, 'Rasa_onTranscription: error sending event hook');
-            });
-        }
-      }
-    } catch (err) {
-      this.logger.error({err}, 'Rasa_onTranscription: Error sending user utterance to Rasa - ending task');
-      this.performAction({rasaResult: 'webhookError'});
-      this.reportedFinalAction = true;
-      this.notifyTaskDone();
-    }
-  }
-  _onTimeout(cs, ep, evt) {
-    this.logger.debug({evt}, 'Rasa: got timeout');
-    if (!this.hasReportedFinalAction) this.performAction({rasaResult: 'timeout'});
-    this.reportedFinalAction = true;
-    this.notifyTaskDone();
-  }
-
-
-}
-
-module.exports = Rasa;

lib/tasks/rest_dial.js

@@ -1,7 +1,7 @@
 const Task = require('./task');
 const {TaskName} = require('../utils/constants');
 const makeTask = require('./make_task');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
+const normalizeJambones = require('../utils/normalize-jambones');
 
 /**
  * Manages an outdial made via REST API
@@ -11,7 +11,6 @@ class TaskRestDial extends Task {
     super(logger, opts);
 
     this.from = this.data.from;
-    this.fromHost = this.data.fromHost;
     this.to = this.data.to;
     this.call_hook = this.data.call_hook;
     this.timeout = this.data.timeout || 60;
@@ -27,7 +26,7 @@ class TaskRestDial extends Task {
   */
   async exec(cs) {
     await super.exec(cs);
-    this.canCancel = true;
+    this.req = cs.req;
 
     this._setCallTimer();
     await this.awaitTaskDone();
@@ -36,36 +35,20 @@ class TaskRestDial extends Task {
   kill(cs) {
     super.kill(cs);
     this._clearCallTimer();
-    if (this.canCancel && cs?.req) {
-      this.canCancel = false;
-      cs.req.cancel();
+    if (this.req) {
+      this.req.cancel();
+      this.req = null;
     }
     this.notifyTaskDone();
   }
 
   async _onConnect(dlg) {
-    this.canCancel = false;
+    this.req = null;
     const cs = this.callSession;
     cs.setDialog(dlg);
 
     try {
-      const b3 = this.getTracingPropagation();
-      const httpHeaders = b3 && {b3};
-      const params = {
-        ...cs.callInfo,
-        defaults: {
-          synthesizer: {
-            vendor: cs.speechSynthesisVendor,
-            language: cs.speechSynthesisLanguage,
-            voice: cs.speechSynthesisVoice
-          },
-          recognizer: {
-            vendor:  cs.speechRecognizerVendor,
-            language: cs.speechRecognizerLanguage
-          }
-        }
-      };
-      const tasks = await cs.requestor.request('session:new', this.call_hook, params, httpHeaders);
+      const tasks = await cs.requestor.request(this.call_hook, cs.callInfo);
       if (tasks && Array.isArray(tasks)) {
         this.logger.debug({tasks: tasks}, `TaskRestDial: replacing application with ${tasks.length} tasks`);
         cs.replaceApplication(normalizeJambones(this.logger, tasks).map((tdata) => makeTask(this.logger, tdata)));
@@ -79,7 +62,7 @@ class TaskRestDial extends Task {
   _onCallStatus(status) {
     this.logger.debug(`CallStatus: ${status}`);
     if (status >= 200) {
-      this.canCancel = false;
+      this.req = null;
       this._clearCallTimer();
       if (status !== 200) this.notifyTaskDone();
     }

lib/tasks/say-legacy.js

@@ -23,7 +23,7 @@ class TaskSayLegacy extends Task {
 
   get name() { return TaskName.SayLegacy; }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     super.exec(cs);
     this.ep = ep;
     try {

lib/tasks/say.js

@@ -1,84 +1,32 @@
 const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
-const pollySSMLSplit = require('polly-ssml-split');
-
-const breakLengthyTextIfNeeded = (logger,  text) => {
-  const chunkSize = 1000;
-  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];
-  }
-};
 
 class TaskSay extends Task {
   constructor(logger, opts, parentTask) {
     super(logger, opts);
     this.preconditions = TaskPreconditions.Endpoint;
 
-    this.text = (Array.isArray(this.data.text) ? this.data.text : [this.data.text])
-      .map((t) => breakLengthyTextIfNeeded(this.logger, t))
-      .flat();
-
+    this.text = Array.isArray(this.data.text) ? this.data.text : [this.data.text];
     this.loop = this.data.loop || 1;
     this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
     this.synthesizer = this.data.synthesizer || {};
-    this.disableTtsCache = this.data.disableTtsCache;
   }
 
   get name() { return TaskName.Say; }
 
-  get summary() {
-    for (let i = 0; i < this.text.length; i++) {
-      if (this.text[i].startsWith('silence_stream')) continue;
-      return `${this.name}{text=${this.text[i].slice(0, 15)}${this.text[i].length > 15 ? '...' : ''}}`;
-    }
-    return `${this.name}{${this.text[0]}}`;
-  }
-
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
 
     const {srf} = cs;
     const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, srf);
-    const {writeAlerts, AlertType, stats} = srf.locals;
+    const {writeAlerts, AlertType} = srf.locals;
     const {synthAudio} = srf.locals.dbHelpers;
-    const vendor = this.synthesizer.vendor && this.synthesizer.vendor !== 'default' ?
-      this.synthesizer.vendor :
-      cs.speechSynthesisVendor;
-    const language = this.synthesizer.language && this.synthesizer.language !== 'default' ?
-      this.synthesizer.language :
-      cs.speechSynthesisLanguage ;
-    let voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
-      this.synthesizer.voice :
-      cs.speechSynthesisVoice;
-    const engine = this.synthesizer.engine || 'standard';
+    const vendor = this.synthesizer.vendor || cs.speechSynthesisVendor;
+    const language = this.synthesizer.language || cs.speechSynthesisLanguage;
+    const voice = this.synthesizer.voice || cs.speechSynthesisVoice;
     const salt = cs.callSid;
     const credentials = cs.getSpeechCredentials(vendor, 'tts');
 
-    /* parse Nuance voices into name and model */
-    let model;
-    if (vendor === 'nuance' && voice) {
-      const arr = /([A-Za-z-]*)\s+-\s+(enhanced|standard)/.exec(voice);
-      if (arr) {
-        voice = arr[1];
-        model = arr[2];
-      }
-    }
-
-    this.logger.info({vendor, language, voice, model}, 'TaskSay:exec');
     this.ep = ep;
     try {
       if (!credentials) {
@@ -87,89 +35,44 @@ class TaskSay extends Task {
           alert_type: AlertType.TTS_NOT_PROVISIONED,
           vendor
         }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
-        this.notifyError({
-          msg: 'TTS error',
-          details:`No speech credentials provisioned for selected vendor ${vendor}`
-        });
         throw new Error('no provisioned speech credentials for TTS');
       }
       // synthesize all of the text elements
       let lastUpdated = false;
-
-      /* produce an audio segment from the provided text */
-      const generateAudio = async(text) => {
-        if (this.killed) return;
-        if (text.startsWith('silence_stream://')) return text;
-
-        /* otel: trace time for tts */
-        const {span} = this.startChildSpan('tts-generation', {
-          'tts.vendor': vendor,
-          'tts.language': language,
-          'tts.voice': voice
-        });
-        try {
-          const {filePath, servedFromCache, rtt} = await synthAudio(stats, {
-            text,
-            vendor,
-            language,
-            voice,
-            engine,
-            model,
-            salt,
-            credentials,
-            disableTtsCache : this.disableTtsCache
-          });
-          this.logger.debug(`file ${filePath}, served from cache ${servedFromCache}`);
-          if (filePath) cs.trackTmpFile(filePath);
-          if (!servedFromCache && !lastUpdated) {
-            lastUpdated = true;
-            updateSpeechCredentialLastUsed(credentials.speech_credential_sid)
-              .catch(() => {/*already logged error */});
-          }
-          span.setAttributes({'tts.cached': servedFromCache});
-          span.end();
-          if (!servedFromCache && rtt) {
-            this.notifyStatus({
-              event: 'synthesized-audio',
-              vendor,
-              language,
-              characters: text.length,
-              elapsedTime: rtt
-            });
-          }
-          return filePath;
-        } catch (err) {
-          this.logger.info({err}, 'Error synthesizing tts');
-          span.end();
+      const filepath = (await Promise.all(this.text.map(async(text) => {
+        const {filePath, servedFromCache} = await synthAudio({
+          text,
+          vendor,
+          language,
+          voice,
+          salt,
+          credentials
+        }).catch((err) => {
+          this.logger.info(err, 'Error synthesizing tts');
           writeAlerts({
             account_sid: cs.accountSid,
-            alert_type: AlertType.TTS_FAILURE,
+            alert_type: AlertType.TTS_NOT_PROVISIONED,
             vendor,
             detail: err.message
-          }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
-          this.notifyError({msg: 'TTS error', details: err.message || err});
-          return;
+          });
+        }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
+        this.logger.debug(`file ${filePath}, served from cache ${servedFromCache}`);
+        if (filePath) cs.trackTmpFile(filePath);
+        if (!servedFromCache && !lastUpdated) {
+          lastUpdated = true;
+          updateSpeechCredentialLastUsed(credentials.speech_credential_sid)
+            .catch(() => {/*already logged error */});
         }
-      };
+        return filePath;
+      }))).filter((fp) => fp && fp.length);
 
-      const arr = this.text.map((t) => generateAudio(t));
-      const filepath = (await Promise.all(arr)).filter((fp) => fp && fp.length);
-      this.notifyStatus({event: 'start-playback'});
+      this.logger.debug({filepath}, 'synthesized files for tts');
 
-      while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep?.connected) {
+      while (!this.killed && this.loop-- && this.ep.connected) {
         let segment = 0;
-        while (!this.killed && segment < filepath.length) {
-          if (cs.isInConference) {
-            const {memberId, confName, confUuid} = cs;
-            await this.playToConfMember(this.ep, memberId, confName, confUuid, filepath[segment]);
-          }
-          else {
-            this.logger.debug(`Say:exec sending command to play file ${filepath[segment]}`);
-            await ep.play(filepath[segment]);
-            this.logger.debug(`Say:exec completed play file ${filepath[segment]}`);
-          }
-          segment++;
-        }
+        do {
+          await ep.play(filepath[segment]);
+        } while (!this.killed && ++segment < filepath.length);
       }
     } catch (err) {
       this.logger.info(err, 'TaskSay:exec error');
@@ -181,14 +84,7 @@ class TaskSay extends Task {
     super.kill(cs);
     if (this.ep.connected) {
       this.logger.debug('TaskSay:kill - killing audio');
-      if (cs.isInConference) {
-        const {memberId, confName} = cs;
-        this.killPlayToConfMember(this.ep, memberId, confName);
-      }
-      else {
-        this.notifyStatus({event: 'kill-playback'});
-        this.ep.api('uuid_break', this.ep.uuid);
-      }
+      await this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
     }
   }
 }

lib/tasks/sip_decline.js

@@ -19,11 +19,7 @@ class TaskSipDecline extends Task {
     res.send(this.data.status, this.data.reason, {
       headers: this.headers
     });
-    cs.emit('callStatusChange', {
-      callStatus: CallStatus.Failed,
-      sipStatus: this.data.status,
-      sipReason: this.data.reason
-    });
+    cs.emit('callStatusChange', {callStatus: CallStatus.Failed, sipStatus: this.data.status});
   }
 }
 

lib/tasks/sip_refer.js

@@ -1,128 +0,0 @@
-const Task = require('./task');
-const {TaskName, TaskPreconditions} = require('../utils/constants');
-const {parseUri} = require('drachtio-srf');
-
-/**
- * sends a sip REFER to transfer the existing call
- */
-class TaskSipRefer extends Task {
-  constructor(logger, opts) {
-    super(logger, opts);
-    this.preconditions = TaskPreconditions.StableCall;
-
-    this.referTo = this.data.referTo;
-    this.referredBy = this.data.referredBy;
-    this.headers = this.data.headers || {};
-    this.eventHook = this.data.eventHook;
-  }
-
-  get name() { return TaskName.SipRefer; }
-
-  async exec(cs) {
-    super.exec(cs);
-    const {dlg} = cs;
-    const {referTo, referredBy} = this._normalizeReferHeaders(cs, dlg);
-
-    try {
-      this.notifyHandler = this._handleNotify.bind(this, cs, dlg);
-      dlg.on('notify', this.notifyHandler);
-      /* otel: trace time for tts */
-      this.referSpan = this.startSpan('send-refer', {
-        'refer.refer_to': referTo,
-        'refer.referred_by': referredBy
-      });
-
-      const response = await dlg.request({
-        method: 'REFER',
-        headers: {
-          ...this.headers,
-          ...(this.referToIsUri && {'X-Refer-To-Leave-Untouched': true}),
-          'Refer-To': referTo,
-          'Referred-By': referredBy
-        }
-      });
-      this.referStatus = response.status;
-      this.referSpan.setAttributes({'refer.status_code': response.status});
-      this.logger.info(`TaskSipRefer:exec - received ${this.referStatus} to REFER`);
-
-      /* 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});
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TaskSipRefer:exec - error sending REFER');
-    }
-    this.referSpan?.end();
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-    const {dlg} = cs;
-    dlg.off('notify', this.notifyHandler);
-    this.notifyTaskDone();
-  }
-
-  async _handleNotify(cs, dlg, req, res) {
-    res.send(200);
-
-    const contentType = req.get('Content-Type');
-    this.logger.debug({body: req.body}, `TaskSipRefer:_handleNotify got ${contentType}`);
-
-    if (contentType?.includes('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];
-        this.logger.debug(`TaskSipRefer:_handleNotify: call got status ${status}`);
-        if (this.eventHook) {
-          const b3 = this.getTracingPropagation();
-          const httpHeaders = b3 && {b3};
-          await cs.requestor.request('verb:hook', this.eventHook,
-            {event: 'transfer-status', call_status: status}, httpHeaders);
-        }
-        if (status >= 200) {
-          this.referSpan.setAttributes({'refer.finalNotify': status});
-          await this.performAction({refer_status: 202, final_referred_call_status: status});
-          this.notifyTaskDone();
-        }
-      }
-    }
-  }
-
-  _normalizeReferHeaders(cs, dlg) {
-    let {referTo, referredBy} = this;
-
-    /* get IP address of the SBC to use as hostname if needed */
-    const {host} = parseUri(dlg.remote.uri);
-
-    if (!referTo.startsWith('<') && !referTo.startsWith('sip') && !referTo.startsWith('"')) {
-      /* they may have only provided a phone number/user */
-      referTo = `sip:${referTo}@${host}`;
-    }
-    else this.referToIsUri = true;
-    if (!referredBy) {
-      /* default */
-      referredBy = cs.req?.callingNumber || dlg.local.uri;
-      this.logger.info({referredBy}, 'setting referredby');
-    }
-    if (!referredBy.startsWith('<') && !referredBy.startsWith('sip') && !referredBy.startsWith('"')) {
-      /* they may have only provided a phone number/user */
-      referredBy = `sip:${referredBy}@${host}`;
-    }
-    return {referTo, referredBy};
-  }
-}
-
-module.exports = TaskSipRefer;

lib/tasks/sip_request.js

@@ -1,49 +0,0 @@
-const Task = require('./task');
-const {TaskName, TaskPreconditions} = require('../utils/constants');
-
-/**
- * Send a SIP request (e.g. INFO, NOTIFY, etc) on an existing call leg
- */
-class TaskSipRequest extends Task {
-  constructor(logger, opts) {
-    super(logger, opts);
-    this.preconditions = TaskPreconditions.StableCall;
-
-    this.method = this.data.method.toUpperCase();
-    this.headers = this.data.headers || {};
-    this.body = this.data.body;
-    if (this.body) this.body = `${this.body}\n`;
-  }
-
-  get name() { return TaskName.SipRequest; }
-
-  async exec(cs, {dlg}) {
-    super.exec(cs);
-    try {
-      this.logger.info({dlg}, `TaskSipRequest: sending a SIP ${this.method}`);
-      const res = await dlg.request({
-        method: this.method,
-        headers: this.headers,
-        body: this.body
-      });
-      const result = {result: 'success', sipStatus: res.status};
-      this.span.setAttributes({
-        ...this.headers,
-        ...(this.body && {body: this.body}),
-        'response.status_code': res.status
-      });
-      this.logger.debug({result}, `TaskSipRequest: received response to ${this.method}`);
-      await this.performAction(result);
-    } catch (err) {
-      this.logger.error({err}, 'TaskSipRequest: error');
-      this.span.setAttributes({
-        ...this.headers,
-        ...(this.body && {body: this.body}),
-        'response.error': err.message
-      });
-      await this.performAction({result: 'failed', err: err.message});
-    }
-  }
-}
-
-module.exports = TaskSipRequest;

lib/tasks/specs.json

@@ -0,0 +1,385 @@
+{
+  "sip:decline": {
+    "properties": {
+      "status": "number",
+      "reason": "string",
+      "headers": "object"
+    },
+    "required": [
+      "status"
+    ]
+  },
+  "dequeue": {
+    "properties": {
+      "name": "string",
+      "actionHook": "object|string",
+      "timeout": "number",
+      "beep": "boolean"
+    },
+    "required": [
+      "name"
+    ]
+  },
+  "enqueue": {
+    "properties": {
+      "name": "string",
+      "actionHook": "object|string",
+      "waitHook": "object|string",
+      "_": "object"
+    },
+    "required": [
+      "name"
+    ]
+  },
+  "leave": {
+    "properties": {
+      
+    }
+  },
+  "hangup": {
+    "properties": {
+      "headers": "object"
+    },
+    "required": [
+    ]
+  },
+  "play": {
+    "properties": {
+      "url": "string",
+      "loop": "number",
+      "earlyMedia": "boolean"
+    },
+    "required": [
+      "url"
+    ]
+  },
+  "say": {
+    "properties": {
+      "text": "string|array",
+      "loop": "number",
+      "synthesizer": "#synthesizer",
+      "earlyMedia": "boolean"
+    },
+    "required": [
+      "text"
+    ]
+  },
+  "gather": {
+    "properties": {
+      "actionHook": "object|string",
+      "finishOnKey": "string",
+      "input": "array",
+      "numDigits": "number",
+      "partialResultHook": "object|string",
+      "speechTimeout": "number",
+      "timeout": "number",
+      "recognizer": "#recognizer",
+      "play": "#play",
+      "say": "#say"
+    },
+    "required": [
+      "actionHook"
+    ]
+  },
+  "conference": {
+    "properties": {
+      "name": "string",
+      "beep": "boolean",
+      "startConferenceOnEnter": "boolean",
+      "endConferenceOnExit": "boolean",
+      "maxParticipants": "number",
+      "actionHook": "object|string",
+      "waitHook": "object|string",
+      "statusEvents": "array",
+      "statusHook": "object|string",
+      "enterHook": "object|string"
+    },
+    "required": [
+      "name"
+    ]
+  },
+  "dial": {
+    "properties": {
+      "actionHook": "object|string",
+      "answerOnBridge": "boolean",
+      "callerId": "string",
+      "confirmHook": "object|string",
+      "dialMusic": "string",
+      "dtmfCapture": "object",
+      "dtmfHook": "object|string",
+      "headers": "object",
+      "listen": "#listen",
+      "target": ["#target"],
+      "timeLimit": "number",
+      "timeout": "number",
+      "proxy": "string",
+      "transcribe": "#transcribe"
+    },
+    "required": [
+      "target"
+    ]
+  },
+  "dialogflow": {
+    "properties": {
+      "credentials": "object|string",
+      "project": "string",
+      "environment": "string",
+      "lang": "string",
+      "actionHook": "object|string",
+      "eventHook": "object|string",
+      "events": "[string]",
+      "welcomeEvent": "string",
+      "welcomeEventParams": "object",
+      "noInputTimeout": "number",
+      "noInputEvent": "string",
+      "passDtmfAsTextInput": "boolean",
+      "thinkingMusic": "string",
+      "tts": "#synthesizer",
+      "bargein": "boolean"
+    },
+    "required": [
+      "project",
+      "credentials",
+      "lang"
+    ]
+  },
+  "dtmf": {
+    "properties": {
+      "dtmf": "string",
+      "duration": "number"
+    },
+    "required": [
+      "dtmf"
+    ]
+  },
+  "lex": {
+    "properties": {
+      "botId": "string",
+      "botAlias": "string",
+      "credentials": "object",
+      "region": "string",
+      "locale": "string",
+      "intent": "#lexIntent",
+      "welcomeMessage": "string",
+      "metadata": "object",
+      "bargein": "boolean",
+      "passDtmf": "boolean",
+      "actionHook": "object|string",
+      "eventHook": "object|string",
+      "noInputTimeout": "number",
+      "tts": "#synthesizer"
+    },
+    "required": [
+      "botId",
+      "botAlias",
+      "region",
+      "credentials"
+    ]
+  },
+  "listen": {
+    "properties": {
+      "actionHook": "object|string",
+      "auth": "#auth",
+      "finishOnKey": "string",
+      "maxLength": "number",
+      "metadata": "object",
+      "mixType": {
+        "type": "string",
+        "enum": ["mono", "stereo", "mixed"]
+      },
+      "passDtmf": "boolean",
+      "playBeep": "boolean",
+      "sampleRate": "number",
+      "timeout": "number",
+      "transcribe": "#transcribe",
+      "url": "string",
+      "wsAuth": "#auth",
+      "earlyMedia": "boolean"
+    },
+    "required": [
+      "url"
+    ]
+  },
+  "message": {
+    "properties": {
+      "carrier": "string",
+      "account_sid": "string",
+      "message_sid": "string",
+      "to": "string",
+      "from": "string",
+      "text": "string",
+      "media": "string|array",
+      "actionHook": "object|string"
+    },
+    "required": [
+      "to",
+      "from"
+    ]
+  },
+  "pause": {
+    "properties": {
+      "length": "number"
+    },
+    "required": [
+      "length"
+    ]
+  },
+  "redirect": {
+    "properties": {
+      "actionHook": "object|string"
+    },
+    "required": [
+      "actionHook"
+    ]
+  },
+  "rest:dial": {
+    "properties": {
+      "account_sid": "string",
+      "application_sid": "string",
+      "call_hook": "object|string",
+      "call_status_hook": "object|string",
+      "from": "string",
+      "speech_synthesis_vendor": "string",
+      "speech_synthesis_voice": "string",
+      "speech_synthesis_language": "string",
+      "speech_recognizer_vendor": "string",
+      "speech_recognizer_language": "string",
+      "tag": "object",
+      "to": "#target",
+      "headers": "object",
+      "timeout": "number"
+    },
+    "required": [
+      "call_hook",
+      "from",
+      "to"
+    ]
+  },
+  "tag": {
+    "properties": {
+      "data": "object"
+    },
+    "required": [
+      "data"
+    ]
+  },
+  "transcribe": {
+    "properties": {
+      "transcriptionHook": "string",
+      "recognizer": "#recognizer",
+      "earlyMedia": "boolean"
+    },
+    "required": [
+      "transcriptionHook",
+      "recognizer"
+    ]
+  },
+  "target": {
+    "properties": {
+      "type": {
+        "type": "string",
+        "enum": ["phone", "sip", "user", "teams"]
+      },
+      "confirmHook": "object|string",
+      "method": {
+        "type": "string",
+        "enum": ["GET", "POST"]
+      },
+      "name": "string",
+      "number": "string",
+      "sipUri": "string",
+      "auth": "#auth",
+      "vmail": "boolean",
+      "tenant": "string"
+    },
+    "required": [
+      "type"
+    ]
+  },
+  "auth": {
+    "properties": {
+      "username": "string",
+      "password": "string"
+    },
+    "required": [
+      "username",
+      "password"
+    ]
+  },
+  "synthesizer": {
+    "properties": {
+      "vendor": {
+        "type": "string",
+        "enum": ["google", "aws", "polly", "default"]
+      },
+      "language": "string",
+      "voice": "string",
+      "gender": {
+        "type": "string",
+        "enum": ["MALE", "FEMALE", "NEUTRAL"]
+      }
+    },
+    "required": [
+      "vendor"
+    ]
+  },
+  "recognizer": {
+    "properties": {
+      "vendor": {
+        "type": "string",
+        "enum": ["google", "aws", "default"]
+      },
+      "language": "string",
+      "hints": "array",
+      "altLanguages": "array",
+      "profanityFilter": "boolean",
+      "interim": "boolean",
+      "singleUtterance": "boolean",
+      "dualChannel": "boolean",
+      "separateRecognitionPerChannel": "boolean",
+      "punctuation": "boolean",
+      "enhancedModel": "boolean",
+      "words": "boolean",
+      "diarization": "boolean",
+      "diarizationMinSpeakers": "number",
+      "diarizationMaxSpeakers": "number",
+      "interactionType": {
+        "type": "string",
+        "enum": [
+          "unspecified",
+          "discussion",
+          "presentation",
+          "phone_call",
+          "voicemail",
+          "voice_search",
+          "voice_command",
+          "dictation"
+        ]
+      },
+      "naicsCode": "number",
+      "identifyChannels": "boolean",
+      "vocabularyName": "string",
+      "vocabularyFilterName": "string",
+      "filterMethod": {
+        "type": "string",
+        "enum": [
+          "remove",
+          "mask",
+          "tag"
+        ]
+      }
+    },
+    "required": [
+      "vendor"
+    ]
+  },
+  "lexIntent": {
+    "properties": {
+      "name": "string",
+      "slots": "object"
+    },
+    "required": [
+      "name"
+    ]
+  }
+}

lib/tasks/task.js

@@ -1,10 +1,12 @@
 const Emitter = require('events');
-const uuidv4 = require('uuid-random');
+const { v4: uuidv4 } = require('uuid');
+const debug = require('debug')('jambonz:feature-server');
+const assert = require('assert');
 const {TaskPreconditions} = require('../utils/constants');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
-const WsRequestor = require('../utils/ws-requestor');
-const {TaskName} = require('../utils/constants');
-const {trace} = require('@opentelemetry/api');
+const normalizeJambones = require('../utils/normalize-jambones');
+const specs = new Map();
+const _specData = require('./specs');
+for (const key in _specData) {specs.set(key, _specData[key]);}
 
 /**
  * @classdesc Represents a jambonz verb. This is a superclass that is extended
@@ -18,13 +20,9 @@ class Task extends Emitter {
     this.logger = logger;
     this.data = data;
     this.actionHook = this.data.actionHook;
-    this.id = data.id;
 
     this._killInProgress = false;
     this._completionPromise = new Promise((resolve) => this._completionResolver = resolve);
-
-    /* used when we play a prompt to a member in conference */
-    this._confPlayCompletionPromise = new Promise((resolve) => this._confPlayCompletionResolver = resolve);
   }
 
   /**
@@ -41,10 +39,6 @@ class Task extends Emitter {
     return this.cs;
   }
 
-  get summary() {
-    return this.name;
-  }
-
   toJSON() {
     return this.data;
   }
@@ -65,37 +59,7 @@ class Task extends Emitter {
   kill(cs) {
     if (this.cs && !this.cs.isConfirmCallSession) this.logger.debug(`${this.name} is being killed`);
     this._killInProgress = true;
-
-    /* remove reference to parent task or else entangled parent-child tasks will not be gc'ed */
-    setImmediate(() => this.parentTask = null);
-  }
-
-  startSpan(name, attributes) {
-    const {srf} = require('../..');
-    const {tracer} = srf.locals.otel;
-    const span = tracer.startSpan(name, undefined, this.ctx);
-    if (attributes) span.setAttributes(attributes);
-    trace.setSpan(this.ctx, span);
-    return span;
-  }
-
-  startChildSpan(name, attributes) {
-    const {srf} = require('../..');
-    const {tracer} = srf.locals.otel;
-    const span = tracer.startSpan(name, undefined, this.ctx);
-    if (attributes) span.setAttributes(attributes);
-    const ctx = trace.setSpan(this.ctx, span);
-    return {span, ctx};
-  }
-
-  getTracingPropagation(encoding, span) {
-    // TODO: support encodings beyond b3 https://github.com/openzipkin/b3-propagation
-    if (span) {
-      return `${span.spanContext().traceId}-${span.spanContext().spanId}-1`;
-    }
-    if (this.span) {
-      return `${this.span.spanContext().traceId}-${this.span.spanContext().spanId}-1`;
-    }
+    // no-op
   }
 
   /**
@@ -113,21 +77,6 @@ class Task extends Emitter {
     return this._completionPromise;
   }
 
-  /**
-   * when a play to conference member completes
-   */
-  notifyConfPlayDone() {
-    this._confPlayCompletionResolver();
-  }
-
-  /**
-   * when a subclass task has launched various async activities and is now simply waiting
-   * for them to complete it should call this method to block until that happens
-   */
-  awaitConfPlayDone() {
-    return this._confPlayCompletionPromise;
-  }
-
   /**
    * provided as a convenience for tasks, this simply calls CallSession#normalizeUrl
    */
@@ -135,116 +84,18 @@ class Task extends Emitter {
     return this.callSession.normalizeUrl(url, method, auth);
   }
 
-  notifyError(obj) {
-    if (this.cs.requestor instanceof WsRequestor) {
-      const params = {...obj, verb: this.name, id: this.id};
-      this.cs.requestor.request('jambonz:error', '/error', params)
-        .catch((err) => this.logger.info({err}, 'Task:notifyError error sending error'));
-    }
-  }
-
-  notifyStatus(obj) {
-    if (this.cs.notifyEvents && this.cs.requestor instanceof WsRequestor) {
-      const params = {...obj, verb: this.name, id: this.id};
-      this.cs.requestor.request('verb:status', '/status', params)
-        .catch((err) => this.logger.info({err}, 'Task:notifyStatus error sending error'));
-    }
-  }
-
   async performAction(results, expectResponse = true) {
     if (this.actionHook) {
-      const type = this.name === TaskName.Redirect ? 'session:redirect' : 'verb:hook';
-      const params = results ? Object.assign(this.cs.callInfo.toJSON(), results) : this.cs.callInfo.toJSON();
-      const span = this.startSpan(type, {'hook.url': this.actionHook});
-      const b3 = this.getTracingPropagation('b3', span);
-      const httpHeaders = b3 && {b3};
-      span.setAttributes({'http.body': JSON.stringify(params)});
-      try {
-        const json = await this.cs.requestor.request(type, this.actionHook, params, httpHeaders);
-        span.setAttributes({'http.statusCode': 200});
-        span.end();
-        if (expectResponse && json && Array.isArray(json)) {
-          const makeTask = require('./make_task');
-          const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
-          if (tasks && tasks.length > 0) {
-            this.logger.info({tasks: tasks}, `${this.name} replacing application with ${tasks.length} tasks`);
-            this.callSession.replaceApplication(tasks);
-          }
-        }
-      } catch (err) {
-        span.setAttributes({'http.statusCode': err.statusCode});
-        span.end();
-        throw err;
-      }
-    }
-  }
-
-  async performHook(cs, hook, results) {
-    const params = results ? Object.assign(cs.callInfo.toJSON(), results) : cs.callInfo.toJSON();
-    const span = this.startSpan('verb:hook', {'hook.url': hook});
-    const b3 = this.getTracingPropagation('b3', span);
-    const httpHeaders = b3 && {b3};
-    span.setAttributes({'http.body': JSON.stringify(params)});
-    try {
-      const json = await cs.requestor.request('verb:hook', hook, params, httpHeaders);
-      span.setAttributes({'http.statusCode': 200});
-      span.end();
-      if (json && Array.isArray(json)) {
+      const params = results ? Object.assign(results, this.cs.callInfo.toJSON()) : this.cs.callInfo.toJSON();
+      const json = await this.cs.requestor.request(this.actionHook, params);
+      if (expectResponse && json && Array.isArray(json)) {
         const makeTask = require('./make_task');
         const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
         if (tasks && tasks.length > 0) {
-          this.redirect(cs, tasks);
-          return true;
+          this.logger.info({tasks: tasks}, `${this.name} replacing application with ${tasks.length} tasks`);
+          this.callSession.replaceApplication(tasks);
         }
       }
-      return false;
-    } catch (err) {
-      span.setAttributes({'http.statusCode': err.statusCode});
-      span.end();
-      throw err;
-    }
-  }
-
-  redirect(cs, tasks) {
-    this.logger.info({tasks: tasks}, `${this.name} replacing application with ${tasks.length} tasks`);
-    this.isReplacingApplication = true;
-    cs.replaceApplication(tasks);
-  }
-
-  async playToConfMember(ep, memberId, confName, confUuid, filepath) {
-    try {
-      this.logger.debug(`Task:playToConfMember - playing ${filepath} to ${confName}:${memberId}`);
-
-      // listen for conference events
-      const handler = this.__onConferenceEvent.bind(this);
-      ep.conn.on('esl::event::CUSTOM::*', handler) ;
-      const response = await ep.api(`conference ${confName} play ${filepath} ${memberId}`);
-      this.logger.debug({response}, 'Task:playToConfMember - api call returned');
-      await this.awaitConfPlayDone();
-      ep.conn.removeListener('esl::event::CUSTOM::*', handler);
-    } catch (err) {
-      this.logger.error({err}, `Task:playToConfMember - error playing ${filepath} to ${confName}:${memberId}`);
-    }
-  }
-
-  async killPlayToConfMember(ep, memberId, confName) {
-    try {
-      this.logger.debug(`Task:killPlayToConfMember - killing audio to ${confName}:${memberId}`);
-      const response = await ep.api(`conference ${confName} stop ${memberId}`);
-      this.logger.debug({response}, 'Task:killPlayToConfMember - api call returned');
-    } catch (err) {
-      this.logger.error({err}, `Task:killPlayToConfMember - error killing audio to ${confName}:${memberId}`);
-    }
-  }
-
-  __onConferenceEvent(evt) {
-    const eventName = evt.getHeader('Event-Subclass') ;
-    if (eventName === 'conference::maintenance') {
-      const action = evt.getHeader('Action') ;
-      if (action === 'play-file-member-done') {
-        this.logger.debug('done playing file to conf member');
-        this.notifyConfPlayDone();
-      }
     }
   }
 
@@ -282,6 +133,74 @@ class Task extends Emitter {
       this.logger.error(err, 'Task:_doRefer error');
     }
   }
+
+  /**
+   * validate that the JSON task description is valid
+   * @param {string} name - verb name
+   * @param {object} data - verb properties
+   */
+  static validate(name, data) {
+    debug(`validating ${name} with data ${JSON.stringify(data)}`);
+    // validate the instruction is supported
+    if (!specs.has(name)) throw new Error(`invalid instruction: ${name}`);
+
+    // check type of each element and make sure required elements are present
+    const specData = specs.get(name);
+    let required = specData.required || [];
+    for (const dKey in data) {
+      if (dKey in specData.properties) {
+        const dVal = data[dKey];
+        const dSpec = specData.properties[dKey];
+        debug(`Task:validate validating property ${dKey} with value ${JSON.stringify(dVal)}`);
+
+        if (typeof dSpec === 'string' && dSpec === 'array') {
+          if (!Array.isArray(dVal)) throw new Error(`${name}: property ${dKey} is not an array`);
+        }
+        else if (typeof dSpec === 'string' && dSpec.includes('|')) {
+          const types = dSpec.split('|').map((t) => t.trim());
+          if (!types.includes(typeof dVal) && !(types.includes('array') && Array.isArray(dVal))) {
+            throw new Error(`${name}: property ${dKey} has invalid data type, must be one of ${types}`);
+          }
+        }
+        else if (typeof dSpec === 'string' && ['number', 'string', 'object', 'boolean'].includes(dSpec)) {
+          // simple types
+          if (typeof dVal !== specData.properties[dKey]) {
+            throw new Error(`${name}: property ${dKey} has invalid data type`);
+          }
+        }
+        else if (Array.isArray(dSpec) && dSpec[0].startsWith('#')) {
+          const name = dSpec[0].slice(1);
+          for (const item of dVal) {
+            Task.validate(name, item);
+          }
+        }
+        else if (typeof dSpec === 'object') {
+          // complex types
+          const type = dSpec.type;
+          assert.ok(['number', 'string', 'object', 'boolean'].includes(type),
+            `invalid or missing type in spec ${JSON.stringify(dSpec)}`);
+          if (type === 'string' && dSpec.enum) {
+            assert.ok(Array.isArray(dSpec.enum), `enum must be an array ${JSON.stringify(dSpec.enum)}`);
+            if (!dSpec.enum.includes(dVal)) throw new Error(`invalid value ${dVal} must be one of ${dSpec.enum}`);
+          }
+        }
+        else if (typeof dSpec === 'string' && dSpec.startsWith('#')) {
+          // reference to another datatype (i.e. nested type)
+          const name = dSpec.slice(1);
+          //const obj = {};
+          //obj[name] = dVal;
+          Task.validate(name, dVal);
+        }
+        else {
+          assert.ok(0, `invalid spec ${JSON.stringify(dSpec)}`);
+        }
+        required = required.filter((item) => item !== dKey);
+      }
+      else throw new Error(`${name}: unknown property ${dKey}`);
+    }
+    if (required.length > 0) throw new Error(`${name}: missing value for ${required}`);
+  }
+
 }
 
 module.exports = Task;

lib/tasks/transcribe.js

@@ -3,34 +3,13 @@ const {
   TaskName,
   TaskPreconditions,
   GoogleTranscriptionEvents,
-  NuanceTranscriptionEvents,
-  AwsTranscriptionEvents,
-  AzureTranscriptionEvents,
-  DeepgramTranscriptionEvents,
-  SonioxTranscriptionEvents,
-  IbmTranscriptionEvents,
-  NvidiaTranscriptionEvents,
-  JambonzTranscriptionEvents
+  AwsTranscriptionEvents
 } = require('../utils/constants');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
 
 class TaskTranscribe extends Task {
   constructor(logger, opts, parentTask) {
     super(logger, opts);
     this.preconditions = TaskPreconditions.Endpoint;
-    this.parentTask = parentTask;
-
-    const {
-      setChannelVarsForStt,
-      normalizeTranscription,
-      removeSpeechListeners,
-      setSpeechCredentialsAtRuntime,
-      compileSonioxTranscripts
-    } = require('../utils/transcription-utils')(logger);
-    this.setChannelVarsForStt = setChannelVarsForStt;
-    this.normalizeTranscription = normalizeTranscription;
-    this.removeSpeechListeners = removeSpeechListeners;
-    this.compileSonioxTranscripts = compileSonioxTranscripts;
 
     this.transcriptionHook = this.data.transcriptionHook;
     this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
@@ -41,200 +20,150 @@ class TaskTranscribe extends Task {
     this.interim = !!recognizer.interim;
     this.separateRecognitionPerChannel = recognizer.separateRecognitionPerChannel;
 
-    /* let credentials be supplied in the recognizer object at runtime */
-    this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);
+    /* google-specific options */
+    this.hints = recognizer.hints || [];
+    this.profanityFilter = recognizer.profanityFilter;
+    this.punctuation = !!recognizer.punctuation;
+    this.enhancedModel = !!recognizer.enhancedModel;
+    this.words = !!recognizer.words;
+    this.diarization = !!recognizer.diarization;
+    this.diarizationMinSpeakers = recognizer.diarizationMinSpeakers || 0;
+    this.diarizationMaxSpeakers = recognizer.diarizationMaxSpeakers || 0;
+    this.interactionType = recognizer.interactionType || 'unspecified';
+    this.naicsCode = recognizer.naicsCode || 0;
+    this.altLanguages = recognizer.altLanguages || [];
 
-    /* buffer for soniox transcripts */
-    this._sonioxTranscripts = [];
-
-    recognizer.hints = recognizer.hints || [];
-    recognizer.altLanguages = recognizer.altLanguages || [];
+    /* aws-specific options */
+    this.identifyChannels = !!recognizer.identifyChannels;
+    this.vocabularyName = recognizer.vocabularyName;
+    this.vocabularyFilterName = recognizer.vocabularyFilterName;
+    this.filterMethod = recognizer.filterMethod;
   }
 
   get name() { return TaskName.Transcribe; }
 
-  async exec(cs, {ep, ep2}) {
+  async exec(cs, ep, parentTask) {
     super.exec(cs);
     const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
-    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;
-
-    if (cs.hasGlobalSttHints) {
-      const {hints, hintsBoost} = cs.globalSttHints;
-      this.data.recognizer.hints = this.data.recognizer.hints.concat(hints);
-      if (!this.data.recognizer.hintsBoost && hintsBoost) this.data.recognizer.hintsBoost = hintsBoost;
-      this.logger.debug({hints: this.data.recognizer.hints, hintsBoost: this.data.recognizer.hintsBoost},
-        'Transcribe:exec - applying global sttHints');
-    }
-    if (cs.hasAltLanguages) {
-      this.data.recognizer.altLanguages = this.data.recognizer.altLanguages.concat(cs.altLanguages);
-      this.logger.debug({altLanguages: this.altLanguages},
-        'Transcribe:exec - applying altLanguages');
-    }
-    if (cs.hasGlobalSttPunctuation && !this.data.recognizer.punctuation) {
-      this.data.recognizer.punctuation = cs.globalSttPunctuation;
-    }
 
     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 (!this.data.recognizer.vendor) {
-      this.data.recognizer.vendor = this.vendor;
-    }
-    if (!this.sttCredentials) this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
+    if ('default' === this.vendor || !this.vendor) this.vendor = cs.speechRecognizerVendor;
+    if ('default' === this.language || !this.language) this.language = cs.speechRecognizerLanguage;
+    this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
 
     try {
       if (!this.sttCredentials) {
-        const {writeAlerts, AlertType} = cs.srf.locals;
-        this.logger.info(`TaskTranscribe:exec - ERROR stt using ${this.vendor} requested but creds not supplied`);
-        writeAlerts({
-          account_sid: cs.accountSid,
-          alert_type: AlertType.STT_NOT_PROVISIONED,
-          vendor: this.vendor
-        }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
+        // TODO: generate alert (actually should be done by cs.getSpeechCredentials)
         throw new Error('no provisioned speech credentials for TTS');
       }
-
-      if (this.vendor === 'nuance' && this.sttCredentials.client_id) {
-        /* get nuance access token */
-        const {client_id, secret} = this.sttCredentials;
-        const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
-        this.logger.debug({client_id},
-          `Transcribe:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
-        this.sttCredentials = {...this.sttCredentials, access_token};
-      }
-      else if (this.vendor == 'ibm' && this.sttCredentials.stt_api_key) {
-        /* get ibm access token */
-        const {stt_api_key, stt_region} = this.sttCredentials;
-        const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
-        this.logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
-        this.sttCredentials = {...this.sttCredentials, access_token, stt_region};
-      }
-      await this._startTranscribing(cs, ep, 1);
-      if (this.separateRecognitionPerChannel && ep2) {
-        await this._startTranscribing(cs, ep2, 2);
-      }
-
+      await this._startTranscribing(cs, ep);
       updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
         .catch(() => {/*already logged error */});
 
       await this.awaitTaskDone();
     } catch (err) {
       this.logger.info(err, 'TaskTranscribe:exec - error');
-      this.parentTask && this.parentTask.emit('error', err);
     }
-    this.removeSpeechListeners(ep);
+    ep.removeCustomEventListener(GoogleTranscriptionEvents.Transcription);
+    ep.removeCustomEventListener(GoogleTranscriptionEvents.NoAudioDetected);
+    ep.removeCustomEventListener(GoogleTranscriptionEvents.MaxDurationExceeded);
+    ep.removeCustomEventListener(AwsTranscriptionEvents.Transcription);
+    ep.removeCustomEventListener(AwsTranscriptionEvents.NoAudioDetected);
+    ep.removeCustomEventListener(AwsTranscriptionEvents.MaxDurationExceeded);
   }
 
   async kill(cs) {
     super.kill(cs);
-    let stopTranscription = false;
-    if (this.ep?.connected) {
-      stopTranscription = true;
+    if (this.ep.connected) {
       this.ep.stopTranscription({vendor: this.vendor})
         .catch((err) => this.logger.info(err, 'Error TaskTranscribe:kill'));
-    }
-    if (this.separateRecognitionPerChannel && this.ep2 && this.ep2.connected) {
-      stopTranscription = true;
-      this.ep2.stopTranscription({vendor: this.vendor})
-        .catch((err) => this.logger.info(err, 'Error TaskTranscribe:kill'));
-    }
-    // hangup after 1 sec if we don't get a final transcription
-    if (stopTranscription) this._timer = setTimeout(() => this.notifyTaskDone(), 1500);
-    else this.notifyTaskDone();
 
+      // hangup after 1 sec if we don't get a final transcription
+      this._timer = setTimeout(() => this.notifyTaskDone(), 1000);
+    }
+    else this.notifyTaskDone();
     await this.awaitTaskDone();
   }
 
-  async _startTranscribing(cs, ep, channel) {
-    const opts = this.setChannelVarsForStt(this, this.sttCredentials, this.data.recognizer);
-    switch (this.vendor) {
-      case 'google':
-        this.bugname = 'google_transcribe';
-        ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(GoogleTranscriptionEvents.NoAudioDetected,
-          this._onNoAudio.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(GoogleTranscriptionEvents.MaxDurationExceeded,
-          this._onMaxDurationExceeded.bind(this, cs, ep, channel));
-        break;
+  async _startTranscribing(cs, ep) {
+    const opts = {};
 
-      case 'aws':
-      case 'polly':
-        this.bugname = 'aws_transcribe';
-        ep.addCustomEventListener(AwsTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(AwsTranscriptionEvents.NoAudioDetected,
-          this._onNoAudio.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(AwsTranscriptionEvents.MaxDurationExceeded,
-          this._onMaxDurationExceeded.bind(this, cs, ep, channel));
-        break;
-      case 'microsoft':
-        this.bugname = 'azure_transcribe';
-        ep.addCustomEventListener(AzureTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected,
-          this._onNoAudio.bind(this, cs, ep, channel));
-        break;
-      case 'nuance':
-        this.bugname = 'nuance_transcribe';
-        ep.addCustomEventListener(NuanceTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(NuanceTranscriptionEvents.StartOfSpeech,
-          this._onStartOfSpeech.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(NuanceTranscriptionEvents.TranscriptionComplete,
-          this._onTranscriptionComplete.bind(this, cs, ep, channel));
-        break;
-      case 'deepgram':
-        this.bugname = 'deepgram_transcribe';
-        ep.addCustomEventListener(DeepgramTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(DeepgramTranscriptionEvents.Connect,
-          this._onDeepgramConnect.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(DeepgramTranscriptionEvents.ConnectFailure,
-          this._onDeepGramConnectFailure.bind(this, cs, ep, channel));
-        break;
-      case 'soniox':
-        this.bugname = 'soniox_transcribe';
-        ep.addCustomEventListener(SonioxTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        break;
-      case 'ibm':
-        this.bugname = 'ibm_transcribe';
-        ep.addCustomEventListener(IbmTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(IbmTranscriptionEvents.Connect,
-          this._onIbmConnect.bind(this, cs, ep, channel));
-        ep.addCustomEventListener(IbmTranscriptionEvents.ConnectFailure,
-          this._onIbmConnectFailure.bind(this, cs, ep, channel));
-        break;
+    ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+    ep.addCustomEventListener(GoogleTranscriptionEvents.NoAudioDetected, this._onNoAudio.bind(this, cs, ep));
+    ep.addCustomEventListener(GoogleTranscriptionEvents.MaxDurationExceeded,
+      this._onMaxDurationExceeded.bind(this, ep));
+    ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+    ep.addCustomEventListener(AwsTranscriptionEvents.NoAudioDetected, this._onNoAudio.bind(this, cs, ep));
+    ep.addCustomEventListener(AwsTranscriptionEvents.MaxDurationExceeded,
+      this._onMaxDurationExceeded.bind(this, cs, ep));
 
-      case 'nvidia':
-        this.bugname = 'nvidia_transcribe';
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep));
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.StartOfSpeech,
-          this._onStartOfSpeech.bind(this, cs, ep));
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.TranscriptionComplete,
-          this._onTranscriptionComplete.bind(this, cs, ep));
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.VadDetected,
-          this._onVadDetected.bind(this, cs, ep));
-        break;
-      default:
-        throw new Error(`Invalid vendor ${this.vendor}`);
+    if (this.vendor === 'google') {
+      if (this.sttCredentials) opts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(this.sttCredentials.credentials);
+      [
+        ['enhancedModel', 'GOOGLE_SPEECH_USE_ENHANCED'],
+        ['separateRecognitionPerChannel', 'GOOGLE_SPEECH_SEPARATE_RECOGNITION_PER_CHANNEL'],
+        ['profanityFilter', 'GOOGLE_SPEECH_PROFANITY_FILTER'],
+        ['punctuation', 'GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION'],
+        ['words', 'GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS'],
+        ['diarization', 'GOOGLE_SPEECH_PROFANITY_FILTER']
+      ].forEach((arr) => {
+        if (this[arr[0]]) opts[arr[1]] = true;
+      });
+      if (this.hints.length > 1) opts.GOOGLE_SPEECH_HINTS = this.hints.join(',');
+      if (this.altLanguages.length > 1) opts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = this.altLanguages.join(',');
+      if ('unspecified' !== this.interactionType) {
+        opts.GOOGLE_SPEECH_METADATA_INTERACTION_TYPE = this.interactionType;
+
+        // additionally set model if appropriate
+        if ('phone_call' === this.interactionType) opts.GOOGLE_SPEECH_MODEL = 'phone_call';
+        else if (['voice_search', 'voice_command'].includes(this.interactionType)) {
+          opts.GOOGLE_SPEECH_MODEL = 'command_and_search';
+        }
+        else opts.GOOGLE_SPEECH_MODEL = 'phone_call';
+      }
+      else opts.GOOGLE_SPEECH_MODEL = 'phone_call';
+      if (this.diarization && this.diarizationMinSpeakers > 0) {
+        opts.GOOGLE_SPEECH_SPEAKER_DIARIZATION_MIN_SPEAKER_COUNT = this.diarizationMinSpeakers;
+      }
+      if (this.diarization && this.diarizationMaxSpeakers > 0) {
+        opts.GOOGLE_SPEECH_SPEAKER_DIARIZATION_MAX_SPEAKER_COUNT = this.diarizationMaxSpeakers;
+      }
+      if (this.naicsCode > 0) opts.GOOGLE_SPEECH_METADATA_INDUSTRY_NAICS_CODE = this.naicsCode;
+
+      await ep.set(opts)
+        .catch((err) => this.logger.info(err, 'TaskTranscribe:_startTranscribing with google'));
     }
+    else if (this.vendor === 'aws') {
+      [
+        ['diarization', 'AWS_SHOW_SPEAKER_LABEL'],
+        ['identifyChannels', 'AWS_ENABLE_CHANNEL_IDENTIFICATION']
+      ].forEach((arr) => {
+        if (this[arr[0]]) opts[arr[1]] = true;
+      });
+      if (this.vocabularyName) opts.AWS_VOCABULARY_NAME = this.vocabularyName;
+      if (this.vocabularyFilterName) {
+        opts.AWS_VOCABULARY_NAME = this.vocabularyFilterName;
+        opts.AWS_VOCABULARY_FILTER_METHOD = this.filterMethod || 'mask';
+      }
 
-    /* common handler for all stt engine errors */
-    ep.addCustomEventListener(JambonzTranscriptionEvents.Error, this._onJambonzError.bind(this, cs, ep));
-    await ep.set(opts)
-      .catch((err) => this.logger.info(err, 'Error setting channel variables'));
+      if (this.sttCredentials) {
+        Object.assign(opts, {
+          AWS_ACCESS_KEY_ID: this.sttCredentials.accessKeyId,
+          AWS_SECRET_ACCESS_KEY: this.sttCredentials.secretAccessKey,
+          AWS_REGION: this.sttCredentials.region
+        });
+      }
+      else {
+        Object.assign(opts, {
+          AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID,
+          AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY,
+          AWS_REGION: process.env.AWS_REGION
+        });
+      }
 
+      await ep.set(opts)
+        .catch((err) => this.logger.info(err, 'TaskTranscribe:_startTranscribing with aws'));
+    }
     await this._transcribe(ep);
   }
 
@@ -243,73 +172,16 @@ class TaskTranscribe extends Task {
       vendor: this.vendor,
       interim: this.interim ? true : false,
       locale: this.language,
-      channels: /*this.separateRecognitionPerChannel ? 2 : */ 1,
-      bugname: this.bugname
+      channels: this.separateRecognitionPerChannel ? 2 : 1
     });
   }
 
-  async _onTranscription(cs, ep, channel, evt, fsEvent) {
-    // make sure this is not a transcript from answering machine detection
-    const bugname = fsEvent.getHeader('media-bugname');
-    if (bugname && this.bugname !== bugname) return;
+  _onTranscription(cs, ep, evt) {
+    if ('aws' === this.vendor && Array.isArray(evt) && evt.length > 0) evt = evt[0];
+    this.logger.debug(evt, 'TaskTranscribe:_onTranscription');
 
-    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);
-    this.logger.debug({evt}, 'TaskTranscribe:_onTranscription');
-    if (evt.alternatives.length === 0) {
-      this.logger.info({evt}, 'TaskTranscribe:_onTranscription - got empty transcript, continue listening');
-      return;
-    }
-
-    if (evt.alternatives[0]?.transcript === '' && !cs.callGone && !this.killed) {
-      if (['microsoft', 'deepgram'].includes(this.vendor)) {
-        this.logger.info({evt}, 'TaskTranscribe:_onTranscription - got empty transcript, continue listening');
-      }
-      else {
-        this.logger.info({evt}, 'TaskTranscribe:_onTranscription - got empty transcript, listen again');
-        this._transcribe(ep);
-      }
-      return;
-    }
-
-    if (this.vendor === 'soniox') {
-      /* compile transcripts into one */
-      this._sonioxTranscripts.push(evt.vendor.finalWords);
-      if (evt.is_final) {
-        evt = this.compileSonioxTranscripts(this._sonioxTranscripts, 1, this.language);
-        this._sonioxTranscripts = [];
-      }
-    }
-
-    if (this.transcriptionHook) {
-      const b3 = this.getTracingPropagation();
-      const httpHeaders = b3 && {b3};
-      try {
-        const json = await this.cs.requestor.request('verb:hook', this.transcriptionHook, {
-          ...this.cs.callInfo,
-          ...httpHeaders,
-          speech: evt
-        });
-        this.logger.info({json}, 'sent transcriptionHook');
-        if (json && Array.isArray(json) && !this.parentTask) {
-          const makeTask = require('./make_task');
-          const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
-          if (tasks && tasks.length > 0) {
-            this.logger.info({tasks: tasks}, `${this.name} replacing application with ${tasks.length} tasks`);
-            this.cs.replaceApplication(tasks);
-          }
-        }
-      } catch (err) {
-        this.logger.info(err, 'TranscribeTask:_onTranscription error');
-      }
-    }
-    if (this.parentTask) {
-      this.parentTask.emit('transcription', evt);
-    }
+    this.cs.requestor.request(this.transcriptionHook, Object.assign({speech: evt}, this.cs.callInfo))
+      .catch((err) => this.logger.info(err, 'TranscribeTask:_onTranscription error'));
     if (this.killed) {
       this.logger.debug('TaskTranscribe:_onTranscription exiting after receiving final transcription');
       this._clearTimer();
@@ -317,13 +189,13 @@ class TaskTranscribe extends Task {
     }
   }
 
-  _onNoAudio(cs, ep, channel) {
-    this.logger.debug(`TaskTranscribe:_onNoAudio restarting transcription on channel ${channel}`);
+  _onNoAudio(cs, ep) {
+    this.logger.debug('TaskTranscribe:_onNoAudio restarting transcription');
     this._transcribe(ep);
   }
 
-  _onMaxDurationExceeded(cs, ep, channel) {
-    this.logger.debug(`TaskTranscribe:_onMaxDurationExceeded restarting transcription on channel ${channel}`);
+  _onMaxDurationExceeded(cs, ep) {
+    this.logger.debug('TaskTranscribe:_onMaxDurationExceeded restarting transcription');
     this._transcribe(ep);
   }
 
@@ -333,64 +205,6 @@ class TaskTranscribe extends Task {
       this._timer = null;
     }
   }
-  _onDeepgramConnect(_cs, _ep) {
-    this.logger.debug('TaskTranscribe:_onDeepgramConnect');
-  }
-
-  _onDeepGramConnectFailure(cs, _ep, _channel, evt) {
-    const {reason} = evt;
-    const {writeAlerts, AlertType} = cs.srf.locals;
-    this.logger.info({evt}, 'TaskTranscribe:_onDeepgramConnectFailure');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      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(`Failed connecting to speech vendor deepgram: ${reason}`);
-    this.notifyTaskDone();
-  }
-
-  _onIbmConnect(_cs, _ep) {
-    this.logger.debug('TaskTranscribe:_onIbmConnect');
-  }
-
-  _onIbmConnectFailure(cs, _ep, _channel, evt) {
-    const {reason} = evt;
-    const {writeAlerts, AlertType} = cs.srf.locals;
-    this.logger.info({evt}, 'TaskTranscribe:_onIbmConnectFailure');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      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(`Failed connecting to speech vendor IBM: ${reason}`);
-    this.notifyTaskDone();
-  }
-  _onIbmError(cs, _ep, _channel, evt) {
-    this.logger.info({evt}, 'TaskTranscribe:_onIbmError');
-  }
-  _onJambonzError(cs, _ep, evt) {
-    this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
-    const {writeAlerts, AlertType} = cs.srf.locals;
-
-    if (this.vendor === 'nuance') {
-      const {code, error} = evt;
-      if (code === 404 && error === 'No speech') return this._resolve('timeout');
-      if (code === 413 && error === 'Too much speech') return this._resolve('timeout');
-    }
-    this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      message: `Custom speech vendor ${this.vendor} error: ${evt.error}`,
-      vendor: this.vendor,
-    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
-    this.notifyError({msg: 'ASR error', details:`Custom speech vendor ${this.vendor} error: ${evt.error}`});
-  }
-
-
 }
 
 module.exports = TaskTranscribe;

lib/utils/amd-utils.js

@@ -1,343 +0,0 @@
-const Emitter = require('events');
-const {readFile} = require('fs');
-const {
-  GoogleTranscriptionEvents,
-  AwsTranscriptionEvents,
-  AzureTranscriptionEvents,
-  AmdEvents,
-  AvmdEvents
-} = require('./constants');
-const bugname = 'amd_bug';
-const {VMD_HINTS_FILE} = process.env;
-let voicemailHints = [];
-
-const updateHints = async(file, callback) => {
-  readFile(file, 'utf8', (err, data) => {
-    if (err) return callback(err);
-    try {
-      callback(null, JSON.parse(data));
-    } catch (err) {
-      callback(err);
-    }
-  });
-};
-
-if (VMD_HINTS_FILE) {
-  updateHints(VMD_HINTS_FILE, (err, hints) => {
-    if (err) {  console.error(err); }
-    voicemailHints = hints;
-
-    /* if successful, update the hints every hour */
-    setInterval(() => {
-      updateHints(VMD_HINTS_FILE, (err, hints) => {
-        if (err) {  console.error(err); }
-        voicemailHints = hints;
-      });
-    }, 60000);
-  });
-}
-
-class Amd extends Emitter {
-  constructor(logger, cs, opts) {
-    super();
-    this.logger = logger;
-    this.vendor = opts.recognizer?.vendor || cs.speechRecognizerVendor;
-    if ('default' === this.vendor) this.vendor = cs.speechRecognizerVendor;
-
-    this.language = opts.recognizer?.language || cs.speechRecognizerLanguage;
-    if ('default' === this.language) this.language = cs.speechRecognizerLanguage;
-
-    this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
-
-    if (!this.sttCredentials) throw new Error(`No speech credentials found for vendor ${this.vendor}`);
-
-    this.thresholdWordCount = opts.thresholdWordCount || 9;
-    const {normalizeTranscription} = require('./transcription-utils')(logger);
-    this.normalizeTranscription = normalizeTranscription;
-
-    const {
-      noSpeechTimeoutMs = 5000,
-      decisionTimeoutMs = 15000,
-      toneTimeoutMs = 20000,
-      greetingCompletionTimeoutMs = 2000
-    } = opts.timers || {};
-    this.noSpeechTimeoutMs = noSpeechTimeoutMs;
-    this.decisionTimeoutMs = decisionTimeoutMs;
-    this.toneTimeoutMs = toneTimeoutMs;
-    this.greetingCompletionTimeoutMs = greetingCompletionTimeoutMs;
-
-    this.beepDetected = false;
-  }
-
-  startDecisionTimer() {
-    this.decisionTimer = setTimeout(this._onDecisionTimeout.bind(this), this.decisionTimeoutMs);
-    this.noSpeechTimer = setTimeout(this._onNoSpeechTimeout.bind(this), this.noSpeechTimeoutMs);
-    this.startToneTimer();
-  }
-  stopDecisionTimer() {
-    this.decisionTimer && clearTimeout(this.decisionTimer);
-  }
-  stopNoSpeechTimer() {
-    this.noSpeechTimer && clearTimeout(this.noSpeechTimer);
-  }
-  startToneTimer() {
-    this.toneTimer = setTimeout(this._onToneTimeout.bind(this), this.toneTimeoutMs);
-  }
-  startGreetingCompletionTimer() {
-    this.greetingCompletionTimer = setTimeout(
-      this._onGreetingCompletionTimeout.bind(this),
-      this.beepDetected ? 1000 : this.greetingCompletionTimeoutMs);
-  }
-  stopGreetingCompletionTimer() {
-    this.greetingCompletionTimer && clearTimeout(this.greetingCompletionTimer);
-  }
-  restartGreetingCompletionTimer() {
-    this.stopGreetingCompletionTimer();
-    this.startGreetingCompletionTimer();
-  }
-  stopToneTimer() {
-    this.toneTimer && clearTimeout(this.toneTimer);
-  }
-  stopAllTimers() {
-    this.stopDecisionTimer();
-    this.stopNoSpeechTimer();
-    this.stopToneTimer();
-    this.stopGreetingCompletionTimer();
-  }
-  _onDecisionTimeout() {
-    this.emit(this.decision = AmdEvents.DecisionTimeout);
-    this.stopNoSpeechTimer();
-  }
-  _onToneTimeout() {
-    this.emit(AmdEvents.ToneTimeout);
-  }
-  _onNoSpeechTimeout() {
-    this.emit(this.decision = AmdEvents.NoSpeechDetected);
-    this.stopDecisionTimer();
-  }
-  _onGreetingCompletionTimeout() {
-    this.emit(AmdEvents.MachineStoppedSpeaking);
-  }
-
-  evaluateTranscription(evt) {
-    if (this.decision) {
-      /* at this point we are only listening for the machine to stop speaking */
-      if (this.decision === AmdEvents.MachineDetected) {
-        this.restartGreetingCompletionTimer();
-      }
-      return;
-    }
-    this.stopNoSpeechTimer();
-
-    this.logger.debug({evt}, 'Amd:evaluateTranscription - raw');
-    const t = this.normalizeTranscription(evt, this.vendor, this.language);
-    const hints = voicemailHints[this.language] || [];
-
-    this.logger.debug({t}, 'Amd:evaluateTranscription - normalized');
-
-    if (Array.isArray(t.alternatives) && t.alternatives.length > 0) {
-      const wordCount = t.alternatives[0].transcript.split(' ').length;
-      const final = t.is_final;
-
-      const foundHint = hints.find((h) =>  t.alternatives[0].transcript.includes(h));
-      if (foundHint) {
-        /* we detected a common voice mail greeting */
-        this.logger.debug(`Amd:evaluateTranscription: found hint ${foundHint}`);
-        this.emit(this.decision = AmdEvents.MachineDetected, {
-          reason: 'hint',
-          hint: foundHint,
-          language: t.language_code
-        });
-      }
-      else if (final && wordCount < this.thresholdWordCount) {
-        /* a short greeting is typically a human */
-        this.emit(this.decision = AmdEvents.HumanDetected, {
-          reason: 'short greeting',
-          greeting: t.alternatives[0].transcript,
-          language: t.language_code
-        });
-      }
-      else if (wordCount >= this.thresholdWordCount) {
-        /* a long greeting is typically a machine */
-        this.emit(this.decision = AmdEvents.MachineDetected, {
-          reason: 'long greeting',
-          greeting: t.alternatives[0].transcript,
-          language: t.language_code
-        });
-      }
-
-      if (this.decision) {
-        this.stopDecisionTimer();
-
-        if (this.decision === AmdEvents.MachineDetected) {
-          /* if we detected a machine, then wait for greeting to end */
-          this.startGreetingCompletionTimer();
-        }
-      }
-      return this.decision;
-    }
-  }
-}
-
-module.exports = (logger) => {
-  const startTranscribing = async(cs, ep, task) => {
-    const {vendor, language} = ep.amd;
-    ep.startTranscription({
-      vendor,
-      language,
-      interim: true,
-      bugname
-    }).catch((err) => {
-      const {writeAlerts, AlertType} = cs.srf.locals;
-      ep.amd = null;
-      task.emit(AmdEvents.Error, err);
-      logger.error(err, 'amd:_startTranscribing error');
-      writeAlerts({
-        account_sid: cs.accountSid,
-        alert_type: AlertType.STT_FAILURE,
-        vendor: vendor,
-        detail: err.message
-      });
-    }).catch((err) => logger.info({err}, 'Error generating alert for tts failure'));
-
-  };
-
-  const onEndOfUtterance = (cs, ep, task) => {
-    logger.debug('amd:onEndOfUtterance');
-    startTranscribing(cs, ep, task);
-  };
-  const onNoSpeechDetected = (cs, ep, task) => {
-    logger.debug('amd:onNoSpeechDetected');
-    ep.amd.stopAllTimers();
-    task.emit(AmdEvents.NoSpeechDetected);
-  };
-  const onTranscription = (cs, ep, task, evt, fsEvent) => {
-    if (fsEvent.getHeader('media-bugname') !== bugname) return;
-    ep.amd?.evaluateTranscription(evt);
-  };
-  const onBeep = (cs, ep, task, evt, fsEvent) => {
-    logger.debug({evt, fsEvent}, 'onBeep');
-    const frequency = Math.floor(fsEvent.getHeader('Frequency'));
-    const variance = Math.floor(fsEvent.getHeader('Frequency-variance'));
-    task.emit('amd', {type: AmdEvents.ToneDetected, frequency, variance});
-    if (ep.amd) {
-      ep.amd.stopToneTimer();
-      ep.amd.beepDetected = true;
-    }
-    ep.execute('avmd_stop').catch((err) => this.logger.info(err, 'Error stopping avmd'));
-  };
-
-  const startAmd = async(cs, ep, task, opts) => {
-    const amd = ep.amd = new Amd(logger, cs, opts);
-    const {vendor, language, sttCredentials} = amd;
-    const sttOpts = {};
-    const hints = voicemailHints[language] || [];
-
-    /* set stt options */
-    logger.info(`starting amd for vendor ${vendor} and language ${language}`);
-    if ('google' === vendor) {
-      sttOpts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(sttCredentials.credentials);
-      sttOpts.GOOGLE_SPEECH_USE_ENHANCED = true;
-      sttOpts.GOOGLE_SPEECH_HINTS = hints.join(',');
-      if (opts.recognizer?.altLanguages) {
-        sttOpts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = opts.recognizer.altLanguages.join(',');
-      }
-      ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
-      ep.addCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance, onEndOfUtterance.bind(null, cs, ep, task));
-    }
-    else if (['aws', 'polly'].includes(vendor)) {
-      Object.assign(sttOpts, {
-        AWS_ACCESS_KEY_ID: sttCredentials.accessKeyId,
-        AWS_SECRET_ACCESS_KEY: sttCredentials.secretAccessKey,
-        AWS_REGION: sttCredentials.region
-      });
-      ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
-    }
-    else if ('microsoft' === vendor) {
-      Object.assign(sttOpts, {
-        'AZURE_SUBSCRIPTION_KEY': sttCredentials.api_key,
-        'AZURE_REGION': sttCredentials.region
-      });
-      sttOpts.AZURE_SPEECH_HINTS = hints.join(',');
-      if (opts.recognizer?.altLanguages) {
-        sttOpts.AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = opts.recognizer.altLanguages.join(',');
-      }
-      sttOpts.AZURE_INITIAL_SPEECH_TIMEOUT_MS = opts.resolveTimeoutMs || 20000;
-
-      ep.addCustomEventListener(AzureTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
-      ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, onNoSpeechDetected.bind(null, cs, ep, task));
-    }
-    await ep.set(sttOpts).catch((err) => logger.info(err, 'Error setting channel variables'));
-
-    amd
-      .on(AmdEvents.NoSpeechDetected, (evt) => {
-        task.emit('amd', {type: AmdEvents.NoSpeechDetected, ...evt});
-        try {
-          ep.connected && ep.stopTranscription({vendor, bugname});
-        } catch (err) {
-          logger.info({err}, 'Error stopping transcription');
-        }
-      })
-      .on(AmdEvents.HumanDetected, (evt) => {
-        task.emit('amd', {type: AmdEvents.HumanDetected, ...evt});
-        try {
-          ep.connected && ep.stopTranscription({vendor, bugname});
-        } catch (err) {
-          logger.info({err}, 'Error stopping transcription');
-        }
-      })
-      .on(AmdEvents.MachineDetected, (evt) => {
-        task.emit('amd', {type: AmdEvents.MachineDetected, ...evt});
-      })
-      .on(AmdEvents.DecisionTimeout, (evt) => {
-        task.emit('amd', {type: AmdEvents.DecisionTimeout, ...evt});
-        try {
-          ep.connected && ep.stopTranscription({vendor, bugname});
-        } catch (err) {
-          logger.info({err}, 'Error stopping transcription');
-        }
-      })
-      .on(AmdEvents.ToneTimeout, (evt) => {
-        //task.emit('amd', {type: AmdEvents.ToneTimeout, ...evt});
-        try {
-          ep.connected && ep.execute('avmd_stop').catch((err) => logger.info(err, 'Error stopping avmd'));
-        } catch (err) {
-          logger.info({err}, 'Error stopping avmd');
-        }
-      })
-      .on(AmdEvents.MachineStoppedSpeaking, () => {
-        task.emit('amd', {type: AmdEvents.MachineStoppedSpeaking});
-        try {
-          ep.connected && ep.stopTranscription({vendor, bugname});
-        } catch (err) {
-          logger.info({err}, 'Error stopping transcription');
-        }
-      });
-
-    /* start transcribing, and also listening for beep */
-    amd.startDecisionTimer();
-    startTranscribing(cs, ep, task);
-
-    ep.addCustomEventListener(AvmdEvents.Beep, onBeep.bind(null, cs, ep, task));
-    ep.execute('avmd_start').catch((err) => this.logger.info(err, 'Error starting avmd'));
-  };
-
-  const stopAmd = (ep, task) => {
-    let vendor;
-    if (ep.amd) {
-      vendor = ep.amd.vendor;
-      ep.amd.stopAllTimers();
-      ep.amd = null;
-    }
-
-    if (ep.connected) {
-      ep.stopTranscription({vendor, bugname})
-        .catch((err) => logger.info(err, 'stopAmd: Error stopping transcription'));
-      task.emit('amd', {type: AmdEvents.Stopped});
-      ep.execute('avmd_stop').catch((err) => this.logger.info(err, 'Error stopping avmd'));
-    }
-    ep.removeCustomEventListener(AvmdEvents.Beep);
-  };
-
-  return {startAmd, stopAmd};
-};

lib/utils/aws-sns-lifecycle.js

@@ -1,7 +1,7 @@
 const Emitter = require('events');
 const bent = require('bent');
 const assert = require('assert');
-const PORT = process.env.AWS_SNS_PORT || 3010;
+const PORT = process.env.AWS_SNS_PORT || 3001;
 const {LifeCycleEvents} = require('./constants');
 const express = require('express');
 const app = express();
@@ -21,26 +21,6 @@ class SnsNotifier extends Emitter {
 
     this.logger = logger;
   }
-  _doListen(logger, app, port, resolve) {
-    return app.listen(port, () => {
-      this.snsEndpoint = `http://${this.publicIp}:${port}`;
-      logger.info(`SNS lifecycle server listening on http://localhost:${port}`);
-      resolve(app);
-    });
-  }
-
-  _handleErrors(logger, app, resolve, reject, e) {
-    if (e.code === 'EADDRINUSE' &&
-      process.env.AWS_SNS_PORT_MAX &&
-      e.port < process.env.AWS_SNS_PORT_MAX) {
-
-      logger.info(`SNS lifecycle server failed to bind port on ${e.port}, will try next port`);
-      const server = this._doListen(logger, app, ++e.port, resolve);
-      server.on('error', this._handleErrors.bind(this, logger, app, resolve, reject));
-      return;
-    }
-    reject(e);
-  }
 
   async _handlePost(req, res) {
     try {
@@ -65,7 +45,6 @@ class SnsNotifier extends Emitter {
           }, 'response from SNS SubscribeURL');
           const data = await this.describeInstance();
           this.lifecycleState = data.AutoScalingInstances[0].LifecycleState;
-          this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
           break;
 
         case 'Notification':
@@ -104,9 +83,11 @@ class SnsNotifier extends Emitter {
       this.logger.debug('SnsNotifier: retrieving instance data');
       this.instanceId = await getString('http://169.254.169.254/latest/meta-data/instance-id');
       this.publicIp = await getString('http://169.254.169.254/latest/meta-data/public-ipv4');
+      this.snsEndpoint = `http://${this.publicIp}:${PORT}`;
       this.logger.info({
         instanceId: this.instanceId,
-        publicIp: this.publicIp
+        publicIp: this.publicIp,
+        snsEndpoint: this.snsEndpoint
       }, 'retrieved AWS instance data');
 
       // start listening
@@ -118,10 +99,7 @@ class SnsNotifier extends Emitter {
         this.logger.error(err, 'burped error');
         res.status(err.status || 500).json({msg: err.message});
       });
-      return new Promise((resolve, reject) => {
-        const server = this._doListen(this.logger, app, PORT, resolve);
-        server.on('error', this._handleErrors.bind(this, this.logger, app, resolve, reject));
-      });
+      app.listen(PORT);
 
     } catch (err) {
       this.logger.error({err}, 'Error retrieving AWS instance metadata');

lib/utils/base-requestor.js

@@ -1,75 +0,0 @@
-const assert = require('assert');
-const Emitter = require('events');
-const crypto = require('crypto');
-const timeSeries = require('@jambonz/time-series');
-let alerter ;
-
-class BaseRequestor extends Emitter {
-  constructor(logger, account_sid, hook, secret) {
-    super();
-    assert(typeof hook === 'object');
-
-    this.logger = logger;
-    this.url = hook.url;
-
-    this.username = hook.username;
-    this.password = hook.password;
-    this.secret = secret;
-    this.account_sid = account_sid;
-
-    const {stats} = require('../../').srf.locals;
-    this.stats = stats;
-
-    if (!alerter) {
-      alerter = timeSeries(logger, {
-        host: process.env.JAMBONES_TIME_SERIES_HOST,
-        commitSize: 50,
-        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
-      });
-    }
-  }
-
-  get Alerter() {
-    return alerter;
-  }
-
-  close() {
-    /* subclass responsibility */
-  }
-
-  _computeSignature(payload, timestamp, secret) {
-    assert(secret);
-    const data = `${timestamp}.${JSON.stringify(payload)}`;
-    return crypto
-      .createHmac('sha256', secret)
-      .update(data, 'utf8')
-      .digest('hex');
-  }
-
-  _generateSigHeader(payload, secret) {
-    const timestamp = Math.floor(Date.now() / 1000);
-    const signature = this._computeSignature(payload, timestamp, secret);
-    const scheme = 'v1';
-    return {
-      'Jambonz-Signature': `t=${timestamp},${scheme}=${signature}`
-    };
-  }
-
-  _isAbsoluteUrl(u) {
-    return typeof u === 'string' &&
-      u.startsWith('https://') || u.startsWith('http://') ||
-      u.startsWith('ws://') || u.startsWith('wss://');
-  }
-  _isRelativeUrl(u) {
-    return typeof u === 'string' && u.startsWith('/');
-  }
-  _roundTrip(startAt) {
-    const diff = process.hrtime(startAt);
-    const time = diff[0] * 1e3 + diff[1] * 1e-6;
-    return time.toFixed(0);
-  }
-
-
-}
-
-module.exports = BaseRequestor;

lib/utils/call-tracer.js

@@ -1,78 +0,0 @@
-const {context, trace} = require('@opentelemetry/api');
-const {Dialog} = require('drachtio-srf');
-class RootSpan {
-  constructor(callType, req) {
-    let tracer, callSid, linkedSpanId;
-
-    if (req instanceof Dialog) {
-      const dlg = req;
-      tracer = dlg.srf.locals.otel.tracer;
-      callSid = dlg.callSid;
-      linkedSpanId = dlg.linkedSpanId;
-    }
-    else {
-      tracer = req.srf.locals.otel.tracer;
-      callSid = req.locals.callSid;
-    }
-    this._span = tracer.startSpan(callType || 'incoming-call');
-    if (req instanceof Dialog) {
-      const dlg = req;
-      this._span.setAttributes({
-        linkedSpanId,
-        callId: dlg.sip.callId
-      });
-    }
-    else {
-      this._span.setAttributes({
-        callSid,
-        accountSid: req.get('X-Account-Sid'),
-        applicationSid: req.locals.application_sid,
-        callId: req.get('Call-ID'),
-        externalCallId: req.get('X-CID')
-      });
-    }
-
-    this._ctx = trace.setSpan(context.active(), this._span);
-    this.tracer = tracer;
-  }
-
-  get context() {
-    return this._ctx;
-  }
-
-  get traceId() {
-    return this._span.spanContext().traceId;
-  }
-
-  get spanId() {
-    return this._span.spanContext().spanId;
-  }
-
-  get traceFlags() {
-    return this._span.spanContext().traceFlags;
-  }
-
-  getTracingPropagation(encoding) {
-    // TODO: support encodings beyond b3 https://github.com/openzipkin/b3-propagation
-    if (this._span  && this.traceId !== '00000000000000000000000000000000') {
-      return `${this.traceId}-${this.spanId}-1`;
-    }
-  }
-
-  setAttributes(attrs) {
-    this._span.setAttributes(attrs);
-  }
-
-  end() {
-    this._span.end();
-  }
-
-  startChildSpan(name, attributes) {
-    const span = this.tracer.startSpan(name, attributes, this._ctx);
-    const ctx = trace.setSpan(context.active(), span);
-    return {span, ctx};
-  }
-}
-
-module.exports = RootSpan;
-

lib/utils/constants.json

@@ -1,8 +1,6 @@
 {
   "TaskName": {
-    "Cognigy": "cognigy",
     "Conference": "conference",
-    "Config": "config",
     "Dequeue": "dequeue",
     "Dial": "dial",
     "Dialogflow": "dialogflow",
@@ -16,12 +14,9 @@
     "Message": "message",
     "Pause": "pause",
     "Play": "play",
-    "Rasa": "rasa",
     "Redirect": "redirect",
     "RestDial": "rest:dial",
     "SipDecline": "sip:decline",
-    "SipRequest": "sip:request",
-    "SipRefer": "sip:refer",
     "SipNotify": "sip:notify",
     "SipRedirect": "sip:redirect",
     "Say": "say",
@@ -29,7 +24,6 @@
     "Tag": "tag",
     "Transcribe": "transcribe"
   },
-  "AllowedSipRecVerbs": ["config", "gather", "transcribe", "listen"],
   "CallStatus": {
     "Trying": "trying",
     "Ringing": "ringing",
@@ -57,64 +51,17 @@
     "StableCall": "stable-call",
     "UnansweredCall": "unanswered-call"
   },
-  "AvmdEvents": {
-    "Beep": "avmd::beep"
-  },
   "GoogleTranscriptionEvents": {
     "Transcription": "google_transcribe::transcription",
     "EndOfUtterance": "google_transcribe::end_of_utterance",
     "NoAudioDetected": "google_transcribe::no_audio_detected",
-    "MaxDurationExceeded": "google_transcribe::max_duration_exceeded",
-    "VadDetected": "google_transcribe::vad_detected"
-  },
-  "NuanceTranscriptionEvents": {
-    "Transcription": "nuance_transcribe::transcription",
-    "StartOfSpeech": "nuance_transcribe::start_of_speech",
-    "TranscriptionComplete": "nuance_transcribe::end_of_transcription",
-    "Error": "nuance_transcribe::error",
-    "VadDetected": "nuance_transcribe::vad_detected"
-  },
-  "NvidiaTranscriptionEvents": {
-    "Transcription": "nvidia_transcribe::transcription",
-    "StartOfSpeech": "nvidia_transcribe::start_of_speech",
-    "TranscriptionComplete": "nvidia_transcribe::end_of_transcription",
-    "Error": "nvidia_transcribe::error",
-    "VadDetected": "nvidia_transcribe::vad_detected"
-  },
-  "DeepgramTranscriptionEvents": {
-    "Transcription": "deepgram_transcribe::transcription",
-    "ConnectFailure": "deepgram_transcribe::connect_failed",
-    "Connect": "deepgram_transcribe::connect"
-  },
-  "SonioxTranscriptionEvents": {
-    "Transcription": "soniox_transcribe::transcription",
-    "Error": "soniox_transcribe::error"
-  },
-  "IbmTranscriptionEvents": {
-    "Transcription": "ibm_transcribe::transcription",
-    "ConnectFailure": "ibm_transcribe::connect_failed",
-    "Connect": "ibm_transcribe::connect",
-    "Error": "ibm_transcribe::error"
+    "MaxDurationExceeded": "google_transcribe::max_duration_exceeded"
   },
   "AwsTranscriptionEvents": {
     "Transcription": "aws_transcribe::transcription",
     "EndOfTranscript": "aws_transcribe::end_of_transcript",
     "NoAudioDetected": "aws_transcribe::no_audio_detected",
-    "MaxDurationExceeded": "aws_transcribe::max_duration_exceeded",
-    "VadDetected": "aws_transcribe::vad_detected"
-  },
-  "AzureTranscriptionEvents": {
-    "Transcription": "azure_transcribe::transcription",
-    "StartOfUtterance": "azure_transcribe::start_of_utterance",
-    "EndOfUtterance": "azure_transcribe::end_of_utterance",
-    "NoSpeechDetected": "azure_transcribe::no_speech_detected",
-    "VadDetected": "azure_transcribe::vad_detected"
-  },
-  "JambonzTranscriptionEvents": {
-    "Transcription": "jambonz_transcribe::transcription",
-    "ConnectFailure": "jambonz_transcribe::connect_failed",
-    "Connect": "jambonz_transcribe::connect",
-    "Error": "jambonz_transcribe::error"
+    "MaxDurationExceeded": "aws_transcribe::max_duration_exceeded"
   },
   "ListenEvents": {
     "Connect": "mod_audio_fork::connect",
@@ -149,34 +96,6 @@
     "Hangup": "hangup",
     "Replaced": "replaced"
   },
-  "HookMsgTypes": [
-    "session:new",
-    "session:reconnect",
-    "session:redirect",
-    "call:status",
-    "queue:status",
-    "dial:confirm",
-    "verb:hook",
-    "verb:status",
-    "jambonz:error"
-  ],
-  "RecordState": {
-    "RecordingOn": "recording_on",
-    "RecordingOff": "recording_off",
-    "RecordingPaused": "recording_paused"
-  },
-  "AmdEvents": {
-    "NoSpeechDetected": "amd_no_speech_detected",
-    "HumanDetected": "amd_human_detected",
-    "MachineDetected": "amd_machine_detected",
-    "MachineStoppedSpeaking": "amd_machine_stopped_speaking",
-    "Error": "amd_error",
-    "DecisionTimeout": "amd_decision_timeout",
-    "ToneDetected": "amd_tone_detected",
-    "ToneTimeout": "amd_tone_timeout",
-    "Stopped": "amd_stopped"
-  },
   "MAX_SIMRINGS": 10,
-  "BONG_TONE": "tone_stream://v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)",
-  "FS_UUID_SET_NAME": "fsUUIDs"
+  "BONG_TONE": "tone_stream://v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"
 }

lib/utils/cron-jobs.js

@@ -1,52 +0,0 @@
-const {execSync} = require('child_process');
-const now = Date.now();
-const fsInventory = process.env.JAMBONES_FREESWITCH
-  .split(',')
-  .map((fs) => {
-    const arr = /^([^:]*):([^:]*):([^:]*)(?::([^:]*))?/.exec(fs);
-    const opts = {address: arr[1], port: arr[2], secret: arr[3]};
-    if (arr.length > 4) opts.advertisedAddress = arr[4];
-    if (process.env.NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
-    return opts;
-  });
-
-const clearChannels = () => {
-  const {logger} = require('../..');
-  const pwd = fsInventory[0].secret;
-  const maxDurationMins = process.env.JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS || 180;
-
-  const calls = execSync(`/usr/local/freeswitch/bin/fs_cli -p ${pwd} -x "show calls"`, {encoding: 'utf8'})
-    .split('\n')
-    .filter((line) => line.match(/^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{8}/))
-    .map((line) => {
-      const arr = line.split(',');
-      const dt = new Date(arr[2]);
-      const duration = (now - dt.getTime()) / 1000;
-      return {
-        uuid: arr[0],
-        time: arr[2],
-        duration
-      };
-    })
-    .filter((c) => c.duration > 60 * maxDurationMins);
-
-  if (calls.length > 0) {
-    logger.debug(`clearChannels: clearing ${calls.length} old calls longer than ${maxDurationMins} mins`);
-    for (const call of calls) {
-      const cmd = `/usr/local/freeswitch/bin/fs_cli -p ${pwd} -x "uuid_kill ${call.uuid}"`;
-      const out = execSync(cmd, {encoding: 'utf8'});
-      logger.debug({out}, 'clearChannels: command output');
-    }
-  }
-  return calls.length;
-};
-
-const clearFiles = () => {
-  //const {logger} = require('../..');
-  /*const out = */ execSync('find /tmp -name "*.mp3" -mtime +2 -exec rm {} \\;');
-  //logger.debug({out}, 'clearFiles: command output');
-};
-
-
-module.exports = {clearChannels, clearFiles};
-

lib/utils/db-utils.js

@@ -10,72 +10,16 @@ const sqlSpeechCredentialsForSP = `SELECT *
 FROM speech_credentials 
 WHERE service_provider_sid =  
 (SELECT service_provider_sid from accounts where account_sid = ?)`;
-const sqlQueryAccountCarrierByName = `SELECT voip_carrier_sid  
-FROM voip_carriers vc 
-WHERE vc.account_sid = ? 
-AND vc.name = ?`;
-const sqlQuerySPCarrierByName = `SELECT voip_carrier_sid  
-FROM voip_carriers vc 
-WHERE vc.account_sid IS NULL 
-AND vc.service_provider_sid = 
-(SELECT service_provider_sid from accounts where account_sid = ?) 
-AND vc.name = ?`;
 
 const speechMapper = (cred) => {
   const {credential, ...obj} = cred;
-  try {
-    if ('google' === obj.vendor) {
-      obj.service_key = decrypt(credential);
-    }
-    else if ('aws' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.access_key_id = o.access_key_id;
-      obj.secret_access_key = o.secret_access_key;
-      obj.aws_region = o.aws_region;
-    }
-    else if ('microsoft' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-      obj.region = o.region;
-      obj.use_custom_stt = o.use_custom_stt;
-      obj.custom_stt_endpoint = o.custom_stt_endpoint;
-      obj.use_custom_tts = o.use_custom_tts;
-      obj.custom_tts_endpoint = o.custom_tts_endpoint;
-    }
-    else if ('wellsaid' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-    }
-    else if ('nuance' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.client_id = o.client_id;
-      obj.secret = o.secret;
-      obj.nuance_tts_uri = o.nuance_tts_uri;
-      obj.nuance_stt_uri = o.nuance_stt_uri;
-    }
-    else if ('ibm' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.tts_api_key = o.tts_api_key;
-      obj.tts_region = o.tts_region;
-      obj.stt_api_key = o.stt_api_key;
-      obj.stt_region = o.stt_region;
-    }
-    else if ('deepgram' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-    }
-    else if ('soniox' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-    }
-    else if (obj.vendor.startsWith('custom:')) {
-      const o = JSON.parse(decrypt(credential));
-      obj.auth_token = o.auth_token;
-      obj.custom_stt_url = o.custom_stt_url;
-      obj.custom_tts_url = o.custom_tts_url;
-    }
-  } catch (err) {
-    console.log(err);
+  if ('google' === obj.vendor) {
+    obj.service_key = decrypt(credential);
+  }
+  else if ('aws' === obj.vendor) {
+    const o = JSON.parse(decrypt(credential));
+    obj.access_key_id = o.access_key_id;
+    obj.secret_access_key = o.secret_access_key;
   }
   return obj;
 };
@@ -85,19 +29,27 @@ module.exports = (logger, srf) => {
   const pp = pool.promise();
 
   const lookupAccountDetails = async(account_sid) => {
-
     const [r] = await pp.query({sql: sqlAccountDetails, nestTables: true}, account_sid);
     if (0 === r.length) throw new Error(`invalid accountSid: ${account_sid}`);
     const [r2] = await pp.query(sqlSpeechCredentials, account_sid);
     const speech = r2.map(speechMapper);
 
-    /* add service provider creds unless we have that vendor at the account level */
-    const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid);
-    r3.forEach((s) => {
-      if (!speech.find((s2) => s2.vendor === s.vendor)) {
-        speech.push(speechMapper(s));
+    /* search at the service provider level if we don't find it at the account level */
+    const haveGoogle = speech.find((s) => s.vendor === 'google');
+    const haveAws = speech.find((s) => s.vendor === 'aws');
+    if (!haveGoogle || !haveAws) {
+      const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid);
+      if (r3.length) {
+        if (!haveGoogle) {
+          const google = r3.find((s) => s.vendor === 'google');
+          if (google) speech.push(speechMapper(google));
+        }
+        if (!haveAws) {
+          const aws = r3.find((s) => s.vendor === 'aws');
+          if (aws) speech.push(speechMapper(aws));
+        }
       }
-    });
+    }
 
     return {
       ...r[0],
@@ -106,7 +58,6 @@ module.exports = (logger, srf) => {
   };
 
   const updateSpeechCredentialLastUsed = async(speech_credential_sid) => {
-    if (!speech_credential_sid) return;
     const pp = pool.promise();
     const sql = 'UPDATE speech_credentials SET last_used = NOW() WHERE speech_credential_sid = ?';
     try {
@@ -116,21 +67,8 @@ module.exports = (logger, srf) => {
     }
   };
 
-  const lookupCarrier = async(account_sid, carrierName) => {
-    const pp = pool.promise();
-    try {
-      const [r] = await pp.query(sqlQueryAccountCarrierByName, [account_sid, carrierName]);
-      if (r.length) return r[0].voip_carrier_sid;
-      const [r2] = await pp.query(sqlQuerySPCarrierByName, [account_sid, carrierName]);
-      if (r2.length) return r2[0].voip_carrier_sid;
-    } catch (err) {
-      logger.error({err}, `lookupCarrier: Error ${account_sid}:${carrierName}`);
-    }
-  };
-
   return {
     lookupAccountDetails,
-    updateSpeechCredentialLastUsed,
-    lookupCarrier
+    updateSpeechCredentialLastUsed
   };
 };

lib/utils/encrypt-decrypt.js

@@ -1,10 +1,10 @@
 const crypto = require('crypto');
-const algorithm = process.env.LEGACY_CRYPTO ? 'aes-256-ctr' : 'aes-256-cbc';
+const algorithm = 'aes-256-ctr';
 const iv = crypto.randomBytes(16);
 const secretKey = crypto.createHash('sha256')
-  .update(process.env.ENCRYPTION_SECRET || process.env.JWT_SECRET)
+  .update(String(process.env.JWT_SECRET))
   .digest('base64')
-  .substring(0, 32);
+  .substr(0, 32);
 
 const encrypt = (text) => {
   const cipher = crypto.createCipheriv(algorithm, secretKey, iv);
@@ -25,8 +25,8 @@ const decrypt = (data) => {
     throw err;
   }
   const decipher = crypto.createDecipheriv(algorithm, secretKey, Buffer.from(hash.iv, 'hex'));
-  const decrypted = Buffer.concat([decipher.update(Buffer.from(hash.content, 'hex')), decipher.final()]);
-  return decrypted.toString();
+  const decrpyted = Buffer.concat([decipher.update(Buffer.from(hash.content, 'hex')), decipher.final()]);
+  return decrpyted.toString();
 };
 
 module.exports = {

lib/utils/http-listener.js

@@ -1,45 +0,0 @@
-
-const express = require('express');
-const httpRoutes = require('../http-routes');
-const PORT = process.env.HTTP_PORT || 3000;
-
-const doListen = (logger, app, port, resolve) => {
-  const server = app.listen(port, () => {
-    const {srf} = app.locals;
-    logger.info(`listening for HTTP requests on port ${PORT}, serviceUrl is ${srf.locals.serviceUrl}`);
-    resolve({server, app});
-  });
-  return server;
-};
-const handleErrors = (logger, app, resolve, reject, e) => {
-  if (e.code === 'EADDRINUSE' &&
-    process.env.HTTP_PORT_MAX &&
-    e.port < process.env.HTTP_PORT_MAX) {
-
-    logger.info(`HTTP server failed to bind port on ${e.port}, will try next port`);
-    const server = doListen(logger, app, ++e.port, resolve);
-    server.on('error', handleErrors.bind(null, logger, app, resolve, reject));
-    return;
-  }
-  logger.info({err: e, port: PORT}, 'httpListener error');
-  reject(e);
-};
-
-const createHttpListener = (logger, srf) => {
-  const app = express();
-  app.locals = {...app.locals, logger, srf};
-  app.use(express.urlencoded({ extended: true }));
-  app.use(express.json());
-  app.use('/', httpRoutes);
-  app.use((err, _req, res, _next) => {
-    logger.error(err, 'burped error');
-    res.status(err.status || 500).json({msg: err.message});
-  });
-  return new Promise((resolve, reject) => {
-    const server = doListen(logger, app, PORT, resolve);
-    server.on('error', handleErrors.bind(null, logger, app, resolve, reject));
-  });
-};
-
-
-module.exports = createHttpListener;

lib/utils/http-requestor.js

@@ -1,189 +0,0 @@
-const {Client, Pool} = require('undici');
-const parseUrl = require('parse-url');
-const assert = require('assert');
-const BaseRequestor = require('./base-requestor');
-const {HookMsgTypes} = require('./constants.json');
-const snakeCaseKeys = require('./snakecase-keys');
-const pools = new Map();
-const HTTP_TIMEOUT = 10000;
-
-const toBase64 = (str) => Buffer.from(str || '', 'utf8').toString('base64');
-
-function basicAuth(username, password) {
-  if (!username || !password) return {};
-  const creds = `${username}:${password || ''}`;
-  const header = `Basic ${toBase64(creds)}`;
-  return {Authorization: header};
-}
-
-
-class HttpRequestor extends BaseRequestor {
-  constructor(logger, account_sid, hook, secret) {
-    super(logger, account_sid, hook, secret);
-
-    this.method = hook.method || 'POST';
-    this.authHeader = basicAuth(hook.username, hook.password);
-
-    assert(this._isAbsoluteUrl(this.url));
-    assert(['GET', 'POST'].includes(this.method));
-
-    const u = this._parsedUrl = parseUrl(this.url);
-    if (u.port) this._baseUrl = `${u.protocol}://${u.resource}:${u.port}`;
-    else this._baseUrl = `${u.protocol}://${u.resource}`;
-    this._protocol = u.protocol;
-    this._resource = u.resource;
-    this._port = u.port;
-    this._search = u.search;
-    this._usePools = process.env.HTTP_POOL && parseInt(process.env.HTTP_POOL);
-
-    if (this._usePools) {
-      if (pools.has(this._baseUrl)) {
-        this.client = pools.get(this._baseUrl);
-      }
-      else {
-        const connections = process.env.HTTP_POOLSIZE ? parseInt(process.env.HTTP_POOLSIZE) : 10;
-        const pipelining = process.env.HTTP_PIPELINING ? parseInt(process.env.HTTP_PIPELINING) : 1;
-        const pool = this.client = new Pool(this._baseUrl, {
-          connections,
-          pipelining
-        });
-        pools.set(this._baseUrl, pool);
-        this.logger.debug(`HttpRequestor:created pool for ${this._baseUrl}`);
-      }
-    }
-    else {
-      if (u.port) this.client = new Client(`${u.protocol}://${u.resource}:${u.port}`);
-      else this.client = new Client(`${u.protocol}://${u.resource}`);
-    }
-  }
-
-  get baseUrl() {
-    return this._baseUrl;
-  }
-
-  close() {
-    if (!this._usePools && !this.client?.closed) this.client.close();
-  }
-
-  /**
-   * Make an HTTP request.
-   * All requests use json bodies.
-   * All requests expect a 200 statusCode on success
-   * @param {object|string} hook - may be a absolute or relative url, or an object
-   * @param {string} [hook.url] - an absolute or relative url
-   * @param {string} [hook.method] - 'GET' or 'POST'
-   * @param {string} [hook.username] - if basic auth is protecting the endpoint
-   * @param {string} [hook.password] - if basic auth is protecting the endpoint
-   * @param {object} [params] - request parameters
-   */
-  async request(type, hook, params, httpHeaders = {}) {
-    /* jambonz:error only sent over ws */
-    if (type === 'jambonz:error') return;
-
-    assert(HookMsgTypes.includes(type));
-
-    const payload = params ? snakeCaseKeys(params, ['customerData', 'sip']) : null;
-    const url = hook.url || hook;
-    const method = hook.method || 'POST';
-    let buf = '';
-
-    assert.ok(url, 'HttpRequestor:request url was not provided');
-    assert.ok, (['GET', 'POST'].includes(method), `HttpRequestor:request method must be 'GET' or 'POST' not ${method}`);
-    const startAt = process.hrtime();
-
-    /* if we have an absolute url, and it is ws then do a websocket connection */
-    if (this._isAbsoluteUrl(url) && url.startsWith('ws')) {
-      const WsRequestor = require('./ws-requestor');
-      this.logger.debug({hook}, 'HttpRequestor: switching to websocket connection');
-      const h = typeof hook === 'object' ? hook : {url: hook};
-      const requestor = new WsRequestor(this.logger, this.account_sid, h, this.secret);
-      if (type === 'session:redirect') {
-        this.close();
-        this.emit('handover', requestor);
-      }
-      return requestor.request('session:new', hook, params, httpHeaders);
-    }
-
-    let newClient;
-    try {
-      let client, path, query;
-      if (this._isRelativeUrl(url)) {
-        client = this.client;
-        path = url;
-      }
-      else {
-        const u = parseUrl(url);
-        if (u.resource === this._resource && u.port === this._port && u.protocol === this._protocol) {
-          client = this.client;
-          path = u.pathname;
-          query = u.query;
-        }
-        else {
-          if (u.port) client = newClient = new Client(`${u.protocol}://${u.resource}:${u.port}`);
-          else client = newClient = new Client(`${u.protocol}://${u.resource}`);
-          path = u.pathname;
-          query = u.query;
-        }
-      }
-      const sigHeader = this._generateSigHeader(payload, this.secret);
-      const hdrs = {
-        ...sigHeader,
-        ...this.authHeader,
-        ...httpHeaders,
-        ...('POST' === method && {'Content-Type': 'application/json'})
-      };
-      const absUrl = this._isRelativeUrl(url) ? `${this.baseUrl}${url}` : url;
-      this.logger.debug({url, absUrl, hdrs}, 'send webhook');
-      const {statusCode, headers, body} =  await client.request({
-        path,
-        query,
-        method,
-        headers: hdrs,
-        ...('POST' === method && {body: JSON.stringify(payload)}),
-        timeout: HTTP_TIMEOUT,
-        followRedirects: false
-      });
-      if (![200, 202, 204].includes(statusCode)) {
-        const err = new Error();
-        err.statusCode = statusCode;
-        throw err;
-      }
-      if (headers['content-type']?.includes('application/json')) {
-        buf = await body.json();
-      }
-      if (newClient) newClient.close();
-    } catch (err) {
-      if (err.statusCode) {
-        this.logger.info({baseUrl: this.baseUrl, url},
-          `web callback returned unexpected status code ${err.statusCode}`);
-      }
-      else {
-        this.logger.error({err, baseUrl: this.baseUrl, url},
-          'web callback returned unexpected error');
-      }
-      let opts = {account_sid: this.account_sid};
-      if (err.code === 'ECONNREFUSED') {
-        opts = {...opts, alert_type: this.Alerter.AlertType.WEBHOOK_CONNECTION_FAILURE, url};
-      }
-      else if (err.name === 'StatusError') {
-        opts = {...opts, alert_type: this.Alerter.AlertType.WEBHOOK_STATUS_FAILURE, url, status: err.statusCode};
-      }
-      else {
-        opts = {...opts, alert_type: this.Alerter.AlertType.WEBHOOK_CONNECTION_FAILURE, url, detail: err.message};
-      }
-      this.Alerter.writeAlerts(opts).catch((err) => this.logger.info({err, opts}, 'Error writing alert'));
-
-      if (newClient) newClient.close();
-      throw err;
-    }
-    const rtt = this._roundTrip(startAt);
-    if (buf) this.stats.histogram('app.hook.response_time', rtt, ['hook_type:app']);
-
-    if (buf && Array.isArray(buf)) {
-      this.logger.info({response: buf}, `HttpRequestor:request ${method} ${url} succeeded in ${rtt}ms`);
-      return buf;
-    }
-  }
-}
-
-module.exports = HttpRequestor;

lib/utils/install-srf-locals.js

@@ -1,5 +1,6 @@
 const Mrf = require('drachtio-fsmrf');
 const ip = require('ip');
+const localIp = ip.address();
 const PORT = process.env.HTTP_PORT || 3000;
 const assert = require('assert');
 
@@ -19,19 +20,11 @@ function initMS(logger, wrapper, ms) {
       wrapper.connects = 1;
       wrapper.active = true;
     });
-
-  ms.on('channel::open', (evt) => {
-    logger.debug({evt}, `mediaserver ${ms.address} added endpoint`);
-  });
-  ms.on('channel::close', (evt) => {
-    logger.debug({evt}, `mediaserver ${ms.address} removed endpoint`);
-  });
 }
 
 function installSrfLocals(srf, logger) {
   logger.debug('installing srf locals');
   assert(!srf.locals.dbHelpers);
-  const {tracer} = srf.locals.otel;
   const {getSBC, lifecycleEmitter} = require('./sbc-pinger')(logger);
   const StatsCollector = require('@jambonz/stats-collector');
   const stats = srf.locals.stats = new StatsCollector(logger);
@@ -49,11 +42,7 @@ function installSrfLocals(srf, logger) {
         assert.ok(arr, `Invalid syntax JAMBONES_FREESWITCH: ${process.env.JAMBONES_FREESWITCH}`);
         const opts = {address: arr[1], port: arr[2], secret: arr[3]};
         if (arr.length > 4) opts.advertisedAddress = arr[4];
-        /* NB: originally for testing only, but for now all jambonz deployments
-          have freeswitch installed locally alongside this app
-        */
         if (process.env.NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
-        else if (process.env.JAMBONES_ESL_LISTEN_ADDRESS) opts.listenAddress = process.env.JAMBONES_ESL_LISTEN_ADDRESS;
         return opts;
       });
     logger.info({fsInventory}, 'freeswitch inventory');
@@ -66,7 +55,7 @@ function installSrfLocals(srf, logger) {
         initMS(logger, val, ms);
       }
       catch (err) {
-        logger.info({err}, `failed connecting to freeswitch at ${fs.address}, will retry shortly: ${err.message}`);
+        logger.info(`failed connecting to freeswitch at ${fs.address}, will retry shortly`);
       }
     }
     // retry to connect to any that were initially offline
@@ -78,7 +67,7 @@ function installSrfLocals(srf, logger) {
             const ms = await mrf.connect(val.opts);
             initMS(logger, val, ms);
           } catch (err) {
-            logger.info({err}, `failed connecting to freeswitch at ${val.opts.address}, will retry shortly`);
+            logger.info(`failed connecting to freeswitch at ${val.opts.address}, will retry shortly`);
           }
         }
       }
@@ -116,7 +105,6 @@ function installSrfLocals(srf, logger) {
   const {
     pool,
     lookupAppByPhoneNumber,
-    lookupAppByRegex,
     lookupAppBySid,
     lookupAppByRealm,
     lookupAppByTeamsTenant,
@@ -131,13 +119,14 @@ function installSrfLocals(srf, logger) {
     password: process.env.JAMBONES_MYSQL_PASSWORD,
     database: process.env.JAMBONES_MYSQL_DATABASE,
     connectionLimit: process.env.JAMBONES_MYSQL_CONNECTION_LIMIT || 10
-  }, logger, tracer);
+  }, logger);
   const {
     client,
     updateCallStatus,
     retrieveCall,
     listCalls,
     deleteCall,
+    synthAudio,
     createHash,
     retrieveHash,
     deleteKey,
@@ -146,24 +135,15 @@ function installSrfLocals(srf, logger) {
     retrieveSet,
     addToSet,
     removeFromSet,
-    monitorSet,
     pushBack,
     popFront,
     removeFromList,
-    getListPosition,
     lengthOfList,
+    getListPosition
   } = require('@jambonz/realtimedb-helpers')({
     host: process.env.JAMBONES_REDIS_HOST,
     port: process.env.JAMBONES_REDIS_PORT || 6379
-  }, logger, tracer);
-  const {
-    synthAudio,
-    getNuanceAccessToken,
-    getIbmAccessToken,
-  } = require('@jambonz/speech-utils')({
-    host: process.env.JAMBONES_REDIS_HOST,
-    port: process.env.JAMBONES_REDIS_PORT || 6379
-  }, logger, tracer);
+  }, logger);
   const {
     writeAlerts,
     AlertType
@@ -173,19 +153,11 @@ function installSrfLocals(srf, logger) {
     commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
   });
 
-  let localIp;
-  try {
-    localIp = ip.address();
-  } catch (err) {
-    logger.error({err}, 'installSrfLocals - error detecting local ipv4 address');
-  }
-
   srf.locals = {...srf.locals,
     dbHelpers: {
       client,
       pool,
       lookupAppByPhoneNumber,
-      lookupAppByRegex,
       lookupAppBySid,
       lookupAppByRealm,
       lookupAppByTeamsTenant,
@@ -206,16 +178,15 @@ function installSrfLocals(srf, logger) {
       retrieveSet,
       addToSet,
       removeFromSet,
-      monitorSet,
       pushBack,
       popFront,
       removeFromList,
       lengthOfList,
-      getListPosition,
-      getNuanceAccessToken,
-      getIbmAccessToken
+      getListPosition
     },
     parentLogger: logger,
+    ipv4: localIp,
+    serviceUrl: `http://${localIp}:${PORT}`,
     getSBC,
     getSmpp: () => {
       return process.env.SMPP_URL;
@@ -226,11 +197,6 @@ function installSrfLocals(srf, logger) {
     writeAlerts,
     AlertType
   };
-
-  if (localIp) {
-    srf.locals.ipv4 = localIp;
-    srf.locals.serviceUrl = `http://${localIp}:${PORT}`;
-  }
 }
 
 module.exports = installSrfLocals;

lib/utils/normalize-jambones.js

@@ -0,0 +1,31 @@
+function normalizeJambones(logger, obj) {
+  if (!Array.isArray(obj)) throw new Error('malformed jambonz payload: must be array');
+  const document = [];
+  for (const tdata of obj) {
+    if (typeof tdata !== 'object') throw new Error('malformed jambonz payload: must be array of objects');
+    if ('verb' in tdata) {
+      // {verb: 'say', text: 'foo..bar'..}
+      const name = tdata.verb;
+      const o = {};
+      Object.keys(tdata)
+        .filter((k) => k !== 'verb')
+        .forEach((k) => o[k] = tdata[k]);
+      const o2 = {};
+      o2[name] = o;
+      document.push(o2);
+    }
+    else if (Object.keys(tdata).length === 1) {
+      // {'say': {..}}
+      document.push(tdata);
+    }
+    else {
+      logger.info(tdata, 'malformed jambonz payload: missing verb property');
+      throw new Error('malformed jambonz payload: missing verb property');
+    }
+  }
+  logger.debug({document}, `normalizeJambones: returning document with ${document.length} tasks`);
+  return document;
+}
+
+module.exports = normalizeJambones;
+

lib/utils/place-outdial.js

@@ -4,36 +4,33 @@ const SipError = require('drachtio-srf').SipError;
 const {TaskPreconditions, CallDirection} = require('../utils/constants');
 const CallInfo = require('../session/call-info');
 const assert = require('assert');
-const { normalizeJambones } = require('@jambonz/verb-specifications');
-const makeTask = require('../tasks/make_task');
 const ConfirmCallSession = require('../session/confirm-call-session');
+const selectSbc = require('./select-sbc');
+const Registrar = require('@jambonz/mw-registrar');
 const AdultingCallSession = require('../session/adulting-call-session');
+const registrar = new Registrar({
+  host: process.env.JAMBONES_REDIS_HOST,
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+});
 const deepcopy = require('deepcopy');
 const moment = require('moment');
-const stripCodecs = require('./strip-ancillary-codecs');
-const RootSpan = require('./call-tracer');
-const uuidv4 = require('uuid-random');
+const { v4: uuidv4 } = require('uuid');
 
 class SingleDialer extends Emitter {
-  constructor({logger, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan}) {
+  constructor({logger, sbcAddress, target, opts, application, callInfo}) {
     super();
     assert(target.type);
 
     this.logger = logger;
     this.target = target;
-    this.from = target.from || {};
     this.sbcAddress = sbcAddress;
     this.opts = opts;
     this.application = application;
     this.confirmHook = target.confirmHook;
-    this.rootSpan = rootSpan;
-    this.startSpan = startSpan;
 
     this.bindings = logger.bindings();
 
     this.parentCallInfo = callInfo;
-    this.accountInfo = accountInfo;
-
     this.callGone = false;
 
     this.callSid = uuidv4();
@@ -64,23 +61,8 @@ class SingleDialer extends Emitter {
   async exec(srf, ms, opts) {
     opts = opts || {};
     opts.headers = opts.headers || {};
-    opts.headers = {
-      ...opts.headers,
-      ...(this.target.headers || {}),
-      ...(this.from.user && {'X-Preferred-From-User': this.from.user}),
-      ...(this.from.host && {'X-Preferred-From-Host': this.from.host}),
-      'X-Jambonz-Routing': this.target.type,
-      'X-Call-Sid': this.callSid,
-      ...(this.applicationSid && {'X-Application-Sid': this.applicationSid})
-    };
-    if (srf.locals.fsUUID) {
-      opts.headers = {
-        ...opts.headers,
-        'X-Jambonz-FS-UUID': srf.locals.fsUUID,
-      };
-    }
-    this.ms = ms;
-    let uri, to, inviteSpan;
+    opts.headers = {...opts.headers, 'X-Call-Sid': this.callSid};
+    let uri, to;
     try {
       switch (this.target.type) {
         case 'phone':
@@ -99,13 +81,18 @@ class SingleDialer extends Emitter {
           break;
         case 'user':
           assert(this.target.name);
+          const aor = this.target.name;
           uri = `sip:${this.target.name}`;
           to = this.target.name;
 
-          if (this.target.overrideTo) {
-            Object.assign(opts.headers, {
-              'X-Override-To': this.target.overrideTo
-            });
+          // need to send to the SBC registered on
+          const reg = await registrar.query(aor);
+          if (reg) {
+            const sbc = selectSbc(reg.sbcAddress);
+            if (sbc) {
+              this.logger.debug(`SingleDialer:exec retrieved registration details for ${aor}, using sbc at ${sbc}`);
+              this.sbcAddress = sbc;
+            }
           }
           break;
         case 'sip':
@@ -146,38 +133,25 @@ class SingleDialer extends Emitter {
         localSdp: this.ep.local.sdp
       });
       if (this.target.auth) opts.auth = this.target.auth;
-      inviteSpan = this.startSpan('invite', {
-        'invite.uri': uri,
-        'invite.dest_type': this.target.type
-      });
-
       this.dlg = await srf.createUAC(uri, {...opts,  followRedirects: true, keepUriOnRedirect: true}, {
         cbRequest: (err, req) => {
           if (err) {
             this.logger.error(err, 'SingleDialer:exec Error creating call');
             this.emit('callCreateFail', err);
-            inviteSpan.setAttributes({
-              'invite.status_code': 500,
-              'invite.err': err.message
-            });
-            inviteSpan.end();
             return;
           }
-          inviteSpan.setAttributes({'invite.call_id': req.get('Call-ID')});
 
           /**
            * INVITE has been sent out
            *  (a) create a CallInfo for this call
            *  (a) create a logger for this call
            */
-          req.srf = srf;
           this.callInfo = new CallInfo({
             direction: CallDirection.Outbound,
             parentCallInfo: this.parentCallInfo,
             req,
             to,
-            callSid: this.callSid,
-            traceId: this.rootSpan.traceId
+            callSid: this.callSid
           });
           this.logger = srf.locals.parentLogger.child({
             callSid: this.callSid,
@@ -185,14 +159,10 @@ class SingleDialer extends Emitter {
             callId: this.callInfo.callId
           });
           this.inviteInProgress = req;
-          this.emit('callStatusChange', {
-            callStatus: CallStatus.Trying,
-            sipStatus: 100,
-            sipReason: 'Trying'
-          });
+          this.emit('callStatusChange', {callStatus: CallStatus.Trying, sipStatus: 100});
         },
         cbProvisional: (prov) => {
-          const status = {sipStatus: prov.status, sipReason: prov.reason};
+          const status = {sipStatus: prov.status};
           if ([180, 183].includes(prov.status) && prov.body) {
             if (status.callStatus !== CallStatus.EarlyMedia) {
               status.callStatus = CallStatus.EarlyMedia;
@@ -207,80 +177,41 @@ class SingleDialer extends Emitter {
       await connectStream(this.dlg.remote.sdp);
       this.dlg.callSid = this.callSid;
       this.inviteInProgress = null;
-      this.emit('callStatusChange', {
-        sipStatus: 200,
-        sipReason: 'OK',
-        callStatus: CallStatus.InProgress
-      });
+      this.emit('callStatusChange', {sipStatus: 200, callStatus: CallStatus.InProgress});
       this.logger.debug(`SingleDialer:exec call connected: ${this.callSid}`);
       const connectTime = this.dlg.connectTime = moment();
-      inviteSpan.setAttributes({'invite.status_code': 200});
-      inviteSpan.end();
-
-
-      /* race condition: we were killed just as call was answered */
-      if (this.killed) {
-        this.logger.info(`SingleDialer:exec race condition - we were killed as call connected: ${this.callSid}`);
-        const duration = moment().diff(connectTime, 'seconds');
-        this.emit('callStatusChange', {
-          callStatus: CallStatus.Completed,
-          sipStatus: 487,
-          sipReason: 'Request Terminated',
-          duration
-        });
-        if (this.ep) this.ep.destroy();
-        return;
-      }
 
       this.dlg
         .on('destroy', () => {
           const duration = moment().diff(connectTime, 'seconds');
           this.logger.debug('SingleDialer:exec called party hung up');
           this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
-          this.ep && this.ep.destroy();
+          this.ep.destroy();
         })
         .on('refresh', () => this.logger.info('SingleDialer:exec - dialog refreshed by uas'))
         .on('modify', async(req, res) => {
           try {
-            if (this.ep) {
-              const newSdp = await this.ep.modify(req.body);
-              res.send(200, {body: newSdp});
-              this.logger.info({offer: req.body, answer: newSdp}, 'SingleDialer:exec: handling reINVITE');
-            }
-            else {
-              this.logger.info('SingleDialer:exec: handling reINVITE with released media, emit event');
-              this.emit('reinvite', req, res);
-            }
+            const newSdp = await this.ep.modify(req.body);
+            res.send(200, {body: newSdp});
+            this.logger.info({offer: req.body, answer: newSdp}, 'SingleDialer:exec: handling reINVITE');
           } catch (err) {
             this.logger.error(err, 'Error handling reinvite');
           }
-        })
-        .on('refer', (req, res) => {
-          this.emit('refer', this.callInfo, req, res);
         });
 
       if (this.confirmHook) this._executeApp(this.confirmHook);
       else this.emit('accept');
     } catch (err) {
-      this.inviteInProgress = null;
       const status = {callStatus: CallStatus.Failed};
       if (err instanceof SipError) {
         status.sipStatus = err.status;
-        status.sipReason = err.reason;
         if (err.status === 487) status.callStatus = CallStatus.NoAnswer;
         else if ([486, 600].includes(err.status)) status.callStatus = CallStatus.Busy;
         this.logger.info(`SingleDialer:exec outdial failure ${err.status}`);
-        inviteSpan.setAttributes({'invite.status_code': err.status});
-        inviteSpan.end();
       }
       else {
         this.logger.error(err, 'SingleDialer:exec');
         status.sipStatus = 500;
-        inviteSpan.setAttributes({
-          'invite.status_code': 500,
-          'invite.err': err.message
-        });
-        inviteSpan.end();
       }
       this.emit('callStatusChange', status);
       if (this.ep) this.ep.destroy();
@@ -315,8 +246,8 @@ class SingleDialer extends Emitter {
   async _executeApp(confirmHook) {
     try {
       // retrieve set of tasks
-      const json = await this.requestor.request('dial:confirm', confirmHook, this.callInfo.toJSON());
-      const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
+      const tasks = await this.requestor.request(confirmHook, this.callInfo);
+
       // verify it contains only allowed verbs
       const allowedTasks = tasks.filter((task) => {
         return [
@@ -336,9 +267,7 @@ class SingleDialer extends Emitter {
         dlg: this.dlg,
         ep: this.ep,
         callInfo: this.callInfo,
-        accountInfo: this.accountInfo,
-        tasks,
-        rootSpan: this.rootSpan
+        tasks
       });
       await cs.exec();
 
@@ -352,67 +281,33 @@ class SingleDialer extends Emitter {
   }
 
   async doAdulting({logger, tasks, application}) {
+    this.logger = logger;
     this.adulting = true;
     this.emit('adulting');
-    if (this.ep) {
-      await this.ep.unbridge()
-        .catch((err) => this.logger.info({err}, 'SingleDialer:doAdulting - failed to unbridge ep'));
-      this.ep.play('silence_stream://1000');
-    }
-    else {
-      await this.reAnchorMedia();
-    }
-
-    this.dlg.callSid = this.callSid;
-    this.dlg.linkedSpanId = this.rootSpan.traceId;
-    const rootSpan = new RootSpan('outbound-call', this.dlg);
-    const newLogger = logger.child({traceId: rootSpan.traceId});
+    await this.ep.unbridge()
+      .catch((err) => this.logger.info({err}, 'SingleDialer:doAdulting - failed to unbridge ep'));
+    this.ep.play('silence_stream://1000');
     const cs = new AdultingCallSession({
-      logger: newLogger,
+      logger: this.logger,
       singleDialer: this,
       application,
       callInfo: this.callInfo,
-      accountInfo: this.accountInfo,
-      tasks,
-      rootSpan
+      tasks
     });
-    cs.exec().catch((err) => newLogger.error({err}, 'doAdulting: error executing session'));
+    cs.exec();
     return cs;
   }
 
-  async releaseMediaToSBC(remoteSdp, localSdp) {
-    assert(this.dlg && this.dlg.connected && this.ep && typeof remoteSdp === 'string');
-    const sdp = stripCodecs(this.logger, remoteSdp, localSdp) || remoteSdp;
-    await this.dlg.modify(sdp, {
-      headers: {
-        'X-Reason': 'release-media'
-      }
-    });
-    this.ep.destroy()
-      .then(() => this.ep = null)
-      .catch((err) => this.logger.error({err}, 'SingleDialer:releaseMediaToSBC: Error destroying endpoint'));
-  }
-
-  async reAnchorMedia() {
-    assert(this.dlg && this.dlg.connected && !this.ep);
-    this.ep = await this.ms.createEndpoint({remoteSdp: this.dlg.remote.sdp});
-    await this.dlg.modify(this.ep.local.sdp, {
-      headers: {
-        'X-Reason': 'anchor-media'
-      }
-    });
-  }
-
-  _notifyCallStatusChange({callStatus, sipStatus, sipReason, duration}) {
+  _notifyCallStatusChange({callStatus, sipStatus, duration}) {
     assert((typeof duration === 'number' && callStatus === CallStatus.Completed) ||
       (!duration && callStatus !== CallStatus.Completed),
     'duration MUST be supplied when call completed AND ONLY when call completed');
 
     if (this.callInfo) {
-      this.callInfo.updateCallStatus(callStatus, sipStatus, sipReason);
+      this.callInfo.updateCallStatus(callStatus, sipStatus);
       if (typeof duration === 'number') this.callInfo.duration = duration;
       try {
-        this.notifier.request('call:status', this.application.call_status_hook, this.callInfo.toJSON());
+        this.requestor.request(this.application.call_status_hook, this.callInfo.toJSON());
       } catch (err) {
         this.logger.info(err, `SingleDialer:_notifyCallStatusChange error sending ${callStatus} ${sipStatus}`);
       }
@@ -425,13 +320,9 @@ class SingleDialer extends Emitter {
   }
 }
 
-function placeOutdial({
-  logger, srf, ms, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan
-}) {
+function placeOutdial({logger, srf, ms, sbcAddress, target, opts, application, callInfo}) {
   const myOpts = deepcopy(opts);
-  const sd = new SingleDialer({
-    logger, sbcAddress, target, myOpts, application, callInfo, accountInfo, rootSpan, startSpan
-  });
+  const sd = new SingleDialer({logger, sbcAddress, target, myOpts, application, callInfo});
   sd.exec(srf, ms, myOpts);
   return sd;
 }

lib/utils/requestor.js

@@ -1,7 +1,42 @@
+const bent = require('bent');
+const parseUrl = require('parse-url');
 const assert = require('assert');
+const snakeCaseKeys = require('./snakecase-keys');
+const crypto = require('crypto');
 const timeSeries = require('@jambonz/time-series');
 let alerter ;
 
+const toBase64 = (str) => Buffer.from(str || '', 'utf8').toString('base64');
+
+function computeSignature(payload, timestamp, secret) {
+  assert(secret);
+  const data = `${timestamp}.${JSON.stringify(payload)}`;
+  return crypto
+    .createHmac('sha256', secret)
+    .update(data, 'utf8')
+    .digest('hex');
+}
+
+function generateSigHeader(payload, secret) {
+  const timestamp = Math.floor(Date.now() / 1000);
+  const signature = computeSignature(payload, timestamp, secret);
+  const scheme = 'v1';
+  return {
+    'Jambonz-Signature': `t=${timestamp},${scheme}=${signature}`
+  };
+}
+
+function basicAuth(username, password) {
+  if (!username || !password) return {};
+  const creds = `${username}:${password || ''}`;
+  const header = `Basic ${toBase64(creds)}`;
+  return {Authorization: header};
+}
+
+function isRelativeUrl(u) {
+  return typeof u === 'string' && u.startsWith('/');
+}
+
 function isAbsoluteUrl(u) {
   return typeof u === 'string' &&
     u.startsWith('https://') || u.startsWith('http://');
@@ -14,6 +49,14 @@ class Requestor {
     this.logger = logger;
     this.url = hook.url;
     this.method = hook.method || 'POST';
+    this.authHeader = basicAuth(hook.username, hook.password);
+
+    const u = parseUrl(this.url);
+    const myPort = u.port ? `:${u.port}` : '';
+    const baseUrl = this._baseUrl = `${u.protocol}://${u.resource}${myPort}`;
+
+    this.get = bent(baseUrl, 'GET', 'buffer', 200, 201);
+    this.post = bent(baseUrl, 'POST', 'buffer', 200, 201);
 
     this.username = hook.username;
     this.password = hook.password;
@@ -35,15 +78,72 @@ class Requestor {
     }
   }
 
-  get Alerter() {
-    if (!alerter) {
-      alerter = timeSeries(this.logger, {
-        host: process.env.JAMBONES_TIME_SERIES_HOST,
-        commitSize: 50,
-        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
-      });
+  get baseUrl() {
+    return this._baseUrl;
+  }
+
+  /**
+   * Make an HTTP request.
+   * All requests use json bodies.
+   * All requests expect a 200 statusCode on success
+   * @param {object|string} hook - may be a absolute or relative url, or an object
+   * @param {string} [hook.url] - an absolute or relative url
+   * @param {string} [hook.method] - 'GET' or 'POST'
+   * @param {string} [hook.username] - if basic auth is protecting the endpoint
+   * @param {string} [hook.password] - if basic auth is protecting the endpoint
+   * @param {object} [params] - request parameters
+   */
+  async request(hook, params) {
+    const payload = params ? snakeCaseKeys(params, ['customerData', 'sip']) : null;
+    const url = hook.url || hook;
+    const method = hook.method || 'POST';
+
+    assert.ok(url, 'Requestor:request url was not provided');
+    assert.ok, (['GET', 'POST'].includes(method), `Requestor:request method must be 'GET' or 'POST' not ${method}`);
+
+    this.logger.debug({hook, payload}, `Requestor:request ${method} ${url}`);
+    const startAt = process.hrtime();
+
+    let buf;
+    try {
+      const sigHeader = generateSigHeader(payload, this.secret);
+      const headers = {...sigHeader, ...this.authHeader};
+      this.logger.info({url, headers}, 'send webhook');
+      buf = isRelativeUrl(url) ?
+        await this.post(url, payload, headers) :
+        await bent(method, 'buffer', 200, 201, 202)(url, payload, headers);
+    } catch (err) {
+      this.logger.error({err, secret: this.secret, baseUrl: this.baseUrl, url, statusCode: err.statusCode},
+        `web callback returned unexpected error code ${err.statusCode}`);
+      let opts = {account_sid: this.account_sid};
+      if (err.code === 'ECONNREFUSED') {
+        opts = {...opts, alert_type: alerter.AlertType.WEBHOOK_CONNECTION_FAILURE, url};
+      }
+      else if (err.name === 'StatusError') {
+        opts = {...opts, alert_type: alerter.AlertType.WEBHOOK_STATUS_FAILURE, url, status: err.statusCode};
+      }
+      else {
+        opts = {...opts, alert_type: alerter.AlertType.WEBHOOK_CONNECTION_FAILURE, url, detail: err.message};
+      }
+      alerter.writeAlerts(opts).catch((err) => this.logger.info({err, opts}, 'Error writing alert'));
+
+      throw err;
+    }
+    const diff = process.hrtime(startAt);
+    const time = diff[0] * 1e3 + diff[1] * 1e-6;
+    const rtt = time.toFixed(0);
+    if (buf) this.stats.histogram('app.hook.response_time', rtt, ['hook_type:app']);
+
+    if (buf && buf.toString().length > 0) {
+      try {
+        const json = JSON.parse(buf.toString());
+        this.logger.info({response: json}, `Requestor:request ${method} ${url} succeeded in ${rtt}ms`);
+        return json;
+      }
+      catch (err) {
+        //this.logger.debug({err, url, method}, `Requestor:request returned non-JSON content: '${buf.toString()}'`);
+      }
     }
-    return alerter;
   }
 }
 

lib/utils/sbc-pinger.js

@@ -1,26 +1,19 @@
 const assert = require('assert');
-const uuidv4 = require('uuid-random');
-const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./constants');
+const noopLogger = {info: () => {}, error: () => {}};
+const {LifeCycleEvents} = require('./constants');
 const Emitter = require('events');
 const debug = require('debug')('jambonz:feature-server');
-const noopLogger = {info: () => {}, error: () => {}};
 
 module.exports = (logger) => {
   logger = logger || noopLogger;
   let idxSbc = 0;
-  let sbcs = [];
 
-  if (process.env.JAMBONES_SBCS) {
-    sbcs = process.env.JAMBONES_SBCS
-      .split(',')
-      .map((sbc) => sbc.trim());
-    assert.ok(sbcs.length, 'JAMBONES_SBCS env var is empty or misconfigured');
-    logger.info({sbcs}, 'SBC inventory');
-  }
-  else if (process.env.K8S && process.env.K8S_SBC_SIP_SERVICE_NAME) {
-    sbcs = [`${process.env.K8S_SBC_SIP_SERVICE_NAME}:5060`];
-    logger.info({sbcs}, 'SBC inventory');
-  }
+  assert.ok(process.env.JAMBONES_SBCS, 'missing JAMBONES_SBCS env var');
+  const sbcs = process.env.JAMBONES_SBCS
+    .split(',')
+    .map((sbc) => sbc.trim());
+  assert.ok(sbcs.length, 'JAMBONES_SBCS env var is empty or misconfigured');
+  logger.info({sbcs}, 'SBC inventory');
 
   // listen for SNS lifecycle changes
   let lifecycleEmitter = new Emitter();
@@ -32,10 +25,6 @@ module.exports = (logger) => {
         lifecycleEmitter = await require('./aws-sns-lifecycle')(logger);
 
         lifecycleEmitter
-          .on('SubscriptionConfirmation', ({publicIp}) => {
-            const {srf} = require('../..');
-            srf.locals.publicIp = publicIp;
-          })
           .on(LifeCycleEvents.ScaleIn, () => {
             logger.info('AWS scale-in notification: begin drying up calls');
             dryUpCalls = true;
@@ -75,11 +64,8 @@ module.exports = (logger) => {
       }
     })();
   }
-  else if (process.env.K8S) {
-    lifecycleEmitter.scaleIn = () => process.exit(0);
-  }
-
 
+  // send OPTIONS pings to SBCs
   async function pingProxies(srf) {
     if (process.env.NODE_ENV === 'test') return;
 
@@ -102,46 +88,18 @@ module.exports = (logger) => {
       }
     }
   }
-  if (process.env.K8S) {
-    setImmediate(() => {
-      logger.info('disabling OPTIONS pings since we are running as a kubernetes service');
-      const {srf} = require('../..');
-      const {addToSet} = srf.locals.dbHelpers;
-      const uuid = srf.locals.fsUUID = uuidv4();
 
-      /* in case redis is restarted, re-insert our key every so often */
-      setInterval(() => {
-        // eslint-disable-next-line max-len
-        addToSet(FS_UUID_SET_NAME, uuid).catch((err) => logger.info({err}, `Error adding ${uuid} to set ${FS_UUID_SET_NAME}`));
-      }, 30000);
-      // eslint-disable-next-line max-len
-      addToSet(FS_UUID_SET_NAME, uuid).catch((err) => logger.info({err}, `Error adding ${uuid} to set ${FS_UUID_SET_NAME}`));
-    });
-  }
-  else {
-    // OPTIONS ping the SBCs from each feature server every 60 seconds
-    setInterval(() => {
-      const {srf} = require('../..');
-      pingProxies(srf);
-    }, process.env.OPTIONS_PING_INTERVAL || 30000);
+  // OPTIONS ping the SBCs from each feature server every 60 seconds
+  setInterval(() => {
+    const {srf} = require('../..');
+    pingProxies(srf);
+  }, 20000);
 
-    // initial ping once we are up
-    setTimeout(async() => {
-
-      // if SBCs are auto-scaling, monitor them as they come and go
-      const {srf} = require('../..');
-      if (!process.env.JAMBONES_SBCS) {
-        const {monitorSet} = srf.locals.dbHelpers;
-        const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-sip`;
-        await monitorSet(setName, 10, (members) => {
-          sbcs = members;
-          logger.info(`sbc-pinger: SBC roster has changed, list of active SBCs is now ${sbcs}`);
-        });
-      }
-
-      pingProxies(srf);
-    }, 1000);
-  }
+  // initial ping once we are up
+  setTimeout(() => {
+    const {srf} = require('../..');
+    pingProxies(srf);
+  }, 1000);
 
   return {
     lifecycleEmitter,

lib/utils/select-sbc.js

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

lib/utils/siprec-utils.js

@@ -1,248 +0,0 @@
-const xmlParser = require('xml2js').parseString;
-const uuidv4 = require('uuid-random');
-const parseUri = require('drachtio-srf').parseUri;
-const transform = require('sdp-transform');
-const debug = require('debug')('jambonz:feature-server');
-
-const parseCallData = (prefix, obj) => {
-  const ret = {};
-  const group = obj[`${prefix}group`];
-  if (group) {
-    const key = Object.keys(group[0]).find((k) => /:?callData$/.test(k));
-    //const o = _.find(group[0], (value, key) => /:?callData$/.test(key));
-    if (key) {
-      //const callData = o[0];
-      const callData = group[0][key];
-      for (const key of Object.keys(callData)) {
-        if (['fromhdr', 'tohdr', 'callid'].includes(key)) ret[key] = callData[key][0];
-      }
-    }
-  }
-  debug('parseCallData', prefix, obj, ret);
-  return ret;
-};
-
-/**
- * parse a SIPREC multiparty body
- * @param  {object} opts - options
- * @return {Promise}
- */
-const parseSiprecPayload = (req, logger) => {
-  const opts = {};
-  return new Promise((resolve, reject) => {
-    let sdp, meta ;
-    for (let i = 0; i < req.payload.length; i++) {
-      switch (req.payload[i].type) {
-        case 'application/sdp':
-          sdp = req.payload[i].content ;
-          break ;
-
-        case 'application/rs-metadata+xml':
-        case 'application/rs-metadata':
-          meta = opts.xml = req.payload[i].content ;
-          break ;
-
-        default:
-          break ;
-      }
-    }
-
-    if (!sdp || !meta) {
-      logger.info({payload: req.payload}, 'invalid SIPREC payload');
-      return reject(new Error('expected multipart SIPREC body'));
-    }
-
-    xmlParser(meta, (err, result) => {
-      if (err) { throw err; }
-
-      opts.recordingData = result ;
-      opts.sessionId = uuidv4() ;
-
-      const arr = /^([^]+)(m=[^]+?)(m=[^]+?)$/.exec(sdp) ;
-      opts.sdp1 = `${arr[1]}${arr[2]}` ;
-      opts.sdp2 = `${arr[1]}${arr[3]}\r\n` ;
-
-      try {
-        if (typeof result === 'object' && Object.keys(result).length === 1) {
-          const key = Object.keys(result)[0] ;
-          const arr = /^(.*:)recording/.exec(key) ;
-          const prefix = !arr ? '' : (arr[1]) ;
-          const obj = opts.recordingData[`${prefix}recording`];
-
-          // 1. collect participant data
-          const participants = {} ;
-          obj[`${prefix}participant`].forEach((p) => {
-            const partDetails = {} ;
-            participants[p.$.participant_id] = partDetails;
-            if ((`${prefix}nameID` in p) && Array.isArray(p[`${prefix}nameID`])) {
-              partDetails.aor = p[`${prefix}nameID`][0].$.aor;
-              if ('name' in p[`${prefix}nameID`][0] && Array.isArray(p[`${prefix}nameID`][0].name)) {
-                const name = p[`${prefix}nameID`][0].name[0];
-                if (typeof name === 'string') partDetails.name = name ;
-                else if (typeof name === 'object') partDetails.name = name._ ;
-              }
-            }
-          });
-
-          // 2. find the associated streams for each participant
-          if (`${prefix}participantstreamassoc` in obj) {
-            obj[`${prefix}participantstreamassoc`].forEach((ps) => {
-              const part = participants[ps.$.participant_id];
-              if (part) {
-                part.send = ps[`${prefix}send`][0];
-                part.recv = ps[`${prefix}recv`][0];
-              }
-            });
-          }
-
-          // 3. Retrieve stream data
-          opts.caller = {} ;
-          opts.callee = {} ;
-          obj[`${prefix}stream`].forEach((s) => {
-            const streamId = s.$.stream_id;
-            let sender;
-            for (const [k, v] of Object.entries(participants)) {
-              if (v.send === streamId) {
-                sender = k;
-                break;
-              }
-            }
-            //const sender = _.find(participants, { 'send': streamId});
-
-            if (!sender) return;
-
-            sender.label = s[`${prefix}label`][0];
-
-            if (-1 !== ['1', 'a_leg', 'inbound'].indexOf(sender.label)) {
-              opts.caller.aor = sender.aor ;
-              if (sender.name) opts.caller.name = sender.name;
-            }
-            else {
-              opts.callee.aor = sender.aor ;
-              if (sender.name) opts.callee.name = sender.name;
-            }
-          });
-
-          // if we dont have a participantstreamassoc then assume the first participant is the caller
-          if (!opts.caller.aor && !opts.callee.aor) {
-            let i = 0;
-            for (const part in participants) {
-              const p = participants[part];
-              if (0 === i && p.aor) {
-                opts.caller.aor = p.aor;
-                opts.caller.name = p.name;
-              }
-              else if (1 === i && p.aor) {
-                opts.callee.aor = p.aor;
-                opts.callee.name = p.name;
-              }
-              i++;
-            }
-          }
-
-          // now for Sonus (at least) we get the original from, to and call-id headers in a <callData/> element
-          // if so, this should take preference
-          const callData = parseCallData(prefix, obj);
-          if (callData) {
-            debug(`callData: ${JSON.stringify(callData)}`);
-            opts.originalCallId = callData.callid;
-
-            // caller
-            let r1 = /^(.*)(<sip.*)$/.exec(callData.fromhdr);
-            if (r1) {
-              const arr = /<(.*)>/.exec(r1[2]);
-              if (arr) {
-                const uri = parseUri(arr[1]);
-                const user = uri.user || 'anonymous';
-                opts.caller.aor = `sip:${user}@${uri.host}`;
-              }
-              const dname = r1[1].trim();
-              const arr2 = /"(.*)"/.exec(dname);
-              if (arr2) opts.caller.name = arr2[1];
-              else opts.caller.name = dname;
-            }
-            // callee
-            r1 = /^(.*)(<sip.*)$/.exec(callData.tohdr);
-            if (r1) {
-              const arr = /<(.*)>/.exec(r1[2]);
-              if (arr) {
-                const uri = parseUri(arr[1]);
-                opts.callee.aor = `sip:${uri.user}@${uri.host}`;
-              }
-              const dname = r1[1].trim();
-              const arr2 = /"(.*)"/.exec(dname);
-              if (arr2) opts.callee.name = arr2[1];
-              else opts.callee.name = dname;
-            }
-            debug(`opts.caller from callData: ${JSON.stringify(opts.caller)}`);
-            debug(`opts.callee from callData: ${JSON.stringify(opts.callee)}`);
-          }
-
-          if (opts.caller.aor && 0 !== opts.caller.aor.indexOf('sip:')) {
-            opts.caller.aor = 'sip:' + opts.caller.aor;
-          }
-          if (opts.callee.aor && 0 !== opts.callee.aor.indexOf('sip:')) {
-            opts.callee.aor = 'sip:' + opts.callee.aor;
-          }
-
-          if (opts.caller.aor) {
-            const uri = parseUri(opts.caller.aor);
-            opts.caller.number = uri.user;
-          }
-          if (opts.callee.aor) {
-            const uri = parseUri(opts.callee.aor);
-            opts.callee.number = uri.user;
-          }
-          opts.recordingSessionId = opts.recordingData[`${prefix}recording`][`${prefix}session`][0].$.session_id;
-        }
-      }
-      catch (err) {
-        reject(err);
-      }
-      debug(opts, 'payload parser results');
-      resolve(opts) ;
-    }) ;
-  }) ;
-};
-
-const createSipRecPayload = (sdp1, sdp2, logger) => {
-  const sdpObj = [];
-  sdpObj.push(transform.parse(sdp1));
-  sdpObj.push(transform.parse(sdp2));
-
-  //const arr1 = /^([^]+)(c=[^]+)t=[^]+(m=[^]+?)(a=[^]+)$/.exec(sdp1) ;
-  //const arr2 = /^([^]+)(c=[^]+)t=[^]+(m=[^]+?)(a=[^]+)$/.exec(sdp2) ;
-
-  debug(`sdp1:      ${sdp1}`);
-  debug(`objSdp[0]: ${JSON.stringify(sdpObj[0])}`);
-  debug(`sdp2:      ${sdp2}`);
-  debug(`objSdp[1]: ${JSON.stringify(sdpObj[1])}`);
-
-  if (!sdpObj[0] || !sdpObj[0].media.length) {
-    throw new Error(`Error parsing sdp1 into component parts: ${sdp1}`);
-  }
-  else if (!sdpObj[1] || !sdpObj[1].media.length)  {
-    throw new Error(`Error parsing sdp2 into component parts: ${sdp2}`);
-  }
-
-  if (!sdpObj[0].media[0].label) sdpObj[0].media[0].label = 1;
-  if (!sdpObj[1].media[0].label) sdpObj[1].media[0].label = 2;
-
-  //const aLabel = sdp1.includes('a=label:') ? '' : 'a=label:1\r\n';
-  //const bLabel = sdp2.includes('a=label:') ? '' : 'a=label:2\r\n';
-
-  sdpObj[0].media = sdpObj[0].media.concat(sdpObj[1].media);
-  const combinedSdp = transform.write(sdpObj[0])
-    .replace(/a=sendonly\r\n/g, '')
-    .replace(/a=direction:both\r\n/g, '');
-
-  debug(`combined ${combinedSdp}`);
-  /*
-  const combinedSdp = `${arr1[1]}t=0 0\r\n${arr1[2]}${arr1[3]}${arr1[4]}${aLabel}${arr2[3]}${arr2[4]}${bLabel}`
-    .replace(/a=sendonly\r\n/g, '')
-    .replace(/a=direction:both\r\n/g, '');
-  */
-  return combinedSdp;
-};
-
-module.exports = { parseSiprecPayload, createSipRecPayload } ;

lib/utils/strip-ancillary-codecs.js

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

lib/utils/summarize-tasks.js

@@ -1,3 +1,3 @@
 module.exports = function(tasks) {
-  return `[${tasks.map((t) => t.summary).join(',')}]`;
+  return `[${tasks.map((t) => t.name).join(',')}]`;
 };

lib/utils/transcription-utils.js

@@ -1,675 +0,0 @@
-const {
-  AzureTranscriptionEvents,
-  GoogleTranscriptionEvents,
-  AwsTranscriptionEvents,
-  NuanceTranscriptionEvents,
-  DeepgramTranscriptionEvents,
-  SonioxTranscriptionEvents,
-  NvidiaTranscriptionEvents,
-  JambonzTranscriptionEvents
-} = 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'
-  ],
-  nvidia: [
-    'NVIDIA_HINTS'
-  ],
-  soniox: [
-    'SONIOX_PROFANITY_FILTER',
-    'SONIOX_MODEL'
-  ]
-};
-
-const compileSonioxTranscripts = (finalWordChunks, channel, language) => {
-  const words = finalWordChunks.flat();
-  const transcript = words.reduce((acc, word) => {
-    if (word.text === '<end>') return acc;
-    if ([',', '.', '?', '!'].includes(word.text)) return `${acc}${word.text}`;
-    return `${acc} ${word.text}`;
-  }, '').trim();
-  const realWords = words.filter((word) => ![',.!?;'].includes(word.text) && word.text !== '<end>');
-  const confidence = realWords.reduce((acc, word) => acc + word.confidence, 0) / realWords.length;
-  const alternatives = [{transcript, confidence}];
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: true,
-    alternatives,
-    vendor: {
-      name: 'soniox',
-      evt: words
-    }
-  };
-};
-
-const normalizeSoniox = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-
-  /* an <end> token indicates the end of an utterance */
-  const endTokenPos = evt.words.map((w) => w.text).indexOf('<end>');
-  const endpointReached = endTokenPos !== -1;
-  const words = endpointReached ? evt.words.slice(0, endTokenPos) : evt.words;
-
-  /* note: we can safely ignore words after the <end> token as they will be returned again */
-  const finalWords = words.filter((word) => word.is_final);
-  const nonFinalWords = words.filter((word) => !word.is_final);
-
-  const is_final = endpointReached && finalWords.length > 0;
-  const transcript = words.reduce((acc, word) => {
-    if ([',', '.', '?', '!'].includes(word.text)) return `${acc}${word.text}`;
-    else return `${acc} ${word.text}`;
-  }, '').trim();
-  const realWords = words.filter((word) => ![',.!?;'].includes(word.text) && word.text !== '<end>');
-  const confidence = realWords.reduce((acc, word) => acc + word.confidence, 0) / realWords.length;
-  const alternatives = [{transcript, confidence}];
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final,
-    alternatives,
-    vendor: {
-      name: 'soniox',
-      endpointReached,
-      evt: copy,
-      finalWords,
-      nonFinalWords
-    }
-  };
-};
-
-const normalizeDeepgram = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  const alternatives = (evt.channel?.alternatives || [])
-    .map((alt) => ({
-      confidence: alt.confidence,
-      transcript: alt.transcript,
-    }));
-
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: evt.is_final,
-    alternatives: [alternatives[0]],
-    vendor: {
-      name: 'deepgram',
-      evt: copy
-    }
-  };
-};
-
-const normalizeNvidia = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  const alternatives = (evt.alternatives || [])
-    .map((alt) => ({
-      confidence: alt.confidence,
-      transcript: alt.transcript,
-    }));
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: evt.is_final,
-    alternatives,
-    vendor: {
-      name: 'nvidia',
-      evt: copy
-    }
-  };
-};
-
-const normalizeIbm = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  //const idx = evt.result_index;
-  const result = evt.results[0];
-
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: result.final,
-    alternatives: result.alternatives,
-    vendor: {
-      name: 'ibm',
-      evt: copy
-    }
-  };
-};
-
-const normalizeGoogle = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: evt.is_final,
-    alternatives: [evt.alternatives[0]],
-    vendor: {
-      name: 'google',
-      evt: copy
-    }
-  };
-};
-
-const normalizeCustom = (evt, channel, language) => {
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: evt.is_final,
-    alternatives: [evt.alternatives[0]]
-  };
-};
-
-const normalizeNuance = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: evt.is_final,
-    alternatives: [evt.alternatives[0]],
-    vendor: {
-      name: 'nuance',
-      evt: copy
-    }
-  };
-};
-
-const normalizeMicrosoft = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  const nbest = evt.NBest;
-  const language_code = evt.PrimaryLanguage?.Language || language;
-  const alternatives = nbest ? nbest.map((n) => {
-    return {
-      confidence: n.Confidence,
-      transcript: n.Display
-    };
-  }) :
-    [
-      {
-        transcript: evt.DisplayText || evt.Text
-      }
-    ];
-
-  return {
-    language_code,
-    channel_tag: channel,
-    is_final: evt.RecognitionStatus === 'Success',
-    alternatives: [alternatives[0]],
-    vendor: {
-      name: 'microsoft',
-      evt: copy
-    }
-  };
-};
-
-const normalizeAws = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: evt[0].is_final,
-    alternatives: evt[0].alternatives,
-    vendor: {
-      name: 'aws',
-      evt: copy
-    }
-  };
-};
-
-
-module.exports = (logger) => {
-  const normalizeTranscription = (evt, vendor, channel, language) => {
-
-    //logger.debug({ evt, vendor, channel, language }, 'normalizeTranscription');
-    switch (vendor) {
-      case 'deepgram':
-        return normalizeDeepgram(evt, channel, language);
-      case 'microsoft':
-        return normalizeMicrosoft(evt, channel, language);
-      case 'google':
-        return normalizeGoogle(evt, channel, language);
-      case 'aws':
-        return normalizeAws(evt, channel, language);
-      case 'nuance':
-        return normalizeNuance(evt, channel, language);
-      case 'ibm':
-        return normalizeIbm(evt, channel, language);
-      case 'nvidia':
-        return normalizeNvidia(evt, channel, language);
-      case 'soniox':
-        return normalizeSoniox(evt, channel, language);
-      default:
-        if (vendor.startsWith('custom:')) {
-          return normalizeCustom(evt, channel, language);
-        }
-        logger.error(`Unknown vendor ${vendor}`);
-        return evt;
-    }
-  };
-
-  const setChannelVarsForStt = (task, sttCredentials, rOpts = {}) => {
-    let opts = {};
-    const {enable, voiceMs = 0, mode = -1} = rOpts.vad || {};
-    const vad = {enable, voiceMs, mode};
-    const vendor = rOpts.vendor;
-
-    /* voice activity detection works across vendors */
-    opts = {
-      ...opts,
-      ...(vad.enable && {START_RECOGNIZING_ON_VAD: 1}),
-      ...(vad.enable && vad.voiceMs && {RECOGNIZER_VAD_VOICE_MS: vad.voiceMs}),
-      ...(vad.enable && typeof vad.mode === 'number' && {RECOGNIZER_VAD_MODE: vad.mode}),
-    };
-
-    if ('google' === vendor) {
-      opts = {
-        ...opts,
-        ...(sttCredentials && {GOOGLE_APPLICATION_CREDENTIALS: JSON.stringify(sttCredentials.credentials)}),
-        ...(rOpts.separateRecognitionPerChannel && {GOOGLE_SPEECH_SEPARATE_RECOGNITION_PER_CHANNEL: 1}),
-        ...(rOpts.separateRecognitionPerChanne === false && {GOOGLE_SPEECH_SEPARATE_RECOGNITION_PER_CHANNEL: 0}),
-        ...(rOpts.profanityFilter && {GOOGLE_SPEECH_PROFANITY_FILTER: 1}),
-        ...(rOpts.punctuation && {GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 1}),
-        ...(rOpts.words && {GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS: 1}),
-        ...(rOpts.singleUtterance && {GOOGLE_SPEECH_SINGLE_UTTERANCE: 1}),
-        ...(rOpts.diarization && {GOOGLE_SPEECH_SPEAKER_DIARIZATION: 1}),
-        ...(rOpts.diarization && rOpts.diarizationMinSpeakers > 0 &&
-          {GOOGLE_SPEECH_SPEAKER_DIARIZATION_MIN_SPEAKER_COUNT: rOpts.diarizationMinSpeakers}),
-        ...(rOpts.diarization && rOpts.diarizationMaxSpeakers > 0 &&
-          {GOOGLE_SPEECH_SPEAKER_DIARIZATION_MAX_SPEAKER_COUNT: rOpts.diarizationMaxSpeakers}),
-        ...(rOpts.enhancedModel && {GOOGLE_SPEECH_USE_ENHANCED: 1}),
-        ...(rOpts.profanityFilter === false && {GOOGLE_SPEECH_PROFANITY_FILTER: 0}),
-        ...(rOpts.punctuation === false && {GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 0}),
-        ...(rOpts.words  == false && {GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS: 0}),
-        ...(rOpts.diarization === false && {GOOGLE_SPEECH_SPEAKER_DIARIZATION: 0}),
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
-          {GOOGLE_SPEECH_HINTS: rOpts.hints.join(',')}),
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
-          {GOOGLE_SPEECH_HINTS: JSON.stringify(rOpts.hints)}),
-        ...(typeof rOpts.hintsBoost === 'number' && {GOOGLE_SPEECH_HINTS_BOOST: rOpts.hintsBoost}),
-        ...(rOpts.altLanguages.length > 0 &&
-          {GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES: [...new Set(rOpts.altLanguages)].join(',')}),
-        ...(rOpts.interactionType &&
-          {GOOGLE_SPEECH_METADATA_INTERACTION_TYPE: rOpts.interactionType}),
-        ...{GOOGLE_SPEECH_MODEL: rOpts.model || 'phone_call'},
-        ...(rOpts.naicsCode > 0 && {GOOGLE_SPEECH_METADATA_INDUSTRY_NAICS_CODE: rOpts.naicsCode}),
-        GOOGLE_SPEECH_METADATA_RECORDING_DEVICE_TYPE: 'phone_line',
-      };
-    }
-    else if (['aws', 'polly'].includes(vendor)) {
-      opts = {
-        ...opts,
-        ...(rOpts.vocabularyName && {AWS_VOCABULARY_NAME: rOpts.vocabularyName}),
-        ...(rOpts.vocabularyFilterName && {AWS_VOCABULARY_FILTER_NAME: rOpts.vocabularyFilterName}),
-        ...(rOpts.filterMethod && {AWS_VOCABULARY_FILTER_METHOD: rOpts.filterMethod}),
-        ...(sttCredentials && {
-          AWS_ACCESS_KEY_ID: sttCredentials.accessKeyId,
-          AWS_SECRET_ACCESS_KEY: sttCredentials.secretAccessKey,
-          AWS_REGION: sttCredentials.region
-        }),
-      };
-    }
-    else if ('microsoft' === vendor) {
-      opts = {
-        ...opts,
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
-          {AZURE_SPEECH_HINTS: rOpts.hints.map((h) => h.trim()).join(',')}),
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
-          {AZURE_SPEECH_HINTS: rOpts.hints.map((h) => h.phrase).join(',')}),
-        ...(rOpts.altLanguages && rOpts.altLanguages.length > 0 &&
-          {AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES: [...new Set(rOpts.altLanguages)].join(',')}),
-        ...(rOpts.requestSnr && {AZURE_REQUEST_SNR: 1}),
-        ...(rOpts.profanityOption && {AZURE_PROFANITY_OPTION: rOpts.profanityOption}),
-        ...(rOpts.azureServiceEndpoint && {AZURE_SERVICE_ENDPOINT: rOpts.azureServiceEndpoint}),
-        ...(rOpts.initialSpeechTimeoutMs > 0 &&
-          {AZURE_INITIAL_SPEECH_TIMEOUT_MS: rOpts.initialSpeechTimeoutMs}),
-        ...(rOpts.requestSnr && {AZURE_REQUEST_SNR: 1}),
-        ...(rOpts.audioLogging && {AZURE_AUDIO_LOGGING: 1}),
-        ...{AZURE_USE_OUTPUT_FORMAT_DETAILED: 1},
-        ...(sttCredentials && {
-          AZURE_SUBSCRIPTION_KEY: sttCredentials.api_key,
-          AZURE_REGION: sttCredentials.region,
-        }),
-        ...(sttCredentials.use_custom_stt && sttCredentials.custom_stt_endpoint &&
-          {AZURE_SERVICE_ENDPOINT_ID: sttCredentials.custom_stt_endpoint})
-      };
-    }
-    else if ('nuance' === vendor) {
-      /**
-       * Note: all nuance options are in recognizer.nuanceOptions, should migrate
-       * other vendor settings to similar nested structure
-       */
-      const {nuanceOptions = {}} = rOpts;
-      opts = {
-        ...opts,
-        ...(sttCredentials.access_token) && {NUANCE_ACCESS_TOKEN: sttCredentials.access_token},
-        ...(sttCredentials.nuance_stt_uri) && {NUANCE_KRYPTON_ENDPOINT: sttCredentials.nuance_stt_uri},
-        ...(nuanceOptions.topic) && {NUANCE_TOPIC: nuanceOptions.topic},
-        ...(nuanceOptions.utteranceDetectionMode) &&
-          {NUANCE_UTTERANCE_DETECTION_MODE: nuanceOptions.utteranceDetectionMode},
-        ...(nuanceOptions.punctuation || rOpts.punctuation) && {NUANCE_PUNCTUATION: nuanceOptions.punctuation},
-        ...(nuanceOptions.profanityFilter) &&
-          {NUANCE_FILTER_PROFANITY: nuanceOptions.profanityFilter},
-        ...(nuanceOptions.includeTokenization) &&
-          {NUANCE_INCLUDE_TOKENIZATION: nuanceOptions.includeTokenization},
-        ...(nuanceOptions.discardSpeakerAdaptation) &&
-          {NUANCE_DISCARD_SPEAKER_ADAPTATION: nuanceOptions.discardSpeakerAdaptation},
-        ...(nuanceOptions.suppressCallRecording) &&
-          {NUANCE_SUPPRESS_CALL_RECORDING: nuanceOptions.suppressCallRecording},
-        ...(nuanceOptions.maskLoadFailures) &&
-          {NUANCE_MASK_LOAD_FAILURES: nuanceOptions.maskLoadFailures},
-        ...(nuanceOptions.suppressInitialCapitalization) &&
-          {NUANCE_SUPPRESS_INITIAL_CAPITALIZATION: nuanceOptions.suppressInitialCapitalization},
-        ...(nuanceOptions.allowZeroBaseLmWeight)
-          && {NUANCE_ALLOW_ZERO_BASE_LM_WEIGHT: nuanceOptions.allowZeroBaseLmWeight},
-        ...(nuanceOptions.filterWakeupWord) &&
-          {NUANCE_FILTER_WAKEUP_WORD: nuanceOptions.filterWakeupWord},
-        ...(nuanceOptions.resultType) &&
-          {NUANCE_RESULT_TYPE: nuanceOptions.resultType || rOpts.interim ? 'partial' : 'final'},
-        ...(nuanceOptions.noInputTimeoutMs) &&
-          {NUANCE_NO_INPUT_TIMEOUT_MS: nuanceOptions.noInputTimeoutMs},
-        ...(nuanceOptions.recognitionTimeoutMs) &&
-          {NUANCE_RECOGNITION_TIMEOUT_MS: nuanceOptions.recognitionTimeoutMs},
-        ...(nuanceOptions.utteranceEndSilenceMs) &&
-          {NUANCE_UTTERANCE_END_SILENCE_MS: nuanceOptions.utteranceEndSilenceMs},
-        ...(nuanceOptions.maxHypotheses) &&
-          {NUANCE_MAX_HYPOTHESES: nuanceOptions.maxHypotheses},
-        ...(nuanceOptions.speechDomain) &&
-          {NUANCE_SPEECH_DOMAIN: nuanceOptions.speechDomain},
-        ...(nuanceOptions.formatting) &&
-          {NUANCE_FORMATTING: nuanceOptions.formatting},
-        ...(nuanceOptions.resources) &&
-          {NUANCE_RESOURCES: JSON.stringify(nuanceOptions.resources)},
-      };
-    }
-    else if ('deepgram' === vendor) {
-      const {deepgramOptions = {}} = rOpts;
-      opts = {
-        ...opts,
-        ...(sttCredentials.api_key) &&
-          {DEEPGRAM_API_KEY: sttCredentials.api_key},
-        ...(deepgramOptions.tier) &&
-          {DEEPGRAM_SPEECH_TIER: deepgramOptions.tier},
-        ...(deepgramOptions.model) &&
-          {DEEPGRAM_SPEECH_MODEL: deepgramOptions.model},
-        ...(deepgramOptions.punctuate) &&
-          {DEEPGRAM_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 1},
-        ...(deepgramOptions.profanityFilter) &&
-          {DEEPGRAM_SPEECH_PROFANITY_FILTER: 1},
-        ...(deepgramOptions.redact) &&
-          {DEEPGRAM_SPEECH_REDACT: 1},
-        ...(deepgramOptions.diarize) &&
-          {DEEPGRAM_SPEECH_DIARIZE: 1},
-        ...(deepgramOptions.diarizeVersion) &&
-          {DEEPGRAM_SPEECH_DIARIZE_VERSION: deepgramOptions.diarizeVersion},
-        ...(deepgramOptions.ner) &&
-          {DEEPGRAM_SPEECH_NER: 1},
-        ...(deepgramOptions.alternatives) &&
-          {DEEPGRAM_SPEECH_ALTERNATIVES: deepgramOptions.alternatives},
-        ...(deepgramOptions.numerals) &&
-          {DEEPGRAM_SPEECH_NUMERALS: deepgramOptions.numerals},
-        ...(deepgramOptions.search) &&
-          {DEEPGRAM_SPEECH_SEARCH: deepgramOptions.search.join(',')},
-        ...(deepgramOptions.replace) &&
-          {DEEPGRAM_SPEECH_REPLACE: deepgramOptions.replace.join(',')},
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
-          {DEEPGRAM_SPEECH_KEYWORDS: rOpts.hints.map((h) => h.trim()).join(',')}),
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
-          {DEEPGRAM_SPEECH_KEYWORDS: rOpts.hints.map((h) => h.phrase).join(',')}),
-        ...(deepgramOptions.keywords) &&
-          {DEEPGRAM_SPEECH_KEYWORDS: deepgramOptions.keywords.join(',')},
-        ...('endpointing' in deepgramOptions) &&
-          {DEEPGRAM_SPEECH_ENDPOINTING: deepgramOptions.endpointing},
-        ...(deepgramOptions.vadTurnoff) &&
-          {DEEPGRAM_SPEECH_VAD_TURNOFF: deepgramOptions.vadTurnoff},
-        ...(deepgramOptions.tag) &&
-          {DEEPGRAM_SPEECH_TAG: deepgramOptions.tag}
-      };
-    }
-    else if ('soniox' === vendor) {
-      const {sonioxOptions = {}} = rOpts;
-      const {storage = {}} = sonioxOptions;
-      opts = {
-        ...opts,
-        ...(sttCredentials.api_key) &&
-          {SONIOX_API_KEY: sttCredentials.api_key},
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
-          {SONIOX_HINTS: rOpts.hints.join(',')}),
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
-          {SONIOX_HINTS: JSON.stringify(rOpts.hints)}),
-        ...(typeof rOpts.hintsBoost === 'number' &&
-          {SONIOX_HINTS_BOOST: rOpts.hintsBoost}),
-        ...(sonioxOptions.model) &&
-          {SONIOX_MODEL: sonioxOptions.model},
-        ...((sonioxOptions.profanityFilter || rOpts.profanityFilter) && {SONIOX_PROFANITY_FILTER: 1}),
-        ...(storage?.id && {SONIOX_STORAGE_ID: storage.id}),
-        ...(storage?.id && storage?.title && {SONIOX_STORAGE_TITLE: storage.title}),
-        ...(storage?.id && storage?.disableStoreAudio && {SONIOX_STORAGE_DISABLE_AUDIO: 1}),
-        ...(storage?.id && storage?.disableStoreTranscript && {SONIOX_STORAGE_DISABLE_TRANSCRIPT: 1}),
-        ...(storage?.id && storage?.disableSearch && {SONIOX_STORAGE_DISABLE_SEARCH: 1})
-      };
-    }
-    else if ('ibm' === vendor) {
-      const {ibmOptions = {}} = rOpts;
-      opts = {
-        ...opts,
-        ...(sttCredentials.access_token) &&
-          {IBM_ACCESS_TOKEN: sttCredentials.access_token},
-        ...(sttCredentials.stt_region) &&
-          {IBM_SPEECH_REGION: sttCredentials.stt_region},
-        ...(sttCredentials.instance_id) &&
-          {IBM_SPEECH_INSTANCE_ID: sttCredentials.instance_id},
-        ...(ibmOptions.model) &&
-          {IBM_SPEECH_MODEL: ibmOptions.model},
-        ...(ibmOptions.language_customization_id) &&
-          {IBM_SPEECH_LANGUAGE_CUSTOMIZATION_ID: ibmOptions.language_customization_id},
-        ...(ibmOptions.acoustic_customization_id) &&
-          {IBM_SPEECH_ACOUSTIC_CUSTOMIZATION_ID: ibmOptions.acoustic_customization_id},
-        ...(ibmOptions.baseModelVersion) &&
-          {IBM_SPEECH_BASE_MODEL_VERSION: ibmOptions.baseModelVersion},
-        ...(ibmOptions.watsonMetadata) &&
-          {IBM_SPEECH_WATSON_METADATA: ibmOptions.watsonMetadata},
-        ...(ibmOptions.watsonLearningOptOut) &&
-          {IBM_SPEECH_WATSON_LEARNING_OPT_OUT: ibmOptions.watsonLearningOptOut}
-      };
-    }
-    else if ('nvidia' === vendor) {
-      const {nvidiaOptions = {}} = rOpts;
-      opts = {
-        ...opts,
-        ...((nvidiaOptions.profanityFilter || rOpts.profanityFilter) && {NVIDIA_PROFANITY_FILTER: 1}),
-        ...(!(nvidiaOptions.profanityFilter || rOpts.profanityFilter) && {NVIDIA_PROFANITY_FILTER: 0}),
-        ...((nvidiaOptions.punctuation || rOpts.punctuation) && {NVIDIA_PUNCTUATION: 1}),
-        ...(!(nvidiaOptions.punctuation || rOpts.punctuation) && {NVIDIA_PUNCTUATION: 0}),
-        ...((rOpts.words || nvidiaOptions.wordTimeOffsets) && {NVIDIA_WORD_TIME_OFFSETS: 1}),
-        ...(!(rOpts.words || nvidiaOptions.wordTimeOffsets) && {NVIDIA_WORD_TIME_OFFSETS: 0}),
-        ...(nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: nvidiaOptions.maxAlternatives}),
-        ...(!nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: 1}),
-        ...(rOpts.model && {NVIDIA_MODEL: rOpts.model}),
-        ...(nvidiaOptions.rivaUri && {NVIDIA_RIVA_URI: nvidiaOptions.rivaUri}),
-        ...(nvidiaOptions.verbatimTranscripts && {NVIDIA_VERBATIM_TRANSCRIPTS: 1}),
-        ...(rOpts.diarization && {NVIDIA_SPEAKER_DIARIZATION: 1}),
-        ...(rOpts.diarization && rOpts.diarizationMaxSpeakers > 0 &&
-          {NVIDIA_DIARIZATION_SPEAKER_COUNT: rOpts.diarizationMaxSpeakers}),
-        ...(rOpts.separateRecognitionPerChannel && {NVIDIA_SEPARATE_RECOGNITION_PER_CHANNEL: 1}),
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
-          {NVIDIA_HINTS: rOpts.hints.join(',')}),
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
-          {NVIDIA_HINTS: JSON.stringify(rOpts.hints)}),
-        ...(typeof rOpts.hintsBoost === 'number' &&
-          {NVIDIA_HINTS_BOOST: rOpts.hintsBoost}),
-        ...(nvidiaOptions.customConfiguration &&
-          {NVIDIA_CUSTOM_CONFIGURATION: JSON.stringify(nvidiaOptions.customConfiguration)}),
-      };
-    }
-    else if (vendor.startsWith('custom:')) {
-      let {options = {}} = rOpts;
-      const {auth_token, custom_stt_url} = sttCredentials;
-      options = {
-        ...options,
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
-        {hints: rOpts.hints}),
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
-        {hints: JSON.stringify(rOpts.hints)}),
-        ...(typeof rOpts.hintsBoost === 'number' && {hintsBoost: rOpts.hintsBoost})
-      };
-
-      opts = {
-        ...opts,
-        JAMBONZ_STT_API_KEY: auth_token,
-        JAMBONZ_STT_URL: custom_stt_url,
-        ...(Object.keys(options).length > 0 && {JAMBONZ_STT_OPTIONS: JSON.stringify(options)}),
-      };
-    }
-
-    (stickyVars[vendor] || []).forEach((key) => {
-      if (!opts[key]) opts[key] = '';
-    });
-    return opts;
-  };
-
-  const removeSpeechListeners = (ep) => {
-    ep.removeCustomEventListener(GoogleTranscriptionEvents.Transcription);
-    ep.removeCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance);
-    ep.removeCustomEventListener(GoogleTranscriptionEvents.VadDetected);
-
-    ep.removeCustomEventListener(AwsTranscriptionEvents.Transcription);
-    ep.removeCustomEventListener(AwsTranscriptionEvents.VadDetected);
-
-    ep.removeCustomEventListener(AzureTranscriptionEvents.Transcription);
-    ep.removeCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected);
-    ep.removeCustomEventListener(AzureTranscriptionEvents.VadDetected);
-
-    ep.removeCustomEventListener(NuanceTranscriptionEvents.Transcription);
-    ep.removeCustomEventListener(NuanceTranscriptionEvents.TranscriptionComplete);
-    ep.removeCustomEventListener(NuanceTranscriptionEvents.StartOfSpeech);
-    ep.removeCustomEventListener(NuanceTranscriptionEvents.VadDetected);
-
-    ep.removeCustomEventListener(DeepgramTranscriptionEvents.Transcription);
-    ep.removeCustomEventListener(DeepgramTranscriptionEvents.Connect);
-    ep.removeCustomEventListener(DeepgramTranscriptionEvents.ConnectFailure);
-
-    ep.removeCustomEventListener(SonioxTranscriptionEvents.Transcription);
-
-    ep.removeCustomEventListener(NvidiaTranscriptionEvents.Transcription);
-    ep.removeCustomEventListener(NvidiaTranscriptionEvents.TranscriptionComplete);
-    ep.removeCustomEventListener(NvidiaTranscriptionEvents.StartOfSpeech);
-    ep.removeCustomEventListener(NvidiaTranscriptionEvents.VadDetected);
-
-    ep.removeCustomEventListener(JambonzTranscriptionEvents.Transcription);
-    ep.removeCustomEventListener(JambonzTranscriptionEvents.Connect);
-    ep.removeCustomEventListener(JambonzTranscriptionEvents.ConnectFailure);
-
-    ep.removeCustomEventListener(JambonzTranscriptionEvents.Error);
-  };
-
-  const setSpeechCredentialsAtRuntime = (recognizer) => {
-    if (!recognizer) return;
-    if (recognizer.vendor === 'nuance') {
-      const {clientId, secret, kryptonEndpoint} = recognizer.nuanceOptions || {};
-      if (clientId && secret) return {client_id: clientId, secret};
-      if (kryptonEndpoint) return {nuance_stt_uri: kryptonEndpoint};
-    }
-    else if (recognizer.vendor === 'nvidia') {
-      const {rivaUri} = recognizer.nvidiaOptions || {};
-      if (rivaUri) return {riva_uri: rivaUri};
-    }
-    else if (recognizer.vendor === 'deepgram') {
-      const {apiKey} = recognizer.deepgramOptions || {};
-      if (apiKey) return {api_key: apiKey};
-    }
-    else if (recognizer.vendor === 'soniox') {
-      const {apiKey} = recognizer.sonioxOptions || {};
-      if (apiKey) return {api_key: apiKey};
-    }
-    else if (recognizer.vendor === 'ibm') {
-      const {ttsApiKey, ttsRegion, sttApiKey, sttRegion, instanceId} = recognizer.ibmOptions || {};
-      if (ttsApiKey || sttApiKey) return {
-        tts_api_key: ttsApiKey,
-        tts_region: ttsRegion,
-        stt_api_key: sttApiKey,
-        stt_region: sttRegion,
-        instance_id: instanceId
-      };
-    }
-  };
-
-  return {
-    normalizeTranscription,
-    setChannelVarsForStt,
-    removeSpeechListeners,
-    setSpeechCredentialsAtRuntime,
-    compileSonioxTranscripts
-  };
-};

lib/utils/ws-requestor.js

@@ -1,354 +0,0 @@
-const assert = require('assert');
-const BaseRequestor = require('./base-requestor');
-const short = require('short-uuid');
-const {HookMsgTypes} = require('./constants.json');
-const Websocket = require('ws');
-const snakeCaseKeys = require('./snakecase-keys');
-const MAX_RECONNECTS = 5;
-const RESPONSE_TIMEOUT_MS = process.env.JAMBONES_WS_API_MSG_RESPONSE_TIMEOUT || 5000;
-
-class WsRequestor extends BaseRequestor {
-  constructor(logger, account_sid, hook, secret) {
-    super(logger, account_sid, hook, secret);
-    this.connections = 0;
-    this.messagesInFlight = new Map();
-    this.maliciousClient = false;
-    this.closedGracefully = false;
-    this.backoffMs = 500;
-    this.connectInProgress = false;
-    this.queuedMsg = [];
-    this.id = short.generate();
-
-    assert(this._isAbsoluteUrl(this.url));
-
-    this.on('socket-closed', this._onSocketClosed.bind(this));
-  }
-
-  /**
-   * Send a JSON payload over the websocket.  If this is the first request,
-   * open the websocket.
-   * All requests expect an ack message in response
-   * @param {object|string} hook - may be a absolute or relative url, or an object
-   * @param {string} [hook.url] - an absolute or relative url
-   * @param {string} [hook.method] - 'GET' or 'POST'
-   * @param {string} [hook.username] - if basic auth is protecting the endpoint
-   * @param {string} [hook.password] - if basic auth is protecting the endpoint
-   * @param {object} [params] - request parameters
-   */
-  async request(type, hook, params, httpHeaders = {}) {
-    assert(HookMsgTypes.includes(type));
-    const url = hook.url || hook;
-
-    if (this.maliciousClient) {
-      this.logger.info({url: this.url}, 'WsRequestor:request - discarding msg to malicious client');
-      return;
-    }
-    if (this.closedGracefully) {
-      this.logger.debug(`WsRequestor:request - discarding ${type} because socket was closed gracefully`);
-      return;
-    }
-
-    if (type === 'session:new') this.call_sid = params.callSid;
-
-    /* if we have an absolute url, and it is http then do a standard webhook */
-    if (this._isAbsoluteUrl(url) && url.startsWith('http')) {
-      const HttpRequestor = require('./http-requestor');
-      this.logger.debug({hook}, 'WsRequestor: sending a webhook (HTTP)');
-      const h = typeof hook === 'object' ? hook : {url: hook};
-      const requestor = new HttpRequestor(this.logger, this.account_sid, h, this.secret);
-      if (type === 'session:redirect') {
-        this.close();
-        this.emit('handover', requestor);
-      }
-      return requestor.request(type, hook, params, httpHeaders);
-    }
-
-    /* connect if necessary */
-    if (!this.ws) {
-      if (this.connectInProgress) {
-        this.logger.debug(
-          `WsRequestor:request(${this.id}) - queueing ${type} message since we are connecting`);
-        this.queuedMsg.push({type, hook, params, httpHeaders});
-        return;
-      }
-      this.connectInProgress = true;
-      this.logger.debug(`WsRequestor:request(${this.id}) - connecting since we do not have a connection`);
-      if (this.connections >= MAX_RECONNECTS) {
-        return Promise.reject(`max attempts connecting to ${this.url}`);
-      }
-      try {
-        const startAt = process.hrtime();
-        await this._connect();
-        const rtt = this._roundTrip(startAt);
-        this.stats.histogram('app.hook.connect_time', rtt, ['hook_type:app']);
-      } catch (err) {
-        this.logger.info({url, err}, 'WsRequestor:request - failed connecting');
-        this.connectInProgress = false;
-        return Promise.reject(err);
-      }
-    }
-    assert(this.ws);
-
-    /* prepare and send message */
-    let payload = params ? snakeCaseKeys(params, ['customerData', 'sip']) : null;
-    if (type === 'session:new') this._sessionData = payload;
-    if (type === 'session:reconnect') payload = this._sessionData;
-    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,
-      msgid,
-      call_sid: this.call_sid,
-      hook: type === 'verb:hook' ? url : undefined,
-      data: {...payload},
-      ...b3
-    };
-
-    const sendQueuedMsgs = () => {
-      if (this.queuedMsg.length > 0) {
-        for (const {type, hook, params, httpHeaders} of this.queuedMsg) {
-          this.logger.debug(`WsRequestor:request - preparing queued ${type} for sending`);
-          setImmediate(this.request.bind(this, type, hook, params, httpHeaders));
-        }
-        this.queuedMsg.length = 0;
-      }
-    };
-
-    //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) {
-      this.ws.send(JSON.stringify(obj), () => {
-        this.logger.debug({obj}, `WsRequestor:request websocket: sent (${url})`);
-        sendQueuedMsgs();
-      });
-      return;
-    }
-
-    /* messages that require an ack */
-    return new Promise((resolve, reject) => {
-      /* give the far end a reasonable amount of time to ack our message */
-      const timer = setTimeout(() => {
-        const {failure} = this.messagesInFlight.get(msgid) || {};
-        failure && failure(`timeout from far end for msgid ${msgid}`);
-        this.messagesInFlight.delete(msgid);
-      }, RESPONSE_TIMEOUT_MS);
-
-      /* save the message info for reply */
-      const startAt = process.hrtime();
-      this.messagesInFlight.set(msgid, {
-        timer,
-        success: (response) => {
-          clearTimeout(timer);
-          const rtt = this._roundTrip(startAt);
-          this.logger.debug({response}, `WsRequestor:request ${url} succeeded in ${rtt}ms`);
-          this.stats.histogram('app.hook.ws_response_time', rtt, ['hook_type:app']);
-          resolve(response);
-        },
-        failure: (err) => {
-          clearTimeout(timer);
-          reject(err);
-        }
-      });
-
-      /* send the message */
-      this.ws.send(JSON.stringify(obj), () => {
-        this.logger.debug({obj}, `WsRequestor:request websocket: sent (${url})`);
-        sendQueuedMsgs();
-      });
-    });
-  }
-
-  close() {
-    this.closedGracefully = true;
-    this.logger.debug('WsRequestor:close closing socket');
-    try {
-      if (this.ws) {
-        this.ws.close(1000);
-        this.ws.removeAllListeners();
-        this.ws = null;
-      }
-      this._clearPendingMessages();
-    } catch (err) {
-      this.logger.info({err}, 'WsRequestor: Error closing socket');
-    }
-  }
-
-  _connect() {
-    assert(!this.ws);
-    return new Promise((resolve, reject) => {
-      const handshakeTimeout = process.env.JAMBONES_WS_HANDSHAKE_TIMEOUT_MS ?
-        parseInt(process.env.JAMBONES_WS_HANDSHAKE_TIMEOUT_MS) :
-        1500;
-      let opts = {
-        followRedirects: true,
-        maxRedirects: 2,
-        handshakeTimeout,
-        maxPayload: process.env.JAMBONES_WS_MAX_PAYLOAD ? parseInt(process.env.JAMBONES_WS_MAX_PAYLOAD) : 24 * 1024,
-      };
-      if (this.username && this.password) opts = {...opts, auth: `${this.username}:${this.password}`};
-
-      this
-        .once('ready', (ws) => {
-          this.removeAllListeners('not-ready');
-          if (this.connections > 1) this.request('session:reconnect', this.url);
-          resolve();
-        })
-        .once('not-ready', (err) => {
-          this.removeAllListeners('ready');
-          reject(err);
-        });
-      const ws = new Websocket(this.url, ['ws.jambonz.org'], opts);
-      this._setHandlers(ws);
-    });
-  }
-
-  _setHandlers(ws) {
-    ws
-      .once('open', this._onOpen.bind(this, ws))
-      .once('close', this._onClose.bind(this))
-      .on('message', this._onMessage.bind(this))
-      .once('unexpected-response', this._onUnexpectedResponse.bind(this, ws))
-      .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');
-    }
-    else this.emit('not-ready', err);
-  }
-
-  _onOpen(ws) {
-    this.logger.info({url: this.url}, `WsRequestor(${this.id}) - successfully connected`);
-    if (this.ws) this.logger.info({old_ws: this.ws._socket.address()}, 'WsRequestor:_onOpen');
-    assert(!this.ws);
-    this.ws = ws;
-    this.connectInProgress = false;
-    this.connections++;
-    this.emit('ready', ws);
-  }
-
-  _onClose(code) {
-    this.logger.info(`WsRequestor(${this.id}) - closed from far end ${code}`);
-    if (this.connections > 0 && code !== 1000) {
-      this.logger.info({url: this.url}, 'WsRequestor - socket closed unexpectedly from remote side');
-      this.emit('socket-closed');
-    }
-    else if (code === 1000) this.closedGracefully = true;
-    this.ws?.removeAllListeners();
-    this.ws = null;
-  }
-
-  _onUnexpectedResponse(ws, req, res) {
-    assert(!this.ws);
-    this.logger.info({
-      headers: res.headers,
-      statusCode: res.statusCode,
-      statusMessage: res.statusMessage
-    }, 'WsRequestor - unexpected response');
-    this.emit('connection-failure');
-    this.emit('not-ready', new Error(`${res.statusCode} ${res.statusMessage}`));
-    this.connections++;
-  }
-
-  _onSocketClosed() {
-    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(
-          {haveWs: !!this.ws, connectInProgress: this.connectInProgress},
-          'WsRequestor:_onSocketClosed time to reconnect');
-        if (!this.ws && !this.connectInProgress) {
-          this.connectInProgress = true;
-          this._connect().catch((err) => this.connectInProgress = false);
-        }
-      }, this.backoffMs);
-      this.backoffMs = this.backoffMs < 2000 ? this.backoffMs * 2 : (this.backoffMs + 2000);
-    }
-  }
-
-  _onMessage(content, isBinary) {
-    if (this.isBinary) {
-      this.logger.info({url: this.url}, 'WsRequestor:_onMessage - discarding binary message');
-      this.maliciousClient = true;
-      this.ws.close();
-      return;
-    }
-
-    /* messages must be JSON format */
-    try {
-      const obj = JSON.parse(content);
-      const {type, msgid, command, call_sid = this.call_sid, queueCommand = false, data} = obj;
-
-      //this.logger.debug({obj}, 'WsRequestor:request websocket: received');
-      assert.ok(type, 'type property not supplied');
-
-      switch (type) {
-        case 'ack':
-          assert.ok(msgid, 'msgid not supplied');
-          this._recvAck(msgid, data);
-          break;
-
-        case 'command':
-          assert.ok(command, 'command property not supplied');
-          assert.ok(data, 'data property not supplied');
-          this._recvCommand(msgid, command, call_sid, queueCommand, data);
-          break;
-
-        default:
-          assert.ok(false, `invalid type property: ${type}`);
-      }
-    } catch (err) {
-      this.logger.info({err, content}, 'WsRequestor:_onMessage - invalid incoming message');
-    }
-  }
-
-  _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`);
-      return;
-    }
-    //this.logger.debug({url: this.url}, `WsRequestor:_recvAck - received response to ${msgid}`);
-    this.messagesInFlight.delete(msgid);
-    const {success} = obj;
-    success && success(data);
-  }
-
-  _recvCommand(msgid, command, call_sid, queueCommand, data) {
-    // TODO: validate command
-    this.logger.debug({msgid, command, call_sid, queueCommand, data}, 'received command');
-    this.emit('command', {msgid, command, call_sid, queueCommand, data});
-  }
-}
-
-module.exports = WsRequestor;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-feature-server",
-  "version": "v0.8.2",
+  "version": "0.3.1",
   "main": "app.js",
   "engines": {
     "node": ">= 10.16.0"
@@ -16,62 +16,44 @@
     "type": "git",
     "url": "https://github.com/jambonz/jambonz-feature-server.git"
   },
-  "bugs": {},
+  "bugs": {
+    "url": "https://github.com/jambonz/jambonz-feature-server/issues"
+  },
   "scripts": {
     "start": "node app",
-    "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=1 ENCRYPTION_SECRET=foobar DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:JambonzR0ck$:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ",
+    "test": "NODE_ENV=test JAMBONES_HOSTING=1 DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=debug ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:ClueCon:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ",
     "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
     "jslint": "eslint app.js lib"
   },
   "dependencies": {
-    "@jambonz/db-helpers": "^0.7.4",
-    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.7.0",
-    "@jambonz/speech-utils": "^0.0.8",
-    "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.2.5",
-    "@jambonz/verb-specifications": "^0.0.11",
-    "@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.1313.0",
+    "@jambonz/db-helpers": "^0.6.13",
+    "@jambonz/mw-registrar": "^0.2.1",
+    "@jambonz/realtimedb-helpers": "^0.4.1",
+    "@jambonz/stats-collector": "^0.1.5",
+    "@jambonz/time-series": "^0.1.5",
+    "aws-sdk": "^2.846.0",
     "bent": "^7.3.12",
-    "debug": "^4.3.4",
+    "cidr-matcher": "^2.1.1",
+    "debug": "^4.3.1",
     "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.20",
-    "drachtio-srf": "^4.5.23",
-    "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",
-    "sdp-transform": "^2.14.1",
-    "short-uuid": "^4.2.2",
-    "sinon": "^15.0.1",
+    "drachtio-fsmrf": "^2.0.7",
+    "drachtio-srf": "^4.4.50",
+    "express": "^4.17.1",
+    "ip": "^1.1.5",
+    "moment": "^2.29.1",
+    "parse-url": "^5.0.2",
+    "pino": "^6.11.2",
     "to-snake-case": "^1.0.0",
-    "undici": "^5.19.1",
-    "uuid-random": "^1.3.2",
-    "verify-aws-sns-signature": "^0.1.0",
-    "ws": "^8.9.0",
+    "uuid": "^8.3.2",
+    "verify-aws-sns-signature": "^0.0.6",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
-    "clear-module": "^4.1.2",
-    "eslint": "^7.32.0",
+    "async": "^3.2.0",
+    "clear-module": "^4.1.1",
+    "eslint": "^7.20.0",
     "eslint-plugin-promise": "^4.3.1",
     "nyc": "^15.1.0",
-    "tape": "^5.6.1"
-  },
-  "optionalDependencies": {
-    "bufferutil": "^4.0.6",
-    "utf-8-validate": "^5.0.8"
+    "tape": "^5.2.2"
   }
 }

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);
-  }
-});

test/create-call-test.js

@@ -1,108 +0,0 @@
-const test = require('tape');
-const { sippUac } = require('./sipp')('test_fs');
-const bent = require('bent');
-const clearModule = require('clear-module');
-const {provisionCallHook} = require('./utils')
-const getJSON = bent('json')
-
-const waitFor = (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('test create-call timeout', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // give UAS app time to come up
-    const p = sippUac('uas-timeout-cancel.xml', '172.38.0.10');
-    await waitFor(1000);
-
-    // GIVEN
-    let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a';
-    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
-    post('v1/createCall', {
-      'account_sid':account_sid,
-      'timeout': 1,
-      "call_hook": {
-        "url": "https://public-apps.jambonz.us/hello-world",
-        "method": "POST"
-      },
-      "from": "15083718299",
-      "to": {
-        "type": "phone",
-        "number": "15583084809"
-      }});
-    //THEN
-    await p;
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('test create-call call-hook basic authentication', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-
-    // GIVEN
-    let from = 'call_hook_basic_authentication';
-    let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a';
-
-    // Give UAS app time to come up
-    const p = sippUac('uas.xml', '172.38.0.10', from);
-    await waitFor(1000);
-
-    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
-    post('v1/createCall', {
-      'account_sid':account_sid,
-      "call_hook": {
-        "url": "http://127.0.0.1:3100/",
-        "method": "POST",
-        "username": "username",
-        "password": "password"
-      },
-      "from": from,
-      "to": {
-        "type": "phone",
-        "number": "15583084809"
-      }});
-
-    let verbs = [
-      {
-        "verb": "say",
-        "text": "hello"
-      }
-    ];
-    provisionCallHook(from, verbs);
-    //THEN
-    await p;
-
-    let obj = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}`)
-    t.ok(obj.headers.Authorization = 'Basic dXNlcm5hbWU6cGFzc3dvcmQ=',
-      'create-call: call-hook contains basic authentication header');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});

test/create-test-db.js

@@ -22,17 +22,11 @@ test('creating schema', (t) => {
       const google_credential = encrypt(process.env.GCP_JSON_KEY);
       const aws_credential = encrypt(JSON.stringify({
         access_key_id: process.env.AWS_ACCESS_KEY_ID,
-        secret_access_key: process.env.AWS_SECRET_ACCESS_KEY,
-        aws_region: process.env.AWS_REGION
-      }));
-      const microsoft_credential = encrypt(JSON.stringify({
-        region: process.env.MICROSOFT_REGION || 'useast',
-        api_key: process.env.MICROSOFT_API_KEY || '1234567890'
+        secret_access_key: process.env.AWS_SECRET_ACCESS_KEY
       }));
       const cmd = `
 UPDATE speech_credentials SET credential='${google_credential}' WHERE vendor='google';
 UPDATE speech_credentials SET credential='${aws_credential}' WHERE vendor='aws';
-UPDATE speech_credentials SET credential='${microsoft_credential}' WHERE vendor='microsoft';
 `;
       const path = `${__dirname}/.creds.sql`;
       fs.writeFileSync(path, cmd);

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"
-    }
-  }
-}

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"
-    }
-  }
-}

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,12 @@ 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');
 /*!40000 ALTER TABLE `applications` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -452,8 +449,6 @@ INSERT INTO `phone_numbers` VALUES ('e686a320-0725-418f-be65-532159bdc3ed','1617
 INSERT INTO `phone_numbers` VALUES ('05eeed62-b29b-4679-bf38-d7a4e318be44','16174000003','5145b436-2f38-4029-8d4c-fd8c67831c7a','bb845d4b-83a9-4cde-a6e9-50f3743bab3f','17461c69-56b5-4dab-ad83-1c43a0f93a3d', NULL);
 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;
 
@@ -592,8 +587,7 @@ DROP TABLE IF EXISTS `speech_credentials`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `speech_credentials` (
   `speech_credential_sid` char(36) NOT NULL,
- `service_provider_sid` CHAR(36),
- `account_sid` char(36) NOT NULL,
+  `account_sid` char(36) NOT NULL,
   `vendor` varchar(255) NOT NULL,
   `credential` VARCHAR(8192) NOT NULL,
   `use_for_tts` tinyint(1) DEFAULT '1',
@@ -617,10 +611,7 @@ CREATE TABLE `speech_credentials` (
 
 LOCK TABLES `speech_credentials` WRITE;
 /*!40000 ALTER TABLE `speech_credentials` DISABLE KEYS */;
-INSERT INTO `speech_credentials` VALUES 
-('2add163c-34f2-45c6-a016-f955d218ffb6',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','google','credential-goes-here',1,1,NULL,'2021-04-03 15:42:10',1,1),
-('2add347f-34f2-45c6-a016-f955d218ffb6',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','microsoft','credential-goes-here',1,1,NULL,'2021-04-03 15:42:10',1,1),
-('84154212-5c99-4c94-8993-bc2a46288daa',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','aws','credential-goes-here',1,1,NULL,NULL,NULL,NULL);
+INSERT INTO `speech_credentials` VALUES ('2add163c-34f2-45c6-a016-f955d218ffb6','bb845d4b-83a9-4cde-a6e9-50f3743bab3f','google','credential-goes-here',1,1,NULL,'2021-04-03 15:42:10',1,1),('84154212-5c99-4c94-8993-bc2a46288daa','bb845d4b-83a9-4cde-a6e9-50f3743bab3f','aws','credential-goes-here',0,0,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `speech_credentials` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -744,7 +735,6 @@ INSERT INTO `webhooks` VALUES ('c71e79db-24f2-4866-a3ee-febb0f97b341','http://12
 INSERT INTO `webhooks` VALUES ('54ab0976-a6c0-45d8-89a4-d90d45bf9d96','http://127.0.0.1:3101/','POST',NULL,NULL);
 INSERT INTO `webhooks` VALUES ('10692465-a511-4277-9807-b7157e4f81e1','http://127.0.0.1:3102/','POST',NULL,NULL);
 INSERT INTO `webhooks` VALUES ('ecb67a8f-f7ce-4919-abf0-bbc69c1001e5','http://127.0.0.1:3103/','POST',NULL,NULL);
-INSERT INTO `webhooks` VALUES ('c9113e7a-741f-48b9-96c1-f2f78176eeb3','http://127.0.0.1:3104/','POST',NULL,NULL);
 /*!40000 ALTER TABLE `webhooks` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

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,32 +18,20 @@ 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;
-
 DROP TABLE IF EXISTS predefined_carriers;
 
 DROP TABLE IF EXISTS account_offers;
 
 DROP TABLE IF EXISTS products;
 
-DROP TABLE IF EXISTS schema_version;
-
 DROP TABLE IF EXISTS api_keys;
 
 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 +65,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 +119,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 ,
@@ -186,20 +148,6 @@ predefined_carrier_sid CHAR(36) NOT NULL,
 PRIMARY KEY (predefined_sip_gateway_sid)
 );
 
-CREATE TABLE predefined_smpp_gateways
-(
-predefined_smpp_gateway_sid CHAR(36) NOT NULL UNIQUE ,
-ipv4 VARCHAR(128) NOT NULL COMMENT 'ip address or DNS name of the gateway. ',
-port INTEGER NOT NULL DEFAULT 2775 COMMENT 'smpp signaling port',
-inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound SMS from the gateway',
-outbound BOOLEAN NOT NULL COMMENT 'i',
-netmask INTEGER NOT NULL DEFAULT 32,
-is_primary BOOLEAN NOT NULL DEFAULT 1,
-use_tls BOOLEAN DEFAULT 0,
-predefined_carrier_sid CHAR(36) NOT NULL,
-PRIMARY KEY (predefined_smpp_gateway_sid)
-);
-
 CREATE TABLE products
 (
 product_sid CHAR(36) NOT NULL UNIQUE ,
@@ -226,11 +174,6 @@ stripe_product_id VARCHAR(56) NOT NULL,
 PRIMARY KEY (account_offer_sid)
 );
 
-CREATE TABLE schema_version
-(
-version VARCHAR(16)
-);
-
 CREATE TABLE api_keys
 (
 api_key_sid CHAR(36) NOT NULL UNIQUE ,
@@ -262,15 +205,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 +260,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 +287,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 +307,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 +357,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 +395,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,32 +402,24 @@ 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);
 ALTER TABLE predefined_sip_gateways ADD FOREIGN KEY predefined_carrier_sid_idxfk (predefined_carrier_sid) REFERENCES predefined_carriers (predefined_carrier_sid);
 
-CREATE INDEX predefined_smpp_gateway_sid_idx ON predefined_smpp_gateways (predefined_smpp_gateway_sid);
-CREATE INDEX predefined_carrier_sid_idx ON predefined_smpp_gateways (predefined_carrier_sid);
-ALTER TABLE predefined_smpp_gateways ADD FOREIGN KEY predefined_carrier_sid_idxfk_1 (predefined_carrier_sid) REFERENCES predefined_carriers (predefined_carrier_sid);
-
 CREATE INDEX product_sid_idx ON products (product_sid);
 CREATE INDEX account_product_sid_idx ON account_products (account_product_sid);
 CREATE INDEX account_subscription_sid_idx ON account_products (account_subscription_sid);
@@ -521,14 +429,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 +450,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 +497,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 +518,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 +537,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 +545,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=1;

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);
-    }
-});

test/docker-compose-testbed.yaml

@@ -9,10 +9,9 @@ networks:
 services:
   mysql:
     image: mysql:5.7
-    platform: linux/x86_64
     ports:
       - "3360:3306"
-    environment:
+    environment: 
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "127.0.0.1", "--protocol", "tcp"]
@@ -44,7 +43,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:
@@ -57,7 +56,7 @@ services:
         condition: service_healthy
 
   freeswitch:
-    image: drachtio/drachtio-freeswitch-mrf:0.4.18
+    image: drachtio/drachtio-freeswitch-mrf:v1.10.1-full
     restart: always
     command: freeswitch --rtp-range-start 20000 --rtp-range-end 20100
     environment:
@@ -68,15 +67,17 @@ services:
       - /tmp:/tmp
       - ./credentials:/opt/credentials
     healthcheck:
-      test: ['CMD', 'fs_cli' ,'-p', 'JambonzR0ck$$', '-x', '"sofia status"']
+      test: ['CMD', 'fs_cli' ,'-x', '"sofia status"']
       timeout: 5s
       retries: 15
     networks:
       fs:
         ipv4_address: 172.38.0.51
 
-  webhook-scaffold:
+  webhook-decline:
     image: jambonz/webhook-test-scaffold:latest
+    environment:
+      APP_PATH: /tmp/decline.json
     ports:
       - "3100:3000/tcp"
     volumes:
@@ -85,8 +86,44 @@ services:
       fs:
         ipv4_address: 172.38.0.60
 
+  webhook-say:
+    image: jambonz/webhook-test-scaffold:latest
+    environment:
+      APP_PATH: /tmp/say.json
+    ports:
+      - "3101:3000/tcp"
+    volumes:
+      - ./test-apps:/tmp
+    networks:
+      fs:
+        ipv4_address: 172.38.0.61
+
+  webhook-gather:
+    image: jambonz/webhook-test-scaffold:latest
+    environment:
+      APP_PATH: /tmp/gather.json
+    ports:
+      - "3102:3000/tcp"
+    volumes:
+      - ./test-apps:/tmp
+    networks:
+      fs:
+        ipv4_address: 172.38.0.62
+
+  webhook-transcribe:
+    image: jambonz/webhook-test-scaffold:latest
+    environment:
+      APP_PATH: /tmp/transcribe.json
+    ports:
+      - "3103:3000/tcp"
+    volumes:
+      - ./test-apps:/tmp
+    networks:
+      fs:
+        ipv4_address: 172.38.0.63
+
   influxdb:
-    image: influxdb:1.8
+    image: influxdb:1.8-alpine
     ports:
       - "8086:8086"
     networks:

test/docker_start.js

@@ -1,5 +1,6 @@
 const test = require('tape') ;
 const exec = require('child_process').exec ;
+const async = require('async');
 
 test('starting docker network..takes a bit for mysql and freeswitch to come up..patience..', (t) => {
   exec(`docker-compose -f ${__dirname}/docker-compose-testbed.yaml up -d`, (err, stdout, stderr) => {

test/gather-tests.js

@@ -3,7 +3,6 @@ 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);
@@ -17,238 +16,16 @@ function connect(connectable) {
   });
 }
 
-test('\'gather\' test - google', async(t) => {
-  if (!process.env.GCP_JSON_KEY) {
-    t.pass('skipping google tests');
-    return t.end();
-  }
+test('\'gather\' and \'transcribe\' tests', async(t) => {
   clearModule.all();
   const {srf, disconnect} = require('../app');
 
   try {
     await connect(srf);
-    // GIVEN
-    let verbs = [
-      {
-        "verb": "gather",
-        "input": ["speech"],
-        "recognizer": {
-          "vendor": "google",
-          "hints": ["customer support", "sales", "human resources", "HR"]
-        },
-        "timeout": 10,
-        "actionHook": "/actionHook"
-      }
-    ];
-    let from = "gather_success";
-    provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
-      'gather: succeeds when using google credentials');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'gather\' test - default (google)', async(t) => {
-  if (!process.env.GCP_JSON_KEY) {
-    t.pass('skipping google tests');
-    return t.end();
-  }
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    // GIVEN
-    let verbs = [
-      {
-        "verb": "gather",
-        "input": ["speech"],
-        "timeout": 10,
-        "actionHook": "/actionHook"
-      }
-    ];
-    let from = "gather_success";
-    provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase() === 'i\'d like to speak to customer support',
-      'gather: succeeds when using default (google) credentials');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'gather\' test - microsoft', async(t) => {
-  if (!process.env.MICROSOFT_REGION || !process.env.MICROSOFT_API_KEY) {
-    t.pass('skipping microsoft tests');
-    return t.end();
-  }
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    // GIVEN
-    let verbs = [
-      {
-        "verb": "gather",
-        "input": ["speech"],
-        "recognizer": {
-          "vendor": "microsoft",
-          "hints": ["customer support", "sales", "human resources", "HR"]
-        },
-        "timeout": 10,
-        "actionHook": "/actionHook"
-      }
-    ];
-    let from = "gather_success";
-    provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
-      'gather: succeeds when using  microsoft credentials');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'gather\' test - aws', async(t) => {
-  if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) {
-    t.pass('skipping aws tests');
-    return t.end();
-  }
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    // GIVEN
-    let verbs = [
-      {
-        "verb": "gather",
-        "input": ["speech"],
-        "recognizer": {
-          "vendor": "aws",
-          "hints": ["customer support", "sales", "human resources", "HR"]
-        },
-        "timeout": 10,
-        "actionHook": "/actionHook"
-      }
-    ];
-    let from = "gather_success";
-    provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
-      'gather: succeeds when using aws credentials');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'gather\' test - deepgram', async(t) => {
-  if (!process.env.DEEPGRAM_API_KEY ) {
-    t.pass('skipping deepgram tests');
-    return t.end();
-  }
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    // GIVEN
-    let verbs = [
-      {
-        "verb": "gather",
-        "input": ["speech"],
-        "recognizer": {
-          "vendor": "deepgram",
-          "hints": ["customer support", "sales", "human resources", "HR"],
-          "deepgramOptions": {
-            "apiKey": process.env.DEEPGRAM_API_KEY
-          }
-        },
-        "timeout": 10,
-        "actionHook": "/actionHook"
-      }
-    ];
-    let from = "gather_success";
-    provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
-      'gather: succeeds when using deepgram credentials');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'gather\' test - soniox', async(t) => {
-  if (!process.env.SONIOX_API_KEY ) {
-    t.pass('skipping soniox tests');
-    return t.end();
-  }
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    // GIVEN
-    let verbs = [
-      {
-        "verb": "gather",
-        "input": ["speech"],
-        "recognizer": {
-          "vendor": "deepgram",
-          "hints": ["customer support", "sales", "human resources", "HR"],
-          "deepgramOptions": {
-            "apiKey": process.env.SONIOX_API_KEY
-          }
-        },
-        "timeout": 10,
-        "actionHook": "/actionHook"
-      }
-    ];
-    let from = "gather_success";
-    provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
-      'gather: succeeds when using soniox credentials');
+    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10');
+    let obj = await getJSON('http://127.0.0.1:3102/actionHook');
+    t.ok(obj.speech.alternatives[0].transcript = 'I\'d like to speak to customer support',
+      'gather: succeeds when using account credentials');
 
     disconnect();
   } catch (err) {

test/index.js

@@ -1,18 +1,9 @@
-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');
-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');

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);
-  }
-});

test/play-tests.js

@@ -1,254 +0,0 @@
-const test = require('tape');
-const { sippUac } = require('./sipp')('test_fs');
-const clearModule = require('clear-module');
-const {provisionCallHook, provisionCustomHook} = require('./utils')
-const bent = require('bent');
-const getJSON = bent('json')
-
-process.on('unhandledRejection', (reason, p) => {
-  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-function connect(connectable) {
-  return new Promise((resolve, reject) => {
-    connectable.on('connect', () => {
-      return resolve();
-    });
-  });
-}
-
-test('\'play\' tests single link in plain text', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'play',
-        url: 'https://example.com/example.mp3'
-      }
-    ];
-
-    const from = 'play_single_link';
-    provisionCallHook(from, verbs)
-
-    // THEN
-    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
-    t.pass('play: succeeds when using single link');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'play\' tests multi links in array', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'play',
-        url: ['https://example.com/example.mp3', 'https://example.com/example.mp3']
-      }
-    ];
-
-    const from = 'play_multi_links_in_array';
-    provisionCallHook(from, verbs)
-
-    // THEN
-    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
-    t.pass('play: succeeds when using links in array');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'play\' tests single link in conference', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const from = 'play_single_link_in_conference';
-    const waitHookVerbs = [
-      {
-        verb: 'play',
-        url: 'https://example.com/example.mp3'
-      }
-    ];
-
-    const verbs = [
-      {
-        verb: 'conference',
-        name: `${from}`,
-        beep: true,
-        "startConferenceOnEnter": false,
-        waitHook: `/customHook`
-      }
-    ];
-    provisionCustomHook(from, waitHookVerbs)
-    provisionCallHook(from, verbs)
-
-    // THEN
-    await sippUac('uac-success-send-bye.xml', '172.38.0.10', from);
-    t.pass('play: succeeds when using in conference as single link');
-    // Make sure that waitHook is called and success
-    await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_customHook`)
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'play\' tests multi links in array in conference', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const from = 'play_multi_links_in_conference';
-    const waitHookVerbs = [
-      {
-        verb: 'play',
-        url: ['https://example.com/example.mp3', 'https://example.com/example.mp3']
-      }
-    ];
-
-    const verbs = [
-      {
-        verb: 'conference',
-        name: `${from}`,
-        beep: true,
-        "startConferenceOnEnter": false,
-        waitHook: `/customHook`
-      }
-    ];
-    provisionCustomHook(from, waitHookVerbs)
-    provisionCallHook(from, verbs)
-
-    // THEN
-    await sippUac('uac-success-send-bye.xml', '172.38.0.10', from);
-    t.pass('play: succeeds when using in conference with multi links');
-    // Make sure that waitHook is called and success
-    await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_customHook`)
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'play\' tests with seekOffset and actionHook', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'play',
-        url: 'silence_stream://5000',
-        seekOffset: 8000,
-        timeoutSecs: 2,
-        actionHook: '/customHook'
-      }
-    ];
-
-    const waitHookVerbs = [];
-
-    const from = 'play_action_hook';
-    provisionCallHook(from, verbs)
-    provisionCustomHook(from, waitHookVerbs)
-
-    // 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');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});

test/say-tests.js

@@ -1,7 +1,6 @@
 const test = require('tape');
 const { sippUac } = require('./sipp')('test_fs');
 const clearModule = require('clear-module');
-const {provisionCallHook} = require('./utils')
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -21,21 +20,9 @@ test('\'say\' tests', async(t) => {
 
   try {
     await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'say',
-        text: 'hello'
-      }
-    ];
-
-    const from = 'say_test_success';
-    provisionCallHook(from, verbs)
-
-    // THEN
-    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
+    await sippUac('uac-say-account-creds-success.xml', '172.38.0.10');
     t.pass('say: succeeds when using using account credentials');
+  
     disconnect();
   } catch (err) {
     console.log(`error received: ${err}`);

test/scenarios/uac-expect-603.xml

@@ -7,7 +7,7 @@
 
       INVITE sip:16174000000@[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]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
       To: <sip:16174000000@[remote_ip]:[remote_port]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
@@ -41,7 +41,7 @@
 
       ACK sip:16174000000@[remote_ip]:[remote_port] SIP/2.0
       [last_Via]
-      From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      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
@@ -53,3 +53,4 @@
   </send>
 
 </scenario>
+

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>
-

test/scenarios/uac-gather-account-creds-success.xml

@@ -8,13 +8,13 @@
   <send retrans="500">
     <![CDATA[
 
-      INVITE sip:[to]@[remote_ip]:[remote_port] SIP/2.0
+      INVITE sip:16174000003@[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]>
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:16174000003@[remote_ip]:[remote_port]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
-      Contact: sip:[from]@[local_ip]:[local_port]
+      Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
       Subject: uac-gather-account-creds-success
@@ -53,13 +53,13 @@
   <send>
     <![CDATA[
 
-      ACK sip:[to]@[remote_ip]:[remote_port] SIP/2.0
+      ACK sip:16174000003@[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]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: 16174000003 <sip:16174000003@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:[from]@[local_ip]:[local_port]
+      Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-gather-account-creds-success
       Content-Length: 0

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>

test/scenarios/uac-invite-expect-480.xml

@@ -1,71 +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" 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="480" 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-say
-      Content-Length: 0
-
-    ]]>
-    </send>
-
-</scenario>
-

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>

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>

test/scenarios/uac-say-account-creds-success.xml

@@ -8,13 +8,13 @@
   <send retrans="500">
     <![CDATA[
 
-      INVITE sip:[to]@[remote_ip]:[remote_port] SIP/2.0
+      INVITE sip:16174000001@[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]>
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:16174000001@[remote_ip]:[remote_port]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
-      Contact: sip:[from]@[local_ip]:[local_port]
+      Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
       Subject: uac-say
@@ -53,13 +53,13 @@
   <send>
     <![CDATA[
 
-      ACK sip:[to]@[remote_ip]:[remote_port] SIP/2.0
+      ACK sip:16174000001@[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]
+      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: 16174000001 <sip:16174000001@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:[from]@[local_ip]:[local_port]
+      Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-say
       Content-Length: 0

test/scenarios/uac-send-info-during-dialog.xml

@@ -1,107 +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>
-
-  <recv request="INFO">
-  </recv>
-
-  <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>
-
-
-  <recv request="BYE">
-  </recv>
-
-  <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>
-
-</scenario>

test/scenarios/uac-success-send-bye.xml

@@ -1,92 +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" 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-say
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <pause milliseconds="3000"/>
-
-  <!-- The 'crlf' option inserts a blank line in the statistics report. -->
-  <send retrans="500">
-    <![CDATA[
-
-      BYE sip: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: 2 BYE
-      Max-Forwards: 70
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <recv response="200" crlf="true">
-  </recv>
-
-</scenario>
-

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>
-

test/scenarios/uas-timeout-cancel.xml

@@ -1,99 +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="UAS Timeout Receive Cancel">
-  <!-- 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" />
-      <ereg regexp=".*" search_in="hdr" header="CSeq:" check_it="false" assign_to="2"/>
-    </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>
-
-  <recv request="CANCEL" >
-  </recv>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 200 OK
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Subject:[$1]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-
-    ]]>
-  </send>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 487 Request Terminated
-      [last_Via:]
-      [last_From:]
-      [last_To:];tag=[pid]SIPpTag01[call_number]
-      [last_Call-ID:]
-      CSeq: [$2]
-      [last_Record-Route:]
-      Subject:[$1]
-      Contact: <sip:[local_ip]:[local_port];transport=[transport]>
-
-    ]]>
-  </send>
-
-  <recv request="ACK"
-        rtd="true"
-        crlf="true">
-  </recv>
-</scenario>
-