Merge branch 'main' into feat/fd_1903

* add statusHook to redirect

* fix url import

* Update redirect.js

* logging

* constructor statusHook

* lint n logging

* debug

* update call_status_hook

* use notifier to test url

* remove require url as its global since node 10

* update verb specs dep

* update verb specs

lib/tasks/llm/llms/google_s2s.js

@@ -36,6 +36,9 @@ class TaskLlmGoogle_S2S extends Task {
     this.model = this.parent.model || 'models/gemini-2.0-flash-live-001';
     this.auth = this.parent.auth;
     this.connectionOptions = this.parent.connectOptions;
+    const {host, version} = this.connectionOptions || {};
+    this.host = host;
+    this.version = version;
 
     const {apiKey} = this.auth || {};
     if (!apiKey) throw new Error('auth.apiKey is required for Google S2S');
@@ -46,7 +49,7 @@ class TaskLlmGoogle_S2S extends Task {
     this.eventHook = this.data.eventHook;
     this.toolHook = this.data.toolHook;
 
-    const {setup} = this.data.llmOptions;
+    const {setup, sessionResumption} = this.data.llmOptions;
 
     if (typeof setup !== 'object') {
       throw new Error('llmOptions with an initial setup is required for Google S2S');
@@ -54,6 +57,7 @@ class TaskLlmGoogle_S2S extends Task {
     this.setup = {
       ...setup,
       model: this.model,
+      ...(sessionResumption && {sessionResumption}),
       // make sure output is always audio
       generationConfig: {
         ...(setup.generationConfig || {}),
@@ -138,6 +142,10 @@ class TaskLlmGoogle_S2S extends Task {
 
     try {
       const args = [ep.uuid, 'session.create', this.apiKey];
+      if (this.host) {
+        args.push(this.host);
+        if (this.version) args.push(this.version);
+      }
       await this._api(ep, args);
     } catch (err) {
       this.logger.error({err}, 'TaskLlmGoogle_S2S:_startListening');

lib/tasks/redirect.js

@@ -1,7 +1,6 @@
 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');
 
 /**
@@ -10,6 +9,7 @@ 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,6 +47,30 @@ 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/utils/action-hook-delay.js

@@ -118,6 +118,13 @@ 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];
 
@@ -129,8 +136,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-lock.json

@@ -18,7 +18,7 @@
         "@jambonz/speech-utils": "^0.2.26",
         "@jambonz/stats-collector": "^0.1.10",
         "@jambonz/time-series": "^0.2.15",
-        "@jambonz/verb-specifications": "^0.0.123",
+        "@jambonz/verb-specifications": "^0.0.125",
         "@modelcontextprotocol/sdk": "^1.9.0",
         "@opentelemetry/api": "^1.8.0",
         "@opentelemetry/exporter-jaeger": "^1.23.0",
@@ -1529,9 +1529,9 @@
       }
     },
     "node_modules/@jambonz/verb-specifications": {
-      "version": "0.0.123",
-      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.123.tgz",
-      "integrity": "sha512-yPW8u0Wacz8FKnQpQDjJ2AQHjHTf4S3TlkTyKqFkOyY8lnjnhqg0Mth+9uvOPfJaHgsPd0t9outfQa0wCu5tww==",
+      "version": "0.0.125",
+      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.125.tgz",
+      "integrity": "sha512-lU1fyyYyjXOdIfQ2gmOFmssZASYNu6LD066iXjqFrBJpiI7shkprcZ1qeWGibuEk9nR2k+em3/YL31Wc8L4wvA==",
       "license": "MIT",
       "dependencies": {
         "debug": "^4.3.4",

package.json

@@ -34,7 +34,7 @@
     "@jambonz/speech-utils": "^0.2.26",
     "@jambonz/stats-collector": "^0.1.10",
     "@jambonz/time-series": "^0.2.15",
-    "@jambonz/verb-specifications": "^0.0.123",
+    "@jambonz/verb-specifications": "^0.0.125",
     "@modelcontextprotocol/sdk": "^1.9.0",
     "@opentelemetry/api": "^1.8.0",
     "@opentelemetry/exporter-jaeger": "^1.23.0",