feat moh (#423)

* feat moh * feat moh * fix typo * fix typo * fix * fix * wip * wip * wip * wip * wip * wip * wip * wip * wip * git commit -a -m wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * fix * fix * fix * fix * wip * rebase * fix * fix
2025-12-20 16:50:39 +00:00 · 2023-08-22 19:09:18 +07:00
parent 32dcb2adfa
commit 6f0dbef433
5 changed files with 157 additions and 18 deletions
--- a/lib/tasks/config.js
+++ b/lib/tasks/config.js
@@ -40,6 +40,8 @@ class TaskConfig extends Task {
    this.preconditions = (this.bargeIn.enable || this.record?.action || this.listen?.url || this.data.amd) ?
      TaskPreconditions.Endpoint :
      TaskPreconditions.None;
+
+    this.onHoldMusic = this.data.onHoldMusic;
  }

  get name() { return TaskName.Config; }
@@ -72,6 +74,7 @@ class TaskConfig extends Task {
    }
    if (this.data.amd) phrase.push('enable amd');
    if (this.notifyEvents) phrase.push(`event notification ${this.notifyEvents ? 'on' : 'off'}`);
+    if (this.onHoldMusic) phrase.push(`onHoldMusic: ${this.onHoldMusic}`);
    return `${this.name}{${phrase.join(',')}}`;
  }

@@ -83,6 +86,10 @@ class TaskConfig extends Task {
      cs.notifyEvents = !!this.data.notifyEvents;
    }

