feat: advanced queues (#362)

* feat: advanced queues * feat: advanced queues * feat: advanced queues * feat: advanced queues * update verb specification * add testcase * add testcase * add testcase * updte testcase * fixed * update queue * fix: fix waithook params * fix: fix waithook params * fix: performQueueWebhook with correct members length * fix merge conflict * debug log * debug listen test * debug listen test * debug listen test * debug listen test * debug listen test * debug listen issue * feat: add tts on account level --------- Co-authored-by: Dave Horton <daveh@beachdognet.com>
2025-12-19 04:17:44 +00:00 · 2023-06-03 19:16:05 +07:00
parent 01260ad054
commit b7070121ee
22 changed files with 987 additions and 166 deletions
--- a/test/config-test.js
+++ b/test/config-test.js
@@ -39,7 +39,7 @@ test('\'config: listen\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
@@ -86,7 +86,7 @@ test('\'config: listen - stop\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
--- a/test/create-call-test.js
+++ b/test/create-call-test.js
@@ -92,7 +92,7 @@ test('test create-call call-hook basic authentication', async(t) => {
        "text": "hello"
      }
    ];
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    //THEN
    await p;

@@ -150,7 +150,7 @@ test('test create-call amd', async(t) => {
        "length": 7
      }
    ];
-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);
    //THEN
    await p;

--- a/test/db/create-and-populate-schema.sql
+++ b/test/db/create-and-populate-schema.sql
--- a/test/db/jambones-sql.sql
+++ b/test/db/jambones-sql.sql
@@ -1,5 +1,4 @@
 /* SQLEditor (MySQL (2))*/
-
 SET FOREIGN_KEY_CHECKS=0;

 DROP TABLE IF EXISTS account_static_ips;
@@ -16,6 +15,8 @@ DROP TABLE IF EXISTS call_routes;

 DROP TABLE IF EXISTS dns_records;

+DROP TABLE IF EXISTS lcr;
+
 DROP TABLE IF EXISTS lcr_carrier_set_entry;

 DROP TABLE IF EXISTS lcr_routes;
@@ -52,6 +53,8 @@ DROP TABLE IF EXISTS smpp_addresses;

 DROP TABLE IF EXISTS speech_credentials;

+DROP TABLE IF EXISTS system_information;
+
 DROP TABLE IF EXISTS users;

 DROP TABLE IF EXISTS smpp_gateways;
@@ -136,11 +139,23 @@ PRIMARY KEY (dns_record_sid)
 CREATE TABLE lcr_routes
 (
 lcr_route_sid CHAR(36),
+lcr_sid CHAR(36) NOT NULL,
 regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed number, used for LCR routing of PSTN calls',
 description VARCHAR(1024),
-priority INTEGER NOT NULL UNIQUE  COMMENT 'lower priority routes are attempted first',
+priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) COMMENT='Least cost routing table';
+) COMMENT='An ordered list of  digit patterns in an LCR table.  The patterns are tested in sequence until one matches';
+
+CREATE TABLE lcr
+(
+lcr_sid CHAR(36) NOT NULL UNIQUE ,
+name VARCHAR(64) COMMENT 'User-assigned name for this LCR table',
+is_active BOOLEAN NOT NULL DEFAULT 1,
+default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use when no digit match based results are found.',
+service_provider_sid CHAR(36),
+account_sid CHAR(36),
+PRIMARY KEY (lcr_sid)
+) COMMENT='An LCR (least cost routing) table that is used by a service provider or account to make decisions about routing outbound calls when multiple carriers are available.';

 CREATE TABLE password_settings
 (
@@ -248,7 +263,10 @@ CREATE TABLE sbc_addresses
 sbc_address_sid CHAR(36) NOT NULL UNIQUE ,
 ipv4 VARCHAR(255) NOT NULL,
 port INTEGER NOT NULL DEFAULT 5060,
+tls_port INTEGER,
+wss_port INTEGER,
 service_provider_sid CHAR(36),
+last_updated DATETIME,
 PRIMARY KEY (sbc_address_sid)
 );

@@ -307,6 +325,13 @@ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (speech_credential_sid)
 );

