fix: upgrade @jambonz/stats-collector from 0.1.5 to 0.1.6

Snyk has created this PR to upgrade @jambonz/stats-collector from 0.1.5 to 0.1.6.

See this package in npm:
https://www.npmjs.com/package/@jambonz/stats-collector

See this project in Snyk:
https://app.snyk.io/org/davehorton/project/cec90d0e-0ded-433e-a42e-fe78b28ae489?utm_source=github&utm_medium=referral&page=upgrade-pr

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:17-slim
+FROM node:16
 WORKDIR /opt/app/
 COPY package.json ./
 RUN npm install

app.js

@@ -7,7 +7,7 @@ assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACH
 assert.ok(process.env.DRACHTIO_SECRET, 'missing DRACHTIO_SECRET env var');
 assert.ok(process.env.JAMBONES_FREESWITCH, 'missing JAMBONES_FREESWITCH env var');
 assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
-assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_SUBNET env var');
+assert.ok(process.env.JAMBONES_NETWORK_CIDR, 'missing JAMBONES_SUBNET env var');
 
 const Srf = require('drachtio-srf');
 const srf = new Srf();
@@ -17,7 +17,7 @@ const opts = {
   level: process.env.JAMBONES_LOGLEVEL || 'info'
 };
 const logger = require('pino')(opts);
-const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
+const {LifeCycleEvents} = require('./lib/utils/constants');
 const installSrfLocals = require('./lib/utils/install-srf-locals');
 installSrfLocals(srf, logger);
 
@@ -92,10 +92,6 @@ sessionTracker.on('idle', () => {
   }
 });
 
-const getCount = () => sessionTracker.count;
-const healthCheck = require('@jambonz/http-health-check');
-healthCheck({app, logger, path: '/', fn: getCount});
-
 setInterval(() => {
   srf.locals.stats.gauge('fs.sip.calls.count', sessionTracker.count);
 }, 5000);
@@ -117,7 +113,6 @@ function handle(signal) {
   const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
   logger.info(`got signal ${signal}, removing ${srf.locals.localSipAddress} from set ${setName}`);
   removeFromSet(setName, srf.locals.localSipAddress);
-  removeFromSet(FS_UUID_SET_NAME, srf.locals.fsUUID);
   srf.locals.disabled = true;
 }
 

bin/k8s-pre-stop-hook.js

@@ -1,29 +0,0 @@
-#!/usr/bin/env node
-const bent = require('bent');
-const getJSON = bent('json');
-const PORT = process.env.HTTP_PORT || 3000;
-
-const sleep = (ms) => {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-};
-
-(async function() {
-
-  try {
-    do {
-      const obj = await getJSON(`http://127.0.0.1:${PORT}/`);
-      const {calls} = obj;
-      if (calls === 0) {
-        console.log('no calls on the system, we can exit');
-        process.exit(0);
-      }
-      else {
-        console.log(`waiting for ${calls} to exit..`);
-      }
-      await sleep(10000);
-    } while (1);
-  } catch (err) {
-    console.error(err, 'Error querying health endpoint');
-    process.exit(-1);
-  }
-})();

lib/http-routes/api/index.js

@@ -9,4 +9,8 @@ api.use('/enqueue', require('./enqueue'));
 api.use('/messaging', require('./messaging'));            // inbound SMS
 api.use('/createMessage', require('./create-message'));   // outbound SMS (REST)
 
+// health checks
+api.get('/', (req, res) => res.sendStatus(200));
+api.get('/health', (req, res) => res.sendStatus(200));
+
 module.exports = api;

lib/http-routes/index.js

@@ -1,23 +1,16 @@
 const express = require('express');
 const api = require('./api');
 const routes = express.Router();
-const sessionTracker = require('../session/session-tracker');
-
-const readiness = (req, res) => {
-  const logger = req.app.locals.logger;
-  const {count} = sessionTracker;
-  const {srf} = require('../..');
-  const {getFreeswitch} = srf.locals;
-  if (getFreeswitch()) {
-    return res.status(200).json({calls: count});
-  }
-  logger.info('responding to /health check with failure as freeswitch is not up');
-  res.sendStatus(480);
-};
 
 routes.use('/v1', api);
 
