many changes from testing

lib/utils/place-outdial.js

@@ -5,6 +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 registrar = new Registrar({
+  host: process.env.JAMBONES_REDIS_HOST,
+  port: process.env.JAMBONES_REDIS_PORT || 6379
+});
+
 const moment = require('moment');
 const uuidv4 = require('uuid/v4');
 
@@ -52,28 +59,39 @@ class SingleDialer extends Emitter {
 
   async exec(srf, ms, opts) {
     let uri, to;
-    switch (this.target.type) {
-      case 'phone':
-        assert(this.target.number);
-        uri = `sip:${this.target.number}@${this.sbcAddress}`;
-        to = this.target.number;
-        break;
-      case 'user':
-        assert(this.target.name);
-        uri = `sip:${this.target.name}`;
-        to = this.target.name;
-        break;
-      case 'sip':
-        assert(this.target.sipUri);
-        uri = this.target.sipUri;
-        to = this.target.sipUri;
-        break;
-      default:
-        // should have been caught by parser
-        assert(false, `invalid dial type ${this.target.type}: must be phone, user, or sip`);
-    }
-
     try {
+      switch (this.target.type) {
+        case 'phone':
+          assert(this.target.number);
+          uri = `sip:${this.target.number}@${this.sbcAddress}`;
+          to = this.target.number;
+          break;
+        case 'user':
+          assert(this.target.name);
+          const aor = this.target.name;
+          uri = `sip:${this.target.name}`;
+          to = this.target.name;
+
+          // 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);
+          uri = this.target.sipUri;
+          to = this.target.sipUri;
+          break;
+        default:
+          // should have been caught by parser
+          assert(false, `invalid dial type ${this.target.type}: must be phone, user, or sip`);
+      }
+
       this.updateCallStatus = srf.locals.dbHelpers.updateCallStatus;
       this.serviceUrl = srf.locals.serviceUrl;
 

lib/utils/requestor.js

@@ -41,6 +41,9 @@ class Requestor {
 
     assert(isAbsoluteUrl(this.url));
     assert(['GET', 'POST'].includes(this.method));
+
+    const {stats} = require('../../').srf.locals;
+    this.stats = stats;
   }
 
   get baseUrl() {
@@ -65,14 +68,26 @@ class Requestor {
     const {username, password} = typeof hook === 'object' ? hook : {};
 
     assert.ok(url, 'Requestor:request url was not provided');
-    assert.ok, (['GET', 'POST'].includes(method), `Requestor:request method must be 'GET' or 'POST' not ${method}`);
-
+    assert.ok, (['GET', 'POST'].includes(method), `Requestor:request method must be 'GET' or 'POST' not ${method}`); 
 
     this.logger.debug({hook, params}, `Requestor:request ${method} ${url}`);
-    const buf = isRelativeUrl(url) ?
-      await this.post(url, params, this.authHeader) :
-      await bent(method, 'buffer', 200, 201)(url, params, basicAuth(username, password));
-    this.logger.debug(`Requestor:request ${method} ${url} succeeded`);
+    const startAt = process.hrtime();
+
+    let buf;
+    try {
+      buf = isRelativeUrl(url) ?
+        await this.post(url, params, this.authHeader) :
+        await bent(method, 'buffer', 200, 201)(url, params, basicAuth(username, password));
+    } catch (err) {
+      this.logger.info({baseUrl: this.baseUrl, url: err.statusCode}, 
+        `web callback returned unexpected error code ${err.statusCode}`);
+      throw err;
+    }
+    const diff = process.hrtime(startAt);
+    const time = diff[0] * 1e3 + diff[1] * 1e-6;
+    const rtt = time.toFixed(0);
+    this.logger.debug(`Requestor:request ${method} ${url} succeeded in ${rtt}ms`);
+    if (buf) this.stats.histogram('app.hook.response_time', rtt, ['hook_type:app']);
 
     if (buf && buf.toString().length > 0) {
       try {

lib/utils/sbc-pinger.js

@@ -11,7 +11,7 @@ module.exports = (logger) => {
   assert.ok(process.env.JAMBONES_SBCS, 'missing JAMBONES_SBCS env var');
   const sbcs = process.env.JAMBONES_SBCS
     .split(',')
-    .map((sbc) => `sip:${sbc.trim()}`);
+    .map((sbc) => sbc.trim());
   assert.ok(sbcs.length, 'JAMBONES_SBCS env var is empty or misconfigured');
   logger.info({sbcs}, 'SBC inventory');
 
@@ -43,7 +43,7 @@ module.exports = (logger) => {
     for (const sbc of sbcs) {
       try {
         const req = await srf.request({
-          uri: sbc,
+          uri: `sip:${sbc}`,
           method: 'OPTIONS',
           headers: {
             'X-FS-Status': 'open'

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}`;
+};