remove config in favor of env vars, other major changes

lib/tasks/dial.js

@@ -5,7 +5,6 @@ const assert = require('assert');
 const placeCall = require('../utils/place-outdial');
 const sessionTracker = require('../session/session-tracker');
 const DtmfCollector = require('../utils/dtmf-collector');
-const config = require('config');
 const debug = require('debug')('jambonz:feature-server');
 
 function parseDtmfOptions(logger, dtmfCapture) {
@@ -129,11 +128,11 @@ class TaskDial extends Task {
       this._installDtmfDetection(cs, this.epOther, this.parentDtmfCollector);
       await this._attemptCalls(cs);
       await this.awaitTaskDone();
-      await cs.requestor.request(this.actionHook, Object.assign({}, cs.callInfo, this.results));
+      await this.performAction(Object.assign({}, cs.callInfo, this.results));
       this._removeDtmfDetection(cs, this.epOther);
       this._removeDtmfDetection(cs, this.ep);
     } catch (err) {
-      this.logger.error(`TaskDial:exec terminating with error ${err.message}`);
+      this.logger.error({err}, 'TaskDial:exec terminating with error');
       this.kill();
     }
   }
@@ -147,7 +146,7 @@ class TaskDial extends Task {
       this.sd.kill();
       this.sd = null;
     }
-    sessionTracker.remove(this.callSid);
+    if (this.callSid) sessionTracker.remove(this.callSid);
     if (this.listenTask) await this.listenTask.kill();
     if (this.transcribeTask) await this.transcribeTask.kill();
     if (this.timerMaxCallDuration) clearTimeout(this.timerMaxCallDuration);
@@ -242,7 +241,7 @@ class TaskDial extends Task {
 
     const sbcAddress = cs.direction === CallDirection.Inbound ?
       `${req.source_address}:${req.source_port}` :
-      config.get('outdials.sbc');
+      srf.locals.sbcs[0];
     const opts = {
       headers: req && req.has('X-CID') ? Object.assign(this.headers, {'X-CID': req.get('X-CID')}) : this.headers,
       proxy: `sip:${sbcAddress}`,

lib/tasks/rest_dial.js

@@ -1,5 +1,7 @@
 const Task = require('./task');
 const {TaskName} = require('../utils/constants');
+const makeTask = require('./make_task');
+const normalizeJamones = require('../utils/normalize-jamones');
 
 /**
  * Manages an outdial made via REST API
@@ -44,12 +46,17 @@ class TaskRestDial extends Task {
     this.req = null;
     const cs = this.callSession;
     cs.setDialog(dlg);
-    const tasks = await cs.requestor.request(this.call_hook, cs.callInfo);
-    if (tasks && Array.isArray(tasks)) {
-      this.logger.debug({tasks: tasks}, `TaskRestDial: replacing application with ${tasks.length} tasks`);
-      cs.replaceApplication(tasks);
+
+    try {
+      const tasks = await cs.requestor.request(this.call_hook, cs.callInfo);
+      if (tasks && Array.isArray(tasks)) {
+        this.logger.debug({tasks: tasks}, `TaskRestDial: replacing application with ${tasks.length} tasks`);
+        cs.replaceApplication(normalizeJamones(this.logger, tasks).map((tdata) => makeTask(this.logger, tdata)));
+      }
+    } catch (err) {
+      this.logger.error(err, 'TaskRestDial:_onConnect error retrieving or parsing application, ending call');
+      this.notifyTaskDone();
     }
-    this.notifyTaskDone();
   }
 
   _onCallStatus(status) {

lib/tasks/specs.json

@@ -116,8 +116,15 @@
   },
   "rest:dial": {
     "properties": {
+      "account_sid": "string",
+      "application_sid": "string",
       "call_hook": "object|string",
+      "call_status_hook": "object|string",
       "from": "string",
+      "speech_synthesis_vendor": "string",
+      "speech_synthesis_voice": "string",
+      "speech_recognizer_vendor": "string",
+      "speech_recognizer_language": "string",
       "tag": "object",
       "to": "#target",
       "timeout": "number"