Merge branch 'main' into fix/fd_1738_02

2026-03-21 18:57:53 +00:00 · 2026-01-09 08:17:36 +07:00
parent 58cb19dcde e4ec0025c3
commit fe845604b1
12 changed files with 171 additions and 120 deletions
--- a/lib/session/call-info.js
+++ b/lib/session/call-info.js
@@ -12,6 +12,7 @@ class CallInfo {
    let srf;
    this.direction = opts.direction;
    this.traceId = opts.traceId;
+    this.hasRecording = false;
    this.callTerminationBy = undefined;
    if (opts.req) {
      const u = opts.req.getParsedHeader('from');
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -756,69 +756,101 @@ class CallSession extends Emitter {
    return this._fillerNoise;
  }

-  async pauseOrResumeBackgroundListenIfRequired(action, silence = false) {
-    if ((action == 'pauseCallRecording' || action == 'resumeCallRecording') &&
-    this.backgroundTaskManager.isTaskRunning('record')) {
-      this.logger.debug({action, silence}, 'CallSession:pauseOrResumeBackgroundListenIfRequired');
-      const backgroundListenTask = this.backgroundTaskManager.getTask('record');
-      const status = action === 'pauseCallRecording' ? ListenStatus.Pause : ListenStatus.Resume;
-      backgroundListenTask.updateListen(
-        status,
-        silence
-      );
-    }
-  }

  async notifyRecordOptions(opts) {
-    const {action, silence} = opts;
+    const {action, silence = false, type = 'siprec'} = opts;
    this.logger.debug({opts}, 'CallSession:notifyRecordOptions');

-    this.pauseOrResumeBackgroundListenIfRequired(action, silence);
-
-    /* if we have not answered yet, just save the details for later */
-    if (!this.dlg) {
-      if (action === 'startCallRecording') {
-        this.recordOptions = opts;
-        return true;
+    if (type == 'cloud') {
+      switch (action) {
+        case 'pauseCallRecording':
+          if (this.backgroundTaskManager.isTaskRunning('record')) {
+            this.logger.debug({action, silence, type}, 'CallSession:cloudRecording');
+            const backgroundListenTask = this.backgroundTaskManager.getTask('record');
+            backgroundListenTask.updateListen(
+              ListenStatus.Pause,
+              silence
+            );
+            return true;
+          } else { return false; }
+        case 'resumeCallRecording':
+          if (this.backgroundTaskManager.isTaskRunning('record')) {
+            this.logger.debug({action, silence, type}, 'CallSession:cloudRecording');
+            const backgroundListenTask = this.backgroundTaskManager.getTask('record');
+            backgroundListenTask.updateListen(
+              ListenStatus.Resume,
+              silence
+            );
+            return true;
+          } else { return false; }
+        case 'startCallRecording':
+          if (!this.backgroundTaskManager.isTaskRunning('record')) {
+            this.logger.debug({action, silence, type}, 'CallSession:cloudRecording');
+            this.callInfo.hasRecording = true;
+            this.updateCallStatus(Object.assign({}, this.callInfo.toJSON()), this.serviceUrl)
+              .catch((err) => this.logger.error(err, 'redis error'));
+            if (!this.dlg) {
+              // Call not yet answered so set flag to record on status change
+              this.application.record_all_calls = true;
+            } else {
+              this.backgroundTaskManager.newTask('record');
+            }
+            return true;
+          } else { return false; }
+        case 'stopCallRecording':
+          if (this.backgroundTaskManager.isTaskRunning('record')) {
+            this.logger.debug({action, silence, type}, 'CallSession:cloudRecording');
+            this.backgroundTaskManager.stop('record');
+            return true;
+          } else { return false; }
+      }
+    } else {
+      // SIPREC
+      /* if we have not answered yet, just save the details for later */
+      if (!this.dlg) {
+        if (action === 'startCallRecording') {
+          this.recordOptions = opts;
+          return true;
+        }
+        return false;
      }
-      return false;
-    }

-    /* check validity of request */
-    if (action == 'startCallRecording' && this.recordState !== RecordState.RecordingOff) {
-      this.logger.info({recordState: this.recordState},
-        'CallSession:notifyRecordOptions: recording is already started, ignoring request');
-      return false;
-    }
-    if (action == 'stopCallRecording' && this.recordState === RecordState.RecordingOff) {
-      this.logger.info({recordState: this.recordState},
-        'CallSession:notifyRecordOptions: recording is already stopped, ignoring request');
-      return false;
-    }
-    if (action == 'pauseCallRecording' && this.recordState !== RecordState.RecordingOn) {
-      this.logger.info({recordState: this.recordState},
-        'CallSession:notifyRecordOptions: cannot pause recording, ignoring request ');
-      return false;
-    }
-    if (action == 'resumeCallRecording' && this.recordState !== RecordState.RecordingPaused) {
-      this.logger.info({recordState: this.recordState},
-        'CallSession:notifyRecordOptions: cannot resume recording, ignoring request ');
-      return false;
-    }
+      /* check validity of request */
+      if (action == 'startCallRecording' && this.recordState !== RecordState.RecordingOff) {
+        this.logger.info({recordState: this.recordState},
+          'CallSession:notifyRecordOptions: recording is already started, ignoring request');
+        return false;
+      }
+      if (action == 'stopCallRecording' && this.recordState === RecordState.RecordingOff) {
+        this.logger.info({recordState: this.recordState},
+          'CallSession:notifyRecordOptions: recording is already stopped, ignoring request');
+        return false;
+      }
+      if (action == 'pauseCallRecording' && this.recordState !== RecordState.RecordingOn) {
+        this.logger.info({recordState: this.recordState},
+          'CallSession:notifyRecordOptions: cannot pause recording, ignoring request ');
+        return false;
+      }
+      if (action == 'resumeCallRecording' && this.recordState !== RecordState.RecordingPaused) {
+        this.logger.info({recordState: this.recordState},
+          'CallSession:notifyRecordOptions: cannot resume recording, ignoring request ');
+        return false;
+      }

-    this.recordOptions = opts;
+      this.recordOptions = opts;

-    switch (action) {
-      case 'startCallRecording':
-        return await this.startRecording();
-      case 'stopCallRecording':
-        return await this.stopRecording();
-      case 'pauseCallRecording':
-        return await this.pauseRecording();
-      case 'resumeCallRecording':
-        return await this.resumeRecording();
-      default:
-        throw new Error(`invalid record action ${action}`);
+      switch (action) {
+        case 'startCallRecording':
+          return await this.startRecording();
+        case 'stopCallRecording':
+          return await this.stopRecording();
+        case 'pauseCallRecording':
+          return await this.pauseRecording();
+        case 'resumeCallRecording':
+          return await this.resumeRecording();
+        default:
+          throw new Error(`invalid record action ${action}`);
+      }
    }
  }

@@ -2980,8 +3012,7 @@ Duration=${duration} `

    // manage record all call.
    if (callStatus === CallStatus.InProgress) {
-      if (this.accountInfo.account.record_all_calls ||
-        this.application.record_all_calls) {
+      if (this.accountInfo.account.record_all_calls || this.application.record_all_calls) {
        this.backgroundTaskManager.newTask('record');
      }
    } else if (callStatus == CallStatus.Completed) {
--- a/lib/tasks/gather.js
+++ b/lib/tasks/gather.js
@@ -496,6 +496,10 @@ class TaskGather extends SttTask {
        this.addCustomEventListener(ep, GladiaTranscriptionEvents.ConnectFailure,
          this._onVendorConnectFailure.bind(this, cs, ep));
        this.addCustomEventListener(ep, GladiaTranscriptionEvents.Error, this._onVendorError.bind(this, cs, ep));
+        // gladia require unique url for each session
+        const {host, path} = await this.createGladiaLiveSession();
+        opts.GLADIA_SPEECH_HOST = host;
+        opts.GLADIA_SPEECH_PATH = path;
        break;

      case 'soniox':
--- a/lib/tasks/redirect.js
+++ b/lib/tasks/redirect.js
@@ -33,7 +33,7 @@ class TaskRedirect extends Task {
      }
      else {
        const baseUrl =  this.cs.application.requestor.baseUrl;
-        const newUrl = URL.parse(this.actionHook);
+        const newUrl = new URL(this.actionHook);
        const newBaseUrl = newUrl.protocol + '//' + newUrl.host;
        if (baseUrl != newBaseUrl) {
          try {
--- a/lib/tasks/stt-task.js
+++ b/lib/tasks/stt-task.js
@@ -203,26 +203,14 @@ class SttTask extends Task {
    if (cs.hasGlobalSttPunctuation && !this.data.recognizer.punctuation) {
      this.data.recognizer.punctuation = cs.globalSttPunctuation;
    }
-    if (this.vendor === 'gladia') {
-      const { api_key, region } = this.sttCredentials;
-      const {url} = await this.createGladiaLiveSession({
-        api_key, region,
-        model: this.data.recognizer.model || 'solaria-1',
-        options: this.data.recognizer.gladiaOptions || {}
-      });
-      const {host, pathname, search} = new URL(url);
-      this.sttCredentials.host = host;
-      this.sttCredentials.path = `${pathname}${search}`;
-    }
  }


-  async createGladiaLiveSession({
-    api_key,
-    region = 'us-west',
-    model = 'solaria-1',
-    options = {},
-  }) {
+  async createGladiaLiveSession() {
+    const { api_key, region = 'us-west' } = this.sttCredentials;
+    const model = this.data.recognizer.model || 'solaria-1';
+    const options = this.data.recognizer.gladiaOptions || {};
+
    const url = `https://api.gladia.io/v2/live?region=${region}`;
    const response = await fetch(url, {
      method: 'POST',
@@ -252,7 +240,9 @@ class SttTask extends Task {

    const data = await response.json();
    this.logger.debug({url: data.url}, 'Gladia Call registered');
-    return data;
+
+    const {host, pathname, search} = new URL(data.url);
+    return {host, path: `${pathname}${search}`};
  }

  addCustomEventListener(ep, event, handler) {
--- a/lib/tasks/transcribe.js
+++ b/lib/tasks/transcribe.js
@@ -459,6 +459,14 @@ class TaskTranscribe extends SttTask {
      else if (this.data.recognizer?.hints?.length > 0) {
        prompt = this.data.recognizer?.hints.join(', ');
      }
+    } else if (this.vendor === 'gladia') {
+      // gladia require unique url for each session
+      const {host, path} = await this.createGladiaLiveSession();
+      await ep.set({
+        GLADIA_SPEECH_HOST: host,
+        GLADIA_SPEECH_PATH: path,
+      })
+        .catch((err) => this.logger.info(err, 'Error setting channel variables'));
    }

    await ep.startTranscription({
--- a/lib/utils/amd-utils.js
+++ b/lib/utils/amd-utils.js
@@ -405,19 +405,21 @@ module.exports = (logger) => {
    if (ep.amd) {
      vendor = ep.amd.vendor;
      ep.amd.stopAllTimers();
-
-      ep.removeListener(GoogleTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(GoogleTranscriptionEvents.EndOfUtterance, ep.amd.EndOfUtteranceHandler);
-      ep.removeListener(AwsTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(AzureTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(AzureTranscriptionEvents.NoSpeechDetected, ep.amd.noSpeechHandler);
-      ep.removeListener(NuanceTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(DeepgramTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(SonioxTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(IbmTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(NvidiaTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(JambonzTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-
+      try {
+        ep.removeListener(GoogleTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+        ep.removeListener(GoogleTranscriptionEvents.EndOfUtterance, ep.amd.EndOfUtteranceHandler);
+        ep.removeListener(AwsTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+        ep.removeListener(AzureTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+        ep.removeListener(AzureTranscriptionEvents.NoSpeechDetected, ep.amd.noSpeechHandler);
+        ep.removeListener(NuanceTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+        ep.removeListener(DeepgramTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+        ep.removeListener(SonioxTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+        ep.removeListener(IbmTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+        ep.removeListener(NvidiaTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+        ep.removeListener(JambonzTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      } catch (error) {
+        logger.error('Unable to Remove AMD Listener', error);
+      }
      ep.amd = null;
    }

--- a/lib/utils/background-task-manager.js
+++ b/lib/utils/background-task-manager.js
@@ -135,26 +135,24 @@ class BackgroundTaskManager extends Emitter {

  // Initiate Record
  async _initRecord() {
-    if (this.cs.accountInfo.account.record_all_calls || this.cs.application.record_all_calls) {
-      if (!JAMBONZ_RECORD_WS_BASE_URL || !this.cs.accountInfo.account.bucket_credential) {
-        this.logger.error('_initRecord: invalid cfg - missing JAMBONZ_RECORD_WS_BASE_URL or bucket config');
-        return undefined;
-      }
-      const listenOpts = {
-        url: `${JAMBONZ_RECORD_WS_BASE_URL}/record/${this.cs.accountInfo.account.bucket_credential.vendor}`,
-        disableBidirectionalAudio: true,
-        mixType : 'stereo',
-        passDtmf: true
-      };
-      if (JAMBONZ_RECORD_WS_USERNAME && JAMBONZ_RECORD_WS_PASSWORD) {
-        listenOpts.wsAuth = {
-          username: JAMBONZ_RECORD_WS_USERNAME,
-          password: JAMBONZ_RECORD_WS_PASSWORD
-        };
-      }
-      this.logger.debug({listenOpts}, '_initRecord: enabling listen');
-      return await this._initListen({verb: 'listen', ...listenOpts}, 'jambonz-session-record', true, 'record');
+    if (!JAMBONZ_RECORD_WS_BASE_URL || !this.cs.accountInfo.account.bucket_credential) {
+      this.logger.error('_initRecord: invalid cfg - missing JAMBONZ_RECORD_WS_BASE_URL or bucket config');
+      return undefined;
    }
+    const listenOpts = {
+      url: `${JAMBONZ_RECORD_WS_BASE_URL}/record/${this.cs.accountInfo.account.bucket_credential.vendor}`,
+      disableBidirectionalAudio: true,
+      mixType : 'stereo',
+      passDtmf: true
+    };
+    if (JAMBONZ_RECORD_WS_USERNAME && JAMBONZ_RECORD_WS_PASSWORD) {
+      listenOpts.wsAuth = {
+        username: JAMBONZ_RECORD_WS_USERNAME,
+        password: JAMBONZ_RECORD_WS_PASSWORD
+      };
+    }
+    this.logger.debug({listenOpts}, '_initRecord: enabling listen');
+    return await this._initListen({verb: 'listen', ...listenOpts}, 'jambonz-session-record', true, 'record');
  }

  // Initiate Transcribe
--- a/lib/utils/sbc-pinger.js
+++ b/lib/utils/sbc-pinger.js
@@ -100,6 +100,30 @@ module.exports = (logger) => {
  else if (K8S) {
    lifecycleEmitter.scaleIn = () => process.exit(0);
  }
+  else {
+    process.on('SIGUSR1', () => {
+      logger.info('received SIGUSR1: begin drying up calls for scale-in');
+      dryUpCalls = true;
+
+      const {srf} = require('../..');
+      const {writeSystemAlerts} = srf.locals;
+      if (writeSystemAlerts) {
+        const {SystemState, FEATURE_SERVER} = require('./constants');
+        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);
+
+      // Note: in response to SIGUSR1 we start drying up but do not exit when calls reach zero.
+      // This is to allow external scripts that sent the signal to manage the lifecycle.
+    });
+  }


  async function pingProxies(srf) {
--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -1085,13 +1085,6 @@ module.exports = (logger) => {
        ...(keyterms && keyterms.length > 0 && {DEEPGRAMFLUX_SPEECH_KEYTERMS: keyterms.join(',')}),
      };
    }
-    else if ('gladia' === vendor) {
-      const {host, path} = sttCredentials;
-      opts = {
-        GLADIA_SPEECH_HOST: host,
-        GLADIA_SPEECH_PATH: path,
-      };
-    }
    else if ('soniox' === vendor) {
      const {sonioxOptions = {}} = rOpts;
      const {storage = {}} = sonioxOptions;
--- a/package-lock.json
+++ b/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.122",
+        "@jambonz/verb-specifications": "^0.0.123",
        "@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.122",
-      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.122.tgz",
-      "integrity": "sha512-7xqaULhKFywJ2ZuyiYt77iiJwJ+8b98Zt1X4+OqZ7Cdjhfo7S6KnR66XRVJHnekXbmfVv58kB0KWUux5TG//Sw==",
+      "version": "0.0.123",
+      "resolved": "https://registry.npmjs.org/@jambonz/verb-specifications/-/verb-specifications-0.0.123.tgz",
+      "integrity": "sha512-yPW8u0Wacz8FKnQpQDjJ2AQHjHTf4S3TlkTyKqFkOyY8lnjnhqg0Mth+9uvOPfJaHgsPd0t9outfQa0wCu5tww==",
      "license": "MIT",
      "dependencies": {
        "debug": "^4.3.4",
--- a/package.json
+++ b/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.122",
+    "@jambonz/verb-specifications": "^0.0.123",
    "@modelcontextprotocol/sdk": "^1.9.0",
    "@opentelemetry/api": "^1.8.0",
    "@opentelemetry/exporter-jaeger": "^1.23.0",