further fixes for #210

.gitignore

@@ -40,5 +40,4 @@ examples/*
 ecosystem.config.js
 .vscode
 test/credentials/*.json
-run-tests.sh
-run-coverage.sh
+run-tests.sh

lib/middleware.js

@@ -245,9 +245,7 @@ module.exports = function(srf, logger) {
 
       // eslint-disable-next-line no-unused-vars
       const {call_hook, call_status_hook, ...appInfo} = app;  // mask sensitive data like user/pass on webhook
-      // eslint-disable-next-line no-unused-vars
-      const {requestor, notifier, ...loggable} = appInfo;
-      logger.info({app: loggable}, `retrieved application for incoming call to ${req.locals.calledNumber}`);
+      logger.info({app: appInfo}, `retrieved application for incoming call to ${req.locals.calledNumber}`);
       req.locals.callInfo = new CallInfo({
         req,
         app: app2,

lib/session/call-session.js

@@ -114,10 +114,6 @@ class CallSession extends Emitter {
     return this.callInfo.applicationSid;
   }
 
-  get callStatus() {
-    return this.callInfo.callStatus;
-  }
-
   /**
    * SIP call-id for the call
    */
@@ -471,10 +467,10 @@ class CallSession extends Emitter {
       this.backgroundGatherTask = makeTask(this.logger, t[0]);
       this._bargeInEnabled = true;
       this.backgroundGatherTask
-        .once('dtmf', this._clearTasks.bind(this, this.backgroundGatherTask))
-        .once('vad', this._clearTasks.bind(this, this.backgroundGatherTask))
-        .once('transcription', this._clearTasks.bind(this, this.backgroundGatherTask))
-        .once('timeout', this._clearTasks.bind(this, this.backgroundGatherTask));
+        .once('dtmf', this._clearTasks.bind(this))
+        .once('vad', this._clearTasks.bind(this))
+        .once('transcription', this._clearTasks.bind(this))
+        .once('timeout', this._clearTasks.bind(this));
       this.logger.info({gather}, 'CallSession:enableBotMode - starting background gather');
       const resources = await this._evaluatePreconditions(this.backgroundGatherTask);
       const {span, ctx} = this.rootSpan.startChildSpan(`background-gather:${this.backgroundGatherTask.summary}`);
@@ -667,7 +663,7 @@ class CallSession extends Emitter {
         }
       }
 
-      if (0 === this.tasks.length && this.requestor instanceof WsRequestor && !this.callGone) {
+      if (0 === this.tasks.length && this.hasStableDialog && this.requestor instanceof WsRequestor) {
         let span;
         try {
           const {span} = this.rootSpan.startChildSpan('waiting for commands');
@@ -678,7 +674,7 @@ class CallSession extends Emitter {
             'async.request.command': command
           });
           span.end();
-          if (this.callGone) break;
+          if (!this.hasStableDialog || this.callGone) break;
         } catch (err) {
           span.end();
           this.logger.info(err, 'CallSession:exec - error waiting for new commands');
@@ -1037,32 +1033,14 @@ class CallSession extends Emitter {
     }
   }
 
-  kill(onBackgroundGatherBargein = false) {
+  kill() {
     if (this.isConfirmCallSession) this.logger.debug('CallSession:kill (ConfirmSession)');
     else this.logger.info('CallSession:kill');
     if (this.currentTask) {
       this.currentTask.kill(this);
       this.currentTask = null;
     }
-    if (onBackgroundGatherBargein) {
-      /* search for a config with bargein disabled */
-      while (this.tasks.length) {
-        const t = this.tasks[0];
-        if (t.name === TaskName.Config && t.bargeIn?.enable === false) {
-          /* found it, clear to that point and remove the disable
-            because we likely already received a partial transcription
-            and we don't want to kill the background gather before we
-            get the full transcription.
-          */
-          delete t.bargeIn.enable;
-          this._bargeInEnabled = false;
-          this.logger.info('CallSession:kill - found bargein disabled in the stack, clearing to that point');
-          break;
-        }
-        this.tasks.shift();
-      }
-    }
-    else this.tasks = [];
+    this.tasks = [];
     this.taskIdx = 0;
   }
 
@@ -1682,12 +1660,11 @@ class CallSession extends Emitter {
     });
   }
 
