add custom headers to outdial, save unique uuid for running FS to redis

Dockerfile

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

app.js

@@ -17,7 +17,7 @@ const opts = {
   level: process.env.JAMBONES_LOGLEVEL || 'info'
 };
 const logger = require('pino')(opts);
-const {LifeCycleEvents} = require('./lib/utils/constants');
+const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
 const installSrfLocals = require('./lib/utils/install-srf-locals');
 installSrfLocals(srf, logger);
 
@@ -117,6 +117,7 @@ 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;
 }
 

lib/utils/constants.json

@@ -106,5 +106,6 @@
     "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)"
+  "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"
 }

lib/utils/place-outdial.js

@@ -63,7 +63,12 @@ class SingleDialer extends Emitter {
   async exec(srf, ms, opts) {
     opts = opts || {};
     opts.headers = opts.headers || {};
-    opts.headers = {...opts.headers, 'X-Call-Sid': this.callSid};
+    opts.headers = {
+      ...opts.headers,
+      'X-Jambonz-Routing': this.target.type,
+      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
+      'X-Call-Sid': this.callSid
+    };
     this.ms = ms;
     let uri, to;
     try {

lib/utils/sbc-pinger.js

@@ -1,8 +1,9 @@
 const assert = require('assert');
-const noopLogger = {info: () => {}, error: () => {}};
-const {LifeCycleEvents} = require('./constants');
+const { v4: uuidv4 } = require('uuid');
+const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./constants');
 const Emitter = require('events');
 const debug = require('debug')('jambonz:feature-server');
+const noopLogger = {info: () => {}, error: () => {}};
 
 module.exports = (logger) => {
   logger = logger || noopLogger;
@@ -89,9 +90,13 @@ module.exports = (logger) => {
       }
     }
   }
-
+  const {srf} = require('../..');
   if (process.env.K8S) {
     logger.info('disabling OPTIONS pings since we are running as a kubernetes service');
+    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
@@ -102,7 +107,6 @@ module.exports = (logger) => {
 
     // initial ping once we are up
     setTimeout(async() => {
-      const {srf} = require('../..');
 
       // if SBCs are auto-scaling, monitor them as they come and go
       if (!process.env.JAMBONES_SBCS) {

test/docker-compose-testbed.yaml

@@ -123,7 +123,7 @@ services:
         ipv4_address: 172.38.0.63
 
   influxdb:
-    image: influxdb:1.8-alpine
+    image: influxdb:1.8
     ports:
       - "8086:8086"
     networks: