bugfix: dial in nested transcribe set proper order of endpoints so channel_tag for caller is 1 and called is 2

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

@@ -127,10 +127,22 @@ router.post('/', async(req, res) => {
     }
     else {
       logger.debug({call_hook: app.call_hook}, 'creating http client for call hook');
-      app.requestor = new HttpRequestor(logger, account.account_sid, app.call_hook, account.webhook_secret);
+      app.requestor = new HttpRequestor(
+        logger,
+        account.service_provider_sid,
+        account.account_sid,
+        app.call_hook,
+        account.webhook_secret
+      );
     }
     if (!app.notifier && app.call_status_hook) {
-      app.notifier = new HttpRequestor(logger, account.account_sid, app.call_status_hook, account.webhook_secret);
+      app.notifier = new HttpRequestor(
+        logger,
+        account.service_provider_sid,
+        account.account_sid,
+        app.call_status_hook,
+        account.webhook_secret
+      );
       logger.debug({call_hook: app.call_hook}, 'creating http client for call status hook');
     }
     else if (!app.notifier) {

lib/http-routes/api/messaging.js

@@ -26,7 +26,13 @@ router.post('/:partner', async(req, res) => {
     app.notifier = app.requestor;
   }
   else {
-    app.requestor = new HttpRequestor(logger, account.account_sid, hook, account.webhook_secret);
+    app.requestor = new HttpRequestor(
+      logger,
+      account.service_provider_sid,
+      account.account_sid,
+      hook,
+      account.webhook_secret
+    );
     app.notifier = {request: () => {}};
   }
 

lib/middleware.js

@@ -17,7 +17,8 @@ module.exports = function(srf, logger) {
     lookupAppByRegex,
     lookupAppBySid,
     lookupAppByRealm,
-    lookupAppByTeamsTenant
+    lookupAppByTeamsTenant,
+    lookupAccountBySid
   }  = srf.locals.dbHelpers;
   const {
     writeAlerts,
@@ -25,7 +26,7 @@ module.exports = function(srf, logger) {
   } = srf.locals;
   const {lookupAccountDetails} = dbUtils(logger, srf);
 
-  function initLocals(req, res, next) {
+  const initLocals = async(req, res, next) => {
     const callId = req.get('Call-ID');
     logger.info({callId}, 'new incoming call');
     if (!req.has('X-Account-Sid')) {
@@ -34,7 +35,10 @@ module.exports = function(srf, logger) {
     }
     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};
+    console.log(`account_sid: ${account_sid}`);
+    const account = await lookupAccountBySid(account_sid);
+    console.log(`account: ${JSON.stringify(account)}`);
+    req.locals = {callSid, account_sid, service_provider_sid: account?.service_provider_sid, callId};
     if (req.has('X-Application-Sid')) {
       const application_sid = req.get('X-Application-Sid');
       logger.debug(`got application from X-Application-Sid header: ${application_sid}`);
@@ -44,7 +48,7 @@ module.exports = function(srf, logger) {
     if (req.has('X-MS-Teams-Tenant-FQDN')) req.locals.msTeamsTenant = req.get('X-MS-Teams-Tenant-FQDN');
 
     next();
-  }
+  };
 
   function createRootSpan(req, res, next) {
     const {callId, callSid, account_sid} = req.locals;
@@ -161,7 +165,7 @@ module.exports = function(srf, logger) {
    * Given the dialed DID/phone number, retrieve the application to invoke
    */
   async function retrieveApplication(req, res, next) {
-    const {logger, accountInfo, account_sid, rootSpan} = req.locals;
+    const {logger, accountInfo, service_provider_sid, account_sid, rootSpan} = req.locals;
     const {span} = rootSpan.startChildSpan('lookupApplication');
     try {
       let app;
@@ -226,14 +230,33 @@ module.exports = function(srf, logger) {
       */
       if ('WS' === app.call_hook?.method ||
         app.call_hook?.url.startsWith('ws://') || app.call_hook?.url.startsWith('wss://')) {
-        app.requestor = new WsRequestor(logger, account_sid, app.call_hook, accountInfo.account.webhook_secret) ;
+        app.requestor = new WsRequestor(
+          logger,
+          service_provider_sid,
+          account_sid,
+          app.call_hook,
+          accountInfo.account.webhook_secret
+        ) ;
         app.notifier = app.requestor;
         app.call_hook.method = 'WS';
       }
       else {
-        app.requestor = new HttpRequestor(logger, account_sid, app.call_hook, accountInfo.account.webhook_secret);
-        if (app.call_status_hook) app.notifier = new HttpRequestor(logger, account_sid, app.call_status_hook,
-          accountInfo.account.webhook_secret);
+        app.requestor = new HttpRequestor(
+          logger,
+          service_provider_sid,
+          account_sid,
+          app.call_hook,
+          accountInfo.account.webhook_secret
+        );
+        if (app.call_status_hook) {
+          app.notifier = new HttpRequestor(
+            logger,
+            service_provider_sid,
+            account_sid,
+            app.call_status_hook,
+            accountInfo.account.webhook_secret
+          );
+        }
         else app.notifier = {request: () => {}};
       }
 
@@ -316,6 +339,7 @@ module.exports = function(srf, logger) {
       span?.setAttributes({webhookStatus: err.statusCode});
       span?.end();
       writeAlerts({
+        service_provider_sid: req.locals.service_provider_sid,
         account_sid: req.locals.account_sid,
         target_sid: req.locals.callSid,
         alert_type: AlertType.INVALID_APP_PAYLOAD,

lib/session/call-info.js

@@ -11,7 +11,6 @@ class CallInfo {
     let srf;
     this.direction = opts.direction;
     this.traceId = opts.traceId;
-    this.callTerminationBy = undefined;
     if (opts.req) {
       const u = opts.req.getParsedHeader('from');
       const uri = parseUri(u.uri);
@@ -22,8 +21,9 @@ class CallInfo {
       // inbound call
       const {app, req} = opts;
       srf = req.srf;
-      this.callSid = req.locals.callSid,
-      this.accountSid = app.account_sid,
+      this.callSid = req.locals.callSid;
+      this.serviceProviderSid = req.locals.service_provider_sid;
+      this.accountSid = app.account_sid;
       this.applicationSid = app.application_sid;
       this.from = from || req.callingNumber;
       this.to = req.calledNumber;
@@ -40,6 +40,7 @@ class CallInfo {
       srf = req.srf;
       this.callSid = callSid || uuidv4();
       this.parentCallSid = parentCallInfo.callSid;
+      this.serviceProviderSid = parentCallInfo.serviceProviderSid;
       this.accountSid = parentCallInfo.accountSid;
       this.applicationSid = parentCallInfo.applicationSid;
       this.from = from || req.callingNumber;
@@ -52,18 +53,20 @@ class CallInfo {
     }
     else if (this.direction === CallDirection.None) {
       // outbound SMS
-      const {messageSid, accountSid, applicationSid, res} = opts;
+      const {messageSid, serviceProviderSid, accountSid, applicationSid, res} = opts;
       srf = res.srf;
       this.messageSid = messageSid;
+      this.serviceProviderSid = serviceProviderSid;
       this.accountSid = accountSid;
       this.applicationSid = applicationSid;
       this.res = res;
     }
     else {
       // outbound call triggered by REST
-      const {req, callSid, accountSid, applicationSid, to, tag} = opts;
+      const {req, callSid, accountSid, serviceProviderSid, applicationSid, to, tag} = opts;
       srf = req.srf;
       this.callSid = callSid;
+      this.serviceProviderSid = serviceProviderSid;
       this.accountSid = accountSid;
       this.applicationSid = applicationSid;
       this.callStatus = CallStatus.Trying,
@@ -120,7 +123,7 @@ class CallInfo {
       applicationSid: this.applicationSid,
       fsSipAddress: this.localSipAddress
     };
-    ['parentCallSid', 'originatingSipIp', 'originatingSipTrunkName', 'callTerminationBy'].forEach((prop) => {
+    ['parentCallSid', 'originatingSipIp', 'originatingSipTrunkName'].forEach((prop) => {
       if (this[prop]) obj[prop] = this[prop];
     });
     if (typeof this.duration === 'number') obj.duration = this.duration;

lib/session/call-session.js

@@ -201,6 +201,12 @@ class CallSession extends Emitter {
     return this.direction === CallDirection.Inbound && this.res.finalResponseSent;
   }
 
+  /**
+   * returns the account sid
+   */
+  get serviceProviderSid() {
+    return this.callInfo.serviceProviderSid;
+  }
   /**
    * returns the account sid
    */
@@ -286,18 +292,6 @@ class CallSession extends Emitter {
     return this._globalAltLanguages;
   }
 
-  set globalSttPunctuation(punctuate) {
-    this._globalSttPunctuation = punctuate;
-  }
-
-  get globalSttPunctuation() {
-    return this._globalSttPunctuation;
-  }
-
-  hasGlobalSttPunctuation() {
-    return this._globalSttPunctuation !== undefined;
-  }
-
   async notifyRecordOptions(opts) {
     const {action} = opts;
     this.logger.debug({opts}, 'CallSession:notifyRecordOptions');
@@ -532,6 +526,7 @@ class CallSession extends Emitter {
             this.logger.info({err}, `malformed google service_key provisioned for account ${sid}`);
             writeAlerts({
               alert_type: AlertType.TTS_FAILURE,
+              service_provider_sid: this.serviceProviderSid,
               account_sid: this.accountSid,
               vendor
             }).catch((err) => this.logger.error({err}, 'Error writing tts alert'));
@@ -549,9 +544,7 @@ class CallSession extends Emitter {
           return {
             speech_credential_sid: credential.speech_credential_sid,
             api_key: credential.api_key,
-            region: credential.region,
-            use_custom_stt: credential.use_custom_stt,
-            custom_stt_endpoint: credential.custom_stt_endpoint
+            region: credential.region
           };
         }
         else if ('wellsaid' === vendor) {
@@ -564,6 +557,7 @@ class CallSession extends Emitter {
       else {
         writeAlerts({
           alert_type: AlertType.STT_NOT_PROVISIONED,
+          service_provider_sid: this.serviceProviderSid,
           account_sid: this.accountSid,
           vendor
         }).catch((err) => this.logger.error({err}, 'Error writing tts alert'));
@@ -640,7 +634,6 @@ class CallSession extends Emitter {
     this._onTasksDone();
     this._clearResources();
 
-
     if (!this.isConfirmCallSession && !this.isSmsCallSession) sessionTracker.remove(this.callSid);
   }
 
@@ -1191,7 +1184,6 @@ class CallSession extends Emitter {
     } catch (err) {
       if (err === CALLER_CANCELLED_ERR_MSG) {
         this.logger.error(err, 'caller canceled quickly before we could respond, ending call');
-        this.callInfo.callTerminationBy = 'caller';
         this._notifyCallStatusChange({
           callStatus: CallStatus.NoAnswer,
           sipStatus: 487,
@@ -1306,8 +1298,7 @@ class CallSession extends Emitter {
       this.dlg = await this.srf.createUAS(this.req, this.res, {
         headers: {
           'X-Trace-ID': this.req.locals.traceId,
-          'X-Call-Sid': this.req.locals.callSid,
-          ...(this.applicationSid && {'X-Application-Sid': this.applicationSid})
+          'X-Call-Sid': this.req.locals.callSid
         },
         localSdp: this.ep.local.sdp
       });
@@ -1399,8 +1390,13 @@ class CallSession extends Emitter {
         }
         else {
           this.logger.info({accountSid: this.accountSid, webhook: r[0]}, 'performQueueWebhook: webhook found');
-          this.queueEventHookRequestor = new HttpRequestor(this.logger, this.accountSid,
-            r[0], this.webhook_secret);
+          this.queueEventHookRequestor = new HttpRequestor(
+            this.logger,
+            this.serviceProviderSid,
+            this.accountSid,
+            r[0],
+            this.webhook_secret
+          );
           this.queueEventHook = r[0];
         }
       } catch (err) {
@@ -1499,9 +1495,8 @@ class CallSession extends Emitter {
         dlg.connected = false;
         dlg.destroy = origDestroy;
         const duration = moment().diff(this.dlg.connectTime, 'seconds');
-        this.callInfo.callTerminationBy = 'jambonz';
         this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
-        this.logger.debug('CallSession: call terminated by jambonz');
+        this.logger.debug('CallSession: call terminated by jambones');
         this.rootSpan.setAttributes({'call.termination': 'hangup by jambonz'});
         origDestroy().catch((err) => this.logger.info({err}, 'CallSession - error destroying dialog'));
         if (this.wakeupResolver) {

lib/session/inbound-call-session.js

@@ -34,7 +34,6 @@ class InboundCallSession extends CallSession {
 
   _onCancel() {
     this.rootSpan.setAttributes({'call.termination': 'caller abandoned'});
-    this.callInfo.callTerminationBy = 'caller';
     this._notifyCallStatusChange({
       callStatus: CallStatus.NoAnswer,
       sipStatus: 487,
@@ -70,7 +69,6 @@ class InboundCallSession extends CallSession {
     assert(this.dlg.connectTime);
     const duration = moment().diff(this.dlg.connectTime, 'seconds');
     this.rootSpan.setAttributes({'call.termination': 'hangup by caller'});
-    this.callInfo.callTerminationBy = 'caller';
     this.emit('callStatusChange', {
       callStatus: CallStatus.Completed,
       duration

lib/session/rest-call-session.js

@@ -44,7 +44,6 @@ class RestCallSession extends CallSession {
    * This is invoked when the called party hangs up, in order to calculate the call duration.
    */
   _callerHungup() {
-    this.callInfo.callTerminationBy = 'caller';
     const duration = moment().diff(this.dlg.connectTime, 'seconds');
     this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
     this.logger.debug('RestCallSession: called party hung up');

lib/session/siprec-call-session.js

@@ -36,8 +36,7 @@ class SipRecCallSession extends InboundCallSession {
         headers: {
           'Content-Type': 'application/sdp',
           'X-Trace-ID': this.req.locals.traceId,
-          'X-Call-Sid': this.req.locals.callSid,
-          ...(this.applicationSid && {'X-Application-Sid': this.applicationSid})
+          'X-Call-Sid': this.req.locals.callSid
         },
         localSdp: combinedSdp
       });

lib/tasks/config.js

@@ -26,7 +26,7 @@ class TaskConfig extends Task {
       });
     }
     if (this.bargeIn.sticky) this.autoEnable = true;
-    this.preconditions = (this.bargeIn.enable || this.record?.action || this.data.amd) ?
+    this.preconditions = (this.bargeIn.enable || this.record?.action) ?
       TaskPreconditions.Endpoint :
       TaskPreconditions.None;
   }
@@ -54,20 +54,13 @@ class TaskConfig extends Task {
     return  `${this.name}{${phrase.join(',')}`;
   }
 
-  async exec(cs, {ep} = {}) {
+  async exec(cs) {
     await super.exec(cs);
 
     if (this.data.amd) {
       this.startAmd = cs.startAmd;
       this.stopAmd = cs.stopAmd;
       this.on('amd', this._onAmdEvent.bind(this, cs));
-
-      try {
-        this.ep = ep;
-        this.startAmd(cs, ep, this, this.data.amd);
-      } catch (err) {
-        this.logger.info({err}, 'Config:exec - Error calling startAmd');
-      }
     }
 
     if (this.hasSynthesizer) {
@@ -105,9 +98,6 @@ class TaskConfig extends Task {
         this.logger.info({altLanguages: this.recognizer.altLanguages}, 'Config: updated altLanguages');
         cs.altLanguages = this.recognizer.altLanguages;
       }
-      if ('punctuation' in this.recognizer) {
-        cs.globalSttPunctuation = this.recognizer.punctuation;
-      }
       this.logger.info({
         recognizer: this.recognizer,
         isContinuousAsr: cs.isContinuousAsr
@@ -140,7 +130,6 @@ class TaskConfig extends Task {
 
   async kill(cs) {
     super.kill(cs);
-    if (this.ep && this.stopAmd) this.stopAmd(this.ep, this);
   }
 
   _onAmdEvent(cs, evt) {

lib/tasks/dial.js

@@ -630,7 +630,7 @@ class TaskDial extends Task {
     if (this.parentDtmfCollector) this._installDtmfDetection(cs, cs.dlg);
     if (this.childDtmfCollector) this._installDtmfDetection(cs, this.dlg);
 
-    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep2: this.epOther, ep:this.ep});
+    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep: this.epOther, ep2:this.ep});
     if (this.listenTask) this.listenTask.exec(cs, {ep: this.epOther});
     if (this.startAmd) {
       try {

lib/tasks/gather.js

@@ -82,7 +82,6 @@ class TaskGather extends Task {
       this.requestSnr = recognizer.requestSnr || false;
       this.initialSpeechTimeoutMs = recognizer.initialSpeechTimeoutMs || 0;
       this.azureServiceEndpoint = recognizer.azureServiceEndpoint;
-      this.azureSttEndpointId = recognizer.azureSttEndpointId;
     }
     else {
       this.hints = [];
@@ -147,9 +146,6 @@ class TaskGather extends Task {
       this.logger.debug({altLanguages: this.altLanguages},
         'Gather:exec - applying altLanguages');
     }
-    if (cs.hasGlobalSttPunctuation) {
-      this.punctuation = cs.globalSttPunctuation;
-    }
     if (!this.isContinuousAsr && cs.isContinuousAsr) {
       this.isContinuousAsr = true;
       this.asrTimeout = cs.asrTimeout * 1000;
@@ -167,6 +163,7 @@ class TaskGather extends Task {
       const {writeAlerts, AlertType} = cs.srf.locals;
       this.logger.info(`TaskGather:exec - ERROR stt using ${this.vendor} requested but creds not supplied`);
       writeAlerts({
+        service_provider_sid: cs.serviceProviderSid,
         account_sid: cs.accountSid,
         alert_type: AlertType.STT_NOT_PROVISIONED,
         vendor: this.vendor
@@ -302,7 +299,7 @@ class TaskGather extends Task {
     }
 
     if ('google' === this.vendor) {
-      this.bugname = 'google_transcribe';
+      this.bugname = 'google_trancribe';
       if (this.sttCredentials) opts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(this.sttCredentials.credentials);
       [
         ['enhancedModel', 'GOOGLE_SPEECH_USE_ENHANCED'],
@@ -314,7 +311,6 @@ class TaskGather extends Task {
         ['diarization', 'GOOGLE_SPEECH_PROFANITY_FILTER']
       ].forEach((arr) => {
         if (this[arr[0]]) opts[arr[1]] = true;
-        else if (this[arr[0]] === false) opts[arr[1]] = false;
       });
       if (this.hints.length > 0) {
         opts.GOOGLE_SPEECH_HINTS = this.hints.join(',');
@@ -340,7 +336,7 @@ class TaskGather extends Task {
       ep.addCustomEventListener(GoogleTranscriptionEvents.VadDetected, this._onVadDetected.bind(this, cs, ep));
     }
     else if (['aws', 'polly'].includes(this.vendor)) {
-      this.bugname = 'aws_transcribe';
+      this.bugname = 'aws_trancribe';
       if (this.vocabularyName) opts.AWS_VOCABULARY_NAME = this.vocabularyName;
       if (this.vocabularyFilterName) {
         opts.AWS_VOCABULARY_NAME = this.vocabularyFilterName;
@@ -357,20 +353,12 @@ class TaskGather extends Task {
       ep.addCustomEventListener(AwsTranscriptionEvents.VadDetected, this._onVadDetected.bind(this, cs, ep));
     }
     else if ('microsoft' === this.vendor) {
-      this.bugname = 'azure_transcribe';
+      this.bugname = 'azure_trancribe';
       if (this.sttCredentials) {
-        const {api_key, region, use_custom_stt, custom_stt_endpoint} = this.sttCredentials;
-
         Object.assign(opts, {
-          'AZURE_SUBSCRIPTION_KEY': api_key,
-          'AZURE_REGION': region
+          'AZURE_SUBSCRIPTION_KEY': this.sttCredentials.api_key,
+          'AZURE_REGION': this.sttCredentials.region
         });
-        if (this.azureSttEndpointId) {
-          Object.assign(opts, {'AZURE_SERVICE_ENDPOINT_ID': this.azureSttEndpointId});
-        }
-        else if (use_custom_stt && custom_stt_endpoint) {
-          Object.assign(opts, {'AZURE_SERVICE_ENDPOINT_ID': custom_stt_endpoint});
-        }
       }
       if (this.hints && this.hints.length > 0) {
         opts.AZURE_SPEECH_HINTS = this.hints.map((h) => h.trim()).join(',');
@@ -412,6 +400,7 @@ class TaskGather extends Task {
       const {writeAlerts, AlertType} = this.cs.srf.locals;
       this.logger.error(err, 'TaskGather:_startTranscribing error');
       writeAlerts({
+        service_provider_sid: this.cs.serviceProviderSid,
         account_sid: this.cs.accountSid,
         alert_type: AlertType.STT_FAILURE,
         vendor: this.vendor,
@@ -526,10 +515,6 @@ class TaskGather extends Task {
 
     /* count words for bargein feature */
     const words = evt.alternatives[0].transcript.split(' ').length;
-    const bufferedWords = this._bufferedTranscripts.reduce((count, e) => {
-      return count + e.alternatives[0].transcript.split(' ').length;
-    }, 0);
-
     if (evt.is_final) {
       if (evt.alternatives[0].transcript === '' && !this.callSession.callGone && !this.killed) {
         if ('microsoft' === this.vendor && finished === 'true') {
@@ -560,14 +545,14 @@ class TaskGather extends Task {
           return this._resolve(this._bufferedTranscripts.length > 0 ? 'speech' : 'timeout');
         }
         this._startAsrTimer();
-        return this._startTranscribing(ep);
+        if ('microsoft' !== this.vendor) this._startTranscribing(ep);
+        return;
       }
       else {
-        if (this.bargein && (words + bufferedWords) < this.minBargeinWordCount) {
-          this.logger.debug({evt, words, bufferedWords},
-            'TaskGather:_onTranscription - final transcript but < min barge words');
-          this._bufferedTranscripts.push(evt);
-          this._startTranscribing(ep);
+        if (this.bargein && words < this.minBargeinWordCount) {
+          this.logger.debug({evt},
+            `TaskGather:_onTranscription - got ${words} but minBargein is ${this.minBargeinWordCount}; discarding`);
+          if ('microsoft' !== this.vendor) this._startTranscribing(ep);
           return;
         }
         else {
@@ -581,9 +566,9 @@ class TaskGather extends Task {
         others do not.
       */
       //const isStableEnough = typeof evt.stability === 'undefined' || evt.stability > GATHER_STABILITY_THRESHOLD;
-      if (this.bargein && (words + bufferedWords) >= this.minBargeinWordCount) {
+      if (this.bargein && words >= this.minBargeinWordCount) {
         if (!this.playComplete) {
-          this.logger.debug({transcript: evt.alternatives[0].transcript}, 'killing audio due to speech');
+          this.logger.debug({transcript: evt.alternatives[0].transcript}, 'killing audio due to minBargein words');
           this.emit('vad');
         }
         this._killAudio(cs);
@@ -650,7 +635,7 @@ class TaskGather extends Task {
     }
 
     this.span.setAttributes({'stt.resolve': reason, 'stt.result': JSON.stringify(evt)});
-    if (this.needsStt && this.ep && this.ep.connected) {
+    if (this.ep && this.ep.connected) {
       this.ep.stopTranscription({vendor: this.vendor})
         .catch((err) => this.logger.error({err}, 'Error stopping transcription'));
     }

lib/tasks/play.js

@@ -7,8 +7,6 @@ class TaskPlay extends Task {
     this.preconditions = TaskPreconditions.Endpoint;
 
     this.url = this.data.url;
-    this.seekOffset = this.data.seekOffset || -1;
-    this.timeoutSecs = this.data.timeoutSecs || -1;
     this.loop = this.data.loop || 1;
     this.earlyMedia = this.data.earlyMedia === true;
   }
@@ -33,13 +31,8 @@ class TaskPlay extends Task {
           } else {
             await this.playToConfMember(this.ep, memberId, confName, confUuid, this.url);
           }
-        } else {
-          const file = (this.timeoutSecs >= 0 || this.seekOffset >= 0) ?
-            {file: this.url, seekOffset: this.seekOffset, timeoutSecs: this.timeoutSecs} : this.url;
-          const result = await ep.play(file);
-          await this.performAction(Object.assign(result, {reason: 'playCompleted'}),
-            !(this.parentTask || cs.isConfirmCallSession));
         }
+        else await ep.play(this.url);
       }
     } catch (err) {
       this.logger.info(err, `TaskPlay:exec - error playing ${this.url}`);

lib/tasks/say.js

@@ -1,107 +1,12 @@
 const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
 
-const breakLengthyTextIfNeeded = (logger,  text) => {
-  const chunkSize = 1000;
-  if (text.length <= chunkSize) return [text];
-
-  const result = [];
-  const isSSML = text.startsWith('<speak>');
-  let startPos = 0;
-  let charPos = isSSML ? 7 : 0;  // skip <speak>
-  let tag;
-  //logger.debug({isSSML}, `breakLengthyTextIfNeeded: handling text of length ${text.length}`);
-  while (startPos + charPos < text.length) {
-    if (isSSML && !tag && text[startPos + charPos] === '<') {
-      const tagStartPos = ++charPos;
-      while (startPos + charPos < text.length) {
-        if (text[startPos + charPos] === '>') {
-          if (text[startPos + charPos - 1] === '\\') tag = null;
-          else if (!tag) tag = text.substring(startPos + tagStartPos, startPos + charPos - 1);
-          break;
-        }
-        if (!tag) {
-          const c = text[startPos + charPos];
-          if (c === ' ') {
-            tag = text.substring(startPos + tagStartPos, startPos + charPos);
-            //logger.debug(`breakLengthyTextIfNeeded: enter tag ${tag} (space)`);
-            break;
-          }
-        }
-        charPos++;
-      }
-      if (tag) {
-        //search for end of tag
-        //logger.debug(`breakLengthyTextIfNeeded: searching forward for </${tag}>`);
-        const e1 = text.indexOf(`</${tag}>`, startPos + charPos);
-        const e2 = text.indexOf('/>', startPos + charPos);
-        const tagEndPos = e1 === -1 ? e2 : e2 === -1 ? e1 : Math.min(e1, e2);
-        if (tagEndPos === -1) {
-          //logger.debug(`breakLengthyTextIfNeeded: exit tag ${tag} not found, exiting`);
-        } else {
-          //logger.debug(`breakLengthyTextIfNeeded: exit tag ${tag} found at ${tagEndPos}`);
-          charPos = tagEndPos + 1;
-        }
-        tag = null;
-      }
-      continue;
-    }
-
-    if (charPos < chunkSize) {
-      charPos++;
-      continue;
-    }
-
-    // start looking for a good break point
-    let chunkIt = false;
-    const a = text[startPos + charPos];
-    const b = text[startPos + charPos + 1];
-    if (/[\.!\?]/.test(a) && /\s/.test(b)) {
-      //logger.debug('breakLengthyTextIfNeeded: breaking at sentence end');
-      chunkIt = true;
-    }
-    if (chunkIt) {
-      charPos++;
-      const chunk = text.substr(startPos, charPos);
-      if (isSSML) {
-        result.push(0 === startPos ? `${chunk}</speak>` : `<speak>${chunk}</speak>`);
-      }
-      else result.push(chunk);
-      charPos = 0;
-      startPos += chunk.length;
-
-      //logger.debug({chunk: result[result.length - 1]},
-      //  `breakLengthyTextIfNeeded: chunked; new starting pos ${startPos}`);
-
-    }
-    else charPos++;
-  }
-
-  // final chunk
-  if (startPos < text.length) {
-    const chunk = text.substr(startPos);
-    if (isSSML) {
-      result.push(0 === startPos ? `${chunk}</speak>` : `<speak>${chunk}`);
-    }
-    else result.push(chunk);
-
-    //logger.debug({chunk: result[result.length - 1]},
-    //  `breakLengthyTextIfNeeded: final chunk; starting pos ${startPos} length ${chunk.length}`);
-
-  }
-
-  return result;
-};
-
 class TaskSay extends Task {
   constructor(logger, opts, parentTask) {
     super(logger, opts);
     this.preconditions = TaskPreconditions.Endpoint;
 
-    this.text = (Array.isArray(this.data.text) ? this.data.text : [this.data.text])
-      .map((t) => breakLengthyTextIfNeeded(this.logger, t))
-      .flat();
-
+    this.text = Array.isArray(this.data.text) ? this.data.text : [this.data.text];
     this.loop = this.data.loop || 1;
     this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
     this.synthesizer = this.data.synthesizer || {};
@@ -142,6 +47,7 @@ class TaskSay extends Task {
     try {
       if (!credentials) {
         writeAlerts({
+          service_provider_sid: cs.serviceProviderSid,
           account_sid: cs.accountSid,
           alert_type: AlertType.TTS_NOT_PROVISIONED,
           vendor
@@ -187,6 +93,7 @@ class TaskSay extends Task {
           this.logger.info({err}, 'Error synthesizing tts');
           span.end();
           writeAlerts({
+            service_provider_sid: cs.serviceProviderSid,
             account_sid: cs.accountSid,
             alert_type: AlertType.TTS_NOT_PROVISIONED,
             vendor,

lib/tasks/specs.json

@@ -98,10 +98,7 @@
     "properties": {
       "url": "string|array",
       "loop": "number|string",
-      "earlyMedia": "boolean",
-      "seekOffset": "number|string",
-      "timeoutSecs": "number|string",
-      "actionHook": "object|string"
+      "earlyMedia": "boolean"
     },
     "required": [
       "url"
@@ -497,7 +494,6 @@
       "requestSnr": "boolean",
       "initialSpeechTimeoutMs": "number",
       "azureServiceEndpoint": "string",
-      "azureSttEndpointId": "string",
       "asrDtmfTerminationDigit": "string",
       "asrTimeout": "number"
     },

lib/tasks/transcribe.js

@@ -54,7 +54,6 @@ class TaskTranscribe extends Task {
     this.requestSnr = recognizer.requestSnr || false;
     this.initialSpeechTimeoutMs = recognizer.initialSpeechTimeoutMs || 0;
     this.azureServiceEndpoint = recognizer.azureServiceEndpoint;
-    this.azureSttEndpointId = recognizer.azureSttEndpointId;
   }
 
   get name() { return TaskName.Transcribe; }
@@ -75,9 +74,6 @@ class TaskTranscribe extends Task {
       this.logger.debug({altLanguages: this.altLanguages},
         'Gather:exec - applying altLanguages');
     }
-    if (cs.hasGlobalSttPunctuation) {
-      this.punctuation = cs.globalSttPunctuation;
-    }
 
     this.ep = ep;
     this.ep2 = ep2;
@@ -90,6 +86,7 @@ class TaskTranscribe extends Task {
         const {writeAlerts, AlertType} = cs.srf.locals;
         this.logger.info(`TaskTranscribe:exec - ERROR stt using ${this.vendor} requested but creds not supplied`);
         writeAlerts({
+          service_provider_sid: cs.serviceProviderSid,
           account_sid: cs.accountSid,
           alert_type: AlertType.STT_NOT_PROVISIONED,
           vendor: this.vendor
@@ -162,7 +159,7 @@ class TaskTranscribe extends Task {
     ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, this._onNoAudio.bind(this, cs, ep, channel));
 
     if (this.vendor === 'google') {
-      this.bugname = 'google_transcribe';
+      this.bugname = 'google_trancribe';
       if (this.sttCredentials) opts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(this.sttCredentials.credentials);
       [
         ['enhancedModel', 'GOOGLE_SPEECH_USE_ENHANCED'],
@@ -174,7 +171,6 @@ class TaskTranscribe extends Task {
         ['diarization', 'GOOGLE_SPEECH_PROFANITY_FILTER']
       ].forEach((arr) => {
         if (this[arr[0]]) opts[arr[1]] = true;
-        else if (this[arr[0]] === false) opts[arr[1]] = false;
       });
       if (this.hints.length > 0) {
         opts.GOOGLE_SPEECH_HINTS = this.hints.join(',');
@@ -200,7 +196,7 @@ class TaskTranscribe extends Task {
         .catch((err) => this.logger.info(err, 'TaskTranscribe:_startTranscribing with google'));
     }
     else if (this.vendor === 'aws') {
-      this.bugname = 'aws_transcribe';
+      this.bugname = 'aws_trancribe';
       [
         ['diarization', 'AWS_SHOW_SPEAKER_LABEL'],
         ['identifyChannels', 'AWS_ENABLE_CHANNEL_IDENTIFICATION']
@@ -232,18 +228,11 @@ class TaskTranscribe extends Task {
         .catch((err) => this.logger.info(err, 'TaskTranscribe:_startTranscribing with aws'));
     }
     else if (this.vendor === 'microsoft') {
-      this.bugname = 'azure_transcribe';
-      const {api_key, region, use_custom_stt, custom_stt_endpoint} = this.sttCredentials;
+      this.bugname = 'azure_trancribe';
       Object.assign(opts, {
-        'AZURE_SUBSCRIPTION_KEY': api_key,
-        'AZURE_REGION': region
+        'AZURE_SUBSCRIPTION_KEY': this.sttCredentials.api_key,
+        'AZURE_REGION': this.sttCredentials.region
       });
-      if (this.azureSttEndpointId) {
-        Object.assign(opts, {'AZURE_SERVICE_ENDPOINT_ID': this.azureSttEndpointId});
-      }
-      else if (use_custom_stt && custom_stt_endpoint) {
-        Object.assign(opts, {'AZURE_SERVICE_ENDPOINT_ID': custom_stt_endpoint});
-      }
       if (this.hints && this.hints.length > 0) {
         opts.AZURE_SPEECH_HINTS = this.hints.map((h) => h.trim()).join(',');
       }
@@ -313,7 +302,7 @@ class TaskTranscribe extends Task {
       const b3 = this.getTracingPropagation();
       const httpHeaders = b3 && {b3};
       this.cs.requestor.request('verb:hook', this.transcriptionHook,
-        Object.assign({speech: evt}, this.cs.callInfo), httpHeaders)
+        Object.assign({speech: evt}, this.cs.callInfo.toJSON()), httpHeaders)
         .catch((err) => this.logger.info(err, 'TranscribeTask:_onTranscription error'));
     }
     if (this.parentTask) {

lib/utils/amd-utils.js

@@ -193,6 +193,7 @@ module.exports = (logger) => {
       task.emit(AmdEvents.Error, err);
       logger.error(err, 'amd:_startTranscribing error');
       writeAlerts({
+        service_provider_sid: cs.serviceProviderSid,
         account_sid: cs.accountSid,
         alert_type: AlertType.STT_FAILURE,
         vendor: vendor,

lib/utils/base-requestor.js

@@ -5,7 +5,7 @@ const timeSeries = require('@jambonz/time-series');
 let alerter ;
 
 class BaseRequestor extends Emitter {
-  constructor(logger, account_sid, hook, secret) {
+  constructor(logger, service_provider_sid, account_sid, hook, secret) {
     super();
     assert(typeof hook === 'object');
 
@@ -15,6 +15,7 @@ class BaseRequestor extends Emitter {
     this.username = hook.username;
     this.password = hook.password;
     this.secret = secret;
+    this.service_provider_sid = service_provider_sid;
     this.account_sid = account_sid;
 
     const {stats} = require('../../').srf.locals;

lib/utils/cron-jobs.js

@@ -42,9 +42,9 @@ const clearChannels = () => {
 };
 
 const clearFiles = () => {
-  //const {logger} = require('../..');
-  /*const out = */ execSync('find /tmp -name "*.mp3" -mtime +2 -exec rm {} \\;');
-  //logger.debug({out}, 'clearFiles: command output');
+  const {logger} = require('../..');
+  const out = execSync('find /tmp -name "*.mp3" -mtime +2 -exec rm {} \\;');
+  logger.debug({out}, 'clearFiles: command output');
 };
 
 

lib/utils/db-utils.js

@@ -36,8 +36,6 @@ const speechMapper = (cred) => {
     const o = JSON.parse(decrypt(credential));
     obj.api_key = o.api_key;
     obj.region = o.region;
-    obj.use_custom_stt = o.use_custom_stt;
-    obj.custom_stt_endpoint = o.custom_stt_endpoint;
   }
   else if ('wellsaid' === obj.vendor) {
     const o = JSON.parse(decrypt(credential));

lib/utils/http-requestor.js

@@ -18,8 +18,8 @@ function basicAuth(username, password) {
 
 
 class HttpRequestor extends BaseRequestor {
-  constructor(logger, account_sid, hook, secret) {
-    super(logger, account_sid, hook, secret);
+  constructor(logger, service_provider_sid, account_sid, hook, secret) {
+    super(logger, service_provider_sid, account_sid, hook, secret);
 
     this.method = hook.method || 'POST';
     this.authHeader = basicAuth(hook.username, hook.password);
@@ -28,8 +28,8 @@ class HttpRequestor extends BaseRequestor {
     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._baseUrl = `${u.protocol}://${u.resource}`;
+    this._resource = u.resource;
     this._protocol = u.protocol;
     this._search = u.search;
     this._usePools = process.env.HTTP_POOL && parseInt(process.env.HTTP_POOL);
@@ -49,10 +49,7 @@ class HttpRequestor extends BaseRequestor {
         this.logger.debug(`HttpRequestor:created pool for ${this._baseUrl}`);
       }
     }
-    else {
-      if (u.port) this.client = new Client(`${u.protocol}://${u.resource}:${u.port}`);
-      else this.client = new Client(`${u.protocol}://${u.resource}`);
-    }
+    else this.client = new Client(`${u.protocol}://${u.resource}`);
   }
 
   get baseUrl() {
@@ -104,8 +101,7 @@ class HttpRequestor extends BaseRequestor {
           query = u.query;
         }
         else {
-          if (u.port) client = newClient = new Client(`${u.protocol}://${u.resource}:${u.port}`);
-          else client = newClient = new Client(`${u.protocol}://${u.resource}`);
+          client = newClient = new Client(`${u.protocol}://${u.resource}`);
           path = u.pathname;
           query = u.query;
         }
@@ -146,7 +142,7 @@ class HttpRequestor extends BaseRequestor {
         this.logger.error({err, baseUrl: this.baseUrl, url},
           'web callback returned unexpected error');
       }
-      let opts = {account_sid: this.account_sid};
+      let opts = {account_sid: this.account_sid, service_provider_sid: this.service_provider_sid};
       if (err.code === 'ECONNREFUSED') {
         opts = {...opts, alert_type: this.Alerter.AlertType.WEBHOOK_CONNECTION_FAILURE, url};
       }

lib/utils/place-outdial.js

@@ -67,8 +67,7 @@ class SingleDialer extends Emitter {
       ...opts.headers,
       ...(this.target.headers || {}),
       'X-Jambonz-Routing': this.target.type,
-      'X-Call-Sid': this.callSid,
-      ...(this.applicationSid && {'X-Application-Sid': this.applicationSid})
+      'X-Call-Sid': this.callSid
     };
     if (srf.locals.fsUUID) {
       opts.headers = {

lib/utils/requestor.js

@@ -1,50 +0,0 @@
-const assert = require('assert');
-const timeSeries = require('@jambonz/time-series');
-let alerter ;
-
-function isAbsoluteUrl(u) {
-  return typeof u === 'string' &&
-    u.startsWith('https://') || u.startsWith('http://');
-}
-
-class Requestor {
-  constructor(logger, account_sid, hook, secret) {
-    assert(typeof hook === 'object');
-
-    this.logger = logger;
-    this.url = hook.url;
-    this.method = hook.method || 'POST';
-
-    this.username = hook.username;
-    this.password = hook.password;
-    this.secret = secret;
-    this.account_sid = account_sid;
-
-    assert(isAbsoluteUrl(this.url));
-    assert(['GET', 'POST'].includes(this.method));
-
-    const {stats} = require('../../').srf.locals;
-    this.stats = stats;
-
-    if (!alerter) {
-      alerter = timeSeries(logger, {
-        host: process.env.JAMBONES_TIME_SERIES_HOST,
-        commitSize: 50,
-        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
-      });
-    }
-  }
-
-  get Alerter() {
-    if (!alerter) {
-      alerter = timeSeries(this.logger, {
-        host: process.env.JAMBONES_TIME_SERIES_HOST,
-        commitSize: 50,
-        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
-      });
-    }
-    return alerter;
-  }
-}
-
-module.exports = Requestor;

lib/utils/ws-requestor.js

@@ -9,8 +9,8 @@ const MAX_RECONNECTS = 5;
 const RESPONSE_TIMEOUT_MS = process.env.JAMBONES_WS_API_MSG_RESPONSE_TIMEOUT || 5000;
 
 class WsRequestor extends BaseRequestor {
-  constructor(logger, account_sid, hook, secret) {
-    super(logger, account_sid, hook, secret);
+  constructor(logger, service_provider_sid, account_sid, hook, secret) {
+    super(logger, service_provider_sid, account_sid, hook, secret);
     this.connections = 0;
     this.messagesInFlight = new Map();
     this.maliciousClient = false;
@@ -54,7 +54,7 @@ class WsRequestor extends BaseRequestor {
     /* if we have an absolute url, and it is http then do a standard webhook */
     if (this._isAbsoluteUrl(url) && url.startsWith('http')) {
       this.logger.debug({hook}, 'WsRequestor: sending a webhook (HTTP)');
-      const requestor = new HttpRequestor(this.logger, this.account_sid, hook, this.secret);
+      const requestor = new HttpRequestor(this.logger, this.service_provider_sid, this.account_sid, hook, this.secret);
       return requestor.request(type, hook, params, httpHeaders);
     }
 
@@ -138,7 +138,7 @@ class WsRequestor extends BaseRequestor {
         success: (response) => {
           clearTimeout(timer);
           const rtt = this._roundTrip(startAt);
-          this.logger.debug({response}, `WsRequestor:request ${url} succeeded in ${rtt}ms`);
+          this.logger.info({response}, `WsRequestor:request ${url} succeeded in ${rtt}ms`);
           this.stats.histogram('app.hook.ws_response_time', rtt, ['hook_type:app']);
           resolve(response);
         },
@@ -187,7 +187,7 @@ class WsRequestor extends BaseRequestor {
         followRedirects: true,
         maxRedirects: 2,
         handshakeTimeout,
-        maxPayload: process.env.JAMBONES_WS_MAX_PAYLOAD ? parseInt(process.env.JAMBONES_WS_MAX_PAYLOAD) : 24 * 1024,
+        maxPayload: 8096,
       };
       if (this.username && this.password) opts = {...opts, auth: `${this.username}:${this.password}`};
 
@@ -286,7 +286,7 @@ class WsRequestor extends BaseRequestor {
       const obj = JSON.parse(content);
       const {type, msgid, command, call_sid = this.call_sid, queueCommand = false, data} = obj;
 
-      //this.logger.debug({obj}, 'WsRequestor:request websocket: received');
+      this.logger.debug({obj}, 'WsRequestor:request websocket: received');
       assert.ok(type, 'type property not supplied');
 
       switch (type) {
@@ -323,7 +323,7 @@ class WsRequestor extends BaseRequestor {
 
   _recvCommand(msgid, command, call_sid, queueCommand, data) {
     // TODO: validate command
-    this.logger.debug({msgid, command, call_sid, queueCommand, data}, 'received command');
+    this.logger.info({msgid, command, call_sid, queueCommand, data}, 'received command');
     this.emit('command', {msgid, command, call_sid, queueCommand, data});
   }
 }

package-lock.json

@@ -11,9 +11,9 @@
       "dependencies": {
         "@jambonz/db-helpers": "^0.6.18",
         "@jambonz/http-health-check": "^0.0.1",
-        "@jambonz/realtimedb-helpers": "^0.4.32",
+        "@jambonz/realtimedb-helpers": "^0.4.29",
         "@jambonz/stats-collector": "^0.1.6",
-        "@jambonz/time-series": "^0.2.1",
+        "@jambonz/time-series": "^0.2.0",
         "@opentelemetry/api": "^1.1.0",
         "@opentelemetry/exporter-jaeger": "^1.3.1",
         "@opentelemetry/exporter-trace-otlp-http": "^0.27.0",
@@ -27,20 +27,20 @@
         "bent": "^7.3.12",
         "debug": "^4.3.4",
         "deepcopy": "^2.1.0",
-        "drachtio-fsmrf": "^3.0.3",
+        "drachtio-fsmrf": "^3.0.2",
         "drachtio-srf": "^4.5.1",
         "express": "^4.18.1",
         "helmet": "^5.1.0",
         "ip": "^1.1.8",
         "moment": "^2.29.4",
-        "parse-url": "^8.1.0",
+        "parse-url": "^7.0.2",
         "pino": "^6.14.0",
         "sdp-transform": "^2.14.1",
         "short-uuid": "^4.2.0",
         "to-snake-case": "^1.0.0",
         "undici": "^5.8.2",
         "uuid": "^8.3.2",
-        "verify-aws-sns-signature": "^0.1.0",
+        "verify-aws-sns-signature": "^0.0.7",
         "ws": "^8.8.0",
         "xml2js": "^0.4.23"
       },
@@ -543,9 +543,9 @@
       }
     },
     "node_modules/@jambonz/realtimedb-helpers": {
-      "version": "0.4.32",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.32.tgz",
-      "integrity": "sha512-m08rqFEg6I43JVwjiyt0ahvljxJ3YvL3xsKHMoSJw48hdy/8V4w9ovYnUNaZGhaerhJVw36fCfTk4YNlByTnVw==",
+      "version": "0.4.29",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.29.tgz",
+      "integrity": "sha512-M31DIbd/QN5IP2727CbEt4C3WvYDHP+X/REepy1bCBnlIyN87fmA32Mjcedxh+5GY/RvtA2iod7EbzJq1LWbNA==",
       "dependencies": {
         "@google-cloud/text-to-speech": "^3.4.0",
         "@jambonz/promisify-redis": "^0.0.6",
@@ -566,9 +566,9 @@
       }
     },
     "node_modules/@jambonz/time-series": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.1.tgz",
-      "integrity": "sha512-uAoeZ3ibS7kEOGdT+vaY8BB8hOV4q38eEaF+d5OvLQaHCrPonNiwB8tWhhXDwtYdDompfqVRUy/plNA9fyS7Vw==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.0.tgz",
+      "integrity": "sha512-yuZKZjSU0txB0YDHYuTF9JU5alysD33QbpkI+XxLiWD6Dn0RbGcO1LSDolCP94jDFxqPh3aJbI0/wDsTBYkpaA==",
       "dependencies": {
         "debug": "^4.3.1",
         "influx": "^5.9.3"
@@ -1992,9 +1992,9 @@
       }
     },
     "node_modules/drachtio-fsmrf": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.3.tgz",
-      "integrity": "sha512-RJpGS+lX3Cmqd725zJGf1KvONH38/9YDHkPxXevmiVBp+iD/EbRps/ze5wpE0MKbjEA93DOmiXGTWqsOChWttw==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.2.tgz",
+      "integrity": "sha512-Daub8hXFVNr8OTc7HnkdusNFjpgBavLYr+0TVTu9q5eemum7lgmnrCY3qKfSnPDEb24TpLbZarFa4NWPFYoqNQ==",
       "dependencies": {
         "camel-case": "^4.1.2",
         "debug": "^2.6.9",
@@ -3614,6 +3614,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-ssh": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
+      "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
+      "dependencies": {
+        "protocols": "^2.0.1"
+      }
+    },
     "node_modules/is-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
@@ -4428,6 +4436,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/nyc": {
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
@@ -4653,19 +4672,22 @@
       }
     },
     "node_modules/parse-path": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
-      "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz",
+      "integrity": "sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==",
       "dependencies": {
         "protocols": "^2.0.0"
       }
     },
     "node_modules/parse-url": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
-      "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz",
+      "integrity": "sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==",
       "dependencies": {
-        "parse-path": "^7.0.0"
+        "is-ssh": "^1.4.0",
+        "normalize-url": "^6.1.0",
+        "parse-path": "^5.0.0",
+        "protocols": "^2.0.1"
       }
     },
     "node_modules/parseurl": {
@@ -5971,12 +5993,12 @@
       }
     },
     "node_modules/verify-aws-sns-signature": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/verify-aws-sns-signature/-/verify-aws-sns-signature-0.1.0.tgz",
-      "integrity": "sha512-giPj4dIrhounlQA+AAy0CZmqARrT2o4WjIcv1GKcnQiKBDmDpJyGIaHu/ESwOGVcZf68aLHFPrEzhudXSp4Krw==",
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/verify-aws-sns-signature/-/verify-aws-sns-signature-0.0.7.tgz",
+      "integrity": "sha512-j/yePIQvLqRGshOwuEs9VT7jGh++1hBoOjjt+Rl4aAffJTu+22GwTPfAD9fLY9VqRrR4Cuiid3eNHOkmxE3TNg==",
       "dependencies": {
         "bent": "^7.3.12",
-        "parse-url": "^8.1.0"
+        "parse-url": "^7.0.2"
       }
     },
     "node_modules/verror": {
@@ -6669,9 +6691,9 @@
       }
     },
     "@jambonz/realtimedb-helpers": {
-      "version": "0.4.32",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.32.tgz",
-      "integrity": "sha512-m08rqFEg6I43JVwjiyt0ahvljxJ3YvL3xsKHMoSJw48hdy/8V4w9ovYnUNaZGhaerhJVw36fCfTk4YNlByTnVw==",
+      "version": "0.4.29",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.29.tgz",
+      "integrity": "sha512-M31DIbd/QN5IP2727CbEt4C3WvYDHP+X/REepy1bCBnlIyN87fmA32Mjcedxh+5GY/RvtA2iod7EbzJq1LWbNA==",
       "requires": {
         "@google-cloud/text-to-speech": "^3.4.0",
         "@jambonz/promisify-redis": "^0.0.6",
@@ -6692,9 +6714,9 @@
       }
     },
     "@jambonz/time-series": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.1.tgz",
-      "integrity": "sha512-uAoeZ3ibS7kEOGdT+vaY8BB8hOV4q38eEaF+d5OvLQaHCrPonNiwB8tWhhXDwtYdDompfqVRUy/plNA9fyS7Vw==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.0.tgz",
+      "integrity": "sha512-yuZKZjSU0txB0YDHYuTF9JU5alysD33QbpkI+XxLiWD6Dn0RbGcO1LSDolCP94jDFxqPh3aJbI0/wDsTBYkpaA==",
       "requires": {
         "debug": "^4.3.1",
         "influx": "^5.9.3"
@@ -7769,9 +7791,9 @@
       }
     },
     "drachtio-fsmrf": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.3.tgz",
-      "integrity": "sha512-RJpGS+lX3Cmqd725zJGf1KvONH38/9YDHkPxXevmiVBp+iD/EbRps/ze5wpE0MKbjEA93DOmiXGTWqsOChWttw==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.2.tgz",
+      "integrity": "sha512-Daub8hXFVNr8OTc7HnkdusNFjpgBavLYr+0TVTu9q5eemum7lgmnrCY3qKfSnPDEb24TpLbZarFa4NWPFYoqNQ==",
       "requires": {
         "camel-case": "^4.1.2",
         "debug": "^2.6.9",
@@ -9008,6 +9030,14 @@
         "call-bind": "^1.0.2"
       }
     },
+    "is-ssh": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz",
+      "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
+      "requires": {
+        "protocols": "^2.0.1"
+      }
+    },
     "is-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
@@ -9635,6 +9665,11 @@
         "process-on-spawn": "^1.0.0"
       }
     },
+    "normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
+    },
     "nyc": {
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
@@ -9803,19 +9838,22 @@
       }
     },
     "parse-path": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-7.0.0.tgz",
-      "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz",
+      "integrity": "sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A==",
       "requires": {
         "protocols": "^2.0.0"
       }
     },
     "parse-url": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-8.1.0.tgz",
-      "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz",
+      "integrity": "sha512-PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg==",
       "requires": {
-        "parse-path": "^7.0.0"
+        "is-ssh": "^1.4.0",
+        "normalize-url": "^6.1.0",
+        "parse-path": "^5.0.0",
+        "protocols": "^2.0.1"
       }
     },
     "parseurl": {
@@ -10831,12 +10869,12 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "verify-aws-sns-signature": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/verify-aws-sns-signature/-/verify-aws-sns-signature-0.1.0.tgz",
-      "integrity": "sha512-giPj4dIrhounlQA+AAy0CZmqARrT2o4WjIcv1GKcnQiKBDmDpJyGIaHu/ESwOGVcZf68aLHFPrEzhudXSp4Krw==",
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/verify-aws-sns-signature/-/verify-aws-sns-signature-0.0.7.tgz",
+      "integrity": "sha512-j/yePIQvLqRGshOwuEs9VT7jGh++1hBoOjjt+Rl4aAffJTu+22GwTPfAD9fLY9VqRrR4Cuiid3eNHOkmxE3TNg==",
       "requires": {
         "bent": "^7.3.12",
-        "parse-url": "^8.1.0"
+        "parse-url": "^7.0.2"
       }
     },
     "verror": {

package.json

@@ -16,7 +16,9 @@
     "type": "git",
     "url": "https://github.com/jambonz/jambonz-feature-server.git"
   },
-  "bugs": {},
+  "bugs": {
+    "url": "https://github.com/jambonz/jambonz-feature-server/issues"
+  },
   "scripts": {
     "start": "node app",
     "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=1 DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:ClueCon:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ",
@@ -26,9 +28,9 @@
   "dependencies": {
     "@jambonz/db-helpers": "^0.6.18",
     "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.4.32",
+    "@jambonz/realtimedb-helpers": "^0.4.29",
     "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.2.1",
+    "@jambonz/time-series": "^0.2.0",
     "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/exporter-jaeger": "^1.3.1",
     "@opentelemetry/exporter-trace-otlp-http": "^0.27.0",
@@ -42,20 +44,20 @@
     "bent": "^7.3.12",
     "debug": "^4.3.4",
     "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.3",
+    "drachtio-fsmrf": "^3.0.2",
     "drachtio-srf": "^4.5.1",
     "express": "^4.18.1",
     "helmet": "^5.1.0",
     "ip": "^1.1.8",
     "moment": "^2.29.4",
-    "parse-url": "^8.1.0",
+    "parse-url": "^7.0.2",
     "pino": "^6.14.0",
     "sdp-transform": "^2.14.1",
     "short-uuid": "^4.2.0",
     "to-snake-case": "^1.0.0",
     "undici": "^5.8.2",
     "uuid": "^8.3.2",
-    "verify-aws-sns-signature": "^0.1.0",
+    "verify-aws-sns-signature": "^0.0.7",
     "ws": "^8.8.0",
     "xml2js": "^0.4.23"
   },

test/play-tests.js

@@ -156,43 +156,3 @@ test('\'play\' tests multi links in array in conference', async(t) => {
     t.error(err);
   }
 });
-
-test('\'play\' tests with seekOffset and actionHook', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'play',
-        url: 'silence_stream://5000',
-        seekOffset: 8000,
-        timeoutSecs: 2,
-        actionHook: '/customHook'
-      }
-    ];
-
-    const waitHookVerbs = [];
-
-    const from = 'play_action_hook';
-    provisionCallHook(from, verbs)
-    provisionCustomHook(from, waitHookVerbs)
-
-    // THEN
-    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
-    t.pass('play: succeeds');
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_customHook`)
-    t.ok(obj.body.reason === "playCompleted", "play: actionHook success received")
-    t.ok(obj.body.playback_seconds === "2", "playback_seconds: actionHook success received")
-    t.ok(obj.body.playback_milliseconds === "2048", "playback_milliseconds: actionHook success received")
-    t.ok(obj.body.playback_last_offset_pos === "16000", "playback_last_offset_pos: actionHook success received")
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});