-  _clearTasks(backgroundGather, evt) {
-    if (this.requestor instanceof WsRequestor && !backgroundGather.cleared) {
+  _clearTasks(evt) {
+    if (this.requestor instanceof WsRequestor) {
       this.logger.info({evt}, 'CallSession:_clearTasks on event from background gather');
       try {
-        backgroundGather.cleared = true;
-        this.kill(true);
+        this.kill();
       } catch (err) {}
     }
   }

lib/tasks/conference.js

@@ -108,10 +108,6 @@ class Conference extends Task {
   async kill(cs) {
     super.kill(cs);
     this.logger.info(`Conference:kill ${this.confName}`);
-    if (this._playSession) {
-      this._playSession.kill();
-      this._playSession = null;
-    }
     this.emitter.emit('kill');
     await this._doFinalMemberCheck(cs);
     if (this.ep && this.ep.connected) this.ep.conn.removeAllListeners('esl::event::CUSTOM::*') ;
@@ -431,19 +427,13 @@ class Conference extends Task {
         .catch((err) => this.logger.info({err}, 'Error deafing or undeafing participant'));
     }
 
-    if (wait_hook) {
-      if (this.wait_hook)
-        delete this.wait_hook.url;
-      this.wait_hook = {url: wait_hook};
-    }
-
     if (hookOnly && this._playSession) {
       this._playSession.kill();
       this._playSession = null;
     }
-    if (this.wait_hook?.url && this.conf_hold_status === 'hold') {
+    if (wait_hook && this.conf_hold_status === 'hold') {
       const {dlg} = cs;
-      this._doWaitHookWhileOnHold(cs, dlg, this.wait_hook);
+      this._doWaitHookWhileOnHold(cs, dlg, wait_hook);
     }
     else if (this.conf_hold_status !== 'hold' && this._playSession) {
       this._playSession.kill();
@@ -454,9 +444,7 @@ class Conference extends Task {
   async _doWaitHookWhileOnHold(cs, dlg, wait_hook) {
     do {
       try {
-        let tasks = [];
-        if (wait_hook.url)
-          tasks = await this._playHook(cs, dlg, wait_hook.url);
+        const tasks = await this._playHook(cs, dlg, wait_hook);
         if (0 === tasks.length) break;
       } catch (err) {
         if (!this.killed) {
@@ -583,10 +571,6 @@ class Conference extends Task {
    */
   _kicked(cs, dlg) {
     this.logger.info(`Conference:kicked - I was dropped from conference ${this.confName}, task is complete`);
-    if (this._playSession) {
-      this._playSession.kill();
-      this._playSession = null;
-    }
     this.replaceEndpointAndEnd(cs);
   }
 

lib/tasks/gather.js

@@ -141,23 +141,9 @@ class TaskGather extends Task {
         asrDtmfTerminationDigit: this.asrDtmfTerminationDigit
       }, 'Gather:exec - enabling continuous ASR since it is turned on for the session');
     }
-    if (process.env.JAMBONZ_GATHER_EARLY_HINTS_MATCH &&
-      !this.isContinuousAsr &&
-      this.hints.length > 0 && this.hints.length <= 10) {
-      this.earlyHintsMatch = true;
-      this.interim = true;
-      this.logger.debug('Gather:exec - early hints match enabled');
-    }
-
     this.ep = ep;
-    if ('default' === this.vendor || !this.vendor) {
-      this.vendor = cs.speechRecognizerVendor;
-      if (this.data.recognizer) this.data.recognizer.vendor = this.vendor;
-    }
-    if ('default' === this.language || !this.language) {
-      this.language = cs.speechRecognizerLanguage;
-      if (this.data.recognizer) this.data.recognizer.language = this.language;
-    }
+    if ('default' === this.vendor || !this.vendor) this.vendor = cs.speechRecognizerVendor;
+    if ('default' === this.language || !this.language) this.language = cs.speechRecognizerLanguage;
     if (!this.data.recognizer.vendor) {
       this.data.recognizer.vendor = this.vendor;
     }
@@ -170,10 +156,8 @@ class TaskGather extends Task {
         alert_type: AlertType.STT_NOT_PROVISIONED,
         vendor: this.vendor
       }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
-      // Notify application that STT vender is wrong.
-      this.notifyError(`No speech-to-text service credentials for ${this.vendor} have been configured`);
-      this.notifyTaskDone();
-      throw new Error(`No speech-to-text service credentials for ${this.vendor} have been configured`);
+
+      throw new Error(`no speech-to-text service credentials for ${this.vendor} have been configured`);
     }
 
     this.logger.info({sttCredentials: this.sttCredentials}, 'Gather:exec - sttCredentials');
@@ -395,8 +379,6 @@ class TaskGather extends Task {
         break;
 
       default:
-        this.notifyError(`Invalid vendor ${this.vendor}`);
-        this.notifyTaskDone();
         throw new Error(`Invalid vendor ${this.vendor}`);
     }
 
@@ -502,10 +484,6 @@ class TaskGather extends Task {
     this.logger.debug({evt, bugname, finished}, 'Gather:_onTranscription');
     if (bugname && this.bugname !== bugname) return;
 
-    if (this.vendor === 'ibm') {
-      if (evt?.state === 'listening') return;
-    }
-
     evt = this.normalizeTranscription(evt, this.vendor, 1, this.language);
 
     /* count words for bargein feature */

lib/tasks/hangup.js

@@ -18,7 +18,6 @@ class TaskHangup extends Task {
     await super.exec(cs);
     try {
       await dlg.destroy({headers: this.headers});
-      cs._callReleased();
     } catch (err) {
       this.logger.error(err, 'TaskHangup:exec - Error hanging up call');
     }

lib/tasks/play.js

@@ -22,20 +22,6 @@ class TaskPlay extends Task {
   async exec(cs, {ep}) {
     await super.exec(cs);
     this.ep = ep;
-    let timeout;
-    let playbackSeconds = 0;
-    let playbackMilliseconds = 0;
-    let completed = !(this.timeoutSecs > 0 || this.loop);
-    if (this.timeoutSecs > 0) {
-      timeout = setTimeout(async() => {
-        completed = true;
-        try {
-          await this.kill(cs);
-        } catch (err) {
-          this.logger.info(err, 'Error killing audio on timeoutSecs');
-        }
-      }, this.timeoutSecs * 1000);
-    }
     try {
       while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep.connected) {
         if (cs.isInConference) {
@@ -48,24 +34,14 @@ class TaskPlay extends Task {
             await this.playToConfMember(this.ep, memberId, confName, confUuid, this.url);
           }
         } else {
-          let file = this.url;
-          if (this.seekOffset >= 0) {
-            file = {file: this.url, seekOffset: this.seekOffset};
-            this.seekOffset = -1;
-          }
+          const file = (this.timeoutSecs >= 0 || this.seekOffset >= 0) ?
+            {file: this.url, seekOffset: this.seekOffset, timeoutSecs: this.timeoutSecs} : this.url;
           const result = await ep.play(file);
-          playbackSeconds += parseInt(result.playbackSeconds);
-          playbackMilliseconds += parseInt(result.playbackMilliseconds);
-          if (this.killed || !this.loop || completed) {
-            if (timeout) clearTimeout(timeout);
-            await this.performAction(
-              Object.assign(result, {reason: 'playCompleted', playbackSeconds, playbackMilliseconds}),
-              !(this.parentTask || cs.isConfirmCallSession));
-          }
+          await this.performAction(Object.assign(result, {reason: 'playCompleted'}),
+            !(this.parentTask || cs.isConfirmCallSession));
         }
       }
     } catch (err) {
-      if (timeout) clearTimeout(timeout);
       this.logger.info(err, `TaskPlay:exec - error playing ${this.url}`);
     }
     this.emit('playDone');

lib/tasks/sip_refer.js

@@ -47,17 +47,7 @@ class TaskSipRefer extends Task {
 
       /* if we fail, fall through to next verb.  If success, we should get BYE from far end */
       if (this.referStatus === 202) {
-        this._notifyTimer = setTimeout(() => {
-          this.logger.info('TaskSipRefer:exec - no NOTIFY received in 15 secs, exiting');
-          this.performAction({refer_status: this.referStatus})
-            .catch((err) => this.logger.error(err, 'TaskSipRefer:exec - error performing action'));
-          this.notifyTaskDone();
-        }, 15000);
         await this.awaitTaskDone();
-        if (this._notifyTimer) {
-          clearTimeout(this._notifyTimer);
-          this._notifyTimer = null;
-        }
       }
       else {
         await this.performAction({refer_status: this.referStatus});
@@ -81,10 +71,10 @@ class TaskSipRefer extends Task {
     const contentType = req.get('Content-Type');
     this.logger.debug({body: req.body}, `TaskSipRefer:_handleNotify got ${contentType}`);
 
-    if (contentType?.includes('message/sipfrag')) {
+    if (contentType === 'message/sipfrag') {
       const arr = /SIP\/2\.0\s+(\d+)/.exec(req.body);
       if (arr) {
-        const status = typeof arr[1] === 'string' ? parseInt(arr[1], 10) : arr[1];
+        const status = arr[1];
         this.logger.debug(`TaskSipRefer:_handleNotify: call got status ${status}`);
         if (this.eventHook) {
           const b3 = this.getTracingPropagation();

lib/tasks/transcribe.js

@@ -68,14 +68,8 @@ class TaskTranscribe extends Task {
 
     this.ep = ep;
     this.ep2 = ep2;
-    if ('default' === this.vendor || !this.vendor) {
-      this.vendor = cs.speechRecognizerVendor;
-      if (this.data.recognizer) this.data.recognizer.vendor = this.vendor;
-    }
-    if ('default' === this.language || !this.language) {
-      this.language = cs.speechRecognizerLanguage;
-      if (this.data.recognizer) this.data.recognizer.language = this.language;
-    }
+    if ('default' === this.vendor || !this.vendor) this.vendor = cs.speechRecognizerVendor;
+    if ('default' === this.language || !this.language) this.language = cs.speechRecognizerLanguage;
     if (!this.data.recognizer.vendor) {
       this.data.recognizer.vendor = this.vendor;
     }
@@ -232,9 +226,6 @@ class TaskTranscribe extends Task {
     const bugname = fsEvent.getHeader('media-bugname');
     if (bugname && this.bugname !== bugname) return;
 
-    if (this.vendor === 'ibm') {
-      if (evt?.state === 'listening') return;
-    }
     this.logger.debug({evt}, 'TaskTranscribe:_onTranscription - before normalization');
 
     evt = this.normalizeTranscription(evt, this.vendor, channel, this.language);

lib/utils/db-utils.js

@@ -87,7 +87,7 @@ module.exports = (logger, srf) => {
     const haveNuance = speech.find((s) => s.vendor === 'nuance');
     const haveDeepgram = speech.find((s) => s.vendor === 'deepgram');
     const haveIbm = speech.find((s) => s.vendor === 'ibm');
-    if (!haveGoogle || !haveAws || !haveMicrosoft || !haveWellsaid || !haveNuance || !haveIbm || !haveDeepgram) {
+    if (!haveGoogle || !haveAws || !haveMicrosoft || !haveWellsaid || !haveNuance) {
       const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid);
       if (r3.length) {
         if (!haveGoogle) {

lib/utils/ws-requestor.js

@@ -166,9 +166,8 @@ class WsRequestor extends BaseRequestor {
     this.logger.debug('WsRequestor:close closing socket');
     try {
       if (this.ws) {
-        this.ws.close(1000);
+        this.ws.close();
         this.ws.removeAllListeners();
-        this.ws = null;
       }
 
       for (const [msgid, obj] of this.messagesInFlight) {

test/index.js

@@ -9,6 +9,5 @@ require('./transcribe-tests');
 require('./sip-request-tests');
 require('./create-call-test');
 require('./play-tests');
-require('./sip-refer-tests');
 require('./remove-test-db');
 require('./docker_stop');

test/play-tests.js

@@ -184,15 +184,11 @@ test('\'play\' tests with seekOffset and actionHook', async(t) => {
     // THEN
     await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
     t.pass('play: succeeds');
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_customHook`);
-    const seconds = parseInt(obj.body.playback_seconds);
-    const milliseconds = parseInt(obj.body.playback_milliseconds);
-    const lastOffsetPos = parseInt(obj.body.playback_last_offset_pos);
-    //console.log({obj}, 'lastRequest');
-    t.ok(obj.body.reason === "playCompleted", "play: actionHook success received");
-    t.ok(seconds === 2, "playback_seconds: actionHook success received");
-    t.ok(milliseconds === 2048, "playback_milliseconds: actionHook success received");
-    t.ok(lastOffsetPos > 15500 && lastOffsetPos < 16500, "playback_last_offset_pos: actionHook success received")
+    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_customHook`)
+    t.ok(obj.body.reason === "playCompleted", "play: actionHook success received")
+    t.ok(obj.body.playback_seconds === "2", "playback_seconds: actionHook success received")
+    t.ok(obj.body.playback_milliseconds === "2048", "playback_milliseconds: actionHook success received")
+    t.ok(obj.body.playback_last_offset_pos === "16000", "playback_last_offset_pos: actionHook success received")
     disconnect();
   } catch (err) {
     console.log(`error received: ${err}`);

test/scenarios/uac-refer-no-notify.xml

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
-  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
-  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
-  <send retrans="500">
-    <![CDATA[
-
-    INVITE sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-    Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-    From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-    To: <sip:[to]@[remote_ip]:[remote_port]>
-    Call-ID: [call_id]
-    CSeq: 1 INVITE
-    Contact: sip:[from]@[local_ip]:[local_port]
-    Max-Forwards: 70
-    X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
-    Subject: uac-refer-no-notify.xml
-    Content-Type: application/sdp
-    Content-Length: [len]
-
-    v=0
-    o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-    s=-
-    c=IN IP[media_ip_type] [media_ip]
-    t=0 0
-    m=audio [media_port] RTP/AVP 0
-    a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
-  <!-- are saved and used for following messages sent. Useful to test   -->
-  <!-- against stateful SIP proxies/B2BUAs.                             -->
-  <recv response="200" rtd="true">
-  </recv>
-
-  <!-- Packet lost can be simulated in any send/recv message by         -->
-  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
-  <send>
-    <![CDATA[
-
-      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: REFER test with no NOT
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- receive re-invite -->
-  <recv request="REFER" crlf="true"/>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 202 Accepted
-      [last_Via:]
-      [last_From:]
-      [last_To:]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-</scenario>

test/scenarios/uac-refer-with-notify.xml

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE scenario SYSTEM "sipp.dtd">
-
-<scenario name="Basic Sipstone UAC">
-  <!-- In client mode (sipp placing calls), the Call-ID MUST be         -->
-  <!-- generated by sipp. To do so, use [call_id] keyword.                -->
-  <send retrans="500">
-    <![CDATA[
-
-    INVITE sip:[to]@[remote_ip]:[remote_port] SIP/2.0
-    Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-    From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-    To: <sip:16174000000@[remote_ip]:[remote_port]>
-    Call-ID: [call_id]
-    CSeq: 1 INVITE
-    Contact: sip:[from]@[local_ip]:[local_port]
-    Max-Forwards: 70
-    X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
-    Subject: uac-refer-with-notify.xml
-    Content-Type: application/sdp
-    Content-Length: [len]
-
-    v=0
-    o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-    s=-
-    c=IN IP[media_ip_type] [media_ip]
-    t=0 0
-    m=audio [media_port] RTP/AVP 0
-    a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-  <recv response="100"
-        optional="true">
-  </recv>
-
-  <recv response="180" optional="true">
-  </recv>
-
-  <recv response="183" optional="true">
-  </recv>
-
-  <!-- By adding rrs="true" (Record Route Sets), the route sets         -->
-  <!-- are saved and used for following messages sent. Useful to test   -->
-  <!-- against stateful SIP proxies/B2BUAs.                             -->
-  <recv response="200" rtd="true">
-  </recv>
-
-  <!-- Packet lost can be simulated in any send/recv message by         -->
-  <!-- by adding the 'lost = "10"'. Value can be [1-100] percent.       -->
-  <send>
-    <![CDATA[
-
-      ACK sip:[service]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:16174000000@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 1 ACK
-      Max-Forwards: 70
-      Subject: uac-refer-with-notify.xml
-      Content-Length: 0
-
-    ]]>
-  </send>
-
-  <!-- receive re-invite -->
-  <recv request="REFER" crlf="true"/>
-
-  <send>
-    <![CDATA[
-
-      SIP/2.0 202 Accepted
-      [last_Via:]
-      [last_From:]
-      [last_To:]
-      [last_Call-ID:]
-      [last_CSeq:]
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Content-Type: application/sdp
-      Content-Length: [len]
-
-      v=0
-      o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]
-      s=-
-      c=IN IP[media_ip_type] [media_ip]
-      t=0 0
-      m=audio [media_port] RTP/AVP 0
-      a=rtpmap:0 PCMU/8000
-
-    ]]>
-  </send>
-
-  <send retrans="500">
-    <![CDATA[
-
-      NOTIFY sip:[service]@[remote_ip]:[remote_port] SIP/2.0
-      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:16174000000@[remote_ip]:[remote_port]>[peer_tag_param]
-      Call-ID: [call_id]
-      CSeq: 2 NOTIFY
-      Contact: sip:sipp@[local_ip]:[local_port]
-      Max-Forwards: 70
-      Subject: uac-refer-with-notify.xml
-      Content-Type: message/sipfrag;version=2.0
-      Content-Length: 16
-      
-      SIP/2.0 200 OK
-    ]]>
-  </send>
-  <recv response="200"</recv>
-      
-</scenario>

test/sip-refer-tests.js

@@ -1,100 +0,0 @@
-const test = require('tape');
-const { sippUac } = require('./sipp')('test_fs');
-const clearModule = require('clear-module');
-const {provisionCallHook, provisionCustomHook, provisionActionHook} = require('./utils')
-const bent = require('bent');
-const getJSON = bent('json')
-
-const sleepFor = async(ms) => new Promise(resolve => setTimeout(resolve, ms));
-
-process.on('unhandledRejection', (reason, p) => {
-  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-function connect(connectable) {
-  return new Promise((resolve, reject) => {
-    connectable.on('connect', () => {
-      return resolve();
-    });
-  });
-}
-
-test('\'refer\' tests w/202 and NOTIFY', {timeout: 25000}, async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'say',
-        text: 'silence_stream://100'
-      },
-      {
-        verb: 'sip:refer',
-        referTo: '123456',
-        actionHook: '/actionHook'
-      }
-    ];
-    const noVerbs = [];
-
-    const from = 'refer_with_notify';
-    provisionCallHook(from, verbs);
-    provisionActionHook(from, noVerbs)
-
-    // THEN
-    await sippUac('uac-refer-with-notify.xml', '172.38.0.10', from);
-    t.pass('refer: successfully received 202 Accepted');
-    await sleepFor(1000);
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.final_referred_call_status === 200, 'refer: successfully received NOTIFY with 200 OK');
-    //console.log(`obj: ${JSON.stringify(obj)}`);
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'refer\' tests w/202 but no NOTIFY', {timeout: 25000}, async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'say',
-        text: 'silence_stream://100'
-      },
-      {
-        verb: 'sip:refer',
-        referTo: '123456',
-        actionHook: '/actionHook'
-      }
-    ];
-    const noVerbs = [];
-
-    const from = 'refer_no_notify';
-    provisionCallHook(from, verbs);
-    provisionActionHook(from, noVerbs)
-
-    // THEN
-    await sippUac('uac-refer-no-notify.xml', '172.38.0.10', from);
-    t.pass('refer: successfully received 202 Accepted w/o NOTIFY');
-    await sleepFor(17000);
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    console.log(`obj: ${JSON.stringify(obj)}`);
-    t.ok(obj.body.refer_status === 202, 'refer: successfully timed out and reported 202');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});

test/sip-tests.js

@@ -53,13 +53,6 @@ test('incoming call tests', (t) => {
     .then(() => {
       return t.pass('handles in-dialog requests');
     })
-    .then(() => {
-      return sippUac('uac-refer-no-notify.xml', '172.38.0.30');
-    })
-    .then(() => {
-      return t.pass('handles sip:refer where we get 202 but no NOTIFY');
-    })
-
     .then(() => {
       srf.disconnect();
       t.end();

test/utils.js

@@ -24,13 +24,4 @@ const provisionCustomHook = (from, verbs) => {
   post(`/customHookMapping`, mapping);
 }
 
-const provisionActionHook = (from, verbs) => {
-  const mapping = {
-    from,
-    data: JSON.stringify(verbs)
-  };
-  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post(`/actionHook`, mapping);
-}
-
-module.exports = { provisionCallHook, provisionCustomHook, provisionActionHook}
+module.exports = { provisionCallHook, provisionCustomHook}