try 4

try 3
try 2
2026-01-25 02:07:56 +00:00 · 2023-04-10 09:02:39 -04:00 · 2023-04-10 09:00:19 -04:00 · 2023-04-10 08:56:44 -04:00 · 2023-04-10 08:53:57 -04:00 · 2023-04-10 08:49:44 -04:00
9 changed files with 130 additions and 62 deletions
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -2,13 +2,8 @@ name: Docker

 on:
  push:
-    # Publish `main` as Docker `latest` image.
-    branches:
-      - main
-
-    # Publish `v1.2.3` tags as releases.
    tags:
-      - v*
+      - '*'

 env:
  IMAGE_NAME: feature-server
@@ -20,32 +15,40 @@ jobs:
    if: github.event_name == 'push'

    steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v3

-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME
-
-      - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      - name: Push image
+      - name: prepare tag 
        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+            export IMAGE_ID=jambonz/$IMAGE_NAME

-          # Change all uppercase to lowercase
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+            # Strip git ref prefix from version
+            export VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')

-          # Strip git ref prefix from version
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+            # Strip "v" prefix from tag name
+            [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')

-          # Strip "v" prefix from tag name
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+            # Use Docker `latest` tag convention
+            [ "$VERSION" == "main" ] && export VERSION=latest

-          # Use Docker `latest` tag convention
-          [ "$VERSION" == "main" ] && VERSION=latest
+            echo IMAGE_ID=$IMAGE_ID
+            echo VERSION=$VERSION

-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
+      - name: Login to Docker Hub 
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}

-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: ${{ env.IMAGE_ID }}:${{ env.VERSION }}
+          build-args: |
+            GITHUB_REPOSITORY=$GITHUB_REPOSITORY
+            GITHUB_REF=$GITHUB_REF
+        env:
+          IMAGE_ID: ${{ env.IMAGE_ID }}
+          VERSION: ${{ env.VERSION }}
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -46,7 +46,16 @@ module.exports = function(srf, logger) {
    }
    if (req.has('X-Authenticated-User')) req.locals.originatingUser = req.get('X-Authenticated-User');
    if (req.has('X-MS-Teams-Tenant-FQDN')) req.locals.msTeamsTenant = req.get('X-MS-Teams-Tenant-FQDN');
-
+    if (req.has('X-Cisco-Recording-Participant')) {
+      const ciscoParticipants = req.get('X-Cisco-Recording-Participant');
+      const regex = /sip:[\d]+@[\d]+\.[\d]+\.[\d]+\.[\d]+/g;
+      const sipURIs = ciscoParticipants.match(regex);
+      logger.info(`X-Cisco-Recording-Participant : ${sipURIs} `);
+      if (sipURIs && sipURIs.length > 0) {
+        req.locals.calledNumber = sipURIs[0];
+        req.locals.callingNumber = sipURIs[1];
+      }
+    }
    next();
  }

