change population of test data

feat: update stat collector version (#302 )
fix: Re-invite sip rec does not update media (#300 )
2026-02-10 16:31:12 +00:00 · 2023-04-05 13:10:01 -04:00 · 2023-04-05 12:02:41 -04:00 · 2023-04-05 09:46:32 -04:00 · 2023-04-04 21:02:21 -04:00 · 2023-04-03 11:13:12 -04:00
7 changed files with 64 additions and 29 deletions
--- a/lib/http-routes/api/create-call.js
+++ b/lib/http-routes/api/create-call.js
@@ -104,7 +104,7 @@ router.post('/', async(req, res) => {
      proxy: `sip:${sbcAddress}`,
      localSdp: ep.local.sdp
    });
-    if (target.auth) opts.auth = this.target.auth;
+    if (target.auth) opts.auth = target.auth;


    /**
--- a/lib/session/siprec-call-session.js
+++ b/lib/session/siprec-call-session.js
@@ -1,6 +1,7 @@
 const InboundCallSession = require('./inbound-call-session');
 const {createSipRecPayload} = require('../utils/siprec-utils');
 const {CallStatus} = require('../utils/constants');
+const {parseSiprecPayload} = require('../utils/siprec-utils');
 /**
 * @classdesc Subclass of InboundCallSession.  This represents a CallSession that is
 * established for an inbound SIPREC call.
@@ -16,6 +17,32 @@ class SipRecCallSession extends InboundCallSession {
    this.metadata = metadata;
  }

+  async _onReinvite(req, res) {
+    try {
+      this.logger.info(req.payload, 'SipRec Re-INVITE payload');
+      const {sdp1: reSdp1, sdp2: reSdp2, metadata: reMetadata} = await parseSiprecPayload(req, this.logger);
+      this.sdp1 = reSdp1;
+      this.sdp2 = reSdp2;
+      this.metadata = reMetadata;
+
+      if (this.ep && this.ep2) {
+        let remoteSdp = this.sdp1.replace(/sendonly/, 'sendrecv');
+        const newSdp1 = await this.ep.modify(remoteSdp);
+        remoteSdp = this.sdp2.replace(/sendonly/, 'sendrecv');
+        const newSdp2 = await this.ep2.modify(remoteSdp);
+        const combinedSdp = await createSipRecPayload(newSdp1, newSdp2, this.logger);
+        res.send(200, {body: combinedSdp});
+        this.logger.info({offer: req.body, answer: combinedSdp}, 'SipRec handling reINVITE');
+      }
+      else {
+        this.logger.info('got SipRec reINVITE but no endpoint and media has not been released');
+        res.send(488);
+      }
+    } catch (err) {
+      this.logger.error(err, 'Error handling reinvite');
+    }
+  }
+
  async answerSipRecCall() {
    try {
      this.ms = this.getMS();
--- a/lib/utils/siprec-utils.js
+++ b/lib/utils/siprec-utils.js
@@ -242,7 +242,8 @@ const createSipRecPayload = (sdp1, sdp2, logger) => {
    .replace(/a=sendonly\r\n/g, '')
    .replace(/a=direction:both\r\n/g, '');
  */
-  return combinedSdp;
+
+  return combinedSdp.replace(/sendrecv/g, 'recvonly');
 };

 module.exports = { parseSiprecPayload, createSipRecPayload } ;
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,8 +12,8 @@
        "@jambonz/db-helpers": "^0.7.4",
        "@jambonz/http-health-check": "^0.0.1",
        "@jambonz/realtimedb-helpers": "^0.7.0",
-        "@jambonz/speech-utils": "^0.0.9",
-        "@jambonz/stats-collector": "^0.1.6",
+        "@jambonz/speech-utils": "^0.0.12",
+        "@jambonz/stats-collector": "^0.1.8",
        "@jambonz/time-series": "^0.2.5",
        "@jambonz/verb-specifications": "^0.0.11",
        "@opentelemetry/api": "^1.4.0",
@@ -1627,9 +1627,9 @@
      }
    },
    "node_modules/@jambonz/speech-utils": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.9.tgz",
