bugfix: when bargein is disabled, kill the background gather and do not restart it

* feat: add create-call timeout test

* feat: single webhook-test-scaffold and basic auth callhook testcase

* cleanup

Co-authored-by: Quan Luu <quan.luuhoang8@gmail.com>
Co-authored-by: xquanluu <110280845+xquanluu@users.noreply.github.com>

lib/session/call-session.js

@@ -410,6 +410,7 @@ class CallSession extends Emitter {
     try {
       const t = normalizeJambones(this.logger, [gather]);
       this.backgroundGatherTask = makeTask(this.logger, t[0]);
+      this._bargeInEnabled = true;
       this.backgroundGatherTask
         .once('dtmf', this._clearTasks.bind(this))
         .once('vad', this._clearTasks.bind(this))
@@ -426,7 +427,7 @@ class CallSession extends Emitter {
           this.backgroundGatherTask && this.backgroundGatherTask.removeAllListeners();
           this.backgroundGatherTask && this.backgroundGatherTask.span.end();
           this.backgroundGatherTask = null;
-          if (autoEnable && !this.callGone && !this._stopping) {
+          if (autoEnable && !this.callGone && !this._stopping && this._bargeInEnabled) {
             this.logger.info('CallSession:enableBotMode: restarting background gather');
             setImmediate(() => this.enableBotMode(gather, true));
           }
@@ -443,6 +444,7 @@ class CallSession extends Emitter {
     }
   }
   disableBotMode() {
+    this._bargeInEnabled = false;
     if (this.backgroundGatherTask) {
       try {
         this.backgroundGatherTask.removeAllListeners();

lib/tasks/config.js

@@ -93,7 +93,7 @@ class TaskConfig extends Task {
       }, 'Config: updated recognizer');
     }
     if ('enable' in this.bargeIn) {
-      if (this.gatherOpts) {
+      if (this.bargeIn.enable === true && this.gatherOpts) {
         this.gatherOpts.recognizer = this.hasRecognizer ?
           this.recognizer :
           {
@@ -103,7 +103,7 @@ class TaskConfig extends Task {
         this.logger.info({opts: this.gatherOpts}, 'Config: enabling bargeIn');
         cs.enableBotMode(this.gatherOpts, this.autoEnable);
       }
-      else {
+      else if (this.bargeIn.enable === false) {
         this.logger.info('Config: disabling bargeIn');
         cs.disableBotMode();
       }

lib/tasks/dial.js

@@ -376,9 +376,8 @@ class TaskDial extends Task {
   }
 
   async _initializeInbound(cs) {
-    const ep = await cs._evalEndpointPrecondition(this);
+    const {ep} = await cs._evalEndpointPrecondition(this);
     this.epOther = ep;
-    debug(`Dial:__initializeInbound allocated ep for incoming call: ${ep.uuid}`);
 
     /* send outbound legs back to the same SBC (to support static IP feature) */
     if (!this.proxy) this.proxy = `${cs.req.source_address}:${cs.req.source_port}`;

lib/utils/http-requestor.js

@@ -31,6 +31,7 @@ class HttpRequestor extends BaseRequestor {
     this._baseUrl = `${u.protocol}://${u.resource}`;
     this._resource = u.resource;
     this._protocol = u.protocol;
+    this._search = u.search;
     this._usePools = process.env.HTTP_POOL && parseInt(process.env.HTTP_POOL);
 
     if (this._usePools) {
@@ -83,13 +84,11 @@ class HttpRequestor extends BaseRequestor {
 
     assert.ok(url, 'HttpRequestor:request url was not provided');
     assert.ok, (['GET', 'POST'].includes(method), `HttpRequestor:request method must be 'GET' or 'POST' not ${method}`);
-    const {url: urlInfo = hook, method: methodInfo = 'POST'} = hook;  // mask user/pass
-    this.logger.debug({url: urlInfo, method: methodInfo, payload}, `HttpRequestor:request ${method} ${url}`);
     const startAt = process.hrtime();
 
     let newClient;
     try {
-      let client, path;
+      let client, path, query;
       if (this._isRelativeUrl(url)) {
         client = this.client;
         path = url;
@@ -99,10 +98,12 @@ class HttpRequestor extends BaseRequestor {
         if (u.resource === this._resource && u.protocol === this._protocol) {
           client = this.client;
           path = u.pathname;
+          query = u.query;
         }
         else {
           client = newClient = new Client(`${u.protocol}://${u.resource}`);
           path = u.pathname;
+          query = u.query;
         }
       }
       const sigHeader = this._generateSigHeader(payload, this.secret);
@@ -116,6 +117,7 @@ class HttpRequestor extends BaseRequestor {
       this.logger.debug({url, absUrl, hdrs}, 'send webhook');
       const {statusCode, headers, body} =  await client.request({
         path,
+        query,
         method,
         headers: hdrs,
         ...('POST' === method && {body: JSON.stringify(payload)}),

test/create-call-test.js

@@ -1,10 +1,9 @@
 const test = require('tape');
 const { sippUac } = require('./sipp')('test_fs');
 const bent = require('bent');
-const getJSON = bent('json')
 const clearModule = require('clear-module');
-const HttpRequestor = require('../lib/utils/http-requestor');
-
+const provisionCallHook = require('./utils')
+const getJSON = bent('json')
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -24,8 +23,9 @@ test('test create-call timeout', async(t) => {
 
   try {
     await connect(srf);
-    let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a'
-    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201)
+    // GIVEN
+    let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a';
+    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
     post('v1/createCall', {
       'account_sid':account_sid,
       'timeout': 1,
@@ -37,7 +37,8 @@ test('test create-call timeout', async(t) => {
       "to": {
         "type": "phone",
         "number": "15583084809"
-      }})
+      }});
+    //THEN
     await sippUac('uas-timeout-cancel.xml', '172.38.0.10');
     disconnect();
   } catch (err) {
@@ -47,6 +48,48 @@ test('test create-call timeout', async(t) => {
   }
 });
 
-function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
+test('test create-call call-hook basic authentication', async(t) => {
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+
+  try {
+    await connect(srf);
+    // GIVEN
+    let from = 'call_hook_basic_authentication';
+    let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a';
+
+    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
+    post('v1/createCall', {
+      'account_sid':account_sid,
+      "call_hook": {
+        "url": "http://127.0.0.1:3100/",
+        "method": "POST",
+        "username": "username",
+        "password": "password"
+      },
+      "from": from,
+      "to": {
+        "type": "phone",
+        "number": "15583084809"
+      }});
+
+    let verbs = [
+      {
+        "verb": "say",
+        "text": "hello"
+      }
+    ];
+    provisionCallHook(from, verbs);
+    //THEN
+    await sippUac('uas.xml', '172.38.0.10', from);
+
+    let obj = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}`)
+    t.ok(obj.headers.Authorization = 'Basic dXNlcm5hbWU6cGFzc3dvcmQ=',
+      'create-call: call-hook contains basic authentication header');
+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});

test/docker-compose-testbed.yaml

@@ -12,7 +12,7 @@ services:
     platform: linux/x86_64
     ports:
       - "3360:3306"
-    environment: 
+    environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "127.0.0.1", "--protocol", "tcp"]
@@ -75,10 +75,8 @@ services:
       fs:
         ipv4_address: 172.38.0.51
 
-  webhook-decline:
+  webhook-scaffold:
     image: jambonz/webhook-test-scaffold:latest
-    environment:
-      APP_PATH: /tmp/decline.json
     ports:
       - "3100:3000/tcp"
     volumes:
@@ -87,54 +85,6 @@ services:
       fs:
         ipv4_address: 172.38.0.60
 
-  webhook-say:
-    image: jambonz/webhook-test-scaffold:latest
-    environment:
-      APP_PATH: /tmp/say.json
-    ports:
-      - "3101:3000/tcp"
-    volumes:
-      - ./test-apps:/tmp
-    networks:
-      fs:
-        ipv4_address: 172.38.0.61
-
-  webhook-gather:
-    image: jambonz/webhook-test-scaffold:latest
-    environment:
-      APP_PATH: /tmp/gather.json
-    ports:
-      - "3102:3000/tcp"
-    volumes:
-      - ./test-apps:/tmp
-    networks:
-      fs:
-        ipv4_address: 172.38.0.62
-
-  webhook-transcribe:
-    image: jambonz/webhook-test-scaffold:latest
-    environment:
-      APP_PATH: /tmp/transcribe.json
-    ports:
-      - "3103:3000/tcp"
-    volumes:
-      - ./test-apps:/tmp
-    networks:
-      fs:
-        ipv4_address: 172.38.0.63
-
-  webhook-sip-info:
-    image: jambonz/webhook-test-scaffold:latest
-    environment:
-      APP_PATH: /tmp/info.json
-    ports:
-      - "3104:3000/tcp"
-    volumes:
-      - ./test-apps:/tmp
-    networks:
-      fs:
-        ipv4_address: 172.38.0.64
-
   influxdb:
     image: influxdb:1.8
     ports:

test/gather-tests.js

@@ -3,6 +3,7 @@ const { sippUac } = require('./sipp')('test_fs');
 const bent = require('bent');
 const getJSON = bent('json')
 const clearModule = require('clear-module');
+const provisionCallHook = require('./utils')
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -22,9 +23,25 @@ test('\'gather\' and \'transcribe\' tests', async(t) => {
 
   try {
     await connect(srf);
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10');
-    let obj = await getJSON('http://127.0.0.1:3102/actionHook');
-    t.ok(obj.speech.alternatives[0].transcript = 'I\'d like to speak to customer support',
+    // GIVEN
+    let verbs = [
+      {
+        "verb": "gather",
+        "input": ["speech"],
+        "recognizer": {
+          "vendor": "google",
+          "hints": ["customer support", "sales", "human resources", "HR"]
+        },
+        "timeout": 10,
+        "actionHook": "/actionHook"
+      }
+    ];
+    let from = "gather_success";
+    provisionCallHook(from, verbs);
+    // THEN
+    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
+    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
+    t.ok(obj.body.speech.alternatives[0].transcript = 'I\'d like to speak to customer support',
       'gather: succeeds when using account credentials');
 
     disconnect();

test/say-tests.js

@@ -1,6 +1,7 @@
 const test = require('tape');
 const { sippUac } = require('./sipp')('test_fs');
 const clearModule = require('clear-module');
+const provisionCallHook = require('./utils')
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -20,9 +21,21 @@ test('\'say\' tests', async(t) => {
 
   try {
     await connect(srf);
-    await sippUac('uac-say-account-creds-success.xml', '172.38.0.10');
+
+    // GIVEN
+    const verbs = [
+      {
+        verb: 'say',
+        text: 'hello'
+      }
+    ];
+
+    const from = 'say_test_success';
+    provisionCallHook(from, verbs)
+
+    // THEN
+    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
     t.pass('say: succeeds when using using account credentials');
-  
     disconnect();
   } catch (err) {
     console.log(`error received: ${err}`);

test/scenarios/uac-expect-603.xml

@@ -7,7 +7,7 @@
 
       INVITE sip:16174000000@[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]
+      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
@@ -41,7 +41,7 @@
 
       ACK sip:16174000000@[remote_ip]:[remote_port] SIP/2.0
       [last_Via]
-      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      From: [from] <sip:[from]@[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
@@ -53,4 +53,3 @@
   </send>
 
 </scenario>
-

test/scenarios/uac-gather-account-creds-success.xml

@@ -8,13 +8,13 @@
   <send retrans="500">
     <![CDATA[
 
-      INVITE sip:16174000003@[remote_ip]:[remote_port] SIP/2.0
+      INVITE sip:[to]@[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:16174000003@[remote_ip]:[remote_port]>
+      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:sipp@[local_ip]:[local_port]
+      Contact: sip:[from]@[local_ip]:[local_port]
       Max-Forwards: 70
       X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
       Subject: uac-gather-account-creds-success
@@ -53,13 +53,13 @@
   <send>
     <![CDATA[
 
-      ACK sip:16174000003@[remote_ip]:[remote_port] SIP/2.0
+      ACK sip:[to]@[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: 16174000003 <sip:16174000003@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: [to] <sip:[to]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:sipp@[local_ip]:[local_port]
+      Contact: sip:[from]@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-gather-account-creds-success
       Content-Length: 0

test/scenarios/uac-send-info-during-dialog.xml

@@ -8,13 +8,13 @@
   <send retrans="500">
     <![CDATA[
 
-      INVITE sip:16174000006@[remote_ip]:[remote_port] SIP/2.0
+      INVITE sip:[to]@[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:16174000006@[remote_ip]:[remote_port]>
+      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:sipp@[local_ip]:[local_port]
+      Contact: sip:[from]@[local_ip]:[local_port]
       Max-Forwards: 70
       X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
       Subject: uac-gather-account-creds-success
@@ -53,13 +53,13 @@
   <send>
     <![CDATA[
 
-      ACK sip:16174000006@[remote_ip]:[remote_port] SIP/2.0
+      ACK sip:[to]@[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: 16174000006 <sip:16174000006@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: [to] <sip:[to]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:sipp@[local_ip]:[local_port]
+      Contact: sip:[from]@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-gather-account-creds-success
       Content-Length: 0

test/scenarios/uac-success-received-bye.xml

@@ -8,13 +8,13 @@
   <send retrans="500">
     <![CDATA[
 
-      INVITE sip:16174000001@[remote_ip]:[remote_port] SIP/2.0
+      INVITE sip:[to]@[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:16174000001@[remote_ip]:[remote_port]>
+      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:sipp@[local_ip]:[local_port]
+      Contact: sip:[from]@[local_ip]:[local_port]
       Max-Forwards: 70
       X-Account-Sid: bb845d4b-83a9-4cde-a6e9-50f3743bab3f
       Subject: uac-say
@@ -53,13 +53,13 @@
   <send>
     <![CDATA[
 
-      ACK sip:16174000001@[remote_ip]:[remote_port] SIP/2.0
+      ACK sip:[to]@[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: 16174000001 <sip:16174000001@[remote_ip]:[remote_port]>[peer_tag_param]
+      From: [from] <sip:[from]@[local_ip]:[local_port]>;tag=[pid]SIPpTag00[call_number]
+      To: [to] <sip:[to]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
-      Contact: sip:sipp@[local_ip]:[local_port]
+      Contact: sip:[from]@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: uac-say
       Content-Length: 0

test/sip-request-tests.js

@@ -3,6 +3,7 @@ const { sippUac } = require('./sipp')('test_fs');
 const bent = require('bent');
 const getJSON = bent('json')
 const clearModule = require('clear-module');
+const provisionCallHook = require('./utils');
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -22,9 +23,28 @@ test('sending SIP in-dialog requests tests', async(t) => {
 
   try {
     await connect(srf);
-    await sippUac('uac-send-info-during-dialog.xml', '172.38.0.10');
-    const obj = await getJSON('http://127.0.0.1:3104/actionHook');
-    t.ok(obj.result === 'success' && obj.sip_status === 200, 'successfully sent SIP INFO');
+    //GIVEN
+    let verbs = [
+      {
+        "verb": "say",
+        "text": "hello"
+      },
+      {
+        "verb": "sip:request",
+        "method": "info",
+        "headers": {
+          "Content-Type": "application/text"
+        },
+        "body": "here I am ",
+        "actionHook": "/actionHook"
+      }
+    ];
+    let from = "sip_indialog_test";
+    provisionCallHook(from, verbs);
+    // THEN
+    await sippUac('uac-send-info-during-dialog.xml', '172.38.0.10', from);
+    const obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
+    t.ok(obj.body.sip_status === 200, 'successfully sent SIP INFO');
 
     disconnect();
   } catch (err) {

test/sipp.js

@@ -24,7 +24,7 @@ obj.output = () => {
   return output;
 };
 
-obj.sippUac = (file, bindAddress) => {
+obj.sippUac = (file, bindAddress, from='sipp', to='16174000000') => {
   const cmd = 'docker';
   const args = [
     'run', '-t', '--rm', '--net', `${network}`,
@@ -34,7 +34,9 @@ obj.sippUac = (file, bindAddress) => {
     '-sleep', '250ms',
     '-nostdin',
     '-cid_str', `%u-%p@%s-${idx++}`,
-    '172.38.0.50'
+    '172.38.0.50',
+    '-key','from', from,
+    '-key','to', to, '-trace_msg'
   ];
 
   if (bindAddress) args.splice(5, 0, '--ip', bindAddress);

test/utils.js

@@ -0,0 +1,18 @@
+const bent = require('bent');
+
+/*
+* phoneNumber: 16174000000
+* Hook endpoints http://127.0.0.1:3100/
+* The function help testcase to register desired jambonz json response for an application call
+* When a call has From number match the registered hook event, the desired jambonz json will be responded.
+*/
+const provisionCallHook = (from, verbs) => {
+  const mapping = {
+    from,
+    data: JSON.stringify(verbs)
+  };
+  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
+  post('/appMapping', mapping);
+}
+
+module.exports = provisionCallHook

test/webhook/app.js

@@ -3,47 +3,95 @@ const fs = require('fs');
 const express = require('express');
 const app = express();
 const listenPort = process.env.HTTP_PORT || 3000;
-let lastAction, lastEvent;
-
-assert.ok(process.env.APP_PATH, 'env var APP_PATH is required');
+let json_mapping = new Map();
+let hook_mapping = new Map();
 
 app.listen(listenPort, () => {
   console.log(`sample jambones app server listening on ${listenPort}`);
 });
 
-const applicationData = JSON.parse(fs.readFileSync(process.env.APP_PATH));
 app.use(express.urlencoded({ extended: true }));
 app.use(express.json());
 
+/*
+ * Markup language
+ */
 
 app.all('/', (req, res) => {
-  console.log(applicationData, `${req.method} /`);
-  return res.json(applicationData);
+  console.log(req.body, 'POST /');
+  const key = req.body.from
+  if (!json_mapping.has(key)) return res.sendStatus(404);
+  const retData = JSON.parse(json_mapping.get(key));
+  console.log(retData, `${req.method} /`);
+  addRequestToMap(key, req, hook_mapping);
+  return res.json(retData);
 });
 
+app.post('/appMapping', (req, res) => {
+  console.log(req.body, 'POST /appMapping');
+  json_mapping.set(req.body.from, req.body.data);
+  return res.sendStatus(200);
+});
+
+/*
+ * Status Callback
+ */
 app.post('/callStatus', (req, res) => {
   console.log({payload: req.body}, 'POST /callStatus');
+  let key = req.body.from + "_callStatus"
+  addRequestToMap(key, req, hook_mapping);
   return res.sendStatus(200);
 });
-
+/*
+ * action Hook
+ */
 app.post('/actionHook', (req, res) => {
   console.log({payload: req.body}, 'POST /actionHook');
-  lastAction = req.body;
+  let key = req.body.from + "_actionHook"
+  addRequestToMap(key, req, hook_mapping);
   return res.sendStatus(200);
 });
 
-app.get('/actionHook', (req, res) => {
-  console.log({payload: lastAction}, 'GET /actionHook');
-  return res.json(lastAction);
-});
+// Fetch Requests
+app.get('/requests/:key', (req, res) => {
+  let key = req.params.key;
+  if (hook_mapping.has(key)) {
+    return res.json(hook_mapping.get(key));
+  } else {
+    return res.sendStatus(404);
+  }
 
-app.post('/eventHook', (req, res) => {
-  console.log({payload: req.body}, 'POST /eventHook');
-  lastEvent = req.body;
-  return res.sendStatus(200);
-});
+})
 
-app.get('/eventHook', (req, res) => {
-  console.log({payload: lastEvent}, 'GET /eventHook');
-  return res.json(lastEvent);
-});
+app.get('/lastRequest/:key', (req, res) => {
+  let key = req.params.key;
+  if (hook_mapping.has(key)) {
+    let requests = hook_mapping.get(key);
+    return res.json(requests[requests.length - 1]);
+  } else {
+    return res.sendStatus(404);
+  }
+})
+
+/*
+ * private function
+ */
+
+function addRequestToMap(key, req, map) {
+  let headers = new Map()
+  for(let i = 0; i < req.rawHeaders.length; i++) {
+    if (i % 2 === 0) {
+      headers.set(req.rawHeaders[i], req.rawHeaders[i + 1])
+    }
+  }
+  let request = {
+    'url': req.url,
+    'headers': Object.fromEntries(headers),
+    'body': req.body
+  }
+  if (map.has(key)) {
+    map.get(key).push(request);
+  } else {
+    map.set(key, [request]);
+  }
+}

test/webhooks-tests.js

@@ -17,10 +17,25 @@ function connect(connectable) {
 test('basic webhook tests', async(t) => {
   clearModule.all();
   const {srf, disconnect} = require('../app');
+  const provisionCallHook = require('./utils')
 
   try {
     await connect(srf);
-    await sippUac('uac-expect-603.xml', '172.38.0.10');
+    const verbs = [
+      {
+        verb: 'sip:decline',
+        status: 603,
+        reason: 'Gone Fishin',
+        headers: {
+          'Retry-After': 300
+        }  
+      }
+    ];
+
+    const from = 'sip_decline_test_success';
+    provisionCallHook(from, verbs)
+
+    await sippUac('uac-expect-603.xml', '172.38.0.10', from);
     t.pass('webhook successfully declines call');
 
     disconnect();