-// health check
-routes.get('/health', readiness);
+// health checks
+routes.get('/', (req, res) => {
+  res.sendStatus(200);
+});
+
+routes.get('/health', (req, res) => {
+  res.sendStatus(200);
+});
 
 module.exports = routes;

lib/middleware.js

@@ -8,13 +8,7 @@ const normalizeJambones = require('./utils/normalize-jambones');
 const dbUtils = require('./utils/db-utils');
 
 module.exports = function(srf, logger) {
-  const {
-    lookupAppByPhoneNumber,
-    lookupAppByRegex,
-    lookupAppBySid,
-    lookupAppByRealm,
-    lookupAppByTeamsTenant
-  }  = srf.locals.dbHelpers;
+  const {lookupAppByPhoneNumber, lookupAppBySid, lookupAppByRealm, lookupAppByTeamsTenant}  = srf.locals.dbHelpers;
   const {lookupAccountDetails} = dbUtils(logger, srf);
   function initLocals(req, res, next) {
     const callSid = req.has('X-Retain-Call-Sid') ? req.get('X-Retain-Call-Sid') : uuidv4();
@@ -118,15 +112,7 @@ module.exports = function(srf, logger) {
             logger.error(err, `Error retrieving transferred call app for ${arr[1]}`);
           }
         }
-        else {
-          const voip_carrier_sid = req.get('X-Voip-Carrier-Sid');
-          app = await lookupAppByPhoneNumber(req.locals.calledNumber, voip_carrier_sid);
-
-          if (!app) {
-            /* lookup by call_routes.regex */
-            app = await lookupAppByRegex(req.locals.calledNumber, account_sid);
-          }
-        }
+        else app = await lookupAppByPhoneNumber(req.locals.calledNumber);
       }
 
       if (!app || !app.call_hook || !app.call_hook.url) {

lib/session/call-session.js

@@ -780,19 +780,9 @@ class CallSession extends Emitter {
 
   async _onReinvite(req, res) {
     try {
-      if (this.ep) {
-        const newSdp = await this.ep.modify(req.body);
-        res.send(200, {body: newSdp});
-        this.logger.info({offer: req.body, answer: newSdp}, 'handling reINVITE');
-      }
-      else if (this.currentTask && this.currentTask.name === TaskName.Dial) {
-        this.logger.info('handling reINVITE after media has been released');
-        await this.currentTask.handleReinviteAfterMediaReleased(req, res);
-      }
-      else {
-        this.logger.info('got reINVITE but no endpoint and media has not been released');
-        res.send(488);
-      }
+      const newSdp = await this.ep.modify(req.body);
+      res.send(200, {body: newSdp});
+      this.logger.info({offer: req.body, answer: newSdp}, 'handling reINVITE');
     } catch (err) {
       this.logger.error(err, 'Error handling reinvite');
     }
@@ -963,13 +953,6 @@ class CallSession extends Emitter {
     });
   }
 
-  async handleReinviteAfterMediaReleased(req, res) {
-    assert(this.dlg && this.dlg.connected && !this.ep);
-    const sdp = await this.dlg.modify(req.body);
-    this.logger.info({sdp}, 'CallSession:handleReinviteAfterMediaReleased - reinvite to A leg returned sdp');
-    res.send(200, {body: sdp});
-  }
-
   /**
    * Called any time call status changes.  This method both invokes the
    * call_status_hook callback as well as updates the realtime database

lib/tasks/cognigy.js

@@ -1,248 +0,0 @@
-const Task = require('./task');
-const {TaskName, TaskPreconditions} = require('../utils/constants');
-const makeTask = require('./make_task');
-const { SocketClient } = require('@cognigy/socket-client');
-
-const parseGallery = (obj = {}) => {
-  const {_default} = obj;
-  if (_default) {
-    const {_gallery} = _default;
-    if (_gallery) return _gallery.fallbackText;
-  }
-};
-
-const parseQuickReplies = (obj) => {
-  const {_default} = obj;
-  if (_default) {
-    const {_quickReplies} = _default;
-    if (_quickReplies) return _quickReplies.text || _quickReplies.fallbackText;
-  }
-};
-
-const parseBotText = (evt) => {
-  const {text, data} = evt;
-  if (text) return text;
-
-  switch (data?.type) {
-    case 'quickReplies':
-      return parseQuickReplies(data?._cognigy);
-    case 'gallery':
-      return parseGallery(data?._cognigy);
-    default:
-      break;
-  }
-};
-
-class Cognigy extends Task {
-  constructor(logger, opts) {
-    super(logger, opts);
-    this.preconditions = TaskPreconditions.Endpoint;
-
-    this.url = this.data.url;
-    this.token = this.data.token;
-    this.prompt = this.data.prompt;
-    this.eventHook = this.data?.eventHook;
-    this.actionHook = this.data?.actionHook;
-    this.data = this.data.data || {};
-    this.prompts = [];
-  }
-
-  get name() { return TaskName.Cognigy; }
-
-  get hasReportedFinalAction() {
-    return this.reportedFinalAction || this.isReplacingApplication;
-  }
-
-  async exec(cs, ep) {
-    await super.exec(cs);
-
-    this.ep = ep;
-    try {
-      /* set event handlers and start transcribing */
-      this.on('transcription', this._onTranscription.bind(this, cs, ep));
-      this.on('error', this._onError.bind(this, cs, ep));
-
-      this.transcribeTask = this._makeTranscribeTask();
-      this.transcribeTask.exec(cs, ep, this)
-        .catch((err) => {
-          this.logger.info({err}, 'Cognigy transcribe task returned error');
-          this.notifyTaskDone();
-        });
-      if (this.prompt) {
-        this.sayTask = this._makeSayTask(this.prompt);
-        this.sayTask.exec(cs, ep, this)
-          .catch((err) => {
-            this.logger.info({err}, 'Cognigy say task returned error');
-            this.notifyTaskDone();
-          });
-      }
-
-      /* connect to the bot and send initial data */
-      this.client = new SocketClient(
-        this.url,
-        this.token,
-        {
-          sessionId: cs.callSid,
-          channel: 'jambonz',
-          forceWebsockets: true,
-          reconnection: true,
-          settings: {
-            enableTypingIndicator: false
-          }
-        }
-      );
-      this.client.on('output', this._onBotUtterance.bind(this, cs, ep));
-      this.client.on('typingStatus', this._onBotTypingStatus.bind(this, cs, ep));
-      this.client.on('error', this._onBotError.bind(this, cs, ep));
-      this.client.on('finalPing', this._onBotFinalPing.bind(this, cs, ep));
-      await this.client.connect();
-      this.client.sendMessage('', {...this.data, ...cs.callInfo});
-
-      await this.awaitTaskDone();
-    } catch (err) {
-      this.logger.error({err}, 'Cognigy error');
-      throw err;
-    }
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-    this.logger.debug('Cognigy:kill');
-
-    this.removeAllListeners();
-    this.transcribeTask && this.transcribeTask.kill();
-
-    this.client.removeAllListeners();
-    if (this.client && this.client.connected) this.client.disconnect();
-
-    if (!this.hasReportedFinalAction) {
-      this.reportedFinalAction = true;
-      this.performAction({cognigyResult: 'caller hungup'})
-        .catch((err) => this.logger.info({err}, 'cognigy - error w/ action webook'));
-    }
-
-    if (this.ep.connected) {
-      await this.ep.api('uuid_break', this.ep.uuid).catch((err) => this.logger.info(err, 'Error killing audio'));
-    }
-    this.notifyTaskDone();
-  }
-
-  _makeTranscribeTask() {
-    const opts = {
-      recognizer: this.data.recognizer || {
-        vendor: 'default',
-        language: 'default',
-        outputFormat: 'detailed'
-      }
-    };
-    this.logger.debug({opts}, 'constructing a nested transcribe object');
-    const transcribe = makeTask(this.logger, {transcribe: opts}, this);
-    return transcribe;
-  }
-
-  _makeSayTask(text) {
-    const opts = {
-      text,
-      synthesizer: this.data.synthesizer ||
-      {
-        vendor: 'default',
-        language: 'default',
-        voice: 'default'
-      }
-    };
-    this.logger.debug({opts}, 'constructing a nested say object');
-    const say = makeTask(this.logger, {say: opts}, this);
-    return say;
-  }
-
-  async _onBotError(cs, ep, evt) {
-    this.logger.info({evt}, 'Cognigy:_onBotError');
-    this.performAction({cognigyResult: 'botError', message: evt.message });
-    this.reportedFinalAction = true;
-    this.notifyTaskDone();
-  }
-
-  async _onBotTypingStatus(cs, ep, evt) {
-    this.logger.info({evt}, 'Cognigy:_onBotTypingStatus');
-  }
-  async _onBotFinalPing(cs, ep) {
-    this.logger.info('Cognigy:_onBotFinalPing');
-    if (this.prompts.length) {
-      const text = this.prompts.join('.');
-      this.prompts = [];
-      if (text && !this.killed) {
-        this.sayTask = this._makeSayTask(text);
-        this.sayTask.exec(cs, ep, this)
-          .catch((err) => {
-            this.logger.info({err}, 'Cognigy say task returned error');
-            this.notifyTaskDone();
-          });
-      }
-    }
-  }
-
-  async _onBotUtterance(cs, ep, evt) {
-    this.logger.debug({evt}, 'Cognigy:_onBotUtterance');
-
-    if (this.eventHook) {
-      this.performHook(cs, this.eventHook, {event: 'botMessage', message: evt})
-        .then((redirected) => {
-          if (redirected) {
-            this.logger.info('Cognigy_onTranscription: event handler for bot message redirected us to new webhook');
-            this.reportedFinalAction = true;
-            this.performAction({cognigyResult: 'redirect'}, false);
-          }
-          return;
-        })
-        .catch(({err}) => {
-          this.logger.info({err}, 'Cognigy_onTranscription: error sending event hook');
-        });
-    }
-    const text = parseBotText(evt);
-    this.prompts.push(text);
-  }
-
-  async _onTranscription(cs, ep, evt) {
-    this.logger.debug({evt}, `Cognigy: got transcription for callSid ${cs.callSid}`);
-    const utterance = evt.alternatives[0].transcript;
-
-    if (this.eventHook) {
-      this.performHook(cs, this.eventHook, {event: 'userMessage', message: utterance})
-        .then((redirected) => {
-          if (redirected) {
-            this.logger.info('Cognigy_onTranscription: event handler for user message redirected us to new webhook');
-            this.reportedFinalAction = true;
-            this.performAction({cognigyResult: 'redirect'}, false);
-            if (this.transcribeTask) this.transcribeTask.kill(cs);
-          }
-          return;
-        })
-        .catch(({err}) => {
-          this.logger.info({err}, 'Cognigy_onTranscription: error sending event hook');
-        });
-    }
-
-    /* send the user utterance to the bot */
-    try {
-      if (this.client && this.client.connected) {
-        this.client.sendMessage(utterance);
-      }
-      else {
-        this.logger.info('Cognigy_onTranscription - not sending user utterance as bot is disconnected');
-      }
-    } catch (err) {
-      this.logger.error({err}, 'Cognigy_onTranscription: Error sending user utterance to Cognigy - ending task');
-      this.performAction({cognigyResult: 'socketError'});
-      this.reportedFinalAction = true;
-      this.notifyTaskDone();
-    }
-  }
-  _onError(cs, ep, err) {
-    this.logger.debug({err}, 'Cognigy: got error');
-    if (!this.hasReportedFinalAction) this.performAction({cognigyResult: 'error', err});
-    this.reportedFinalAction = true;
-    this.notifyTaskDone();
-  }
-}
-
-module.exports = Cognigy;