+    if (this.onHoldMusic) {
+      cs.onHoldMusic = this.onHoldMusic;
+    }
+
    if (this.data.amd) {
      this.startAmd = cs.startAmd;
      this.stopAmd = cs.stopAmd;
--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -12,10 +12,13 @@ const assert = require('assert');
 const placeCall = require('../utils/place-outdial');
 const sessionTracker = require('../session/session-tracker');
 const DtmfCollector = require('../utils/dtmf-collector');
+const ConfirmCallSession = require('../session/confirm-call-session');
 const dbUtils = require('../utils/db-utils');
 const debug = require('debug')('jambonz:feature-server');
 const {parseUri} = require('drachtio-srf');
 const {ANCHOR_MEDIA_ALWAYS} = require('../config');
+const { isOnhold } = require('../utils/sdp-utils');
+const { normalizeJambones } = require('@jambonz/verb-specifications');

 function parseDtmfOptions(logger, dtmfCapture) {
  let parentDtmfCollector, childDtmfCollector;
@@ -135,6 +138,10 @@ class TaskDial extends Task {

  get name() { return TaskName.Dial; }

+  get isOnHold() {
+    return this.isIncomingLegHold || this.isOutgoingLegHold;
+  }
+
  get canReleaseMedia() {
    const keepAnchor = this.data.anchorMedia ||
    this.cs.isBackGroundListen ||
@@ -507,7 +514,8 @@ class TaskDial extends Task {
          callInfo: cs.callInfo,
          accountInfo: cs.accountInfo,
          rootSpan: cs.rootSpan,
-          startSpan: this.startSpan.bind(this)
+          startSpan: this.startSpan.bind(this),
+          dialTask: this
        });
        this.dials.set(sd.callSid, sd);

@@ -576,11 +584,7 @@ class TaskDial extends Task {
            }
          })
          .on('reinvite', (req, res) => {
-            try {
-              cs.handleReinviteAfterMediaReleased(req, res);
-            } catch (err) {
-              this.logger.error(err, 'Error in dial einvite from B leg');
-            }
+            this._onReinvite(req, res);
          })
          .on('refer', (callInfo, req, res) => {

@@ -616,6 +620,35 @@ class TaskDial extends Task {
    this._killOutdials();       // NB: order is important
  }

+  async _onReinvite(req, res) {
+    try {
+      let isHandled = false;
+      if (this.cs.onHoldMusic) {
+        if (isOnhold(req.body) && !this.epOther && !this.ep) {
+          await this.cs.handleReinviteAfterMediaReleased(req, res);
+          // Onhold but media is already released
+          // reconnect A Leg and Response B leg
+          await this.reAnchorMedia(this.cs, this.sd);
+          this.isOutgoingLegHold = true;
+          isHandled = true;
+          this._onHoldHook();
+        } else if (!isOnhold(req.body) && this.epOther && this.ep && this.isOutgoingLegHold && this.canReleaseMedia) {
+          // 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);
+          isHandled = true;
+          this.isOutgoingLegHold = false;
+        }
+      }
+      if (!isHandled) {
+        this.cs.handleReinviteAfterMediaReleased(req, res);
+      }
+    } catch (err) {
+      this.logger.error(err, 'Error in dial einvite from B leg');
+    }
+  }
+
  _onMaxCallDuration(cs) {
    this.logger.info(`Dial:_onMaxCallDuration tearing down call as it has reached ${this.timeLimit}s`);
    this.ep && this.ep.unbridge();
@@ -720,9 +753,29 @@ class TaskDial extends Task {
  }

  async handleReinviteAfterMediaReleased(req, res) {
-    const sdp = await this.dlg.modify(req.body);
-    this.logger.info({sdp}, 'Dial:handleReinviteAfterMediaReleased - sent reinvite to B leg');
-    res.send(200, {body: sdp});
+    let isHandled = false;
+    if (isOnhold(req.body) && !this.epOther && !this.ep) {
+      const sdp = await this.dlg.modify(req.body);
+      res.send(200, {body: sdp});
+      // Onhold but media is already released
+      await this.reAnchorMedia(this.cs, this.sd);
+      isHandled = true;
+      this.isIncomingLegHold = true;
+      this._onHoldHook();
+    } else if (!isOnhold(req.body) && 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);
+      isHandled = true;
+      this.isIncomingLegHold = false;
+    }
+
+    if (!isHandled) {
+      const sdp = await this.dlg.modify(req.body);
+      this.logger.info({sdp}, 'Dial:handleReinviteAfterMediaReleased - sent reinvite to B leg');
+      res.send(200, {body: sdp});
+    }
  }

  _onAmdEvent(cs, evt) {
@@ -733,6 +786,48 @@ class TaskDial extends Task {
        this.logger.error({err}, 'Dial:_onAmdEvent - error calling actionHook');
      });
  }
+
+  async _onHoldHook(allowed = [TaskName.Play, TaskName.Say, TaskName.Pause]) {
+    if (this.data.onHoldHook) {
+      // send silence for keep Voice quality
+      await this.epOther.play('silence_stream://500');
+      let allowedTasks;
+      do {
+        try {
+          const b3 = this.getTracingPropagation();
+          const httpHeaders = b3 && {b3};
+          const json = await this.cs.application.requestor.
+            request('verb:hook', this.data.onHoldHook, this.cs.callInfo.toJSON(), httpHeaders);
+          const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
+          allowedTasks = tasks.filter((t) => allowed.includes(t.name));
+          if (tasks.length !== allowedTasks.length) {
+            this.logger.debug({tasks, allowedTasks}, 'unsupported task');
+            throw new Error(`unsupported verb in enqueue waitHook: only ${JSON.stringify(allowed)}`);
+          }
+          this.logger.debug(`DialTask:_onHoldHook: executing ${tasks.length} tasks`);
+          if (tasks.length) {
+            this._playSession = new ConfirmCallSession({
+              logger: this.logger,
+              application: this.cs.application,
+              dlg: this.isIncomingLegHold ? this.dlg : this.cs.dlg,
+              ep: this.isIncomingLegHold ? this.ep : this.cs.ep,
+              callInfo: this.cs.callInfo,
+              accountInfo: this.cs.accountInfo,
+              tasks,
+              rootSpan: this.cs.rootSpan
+            });
+            await this._playSession.exec();
+            this._playSession = null;
+          }
+        } catch (error) {
+          this.logger.info(error, 'DialTask:_onHoldHook: failed retrieving waitHook');
+          this._playSession = null;
+          break;
+        }
+      } while (allowedTasks && allowedTasks.length > 0 && !this.killed && this.isOnHold);
+      this.logger.info('Finish onHoldHook');
+    }
+  }
 }

 module.exports = TaskDial;