+CREATE TABLE system_information
+(
+domain_name VARCHAR(255),
+sip_domain_name VARCHAR(255),
+monitoring_domain_name VARCHAR(255)
+);
+
 CREATE TABLE users
 (
 user_sid CHAR(36) NOT NULL UNIQUE ,
@@ -357,6 +382,7 @@ smpp_inbound_password VARCHAR(64),
 register_from_user VARCHAR(128),
 register_from_domain VARCHAR(255),
 register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
+register_status VARCHAR(4096),
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';

@@ -403,6 +429,7 @@ inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound ca
 outbound BOOLEAN NOT NULL COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
 voip_carrier_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
+protocol ENUM('udp','tcp','tls', 'tls/srtp') DEFAULT 'udp' COMMENT 'Outbound call protocol',
 PRIMARY KEY (sip_gateway_sid)
 ) COMMENT='A whitelisted sip gateway used for origination/termination';

@@ -435,7 +462,7 @@ account_sid CHAR(36) COMMENT 'account that this application belongs to (if null,
 call_hook_sid CHAR(36) COMMENT 'webhook to call for inbound calls ',
 call_status_hook_sid CHAR(36) COMMENT 'webhook to call for call status events',
 messaging_hook_sid CHAR(36) COMMENT 'webhook to call for inbound SMS/MMS ',
-app_json VARCHAR(16384),
+app_json TEXT,
 speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
 speech_synthesis_voice VARCHAR(64),
@@ -502,6 +529,14 @@ ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid)
 CREATE INDEX dns_record_sid_idx ON dns_records (dns_record_sid);
 ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);

+CREATE INDEX lcr_sid_idx ON lcr_routes (lcr_sid);
+ALTER TABLE lcr_routes ADD FOREIGN KEY lcr_sid_idxfk (lcr_sid) REFERENCES lcr (lcr_sid);
+
+CREATE INDEX lcr_sid_idx ON lcr (lcr_sid);
+ALTER TABLE lcr ADD FOREIGN KEY default_carrier_set_entry_sid_idxfk (default_carrier_set_entry_sid) REFERENCES lcr_carrier_set_entry (lcr_carrier_set_entry_sid);
+
+CREATE INDEX service_provider_sid_idx ON lcr (service_provider_sid);
+CREATE INDEX account_sid_idx ON lcr (account_sid);
 CREATE INDEX permission_sid_idx ON permissions (permission_sid);
 CREATE INDEX predefined_carrier_sid_idx ON predefined_carriers (predefined_carrier_sid);
 CREATE INDEX predefined_sip_gateway_sid_idx ON predefined_sip_gateways (predefined_sip_gateway_sid);
@@ -648,4 +683,4 @@ ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (devic

 ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);

