refactor

lib/session/call-session.js

@@ -1082,7 +1082,7 @@ class CallSession extends Emitter {
             const cred = JSON.parse(credential.service_key.replace(/\n/g, '\\n'));
             return {
               speech_credential_sid: credential.speech_credential_sid,
-              credentials: cred,
+              credentials: cred
             };
           } catch (err) {
             const sid = this.accountInfo.account.account_sid;
@@ -2727,8 +2727,12 @@ Duration=${duration} `
       tidyUp();
     }
     else {
-      this.logger.debug('CallSession:propagateAnswer - call already answered - re-anchor media with a reinvite');
-      await this.dlg.modify(this.ep.local.sdp);
+      if (this.currentTask?.name === TaskName.Dial && !this.currentTask.canReleaseMedia) {
+        this.logger.debug('CallSession:propagateAnswer - call already answered and anchored');
+      } else {
+        this.logger.debug('CallSession:propagateAnswer - call already answered - re-anchor media with a reinvite');
+        await this.dlg.modify(this.ep.local.sdp);
+      }
     }
   }
 

lib/tasks/redirect.js

@@ -1,6 +1,7 @@
 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');
 
 /**
@@ -9,7 +10,6 @@ const HttpRequestor = require('../utils/http-requestor');
 class TaskRedirect extends Task {
   constructor(logger, opts) {
     super(logger, opts);
-    this.statusHook = opts.statusHook || false;
   }
 
   get name() { return TaskName.Redirect; }
@@ -47,30 +47,6 @@ class TaskRedirect extends Task {
         }
       }
     }
-
-    /* update the notifier if a new statusHook was provided */
-    if (this.statusHook) {
-      this.logger.info(`TaskRedirect updating statusHook to ${this.statusHook}`);
-      try {
-        const oldNotifier = cs.application.notifier;
-        const isStatusHookAbsolute = cs.notifier?._isAbsoluteUrl(this.statusHook);
-        if (isStatusHookAbsolute) {
-          if (cs.notifier instanceof WsRequestor) {
-            cs.application.notifier = new WsRequestor(this.logger, cs.accountSid, {url: this.statusHook},
-              cs.accountInfo.account.webhook_secret);
-          } else {
-            cs.application.notifier = new HttpRequestor(this.logger, cs.accountSid, {url: this.statusHook},
-              cs.accountInfo.account.webhook_secret);
-          }
-          if (oldNotifier?.close) oldNotifier.close();
-        }
-        /* update the call_status_hook URL that gets passed to the notifier */
-        cs.application.call_status_hook = this.statusHook;
-      } catch (err) {
-        this.logger.info(err, `TaskRedirect error updating statusHook to ${this.statusHook}`);
-      }
-    }
-
     await this.performAction();
   }
 }

lib/tasks/tts-task.js

@@ -31,9 +31,8 @@ class TtsTask extends Task {
     this.synthesizer = this.data.synthesizer || {};
     this.disableTtsCache = this.data.disableTtsCache;
     this.options = this.synthesizer.options || {};
-    this.instructions = this.data.instructions || this.options.instructions;
+    this.instructions = this.data.instructions;
     this.playbackIds = [];
-    this.useGeminiTts = this.options.useGeminiTts;
   }
 
   getPlaybackId(offset) {
@@ -243,8 +242,6 @@ class TtsTask extends Task {
       }
     } else if (vendor === 'cartesia') {
       credentials.model_id = this.options.model_id || credentials.model_id;
-    } else if (vendor === 'google') {
-      this.model = this.options.model || credentials.credentials.model_id;
     }
 
     this.model_id = credentials.model_id;

lib/utils/action-hook-delay.js

@@ -118,13 +118,6 @@ class ActionHookDelayProcessor extends Emitter {
     this.logger.debug('ActionHookDelayProcessor#_onNoResponseTimer');
     this._noResponseTimer = null;
 
-    /* check if endpoint is still available (call may have ended) */
-    if (!this.ep) {
-      this.logger.debug('ActionHookDelayProcessor#_onNoResponseTimer: endpoint is null, call may have ended');
-      this._active = false;
-      return;
-    }
-
     /* get the next play or say action */
     const verb = this.actions[this._retryCount % this.actions.length];
 
@@ -136,8 +129,8 @@ class ActionHookDelayProcessor extends Emitter {
       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.ep.removeAllListeners('playback-start');
+        this.ep.removeAllListeners('playback-stop');
       });
     } catch (err) {
       this.logger.info(err, 'ActionHookDelayProcessor#_onNoResponseTimer: error starting action');

package.json

@@ -31,10 +31,10 @@
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/mw-registrar": "^0.2.7",
     "@jambonz/realtimedb-helpers": "^0.8.15",
-    "@jambonz/speech-utils": "^0.2.30",
+    "@jambonz/speech-utils": "^0.2.26",
     "@jambonz/stats-collector": "^0.1.10",
     "@jambonz/time-series": "^0.2.15",
-    "@jambonz/verb-specifications": "^0.0.125",
+    "@jambonz/verb-specifications": "^0.0.123",
     "@modelcontextprotocol/sdk": "^1.9.0",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-jaeger": "^1.23.0",
@@ -58,7 +58,7 @@
     "polly-ssml-split": "^0.1.0",
     "sdp-transform": "^2.15.0",
     "short-uuid": "^5.1.0",
-    "sinon": "^21.0.1",
+    "sinon": "^17.0.1",
     "to-snake-case": "^1.0.0",
     "undici": "^7.5.0",
     "verify-aws-sns-signature": "^0.1.0",