lib/tasks/dial.js

@@ -161,10 +161,6 @@ class TaskDial extends Task {
 
   async kill(cs, reason) {
     super.kill(cs);
-    if (this.dialMusic && this.epOther) {
-      this.epOther.api('uuid_break', this.epOther.uuid)
-        .catch((err) => this.logger.info(err, 'Error killing dialMusic'));
-    }
     this.killReason = reason || KillReason.Hangup;
     if (this.timerMaxCallDuration) {
       clearTimeout(this.timerMaxCallDuration);
@@ -437,13 +433,6 @@ class TaskDial extends Task {
               this.kill(cs);
             }
           })
-          .on('reinvite', (req, res) => {
-            try {
-              cs.handleReinviteAfterMediaReleased(req, res);
-            } catch (err) {
-              this.logger.error(err, 'Error in dial einvite from B leg');
-            }
-          })
           .once('adulting', () => {
             /* child call just adulted and got its own session */
             this.logger.info('Dial:on_adulting: detaching child call leg');
@@ -570,12 +559,6 @@ class TaskDial extends Task {
     await Promise.all([sd.reAnchorMedia(), cs.reAnchorMedia()]);
     this.epOther = cs.ep;
   }
-
-  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});
-  }
 }
 
 module.exports = TaskDial;

