rasa: add support for eventhook which provides user and bot messages in realtime and supports redirecting to a new app

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

@@ -57,11 +57,6 @@ router.post('/', async(req, res) => {
       case 'user':
         uri = `sip:${target.name}`;
         to = target.name;
-        if (target.overrideTo) {
-          Object.assign(opts.headers, {
-            'X-Override-To': target.overrideTo
-          });
-        }
         break;
       case 'sip':
         uri = target.sipUri;
@@ -110,11 +105,8 @@ router.post('/', async(req, res) => {
 
     /* now launch the outdial */
     try {
-      const dlg = await srf.createUAC(uri, {...opts,  followRedirects: true, keepUriOnRedirect: true}, {
+      const dlg = await srf.createUAC(uri, opts, {
         cbRequest: (err, inviteReq) => {
-          /* in case of 302 redirect, this gets called twice, ignore the second */
-          if (res.headersSent) return;
-
           if (err) {
             logger.error(err, 'createCall Error creating call');
             res.status(500).send('Call Failure');

lib/middleware.js

@@ -167,7 +167,7 @@ module.exports = function(srf, logger) {
       if (0 === app.tasks.length) throw new Error('no application provided');
       next();
     } catch (err) {
-      logger.info({err}, `Error retrieving or parsing application: ${err.message}`);
+      logger.info(`Error retrieving or parsing application: ${err.message}`);
       res.send(480, {headers: {'X-Reason': err.message}});
     }
   }

lib/session/adulting-call-session.js

@@ -8,14 +8,13 @@ const CallSession = require('./call-session');
 
  */
 class AdultingCallSession extends CallSession {
-  constructor({logger, application, singleDialer, tasks, callInfo, accountInfo}) {
+  constructor({logger, application, singleDialer, tasks, callInfo}) {
     super({
       logger,
       application,
       srf: singleDialer.dlg.srf,
       tasks,
-      callInfo,
-      accountInfo
+      callInfo
     });
     this.sd = singleDialer;
 

lib/session/call-session.js

@@ -34,7 +34,7 @@ class CallSession extends Emitter {
    * @param {array} opts.tasks - tasks we are to execute
    * @param {callInfo} opts.callInfo - information about the call
    */
-  constructor({logger, application, srf, tasks, callInfo, accountInfo, memberId, confName, confUuid}) {
+  constructor({logger, application, srf, tasks, callInfo, accountInfo}) {
     super();
     this.logger = logger;
     this.application = application;
@@ -42,9 +42,6 @@ class CallSession extends Emitter {
     this.callInfo = callInfo;
     this.accountInfo = accountInfo;
     this.tasks = tasks;
-    this.memberId = memberId;
-    this.confName = confName;
-    this.confUuid = confUuid;
     this.taskIdx = 0;
     this.stackIdx = 0;
     this.callGone = false;
@@ -199,27 +196,6 @@ class CallSession extends Emitter {
     return this.accountInfo?.account?.webhook_secret;
   }
 
-  get isInConference() {
-    return this.memberId && this.confName && this.confUuid;
-  }
-
-  setConferenceDetails(memberId, confName, confUuid) {
-    assert(!this.memberId && !this.confName && !this.confUuid);
-    assert (memberId && confName && confUuid);
-
-    this.logger.debug(`session is now in conference ${confName}:${memberId} - uuid ${confUuid}`);
-    this.memberId = memberId;
-    this.confName = confName;
-    this.confUuid = confUuid;
-  }
-
-  clearConferenceDetails() {
-    this.logger.debug(`session has now left conference ${this.confName}:${this.memberId}`);
-    this.memberId = null;
-    this.confName = null;
-    this.confUuid = null;
-  }
-
   /**
    * Check for speech credentials for the specified vendor
    * @param {*} vendor - google or aws
@@ -363,7 +339,7 @@ class CallSession extends Emitter {
    */
   _lccCallStatus(opts) {
     if (opts.call_status === CallStatus.Completed && this.dlg) {
-      this.logger.info('CallSession:_lccCallStatus hanging up call due to request from api');
+      this.logger.info('CallSession:updateCall hanging up call due to request from api');
       this._callerHungup();
     }
     else if (opts.call_status === CallStatus.NoAnswer) {
@@ -412,7 +388,7 @@ class CallSession extends Emitter {
       const {parentLogger} = this.srf.locals;
       const childLogger = parentLogger.child({callId: this.callId, callSid: sd.callSid});
       const t = normalizeJambones(childLogger, childTasks).map((tdata) => makeTask(childLogger, tdata));
-      childLogger.info({tasks: listTaskNames(t)}, 'CallSession:_lccCallHook new task list for child call');
+      childLogger.info({tasks: listTaskNames(t)}, 'CallSession:updateCall new task list for child call');
       const cs = await sd.doAdulting({
         logger: childLogger,
         application: this.application,
@@ -424,7 +400,7 @@ class CallSession extends Emitter {
     }
     if (tasks) {
       const t = normalizeJambones(this.logger, tasks).map((tdata) => makeTask(this.logger, tdata));
-      this.logger.info({tasks: listTaskNames(t)}, 'CallSession:_lccCallHook new task list');
+      this.logger.info({tasks: listTaskNames(t)}, 'CallSession:updateCall new task list');
       this.replaceApplication(t);
     }
     else {
@@ -441,39 +417,23 @@ class CallSession extends Emitter {
   async _lccListenStatus(opts) {
     const task = this.currentTask;
     if (!task || ![TaskName.Dial, TaskName.Listen].includes(task.name)) {
-      return this.logger.info(`CallSession:_lccListenStatus - invalid listen_status in task ${task.name}`);
+      return this.logger.info(`CallSession:updateCall - invalid listen_status in task ${task.name}`);
     }
     const listenTask = task.name === TaskName.Listen ? task : task.listenTask;
     if (!listenTask) {
-      return this.logger.info('CallSession:_lccListenStatus - invalid listen_status: Dial does not have a listen');
+      return this.logger.info('CallSession:updateCall - invalid listen_status: Dial does not have a listen');
     }
     listenTask.updateListen(opts.listen_status);
   }
 
   async _lccMuteStatus(callSid, mute) {
-    // this whole thing requires us to be in a Dial or Conference verb
+    // this whole thing requires us to be in a Dial verb
     const task = this.currentTask;
-    if (!task || ![TaskName.Dial, TaskName.Conference].includes(task.name)) {
-      return this.logger.info('CallSession:_lccMuteStatus - invalid: neither dial nor conference are not active');
+    if (!task || TaskName.Dial !== task.name) {
+      return this.logger.info('CallSession:_lccMute - invalid command as dial is not active');
     }
-    // now do the mute/unmute
-    task.mute(callSid, mute).catch((err) => this.logger.error(err, 'CallSession:_lccMuteStatus'));
-  }
-
-  async _lccConfHoldStatus(callSid, opts) {
-    const task = this.currentTask;
-    if (!task || TaskName.Conference !== task.name || !this.isInConference) {
-      return this.logger.info('CallSession:_lccConfHoldStatus - invalid command as call is not in conference');
-    }
-    task.doConferenceHold(this, opts);
-  }
-
-  async _lccConfMuteStatus(callSid, opts) {
-    const task = this.currentTask;
-    if (!task || TaskName.Conference !== task.name || !this.isInConference) {
-      return this.logger.info('CallSession:_lccConfHoldStatus - invalid command as call is not in conference');
-    }
-    task.doConferenceMuteNonModerators(this, opts);
+    // now do the whisper
+    task.mute(callSid, mute).catch((err) => this.logger.error(err, 'CallSession:_lccMute'));
   }
 
   /**
@@ -524,6 +484,20 @@ class CallSession extends Emitter {
     task.whisper(tasks, callSid).catch((err) => this.logger.error(err, 'CallSession:_lccWhisper'));
   }
 
+  /**
+   * perform live call control -- mute or unmute an endpoint
+   * @param {array} opts - array of play or say tasks
+   */
+  async _lccMute(callSid, mute) {
+
+    // this whole thing requires us to be in a Dial verb
+    const task = this.currentTask;
+    if (!task || TaskName.Dial !== task.name) {
+      return this.logger.info('CallSession:_lccMute - not possible since we are not in a dial');
+    }
+
+    task.mute(callSid, mute).catch((err) => this.logger.error(err, 'CallSession:_lccMute'));
+  }
 
   /**
    * perform live call control
@@ -545,12 +519,6 @@ class CallSession extends Emitter {
     else if (opts.mute_status) {
       await this._lccMuteStatus(callSid, opts.mute_status === 'mute');
     }
-    else if (opts.conf_hold_status) {
-      await this._lccConfHoldStatus(callSid, opts);
-    }
-    else if (opts.conf_mute_status) {
-      await this._lccConfMuteStatus(callSid, opts);
-    }
 
     // whisper may be the only thing we are asked to do, or it may that
     // we are doing a whisper after having muted, paused reccording etc..
@@ -926,28 +894,6 @@ class CallSession extends Emitter {
     };
   }
 
-  async releaseMediaToSBC(remoteSdp) {
-    assert(this.dlg && this.dlg.connected && this.ep && typeof remoteSdp === 'string');
-    await this.dlg.modify(remoteSdp, {
-      headers: {
-        'X-Reason': 'release-media'
-      }
-    });
-    this.ep.destroy()
-      .then(() => this.ep = null)
-      .catch((err) => this.logger.error({err}, 'CallSession:releaseMediaToSBC: Error destroying endpoint'));
-  }
-
-  async reAnchorMedia() {
-    assert(this.dlg && this.dlg.connected && !this.ep);
-    this.ep = await this.ms.createEndpoint({remoteSdp: this.dlg.remote.sdp});
-    await this.dlg.modify(this.ep.local.sdp, {
-      headers: {
-        'X-Reason': 'anchor-media'
-      }
-    });
-  }
-
   /**
    * Called any time call status changes.  This method both invokes the
    * call_status_hook callback as well as updates the realtime database

lib/session/confirm-call-session.js

@@ -8,7 +8,7 @@ const CallSession = require('./call-session');
 
  */
 class ConfirmCallSession extends CallSession {
-  constructor({logger, application, dlg, ep, tasks, callInfo, accountInfo, memberId, confName}) {
+  constructor({logger, application, dlg, ep, tasks, callInfo, accountInfo}) {
     super({
       logger,
       application,
@@ -16,9 +16,7 @@ class ConfirmCallSession extends CallSession {
       callSid: dlg.callSid,
       tasks,
       callInfo,
-      accountInfo,
-      memberId,
-      confName
+      accountInfo
     });
     this.dlg = dlg;
     this.ep = ep;

lib/tasks/conference.js

@@ -27,8 +27,7 @@ function camelize(str) {
 
 function unhandled(logger, cs, evt) {
   this.participantCount = parseInt(evt.getHeader('Conference-Size'));
-  // logger.debug({evt}, `unhandled conference event: ${evt.getHeader('Action')}`) ;
-  logger.debug(`unhandled conference event: ${evt.getHeader('Action')}`) ;
+  logger.debug({evt}, `unhandled conference event: ${evt.getHeader('Action')}`) ;
 }
 
 function capitalize(s) {
@@ -46,7 +45,7 @@ class Conference extends Task {
 
     this.confName = this.data.name;
     [
-      'beep', 'startConferenceOnEnter', 'endConferenceOnExit', 'joinMuted',
+      'beep', 'startConferenceOnEnter', 'endConferenceOnExit',
       'maxParticipants', 'waitHook', 'statusHook', 'endHook', 'enterHook'
     ].forEach((attr) => this[attr] = this.data[attr]);
 
@@ -214,7 +213,6 @@ class Conference extends Task {
             this._playSession.kill();
             this._playSession = null;
           }
-          cs.clearConferenceDetails();
           resolve();
         });
 
@@ -332,16 +330,11 @@ class Conference extends Task {
 
     const opts = {};
     if (this.endConferenceOnExit) Object.assign(opts, {flags: {endconf: true}});
-    if (this.startConferenceOnEnter) Object.assign(opts, {flags: {moderator: true}});
-    if (this.joinMuted) Object.assign(opts, {flags: {mute: true}});
-
     try {
       const {memberId, confUuid} = await this.ep.join(this.confName, opts);
       this.logger.debug({memberId, confUuid}, `Conference:_joinConference: successfully joined ${this.confName}`);
       this.memberId = memberId;
       this.confUuid = confUuid;
-
-      cs.setConferenceDetails(memberId, this.confName, confUuid);
       const response = await this.ep.api('conference', [this.confName, 'get', 'count']);
       if (response.body && /\d+/.test(response.body)) this.participantCount = parseInt(response.body);
       this._notifyConferenceEvent(cs, 'join');
@@ -378,70 +371,9 @@ class Conference extends Task {
    */
   notifyStartConference(cs, opts) {
     this.logger.info({opts}, `Conference:notifyStartConference: conference ${this.confName} has now started`);
-    this.conferenceStartTime = new Date();
     this.emitter.emit('join', opts);
   }
 
-  async doConferenceMuteNonModerators(cs, opts) {
-    const mute = opts.conf_mute_status === 'mute';
-    assert (cs.isInConference);
-
-    this.logger.info(`Conference:doConferenceMuteNonModerators ${mute ? 'muting' : 'unmuting'} non-moderators`);
-    this.ep.api(`conference ${this.confName} ${mute ? 'mute' : 'unmute'} non_moderator`)
-      .catch((err) => this.logger.info({err}, 'Error muting or unmuting non_moderators'));
-
-    if (this.conf_hold_status !== 'hold' && this._playSession) {
-      this._playSession.kill();
-      this._playSession = null;
-    }
-  }
-
-  async doConferenceHold(cs, opts) {
-    assert (cs.isInConference);
-
-    const {conf_hold_status, wait_hook} = opts;
-    let hookOnly = true;
-
-    if (this.conf_hold_status !== conf_hold_status) {
-      hookOnly = false;
-      this.conf_hold_status = conf_hold_status;
-      const hold = conf_hold_status === 'hold';
-
-      this.ep.api(`conference ${this.confName} ${hold ? 'mute' : 'unmute'} ${this.memberId}`)
-        .catch((err) => this.logger.info({err}, 'Error muting or unmuting participant'));
-      this.ep.api(`conference ${this.confName} ${hold ? 'deaf' : 'undeaf'} ${this.memberId}`)
-        .catch((err) => this.logger.info({err}, 'Error deafing or undeafing participant'));
-    }
-
-    if (hookOnly && this._playSession) {
-      this._playSession.kill();
-      this._playSession = null;
-    }
-    if (wait_hook && this.conf_hold_status === 'hold') {
-      const {dlg} = cs;
-      this._doWaitHookWhileOnHold(cs, dlg, wait_hook);
-    }
-    else if (this.conf_hold_status !== 'hold' && this._playSession) {
-      this._playSession.kill();
-      this._playSession = null;
-    }
-  }
-
-  async _doWaitHookWhileOnHold(cs, dlg, wait_hook) {
-    do {
-      try {
-        const tasks = await this._playHook(cs, dlg, wait_hook);
-        if (0 === tasks.length) break;
-      } catch (err) {
-        if (!this.killed) {
-          this.logger.info(err, `Conference:_doWait: failed retrieving wait_hook for ${this.confName}`);
-        }
-        this._playSession = null;
-        break;
-      }
-    } while (!this.killed && !this.conf_hold_status === 'hold');
-  }
-
   /**
    * Add ourselves to the waitlist of sessions to be notified once
    * the conference starts
@@ -532,9 +464,6 @@ class Conference extends Task {
         dlg,
         ep: cs.ep,
         callInfo: cs.callInfo,
-        accountInfo: cs.accountInfo,
-        memberId: this.memberId,
-        confName: this.confName,
         tasks
       });
       await this._playSession.exec();
@@ -555,7 +484,6 @@ class Conference extends Task {
   }
 
   async replaceEndpointAndEnd(cs) {
-    cs.clearConferenceDetails();
     if (this.replaced) return;
     this.replaced = true;
     try {

lib/tasks/dial.js

@@ -130,10 +130,6 @@ class TaskDial extends Task {
 
   get name() { return TaskName.Dial; }
 
-  get canReleaseMedia() {
-    return !process.env.ANCHOR_MEDIA_ALWAYS && !this.listenTask && !this.transcribeTask;
-  }
-
   async exec(cs) {
     await super.exec(cs);
     try {
@@ -146,12 +142,13 @@ class TaskDial extends Task {
           this.epOther.play(this.dialMusic).catch((err) => {});
         }
       }
+      if (this.epOther) this._installDtmfDetection(cs, this.epOther, this.parentDtmfCollector);
       await this._attemptCalls(cs);
       await this.awaitTaskDone();
       this.logger.debug({callSid: this.cs.callSid}, 'Dial:exec task is done, sending actionHook if any');
       await this.performAction(this.results, this.killReason !== KillReason.Replaced);
-      this._removeDtmfDetection(cs.dlg);
-      this._removeDtmfDetection(this.dlg);
+      this._removeDtmfDetection(cs, this.epOther);
+      this._removeDtmfDetection(cs, this.ep);
     } catch (err) {
       this.logger.error({err}, 'TaskDial:exec terminating with error');
       this.kill(cs);
@@ -161,8 +158,8 @@ class TaskDial extends Task {
   async kill(cs, reason) {
     super.kill(cs);
     this.killReason = reason || KillReason.Hangup;
-    this._removeDtmfDetection(cs.dlg);
-    this._removeDtmfDetection(this.dlg);
+    this._removeDtmfDetection(this.cs, this.epOther);
+    this._removeDtmfDetection(this.cs, this.ep);
     this._killOutdials();
     if (this.sd) {
       this.sd.kill();
@@ -180,14 +177,9 @@ class TaskDial extends Task {
    * @param {*} tasks - array of play/say tasks to execute
    */
   async whisper(tasks, callSid) {
+    if (!this.epOther || !this.ep) return this.logger.info('Dial:whisper: no paired endpoint found');
     try {
       const cs = this.callSession;
-      if (!this.ep && !this.epOther) {
-        await this.reAnchorMedia(this.callSession, this.sd);
-      }
-
-      if (!this.epOther || !this.ep) return this.logger.info('Dial:whisper: no paired endpoint found');
-
       this.logger.debug('Dial:whisper unbridging endpoints');
       await this.epOther.unbridge();
       this.logger.debug('Dial:whisper executing tasks');
@@ -196,12 +188,7 @@ class TaskDial extends Task {
         await task.exec(cs, callSid === this.callSid ? this.ep : this.epOther);
       }
       this.logger.debug('Dial:whisper tasks complete');
-      if (!cs.callGone && this.epOther) {
-
-        /* if we can release the media back to the SBC, do so now */
-        if (this.canReleaseMedia) this._releaseMedia(cs, this.sd);
-        else this.epOther.bridge(this.ep);
-      }
+      if (!cs.callGone && this.epOther) this.epOther.bridge(this.ep);
     } catch (err) {
       this.logger.error(err, 'Dial:whisper error');
     }
@@ -211,19 +198,14 @@ class TaskDial extends Task {
    * mute or unmute one side of the call
    */
   async mute(callSid, doMute) {
-    const parentCall = callSid !== this.callSid;
-    const dlg = parentCall ? this.callSession.dlg : this.dlg;
-    const hdr = `${doMute ? 'mute' : 'unmute'} call leg`;
+    if (!this.epOther || !this.ep) return this.logger.info('Dial:mute: no paired endpoint found');
     try {
-      /* let rtpengine do the mute / unmute */
-      await dlg.request({
-        method: 'INFO',
-        headers: {
-          'X-Reason': hdr
-        }
-      });
+      const parentCall = callSid !== this.callSid;
+      const ep = parentCall ? this.epOther : this.ep;
+      await ep[doMute ? 'mute' : 'unmute']();
+      this.logger.debug(`Dial:mute ${doMute ? 'muted' : 'unmuted'} ${parentCall ? 'parentCall' : 'childCall'}`);
     } catch (err) {
-      this.logger.info({err}, `Dial:mute - ${hdr} error`);
+      this.logger.error(err, 'Dial:mute error');
     }
   }
 
@@ -235,39 +217,35 @@ class TaskDial extends Task {
     this.dials.clear();
   }
 
-  _installDtmfDetection(cs, dlg) {
-    dlg.on('info', this._onInfo.bind(this, cs, dlg));
+  _installDtmfDetection(cs, ep, dtmfDetector) {
+    if (ep && this.dtmfHook && !ep.dtmfDetector) {
+      ep.dtmfDetector = dtmfDetector;
+      ep.on('dtmf', this._onDtmf.bind(this, cs, ep));
+    }
   }
-  _removeDtmfDetection(dlg) {
-    dlg && dlg.removeAllListeners('info');
+  _removeDtmfDetection(cs, ep) {
+    if (ep) {
+      delete ep.dtmfDetector;
+      ep.removeAllListeners('dtmf');
+    }
   }
 
-  _onInfo(cs, dlg, req, res) {
-    res.send(200);
-    if (req.get('Content-Type') !== 'application/dtmf-relay') return;
-
-    const dtmfDetector = dlg === cs.dlg ? this.parentDtmfCollector : this.childDtmfCollector;
-    if (!dtmfDetector) return;
-    let requestor, callSid, callInfo;
-    if (dtmfDetector === this.parentDtmfCollector) {
-      requestor = cs.requestor;
-      callSid = cs.callSid;
-      callInfo = cs.callInfo;
-    }
-    else {
-      requestor = this.sd?.requestor;
-      callSid = this.sd?.callSid;
-      callInfo = this.sd?.callInfo;
-    }
-    if (!requestor) return;
-    const arr = /Signal=([0-9#*])/.exec(req.body);
-    if (!arr) return;
-    const key = arr[1];
-    const match = dtmfDetector.keyPress(key);
-    if (match) {
-      this.logger.info({callSid}, `Dial:_onInfo triggered dtmf match: ${match}`);
-      requestor.request(this.dtmfHook, {dtmf: match, ...callInfo.toJSON()})
-        .catch((err) => this.logger.info(err, 'Dial:_onDtmf - error'));
+  _onDtmf(cs, ep, evt) {
+    if (ep.dtmfDetector) {
+      const match = ep.dtmfDetector.keyPress(evt.dtmf);
+      if (match) {
+        this.logger.debug({callSid: this.cs.callSid}, `Dial:_onDtmf triggered dtmf match: ${match}`);
+        const requestor = ep.dtmfDetector === this.parentDtmfCollector ?
+          cs.requestor :
+          (this.sd ? this.sd.requestor : null);
+        if (!requestor) {
+          this.logger.info(`Dial:_onDtmf got digits on B leg after adulting: ${evt.dtmf}`);
+        }
+        else {
+          requestor.request(this.dtmfHook, {dtmf: match, ...cs.callInfo.toJSON()})
+            .catch((err) => this.logger.info(err, 'Dial:_onDtmf - error'));
+        }
+      }
     }
   }
 
@@ -277,7 +255,7 @@ class TaskDial extends Task {
     debug(`Dial:__initializeInbound allocated ep for incoming call: ${ep.uuid}`);
 
     /* send outbound legs back to the same SBC (to support static IP feature) */
-    if (!this.proxy) this.proxy = `${cs.req.source_address}:${cs.req.source_port}`;
+    if (!this.proxy) this.proxy = `${cs.req.source_address}:${cs.req.source_port};transport=tcp`;
 
     if (this.dialMusic) {
       // play dial music to caller while we outdial
@@ -344,8 +322,7 @@ class TaskDial extends Task {
           sbcAddress,
           target: t,
           opts,
-          callInfo: cs.callInfo,
-          accountInfo: cs.accountInfo
+          callInfo: cs.callInfo
         });
         this.dials.set(sd.callSid, sd);
 
@@ -389,13 +366,9 @@ class TaskDial extends Task {
                 break;
             }
           })
-          .on('accept', async() => {
+          .on('accept', () => {
             this.logger.debug(`Dial:_attemptCalls - we have a winner: ${sd.callSid}`);
-            try {
-              await this._connectSingleDial(cs, sd);
-            } catch (err) {
-              this.logger.info({err}, 'Dial:_attemptCalls - Error calling _connectSingleDial ');
-            }
+            this._connectSingleDial(cs, sd);
           })
           .on('decline', () => {
             this.logger.debug(`Dial:_attemptCalls - declined: ${sd.callSid}`);
@@ -421,8 +394,8 @@ class TaskDial extends Task {
     });
   }
 
-  async _connectSingleDial(cs, sd) {
-    if (!this.bridged && !this.canReleaseMedia) {
+  _connectSingleDial(cs, sd) {
+    if (!this.bridged) {
       this.logger.debug('Dial:_connectSingleDial bridging endpoints');
       if (this.epOther) {
         this.epOther.api('uuid_break', this.epOther.uuid);
@@ -432,7 +405,7 @@ class TaskDial extends Task {
     }
 
     // ding! ding! ding! we have a winner
-    await this._selectSingleDial(cs, sd);
+    this._selectSingleDial(cs, sd);
     this._killOutdials();       // NB: order is important
   }
 
@@ -445,7 +418,7 @@ class TaskDial extends Task {
    * - launch any nested tasks
    * - and establish a handler to clean up if the called party hangs up
    */
-  async _selectSingleDial(cs, sd) {
+  _selectSingleDial(cs, sd) {
     debug(`Dial:_selectSingleDial ep for outbound call: ${sd.ep.uuid}`);
     this.dials.delete(sd.callSid);
 
@@ -453,7 +426,7 @@ class TaskDial extends Task {
     this.callSid = sd.callSid;
     if (this.earlyMedia) {
       debug('Dial:_selectSingleDial propagating answer supervision on A leg now that B is connected');
-      await cs.propagateAnswer();
+      cs.propagateAnswer();
     }
     if (this.timeLimit) {
       this.timerMaxCallDuration = setTimeout(() => {
@@ -469,7 +442,7 @@ class TaskDial extends Task {
         this.logger.debug('Dial:_selectSingleDial called party hungup, ending dial operation');
         sessionTracker.remove(this.callSid);
         if (this.timerMaxCallDuration) clearTimeout(this.timerMaxCallDuration);
-        this.ep && this.ep.unbridge();
+        this.ep.unbridge();
         this.kill(cs);
       }
     });
@@ -480,14 +453,10 @@ class TaskDial extends Task {
       dialCallSid: sd.callSid,
     });
 
-    if (this.parentDtmfCollector) this._installDtmfDetection(cs, cs.dlg);
-    if (this.childDtmfCollector) this._installDtmfDetection(cs, this.dlg);
+    if (this.childDtmfCollector) this._installDtmfDetection(cs, this.ep, this.childDtmfCollector);
 
     if (this.transcribeTask) this.transcribeTask.exec(cs, this.ep);
     if (this.listenTask) this.listenTask.exec(cs, this.ep);
-
-    /* if we can release the media back to the SBC, do so now */
-    if (this.canReleaseMedia) this._releaseMedia(cs, sd);
   }
 
   _bridgeEarlyMedia(sd) {
@@ -499,33 +468,6 @@ class TaskDial extends Task {
     }
   }
 
-  /**
-   * Release the media from freeswitch
-   * @param {*} cs
-   * @param {*} sd
-   */
-  async _releaseMedia(cs, sd) {
-    assert(cs.ep && sd.ep);
-
-    try {
-      this.logger.info('Dial:_releaseMedia - releasing media from freewitch');
-      const aLegSdp = cs.ep.remote.sdp;
-      const bLegSdp = sd.ep.remote.sdp;
-      await Promise.all[sd.releaseMediaToSBC(aLegSdp), cs.releaseMediaToSBC(bLegSdp)];
-      this.epOther = null;
-      this.logger.info('Dial:_releaseMedia - successfully released media from freewitch');
-    } catch (err) {
-      this.logger.info({err}, 'Dial:_releaseMedia error');
-    }
-  }
-
-  async reAnchorMedia(cs, sd) {
-    if (cs.ep && sd.ep) return;
-
-    this.logger.info('Dial:reAnchorMedia - re-anchoring media to freewitch');
-    await Promise.all([sd.reAnchorMedia(), cs.reAnchorMedia()]);
-    this.epOther = cs.ep;
-  }
 }
 
 module.exports = TaskDial;

lib/tasks/dialogflow/index.js

@@ -210,7 +210,6 @@ class Dialogflow extends Task {
     /* if we are using tts and a message was provided, play it out */
     if (this.vendor && intent.fulfillmentText && intent.fulfillmentText.length > 0) {
       const {srf} = cs;
-      const {stats} = srf.locals;
       const {synthAudio} = srf.locals.dbHelpers;
       this.waitingForPlayStart = false;
 
@@ -230,7 +229,7 @@ class Dialogflow extends Task {
           credentials: this.ttsCredentials
         };
         this.logger.debug({obj}, 'Dialogflow:_onIntent - playing message via tts');
-        const {filePath, servedFromCache} = await synthAudio(stats, obj);
+        const {filePath, servedFromCache} = await synthAudio(obj);
         if (filePath) cs.trackTmpFile(filePath);
         if (!this.ttsCredentials && !servedFromCache) cs.billForTts(intent.fulfillmentText.length);
 

lib/tasks/gather.js

@@ -94,7 +94,7 @@ class TaskGather extends Task {
       }
 
       if (this.input.includes('digits')) {
-        ep.on('dtmf', this._onDtmf.bind(this, cs, ep));
+        ep.on('dtmf', this._onDtmf.bind(this, ep));
       }
 
       await this.awaitTaskDone();
@@ -108,19 +108,19 @@ class TaskGather extends Task {
 
   kill(cs) {
     super.kill(cs);
-    this._killAudio(cs);
+    this._killAudio();
     this.ep.removeAllListeners('dtmf');
     this._resolve('killed');
   }
 
-  _onDtmf(cs, ep, evt) {
+  _onDtmf(ep, evt) {
     this.logger.debug(evt, 'TaskGather:_onDtmf');
     if (evt.dtmf === this.finishOnKey) this._resolve('dtmf-terminator-key');
     else {
       this.digitBuffer += evt.dtmf;
       if (this.digitBuffer.length === this.numDigits) this._resolve('dtmf-num-digits');
     }
-    this._killAudio(cs);
+    this._killAudio();
   }
 
   async _initSpeech(cs, ep) {
@@ -191,16 +191,14 @@ class TaskGather extends Task {
     }
   }
 
-  _killAudio(cs) {
+  _killAudio() {
     if (this.sayTask && !this.sayTask.killed) {
       this.sayTask.removeAllListeners('playDone');
-      this.sayTask.kill(cs);
-      this.sayTask = null;
+      this.sayTask.kill();
     }
     if (this.playTask && !this.playTask.killed) {
       this.playTask.removeAllListeners('playDone');
-      this.playTask.kill(cs);
-      this.playTask = null;
+      this.playTask.kill();
     }
   }
 
@@ -235,15 +233,14 @@ class TaskGather extends Task {
 
     this._clearTimer();
     if (reason.startsWith('dtmf')) {
-      await this.performAction({digits: this.digitBuffer, reason: 'dtmfDetected'});
+      await this.performAction({digits: this.digitBuffer});
     }
     else if (reason.startsWith('speech')) {
       if (this.parentTask) this.parentTask.emit('transcription', evt);
-      else await this.performAction({speech: evt, reason: 'speechDetected'});
+      else await this.performAction({speech: evt});
     }
-    else if (reason.startsWith('timeout')) {
-      if (this.parentTask) this.parentTask.emit('timeout', evt);
-      else await this.performAction({reason: 'timeout'});
+    else if (reason.startsWith('timeout') && this.parentTask) {
+      this.parentTask.emit('timeout', evt);
     }
     this.notifyTaskDone();
   }

lib/tasks/lex.js

@@ -182,13 +182,12 @@ class Lex extends Task {
       const type = messages[0].type;
       if (['PlainText', 'SSML'].includes(type) && msg) {
         const {srf} = cs;
-        const {stats} = srf.locals;
         const {synthAudio} = srf.locals.dbHelpers;
 
         try {
           this.logger.debug(`tts with ${this.vendor} ${this.voice}`);
           // eslint-disable-next-line no-unused-vars
-          const {filePath, servedFromCache} = await synthAudio(stats, {
+          const {filePath, servedFromCache} = await synthAudio({
             text: msg,
             vendor: this.vendor,
             language: this.language,

lib/tasks/message.js

@@ -1,7 +1,6 @@
 const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
 const bent = require('bent');
-const { v4: uuidv4 } = require('uuid');
 
 class TaskMessage extends Task {
   constructor(logger, opts) {
@@ -9,11 +8,13 @@ class TaskMessage extends Task {
     this.preconditions = TaskPreconditions.None;
 
     this.payload = {
-      message_sid: this.data.message_sid || uuidv4(),
-      carrier: this.data.carrier,
+      message_sid: this.data.message_sid,
+      provider: this.data.provider,
       to: this.data.to,
       from: this.data.from,
-      text: this.data.text
+      cc: this.data.cc,
+      text: this.data.text,
+      media: this.data.media
     };
 
   }
@@ -27,18 +28,16 @@ class TaskMessage extends Task {
     const {srf, accountSid} = cs;
     const {res} = cs.callInfo;
     let payload = this.payload;
-    const actionParams = {message_sid: this.payload.message_sid};
-
     await super.exec(cs);
     try {
-      const {getSmpp, dbHelpers} = srf.locals;
+      const {getSBC, getSmpp, dbHelpers} = srf.locals;
       const {lookupSmppGateways} = dbHelpers;
 
-      this.logger.debug(`looking up gateways for account_sid: ${accountSid}`);
+      this.logger.info(`looking up gateways for account_sid: ${accountSid}`);
       const r = await lookupSmppGateways(accountSid);
       let gw, url, relativeUrl;
       if (r.length > 0) {
-        gw = r.find((o) => 1 === o.sg.outbound && (!this.payload.carrier || o.vc.name === this.payload.carrier));
+        gw = r.find((o) => 1 === o.sg.outbound && (!this.payload.provider || o.vc.name === this.payload.provider));
       }
       if (gw) {
         this.logger.info({gw, accountSid}, 'Message:exec - using smpp to send message');
@@ -51,75 +50,37 @@ class TaskMessage extends Task {
         };
       }
       else {
-        //TMP: smpp only at the moment, need to add http back in
-        /*
-        this.logger.info({gw, accountSid, carrier: this.payload.carrier},
+        this.logger.info({gw, accountSid, provider: this.payload.provider},
           'Message:exec - no smpp gateways found to send message');
         relativeUrl = 'v1/outboundSMS';
         const sbcAddress = getSBC();
         if (sbcAddress) url = `http://${sbcAddress}:3000/`;
-        */
-        this.performAction({
-          ...actionParams,
-          message_status: 'no carriers'
-        }).catch((err) => {});
-        if (res) res.sendStatus(404);
-        return;
+
+        //TMP: smpp only at the moment, need to add http back in
+        return res.sendStatus(404);
       }
       if (url) {
-        const post = bent(url, 'POST', 'json', 201, 480);
+        const post = bent(url, 'POST', 'json', 201);
         this.logger.info({payload, url}, 'Message:exec sending outbound SMS');
         const response = await post(relativeUrl, payload);
-        const {smpp_err_code, carrier, message_id, message} = response;
-        if (smpp_err_code) {
-          this.logger.info({response}, 'SMPP error sending SMS');
-          this.performAction({
-            ...actionParams,
-            carrier,
-            carrier_message_id: message_id,
-            message_status: 'failure',
-            message_failure_reason: message
-          }).catch((err) => {});
-          if (res) {
-            res.status(480).json({
-              ...response,
-              sid: cs.callInfo.messageSid
-            });
-          }
-        }
-        else {
-          const {message_id, carrier} = response;
-          this.logger.info({response}, 'Successfully sent SMS');
-          this.performAction({
-            ...actionParams,
-            carrier,
-            carrier_message_id: message_id,
-            message_status: 'success',
-          }).catch((err) => {});
-          if (res) {
-            res.status(200).json({
-              sid: cs.callInfo.messageSid,
-              carrierResponse: response
-            });
-          }
+        this.logger.info({response}, 'Successfully sent SMS');
+        if (cs.callInfo.res) {
+          this.logger.info('Message:exec sending 200 OK response to HTTP POST from api server');
+          res.status(200).json({
+            sid: cs.callInfo.messageSid,
+            providerResponse: response
+          });
         }
+
+        // TODO: action Hook
       }
       else {
-        this.logger.info('Message:exec - unable to send SMS as SMPP is not configured on the system');
-        this.performAction({
-          ...actionParams,
-          message_status: 'smpp configuration error'
-        }).catch((err) => {});
-        if (res) res.status(404).json({message: 'no configured SMS gateways'});
+        this.logger.info('Message:exec - unable to send SMS as there are no available SMS gateways');
+        res.status(422).json({message: 'no configured SMS gateways'});
       }
     } catch (err) {
-      this.logger.error(err, 'TaskMessage:exec - unexpected error sending SMS');
-      this.performAction({
-        ...actionParams,
-        message_status: 'system error',
-        message_failure_reason: err.message
-      });
-      if (res) res.status(422).json({message: 'no configured SMS gateways'});
+      this.logger.error(err, 'TaskMessage:exec - Error sending SMS');
+      res.status(422).json({message: 'no configured SMS gateways'});
     }
   }
 }

lib/tasks/play.js

@@ -17,12 +17,8 @@ class TaskPlay extends Task {
     await super.exec(cs);
     this.ep = ep;
     try {
-      while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep.connected) {
-        if (cs.isInConference) {
-          const {memberId, confName, confUuid} = cs;
-          await this.playToConfMember(this.ep, memberId, confName, confUuid, this.url);
-        }
-        else await ep.play(this.url);
+      while (!this.killed && this.loop--) {
+        await ep.play(this.url);
       }
     } catch (err) {
       this.logger.info(err, `TaskPlay:exec - error playing ${this.url}`);
@@ -34,13 +30,7 @@ class TaskPlay extends Task {
     super.kill(cs);
     if (this.ep.connected && !this.playComplete) {
       this.logger.debug('TaskPlay:kill - killing audio');
-      if (cs.isInConference) {
-        const {memberId, confName} = cs;
-        this.killPlayToConfMember(this.ep, memberId, confName);
-      }
-      else {
-        await this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
-      }
+      await this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
     }
   }
 }

lib/tasks/rasa.js

@@ -111,9 +111,7 @@ class Rasa extends Task {
       const response = await this.post(this.data.url, payload);
       this.logger.debug({response}, 'Rasa:_onTranscription - got response from Rasa');
       const botUtterance = Array.isArray(response) ?
-        response.reduce((prev, current) => {
-          return current.text ? `${prev} ${current.text}` : '';
-        }, '') :
+        response.reduce((prev, current) => `${prev} ${current.text}`, '') :
         null;
       if (botUtterance) {
         this.logger.debug({botUtterance}, 'Rasa:_onTranscription: got user utterance');
@@ -121,7 +119,7 @@ class Rasa extends Task {
         this.gatherTask.exec(cs, ep, this)
           .catch((err) => this.logger.info({err}, 'Rasa gather task returned error'));
         if (this.eventHook) {
-          this.performHook(cs, this.eventHook, {event: 'botMessage', message: response})
+          this.performHook(cs, this.eventHook, {event: 'botMessage', message: botUtterance})
             .then((redirected) => {
               if (redirected) {
                 this.logger.info('Rasa_onTranscription: event handler for bot message redirected us to new webhook');

lib/tasks/say.js

@@ -19,21 +19,14 @@ class TaskSay extends Task {
 
     const {srf} = cs;
     const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, srf);
-    const {writeAlerts, AlertType, stats} = srf.locals;
+    const {writeAlerts, AlertType} = srf.locals;
     const {synthAudio} = srf.locals.dbHelpers;
-    const vendor = ('default' === this.synthesizer.vendor  || !this.synthesizer.vendor) ?
-      cs.speechSynthesisVendor :
-      this.synthesizer.vendor;
-    const language = ('default' === this.synthesizer.language  || !this.synthesizer.language) ?
-      cs.speechSynthesisLanguage :
-      this.synthesizer.language;
-    const voice = ('default' === this.synthesizer.voice  || !this.synthesizer.voice) ?
-      cs.speechSynthesisVoice :
-      this.synthesizer.voice;
+    const vendor = this.synthesizer.vendor || cs.speechSynthesisVendor;
+    const language = this.synthesizer.language || cs.speechSynthesisLanguage;
+    const voice = this.synthesizer.voice || cs.speechSynthesisVoice;
     const salt = cs.callSid;
     const credentials = cs.getSpeechCredentials(vendor, 'tts');
 
-    this.logger.info({vendor, credentials}, 'Task:say - using vendor');
     this.ep = ep;
     try {
       if (!credentials) {
@@ -47,7 +40,7 @@ class TaskSay extends Task {
       // synthesize all of the text elements
       let lastUpdated = false;
       const filepath = (await Promise.all(this.text.map(async(text) => {
-        const {filePath, servedFromCache} = await synthAudio(stats, {
+        const {filePath, servedFromCache} = await synthAudio({
           text,
           vendor,
           language,
@@ -75,14 +68,10 @@ class TaskSay extends Task {
 
       this.logger.debug({filepath}, 'synthesized files for tts');
 
-      while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep.connected) {
+      while (!this.killed && this.loop-- && this.ep.connected) {
         let segment = 0;
         do {
-          if (cs.isInConference) {
-            const {memberId, confName, confUuid} = cs;
-            await this.playToConfMember(this.ep, memberId, confName, confUuid, filepath[segment]);
-          }
-          else await ep.play(filepath[segment]);
+          await ep.play(filepath[segment]);
         } while (!this.killed && ++segment < filepath.length);
       }
     } catch (err) {
@@ -95,13 +84,7 @@ class TaskSay extends Task {
     super.kill(cs);
     if (this.ep.connected) {
       this.logger.debug('TaskSay:kill - killing audio');
-      if (cs.isInConference) {
-        const {memberId, confName} = cs;
-        this.killPlayToConfMember(this.ep, memberId, confName);
-      }
-      else {
-        this.ep.api('uuid_break', this.ep.uuid);
-      }
+      await this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
     }
   }
 }

lib/tasks/specs.json

@@ -46,7 +46,7 @@
   "play": {
     "properties": {
       "url": "string",
-      "loop": "number|string",
+      "loop": "number",
       "earlyMedia": "boolean"
     },
     "required": [
@@ -56,7 +56,7 @@
   "say": {
     "properties": {
       "text": "string|array",
-      "loop": "number|string",
+      "loop": "number",
       "synthesizer": "#synthesizer",
       "earlyMedia": "boolean"
     },
@@ -87,7 +87,6 @@
       "startConferenceOnEnter": "boolean",
       "endConferenceOnExit": "boolean",
       "maxParticipants": "number",
-      "joinMuted": "boolean",
       "actionHook": "object|string",
       "waitHook": "object|string",
       "statusEvents": "array",

lib/tasks/task.js

@@ -23,9 +23,6 @@ class Task extends Emitter {
 
     this._killInProgress = false;
     this._completionPromise = new Promise((resolve) => this._completionResolver = resolve);
-
-    /* used when we play a prompt to a member in conference */
-    this._confPlayCompletionPromise = new Promise((resolve) => this._confPlayCompletionResolver = resolve);
   }
 
   /**
@@ -80,21 +77,6 @@ class Task extends Emitter {
     return this._completionPromise;
   }
 
-  /**
-   * when a play to conference member completes
-   */
-  notifyConfPlayDone() {
-    this._confPlayCompletionResolver();
-  }
-
-  /**
-   * when a subclass task has launched various async activities and is now simply waiting
-   * for them to complete it should call this method to block until that happens
-   */
-  awaitConfPlayDone() {
-    return this._confPlayCompletionPromise;
-  }
-
   /**
    * provided as a convenience for tasks, this simply calls CallSession#normalizeUrl
    */
@@ -136,43 +118,6 @@ class Task extends Emitter {
     cs.replaceApplication(tasks);
   }
 
-  async playToConfMember(ep, memberId, confName, confUuid, filepath) {
-    try {
-      this.logger.debug(`Task:playToConfMember - playing ${filepath} to ${confName}:${memberId}`);
-
-      // listen for conference events
-      const handler = this.__onConferenceEvent.bind(this);
-      ep.conn.on('esl::event::CUSTOM::*', handler) ;
-      const response = await ep.api(`conference ${confName} play ${filepath} ${memberId}`);
-      this.logger.debug({response}, 'Task:playToConfMember - api call returned');
-      await this.awaitConfPlayDone();
-      ep.conn.removeListener('esl::event::CUSTOM::*', handler);
-    } catch (err) {
-      this.logger.error({err}, `Task:playToConfMember - error playing ${filepath} to ${confName}:${memberId}`);
-    }
-  }
-
-  async killPlayToConfMember(ep, memberId, confName) {
-    try {
-      this.logger.debug(`Task:killPlayToConfMember - killing audio to ${confName}:${memberId}`);
-      const response = await ep.api(`conference ${confName} stop ${memberId}`);
-      this.logger.debug({response}, 'Task:killPlayToConfMember - api call returned');
-    } catch (err) {
-      this.logger.error({err}, `Task:killPlayToConfMember - error killing audio to ${confName}:${memberId}`);
-    }
-  }
-
-  __onConferenceEvent(evt) {
-    const eventName = evt.getHeader('Event-Subclass') ;
-    if (eventName === 'conference::maintenance') {
-      const action = evt.getHeader('Action') ;
-      if (action === 'play-file-member-done') {
-        this.logger.debug('done playing file to conf member');
-        this.notifyConfPlayDone();
-      }
-    }
-  }
-
   async transferCallToFeatureServer(cs, sipAddress, opts) {
     const uuid = uuidv4();
     const {addKey} = cs.srf.locals.dbHelpers;

lib/tasks/transcribe.js

@@ -91,7 +91,7 @@ class TaskTranscribe extends Task {
     ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
     ep.addCustomEventListener(GoogleTranscriptionEvents.NoAudioDetected, this._onNoAudio.bind(this, cs, ep));
     ep.addCustomEventListener(GoogleTranscriptionEvents.MaxDurationExceeded,
-      this._onMaxDurationExceeded.bind(this, cs, ep));
+      this._onMaxDurationExceeded.bind(this, ep));
     ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
     ep.addCustomEventListener(AwsTranscriptionEvents.NoAudioDetected, this._onNoAudio.bind(this, cs, ep));
     ep.addCustomEventListener(AwsTranscriptionEvents.MaxDurationExceeded,

lib/utils/install-srf-locals.js

@@ -135,7 +135,6 @@ function installSrfLocals(srf, logger) {
     retrieveSet,
     addToSet,
     removeFromSet,
-    monitorSet,
     pushBack,
     popFront,
     removeFromList,
@@ -179,7 +178,6 @@ function installSrfLocals(srf, logger) {
       retrieveSet,
       addToSet,
       removeFromSet,
-      monitorSet,
       pushBack,
       popFront,
       removeFromList,

lib/utils/place-outdial.js

@@ -17,7 +17,7 @@ const moment = require('moment');
 const { v4: uuidv4 } = require('uuid');
 
 class SingleDialer extends Emitter {
-  constructor({logger, sbcAddress, target, opts, application, callInfo, accountInfo}) {
+  constructor({logger, sbcAddress, target, opts, application, callInfo}) {
     super();
     assert(target.type);
 
@@ -31,8 +31,6 @@ class SingleDialer extends Emitter {
     this.bindings = logger.bindings();
 
     this.parentCallInfo = callInfo;
-    this.accountInfo = accountInfo;
-
     this.callGone = false;
 
     this.callSid = uuidv4();
@@ -64,7 +62,6 @@ class SingleDialer extends Emitter {
     opts = opts || {};
     opts.headers = opts.headers || {};
     opts.headers = {...opts.headers, 'X-Call-Sid': this.callSid};
-    this.ms = ms;
     let uri, to;
     try {
       switch (this.target.type) {
@@ -88,12 +85,6 @@ class SingleDialer extends Emitter {
           uri = `sip:${this.target.name}`;
           to = this.target.name;
 
-          if (this.target.overrideTo) {
-            Object.assign(opts.headers, {
-              'X-Override-To': this.target.overrideTo
-            });
-          }
-
           // need to send to the SBC registered on
           const reg = await registrar.query(aor);
           if (reg) {
@@ -204,7 +195,7 @@ class SingleDialer extends Emitter {
           const duration = moment().diff(connectTime, 'seconds');
           this.logger.debug('SingleDialer:exec called party hung up');
           this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
-          this.ep && this.ep.destroy();
+          this.ep.destroy();
         })
         .on('refresh', () => this.logger.info('SingleDialer:exec - dialog refreshed by uas'))
         .on('modify', async(req, res) => {
@@ -302,48 +293,20 @@ class SingleDialer extends Emitter {
     this.logger = logger;
     this.adulting = true;
     this.emit('adulting');
-    if (this.ep) {
-      await this.ep.unbridge()
-        .catch((err) => this.logger.info({err}, 'SingleDialer:doAdulting - failed to unbridge ep'));
-      this.ep.play('silence_stream://1000');
-    }
-    else {
-      await this.reAnchorMedia();
-    }
+    await this.ep.unbridge()
+      .catch((err) => this.logger.info({err}, 'SingleDialer:doAdulting - failed to unbridge ep'));
+    this.ep.play('silence_stream://1000');
     const cs = new AdultingCallSession({
       logger: this.logger,
       singleDialer: this,
       application,
       callInfo: this.callInfo,
-      accountInfo: this.accountInfo,
       tasks
     });
     cs.exec();
     return cs;
   }
 
-  async releaseMediaToSBC(remoteSdp) {
-    assert(this.dlg && this.dlg.connected && this.ep && typeof remoteSdp === 'string');
-    await this.dlg.modify(remoteSdp, {
-      headers: {
-        'X-Reason': 'release-media'
-      }
-    });
-    this.ep.destroy()
-      .then(() => this.ep = null)
-      .catch((err) => this.logger.error({err}, 'SingleDialer:releaseMediaToSBC: Error destroying endpoint'));
-  }
-
-  async reAnchorMedia() {
-    assert(this.dlg && this.dlg.connected && !this.ep);
-    this.ep = await this.ms.createEndpoint({remoteSdp: this.dlg.remote.sdp});
-    await this.dlg.modify(this.ep.local.sdp, {
-      headers: {
-        'X-Reason': 'anchor-media'
-      }
-    });
-  }
-
   _notifyCallStatusChange({callStatus, sipStatus, duration}) {
     assert((typeof duration === 'number' && callStatus === CallStatus.Completed) ||
       (!duration && callStatus !== CallStatus.Completed),
@@ -366,9 +329,9 @@ class SingleDialer extends Emitter {
   }
 }
 
-function placeOutdial({logger, srf, ms, sbcAddress, target, opts, application, callInfo, accountInfo}) {
+function placeOutdial({logger, srf, ms, sbcAddress, target, opts, application, callInfo}) {
   const myOpts = deepcopy(opts);
-  const sd = new SingleDialer({logger, sbcAddress, target, myOpts, application, callInfo, accountInfo});
+  const sd = new SingleDialer({logger, sbcAddress, target, myOpts, application, callInfo});
   sd.exec(srf, ms, myOpts);
   return sd;
 }

lib/utils/sbc-pinger.js

@@ -7,15 +7,13 @@ const debug = require('debug')('jambonz:feature-server');
 module.exports = (logger) => {
   logger = logger || noopLogger;
   let idxSbc = 0;
-  let sbcs = [];
 
-  if (process.env.JAMBONES_SBCS) {
-    sbcs = process.env.JAMBONES_SBCS
-      .split(',')
-      .map((sbc) => sbc.trim());
-    assert.ok(sbcs.length, 'JAMBONES_SBCS env var is empty or misconfigured');
-    logger.info({sbcs}, 'SBC inventory');
-  }
+  assert.ok(process.env.JAMBONES_SBCS, 'missing JAMBONES_SBCS env var');
+  const sbcs = process.env.JAMBONES_SBCS
+    .split(',')
+    .map((sbc) => sbc.trim());
+  assert.ok(sbcs.length, 'JAMBONES_SBCS env var is empty or misconfigured');
+  logger.info({sbcs}, 'SBC inventory');
 
   // listen for SNS lifecycle changes
   let lifecycleEmitter = new Emitter();
@@ -98,19 +96,8 @@ module.exports = (logger) => {
   }, 20000);
 
   // initial ping once we are up
-  setTimeout(async() => {
+  setTimeout(() => {
     const {srf} = require('../..');
-
-    // if SBCs are auto-scaling, monitor them as they come and go
-    if (!process.env.JAMBONES_SBCS) {
-      const {monitorSet} = srf.locals.dbHelpers;
-      const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-sip`;
-      await monitorSet(setName, 10, (members) => {
-        sbcs = members;
-        logger.info(`sbc-pinger: SBC roster has changed, list of active SBCs is now ${sbcs}`);
-      });
-    }
-
     pingProxies(srf);
   }, 1000);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-feature-server",
-  "version": "0.6.7-rc3",
+  "version": "0.3.1",
   "main": "app.js",
   "engines": {
     "node": ">= 10.16.0"
@@ -28,7 +28,7 @@
   "dependencies": {
     "@jambonz/db-helpers": "^0.6.13",
     "@jambonz/mw-registrar": "^0.2.1",
-    "@jambonz/realtimedb-helpers": "^0.4.8",
+    "@jambonz/realtimedb-helpers": "^0.4.1",
     "@jambonz/stats-collector": "^0.1.5",
     "@jambonz/time-series": "^0.1.5",
     "aws-sdk": "^2.846.0",
@@ -37,7 +37,7 @@
     "debug": "^4.3.1",
     "deepcopy": "^2.1.0",
     "drachtio-fsmrf": "^2.0.7",
-    "drachtio-srf": "^4.4.55",
+    "drachtio-srf": "^4.4.50",
     "express": "^4.17.1",
     "ip": "^1.1.5",
     "moment": "^2.29.1",