gather: restart if we get an empty transcript (looking at you, Azure)

Dockerfile

@@ -1,23 +1,10 @@
-FROM --platform=linux/amd64 node:18.6.0-alpine as base
-
-RUN apk --update --no-cache add --virtual .builds-deps build-base python3
-
+FROM node:17.7.1-slim
 WORKDIR /opt/app/
-
-FROM base as build
-
-COPY package.json package-lock.json ./
-
-RUN npm ci
-
-COPY . .
-
-FROM base
-
-COPY --from=build /opt/app /opt/app/
-
+COPY package.json ./
+RUN npm install
+RUN npm prune
+COPY . /opt/app
 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:
@@ -86,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

@@ -16,9 +16,11 @@ const api = require('@opentelemetry/api');
 srf.locals = {...srf.locals, otel: {tracer, api}};
 
 const PORT = process.env.HTTP_PORT || 3000;
-const opts = {level: process.env.JAMBONES_LOGLEVEL || 'info'};
-const pino = require('pino');
-const logger = pino(opts, pino.destination({sync: false}));
+const opts = {
+  timestamp: () => {return `, "time": "${new Date().toISOString()}"`;},
+  level: process.env.JAMBONES_LOGLEVEL || 'info'
+};
+const logger = require('pino')(opts);
 const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
 const installSrfLocals = require('./lib/utils/install-srf-locals');
 installSrfLocals(srf, logger);
@@ -26,7 +28,6 @@ installSrfLocals(srf, logger);
 const {
   initLocals,
   createRootSpan,
-  handleSipRec,
   getAccountDetails,
   normalizeNumbers,
   retrieveApplication,
@@ -45,7 +46,6 @@ Object.assign(app.locals, {
 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 });
@@ -68,17 +68,14 @@ 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();
 });
 

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