-SET FOREIGN_KEY_CHECKS=1;
+SET FOREIGN_KEY_CHECKS=1;
--- a/test/dial-tests.js
+++ b/test/dial-tests.js
@@ -43,7 +43,7 @@ test('\'dial-phone\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
@@ -102,7 +102,7 @@ test('\'dial-sip\'', async(t) => {
        }
      ];
  
-      provisionCallHook(from, verbs);
+      await provisionCallHook(from, verbs);
  
      // THEN
      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
@@ -169,7 +169,7 @@ test('\'dial-user\'', async(t) => {
        }
      ];
  
-      provisionCallHook(from, verbs);
+      await provisionCallHook(from, verbs);
  
      // THEN
      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
--- a/test/gather-tests.js
+++ b/test/gather-tests.js
@@ -50,7 +50,7 @@ test('\'gather\' test - google', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -86,7 +86,7 @@ test('\'gather\' test - default (google)', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -133,7 +133,7 @@ test('\'config\' test - reset to app defaults', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -173,7 +173,7 @@ test('\'gather\' test - microsoft', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -213,7 +213,7 @@ test('\'gather\' test - aws', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -256,7 +256,7 @@ test('\'gather\' test - deepgram', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -298,7 +298,7 @@ test('\'gather\' test - soniox', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
--- a/test/index.js
+++ b/test/index.js
@@ -14,5 +14,6 @@ require('./play-tests');
 require('./sip-refer-tests');
 require('./listen-tests');
 require('./config-test');
+require('./queue-test');
 require('./remove-test-db');
 require('./docker_stop');
--- a/test/listen-tests.js
+++ b/test/listen-tests.js
@@ -35,7 +35,7 @@ test('\'listen-success\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
@@ -69,13 +69,13 @@ test('\'listen-maxLength\'', async(t) => {
      {
        "verb": "listen",
        "url": `ws://172.38.0.60:3000/${from}`,
-        "mixType" : "mixed",
+        "mixType" : "stereo",
        "timeout": 2,
        "maxLength": 2
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
@@ -109,7 +109,7 @@ test('\'listen-pause-resume\'', async(t) => {
      }
    ];

-    provisionCallHook(from, verbs);
+    await provisionCallHook(from, verbs);

    // THEN
    const p = sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
--- a/test/play-tests.js
+++ b/test/play-tests.js
@@ -33,7 +33,7 @@ test('\'play\' tests single link in plain text', async(t) => {
    ];

    const from = 'play_single_link';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -62,7 +62,7 @@ test('\'play\' tests multi links in array', async(t) => {
    ];

    const from = 'play_multi_links_in_array';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -100,8 +100,8 @@ test('\'play\' tests single link in conference', async(t) => {
        waitHook: `/customHook`
      }
    ];
-    provisionCustomHook(from, waitHookVerbs)
-    provisionCallHook(from, verbs)
+    await provisionCustomHook(from, waitHookVerbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-send-bye.xml', '172.38.0.10', from);
@@ -141,8 +141,8 @@ test('\'play\' tests multi links in array in conference', async(t) => {
        waitHook: `/customHook`
      }
    ];
-    provisionCustomHook(from, waitHookVerbs)
-    provisionCallHook(from, verbs)
+    await provisionCustomHook(from, waitHookVerbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-send-bye.xml', '172.38.0.10', from);
@@ -178,8 +178,8 @@ test('\'play\' tests with seekOffset and actionHook', async(t) => {
    const waitHookVerbs = [];

    const from = 'play_action_hook';
-    provisionCallHook(from, verbs)
-    provisionCustomHook(from, waitHookVerbs)
+    await provisionCallHook(from, verbs)
+    await provisionCustomHook(from, waitHookVerbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -218,7 +218,7 @@ test('\'play\' tests with earlymedia', async(t) => {
    ];

    const from = 'play_early_media';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-invite-expect-183-cancel.xml', '172.38.0.10', from);
--- a/test/queue-test.js
+++ b/test/queue-test.js
@@ -0,0 +1,127 @@
+const test = require('tape');
+const { sippUac } = require('./sipp')('test_fs');
+const clearModule = require('clear-module');
+const {provisionCallHook, provisionActionHook, provisionAnyHook} = require('./utils');
+const bent = require('bent');
+const getJSON = bent('json');
+
+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();
+    });
+  });
+}
+
+const sleepFor = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
+
+test('\'enqueue-dequeue\' tests', async(t) => {
+
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+  try {
+    await connect(srf);
+    // GIVEN
+    const verbs = [
+      {
+        verb: 'enqueue',
+        name: 'support',
+        actionHook: '/actionHook'
+      }
+    ];
+
+    const verbs2 = [
+      {
+        verb: 'dequeue',
+        name: 'support'
+      }
+    ];
+
+    const actionVerbs = [
+      {
+        verb: 'play',
+        url: 'silence_stream://1000',
+        earlyMedia: true
+      }
+    ];
+
+    const from = 'enqueue_success';
+    await provisionCallHook(from, verbs);
+    await provisionActionHook(from, actionVerbs)
+
+    const from2 = 'dequeue_success';
+    await provisionCallHook(from2, verbs2);
+    
+
+    // THEN
+    const p1 = sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
+
+    await sleepFor(1000);
+
+    const p2 = sippUac('uac-success-send-bye.xml', '172.38.0.11', from2);
+    await Promise.all([p1, p2]);
+    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
+    t.ok(obj.body.queue_result === 'bridged');
+    t.pass('enqueue-dequeue: succeeds connect');
+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});
+
+test('\leave\' tests', async(t) => {
+
+  clearModule.all();
+  const {srf, disconnect} = require('../app');
+  try {
+    await connect(srf);
+    // GIVEN
+    const verbs = [
+      {
+        verb: 'enqueue',
+        name: 'support1',
+        waitHook: '/anyHook/enqueue_success_leave',
+        actionHook: '/actionHook'
+      }
+    ];
+
+    const anyHookVerbs = [
+      {
+        verb: 'leave'
+      }
+    ];
+
+        const actionVerbs = [
+      {
+        verb: 'play',
+        url: 'silence_stream://1000',
+        earlyMedia: true
+      }
+    ];
+
+    const from = 'enqueue_success_leave';
+    await provisionCallHook(from, verbs);
+    await provisionAnyHook(from, anyHookVerbs);
+    await provisionActionHook(from, actionVerbs)
+    
+
+    // THEN
+    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
+    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/enqueue_success_leave`);
+    t.ok(obj.body.queue_position === 0);
+    const obj1  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
+    t.ok(obj1.body.queue_result === 'leave');
+    t.pass('enqueue-dequeue: succeeds connect');
+    disconnect();
+  } catch (err) {
+    console.log(`error received: ${err}`);
+    disconnect();
+    t.error(err);
+  }
+});
--- a/test/say-tests.js
+++ b/test/say-tests.js
@@ -31,7 +31,7 @@ test('\'say\' tests', async(t) => {
    ];

    const from = 'say_test_success';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -71,7 +71,7 @@ test('\'config\' reset synthesizer tests', async(t) => {
    ];

    const from = 'say_test_success';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -111,7 +111,7 @@ if (MICROSOFT_CUSTOM_API_KEY && MICROSOFT_DEPLOYMENT_ID && MICROSOFT_CUSTOM_REGI
      ];

      const from = 'say_test_success';
-      provisionCallHook(from, verbs)
+      await provisionCallHook(from, verbs)

      // THEN
      await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
--- a/test/sip-refer-tests.js
+++ b/test/sip-refer-tests.js
@@ -41,8 +41,8 @@ test('\'refer\' tests w/202 and NOTIFY', {timeout: 25000}, async(t) => {
    const noVerbs = [];

    const from = 'refer_with_notify';
-    provisionCallHook(from, verbs);
-    provisionActionHook(from, noVerbs)
+    await provisionCallHook(from, verbs);
+    await provisionActionHook(from, noVerbs)

    // THEN
    await sippUac('uac-refer-with-notify.xml', '172.38.0.10', from);
@@ -81,8 +81,8 @@ test('\'refer\' tests w/202 but no NOTIFY', {timeout: 25000}, async(t) => {
    const noVerbs = [];

    const from = 'refer_no_notify';
-    provisionCallHook(from, verbs);
-    provisionActionHook(from, noVerbs)
+    await provisionCallHook(from, verbs);
+    await provisionActionHook(from, noVerbs)

    // THEN
    await sippUac('uac-refer-no-notify.xml', '172.38.0.10', from);
--- a/test/sip-request-tests.js
+++ b/test/sip-request-tests.js
@@ -40,7 +40,7 @@ test('sending SIP in-dialog requests tests', async(t) => {
      }
    ];
    let from = "sip_indialog_test";
-    provisionCallHook(from, verbs);
+    await 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`);
--- a/test/transcribe-tests.js
+++ b/test/transcribe-tests.js
@@ -48,7 +48,7 @@ test('\'transcribe\' test - google', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -85,7 +85,7 @@ test('\'transcribe\' test - microsoft', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -122,7 +122,7 @@ test('\'transcribe\' test - aws', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -162,7 +162,7 @@ test('\'transcribe\' test - deepgram', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
@@ -202,7 +202,7 @@ test('\'transcribe\' test - soniox', async(t) => {
      }
    ];
    let from = "gather_success";
-    provisionCallHook(from, verbs);
+    await 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`);
--- a/test/utils.js
+++ b/test/utils.js
@@ -6,31 +6,40 @@ const bent = require('bent');
 * 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 provisionCallHook = async (from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post('/appMapping', mapping);
+  await post('/appMapping', mapping);
 }

-const provisionCustomHook = (from, verbs) => {
+const provisionCustomHook = async(from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post(`/customHookMapping`, mapping);
+  await post(`/customHookMapping`, mapping);
 }

-const provisionActionHook = (from, verbs) => {
+const provisionActionHook = async(from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  post(`/actionHook`, mapping);
+  await post(`/actionHook`, mapping);
 }

-module.exports = { provisionCallHook, provisionCustomHook, provisionActionHook}
+const provisionAnyHook = async(key, verbs) => {
+  const mapping = {
+    key,
+    data: JSON.stringify(verbs)
+  };
+  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
+  await post(`/anyHookMapping`, mapping);
+}
+
+module.exports = { provisionCallHook, provisionCustomHook, provisionActionHook, provisionAnyHook}
--- a/test/webhook/app.js
+++ b/test/webhook/app.js
@@ -2,6 +2,7 @@ const express = require('express');
 const app = express();
 const Websocket = require('ws');
 const listenPort = process.env.HTTP_PORT || 3000;
+const any_hook_json_mapping = new Map();
 let json_mapping = new Map();
 let hook_mapping = new Map();
 let ws_packet_count = new Map();
@@ -61,7 +62,7 @@ app.all('/', (req, res) => {
  console.log(req.body, 'POST /');
  const key = req.body.from
  addRequestToMap(key, req, hook_mapping);
-  return getJsonFromMap(key, req, res);
+  return getJsonFromMap(json_mapping, key, req, res);
 });

 app.post('/appMapping', (req, res) => {
@@ -106,7 +107,7 @@ app.post('/actionHook', (req, res) => {
 app.all('/customHook', (req, res) => {
  let key = `${req.body.from}_customHook`;;
  console.log(req.body, `POST /customHook`);
-  return getJsonFromMap(key, req, res);
+  return getJsonFromMap(json_mapping, key, req, res);
 });

 app.post('/customHookMapping', (req, res) => {
@@ -116,6 +117,23 @@ app.post('/customHookMapping', (req, res) => {
  return res.sendStatus(200);
 });

+/**
+ * Any Hook
+ */
+
+app.all('/anyHook/:key', (req, res) => {
+  let key = req.params.key;
+  console.log(req.body, `POST /anyHook/${key}`);
+  return getJsonFromMap(any_hook_json_mapping, key, req, res);
+});
+
+app.post('/anyHookMapping', (req, res) => {
+  let key = req.body.key;
+  console.log(req.body, `POST /anyHookMapping/${key}`);
+  any_hook_json_mapping.set(key, req.body.data);
+  return res.sendStatus(200);
+});
+
 // Fetch Requests
 app.get('/requests/:key', (req, res) => {
  let key = req.params.key;
@@ -162,9 +180,9 @@ app.get('/ws_metadata/:key', (req, res) => {
 * private function
 */

-function getJsonFromMap(key, req, res) {
-  if (!json_mapping.has(key)) return res.sendStatus(404);
-  const retData = JSON.parse(json_mapping.get(key));
+function getJsonFromMap(map, key, req, res) {
+  if (!map.has(key)) return res.sendStatus(404);
+  const retData = JSON.parse(map.get(key));
  console.log(retData, ` Response to ${req.method} ${req.url}`);
  addRequestToMap(key, req, hook_mapping);
  return res.json(retData);
--- a/test/webhooks-tests.js
+++ b/test/webhooks-tests.js
@@ -45,7 +45,7 @@ test('basic webhook tests', async(t) => {
    ];

    const from = 'sip_decline_test_success';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    await sippUac('uac-expect-603.xml', '172.38.0.10', from);
    t.pass('webhook successfully declines call');
@@ -73,7 +73,7 @@ test('invalid jambonz json create alert tests', async(t) => {
    };

    const from = 'invalid_json_create_alert';
-    provisionCallHook(from, verbs)
+    await provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-invite-expect-480.xml', '172.38.0.10', from);