support configuration to limit minimum value sipgatewa netmask can be used (#344 )

added private_newtwork_cidr to system_information table (#341 )
* added private_newtwork_cidr to system_information table * db schema upgrade to add system_information.private_network_cidr in 0.9.2 * increase size of system_information.private_network_cidr to varchar(8192)
2026-01-25 02:08:24 +00:00 · 2024-08-19 21:44:15 -04:00 · 2024-08-18 12:49:06 -04:00 · 2024-08-07 07:24:58 -04:00 · 2024-08-06 11:42:33 -04:00 · 2024-07-24 13:04:12 -04:00
15 changed files with 202 additions and 35 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,11 +7,21 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
+      - name: Install Docker Compose
+        run: |
+          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          sudo chmod +x /usr/local/bin/docker-compose
+          docker-compose --version
      - uses: actions/setup-node@v3
        with:
          node-version: lts/*
      - run: npm install
      - run: npm run jslint
+      - name: Install Docker Compose
+        run: |
+          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          sudo chmod +x /usr/local/bin/docker-compose
+          docker-compose --version
      - run: npm test

 
--- a/db/jambones-sql.sql
+++ b/db/jambones-sql.sql
@@ -162,7 +162,7 @@ regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed num
 description VARCHAR(1024),
 priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) COMMENT='An ordered list of  digit patterns in an LCR table.  The patterns are tested in sequence until one matches';
+) COMMENT='An ordered list of  digit patterns in an LCR table.  The pat';

 CREATE TABLE lcr
 (
@@ -173,7 +173,7 @@ default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use whe
 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.';
+) COMMENT='An LCR (least cost routing) table that is used by a service ';

 CREATE TABLE password_settings
 (
@@ -358,7 +358,8 @@ CREATE TABLE system_information
 (
 domain_name VARCHAR(255),
 sip_domain_name VARCHAR(255),
-monitoring_domain_name VARCHAR(255)
+monitoring_domain_name VARCHAR(255),
+private_network_cidr VARCHAR(8192)
 );

 CREATE TABLE users
--- a/db/jambones.sqs
+++ b/db/jambones.sqs
@@ -2808,7 +2808,7 @@
        </location>
        <size>
            <width>266.00</width>
-            <height>80.00</height>
+            <height>100.00</height>
        </size>
        <zorder>35</zorder>
        <SQLField>
@@ -2826,6 +2826,11 @@
            <type><![CDATA[VARCHAR(255)]]></type>
            <uid><![CDATA[0A8DB34E-76C9-4D40-9E31-786E0228DCEE]]></uid>
        </SQLField>
+        <SQLField>
+            <name><![CDATA[private_network_cidr]]></name>
+            <type><![CDATA[VARCHAR(8192)]]></type>
+            <uid><![CDATA[45A2CE92-0BA7-4156-AE05-750D63F386F3]]></uid>
+        </SQLField>
        <labelWindowIndex><![CDATA[3]]></labelWindowIndex>
        <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
        <uid><![CDATA[F0C2DC80-CBA7-4BE7-8856-D10B062A7B17]]></uid>
@@ -3115,14 +3120,14 @@
        <RightSidebarWidth><![CDATA[1235.000000]]></RightSidebarWidth>
        <sidebarIndex><![CDATA[2]]></sidebarIndex>
        <snapToGrid><![CDATA[0]]></snapToGrid>
-        <SourceSidebarWidth><![CDATA[312.000000]]></SourceSidebarWidth>
+        <SourceSidebarWidth><![CDATA[0.000000]]></SourceSidebarWidth>
        <SQLEditorFileFormatVersion><![CDATA[4]]></SQLEditorFileFormatVersion>
        <uid><![CDATA[58C99A00-06C9-478C-A667-C63842E088F3]]></uid>
-        <windowHeight><![CDATA[1079.000000]]></windowHeight>
+        <windowHeight><![CDATA[873.000000]]></windowHeight>
        <windowLocationX><![CDATA[0.000000]]></windowLocationX>
-        <windowLocationY><![CDATA[0.000000]]></windowLocationY>
-        <windowScrollOrigin><![CDATA[{1, 0}]]></windowScrollOrigin>
-        <windowWidth><![CDATA[1676.000000]]></windowWidth>
+        <windowLocationY><![CDATA[71.000000]]></windowLocationY>
+        <windowScrollOrigin><![CDATA[{1674.5, 0}]]></windowScrollOrigin>
+        <windowWidth><![CDATA[1512.000000]]></windowWidth>
    </SQLDocumentInfo>
    <AllowsIndexRenamingOnInsert><![CDATA[1]]></AllowsIndexRenamingOnInsert>
    <defaultLabelExpanded><![CDATA[1]]></defaultLabelExpanded>
--- a/db/upgrade-jambonz-db.js
+++ b/db/upgrade-jambonz-db.js
@@ -197,6 +197,9 @@ const sql = {
    'ALTER TABLE applications MODIFY COLUMN speech_synthesis_voice VARCHAR(256)',
    'ALTER TABLE applications MODIFY COLUMN fallback_speech_synthesis_voice VARCHAR(256)',
    'ALTER TABLE sip_gateways ADD COLUMN use_sips_scheme BOOLEAN NOT NULL DEFAULT 0',
+  ],
+  9002: [
+    'ALTER TABLE system_information ADD COLUMN private_network_cidr VARCHAR(8192)',
  ]
 };

@@ -230,6 +233,7 @@ const doIt = async() => {
        if (val < 8004) upgrades.push(...sql['8004']);
        if (val < 8005) upgrades.push(...sql['8005']);
        if (val < 9000) upgrades.push(...sql['9000']);
+        if (val < 9002) upgrades.push(...sql['9002']);

        // perform all upgrades
        logger.info({upgrades}, 'applying schema upgrades..');
--- a/lib/models/speech-credential.js
+++ b/lib/models/speech-credential.js
@@ -23,10 +23,11 @@ class SpeechCredential extends Model {
  static async getSpeechCredentialsByVendorAndLabel(service_provider_sid, account_sid, vendor, label) {
    let sql;
    if (account_sid) {
-      sql = `SELECT * FROM speech_credentials WHERE account_sid = ? AND vendor = ? ${label ? 'AND label = ?' : ''}`;
+      sql = `SELECT * FROM speech_credentials WHERE account_sid = ? AND vendor = ?
+        AND label ${label ? '= ?' : 'is NULL'}`;
    } else {
      sql = `SELECT * FROM speech_credentials WHERE service_provider_sid = ? AND vendor = ?
-        ${label ? 'AND label = ?' : ''}`;
+        AND label ${label ? '= ?' : 'is NULL'}`;
    }
    const [rows] = await promisePool.query(sql, [account_sid ? account_sid : service_provider_sid, vendor, label]);
    return rows;
--- a/lib/models/system-information.js
+++ b/lib/models/system-information.js
@@ -33,6 +33,10 @@ SystemInformation.fields = [
    name: 'monitoring_domain_name',
    type: 'string',
  },
+  {
+    name: 'private_network_cidr',
+    type: 'string',
+  },
 ];

 module.exports = SystemInformation;
--- a/lib/routes/api/sip-gateways.js
+++ b/lib/routes/api/sip-gateways.js
@@ -41,6 +41,7 @@ const checkUserScope = async(req, voip_carrier_sid) => {

 const validate = async(req, sid) => {
  const {lookupSipGatewayBySid} = req.app.locals;
+  const {netmask} = req.body;
  let voip_carrier_sid;

  if (sid) {
@@ -52,6 +53,12 @@ const validate = async(req, sid) => {
    voip_carrier_sid = req.body.voip_carrier_sid;
    if (!voip_carrier_sid) throw new DbErrorBadRequest('missing voip_carrier_sid');
  }
+  if (netmask &&
+    process.env.JAMBONZ_MIN_GATEWAY_NETMASK &&
+    parseInt(netmask) < process.env.JAMBONZ_MIN_GATEWAY_NETMASK) {
+    throw new DbErrorBadRequest(
+      `netmask required to have value equal or greater than ${process.env.JAMBONZ_MIN_GATEWAY_NETMASK}`);
+  }
  await checkUserScope(req, voip_carrier_sid);
 };

--- a/lib/routes/api/speech-credentials.js
+++ b/lib/routes/api/speech-credentials.js
@@ -124,6 +124,7 @@ const encryptCredential = (obj) => {
    nuance_stt_uri,
    deepgram_stt_uri,
    deepgram_stt_use_tls,
+    deepgram_tts_uri,
    use_custom_tts,
    custom_tts_endpoint,
    custom_tts_endpoint_url,
@@ -204,10 +205,10 @@ const encryptCredential = (obj) => {

    case 'deepgram':
      // API key is optional if onprem
-      if (!deepgram_stt_uri) {
+      if (!deepgram_stt_uri || !deepgram_tts_uri) {
        assert(api_key, 'invalid deepgram speech credential: api_key is required');
      }
-      const deepgramData = JSON.stringify({api_key, deepgram_stt_uri, deepgram_stt_use_tls});
+      const deepgramData = JSON.stringify({api_key, deepgram_stt_uri, deepgram_stt_use_tls, deepgram_tts_uri});
      return encrypt(deepgramData);

    case 'ibm':
@@ -458,6 +459,7 @@ router.put('/:sid', async(req, res) => {
          options,
          deepgram_stt_uri,
          deepgram_stt_use_tls,
+          deepgram_tts_uri,
          engine_version
        } = req.body;

@@ -485,6 +487,7 @@ router.put('/:sid', async(req, res) => {
          options,
          deepgram_stt_uri,
          deepgram_stt_use_tls,
+          deepgram_tts_uri,
          engine_version
        };
        logger.info({o, newCred}, 'updating speech credential with this new credential');
--- a/lib/utils/speech-data/tts-model-elevenlabs.js
+++ b/lib/utils/speech-data/tts-model-elevenlabs.js
@@ -1,5 +1,6 @@
 module.exports = [
  { name: 'Turbo v2', value: 'eleven_turbo_v2' },
+  { name: 'Turbo v2.5', value: 'eleven_turbo_v2_5' },
  { name: 'Multilingual v2', value: 'eleven_multilingual_v2' },
  { name: 'Multilingual v1', value: 'eleven_multilingual_v1' },
  { name: 'English v1', value: 'eleven_monolingual_v1' },
--- a/lib/utils/speech-utils.js
+++ b/lib/utils/speech-utils.js
@@ -92,8 +92,8 @@ const testGoogleStt = async(logger, credentials) => {
 };

 const testDeepgramStt = async(logger, credentials) => {
-  const {api_key} = credentials;
-  const deepgram = new Deepgram(api_key);
+  const {api_key, deepgram_stt_uri, deepgram_stt_use_tls} = credentials;
+  const deepgram = new Deepgram(api_key, deepgram_stt_uri, deepgram_stt_uri && deepgram_stt_use_tls);

  const mimetype = 'audio/wav';
  const source = {
@@ -272,7 +272,8 @@ const testPlayHT = async(logger, synthAudio, credentials) => {
        credentials,
        language: 'en-US',
        voice: 's3://voice-cloning-zero-shot/d9ff78ba-d016-47f6-b0ef-dd630f59414e/female-cs/manifest.json',
-        text: 'Hi there and welcome to jambones!'
+        text: 'Hi there and welcome to jambones!',
+        renderForCaching: true
      }
    );
    // Test if playHT can fetch voices
@@ -295,7 +296,8 @@ const testRimelabs = async(logger, synthAudio, credentials) => {
        credentials,
        language: 'en-US',
        voice: 'amber',
-        text: 'Hi there and welcome to jambones!'
+        text: 'Hi there and welcome to jambones!',
+        renderForCaching: true
      }
    );
  } catch (err) {
@@ -312,7 +314,8 @@ const testWhisper = async(logger, synthAudio, credentials) => {
        credentials,
        language: 'en-US',
        voice: 'alloy',
-        text: 'Hi there and welcome to jambones!'
+        text: 'Hi there and welcome to jambones!',
+        renderForCaching: true
      }
    );
  } catch (err) {
@@ -328,7 +331,8 @@ const testDeepgramTTS = async(logger, synthAudio, credentials) => {
        vendor: 'deepgram',
        credentials,
        model: 'aura-asteria-en',
-        text: 'Hi there and welcome to jambones!'
+        text: 'Hi there and welcome to jambones!',
+        renderForCaching: true
      }
    );
  } catch (err) {
@@ -383,7 +387,8 @@ const testVerbioTts = async(logger, synthAudio, credentials) => {
        credentials,
        language: 'en-US',
        voice: 'tommy_en-us',
-        text: 'Hi there and welcome to jambones!'
+        text: 'Hi there and welcome to jambones!',
+        renderForCaching: true
      }
    );
  } catch (err) {
@@ -509,6 +514,7 @@ function decryptCredential(obj, credential, logger, isObscureKey = true) {
    obj.api_key = isObscureKey ? obscureKey(o.api_key) : o.api_key;
    obj.deepgram_stt_uri = o.deepgram_stt_uri;
    obj.deepgram_stt_use_tls = o.deepgram_stt_use_tls;
+    obj.deepgram_tts_uri = o.deepgram_tts_uri;
  }
  else if ('ibm' === obj.vendor) {
    const o = JSON.parse(decrypt(credential));
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
        "@jambonz/lamejs": "^1.2.2",
        "@jambonz/mw-registrar": "^0.2.7",
        "@jambonz/realtimedb-helpers": "^0.8.9",
-        "@jambonz/speech-utils": "^0.1.11",
+        "@jambonz/speech-utils": "^0.1.13",
        "@jambonz/time-series": "^0.2.8",
        "@jambonz/verb-specifications": "^0.0.72",
        "@soniox/soniox-node": "^1.2.2",
@@ -36,7 +36,7 @@
        "jsonwebtoken": "^9.0.2",
        "mailgun.js": "^10.2.1",
        "microsoft-cognitiveservices-speech-sdk": "1.36.0",
-        "mysql2": "^3.9.3",
+        "mysql2": "^3.11.0",
        "nocache": "4.0.0",
        "passport": "^0.7.0",
        "passport-http-bearer": "^1.0.1",
@@ -2027,9 +2027,10 @@
      }
    },
    "node_modules/@jambonz/speech-utils": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.1.11.tgz",
-      "integrity": "sha512-VgljBLUF871adib/3yWpzd7kv26ioxiLVkAIxm94CSk9WeZuzX1lVcE2SohojW3mjCYdYY6+B8FRyzlTD+en3g==",
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.1.13.tgz",
+      "integrity": "sha512-QeVmNFLtJGPGQfmp7jXpy742AyJIv2EteelDmNTqWGFEwTBj88q8GLP51hUsIR2ZbE5n/ZmZb/ytT6Y6LIQSDg==",
+      "license": "MIT",
      "dependencies": {
        "@aws-sdk/client-polly": "^3.496.0",
        "@aws-sdk/client-sts": "^3.496.0",
@@ -2041,7 +2042,7 @@
        "form-urlencoded": "^6.1.4",
        "google-protobuf": "^3.21.2",
        "ibm-watson": "^8.0.0",
-        "microsoft-cognitiveservices-speech-sdk": "1.36.0",
+        "microsoft-cognitiveservices-speech-sdk": "1.38.0",
        "openai": "^4.25.0",
        "undici": "^6.4.0"
      }
@@ -2051,6 +2052,28 @@
      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz",
      "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="
    },
+    "node_modules/@jambonz/speech-utils/node_modules/https-proxy-agent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "5",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@jambonz/speech-utils/node_modules/https-proxy-agent/node_modules/agent-base": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
    "node_modules/@jambonz/speech-utils/node_modules/ibm-watson": {
      "version": "8.0.0",
      "resolved": "https://registry.npmjs.org/ibm-watson/-/ibm-watson-8.0.0.tgz",
@@ -2072,6 +2095,41 @@
        "node": ">=16.0.0"
      }
    },
+    "node_modules/@jambonz/speech-utils/node_modules/microsoft-cognitiveservices-speech-sdk": {
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/microsoft-cognitiveservices-speech-sdk/-/microsoft-cognitiveservices-speech-sdk-1.38.0.tgz",
+      "integrity": "sha512-NA6J4eIDkeR9iN83rcn77Kn5AWQcizDEn1tLMjzRvSovUNB1FrZe0mWYO0fsGltUwMl3Ns5OZ3lGw42PU4fEYA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/webrtc": "^0.0.37",
+        "agent-base": "^6.0.1",
+        "bent": "^7.3.12",
+        "https-proxy-agent": "^4.0.0",
+        "uuid": "^9.0.0",
+        "ws": "^7.5.6"
+      }
+    },
+    "node_modules/@jambonz/speech-utils/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/@jambonz/time-series": {
      "version": "0.2.8",
      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.2.8.tgz",
@@ -3434,6 +3492,15 @@
        "node": "*"
      }
    },
+    "node_modules/aws-ssl-profiles": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/aws-ssl-profiles/-/aws-ssl-profiles-1.1.1.tgz",
+      "integrity": "sha512-+H+kuK34PfMaI9PNU/NSjBKL5hh/KDM9J72kwYeYEm0A8B1AC4fuCy3qsjnA7lxklgyXsB68yn8Z2xoZEjgwCQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
    "node_modules/aws4": {
      "version": "1.12.0",
      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
@@ -6909,10 +6976,12 @@
      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
    },
    "node_modules/mysql2": {
-      "version": "3.9.3",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.9.3.tgz",
-      "integrity": "sha512-+ZaoF0llESUy7BffccHG+urErHcWPZ/WuzYAA9TEeLaDYyke3/3D+VQDzK9xzRnXpd0eMtRf0WNOeo4Q1Baung==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.11.0.tgz",
+      "integrity": "sha512-J9phbsXGvTOcRVPR95YedzVSxJecpW5A5+cQ57rhHIFXteTP10HCs+VBjS7DHIKfEaI1zQ5tlVrquCd64A6YvA==",
+      "license": "MIT",
      "dependencies": {
+        "aws-ssl-profiles": "^1.1.1",
        "denque": "^2.1.0",
        "generate-function": "^2.3.1",
        "iconv-lite": "^0.6.3",
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
    "@jambonz/lamejs": "^1.2.2",
    "@jambonz/mw-registrar": "^0.2.7",
    "@jambonz/realtimedb-helpers": "^0.8.9",
-    "@jambonz/speech-utils": "^0.1.11",
+    "@jambonz/speech-utils": "^0.1.13",
    "@jambonz/time-series": "^0.2.8",
    "@jambonz/verb-specifications": "^0.0.72",
    "@soniox/soniox-node": "^1.2.2",
@@ -46,7 +46,7 @@
    "jsonwebtoken": "^9.0.2",
    "mailgun.js": "^10.2.1",
    "microsoft-cognitiveservices-speech-sdk": "1.36.0",
-    "mysql2": "^3.9.3",
+    "mysql2": "^3.11.0",
    "nocache": "4.0.0",
    "passport": "^0.7.0",
    "passport-http-bearer": "^1.0.1",
--- a/test/sip-gateways.js
+++ b/test/sip-gateways.js
@@ -17,6 +17,53 @@ test('sip gateway tests', async(t) => {
    let result;
    const voip_carrier_sid = await createVoipCarrier(request);

+    /* add a invalid sip gateway */
+    const STORED_JAMBONZ_MIN_GATEWAY_NETMASK = process.env.JAMBONZ_MIN_GATEWAY_NETMASK;
+    process.env.JAMBONZ_MIN_GATEWAY_NETMASK = 24;
+    
+    result = await request.post('/SipGateways', {
+      resolveWithFullResponse: true,
+      auth: authAdmin,
+      json: true,
+      simple: false,
+      body: {
+        voip_carrier_sid,
+        ipv4: '1.2.3.4',
+        netmask: 1,
+        inbound: true,
+        outbound: true,
+        protocol: 'tcp'
+      }
+    });
+    t.ok(result.statusCode === 400, 'successfully created sip gateway ');
+
+    result = await request.post('/SipGateways', {
+      resolveWithFullResponse: true,
+      auth: authAdmin,
+      json: true,
+      body: {
+        voip_carrier_sid,
+        ipv4: '1.2.3.4',
+        netmask: 24,
+        inbound: true,
+        outbound: true,
+        protocol: 'tcp'
+      }
+    });
+    t.ok(result.statusCode === 201, 'successfully created sip gateway ');
+
+    process.env.JAMBONZ_MIN_GATEWAY_NETMASK = STORED_JAMBONZ_MIN_GATEWAY_NETMASK;
+
+    /* delete sip gateways */
+    result = await request.delete(`/SipGateways/${result.body.sid}`, {
+      resolveWithFullResponse: true,
+      simple: false,
+      json: true,
+      auth: authAdmin
+    });
+    //console.log(`result: ${JSON.stringify(result)}`);
+    t.ok(result.statusCode === 204, 'successfully deleted sip gateway');
+
    /* add a sip gateway */
    result = await request.post('/SipGateways', {
      resolveWithFullResponse: true,
--- a/test/speech-credentials.js
+++ b/test/speech-credentials.js
@@ -371,7 +371,8 @@ test('speech credentials tests', async(t) => {
        vendor: 'deepgram',
        use_for_stt: true,
        deepgram_stt_uri: "127.0.0.1:50002",
-        deepgram_stt_use_tls: true
+        deepgram_stt_use_tls: true,
+        deepgram_tts_uri: 'https://server.com'
      }
    });
    t.ok(result.statusCode === 201, 'successfully added speech credential for deepgram');
@@ -386,6 +387,7 @@ test('speech credentials tests', async(t) => {
    t.ok(result.statusCode === 200, 'successfully get speech credential for deepgram');
    t.ok(result.body.deepgram_stt_uri === '127.0.0.1:50002', "deepgram_stt_uri is correct for deepgram");
    t.ok(result.body.deepgram_stt_use_tls === true, "deepgram_stt_use_tls is correct for deepgram");
+    t.ok(result.body.deepgram_tts_uri === 'https://server.com', "deepgram_tts_uri is correct for deepgram")

    result = await request.put(`/Accounts/${account_sid}/SpeechCredentials/${dg_sid}`, {
      resolveWithFullResponse: true,
@@ -395,7 +397,8 @@ test('speech credentials tests', async(t) => {
        vendor: 'deepgram',
        use_for_stt: true,
        deepgram_stt_uri: "127.0.0.2:50002",
-        deepgram_stt_use_tls: false
+        deepgram_stt_use_tls: false,
+        deepgram_tts_uri: 'https://server2.com'
      }
    });
    t.ok(result.statusCode === 204, 'successfully updated speech credential for deepgram onprem');
@@ -409,6 +412,7 @@ test('speech credentials tests', async(t) => {
    t.ok(result.statusCode === 200, 'successfully get speech credential for deepgram onprem');
    t.ok(result.body.deepgram_stt_uri === '127.0.0.2:50002', "deepgram_stt_uri is correct for deepgram onprem");
    t.ok(result.body.deepgram_stt_use_tls === false, "deepgram_stt_use_tls is correct for deepgram onprem");
+    t.ok(result.body.deepgram_tts_uri === 'https://server2.com', "deepgram_tts_uri is correct for deepgram onprem");

    result = await request.delete(`/Accounts/${account_sid}/SpeechCredentials/${dg_sid}`, {
      auth: authUser,
--- a/test/system-information.js
+++ b/test/system-information.js
@@ -16,7 +16,8 @@ test('system information test', async(t) => {
      body: {
        domain_name: 'test.com',
        sip_domain_name: 'sip.test.com',
-        monitoring_domain_name: 'monitor.test.com'
+        monitoring_domain_name: 'monitor.test.com',
+        private_network_cidr: '192.168.1.0/24, 10.10.100.1'
      }
    });
    t.ok(result.statusCode === 201, 'successfully created system information ');
@@ -24,6 +25,7 @@ test('system information test', async(t) => {
    t.ok(body.domain_name === 'test.com', 'added domain_name ok');
    t.ok(body.sip_domain_name === 'sip.test.com', 'added sip_domain_name ok');
    t.ok(body.monitoring_domain_name === 'monitor.test.com', 'added monitoring_domain_name ok');
+    t.ok(body.private_network_cidr === '192.168.1.0/24, 10.10.100.1', 'added private_network_cidr ok');

    result = await request.get('/SystemInformation', {
      auth: authAdmin,
@@ -32,6 +34,7 @@ test('system information test', async(t) => {
    t.ok(result.domain_name === 'test.com', 'get domain_name ok');
    t.ok(result.sip_domain_name === 'sip.test.com', 'get sip_domain_name ok');
    t.ok(result.monitoring_domain_name === 'monitor.test.com', 'get monitoring_domain_name ok');
+    t.ok(result.private_network_cidr === '192.168.1.0/24, 10.10.100.1', 'get private_network_cidr ok'); 

    result = await request.post('/SystemInformation', {
      resolveWithFullResponse: true,
@@ -40,7 +43,8 @@ test('system information test', async(t) => {
      body: {
        domain_name: 'test1.com',
        sip_domain_name: 'sip1.test.com',
-        monitoring_domain_name: 'monitor1.test.com'
+        monitoring_domain_name: 'monitor1.test.com',
+        private_network_cidr: ''
      }
    });
    t.ok(result.statusCode === 201, 'successfully updated system information ');
@@ -48,6 +52,7 @@ test('system information test', async(t) => {
    t.ok(body.domain_name === 'test1.com', 'updated domain_name ok');
    t.ok(body.sip_domain_name === 'sip1.test.com', 'updated sip_domain_name ok');
    t.ok(body.monitoring_domain_name === 'monitor1.test.com', 'updated monitoring_domain_name ok');
+    t.ok(body.private_network_cidr === '', 'updated private_network_cidr ok');

    result = await request.get('/SystemInformation', {
      auth: authAdmin,
Author	SHA1	Message	Date
Hoan Luu Huu	52de41c9bc	support configuration to limit minimum value sipgatewa netmask can be used (#344 )	2024-08-19 21:44:15 -04:00
Dave Horton	ed71abd675	added private_newtwork_cidr to system_information table (#341 ) * added private_newtwork_cidr to system_information table * db schema upgrade to add system_information.private_network_cidr in 0.9.2 * increase size of system_information.private_network_cidr to varchar(8192)	2024-08-18 12:49:06 -04:00
Hoan Luu Huu	2d2b98dab5	Feat/deepgram tts onprem (#338 ) * support deepgram onpremise * wip * update speech utils version * install docker in ci	2024-08-07 07:24:58 -04:00
Hoan Luu Huu	7553e2b617	update mysql2 version (#339 )	2024-08-06 11:42:33 -04:00
Hoan Luu Huu	b921cab867	Support elevenlabs 2.5 (#336 ) * update elevenlab model * wip * wip * wip	2024-07-24 13:04:12 -04:00