major revamp of http client functionalit

lib/utils/place-outdial.js

@@ -5,9 +5,7 @@ const {TaskPreconditions, CallDirection} = require('../utils/constants');
 const CallInfo = require('../session/call-info');
 const assert = require('assert');
 const ConfirmCallSession = require('../session/confirm-call-session');
-const hooks = require('./notifiers');
 const moment = require('moment');
-const parseUrl = require('parse-url');
 const uuidv4 = require('uuid/v4');
 
 class SingleDialer extends Emitter {
@@ -20,8 +18,7 @@ class SingleDialer extends Emitter {
     this.sbcAddress = sbcAddress;
     this.opts = opts;
     this.application = application;
-    this.url = target.url;
-    this.method = target.method;
+    this.confirmHook = target.confirmHook;
 
     this.bindings = logger.bindings();
 
@@ -37,6 +34,22 @@ class SingleDialer extends Emitter {
     return this.callInfo.callStatus;
   }
 
+  /**
+   * can be used for all http requests within this session
+   */
+  get requestor() {
+    assert(this.application.requestor);
+    return this.application.requestor;
+  }
+
+  /**
+   * can be used for all http call status notifications within this session
+   */
+  get notifier() {
+    assert(this.application.notifier);
+    return this.application.notifier;
+  }
+
   async exec(srf, ms, opts) {
     let uri, to;
     switch (this.target.type) {
@@ -106,9 +119,6 @@ class SingleDialer extends Emitter {
             callId: this.callInfo.callId
           });
           this.inviteInProgress = req;
-          const {actionHook, notifyHook} = hooks(this.logger, this.callInfo);
-          this.actionHook = actionHook;
-          this.notifyHook = notifyHook;
           this.emit('callStatusChange', {callStatus: CallStatus.Trying, sipStatus: 100});
         },
         cbProvisional: (prov) => {
@@ -135,7 +145,7 @@ class SingleDialer extends Emitter {
         this.ep.destroy();
       });
 
-      if (this.url) this._executeApp(this.url);
+      if (this.confirmHook) this._executeApp(this.confirmHook);
       else this.emit('accept');
     } catch (err) {
       const status = {callStatus: CallStatus.Failed};
@@ -178,29 +188,12 @@ class SingleDialer extends Emitter {
    * Note: the application to run may not include a dial or sip:decline verb
    * @param {*} url - url for application
    */
-  async _executeApp(url) {
-    this.logger.debug(`SingleDialer:_executeApp: executing ${url} after connect`);
+  async _executeApp(confirmHook) {
     try {
-      let auth, method;
-      const app = Object.assign({}, this.application);
-      if (url.startsWith('/')) {
-        const savedUrl = url;
-        const or = app.originalRequest;
-        url = `${or.baseUrl}${url}`;
-        auth = or.auth;
-        method = this.method || or.method || 'POST';
-        this.logger.debug({originalUrl: savedUrl, normalizedUrl: url}, 'SingleDialer:_executeApp normalized url');
-      }
-      else {
-        const u = parseUrl(url);
-        const myPort = u.port ? `:${u.port}` : '';
-        app.originalRequest = {
-          baseUrl: `${u.protocol}://${u.resource}${myPort}`
-        };
-        method = this.method || 'POST';
-      }
+      // retrieve set of tasks
+      const tasks = await this.requestor.request(confirmHook, this.callInfo);
 
-      const tasks = await this.actionHook({url, method, auth});
+      // verify it contains only allowed verbs
       const allowedTasks = tasks.filter((task) => {
         return [
           TaskPreconditions.StableCall,
@@ -211,16 +204,19 @@ class SingleDialer extends Emitter {
         throw new Error('unsupported verb in dial url');
       }
 
+      // now execute it in a new ConfirmCallSession
       this.logger.debug(`SingleDialer:_executeApp: executing ${tasks.length} tasks`);
       const cs = new ConfirmCallSession({
         logger: this.logger,
-        application: app,
+        application: this.application,
         dlg: this.dlg,
         ep: this.ep,
         callInfo: this.callInfo,
         tasks
       });
       await cs.exec();
+
+      // still connected after app is completed?  Signal parent call we are good
       this.emit(this.dlg.connected ? 'accept' : 'decline');
     } catch (err) {
       this.logger.debug(err, 'SingleDialer:_executeApp: error');
@@ -233,6 +229,7 @@ class SingleDialer extends Emitter {
     assert((typeof duration === 'number' && callStatus === CallStatus.Completed) ||
       (!duration && callStatus !== CallStatus.Completed),
     'duration MUST be supplied when call completed AND ONLY when call completed');
+
     this.callInfo.updateCallStatus(callStatus, sipStatus);
     if (typeof duration === 'number') this.callInfo.duration = duration;
     try {