@@ -13,13 +13,12 @@ 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();
@@ -41,7 +40,7 @@ router.post('/', async(req, res) => {
       'X-Jambonz-Routing': target.type,
       'X-Jambonz-FS-UUID': srf.locals.fsUUID,
       'X-Call-Sid': callSid,
-      'X-Account-Sid': accountSid
+      'X-Account-Sid': req.body.account_sid
     };
 
     switch (target.type) {
@@ -50,7 +49,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,
@@ -77,13 +76,14 @@ router.post('/', async(req, res) => {
     if (target.type === 'phone' && target.trunk) {
       const {lookupCarrier} = dbUtils(this.logger, srf);
       const voip_carrier_sid = await lookupCarrier(req.body.account_sid, target.trunk);
-      logger.info(
+      this.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');
@@ -117,25 +117,15 @@ 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');
+    if ('WS' === app.call_hook?.method) {
       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;
-      }
+      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: () => {}};
+      if (app.call_status_hook) app.notifier = new HttpRequestor(logger, account.account_sid, app.call_status_hook,
+        account.webhook_secret);
+      else app.notifier = {request: () => {}};
     }
 
     /* now launch the outdial */
@@ -157,22 +147,10 @@ router.post('/', async(req, res) => {
             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 rootSpan = new RootSpan('rest-call', req);
           const callInfo = new CallInfo({
             direction: CallDirection.Outbound,
             req: inviteReq,
@@ -181,10 +159,10 @@ router.post('/', async(req, res) => {
             callSid,
             accountSid: req.body.account_sid,
             applicationSid: app.application_sid,
-            traceId: rootSpan.traceId
+            traceId: this.rootSpan.traceId
           });
           cs = new RestCallSession({
-            logger: sipLogger,
+            logger,
             application: app,
             srf,
             req: inviteReq,
@@ -196,10 +174,13 @@ router.post('/', async(req, res) => {
           });
           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;
@@ -240,7 +221,6 @@ router.post('/', async(req, res) => {
         else console.error(err);
       }
       ep.destroy();
-      setTimeout(restDial.kill.bind(restDial), 5000);
     }
   } catch (err) {
     sysError(logger, res, err);

lib/middleware.js

@@ -1,6 +1,5 @@
 const { v4: uuidv4 } = require('uuid');
-const {CallDirection, AllowedSipRecVerbs} = require('./utils/constants');
-const {parseSiprecPayload} = require('./utils/siprec-utils');
+const {CallDirection} = require('./utils/constants');
 const CallInfo = require('./session/call-info');
 const HttpRequestor = require('./utils/http-requestor');
 const WsRequestor = require('./utils/ws-requestor');
@@ -19,22 +18,16 @@ module.exports = function(srf, logger) {
     lookupAppByRealm,
     lookupAppByTeamsTenant
   }  = srf.locals.dbHelpers;
-  const {
-    writeAlerts,
-    AlertType
-  } = srf.locals;
   const {lookupAccountDetails} = dbUtils(logger, srf);
 
   function initLocals(req, res, next) {
-    const callId = req.get('Call-ID');
-    logger.info({callId}, '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, account_sid};
     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}`);
@@ -47,7 +40,7 @@ module.exports = function(srf, logger) {
   }
 
   function createRootSpan(req, res, next) {
-    const {callId, callSid, account_sid} = req.locals;
+    const {callSid, account_sid} = req.locals;
     const rootSpan = new RootSpan('incoming-call', req);
     const traceId = rootSpan.traceId;
 
@@ -55,7 +48,7 @@ module.exports = function(srf, logger) {
       ...req.locals,
       traceId,
       logger: logger.child({
-        callId,
+        callId: req.get('Call-ID'),
         callSid,
         accountSid: account_sid,
         callingNumber: req.callingNumber,
@@ -80,35 +73,6 @@ module.exports = function(srf, logger) {
     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
    */
@@ -137,10 +101,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
@@ -161,7 +122,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 logger = req.locals.logger;
+    const {accountInfo, account_sid, rootSpan} = req.locals;
     const {span} = rootSpan.startChildSpan('lookupApplication');
     try {
       let app;
@@ -263,30 +225,17 @@ module.exports = function(srf, logger) {
    */
   async function invokeWebCallback(req, res, next) {
     const logger = req.locals.logger;
-    const {rootSpan, siprec, application:app} = req.locals;
+    const {rootSpan, application:app} = req.locals;
     let span;
     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 */
       const params = Object.assign(['POST', 'WS'].includes(app.call_hook.method) ? {sip: req.msg} : {},
-        req.locals.callInfo, {
-          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');
+        req.locals.callInfo);
       const obj = rootSpan.startChildSpan('performAppWebhook');
       span = obj.span;
       const b3 = rootSpan.getTracingPropagation();
@@ -299,28 +248,10 @@ module.exports = function(srf, logger) {
       });
       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();
@@ -330,7 +261,6 @@ module.exports = function(srf, logger) {
   return {
     initLocals,
     createRootSpan,
-    handleSipRec,
     getAccountDetails,
     normalizeNumbers,
     retrieveApplication,

lib/session/adulting-call-session.js

@@ -8,15 +8,14 @@ const CallSession = require('./call-session');
 
  */
 class AdultingCallSession extends CallSession {
-  constructor({logger, application, singleDialer, tasks, callInfo, accountInfo, rootSpan}) {
+  constructor({logger, application, singleDialer, tasks, callInfo, accountInfo}) {
     super({
       logger,
       application,
       srf: singleDialer.dlg.srf,
       tasks,
       callInfo,
-      accountInfo,
-      rootSpan
+      accountInfo
     });
     this.sd = singleDialer;
 

lib/session/call-session.js

@@ -1,14 +1,6 @@
 const Emitter = require('events');
 const fs = require('fs');
-const {
-  CallDirection,
-  TaskPreconditions,
-  CallStatus,
-  TaskName,
-  KillReason,
-  RecordState,
-  AllowedSipRecVerbs
-} = require('../utils/constants');
+const {CallDirection, TaskPreconditions, CallStatus, TaskName, KillReason} = require('../utils/constants');
 const moment = require('moment');
 const assert = require('assert');
 const sessionTracker = require('./session-tracker');
@@ -62,8 +54,6 @@ class CallSession extends Emitter {
 
     assert(rootSpan);
 
-    this._recordState = RecordState.RecordingOff;
-
     this.tmpFiles = new Set();
 
     if (!this.isSmsCallSession) {
@@ -73,10 +63,6 @@ class CallSession extends Emitter {
 
     if (!this.isConfirmCallSession && !this.isSmsCallSession && !this.isAdultingCallSession) {
       sessionTracker.add(this.callSid, this);
-
-      const {startAmd, stopAmd} = require('../utils/amd-utils')(logger);
-      this.startAmd = startAmd;
-      this.stopAmd = stopAmd;
     }
 
     this._pool = srf.locals.dbHelpers.pool;
@@ -99,10 +85,6 @@ class CallSession extends Emitter {
     return this.callInfo.direction;
   }
 
-  get applicationSid() {
-    return this.callInfo.applicationSid;
-  }
-
   /**
    * SIP call-id for the call
    */
@@ -229,13 +211,6 @@ class CallSession extends Emitter {
     return this.constructor.name === 'ConfirmCallSession';
   }
 
-  /**
-   * returns true if this session is a SipRecCallSession
-   */
-  get isSipRecCallSession() {
-    return this.constructor.name === 'SipRecCallSession';
-  }
-
   /**
    * returns true if this session is a SmsCallSession
    */
@@ -259,188 +234,15 @@ class CallSession extends Emitter {
     return this.rootSpan?.getTracingPropagation();
   }
 
-  get recordState() { return this._recordState; }
-
-  set globalSttHints({hints, hintsBoost}) {
-    this._globalSttHints = {hints, hintsBoost};
-  }
-
-  get hasGlobalSttHints() {
-    const {hints = []} = this._globalSttHints || {};
-    return hints.length > 0;
-  }
-
-  get globalSttHints() {
-    return this._globalSttHints;
-  }
-
-  set altLanguages(langs) {
-    this._globalAltLanguages = langs;
-  }
-
-  get hasAltLanguages() {
-    return Array.isArray(this._globalAltLanguages);
-  }
-
-  get altLanguages() {
-    return this._globalAltLanguages;
-  }
-
-  async notifyRecordOptions(opts) {
-    const {action} = opts;
-    this.logger.debug({opts}, 'CallSession:notifyRecordOptions');
-
-    /* if we have not answered yet, just save the details for later */
-    if (!this.dlg) {
-      if (action === 'startCallRecording') {
-        this.recordOptions = opts;
-        return true;
-      }
-      return false;
-    }
-
-    /* check validity of request */
-    if (action == 'startCallRecording' && this.recordState !== RecordState.RecordingOff) {
-      this.logger.info({recordState: this.recordState},
-        'CallSession:notifyRecordOptions: recording is already started, ignoring request');
-      return false;
-    }
-    if (action == 'stopCallRecording' && this.recordState === RecordState.RecordingOff) {
-      this.logger.info({recordState: this.recordState},
-        'CallSession:notifyRecordOptions: recording is already stopped, ignoring request');
-      return false;
-    }
-    if (action == 'pauseCallRecording' && this.recordState !== RecordState.RecordingOn) {
-      this.logger.info({recordState: this.recordState},
-        'CallSession:notifyRecordOptions: cannot pause recording, ignoring request ');
-      return false;
-    }
-    if (action == 'resumeCallRecording' && this.recordState !== RecordState.RecordingPaused) {
-      this.logger.info({recordState: this.recordState},
-        'CallSession:notifyRecordOptions: cannot resume recording, ignoring request ');
-      return false;
-    }
-
-    this.recordOptions = opts;
-
-    switch (action) {
-      case 'startCallRecording':
-        return await this.startRecording();
-      case 'stopCallRecording':
-        return await this.stopRecording();
-      case 'pauseCallRecording':
-        return await this.pauseRecording();
-      case 'resumeCallRecording':
-        return await this.resumeRecording();
-      default:
-        throw new Error(`invalid record action ${action}`);
-    }
-  }
-
-  async startRecording() {
-    const {recordingID, siprecServerURL} = this.recordOptions;
-    assert(this.dlg);
-    this.logger.debug(`CallSession:startRecording - sending to ${siprecServerURL}`);
-    try {
-      const res = await this.dlg.request({
-        method: 'INFO',
-        headers: {
-          'X-Reason': 'startCallRecording',
-          'X-Srs-Url': siprecServerURL,
-          'X-Srs-Recording-ID': recordingID,
-          'X-Call-Sid': this.callSid,
-          'X-Account-Sid': this.accountSid,
-          'X-Application-Sid': this.applicationSid,
-        }
-      });
-      if (res.status === 200) {
-        this._recordState = RecordState.RecordingOn;
-        return true;
-      }
-      this.logger.info(`CallSession:startRecording - ${res.status} failure sending to ${siprecServerURL}`);
-      return false;
-    } catch (err) {
-      this.logger.info({err}, `CallSession:startRecording - failure sending to ${siprecServerURL}`);
-      return false;
-    }
-  }
-
-  async stopRecording() {
-    assert(this.dlg);
-    this.logger.debug('CallSession:stopRecording');
-    try {
-      const res = await this.dlg.request({
-        method: 'INFO',
-        headers: {
-          'X-Reason': 'stopCallRecording',
-        }
-      });
-      if (res.status === 200) {
-        this._recordState = RecordState.RecordingOff;
-        return true;
-      }
-      this.logger.info(`CallSession:stopRecording - ${res.status} failure`);
-      return false;
-    } catch (err) {
-      this.logger.info({err}, 'CallSession:startRecording - failure sending');
-      return false;
-    }
-  }
-
-  async pauseRecording() {
-    assert(this.dlg);
-    this.logger.debug('CallSession:pauseRecording');
-    try {
-      const res = await this.dlg.request({
-        method: 'INFO',
-        headers: {
-          'X-Reason': 'pauseCallRecording',
-        }
-      });
-      if (res.status === 200) {
-        this._recordState = RecordState.RecordingPaused;
-        return true;
-      }
-      this.logger.info(`CallSession:pauseRecording - ${res.status} failure`);
-      return false;
-    } catch (err) {
-      this.logger.info({err}, 'CallSession:pauseRecording - failure sending');
-      return false;
-    }
-  }
-
-  async resumeRecording() {
-    assert(this.dlg);
-    this.logger.debug('CallSession:resumeRecording');
-    try {
-      const res = await this.dlg.request({
-        method: 'INFO',
-        headers: {
-          'X-Reason': 'resumeCallRecording',
-        }
-      });
-      if (res.status === 200) {
-        this._recordState = RecordState.RecordingOn;
-        return true;
-      }
-      this.logger.info(`CallSession:resumeRecording - ${res.status} failure`);
-      return false;
-    } catch (err) {
-      this.logger.info({err}, 'CallSession:resumeRecording - failure sending');
-      return false;
-    }
-  }
-
   async enableBotMode(gather, autoEnable) {
     try {
       const t = normalizeJambones(this.logger, [gather]);
       this.backgroundGatherTask = makeTask(this.logger, t[0]);
-      this._bargeInEnabled = true;
       this.backgroundGatherTask
-        .once('dtmf', this._clearTasks.bind(this))
-        .once('vad', this._clearTasks.bind(this))
-        .once('transcription', this._clearTasks.bind(this))
-        .once('timeout', this._clearTasks.bind(this));
+        .on('dtmf', this._clearTasks.bind(this))
+        .on('vad', this._clearTasks.bind(this))
+        .on('transcription', this._clearTasks.bind(this))
+        .on('timeout', this._clearTasks.bind(this));
       this.logger.info({gather}, 'CallSession:enableBotMode - starting background gather');
       const resources = await this._evaluatePreconditions(this.backgroundGatherTask);
       const {span, ctx} = this.rootSpan.startChildSpan(`background-gather:${this.backgroundGatherTask.summary}`);
@@ -452,7 +254,7 @@ class CallSession extends Emitter {
           this.backgroundGatherTask && this.backgroundGatherTask.removeAllListeners();
           this.backgroundGatherTask && this.backgroundGatherTask.span.end();
           this.backgroundGatherTask = null;
-          if (autoEnable && !this.callGone && !this._stopping && this._bargeInEnabled) {
+          if (autoEnable && !this.callGone) {
             this.logger.info('CallSession:enableBotMode: restarting background gather');
             setImmediate(() => this.enableBotMode(gather, true));
           }
@@ -469,11 +271,10 @@ class CallSession extends Emitter {
     }
   }
   disableBotMode() {
-    this._bargeInEnabled = false;
     if (this.backgroundGatherTask) {
       try {
         this.backgroundGatherTask.removeAllListeners();
-        this.backgroundGatherTask.kill().catch((err) => {});
+        this.backgroundGatherTask.kill();
       } catch (err) {}
       this.backgroundGatherTask = null;
     }
@@ -530,7 +331,7 @@ class CallSession extends Emitter {
             speech_credential_sid: credential.speech_credential_sid,
             accessKeyId: credential.access_key_id,
             secretAccessKey: credential.secret_access_key,
-            region: credential.aws_region || process.env.AWS_REGION
+            region: process.env.AWS_REGION || credential.aws_region
           };
         }
         else if ('microsoft' === vendor) {
@@ -621,8 +422,6 @@ class CallSession extends Emitter {
 
     // all done - cleanup
     this.logger.info('CallSession:exec all tasks complete');
-    this._stopping = true;
-    this.disableBotMode();
     this._onTasksDone();
     this._clearResources();
 
@@ -923,9 +722,6 @@ class CallSession extends Emitter {
       const res = await this._lccSipRequest(opts, callSid);
       return {status: res.status, reason: res.reason};
     }
-    else if (opts.record) {
-      await this.notifyRecordOptions(opts.record);
-    }
 
     // whisper may be the only thing we are asked to do, or it may that
     // we are doing a whisper after having muted, paused reccording etc..
@@ -943,20 +739,6 @@ class CallSession extends Emitter {
       this.logger.debug('CallSession:replaceApplication - ignoring because call is gone');
       return;
     }
-
-    if (this.isSipRecCallSession) {
-      const pruned = tasks.filter((t) => AllowedSipRecVerbs.includes(t.name));
-      if (0 === pruned.length) {
-        this.logger.info({tasks},
-          'CallSession:replaceApplication - only config, transcribe and/or listen allowed on an incoming siprec call');
-        return;
-      }
-      if (pruned.length < tasks.length) {
-        this.logger.info(
-          'CallSession:replaceApplication - removing verbs that are not allowed for incoming siprec call');
-        tasks = pruned;
-      }
-    }
     this.tasks = tasks;
     this.taskIdx = 0;
     this.stackIdx++;
@@ -979,49 +761,6 @@ class CallSession extends Emitter {
     this.taskIdx = 0;
   }
 
-  /**
-   * Append tasks to the current execution stack UNLESS there is a gather in the stack.
-   * in that case, insert the tasks before the gather AND if the tasks include
-   * a gather then delete/remove the gather from the existing stack
-   * @param {*} t array of tasks
-   */
-  _injectTasks(newTasks) {
-    const gatherPos = this.tasks.map((t) => t.name).indexOf(TaskName.Gather);
-    const currentlyExecutingGather = this.currentTask?.name === TaskName.Gather;
-
-    this.logger.debug({
-      currentTaskList: listTaskNames(this.tasks),
-      newContent: listTaskNames(newTasks),
-      currentlyExecutingGather,
-      gatherPos
-    }, 'CallSession:_injectTasks - starting');
-
-    const killGather = () => {
-      this.logger.debug('CallSession:_injectTasks - killing current gather because we have new content');
-      this.currentTask.kill(this);
-    };
-
-    if (-1 === gatherPos) {
-      /* no gather in the stack  simply append tasks */
-      this.tasks.push(...newTasks);
-      this.logger.debug({
-        updatedTaskList: listTaskNames(this.tasks)
-      }, 'CallSession:_injectTasks - completed (simple append)');
-
-      /* we do need to kill the current gather if we are executing one */
-      if (currentlyExecutingGather) killGather();
-      return;
-    }
-
-    if (currentlyExecutingGather) killGather();
-    const newTasksHasGather = newTasks.find((t) => t.name === TaskName.Gather);
-    this.tasks.splice(gatherPos, newTasksHasGather ? 1 : 0, ...newTasks);
-
-    this.logger.debug({
-      updatedTaskList: listTaskNames(this.tasks)
-    }, 'CallSession:_injectTasks - completed');
-  }
-
   _onCommand({msgid, command, call_sid, queueCommand, data}) {
     this.logger.info({msgid, command, queueCommand}, 'CallSession:_onCommand - received command');
     const resolution = {reason: 'received command', queue: queueCommand, command};
@@ -1034,15 +773,10 @@ class CallSession extends Emitter {
             this.logger.info({tasks: listTaskNames(t)}, 'CallSession:_onCommand new task list');
             this.replaceApplication(t);
           }
-          else if (process.env.JAMBONES_INJECT_CONTENT) {
-            this.logger.debug({tasks: listTaskNames(t)}, 'CallSession:_onCommand - queueing tasks (injecting content)');
-            this._injectTasks(t);
-            this.logger.info({tasks: listTaskNames(this.tasks)}, 'CallSession:_onCommand - updated task list');
-          }
           else {
-            this.logger.debug({tasks: listTaskNames(t)}, 'CallSession:_onCommand - queueing tasks');
+            this.logger.info({tasks: listTaskNames(t)}, 'CallSession:_onCommand - queueing tasks');
             this.tasks.push(...t);
-            this.logger.info({tasks: listTaskNames(this.tasks)}, 'CallSession:_onCommand - updated task list');
+            this.logger.debug({tasks: listTaskNames(this.tasks)}, 'CallSession:_onCommand - updated task list');
           }
           resolution.command = listTaskNames(t);
         }
@@ -1124,23 +858,15 @@ class CallSession extends Emitter {
    * @param {Task} task - task to be executed
    */
   async _evalEndpointPrecondition(task) {
+    this.logger.debug('CallSession:_evalEndpointPrecondition');
     if (this.callGone) new Error(`${BADPRECONDITIONS}: call gone`);
 
     if (this.ep) {
-      const resources = {ep: this.ep};
-      if (task.earlyMedia === true || this.dlg) {
-        return {
-          ...resources,
-          ...(this.isSipRecCallSession && {ep2: this.ep2})
-        };
-      }
+      if (task.earlyMedia === true || this.dlg) return this.ep;
 
       // we are going from an early media connection to answer
       await this.propagateAnswer();
-      return {
-        ...resources,
-        ...(this.isSipRecCallSession && {ep2: this.ep2})
-      };
+      return this.ep;
     }
 
     // need to allocate an endpoint
@@ -1163,7 +889,7 @@ class CallSession extends Emitter {
       if (this.direction === CallDirection.Inbound) {
         if (task.earlyMedia && !this.req.finalResponseSent) {
           this.res.send(183, {body: ep.local.sdp});
-          return {ep};
+          return ep;
         }
         this.logger.debug('propogating answer');
         await this.propagateAnswer();
@@ -1172,7 +898,7 @@ class CallSession extends Emitter {
         // outbound call TODO
       }
 
-      return {ep};
+      return ep;
     } catch (err) {
       if (err === CALLER_CANCELLED_ERR_MSG) {
         this.logger.error(err, 'caller canceled quickly before we could respond, ending call');
@@ -1197,7 +923,7 @@ class CallSession extends Emitter {
   _evalStableCallPrecondition(task) {
     if (this.callGone) throw new Error(`${BADPRECONDITIONS}: call gone`);
     if (!this.dlg) throw new Error(`${BADPRECONDITIONS}: call was not answered`);
-    return {dlg: this.dlg};
+    return this.dlg;
   }
 
   /**
@@ -1236,7 +962,7 @@ class CallSession extends Emitter {
    * Hang up the call and free the media endpoint
    */
   _clearResources() {
-    for (const resource of [this.dlg, this.ep, this.ep2]) {
+    for (const resource of [this.dlg, this.ep]) {
       if (resource && resource.connected) resource.destroy();
     }
     this.dlg = null;
@@ -1300,9 +1026,6 @@ class CallSession extends Emitter {
       this.dlg.callSid = this.callSid;
       this.emit('callStatusChange', {sipStatus: 200, sipReason: 'OK', callStatus: CallStatus.InProgress});
 
-      if (this.recordOptions && this.recordState === RecordState.RecordingOff) {
-        this.startRecording();
-      }
       this.dlg.on('modify', this._onReinvite.bind(this));
       this.dlg.on('refer', this._onRefer.bind(this));
 
@@ -1485,7 +1208,7 @@ class CallSession extends Emitter {
         this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
         this.logger.debug('CallSession: call terminated by jambones');
         this.rootSpan.setAttributes({'call.termination': 'hangup by jambonz'});
-        origDestroy().catch((err) => this.logger.info({err}, 'CallSession - error destroying dialog'));
+        origDestroy();
         if (this.wakeupResolver) {
           this.wakeupResolver({reason: 'session ended'});
           this.wakeupResolver = null;

lib/session/siprec-call-session.js

@@ -1,58 +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
-        },
-        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

@@ -72,7 +72,7 @@ class Conference extends Task {
   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;
@@ -453,7 +453,7 @@ class Conference extends Task {
         this._playSession = null;
         break;
       }
-    } while (!this.killed && this.conf_hold_status === 'hold');
+    } while (!this.killed && this.conf_hold_status !== 'hold');
   }
 
   /**
@@ -541,9 +541,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,
@@ -554,8 +551,7 @@ class Conference extends Task {
         accountInfo: cs.accountInfo,
         memberId: this.memberId,
         confName: this.confName,
-        tasks,
-        rootSpan: cs.rootSpan
+        tasks
       });
       await this._playSession.exec();
       this._playSession = null;

lib/tasks/config.js

@@ -4,19 +4,19 @@ const {TaskName, TaskPreconditions} = require('../utils/constants');
 class TaskConfig extends Task {
   constructor(logger, opts) {
     super(logger, opts);
+    this.preconditions = TaskPreconditions.Endpoint;
+
     [
       'synthesizer',
       'recognizer',
-      'bargeIn',
-      'record'
+      'bargeIn'
     ].forEach((k) => this[k] = this.data[k] || {});
 
-    if (this.bargeIn.enable) {
+    if (this.hasBargeIn && this.bargeIn.enable === true) {
       this.gatherOpts = {
         verb: 'gather',
         timeout: 0,
-        bargein: true,
-        input: ['speech']
+        bargein: true
       };
       [
         'finishOnKey', 'input', 'numDigits', 'minDigits', 'maxDigits',
@@ -24,11 +24,9 @@ class TaskConfig extends Task {
       ].forEach((k) => {
         if (this.bargeIn[k]) this.gatherOpts[k] = this.bargeIn[k];
       });
+      if (this.bargeIn.sticky) this.autoEnable = true;
     }
-    if (this.bargeIn.sticky) this.autoEnable = true;
-    this.preconditions = (this.bargeIn.enable || this.record?.action) ?
-      TaskPreconditions.Endpoint :
-      TaskPreconditions.None;
+    this.preconditions = this.hasBargeIn ? TaskPreconditions.Endpoint : TaskPreconditions.None;
   }
 
   get name() { return TaskName.Config; }
@@ -37,9 +35,11 @@ class TaskConfig extends Task {
 
   get hasRecognizer() { return Object.keys(this.recognizer).length; }
 
+  get hasBargeIn() { return Object.keys(this.bargeIn).length; }
+
   get summary() {
     const phrase = [];
-    if (this.bargeIn.enable) phrase.push('enable barge-in');
+    if (this.hasBargeIn) phrase.push('enable barge-in');
     if (this.hasSynthesizer) {
       const {vendor:v, language:l, voice} = this.synthesizer;
       const s = `{${v},${l},${voice}}`;
@@ -50,19 +50,12 @@ class TaskConfig extends Task {
       const s = `{${v},${l}}`;
       phrase.push(`set recognizer${s}`);
     }
-    if (this.data.amd) phrase.push('enable amd');
     return  `${this.name}{${phrase.join(',')}`;
   }
 
   async exec(cs) {
     await super.exec(cs);
 
-    if (this.data.amd) {
-      this.startAmd = cs.startAmd;
-      this.stopAmd = cs.stopAmd;
-      this.on('amd', this._onAmdEvent.bind(this, cs));
-    }
-
     if (this.hasSynthesizer) {
       cs.speechSynthesisVendor = this.synthesizer.vendor !== 'default'
         ? this.synthesizer.vendor
@@ -82,61 +75,24 @@ class TaskConfig extends Task {
       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;
-      }
-      this.logger.info({
-        recognizer: this.recognizer,
-        isContinuousAsr: cs.isContinuousAsr
-      }, 'Config: updated recognizer');
+      this.gatherOpts.recognizer = this.recognizer;
+      this.logger.info({recognizer: this.recognizer}, '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');
+    if (this.hasBargeIn) {
+      if (this.gatherOpts) {
+        this.logger.debug({opts: this.gatherOpts}, 'Config: enabling bargeIn');
         cs.enableBotMode(this.gatherOpts, this.autoEnable);
       }
-      else if (this.bargeIn.enable === false) {
-        this.logger.info('Config: disabling bargeIn');
+      else {
+        this.logger.debug('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');
-      }
-    }
   }
 
   async kill(cs) {
     super.kill(cs);
   }
-
-  _onAmdEvent(cs, evt) {
-    this.logger.info({evt}, 'Config:_onAmdEvent');
-    const {actionHook} = this.data.amd;
-    this.performHook(cs, actionHook, evt);
-  }
 }
 
 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

@@ -134,10 +134,7 @@ class TaskDial extends Task {
   get name() { return TaskName.Dial; }
 
   get canReleaseMedia() {
-    return !process.env.ANCHOR_MEDIA_ALWAYS &&
-      !this.listenTask &&
-      !this.transcribeTask &&
-      !this.startAmd;
+    return !process.env.ANCHOR_MEDIA_ALWAYS && !this.listenTask && !this.transcribeTask;
   }
 
   get summary() {
@@ -161,11 +158,6 @@ class TaskDial extends Task {
   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);
       }
@@ -189,11 +181,6 @@ 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'));
@@ -216,14 +203,8 @@ class TaskDial extends Task {
       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);
     this.notifyTaskDone();
   }
 
@@ -245,10 +226,10 @@ class TaskDial extends Task {
       this.logger.debug('Dial:whisper executing tasks');
       while (tasks.length && !cs.callGone) {
         const task = tasks.shift();
-        const {span, ctx} = this.startChildSpan(`whisper:${task.summary}`);
+        const {span, ctx} = this.startChildSpan(`whisper:${this.sayTask.summary}`);
         task.span = span;
         task.ctx = ctx;
-        await task.exec(cs, callSid === this.callSid ? {ep: this.ep} : {ep: this.epOther});
+        await task.exec(cs, callSid === this.callSid ? this.ep : this.epOther);
         span.end();
       }
       this.logger.debug('Dial:whisper tasks complete');
@@ -370,14 +351,15 @@ class TaskDial extends Task {
       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)
+      requestor.request('verb:hook', this.dtmfHook, {dtmf: match, ...callInfo.toJSON(), httpHeaders})
         .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}`;
@@ -422,18 +404,13 @@ class TaskDial extends Task {
       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.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;
@@ -589,7 +566,6 @@ class TaskDial extends Task {
    * - 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
    */
@@ -630,18 +606,11 @@ class TaskDial extends Task {
     if (this.parentDtmfCollector) this._installDtmfDetection(cs, cs.dlg);
     if (this.childDtmfCollector) this._installDtmfDetection(cs, this.dlg);
 
-    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep2: this.epOther, ep:this.ep});
-    if (this.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 (this.transcribeTask) this.transcribeTask.exec(cs, this.ep);
+    if (this.listenTask) this.listenTask.exec(cs, this.ep);
 
     /* 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.canReleaseMedia) this._releaseMedia(cs, sd);
   }
 
   _bridgeEarlyMedia(sd) {
@@ -685,12 +654,6 @@ class TaskDial extends Task {
     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);
-  }
 }
 
 module.exports = TaskDial;

lib/tasks/dialogflow/index.js

@@ -64,7 +64,7 @@ class Dialogflow extends Task {
 
   get name() { return TaskName.Dialogflow; }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
 
     try {
@@ -295,9 +295,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 +405,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

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

@@ -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}`;
@@ -349,8 +349,7 @@ class TaskEnqueue extends Task {
         ep: cs.ep,
         callInfo: cs.callInfo,
         accountInfo: cs.accountInfo,
-        tasks: tasksToRun,
-        rootSpan: cs.rootSpan
+        tasks: tasksToRun
       });
       await this._playSession.exec();
       this._playSession = null;

lib/tasks/gather.js

@@ -11,19 +11,6 @@ const makeTask = require('./make_task');
 const assert = require('assert');
 //const GATHER_STABILITY_THRESHOLD =  Number(process.env.JAMBONZ_GATHER_STABILITY_THRESHOLD || 0.7);
 
-const compileTranscripts = (logger, evt, arr) => {
-  //logger.debug({arr, evt}, 'compile transcripts');
-  if (!Array.isArray(arr) || arr.length === 0) return;
-  let t = '';
-  for (const a of arr) {
-    //logger.debug(`adding ${a.alternatives[0].transcript}`);
-    t += ` ${a.alternatives[0].transcript}`;
-  }
-  t += ` ${evt.alternatives[0].transcript}`;
-  evt.alternatives[0].transcript = t.trim();
-  //logger.debug(`compiled transcript: ${evt.alternatives[0].transcript}`);
-};
-
 class TaskGather extends Task {
   constructor(logger, opts, parentTask) {
     super(logger, opts);
@@ -36,11 +23,11 @@ class TaskGather extends Task {
     ].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;
+    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.interim = this.partialResultHook || this.bargein;
     this.listenDuringPrompt = this.data.listenDuringPrompt === false ? false : true;
     this.minBargeinWordCount = this.data.minBargeinWordCount || 0;
     if (this.data.recognizer) {
@@ -49,23 +36,8 @@ class TaskGather extends Task {
       this.language = recognizer.language;
       this.hints = recognizer.hints || [];
       this.hintsBoost = recognizer.hintsBoost;
-      this.profanityFilter = recognizer.profanityFilter;
-      this.punctuation = !!recognizer.punctuation;
-      this.enhancedModel = !!recognizer.enhancedModel;
-      this.model = recognizer.model || 'command_and_search';
-      this.words = !!recognizer.words;
-      this.singleUtterance = recognizer.singleUtterance || true;
-      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 || [];
-
-      /* 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;
+      this.punctuation = !!recognizer.punctuation;
 
       /* vad: if provided, we dont connect to recognizer until voice activity is detected */
       const {enable, voiceMs = 0, mode = -1} = recognizer.vad || {};
@@ -83,10 +55,6 @@ class TaskGather extends Task {
       this.initialSpeechTimeoutMs = recognizer.initialSpeechTimeoutMs || 0;
       this.azureServiceEndpoint = recognizer.azureServiceEndpoint;
     }
-    else {
-      this.hints = [];
-      this.altLanguages = [];
-    }
 
     this.digitBuffer = '';
     this._earlyMedia = this.data.earlyMedia === true;
@@ -99,9 +67,6 @@ class TaskGather extends Task {
     }
     if (!this.sayTask && !this.playTask) this.listenDuringPrompt = false;
 
-    /* buffer speech for continuous asr */
-    this._bufferedTranscripts = [];
-
     this.parentTask = parentTask;
   }
 
@@ -129,32 +94,11 @@ class TaskGather extends Task {
     return s;
   }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     this.logger.debug('Gather:exec');
     await super.exec(cs);
     const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
 
-    if (cs.hasGlobalSttHints) {
-      const {hints, hintsBoost} = cs.globalSttHints;
-      this.hints = this.hints.concat(hints);
-      if (!this.hintsBoost && hintsBoost) this.hintsBoost = hintsBoost;
-      this.logger.debug({hints: this.hints, hintsBoost: this.hintsBoost},
-        'Gather:exec - applying global sttHints');
-    }
-    if (cs.hasAltLanguages) {
-      this.altLanguages = this.altLanguages.concat(cs.altLanguages);
-      this.logger.debug({altLanguages: this.altLanguages},
-        'Gather:exec - applying altLanguages');
-    }
-    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');
-    }
     this.ep = ep;
     if ('default' === this.vendor || !this.vendor) this.vendor = cs.speechRecognizerVendor;
     if ('default' === this.language || !this.language) this.language = cs.speechRecognizerLanguage;
@@ -173,7 +117,6 @@ class TaskGather extends Task {
 
     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(() => {
@@ -189,7 +132,7 @@ class TaskGather extends Task {
         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');
@@ -201,7 +144,7 @@ class TaskGather extends Task {
         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');
@@ -218,7 +161,7 @@ class TaskGather extends Task {
           .catch(() => {/*already logged error */});
       }
 
-      if (this.input.includes('digits') || this.dtmfBargein || this.asrDtmfTerminationDigit) {
+      if (this.input.includes('digits') || this.dtmfBargein) {
         ep.on('dtmf', this._onDtmf.bind(this, cs, ep));
       }
 
@@ -256,15 +199,12 @@ class TaskGather extends Task {
     this.logger.debug(evt, 'TaskGather:_onDtmf');
     clearTimeout(this.interDigitTimer);
     let resolved = false;
-    if (this.dtmfBargein) {
-      this._killAudio(cs);
-      this.emit('dtmf', evt);
-    }
+    if (this.dtmfBargein) this._killAudio(cs);
     if (evt.dtmf === this.finishOnKey && this.input.includes('digits')) {
       resolved = true;
       this._resolve('dtmf-terminator-key');
     }
-    else if (this.input.includes('digits')) {
+    else {
       this.digitBuffer += evt.dtmf;
       const len = this.digitBuffer.length;
       if (len === this.numDigits || len === this.maxDigits) {
@@ -272,13 +212,6 @@ class TaskGather extends Task {
         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;
@@ -298,44 +231,30 @@ class TaskGather extends Task {
     }
 
     if ('google' === this.vendor) {
-      this.bugname = 'google_trancribe';
       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'],
-        ['singleUtterance', 'GOOGLE_SPEECH_SINGLE_UTTERANCE'],
-        ['diarization', 'GOOGLE_SPEECH_PROFANITY_FILTER']
-      ].forEach((arr) => {
-        if (this[arr[0]]) opts[arr[1]] = true;
+      Object.assign(opts, {
+        GOOGLE_SPEECH_USE_ENHANCED: true,
+        GOOGLE_SPEECH_SINGLE_UTTERANCE: true,
+        GOOGLE_SPEECH_MODEL: 'command_and_search',
+        GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: this.punctuation
       });
-      if (this.hints.length > 0) {
-        opts.GOOGLE_SPEECH_HINTS = this.hints.join(',');
+      if (this.hints && this.hints.length > 1) {
+        opts.GOOGLE_SPEECH_HINTS = this.hints.map((h) => h.trim()).join(',');
         if (typeof this.hintsBoost === 'number') {
           opts.GOOGLE_SPEECH_HINTS_BOOST = this.hintsBoost;
         }
       }
-      if (this.altLanguages.length > 0) opts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = this.altLanguages.join(',');
-      else opts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = '';
-      if ('unspecified' !== this.interactionType) {
-        opts.GOOGLE_SPEECH_METADATA_INTERACTION_TYPE = this.interactionType;
+      if (this.altLanguages && this.altLanguages.length > 0) {
+        opts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = this.altLanguages.join(',');
       }
-      opts.GOOGLE_SPEECH_MODEL = this.model;
-      if (this.diarization && this.diarizationMinSpeakers > 0) {
-        opts.GOOGLE_SPEECH_SPEAKER_DIARIZATION_MIN_SPEAKER_COUNT = this.diarizationMinSpeakers;
+      if (this.profanityFilter === true) {
+        Object.assign(opts, {'GOOGLE_SPEECH_PROFANITY_FILTER': true});
       }
-      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;
       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));
     }
     else if (['aws', 'polly'].includes(this.vendor)) {
-      this.bugname = 'aws_trancribe';
       if (this.vocabularyName) opts.AWS_VOCABULARY_NAME = this.vocabularyName;
       if (this.vocabularyFilterName) {
         opts.AWS_VOCABULARY_NAME = this.vocabularyFilterName;
@@ -352,22 +271,15 @@ class TaskGather extends Task {
       ep.addCustomEventListener(AwsTranscriptionEvents.VadDetected, this._onVadDetected.bind(this, cs, ep));
     }
     else if ('microsoft' === this.vendor) {
-      this.bugname = 'azure_trancribe';
       if (this.sttCredentials) {
         Object.assign(opts, {
           'AZURE_SUBSCRIPTION_KEY': this.sttCredentials.api_key,
           'AZURE_REGION': this.sttCredentials.region
         });
       }
-      if (this.hints && this.hints.length > 0) {
+      if (this.hints && this.hints.length > 1) {
         opts.AZURE_SPEECH_HINTS = this.hints.map((h) => h.trim()).join(',');
       }
-      if (this.altLanguages && this.altLanguages.length > 0) {
-        opts.AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = this.altLanguages.join(',');
-      }
-      else {
-        opts.AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = '';
-      }
       if (this.requestSnr) opts.AZURE_REQUEST_SNR = 1;
       if (this.profanityOption && this.profanityOption !== 'raw') opts.AZURE_PROFANITY_OPTION = this.profanityOption;
       if (this.azureServiceEndpoint) opts.AZURE_SERVICE_ENDPOINT = this.azureServiceEndpoint;
@@ -387,14 +299,12 @@ class TaskGather extends Task {
     this.logger.debug({
       vendor: this.vendor,
       locale: this.language,
-      interim: this.interim,
-      bugname: this.bugname
+      interim: this.interim
     }, 'Gather:_startTranscribing');
     ep.startTranscription({
       vendor: this.vendor,
       locale: this.language,
       interim: this.interim,
-      bugname: this.bugname,
     }).catch((err) => {
       const {writeAlerts, AlertType} = this.cs.srf.locals;
       this.logger.error(err, 'TaskGather:_startTranscribing error');
@@ -409,11 +319,13 @@ 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);
+    if (this._timeoutTimer) {
+      clearTimeout(this._timeoutTimer);
+      this._timeoutTimer = null;
+    }
+    assert(!this._timeoutTimer);
+    this.logger.debug(`Gather:_startTimer: timeout ${this.timeout}`);
+    this._timeoutTimer = setTimeout(() => this._resolve('timeout'), this.timeout);
   }
 
   _clearTimer() {
@@ -423,35 +335,6 @@ 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) {
@@ -474,23 +357,14 @@ class TaskGather extends Task {
     }
   }
 
-  _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');
-    if (bugname && this.bugname !== bugname) return;
-
+  _onTranscription(cs, ep, evt) {
     if ('aws' === this.vendor && Array.isArray(evt) && evt.length > 0) evt = evt[0];
     if ('microsoft' === this.vendor) {
       const final = evt.RecognitionStatus === 'Success';
       if (final) {
-        // don't sort based on confidence: https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/1463
-        //const nbest = evt.NBest.sort((a, b) => b.Confidence - a.Confidence);
-        const nbest = evt.NBest;
-        const language_code = evt.PrimaryLanguage?.Language || this.language;
+        const nbest = evt.NBest.sort((a, b) => b.Confidence - a.Confidence);
         evt = {
           is_final: true,
-          language_code,
           alternatives: [
             {
               confidence: nbest[0].Confidence,
@@ -510,57 +384,12 @@ class TaskGather extends Task {
         };
       }
     }
-
-    /* count words for bargein feature */
-    const words = evt.alternatives[0].transcript.split(' ').length;
-    const bufferedWords = this._bufferedTranscripts.reduce((count, e) => {
-      return count + e.alternatives[0].transcript.split(' ').length;
-    }, 0);
-
     if (evt.is_final) {
-      if (evt.alternatives[0].transcript === '' && !this.callSession.callGone && !this.killed) {
-        if ('microsoft' === this.vendor && finished === 'true') {
-          this.logger.debug({evt}, 'TaskGather:_onTranscription - got empty transcript from old gather, disregarding');
-        }
-        else {
-          this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, listen again');
-          this._startTranscribing(ep);
-        }
-        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();
+      if (evt.alternatives[0].transcript === '') {
+        this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, listen again');
         return 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 {
-          this._resolve('speech', evt);
-        }
-      }
+      this._resolve('speech', evt);
     }
     else {
       /* google has a measure of stability:
@@ -568,17 +397,18 @@ class TaskGather extends Task {
         others do not.
       */
       //const isStableEnough = typeof evt.stability === 'undefined' || evt.stability > GATHER_STABILITY_THRESHOLD;
-      if (this.bargein && (words + bufferedWords) >= this.minBargeinWordCount) {
+
+      if (this.bargein && /* isStableEnough && */
+        evt.alternatives[0].transcript.split(' ').length >= 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.requestor.request(this.partialResultHook,  Object.assign({speech: evt},
           this.cs.callInfo, httpHeaders));
       }
     }
@@ -589,7 +419,7 @@ class TaskGather extends Task {
       this._killAudio(cs);
     }
 
-    if (!this.resolved && !this.killed && !this._bufferedTranscripts.length) {
+    if (!this.resolved && !this.killed) {
       this._startTranscribing(ep);
     }
   }
@@ -602,39 +432,17 @@ class TaskGather extends Task {
     }
   }
 
-  _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;
-    }
+  _onNoSpeechDetected(cs, ep) {
+    this._resolve('timeout');
   }
 
   async _resolve(reason, evt) {
-    this.logger.debug(`TaskGather:resolve with reason ${reason}`);
     if (this.resolved) return;
+    if (this.callSession && this.callSession.callGone) return;
 
     this.resolved = true;
+    this.logger.info(`TaskGather:resolve with reason ${reason}`);
     clearTimeout(this.interDigitTimer);
-    this._clearTimer();
-
-    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.ep && this.ep.connected) {
@@ -642,35 +450,28 @@ class TaskGather extends Task {
         .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')) {
+      if (this.parentTask) this.parentTask.emit('dtmf', evt);
+      else {
+        this.emit('dtmf', evt);
+        await this.performAction({digits: this.digitBuffer, reason: 'dtmfDetected'});
+      }
     }
-
-    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('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'});
       }
-      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,7 +14,7 @@ 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});

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

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

lib/tasks/listen.js

@@ -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);
@@ -40,7 +41,7 @@ class TaskListen extends Task {
         const {span, ctx} = this.startChildSpan(`nested:${this.transcribeTask.summary}`);
         this.transcribeTask.span = span;
         this.transcribeTask.ctx = ctx;
-        this.transcribeTask.exec(cs, {ep})
+        this.transcribeTask.exec(cs, ep)
           .then((result) => span.end())
           .catch((err) => span.end());
       }
@@ -60,21 +61,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;
-    }
+    if (this.transcribeTask) await this.transcribeTask.kill(cs);
     this.ep && this._removeListeners(this.ep);
     this.notifyTaskDone();
   }
@@ -154,13 +148,7 @@ class TaskListen extends Task {
 
   }
 
-  _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;
@@ -219,7 +207,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

@@ -17,9 +17,6 @@ function makeTask(logger, obj, parent) {
     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);

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

@@ -17,20 +17,14 @@ class TaskPlay extends Task {
     return `${this.name}:{url=${this.url}}`;
   }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
     this.ep = ep;
     try {
       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);
-          }
+          await this.playToConfMember(this.ep, memberId, confName, confUuid, this.url);
         }
         else await ep.play(this.url);
       }

lib/tasks/rasa.js

@@ -20,7 +20,7 @@ class Rasa extends Task {
     return this.reportedFinalAction || this.isReplacingApplication;
   }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
 
     this.ep = ep;
@@ -34,7 +34,7 @@ class Rasa extends Task {
       const {span, ctx} = this.startChildSpan(`nested:${this.gatherTask.summary}`);
       this.gatherTask.span = span;
       this.gatherTask.ctx = ctx;
-      this.gatherTask.exec(cs, {ep})
+      this.gatherTask.exec(cs, ep, this)
         .then(() => span.end())
         .catch((err) => {
           span.end();
@@ -128,7 +128,7 @@ class Rasa extends Task {
         const {span, ctx} = this.startChildSpan(`nested:${this.gatherTask.summary}`);
         this.gatherTask.span = span;
         this.gatherTask.ctx = ctx;
-        this.gatherTask.exec(cs, {ep})
+        this.gatherTask.exec(cs, ep, this)
           .then(() => span.end())
           .catch((err) => {
             span.end();

lib/tasks/rest_dial.js

@@ -50,21 +50,7 @@ class TaskRestDial extends Task {
     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('verb:hook', this.call_hook, cs.callInfo, httpHeaders);
       if (tasks && Array.isArray(tasks)) {
         this.logger.debug({tasks: tasks}, `TaskRestDial: replacing application with ${tasks.length} tasks`);
         cs.replaceApplication(normalizeJambones(this.logger, tasks).map((tdata) => makeTask(this.logger, tdata)));

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

@@ -22,7 +22,7 @@ class TaskSay extends Task {
     return `${this.name}{${this.text[0]}}`;
   }
 
-  async exec(cs, {ep}) {
+  async exec(cs, ep) {
     await super.exec(cs);
 
     const {srf} = cs;
@@ -51,64 +51,55 @@ 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(`No speech credentials have been provisioned for ${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) => {
+      /* otel: trace time for tts */
+      const {span} = this.startChildSpan('tts-generation', {
+        'tts.vendor': vendor,
+        'tts.language': language,
+        'tts.voice': voice
+      });
+      this.ttsSpan = span;
+
+      const filepath = (await Promise.all(this.text.map(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} = await synthAudio(stats, {
-            text,
-            vendor,
-            language,
-            voice,
-            engine,
-            salt,
-            credentials
-          });
-          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();
-          return filePath;
-        } catch (err) {
-          this.logger.info({err}, 'Error synthesizing tts');
-          span.end();
+        const {filePath, servedFromCache} = await synthAudio(stats, {
+          text,
+          vendor,
+          language,
+          voice,
+          engine,
+          salt,
+          credentials
+        }).catch((err) => {
+          this.logger.info(err, 'Error synthesizing tts');
           writeAlerts({
             account_sid: cs.accountSid,
             alert_type: AlertType.TTS_NOT_PROVISIONED,
             vendor,
             detail: err.message
-          }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
-          this.notifyError(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 */});
         }
-      };
-
-      const arr = this.text.map((t) => generateAudio(t));
-      const filepath = (await Promise.all(arr)).filter((fp) => fp && fp.length);
+        this.ttsSpan.setAttributes({'tts.cached': servedFromCache});
+        return filePath;
+      }))).filter((fp) => fp && fp.length);
+      this.ttsSpan?.end();
       this.logger.debug({filepath}, 'synthesized files for tts');
 
       while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep?.connected) {
         let segment = 0;
-        while (!this.killed && segment < filepath.length) {
+        do {
           if (cs.isInConference) {
             const {memberId, confName, confUuid} = cs;
             await this.playToConfMember(this.ep, memberId, confName, confUuid, filepath[segment]);
@@ -118,10 +109,10 @@ class TaskSay extends Task {
             await ep.play(filepath[segment]);
             this.logger.debug(`Say:exec completed play file ${filepath[segment]}`);
           }
-          segment++;
-        }
+        } while (!this.killed && ++segment < filepath.length);
       }
     } catch (err) {
+      this.ttsSpan?.end();
       this.logger.info(err, 'TaskSay:exec error');
     }
     this.emit('playDone');

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

@@ -9,17 +9,6 @@
       "status"
     ]
   },
-  "sip:request": {
-    "properties": {
-      "method": "string",
-      "body": "string",
-      "headers": "object",
-      "actionHook": "object|string"
-    },
-    "required": [
-      "method"
-    ]
-  },
   "sip:refer": {
     "properties": {
       "referTo": "string",
@@ -36,9 +25,7 @@
     "properties": {
       "synthesizer": "#synthesizer",
       "recognizer": "#recognizer",
-      "bargeIn": "#bargeIn",
-      "record": "#recordOptions",
-      "amd": "#amd"
+      "bargeIn": "#bargeIn"
     },
     "required": []
   },
@@ -84,7 +71,7 @@
   },
   "leave": {
     "properties": {
-
+      
     }
   },
   "hangup": {
@@ -96,7 +83,7 @@
   },
   "play": {
     "properties": {
-      "url": "string|array",
+      "url": "string",
       "loop": "number|string",
       "earlyMedia": "boolean"
     },
@@ -173,8 +160,7 @@
       "timeLimit": "number",
       "timeout": "number",
       "proxy": "string",
-      "transcribe": "#transcribe",
-      "amd": "#amd"
+      "transcribe": "#transcribe"
     },
     "required": [
       "target"
@@ -310,19 +296,6 @@
       "path"
     ]
   },
-  "recordOptions": {
-    "properties": {
-      "action": {
-        "type": "string",
-        "enum": ["startCallRecording", "stopCallRecording", "pauseCallRecording", "resumeCallRecording"]
-      },
-      "recordingID": "string",
-      "siprecServerURL": "string"
-    },
-    "required": [
-      "action"
-    ]
-  },
   "redirect": {
     "properties": {
       "actionHook": "object|string"
@@ -475,7 +448,6 @@
           "tag"
         ]
       },
-      "model": "string",
       "outputFormat": {
         "type": "string",
         "enum": [
@@ -493,9 +465,7 @@
       },
       "requestSnr": "boolean",
       "initialSpeechTimeoutMs": "number",
-      "azureServiceEndpoint": "string",
-      "asrDtmfTerminationDigit": "string",
-      "asrTimeout": "number"
+      "azureServiceEndpoint": "string"
     },
     "required": [
       "vendor"
@@ -514,29 +484,10 @@
     "properties": {
       "enable": "boolean",
       "voiceMs": "number",
-      "mode": "number"
+      "mode": "number"  
     },
     "required": [
       "enable"
     ]
-  },
-  "amd": {
-    "properties": {
-      "actionHook": "object|string",
-      "thresholdWordCount": "number",
-      "timers": "#amdTimers",
-      "recognizer": "#recognizer"
-    },
-    "required": [
-      "actionHook"
-    ]
-  },
-  "amdTimers": {
-    "properties": {
-      "noSpeechTimeoutMs": "number",
-      "decisionTimeoutMs": "number",
-      "toneTimeoutMs": "number",
-      "greetingCompletionTimeoutMs": "number"
-    }
   }
 }

lib/tasks/task.js

@@ -137,15 +137,9 @@ class Task extends Emitter {
     return this.callSession.normalizeUrl(url, method, auth);
   }
 
-  notifyError(errMsg) {
-    const params = {error: errMsg, verb: this.name};
-    this.cs.requestor.request('jambonz:error', '/error', params)
-      .catch((err) => this.logger.info({err}, 'Task:notifyError error sending error'));
-  }
-
   async performAction(results, expectResponse = true) {
     if (this.actionHook) {
-      const params = results ? Object.assign(this.cs.callInfo.toJSON(), results) : this.cs.callInfo.toJSON();
+      const params = results ? Object.assign(results, this.cs.callInfo.toJSON()) : this.cs.callInfo.toJSON();
       const span = this.startSpan('verb:hook', {'hook.url': this.actionHook});
       const b3 = this.getTracingPropagation('b3', span);
       const httpHeaders = b3 && {b3};
@@ -171,13 +165,12 @@ class Task extends Emitter {
   }
 
   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)});
+    span.setAttributes({'http.body': JSON.stringify(results)});
     try {
-      const json = await cs.requestor.request('verb:hook', hook, params, httpHeaders);
+      const json = await cs.requestor.request('verb:hook', hook, results, httpHeaders);
       span.setAttributes({'http.statusCode': 200});
       span.end();
       if (json && Array.isArray(json)) {

lib/tasks/transcribe.js

@@ -32,9 +32,7 @@ class TaskTranscribe extends Task {
     this.profanityFilter = recognizer.profanityFilter;
     this.punctuation = !!recognizer.punctuation;
     this.enhancedModel = !!recognizer.enhancedModel;
-    this.model = recognizer.model || 'phone_call';
     this.words = !!recognizer.words;
-    this.singleUtterance = recognizer.singleUtterance || false;
     this.diarization = !!recognizer.diarization;
     this.diarizationMinSpeakers = recognizer.diarizationMinSpeakers || 0;
     this.diarizationMaxSpeakers = recognizer.diarizationMaxSpeakers || 0;
@@ -58,25 +56,11 @@ class TaskTranscribe extends Task {
 
   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);
 
-    if (cs.hasGlobalSttHints) {
-      const {hints, hintsBoost} = cs.globalSttHints;
-      this.hints = this.hints.concat(hints);
-      if (!this.hintsBoost && hintsBoost) this.hintsBoost = hintsBoost;
-      this.logger.debug({hints: this.hints, hintsBoost: this.hintsBoost},
-        'Transcribe:exec - applying global `sttHints');
-    }
-    if (cs.hasAltLanguages) {
-      this.altLanguages = this.altLanguages.concat(cs.altLanguages);
-      this.logger.debug({altLanguages: this.altLanguages},
-        'Gather:exec - applying altLanguages');
-    }
-
     this.ep = ep;
-    this.ep2 = ep2;
     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');
@@ -92,11 +76,7 @@ class TaskTranscribe extends Task {
         }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
         throw new Error('no provisioned speech credentials for TTS');
       }
-      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 */});
 
@@ -117,25 +97,18 @@ class TaskTranscribe extends Task {
 
   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) {
+  async _startTranscribing(cs, ep) {
     const opts = {};
 
     if (this.vad.enable) {
@@ -144,45 +117,47 @@ class TaskTranscribe extends Task {
       if (this.vad.mode >= 0 && this.vad.mode <= 3) opts.RECOGNIZER_VAD_MODE = this.vad.mode;
     }
 
-    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.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, cs, ep, channel));
-    ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep, channel));
-    ep.addCustomEventListener(AwsTranscriptionEvents.NoAudioDetected, this._onNoAudio.bind(this, cs, ep, channel));
+      this._onMaxDurationExceeded.bind(this, cs, 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, channel));
-    ep.addCustomEventListener(AzureTranscriptionEvents.Transcription,
-      this._onTranscription.bind(this, cs, ep, channel));
-    ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, this._onNoAudio.bind(this, cs, ep, channel));
+      this._onMaxDurationExceeded.bind(this, cs, ep));
+    ep.addCustomEventListener(AzureTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+    ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, this._onNoAudio.bind(this, cs, ep));
 
     if (this.vendor === 'google') {
-      this.bugname = 'google_trancribe';
       if (this.sttCredentials) opts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(this.sttCredentials.credentials);
       [
         ['enhancedModel', 'GOOGLE_SPEECH_USE_ENHANCED'],
-        //['separateRecognitionPerChannel', 'GOOGLE_SPEECH_SEPARATE_RECOGNITION_PER_CHANNEL'],
+        ['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'],
-        ['singleUtterance', 'GOOGLE_SPEECH_SINGLE_UTTERANCE'],
         ['diarization', 'GOOGLE_SPEECH_PROFANITY_FILTER']
       ].forEach((arr) => {
         if (this[arr[0]]) opts[arr[1]] = true;
       });
-      if (this.hints.length > 0) {
+      if (this.hints.length > 1) {
         opts.GOOGLE_SPEECH_HINTS = this.hints.join(',');
         if (typeof this.hintsBoost === 'number') {
           opts.GOOGLE_SPEECH_HINTS_BOOST = this.hintsBoost;
         }
       }
-      if (this.altLanguages.length > 0) opts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = this.altLanguages.join(',');
-      else opts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = '';
+      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';
       }
-      opts.GOOGLE_SPEECH_MODEL = this.model;
+      else opts.GOOGLE_SPEECH_MODEL = 'phone_call';
       if (this.diarization && this.diarizationMinSpeakers > 0) {
         opts.GOOGLE_SPEECH_SPEAKER_DIARIZATION_MIN_SPEAKER_COUNT = this.diarizationMinSpeakers;
       }
@@ -195,7 +170,6 @@ class TaskTranscribe extends Task {
         .catch((err) => this.logger.info(err, 'TaskTranscribe:_startTranscribing with google'));
     }
     else if (this.vendor === 'aws') {
-      this.bugname = 'aws_trancribe';
       [
         ['diarization', 'AWS_SHOW_SPEAKER_LABEL'],
         ['identifyChannels', 'AWS_ENABLE_CHANNEL_IDENTIFICATION']
@@ -227,16 +201,13 @@ class TaskTranscribe extends Task {
         .catch((err) => this.logger.info(err, 'TaskTranscribe:_startTranscribing with aws'));
     }
     else if (this.vendor === 'microsoft') {
-      this.bugname = 'azure_trancribe';
       Object.assign(opts, {
         'AZURE_SUBSCRIPTION_KEY': this.sttCredentials.api_key,
         'AZURE_REGION': this.sttCredentials.region
       });
-      if (this.hints && this.hints.length > 0) {
+      if (this.hints && this.hints.length > 1) {
         opts.AZURE_SPEECH_HINTS = this.hints.map((h) => h.trim()).join(',');
       }
-      if (this.altLanguages.length > 0) opts.AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = this.altLanguages.join(',');
-      else opts.AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = '';
       if (this.requestSnr) opts.AZURE_REQUEST_SNR = 1;
       if (this.profanityOption !== 'raw') opts.AZURE_PROFANITY_OPTION = this.profanityOption;
       if (this.initialSpeechTimeoutMs > 0) opts.AZURE_INITIAL_SPEECH_TIMEOUT_MS = this.initialSpeechTimeoutMs;
@@ -254,21 +225,15 @@ 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
     });
   }
 
-  _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;
-
-    this.logger.debug({evt, channel}, 'TaskTranscribe:_onTranscription');
+  _onTranscription(cs, ep, evt) {
+    this.logger.debug(evt, 'TaskTranscribe:_onTranscription');
     if ('aws' === this.vendor && Array.isArray(evt) && evt.length > 0) evt = evt[0];
     if ('microsoft' === this.vendor) {
       const nbest = evt.NBest;
-      const language_code = evt.PrimaryLanguage?.Language || this.language;
       const alternatives = nbest ? nbest.map((n) => {
         return {
           confidence: n.Confidence,
@@ -277,26 +242,17 @@ class TaskTranscribe extends Task {
       }) :
         [
           {
-            transcript: evt.DisplayText || evt.Text
+            transcript: evt.DisplayText
           }
         ];
 
       const newEvent = {
         is_final: evt.RecognitionStatus === 'Success',
-        channel,
-        language_code,
         alternatives
       };
       evt = newEvent;
     }
 
-    if (evt.alternatives[0].transcript === '' && !cs.callGone && !this.killed) {
-      this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, listen again');
-      return this._transcribe(ep);
-    }
-
-    evt.channel_tag = channel;
-
     if (this.transcriptionHook) {
       const b3 = this.getTracingPropagation();
       const httpHeaders = b3 && {b3};
@@ -314,13 +270,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);
   }
 

lib/utils/amd-utils.js

@@ -1,324 +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));
-    }
-    logger.debug({sttOpts}, 'startAmd: setting channel vars');
-    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});
-        ep.stopTranscription({vendor, bugname});
-      })
-      .on(AmdEvents.HumanDetected, (evt) => {
-        task.emit('amd', {type: AmdEvents.HumanDetected, ...evt});
-        ep.stopTranscription({vendor, bugname});
-      })
-      .on(AmdEvents.MachineDetected, (evt) => {
-        task.emit('amd', {type: AmdEvents.MachineDetected, ...evt});
-      })
-      .on(AmdEvents.DecisionTimeout, (evt) => {
-        task.emit('amd', {type: AmdEvents.DecisionTimeout, ...evt});
-        ep.stopTranscription({vendor, bugname});
-      })
-      .on(AmdEvents.ToneTimeout, (evt) => {
-        //task.emit('amd', {type: AmdEvents.ToneTimeout, ...evt});
-        ep.execute('avmd_stop').catch((err) => logger.info(err, 'Error stopping avmd'));
-      })
-      .on(AmdEvents.MachineStoppedSpeaking, () => {
-        task.emit('amd', {type: AmdEvents.MachineStoppedSpeaking});
-        ep.stopTranscription({vendor, bugname});
-      });
-
-    /* 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/constants.json

@@ -20,7 +20,6 @@
     "Redirect": "redirect",
     "RestDial": "rest:dial",
     "SipDecline": "sip:decline",
-    "SipRequest": "sip:request",
     "SipRefer": "sip:refer",
     "SipNotify": "sip:notify",
     "SipRedirect": "sip:redirect",
@@ -29,7 +28,6 @@
     "Tag": "tag",
     "Transcribe": "transcribe"
   },
-  "AllowedSipRecVerbs": ["config", "gather", "transcribe", "listen"],
   "CallStatus": {
     "Trying": "trying",
     "Ringing": "ringing",
@@ -57,9 +55,6 @@
     "StableCall": "stable-call",
     "UnansweredCall": "unanswered-call"
   },
-  "AvmdEvents": {
-    "Beep": "avmd::beep"
-  },
   "GoogleTranscriptionEvents": {
     "Transcription": "google_transcribe::transcription",
     "EndOfUtterance": "google_transcribe::end_of_utterance",
@@ -120,26 +115,9 @@
     "session:redirect",
     "call:status",
     "queue:status",
-    "dial:confirm",
     "verb:hook",
     "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"

lib/utils/db-utils.js

@@ -30,7 +30,6 @@ const speechMapper = (cred) => {
     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));

lib/utils/http-requestor.js

@@ -1,11 +1,9 @@
-const {Client, Pool} = require('undici');
+const bent = require('bent');
 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');
 
@@ -24,42 +22,22 @@ class HttpRequestor extends BaseRequestor {
     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);
+
+
     assert(this._isAbsoluteUrl(this.url));
     assert(['GET', 'POST'].includes(this.method));
-
-    const u = this._parsedUrl = parseUrl(this.url);
-    this._baseUrl = `${u.protocol}://${u.resource}`;
-    this._resource = u.resource;
-    this._protocol = u.protocol;
-    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 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.
@@ -72,67 +50,25 @@ class HttpRequestor extends BaseRequestor {
    * @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 {url: urlInfo = hook, method: methodInfo = 'POST'} = hook;  // mask user/pass
+    this.logger.debug({url: urlInfo, method: methodInfo, payload}, `HttpRequestor:request ${method} ${url}`);
     const startAt = process.hrtime();
 
-    let newClient;
+    let buf;
     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.protocol === this._protocol) {
-          client = this.client;
-          path = u.pathname;
-          query = u.query;
-        }
-        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();
+      const headers = {...sigHeader, ...this.authHeader, ...httpHeaders};
+      this.logger.debug({url, headers}, 'send webhook');
+      buf = this._isRelativeUrl(url) ?
+        await this.post(url, payload, headers) :
+        await bent(method, 'buffer', 200, 201, 202)(url, payload, headers);
     } catch (err) {
       if (err.statusCode) {
         this.logger.info({baseUrl: this.baseUrl, url},
@@ -154,15 +90,20 @@ class HttpRequestor extends BaseRequestor {
       }
       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;
+    if (buf && buf.toString().length > 0) {
+      try {
+        const json = JSON.parse(buf.toString());
+        this.logger.info({response: json}, `HttpRequestor:request ${method} ${url} succeeded in ${rtt}ms`);
+        return json;
+      }
+      catch (err) {
+        //this.logger.debug({err, url, method}, `HttpRequestor:request returned non-JSON content: '${buf.toString()}'`);
+      }
     }
   }
 }

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');
 
@@ -166,13 +167,6 @@ 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,
@@ -207,6 +201,8 @@ function installSrfLocals(srf, logger) {
       getListPosition
     },
     parentLogger: logger,
+    ipv4: localIp,
+    serviceUrl: `http://${localIp}:${PORT}`,
     getSBC,
     getSmpp: () => {
       return process.env.SMPP_URL;
@@ -217,11 +213,6 @@ function installSrfLocals(srf, logger) {
     writeAlerts,
     AlertType
   };
-
-  if (localIp) {
-    srf.locals.ipv4 = localIp;
-    srf.locals.serviceUrl = `http://${localIp}:${PORT}`;
-  }
 }
 
 module.exports = installSrfLocals;

lib/utils/place-outdial.js

@@ -4,8 +4,6 @@ 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('../utils/normalize-jambones');
-const makeTask = require('../tasks/make_task');
 const ConfirmCallSession = require('../session/confirm-call-session');
 const AdultingCallSession = require('../session/adulting-call-session');
 const deepcopy = require('deepcopy');
@@ -311,8 +309,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.toJSON());
+
       // verify it contains only allowed verbs
       const allowedTasks = tasks.filter((task) => {
         return [
@@ -332,7 +330,6 @@ class SingleDialer extends Emitter {
         dlg: this.dlg,
         ep: this.ep,
         callInfo: this.callInfo,
-        accountInfo: this.accountInfo,
         tasks,
         rootSpan: this.rootSpan
       });
@@ -348,6 +345,7 @@ class SingleDialer extends Emitter {
   }
 
   async doAdulting({logger, tasks, application}) {
+    this.logger = logger;
     this.adulting = true;
     this.emit('adulting');
     if (this.ep) {
@@ -362,9 +360,8 @@ class SingleDialer extends Emitter {
     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});
     const cs = new AdultingCallSession({
-      logger: newLogger,
+      logger: this.logger,
       singleDialer: this,
       application,
       callInfo: this.callInfo,
@@ -372,7 +369,7 @@ class SingleDialer extends Emitter {
       tasks,
       rootSpan
     });
-    cs.exec().catch((err) => newLogger.error({err}, 'doAdulting: error executing session'));
+    cs.exec();
     return cs;
   }
 

lib/utils/sbc-pinger.js

@@ -104,14 +104,8 @@ module.exports = (logger) => {
       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}`));
+      addToSet(FS_UUID_SET_NAME, uuid)
+        .catch((err) => logger.info({err}, `Error adding ${uuid} to set ${FS_UUID_SET_NAME}`));
     });
   }
   else {

lib/utils/siprec-utils.js

@@ -1,248 +0,0 @@
-const xmlParser = require('xml2js').parseString;
-const { v4: uuidv4 } = require('uuid');
-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/transcription-utils.js

@@ -1,33 +0,0 @@
-module.exports = (logger) => {
-  const normalizeTranscription = (evt, vendor, channel) => {
-    if ('aws' === vendor && Array.isArray(evt) && evt.length > 0) evt = evt[0];
-    if ('microsoft' === vendor) {
-      const nbest = evt.NBest;
-      const language_code = evt.PrimaryLanguage?.Language || this.language;
-      const alternatives = nbest ? nbest.map((n) => {
-        return {
-          confidence: n.Confidence,
-          transcript: n.Display
-        };
-      }) :
-        [
-          {
-            transcript: evt.DisplayText || evt.Text
-          }
-        ];
-
-      const newEvent = {
-        is_final: evt.RecognitionStatus === 'Success',
-        channel,
-        language_code,
-        alternatives
-      };
-      evt = newEvent;
-    }
-    evt.channel_tag = channel;
-    //logger.debug({evt}, 'normalized transcription');
-    return evt;
-  };
-
-  return {normalizeTranscription};
-};

lib/utils/ws-requestor.js

@@ -14,11 +14,8 @@ class WsRequestor extends BaseRequestor {
     this.connections = 0;
     this.messagesInFlight = new Map();
     this.maliciousClient = false;
-    this.closedGracefully = false;
+    this.closedByUs = false;
     this.backoffMs = 500;
-    this.connectInProgress = false;
-    this.queuedMsg = [];
-    this.id = short.generate();
 
     assert(this._isAbsoluteUrl(this.url));
 
@@ -44,10 +41,6 @@ class WsRequestor extends BaseRequestor {
       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 we closed the socket`);
-      return;
-    }
 
     if (type === 'session:new') this.call_sid = params.callSid;
 
@@ -60,14 +53,6 @@ class WsRequestor extends BaseRequestor {
 
     /* 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) {
         throw new Error(`max attempts connecting to ${this.url}`);
       }
@@ -78,16 +63,13 @@ class WsRequestor extends BaseRequestor {
         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;
         throw 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;
+    const payload = params ? snakeCaseKeys(params, ['customerData', 'sip']) : null;
     assert.ok(url, 'WsRequestor:request url was not provided');
 
     const msgid = short.generate();
@@ -101,23 +83,12 @@ class WsRequestor extends BaseRequestor {
       ...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})`);
 
     /* simple notifications */
-    if (['call:status', 'jambonz:error', 'session:reconnect'].includes(type)) {
+    if (['call:status', 'jambonz:error'].includes(type)) {
       this.ws.send(JSON.stringify(obj), () => {
         this.logger.debug({obj}, `WsRequestor:request websocket: sent (${url})`);
-        sendQueuedMsgs();
       });
       return;
     }
@@ -134,7 +105,6 @@ class WsRequestor extends BaseRequestor {
       /* save the message info for reply */
       const startAt = process.hrtime();
       this.messagesInFlight.set(msgid, {
-        timer,
         success: (response) => {
           clearTimeout(timer);
           const rtt = this._roundTrip(startAt);
@@ -151,23 +121,20 @@ class WsRequestor extends BaseRequestor {
       /* 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');
+    this.closedByUs = true;
     try {
       if (this.ws) {
+        this.logger.info('WsRequestor:close closing socket');
         this.ws.close();
         this.ws.removeAllListeners();
       }
 
       for (const [msgid, obj] of this.messagesInFlight) {
-        const {timer} = obj;
-        clearTimeout(timer);
         obj.failure(`abandoning msgid ${msgid} since we have closed the socket`);
       }
       this.messagesInFlight.clear();
@@ -193,8 +160,9 @@ class WsRequestor extends BaseRequestor {
 
       this
         .once('ready', (ws) => {
+          this.ws = ws;
           this.removeAllListeners('not-ready');
-          if (this.connections > 1) this.request('session:reconnect', this.url);
+          if (this.connections > 0) this.request('session:reconnect', this.url);
           resolve();
         })
         .once('not-ready', (err) => {
@@ -207,7 +175,6 @@ class WsRequestor extends BaseRequestor {
   }
 
   _setHandlers(ws) {
-    this.logger.debug('WsRequestor:_setHandlers');
     ws
       .once('open', this._onOpen.bind(this, ws))
       .once('close', this._onClose.bind(this))
@@ -224,23 +191,18 @@ class WsRequestor extends BaseRequestor {
   }
 
   _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);
+    this.logger.info({url: this.url}, 'WsRequestor - successfully connected');
   }
 
-  _onClose(code) {
-    this.logger.info(`WsRequestor(${this.id}) - closed from far end ${code}`);
-    if (this.connections > 0 && code !== 1000) {
+  _onClose() {
+    if (this.connections > 0) {
       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 && this.ws.removeAllListeners();
     this.ws = null;
   }
 
@@ -258,17 +220,8 @@ class WsRequestor extends BaseRequestor {
   _onSocketClosed() {
     this.ws = null;
     this.emit('connection-dropped');
-    if (this.connections > 0 && this.connections < MAX_RECONNECTS && !this.closedGracefully) {
-      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);
+    if (this.connections++ > 0 && this.connections < MAX_RECONNECTS && !this.closedByUs) {
+      setTimeout(this._connect.bind(this), this.backoffMs);
       this.backoffMs = this.backoffMs < 2000 ? this.backoffMs * 2 : (this.backoffMs + 2000);
     }
   }
@@ -305,7 +258,7 @@ class WsRequestor extends BaseRequestor {
           assert.ok(false, `invalid type property: ${type}`);
       }
     } catch (err) {
-      this.logger.info({err, content}, 'WsRequestor:_onMessage - invalid incoming message');
+      this.logger.info({err}, 'WsRequestor:_onMessage - invalid incoming message');
     }
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-feature-server",
-  "version": "v0.7.6",
+  "version": "v0.7.4",
   "main": "app.js",
   "engines": {
     "node": ">= 10.16.0"
@@ -21,52 +21,57 @@
   },
   "scripts": {
     "start": "node app",
-    "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=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=error 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/ ",
+    "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=info 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.6.18",
+    "@cognigy/socket-client": "^4.5.5",
+    "@jambonz/db-helpers": "^0.6.16",
     "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.4.29",
+    "@jambonz/mw-registrar": "^0.2.1",
+    "@jambonz/realtimedb-helpers": "^0.4.26",
     "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.1.12",
+    "@jambonz/time-series": "^0.1.6",
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/exporter-jaeger": "^1.3.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.27.0",
-    "@opentelemetry/exporter-zipkin": "^1.3.1",
+    "@opentelemetry/exporter-collector": "^0.25.0",
+    "@opentelemetry/exporter-jaeger": "^1.1.0",
+    "@opentelemetry/exporter-zipkin": "^1.1.0",
     "@opentelemetry/instrumentation": "^0.27.0",
-    "@opentelemetry/resources": "^1.3.1",
-    "@opentelemetry/sdk-trace-base": "^1.3.1",
-    "@opentelemetry/sdk-trace-node": "^1.3.1",
-    "@opentelemetry/semantic-conventions": "^1.3.1",
-    "aws-sdk": "^2.1152.0",
+    "@opentelemetry/instrumentation-express": "^0.28.0",
+    "@opentelemetry/instrumentation-http": "^0.27.0",
+    "@opentelemetry/instrumentation-pino": "^0.28.1",
+    "@opentelemetry/resources": "^1.1.0",
+    "@opentelemetry/sdk-trace-base": "^1.1.0",
+    "@opentelemetry/sdk-trace-node": "^1.1.0",
+    "@opentelemetry/semantic-conventions": "^1.1.0",
+    "aws-sdk": "^2.1073.0",
     "bent": "^7.3.12",
-    "debug": "^4.3.4",
+    "cidr-matcher": "^2.1.1",
+    "debug": "^4.3.2",
     "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.2",
-    "drachtio-srf": "^4.5.1",
-    "express": "^4.18.1",
-    "helmet": "^5.1.0",
-    "ip": "^1.1.8",
-    "moment": "^2.29.3",
-    "parse-url": "^7.0.2",
-    "pino": "^6.14.0",
-    "sdp-transform": "^2.14.1",
+    "drachtio-fsmrf": "^2.0.13",
+    "drachtio-srf": "^4.4.61",
+    "express": "^4.17.1",
+    "helmet": "^5.0.2",
+    "ip": "^1.1.5",
+    "moment": "^2.29.1",
+    "parse-url": "^5.0.7",
+    "pino": "^6.13.4",
     "short-uuid": "^4.2.0",
     "to-snake-case": "^1.0.0",
-    "undici": "^5.8.2",
     "uuid": "^8.3.2",
-    "verify-aws-sns-signature": "^0.0.7",
-    "ws": "^8.8.0",
+    "verify-aws-sns-signature": "^0.0.6",
+    "ws": "^8.5.0",
     "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.5.3"
+    "tape": "^5.2.2"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.6",

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/db/create-and-populate-schema.sql

@@ -251,7 +251,6 @@ INSERT INTO `applications` VALUES ('24d0f6af-e976-44dd-a2e8-41c7b55abe33','say a
 INSERT INTO `applications` VALUES ('17461c69-56b5-4dab-ad83-1c43a0f93a3d','gather',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','10692465-a511-4277-9807-b7157e4f81e1','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
 INSERT INTO `applications` VALUES ('baf9213b-5556-4c20-870c-586392ed246f','transcribe',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','ecb67a8f-f7ce-4919-abf0-bbc69c1001e5','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
 INSERT INTO `applications` VALUES ('ae026ab5-3029-47b4-9d7c-236e3a4b4ebe','transcribe account 2',NULL,'622f62e4-303a-49f2-bbe0-eb1e1714e37a','ecb67a8f-f7ce-4919-abf0-bbc69c1001e5','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
-INSERT INTO `applications` VALUES ('195d9507-6a42-46a8-825f-f009e729d023','sip info',NULL,'bb845d4b-83a9-4cde-a6e9-50f3743bab3f','c9113e7a-741f-48b9-96c1-f2f78176eeb3','293904c1-351b-4bca-8d58-1a29b853c7db',NULL,'google','en-US','en-US-Standard-C','google','en-US');
 /*!40000 ALTER TABLE `applications` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -450,7 +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);
 /*!40000 ALTER TABLE `phone_numbers` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -738,7 +736,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/docker-compose-testbed.yaml

@@ -12,7 +12,7 @@ services:
     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"]
@@ -75,8 +75,10 @@ services:
       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,6 +87,42 @@ 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
     ports:

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);
@@ -23,25 +22,9 @@ test('\'gather\' and \'transcribe\' tests', async(t) => {
 
   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`);
-    t.ok(obj.body.speech.alternatives[0].transcript = 'I\'d like to speak to customer support',
+    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();

test/index.js

@@ -5,8 +5,5 @@ require('./account-validation-tests');
 require('./webhooks-tests');
 require('./say-tests');
 require('./gather-tests');
-require('./sip-request-tests');
-require('./create-call-test');
-require('./play-tests');
 require('./remove-test-db');
 require('./docker_stop');

test/play-tests.js

@@ -1,158 +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/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.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-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-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-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>
-

test/sip-request-tests.js

@@ -1,55 +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('sending SIP in-dialog requests tests', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    //GIVEN
-    let verbs = [
-      {
-        "verb": "say",
-        "text": "hello"
-      },
-      {
-        "verb": "sip:request",
-        "method": "info",
-        "headers": {
-          "Content-Type": "application/text"
-        },
-        "body": "here I am ",
-        "actionHook": "/actionHook"
-      }
-    ];
-    let from = "sip_indialog_test";
-    provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-send-info-during-dialog.xml', '172.38.0.10', from);
-    const obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.sip_status === 200, 'successfully sent SIP INFO');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});

test/sip-tests.js

@@ -1,5 +1,7 @@
-const test = require('tape');
-const { sippUac } = require('./sipp')('test_sbc-inbound');
+const test = require('blue-tape');
+const { output, sippUac } = require('./sipp')('test_sbc-inbound');
+const debug = require('debug')('drachtio:sbc-inbound');
+const clearModule = require('clear-module');
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

test/sipp.js

@@ -24,7 +24,7 @@ obj.output = () => {
   return output;
 };
 
-obj.sippUac = (file, bindAddress, from='sipp', to='16174000000') => {
+obj.sippUac = (file, bindAddress) => {
   const cmd = 'docker';
   const args = [
     'run', '-t', '--rm', '--net', `${network}`,
@@ -34,9 +34,7 @@ obj.sippUac = (file, bindAddress, from='sipp', to='16174000000') => {
     '-sleep', '250ms',
     '-nostdin',
     '-cid_str', `%u-%p@%s-${idx++}`,
-    '172.38.0.50',
-    '-key','from', from,
-    '-key','to', to, '-trace_msg'
+    '172.38.0.50'
   ];
 
   if (bindAddress) args.splice(5, 0, '--ip', bindAddress);
@@ -63,7 +61,7 @@ obj.sippUac = (file, bindAddress, from='sipp', to='16174000000') => {
       addOutput(data.toString());
     });
     child_process.stdout.on('data', (data) => {
-      // console.log(`stdout: ${data}`);
+      //console.log(`stdout: ${data}`);
       addOutput(data.toString());
     });
   });

test/test-apps/info.json

@@ -1,15 +0,0 @@
-[
-  {
-    "verb": "say",
-    "text": "hello"
-  },  
-  {
-    "verb": "sip:request",
-    "method": "info",
-    "headers": {
-      "Content-Type": "application/text"
-    },
-    "body": "here I am ",
-    "actionHook": "/actionHook"
-  }
-]

test/utils.js

@@ -1,27 +0,0 @@
-const bent = require('bent');
-
-/*
-* phoneNumber: 16174000000
-* Hook endpoints http://127.0.0.1:3100/
-* The function help testcase to register desired jambonz json response for an application call
-* When a call has From number match the registered hook event, the desired jambonz json will be responded.
-*/
-const provisionCallHook = (from, verbs) => {
-  const mapping = {
-    from,
-    data: JSON.stringify(verbs)
-  };
-  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post('/appMapping', mapping);
-}
-
-const provisionCustomHook = (from, verbs) => {
-  const mapping = {
-    from,
-    data: JSON.stringify(verbs)
-  };
-  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post(`/customHookMapping`, mapping);
-}
-
-module.exports = { provisionCallHook, provisionCustomHook}

test/webhook/Dockerfile

@@ -1,23 +1,15 @@
-FROM --platform=linux/amd64 node:18.6.0-alpine 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/
-
-ARG NODE_ENV
-
-ENV NODE_ENV $NODE_ENV
-
-CMD [ "node", "app.js" ]
+FROM node:alpine as webapp
+RUN apk add curl
+WORKDIR /opt/app
+COPY . /opt/app
+COPY --from=builder /opt/app/node_modules ./node_modules
+COPY ./entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

test/webhook/app.js

@@ -3,117 +3,47 @@ const fs = require('fs');
 const express = require('express');
 const app = express();
 const listenPort = process.env.HTTP_PORT || 3000;
-let json_mapping = new Map();
-let hook_mapping = new Map();
+let lastAction, lastEvent;
+
+assert.ok(process.env.APP_PATH, 'env var APP_PATH is required');
 
 app.listen(listenPort, () => {
   console.log(`sample jambones app server listening on ${listenPort}`);
 });
 
+const applicationData = JSON.parse(fs.readFileSync(process.env.APP_PATH));
 app.use(express.urlencoded({ extended: true }));
 app.use(express.json());
 
-/*
- * Markup language
- */
 
 app.all('/', (req, res) => {
-  console.log(req.body, 'POST /');
-  const key = req.body.from
-  return getJsonFromMap(key, req, res);
+  console.log(applicationData, `${req.method} /`);
+  return res.json(applicationData);
 });
 
-app.post('/appMapping', (req, res) => {
-  console.log(req.body, 'POST /appMapping');
-  json_mapping.set(req.body.from, req.body.data);
-  return res.sendStatus(200);
-});
-
-/*
- * Status Callback
- */
 app.post('/callStatus', (req, res) => {
   console.log({payload: req.body}, 'POST /callStatus');
-  let key = req.body.from + "_callStatus"
-  addRequestToMap(key, req, hook_mapping);
   return res.sendStatus(200);
 });
-/*
- * action Hook
- */
+
 app.post('/actionHook', (req, res) => {
   console.log({payload: req.body}, 'POST /actionHook');
-  let key = req.body.from + "_actionHook"
-  addRequestToMap(key, req, hook_mapping);
+  lastAction = req.body;
   return res.sendStatus(200);
 });
 
-/*
-* customHook
-* For the hook to return
- */
-
-app.all('/customHook', (req, res) => {
-  let key = `${req.body.from}_customHook`;;
-  console.log(req.body, `POST /customHook`);
-  return getJsonFromMap(key, req, res);
+app.get('/actionHook', (req, res) => {
+  console.log({payload: lastAction}, 'GET /actionHook');
+  return res.json(lastAction);
 });
 
-app.post('/customHookMapping', (req, res) => {
-  let key = `${req.body.from}_customHook`;
-  console.log(req.body, `POST /customHookMapping`);
-  json_mapping.set(key, req.body.data);
+app.post('/eventHook', (req, res) => {
+  console.log({payload: req.body}, 'POST /eventHook');
+  lastEvent = req.body;
   return res.sendStatus(200);
 });
 
-// Fetch Requests
-app.get('/requests/:key', (req, res) => {
-  let key = req.params.key;
-  if (hook_mapping.has(key)) {
-    return res.json(hook_mapping.get(key));
-  } else {
-    return res.sendStatus(404);
-  }
-
-})
-
-app.get('/lastRequest/:key', (req, res) => {
-  let key = req.params.key;
-  if (hook_mapping.has(key)) {
-    let requests = hook_mapping.get(key);
-    return res.json(requests[requests.length - 1]);
-  } else {
-    return res.sendStatus(404);
-  }
-})
-
-/*
- * private function
- */
-
-function getJsonFromMap(key, req, res) {
-  if (!json_mapping.has(key)) return res.sendStatus(404);
-  const retData = JSON.parse(json_mapping.get(key));
-  console.log(retData, ` Response to ${req.method} ${req.url}`);
-  addRequestToMap(key, req, hook_mapping);
-  return res.json(retData);
-}
-
-function addRequestToMap(key, req, map) {
-  let headers = new Map()
-  for(let i = 0; i < req.rawHeaders.length; i++) {
-    if (i % 2 === 0) {
-      headers.set(req.rawHeaders[i], req.rawHeaders[i + 1])
-    }
-  }
-  let request = {
-    'url': req.url,
-    'headers': Object.fromEntries(headers),
-    'body': req.body
-  }
-  if (map.has(key)) {
-    map.get(key).push(request);
-  } else {
-    map.set(key, [request]);
-  }
-}
+app.get('/eventHook', (req, res) => {
+  console.log({payload: lastEvent}, 'GET /eventHook');
+  return res.json(lastEvent);
+});

test/webhook/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt/app/
+npm start

test/webhook/package-lock.json

@@ -1,493 +1,8 @@
 {
   "name": "webhook",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "webhook",
-      "version": "1.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "express": "^4.17.1"
-      }
-    },
-    "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
-    "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dependencies": {
-        "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "dependencies": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.45.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
-      "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.28",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
-      "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
-      "dependencies": {
-        "mime-db": "1.45.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
-      "dependencies": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-    },
-    "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    }
-  },
   "dependencies": {
     "accepts": {
       "version": "1.3.7",

test/webhooks-tests.js

@@ -1,15 +1,6 @@
 const test = require('tape');
 const { sippUac } = require('./sipp')('test_fs');
 const clearModule = require('clear-module');
-const {provisionCallHook} = require('./utils')
-const opts = {
-  timestamp: () => {return `, "time": "${new Date().toISOString()}"`;},
-  level: process.env.JAMBONES_LOGLEVEL || 'info'
-};
-const logger = require('pino')(opts);
-const { queryAlerts } = require('@jambonz/time-series')(
-  logger, process.env.JAMBONES_TIME_SERIES_HOST
-);
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -29,21 +20,7 @@ test('basic webhook tests', async(t) => {
 
   try {
     await connect(srf);
-    const verbs = [
-      {
-        verb: 'sip:decline',
-        status: 603,
-        reason: 'Gone Fishin',
-        headers: {
-          'Retry-After': 300
-        }
-      }
-    ];
-
-    const from = 'sip_decline_test_success';
-    provisionCallHook(from, verbs)
-
-    await sippUac('uac-expect-603.xml', '172.38.0.10', from);
+    await sippUac('uac-expect-603.xml', '172.38.0.10');
     t.pass('webhook successfully declines call');
 
     disconnect();
@@ -53,43 +30,3 @@ test('basic webhook tests', async(t) => {
     t.error(err);
   }
 });
-
-test('invalid jambonz json create alert tests', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    // Invalid json array
-    const verbs = {
-      verb: 'say',
-      text: 'hello'
-    };
-
-    const from = 'invalid_json_create_alert';
-    provisionCallHook(from, verbs)
-
-    // THEN
-    await sippUac('uac-invite-expect-480.xml', '172.38.0.10', from);
-    // sleep testcase for more than 7 second to wait alert pushed to database.
-    await sleep(8000);
-    const data = await queryAlerts(
-      {account_sid: 'bb845d4b-83a9-4cde-a6e9-50f3743bab3f', page: 1, page_size: 25, days: 7});
-    let checked = false;
-    for (let i = 0; i < data.total; i++) {
-      checked = data.data[i].message === 'malformed jambonz payload: must be array'
-    }
-    t.ok(checked, 'alert is raised as expected');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}

tracer.js

@@ -6,7 +6,7 @@ const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventi
 const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
-const  { OTLPTraceExporter } = require ('@opentelemetry/exporter-trace-otlp-http');
+const { CollectorTraceExporter } =  require('@opentelemetry/exporter-collector');
 //const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
 //const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
 //const { PinoInstrumentation } = require('@opentelemetry/instrumentation-pino');
@@ -29,7 +29,7 @@ module.exports = (serviceName) => {
       exporter = new ZipkinExporter({url:process.env.OTEL_EXPORTER_ZIPKIN_URL});
     }
     else {
-      exporter = new OTLPTraceExporter({
+      exporter = new CollectorTraceExporter({
         url: process.OTEL_EXPORTER_COLLECTOR_URL
       });
     }