-      "integrity": "sha512-YxhDpQvmDkLLTg6XguIrod6jm55RiuTCAiW+MDmx73Rm8FLDibxxoM7TKLR5Hl2Pbfv+j7eS1XraBbJO/bbxTQ==",
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.12.tgz",
+      "integrity": "sha512-0S5HlFmVLGw6AA7R1HBE08tgCjT4P7szqsMioDKVrrTA84/qqqb4Vv70zc0F63lM2qUU5OXUnA1RJUcVpo9imQ==",
      "dependencies": {
        "@aws-sdk/client-polly": "^3.303.0",
        "@google-cloud/text-to-speech": "^4.2.1",
@@ -1646,9 +1646,9 @@
      }
    },
    "node_modules/@jambonz/stats-collector": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.6.tgz",
-      "integrity": "sha512-Qk+kpeb2wravpj3OYPC4N3ML1qoAzARNLfKGZtJ05PTAtfWoZMPnyfPAM9EJHIiVfs2Lec3CXDjEpHna0mc9EA==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.8.tgz",
+      "integrity": "sha512-PadBKTmcphU7bZI7pVr4awhoIi+DMLw7An6AGE0GGsLCn2x0IGnxr9k47gI4Bk3OaSF6N7RyVLEAMkJfr24l8Q==",
      "dependencies": {
        "debug": "^4.3.2",
        "hot-shots": "^8.5.0"
@@ -9962,9 +9962,9 @@
      }
    },
    "@jambonz/speech-utils": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.9.tgz",
-      "integrity": "sha512-YxhDpQvmDkLLTg6XguIrod6jm55RiuTCAiW+MDmx73Rm8FLDibxxoM7TKLR5Hl2Pbfv+j7eS1XraBbJO/bbxTQ==",
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/@jambonz/speech-utils/-/speech-utils-0.0.12.tgz",
+      "integrity": "sha512-0S5HlFmVLGw6AA7R1HBE08tgCjT4P7szqsMioDKVrrTA84/qqqb4Vv70zc0F63lM2qUU5OXUnA1RJUcVpo9imQ==",
      "requires": {
        "@aws-sdk/client-polly": "^3.303.0",
        "@google-cloud/text-to-speech": "^4.2.1",
@@ -9981,9 +9981,9 @@
      }
    },
    "@jambonz/stats-collector": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.6.tgz",