@@ -94,8 +103,10 @@ module.exports = function(srf, logger) {
          .find((p) => p.type === 'application/sdp')
          .content;
        const {sdp1, sdp2, ...metadata} = await parseSiprecPayload(req, logger);
-        req.locals.calledNumber = metadata.caller.number;
-        req.locals.callingNumber = metadata.callee.number;
+        if (!req.locals.calledNumber && !req.locals.calledNumber) {
+          req.locals.calledNumber = metadata.caller.number;
+          req.locals.callingNumber = metadata.callee.number;
+        }
        req.locals = {
          ...req.locals,
          siprec: {
--- a/lib/session/call-info.js
+++ b/lib/session/call-info.js
@@ -33,6 +33,23 @@ class CallInfo {
      this.callStatus = CallStatus.Trying;
      this.originatingSipIp = req.get('X-Forwarded-For');
      this.originatingSipTrunkName = req.get('X-Originating-Carrier');
+      const {siprec} = req.locals;
+      if (siprec) {
+        const caller = parseUri(req.locals.callingNumber);
+        const callee = parseUri(req.locals.calledNumber);
+        this.participants = [
+          {
+            participant: 'caller',
+            uriUser: caller.user,
+            uriHost: caller.host
+          },
+          {
+            participant: 'callee',
+            uriUser: callee.user,
+            uriHost: callee.host
+          }
+        ];
+      }
    }
    else if (opts.parentCallInfo) {
      // outbound call that is a child of an existing call
--- a/lib/utils/siprec-utils.js
+++ b/lib/utils/siprec-utils.js
@@ -47,8 +47,16 @@ const parseSiprecPayload = (req, logger) => {
      }
    }

-    if (!sdp || !meta) {
-      logger.info({payload: req.payload}, 'invalid SIPREC payload');
+
+    if (!meta && sdp) {
+      const arr = /^([^]+)(m=[^]+?)(m=[^]+?)$/.exec(sdp);
+      opts.sdp1 = `${arr[1]}${arr[2]}`;
+      opts.sdp2 = `${arr[1]}${arr[3]}\r\n`;
+      opts.sessionId = uuidv4();
+      logger.info({ payload: req.payload }, 'SIPREC payload with no metadata (e.g. Cisco NBR)');
+      resolve(opts);
+    } else if (!sdp || !meta) {
+      logger.info({ payload: req.payload }, 'invalid SIPREC payload');
      return reject(new Error('expected multipart SIPREC body'));
    }

--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -336,8 +336,7 @@ module.exports = (logger) => {
    };

    if ('google' === vendor) {
-      let model = 'phone_call';
-      if (rOpts.altLanguages.length > 0) model = task.name === TaskName.Gather ? 'command_and_search' : 'latest_long';
+      const model = task.name === TaskName.Gather ? 'command_and_search' : 'latest_long';
      opts = {
        ...opts,
        ...(sttCredentials && {GOOGLE_APPLICATION_CREDENTIALS: JSON.stringify(sttCredentials.credentials)}),
@@ -352,7 +351,7 @@ module.exports = (logger) => {
          {GOOGLE_SPEECH_SPEAKER_DIARIZATION_MIN_SPEAKER_COUNT: rOpts.diarizationMinSpeakers}),
        ...(rOpts.diarization && rOpts.diarizationMaxSpeakers > 0 &&
          {GOOGLE_SPEECH_SPEAKER_DIARIZATION_MAX_SPEAKER_COUNT: rOpts.diarizationMaxSpeakers}),
-        ...(rOpts.enhancedModel && {GOOGLE_SPEECH_USE_ENHANCED: 1}),
+        ...(rOpts.enhancedModel !== false && {GOOGLE_SPEECH_USE_ENHANCED: 1}),
        ...(rOpts.profanityFilter === false && {GOOGLE_SPEECH_PROFANITY_FILTER: 0}),
        ...(rOpts.punctuation === false && {GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 0}),
        ...(rOpts.words  == false && {GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS: 0}),
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
        "@jambonz/http-health-check": "^0.0.1",
        "@jambonz/realtimedb-helpers": "^0.7.0",
        "@jambonz/speech-utils": "^0.0.12",
-        "@jambonz/stats-collector": "^0.1.6",
+        "@jambonz/stats-collector": "^0.1.8",
        "@jambonz/time-series": "^0.2.5",
        "@jambonz/verb-specifications": "^0.0.11",
        "@opentelemetry/api": "^1.4.0",
@@ -46,7 +46,7 @@
        "uuid-random": "^1.3.2",
        "verify-aws-sns-signature": "^0.1.0",
        "ws": "^8.9.0",
-        "xml2js": "^0.4.23"
+        "xml2js": "^0.5.0"
      },
      "devDependencies": {
        "clear-module": "^4.1.2",
@@ -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"
@@ -3264,6 +3264,18 @@
        "node": ">=12.x"
      }
    },
+    "node_modules/drachtio-modesl/node_modules/xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
    "node_modules/drachtio-srf": {
      "version": "4.5.23",
      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.23.tgz",
@@ -8597,9 +8609,9 @@
      }
    },
    "node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
      "dependencies": {
        "sax": ">=0.6.0",
        "xmlbuilder": "~11.0.0"
@@ -9981,9 +9993,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"
@@ -11239,6 +11251,17 @@
        "eventemitter2": "^6.4.4",
        "uuid-random": "^1.3.2",
        "xml2js": "^0.4.19"
+      },
+      "dependencies": {
+        "xml2js": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+          "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+          "requires": {
+            "sax": ">=0.6.0",
+            "xmlbuilder": "~11.0.0"
+          }
+        }
      }
    },
    "drachtio-srf": {
@@ -15304,9 +15327,9 @@
      "requires": {}
    },
    "xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
      "requires": {
        "sax": ">=0.6.0",
        "xmlbuilder": "~11.0.0"
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/realtimedb-helpers": "^0.7.0",
    "@jambonz/speech-utils": "^0.0.12",
-    "@jambonz/stats-collector": "^0.1.6",
+    "@jambonz/stats-collector": "^0.1.8",
    "@jambonz/time-series": "^0.2.5",
    "@jambonz/verb-specifications": "^0.0.11",
    "@opentelemetry/api": "^1.4.0",
@@ -61,7 +61,7 @@
    "uuid-random": "^1.3.2",
    "verify-aws-sns-signature": "^0.1.0",
    "ws": "^8.9.0",
-    "xml2js": "^0.4.23"
+    "xml2js": "^0.5.0"
  },
  "devDependencies": {
    "clear-module": "^4.1.2",
--- 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	1126ea827f	try 4	2023-04-10 09:02:39 -04:00
Dave Horton	fcc4c0a5ce	try 3	2023-04-10 09:00:19 -04:00
Dave Horton	ba3ff42987	try 2	2023-04-10 08:56:44 -04:00
Dave Horton	765311c491	interpolate tags	2023-04-10 08:53:57 -04:00
Dave Horton	dcd8b378b2	use docker/build-push-action@v4	2023-04-10 08:49:44 -04:00
Quan HL	552a4e9fd1	feat: upload docker image to docker hub	2023-04-10 15:12:50 +07:00
Snyk bot	04003a709e	fix: package.json & package-lock.json to reduce vulnerabilities (#305 ) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-XML2JS-5414874	2023-04-09 12:41:47 -04:00
Dave Horton	565ee609ef	based on more testing default google to command_and_search for gather and latest_long for transcribe	2023-04-07 07:34:03 -04:00
Vinod Dharashive	9587465e85	Support for Cisco NBR for Agentassist (#303 ) * NBR Support * NBR Support * NBR Support * re-invite Ok sdp should be sendonly * NBR Support * sendrecv sdp correction * Update siprec-utils.js * Updated comments * Siprec participants details added to hook * Bugfix siprec * Update call-info.js	2023-04-07 07:33:24 -04:00
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