support SIP Privacy (#970)

.gitignore

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:20-alpine as base
+FROM --platform=linux/amd64 node:18.15-alpine3.16 as base
 
 RUN apk --update --no-cache add --virtual .builds-deps build-base python3
 

README.md

@@ -13,7 +13,7 @@ Configuration is provided via environment variables:
 |AWS_ACCESS_KEY_ID| aws access key id, used for TTS/STT as well SNS notifications|no|
 |AWS_REGION| aws region| no|
 |AWS_SECRET_ACCESS_KEY| aws secret access key, used per above|no|
-|AWS_SNS_TOPIC_ARN| aws sns topic arn that scale-in lifecycle notifications will be published to|no|
+|AWS_SNS_TOPIC_ARM| aws sns topic arn that scale-in lifecycle notifications will be published to|no|
 |DRACHTIO_HOST| ip address of drachtio server (typically '127.0.0.1')|yes|
 |DRACHTIO_PORT| listening port of drachtio server for control connections (typically 9022)|yes|
 |DRACHTIO_SECRET| shared secret|yes|
@@ -72,7 +72,7 @@ module.exports = {
       STATS_PORT: 8125,
       STATS_PROTOCOL: 'tcp',
       STATS_TELEGRAF: 1,
-      AWS_SNS_TOPIC_ARN: 'arn:aws:sns:us-west-1:xxxxxxxxxxx:terraform-20201107200347128600000002',
+      AWS_SNS_TOPIC_ARM: 'arn:aws:sns:us-west-1:xxxxxxxxxxx:terraform-20201107200347128600000002',
       JAMBONES_NETWORK_CIDR: '172.31.0.0/16',
       JAMBONES_MYSQL_HOST: 'aurora-cluster-jambonz.cluster-yyyyyyyyyyy.us-west-1.rds.amazonaws.com',
       JAMBONES_MYSQL_USER: 'admin',

app.js

@@ -25,74 +25,9 @@ const opts = {
 };
 const pino = require('pino');
 const logger = pino(opts, pino.destination({sync: false}));
-const {LifeCycleEvents, FS_UUID_SET_NAME, SystemState, FEATURE_SERVER} = require('./lib/utils/constants');
+const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
 const installSrfLocals = require('./lib/utils/install-srf-locals');
-const createHttpListener = require('./lib/utils/http-listener');
-const healthCheck = require('@jambonz/http-health-check');
-
-logger.on('level-change', (lvl, _val, prevLvl, _prevVal, instance) => {
-  if (logger !== instance) {
-    return;
-  }
-  logger.info('system log level %s was changed to %s', prevLvl, lvl);
-});
-
-// Install the srf locals
-installSrfLocals(srf, logger, {
-  onFreeswitchConnect: (wraper) => {
-    // Only connect to drachtio if freeswitch is connected
-    logger.info(`connected to freeswitch at ${wraper.ms.address}, start drachtio server`);
-    if (DRACHTIO_HOST) {
-      srf.connect({host: DRACHTIO_HOST, port: DRACHTIO_PORT, secret: DRACHTIO_SECRET });
-      srf.on('connect', (err, hp) => {
-        const arr = /^(.*)\/(.*)$/.exec(hp.split(',').pop());
-        srf.locals.localSipAddress = `${arr[2]}`;
-        logger.info(`connected to drachtio listening on ${hp}, local sip address is ${srf.locals.localSipAddress}`);
-      });
-    }
-    else {
-      logger.info(`listening for drachtio requests on port ${DRACHTIO_PORT}`);
-      srf.listen({port: DRACHTIO_PORT, secret: DRACHTIO_SECRET});
-    }
-    // Start Http server
-    createHttpListener(logger, srf)
-      .then(({server, app}) => {
-        httpServer = server;
-        healthCheck({app, logger, path: '/', fn: getCount});
-        return {server, app};
-      })
-      .catch((err) => {
-        logger.error(err, 'Error creating http listener');
-      });
-  },
-  onFreeswitchDisconnect: (wraper) => {
-    // check if all freeswitch connections are lost, disconnect drachtio server
-    logger.info(`lost connection to freeswitch at ${wraper.ms.address}`);
-    const ms = srf.locals.getFreeswitch();
-    if (!ms) {
-      logger.info('no freeswitch connections, stopping drachtio server');
-      disconnect();
-    }
-  }
-});
-if (NODE_ENV === 'test') {
-  srf.on('error', (err) => {
-    logger.info(err, 'Error connecting to drachtio');
-  });
-}
-
-// Init services
-const writeSystemAlerts = srf.locals?.writeSystemAlerts;
-if (writeSystemAlerts) {
-  writeSystemAlerts({
-    system_component: FEATURE_SERVER,
-    state : SystemState.Online,
-    fields : {
-      detail: `feature-server with process_id ${process.pid} started`,
-      host: srf.locals?.ipv4
-    }
-  });
-}
+installSrfLocals(srf, logger);
 
 const {
   initLocals,
@@ -107,6 +42,24 @@ const {
 const InboundCallSession = require('./lib/session/inbound-call-session');
 const SipRecCallSession = require('./lib/session/siprec-call-session');
 
+if (DRACHTIO_HOST) {
+  srf.connect({host: DRACHTIO_HOST, port: DRACHTIO_PORT, secret: DRACHTIO_SECRET });
+  srf.on('connect', (err, hp) => {
+    const arr = /^(.*)\/(.*)$/.exec(hp.split(',').pop());
+    srf.locals.localSipAddress = `${arr[2]}`;
+    logger.info(`connected to drachtio listening on ${hp}, local sip address is ${srf.locals.localSipAddress}`);
+  });
+}
+else {
+  logger.info(`listening for drachtio requests on port ${DRACHTIO_PORT}`);
+  srf.listen({port: DRACHTIO_PORT, secret: DRACHTIO_SECRET});
+}
+if (NODE_ENV === 'test') {
+  srf.on('error', (err) => {
+    logger.info(err, 'Error connecting to drachtio');
+  });
+}
+
 srf.use('invite', [
   initLocals,
   createRootSpan,
@@ -132,27 +85,27 @@ sessionTracker.on('idle', () => {
   }
 });
 const getCount = () => sessionTracker.count;
-
+const healthCheck = require('@jambonz/http-health-check');
 let httpServer;
 
-const monInterval = setInterval(async() => {
+const createHttpListener = require('./lib/utils/http-listener');
+createHttpListener(logger, srf)
+  .then(({server, app}) => {
+    httpServer = server;
+    healthCheck({app, logger, path: '/', fn: getCount});
+    return {server, app};
+  })
+  .catch((err) => {
+    logger.error(err, 'Error creating http listener');
+  });
+
+
+setInterval(async() => {
   srf.locals.stats.gauge('fs.sip.calls.count', sessionTracker.count);
-  try {
-    const systemInformation = await srf.locals.dbHelpers.lookupSystemInformation();
-    if (systemInformation && systemInformation.log_level) {
-      const envLogLevel = logger.levels.values[JAMBONES_LOGLEVEL.toLowerCase()];
-      const dbLogLevel = logger.levels.values[systemInformation.log_level];
-      const appliedLogLevel = Math.min(envLogLevel, dbLogLevel);
-      if (logger.levelVal !== appliedLogLevel) {
-        logger.level = logger.levels.labels[Math.min(envLogLevel, dbLogLevel)];
-      }
-    }
-  } catch (err) {
-    if (process.env.NODE_ENV === 'test') {
-      clearInterval(monInterval);
-      logger.error('all tests complete');
-    }
-    else logger.error({err}, 'Error checking system log level in database');
+  // Checking system log level
+  const systemInformation = await srf.locals.dbHelpers.lookupSystemInformation();
+  if (systemInformation && systemInformation.log_level) {
+    logger.level = systemInformation.log_level;
   }
 }, 20000);
 
@@ -161,29 +114,16 @@ const disconnect = () => {
     httpServer?.on('close', resolve);
     httpServer?.close();
     srf.disconnect();
-    srf.removeAllListeners();
     srf.locals.mediaservers?.forEach((ms) => ms.disconnect());
   });
 };
-process.on('SIGTERM', handle);
-process.on('SIGINT', handle);
 
-async function handle(signal) {
+process.on('SIGTERM', handle);
+
+function handle(signal) {
   const {removeFromSet} = srf.locals.dbHelpers;
   srf.locals.disabled = true;
   logger.info(`got signal ${signal}`);
-  const writeSystemAlerts = srf.locals?.writeSystemAlerts;
-  if (writeSystemAlerts) {
-    // it has to be synchronous call, or else by the time system saves the app terminates
-    await writeSystemAlerts({
-      system_component: FEATURE_SERVER,
-      state : SystemState.Offline,
-      fields : {
-        detail: `feature-server with process_id ${process.pid} stopped, signal ${signal}`,
-        host: srf.locals?.ipv4
-      }
-    });
-  }
   const setName = `${(JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
   const fsServiceUrlSetName = `${(JAMBONES_CLUSTER_ID || 'default')}:fs-service-url`;
   if (setName && srf.locals.localSipAddress) {

lib/config.js

@@ -93,7 +93,7 @@ const AWS_REGION = process.env.AWS_REGION;
 const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
 const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
 const AWS_SNS_PORT = parseInt(process.env.AWS_SNS_PORT, 10) || 3001;
-const AWS_SNS_TOPIC_ARN = process.env.AWS_SNS_TOPIC_ARN;
+const AWS_SNS_TOPIC_ARM = process.env.AWS_SNS_TOPIC_ARM;
 const AWS_SNS_PORT_MAX = parseInt(process.env.AWS_SNS_PORT_MAX, 10) || 3005;
 
 const GCP_JSON_KEY = process.env.GCP_JSON_KEY;
@@ -136,12 +136,6 @@ const JAMBONES_DISABLE_DIRECT_P2P_CALL = process.env.JAMBONES_DISABLE_DIRECT_P2P
 const JAMBONES_EAGERLY_PRE_CACHE_AUDIO = parseInt(process.env.JAMBONES_EAGERLY_PRE_CACHE_AUDIO, 10) || 0;
 
 const JAMBONES_USE_FREESWITCH_TIMER_FD = process.env.JAMBONES_USE_FREESWITCH_TIMER_FD;
-const JAMBONES_DIAL_SBC_FOR_REGISTERED_USER = process.env.JAMBONES_DIAL_SBC_FOR_REGISTERED_USER || false;
-const JAMBONES_MEDIA_TIMEOUT_MS = process.env.JAMBONES_MEDIA_TIMEOUT_MS || 0;
-const JAMBONES_MEDIA_HOLD_TIMEOUT_MS = process.env.JAMBONES_MEDIA_HOLD_TIMEOUT_MS || 0;
-// jambonz
-const JAMBONES_TRANSCRIBE_EP_DESTROY_DELAY_MS =
-  process.env.JAMBONES_TRANSCRIBE_EP_DESTROY_DELAY_MS;
 
 module.exports = {
   JAMBONES_MYSQL_HOST,
@@ -192,7 +186,7 @@ module.exports = {
   AWS_ACCESS_KEY_ID,
   AWS_SECRET_ACCESS_KEY,
   AWS_SNS_PORT,
-  AWS_SNS_TOPIC_ARN,
+  AWS_SNS_TOPIC_ARM,
   AWS_SNS_PORT_MAX,
 
   ANCHOR_MEDIA_ALWAYS,
@@ -227,9 +221,5 @@ module.exports = {
   JAMBONZ_RECORD_WS_PASSWORD,
   JAMBONZ_DISABLE_DIAL_PAI_HEADER,
   JAMBONES_DISABLE_DIRECT_P2P_CALL,
-  JAMBONES_USE_FREESWITCH_TIMER_FD,
-  JAMBONES_DIAL_SBC_FOR_REGISTERED_USER,
-  JAMBONES_MEDIA_TIMEOUT_MS,
-  JAMBONES_MEDIA_HOLD_TIMEOUT_MS,
-  JAMBONES_TRANSCRIBE_EP_DESTROY_DELAY_MS
+  JAMBONES_USE_FREESWITCH_TIMER_FD
 };

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

@@ -3,7 +3,7 @@ const makeTask = require('../../tasks/make_task');
 const RestCallSession = require('../../session/rest-call-session');
 const CallInfo = require('../../session/call-info');
 const {CallDirection, CallStatus} = require('../../utils/constants');
-const crypto = require('crypto');
+const uuidv4 = require('uuid-random');
 const SipError = require('drachtio-srf').SipError;
 const { validationResult, body } = require('express-validator');
 const { validate } = require('@jambonz/verb-specifications');
@@ -12,11 +12,8 @@ const HttpRequestor = require('../../utils/http-requestor');
 const WsRequestor = require('../../utils/ws-requestor');
 const RootSpan = require('../../utils/call-tracer');
 const dbUtils = require('../../utils/db-utils');
-const { decrypt } = require('../../utils/encrypt-decrypt');
 const { mergeSdpMedia, extractSdpMedia } = require('../../utils/sdp-utils');
 const { createCallSchema, customSanitizeFunction } = require('../schemas/create-call');
-const { selectHostPort } = require('../../utils/network');
-const { JAMBONES_DIAL_SBC_FOR_REGISTERED_USER } = require('../../config');
 
 const removeNullProperties = (obj) => (Object.keys(obj).forEach((key) => obj[key] === null && delete obj[key]), obj);
 const removeNulls = (req, res, next) => {
@@ -68,7 +65,7 @@ router.post('/',
         lookupAppBySid
       }  = srf.locals.dbHelpers;
       const {getSBC, getFreeswitch} = srf.locals;
-      let sbcAddress = getSBC();
+      const sbcAddress = getSBC();
       if (!sbcAddress) throw new Error('no available SBCs for outbound call creation');
       const target = restDial.to;
       const opts = {
@@ -81,7 +78,7 @@ router.post('/',
       const {lookupTeamsByAccount, lookupAccountBySid} = srf.locals.dbHelpers;
       const account = await lookupAccountBySid(req.body.account_sid);
       const accountInfo = await lookupAccountDetails(req.body.account_sid);
-      const callSid = crypto.randomUUID();
+      const callSid = uuidv4();
       const application = req.body.application_sid ? await lookupAppBySid(req.body.application_sid) : null;
       const record_all_calls = account.record_all_calls || (application && application.record_all_calls);
       const recordOutputFormat = account.record_format || 'mp3';
@@ -101,7 +98,6 @@ router.post('/',
         ...(req.body?.application_sid && {'X-Application-Sid': req.body.application_sid}),
         ...(restDial.fromHost && {'X-Preferred-From-Host': restDial.fromHost}),
         ...(record_all_calls && {'X-Record-All-Calls': recordOutputFormat}),
-        ...(target.proxy && {'X-SIP-Proxy': target.proxy}),
         ...target.headers
       };
 
@@ -144,16 +140,6 @@ router.post('/',
         }
       }
 
-      // find handling sbc sip for called user
-      if (JAMBONES_DIAL_SBC_FOR_REGISTERED_USER && target.type === 'user') {
-        const { registrar }  = srf.locals.dbHelpers;
-        const reg = await registrar.query(target.name);
-        if (reg) {
-          sbcAddress = selectHostPort(logger, reg.sbcAddress, 'tcp')[1];
-        }
-        //sbc outbound return 404 Notfound to handle case called user is not reigstered.
-      }
-
       /**
      * trunk isn't specified,
      * check if from-number matches any existing numbers on Jambonz
@@ -210,20 +196,10 @@ router.post('/',
 
       /**
      * create our application object -
-     * we merge the inbound call application,
-     * with the provided app params from the request body
+     * not from the database as per an inbound call,
+     * but from the provided params in the request
      */
-      try {
-        if (application?.env_vars && Object.keys(application.env_vars).length > 0) {
-          restDial.env_vars = JSON.parse(decrypt(application.env_vars));
-        }
-      } catch (err) {
-        logger.info({err}, 'Unable to set env_vars');
-      }
-      const app = {
-        ...application,
-        ...req.body
-      };
+      const app = req.body;
 
       /**
      * attach our requestor and notifier objects
@@ -232,7 +208,7 @@ router.post('/',
       if ('WS' === app.call_hook?.method || /^wss?:/.test(app.call_hook.url)) {
         logger.debug({call_hook: app.call_hook}, 'creating websocket for call hook');
         app.requestor = new WsRequestor(logger, account.account_sid, app.call_hook, account.webhook_secret) ;
-        if (app.call_hook.url === app.call_status_hook?.url  || !app.call_status_hook?.url) {
+        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;
         }

lib/middleware.js

@@ -1,5 +1,5 @@
-const crypto = require('crypto');
-const {CallDirection, AllowedSipRecVerbs, WS_CLOSE_CODES} = require('./utils/constants');
+const uuidv4 = require('uuid-random');
+const {CallDirection, AllowedSipRecVerbs} = require('./utils/constants');
 const {parseSiprecPayload} = require('./utils/siprec-utils');
 const CallInfo = require('./session/call-info');
 const HttpRequestor = require('./utils/http-requestor');
@@ -15,7 +15,6 @@ const {
   JAMBONES_DISABLE_DIRECT_P2P_CALL
 } = require('./config');
 const { createJambonzApp } = require('./dynamic-apps');
-const { decrypt } = require('./utils/encrypt-decrypt');
 
 module.exports = function(srf, logger) {
   const {
@@ -46,7 +45,7 @@ module.exports = function(srf, logger) {
       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') : crypto.randomUUID();
+    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};
 
@@ -337,9 +336,7 @@ module.exports = function(srf, logger) {
         if (arr) {
           const google_custom_voice_sid = arr[1];
           const [custom_voice] = await lookupGoogleCustomVoice(google_custom_voice_sid);
-          //google voice cloning key has size 200kb, jambonz should not resolve the voice here that the app's calling
-          //webhook will receive big payload, tts-task should resolve the voice later.
-          if (!custom_voice.use_voice_cloning_key) {
+          if (custom_voice) {
             app2.speech_synthesis_voice = {
               reportedUsage: custom_voice.reported_usage,
               model: custom_voice.model
@@ -349,10 +346,11 @@ module.exports = function(srf, logger) {
       }
 
       req.locals.application = app2;
+
       // eslint-disable-next-line no-unused-vars
       const {call_hook, call_status_hook, ...appInfo} = app;  // mask sensitive data like user/pass on webhook
       // eslint-disable-next-line no-unused-vars
-      const {requestor, notifier, env_vars, ...loggable} = appInfo;
+      const {requestor, notifier, ...loggable} = appInfo;
       logger.info({app: loggable}, `retrieved application for incoming call to ${req.locals.calledNumber}`);
       req.locals.callInfo = new CallInfo({
         req,
@@ -417,28 +415,16 @@ module.exports = function(srf, logger) {
             ...(app.fallback_speech_recognizer_language && {fallback_language: app.fallback_speech_recognizer_language})
           }
         };
-        let env_vars;
-        try {
-          if (app.env_vars) {
-            const d_env_vars = JSON.parse(decrypt(app.env_vars));
-            logger.info(`Setting env_vars: ${Object.keys(d_env_vars)}`); // Only log the keys not the values
-            env_vars = d_env_vars;
-          }
-        } catch (err) {
-          logger.info({err}, 'Unable to set env_vars');
-        }
         const params = Object.assign(['POST', 'WS'].includes(app.call_hook.method) ? { sip: req.msg } : {},
           req.locals.callInfo,
           { service_provider_sid: req.locals.service_provider_sid },
-          { defaults },
-          { env_vars }
-        );
+          { defaults });
         logger.debug({ params }, 'sending initial webhook');
         const obj = rootSpan.startChildSpan('performAppWebhook');
         span = obj.span;
         const b3 = rootSpan.getTracingPropagation();
         const httpHeaders = b3 && { b3 };
-        json = await app.requestor.request('session:new', app.call_hook, params, httpHeaders, span);
+        json = await app.requestor.request('session:new', app.call_hook, params, httpHeaders);
       }
 
       app.tasks = normalizeJambones(logger, json).map((tdata) => makeTask(logger, tdata));
@@ -472,7 +458,7 @@ module.exports = function(srf, logger) {
       }).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(WS_CLOSE_CODES.GoingAway);
+      app.requestor.close();
     }
   }
 

lib/session/adulting-call-session.js

@@ -45,10 +45,8 @@ class AdultingCallSession extends CallSession {
     return this.sd.ep;
   }
 
-  // When adulting session kicked from conference, replaceEndpoint is a must
-  set ep(newEp) {
-    this.sd.ep = newEp;
-  }
+  /* see note above */
+  set ep(newEp) {}
 
   get callSid() {
     return this.callInfo.callSid;

lib/session/call-info.js

@@ -1,6 +1,6 @@
 const {CallDirection, CallStatus} = require('../utils/constants');
 const parseUri = require('drachtio-srf').parseUri;
-const crypto = require('crypto');
+const uuidv4 = require('uuid-random');
 const {JAMBONES_API_BASE_URL} = require('../config');
 /**
  * @classdesc Represents the common information for all calls
@@ -57,7 +57,7 @@ class CallInfo {
       // outbound call that is a child of an existing call
       const {req, parentCallInfo, to, callSid} = opts;
       srf = req.srf;
-      this.callSid = callSid || crypto.randomUUID();
+      this.callSid = callSid || uuidv4();
       this.parentCallSid = parentCallInfo.callSid;
       this.accountSid = parentCallInfo.accountSid;
       this.applicationSid = parentCallInfo.applicationSid;

lib/session/confirm-call-session.js

@@ -8,7 +8,7 @@ const CallSession = require('./call-session');
 
  */
 class ConfirmCallSession extends CallSession {
-  constructor({logger, application, dlg, ep, tasks, callInfo, accountInfo, memberId, confName, rootSpan, req}) {
+  constructor({logger, application, dlg, ep, tasks, callInfo, accountInfo, memberId, confName, rootSpan}) {
     super({
       logger,
       application,
@@ -23,7 +23,6 @@ class ConfirmCallSession extends CallSession {
     });
     this.dlg = dlg;
     this.ep = ep;
-    this.req = req;
   }
 
   /**

lib/session/inbound-call-session.js

@@ -70,12 +70,8 @@ class InboundCallSession extends CallSession {
     this._hangup('caller');
   }
 
-  _jambonzHangup(reason) {
-    this.dlg?.destroy({
-      headers: {
-        ...(reason && {'X-Reason': reason})
-      }
-    });
+  _jambonzHangup() {
+    this.dlg?.destroy();
     // kill current task or wakeup the call session.
     this._callReleased();
   }

lib/session/rest-call-session.js

@@ -63,7 +63,7 @@ class RestCallSession extends CallSession {
     this.callInfo.callTerminationBy = terminatedBy;
     const duration = moment().diff(this.dlg.connectTime, 'seconds');
     this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
-    this.logger.info(`RestCallSession: called party hung up by ${terminatedBy}`);
+    this.logger.debug(`RestCallSession: called party hung up by ${terminatedBy}`);
     this._callReleased();
   }
 

lib/tasks/conference.js

@@ -83,11 +83,7 @@ class Conference extends Task {
     // reset answer time if we were transferred from another feature server
     if (this.connectTime) dlg.connectTime = this.connectTime;
 
-    if (cs.sipRequestWithinDialogHook) {
-      /* remove any existing listener to escape from duplicating events */
-      this._removeSipIndialogRequestListener(this.dlg);
-      this._initSipIndialogRequestListener(cs, dlg);
-    }
+
     this.ep.on('destroy', this._kicked.bind(this, cs, dlg));
 
     try {
@@ -107,7 +103,6 @@ class Conference extends Task {
 
       this.logger.debug(`Conference:exec - conference ${this.confName} is over`);
       if (this.callMoved !== false) await this.performAction(this.results);
-      this._removeSipIndialogRequestListener(dlg);
     } catch (err) {
       this.logger.info(err, `TaskConference:exec - error in conference ${this.confName}`);
     }
@@ -421,20 +416,6 @@ class Conference extends Task {
     }
   }
 
-  _initSipIndialogRequestListener(cs, dlg) {
-    dlg.on('info', this._onRequestWithinDialog.bind(this, cs));
-    dlg.on('message', this._onRequestWithinDialog.bind(this, cs));
-  }
-
-  _removeSipIndialogRequestListener(dlg) {
-    dlg && dlg.removeAllListeners('message');
-    dlg && dlg.removeAllListeners('info');
-  }
-
-  _onRequestWithinDialog(cs, req, res) {
-    cs._onRequestWithinDialog(req, res);
-  }
-
   /**
    * The conference we have been waiting for has started.
    * It may be on this server or a different one, and we are
@@ -672,8 +653,7 @@ class Conference extends Task {
         memberId: this.memberId,
         confName: this.confName,
         tasks,
-        rootSpan: cs.rootSpan,
-        req: cs.req
+        rootSpan: cs.rootSpan
       });
       await this._playSession.exec();
       this._playSession = null;

lib/tasks/config.js

@@ -16,8 +16,7 @@ class TaskConfig extends Task {
       'fillerNoise',
       'actionHookDelayAction',
       'boostAudioSignal',
-      'vad',
-      'ttsStream'
+      'vad'
     ].forEach((k) => this[k] = this.data[k] || {});
 
     if ('notifyEvents' in this.data) {
@@ -46,12 +45,6 @@ class TaskConfig extends Task {
       };
       delete this.transcribeOpts.enable;
     }
-    if (this.ttsStream.enable) {
-      this.sayOpts = {
-        verb: 'say',
-        stream: true
-      };
-    }
 
     if (this.data.reset) {
       if (typeof this.data.reset === 'string') this.data.reset = [this.data.reset];
@@ -82,7 +75,6 @@ class TaskConfig extends Task {
   get hasVad() { return Object.keys(this.vad).length; }
   get hasFillerNoise() { return Object.keys(this.fillerNoise).length; }
   get hasReferHook() { return Object.keys(this.data).includes('referHook'); }
-  get hasTtsStream() { return Object.keys(this.ttsStream).length; }
 
   get summary() {
     const phrase = [];
@@ -114,9 +106,6 @@ class TaskConfig extends Task {
     if (this.onHoldMusic) phrase.push(`onHoldMusic: ${this.onHoldMusic}`);
     if ('boostAudioSignal' in this.data) phrase.push(`setGain ${this.data.boostAudioSignal}`);
     if (this.hasReferHook) phrase.push('set referHook');
-    if (this.hasTtsStream) {
-      phrase.push(`${this.ttsStream.enable ? 'enable' : 'disable'} ttsStream`);
-    }
     return `${this.name}{${phrase.join(',')}}`;
   }
 
@@ -139,7 +128,7 @@ class TaskConfig extends Task {
 
       try {
         this.ep = ep;
-        await this.startAmd(cs, ep, this, this.data.amd);
+        this.startAmd(cs, ep, this, this.data.amd);
       } catch (err) {
         this.logger.info({err}, 'Config:exec - Error calling startAmd');
       }
@@ -187,20 +176,18 @@ class TaskConfig extends Task {
         : cs.speechRecognizerVendor;
       cs.speechRecognizerLabel = this.recognizer.label === 'default'
         ? cs.speechRecognizerLabel : this.recognizer.label;
-      cs.speechRecognizerLanguage = this.recognizer.language !== undefined && this.recognizer.language !== 'default'
+      cs.speechRecognizerLanguage = this.recognizer.language !== 'default'
         ? this.recognizer.language
         : cs.speechRecognizerLanguage;
 
       //fallback
-      cs.fallbackSpeechRecognizerVendor = this.recognizer.fallbackVendor !== undefined &&
-        this.recognizer.fallbackVendor !== 'default'
+      cs.fallbackSpeechRecognizerVendor = this.recognizer.fallbackVendor !== 'default'
         ? this.recognizer.fallbackVendor
         : cs.fallbackSpeechRecognizerVendor;
       cs.fallbackSpeechRecognizerLabel = this.recognizer.fallbackLabel === 'default' ?
         cs.fallbackSpeechRecognizerLabel :
         this.recognizer.fallbackLabel;
-      cs.fallbackSpeechRecognizerLanguage = this.recognizer.fallbackLanguage !== undefined &&
-        this.recognizer.fallbackLanguage !== 'default'
+      cs.fallbackSpeechRecognizerLanguage = this.recognizer.fallbackLanguage !== 'default'
         ? this.recognizer.fallbackLanguage
         : cs.fallbackSpeechRecognizerLanguage;
 
@@ -318,22 +305,6 @@ class TaskConfig extends Task {
     if (this.hasReferHook) {
       cs.referHook = this.data.referHook;
     }
-
-    if (this.ttsStream.enable && this.sayOpts) {
-      this.sayOpts.synthesizer = this.hasSynthesizer ? this.synthesizer : {
-        vendor: cs.speechSynthesisVendor,
-        language: cs.speechSynthesisLanguage,
-        voice: cs.speechSynthesisVoice,
-        ...(cs.speechSynthesisLabel && {
-          label: cs.speechSynthesisLabel
-        })
-      };
-      this.logger.info({opts: this.gatherOpts}, 'Config: enabling ttsStream');
-      cs.enableBackgroundTtsStream(this.sayOpts);
-    } else if (!this.ttsStream.enable) {
-      this.logger.info('Config: disabling ttsStream');
-      cs.disableTtsStream();
-    }
   }
 
   async kill(cs) {

lib/tasks/dequeue.js

@@ -3,7 +3,8 @@ const {TaskName, TaskPreconditions, DequeueResults, BONG_TONE} = require('../uti
 const Emitter = require('events');
 const bent = require('bent');
 const assert = require('assert');
-const { sleepFor } = require('../utils/helpers');
+
+const sleepFor = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
 
 const getUrl = (cs) => `${cs.srf.locals.serviceUrl}/v1/dequeue/${cs.callSid}`;
 

lib/tasks/dial.js

@@ -6,7 +6,6 @@ const {
   TaskName,
   TaskPreconditions,
   MAX_SIMRINGS,
-  MediaPath,
   KillReason
 } = require('../utils/constants');
 const assert = require('assert');
@@ -18,13 +17,9 @@ const dbUtils = require('../utils/db-utils');
 const parseDecibels = require('../utils/parse-decibels');
 const debug = require('debug')('jambonz:feature-server');
 const {parseUri} = require('drachtio-srf');
-const {ANCHOR_MEDIA_ALWAYS,
-  JAMBONZ_DISABLE_DIAL_PAI_HEADER,
-  JAMBONES_DIAL_SBC_FOR_REGISTERED_USER} = require('../config');
+const {ANCHOR_MEDIA_ALWAYS, JAMBONZ_DISABLE_DIAL_PAI_HEADER} = require('../config');
 const { isOnhold, isOpusFirst } = require('../utils/sdp-utils');
 const { normalizeJambones } = require('@jambonz/verb-specifications');
-const { selectHostPort } = require('../utils/network');
-const { sleepFor } = require('../utils/helpers');
 
 function parseDtmfOptions(logger, dtmfCapture) {
   let parentDtmfCollector, childDtmfCollector;
@@ -87,6 +82,8 @@ function filterAndLimit(logger, tasks) {
   return unique;
 }
 
+const sleepFor = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
+
 class TaskDial extends Task {
   constructor(logger, opts) {
     super(logger, opts);
@@ -108,7 +105,6 @@ class TaskDial extends Task {
     this.proxy = this.data.proxy;
     this.tag = this.data.tag;
     this.boostAudioSignal = this.data.boostAudioSignal;
-    this._mediaPath = MediaPath.FullMedia;
 
     if (this.dtmfHook) {
       const {parentDtmfCollector, childDtmfCollector} = parseDtmfOptions(logger, this.data.dtmfCapture || {});
@@ -120,9 +116,8 @@ class TaskDial extends Task {
       }
     }
 
-    const listenData = this.data.listen || this.data.stream;
-    if (listenData) {
-      this.listenTask = makeTask(logger, {'listen': listenData }, this);
+    if (this.data.listen) {
+      this.listenTask = makeTask(logger, {'listen': this.data.listen}, this);
     }
     if (this.data.transcribe) {
       this.transcribeTask = makeTask(logger, {'transcribe' : this.data.transcribe}, this);
@@ -157,21 +152,17 @@ class TaskDial extends Task {
 
   get canReleaseMedia() {
     const keepAnchor = this.data.anchorMedia ||
-      this.cs.isBackGroundListen ||
-      this.cs.onHoldMusic ||
-      ANCHOR_MEDIA_ALWAYS ||
-      this.listenTask ||
-      this.dubTasks ||
-      this.transcribeTask ||
-      this.startAmd;
+    this.cs.isBackGroundListen ||
+    this.cs.onHoldMusic ||
+    ANCHOR_MEDIA_ALWAYS ||
+    this.listenTask ||
+    this.dubTasks ||
+    this.transcribeTask ||
+    this.startAmd;
 
     return !keepAnchor;
   }
 
-  get shouldExitMediaPathEntirely() {
-    return this.data.exitMediaPath;
-  }
-
   get summary() {
     if (this.target.length === 1) {
       const target = this.target[0];
@@ -192,16 +183,6 @@ class TaskDial extends Task {
 
   async exec(cs) {
     await super.exec(cs);
-
-    if (this.data.anchorMedia && this.data.exitMediaPath) {
-      this.logger.info('Dial:exec - incompatible anchorMedia and exitMediaPath are both set, will obey anchorMedia');
-      delete this.data.exitMediaPath;
-    }
-    if (!this.canReleaseMedia && this.data.exitMediaPath) {
-      this.logger.info(
-        'Dial:exec - exitMediaPath is set so features such as transcribe and record will not work on this call');
-    }
-
     try {
       if (this.listenTask) {
         const {span, ctx} = this.startChildSpan(`nested:${this.listenTask.summary}`);
@@ -229,10 +210,10 @@ class TaskDial extends Task {
               try {
                 await this.epOther.play(this.dialMusic);
               } catch (err) {
-                this.logger.error(err, `TaskDial:exec error playing dialMusic ${this.dialMusic}`);
+                this.logger.error(err, `TaskDial:exec error playing ${this.dialMusic}`);
                 await sleepFor(1000);
               }
-            } while (!this.killed && !this.bridged && this._mediaPath === MediaPath.FullMedia);
+            } while (!this.killed || !this.bridged);
           })();
         }
       }
@@ -273,9 +254,7 @@ class TaskDial extends Task {
     this._removeDtmfDetection(this.dlg);
     await this._killOutdials();
     if (this.sd) {
-      const byeReasonHeader = this.killReason === KillReason.MediaTimeout ? 'Media Timeout' : undefined;
-      this.sd.kill(byeReasonHeader);
-      this.sd.ep?.removeListener('destroy', this._handleMediaTimeout.bind(this));
+      this.sd.kill();
       this.sd.removeAllListeners();
       this.sd = null;
     }
@@ -321,7 +300,7 @@ class TaskDial extends Task {
       if (!cs.callGone && this.epOther) {
 
         /* if we can release the media back to the SBC, do so now */
-        if (this.canReleaseMedia) this._releaseMedia(cs, this.sd, this.shouldExitMediaPathEntirely);
+        if (this.canReleaseMedia) this._releaseMedia(cs, this.sd);
         else this.epOther.bridge(this.ep);
       }
     } catch (err) {
@@ -363,12 +342,6 @@ class TaskDial extends Task {
         const by = parseUri(req.getParsedHeader('Referred-By').uri);
         const referredBy = req.get('Referred-By');
         const userAgent = req.get('User-Agent');
-        const customHeaders = Object.keys(req.headers)
-          .filter((h) => h.toLowerCase().startsWith('x-'))
-          .reduce((acc, h) => {
-            acc[h] = req.get(h);
-            return acc;
-          }, {});
         this.logger.info({to}, 'refer to parsed');
         const json = await cs.requestor.request('verb:hook', this.referHook, {
           ...(callInfo.toJSON()),
@@ -379,8 +352,7 @@ class TaskDial extends Task {
             ...(userAgent && {sip_user_agent: userAgent}),
             ...(by && {referred_by_user: by.scheme === 'tel' ? by.number : by.user}),
             referring_call_sid,
-            referred_call_sid,
-            ...customHeaders
+            referred_call_sid
           }
         }, httpHeaders);
         if (json && Array.isArray(json)) {
@@ -406,9 +378,6 @@ class TaskDial extends Task {
             this.logger.info(err, 'Dial:handleRefer - error setting new application after receiving REFER');
           }
         }
-        //caller and callee legs are briged together, accept refer with 202 will release callee leg endpoint
-        //that makes freeswitch release endpoint for caller leg.
-        if (this.ep) this.ep.unbridge();
         res.send(202);
         this.logger.info('DialTask:handleRefer - sent 202 Accepted');
       } catch (err) {
@@ -498,7 +467,7 @@ class TaskDial extends Task {
     dlg && dlg.removeAllListeners('info');
   }
 
-  _onRequestWithinDialog(cs, req, res) {
+  async _onRequestWithinDialog(cs, req, res) {
     cs._onRequestWithinDialog(req, res);
   }
 
@@ -521,8 +490,8 @@ class TaskDial extends Task {
     const {req, callInfo, direction, srf} = cs;
     const {getSBC} = srf.locals;
     const {lookupTeamsByAccount, lookupAccountBySid} = srf.locals.dbHelpers;
-    const {lookupCarrier, lookupCarrierByPhoneNumber, lookupVoipCarrierBySid} = dbUtils(this.logger, cs.srf);
-    let sbcAddress = this.proxy || getSBC();
+    const {lookupCarrier, lookupCarrierByPhoneNumber} = dbUtils(this.logger, cs.srf);
+    const sbcAddress = this.proxy || getSBC();
     const teamsInfo = {};
     let fqdn;
 
@@ -540,18 +509,12 @@ class TaskDial extends Task {
       ...this.headers
     };
 
-    // default to inband dtmf if not specified
-    this.inbandDtmfEnabled = cs.inbandDtmfEnabled;
-    // get calling user from From header
-    const parsedFrom = req.getParsedHeader('from');
-    const fromUri = parseUri(parsedFrom.uri);
     const opts = {
       headers: this.headers,
       proxy: `sip:${sbcAddress}`,
-      callingNumber: this.callerId || fromUri.user,
+      callingNumber: this.callerId || req.callingNumber,
       ...(this.callerName && {callingName: this.callerName}),
-      opusFirst: isOpusFirst(this.cs.ep.remote.sdp),
-      isVideoCall: this.cs.ep.remote.sdp.includes('m=video')
+      opusFirst: isOpusFirst(this.cs.ep.remote.sdp)
     };
 
     const t = this.target.find((t) => t.type === 'teams');
@@ -595,15 +558,6 @@ class TaskDial extends Task {
             this.logger.error({err}, 'Error looking up account by sid');
           }
         }
-        // find handling sbc sip for called user
-        if (JAMBONES_DIAL_SBC_FOR_REGISTERED_USER && t.type === 'user') {
-          const { registrar }  = srf.locals.dbHelpers;
-          const reg = await registrar.query(t.name);
-          if (reg) {
-            sbcAddress = selectHostPort(this.logger, reg.sbcAddress, 'tcp')[1];
-          }
-          //sbc outbound return 404 Notfound to handle case called user is not reigstered.
-        }
         if (t.type === 'phone' && t.trunk) {
           const voip_carrier_sid = await lookupCarrier(cs.accountSid, t.trunk);
           this.logger.info(`Dial:_attemptCalls: selected ${voip_carrier_sid} for requested carrier: ${t.trunk}`);
@@ -620,17 +574,10 @@ class TaskDial extends Task {
           const str = this.callerId || req.callingNumber || '';
           const callingNumber = str.startsWith('+') ? str.substring(1) : str;
           const voip_carrier_sid = await lookupCarrierByPhoneNumber(cs.accountSid, callingNumber);
-          const req_voip_carrier_sid = req.has('X-Voip-Carrier-Sid') ? req.get('X-Voip-Carrier-Sid') : null;
           if (voip_carrier_sid) {
             this.logger.info(
               `Dial:_attemptCalls: selected voip_carrier_sid ${voip_carrier_sid} for callingNumber: ${callingNumber}`);
             opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
-
-            // Checking if outbound carrier is different from inbound carrier and has dtmf type tones
-            if (voip_carrier_sid !== req_voip_carrier_sid) {
-              const [voipCarrier] = await lookupVoipCarrierBySid(voip_carrier_sid);
-              this.inbandDtmfEnabled = voipCarrier?.dtmf_type === 'tones';
-            }
           }
         }
 
@@ -787,7 +734,7 @@ class TaskDial extends Task {
             // Offhold, time to release media
             const newSdp = await this.ep.modify(req.body);
             await res.send(200, {body: newSdp});
-            await this._releaseMedia(this.cs, this.sd, this.shouldExitMediaPathEntirely);
+            await this._releaseMedia(this.cs, this.sd);
             this.isOutgoingLegHold = false;
           } else {
             this.logger.debug('Dial: _onReinvite receive unhold Request, update media server');
@@ -871,14 +818,10 @@ class TaskDial extends Task {
 
     if (this.parentDtmfCollector) this._installDtmfDetection(cs, cs.dlg);
     if (this.childDtmfCollector) this._installDtmfDetection(cs, this.dlg);
-    if (cs.sipRequestWithinDialogHook) {
-      /* remove any existing listener to escape from duplicating events */
-      this._removeSipIndialogRequestListener(this.dlg);
-      this._initSipIndialogRequestListener(cs, this.dlg);
-    }
+    if (cs.sipRequestWithinDialogHook) this._initSipIndialogRequestListener(cs, this.dlg);
 
     if (this.transcribeTask) this.transcribeTask.exec(cs, {ep: this.epOther, ep2:this.ep});
-    if (this.listenTask) this.listenTask.exec(cs, {ep: this.listenTask.channel === 2 ? this.ep : this.epOther});
+    if (this.listenTask) this.listenTask.exec(cs, {ep: this.epOther});
     if (this.startAmd) {
       try {
         this.startAmd(cs, this.ep, this, this.data.amd);
@@ -900,17 +843,7 @@ class TaskDial extends Task {
     }
 
     /* if we can release the media back to the SBC, do so now */
-    if (this.canReleaseMedia || this.shouldExitMediaPathEntirely) {
-      setTimeout(this._releaseMedia.bind(this, cs, sd, this.shouldExitMediaPathEntirely), 200);
-    }
-
-    this.sd.ep.once('destroy', this._handleMediaTimeout.bind(this));
-  }
-
-  _handleMediaTimeout(evt) {
-    if (evt?.reason === 'MEDIA_TIMEOUT' && this.sd && this.bridged) {
-      this.kill(this.cs, KillReason.MediaTimeout);
-    }
+    if (this.canReleaseMedia) setTimeout(this._releaseMedia.bind(this, cs, sd), 200);
   }
 
   _bridgeEarlyMedia(sd) {
@@ -922,57 +855,22 @@ class TaskDial extends Task {
     }
   }
 
-  /* public api */
-  async updateMediaPath(desiredPath) {
-    this.logger.info(`Dial:updateMediaPath - ${this._mediaPath} => ${desiredPath}`);
-    switch (desiredPath) {
-      case MediaPath.NoMedia:
-        assert(this._mediaPath !== MediaPath.NoMedia, 'updateMediaPath: already no-media');
-        await this._releaseMedia(this.cs, this.sd, true);
-        break;
-
-      case MediaPath.PartialMedia:
-        assert(this._mediaPath !== MediaPath.PartialMedia, 'updateMediaPath: already partial-media');
-        if (this._mediaPath === MediaPath.FullMedia) {
-          await this._releaseMedia(this.cs, this.sd, false);
-        }
-        else {
-          // to go from no-media to partial-media we need to go through full-media first
-          await this.reAnchorMedia(this.cs, this.sd);
-          await this._releaseMedia(this.cs, this.sd, false);
-        }
-        assert(!this.epOther, 'updateMediaPath: epOther should be null');
-        assert(!this.ep, 'updateMediaPath: ep should be null');
-
-        break;
-      case MediaPath.FullMedia:
-        assert(this._mediaPath !== MediaPath.FullMedia, 'updateMediaPath: already full-media');
-        await this.reAnchorMedia(this.cs, this.sd);
-        break;
-
-      default:
-        assert(false, `updateMediaPath: invalid path request ${desiredPath}`);
-    }
-  }
-
   /**
    * Release the media from freeswitch
    * @param {*} cs
    * @param {*} sd
    */
-  async _releaseMedia(cs, sd, releaseEntirely = false) {
+  async _releaseMedia(cs, sd) {
     assert(cs.ep && sd.ep);
 
     try {
       // Wait until we got new SDP from B leg to ofter to A Leg
       const aLegSdp = cs.ep.remote.sdp;
-      await sd.releaseMediaToSBC(aLegSdp, cs.ep.local.sdp, releaseEntirely);
+      await sd.releaseMediaToSBC(aLegSdp, cs.ep.local.sdp);
       const bLegSdp = sd.dlg.remote.sdp;
-      await cs.releaseMediaToSBC(bLegSdp, releaseEntirely);
+      await cs.releaseMediaToSBC(bLegSdp);
       this.epOther = null;
-      this._mediaPath = releaseEntirely ? MediaPath.NoMedia : MediaPath.PartialMedia;
-      this.logger.info(
-        `Dial:_releaseMedia - successfully released media from freewitch, media path is now ${this._mediaPath}`);
+      this.logger.info('Dial:_releaseMedia - successfully released media from freewitch');
     } catch (err) {
       this.logger.info({err}, 'Dial:_releaseMedia error');
     }
@@ -982,14 +880,8 @@ class TaskDial extends Task {
     if (cs.ep && sd.ep) return;
 
     this.logger.info('Dial:reAnchorMedia - re-anchoring media to freewitch');
-    await Promise.all([sd.reAnchorMedia(this._mediaPath), cs.reAnchorMedia(this._mediaPath)]);
+    await Promise.all([sd.reAnchorMedia(), cs.reAnchorMedia()]);
     this.epOther = cs.ep;
-
-    this.epOther.bridge(this.ep);
-
-    this._mediaPath = MediaPath.FullMedia;
-    this.logger.info(
-      `Dial:_releaseMedia - successfully re-anchored media to freewitch, media path is now ${this._mediaPath}`);
   }
 
   // Handle RE-INVITE hold from caller leg.
@@ -1008,12 +900,11 @@ class TaskDial extends Task {
         }
         this._onHoldHook(req);
       } else if (!isOnhold(req.body)) {
-        if (this.epOther && this.ep && this.isIncomingLegHold &&
-          (this.canReleaseMedia || this.shouldExitMediaPathEntirely)) {
+        if (this.epOther && this.ep && this.isIncomingLegHold && this.canReleaseMedia) {
           // Offhold, time to release media
           const newSdp = await this.epOther.modify(req.body);
           await res.send(200, {body: newSdp});
-          await this._releaseMedia(this.cs, this.sd, this.shouldExitMediaPathEntirely);
+          await this._releaseMedia(this.cs, this.sd);
           isHandled = true;
         }
         this.isIncomingLegHold = false;
@@ -1072,8 +963,7 @@ class TaskDial extends Task {
               callInfo: this.cs.callInfo,
               accountInfo: this.cs.accountInfo,
               tasks,
-              rootSpan: this.cs.rootSpan,
-              req: this.cs.req
+              rootSpan: this.cs.rootSpan
             });
             await this._onHoldSession.exec();
             this._onHoldSession = null;

lib/tasks/enqueue.js

@@ -369,8 +369,7 @@ class TaskEnqueue extends Task {
         callInfo: cs.callInfo,
         accountInfo: cs.accountInfo,
         tasks: tasksToRun,
-        rootSpan: cs.rootSpan,
-        req: cs.req
+        rootSpan: cs.rootSpan
       });
       await this._playSession.exec();
       this._playSession = null;

lib/tasks/gather.js

@@ -11,8 +11,6 @@ const {
   NvidiaTranscriptionEvents,
   JambonzTranscriptionEvents,
   AssemblyAiTranscriptionEvents,
-  VoxistTranscriptionEvents,
-  OpenAITranscriptionEvents,
   VadDetection,
   VerbioTranscriptionEvents,
   SpeechmaticsTranscriptionEvents
@@ -26,7 +24,6 @@ const makeTask = require('./make_task');
 const assert = require('assert');
 const SttTask = require('./stt-task');
 const { SpeechCredentialError } = require('../utils/error');
-const SPEECHMATICS_DEFAULT_ASR_TIMEOUT = 1200;
 
 class TaskGather extends SttTask {
   constructor(logger, opts, parentTask) {
@@ -84,7 +81,6 @@ class TaskGather extends SttTask {
     this._bufferedTranscripts = [];
     this.partialTranscriptsCount = 0;
     this.bugname_prefix = 'gather_';
-
   }
 
   get name() { return TaskName.Gather; }
@@ -112,12 +108,6 @@ class TaskGather extends SttTask {
     return this.fillerNoise.startDelaySecs;
   }
 
-  get isStreamingTts() { return this.sayTask && this.sayTask.isStreamingTts; }
-
-  getTtsVendorData() {
-    if (this.sayTask) return this.sayTask.getTtsVendorData(this.cs);
-  }
-
   get summary() {
     let s = `${this.name}{`;
     if (this.input.length === 2) s += 'inputs=[speech,digits],';
@@ -150,6 +140,7 @@ class TaskGather extends SttTask {
   async handling(cs, {ep}) {
     this.logger.debug({options: this.data}, 'Gather:exec');
     await super.exec(cs, {ep});
+    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
 
     this.fillerNoise = {
       ...(cs.fillerNoise || {}),
@@ -165,23 +156,12 @@ class TaskGather extends SttTask {
       const {hints, hintsBoost} = cs.globalSttHints;
       const setOfHints = new Set((this.data.recognizer.hints || [])
         .concat(hints)
-        // allow for hints to be an array of object
-        .filter((h) => (typeof h === 'string' && h.length > 0) || (typeof h === 'object')));
+        .filter((h) => typeof h === 'string' && h.length > 0));
       this.data.recognizer.hints = [...setOfHints];
       if (!this.data.recognizer.hintsBoost && hintsBoost) this.data.recognizer.hintsBoost = hintsBoost;
       this.logger.debug({hints: this.data.recognizer.hints, hintsBoost: this.data.recognizer.hintsBoost},
         'Gather:exec - applying global sttHints');
     }
-
-    // specials case for speechmatics: they dont do endpointing so we need to enable continuous ASR
-    if (this.vendor === 'speechmatics' && !this.isContinuousAsr) {
-      const maxDelay = this.recognizer?.speechmaticsOptions?.transcription_config?.max_delay;
-      if (maxDelay) this.asrTimeout = Math.min(SPEECHMATICS_DEFAULT_ASR_TIMEOUT, maxDelay * 1000);
-      else this.asrTimeout = SPEECHMATICS_DEFAULT_ASR_TIMEOUT;
-      this.isContinuousAsr = true;
-      this.logger.debug(`Gather:exec - auto-enabling continuous ASR for speechmatics w/ timeout ${this.asrTimeout}`);
-    }
-
     if (!this.isContinuousAsr && cs.isContinuousAsr) {
       this.isContinuousAsr = true;
       this.asrTimeout = cs.asrTimeout * 1000;
@@ -230,6 +210,7 @@ class TaskGather extends SttTask {
             return;
           }
           this._startTranscribing(ep);
+          return updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
         } catch (e) {
           await this._startFallback(cs, ep, {error: e});
         }
@@ -241,7 +222,6 @@ class TaskGather extends SttTask {
         const {span, ctx} = this.startChildSpan(`nested:${this.sayTask.summary}`);
         const process = () => {
           this.logger.debug('Gather: nested say task completed');
-          this.playComplete = true;
           if (!this.listenDuringPrompt) {
             startDtmfListener();
           }
@@ -272,7 +252,6 @@ class TaskGather extends SttTask {
         const {span, ctx} = this.startChildSpan(`nested:${this.playTask.summary}`);
         const process = () => {
           this.logger.debug('Gather: nested play task completed');
-          this.playComplete = true;
           if (!this.listenDuringPrompt) {
             startDtmfListener();
           }
@@ -311,6 +290,8 @@ class TaskGather extends SttTask {
         await this._setSpeechHandlers(cs, ep);
         if (!this.resolved && !this.killed) {
           this._startTranscribing(ep);
+          updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
+            .catch(() => {/*already logged error */});
         }
         else {
           this.logger.info('Gather:exec - task was killed or resolved quickly, not starting transcription');
@@ -365,13 +346,6 @@ class TaskGather extends SttTask {
       this._killAudio(cs);
       this.emit('dtmf', evt);
     }
-    if (this.isContinuousAsr && evt.dtmf === this.asrDtmfTerminationDigit && this._bufferedTranscripts.length > 0) {
-      this.logger.info(`continuousAsr triggered with dtmf ${this.asrDtmfTerminationDigit}`);
-      this._clearAsrTimer();
-      this._clearTimer();
-      this._startFinalAsrTimer();
-      return;
-    }
     if (evt.dtmf === this.finishOnKey && this.input.includes('digits')) {
       resolved = true;
       this._resolve('dtmf-terminator-key');
@@ -394,6 +368,13 @@ class TaskGather extends SttTask {
         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;
@@ -535,17 +516,6 @@ class TaskGather extends SttTask {
           this._onVendorConnectFailure.bind(this, cs, ep));
         break;
 
-      case 'voxist':
-        this.bugname = `${this.bugname_prefix}voxist_transcribe`;
-        this.addCustomEventListener(ep, VoxistTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep));
-        this.addCustomEventListener(
-          ep, VoxistTranscriptionEvents.Connect, this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, VoxistTranscriptionEvents.Error, this._onVendorError.bind(this, cs, ep));
-        this.addCustomEventListener(ep, VoxistTranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep));
-        break;
-
       case 'speechmatics':
         this.bugname = `${this.bugname_prefix}speechmatics_transcribe`;
         this.addCustomEventListener(
@@ -563,31 +533,6 @@ class TaskGather extends SttTask {
 
         break;
 
-      case 'openai':
-        this.bugname = `${this.bugname_prefix}openai_transcribe`;
-        this.addCustomEventListener(
-          ep, OpenAITranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        this.addCustomEventListener(
-          ep, OpenAITranscriptionEvents.SpeechStarted, this._onOpenAISpeechStarted.bind(this, cs, ep));
-        this.addCustomEventListener(
-          ep, OpenAITranscriptionEvents.SpeechStopped, this._onOpenAISpeechStopped.bind(this, cs, ep));
-        this.addCustomEventListener(ep, OpenAITranscriptionEvents.Connect,
-          this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, OpenAITranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep));
-        this.addCustomEventListener(ep, OpenAITranscriptionEvents.Error,
-          this._onOpenAIErrror.bind(this, cs, ep));
-
-        /* openai delta transcripts are useful only for minBargeinWordCount eval */
-        if (this.minBargeinWordCount > 1) {
-          this.openaiPartials = [];
-          opts.OPENAI_WANT_PARTIALS = 1;
-          this.addCustomEventListener(
-            ep, OpenAITranscriptionEvents.PartialTranscript, this._onOpenAIPartialTranscript.bind(this, cs, ep));
-        }
-        this.modelSupportsConversationTracking = opts.OPENAI_MODEL !== 'whisper-1';
-        break;
-
       default:
         if (this.vendor.startsWith('custom:')) {
           this.bugname = `${this.bugname_prefix}${this.vendor}_transcribe`;
@@ -612,32 +557,13 @@ class TaskGather extends SttTask {
   }
 
   _startTranscribing(ep) {
-    this.logger.info({
+    this.logger.debug({
       vendor: this.vendor,
       locale: this.language,
       interim: this.interim,
       bugname: this.bugname
     }, 'Gather:_startTranscribing');
 
-
-    /* special feature for openai: we can provide a prompt that includes recent conversation history */
-    let prompt;
-    if (this.vendor === 'openai') {
-      if (this.modelSupportsConversationTracking) {
-        prompt = this.formatOpenAIPrompt(this.cs, {
-          prompt: this.data.recognizer?.openaiOptions?.prompt,
-          hintsTemplate: this.data.recognizer?.openaiOptions?.promptTemplates?.hintsTemplate,
-          // eslint-disable-next-line max-len
-          conversationHistoryTemplate: this.data.recognizer?.openaiOptions?.promptTemplates?.conversationHistoryTemplate,
-          hints: this.data.recognizer?.hints,
-        });
-        this.logger.debug({prompt}, 'Gather:_startTranscribing - created an openai prompt');
-      }
-      else if (this.data.recognizer?.hints?.length > 0) {
-        prompt = this.data.recognizer?.hints.join(', ');
-      }
-    }
-
     /**
      * Note: we don't need to ask deepgram for interim results, because they
      * already send us words as they are finalized (is_final=true) even before
@@ -649,7 +575,6 @@ class TaskGather extends SttTask {
       interim: this.interim,
       bugname: this.bugname,
       hostport: this.hostport,
-      prompt
     }).catch((err) => {
       const {writeAlerts, AlertType} = this.cs.srf.locals;
       this.logger.error(err, 'TaskGather:_startTranscribing error');
@@ -685,24 +610,15 @@ class TaskGather extends SttTask {
   }
 
   _startAsrTimer() {
-    // Deepgram has a case that UtteranceEnd is not sent to cover the last word end time.
-    // So we need to wait for the asrTimeout to be sure that the last word is sent.
-    // if (this.vendor === 'deepgram') return; // no need
+    if (this.vendor === 'deepgram') return; // no need
     assert(this.isContinuousAsr);
     this._clearAsrTimer();
     this._asrTimer = setTimeout(() => {
-      this.logger.info('_startAsrTimer - asr timer went off');
+      this.logger.debug('_startAsrTimer - asr timer went off');
       const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
-
-      /* special case for speechmatics - keep listening if we dont have any transcripts */
-      if (this.vendor === 'speechmatics' && this._bufferedTranscripts.length === 0) {
-        this.logger.debug('Gather:_startAsrTimer - speechmatics, no transcripts yet, keep listening');
-        this._startAsrTimer();
-        return;
-      }
       this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout', evt);
     }, this.asrTimeout);
-    this.logger.info(`_startAsrTimer: set for ${this.asrTimeout}ms`);
+    this.logger.debug(`_startAsrTimer: set for ${this.asrTimeout}ms`);
   }
 
   _clearAsrTimer() {
@@ -714,7 +630,7 @@ class TaskGather extends SttTask {
   }
 
   _hangupCall() {
-    this.logger.debug('TaskGather:_hangupCall');
+    this.logger.debug('_hangupCall');
     this.cs.hangup();
   }
 
@@ -737,7 +653,7 @@ class TaskGather extends SttTask {
   _startFinalAsrTimer() {
     this._clearFinalAsrTimer();
     this._finalAsrTimer = setTimeout(() => {
-      this.logger.info('_startFinalAsrTimer - final asr timer went off');
+      this.logger.debug('_startFinalAsrTimer - final asr timer went off');
       const evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
       this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout', evt);
     }, 1000);
@@ -810,7 +726,6 @@ class TaskGather extends SttTask {
         this._fillerNoiseOn = false;  // in a race, if we just started audio it may sneak through here
         this.ep.api('uuid_break', this.ep.uuid)
           .catch((err) => this.logger.info(err, 'Error killing audio'));
-        cs.clearTtsStream();
       }
       return;
     }
@@ -832,31 +747,20 @@ class TaskGather extends SttTask {
     const bugname = fsEvent.getHeader('media-bugname');
     const finished = fsEvent.getHeader('transcription-session-finished');
     this.logger.debug({evt, bugname, finished, vendor: this.vendor}, 'Gather:_onTranscription raw transcript');
-    if (bugname && this.bugname !== bugname) {
-      this.logger.info(
-        `Gather:_onTranscription - ignoring transcript from ${bugname} because our bug is ${this.bugname}`);
-      return;
-    }
+    if (bugname && this.bugname !== bugname) return;
     if (finished === 'true') return;
 
     if (this.vendor === 'ibm' && evt?.state === 'listening') return;
     if (this.vendor === 'deepgram' && evt.type === 'UtteranceEnd') {
       /* we will only get this when we have set utterance_end_ms */
       if (this._bufferedTranscripts.length === 0) {
-        this.logger.info('Gather:_onTranscription - got UtteranceEnd event from deepgram but no buffered transcripts');
+        this.logger.debug('Gather:_onTranscription - got UtteranceEnd event from deepgram but no buffered transcripts');
       }
       else {
-        const utteranceTime = evt.last_word_end;
-        // eslint-disable-next-line max-len
-        if (utteranceTime && this._dgTimeOfLastUnprocessedWord && utteranceTime < this._dgTimeOfLastUnprocessedWord && utteranceTime != -1) {
-          this.logger.info('Gather:_onTranscription - got UtteranceEnd with unprocessed words, continue listening');
-        }
-        else {
-          this.logger.info('Gather:_onTranscription - got UtteranceEnd from deepgram, return buffered transcript');
-          evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
-          this._bufferedTranscripts = [];
-          this._resolve('speech', evt);
-        }
+        this.logger.debug('Gather:_onTranscription - got UtteranceEnd event from deepgram, return buffered transcript');
+        evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
+        this._bufferedTranscripts = [];
+        this._resolve('speech', evt);
       }
       return;
     }
@@ -867,7 +771,7 @@ class TaskGather extends SttTask {
 
     evt = this.normalizeTranscription(evt, this.vendor, 1, this.language,
       this.shortUtterance, this.data.recognizer.punctuation);
-    //this.logger.debug({evt, bugname, finished, vendor: this.vendor}, 'Gather:_onTranscription normalized transcript');
+    this.logger.debug({evt, bugname, finished, vendor: this.vendor}, 'Gather:_onTranscription normalized transcript');
 
     if (evt.alternatives.length === 0) {
       this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, continue listening');
@@ -875,6 +779,8 @@ class TaskGather extends SttTask {
     }
     const confidence = evt.alternatives[0].confidence;
     const minConfidence = this.data.recognizer?.minConfidence;
+    this.logger.debug({evt},
+      `TaskGather:_onTranscription - confidence (${confidence}), minConfidence (${minConfidence})`);
     if (confidence && minConfidence && confidence < minConfidence) {
       this.logger.info({evt},
         'TaskGather:_onTranscription - Transcript confidence ' +
@@ -928,7 +834,7 @@ class TaskGather extends SttTask {
         const t = evt.alternatives[0].transcript;
         if (t) {
           /* remove trailing punctuation */
-          if (this.vendor !== 'speechmatics' && /[,;:\.!\?]$/.test(t)) {
+          if (/[,;:\.!\?]$/.test(t)) {
             this.logger.debug('TaskGather:_onTranscription - removing trailing punctuation');
             evt.alternatives[0].transcript = t.slice(0, -1);
           }
@@ -944,10 +850,7 @@ class TaskGather extends SttTask {
         this._startAsrTimer();
 
         /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'speechmatics'].includes(this.vendor) &&
-          !this.vendor.startsWith('custom')) {
-          this._startTranscribing(ep);
-        }
+        if (!['soniox', 'aws', 'microsoft', 'deepgram'].includes(this.vendor)) this._startTranscribing(ep);
       }
       else {
         /* this was removed to fix https://github.com/jambonz/jambonz-feature-server/issues/783 */
@@ -990,21 +893,8 @@ class TaskGather extends SttTask {
         if (originalEvent.is_final && evt.alternatives[0].transcript !== '') {
           this.logger.debug({evt}, 'Gather:_onTranscription - buffering a completed (partial) deepgram transcript');
           this._bufferedTranscripts.push(evt);
-          this._dgTimeOfLastUnprocessedWord = null;
-        }
-        if (evt.alternatives[0].transcript === '') {
-          emptyTranscript = true;
-        }
-        else if (!originalEvent.is_final) {
-          /* Deepgram: we have unprocessed words-save last word end time so we can later compare to UtteranceEnd */
-          const words = originalEvent.channel.alternatives[0].words;
-          if (words?.length > 0) {
-            this._dgTimeOfLastUnprocessedWord = words.slice(-1)[0].end;
-            this.logger.debug(
-              `TaskGather:_onTranscription - saving word end time: ${this._dgTimeOfLastUnprocessedWord}`);
-          }
-
         }
+        if (evt.alternatives[0].transcript === '') emptyTranscript = true;
       }
 
       if (!emptyTranscript) {
@@ -1034,7 +924,7 @@ class TaskGather extends SttTask {
         }
       }
       // If transcription received, reset timeout timer.
-      if (this._timeoutTimer && !emptyTranscript) {
+      if (this._timeoutTimer) {
         this._startTimer();
       }
       /* restart asr timer if we get a partial transcript (only if the asr timer is already running) */
@@ -1079,6 +969,7 @@ class TaskGather extends SttTask {
         bugname: this.bugname
       })
         .catch((err) => this.logger.error({err}, `Error stopping transcription for primary vendor ${this.vendor}`));
+      const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
       try {
         this.logger.debug('gather:_startFallback');
         this.notifyError({ msg: 'ASR error',
@@ -1087,6 +978,7 @@ class TaskGather extends SttTask {
         this._speechHandlersSet = false;
         await this._setSpeechHandlers(cs, ep);
         this._startTranscribing(ep);
+        updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
         return true;
       } catch (error) {
         this.logger.info({error}, `There is error while falling back to ${this.fallbackVendor}`);
@@ -1140,33 +1032,6 @@ class TaskGather extends SttTask {
     this._onVendorError(cs, _ep, {error: JSON.stringify(e)});
   }
 
-  async _onOpenAIErrror(cs, _ep, evt) {
-    // eslint-disable-next-line no-unused-vars
-    const {message, ...e} = evt;
-    this._onVendorError(cs, _ep, {error: JSON.stringify(e)});
-  }
-
-  async _onOpenAISpeechStarted(cs, _ep, evt) {
-    this.logger.debug({evt}, 'TaskGather:_onOpenAISpeechStarted');
-  }
-
-  async _onOpenAISpeechStopped(cs, _ep, evt) {
-    this.logger.debug({evt}, 'TaskGather:_onOpenAISpeechStopped');
-  }
-
-  async _onOpenAIPartialTranscript(cs, _ep, evt) {
-    if (!this.playComplete) {
-      const words = evt.delta.split(' ').filter((w) => /[A-Za-z0-0]/.test(w));
-      this.openaiPartials.push(...words);
-      this.logger.debug({words, partials: this.openaiPartials, evt}, 'TaskGather:_onOpenAIPartialTranscript - words');
-      if (this.openaiPartials.length >= this.minBargeinWordCount) {
-        this.logger.debug({partials: this.openaiPartials}, 'killing audio due to speech (openai)');
-        this._killAudio(cs);
-        this.notifyStatus({event: 'speech-bargein-detected', words: this.openaiPartials});
-      }
-    }
-  }
-
   async _onVendorError(cs, _ep, evt) {
     super._onVendorError(cs, _ep, evt);
     if (!(await this._startFallback(cs, _ep, evt))) {
@@ -1208,7 +1073,7 @@ class TaskGather extends SttTask {
   }
 
   async _resolve(reason, evt) {
-    this.logger.info({evt}, `TaskGather:resolve with reason ${reason}`);
+    this.logger.debug(`TaskGather:resolve with reason ${reason}`);
     if (this.needsStt && this.ep && this.ep.connected) {
       this.ep.stopTranscription({
         vendor: this.vendor,
@@ -1244,7 +1109,7 @@ class TaskGather extends SttTask {
     });
 
     if (this.callSession && this.callSession.callGone) {
-      this.logger.info('TaskGather:_resolve - call is gone, not invoking web callback');
+      this.logger.debug('TaskGather:_resolve - call is gone, not invoking web callback');
       this.notifyTaskDone();
       return;
     }
@@ -1276,7 +1141,6 @@ class TaskGather extends SttTask {
         }
       }
       else if (reason.startsWith('speech')) {
-        this.cs.emit('userSaid', evt.alternatives[0].transcript);
         if (this.parentTask) this.parentTask.emit('transcription', evt);
         else {
           this.emit('transcription', evt);
@@ -1302,12 +1166,13 @@ class TaskGather extends SttTask {
         if (this.parentTask) this.parentTask.emit('stt-low-confidence', evt);
         else {
           this.emit('stt-low-confidence', evt);
-          returnedVerbs = await this.performAction({speech:evt, reason: 'stt-low-confidence'});
+          returnedVerbs = await this.performAction({reason: 'stt-low-confidence'});
         }
       }
     } catch (err) {  /*already logged error*/ }
 
     // Gather got response from hook, cancel actionHookDelay processing
+    this.logger.debug('TaskGather:_resolve - checking ahd');
     if (this.cs.actionHookDelayProcessor) {
       if (returnedVerbs) {
         this.logger.debug('TaskGather:_resolve - got response from action hook, cancelling actionHookDelay');

lib/tasks/listen.js

@@ -17,7 +17,7 @@ class TaskListen extends Task {
 
     [
       'action', 'auth', 'method', 'url', 'finishOnKey', 'maxLength', 'metadata', 'mixType', 'passDtmf', 'playBeep',
-      'sampleRate', 'timeout', 'transcribe', 'wsAuth', 'disableBidirectionalAudio', 'channel'
+      'sampleRate', 'timeout', 'transcribe', 'wsAuth', 'disableBidirectionalAudio'
     ].forEach((k) => this[k] = this.data[k]);
 
     this.mixType = this.mixType || 'mono';
@@ -221,7 +221,7 @@ class TaskListen extends Task {
     }
   }
   _onConnect(ep) {
-    this.logger.info('TaskListen:_onConnect');
+    this.logger.debug('TaskListen:_onConnect');
   }
   _onConnectFailure(ep, evt) {
     this.logger.info(evt, 'TaskListen:_onConnectFailure');

lib/tasks/llm/index.js

@@ -1,11 +1,6 @@
 const Task = require('../task');
 const {TaskPreconditions} = require('../../utils/constants');
 const TaskLlmOpenAI_S2S = require('./llms/openai_s2s');
-const TaskLlmVoiceAgent_S2S = require('./llms/voice_agent_s2s');
-const TaskLlmUltravox_S2S = require('./llms/ultravox_s2s');
-const TaskLlmElevenlabs_S2S = require('./llms/elevenlabs_s2s');
-const TaskLlmGoogle_S2S = require('./llms/google_s2s');
-const LlmMcpService = require('../../utils/llm-mcp');
 
 class TaskLlm extends Task {
   constructor(logger, opts) {
@@ -20,8 +15,6 @@ class TaskLlm extends Task {
 
     // delegate to the specific llm model
     this.llm = this.createSpecificLlm();
-    // MCP
-    this.mcpServers = this.data.mcpServers || [];
   }
 
   get name() { return this.llm.name ; }
@@ -32,32 +25,14 @@ class TaskLlm extends Task {
 
   get ep() { return this.cs.ep; }
 
-  get mcpService() {
-    return this.llmMcpService;
-  }
-
-  get isMcpEnabled() {
-    return this.mcpServers.length > 0;
-  }
-
   async exec(cs, {ep}) {
     await super.exec(cs, {ep});
-
-    // create the MCP service if we have MCP servers
-    if (this.isMcpEnabled) {
-      this.llmMcpService = new LlmMcpService(this.logger, this.mcpServers);
-      await this.llmMcpService.init();
-    }
     await this.llm.exec(cs, {ep});
   }
 
   async kill(cs) {
     super.kill(cs);
     await this.llm.kill(cs);
-    // clean up MCP clients
-    if (this.isMcpEnabled) {
-      await this.mcpService.close();
-    }
   }
 
   createSpecificLlm() {
@@ -65,26 +40,10 @@ class TaskLlm extends Task {
     switch (this.vendor) {
       case 'openai':
       case 'microsoft':
-        llm = new TaskLlmOpenAI_S2S(this.logger, this.data, this);
+        if (this.model.startsWith('gpt-4o-realtime')) {
+          llm = new TaskLlmOpenAI_S2S(this.logger, this.data, this);
+        }
         break;
-
-      case 'voiceagent':
-      case 'deepgram':
-        llm = new TaskLlmVoiceAgent_S2S(this.logger, this.data, this);
-        break;
-
-      case 'ultravox':
-        llm = new TaskLlmUltravox_S2S(this.logger, this.data, this);
-        break;
-
-      case 'elevenlabs':
-        llm = new TaskLlmElevenlabs_S2S(this.logger, this.data, this);
-        break;
-
-      case 'google':
-        llm = new TaskLlmGoogle_S2S(this.logger, this.data, this);
-        break;
-
       default:
         throw new Error(`Unsupported vendor ${this.vendor} for LLM`);
     }
@@ -108,15 +67,8 @@ class TaskLlm extends Task {
     await this.cs?.requestor.request('llm:event', this.eventHook, data);
   }
 
-
   async sendToolHook(tool_call_id, data) {
-    const tool_response = await this.cs?.requestor.request('llm:tool-call', this.toolHook, {tool_call_id, ...data});
-    // if the toolHook was a websocket it will return undefined, otherwise it should return an object
-    if (typeof tool_response != 'undefined') {
-      tool_response.type = 'client_tool_result';
-      tool_response.invocation_id = tool_call_id;
-      this.processToolOutput(tool_call_id, tool_response);
-    }
+    await this.cs?.requestor.request('llm:tool-call', this.toolHook, {tool_call_id, ...data});
   }
 
   async processToolOutput(tool_call_id, data) {

lib/tasks/llm/llms/elevenlabs_s2s.js

@@ -1,327 +0,0 @@
-const Task = require('../../task');
-const TaskName = 'Llm_Elevenlabs_s2s';
-const {LlmEvents_Elevenlabs} = require('../../../utils/constants');
-const {request} = require('undici');
-const ClientEvent = 'client.event';
-const SessionDelete = 'session.delete';
-
-const elevenlabs_server_events = [
-  'conversation_initiation_metadata',
-  'user_transcript',
-  'agent_response',
-  'client_tool_call'
-];
-
-const expandWildcards = (events) => {
-  const expandedEvents = [];
-
-  events.forEach((evt) => {
-    if (evt.endsWith('.*')) {
-      const prefix = evt.slice(0, -2); // Remove the wildcard ".*"
-      const matchingEvents = elevenlabs_server_events.filter((e) => e.startsWith(prefix));
-      expandedEvents.push(...matchingEvents);
-    } else {
-      expandedEvents.push(evt);
-    }
-  });
-
-  return expandedEvents;
-};
-
-class TaskLlmElevenlabs_S2S extends Task {
-  constructor(logger, opts, parentTask) {
-    super(logger, opts, parentTask);
-    this.parent = parentTask;
-
-    this.vendor = this.parent.vendor;
-    this.auth = this.parent.auth;
-
-    const {agent_id, api_key} = this.auth || {};
-    if (!agent_id) throw new Error('auth.agent_id is required for Elevenlabs S2S');
-
-    this.agent_id = agent_id;
-    this.api_key = api_key;
-    this.actionHook = this.data.actionHook;
-    this.eventHook = this.data.eventHook;
-    this.toolHook = this.data.toolHook;
-    const {
-      conversation_initiation_client_data,
-      input_sample_rate = 16000,
-      output_sample_rate = 16000
-    } = this.data.llmOptions;
-    this.conversation_initiation_client_data = conversation_initiation_client_data;
-    this.input_sample_rate = input_sample_rate;
-    this.output_sample_rate = output_sample_rate;
-    this.results = {
-      completionReason: 'normal conversation end'
-    };
-
-    /**
-     * only one of these will have items,
-     * if includeEvents, then these are the events to include
-     * if excludeEvents, then these are the events to exclude
-     */
-    this.includeEvents = [];
-    this.excludeEvents = [];
-
-    /* default to all events if user did not specify */
-    this._populateEvents(this.data.events || elevenlabs_server_events);
-
-    this.addCustomEventListener = parentTask.addCustomEventListener.bind(parentTask);
-    this.removeCustomEventListeners = parentTask.removeCustomEventListeners.bind(parentTask);
-  }
-
-  get name() { return TaskName; }
-
-  async getSignedUrl() {
-    if (!this.api_key) {
-      return {
-        host: 'api.elevenlabs.io',
-        path: `/v1/convai/conversation?agent_id=${this.agent_id}`,
-      };
-    }
-
-    const {statusCode, body} = await request(
-      `https://api.elevenlabs.io/v1/convai/conversation/get_signed_url?agent_id=${this.agent_id}`, {
-        method: 'GET',
-        headers: {
-          'xi-api-key': this.api_key
-        },
-      }
-    );
-    const data = await body.json();
-    if (statusCode !== 200 || !data?.signed_url) {
-      this.logger.error({statusCode, data}, 'Elevenlabs Error registering call');
-      throw new Error(`Elevenlabs  Error registering call: ${data.message}`);
-    }
-
-    const url = new URL(data.signed_url);
-    return {
-      host: url.hostname,
-      path: url.pathname + url.search,
-    };
-  }
-
-  async _api(ep, args) {
-    const res = await ep.api('uuid_elevenlabs_s2s', `^^|${args.join('|')}`);
-    if (!res.body?.startsWith('+OK')) {
-      throw new Error({args}, `Error calling uuid_elevenlabs_s2s: ${res.body}`);
-    }
-  }
-
-  async exec(cs, {ep}) {
-    await super.exec(cs);
-    await this._startListening(cs, ep);
-
-    await this.awaitTaskDone();
-
-    /* note: the parent llm verb started the span, which is why this is necessary */
-    await this.parent.performAction(this.results);
-
-    this._unregisterHandlers();
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-
-    this._api(cs.ep, [cs.ep.uuid, SessionDelete])
-      .catch((err) => this.logger.info({err}, 'TaskLlmElevenlabs_S2S:kill - error deleting session'));
-
-    this.notifyTaskDone();
-  }
-
-  /**
-   * Send function call output to the Elevenlabs server in the form of conversation.item.create
-   * per https://elevenlabs.io/docs/conversational-ai/api-reference/conversational-ai/websocket
-   */
-  async processToolOutput(ep, tool_call_id, rawData) {
-    try {
-      const {data} = rawData;
-      this.logger.debug({tool_call_id, data}, 'TaskLlmElevenlabs_S2S:processToolOutput');
-
-      if (!data.type || data.type !== 'client_tool_result') {
-        this.logger.info({data},
-          'TaskLlmElevenlabs_S2S:processToolOutput - invalid tool output, must be client_tool_result');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TaskLlmElevenlabs_S2S:processToolOutput');
-    }
-  }
-
-  /**
-   * Send a session.update to the Elevenlabs server
-   * Note: creating and deleting conversation items also supported as well as interrupting the assistant
-   */
-  async processLlmUpdate(ep, data, _callSid) {
-    this.logger.debug({data, _callSid}, 'TaskLlmElevenlabs_S2S:processLlmUpdate, ignored');
-  }
-
-  async _startListening(cs, ep) {
-    this._registerHandlers(ep);
-
-    try {
-      const {host, path} = await this.getSignedUrl();
-      const args = this.conversation_initiation_client_data ?
-        [ep.uuid, 'session.create', this.input_sample_rate, this.output_sample_rate, host, path] :
-        [ep.uuid, 'session.create', this.input_sample_rate, this.output_sample_rate, host, path, 'no_initial_config'];
-      await this._api(ep, args);
-    } catch (err) {
-      this.logger.error({err}, 'TaskLlmElevenlabs_S2S:_startListening');
-      this.notifyTaskDone();
-    }
-  }
-
-  async _sendClientEvent(ep, obj) {
-    let ok = true;
-    this.logger.debug({obj}, 'TaskLlmElevenlabs_S2S:_sendClientEvent');
-    try {
-      const args = [ep.uuid, ClientEvent, JSON.stringify(obj)];
-      await this._api(ep, args);
-    } catch (err) {
-      ok = false;
-      this.logger.error({err}, 'TaskLlmElevenlabs_S2S:_sendClientEvent - Error');
-    }
-    return ok;
-  }
-
-  async _sendInitialMessage(ep) {
-    if (this.conversation_initiation_client_data) {
-      if (!await this._sendClientEvent(ep, {
-        type: 'conversation_initiation_client_data',
-        ...this.conversation_initiation_client_data
-      })) {
-        this.notifyTaskDone();
-      }
-    }
-  }
-
-  _registerHandlers(ep) {
-    this.addCustomEventListener(ep, LlmEvents_Elevenlabs.Connect, this._onConnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_Elevenlabs.ConnectFailure, this._onConnectFailure.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_Elevenlabs.Disconnect, this._onDisconnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_Elevenlabs.ServerEvent, this._onServerEvent.bind(this, ep));
-  }
-
-  _unregisterHandlers() {
-    this.removeCustomEventListeners();
-  }
-
-  _onError(ep, evt) {
-    this.logger.info({evt}, 'TaskLlmElevenlabs_S2S:_onError');
-    this.notifyTaskDone();
-  }
-
-  _onConnect(ep) {
-    this.logger.debug('TaskLlmElevenlabs_S2S:_onConnect');
-    this._sendInitialMessage(ep);
-  }
-  _onConnectFailure(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmElevenlabs_S2S:_onConnectFailure');
-    this.results = {completionReason: 'connection failure'};
-    this.notifyTaskDone();
-  }
-  _onDisconnect(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmElevenlabs_S2S:_onConnectFailure');
-    this.results = {completionReason: 'disconnect from remote end'};
-    this.notifyTaskDone();
-  }
-  async _onServerEvent(ep, evt) {
-    let endConversation = false;
-    const type = evt.type;
-    this.logger.info({evt}, 'TaskLlmElevenlabs_S2S:_onServerEvent');
-
-    if (type === 'error') {
-      endConversation = true;
-      this.results = {
-        completionReason: 'server error',
-        error: evt.error
-      };
-    }
-
-    /* tool calls */
-    else if (type === 'client_tool_call') {
-      this.logger.debug({evt}, 'TaskLlmElevenlabs_S2S:_onServerEvent - function_call');
-      const {tool_name: name, tool_call_id: call_id, parameters: args} = evt.client_tool_call;
-
-      const mcpTools = this.parent.isMcpEnabled ? await this.parent.mcpService.getAvailableMcpTools() : [];
-      if (mcpTools.some((tool) => tool.name === name)) {
-        this.logger.debug({name, args}, 'TaskLlmElevenlabs_S2S:_onServerEvent - calling mcp tool');
-        try {
-          const res = await this.parent.mcpService.callMcpTool(name, args);
-          this.logger.debug({res}, 'TaskLlmElevenlabs_S2S:_onServerEvent - function_call - mcp result');
-          this.processToolOutput(ep, call_id, {
-            data: {
-              type: 'client_tool_result',
-              tool_call_id: call_id,
-              result: res.content?.length ? res.content[0] : res.content,
-              is_error: false
-            }
-          });
-          return;
-        }
-        catch (err) {
-          this.logger.info({err, evt}, 'TaskLlmElevenlabs_S2S - error calling mcp tool');
-          this.results = {
-            completionReason: 'client error calling mcp function',
-            error: err
-          };
-          endConversation = true;
-        }
-      } else if (!this.toolHook) {
-        this.logger.warn({evt}, 'TaskLlmElevenlabs_S2S:_onServerEvent - no toolHook defined!');
-      }
-      else {
-        try {
-          await this.parent.sendToolHook(call_id, {name, args});
-        } catch (err) {
-          this.logger.info({err, evt}, 'TaskLlmElevenlabs_S2S - error calling function');
-          this.results = {
-            completionReason: 'client error calling function',
-            error: err
-          };
-          endConversation = true;
-        }
-      }
-    }
-
-    /* check whether we should notify on this event */
-    if (this.includeEvents.length > 0 ? this.includeEvents.includes(type) : !this.excludeEvents.includes(type)) {
-      this.parent.sendEventHook(evt)
-        .catch((err) => this.logger.info({err},
-          'TaskLlmElevenlabs_S2S:_onServerEvent - error sending event hook'));
-    }
-
-    if (endConversation) {
-      this.logger.info({results: this.results},
-        'TaskLlmElevenlabs_S2S:_onServerEvent - ending conversation due to error');
-      this.notifyTaskDone();
-    }
-  }
-
-  _populateEvents(events) {
-    if (events.includes('all')) {
-      /* work by excluding specific events */
-      const exclude = events
-        .filter((evt) => evt.startsWith('-'))
-        .map((evt) => evt.slice(1));
-      if (exclude.length === 0) this.includeEvents = elevenlabs_server_events;
-      else this.excludeEvents = expandWildcards(exclude);
-    }
-    else {
-      /* work by including specific events */
-      const include = events
-        .filter((evt) => !evt.startsWith('-'));
-      this.includeEvents = expandWildcards(include);
-    }
-
-    this.logger.debug({
-      includeEvents: this.includeEvents,
-      excludeEvents: this.excludeEvents
-    }, 'TaskLlmElevenlabs_S2S:_populateEvents');
-  }
-}
-
-module.exports = TaskLlmElevenlabs_S2S;

lib/tasks/llm/llms/google_s2s.js

@@ -1,319 +0,0 @@
-const Task = require('../../task');
-const TaskName = 'Llm_Google_s2s';
-const {LlmEvents_Google} = require('../../../utils/constants');
-const ClientEvent = 'client.event';
-const SessionDelete = 'session.delete';
-
-const google_server_events = [
-  'error',
-  'session.created',
-  'session.updated',
-];
-
-const expandWildcards = (events) => {
-  const expandedEvents = [];
-
-  events.forEach((evt) => {
-    if (evt.endsWith('.*')) {
-      const prefix = evt.slice(0, -2); // Remove the wildcard ".*"
-      const matchingEvents = google_server_events.filter((e) => e.startsWith(prefix));
-      expandedEvents.push(...matchingEvents);
-    } else {
-      expandedEvents.push(evt);
-    }
-  });
-
-  return expandedEvents;
-};
-
-class TaskLlmGoogle_S2S extends Task {
-  constructor(logger, opts, parentTask) {
-    super(logger, opts, parentTask);
-    this.parent = parentTask;
-
-    this.vendor = this.parent.vendor;
-    this.vendor = this.parent.vendor;
-    this.model = this.parent.model || 'models/gemini-2.0-flash-live-001';
-    this.auth = this.parent.auth;
-    this.connectionOptions = this.parent.connectOptions;
-
-    const {apiKey} = this.auth || {};
-    if (!apiKey) throw new Error('auth.apiKey is required for Google S2S');
-
-    this.apiKey = apiKey;
-
-    this.actionHook = this.data.actionHook;
-    this.eventHook = this.data.eventHook;
-    this.toolHook = this.data.toolHook;
-
-    const {setup} = this.data.llmOptions;
-
-    if (typeof setup !== 'object') {
-      throw new Error('llmOptions with an initial setup is required for Google S2S');
-    }
-    this.setup = {
-      ...setup,
-      model: this.model,
-      // make sure output is always audio
-      generationConfig: {
-        ...(setup.generationConfig || {}),
-        responseModalities: 'audio'
-      }
-    };
-
-    this.results = {
-      completionReason: 'normal conversation end'
-    };
-
-    /**
-     * only one of these will have items,
-     * if includeEvents, then these are the events to include
-     * if excludeEvents, then these are the events to exclude
-     */
-    this.includeEvents = [];
-    this.excludeEvents = [];
-
-    /* default to all events if user did not specify */
-    this._populateEvents(this.data.events || google_server_events);
-
-    this.addCustomEventListener = parentTask.addCustomEventListener.bind(parentTask);
-    this.removeCustomEventListeners = parentTask.removeCustomEventListeners.bind(parentTask);
-  }
-
-  get name() { return TaskName; }
-
-  async _api(ep, args) {
-    const res = await ep.api('uuid_google_s2s', `^^|${args.join('|')}`);
-    if (!res.body?.startsWith('+OK')) {
-      throw new Error({args}, `Error calling uuid_openai_s2s: ${res.body}`);
-    }
-  }
-
-  async exec(cs, {ep}) {
-    await super.exec(cs);
-
-    await this._startListening(cs, ep);
-
-    await this.awaitTaskDone();
-
-    /* note: the parent llm verb started the span, which is why this is necessary */
-    await this.parent.performAction(this.results);
-
-    this._unregisterHandlers();
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-
-    this._api(cs.ep, [cs.ep.uuid, SessionDelete])
-      .catch((err) => this.logger.info({err}, 'TaskLlmGoogle_S2S:kill - error deleting session'));
-
-    this.notifyTaskDone();
-  }
-
-  _populateEvents(events) {
-    if (events.includes('all')) {
-      /* work by excluding specific events */
-      const exclude = events
-        .filter((evt) => evt.startsWith('-'))
-        .map((evt) => evt.slice(1));
-      if (exclude.length === 0) this.includeEvents = google_server_events;
-      else this.excludeEvents = expandWildcards(exclude);
-    }
-    else {
-      /* work by including specific events */
-      const include = events
-        .filter((evt) => !evt.startsWith('-'));
-      this.includeEvents = expandWildcards(include);
-    }
-
-    this.logger.debug({
-      includeEvents: this.includeEvents,
-      excludeEvents: this.excludeEvents
-    }, 'TaskLlmGoogle_S2S:_populateEvents');
-  }
-
-  async _startListening(cs, ep) {
-    this._registerHandlers(ep);
-
-    try {
-      const args = [ep.uuid, 'session.create', this.apiKey];
-      await this._api(ep, args);
-    } catch (err) {
-      this.logger.error({err}, 'TaskLlmGoogle_S2S:_startListening');
-      this.notifyTaskDone();
-    }
-  }
-
-  async _sendClientEvent(ep, obj) {
-    let ok = true;
-    this.logger.debug({obj}, 'TaskLlmGoogle_S2S:_sendClientEvent');
-    try {
-      const args = [ep.uuid, ClientEvent, JSON.stringify(obj)];
-      await this._api(ep, args);
-    } catch (err) {
-      ok = false;
-      this.logger.error({err}, 'TaskLlmGoogle_S2S:_sendClientEvent - Error');
-    }
-    return ok;
-  }
-
-  async _sendInitialMessage(ep) {
-    const setup = this.setup;
-    const mcpTools = this.parent.isMcpEnabled ? await this.parent.mcpService.getAvailableMcpTools() : [];
-    if (mcpTools && mcpTools.length > 0) {
-      const convertedTools = [
-        {
-          functionDeclarations: mcpTools.map((tool) => {
-            if (tool.inputSchema) {
-              delete tool.inputSchema.additionalProperties;
-              delete tool.inputSchema['$schema'];
-            }
-            return {
-              name: tool.name,
-              description: tool.description,
-              parameters: tool.inputSchema,
-            };
-          })
-        }
-      ];
-      // merge with any existing tools
-      setup.tools = [...convertedTools, ...(this.setup.tools || [])];
-    }
-    if (!await this._sendClientEvent(ep, {
-      setup,
-    })) {
-      this.logger.debug(this.setup, 'TaskLlmGoogle_S2S:_sendInitialMessage - sending session.update');
-      this.notifyTaskDone();
-    }
-  }
-
-  _registerHandlers(ep) {
-    this.addCustomEventListener(ep, LlmEvents_Google.Connect, this._onConnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_Google.ConnectFailure, this._onConnectFailure.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_Google.Disconnect, this._onDisconnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_Google.ServerEvent, this._onServerEvent.bind(this, ep));
-  }
-
-  _unregisterHandlers() {
-    this.removeCustomEventListeners();
-  }
-
-  _onError(ep, evt) {
-    this.logger.info({evt}, 'TaskLlmGoogle_S2S:_onError');
-    this.notifyTaskDone();
-  }
-
-  _onConnect(ep) {
-    this.logger.debug('TaskLlmGoogle_S2S:_onConnect');
-    this._sendInitialMessage(ep);
-  }
-  _onConnectFailure(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmGoogle_S2S:_onConnectFailure');
-    this.results = {completionReason: 'connection failure'};
-    this.notifyTaskDone();
-  }
-  _onDisconnect(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmGoogle_S2S:_onConnectFailure');
-    this.results = {completionReason: 'disconnect from remote end'};
-    this.notifyTaskDone();
-  }
-
-  async _onServerEvent(ep, evt) {
-    let endConversation = false;
-    this.logger.debug({evt}, 'TaskLlmGoogle_S2S:_onServerEvent');
-    const {toolCall /**toolCallCancellation*/}  = evt;
-
-    if (toolCall) {
-      this.logger.debug({toolCall}, 'TaskLlmGoogle_S2S:_onServerEvent - toolCall');
-      if (!this.toolHook) {
-        this.logger.info({evt}, 'TaskLlmGoogle_S2S:_onServerEvent - no toolHook defined!');
-      }
-      else {
-        const {functionCalls} = toolCall;
-        const mcpTools = this.parent.isMcpEnabled ? await this.parent.mcpService.getAvailableMcpTools() : [];
-        const functionResponses = [];
-        if (mcpTools && mcpTools.length > 0) {
-          for (const functionCall of functionCalls) {
-            const {name, args, id} = functionCall;
-            const tool = mcpTools.find((tool) => tool.name === name);
-            if (tool) {
-              const response = await this.parent.mcpService.callMcpTool(name, args);
-              functionResponses.push({
-                response: {
-                  output: response,
-                },
-                id
-              });
-            }
-          }
-        }
-
-        if (functionResponses && functionResponses.length > 0) {
-          this.logger.debug({functionResponses}, 'TaskLlmGoogle_S2S:_onServerEvent - function_call - mcp result');
-          this.processToolOutput(ep, 'tool_call_id', {
-            toolResponse: {
-              functionResponses
-            }
-          });
-        } else {
-          try {
-            await this.parent.sendToolHook('function_call_id', {type: 'toolCall', functionCalls});
-          } catch (err) {
-            this.logger.info({err, evt}, 'TaskLlmGoogle_S2S - error calling function');
-            this.results = {
-              completionReason: 'client error calling function',
-              error: err
-            };
-            endConversation = true;
-          }
-        }
-      }
-    }
-
-    this._sendLlmEvent('llm_event', evt);
-
-    if (endConversation) {
-      this.logger.info({results: this.results},
-        'TaskLlmGoogle_S2S:_onServerEvent - ending conversation due to error');
-      this.notifyTaskDone();
-    }
-  }
-
-  _sendLlmEvent(type, evt) {
-    /* check whether we should notify on this event */
-    if (this.includeEvents.length > 0 ? this.includeEvents.includes(type) : !this.excludeEvents.includes(type)) {
-      this.parent.sendEventHook(evt)
-        .catch((err) => this.logger.info({err}, 'TaskLlmGoogle_S2S:_onServerEvent - error sending event hook'));
-    }
-  }
-
-  async processLlmUpdate(ep, data, _callSid) {
-    try {
-      this.logger.debug({data, _callSid}, 'TaskLlmGoogle_S2S:processLlmUpdate');
-
-      await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-    } catch (err) {
-      this.logger.info({err, data}, 'TaskLlmGoogle_S2S:processLlmUpdate - Error processing LLM update');
-    }
-  }
-
-  async processToolOutput(ep, tool_call_id, data) {
-    try {
-      this.logger.debug({tool_call_id, data}, 'TaskLlmGoogle_S2S:processToolOutput');
-      const {toolResponse} = data;
-
-      if (!toolResponse) {
-        this.logger.info({data},
-          'TaskLlmGoogle_S2S:processToolOutput - invalid tool output, must be functionResponses');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-      }
-    } catch (err) {
-      this.logger.info({err, data}, 'TaskLlmGoogle_S2S:processToolOutput - Error processing tool output');
-    }
-  }
-}
-
-module.exports = TaskLlmGoogle_S2S;

lib/tasks/llm/llms/openai_s2s.js

@@ -59,7 +59,7 @@ class TaskLlmOpenAI_S2S extends Task {
     this.parent = parentTask;
 
     this.vendor = this.parent.vendor;
-    this.model = this.parent.model || 'gpt-4o-realtime-preview-2024-12-17';
+    this.model = this.parent.model;
     this.auth = this.parent.auth;
     this.connectionOptions = this.parent.connectOptions;
 
@@ -120,9 +120,9 @@ class TaskLlmOpenAI_S2S extends Task {
 
     switch (this.vendor) {
       case 'openai':
-        return `v1/realtime?model=${this.model}`;
+        return 'v1/realtime?model=gpt-4o-realtime-preview-2024-10-01';
       case 'microsoft':
-        return `openai/realtime?api-version=2024-10-01-preview&deployment=${this.model}`;
+        return 'openai/realtime?api-version=2024-10-01-preview&deployment=gpt-4o-realtime-preview-1001&';
     }
   }
 
@@ -235,23 +235,6 @@ class TaskLlmOpenAI_S2S extends Task {
 
     /* send immediate session.update if present */
     else if (this.session_update) {
-      if (this.parent.isMcpEnabled) {
-        this.logger.debug('TaskLlmOpenAI_S2S:_sendInitialMessage - mcp enabled');
-        const tools = await this.parent.mcpService.getAvailableMcpTools();
-        if (tools && tools.length > 0 && this.session_update) {
-          const convertedTools = tools.map((tool) => ({
-            name: tool.name,
-            type: 'function',
-            description: tool.description,
-            parameters: tool.inputSchema
-          }));
-
-          this.session_update.tools = [
-            ...convertedTools,
-            ...(this.session_update.tools || [])
-          ];
-        }
-      }
       obj = {type: 'session.update', session: this.session_update};
       this.logger.debug({obj}, 'TaskLlmOpenAI_S2S:_sendInitialMessage - sending session.update');
       if (!await this._sendClientEvent(ep, obj)) {
@@ -316,37 +299,13 @@ class TaskLlmOpenAI_S2S extends Task {
     /* tool calls */
     else if (type === 'response.output_item.done' && evt.item?.type === 'function_call') {
       this.logger.debug({evt}, 'TaskLlmOpenAI_S2S:_onServerEvent - function_call');
-      const {name, call_id} = evt.item;
-      const args = JSON.parse(evt.item.arguments);
-
-      const mcpTools = this.parent.isMcpEnabled ? await this.parent.mcpService.getAvailableMcpTools() : [];
-      if (mcpTools.some((tool) => tool.name === name)) {
-        this.logger.debug({call_id, name, args}, 'TaskLlmOpenAI_S2S:_onServerEvent - calling mcp tool');
-        try {
-          const res = await this.parent.mcpService.callMcpTool(name, args);
-          this.logger.debug({res}, 'TaskLlmOpenAI_S2S:_onServerEvent - function_call - mcp result');
-          this.processToolOutput(ep, call_id, {
-            type: 'conversation.item.create',
-            item: {
-              type: 'function_call_output',
-              call_id,
-              output: res.content[0]?.text || 'There is no output from the function call',
-            }
-          });
-          return;
-        } catch (err) {
-          this.logger.info({err, evt}, 'TaskLlmOpenAI_S2S - error calling function');
-          this.results = {
-            completionReason: 'client error calling mcp function',
-            error: err
-          };
-          endConversation = true;
-        }
-      }
-      else if (!this.toolHook) {
+      if (!this.toolHook) {
         this.logger.warn({evt}, 'TaskLlmOpenAI_S2S:_onServerEvent - no toolHook defined!');
       }
       else {
+        const {name, call_id} = evt.item;
+        const args = JSON.parse(evt.item.arguments);
+
         try {
           await this.parent.sendToolHook(call_id, {name, args});
         } catch (err) {

lib/tasks/llm/llms/ultravox_s2s.js

@@ -1,344 +0,0 @@
-const Task = require('../../task');
-const TaskName = 'Llm_Ultravox_s2s';
-const {request} = require('undici');
-const {LlmEvents_Ultravox} = require('../../../utils/constants');
-
-const ultravox_server_events = [
-  'createCall',
-  'pong',
-  'state',
-  'transcript',
-  'conversationText',
-  'clientToolInvocation',
-  'playbackClearBuffer',
-];
-
-const ClientEvent = 'client.event';
-
-const expandWildcards = (events) => {
-  // no-op for deepgram
-  return events;
-};
-
-const SessionDelete = 'session.delete';
-
-class TaskLlmUltravox_S2S extends Task {
-  constructor(logger, opts, parentTask) {
-    super(logger, opts, parentTask);
-    this.parent = parentTask;
-
-    this.vendor = this.parent.vendor;
-    this.model = this.parent.model || 'fixie-ai/ultravox';
-    this.auth = this.parent.auth;
-    this.connectionOptions = this.parent.connectOptions;
-
-    const {apiKey} = this.auth || {};
-    if (!apiKey) throw new Error('auth.apiKey is required for Vendor: Ultravox');
-    this.apiKey = apiKey;
-    this.actionHook = this.data.actionHook;
-    this.eventHook = this.data.eventHook;
-    this.toolHook = this.data.toolHook;
-
-    this.results = {
-      completionReason: 'normal conversation end'
-    };
-
-    /**
-     * only one of these will have items,
-     * if includeEvents, then these are the events to include
-     * if excludeEvents, then these are the events to exclude
-     */
-    this.includeEvents = [];
-    this.excludeEvents = [];
-
-    /* default to all events if user did not specify */
-    this._populateEvents(this.data.events || ultravox_server_events);
-
-    this.addCustomEventListener = parentTask.addCustomEventListener.bind(parentTask);
-    this.removeCustomEventListeners = parentTask.removeCustomEventListeners.bind(parentTask);
-  }
-
-  get name() { return TaskName; }
-
-  async _api(ep, args) {
-    const res = await ep.api('uuid_ultravox_s2s', `^^|${args.join('|')}`);
-    if (!res.body?.startsWith('+OK')) {
-      throw new Error(`Error calling uuid_ultravox_s2s: ${JSON.stringify(res.body)}`);
-    }
-  }
-
-  /**
-   * Converts a JSON Schema to the dynamic parameters format used in the Ultravox API
-   * @param {Object} jsonSchema - A JSON Schema object defining parameters
-   * @param {string} locationDefault - Default location value for parameters (default: 'PARAMETER_LOCATION_BODY')
-   * @returns {Array} Array of dynamic parameters objects
-   */
-  transformSchemaToParameters(jsonSchema, locationDefault = 'PARAMETER_LOCATION_BODY') {
-    if (jsonSchema.properties) {
-      const required = jsonSchema.required || [];
-
-      return Object.entries(jsonSchema.properties).map(([name]) => {
-        return {
-          name,
-          location: locationDefault,
-          required: required.includes(name)
-        };
-      });
-    }
-
-    return [];
-  }
-
-  async createCall() {
-    const mcpTools = this.parent.isMcpEnabled ? await this.parent.mcpService.getAvailableMcpTools() : [];
-    if (mcpTools && mcpTools.length > 0) {
-      const convertedTools = mcpTools.map((tool) => {
-        return {
-          temporaryTool: {
-            modelToolName: tool.name,
-            description: tool.description,
-            dynamicParameters: this.transformSchemaToParameters(tool.inputSchema),
-            // use client tool that ultravox call tool via freeswitch module.
-            client: {}
-          }
-        };
-      }
-      );
-      // merge with any existing tools
-      this.data.llmOptions.selectedTools = [
-        ...convertedTools,
-        ...(this.data.llmOptions.selectedTools || [])
-      ];
-    }
-
-    const payload = {
-      ...this.data.llmOptions,
-      model: this.model,
-      medium: {
-        ...(this.data.llmOptions.medium || {}),
-        serverWebSocket: {
-          inputSampleRate: 8000,
-          outputSampleRate: 8000,
-        }
-      }
-    };
-    const {statusCode, body} = await request('https://api.ultravox.ai/api/calls', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'X-API-Key': this.apiKey
-      },
-      body: JSON.stringify(payload)
-    });
-    const data = await body.json();
-    if (statusCode !== 201 || !data?.joinUrl) {
-      this.logger.info({statusCode, data}, 'Ultravox Error registering call');
-      throw new Error(`Ultravox Error registering call:${statusCode} - ${data.detail}`);
-    }
-    this.logger.debug({joinUrl: data.joinUrl}, 'Ultravox Call registered');
-    return data;
-  }
-
-  _unregisterHandlers() {
-    this.removeCustomEventListeners();
-  }
-
-  _registerHandlers(ep) {
-    this.addCustomEventListener(ep, LlmEvents_Ultravox.Connect, this._onConnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_Ultravox.ConnectFailure, this._onConnectFailure.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_Ultravox.Disconnect, this._onDisconnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_Ultravox.ServerEvent, this._onServerEvent.bind(this, ep));
-  }
-
-  async _startListening(cs, ep) {
-    this._registerHandlers(ep);
-
-    try {
-      const data = await this.createCall();
-      const {joinUrl} = data;
-      // split the joinUrl into host and path
-      const {host, pathname, search} = new URL(joinUrl);
-      const args = [ep.uuid, 'session.create', host, pathname + search];
-      await this._api(ep, args);
-      // Notify the application that the session has been created with detail information
-      this._sendLlmEvent('createCall', {
-        type: 'createCall',
-        ...data
-      });
-    } catch (err) {
-      this.logger.info({err}, 'TaskLlmUltraVox_S2S:_startListening - Error sending createCall');
-      this.results = {completionReason: `connection failure - ${err}`};
-      this.notifyTaskDone();
-    }
-  }
-
-  async exec(cs, {ep}) {
-    await super.exec(cs);
-
-    await this._startListening(cs, ep);
-
-    await this.awaitTaskDone();
-
-    /* note: the parent llm verb started the span, which is why this is necessary */
-    await this.parent.performAction(this.results);
-
-    this._unregisterHandlers();
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-
-    this._api(cs.ep, [cs.ep.uuid, SessionDelete])
-      .catch((err) => this.logger.info({err}, 'TaskLlmUltravox_S2S:kill - error deleting session'));
-
-    this.notifyTaskDone();
-  }
-
-  _onConnect(ep) {
-    this.logger.info('TaskLlmUltravox_S2S:_onConnect');
-  }
-  _onConnectFailure(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmUltravox_S2S:_onConnectFailure');
-    this.results = {completionReason: 'connection failure'};
-    this.notifyTaskDone();
-  }
-  _onDisconnect(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmUltravox_S2S:_onConnectFailure');
-    this.results = {completionReason: 'disconnect from remote end'};
-    this.notifyTaskDone();
-  }
-
-  async _onServerEvent(_ep, evt) {
-    let endConversation = false;
-    const type = evt.type;
-    this.logger.debug({evt}, 'TaskLlmUltravox_S2S:_onServerEvent');
-
-    /* server errors of some sort */
-    if (type === 'error') {
-      endConversation = true;
-      this.results = {
-        completionReason: 'server error',
-        error: evt.error
-      };
-    }
-
-    /* tool calls */
-    else if (type === 'client_tool_invocation') {
-      this.logger.debug({evt}, 'TaskLlmUltravox_S2S:_onServerEvent - function_call');
-      const {toolName: name, invocationId: call_id, parameters: args} = evt;
-
-      const mcpTools = this.parent.isMcpEnabled ? await this.parent.mcpService.getAvailableMcpTools() : [];
-      if (mcpTools.some((tool) => tool.name === name)) {
-        this.logger.debug({
-          name,
-          input: args
-        }, 'TaskLlmUltravox_S2S:_onServerEvent - function_call - mcp tool');
-        try {
-          const res = await this.parent.mcpService.callMcpTool(name, args);
-          this.logger.debug({res}, 'TaskLlmUltravox_S2S:_onServerEvent - function_call - mcp result');
-          this.processToolOutput(_ep, call_id, {
-            type: 'client_tool_result',
-            invocation_id: call_id,
-            result: res.content
-          });
-          return;
-        } catch (err) {
-          this.logger.info({err, evt}, 'TaskLlmUltravox_S2S - error calling mcp tool');
-          this.results = {
-            completionReason: 'client error calling mcp function',
-            error: err
-          };
-          endConversation = true;
-        }
-      } else if (!this.toolHook) {
-        this.logger.info({evt}, 'TaskLlmUltravox_S2S:_onServerEvent - no toolHook defined!');
-      }
-      else {
-        try {
-          await this.parent.sendToolHook(call_id, {name, args});
-        } catch (err) {
-          this.logger.info({err, evt}, 'TaskLlmUltravox_S2S - error calling function');
-          this.results = {
-            completionReason: 'client error calling function',
-            error: err
-          };
-          endConversation = true;
-        }
-      }
-    }
-
-    this._sendLlmEvent(type, evt);
-
-    if (endConversation) {
-      this.logger.info({results: this.results},
-        'TaskLlmUltravox_S2S:_onServerEvent - ending conversation due to error');
-      this.notifyTaskDone();
-    }
-  }
-
-  _sendLlmEvent(type, evt) {
-    /* check whether we should notify on this event */
-    if (this.includeEvents.length > 0 ? this.includeEvents.includes(type) : !this.excludeEvents.includes(type)) {
-      this.parent.sendEventHook(evt)
-        .catch((err) => this.logger.info({err}, 'TaskLlmUltravox_S2S:_onServerEvent - error sending event hook'));
-    }
-  }
-
-  async processLlmUpdate(ep, data, _callSid) {
-    try {
-      this.logger.debug({data, _callSid}, 'TaskLlmUltravox_S2S:processLlmUpdate');
-
-      if (!data.type || ![
-        'input_text_message'
-      ].includes(data.type)) {
-        this.logger.info({data},
-          'TaskLlmUltravox_S2S:processLlmUpdate - invalid mid-call request, only input_text_message supported');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-      }
-    } catch (err) {
-      this.logger.info({err, data}, 'TaskLlmUltravox_S2S:processLlmUpdate - Error processing LLM update');
-    }
-  }
-
-  async processToolOutput(ep, tool_call_id, data) {
-    try {
-      this.logger.debug({tool_call_id, data}, 'TaskLlmUltravox_S2S:processToolOutput');
-
-      if (!data.type || data.type !== 'client_tool_result') {
-        this.logger.info({data},
-          'TaskLlmUltravox_S2S:processToolOutput - invalid tool output, must be client_tool_result');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-      }
-    } catch (err) {
-      this.logger.info({err, data}, 'TaskLlmUltravox_S2S:processToolOutput - Error processing tool output');
-    }
-  }
-
-  _populateEvents(events) {
-    if (events.includes('all')) {
-      /* work by excluding specific events */
-      const exclude = events
-        .filter((evt) => evt.startsWith('-'))
-        .map((evt) => evt.slice(1));
-      if (exclude.length === 0) this.includeEvents = ultravox_server_events;
-      else this.excludeEvents = expandWildcards(exclude);
-    }
-    else {
-      /* work by including specific events */
-      const include = events
-        .filter((evt) => !evt.startsWith('-'));
-      this.includeEvents = expandWildcards(include);
-    }
-
-    this.logger.debug({
-      includeEvents: this.includeEvents,
-      excludeEvents: this.excludeEvents
-    }, 'TaskLlmUltravox_S2S:_populateEvents');
-  }
-}
-
-module.exports = TaskLlmUltravox_S2S;

lib/tasks/llm/llms/voice_agent_s2s.js

@@ -1,352 +0,0 @@
-const Task = require('../../task');
-const TaskName = 'Llm_VoiceAgent_s2s';
-const {LlmEvents_VoiceAgent} = require('../../../utils/constants');
-const ClientEvent = 'client.event';
-const SessionDelete = 'session.delete';
-
-const va_server_events = [
-  'Error',
-  'Welcome',
-  'SettingsApplied',
-  'ConversationText',
-  'UserStartedSpeaking',
-  'EndOfThought',
-  'AgentThinking',
-  'FunctionCallRequest',
-  'FunctionCalling',
-  'AgentStartedSpeaking',
-  'AgentAudioDone',
-];
-
-const expandWildcards = (events) => {
-  // no-op for deepgram
-  return events;
-};
-
-class TaskLlmVoiceAgent_S2S extends Task {
-  constructor(logger, opts, parentTask) {
-    super(logger, opts, parentTask);
-    this.parent = parentTask;
-
-    this.vendor = this.parent.vendor;
-    this.model = this.parent.model || 'voice-agent';
-    this.auth = this.parent.auth;
-    this.connectionOptions = this.parent.connectOptions;
-
-    const {apiKey} = this.auth || {};
-    if (!apiKey) throw new Error('auth.apiKey is required for VoiceAgent S2S');
-
-    this.apiKey = apiKey;
-    this.authType = 'bearer';
-    this.actionHook = this.data.actionHook;
-    this.eventHook = this.data.eventHook;
-    this.toolHook = this.data.toolHook;
-    const {Settings} = this.data.llmOptions;
-
-    if (typeof Settings !== 'object') {
-      throw new Error('llmOptions with an initial Settings is required for VoiceAgent S2S');
-    }
-
-    // eslint-disable-next-line no-unused-vars
-    const {audio, ...rest} = Settings;
-    const cfg = this.Settings = rest;
-
-    if (!cfg.agent) throw new Error('llmOptions.Settings.agent is required for VoiceAgent S2S');
-    if (!cfg.agent.think) {
-      throw new Error('llmOptions.Settings.agent.think is required for VoiceAgent S2S');
-    }
-    if (!cfg.agent.think.provider?.model) {
-      throw new Error('llmOptions.Settings.agent.think.provider.model is required for VoiceAgent S2S');
-    }
-    if (!cfg.agent.think.provider?.type) {
-      throw new Error('llmOptions.Settings.agent.think.provider.type is required for VoiceAgent S2S');
-    }
-
-    this.results = {
-      completionReason: 'normal conversation end'
-    };
-
-    /**
-     * only one of these will have items,
-     * if includeEvents, then these are the events to include
-     * if excludeEvents, then these are the events to exclude
-     */
-    this.includeEvents = [];
-    this.excludeEvents = [];
-
-    /* default to all events if user did not specify */
-    this._populateEvents(this.data.events || va_server_events);
-
-    this.addCustomEventListener = parentTask.addCustomEventListener.bind(parentTask);
-    this.removeCustomEventListeners = parentTask.removeCustomEventListeners.bind(parentTask);
-  }
-
-  get name() { return TaskName; }
-
-  get host() {
-    const {host} = this.connectionOptions || {};
-    return host || 'agent.deepgram.com';
-  }
-
-  get path() {
-    const {path} = this.connectionOptions || {};
-    if (path) return path;
-
-    return '/v1/agent/converse';
-  }
-
-  async _api(ep, args) {
-    const res = await ep.api('uuid_voice_agent_s2s', `^^|${args.join('|')}`);
-    if (!res.body?.startsWith('+OK')) {
-      throw new Error(`Error calling uuid_voice_agent_s2s: ${JSON.stringify(res.body)}`);
-    }
-  }
-
-  async exec(cs, {ep}) {
-    await super.exec(cs);
-
-    await this._startListening(cs, ep);
-
-    await this.awaitTaskDone();
-
-    /* note: the parent llm verb started the span, which is why this is necessary */
-    await this.parent.performAction(this.results);
-
-    this._unregisterHandlers();
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-
-    this._api(cs.ep, [cs.ep.uuid, SessionDelete])
-      .catch((err) => this.logger.info({err}, 'TaskLlmVoiceAgent_S2S:kill - error deleting session'));
-
-    this.notifyTaskDone();
-  }
-
-  /**
-   * Send function call response to the VoiceAgent server
-   */
-  async processToolOutput(ep, tool_call_id, data) {
-    try {
-      const {data:response} = data;
-      this.logger.debug({tool_call_id, response}, 'TaskLlmVoiceAgent_S2S:processToolOutput');
-
-      if (!response.type || response.type !== 'FunctionCallResponse') {
-        this.logger.info({response},
-          'TaskLlmVoiceAgent_S2S:processToolOutput - invalid tool output, must be FunctionCallResponse');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(response)]);
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TaskLlmVoiceAgent_S2S:processToolOutput');
-    }
-  }
-
-  /**
-   * Send a session.update to the VoiceAgent server
-   * Note: creating and deleting conversation items also supported as well as interrupting the assistant
-   */
-  async processLlmUpdate(ep, data, _callSid) {
-    try {
-      this.logger.debug({data, _callSid}, 'TaskLlmVoiceAgent_S2S:processLlmUpdate');
-
-      if (!data.type || ![
-        'UpdateInstructions',
-        'UpdateSpeak',
-        'InjectAgentMessage',
-      ].includes(data.type)) {
-        this.logger.info({data}, 'TaskLlmVoiceAgent_S2S:processLlmUpdate - invalid mid-call request');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TaskLlmVoiceAgent_S2S:processLlmUpdate');
-    }
-  }
-
-  async _startListening(cs, ep) {
-    this._registerHandlers(ep);
-
-    try {
-      const args = [ep.uuid, 'session.create', this.host, this.path, this.authType, this.apiKey];
-      await this._api(ep, args);
-    } catch (err) {
-      this.logger.error({err}, `TaskLlmVoiceAgent_S2S:_startListening: ${JSON.stringify(err)}`);
-      this.notifyTaskDone();
-    }
-  }
-
-  async _sendClientEvent(ep, obj) {
-    let ok = true;
-    this.logger.debug({obj}, 'TaskLlmVoiceAgent_S2S:_sendClientEvent');
-    try {
-      const args = [ep.uuid, ClientEvent, JSON.stringify(obj)];
-      await this._api(ep, args);
-    } catch (err) {
-      ok = false;
-      this.logger.error({err}, 'TaskLlmVoiceAgent_S2S:_sendClientEvent - Error');
-    }
-    return ok;
-  }
-
-  async _sendInitialMessage(ep) {
-    const mcpTools = this.parent.isMcpEnabled ? await this.parent.mcpService.getAvailableMcpTools() : [];
-    if (mcpTools && mcpTools.length > 0 && this.Settings.agent?.think) {
-      const convertedTools = mcpTools.map((tool) => ({
-        name: tool.name,
-        description: tool.description,
-        parameters: tool.inputSchema
-      }));
-
-      this.Settings.agent.think.functions = [
-        ...convertedTools,
-        ...(this.Settings.agent.think?.functions || [])
-      ];
-    }
-    if (!await this._sendClientEvent(ep, this.Settings)) {
-      this.notifyTaskDone();
-    }
-  }
-
-  _registerHandlers(ep) {
-    this.addCustomEventListener(ep, LlmEvents_VoiceAgent.Connect, this._onConnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_VoiceAgent.ConnectFailure, this._onConnectFailure.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_VoiceAgent.Disconnect, this._onDisconnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_VoiceAgent.ServerEvent, this._onServerEvent.bind(this, ep));
-  }
-
-  _unregisterHandlers() {
-    this.removeCustomEventListeners();
-  }
-
-  _onError(_ep, evt) {
-    this.logger.info({evt}, 'TaskLlmVoiceAgent_S2S:_onError');
-    this.notifyTaskDone();
-  }
-
-  _onConnect(ep) {
-    this.logger.debug('TaskLlmVoiceAgent_S2S:_onConnect');
-    this._sendInitialMessage(ep);
-  }
-  _onConnectFailure(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmVoiceAgent_S2S:_onConnectFailure');
-    this.results = {completionReason: 'connection failure'};
-    this.notifyTaskDone();
-  }
-  _onDisconnect(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmVoiceAgent_S2S:_onConnectFailure');
-    this.results = {completionReason: 'disconnect from remote end'};
-    this.notifyTaskDone();
-  }
-  async _onServerEvent(_ep, evt) {
-    let endConversation = false;
-    const type = evt.type;
-    this.logger.info({evt}, 'TaskLlmVoiceAgent_S2S:_onServerEvent');
-
-    /* check for failures, such as rate limit exceeded, that should terminate the conversation */
-    if (type === 'response.done' && evt.response.status === 'failed') {
-      endConversation = true;
-      this.results = {
-        completionReason: 'server failure',
-        error: evt.response.status_details?.error
-      };
-    }
-
-    /* server errors of some sort */
-    else if (type === 'error') {
-      endConversation = true;
-      this.results = {
-        completionReason: 'server error',
-        error: evt.error
-      };
-    }
-
-    /* tool calls */
-    else if (type === 'FunctionCallRequest') {
-      this.logger.debug({evt}, 'TaskLlmVoiceAgent_S2S:_onServerEvent - function_call');
-
-      const mcpTools = this.parent.isMcpEnabled ? await this.parent.mcpService.getAvailableMcpTools() : [];
-      if (!this.toolHook && mcpTools.length === 0) {
-        this.logger.warn({evt}, 'TaskLlmVoiceAgent_S2S:_onServerEvent - no toolHook defined!');
-      } else {
-        const {functions} = evt;
-        const handledFunctions = [];
-
-        try {
-          if (mcpTools && mcpTools.length > 0) {
-            for (const func of functions) {
-              const {name, arguments: args, id} = func;
-              const tool = mcpTools.find((tool) => tool.name === name);
-              if (tool) {
-                handledFunctions.push(name);
-                const response = await this.parent.mcpService.callMcpTool(name, JSON.parse(args));
-                this.logger.debug({response}, 'TaskLlmVoiceAgent_S2S:_onServerEvent - function_call - mcp result');
-                this.processToolOutput(_ep, id, {
-                  data: {
-                    type: 'FunctionCallResponse',
-                    id,
-                    name,
-                    content: response.length > 0 ? response[0].text : 'There is no output from the function call'
-                  }
-                });
-              }
-            }
-          }
-
-          for (const func of functions) {
-            const {name, arguments: args, id} = func;
-            if (!handledFunctions.includes(name)) {
-              await this.parent.sendToolHook(id, {name, args: JSON.parse(args)});
-            }
-          }
-        } catch (err) {
-          this.logger.info({err, evt}, 'TaskLlmVoiceAgent_S2S:_onServerEvent - error calling function');
-          this.results = {
-            completionReason: 'client error calling function',
-            error: err
-          };
-          endConversation = true;
-        }
-      }
-    }
-
-    /* check whether we should notify on this event */
-    if (this.includeEvents.length > 0 ? this.includeEvents.includes(type) : !this.excludeEvents.includes(type)) {
-      this.parent.sendEventHook(evt)
-        .catch((err) => this.logger.info({err}, 'TaskLlmVoiceAgent_S2S:_onServerEvent - error sending event hook'));
-    }
-
-    if (endConversation) {
-      this.logger.info({results: this.results},
-        'TaskLlmVoiceAgent_S2S:_onServerEvent - ending conversation due to error');
-      this.notifyTaskDone();
-    }
-  }
-
-  _populateEvents(events) {
-    if (events.includes('all')) {
-      /* work by excluding specific events */
-      const exclude = events
-        .filter((evt) => evt.startsWith('-'))
-        .map((evt) => evt.slice(1));
-      if (exclude.length === 0) this.includeEvents = va_server_events;
-      else this.excludeEvents = expandWildcards(exclude);
-    }
-    else {
-      /* work by including specific events */
-      const include = events
-        .filter((evt) => !evt.startsWith('-'));
-      this.includeEvents = expandWildcards(include);
-    }
-
-    this.logger.debug({
-      includeEvents: this.includeEvents,
-      excludeEvents: this.excludeEvents
-    }, 'TaskLlmVoiceAgent_S2S:_populateEvents');
-  }
-}
-
-module.exports = TaskLlmVoiceAgent_S2S;

lib/tasks/make_task.js

@@ -84,7 +84,6 @@ function makeTask(logger, obj, parent) {
       const TaskTranscribe = require('./transcribe');
       return new TaskTranscribe(logger, data, parent);
     case TaskName.Listen:
-    case TaskName.Stream:
       const TaskListen = require('./listen');
       return new TaskListen(logger, data, parent);
     case TaskName.Redirect:

lib/tasks/message.js

@@ -1,7 +1,7 @@
 const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
 const bent = require('bent');
-const crypto = require('crypto');
+const uuidv4 = require('uuid-random');
 const {K8S} = require('../config');
 class TaskMessage extends Task {
   constructor(logger, opts) {
@@ -9,7 +9,7 @@ class TaskMessage extends Task {
     this.preconditions = TaskPreconditions.None;
 
     this.payload = {
-      message_sid: this.data.message_sid || crypto.randomUUID(),
+      message_sid: this.data.message_sid || uuidv4(),
       carrier: this.data.carrier,
       to: this.data.to,
       from: this.data.from,

lib/tasks/play.js

@@ -1,6 +1,6 @@
 const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
-const { PlayFileNotFoundError } = require('../utils/error');
+
 class TaskPlay extends Task {
   constructor(logger, opts) {
     super(logger, opts);
@@ -26,7 +26,6 @@ class TaskPlay extends Task {
     let playbackSeconds = 0;
     let playbackMilliseconds = 0;
     let completed = !(this.timeoutSecs > 0 || this.loop);
-    cs.playingAudio = true;
     if (this.timeoutSecs > 0) {
       timeout = setTimeout(async() => {
         completed = true;
@@ -40,22 +39,6 @@ class TaskPlay extends Task {
     try {
       this.notifyStatus({event: 'start-playback'});
       while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep.connected) {
-        /* Listen for playback-start event and set up a one-time listener for uuid_break
-         * that will kill the audio playback if the taskIds match. This ensures that
-         * we only kill the currently playing audio and not audio from other tasks.
-         * As we are using stickyEventEmitter, even if the event is emitted before the listener is registered,
-         * the listener will receive the most recent event.
-         */
-        ep.once('playback-start', (evt) => {
-          this.logger.debug({evt}, 'Play got playback-start');
-          this.cs.stickyEventEmitter.once('uuid_break', (t) => {
-            if (t?.taskId === this.taskId) {
-              this.logger.debug(`Play got kill-playback, executing uuid_break, taskId: ${t?.taskId}`);
-              this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
-              this.notifyStatus({event: 'kill-playback'});
-            }
-          });
-        });
         if (cs.isInConference) {
           const {memberId, confName, confUuid} = cs;
           if (Array.isArray(this.url)) {
@@ -83,35 +66,23 @@ class TaskPlay extends Task {
         }
       }
     } catch (err) {
-      this.logger.info(`TaskPlay:exec - error playing ${this.url}: ${err.message}`);
-      this.playComplete = true;
-      if (err.message === 'File Not Found') {
-        const {writeAlerts, AlertType} = cs.srf.locals;
-        await this.performAction({status: 'fail', reason: 'playFailed'}, !(this.parentTask || cs.isConfirmCallSession));
-        this.emit('playDone');
-        writeAlerts({
-          account_sid: cs.accountSid,
-          alert_type: AlertType.PLAY_FILENOTFOUND,
-          url: this.url,
-          target_sid: cs.callSid
-        });
-        throw new PlayFileNotFoundError(this.url);
-      }
+      if (timeout) clearTimeout(timeout);
+      this.logger.info(err, `TaskPlay:exec - error playing ${this.url}`);
     }
     this.emit('playDone');
   }
 
   async kill(cs) {
     super.kill(cs);
-    if (this.ep?.connected && !this.playComplete) {
+    if (this.ep.connected && !this.playComplete) {
       this.logger.debug('TaskPlay:kill - killing audio');
       if (cs.isInConference) {
         const {memberId, confName} = cs;
         this.killPlayToConfMember(this.ep, memberId, confName);
       }
       else {
-        //this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
-        cs.stickyEventEmitter.emit('uuid_break', this);
+        this.notifyStatus({event: 'kill-playback'});
+        this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
       }
     }
   }

lib/tasks/redirect.js

@@ -1,8 +1,5 @@
 const Task = require('./task');
 const {TaskName} = require('../utils/constants');
-const WsRequestor = require('../utils/ws-requestor');
-const URL = require('url');
-const HttpRequestor = require('../utils/http-requestor');
 
 /**
  * Redirects to a new application
@@ -16,32 +13,6 @@ class TaskRedirect extends Task {
 
   async exec(cs) {
     await super.exec(cs);
-
-    if (cs.requestor instanceof WsRequestor && cs.application.requestor._isAbsoluteUrl(this.actionHook)) {
-      this.logger.info(`Task:performAction redirecting to ${this.actionHook}, requires new ws connection`);
-      try {
-        this.cs.requestor.close();
-        const requestor = new WsRequestor(this.logger, cs.accountSid, {url: this.actionHook}, this.webhook_secret) ;
-        this.cs.application.requestor = requestor;
-      } catch (err) {
-        this.logger.info(err, `Task:performAction error redirecting to ${this.actionHook}`);
-      }
-    } else if (cs.application.requestor._isAbsoluteUrl(this.actionHook)) {
-      const baseUrl =  this.cs.application.requestor.baseUrl;
-      const newUrl = URL.parse(this.actionHook);
-      const newBaseUrl = newUrl.protocol + '//' + newUrl.host;
-      if (baseUrl != newBaseUrl) {
-        try {
-          this.logger.info(`Task:redirect updating base url to ${newBaseUrl}`);
-          const newRequestor = new HttpRequestor(this.logger, cs.accountSid, {url: this.actionHook},
-            cs.accountInfo.account.webhook_secret);
-          this.cs.requestor.removeAllListeners();
-          this.cs.application.requestor = newRequestor;
-        } catch (err) {
-          this.logger.info(err, `Task:redirect error updating base url to ${this.actionHook}`);
-        }
-      }
-    }
     await this.performAction();
   }
 }

lib/tasks/rest_dial.js

@@ -12,7 +12,6 @@ class TaskRestDial extends Task {
 
     this.from = this.data.from;
     this.callerName = this.data.callerName;
-    this.timeLimit = this.data.timeLimit;
     this.fromHost = this.data.fromHost;
     this.to = this.data.to;
     this.call_hook = this.data.call_hook;
@@ -67,9 +66,6 @@ class TaskRestDial extends Task {
     const cs = this.callSession;
     cs.setDialog(dlg);
     cs.referHook = this.referHook;
-    if (this.timeLimit) {
-      cs.startMaxCallDurationTimer(this.timeLimit);
-    }
     this.logger.debug('TaskRestDial:_onConnect - call connected');
     if (this.sipRequestWithinDialogHook) this._initSipRequestWithinDialogHandler(cs, dlg);
     try {
@@ -77,18 +73,15 @@ class TaskRestDial extends Task {
       const httpHeaders = b3 && {b3};
       const params = {
         ...(cs.callInfo.toJSON()),
-        ...(this.env_vars && {env_vars: this.env_vars}),
         defaults: {
           synthesizer: {
             vendor: cs.speechSynthesisVendor,
             language: cs.speechSynthesisLanguage,
-            voice: cs.speechSynthesisVoice,
-            label: cs.speechSynthesisLabel,
+            voice: cs.speechSynthesisVoice
           },
           recognizer: {
             vendor:  cs.speechRecognizerVendor,
-            language: cs.speechRecognizerLanguage,
-            label: cs.speechRecognizerLabel,
+            language: cs.speechRecognizerLanguage
           }
         }
       };

lib/tasks/say.js

@@ -1,4 +1,3 @@
-const assert = require('assert');
 const TtsTask = require('./tts-task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
 const pollySSMLSplit = require('polly-ssml-split');
@@ -36,40 +35,24 @@ class TaskSay extends TtsTask {
     super(logger, opts, parentTask);
     this.preconditions = TaskPreconditions.Endpoint;
 
-    assert.ok((typeof this.data.text === 'string' || Array.isArray(this.data.text)) || this.data.stream === true,
-      'Say: either text or stream:true is required');
+    this.text = (Array.isArray(this.data.text) ? this.data.text : [this.data.text])
+      .map((t) => breakLengthyTextIfNeeded(this.logger, t))
+      .flat();
 
-
-    if (this.data.stream === true) {
-      this._isStreamingTts = true;
-      this.closeOnStreamEmpty = this.data.closeOnStreamEmpty !== false;
-    }
-    else {
-      this._isStreamingTts = false;
-      this.text = (Array.isArray(this.data.text) ? this.data.text : [this.data.text])
-        .map((t) => breakLengthyTextIfNeeded(this.logger, t))
-        .flat();
-
-      this.loop = this.data.loop || 1;
-      this.isHandledByPrimaryProvider = true;
-    }
+    this.loop = this.data.loop || 1;
+    this.isHandledByPrimaryProvider = true;
   }
 
   get name() { return TaskName.Say; }
 
   get summary() {
-    if (this.isStreamingTts) return `${this.name} streaming`;
-    else {
-      for (let i = 0; i < this.text.length; i++) {
-        if (this.text[i].startsWith('silence_stream')) continue;
-        return `${this.name}{text=${this.text[i].slice(0, 15)}${this.text[i].length > 15 ? '...' : ''}}`;
-      }
-      return `${this.name}{${this.text[0]}}`;
+    for (let i = 0; i < this.text.length; i++) {
+      if (this.text[i].startsWith('silence_stream')) continue;
+      return `${this.name}{text=${this.text[i].slice(0, 15)}${this.text[i].length > 15 ? '...' : ''}}`;
     }
+    return `${this.name}{${this.text[0]}}`;
   }
 
-  get isStreamingTts() { return this._isStreamingTts; }
-
   _validateURL(urlString) {
     try {
       new URL(urlString);
@@ -80,19 +63,14 @@ class TaskSay extends TtsTask {
   }
 
   async exec(cs, obj) {
-    if (this.isStreamingTts && !cs.appIsUsingWebsockets) {
-      throw new Error('Say: streaming say verb requires applications to use the websocket API');
-    }
-
     try {
-      if (this.isStreamingTts) await this.handlingStreaming(cs, obj);
-      else await this.handling(cs, obj);
+      await this.handling(cs, obj);
       this.emit('playDone');
     } catch (error) {
       if (error instanceof SpeechCredentialError) {
         // if say failed due to speech credentials, alarm is writtern and error notification is sent
         // finished this say to move to next task.
-        this.logger.info({error}, 'Say failed due to SpeechCredentialError, finished!');
+        this.logger.info('Say failed due to SpeechCredentialError, finished!');
         this.emit('playDone');
         return;
       }
@@ -100,35 +78,6 @@ class TaskSay extends TtsTask {
     }
   }
 
-  async handlingStreaming(cs, {ep}) {
-    const {vendor, language, voice, label} = this.getTtsVendorData(cs);
-    const  credentials = cs.getSpeechCredentials(vendor, 'tts', label);
-    if (!credentials) {
-      throw new SpeechCredentialError(
-        `No text-to-speech service credentials for ${vendor} with labels: ${label} have been configured`);
-    }
-    this.ep = ep;
-    try {
-
-      await this.setTtsStreamingChannelVars(vendor, language, voice, credentials, ep);
-
-      await cs.startTtsStream();
-
-      cs.requestor?.request('tts:streaming-event', '/streaming-event', {event_type: 'stream_open'})
-        .catch((err) => this.logger.info({err}, 'TaskSay:handlingStreaming - Error sending'));
-    } catch (err) {
-      this.logger.info({err}, 'TaskSay:handlingStreaming - Error setting channel vars');
-      cs.requestor?.request('tts:streaming-event', '/streaming-event', {event_type: 'stream_closed'})
-        .catch((err) => this.logger.info({err}, 'TaskSay:handlingStreaming - Error sending'));
-
-      //TODO: send tts:streaming-event with error?
-      this.notifyTaskDone();
-    }
-
-    await this.awaitTaskDone();
-    this.logger.info('TaskSay:handlingStreaming - done');
-  }
-
   async handling(cs, {ep}) {
     const {srf, accountSid:account_sid, callSid:target_sid} = cs;
     const {writeAlerts, AlertType} = srf.locals;
@@ -147,7 +96,7 @@ class TaskSay extends TtsTask {
     let voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
       this.synthesizer.voice :
       cs.speechSynthesisVoice;
-    let label = this.taskIncludeSynthesizer ? this.synthesizer.label : cs.speechSynthesisLabel;
+    let label = this.taskInlcudeSynthesizer ? this.synthesizer.label : cs.speechSynthesisLabel;
 
     const fallbackVendor = this.synthesizer.fallbackVendor && this.synthesizer.fallbackVendor !== 'default' ?
       this.synthesizer.fallbackVendor :
@@ -158,7 +107,7 @@ class TaskSay extends TtsTask {
     const fallbackVoice =  this.synthesizer.fallbackVoice && this.synthesizer.fallbackVoice !== 'default' ?
       this.synthesizer.fallbackVoice :
       cs.fallbackSpeechSynthesisVoice;
-    const fallbackLabel = this.taskIncludeSynthesizer ?
+    const fallbackLabel = this.taskInlcudeSynthesizer ?
       this.synthesizer.fallbackLabel : cs.fallbackSpeechSynthesisLabel;
 
     if (cs.hasFallbackTts) {
@@ -213,7 +162,7 @@ class TaskSay extends TtsTask {
           ep.once('playback-start', (evt) => {
             this.logger.debug({evt}, 'Say got playback-start');
             if (this.otelSpan) {
-              this._addStreamingTtsAttributes(this.otelSpan, evt, vendor);
+              this._addStreamingTtsAttributes(this.otelSpan, evt);
               this.otelSpan.end();
               this.otelSpan = null;
               if (evt.variable_tts_cache_filename) {
@@ -223,19 +172,7 @@ class TaskSay extends TtsTask {
           });
           ep.once('playback-stop', (evt) => {
             this.logger.debug({evt}, 'Say got playback-stop');
-            this.notifyStatus({event: 'stop-playback'});
-            this.notifiedPlayBackStop = true;
-            const tts_error = evt.variable_tts_error;
-            let response_code = 200;
-            // Check if any property ends with _response_code
-            for (const [key, value] of Object.entries(evt)) {
-              if (key.endsWith('_response_code')) {
-                response_code = parseInt(value, 10) || 200;
-                break;
-              }
-            }
-
-            if (tts_error) {
+            if (evt.variable_tts_error) {
               writeAlerts({
                 account_sid,
                 alert_type: AlertType.TTS_FAILURE,
@@ -244,7 +181,7 @@ class TaskSay extends TtsTask {
                 target_sid
               }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
             }
-            if (!tts_error && response_code < 300 && evt.variable_tts_cache_filename && !this.killed) {
+            if (evt.variable_tts_cache_filename && !this.killed) {
               const text = parseTextFromSayString(this.text[segment]);
               addFileToCache(evt.variable_tts_cache_filename, {
                 account_sid,
@@ -252,15 +189,12 @@ class TaskSay extends TtsTask {
                 language,
                 voice,
                 engine,
-                model: this.model || this.model_id,
-                text,
-                instructions: this.instructions
+                text
               }).catch((err) => this.logger.info({err}, 'Error adding file to cache'));
             }
 
             if (this._playResolve) {
-              (tts_error || response_code >= 300) ? this._playReject(new Error(evt.variable_tts_error)) :
-                this._playResolve();
+              evt.variable_tts_error ? this._playReject(new Error(evt.variable_tts_error)) : this._playResolve();
             }
           });
           // wait for playback-stop event received to confirm if the playback is successful
@@ -306,13 +240,8 @@ class TaskSay extends TtsTask {
       if (cs.isInConference) {
         const {memberId, confName} = cs;
         this.killPlayToConfMember(this.ep, memberId, confName);
-      } else if (this.isStreamingTts) {
-        this.logger.debug('TaskSay:kill - clearing TTS stream for streaming audio');
-        cs.clearTtsStream();
-      } else {
-        if (!this.notifiedPlayBackStop) {
-          this.notifyStatus({event: 'stop-playback'});
-        }
+      }
+      else {
         this.notifyStatus({event: 'kill-playback'});
         this.ep.api('uuid_break', this.ep.uuid);
       }
@@ -324,39 +253,26 @@ class TaskSay extends TtsTask {
         this._playResolve = null;
       }
     }
-    this.notifyTaskDone();
   }
 
-  _addStreamingTtsAttributes(span, evt, vendor) {
+  _addStreamingTtsAttributes(span, evt) {
     const attrs = {'tts.cached': false};
     for (const [key, value] of Object.entries(evt)) {
       if (key.startsWith('variable_tts_')) {
         let newKey = key.substring('variable_tts_'.length)
           .replace('whisper_', 'whisper.')
-          .replace('nvidia_', 'nvidia.')
           .replace('deepgram_', 'deepgram.')
           .replace('playht_', 'playht.')
-          .replace('cartesia_', 'cartesia.')
           .replace('rimelabs_', 'rimelabs.')
           .replace('verbio_', 'verbio.')
           .replace('elevenlabs_', 'elevenlabs.');
         if (spanMapping[newKey]) newKey = spanMapping[newKey];
         attrs[newKey] = value;
-        if (key === 'variable_tts_time_to_first_byte_ms' && value) {
-          this.cs.srf.locals.stats.histogram('tts.response_time', value, [`vendor:${vendor}`]);
-        }
       }
     }
     delete attrs['cache_filename']; //no value in adding this to the span
     span.setAttributes(attrs);
   }
-
-  notifyTtsStreamIsEmpty() {
-    if (this.isStreamingTts && this.closeOnStreamEmpty) {
-      this.logger.info('TaskSay:notifyTtsStreamIsEmpty - stream is empty, killing task');
-      this.notifyTaskDone();
-    }
-  }
 }
 
 const spanMapping = {
@@ -393,11 +309,6 @@ const spanMapping = {
   'playht.name_lookup_time_ms': 'name_lookup_ms',
   'playht.connect_time_ms': 'connect_ms',
   'playht.final_response_time_ms': 'final_response_ms',
-  // Cartesia
-  'cartesia.request_id': 'cartesia.req_id',
-  'cartesia.name_lookup_time_ms': 'name_lookup_ms',
-  'cartesia.connect_time_ms': 'connect_ms',
-  'cartesia.final_response_time_ms': 'final_response_ms',
   // Rimelabs
   'rimelabs.name_lookup_time_ms': 'name_lookup_ms',
   'rimelabs.connect_time_ms': 'connect_ms',

lib/tasks/sip_decline.js

@@ -18,11 +18,6 @@ class TaskSipDecline extends Task {
     super.exec(cs);
     res.send(this.data.status, this.data.reason, {
       headers: this.headers
-    }, (err) => {
-      if (!err) {
-        // Call was successfully declined
-        cs._callReleased();
-      }
     });
     cs.emit('callStatusChange', {
       callStatus: CallStatus.Failed,

lib/tasks/sip_refer.js

@@ -12,7 +12,6 @@ class TaskSipRefer extends Task {
 
     this.referTo = this.data.referTo;
     this.referredBy = this.data.referredBy;
-    this.referredByDisplayName = this.data.referredByDisplayName;
     this.headers = this.data.headers || {};
     this.eventHook = this.data.eventHook;
   }
@@ -95,10 +94,7 @@ class TaskSipRefer extends Task {
         }
         if (status >= 200) {
           this.referSpan.setAttributes({'refer.finalNotify': status});
-          await this.performAction({refer_status: 202, final_referred_call_status: status})
-            .catch((err) => {
-              this.logger.error(err, 'TaskSipRefer:exec - error performing action finalNotify');
-            });
+          await this.performAction({refer_status: 202, final_referred_call_status: status});
           this.notifyTaskDone();
         }
       }
@@ -106,7 +102,7 @@ class TaskSipRefer extends Task {
   }
 
   _normalizeReferHeaders(cs, dlg) {
-    let {referTo, referredBy, referredByDisplayName} = this;
+    let {referTo, referredBy} = this;
 
     /* get IP address of the SBC to use as hostname if needed */
     const {host} = parseUri(dlg.remote.uri);
@@ -121,12 +117,9 @@ class TaskSipRefer extends Task {
       referredBy = cs.req?.callingNumber || dlg.local.uri;
       this.logger.info({referredBy}, 'setting referredby');
     }
-    if (!referredByDisplayName) {
-      referredByDisplayName = cs.req?.callingName;
-    }
     if (!referredBy.startsWith('<') && !referredBy.startsWith('sip') && !referredBy.startsWith('"')) {
       /* they may have only provided a phone number/user */
-      referredBy = `${referredByDisplayName ? `"${referredByDisplayName}"` : ''}<sip:${referredBy}@${host}>`;
+      referredBy = `sip:${referredBy}@${host}`;
     }
     return {referTo, referredBy};
   }

lib/tasks/stt-task.js

@@ -5,30 +5,6 @@ const { TaskPreconditions, CobaltTranscriptionEvents } = require('../utils/const
 const { SpeechCredentialError } = require('../utils/error');
 const {JAMBONES_AWS_TRANSCRIBE_USE_GRPC} = require('../config');
 
-/**
- * "Please insert turns here: {{turns:4}}"
-// -> { processed: 'Please insert turns here: {{turns}}', turns: 4 }
-
-processTurnString("Please insert turns here: {{turns}}"));
-// -> { processed: 'Please insert turns here: {{turns}}', turns: null }
- */
-const processTurnString = (input) => {
-  const regex = /\{\{turns(?::(\d+))?\}\}/;
-  const match = input.match(regex);
-
-  if (!match) {
-    return {
-      processed: input,
-      turns: null
-    };
-  }
-
-  const turns = match[1] ? parseInt(match[1], 10) : null;
-  const processed = input.replace(regex, '{{turns}}');
-
-  return { processed, turns };
-};
-
 class SttTask extends Task {
 
   constructor(logger, data, parentTask) {
@@ -243,8 +219,7 @@ class SttTask extends Task {
           roleArn
         });
       this.logger.debug({roleArn}, `(roleArn) got aws access token ${servedFromCache ? 'from cache' : ''}`);
-      // from role ARN, we will get SessionToken, but feature server use it as securityToken.
-      credentials = {...credentials, accessKeyId, secretAccessKey, securityToken: sessionToken};
+      credentials = {...credentials, accessKeyId, secretAccessKey, sessionToken};
     }
     else if (vendor === 'verbio' && credentials.client_id && credentials.client_secret) {
       const {access_token, servedFromCache} = await getVerbioAccessToken(credentials);
@@ -254,13 +229,9 @@ class SttTask extends Task {
     }
     else if (vendor == 'aws' && !JAMBONES_AWS_TRANSCRIBE_USE_GRPC) {
       /* get AWS access token */
-      const {speech_credential_sid, accessKeyId, secretAccessKey, securityToken, region } = credentials;
+      const {accessKeyId, secretAccessKey, securityToken, region } = credentials;
       if (!securityToken) {
-        const { servedFromCache, ...newCredentials} = await getAwsAuthToken({
-          speech_credential_sid,
-          accessKeyId,
-          secretAccessKey,
-          region});
+        const { servedFromCache, ...newCredentials} = await getAwsAuthToken({accessKeyId, secretAccessKey, region});
         this.logger.debug({newCredentials}, `got aws security token ${servedFromCache ? 'from cache' : ''}`);
         credentials = {...newCredentials, region};
       }
@@ -314,57 +285,6 @@ class SttTask extends Task {
     });
   }
 
-  formatOpenAIPrompt(cs, {prompt, hintsTemplate, conversationHistoryTemplate, hints}) {
-    let conversationHistoryPrompt, hintsPrompt;
-
-    /* generate conversation history from template */
-    if (conversationHistoryTemplate) {
-      const {processed, turns} = processTurnString(conversationHistoryTemplate);
-      this.logger.debug({processed, turns}, 'SttTask: processed conversation history template');
-      conversationHistoryPrompt = cs.getFormattedConversation(turns || 4);
-      //this.logger.debug({conversationHistoryPrompt}, 'SttTask: conversation history');
-      if (conversationHistoryPrompt) {
-        conversationHistoryPrompt = processed.replace('{{turns}}', `\n${conversationHistoryPrompt}\nuser: `);
-      }
-    }
-
-    /* generate hints from template */
-    if (hintsTemplate && Array.isArray(hints) && hints.length > 0) {
-      hintsPrompt = hintsTemplate.replace('{{hints}}', hints);
-    }
-
-    /* combine into final prompt */
-    let finalPrompt = prompt || '';
-    if (hintsPrompt) {
-      finalPrompt = `${finalPrompt}\n${hintsPrompt}`;
-    }
-    if (conversationHistoryPrompt) {
-      finalPrompt = `${finalPrompt}\n${conversationHistoryPrompt}`;
-    }
-
-    this.logger.debug({
-      finalPrompt,
-      hints,
-      hintsPrompt,
-      conversationHistoryTemplate,
-      conversationHistoryPrompt
-    }, 'SttTask: formatted OpenAI prompt');
-    return finalPrompt?.trimStart();
-  }
-
-  /* some STT engines will keep listening after a final response, so no need to restart */
-  doesVendorContinueListeningAfterFinalTranscript(vendor) {
-    return (vendor.startsWith('custom:') || [
-      'soniox',
-      'aws',
-      'microsoft',
-      'deepgram',
-      'google',
-      'speechmatics',
-      'openai',
-    ].includes(vendor));
-  }
-
   _onCompileContext(ep, key, evt) {
     const {addKey} = this.cs.srf.locals.dbHelpers;
     this.logger.debug({evt}, `received cobalt compile context event, will cache under ${key}`);

lib/tasks/task.js

@@ -1,5 +1,5 @@
 const Emitter = require('events');
-const crypto = require('crypto');
+const uuidv4 = require('uuid-random');
 const {TaskPreconditions} = require('../utils/constants');
 const { normalizeJambones } = require('@jambonz/verb-specifications');
 const WsRequestor = require('../utils/ws-requestor');
@@ -19,7 +19,6 @@ class Task extends Emitter {
     this.data = data;
     this.actionHook = this.data.actionHook;
     this.id = data.id;
-    this.taskId = crypto.randomUUID();
 
     this._killInProgress = false;
     this._completionPromise = new Promise((resolve) => this._completionResolver = resolve);
@@ -166,7 +165,7 @@ class Task extends Emitter {
       span.setAttributes({'http.body': JSON.stringify(params)});
       try {
         if (this.id) params.verb_id = this.id;
-        const json = await this.cs.requestor.request(type, this.actionHook, params, httpHeaders, span);
+        const json = await this.cs.requestor.request(type, this.actionHook, params, httpHeaders);
         span.setAttributes({'http.statusCode': 200});
         const isWsConnection = this.cs.requestor instanceof WsRequestor;
         if (!isWsConnection || (expectResponse && json && Array.isArray(json) && json.length)) {
@@ -210,7 +209,7 @@ class Task extends Emitter {
     const httpHeaders = b3 && {b3};
     span.setAttributes({'http.body': JSON.stringify(params)});
     try {
-      const json = await cs.requestor.request('verb:hook', hook, params, httpHeaders, span);
+      const json = await cs.requestor.request('verb:hook', hook, params, httpHeaders);
       span.setAttributes({'http.statusCode': 200});
       span.end();
       if (json && Array.isArray(json)) {
@@ -273,7 +272,7 @@ class Task extends Emitter {
   }
 
   async transferCallToFeatureServer(cs, sipAddress, opts) {
-    const uuid = crypto.randomUUID();
+    const uuid = uuidv4();
     const {addKey} = cs.srf.locals.dbHelpers;
     const obj = Object.assign({}, cs.application);
     delete obj.requestor;

lib/tasks/transcribe.js

@@ -13,8 +13,6 @@ const {
   JambonzTranscriptionEvents,
   TranscribeStatus,
   AssemblyAiTranscriptionEvents,
-  VoxistTranscriptionEvents,
-  OpenAITranscriptionEvents,
   VerbioTranscriptionEvents,
   SpeechmaticsTranscriptionEvents
 } = require('../utils/constants.json');
@@ -29,8 +27,8 @@ class TaskTranscribe extends SttTask {
     super(logger, opts, parentTask);
 
     this.transcriptionHook = this.data.transcriptionHook;
-    this.translationHook = this.data.translationHook;
     this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
+
     if (this.data.recognizer) {
       this.interim = !!this.data.recognizer.interim;
       this.separateRecognitionPerChannel = this.data.recognizer.separateRecognitionPerChannel;
@@ -102,10 +100,11 @@ class TaskTranscribe extends SttTask {
         ...this.data.recognizer.nuanceOptions
       };
     }
+    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
 
     if (cs.hasGlobalSttHints) {
       const {hints, hintsBoost} = cs.globalSttHints;
-      this.data.recognizer.hints = this.data.recognizer?.hints?.concat(hints);
+      this.data.recognizer.hints = this.data.recognizer.hints.concat(hints);
       if (!this.data.recognizer.hintsBoost && hintsBoost) this.data.recognizer.hintsBoost = hintsBoost;
       this.logger.debug({hints: this.data.recognizer.hints, hintsBoost: this.data.recognizer.hintsBoost},
         'Transcribe:exec - applying global sttHints');
@@ -118,6 +117,9 @@ class TaskTranscribe extends SttTask {
       if (this.transcribing2) {
         await this._startTranscribing(cs, ep2, 2);
       }
+
+      updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
+        .catch(() => {/*already logged error */});
     } catch (err) {
       if (!(await this._startFallback(cs, ep, {error: err}))) {
         this.logger.info(err, 'TaskTranscribe:exec - error');
@@ -301,23 +303,10 @@ class TaskTranscribe extends SttTask {
           this._onVendorConnectFailure.bind(this, cs, ep, channel));
         break;
 
-      case 'voxist':
-        this.bugname = `${this.bugname_prefix}voxist_transcribe`;
-        this.addCustomEventListener(ep, VoxistTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        this.addCustomEventListener(ep,
-          VoxistTranscriptionEvents.Connect, this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, VoxistTranscriptionEvents.Error, this._onVendorError.bind(this, cs, ep));
-        this.addCustomEventListener(ep, VoxistTranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep, channel));
-        break;
-
       case 'speechmatics':
         this.bugname = `${this.bugname_prefix}speechmatics_transcribe`;
         this.addCustomEventListener(
-          ep, SpeechmaticsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep, channel));
-        this.addCustomEventListener(
-          ep, SpeechmaticsTranscriptionEvents.Translation, this._onTranslation.bind(this, cs, ep, channel));
+          ep, SpeechmaticsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
         this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.Info,
           this._onSpeechmaticsInfo.bind(this, cs, ep));
         this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.RecognitionStarted,
@@ -330,20 +319,6 @@ class TaskTranscribe extends SttTask {
           this._onSpeechmaticsError.bind(this, cs, ep));
         break;
 
-      case 'openai':
-        this.bugname = `${this.bugname_prefix}openai_transcribe`;
-        this.addCustomEventListener(
-          ep, OpenAITranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep, channel));
-        this.addCustomEventListener(ep, OpenAITranscriptionEvents.Connect,
-          this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, OpenAITranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep));
-        this.addCustomEventListener(ep, OpenAITranscriptionEvents.Error,
-          this._onOpenAIErrror.bind(this, cs, ep));
-
-        this.modelSupportsConversationTracking = opts.OPENAI_MODEL !== 'whisper-1';
-        break;
-
       default:
         if (this.vendor.startsWith('custom:')) {
           this.bugname = `${this.bugname_prefix}${this.vendor}_transcribe`;
@@ -379,25 +354,6 @@ class TaskTranscribe extends SttTask {
   async _transcribe(ep) {
     this.logger.debug(
       `TaskTranscribe:_transcribe - starting transcription vendor ${this.vendor} bugname ${this.bugname}`);
-
-    /* special feature for openai: we can provide a prompt that includes recent conversation history */
-    let prompt;
-    if (this.vendor === 'openai') {
-      if (this.modelSupportsConversationTracking) {
-        prompt = this.formatOpenAIPrompt(this.cs, {
-          prompt: this.data.recognizer?.openaiOptions?.prompt,
-          hintsTemplate: this.data.recognizer?.openaiOptions?.promptTemplates?.hintsTemplate,
-          // eslint-disable-next-line max-len
-          conversationHistoryTemplate: this.data.recognizer?.openaiOptions?.promptTemplates?.conversationHistoryTemplate,
-          hints: this.data.recognizer?.hints,
-        });
-        this.logger.debug({prompt}, 'Gather:_startTranscribing - created an openai prompt');
-      }
-      else if (this.data.recognizer?.hints?.length > 0) {
-        prompt = this.data.recognizer?.hints.join(', ');
-      }
-    }
-
     await ep.startTranscription({
       vendor: this.vendor,
       interim: this.interim ? true : false,
@@ -489,9 +445,8 @@ class TaskTranscribe extends SttTask {
         this._startAsrTimer(channel);
 
         /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!this.doesVendorContinueListeningAfterFinalTranscript(this.vendor)) {
-          this._startTranscribing(cs, ep, channel);
-        }
+        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google']
+          .includes(this.vendor)) this._startTranscribing(cs, ep, channel);
       }
       else {
         if (this.vendor === 'soniox') {
@@ -514,7 +469,9 @@ class TaskTranscribe extends SttTask {
         this.logger.debug({evt}, 'TaskTranscribe:_onTranscription - sending final transcript');
         this._resolve(channel, evt);
 
-        if (!this.doesVendorContinueListeningAfterFinalTranscript(this.vendor)) {
+        /* some STT engines will keep listening after a final response, so no need to restart */
+        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google'].includes(this.vendor) &&
+          !this.vendor.startsWith('custom:')) {
           this.logger.debug('TaskTranscribe:_onTranscription - restarting transcribe');
           this._startTranscribing(cs, ep, channel);
         }
@@ -539,47 +496,6 @@ class TaskTranscribe extends SttTask {
     }
   }
 
-  async _onTranslation(_cs, _ep, channel, evt, _fsEvent) {
-    this.logger.debug({evt}, 'TaskTranscribe:_onTranslation');
-    if (this.translationHook && evt.results?.length > 0) {
-      try {
-        const b3 = this.getTracingPropagation();
-        const httpHeaders = b3 && {b3};
-        const payload = {
-          ...this.cs.callInfo,
-          ...httpHeaders,
-          translation: {
-            channel,
-            language: evt.language,
-            translation: evt.results[0].content
-          }
-        };
-
-        this.logger.debug({payload}, 'sending translationHook');
-        const json = await this.cs.requestor.request('verb:hook', this.translationHook, payload);
-        this.logger.info({json}, 'completed translationHook');
-        if (json && Array.isArray(json) && !this.parentTask) {
-          const makeTask = require('./make_task');
-          const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
-          if (tasks && tasks.length > 0) {
-            this.logger.info({tasks: tasks}, `${this.name} replacing application with ${tasks.length} tasks`);
-            this.cs.replaceApplication(tasks);
-          }
-        }
-      } catch (err) {
-        this.logger.info(err, 'TranscribeTask:_onTranslation error');
-      }
-      if (this.parentTask) {
-        this.parentTask.emit('translation', evt);
-      }
-    }
-    if (this.killed) {
-      this.logger.debug('TaskTranscribe:_onTranslation exiting after receiving final transcription');
-      this._clearTimer();
-      this.notifyTaskDone();
-    }
-  }
-
   async _resolve(channel, evt) {
     if (evt.is_final) {
       /* we've got a final transcript, so end the otel child span for this channel */
@@ -653,21 +569,12 @@ class TaskTranscribe extends SttTask {
   }
 
   _onMaxDurationExceeded(cs, ep, channel) {
-    this.restartDueToError(ep, channel, 'Max duration exceeded');
-  }
-
-  _onMaxBufferExceeded(cs, ep, channel) {
-    this.restartDueToError(ep, channel, 'Max buffer exceeded');
-  }
-
-  restartDueToError(ep, channel, reason) {
-    this.logger.debug(`TaskTranscribe:${reason} on channel ${channel}`);
+    this.logger.debug(`TaskTranscribe:_onMaxDurationExceeded on channel ${channel}`);
     if (this.paused) return;
-
     if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
       this.childSpan[channel - 1].span.setAttributes({
         channel,
-        'stt.resolve': reason,
+        'stt.resolve': 'max duration exceeded',
         'stt.label': this.label || 'None',
       });
       this.childSpan[channel - 1].span.end();
@@ -694,6 +601,7 @@ class TaskTranscribe extends SttTask {
         bugname: this.bugname
       })
         .catch((err) => this.logger.error({err}, `Error stopping transcription for primary vendor ${this.vendor}`));
+      const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
       try {
         this.notifyError({ msg: 'ASR error',
           details:`STT Vendor ${this.vendor} error: ${evt.error || evt.reason}`, failover: 'in progress'});
@@ -704,6 +612,7 @@ class TaskTranscribe extends SttTask {
         }
         this[`_speechHandlersSet_${channel}`] = false;
         this._startTranscribing(cs, _ep, channel);
+        updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
         return true;
       } catch (error) {
         this.notifyError({ msg: 'ASR error',
@@ -724,14 +633,6 @@ class TaskTranscribe extends SttTask {
       return;
     }
     this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
-    if (this.vendor === 'microsoft' &&
-      evt.error?.includes('Due to service inactivity, the client buffer exceeded maximum size. Resetting the buffer')) {
-      let channel = 1;
-      if (this.ep !== _ep) {
-        channel = 2;
-      }
-      return this._onMaxBufferExceeded(cs, _ep, channel);
-    }
     if (this.paused) return;
     const {writeAlerts, AlertType} = cs.srf.locals;
 
@@ -776,13 +677,7 @@ class TaskTranscribe extends SttTask {
     this.logger.debug({evt}, 'TaskGather:_onSpeechmaticsInfo');
   }
 
-  async _onSpeechmaticsError(cs, _ep, evt) {
-    // eslint-disable-next-line no-unused-vars
-    const {message, ...e} = evt;
-    this._onVendorError(cs, _ep, {error: JSON.stringify(e)});
-  }
-
-  async _onOpenAIErrror(cs, _ep, evt) {
+  async _onSpeechmaticsErrror(cs, _ep, evt) {
     // eslint-disable-next-line no-unused-vars
     const {message, ...e} = evt;
     this._onVendorError(cs, _ep, {error: JSON.stringify(e)});

lib/tasks/tts-task.js

@@ -1,7 +1,6 @@
 const Task = require('./task');
 const { TaskPreconditions } = require('../utils/constants');
 const { SpeechCredentialError } = require('../utils/error');
-const dbUtils = require('../utils/db-utils');
 
 class TtsTask extends Task {
 
@@ -13,15 +12,14 @@ class TtsTask extends Task {
 
     this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
     /**
-     * Task use taskIncludeSynthesizer to identify
-     * if taskIncludeSynthesizer === true, use label from verb.synthesizer, even it's empty
-     * if taskIncludeSynthesizer === false, use label from application.synthesizer
+     * Task use taskInlcudeSynthesizer to identify
+     * if taskInlcudeSynthesizer === true, use label from verb.synthesizer, even it's empty
+     * if taskInlcudeSynthesizer === false, use label from application.synthesizer
      */
-    this.taskIncludeSynthesizer = !!this.data.synthesizer;
+    this.taskInlcudeSynthesizer = !!this.data.synthesizer;
     this.synthesizer = this.data.synthesizer || {};
     this.disableTtsCache = this.data.disableTtsCache;
     this.options = this.synthesizer.options || {};
-    this.instructions = this.data.instructions;
   }
 
   async exec(cs) {
@@ -43,109 +41,11 @@ class TtsTask extends Task {
         }
       }
     }
-
-    const fullText = Array.isArray(this.text) ? this.text.join(' ') : this.text;
-    // in case dub verb, text might not be set.
-    if (fullText?.length > 0) {
-      cs.emit('botSaid', fullText);
-    }
-  }
-
-  getTtsVendorData(cs) {
-    const vendor = this.synthesizer.vendor && this.synthesizer.vendor !== 'default' ?
-      this.synthesizer.vendor :
-      cs.speechSynthesisVendor;
-    const language = this.synthesizer.language && this.synthesizer.language !== 'default' ?
-      this.synthesizer.language :
-      cs.speechSynthesisLanguage ;
-    const voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
-      this.synthesizer.voice :
-      cs.speechSynthesisVoice;
-    const label = this.taskIncludeSynthesizer ? this.synthesizer.label : cs.speechSynthesisLabel;
-    return {vendor, language, voice, label};
-  }
-
-  async setTtsStreamingChannelVars(vendor, language, voice, credentials, ep) {
-    const {api_key, model_id, custom_tts_streaming_url, auth_token} = credentials;
-    let obj;
-
-    this.logger.debug({credentials},
-      `setTtsStreamingChannelVars: vendor: ${vendor}, language: ${language}, voice: ${voice}`);
-
-    switch (vendor) {
-      case 'deepgram':
-        obj = {
-          DEEPGRAM_API_KEY: api_key,
-          DEEPGRAM_TTS_STREAMING_MODEL: voice
-        };
-        break;
-      case 'cartesia':
-        obj = {
-          CARTESIA_API_KEY: api_key,
-          CARTESIA_TTS_STREAMING_MODEL_ID: model_id,
-          CARTESIA_TTS_STREAMING_VOICE_ID: voice,
-          CARTESIA_TTS_STREAMING_LANGUAGE: language || 'en',
-        };
-        break;
-      case 'elevenlabs':
-        const {stability, similarity_boost, use_speaker_boost, style, speed} = this.options.voice_settings || {};
-        obj = {
-          ELEVENLABS_API_KEY: api_key,
-          ELEVENLABS_TTS_STREAMING_MODEL_ID: model_id,
-          ELEVENLABS_TTS_STREAMING_VOICE_ID: voice,
-          // 20/12/2024 - only eleven_turbo_v2_5 support multiple language
-          ...(['eleven_turbo_v2_5'].includes(model_id) && {ELEVENLABS_TTS_STREAMING_LANGUAGE: language}),
-          ...(stability && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_STABILITY: stability}),
-          ...(similarity_boost && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_SIMILARITY_BOOST: similarity_boost}),
-          ...(use_speaker_boost && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_USE_SPEAKER_BOOST: use_speaker_boost}),
-          ...(style && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_STYLE: style}),
-          // speed has value 0.7 to 1.2, 1.0 is default, make sure we send the value event it's 0
-          ...(speed !== null && speed !== undefined && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_SPEED: `${speed}`}),
-          ...(this.options.pronunciation_dictionary_locators &&
-            Array.isArray(this.options.pronunciation_dictionary_locators) && {
-            ELEVENLABS_TTS_STREAMING_PRONUNCIATION_DICTIONARY_LOCATORS:
-            JSON.stringify(this.options.pronunciation_dictionary_locators)
-          }),
-        };
-        break;
-      case 'rimelabs':
-        const {
-          pauseBetweenBrackets, phonemizeBetweenBrackets, inlineSpeedAlpha, speedAlpha, reduceLatency
-        } = this.options;
-        obj = {
-          RIMELABS_API_KEY: api_key,
-          RIMELABS_TTS_STREAMING_MODEL_ID: model_id,
-          RIMELABS_TTS_STREAMING_VOICE_ID: voice,
-          RIMELABS_TTS_STREAMING_LANGUAGE: language || 'en',
-          ...(pauseBetweenBrackets && {RIMELABS_TTS_STREAMING_PAUSE_BETWEEN_BRACKETS: pauseBetweenBrackets}),
-          ...(phonemizeBetweenBrackets &&
-            {RIMELABS_TTS_STREAMING_PHONEMIZE_BETWEEN_BRACKETS: phonemizeBetweenBrackets}),
-          ...(inlineSpeedAlpha && {RIMELABS_TTS_STREAMING_INLINE_SPEED_ALPHA: inlineSpeedAlpha}),
-          ...(speedAlpha && {RIMELABS_TTS_STREAMING_SPEED_ALPHA: speedAlpha}),
-          ...(reduceLatency && {RIMELABS_TTS_STREAMING_REDUCE_LATENCY: reduceLatency})
-        };
-        break;
-      default:
-        if (vendor.startsWith('custom:')) {
-          const use_tls = custom_tts_streaming_url.startsWith('wss://');
-          obj = {
-            CUSTOM_TTS_STREAMING_HOST: custom_tts_streaming_url.replace(/^(ws|wss):\/\//, ''),
-            CUSTOM_TTS_STREAMING_API_KEY: auth_token,
-            CUSTOM_TTS_STREAMING_VOICE_ID: voice,
-            CUSTOM_TTS_STREAMING_LANGUAGE: language || 'en',
-            CUSTOM_TTS_STREAMING_USE_TLS: use_tls
-          };
-        } else {
-          throw new Error(`vendor ${vendor} is not supported for tts streaming yet`);
-        }
-    }
-    this.logger.debug({vendor, credentials, obj}, 'setTtsStreamingChannelVars');
-
-    await ep.set(obj);
   }
 
   async _synthesizeWithSpecificVendor(cs, ep, {vendor, language, voice, label, preCache = false}) {
     const {srf, accountSid:account_sid} = cs;
+    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, srf);
     const {writeAlerts, AlertType, stats} = srf.locals;
     const {synthAudio} = srf.locals.dbHelpers;
     const engine = this.synthesizer.engine || cs.synthesizer?.engine || 'neural';
@@ -157,14 +57,15 @@ class TtsTask extends Task {
         `No text-to-speech service credentials for ${vendor} with labels: ${label} have been configured`);
     }
     /* parse Nuance voices into name and model */
+    let model;
     if (vendor === 'nuance' && voice) {
       const arr = /([A-Za-z-]*)\s+-\s+(enhanced|standard)/.exec(voice);
       if (arr) {
         voice = arr[1];
-        this.model = arr[2];
+        model = arr[2];
       }
     } else if (vendor === 'deepgram') {
-      this.model = voice;
+      model = voice;
     }
 
     /* allow for microsoft custom region voice and api_key to be specified as an override */
@@ -194,24 +95,8 @@ class TtsTask extends Task {
     } else if (vendor === 'playht') {
       credentials = credentials || {};
       credentials.voice_engine = this.options.voice_engine || credentials.voice_engine;
-    } else if (vendor === 'google' && typeof voice === 'string' && voice.startsWith('custom_')) {
-      const {lookupGoogleCustomVoice} = dbUtils(this.logger, cs.srf);
-      const arr = /custom_(.*)/.exec(voice);
-      if (arr) {
-        const google_custom_voice_sid = arr[1];
-        const [custom_voice] = await lookupGoogleCustomVoice(google_custom_voice_sid);
-        if (custom_voice.use_voice_cloning_key) {
-          voice = {
-            voice_cloning_key: custom_voice.voice_cloning_key,
-          };
-        }
-      }
-    } else if (vendor === 'cartesia') {
-      credentials.model_id = this.options.model_id || credentials.model_id;
     }
 
-    this.model_id = credentials.model_id;
-
     /**
      * note on cache_speech_handles.  This was found to be risky.
      * It can cause a crash in the following sequence on a single call:
@@ -232,8 +117,7 @@ class TtsTask extends Task {
     // If vendor is changed from the previous one, then reset the cache_speech_handles flag
     //cs.currentTtsVendor = vendor;
 
-    if (!preCache && !this._disableTracing)
-      this.logger.debug({vendor, language, voice, model: this.model}, 'TaskSay:exec');
+    if (!preCache && !this._disableTracing) this.logger.info({vendor, language, voice, model}, 'TaskSay:exec');
     try {
       if (!credentials) {
         writeAlerts({
@@ -244,6 +128,8 @@ class TtsTask extends Task {
         }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
         throw new SpeechCredentialError('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) => {
@@ -264,12 +150,11 @@ class TtsTask extends Task {
           const {filePath, servedFromCache, rtt} = await synthAudio(stats, {
             account_sid,
             text,
-            instructions: this.instructions,
             vendor,
             language,
             voice,
             engine,
-            model: this.model,
+            model,
             salt,
             credentials,
             options: this.options,
@@ -284,6 +169,10 @@ class TtsTask extends Task {
               this.otelSpan.end();
               this.otelSpan = null;
             }
+            if (!servedFromCache && !lastUpdated) {
+              lastUpdated = true;
+              updateSpeechCredentialLastUsed(credentials.speech_credential_sid).catch(() => {/* logged error */});
+            }
             if (!servedFromCache && rtt && !preCache  && !this._disableTracing) {
               this.notifyStatus({
                 event: 'synthesized-audio',

lib/utils/action-hook-delay.js

@@ -126,12 +126,7 @@ class ActionHookDelayProcessor extends Emitter {
     try {
       this._taskInProgress = makeTask(this.logger, t[0]);
       this._taskInProgress.disableTracing = true;
-      this._taskInProgress.exec(this.cs, {ep: this.ep}).catch((err) => {
-        this.logger.info(`ActionHookDelayProcessor#_onNoResponseTimer: error playing file: ${err.message}`);
-        this._taskInProgress = null;
-        this.ep.removeAllListeners('playback-start');
-        this.ep.removeAllListeners('playback-stop');
-      });
+      this._taskInProgress.exec(this.cs, {ep: this.ep});
     } catch (err) {
       this.logger.info(err, 'ActionHookDelayProcessor#_onNoResponseTimer: error starting action');
       this._taskInProgress = null;

lib/utils/amd-utils.js

@@ -45,7 +45,6 @@ if (VMD_HINTS_FILE) {
   });
 }
 
-
 class Amd extends Emitter {
   constructor(logger, cs, opts) {
     super();
@@ -69,8 +68,6 @@ class Amd extends Emitter {
     this.getIbmAccessToken = getIbmAccessToken;
     const {setChannelVarsForStt} = require('./transcription-utils')(logger);
     this.setChannelVarsForStt = setChannelVarsForStt;
-    this.digitCount = opts.digitCount || 0;
-    this.numberRegEx = RegExp(`[0-9]{${this.digitCount}}`);
 
     const {
       noSpeechTimeoutMs = 5000,
@@ -156,7 +153,7 @@ class Amd extends Emitter {
       const wordCount = t.alternatives[0].transcript.split(' ').length;
       const final = t.is_final;
 
-      const foundHint = hints.find((h) =>  t.alternatives[0].transcript.toLowerCase().includes(h.toLowerCase()));
+      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}`);
@@ -166,14 +163,6 @@ class Amd extends Emitter {
           language: t.language_code
         });
       }
-      else if (this.digitCount != 0 && this.numberRegEx.test(t.alternatives[0].transcript)) {
-        /* a string of numbers is typically a machine */
-        this.emit(this.decision = AmdEvents.MachineDetected, {
-          reason: 'digit count',
-          greeting: t.alternatives[0].transcript,
-          language: t.language_code
-        });
-      }
       else if (final && wordCount < this.thresholdWordCount) {
         /* a short greeting is typically a human */
         this.emit(this.decision = AmdEvents.HumanDetected, {

lib/utils/aws-sns-lifecycle.js

@@ -4,7 +4,7 @@ const assert = require('assert');
 const {
   AWS_REGION,
   AWS_SNS_PORT: PORT,
-  AWS_SNS_TOPIC_ARN,
+  AWS_SNS_TOPIC_ARM,
   AWS_SNS_PORT_MAX,
 } = require('../config');
 const {LifeCycleEvents} = require('./constants');
@@ -55,12 +55,12 @@ class SnsNotifier extends Emitter {
   async _handlePost(req, res) {
     try {
       const parsedBody = JSON.parse(req.body);
-      this.logger.info({headers: req.headers, body: parsedBody}, 'Received HTTP POST from AWS');
+      this.logger.debug({headers: req.headers, body: parsedBody}, 'Received HTTP POST from AWS');
       if (!validatePayload(parsedBody)) {
         this.logger.info('incoming AWS SNS HTTP POST failed signature validation');
         return res.sendStatus(403);
       }
-      this.logger.info('incoming HTTP POST passed validation');
+      this.logger.debug('incoming HTTP POST passed validation');
       res.sendStatus(200);
 
       switch (parsedBody.Type) {
@@ -74,18 +74,7 @@ class SnsNotifier extends Emitter {
             subscriptionRequestId: this.subscriptionRequestId
           }, 'response from SNS SubscribeURL');
           const data = await this.describeInstance();
-
-          const group = data.AutoScalingGroups.find((group) =>
-            group.Instances && group.Instances.some((instance) => instance.InstanceId === this.instanceId)
-          );
-          if (!group) {
-            this.logger.error('Current instance not found in any Auto Scaling group', data);
-          } else {
-            const instance = group.Instances.find((instance) => instance.InstanceId === this.instanceId);
-            this.lifecycleState = instance.LifecycleState;
-          }
-
-          //this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
+          this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
           this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
           break;
 
@@ -105,7 +94,7 @@ class SnsNotifier extends Emitter {
               this.unsubscribe();
             }
             else {
-              this.logger.info(`SnsNotifier - instance ${msg.EC2InstanceId} is scaling in (not us)`);
+              this.logger.debug(`SnsNotifier - instance ${msg.EC2InstanceId} is scaling in (not us)`);
             }
           }
           break;
@@ -122,7 +111,7 @@ class SnsNotifier extends Emitter {
 
   async init() {
     try {
-      this.logger.info('SnsNotifier: retrieving instance data');
+      this.logger.debug('SnsNotifier: retrieving instance data');
       this.instanceId = await getString('http://169.254.169.254/latest/meta-data/instance-id');
       this.publicIp = await getString('http://169.254.169.254/latest/meta-data/public-ipv4');
       this.logger.info({
@@ -153,13 +142,13 @@ class SnsNotifier extends Emitter {
     try {
       const params = {
         Protocol: 'http',
-        TopicArn: AWS_SNS_TOPIC_ARN,
+        TopicArn: AWS_SNS_TOPIC_ARM,
         Endpoint: this.snsEndpoint
       };
       const response = await snsClient.send(new SubscribeCommand(params));
-      this.logger.info({response}, `response to SNS subscribe to ${AWS_SNS_TOPIC_ARN}`);
+      this.logger.info({response}, `response to SNS subscribe to ${AWS_SNS_TOPIC_ARM}`);
     } catch (err) {
-      this.logger.error({err}, `Error subscribing to SNS topic arn ${AWS_SNS_TOPIC_ARN}`);
+      this.logger.error({err}, `Error subscribing to SNS topic arn ${AWS_SNS_TOPIC_ARM}`);
     }
   }
 
@@ -170,9 +159,9 @@ class SnsNotifier extends Emitter {
         SubscriptionArn: this.subscriptionArn
       };
       const response = await snsClient.send(new UnsubscribeCommand(params));
-      this.logger.info({response}, `response to SNS unsubscribe to ${AWS_SNS_TOPIC_ARN}`);
+      this.logger.info({response}, `response to SNS unsubscribe to ${AWS_SNS_TOPIC_ARM}`);
     } catch (err) {
-      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${AWS_SNS_TOPIC_ARN}`);
+      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${AWS_SNS_TOPIC_ARM}`);
     }
   }
 

lib/utils/background-task-manager.js

@@ -46,9 +46,6 @@ class BackgroundTaskManager extends Emitter {
       case 'transcribe':
         task = await this._initTranscribe(opts);
         break;
-      case 'ttsStream':
-        task = await this._initTtsStream(opts);
-        break;
       default:
         break;
     }
@@ -103,7 +100,6 @@ class BackgroundTaskManager extends Emitter {
   async _initBargeIn(opts) {
     let task;
     try {
-      const copy = JSON.parse(JSON.stringify(opts));
       const t = normalizeJambones(this.logger, [opts]);
       task = makeTask(this.logger, t[0]);
       task
@@ -122,7 +118,7 @@ class BackgroundTaskManager extends Emitter {
           if (task.sticky && !this.cs.callGone && !this.cs._stopping) {
             this.logger.info('BackgroundTaskManager:_initBargeIn: restarting background bargeIn');
             this._bargeInHandled = false;
-            this.newTask('bargeIn', copy, true);
+            this.newTask('bargeIn', opts, true);
           }
           return;
         })
@@ -177,25 +173,6 @@ class BackgroundTaskManager extends Emitter {
     return task;
   }
 
-  // Initiate Tts Stream
-  async _initTtsStream(opts) {
-    let task;
-    try {
-      const t = normalizeJambones(this.logger, [opts]);
-      task = makeTask(this.logger, t[0]);
-      const resources = await this.cs._evaluatePreconditions(task);
-      const {span, ctx} = this.rootSpan.startChildSpan(`background-ttsStream:${task.summary}`);
-      task.span = span;
-      task.ctx = ctx;
-      task.exec(this.cs, resources)
-        .then(this._taskCompleted.bind(this, 'ttsStream', task))
-        .catch(this._taskError.bind(this, 'ttsStream', task));
-    } catch (err) {
-      this.logger.info(err, 'BackgroundTaskManager:_initTtsStream - Error creating ttsStream task');
-    }
-    return task;
-  }
-
   _taskCompleted(type, task) {
     this.logger.debug({type, task}, `BackgroundTaskManager:_taskCompleted: task completed, sticky: ${task.sticky}`);
     task.removeAllListeners();

lib/utils/base-requestor.js

@@ -1,7 +1,6 @@
 const assert = require('assert');
 const Emitter = require('events');
 const crypto = require('crypto');
-const parseUrl = require('parse-url');
 const timeSeries = require('@jambonz/time-series');
 const {NODE_ENV, JAMBONES_TIME_SERIES_HOST} = require('../config');
 let alerter ;
@@ -22,10 +21,6 @@ class BaseRequestor extends Emitter {
     const {stats} = require('../../').srf.locals;
     this.stats = stats;
 
-    const u = this._parsedUrl = parseUrl(this.url);
-    if (u.port) this._baseUrl = `${u.protocol}://${u.resource}:${u.port}`;
-    else this._baseUrl = `${u.protocol}://${u.resource}`;
-
     if (!alerter) {
       alerter = timeSeries(logger, {
         host: JAMBONES_TIME_SERIES_HOST,
@@ -35,10 +30,6 @@ class BaseRequestor extends Emitter {
     }
   }
 
-  get baseUrl() {
-    return this._baseUrl;
-  }
-
   get Alerter() {
     return alerter;
   }
@@ -79,44 +70,7 @@ class BaseRequestor extends Emitter {
     return time.toFixed(0);
   }
 
-  _parseHashParams(hash) {
-    // Remove the leading # if present
-    const hashString = hash.startsWith('#') ? hash.substring(1) : hash;
-    // Use URLSearchParams for parsing
-    const params = new URLSearchParams(hashString);
-    // Convert to a regular object
-    const result = {};
-    for (const [key, value] of params.entries()) {
-      result[key] = value;
-    }
-    return result;
-  }
 
-  /**
-   * Check if the error should be retried based on retry policy
-   * @param {Error} err - The error that occurred
-   * @param {string[]} rpValues - Array of retry policy values
-   * @returns {boolean} True if the error should be retried
-   */
-  _shouldRetry(err, rpValues) {
-    // ct = connection timeout (ECONNREFUSED, ETIMEDOUT, etc)
-    const isCt = err.code === 'ECONNREFUSED' ||
-                 err.code === 'ETIMEDOUT' ||
-                 err.code === 'ECONNRESET' ||
-                 err.code === 'ECONNABORTED';
-    // rt = request timeout
-    const isRt = err.name === 'TimeoutError';
-    // 4xx = client errors
-    const is4xx = err.statusCode >= 400 && err.statusCode < 500;
-    // 5xx = server errors
-    const is5xx = err.statusCode >= 500 && err.statusCode < 600;
-    // Check if error type is included in retry policy
-    return rpValues.includes('all') ||
-           (isCt && rpValues.includes('ct')) ||
-           (isRt && rpValues.includes('rt')) ||
-           (is4xx && rpValues.includes('4xx')) ||
-           (is5xx && rpValues.includes('5xx'));
-  }
 }
 
 module.exports = BaseRequestor;

lib/utils/constants.json

@@ -28,11 +28,10 @@
     "SipRedirect": "sip:redirect",
     "Say": "say",
     "SayLegacy": "say:legacy",
-    "Stream": "stream",
     "Tag": "tag",
     "Transcribe": "transcribe"
   },
-  "AllowedSipRecVerbs": ["answer", "config", "gather", "transcribe", "listen", "tag", "hangup", "sip:decline"],
+  "AllowedSipRecVerbs": ["answer", "config", "gather", "transcribe", "listen", "tag"],
   "AllowedConfirmSessionVerbs": ["config", "gather", "plays", "say", "tag"],
   "CallStatus": {
     "Trying": "trying",
@@ -130,25 +129,12 @@
   },
   "SpeechmaticsTranscriptionEvents": {
     "Transcription": "speechmatics_transcribe::transcription",
-    "Translation": "speechmatics_transcribe::translation",
     "Info": "speechmatics_transcribe::info",
     "RecognitionStarted": "speechmatics_transcribe::recognition_started",
     "ConnectFailure": "speechmatics_transcribe::connect_failed",
     "Connect": "speechmatics_transcribe::connect",
     "Error": "speechmatics_transcribe::error"
   },
-  "OpenAITranscriptionEvents": {
-    "Transcription": "openai_transcribe::transcription",
-    "Translation": "openai_transcribe::translation",
-    "SpeechStarted": "openai_transcribe::speech_started",
-    "SpeechStopped": "openai_transcribe::speech_stopped",
-    "PartialTranscript": "openai_transcribe::partial_transcript",
-    "Info": "openai_transcribe::info",
-    "RecognitionStarted": "openai_transcribe::recognition_started",
-    "ConnectFailure": "openai_transcribe::connect_failed",
-    "Connect": "openai_transcribe::connect",
-    "Error": "openai_transcribe::error"
-  },
   "JambonzTranscriptionEvents": {
     "Transcription": "jambonz_transcribe::transcription",
     "ConnectFailure": "jambonz_transcribe::connect_failed",
@@ -161,12 +147,6 @@
     "ConnectFailure": "assemblyai_transcribe::connect_failed",
     "Connect": "assemblyai_transcribe::connect"
   },
-  "VoxistTranscriptionEvents": {
-    "Transcription": "voxist_transcribe::transcription",
-    "Error": "voxist_transcribe::error",
-    "ConnectFailure": "voxist_transcribe::connect_failed",
-    "Connect": "voxist_transcribe::connect"
-  },
   "VadDetection": {
     "Detection": "vad_detect:detection"
   },
@@ -194,34 +174,6 @@
     "Disconnect": "openai_s2s::disconnect",
     "ServerEvent": "openai_s2s::server_event"
   },
-  "LlmEvents_Google": {
-    "Error": "error",
-    "Connect": "google_s2s::connect",
-    "ConnectFailure": "google_s2s::connect_failed",
-    "Disconnect": "google_s2s::disconnect",
-    "ServerEvent": "google_s2s::server_event"
-  },
-  "LlmEvents_Elevenlabs": {
-    "Error": "error",
-    "Connect": "elevenlabs_s2s::connect",
-    "ConnectFailure": "elevenlabs_s2s::connect_failed",
-    "Disconnect": "elevenlabs_s2s::disconnect",
-    "ServerEvent": "elevenlabs_s2s::server_event"
-  },
-  "LlmEvents_VoiceAgent": {
-    "Error": "error",
-    "Connect": "voice_agent_s2s::connect",
-    "ConnectFailure": "voice_agent_s2s::connect_failed",
-    "Disconnect": "voice_agent_s2s::disconnect",
-    "ServerEvent": "voice_agent_s2s::server_event"
-  },
-  "LlmEvents_Ultravox": {
-    "Error": "error",
-    "Connect": "ultravox_s2s::connect",
-    "ConnectFailure": "ultravox_s2s::connect_failed",
-    "Disconnect": "ultravox_s2s::disconnect",
-    "ServerEvent": "ultravox_s2s::server_event"
-  },
   "QueueResults": {
     "Bridged": "bridged",
     "Error": "error",
@@ -236,8 +188,7 @@
   },
   "KillReason": {
     "Hangup": "hangup",
-    "Replaced": "replaced",
-    "MediaTimeout": "media_timeout"
+    "Replaced": "replaced"
   },
   "HookMsgTypes": [
     "session:new",
@@ -251,8 +202,6 @@
     "verb:status",
     "llm:event",
     "llm:tool-call",
-    "tts:tokens-result",
-    "tts:streaming-event",
     "jambonz:error"
   ],
   "RecordState": {
@@ -271,59 +220,7 @@
     "ToneTimeout": "amd_tone_timeout",
     "Stopped": "amd_stopped"
   },
-  "MediaPath": {
-    "NoMedia": "no-media",
-    "PartialMedia": "partial-media",
-    "FullMedia": "full-media"
-  },
-  "DeepgramTtsStreamingEvents": {
-    "Empty": "deepgram_tts_streaming::empty",
-    "ConnectFailure": "deepgram_tts_streaming::connect_failed",
-    "Connect": "deepgram_tts_streaming::connect"
-  },
-  "CartesiaTtsStreamingEvents": {
-    "Empty": "cartesia_tts_streaming::empty",
-    "ConnectFailure": "cartesia_tts_streaming::connect_failed",
-    "Connect": "cartesia_tts_streaming::connect"
-  },
-  "ElevenlabsTtsStreamingEvents": {
-    "Empty": "elevenlabs_tts_streaming::empty",
-    "ConnectFailure": "elevenlabs_tts_streaming::connect_failed",
-    "Connect": "elevenlabs_tts_streaming::connect"
-  },
-  "RimelabsTtsStreamingEvents": {
-    "Empty": "rimelabs_tts_streaming::empty",
-    "ConnectFailure": "rimelabs_tts_streaming::connect_failed",
-    "Connect": "rimelabs_tts_streaming::connect"
-  },
-  "CustomTtsStreamingEvents": {
-    "Empty": "custom_tts_streaming::empty",
-    "ConnectFailure": "custom_tts_streaming::connect_failed",
-    "Connect": "custom_tts_streaming::connect"
-  },
-  "TtsStreamingEvents": {
-    "Empty": "tts_streaming::empty",
-    "Pause": "tts_streaming::pause",
-    "Resume": "tts_streaming::resume",
-    "ConnectFailure": "tts_streaming::connect_failed"
-  },
-  "TtsStreamingConnectionStatus": {
-    "NotConnected": "not_connected",
-    "Connected": "connected",
-    "Connecting": "connecting",
-    "Failed": "failed"
-  },
   "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",
-  "SystemState" : {
-    "Online": "ONLINE",
-    "Offline": "OFFLINE",
-    "GracefulShutdownInProgress":"SHUTDOWN_IN_PROGRESS"
-  },
-  "FEATURE_SERVER" : "feature-server",
-  "WS_CLOSE_CODES": {
-    "NormalClosure": 1000,
-    "GoingAway": 1001
-  }
+  "FS_UUID_SET_NAME": "fsUUIDs"
 }

lib/utils/db-utils.js

@@ -76,7 +76,6 @@ const speechMapper = (cred) => {
     else if ('deepgram' === obj.vendor) {
       const o = JSON.parse(decrypt(credential));
       obj.api_key = o.api_key;
-      obj.model_id = o.model_id;
       obj.deepgram_stt_uri = o.deepgram_stt_uri;
       obj.deepgram_tts_uri = o.deepgram_tts_uri;
       obj.deepgram_stt_use_tls = o.deepgram_stt_use_tls;
@@ -106,13 +105,6 @@ const speechMapper = (cred) => {
       obj.voice_engine = o.voice_engine;
       obj.options = o.options;
     }
-    else if ('cartesia' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-      obj.model_id = o.model_id;
-      obj.embedding = o.embedding;
-      obj.options = o.options;
-    }
     else if ('rimelabs' === obj.vendor) {
       const o = JSON.parse(decrypt(credential));
       obj.api_key = o.api_key;
@@ -123,10 +115,6 @@ const speechMapper = (cred) => {
       const o = JSON.parse(decrypt(credential));
       obj.api_key = o.api_key;
     }
-    else if ('voxist' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-    }
     else if ('whisper' === obj.vendor) {
       const o = JSON.parse(decrypt(credential));
       obj.api_key = o.api_key;
@@ -143,17 +131,11 @@ const speechMapper = (cred) => {
       obj.api_key = o.api_key;
       obj.speechmatics_stt_uri = o.speechmatics_stt_uri;
     }
-    else if ('openai' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-      obj.model_id = o.model_id;
-    }
     else if (obj.vendor.startsWith('custom:')) {
       const o = JSON.parse(decrypt(credential));
       obj.auth_token = o.auth_token;
       obj.custom_stt_url = o.custom_stt_url;
       obj.custom_tts_url = o.custom_tts_url;
-      obj.custom_tts_streaming_url = o.custom_tts_streaming_url;
     }
   } catch (err) {
     console.log(err);
@@ -233,23 +215,11 @@ module.exports = (logger, srf) => {
     }
   };
 
-  const lookupVoipCarrierBySid = async(sid) => {
-    const pp = pool.promise();
-    try {
-      const [r] = await pp.query('SELECT * FROM voip_carriers WHERE voip_carrier_sid = ?', [sid]);
-      return r;
-
-    } catch (err) {
-      logger.error({err}, `lookupVoipCarrierBySid: Error ${sid}`);
-    }
-  };
-
   return {
     lookupAccountDetails,
     updateSpeechCredentialLastUsed,
     lookupCarrier,
     lookupCarrierByPhoneNumber,
-    lookupGoogleCustomVoice,
-    lookupVoipCarrierBySid
+    lookupGoogleCustomVoice
   };
 };

lib/utils/error.js

@@ -1,33 +1,9 @@
-class NonFatalTaskError extends Error {
+class SpeechCredentialError extends Error {
   constructor(msg) {
     super(msg);
   }
 }
 
-class SpeechCredentialError extends NonFatalTaskError {
-  constructor(msg) {
-    super(msg);
-  }
-}
-
-class PlayFileNotFoundError extends NonFatalTaskError {
-  constructor(url) {
-    super('File not found');
-    this.url = url;
-  }
-}
-
-class HTTPResponseError extends Error {
-  constructor(statusCode) {
-    super('Unexpected HTTP Response');
-    delete this.stack;
-    this.statusCode = statusCode;
-  }
-}
-
 module.exports = {
-  SpeechCredentialError,
-  NonFatalTaskError,
-  PlayFileNotFoundError,
-  HTTPResponseError
+  SpeechCredentialError
 };

lib/utils/helpers.js

@@ -1,5 +0,0 @@
-
-const sleepFor = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
-module.exports = {
-  sleepFor
-};

lib/utils/http-requestor.js

@@ -16,7 +16,6 @@ const {
   NODE_ENV,
   HTTP_USER_AGENT_HEADER,
 } = require('../config');
-const {HTTPResponseError} = require('./error');
 
 const toBase64 = (str) => Buffer.from(str || '', 'utf8').toString('base64');
 
@@ -43,12 +42,13 @@ class HttpRequestor extends BaseRequestor {
 
     this.method = hook.method || 'POST';
     this.authHeader = basicAuth(hook.username, hook.password);
-    this.backoffMs = 500;
 
     assert(this._isAbsoluteUrl(this.url));
     assert(['GET', 'POST'].includes(this.method));
 
     const u = this._parsedUrl = parseUrl(this.url);
+    if (u.port) this._baseUrl = `${u.protocol}://${u.resource}:${u.port}`;
+    else this._baseUrl = `${u.protocol}://${u.resource}`;
     this._protocol = u.protocol;
     this._resource = u.resource;
     this._port = u.port;
@@ -56,18 +56,18 @@ class HttpRequestor extends BaseRequestor {
     this._usePools = HTTP_POOL && parseInt(HTTP_POOL);
 
     if (this._usePools) {
-      if (pools.has(this.baseUrl)) {
-        this.client = pools.get(this.baseUrl);
+      if (pools.has(this._baseUrl)) {
+        this.client = pools.get(this._baseUrl);
       }
       else {
         const connections = HTTP_POOLSIZE ? parseInt(HTTP_POOLSIZE) : 10;
         const pipelining = HTTP_PIPELINING ? parseInt(HTTP_PIPELINING) : 1;
-        const pool = this.client = new Pool(this.baseUrl, {
+        const pool = this.client = new Pool(this._baseUrl, {
           connections,
           pipelining
         });
-        pools.set(this.baseUrl, pool);
-        this.logger.debug(`HttpRequestor:created pool for ${this.baseUrl}`);
+        pools.set(this._baseUrl, pool);
+        this.logger.debug(`HttpRequestor:created pool for ${this._baseUrl}`);
       }
     }
     else {
@@ -88,6 +88,10 @@ class HttpRequestor extends BaseRequestor {
     }
   }
 
+  get baseUrl() {
+    return this._baseUrl;
+  }
+
   close() {
     if (!this._usePools && !this.client?.closed) this.client.close();
   }
@@ -103,13 +107,13 @@ class HttpRequestor extends BaseRequestor {
    * @param {string} [hook.password] - if basic auth is protecting the endpoint
    * @param {object} [params] - request parameters
    */
-  async request(type, hook, params, httpHeaders = {}, span) {
+  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', 'env_vars', 'args']) : null;
+    const payload = params ? snakeCaseKeys(params, ['customerData', 'sip']) : null;
     const url = hook.url || hook;
     const method = hook.method || 'POST';
     let buf = '';
@@ -132,51 +136,30 @@ class HttpRequestor extends BaseRequestor {
         this.close();
         this.emit('handover', requestor);
       }
-      return requestor.request('session:new', hook, params, httpHeaders, span);
+      return requestor.request('session:new', hook, params, httpHeaders);
     }
 
     let newClient;
     try {
-      this.backoffMs = 500;
-      // Parse URL and extract hash parameters for retry configuration
-      // Prepare request options - only do this once
-      const absUrl = this._isRelativeUrl(url) ? `${this.baseUrl}${url}` : url;
-      const parsedUrl = parseUrl(absUrl);
-      const hash = parsedUrl.hash || '';
-      const hashObj = hash ? this._parseHashParams(hash) : {};
-
-      // Retry policy: rp valid values: 4xx, 5xx, ct, rt, all, default is ct
-      // Retry count: rc valid values: 1-5, default is 0
-      // rc is the number of attempts we'll make AFTER the initial try
-      const rc = hash ? Math.min(Math.abs(parseInt(hashObj.rc || '0')), 5) : 0;
-      const rp = hashObj.rp || 'ct';
-      const rpValues = rp.split(',').map((v) => v.trim());
-      let retryCount = 0;
-
-      // Set up client, path and query parameters - only do this once
       let client, path, query;
       if (this._isRelativeUrl(url)) {
         client = this.client;
         path = url;
       }
       else {
-        if (parsedUrl.resource === this._resource &&
-          parsedUrl.port === this._port &&
-          parsedUrl.protocol === this._protocol) {
+        const u = parseUrl(url);
+        if (u.resource === this._resource && u.port === this._port && u.protocol === this._protocol) {
           client = this.client;
-          path = parsedUrl.pathname;
-          query = parsedUrl.query;
+          path = u.pathname;
+          query = u.query;
         }
         else {
-          if (parsedUrl.port) {
-            client = newClient = new Client(`${parsedUrl.protocol}://${parsedUrl.resource}:${parsedUrl.port}`);
-          }
-          else client = newClient = new Client(`${parsedUrl.protocol}://${parsedUrl.resource}`);
-          path = parsedUrl.pathname;
-          query = parsedUrl.query;
+          if (u.port) client = newClient = new Client(`${u.protocol}://${u.resource}:${u.port}`);
+          else client = newClient = new Client(`${u.protocol}://${u.resource}`);
+          path = u.pathname;
+          query = u.query;
         }
       }
-
       const sigHeader = this._generateSigHeader(payload, this.secret);
       const hdrs = {
         ...sigHeader,
@@ -184,8 +167,20 @@ class HttpRequestor extends BaseRequestor {
         ...httpHeaders,
         ...('POST' === method && {'Content-Type': 'application/json'})
       };
-
-      const requestOptions = {
+      const absUrl = this._isRelativeUrl(url) ? `${this.baseUrl}${url}` : url;
+      this.logger.debug({url, absUrl, hdrs}, 'send webhook');
+      const {statusCode, headers, body} =  HTTP_PROXY_IP ? await request(
+        this.baseUrl,
+        {
+          path,
+          query,
+          method,
+          headers: hdrs,
+          ...('POST' === method && {body: JSON.stringify(payload)}),
+          timeout: HTTP_TIMEOUT,
+          followRedirects: false
+        }
+      ) : await client.request({
         path,
         query,
         method,
@@ -193,51 +188,15 @@ class HttpRequestor extends BaseRequestor {
         ...('POST' === method && {body: JSON.stringify(payload)}),
         timeout: HTTP_TIMEOUT,
         followRedirects: false
-      };
-
-      // Simplified makeRequest function that just executes the HTTP request
-      const makeRequest = async() => {
-        this.logger.debug({url, absUrl, hdrs, retryCount},
-          `send webhook${retryCount > 0 ? ' (retry ' + retryCount + ')' : ''}`);
-
-        const {statusCode, headers, body} = HTTP_PROXY_IP ? await request(
-          this.baseUrl,
-          requestOptions
-        ) : await client.request(requestOptions);
-
-        if (![200, 202, 204].includes(statusCode)) {
-          const err = new HTTPResponseError(statusCode);
-          throw err;
-        }
-
-        if (headers['content-type']?.includes('application/json')) {
-          return await body.json();
-        }
-        return '';
-      };
-
-      while (true) {
-        try {
-          buf = await makeRequest();
-          break; // Success, exit the retry loop
-        } catch (err) {
-          retryCount++;
-
-          // Check if we should retry
-          if (retryCount <= rc && this._shouldRetry(err, rpValues)) {
-            this.logger.info(
-              {err, baseUrl: this.baseUrl, url, retryCount, maxRetries: rc},
-              `Retrying request (${retryCount}/${rc})`
-            );
-            const delay = this.backoffMs;
-            this.backoffMs = this.backoffMs < 2000 ? this.backoffMs * 2 : (this.backoffMs + 2000);
-            await new Promise((resolve) => setTimeout(resolve, delay));
-            continue;
-          }
-          throw err;
-        }
+      });
+      if (![200, 202, 204].includes(statusCode)) {
+        const err = new Error();
+        err.statusCode = statusCode;
+        throw err;
+      }
+      if (headers['content-type']?.includes('application/json')) {
+        buf = await body.json();
       }
-
       if (newClient) newClient.close();
     } catch (err) {
       if (err.statusCode) {
@@ -266,10 +225,10 @@ class HttpRequestor extends BaseRequestor {
     const rtt = this._roundTrip(startAt);
     if (buf) this.stats.histogram('app.hook.response_time', rtt, ['hook_type:app']);
 
-    if (buf && (Array.isArray(buf) || type == 'llm:tool-call')) {
+    if (buf && Array.isArray(buf)) {
       this.logger.info({response: buf}, `HttpRequestor:request ${method} ${url} succeeded in ${rtt}ms`);
+      return buf;
     }
-    return buf;
   }
 }
 

lib/utils/install-srf-locals.js

@@ -31,26 +31,18 @@ function getLocalIp() {
   return '127.0.0.1'; // Fallback to localhost if no suitable interface found
 }
 
-function initMS(logger, wrapper, ms, {
-  onFreeswitchConnect,
-  onFreeswitchDisconnect
-}) {
+function initMS(logger, wrapper, ms) {
   Object.assign(wrapper, {ms, active: true, connects: 1});
   logger.info(`connected to freeswitch at ${ms.address}`);
 
-  onFreeswitchConnect(wrapper);
-
   ms.conn
     .on('esl::end', () => {
       wrapper.active = false;
-      wrapper.connects = 0;
       logger.info(`lost connection to freeswitch at ${ms.address}`);
-      onFreeswitchDisconnect(wrapper);
-      ms.removeAllListeners();
     })
     .on('esl::ready', () => {
       if (wrapper.connects > 0) {
-        logger.info(`esl::ready connected to freeswitch at ${ms.address}`);
+        logger.info(`connected to freeswitch at ${ms.address}`);
       }
       wrapper.connects = 1;
       wrapper.active = true;
@@ -64,10 +56,7 @@ function initMS(logger, wrapper, ms, {
   });
 }
 
-function installSrfLocals(srf, logger, {
-  onFreeswitchConnect = () => {},
-  onFreeswitchDisconnect = () => {}
-}) {
+function installSrfLocals(srf, logger) {
   logger.debug('installing srf locals');
   assert(!srf.locals.dbHelpers);
   const {tracer} = srf.locals.otel;
@@ -102,10 +91,7 @@ function installSrfLocals(srf, logger, {
       mediaservers.push(val);
       try {
         const ms = await mrf.connect(fs);
-        initMS(logger, val, ms, {
-          onFreeswitchConnect,
-          onFreeswitchDisconnect
-        });
+        initMS(logger, val, ms);
       }
       catch (err) {
         logger.info({err}, `failed connecting to freeswitch at ${fs.address}, will retry shortly: ${err.message}`);
@@ -116,15 +102,9 @@ function installSrfLocals(srf, logger, {
       for (const val of mediaservers) {
         if (val.connects === 0) {
           try {
-            // make sure all listeners are removed before reconnecting
-            val.ms?.disconnect();
-            val.ms = null;
             logger.info({mediaserver: val.opts}, 'Retrying initial connection to media server');
             const ms = await mrf.connect(val.opts);
-            initMS(logger, val, ms, {
-              onFreeswitchConnect,
-              onFreeswitchDisconnect
-            });
+            initMS(logger, val, ms);
           } catch (err) {
             logger.info({err}, `failed connecting to freeswitch at ${val.opts.address}, will retry shortly`);
           }
@@ -219,8 +199,7 @@ function installSrfLocals(srf, logger, {
   } = require('@jambonz/speech-utils')({}, logger);
   const {
     writeAlerts,
-    AlertType,
-    writeSystemAlerts
+    AlertType
   } = require('@jambonz/time-series')(logger, {
     host: JAMBONES_TIME_SERIES_HOST,
     commitSize: 50,
@@ -290,8 +269,7 @@ function installSrfLocals(srf, logger, {
     getFreeswitch,
     stats: stats,
     writeAlerts,
-    AlertType,
-    writeSystemAlerts
+    AlertType
   };
 
   if (localIp) {

lib/utils/llm-mcp.js

@@ -1,103 +0,0 @@
-const { Client } = require('@modelcontextprotocol/sdk/client/index.js');
-
-class LlmMcpService {
-
-  constructor(logger, mcpServers) {
-    this.logger = logger;
-    this.mcpServers = mcpServers || [];
-    this.mcpClients = [];
-  }
-
-  // make sure we call init() before using any of the mcp clients
-  // this is to ensure that we have a valid connection to the MCP server
-  // and that we have collected the available tools.
-  async init() {
-    if (this.mcpClients.length > 0) {
-      return;
-    }
-    const { SSEClientTransport } = await import('@modelcontextprotocol/sdk/client/sse.js');
-    for (const server of this.mcpServers) {
-      const { url } = server;
-      if (url) {
-        try {
-          const transport = new SSEClientTransport(new URL(url), {});
-          const client = new Client({ name: 'Jambonz MCP Client', version: '1.0.0' });
-          await client.connect(transport);
-          // collect available tools
-          const { tools } = await client.listTools();
-          this.mcpClients.push({
-            url,
-            client,
-            tools
-          });
-        } catch (err) {
-          this.logger.error(`LlmMcpService: Failed to connect to MCP server at ${url}: ${err.message}`);
-        }
-      }
-    }
-  }
-
-  async getAvailableMcpTools() {
-    // returns a list of available tools from all MCP clients
-    const tools = [];
-    for (const mcpClient of this.mcpClients) {
-      const {tools: availableTools} = mcpClient;
-      if (availableTools) {
-        tools.push(...availableTools);
-      }
-    }
-    return tools;
-  }
-
-  async getMcpClientByToolName(name) {
-    for (const mcpClient of this.mcpClients) {
-      const { tools } = mcpClient;
-      if (tools && tools.some((tool) => tool.name === name)) {
-        return mcpClient.client;
-      }
-    }
-    return null;
-  }
-
-  async getMcpClientByToolId(id) {
-    for (const mcpClient of this.mcpClients) {
-      const { tools } = mcpClient;
-      if (tools && tools.some((tool) => tool.id === id)) {
-        return mcpClient.client;
-      }
-    }
-    return null;
-  }
-
-  async callMcpTool(name, input) {
-    const client = await this.getMcpClientByToolName(name);
-    if (client) {
-      try {
-        const result = await client.callTool({
-          name,
-          arguments: input,
-        });
-        this.logger.debug({result}, 'LlmMcpService - result');
-        return result;
-      } catch (err) {
-        this.logger.error({err}, 'LlmMcpService - error calling tool');
-        throw err;
-      }
-    }
-  }
-
-  async close() {
-    for (const mcpClient of this.mcpClients) {
-      const { client } = mcpClient;
-      if (client) {
-        await client.close();
-        this.logger.debug({url: mcpClient.url}, 'LlmMcpService - mcp client closed');
-      }
-    }
-    this.mcpClients = [];
-  }
-
-}
-
-module.exports = LlmMcpService;
-

lib/utils/network.js

@@ -1,32 +0,0 @@
-
-/**
- * Parses a list of hostport entries and selects the first one that matches the specified protocol,
- * excluding any entries with the localhost IP address ('127.0.0.1').
- *
- * Each hostport entry should be in the format: 'protocol/ip:port'
- *
- * @param {Object} logger - A logging object with a 'debug' method for logging debug messages.
- * @param {string} hostport - A comma-separated string containing hostport entries.
- * @param {string} protocol - The protocol to match (e.g., 'udp', 'tcp').
- * @returns {Array} An array containing:
- * 0: protocol
- * 1: ip address
- * 2: port
- */
-const selectHostPort = (logger, hostport, protocol) => {
-  logger.debug(`selectHostPort: ${hostport}, ${protocol}`);
-  const sel = hostport
-    .split(',')
-    .map((hp) => {
-      const arr = /(.*)\/(.*):(.*)/.exec(hp);
-      return [arr[1], arr[2], arr[3]];
-    })
-    .filter((hp) => {
-      return hp[0] === protocol && hp[1] !== '127.0.0.1';
-    });
-  return sel[0];
-};
-
-module.exports = {
-  selectHostPort
-};

lib/utils/place-outdial.js

@@ -1,5 +1,5 @@
 const Emitter = require('events');
-const {CallStatus, MediaPath} = require('./constants');
+const {CallStatus} = require('./constants');
 const SipError = require('drachtio-srf').SipError;
 const {TaskPreconditions, CallDirection} = require('../utils/constants');
 const CallInfo = require('../session/call-info');
@@ -12,17 +12,13 @@ const deepcopy = require('deepcopy');
 const moment = require('moment');
 const stripCodecs = require('./strip-ancillary-codecs');
 const RootSpan = require('./call-tracer');
-const crypto = require('crypto');
+const uuidv4 = require('uuid-random');
 const HttpRequestor = require('./http-requestor');
 const WsRequestor = require('./ws-requestor');
-const {makeOpusFirst, removeVideoSdp} = require('./sdp-utils');
+const {makeOpusFirst} = require('./sdp-utils');
 const {
-  JAMBONES_USE_FREESWITCH_TIMER_FD,
-  JAMBONES_MEDIA_TIMEOUT_MS,
-  JAMBONES_MEDIA_HOLD_TIMEOUT_MS,
-  JAMBONES_TRANSCRIBE_EP_DESTROY_DELAY_MS
+  JAMBONES_USE_FREESWITCH_TIMER_FD
 } = require('../config');
-const { sleepFor } = require('./helpers');
 
 class SingleDialer extends Emitter {
   constructor({logger, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan, dialTask,
@@ -47,7 +43,7 @@ class SingleDialer extends Emitter {
 
     this.callGone = false;
 
-    this.callSid = crypto.randomUUID();
+    this.callSid = uuidv4();
     this.dialTask = dialTask;
     this.onHoldMusic = onHoldMusic;
 
@@ -154,21 +150,15 @@ class SingleDialer extends Emitter {
         return;
       }
       let lastSdp;
-      const connectStream = async(remoteSdp, isVideoCall) => {
+      const connectStream = async(remoteSdp) => {
         if (remoteSdp === lastSdp) return;
-        if (process.env.JAMBONES_VIDEO_CALLS_ENABLED_IN_FS && !isVideoCall) {
-          remoteSdp = removeVideoSdp(remoteSdp);
-        }
         lastSdp = remoteSdp;
         return this.ep.modify(remoteSdp);
       };
-      let localSdp = this.ep.local.sdp;
-      if (process.env.JAMBONES_VIDEO_CALLS_ENABLED_IN_FS && !opts.isVideoCall) {
-        localSdp = removeVideoSdp(localSdp);
-      }
+
       Object.assign(opts, {
         proxy: `sip:${this.sbcAddress}`,
-        localSdp: opts.opusFirst ? makeOpusFirst(localSdp) : localSdp
+        localSdp: opts.opusFirst ? makeOpusFirst(this.ep.local.sdp) : this.ep.local.sdp
       });
       if (this.target.auth) opts.auth = this.target.auth;
       inviteSpan = this.startSpan('invite', {
@@ -230,13 +220,13 @@ class SingleDialer extends Emitter {
               status.callStatus = CallStatus.EarlyMedia;
               this.emit('earlyMedia');
             }
-            connectStream(prov.body, opts.isVideoCall);
+            connectStream(prov.body);
           }
           else status.callStatus = CallStatus.Ringing;
           this.emit('callStatusChange', status);
         }
       });
-      await connectStream(this.dlg.remote.sdp, opts.isVideoCall);
+      await connectStream(this.dlg.remote.sdp);
       this.dlg.callSid = this.callSid;
       this.inviteInProgress = null;
       this.emit('callStatusChange', {
@@ -279,12 +269,7 @@ class SingleDialer extends Emitter {
                 this.logger.info('dial is onhold, emit event');
                 this.emit('reinvite', req, res);
               } else {
-                let newSdp = await this.ep.modify(req.body);
-                // in case of reINVITE if video call is enabled in FS and the call is not a video call,
-                // remove video media from the SDP
-                if (process.env.JAMBONES_VIDEO_CALLS_ENABLED_IN_FS && !this.opts?.isVideoCall) {
-                  newSdp = removeVideoSdp(newSdp);
-                }
+                const newSdp = await this.ep.modify(req.body);
                 res.send(200, {body: newSdp});
                 this.logger.info({offer: req.body, answer: newSdp}, 'SingleDialer:exec: handling reINVITE');
               }
@@ -332,19 +317,14 @@ class SingleDialer extends Emitter {
   /**
    * kill the call in progress or the stable dialog, whichever we have
    */
-  async kill(Reason) {
+  async kill() {
     this.killed = true;
     if (this.inviteInProgress) await this.inviteInProgress.cancel();
     else if (this.dlg && this.dlg.connected) {
       const duration = moment().diff(this.dlg.connectTime, 'seconds');
       this.logger.debug('SingleDialer:kill hanging up called party');
       this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
-      const headers = {
-        ...(Reason && {'X-Reason': Reason})
-      };
-      this.dlg.destroy({
-        headers
-      });
+      this.dlg.destroy();
     }
     if (this.ep) {
       this.logger.debug(`SingleDialer:kill - deleting endpoint ${this.ep.uuid}`);
@@ -355,40 +335,11 @@ class SingleDialer extends Emitter {
   _configMsEndpoint() {
     const opts = {
       ...(this.onHoldMusic && {holdMusic: `shout://${this.onHoldMusic.replace(/^https?:\/\//, '')}`}),
-      ...(JAMBONES_USE_FREESWITCH_TIMER_FD && {timer_name: 'timerfd'}),
-      ...(JAMBONES_MEDIA_TIMEOUT_MS && {media_timeout: JAMBONES_MEDIA_TIMEOUT_MS}),
-      ...(JAMBONES_MEDIA_HOLD_TIMEOUT_MS && {media_hold_timeout: JAMBONES_MEDIA_HOLD_TIMEOUT_MS})
+      ...(JAMBONES_USE_FREESWITCH_TIMER_FD && {timer_name: 'timerfd'})
     };
     if (Object.keys(opts).length > 0) {
       this.ep.set(opts);
     }
-    if (this.dialTask?.inbandDtmfEnabled && !this.ep.inbandDtmfEnabled) {
-      // https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Modules/mod-dptools/6587132/#0-about
-      try {
-        this.ep.execute('start_dtmf');
-        this.ep.inbandDtmfEnabled = true;
-      } catch (err) {
-        this.logger.info(err, 'place-outdial:_configMsEndpoint - error enable inband DTMF');
-      }
-    }
-
-    const origDestroy = this.ep.destroy.bind(this.ep);
-    this.ep.destroy = async() => {
-      try {
-        if (this.dialTask.transcribeTask && JAMBONES_TRANSCRIBE_EP_DESTROY_DELAY_MS) {
-          // transcribe task is being used, wait for some time before destroy
-          // if final transcription is received but endpoint is already closed,
-          // freeswitch module will not be able to send the transcription
-
-          this.logger.info('SingleDialer:_configMsEndpoint -' +
-            ' Dial with transcribe task, wait for some time before destroy');
-          await sleepFor(JAMBONES_TRANSCRIBE_EP_DESTROY_DELAY_MS);
-        }
-        await origDestroy();
-      } catch (err) {
-        this.logger.error(err, 'SingleDialer:_configMsEndpoint - error destroying endpoint');
-      }
-    };
   }
 
   /**
@@ -430,8 +381,7 @@ class SingleDialer extends Emitter {
         callInfo: this.callInfo,
         accountInfo: this.accountInfo,
         tasks,
-        rootSpan: this.rootSpan,
-        req: this.req
+        rootSpan: this.rootSpan
       });
       await cs.exec();
 
@@ -440,10 +390,7 @@ class SingleDialer extends Emitter {
     } catch (err) {
       this.logger.debug(err, 'SingleDialer:_executeApp: error');
       this.emit('decline');
-      if (this.dlg.connected) {
-        this.dlg.destroy();
-        this.ep.destroy();
-      }
+      if (this.dlg.connected) this.dlg.destroy();
     }
   }
 
@@ -508,26 +455,21 @@ class SingleDialer extends Emitter {
     return cs;
   }
 
-  async releaseMediaToSBC(remoteSdp, localSdp, releaseMediaEntirely) {
+  async releaseMediaToSBC(remoteSdp, localSdp) {
     assert(this.dlg && this.dlg.connected && this.ep && typeof remoteSdp === 'string');
     const sdp = stripCodecs(this.logger, remoteSdp, localSdp) || remoteSdp;
     await this.dlg.modify(sdp, {
       headers: {
-        'X-Reason': releaseMediaEntirely ? 'release-media-entirely' : 'release-media'
+        'X-Reason': 'release-media'
       }
     });
-    try {
-      await this.ep.destroy();
-    } catch (err) {
-      this.logger.error({err}, 'SingleDialer:releaseMediaToSBC: Error destroying endpoint');
-    }
-    this.ep = null;
+    this.ep.destroy()
+      .then(() => this.ep = null)
+      .catch((err) => this.logger.error({err}, 'SingleDialer:releaseMediaToSBC: Error destroying endpoint'));
   }
 
-  async reAnchorMedia(currentMediaRoute = MediaPath.PartialMedia) {
+  async reAnchorMedia() {
     assert(this.dlg && this.dlg.connected && !this.ep);
-
-    this.logger.debug('SingleDialer:reAnchorMedia: re-anchoring media after partial media');
     this.ep = await this.ms.createEndpoint({remoteSdp: this.dlg.remote.sdp});
     this._configMsEndpoint();
     await this.dlg.modify(this.ep.local.sdp, {
@@ -535,11 +477,6 @@ class SingleDialer extends Emitter {
         'X-Reason': 'anchor-media'
       }
     });
-
-    if (currentMediaRoute === MediaPath.NoMedia) {
-      this.logger.debug('SingleDialer:reAnchorMedia: repoint endpoint after no media');
-      await this.ep.modify(this.dlg.remote.sdp);
-    }
   }
 
   _notifyCallStatusChange({callStatus, sipStatus, sipReason, duration}) {
@@ -570,8 +507,7 @@ function placeOutdial({
 }) {
   const myOpts = deepcopy(opts);
   const sd = new SingleDialer({
-    logger, sbcAddress, target, opts: myOpts, application, callInfo,
-    accountInfo, rootSpan, startSpan, dialTask, onHoldMusic
+    logger, sbcAddress, target, myOpts, application, callInfo, accountInfo, rootSpan, startSpan, dialTask, onHoldMusic
   });
   sd.exec(srf, ms, myOpts);
   return sd;

lib/utils/sbc-pinger.js

@@ -1,5 +1,5 @@
 const assert = require('assert');
-const crypto = require('crypto');
+const uuidv4 = require('uuid-random');
 const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./constants');
 const Emitter = require('events');
 const debug = require('debug')('jambonz:feature-server');
@@ -8,7 +8,7 @@ const {
   JAMBONES_SBCS,
   K8S,
   K8S_SBC_SIP_SERVICE_NAME,
-  AWS_SNS_TOPIC_ARN,
+  AWS_SNS_TOPIC_ARM,
   OPTIONS_PING_INTERVAL,
   AWS_REGION,
   NODE_ENV,
@@ -35,7 +35,7 @@ module.exports = (logger) => {
   // listen for SNS lifecycle changes
   let lifecycleEmitter = new Emitter();
   let dryUpCalls = false;
-  if (AWS_SNS_TOPIC_ARN && AWS_REGION) {
+  if (AWS_SNS_TOPIC_ARM && AWS_REGION) {
 
     (async function() {
       try {
@@ -46,24 +46,12 @@ module.exports = (logger) => {
             const {srf} = require('../..');
             srf.locals.publicIp = publicIp;
           })
-          .on(LifeCycleEvents.ScaleIn, async() => {
+          .on(LifeCycleEvents.ScaleIn, () => {
             logger.info('AWS scale-in notification: begin drying up calls');
             dryUpCalls = true;
             lifecycleEmitter.operationalState = LifeCycleEvents.ScaleIn;
 
             const {srf} = require('../..');
-            const {writeSystemAlerts} = srf.locals;
-            if (writeSystemAlerts) {
-              const {SystemState, FEATURE_SERVER} = require('./constants');
-              await writeSystemAlerts({
-                system_component: FEATURE_SERVER,
-                state : SystemState.GracefulShutdownInProgress,
-                fields : {
-                  detail: `feature-server with process_id ${process.pid} shutdown in progress`,
-                  host: srf.locals?.ipv4
-                }
-              });
-            }
             pingProxies(srf);
 
             // if we have zero calls, we can complete the scale-in right
@@ -130,7 +118,7 @@ module.exports = (logger) => {
       logger.info('disabling OPTIONS pings since we are running as a kubernetes service');
       const {srf} = require('../..');
       const {addToSet} = srf.locals.dbHelpers;
-      const uuid = srf.locals.fsUUID = crypto.randomUUID();
+      const uuid = srf.locals.fsUUID = uuidv4();
 
       /* in case redis is restarted, re-insert our key every so often */
       setInterval(() => {

lib/utils/sdp-utils.js

@@ -35,12 +35,6 @@ const makeOpusFirst = (sdp) => {
   }
   return sdpTransform.write(parsedSdp);
 };
-const removeVideoSdp = (sdp) => {
-  const parsedSdp = sdpTransform.parse(sdp);
-  // Filter out video media sections, keeping only non-video media
-  parsedSdp.media = parsedSdp.media.filter((media) => media.type !== 'video');
-  return sdpTransform.write(parsedSdp);
-};
 
 const extractSdpMedia = (sdp) => {
   const parsedSdp1 = sdpTransform.parse(sdp);
@@ -60,6 +54,5 @@ module.exports = {
   mergeSdpMedia,
   extractSdpMedia,
   isOpusFirst,
-  makeOpusFirst,
-  removeVideoSdp
+  makeOpusFirst
 };

lib/utils/siprec-utils.js

@@ -1,5 +1,5 @@
 const xmlParser = require('xml2js').parseString;
-const crypto = require('crypto');
+const uuidv4 = require('uuid-random');
 const parseUri = require('drachtio-srf').parseUri;
 const transform = require('sdp-transform');
 const debug = require('debug')('jambonz:feature-server');
@@ -52,7 +52,7 @@ const parseSiprecPayload = (req, logger) => {
       const arr = /^([^]+)(m=[^]+?)(m=[^]+?)$/.exec(sdp);
       opts.sdp1 = `${arr[1]}${arr[2]}`;
       opts.sdp2 = `${arr[1]}${arr[3]}\r\n`;
-      opts.sessionId = crypto.randomUUID();
+      opts.sessionId = uuidv4();
       logger.info({ payload: req.payload }, 'SIPREC payload with no metadata (e.g. Cisco NBR)');
       resolve(opts);
     } else if (!sdp || !meta) {
@@ -64,7 +64,7 @@ const parseSiprecPayload = (req, logger) => {
       if (err) { throw err; }
 
       opts.recordingData = result ;
-      opts.sessionId = crypto.randomUUID();
+      opts.sessionId = uuidv4() ;
 
       const arr = /^([^]+)(m=[^]+?)(m=[^]+?)$/.exec(sdp) ;
       opts.sdp1 = `${arr[1]}${arr[2]}` ;

lib/utils/sticky-event-emitter.js

@@ -1,74 +0,0 @@
-const EventEmitter = require('events');
-
-/**
- * A specialized EventEmitter that caches the most recent event emissions.
- * When new listeners are added, they immediately receive the most recent
- * event if it was previously emitted. This is useful for handling state
- * changes where late subscribers need to know the current state.
- *
- * Features:
- * - Caches the most recent emission for each event type
- * - New listeners immediately receive the cached event if available
- * - Supports both regular (on) and one-time (once) listeners
- * - Maintains compatibility with Node's EventEmitter interface
- */
-class StickyEventEmitter extends EventEmitter {
-  constructor() {
-    super();
-    this._eventCache = new Map();
-    this._onceListeners = new Map(); // For storing once listeners if needed
-  }
-  destroy() {
-    this._eventCache.clear();
-    this._onceListeners.clear();
-    this.removeAllListeners();
-  }
-  emit(event, ...args) {
-    // Store the event and its args
-    this._eventCache.set(event, args);
-
-    // If there are any 'once' listeners waiting, call them
-    if (this._onceListeners.has(event)) {
-      const listeners = this._onceListeners.get(event);
-      for (const listener of listeners) {
-        listener(...args);
-      }
-      if (this.onSuccess) {
-        this.onSuccess();
-      }
-      this._onceListeners.delete(event);
-      // return from here as the event listener is already called
-      // this is to avoid calling the native emit method which
-      // will call the event listener again
-      return true;
-    }
-
-    return super.emit(event, ...args);
-  }
-
-  on(event, listener) {
-    if (this._eventCache.has(event)) {
-      listener(...this._eventCache.get(event));
-    }
-    return super.on(event, listener);
-  }
-
-  once(event, listener) {
-    if (this._eventCache.has(event)) {
-      listener(...this._eventCache.get(event));
-      if (this.onSuccess) {
-        this.onSuccess();
-      }
-    } else {
-      // Store listener in case emit comes before
-      if (!this._onceListeners.has(event)) {
-        this._onceListeners.set(event, []);
-      }
-      this._onceListeners.get(event).push(listener);
-      super.once(event, listener); // Also attach to native once
-    }
-    return this;
-  }
-}
-
-module.exports = StickyEventEmitter;

lib/utils/transcription-utils.js

@@ -30,7 +30,6 @@ const stickyVars = {
     'DEEPGRAM_SPEECH_TIER',
     'DEEPGRAM_SPEECH_MODEL',
     'DEEPGRAM_SPEECH_ENABLE_SMART_FORMAT',
-    'DEEPGRAM_SPEECH_ENABLE_NO_DELAY',
     'DEEPGRAM_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION',
     'DEEPGRAM_SPEECH_PROFANITY_FILTER',
     'DEEPGRAM_SPEECH_REDACT',
@@ -44,9 +43,7 @@ const stickyVars = {
     'DEEPGRAM_SPEECH_UTTERANCE_END_MS',
     'DEEPGRAM_SPEECH_VAD_TURNOFF',
     'DEEPGRAM_SPEECH_TAG',
-    'DEEPGRAM_SPEECH_MODEL_VERSION',
-    'DEEPGRAM_SPEECH_FILLER_WORDS',
-    'DEEPGRAM_SPEECH_KEYTERMS',
+    'DEEPGRAM_SPEECH_MODEL_VERSION'
   ],
   aws: [
     'AWS_VOCABULARY_NAME',
@@ -107,26 +104,12 @@ const stickyVars = {
     'ASSEMBLYAI_API_KEY',
     'ASSEMBLYAI_WORD_BOOST'
   ],
-  voxist: [
-    'VOXIST_API_KEY',
-  ],
   speechmatics: [
     'SPEECHMATICS_API_KEY',
     'SPEECHMATICS_HOST',
     'SPEECHMATICS_PATH',
     'SPEECHMATICS_SPEECH_HINTS',
-    'SPEECHMATICS_TRANSLATION_LANGUAGES',
-    'SPEECHMATICS_TRANSLATION_PARTIALS'
-  ],
-  openai: [
-    'OPENAI_API_KEY',
-    'OPENAI_MODEL',
-    'OPENAI_INPUT_AUDIO_NOISE_REDUCTION',
-    'OPENAI_TURN_DETECTION_TYPE',
-    'OPENAI_TURN_DETECTION_THRESHOLD',
-    'OPENAI_TURN_DETECTION_PREFIX_PADDING_MS',
-    'OPENAI_TURN_DETECTION_SILENCE_DURATION_MS',
-  ],
+  ]
 };
 
 /**
@@ -200,10 +183,7 @@ const selectDefaultGoogleModel = (task, language, version) => {
     (useV2 ? 'long' : 'latest_long');
 };
 const consolidateTranscripts = (bufferedTranscripts, channel, language, vendor) => {
-  if (bufferedTranscripts.length === 1) {
-    bufferedTranscripts[0].is_final = true;
-    return bufferedTranscripts[0];
-  }
+  if (bufferedTranscripts.length === 1) return bufferedTranscripts[0];
   let totalConfidence = 0;
   const finalTranscript = bufferedTranscripts.reduce((acc, evt) => {
     totalConfidence += evt.alternatives[0].confidence;
@@ -223,7 +203,7 @@ const consolidateTranscripts = (bufferedTranscripts, channel, language, vendor)
     const lastChar = acc.alternatives[0].transcript.slice(-1);
     const firstChar = newTranscript.charAt(0);
 
-    if (vendor === 'speechmatics' || (lastChar.match(/\d/) && firstChar.match(/\d/))) {
+    if (lastChar.match(/\d/) && firstChar.match(/\d/)) {
       acc.alternatives[0].transcript += newTranscript;
     } else {
       acc.alternatives[0].transcript += ` ${newTranscript}`;
@@ -313,18 +293,13 @@ const normalizeDeepgram = (evt, channel, language, shortUtterance) => {
       confidence: alt.confidence,
       transcript: alt.transcript,
     }));
-  /**
-   * Some models (nova-2-general) return the detected language in the
-   * alternatives.languages array if the language is set as multi.
-   * If the language is detected, we use it as the language_code.
-   */
-  const detectedLanguage = evt.channel?.alternatives?.[0]?.languages?.[0];
+
   /**
    * note difference between is_final and speech_final in Deepgram:
    * https://developers.deepgram.com/docs/understand-endpointing-interim-results
    */
   return {
-    language_code: detectedLanguage || language,
+    language_code: language,
     channel_tag: channel,
     is_final: shortUtterance ? evt.is_final : evt.speech_final,
     alternatives: alternatives.length ? [alternatives[0]] : [],
@@ -536,25 +511,6 @@ const normalizeAssemblyAi = (evt, channel, language) => {
   };
 };
 
-const normalizeVoxist = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: evt.type === 'final',
-    alternatives: [
-      {
-        confidence: 1.00,
-        transcript: evt.text,
-      }
-    ],
-    vendor: {
-      name: 'voxist',
-      evt: copy
-    }
-  };
-};
-
 const normalizeSpeechmatics = (evt, channel, language) => {
   const copy = JSON.parse(JSON.stringify(evt));
   const is_final = evt.message === 'AddTranscript';
@@ -580,35 +536,6 @@ const normalizeSpeechmatics = (evt, channel, language) => {
   return obj;
 };
 
-const calculateConfidence = (logprobsArray) => {
-  // Sum the individual log probabilities
-  const totalLogProb = logprobsArray.reduce((sum, tokenInfo) => sum + tokenInfo.logprob, 0);
-
-  // Convert the total log probability back to a regular probability
-  const confidence = Math.exp(totalLogProb);
-  return confidence;
-};
-
-const normalizeOpenAI = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  const obj = {
-    language_code: language,
-    channel_tag: channel,
-    is_final: true,
-    alternatives: [
-      {
-        transcript: evt.transcript,
-        confidence: evt.logprobs ? calculateConfidence(evt.logprobs) : 1.0,
-      }
-    ],
-    vendor: {
-      name: 'openai',
-      evt: copy
-    }
-  };
-  return obj;
-};
-
 module.exports = (logger) => {
   const normalizeTranscription = (evt, vendor, channel, language, shortUtterance, punctuation) => {
 
@@ -634,14 +561,10 @@ module.exports = (logger) => {
         return normalizeCobalt(evt, channel, language);
       case 'assemblyai':
         return normalizeAssemblyAi(evt, channel, language, shortUtterance);
-      case 'voxist':
-        return normalizeVoxist(evt, channel, language);
       case 'verbio':
         return normalizeVerbio(evt, channel, language);
       case 'speechmatics':
         return normalizeSpeechmatics(evt, channel, language);
-      case 'openai':
-        return normalizeOpenAI(evt, channel, language);
       default:
         if (vendor.startsWith('custom:')) {
           return normalizeCustom(evt, channel, language, vendor);
@@ -776,8 +699,6 @@ module.exports = (logger) => {
         //azureSttEndpointId overrides sttCredentials.custom_stt_endpoint
         ...(rOpts.azureSttEndpointId &&
           {AZURE_SERVICE_ENDPOINT_ID: rOpts.azureSttEndpointId}),
-        ...(azureOptions.speechRecognitionMode &&
-          {AZURE_RECOGNITION_MODE: azureOptions.speechRecognitionMode}),
       };
     }
     else if ('nuance' === vendor) {
@@ -829,7 +750,7 @@ module.exports = (logger) => {
       };
     }
     else if ('deepgram' === vendor) {
-      let model = rOpts.deepgramOptions?.model || rOpts.model || sttCredentials.model_id;
+      let {model} = rOpts;
       const {deepgramOptions = {}} = rOpts;
       const deepgramUri = deepgramOptions.deepgramSttUri || sttCredentials.deepgram_stt_uri;
       const useTls = deepgramOptions.deepgramSttUseTls || sttCredentials.deepgram_stt_use_tls;
@@ -851,8 +772,6 @@ module.exports = (logger) => {
           {DEEPGRAM_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 1},
         ...(deepgramOptions.smartFormatting) &&
           {DEEPGRAM_SPEECH_ENABLE_SMART_FORMAT: 1},
-        ...(deepgramOptions.noDelay) &&
-          {DEEPGRAM_SPEECH_ENABLE_NO_DELAY: 1},
         ...(deepgramOptions.profanityFilter) &&
           {DEEPGRAM_SPEECH_PROFANITY_FILTER: 1},
         ...(deepgramOptions.redact) &&
@@ -888,11 +807,7 @@ module.exports = (logger) => {
         ...(deepgramOptions.tag) &&
           {DEEPGRAM_SPEECH_TAG: deepgramOptions.tag},
         ...(deepgramOptions.version) &&
-          {DEEPGRAM_SPEECH_MODEL_VERSION: deepgramOptions.version},
-        ...(deepgramOptions.fillerWords) &&
-          {DEEPGRAM_SPEECH_FILLER_WORDS: deepgramOptions.fillerWords},
-        ...((Array.isArray(deepgramOptions.keyterms) && deepgramOptions.keyterms.length > 0) &&
-          {DEEPGRAM_SPEECH_KEYTERMS: deepgramOptions.keyterms.join(',')})
+          {DEEPGRAM_SPEECH_MODEL_VERSION: deepgramOptions.version}
       };
     }
     else if ('soniox' === vendor) {
@@ -1001,43 +916,6 @@ module.exports = (logger) => {
           {ASSEMBLYAI_WORD_BOOST: JSON.stringify(rOpts.hints)})
       };
     }
-    else if ('voxist' === vendor) {
-      opts = {
-        ...opts,
-        ...(sttCredentials.api_key) &&
-          {VOXIST_API_KEY: sttCredentials.api_key},
-      };
-    }
-    else if ('openai' === vendor) {
-      const {openaiOptions = {}} = rOpts;
-      const model = openaiOptions.model || rOpts.model || sttCredentials.model_id || 'whisper-1';
-      const apiKey = openaiOptions.apiKey || sttCredentials.api_key;
-
-      opts = {
-        OPENAI_MODEL: model,
-        OPENAI_API_KEY: apiKey,
-        ...opts,
-        ...(openaiOptions.prompt && {OPENAI_PROMPT: openaiOptions.prompt}),
-        ...(openaiOptions.input_audio_noise_reduction &&
-          {OPENAI_INPUT_AUDIO_NOISE_REDUCTION: openaiOptions.input_audio_noise_reduction}),
-      };
-
-      if (openaiOptions.turn_detection) {
-        opts = {
-          ...opts,
-          OPENAI_TURN_DETECTION_TYPE: openaiOptions.turn_detection.type,
-          ...(openaiOptions.turn_detection.threshold && {
-            OPENAI_TURN_DETECTION_THRESHOLD: openaiOptions.turn_detection.threshold
-          }),
-          ...(openaiOptions.turn_detection.prefix_padding_ms && {
-            OPENAI_TURN_DETECTION_PREFIX_PADDING_MS: openaiOptions.turn_detection.prefix_padding_ms
-          }),
-          ...(openaiOptions.turn_detection.silence_duration_ms && {
-            OPENAI_TURN_DETECTION_SILENCE_DURATION_MS: openaiOptions.turn_detection.silence_duration_ms
-          }),
-        };
-      }
-    }
     else if ('verbio' === vendor) {
       const {verbioOptions = {}} = rOpts;
       opts = {
@@ -1059,48 +937,11 @@ module.exports = (logger) => {
       };
     }
     else if ('speechmatics' === vendor) {
-      const {speechmaticsOptions = {}} = rOpts;
       opts = {
         ...opts,
         ...(sttCredentials.api_key) && {SPEECHMATICS_API_KEY: sttCredentials.api_key},
         ...(sttCredentials.speechmatics_stt_uri) && {SPEECHMATICS_HOST: sttCredentials.speechmatics_stt_uri},
         ...(rOpts.hints?.length > 0 && {SPEECHMATICS_SPEECH_HINTS: rOpts.hints.join(',')}),
-        ...(speechmaticsOptions.translation_config &&
-          {
-            SPEECHMATICS_TRANSLATION_LANGUAGES: speechmaticsOptions.translation_config.target_languages.join(','),
-            SPEECHMATICS_TRANSLATION_PARTIALS: speechmaticsOptions.translation_config.enable_partials ? 1 : 0
-          }
-        ),
-        ...(speechmaticsOptions.transcription_config?.domain &&
-          {SPEECHMATICS_DOMAIN: speechmaticsOptions.transcription_config.domain}),
-        ...{SPEECHMATICS_MAX_DELAY: speechmaticsOptions.transcription_config?.max_delay || 0.7},
-        ...{SPEECHMATICS_MAX_DELAY_MODE: speechmaticsOptions.transcription_config?.max_delay_mode || 'flexible'},
-        ...(speechmaticsOptions.transcription_config?.diarization &&
-            {SPEECHMATICS_DIARIZATION: speechmaticsOptions.transcription_config.diarization}),
-        ...(speechmaticsOptions.transcription_config?.speaker_diarization_config?.speaker_sensitivity &&
-          {SPEECHMATICS_DIARIZATION_SPEAKER_SENSITIVITY:
-            speechmaticsOptions.transcription_config.speaker_diarization_config.speaker_sensitivity}),
-        ...(speechmaticsOptions.transcription_config?.speaker_diarization_config?.max_speakers &&
-          {SPEECHMATICS_DIARIZATION_MAX_SPEAKERS:
-            speechmaticsOptions.transcription_config.speaker_diarization_config.max_speakers}),
-        ...(speechmaticsOptions.transcription_config?.output_locale &&
-          {SPEECHMATICS_OUTPUT_LOCALE: speechmaticsOptions.transcription_config.output_locale}),
-        ...(speechmaticsOptions.transcription_config?.punctuation_overrides?.permitted_marks &&
-          {SPEECHMATICS_PUNCTUATION_ALLOWED:
-            speechmaticsOptions.transcription_config.punctuation_overrides.permitted_marks.join(',')}),
-        ...(speechmaticsOptions.transcription_config?.punctuation_overrides?.sensitivity &&
-          {SPEECHMATICS_PUNCTUATION_SENSITIVITY:
-            speechmaticsOptions.transcription_config?.punctuation_overrides?.sensitivity}),
-        ...(speechmaticsOptions.transcription_config?.operating_point &&
-          {SPEECHMATICS_OPERATING_POINT: speechmaticsOptions.transcription_config.operating_point}),
-        ...(speechmaticsOptions.transcription_config?.enable_entities &&
-          {SPEECHMATICS_ENABLE_ENTTIES: speechmaticsOptions.transcription_config.enable_entities}),
-        ...(speechmaticsOptions.transcription_config?.audio_filtering_config?.volume_threshold &&
-          {SPEECHMATICS_VOLUME_THRESHOLD:
-            speechmaticsOptions.transcription_config.audio_filtering_config.volume_threshold}),
-        ...(speechmaticsOptions.transcription_config?.transcript_filtering_config?.remove_disfluencies &&
-          {SPEECHMATICS_REMOVE_DISFLUENCIES:
-            speechmaticsOptions.transcription_config.transcript_filtering_config.remove_disfluencies})
       };
     }
     else if (vendor.startsWith('custom:')) {

lib/utils/tts-streaming-buffer.js

@@ -1,452 +0,0 @@
-const Emitter = require('events');
-const assert = require('assert');
-const {
-  TtsStreamingEvents,
-  TtsStreamingConnectionStatus
-} = require('../utils/constants');
-
-const MAX_CHUNK_SIZE = 1800;
-const HIGH_WATER_BUFFER_SIZE = 1000;
-const LOW_WATER_BUFFER_SIZE = 200;
-const TIMEOUT_RETRY_MSECS = 1000; // 1 second
-
-
-const isWhitespace = (str) => /^\s*$/.test(str);
-
-/**
- * Each queue item is an object:
- *   - { type: 'text', value: '…' } for text tokens.
- *   - { type: 'flush' } for a flush command.
- */
-class TtsStreamingBuffer extends Emitter {
-  constructor(cs) {
-    super();
-    this.cs = cs;
-    this.logger = cs.logger;
-
-    // Use an array to hold our structured items.
-    this.queue = [];
-    // Track total number of characters in text items.
-    this.bufferedLength = 0;
-    this.eventHandlers = [];
-    this._isFull = false;
-    this._connectionStatus = TtsStreamingConnectionStatus.NotConnected;
-    this.timer = null;
-    // Record the last time the text buffer was updated.
-    this.lastUpdateTime = 0;
-  }
-
-  get isEmpty() {
-    return this.queue.length === 0;
-  }
-
-  get size() {
-    return this.bufferedLength;
-  }
-
-  get isFull() {
-    return this._isFull;
-  }
-
-  get ep() {
-    return this.cs?.ep;
-  }
-
-  async start() {
-    assert.ok(
-      this._connectionStatus === TtsStreamingConnectionStatus.NotConnected,
-      'TtsStreamingBuffer:start already started, or has failed'
-    );
-
-    this.vendor = this.cs.getTsStreamingVendor();
-    if (!this.vendor) {
-      this.logger.info('TtsStreamingBuffer:start No TTS streaming vendor configured');
-      throw new Error('No TTS streaming vendor configured');
-    }
-
-    this.logger.info(`TtsStreamingBuffer:start Connecting to TTS streaming with vendor ${this.vendor}`);
-
-    this._connectionStatus = TtsStreamingConnectionStatus.Connecting;
-    try {
-      if (this.eventHandlers.length === 0) this._initHandlers(this.ep);
-      await this._api(this.ep, [this.ep.uuid, 'connect']);
-    } catch (err) {
-      this.logger.info({ err }, 'TtsStreamingBuffer:start Error connecting to TTS streaming');
-      this._connectionStatus = TtsStreamingConnectionStatus.Failed;
-    }
-  }
-
-  stop() {
-    clearTimeout(this.timer);
-    this.removeCustomEventListeners();
-    if (this.ep) {
-      this._api(this.ep, [this.ep.uuid, 'close'])
-        .catch((err) =>
-          this.logger.info({ err }, 'TtsStreamingBuffer:stop Error closing TTS streaming')
-        );
-    }
-    this.timer = null;
-    this.queue = [];
-    this.bufferedLength = 0;
-    this._connectionStatus = TtsStreamingConnectionStatus.NotConnected;
-  }
-
-  /**
-   * Buffer new text tokens.
-   */
-  async bufferTokens(tokens) {
-    if (this._connectionStatus === TtsStreamingConnectionStatus.Failed) {
-      this.logger.info('TtsStreamingBuffer:bufferTokens TTS streaming connection failed, rejecting request');
-      return { status: 'failed', reason: `connection to ${this.vendor} failed` };
-    }
-
-    if (0 === this.bufferedLength && isWhitespace(tokens)) {
-      this.logger.debug({tokens}, 'TtsStreamingBuffer:bufferTokens discarded whitespace tokens');
-      return { status: 'ok' };
-    }
-
-    const displayedTokens = tokens.length <= 40 ? tokens : tokens.substring(0, 40);
-    const totalLength = tokens.length;
-
-    if (this.bufferedLength + totalLength > HIGH_WATER_BUFFER_SIZE) {
-      this.logger.info(
-        `TtsStreamingBuffer throttling: buffer is full, rejecting request to buffer ${totalLength} tokens`
-      );
-      if (!this._isFull) {
-        this._isFull = true;
-        this.emit(TtsStreamingEvents.Pause);
-      }
-      return { status: 'failed', reason: 'full' };
-    }
-
-    this.logger.debug(
-      `TtsStreamingBuffer:bufferTokens "${displayedTokens}" (length: ${totalLength})`
-    );
-    this.queue.push({ type: 'text', value: tokens });
-    this.bufferedLength += totalLength;
-    // Update the last update time each time new text is buffered.
-    this.lastUpdateTime = Date.now();
-
-    await this._feedQueue();
-    return { status: 'ok' };
-  }
-
-  /**
-   * Insert a flush command. If no text is queued, flush immediately.
-   * Otherwise, append a flush marker so that all text preceding it will be sent
-   * (regardless of sentence boundaries) before the flush is issued.
-   */
-  flush() {
-    if (this._connectionStatus === TtsStreamingConnectionStatus.Connecting) {
-      this.logger.debug('TtsStreamingBuffer:flush TTS stream is not quite ready - wait for connect');
-      if (this.queue.length === 0 || this.queue[this.queue.length - 1].type !== 'flush') {
-        this.queue.push({ type: 'flush' });
-      }
-      return;
-    }
-    else if (this._connectionStatus === TtsStreamingConnectionStatus.Connected) {
-      if (this.isEmpty) {
-        this._doFlush();
-      }
-      else {
-        if (this.queue[this.queue.length - 1].type !== 'flush') {
-          this.queue.push({ type: 'flush' });
-          this.logger.debug('TtsStreamingBuffer:flush added flush marker to queue');
-        }
-      }
-    }
-    else {
-      this.logger.debug(
-        `TtsStreamingBuffer:flush TTS stream is not connected, status: ${this._connectionStatus}`
-      );
-    }
-  }
-
-  clear() {
-    this.logger.debug('TtsStreamingBuffer:clear');
-    if (this._connectionStatus !== TtsStreamingConnectionStatus.Connected) return;
-    clearTimeout(this.timer);
-    this._api(this.ep, [this.ep.uuid, 'clear']).catch((err) =>
-      this.logger.info({ err }, 'TtsStreamingBuffer:clear Error clearing TTS streaming')
-    );
-    this.queue = [];
-    this.bufferedLength = 0;
-    this.timer = null;
-    this._isFull = false;
-  }
-
-  /**
-   * Process the queue in two phases.
-   *
-   * Phase 1: Look for flush markers. When a flush marker is found (even if not at the very front),
-   *   send all text tokens that came before it immediately (ignoring sentence boundaries)
-   *   and then send the flush command. Repeat until there are no flush markers left.
-   *
-   * Phase 2: With the remaining queue (now containing only text items), accumulate text
-   *   up to MAX_CHUNK_SIZE and use sentence-boundary logic to determine a chunk.
-   *   Then, remove the exact tokens (or portions thereof) that were consumed.
-   */
-  async _feedQueue(handlingTimeout = false) {
-    this.logger.debug({ queue: this.queue }, 'TtsStreamingBuffer:_feedQueue');
-    try {
-      if (!this.cs.isTtsStreamOpen || !this.ep) {
-        this.logger.debug('TtsStreamingBuffer:_feedQueue TTS stream is not open or no endpoint available');
-        return;
-      }
-      if (
-        this._connectionStatus === TtsStreamingConnectionStatus.NotConnected ||
-        this._connectionStatus === TtsStreamingConnectionStatus.Failed
-      ) {
-        this.logger.debug('TtsStreamingBuffer:_feedQueue TTS stream is not connected');
-        return;
-      }
-
-      // --- Phase 1: Process flush markers ---
-      // Process any flush marker that isn’t in the very first position.
-      let flushIndex = this.queue.findIndex((item, idx) => item.type === 'flush' && idx > 0);
-      while (flushIndex !== -1) {
-        let flushText = '';
-        // Accumulate all text tokens preceding the flush marker.
-        for (let i = 0; i < flushIndex; i++) {
-          if (this.queue[i].type === 'text') {
-            flushText += this.queue[i].value;
-          }
-        }
-        // Remove those text items.
-        for (let i = 0; i < flushIndex; i++) {
-          const item = this.queue.shift();
-          if (item.type === 'text') {
-            this.bufferedLength -= item.value.length;
-          }
-        }
-        // Remove the flush marker (now at the front).
-        if (this.queue.length > 0 && this.queue[0].type === 'flush') {
-          this.queue.shift();
-        }
-        // Immediately send all accumulated text (ignoring sentence boundaries).
-        if (flushText.length > 0) {
-          const modifiedFlushText = flushText.replace(/\n\n/g, '\n \n');
-          try {
-            await this._api(this.ep, [this.ep.uuid, 'send', modifiedFlushText]);
-          } catch (err) {
-            this.logger.info({ err, flushText }, 'TtsStreamingBuffer:_feedQueue Error sending TTS chunk');
-          }
-        }
-        // Send the flush command.
-        await this._doFlush();
-
-        flushIndex = this.queue.findIndex((item, idx) => item.type === 'flush' && idx > 0);
-      }
-
-      // If a flush marker is at the very front, process it.
-      while (this.queue.length > 0 && this.queue[0].type === 'flush') {
-        this.queue.shift();
-        await this._doFlush();
-      }
-
-      // --- Phase 2: Process remaining text tokens ---
-      if (this.queue.length === 0) {
-        this._removeTimer();
-        return;
-      }
-
-      // Accumulate contiguous text tokens (from the front) up to MAX_CHUNK_SIZE.
-      let combinedText = '';
-      for (const item of this.queue) {
-        if (item.type !== 'text') break;
-        combinedText += item.value;
-        if (combinedText.length >= MAX_CHUNK_SIZE) break;
-      }
-      if (combinedText.length === 0) {
-        this._removeTimer();
-        return;
-      }
-
-      const limit = Math.min(MAX_CHUNK_SIZE, combinedText.length);
-      let chunkEnd = findSentenceBoundary(combinedText, limit);
-      if (chunkEnd <= 0) {
-        if (handlingTimeout) {
-          chunkEnd = findWordBoundary(combinedText, limit);
-          if (chunkEnd <= 0) {
-            this._setTimerIfNeeded();
-            return;
-          }
-        } else {
-          this._setTimerIfNeeded();
-          return;
-        }
-      }
-      const chunk = combinedText.slice(0, chunkEnd);
-
-      // Now we iterate over the queue items
-      // and deduct their lengths until we've accounted for chunkEnd characters.
-      let remaining = chunkEnd;
-      let tokensProcessed = 0;
-      for (let i = 0; i < this.queue.length; i++) {
-        const token = this.queue[i];
-        if (token.type !== 'text') break;
-        if (remaining >= token.value.length) {
-          remaining -= token.value.length;
-          tokensProcessed = i + 1;
-        } else {
-          // Partially consumed token: update its value to remove the consumed part.
-          token.value = token.value.slice(remaining);
-          tokensProcessed = i;
-          remaining = 0;
-          break;
-        }
-      }
-      // Remove the fully consumed tokens from the front of the queue.
-      this.queue.splice(0, tokensProcessed);
-      this.bufferedLength -= chunkEnd;
-
-      const modifiedChunk = chunk.replace(/\n\n/g, '\n \n');
-      this.logger.debug(`TtsStreamingBuffer:_feedQueue sending chunk to tts: ${modifiedChunk}`);
-
-      try {
-        await this._api(this.ep, [this.ep.uuid, 'send', modifiedChunk]);
-      } catch (err) {
-        this.logger.info({ err, chunk }, 'TtsStreamingBuffer:_feedQueue Error sending TTS chunk');
-      }
-
-      if (this._isFull && this.bufferedLength <= LOW_WATER_BUFFER_SIZE) {
-        this.logger.info('TtsStreamingBuffer throttling: buffer is no longer full - resuming');
-        this._isFull = false;
-        this.emit(TtsStreamingEvents.Resume);
-      }
-
-      return this._feedQueue();
-    } catch (err) {
-      this.logger.info({ err }, 'TtsStreamingBuffer:_feedQueue Error sending TTS chunk');
-      this.queue = [];
-      this.bufferedLength = 0;
-    }
-  }
-
-  async _api(ep, args) {
-    const apiCmd = `uuid_${this.vendor.startsWith('custom:') ? 'custom' : this.vendor}_tts_streaming`;
-    const res = await ep.api(apiCmd, `^^|${args.join('|')}`);
-    if (!res.body?.startsWith('+OK')) {
-      this.logger.info({ args }, `Error calling ${apiCmd}: ${res.body}`);
-      throw new Error(`Error calling ${apiCmd}: ${res.body}`);
-    }
-  }
-
-  _doFlush() {
-    return this._api(this.ep, [this.ep.uuid, 'flush'])
-      .then(() => this.logger.debug('TtsStreamingBuffer:_doFlush sent flush command'))
-      .catch((err) =>
-        this.logger.info(
-          { err },
-          `TtsStreamingBuffer:_doFlush Error flushing TTS streaming: ${JSON.stringify(err)}`
-        )
-      );
-  }
-
-  async _onConnect(vendor) {
-    this.logger.info(`TtsStreamingBuffer:_onConnect streaming tts connection made to ${vendor} successful`);
-    this._connectionStatus = TtsStreamingConnectionStatus.Connected;
-    if (this.queue.length > 0) {
-      await this._feedQueue();
-    }
-  }
-
-  _onConnectFailure(vendor) {
-    this.logger.info(`TtsStreamingBuffer:_onConnectFailure streaming tts connection failed to ${vendor}`);
-    this._connectionStatus = TtsStreamingConnectionStatus.Failed;
-    this.queue = [];
-    this.bufferedLength = 0;
-    this.emit(TtsStreamingEvents.ConnectFailure, { vendor });
-  }
-
-  _setTimerIfNeeded() {
-    if (this.bufferedLength > 0 && !this.timer) {
-      this.logger.debug({queue: this.queue},
-        `TtsStreamingBuffer:_setTimerIfNeeded setting timer because ${this.bufferedLength} buffered`);
-      this.timer = setTimeout(this._onTimeout.bind(this), TIMEOUT_RETRY_MSECS);
-    }
-  }
-
-  _removeTimer() {
-    if (this.timer) {
-      this.logger.debug('TtsStreamingBuffer:_removeTimer clearing timer');
-      clearTimeout(this.timer);
-      this.timer = null;
-    }
-  }
-
-  _onTimeout() {
-    this.logger.debug('TtsStreamingBuffer:_onTimeout Timeout waiting for sentence boundary');
-    this.timer = null;
-    // Check if new text has been added since the timer was set.
-    const now = Date.now();
-    if (now - this.lastUpdateTime < TIMEOUT_RETRY_MSECS) {
-      this.logger.debug('TtsStreamingBuffer:_onTimeout New text received recently; postponing flush.');
-      this._setTimerIfNeeded();
-      return;
-    }
-    this._feedQueue(true);
-  }
-
-  _onTtsEmpty(vendor) {
-    this.emit(TtsStreamingEvents.Empty, { vendor });
-  }
-
-  addCustomEventListener(ep, event, handler) {
-    this.eventHandlers.push({ ep, event, handler });
-    ep.addCustomEventListener(event, handler);
-  }
-
-  removeCustomEventListeners() {
-    this.eventHandlers.forEach((h) => h.ep.removeCustomEventListener(h.event, h.handler));
-  }
-
-  _initHandlers(ep) {
-    [
-      'deepgram',
-      'cartesia',
-      'elevenlabs',
-      'rimelabs',
-      'custom'
-    ].forEach((vendor) => {
-      const eventClassName = `${vendor.charAt(0).toUpperCase() + vendor.slice(1)}TtsStreamingEvents`;
-      const eventClass = require('../utils/constants')[eventClassName];
-      if (!eventClass) throw new Error(`Event class for vendor ${vendor} not found`);
-
-      this.addCustomEventListener(ep, eventClass.Connect, this._onConnect.bind(this, vendor));
-      this.addCustomEventListener(ep, eventClass.ConnectFailure, this._onConnectFailure.bind(this, vendor));
-      this.addCustomEventListener(ep, eventClass.Empty, this._onTtsEmpty.bind(this, vendor));
-    });
-  }
-}
-
-const findSentenceBoundary = (text, limit) => {
-  // Look for punctuation or double newline that signals sentence end.
-  const sentenceEndRegex = /[.!?](?=\s|$)|\n\n/g;
-  let lastSentenceBoundary = -1;
-  let match;
-  while ((match = sentenceEndRegex.exec(text)) && match.index < limit) {
-    const precedingText = text.slice(0, match.index).trim();
-    if (precedingText.length > 0) {
-      if (
-        match[0] === '\n\n' ||
-        (match.index === 0 || !/\d$/.test(text[match.index - 1]))
-      ) {
-        lastSentenceBoundary = match.index + (match[0] === '\n\n' ? 2 : 1);
-      }
-    }
-  }
-  return lastSentenceBoundary;
-};
-
-const findWordBoundary = (text, limit) => {
-  const wordBoundaryRegex = /\s+/g;
-  let lastWordBoundary = -1;
-  let match;
-  while ((match = wordBoundaryRegex.exec(text)) && match.index < limit) {
-    lastWordBoundary = match.index;
-  }
-  return lastWordBoundary;
-};
-
-module.exports = TtsStreamingBuffer;

lib/utils/ws-requestor.js

@@ -1,8 +1,7 @@
 const assert = require('assert');
 const BaseRequestor = require('./base-requestor');
 const short = require('short-uuid');
-const parseUrl = require('parse-url');
-const {HookMsgTypes, WS_CLOSE_CODES} = require('./constants.json');
+const {HookMsgTypes} = require('./constants.json');
 const Websocket = require('ws');
 const snakeCaseKeys = require('./snakecase-keys');
 const {
@@ -13,20 +12,6 @@ const {
   JAMBONES_WS_MAX_PAYLOAD,
   HTTP_USER_AGENT_HEADER
 } = require('../config');
-const MTYPE_WANTS_ACK = [
-  'call:status',
-  'verb:status',
-  'jambonz:error',
-  'llm:event',
-  'llm:tool-call',
-  'tts:streaming-event',
-  'tts:tokens-result',
-];
-const MTYPE_NO_DATA = [
-  'llm:tool-output',
-  'tts:flush',
-  'tts:clear'
-];
 
 class WsRequestor extends BaseRequestor {
   constructor(logger, account_sid, hook, secret) {
@@ -42,19 +27,6 @@ class WsRequestor extends BaseRequestor {
 
     assert(this._isAbsoluteUrl(this.url));
 
-    const parsedUrl = parseUrl(this.url);
-    const hash = parsedUrl.hash || '';
-    const hashObj = hash ? this._parseHashParams(hash) : {};
-
-    // remove hash
-    this.cleanUrl = hash ? this.url.replace(`#${hash}`, '') : this.url;
-
-    // Retry policy: rp valid values: 4xx, 5xx, ct, rt, all, default is ct
-    // Retry count: rc valid values: 1-5, default is 5 for websockets
-    this.maxReconnects = Math.min(Math.abs(parseInt(hashObj.rc) || MAX_RECONNECTS), 5);
-    this.retryPolicy = hashObj.rp || 'ct';
-    this.retryPolicyValues = this.retryPolicy.split(',').map((v) => v.trim());
-
     this.on('socket-closed', this._onSocketClosed.bind(this));
   }
 
@@ -69,10 +41,10 @@ class WsRequestor extends BaseRequestor {
    * @param {string} [hook.password] - if basic auth is protecting the endpoint
    * @param {object} [params] - request parameters
    */
-  async request(type, hook, params, httpHeaders = {}, span) {
+  async request(type, hook, params, httpHeaders = {}) {
     assert(HookMsgTypes.includes(type));
     const url = hook.url || hook;
-    const wantsAck = !MTYPE_WANTS_ACK.includes(type);
+    const wantsAck = !['call:status', 'verb:status', 'jambonz:error', 'llm:event', 'llm:tool-call'].includes(type);
 
     if (this.maliciousClient) {
       this.logger.info({url: this.url}, 'WsRequestor:request - discarding msg to malicious client');
@@ -101,7 +73,7 @@ class WsRequestor extends BaseRequestor {
         this.close();
         this.emit('handover', requestor);
       }
-      return requestor.request(type, hook, params, httpHeaders, span);
+      return requestor.request(type, hook, params, httpHeaders);
     }
 
     /* connect if necessary */
@@ -125,65 +97,16 @@ class WsRequestor extends BaseRequestor {
       }
       this.connectInProgress = true;
       this.logger.debug(`WsRequestor:request(${this.id}) - connecting since we do not have a connection for ${type}`);
-
+      if (this.connections >= MAX_RECONNECTS) {
+        return Promise.reject(`max attempts connecting to ${this.url}`);
+      }
       try {
-        let retryCount = 0;
-        let lastError = null;
-
-        while (retryCount <= this.maxReconnects) {
-          try {
-            this.logger.error({retryCount, maxReconnects: this.maxReconnects},
-              'WsRequestor:request - attempting connection');
-
-            // Ensure clean state before each connection attempt
-            if (this.ws) {
-              this.ws.removeAllListeners();
-              this.ws = null;
-            }
-
-            this.logger.error({retryCount}, 'WsRequestor:request - calling _connect()');
-            const startAt = process.hrtime();
-            await this._connect();
-            const rtt = this._roundTrip(startAt);
-            this.stats.histogram('app.hook.connect_time', rtt, ['hook_type:app']);
-            this.logger.error({retryCount}, 'WsRequestor:request - connection successful, exiting retry loop');
-            lastError = null;
-            break;
-          } catch (error) {
-            lastError = error;
-            retryCount++;
-            this.logger.error({error: error.message, retryCount, maxReconnects: this.maxReconnects},
-              'WsRequestor:request - connection attempt failed');
-
-            if (retryCount <= this.maxReconnects &&
-                this.retryPolicyValues?.length &&
-                this._shouldRetry(error, this.retryPolicyValues)) {
-
-              this.logger.error(
-                {url, error, retryCount, maxRetries: this.maxReconnects},
-                `WsRequestor:request - connection failed, retrying (${retryCount}/${this.maxReconnects})`
-              );
-
-              const delay = this.backoffMs;
-              this.backoffMs = this.backoffMs < 2000 ? this.backoffMs * 2 : (this.backoffMs + 2000);
-              this.logger.error({delay}, 'WsRequestor:request - waiting before retry');
-              await new Promise((resolve) => setTimeout(resolve, delay));
-              this.logger.error('WsRequestor:request - retry delay complete, attempting retry');
-              continue;
-            }
-            this.logger.error({lastError: lastError.message, retryCount, maxReconnects: this.maxReconnects},
-              'WsRequestor:request - throwing last error');
-            throw lastError;
-          }
-        }
-
-        // If we exit the loop without success, throw the last error
-        if (lastError) {
-          throw lastError;
-        }
+        const startAt = process.hrtime();
+        await this._connect();
+        const rtt = this._roundTrip(startAt);
+        this.stats.histogram('app.hook.connect_time', rtt, ['hook_type:app']);
       } catch (err) {
-        this.logger.info({url, err, retryPolicy: this.retryPolicy},
-          'WsRequestor:request - all connection attempts failed');
+        this.logger.info({url, err}, 'WsRequestor:request - failed connecting');
         this.connectInProgress = false;
         return Promise.reject(err);
       }
@@ -195,8 +118,8 @@ class WsRequestor extends BaseRequestor {
     assert(this.ws);
 
     /* prepare and send message */
-    let payload = params ? snakeCaseKeys(params, ['customerData', 'sip', 'env_vars', 'args']) : null;
-    if (type === 'session:new' || type === 'session:adulting') this._sessionData = payload;
+    let payload = params ? snakeCaseKeys(params, ['customerData', 'sip']) : null;
+    if (type === 'session:new') this._sessionData = payload;
     if (type === 'session:reconnect') payload = this._sessionData;
     assert.ok(url, 'WsRequestor:request url was not provided');
 
@@ -209,23 +132,17 @@ class WsRequestor extends BaseRequestor {
       type,
       msgid,
       call_sid: this.call_sid,
-      hook: [
-        'verb:hook', 'dial:confirm', 'session:redirect', 'llm:event', 'llm:tool-call'
-      ].includes(type) ? url : undefined,
+      hook: ['verb:hook', 'session:redirect', 'llm:event', 'llm:tool-call'].includes(type) ? url : undefined,
       data: {...payload},
       ...b3
     };
-    // add msgid to span attributes if it exists
-    if (span) {
-      span.setAttributes({'msgid': msgid});
-    }
 
     const sendQueuedMsgs = () => {
       if (this.queuedMsg.length > 0) {
         for (const {type, hook, params, httpHeaders, promise} of this.queuedMsg) {
           this.logger.debug(`WsRequestor:request - preparing queued ${type} for sending`);
           if (promise) {
-            this.request(type, hook, params, httpHeaders, span)
+            this.request(type, hook, params, httpHeaders)
               .then((res) => promise.resolve(res))
               .catch((err) => promise.reject(err));
           }
@@ -330,13 +247,13 @@ class WsRequestor extends BaseRequestor {
     }
   }
 
-  close(code = WS_CLOSE_CODES.NormalClosure) {
+  close() {
     this.closedGracefully = true;
-    this.logger.debug(`WsRequestor:close closing socket with code ${code}`);
+    this.logger.debug('WsRequestor:close closing socket');
     this._stopPingTimer();
     try {
       if (this.ws) {
-        this.ws.close(code);
+        this.ws.close(1000);
         this.ws.removeAllListeners();
         this.ws = null;
       }
@@ -364,23 +281,17 @@ class WsRequestor extends BaseRequestor {
       };
       if (this.username && this.password) opts = {...opts, auth: `${this.username}:${this.password}`};
 
-      // Clean up any existing connection event listeners to prevent interference between retry attempts
-      this.removeAllListeners('ready');
-      this.removeAllListeners('not-ready');
-
       this
         .once('ready', (ws) => {
-          this.logger.error({retryCount: 'unknown'}, 'WsRequestor:_connect - ready event fired, resolving Promise');
           this.removeAllListeners('not-ready');
           if (this.connections > 1) this.request('session:reconnect', this.url);
           resolve();
         })
         .once('not-ready', (err) => {
-          this.logger.error({err: err.message}, 'WsRequestor:_connect - not-ready event fired, rejecting Promise');
           this.removeAllListeners('ready');
           reject(err);
         });
-      const ws = new Websocket(this.cleanUrl, ['ws.jambonz.org'], opts);
+      const ws = new Websocket(this.url, ['ws.jambonz.org'], opts);
       this._setHandlers(ws);
     });
   }
@@ -404,13 +315,10 @@ class WsRequestor extends BaseRequestor {
   }
 
   _onError(err) {
-    if (this.connectInProgress) {
-      this.logger.info({url: this.url, err}, 'WsRequestor:_onError - emitting not-ready for connection attempt');
-      this.emit('not-ready', err);
-    }
-    else if (this.connections === 0) {
-      this.emit('not-ready', err);
+    if (this.connections > 0) {
+      this.logger.info({url: this.url, err}, 'WsRequestor:_onError');
     }
+    else this.emit('not-ready', err);
   }
 
   _onOpen(ws) {
@@ -447,44 +355,30 @@ class WsRequestor extends BaseRequestor {
       statusMessage: res.statusMessage
     }, 'WsRequestor - unexpected response');
     this.emit('connection-failure');
-
-    const error = new Error(`${res.statusCode} ${res.statusMessage}`);
-    error.statusCode = res.statusCode;
-    this.connectInProgress = false;
-
-    this.emit('not-ready', error);
+    this.emit('not-ready', new Error(`${res.statusCode} ${res.statusMessage}`));
+    this.connections++;
   }
 
   _onSocketClosed() {
     this.ws = null;
     this.emit('connection-dropped');
     this._stopPingTimer();
-
-    if (this.connections > 0 && this.connections < this.maxReconnects && !this.closedGracefully) {
+    if (this.connections > 0 && this.connections < MAX_RECONNECTS && !this.closedGracefully) {
       if (!this._initMsgId) this._clearPendingMessages();
       this.logger.debug(`WsRequestor:_onSocketClosed waiting ${this.backoffMs} to reconnect`);
-      this._scheduleReconnect('_onSocketClosed');
-    }
-  }
-
-  _scheduleReconnect(source) {
-    this.logger.debug(`WsRequestor:_scheduleReconnect waiting ${this.backoffMs} to reconnect (${source})`);
-    setTimeout(() => {
-      this.logger.debug(
-        {haveWs: !!this.ws, connectInProgress: this.connectInProgress},
-        `WsRequestor:_scheduleReconnect time to reconnect (${source})`);
-      if (!this.ws && !this.connectInProgress) {
-        this.connectInProgress = true;
-        return this._connect()
-          .catch((err) => this.logger.error(`WsRequestor:${source} There is error while reconnect`, err))
-          .finally(() => this.connectInProgress = false);
-      } else {
+      setTimeout(() => {
         this.logger.debug(
           {haveWs: !!this.ws, connectInProgress: this.connectInProgress},
-          `WsRequestor:_scheduleReconnect skipping reconnect attempt (${source}) - conditions not met`);
-      }
-    }, this.backoffMs);
-    this.backoffMs = this.backoffMs < 2000 ? this.backoffMs * 2 : (this.backoffMs + 2000);
+          'WsRequestor:_onSocketClosed time to reconnect');
+        if (!this.ws && !this.connectInProgress) {
+          this.connectInProgress = true;
+          return this._connect()
+            .catch((err) => this.logger.error('WsRequestor:_onSocketClosed There is error while reconnect', err))
+            .finally(() => this.connectInProgress = false);
+        }
+      }, this.backoffMs);
+      this.backoffMs = this.backoffMs < 2000 ? this.backoffMs * 2 : (this.backoffMs + 2000);
+    }
   }
 
   _onMessage(content, isBinary) {
@@ -514,7 +408,7 @@ class WsRequestor extends BaseRequestor {
 
         case 'command':
           assert.ok(command, 'command property not supplied');
-          assert.ok(data || MTYPE_NO_DATA.includes(command), 'data property not supplied');
+          assert.ok(data || command === 'llm:tool-output', 'data property not supplied');
           this._recvCommand(msgid, command, call_sid, queueCommand, tool_call_id, data);
           break;
 
@@ -523,21 +417,6 @@ class WsRequestor extends BaseRequestor {
       }
     } catch (err) {
       this.logger.info({err, content}, 'WsRequestor:_onMessage - invalid incoming message');
-      const params = {
-        msg: 'InvalidMessage',
-        details: err.message,
-        content: Buffer.from(content).toString('utf-8')
-      };
-      const {writeAlerts, AlertType} = this.Alerter;
-      writeAlerts({
-        account_sid: this.account_sid,
-        alert_type: AlertType.INVALID_APP_PAYLOAD,
-        target_sid: this.call_sid,
-        message: err.message,
-
-      }).catch((err) => this.logger.info({err}, 'Error generating alert for invalid message'));
-      this.request('jambonz:error', '/error', params)
-        .catch((err) => this.logger.debug({err}, 'WsRequestor:_onMessage - Error sending'));
     }
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-feature-server",
-  "version": "0.9.4",
+  "version": "0.9.2",
   "main": "app.js",
   "engines": {
     "node": ">= 18.x"
@@ -27,15 +27,14 @@
   "dependencies": {
     "@aws-sdk/client-auto-scaling": "^3.549.0",
     "@aws-sdk/client-sns": "^3.549.0",
-    "@jambonz/db-helpers": "^0.9.12",
+    "@jambonz/db-helpers": "^0.9.6",
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/mw-registrar": "^0.2.7",
-    "@jambonz/realtimedb-helpers": "^0.8.13",
-    "@jambonz/speech-utils": "^0.2.11",
+    "@jambonz/realtimedb-helpers": "^0.8.8",
+    "@jambonz/speech-utils": "^0.1.20",
     "@jambonz/stats-collector": "^0.1.10",
-    "@jambonz/time-series": "^0.2.13",
-    "@jambonz/verb-specifications": "^0.0.104",
-    "@modelcontextprotocol/sdk": "^1.9.0",
+    "@jambonz/time-series": "^0.2.9",
+    "@jambonz/verb-specifications": "^0.0.83",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-jaeger": "^1.23.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.50.0",
@@ -48,19 +47,21 @@
     "bent": "^7.3.12",
     "debug": "^4.3.4",
     "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^4.0.3",
-    "drachtio-srf": "^5.0.5",
+    "drachtio-fsmrf": "^3.0.45",
+    "drachtio-srf": "^4.5.35",
     "express": "^4.19.2",
     "express-validator": "^7.0.1",
     "moment": "^2.30.1",
     "parse-url": "^9.2.0",
     "pino": "^8.20.0",
     "polly-ssml-split": "^0.1.0",
-    "sdp-transform": "^2.15.0",
+    "proxyquire": "^2.1.3",
+    "sdp-transform": "^2.14.2",
     "short-uuid": "^5.1.0",
     "sinon": "^17.0.1",
     "to-snake-case": "^1.0.0",
-    "undici": "^7.5.0",
+    "undici": "^6.20.0",
+    "uuid-random": "^1.3.2",
     "verify-aws-sns-signature": "^0.1.0",
     "ws": "^8.18.0",
     "xml2js": "^0.6.2"
@@ -70,7 +71,6 @@
     "eslint": "7.32.0",
     "eslint-plugin-promise": "^6.1.1",
     "nyc": "^15.1.0",
-    "proxyquire": "^2.1.3",
     "tape": "^5.7.5"
   },
   "optionalDependencies": {

test/create-call-test.js

@@ -222,62 +222,3 @@ test('test create-call app_json', async(t) => {
     t.error(err);
   }
 });
-
-test('test create-call timeLimit', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-
-    // GIVEN
-    let from = 'create-call-app-json';
-    let account_sid = 'bb845d4b-83a9-4cde-a6e9-50f3743bab3f';
-
-    // Give UAS app time to come up
-    const p = sippUac('uas.xml', '172.38.0.10', from);
-    await waitFor(1000);
-
-    const startTime = Date.now();
-
-    const app_json = `[
-      {
-        "verb": "pause",
-        "length": 7
-      }
-    ]`;
-
-    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
-    post('v1/createCall', {
-      'account_sid':account_sid,
-      "call_hook": {
-        "url": "http://127.0.0.1:3100/",
-        "method": "POST",
-        "username": "username",
-        "password": "password"
-      },
-      app_json,
-      "from": from,
-      "to": {
-        "type": "phone",
-        "number": "15583084809"
-      },
-      "timeLimit": 1,
-      "speech_recognizer_vendor": "google",
-      "speech_recognizer_language": "en"
-    });
-
-    //THEN
-    await p;
-    const endTime = Date.now();
-
-    t.ok(endTime - startTime < 2000, 'create-call: timeLimit is respected');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});

test/db/jambones-sql.sql

@@ -351,8 +351,6 @@ speech_credential_sid CHAR(36) NOT NULL,
 model VARCHAR(512) NOT NULL,
 reported_usage ENUM('REPORTED_USAGE_UNSPECIFIED','REALTIME','OFFLINE') DEFAULT 'REALTIME',
 name VARCHAR(64) NOT NULL,
-voice_cloning_key MEDIUMTEXT,
-use_voice_cloning_key BOOLEAN DEFAULT false,
 PRIMARY KEY (google_custom_voice_sid)
 );
 

test/dial-tests.js

@@ -3,8 +3,9 @@ const { sippUac } = require('./sipp')('test_fs');
 const bent = require('bent');
 const getJSON = bent('json')
 const clearModule = require('clear-module');
-const {provisionCallHook} = require('./utils');
-const { sleepFor } = require('../lib/utils/helpers');
+const {provisionCallHook} = require('./utils')
+
+const sleepFor = (ms) => new Promise((r) => setTimeout(r, ms));
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);

test/docker-compose-testbed.yaml

@@ -42,7 +42,7 @@ services:
         ipv4_address: 172.38.0.7
 
   drachtio:
-    image: drachtio/drachtio-server:0.8.26
+    image: drachtio/drachtio-server:0.8.25-rc8
     restart: always
     command: drachtio --contact "sip:*;transport=udp" --mtu 4096 --address 0.0.0.0 --port 9022
     ports:
@@ -57,7 +57,7 @@ services:
         condition: service_healthy
 
   freeswitch:
-    image: drachtio/drachtio-freeswitch-mrf:0.9.2-4
+    image: drachtio/drachtio-freeswitch-mrf:latest
     restart: always
     command: freeswitch --rtp-range-start 20000 --rtp-range-end 20100
     environment:

test/http-requestor-retry-test.js

@@ -1,151 +0,0 @@
-// Test for HttpRequestor retry functionality
-const test = require('tape');
-const sinon = require('sinon');
-const proxyquire = require('proxyquire').noCallThru();
-const { createMocks, setupBaseRequestorMocks } = require('./utils/mock-helper');
-
-// Create mocks
-const mocks = createMocks();
-
-// Mock timeSeries module
-const timeSeriesMock = sinon.stub().returns(mocks.MockAlerter);
-
-// Mock the config with required properties
-const configMock = {
-  HTTP_POOL: '0',
-  HTTP_POOLSIZE: '10',
-  HTTP_PIPELINING: '1',
-  HTTP_TIMEOUT: 5000,
-  HTTP_PROXY_IP: null,
-  HTTP_PROXY_PORT: null,
-  HTTP_PROXY_PROTOCOL: null,
-  NODE_ENV: 'test',
-  HTTP_USER_AGENT_HEADER: 'test-agent'
-};
-
-// Mock db-helpers
-const dbHelpersMock = mocks.MockDbHelpers;
-
-// Require HttpRequestor with mocked dependencies
-const BaseRequestor = proxyquire('../lib/utils/base-requestor', {
-  '@jambonz/time-series': timeSeriesMock,
-  '../config': configMock,
-  '../../': { srf: { locals: { stats: mocks.MockStats } } }
-});
-
-// Setup BaseRequestor mocks
-setupBaseRequestorMocks(BaseRequestor);
-
-// Require HttpRequestor with mocked dependencies
-const HttpRequestor = proxyquire('../lib/utils/http-requestor', {
-  './base-requestor': BaseRequestor,
-  '../config': configMock,
-  '@jambonz/db-helpers': dbHelpersMock
-});
-
-// Setup utility function
-const setupRequestor = () => {
-  const hook = { url: 'http://localhost/test', method: 'POST' };
-  const requestor = new HttpRequestor(mocks.MockLogger, 'AC123', hook, 'testsecret');
-  requestor.stats = mocks.MockStats;
-  return requestor;
-};
-
-// Cleanup function for tests
-const cleanup = (requestor) => {
-  sinon.restore();
-  if (requestor && requestor.close) requestor.close();
-};
-
-test('HttpRequestor: should retry on connection errors when specified in hash', async (t) => {
-  const requestor = setupRequestor();
-  
-  // Setup a URL with retry params in the hash
-  const urlWithRetry = 'http://localhost/test#rc=3&rp=ct,5xx';
-  
-  // First two calls fail with connection refused, third succeeds
-  const requestStub = sinon.stub(requestor.client, 'request');
-  const error = new Error('Connection refused');
-  error.code = 'ECONNREFUSED';
-  
-  // Fail twice, succeed on third try
-  requestStub.onCall(0).rejects(error);
-  requestStub.onCall(1).rejects(error);
-  requestStub.onCall(2).resolves({
-    statusCode: 200,
-    headers: { 'content-type': 'application/json' },
-    body: { json: async () => ({ success: true }) }
-  });
-  
-  try {
-    const hook = { url: urlWithRetry, method: 'GET' };
-    const result = await requestor.request('verb:hook', hook, null);
-    
-    t.equal(requestStub.callCount, 3, 'Should have retried twice for a total of 3 calls');
-    t.deepEqual(result, { success: true }, 'Should return successful response');
-  } catch (err) {
-    t.fail(`Should not throw an error: ${err.message}`);
-  }
-  
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: should respect retry count (rc) from hash', async (t) => {
-  const requestor = setupRequestor();
-  
-  // Setup a URL with retry params in the hash - only retry once
-  const urlWithRetry = 'http://localhost/test#rc=1&rp=ct';
-  
-  // All calls fail with connection refused
-  const requestStub = sinon.stub(requestor.client, 'request');
-  const error = new Error('Connection refused');
-  error.code = 'ECONNREFUSED';
-  
-  // Always fail
-  requestStub.rejects(error);
-  
-  try {
-    const hook = { url: urlWithRetry, method: 'GET' };
-    await requestor.request('verb:hook', hook, null);
-    t.fail('Should have thrown an error');
-  } catch (err) {
-    t.equal(requestStub.callCount, 2, 'Should have retried once for a total of 2 calls');
-    t.equal(err.code, 'ECONNREFUSED', 'Should throw the original error');
-  }
-  
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: should respect retry policy (rp) from hash', async (t) => {
-  const requestor = setupRequestor();
-  
-  // Setup a URL with retry params in hash - only retry on 5xx errors
-  const urlWithRetry = 'http://localhost/test#rc=2&rp=5xx';
-  
-  // Fail with 404 (should not retry since rp=5xx)
-  const requestStub = sinon.stub(requestor.client, 'request');
-  requestStub.resolves({
-    statusCode: 404,
-    headers: {},
-    body: {}
-  });
-  
-  try {
-    const hook = { url: urlWithRetry, method: 'GET' };
-    await requestor.request('verb:hook', hook, null);
-    t.fail('Should have thrown an error');
-  } catch (err) {
-    t.equal(requestStub.callCount, 1, 'Should not retry on 404 when rp=5xx');
-    t.equal(err.statusCode, 404, 'Should throw 404 error');
-  }
-  
-  cleanup(requestor);
-  t.end();
-});
-
-module.exports = {
-  setupRequestor,
-  cleanup
-};

test/http-requestor-unit-test.js

@@ -1,214 +0,0 @@
-const test = require('tape');
-const sinon = require('sinon');
-const { createMockedRequestors } = require('./utils/test-mocks');
-
-// Use the shared mocks and helpers
-const {
-  HttpRequestor,
-  setupRequestor,
-  cleanup
-} = createMockedRequestors();
-
-// All prototype overrides and setup are now handled in test-mocks.js
-
-// --- TESTS ---
-test('HttpRequestor: constructor sets up properties correctly', (t) => {
-  const requestor = setupRequestor();
-  t.equal(requestor.method, 'POST', 'method should be POST');
-  t.equal(requestor.url, 'http://localhost/test', 'url should be set');
-  t.equal(typeof requestor.client, 'object', 'client should be an object');
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: constructor with username/password sets auth header', (t) => {
-  const { mocks, HttpRequestor } = createMockedRequestors();
-  const logger = mocks.logger;
-  const hook = {
-    url: 'http://localhost/test',
-    method: 'POST',
-    username: 'user',
-    password: 'pass'
-  };
-  const requestor = new HttpRequestor(logger, 'AC123', hook, 'secret');
-  t.ok(requestor.authHeader.Authorization, 'Authorization header should be set');
-  t.ok(requestor.authHeader.Authorization.startsWith('Basic '), 'Should be Basic auth');
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: request should return JSON on 200 response', async (t) => {
-  const requestor = setupRequestor();
-  const expectedResponse = { success: true, data: [1, 2, 3] };
-  const fakeBody = { json: async () => expectedResponse };
-  sinon.stub(requestor.client, 'request').resolves({
-    statusCode: 200,
-    headers: { 'content-type': 'application/json' },
-    body: fakeBody
-  });
-  try {
-    const hook = { url: 'http://localhost/test', method: 'POST' };
-    const result = await requestor.request('verb:hook', hook, { foo: 'bar' });
-    t.deepEqual(result, expectedResponse, 'Should return parsed JSON');
-    const requestCall = requestor.client.request.getCall(0);
-    const opts = requestCall.args[0];
-    t.equal(opts.method, 'POST', 'method should be POST');
-    t.ok(opts.headers['X-Signature'], 'Should include signature header');
-    t.ok(opts.body, 'Should include request body');
-  } catch (err) {
-    t.fail(err);
-  }
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: request should handle non-200 responses', async (t) => {
-  const requestor = setupRequestor();
-  sinon.stub(requestor.client, 'request').resolves({
-    statusCode: 404,
-    headers: {},
-    body: {}
-  });
-  try {
-    const hook = { url: 'http://localhost/test', method: 'POST' };
-    await requestor.request('verb:hook', hook, { foo: 'bar' });
-    t.fail('Should have thrown an error');
-  } catch (err) {
-    t.ok(err, 'Should throw an error');
-    t.equal(err.statusCode, 404, 'Error should contain status code');
-  }
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: request should handle ECONNREFUSED error', async (t) => {
-  const requestor = setupRequestor();
-  const error = new Error('Connection refused');
-  error.code = 'ECONNREFUSED';
-  sinon.stub(requestor.client, 'request').rejects(error);
-  try {
-    const hook = { url: 'http://localhost/test', method: 'POST' };
-    await requestor.request('verb:hook', hook, { foo: 'bar' });
-    t.fail('Should have thrown an error');
-  } catch (err) {
-    t.equal(err.code, 'ECONNREFUSED', 'Should pass through the error');
-  }
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: request should skip jambonz:error type', async (t) => {
-  const requestor = setupRequestor();
-  const spy = sinon.spy(requestor.client, 'request');
-  const hook = { url: 'http://localhost/test', method: 'POST' };
-  const result = await requestor.request('jambonz:error', hook, { foo: 'bar' });
-  t.equal(result, undefined, 'Should return undefined');
-  t.equal(spy.callCount, 0, 'Should not call request method');
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: request should handle array response', async (t) => {
-  const requestor = setupRequestor();
-  const fakeBody = { json: async () => [{ id: 1 }, { id: 2 }] };
-  sinon.stub(requestor.client, 'request').resolves({
-    statusCode: 200,
-    headers: { 'content-type': 'application/json' },
-    body: fakeBody
-  });
-  try {
-    const hook = { url: 'http://localhost/test', method: 'POST' };
-    const result = await requestor.request('verb:hook', hook, { foo: 'bar' });
-    t.ok(Array.isArray(result), 'Should return an array');
-    t.equal(result.length, 2, 'Array should have 2 items');
-  } catch (err) {
-    t.fail(err);
-  }
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: request should handle llm:tool-call type', async (t) => {
-  const requestor = setupRequestor();
-  const fakeBody = { json: async () => ({ result: 'tool output' }) };
-  sinon.stub(requestor.client, 'request').resolves({
-    statusCode: 200,
-    headers: { 'content-type': 'application/json' },
-    body: fakeBody
-  });
-  try {
-    const hook = { url: 'http://localhost/test', method: 'POST' };
-    const result = await requestor.request('llm:tool-call', hook, { tool: 'test' });
-    t.deepEqual(result, { result: 'tool output' }, 'Should return the parsed JSON');
-  } catch (err) {
-    t.fail(err);
-  }
-  cleanup(requestor);
-  t.end();
-});
-
-test('HttpRequestor: close should close the client if not using pools', (t) => {
-  // Ensure HTTP_POOL is set to false to disable pool usage
-  const oldHttpPool = process.env.HTTP_POOL;
-  process.env.HTTP_POOL = '0';
-
-  const requestor = setupRequestor();
-  // Make sure _usePools is false
-  requestor._usePools = false;
-
-  // Replace the client.close with a spy function
-  const closeSpy = sinon.spy();
-  requestor.client.close = closeSpy;
-
-  // Set client.closed to false to ensure the condition is met
-  requestor.client.closed = false;
-
-  // Call close
-  requestor.close();
-
-  // Check if the spy was called
-  t.ok(closeSpy.calledOnce, 'Should call client.close');
-
-  // Restore HTTP_POOL
-  process.env.HTTP_POOL = oldHttpPool;
-
-  // Don't call cleanup(requestor) as it would try to call client.close again
-  sinon.restore();
-  t.end();
-});
-
-test('HttpRequestor: request should handle URLs with fragments', async (t) => {
-  const requestor = setupRequestor();
-  // Use the same host/port as the base client to avoid creating a new client
-  const urlWithFragment = 'http://localhost?param1=value1#rc=5&rp=4xx,5xx,ct';
-  const expectedResponse = { status: 'success' };
-  const fakeBody = { json: async () => expectedResponse };
-
-  // Stub the request method
-  const requestStub = sinon.stub(requestor.client, 'request').callsFake((opts) => {
-    return Promise.resolve({
-      statusCode: 200,
-      headers: { 'content-type': 'application/json' },
-      body: fakeBody
-    });
-  });
-  try {
-    const hook = { url: urlWithFragment, method: 'GET' };
-    const result = await requestor.request('verb:hook', hook, null);
-    t.deepEqual(result, expectedResponse, 'Should return the parsed JSON response');
-    const requestCall = requestStub.getCall(0);
-    const opts = requestCall.args[0];
-    t.ok(opts.query && opts.query.param1 === 'value1', 'Query parameters should be parsed');
-    t.equal(opts.path, '/', 'Path should be extracted from URL');
-    t.notOk(opts.query && opts.query.rc, 'Fragment should not be included in query parameters');
-  } catch (err) {
-    t.fail(err);
-  }
-  cleanup(requestor);
-  t.end();
-});
-
-// test('HttpRequestor: request should handle URLs with query parameters', async (t) => {
-//   t.pass('Restored original require function');
-//   t.end();
-// });

test/index.js

@@ -1,8 +1,4 @@
-require('./ws-requestor-retry-unit-test');
-require('./test_ws_retry_comprehensive');
 require('./ws-requestor-unit-test');
-require('./http-requestor-retry-test');
-require('./http-requestor-unit-test');
 require('./unit-tests');
 require('./docker_start');
 require('./create-test-db');

test/queue-test.js

@@ -3,7 +3,6 @@ const { sippUac } = require('./sipp')('test_fs');
 const clearModule = require('clear-module');
 const {provisionCallHook, provisionActionHook, provisionAnyHook} = require('./utils');
 const bent = require('bent');
-const { sleepFor } = require('../lib/utils/helpers');
 const getJSON = bent('json');
 
 process.on('unhandledRejection', (reason, p) => {
@@ -18,6 +17,8 @@ function connect(connectable) {
   });
 }
 
+const sleepFor = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
+
 test('\'enqueue-dequeue\' tests', async(t) => {
 
   clearModule.all();

test/sip-refer-tests.js

@@ -3,9 +3,10 @@ const { sippUac } = require('./sipp')('test_fs');
 const clearModule = require('clear-module');
 const {provisionCallHook, provisionCustomHook, provisionActionHook} = require('./utils')
 const bent = require('bent');
-const { sleepFor } = require('../lib/utils/helpers');
 const getJSON = bent('json')
 
+const sleepFor = async(ms) => new Promise(resolve => setTimeout(resolve, ms));
+
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });

test/test_ws_retry_comprehensive.js

@@ -1,436 +0,0 @@
-const test = require('tape');
-const sinon = require('sinon');
-const proxyquire = require("proxyquire");
-proxyquire.noCallThru();
-
-const {
-  JAMBONES_LOGLEVEL,  
-} = require('../lib/config');
-const logger = require('pino')({level: JAMBONES_LOGLEVEL});
-
-// Mock WebSocket specifically for retry testing
-class RetryMockWebSocket {
-  static retryScenarios = new Map();
-  static connectionAttempts = new Map();
-  static urlMapping = new Map(); // Maps cleanUrl -> originalUrl
-  
-  constructor(url, protocols, options) {
-    this.url = url;
-    this.protocols = protocols;
-    this.options = options;
-    this.eventListeners = new Map();
-    
-    // Extract scenario key from URL hash or use URL itself
-    this.scenarioKey = this.extractScenarioKey(url);
-    
-    // Track connection attempts for this scenario
-    const attempts = RetryMockWebSocket.connectionAttempts.get(this.scenarioKey) || 0;
-    RetryMockWebSocket.connectionAttempts.set(this.scenarioKey, attempts + 1);
-    
-    console.log(`RetryMockWebSocket: constructor for URL ${url}, scenarioKey="${this.scenarioKey}", attempt #${attempts + 1}`);
-    
-    // Handle connection immediately
-    setImmediate(() => {
-      this.handleConnection();
-    });
-  }
-  
-  extractScenarioKey(url) {
-    console.log(`RetryMockWebSocket: extractScenarioKey from URL: ${url}`);
-    
-    // Check if we have a mapping from cleanUrl to originalUrl
-    const originalUrl = RetryMockWebSocket.urlMapping.get(url);
-    if (originalUrl && originalUrl.includes('#')) {
-      const hash = originalUrl.split('#')[1];
-      console.log(`RetryMockWebSocket: found mapped URL with hash: ${hash}`);
-      return hash;
-    }
-    
-    // For URLs with hash parameters, use the hash as the scenario key
-    if (url.includes('#')) {
-      const hash = url.split('#')[1];
-      console.log(`RetryMockWebSocket: found hash: ${hash}`);
-      return hash; // Use hash as scenario key
-    }
-    
-    console.log(`RetryMockWebSocket: using full URL as scenario key: ${url}`);
-    return url; // Fallback to full URL
-  }
-  
-  static setRetryScenario(key, scenario) {
-    console.log(`RetryMockWebSocket: setting scenario for key "${key}":`, scenario);
-    RetryMockWebSocket.retryScenarios.set(key, scenario);
-  }
-  
-  static setUrlMapping(cleanUrl, originalUrl) {
-    console.log(`RetryMockWebSocket: mapping ${cleanUrl} -> ${originalUrl}`);
-    RetryMockWebSocket.urlMapping.set(cleanUrl, originalUrl);
-  }
-  
-  static clearScenarios() {
-    console.log('RetryMockWebSocket: clearing all scenarios');
-    RetryMockWebSocket.retryScenarios.clear();
-    RetryMockWebSocket.connectionAttempts.clear();
-    RetryMockWebSocket.urlMapping.clear();
-  }
-  
-  static getConnectionAttempts(key) {
-    return RetryMockWebSocket.connectionAttempts.get(key) || 0;
-  }
-  
-  handleConnection() {
-    const scenario = RetryMockWebSocket.retryScenarios.get(this.scenarioKey);
-    console.log(`RetryMockWebSocket: handleConnection for scenarioKey="${this.scenarioKey}", scenario found:`, !!scenario);
-    
-    if (!scenario) {
-      // Default successful connection
-      console.log(`RetryMockWebSocket: no scenario found, defaulting to success`);
-      this.simulateOpen();
-      return;
-    }
-    
-    const attemptNumber = RetryMockWebSocket.connectionAttempts.get(this.scenarioKey);
-    const behavior = scenario.attempts[attemptNumber - 1] || scenario.attempts[scenario.attempts.length - 1];
-    
-    console.log(`RetryMockWebSocket: attempt ${attemptNumber}, behavior:`, behavior);
-    
-    if (behavior.type === 'handshake-failure') {
-      // Simulate handshake failure with specific status code
-      setImmediate(() => {
-        console.log(`RetryMockWebSocket: triggering handshake failure with status ${behavior.statusCode}`);
-        if (this.eventListeners.has('unexpected-response')) {
-          const mockResponse = {
-            statusCode: behavior.statusCode || 500,
-            statusMessage: behavior.statusMessage || 'Internal Server Error',
-            headers: {}
-          };
-          const mockRequest = {
-            headers: {}
-          };
-          this.eventListeners.get('unexpected-response')(mockRequest, mockResponse);
-        }
-      });
-    } else if (behavior.type === 'network-error') {
-      // Simulate network error during connection
-      setImmediate(() => {
-        console.log(`RetryMockWebSocket: triggering network error: ${behavior.message}`);
-        if (this.eventListeners.has('error')) {
-          const error = new Error(behavior.message || 'Network error');
-          // Set proper error code for retry policy checking
-          if (behavior.message && behavior.message.includes('Connection refused')) {
-            error.code = 'ECONNREFUSED';
-          } else if (behavior.message && behavior.message.includes('timeout')) {
-            error.code = 'ETIMEDOUT';
-          } else {
-            error.code = 'ECONNREFUSED'; // Default for network errors
-          }
-          this.eventListeners.get('error')(error);
-        }
-      });
-    } else if (behavior.type === 'success') {
-      // Successful connection
-      console.log(`RetryMockWebSocket: triggering success`);
-      this.simulateOpen();
-    }
-  }
-  
-  simulateOpen() {
-    setImmediate(() => {
-      if (this.eventListeners.has('open')) {
-        console.log(`RetryMockWebSocket: calling open listener`);
-        this.eventListeners.get('open')();
-      }
-    });
-  }
-  
-  once(event, listener) {
-    console.log(`RetryMockWebSocket: registering once listener for ${event}`);
-    this.eventListeners.set(event, listener);
-    return this;
-  }
-  
-  on(event, listener) {
-    console.log(`RetryMockWebSocket: registering on listener for ${event}`);
-    this.eventListeners.set(event, listener);
-    return this;
-  }
-  
-  removeAllListeners() {
-    this.eventListeners.clear();
-  }
-  
-  send(data, callback) {
-    // For successful connections, simulate message response
-    try {
-      const json = JSON.parse(data);
-      console.log({json}, 'RetryMockWebSocket: got message from ws-requestor');
-      
-      // Simulate successful response
-      setTimeout(() => {
-        const msg = {
-          type: 'ack',
-          msgid: json.msgid,
-          command: 'command',
-          call_sid: json.call_sid,
-          queueCommand: false,
-          data: '[{"verb": "play","url": "silence_stream://5000"}]'
-        };
-        console.log({msg}, 'RetryMockWebSocket: sending ack to ws-requestor');
-        this.mockOnMessage(JSON.stringify(msg));
-      }, 50);
-      
-      if (callback) callback();
-    } catch (err) {
-      console.error('RetryMockWebSocket: Error processing send', err);
-      if (callback) callback(err);
-    }
-  }
-  
-  mockOnMessage(message, isBinary = false) {
-    if (this.eventListeners.has('message')) {
-      this.eventListeners.get('message')(message, isBinary);
-    }
-  }
-  
-  close(code) {
-    if (this.eventListeners.has('close')) {
-      this.eventListeners.get('close')(code || 1000);
-    }
-  }
-}
-
-const BaseRequestor = proxyquire('../lib/utils/base-requestor', {
-  '../../': {
-    srf: {
-      locals: {
-        stats: {
-          histogram: () => {},
-        },
-      },
-    },
-  },
-  '@jambonz/time-series': sinon.stub(),
-});
-
-const WsRequestor = proxyquire('../lib/utils/ws-requestor', {
-  './base-requestor': BaseRequestor,
-  ws: RetryMockWebSocket,
-});
-
-test('ws retry policy - 4xx error with rp=5xx should not retry', async(t) => {
-  // GIVEN
-  console.log('Starting test setup...');
-  RetryMockWebSocket.clearScenarios();
-
-  const call_sid = 'ws_no_retry_4xx';
-  
-  // Set up the URL mapping
-  const cleanUrl = 'ws://localhost:3000';
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=5xx';
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  // Set up the retry scenario for the first attempt to fail with 400, but policy only retries 5xx
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=5xx', {
-    attempts: [
-      { type: 'handshake-failure', statusCode: 400, statusMessage: 'Bad Request' }
-    ]
-  });
-
-  const hook = {
-    url: 'ws://localhost:3000#rc=2&rp=5xx', // Max 2 retries, retry only on 5xx
-    username: 'username',
-    password: 'password',
-  };
-
-  const params = {
-    callSid: call_sid,
-  };
-
-  // WHEN
-  const requestor = new WsRequestor(
-    logger,
-    'account_sid',
-    hook,
-    'webhook_secret'
-  );
-  try {
-    const result = await requestor.request('session:new', hook, params, {});
-    t.fail('Should have thrown an error');
-    t.end();
-  } catch (err) {
-    // THEN
-    const errorMessage = err.message || err.toString() || String(err);
-    t.ok(
-      errorMessage.includes('400'),
-      `ws properly failed without retry for 4xx when rp=5xx - error: ${errorMessage}`
-    );
-    t.end();
-  }
-});
-
-test('ws retry policy - 5xx error with rp=5xx should retry and succeed', async(t) => {
-  // GIVEN
-  console.log('Starting 5xx retry test setup...');
-  RetryMockWebSocket.clearScenarios();
-
-  const call_sid = 'ws_retry_5xx_success';
-  
-  // Set up the URL mapping
-  const cleanUrl = 'ws://localhost:3000';
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=5xx';
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  // Set up the retry scenario - first attempt fails with 500, second succeeds
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=5xx', {
-    attempts: [
-      { type: 'handshake-failure', statusCode: 500, statusMessage: 'Internal Server Error' },
-      { type: 'success' }
-    ]
-  });
-
-  const hook = {
-    url: 'ws://localhost:3000#rc=2&rp=5xx', // Max 2 retries, retry only on 5xx
-    username: 'username',
-    password: 'password',
-  };
-
-  const params = {
-    callSid: call_sid,
-  };
-
-  // WHEN
-  const requestor = new WsRequestor(
-    logger,
-    'account_sid',
-    hook,
-    'webhook_secret'
-  );
-  try {
-    const result = await requestor.request('session:new', hook, params, {});
-    
-    // THEN
-    t.ok(result, 'ws successfully retried and connected after 5xx error');
-    
-    // Verify that exactly 2 attempts were made
-    const attempts = RetryMockWebSocket.getConnectionAttempts('rc=2&rp=5xx');
-    t.equal(attempts, 2, 'Should have made exactly 2 connection attempts');
-    
-    t.end();
-  } catch (err) {
-    t.fail(`Should have succeeded after retry - error: ${err.message}`);
-    t.end();
-  }
-});
-
-test('ws retry policy - network error with rp=ct should retry and succeed', async(t) => {
-  // GIVEN
-  console.log('Starting network error retry test setup...');
-  RetryMockWebSocket.clearScenarios();
-
-  const call_sid = 'ws_retry_network_success';
-  
-  // Set up the URL mapping
-  const cleanUrl = 'ws://localhost:3000';
-  const originalUrl = 'ws://localhost:3000#rc=3&rp=ct';
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  // Set up the retry scenario - first two attempts fail with network error, third succeeds
-  RetryMockWebSocket.setRetryScenario('rc=3&rp=ct', {
-    attempts: [
-      { type: 'network-error', message: 'Connection refused' },
-      { type: 'network-error', message: 'Connection refused' },
-      { type: 'success' }
-    ]
-  });
-
-  const hook = {
-    url: 'ws://localhost:3000#rc=3&rp=ct', // Max 3 retries, retry on connection errors
-    username: 'username',
-    password: 'password',
-  };
-
-  const params = {
-    callSid: call_sid,
-  };
-
-  // WHEN
-  const requestor = new WsRequestor(
-    logger,
-    'account_sid',
-    hook,
-    'webhook_secret'
-  );
-  try {
-    const result = await requestor.request('session:new', hook, params, {});
-    
-    // THEN
-    t.ok(result, 'ws successfully retried and connected after network errors');
-    
-    // Verify that exactly 3 attempts were made
-    const attempts = RetryMockWebSocket.getConnectionAttempts('rc=3&rp=ct');
-    t.equal(attempts, 3, 'Should have made exactly 3 connection attempts');
-    
-    t.end();
-  } catch (err) {
-    t.fail(`Should have succeeded after retry - error: ${err.message}`);
-    t.end();
-  }
-});
-
-test('ws retry policy - retry exhaustion should fail with last error', async(t) => {
-  // GIVEN
-  console.log('Starting retry exhaustion test setup...');
-  RetryMockWebSocket.clearScenarios();
-
-  const call_sid = 'ws_retry_exhaustion';
-  
-  // Set up the URL mapping
-  const cleanUrl = 'ws://localhost:3000';
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=5xx';
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  // Set up the retry scenario - all attempts fail with 500
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=5xx', {
-    attempts: [
-      { type: 'handshake-failure', statusCode: 500, statusMessage: 'Internal Server Error' },
-      { type: 'handshake-failure', statusCode: 500, statusMessage: 'Internal Server Error' },
-      { type: 'handshake-failure', statusCode: 500, statusMessage: 'Internal Server Error' }
-    ]
-  });
-
-  const hook = {
-    url: 'ws://localhost:3000#rc=2&rp=5xx', // Max 2 retries, retry only on 5xx
-    username: 'username',
-    password: 'password',
-  };
-
-  const params = {
-    callSid: call_sid,
-  };
-
-  // WHEN
-  const requestor = new WsRequestor(
-    logger,
-    'account_sid',
-    hook,
-    'webhook_secret'
-  );
-  try {
-    const result = await requestor.request('session:new', hook, params, {});
-    t.fail('Should have thrown an error after exhausting retries');
-    t.end();
-  } catch (err) {
-    // THEN
-    const errorMessage = err.message || err.toString() || String(err);
-    t.ok(
-      errorMessage.includes('500'),
-      `ws properly failed after exhausting retries - error: ${errorMessage}`
-    );
-    
-    // Verify that exactly 3 attempts were made (initial + 2 retries)
-    const attempts = RetryMockWebSocket.getConnectionAttempts('rc=2&rp=5xx');
-    t.equal(attempts, 3, 'Should have made exactly 3 connection attempts (initial + 2 retries)');
-    
-    t.end();
-  }
-});

test/utils/mock-helper.js

@@ -1,103 +0,0 @@
-const sinon = require('sinon');
-
-/**
- * Creates mock objects commonly needed for testing HttpRequestor and related classes
- * @returns {Object} Mock objects
- */
-const createMocks = () => {
-  // Basic logger mock
-  const MockLogger = {
-    debug: () => {},
-    info: () => {},
-    error: () => {}
-  };
-
-  // Stats mock
-  const MockStats = { 
-    histogram: () => {} 
-  };
-
-  // Alerter mock
-  const MockAlerter = {
-    AlertType: {
-      WEBHOOK_CONNECTION_FAILURE: 'WEBHOOK_CONNECTION_FAILURE',
-      WEBHOOK_STATUS_FAILURE: 'WEBHOOK_STATUS_FAILURE'
-    },
-    writeAlerts: async () => {}
-  };
-
-  // DB helpers mock
-  const MockDbHelpers = {
-    pool: {
-      getConnection: () => Promise.resolve({
-        connect: () => {},
-        on: () => {},
-        query: (sql, cb) => {
-          if (typeof cb === 'function') cb(null, []);
-          return { stream: () => ({ on: () => {} }) };
-        },
-        end: () => {}
-      }),
-      query: (...args) => {
-        const cb = args[args.length - 1];
-        if (typeof cb === 'function') cb(null, []);
-        return Promise.resolve([]);
-      }
-    },
-    camelize: (obj) => obj
-  };
-
-  // Time series mock
-  const MockTimeSeries = () => ({
-    writeAlerts: async () => {},
-    AlertType: {
-      WEBHOOK_CONNECTION_FAILURE: 'WEBHOOK_CONNECTION_FAILURE',
-      WEBHOOK_STATUS_FAILURE: 'WEBHOOK_STATUS_FAILURE'
-    }
-  });
-
-  return {
-    MockLogger,
-    MockStats,
-    MockAlerter,
-    MockDbHelpers,
-    MockTimeSeries
-  };
-};
-
-/**
- * Set up mocks on the BaseRequestor class for tests
- * @param {Object} BaseRequestor - The BaseRequestor class
- */
-const setupBaseRequestorMocks = (BaseRequestor) => {
-  BaseRequestor.prototype._isAbsoluteUrl = function(url) { return url.startsWith('http'); };
-  BaseRequestor.prototype._isRelativeUrl = function(url) { return !url.startsWith('http'); };
-  BaseRequestor.prototype._generateSigHeader = function() { return { 'X-Signature': 'test-signature' }; };
-  BaseRequestor.prototype._roundTrip = function() { return 10; };
-  
-  // Define baseUrl property
-  Object.defineProperty(BaseRequestor.prototype, 'baseUrl', { 
-    get: function() { return 'http://localhost'; } 
-  });
-  
-  // Define Alerter property
-  const mocks = createMocks();
-  Object.defineProperty(BaseRequestor.prototype, 'Alerter', { 
-    get: function() { return mocks.MockAlerter; } 
-  });
-};
-
-/**
- * Clean up after tests
- * @param {Object} requestor - The requestor instance to clean up
- */
-const cleanup = (requestor) => {
-  sinon.restore();
-  if (requestor && requestor.close) requestor.close();
-};
-
-module.exports = {
-  createMocks,
-  setupBaseRequestorMocks,
-  cleanup
-};

test/utils/test-mocks.js

@@ -1,154 +0,0 @@
-/**
- * Common test mocks for Jambonz tests
- */
-const proxyquire = require('proxyquire').noCallThru();
-
-// Logger mock
-class MockLogger {
-  debug() {}
-  info() {}
-  error() {}
-}
-
-// Stats mock
-const statsMock = { histogram: () => {} };
-
-// Time series mock
-const timeSeriesMock = () => ({
-  writeAlerts: async () => {},
-  AlertType: {
-    WEBHOOK_CONNECTION_FAILURE: 'WEBHOOK_CONNECTION_FAILURE',
-    WEBHOOK_STATUS_FAILURE: 'WEBHOOK_STATUS_FAILURE'
-  }
-});
-
-// DB helpers mock
-const dbHelpersMock = {
-  pool: {
-    getConnection: () => Promise.resolve({
-      connect: () => {},
-      on: () => {},
-      query: (sql, cb) => {
-        if (typeof cb === 'function') cb(null, []);
-        return { stream: () => ({ on: () => {} }) };
-      },
-      end: () => {}
-    }),
-    query: (...args) => {
-      const cb = args[args.length - 1];
-      if (typeof cb === 'function') cb(null, []);
-      return Promise.resolve([]);
-    }
-  },
-  camelize: (obj) => obj
-};
-
-// Config mock
-const configMock = {
-  HTTP_POOL: '0',
-  HTTP_POOLSIZE: '10',
-  HTTP_PIPELINING: '1',
-  HTTP_TIMEOUT: 5000,
-  HTTP_PROXY_IP: null,
-  HTTP_PROXY_PORT: null,
-  HTTP_PROXY_PROTOCOL: null,
-  NODE_ENV: 'test',
-  HTTP_USER_AGENT_HEADER: 'test-agent',
-  JAMBONES_TIME_SERIES_HOST: 'localhost'
-};
-
-// SRF mock
-const srfMock = {
-  srf: {
-    locals: {
-      stats: statsMock
-    }
-  }
-};
-
-// Alerter mock
-const alerterMock = {
-  AlertType: {
-    WEBHOOK_CONNECTION_FAILURE: 'WEBHOOK_CONNECTION_FAILURE',
-    WEBHOOK_STATUS_FAILURE: 'WEBHOOK_STATUS_FAILURE'
-  },
-  writeAlerts: async () => {}
-};
-
-/**
- * Creates mocked BaseRequestor and HttpRequestor classes
- * @returns {Object} Mocked classes and helper functions
- */
-function createMockedRequestors() {
-  // First, mock BaseRequestor's dependencies
-  const BaseRequestor = proxyquire('../../lib/utils/base-requestor', {
-    '@jambonz/time-series': timeSeriesMock,
-    '../config': configMock,
-    '../../': srfMock
-  });
-
-  // Apply prototype methods and properties
-  BaseRequestor.prototype._isAbsoluteUrl = function(url) { return url.startsWith('http'); };
-  BaseRequestor.prototype._isRelativeUrl = function(url) { return !url.startsWith('http'); };
-  BaseRequestor.prototype._generateSigHeader = function() { return { 'X-Signature': 'test-signature' }; };
-  BaseRequestor.prototype._roundTrip = function() { return 10; };
-
-  // Define baseUrl property
-  Object.defineProperty(BaseRequestor.prototype, 'baseUrl', { 
-    get: function() { return 'http://localhost'; } 
-  });
-
-  // Define Alerter property
-  Object.defineProperty(BaseRequestor.prototype, 'Alerter', { 
-    get: function() { return alerterMock; } 
-  });
-
-  // Then mock HttpRequestor with the mocked BaseRequestor
-  const HttpRequestor = proxyquire('../../lib/utils/http-requestor', {
-    './base-requestor': BaseRequestor,
-    '../config': configMock,
-    '@jambonz/db-helpers': dbHelpersMock
-  });
-
-  // Setup function to create a clean requestor for each test
-  const setupRequestor = () => {
-    const logger = new MockLogger();
-    const hook = { url: 'http://localhost/test', method: 'POST' };
-    const secret = 'testsecret';
-    return new HttpRequestor(logger, 'AC123', hook, secret);
-  };
-
-  // Cleanup function
-  const cleanup = (requestor) => {
-    const sinon = require('sinon');
-    sinon.restore();
-    if (requestor && requestor.close) requestor.close();
-  };
-
-  return {
-    BaseRequestor,
-    HttpRequestor,
-    setupRequestor,
-    cleanup,
-    mocks: {
-      logger: new MockLogger(),
-      stats: statsMock,
-      timeSeries: timeSeriesMock,
-      dbHelpers: dbHelpersMock,
-      config: configMock,
-      srf: srfMock,
-      alerter: alerterMock
-    }
-  };
-}
-
-module.exports = {
-  createMockedRequestors,
-  MockLogger,
-  statsMock,
-  timeSeriesMock,
-  dbHelpersMock,
-  configMock,
-  srfMock,
-  alerterMock
-};

test/ws-requestor-retry-unit-test.js

@@ -1,605 +0,0 @@
-const test = require('tape');
-const sinon = require('sinon');
-const proxyquire = require("proxyquire");
-proxyquire.noCallThru();
-
-const {
-  JAMBONES_LOGLEVEL,  
-} = require('../lib/config');
-const logger = require('pino')({level: JAMBONES_LOGLEVEL});
-
-// Mock WebSocket specifically for retry testing
-class RetryMockWebSocket {
-  static retryScenarios = new Map();
-  static connectionAttempts = new Map();
-  static urlMapping = new Map(); // Maps cleanUrl -> originalUrl
-  
-  constructor(url, protocols, options) {
-    this.url = url;
-    this.protocols = protocols;
-    this.options = options;
-    this.eventListeners = new Map();
-    
-    // Extract scenario key from URL hash or use URL itself
-    this.scenarioKey = this.extractScenarioKey(url);
-    
-    // Track connection attempts for this scenario
-    const attempts = RetryMockWebSocket.connectionAttempts.get(this.scenarioKey) || 0;
-    RetryMockWebSocket.connectionAttempts.set(this.scenarioKey, attempts + 1);
-    
-    // Handle connection immediately
-    setImmediate(() => {
-      this.handleConnection();
-    });
-  }
-  
-  extractScenarioKey(url) {
-    console.log(`RetryMockWebSocket: extractScenarioKey from URL: ${url}`);
-    
-    // Check if we have a mapping from cleanUrl to originalUrl
-    const originalUrl = RetryMockWebSocket.urlMapping.get(url);
-    if (originalUrl && originalUrl.includes('#')) {
-      const hash = originalUrl.split('#')[1];
-      console.log(`RetryMockWebSocket: found mapped URL with hash: ${hash}`);
-      return hash;
-    }
-    
-    // For URLs with hash parameters, use the hash as the scenario key
-    if (url.includes('#')) {
-      const hash = url.split('#')[1];
-      console.log(`RetryMockWebSocket: found hash: ${hash}`);
-      return hash; // Use hash as scenario key
-    }
-    
-    console.log(`RetryMockWebSocket: using full URL as scenario key: ${url}`);
-    return url; // Fallback to full URL
-  }
-  
-  static setRetryScenario(key, scenario) {
-    RetryMockWebSocket.retryScenarios.set(key, scenario);
-  }
-  
-  static setUrlMapping(cleanUrl, originalUrl) {
-    RetryMockWebSocket.urlMapping.set(cleanUrl, originalUrl);
-  }
-  
-  static clearScenarios() {
-    RetryMockWebSocket.retryScenarios.clear();
-    RetryMockWebSocket.connectionAttempts.clear();
-    RetryMockWebSocket.urlMapping.clear();
-  }
-  
-  static getConnectionAttempts(key) {
-    return RetryMockWebSocket.connectionAttempts.get(key) || 0;
-  }
-  
-  handleConnection() {
-    const scenario = RetryMockWebSocket.retryScenarios.get(this.scenarioKey);
-    console.log(`RetryMockWebSocket: handleConnection for scenarioKey="${this.scenarioKey}", scenario found:`, !!scenario);
-    
-    if (!scenario) {
-      // Default successful connection
-      this.simulateOpen();
-      return;
-    }
-    
-    const attemptNumber = RetryMockWebSocket.connectionAttempts.get(this.scenarioKey);
-    const behavior = scenario.attempts[attemptNumber - 1] || scenario.attempts[scenario.attempts.length - 1];
-    
-    console.log(`RetryMockWebSocket: attempt ${attemptNumber}, behavior:`, behavior);
-    
-    if (behavior.type === 'handshake-failure') {
-      // Simulate handshake failure with specific status code
-      setImmediate(() => {
-        console.log(`RetryMockWebSocket: triggering handshake failure with status ${behavior.statusCode}`);
-        if (this.eventListeners.has('unexpected-response')) {
-          const mockResponse = {
-            statusCode: behavior.statusCode || 500,
-            statusMessage: behavior.statusMessage || 'Internal Server Error',
-            headers: {}
-          };
-          const mockRequest = {
-            headers: {}
-          };
-          this.eventListeners.get('unexpected-response')(mockRequest, mockResponse);
-        }
-      });
-    } else if (behavior.type === 'network-error') {
-      // Simulate network error during connection
-      setImmediate(() => {
-        console.log(`RetryMockWebSocket: triggering network error: ${behavior.message}`);
-        if (this.eventListeners.has('error')) {
-          const err = new Error(behavior.message || 'Network error');
-          // Set appropriate error codes based on the message
-          if (behavior.message === 'Connection timeout') {
-            err.code = 'ETIMEDOUT';
-          } else if (behavior.message === 'Connection refused') {
-            err.code = 'ECONNREFUSED';
-          } else if (behavior.message === 'Connection reset') {
-            err.code = 'ECONNRESET';
-          } else {
-            // Default to ECONNREFUSED for generic network errors
-            err.code = 'ECONNREFUSED';
-          }
-          this.eventListeners.get('error')(err);
-        }
-      });
-    } else if (behavior.type === 'success') {
-      // Successful connection
-      console.log(`RetryMockWebSocket: triggering success`);
-      this.simulateOpen();
-    }
-  }
-  
-  simulateOpen() {
-    setImmediate(() => {
-      if (this.eventListeners.has('open')) {
-        this.eventListeners.get('open')();
-      }
-    });
-  }
-  
-  once(event, listener) {
-    this.eventListeners.set(event, listener);
-    return this;
-  }
-  
-  on(event, listener) {
-    this.eventListeners.set(event, listener);
-    return this;
-  }
-  
-  removeAllListeners() {
-    this.eventListeners.clear();
-  }
-  
-  send(data, callback) {
-    // For successful connections, simulate message response
-    try {
-      const json = JSON.parse(data);
-      console.log({json}, 'RetryMockWebSocket: got message from ws-requestor');
-      
-      // Simulate successful response
-      setTimeout(() => {
-        const msg = {
-          type: 'ack',
-          msgid: json.msgid,
-          command: 'command',
-          call_sid: json.call_sid,
-          queueCommand: false,
-          data: '[{"verb": "play","url": "silence_stream://5000"}]'
-        };
-        console.log({msg}, 'RetryMockWebSocket: sending ack to ws-requestor');
-        this.mockOnMessage(JSON.stringify(msg));
-      }, 50);
-      
-      if (callback) callback();
-    } catch (err) {
-      console.error('RetryMockWebSocket: Error processing send', err);
-      if (callback) callback(err);
-    }
-  }
-  
-  mockOnMessage(message, isBinary = false) {
-    if (this.eventListeners.has('message')) {
-      this.eventListeners.get('message')(message, isBinary);
-    }
-  }
-  
-  close(code) {
-    if (this.eventListeners.has('close')) {
-      this.eventListeners.get('close')(code || 1000);
-    }
-  }
-}
-
-const BaseRequestor = proxyquire(
-  "../lib/utils/base-requestor",
-  {
-    "../../": {
-      srf: {
-        locals: {
-          stats: {
-            histogram: () => {}
-          }
-        }
-      }
-    },
-    "@jambonz/time-series": sinon.stub()
-  }
-);
-
-const WsRequestor = proxyquire(
-  "../lib/utils/ws-requestor",
-  {
-    "./base-requestor": BaseRequestor,
-    "ws": RetryMockWebSocket
-  }
-);
-
-test('WS Retry - 4xx error with rp=4xx should retry and succeed', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=4xx';
-  const cleanUrl = 'ws://localhost:3000';
-  
-  // Set up URL mapping so mock can find the right scenario
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'handshake-failure', statusCode: 400, statusMessage: 'Bad Request' },
-      { type: 'success' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=4xx', retryScenario);
-  
-  const hook = {
-    url: originalUrl,
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_4xx_retry'
-  };
-  
-  // WHEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  const result = await requestor.request('session:new', hook, params, {});
-  
-  // THEN
-  t.ok(result, 'ws successfully retried after 4xx error and got response');
-  t.equal(RetryMockWebSocket.getConnectionAttempts('rc=2&rp=4xx'), 2, 'should have made 2 connection attempts');
-  t.end();
-});
-
-test('WS Retry - 4xx error with rp=5xx should not retry', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=5xx';
-  const cleanUrl = 'ws://localhost:3000';
-  
-  // Set up URL mapping so mock can find the right scenario
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'handshake-failure', statusCode: 400, statusMessage: 'Bad Request' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=5xx', retryScenario);
-  
-  const hook = {
-    url: originalUrl,
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_4xx_no_retry'
-  };
-  
-  // WHEN & THEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  try {
-    await requestor.request('session:new', hook, params, {});
-    t.fail('Should have thrown an error');
-  } catch (err) {
-    const errorMessage = err.message || err.toString() || String(err);
-    t.ok(errorMessage.includes('400'), 'ws properly failed without retry for 4xx when rp=5xx');
-    t.equal(RetryMockWebSocket.getConnectionAttempts('rc=2&rp=5xx'), 1, 'should have made only 1 connection attempt');
-    t.end();
-  }
-});
-
-test('WS Retry - 5xx error with rp=5xx should retry and succeed', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=5xx';
-  const cleanUrl = 'ws://localhost:3000';
-  
-  // Set up URL mapping so mock can find the right scenario
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'handshake-failure', statusCode: 503, statusMessage: 'Service Unavailable' },
-      { type: 'success' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=5xx', retryScenario);
-  
-  const hook = {
-    url: originalUrl,
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_5xx_retry'
-  };
-  
-  // WHEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  const result = await requestor.request('session:new', hook, params, {});
-  
-  // THEN
-  t.ok(result, 'ws successfully retried after 5xx error and got response');
-  t.equal(RetryMockWebSocket.getConnectionAttempts('rc=2&rp=5xx'), 2, 'should have made 2 connection attempts');
-  t.end();
-});
-
-test('WS Retry - 5xx error with rp=4xx should not retry', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=4xx';
-  const cleanUrl = 'ws://localhost:3000';
-  
-  // Set up URL mapping so mock can find the right scenario
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'handshake-failure', statusCode: 503, statusMessage: 'Service Unavailable' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=4xx', retryScenario);
-  
-  const hook = {
-    url: originalUrl,
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_5xx_no_retry'
-  };
-  
-  // WHEN & THEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  try {
-    await requestor.request('session:new', hook, params, {});
-    t.fail('Should have thrown an error');
-  } catch (err) {
-    const errorMessage = err.message || err.toString() || String(err);
-    t.ok(errorMessage.includes('503'), 'ws properly failed without retry for 5xx when rp=4xx');
-    t.equal(RetryMockWebSocket.getConnectionAttempts('rc=2&rp=4xx'), 1, 'should have made only 1 connection attempt');
-    t.end();
-  }
-});
-
-test('WS Retry - network error with rp=all should retry and succeed', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=all';
-  const cleanUrl = 'ws://localhost:3000';
-  
-  // Set up URL mapping so mock can find the right scenario
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'network-error', message: 'Connection refused' },
-      { type: 'success' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=all', retryScenario);
-  
-  const hook = {
-    url: originalUrl,
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_network_retry'
-  };
-  
-  // WHEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  const result = await requestor.request('session:new', hook, params, {});
-  
-  // THEN
-  t.ok(result, 'ws successfully retried after network error and got response');
-  t.equal(RetryMockWebSocket.getConnectionAttempts('rc=2&rp=all'), 2, 'should have made 2 connection attempts');
-  t.end();
-});
-
-test('WS Retry - network error with rp=4xx should not retry', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=4xx';
-  const cleanUrl = 'ws://localhost:3000';
-  
-  // Set up URL mapping so mock can find the right scenario
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'network-error', message: 'Connection refused' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=4xx', retryScenario);
-  
-  const hook = {
-    url: originalUrl,
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_network_no_retry'
-  };
-  
-  // WHEN & THEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  try {
-    await requestor.request('session:new', hook, params, {});
-    t.fail('Should have thrown an error');
-  } catch (err) {
-    const errorMessage = err.message || err.toString() || String(err);
-    t.ok(errorMessage.includes('Connection refused') || errorMessage.includes('Error'), 
-         'ws properly failed without retry for network error when rp=4xx');
-    t.equal(RetryMockWebSocket.getConnectionAttempts('rc=2&rp=4xx'), 1, 'should have made only 1 connection attempt');
-    t.end();
-  }
-});
-
-test('WS Retry - multiple retries then success', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const originalUrl = 'ws://localhost:3000#rc=4&rp=all';
-  const cleanUrl = 'ws://localhost:3000';
-  
-  // Set up URL mapping so mock can find the right scenario
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'handshake-failure', statusCode: 503, statusMessage: 'Service Unavailable' },
-      { type: 'network-error', message: 'Connection timeout' },
-      { type: 'handshake-failure', statusCode: 502, statusMessage: 'Bad Gateway' },
-      { type: 'success' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('rc=4&rp=all', retryScenario);
-  
-  const hook = {
-    url: originalUrl,
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_multiple_retries'
-  };
-  
-  // WHEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  const result = await requestor.request('session:new', hook, params, {});
-  
-  // THEN
-  t.ok(result, 'ws successfully retried multiple times and got response');
-  t.equal(RetryMockWebSocket.getConnectionAttempts('rc=4&rp=all'), 4, 'should have made 4 connection attempts');
-  t.end();
-});
-
-test('WS Retry - exhaust retries and fail', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=5xx';
-  const cleanUrl = 'ws://localhost:3000';
-  
-  // Set up URL mapping so mock can find the right scenario
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'handshake-failure', statusCode: 503, statusMessage: 'Service Unavailable' },
-      { type: 'handshake-failure', statusCode: 503, statusMessage: 'Service Unavailable' },
-      { type: 'handshake-failure', statusCode: 503, statusMessage: 'Service Unavailable' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=5xx', retryScenario);
-  
-  const hook = {
-    url: originalUrl,
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_exhaust_retries'
-  };
-  
-  // WHEN & THEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  try {
-    await requestor.request('session:new', hook, params, {});
-    t.fail('Should have thrown an error');
-  } catch (err) {
-    const errorMessage = err.message || err.toString() || String(err);
-    t.ok(errorMessage.includes('503'), 'ws properly failed after exhausting retries');
-    t.equal(RetryMockWebSocket.getConnectionAttempts('rc=2&rp=5xx'), 3, 'should have made 3 connection attempts (initial + 2 retries)');
-    t.end();
-  }
-});
-
-test('WS Retry - rp=ct (connection timeout) should retry network errors', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const originalUrl = 'ws://localhost:3000#rc=2&rp=ct';
-  const cleanUrl = 'ws://localhost:3000';
-  
-  // Set up URL mapping so mock can find the right scenario
-  RetryMockWebSocket.setUrlMapping(cleanUrl, originalUrl);
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'network-error', message: 'Connection timeout' },
-      { type: 'success' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('rc=2&rp=ct', retryScenario);
-  
-  const hook = {
-    url: originalUrl,
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_ct_retry'
-  };
-  
-  // WHEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  const result = await requestor.request('session:new', hook, params, {});
-  
-  // THEN
-  t.ok(result, 'ws successfully retried connection timeout and got response');
-  t.equal(RetryMockWebSocket.getConnectionAttempts('rc=2&rp=ct'), 2, 'should have made 2 connection attempts');
-  t.end();
-});
-
-test('WS Retry - default behavior (no hash params) should use ct policy', async (t) => {
-  // GIVEN
-  RetryMockWebSocket.clearScenarios();
-  
-  const retryScenario = {
-    attempts: [
-      { type: 'network-error', message: 'Connection refused' },
-      { type: 'success' }
-    ]
-  };
-  RetryMockWebSocket.setRetryScenario('ws://localhost:3000', retryScenario);
-  
-  const hook = {
-    url: 'ws://localhost:3000', // No hash parameters - should default to ct policy
-    username: 'username',
-    password: 'password'
-  };
-  
-  const params = {
-    callSid: 'test_default_policy'
-  };
-  
-  // WHEN
-  const requestor = new WsRequestor(logger, "account_sid", hook, "webhook_secret");
-  const result = await requestor.request('session:new', hook, params, {});
-  
-  // THEN
-  t.ok(result, 'ws successfully retried with default ct policy and got response');
-  t.equal(RetryMockWebSocket.getConnectionAttempts('ws://localhost:3000'), 2, 'should have made 2 connection attempts');
-  t.end();
-});

test/ws-requestor-unit-test.js

@@ -127,8 +127,7 @@ test('ws response error 1000', async (t) => {
   }
   catch (err) {
     // THEN
-    t.ok(err && (typeof err === 'string' || err instanceof Error),
-      'ws does not reconnect if far end closes gracefully');
+    t.ok(err.startsWith('timeout from far end for msgid'), 'ws does not reconnect if far end closes gracefully');
     t.end();
   }
 });
@@ -162,8 +161,7 @@ test('ws response error', async (t) => {
   }
   catch (err) {
     // THEN
-    t.ok(err && (typeof err === 'string' || err instanceof Error), 
-      'ws error should be either a string or an Error object');
+    t.ok(err.startsWith('timeout from far end for msgid'), 'ws does not reconnect if far end closes gracefully');
     t.end();
   }
 });
@@ -197,7 +195,7 @@ test('ws unexpected-response', async (t) => {
   }
   catch (err) {
     // THEN
-    t.ok(err, 'ws properly fails on unexpected response');
+    t.ok(err.code = 'ERR_ASSERTION', 'ws does not reconnect if far end closes gracefully');
     t.end();
   }
 });

tracer.js

@@ -25,38 +25,29 @@ module.exports = (serviceName) => {
       }),
     });
 
-    const exporters = [];
-
+    let exporter;
     if (OTEL_EXPORTER_JAEGER_AGENT_HOST  || OTEL_EXPORTER_JAEGER_ENDPOINT) {
-      exporters.push(new JaegerExporter());
+      exporter = new JaegerExporter();
     }
-
-    if (OTEL_EXPORTER_ZIPKIN_URL) {
-      exporters.push(new ZipkinExporter({url:OTEL_EXPORTER_ZIPKIN_URL}));
+    else if (OTEL_EXPORTER_ZIPKIN_URL) {
+      exporter = new ZipkinExporter({url:OTEL_EXPORTER_ZIPKIN_URL});
     }
-
-    if (OTEL_EXPORTER_ZIPKIN_URL) {
-      exporters.push(new ZipkinExporter({url:OTEL_EXPORTER_ZIPKIN_URL}));
-    }
-
-    if (OTEL_EXPORTER_COLLECTOR_URL) {
-      exporters.push(new OTLPTraceExporter({
+    else {
+      exporter = new OTLPTraceExporter({
         url: OTEL_EXPORTER_COLLECTOR_URL
-      }));
+      });
     }
 
-    exporters.forEach((element) => {
-      provider.addSpanProcessor(new BatchSpanProcessor(element, {
-        // The maximum queue size. After the size is reached spans are dropped.
-        maxQueueSize: 100,
-        // The maximum batch size of every export. It must be smaller or equal to maxQueueSize.
-        maxExportBatchSize: 10,
-        // The interval between two consecutive exports
-        scheduledDelayMillis: 500,
-        // How long the export can run before it is cancelled
-        exportTimeoutMillis: 30000,
-      }));
-    });
+    provider.addSpanProcessor(new BatchSpanProcessor(exporter, {
+      // The maximum queue size. After the size is reached spans are dropped.
+      maxQueueSize: 100,
+      // The maximum batch size of every export. It must be smaller or equal to maxQueueSize.
+      maxExportBatchSize: 10,
+      // The interval between two consecutive exports
+      scheduledDelayMillis: 500,
+      // How long the export can run before it is cancelled
+      exportTimeoutMillis: 30000,
+    }));
 
     // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
     provider.register();