-      "integrity": "sha512-Qk+kpeb2wravpj3OYPC4N3ML1qoAzARNLfKGZtJ05PTAtfWoZMPnyfPAM9EJHIiVfs2Lec3CXDjEpHna0mc9EA==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.8.tgz",
+      "integrity": "sha512-PadBKTmcphU7bZI7pVr4awhoIi+DMLw7An6AGE0GGsLCn2x0IGnxr9k47gI4Bk3OaSF6N7RyVLEAMkJfr24l8Q==",
      "requires": {
        "debug": "^4.3.2",
        "hot-shots": "^8.5.0"
--- a/package.json
+++ b/package.json
@@ -27,8 +27,8 @@
    "@jambonz/db-helpers": "^0.7.4",
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/realtimedb-helpers": "^0.7.0",
-    "@jambonz/speech-utils": "^0.0.9",
-    "@jambonz/stats-collector": "^0.1.6",
+    "@jambonz/speech-utils": "^0.0.12",
+    "@jambonz/stats-collector": "^0.1.8",
    "@jambonz/time-series": "^0.2.5",
    "@jambonz/verb-specifications": "^0.0.11",
    "@opentelemetry/api": "^1.4.0",
--- a/test/create-test-db.js
+++ b/test/create-test-db.js
@@ -18,30 +18,38 @@ test('creating schema', (t) => {
    if (err) return t.end(err);
    t.pass('schema and test data successfully created');

-    if (process.env.GCP_JSON_KEY && process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
+    const sql = [];
+    if (process.env.GCP_JSON_KEY) {
      const google_credential = encrypt(process.env.GCP_JSON_KEY);
+      t.pass('adding google credentials');
+      sql.push(`UPDATE speech_credentials SET credential='${google_credential}' WHERE vendor='google';`);
+    }
+    if (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
      const aws_credential = encrypt(JSON.stringify({
        access_key_id: process.env.AWS_ACCESS_KEY_ID,
        secret_access_key: process.env.AWS_SECRET_ACCESS_KEY,
        aws_region: process.env.AWS_REGION
      }));
+      t.pass('adding aws credentials');
+      sql.push(`UPDATE speech_credentials SET credential='${aws_credential}' WHERE vendor='aws';`);
+    }
+    if (process.env.MICROSOFT_REGION && process.env.MICROSOFT_API_KEY) {
      const microsoft_credential = encrypt(JSON.stringify({
-        region: process.env.MICROSOFT_REGION || 'useast',
-        api_key: process.env.MICROSOFT_API_KEY || '1234567890'
+        region: process.env.MICROSOFT_REGION,
+        api_key: process.env.MICROSOFT_API_KEY
      }));
-      const cmd = `
-UPDATE speech_credentials SET credential='${google_credential}' WHERE vendor='google';
-UPDATE speech_credentials SET credential='${aws_credential}' WHERE vendor='aws';
-UPDATE speech_credentials SET credential='${microsoft_credential}' WHERE vendor='microsoft';
-`;
+      t.pass('adding microsoft credentials');
+      sql.push(`UPDATE speech_credentials SET credential='${microsoft_credential}' WHERE vendor='microsoft';`);
+    }
+    if (sql.length > 0) {
      const path = `${__dirname}/.creds.sql`;
-      fs.writeFileSync(path, cmd);
+      const cmd = sql.join('\n');
+      fs.writeFileSync(path, sql.join('\n'));
      exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360  -D jambones_test < ${path}`, (err, stdout, stderr) => {
        console.log(stdout);
        console.log(stderr);
        if (err) return t.end(err);
        fs.unlinkSync(path)
-        fs.writeFileSync(`${__dirname}/credentials/gcp.json`, process.env.GCP_JSON_KEY);
        t.pass('set account-level speech credentials');
        t.end();
      });
--- a/test/remove-test-db.js
+++ b/test/remove-test-db.js
@@ -5,7 +5,6 @@ test('dropping jambones_test database', (t) => {
  exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360 < ${__dirname}/db/remove_test_db.sql`, (err, stdout, stderr) => {
    if (err) return t.end(err);
    t.pass('database successfully dropped');
-    fs.unlinkSync(`${__dirname}/credentials/gcp.json`);
    t.end();
  });
 });
Author	SHA1	Message	Date
Dave Horton	845d80a23d	change population of test data	2023-04-05 13:10:01 -04:00
Hoan Luu Huu	3109db7861	feat: update stat collector version (#302 )	2023-04-05 12:02:41 -04:00
Hoan Luu Huu	11c5047465	fix: Re-invite sip rec does not update media (#300 ) * fix: Re-invite sip rec does not update media * fix: Re-invite sip rec does not update media	2023-04-05 09:46:32 -04:00
Dave Horton	e19ea629f0	response to siprec invite should have a:recvonly if offer had a:sendonly (#298 )	2023-04-04 21:02:21 -04:00
Antony Jukes	fe529c6bfb	removed incorrect "this" from this.target.auth as it actually a local const. (#296 )	2023-04-03 11:13:12 -04:00
Dave Horton	e980b82ec4	update to speech utils with improved microsoft tts	2023-04-01 13:20:59 -04:00
Hoan Luu Huu	318ca19791	fix: update speech utils version (#295 ) * fix: update speech utils version * update package-lock.json --------- Co-authored-by: Dave Horton <daveh@beachdognet.com>	2023-04-01 11:35:13 -04:00