lib/tasks/dialogflow/index.js

@@ -452,8 +452,8 @@ class Dialogflow extends Task {
     this.noinputTimer = setTimeout(this._onNoInput.bind(this, ep, cs), this.noInputTimeout);
   }
 
-  async _performHook(cs, hook, results = {}) {
-    const json = await this.cs.requestor.request(hook, {...results, ...cs.callInfo.toJSON()});
+  async _performHook(cs, hook, results) {
+    const json = await this.cs.requestor.request(hook, results);
     if (json && Array.isArray(json)) {
       const makeTask = require('../make_task');
       const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));

lib/tasks/make_task.js

@@ -20,9 +20,6 @@ function makeTask(logger, obj, parent) {
     case TaskName.SipRefer:
       const TaskSipRefer = require('./sip_refer');
       return new TaskSipRefer(logger, data, parent);
-    case TaskName.Cognigy:
-      const TaskCognigy = require('./cognigy');
-      return new TaskCognigy(logger, data, parent);
     case TaskName.Conference:
       const TaskConference = require('./conference');
       return new TaskConference(logger, data, parent);

lib/tasks/say.js

@@ -25,7 +25,7 @@ class TaskSay extends Task {
     const vendor = hasVerbLevelTts ? this.synthesizer.vendor : cs.speechSynthesisVendor ;
     const language = hasVerbLevelTts ? this.synthesizer.language : cs.speechSynthesisLanguage ;
     const voice = hasVerbLevelTts ? this.synthesizer.voice : cs.speechSynthesisVoice ;
-    const platform = this.synthesizer.platform || 'standard';
+
     const salt = cs.callSid;
     const credentials = cs.getSpeechCredentials(vendor, 'tts');
 
@@ -48,7 +48,6 @@ class TaskSay extends Task {
           vendor,
           language,
           voice,
-          platform,
           salt,
           credentials
         }).catch((err) => {

lib/tasks/specs.json

@@ -21,22 +21,6 @@
       "referTo"
     ]
   },
-  "cognigy": {
-    "properties": {
-      "url": "string",
-      "token": "string",
-      "recognizer": "#recognizer",
-      "tts": "#synthesizer",
-      "prompt": "string",
-      "actionHook": "object|string",
-      "eventHook": "object|string",
-      "data": "object"
-    },
-    "required": [
-      "url",
-      "token"
-    ]
-  },
   "dequeue": {
     "properties": {
       "name": "string",
@@ -324,6 +308,7 @@
       "earlyMedia": "boolean"
     },
     "required": [
+      "transcriptionHook",
       "recognizer"
     ]
   },
@@ -344,8 +329,7 @@
       "auth": "#auth",
       "vmail": "boolean",
       "tenant": "string",
-      "trunk": "string",
-      "overrideTo": "string"
+      "trunk": "string"
     },
     "required": [
       "type"
@@ -369,10 +353,6 @@
       },
       "language": "string",
       "voice": "string",
-      "platform": {
-        "type": "string",
-        "enum": ["standard", "neural"]
-      },
       "gender": {
         "type": "string",
         "enum": ["MALE", "FEMALE", "NEUTRAL"]

lib/tasks/transcribe.js

@@ -11,7 +11,6 @@ class TaskTranscribe extends Task {
   constructor(logger, opts, parentTask) {
     super(logger, opts);
     this.preconditions = TaskPreconditions.Endpoint;
-    this.parentTask = parentTask;
 
     this.transcriptionHook = this.data.transcriptionHook;
     this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
@@ -77,7 +76,6 @@ class TaskTranscribe extends Task {
       await this.awaitTaskDone();
     } catch (err) {
       this.logger.info(err, 'TaskTranscribe:exec - error');
-      this.parentTask && this.parentTask.emit('error', err);
     }
     ep.removeCustomEventListener(GoogleTranscriptionEvents.Transcription);
     ep.removeCustomEventListener(GoogleTranscriptionEvents.NoAudioDetected);
@@ -212,36 +210,25 @@ class TaskTranscribe extends Task {
   }
 
   _onTranscription(cs, ep, evt) {
-    this.logger.debug(evt, 'TaskTranscribe:_onTranscription');
     if ('aws' === this.vendor && Array.isArray(evt) && evt.length > 0) evt = evt[0];
     if ('microsoft' === this.vendor) {
       const nbest = evt.NBest;
-      const alternatives = nbest ? nbest.map((n) => {
+      const alternatives = nbest.map((n) => {
         return {
           confidence: n.Confidence,
           transcript: n.Display
         };
-      }) :
-        [
-          {
-            transcript: evt.DisplayText
-          }
-        ];
-
+      });
       const newEvent = {
         is_final: evt.RecognitionStatus === 'Success',
         alternatives
       };
       evt = newEvent;
     }
+    this.logger.debug(evt, 'TaskTranscribe:_onTranscription');
 
-    if (this.transcriptionHook) {
-      this.cs.requestor.request(this.transcriptionHook, Object.assign({speech: evt}, this.cs.callInfo))
-        .catch((err) => this.logger.info(err, 'TranscribeTask:_onTranscription error'));
-    }
-    if (this.parentTask) {
-      this.parentTask.emit('transcription', evt);
-    }
+    this.cs.requestor.request(this.transcriptionHook, Object.assign({speech: evt}, this.cs.callInfo))
+      .catch((err) => this.logger.info(err, 'TranscribeTask:_onTranscription error'));
     if (this.killed) {
       this.logger.debug('TaskTranscribe:_onTranscription exiting after receiving final transcription');
       this._clearTimer();

lib/utils/constants.json

@@ -1,6 +1,5 @@
 {
   "TaskName": {
-    "Cognigy": "cognigy",
     "Conference": "conference",
     "Dequeue": "dequeue",
     "Dial": "dial",
@@ -106,6 +105,5 @@
     "Replaced": "replaced"
   },
   "MAX_SIMRINGS": 10,
-  "BONG_TONE": "tone_stream://v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)",
-  "FS_UUID_SET_NAME": "fsUUIDs"
+  "BONG_TONE": "tone_stream://v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"
 }

lib/utils/install-srf-locals.js

@@ -112,7 +112,6 @@ function installSrfLocals(srf, logger) {
   const {
     pool,
     lookupAppByPhoneNumber,
-    lookupAppByRegex,
     lookupAppBySid,
     lookupAppByRealm,
     lookupAppByTeamsTenant,
@@ -167,7 +166,6 @@ function installSrfLocals(srf, logger) {
       client,
       pool,
       lookupAppByPhoneNumber,
-      lookupAppByRegex,
       lookupAppBySid,
       lookupAppByRealm,
       lookupAppByTeamsTenant,

lib/utils/place-outdial.js

@@ -5,7 +5,13 @@ const {TaskPreconditions, CallDirection} = require('../utils/constants');
 const CallInfo = require('../session/call-info');
 const assert = require('assert');
 const ConfirmCallSession = require('../session/confirm-call-session');
+const selectSbc = require('./select-sbc');
+const Registrar = require('@jambonz/mw-registrar');
 const AdultingCallSession = require('../session/adulting-call-session');
+const registrar = new Registrar({
+  host: process.env.JAMBONES_REDIS_HOST,
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+});
 const deepcopy = require('deepcopy');
 const moment = require('moment');
 const { v4: uuidv4 } = require('uuid');
@@ -57,12 +63,7 @@ class SingleDialer extends Emitter {
   async exec(srf, ms, opts) {
     opts = opts || {};
     opts.headers = opts.headers || {};
-    opts.headers = {
-      ...opts.headers,
-      'X-Jambonz-Routing': this.target.type,
-      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
-      'X-Call-Sid': this.callSid
-    };
+    opts.headers = {...opts.headers, 'X-Call-Sid': this.callSid};
     this.ms = ms;
     let uri, to;
     try {
@@ -83,6 +84,7 @@ class SingleDialer extends Emitter {
           break;
         case 'user':
           assert(this.target.name);
+          const aor = this.target.name;
           uri = `sip:${this.target.name}`;
           to = this.target.name;
 
@@ -91,6 +93,16 @@ class SingleDialer extends Emitter {
               'X-Override-To': this.target.overrideTo
             });
           }
+
+          // need to send to the SBC registered on
+          const reg = await registrar.query(aor);
+          if (reg) {
+            const sbc = selectSbc(reg.sbcAddress);
+            if (sbc) {
+              this.logger.debug(`SingleDialer:exec retrieved registration details for ${aor}, using sbc at ${sbc}`);
+              this.sbcAddress = sbc;
+            }
+          }
           break;
         case 'sip':
           assert(this.target.sipUri);
@@ -197,15 +209,9 @@ class SingleDialer extends Emitter {
         .on('refresh', () => this.logger.info('SingleDialer:exec - dialog refreshed by uas'))
         .on('modify', async(req, res) => {
           try {
-            if (this.ep) {
-              const newSdp = await this.ep.modify(req.body);
-              res.send(200, {body: newSdp});
-              this.logger.info({offer: req.body, answer: newSdp}, 'SingleDialer:exec: handling reINVITE');
-            }
-            else {
-              this.logger.info('SingleDialer:exec: handling reINVITE with released media, emit event');
-              this.emit('reinvite', req, res);
-            }
+            const newSdp = await this.ep.modify(req.body);
+            res.send(200, {body: newSdp});
+            this.logger.info({offer: req.body, answer: newSdp}, 'SingleDialer:exec: handling reINVITE');
           } catch (err) {
             this.logger.error(err, 'Error handling reinvite');
           }

lib/utils/sbc-pinger.js

@@ -1,9 +1,8 @@
 const assert = require('assert');
-const { v4: uuidv4 } = require('uuid');
-const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./constants');
+const noopLogger = {info: () => {}, error: () => {}};
+const {LifeCycleEvents} = require('./constants');
 const Emitter = require('events');
 const debug = require('debug')('jambonz:feature-server');
-const noopLogger = {info: () => {}, error: () => {}};
 
 module.exports = (logger) => {
   logger = logger || noopLogger;
@@ -68,6 +67,7 @@ module.exports = (logger) => {
     })();
   }
 
+  // send OPTIONS pings to SBCs
   async function pingProxies(srf) {
     if (process.env.NODE_ENV === 'test') return;
 
@@ -90,40 +90,29 @@ module.exports = (logger) => {
       }
     }
   }
-  if (process.env.K8S) {
-    setImmediate(() => {
-      logger.info('disabling OPTIONS pings since we are running as a kubernetes service');
-      const {srf} = require('../..');
-      const {addToSet} = srf.locals.dbHelpers;
-      const uuid = srf.locals.fsUUID = uuidv4();
-      addToSet(FS_UUID_SET_NAME, uuid)
-        .catch((err) => logger.info({err}, `Error adding ${uuid} to set ${FS_UUID_SET_NAME}`));
-    });
-  }
-  else {
-    // OPTIONS ping the SBCs from each feature server every 60 seconds
-    setInterval(() => {
-      const {srf} = require('../..');
-      pingProxies(srf);
-    }, process.env.OPTIONS_PING_INTERVAL || 30000);
 
-    // initial ping once we are up
-    setTimeout(async() => {
+  // OPTIONS ping the SBCs from each feature server every 60 seconds
+  setInterval(() => {
+    const {srf} = require('../..');
+    pingProxies(srf);
+  }, process.env.OPTIONS_PING_INTERVAL || 30000);
 
-      // if SBCs are auto-scaling, monitor them as they come and go
-      const {srf} = require('../..');
-      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}`);
-        });
-      }
+  // initial ping once we are up
+  setTimeout(async() => {
+    const {srf} = require('../..');
 
-      pingProxies(srf);
-    }, 1000);
-  }
+    // 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);
 
   return {
     lifecycleEmitter,

lib/utils/select-sbc.js

@@ -0,0 +1,13 @@
+const CIDRMatcher = require('cidr-matcher');
+const matcher = new CIDRMatcher([process.env.JAMBONES_NETWORK_CIDR]);
+
+module.exports = (sbcList) => {
+  const obj = sbcList
+    .split(',')
+    .map((str) => {
+      const arr = /^(.*)\/(.*):(\d+)$/.exec(str);
+      return {protocol: arr[1], host: arr[2], port: arr[3]};
+    })
+    .find((obj) => 'udp' == obj.protocol && matcher.contains(obj.host));
+  if (obj) return `${obj.host}:${obj.port}`;
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jambonz-feature-server",
-  "version": "v0.7.1",
+  "version": "v0.7.0",
   "main": "app.js",
   "engines": {
     "node": ">= 10.16.0"
@@ -26,25 +26,23 @@
     "jslint": "eslint app.js lib"
   },
   "dependencies": {
-    "@cognigy/socket-client": "^4.5.5",
-    "@jambonz/db-helpers": "^0.6.16",
-    "@jambonz/http-health-check": "^0.0.1",
+    "@jambonz/db-helpers": "^0.6.14",
     "@jambonz/mw-registrar": "^0.2.1",
-    "@jambonz/realtimedb-helpers": "^0.4.15",
+    "@jambonz/realtimedb-helpers": "^0.4.10",
     "@jambonz/stats-collector": "^0.1.6",
     "@jambonz/time-series": "^0.1.5",
-    "aws-sdk": "^2.1060.0",
+    "aws-sdk": "^2.846.0",
     "bent": "^7.3.12",
     "cidr-matcher": "^2.1.1",
-    "debug": "^4.3.2",
+    "debug": "^4.3.1",
     "deepcopy": "^2.1.0",
     "drachtio-fsmrf": "^2.0.13",
     "drachtio-srf": "^4.4.55",
     "express": "^4.17.1",
     "ip": "^1.1.5",
     "moment": "^2.29.1",
-    "parse-url": "^5.0.7",
-    "pino": "^6.13.2",
+    "parse-url": "^5.0.2",
+    "pino": "^6.11.2",
     "to-snake-case": "^1.0.0",
     "uuid": "^8.3.2",
     "verify-aws-sns-signature": "^0.0.6",

test/docker-compose-testbed.yaml

@@ -9,7 +9,6 @@ networks:
 services:
   mysql:
     image: mysql:5.7
-    platform: linux/x86_64
     ports:
       - "3360:3306"
     environment: 
@@ -124,7 +123,7 @@ services:
         ipv4_address: 172.38.0.63
 
   influxdb:
-    image: influxdb:1.8
+    image: influxdb:1.8-alpine
     ports:
       - "8086:8086"
     networks: