fix: upgrade @grpc/grpc-js from 1.9.15 to 1.11.1

Snyk has created this PR to upgrade @grpc/grpc-js from 1.9.15 to 1.11.1. See this package in npm: @grpc/grpc-js See this project in Snyk: https://app.snyk.io/org/davehorton/project/6f41db32-9ff7-45b4-83ae-9512305f387b?utm_source=github&utm_medium=referral&page=upgrade-pr
0.1.15
2026-10-03 23:33:59 +00:00 · 2024-08-21 08:16:53 +00:00 · 2024-08-12 09:30:09 -04:00 · 2024-08-12 09:27:12 -04:00 · 2024-08-12 09:26:00 -04:00 · 2024-08-12 20:16:24 +07:00
6 changed files with 107 additions and 34 deletions
@@ -13,6 +13,11 @@ jobs:
        with:
          node-version: lts/*
      - run: npm install
+      - 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 run jslint
      - run: sudo apt update && sudo apt install -y squid
      - run: sudo cp test/squid.conf /etc/squid/squid.conf
@@ -1,6 +1,7 @@
 const JAMBONES_TTS_TRIM_SILENCE = process.env.JAMBONES_TTS_TRIM_SILENCE;
 const JAMBONES_DISABLE_TTS_STREAMING = process.env.JAMBONES_DISABLE_TTS_STREAMING;
 const JAMBONES_DISABLE_AZURE_TTS_STREAMING = process.env.JAMBONES_DISABLE_AZURE_TTS_STREAMING;
+const JAMBONES_EAGERLY_PRE_CACHE_AUDIO = process.env.JAMBONES_EAGERLY_PRE_CACHE_AUDIO;

 const JAMBONES_HTTP_PROXY_IP = process.env.JAMBONES_HTTP_PROXY_IP;
 const JAMBONES_HTTP_PROXY_PORT = process.env.JAMBONES_HTTP_PROXY_PORT;
@@ -18,6 +19,7 @@ module.exports = {
  JAMBONES_HTTP_PROXY_IP,
  JAMBONES_HTTP_PROXY_PORT,
  JAMBONES_TTS_CACHE_DURATION_MINS,
+  JAMBONES_EAGERLY_PRE_CACHE_AUDIO,
  TMP_FOLDER,
  HTTP_TIMEOUT
 };
@@ -44,6 +44,7 @@ const {
  JAMBONES_HTTP_PROXY_IP,
  JAMBONES_HTTP_PROXY_PORT,
  JAMBONES_TTS_CACHE_DURATION_MINS,
+  JAMBONES_EAGERLY_PRE_CACHE_AUDIO,
 } = require('./config');
 const EXPIRES = JAMBONES_TTS_CACHE_DURATION_MINS;
 const OpenAI = require('openai');
@@ -86,7 +87,7 @@ const trimTrailingSilence = (buffer) => {
 */
 async function synthAudio(client, createHash, retrieveHash, logger, stats, { account_sid,
  vendor, language, voice, gender, text, engine, salt, model, credentials, deploymentId,
-  disableTtsCache, renderForCaching, disableTtsStreaming, options
+  disableTtsCache, renderForCaching = false, disableTtsStreaming, options
 }) {
  let audioBuffer;
  let servedFromCache = false;
@@ -157,20 +158,42 @@ async function synthAudio(client, createHash, retrieveHash, logger, stats, { acc
    }

  }
+
  const key = makeSynthKey({
    account_sid,
    vendor,
    language: language || '',
    voice: voice || deploymentId,
    engine,
-    text
+    text,
+    renderForCaching
  });
  let filePath;
-  filePath = makeFilePath(vendor, key, salt);
+  filePath = makeFilePath({vendor, key, salt, renderForCaching});
  debug(`synth key is ${key}`);
  let cached;
  if (!disableTtsCache) {
    cached = await client.get(key);
+    /**
+    *  If we are using tts streaming and also precaching audio, audio could have been cached by streaming (r8)
+    * or here in speech-utils due to precaching (mp3), so we need to check for both keys.
+    */
+    if (!cached && JAMBONES_EAGERLY_PRE_CACHE_AUDIO) {
+      const preCachekey = makeSynthKey({
+        account_sid,
+        vendor,
+        language: language || '',
+        voice: voice || deploymentId,
+        engine,
+        text,
+        renderForCaching: true
+      });
+      cached = await client.get(preCachekey);
+      if (cached) {
+        // Precache audio is available update filpath with precache file extension.
+        filePath = makeFilePath({vendor, key, salt, renderForCaching: true});
+      }
+    }
  }
  if (cached) {
    // found in cache - extend the expiry and use it
@@ -16,29 +16,31 @@ const debug = require('debug')('jambonz:realtimedb-helpers');
 */
 //const nuanceClientMap = new Map();

-function makeSynthKey({account_sid = '', vendor, language, voice, engine = '', text}) {
+function makeSynthKey({
+  account_sid = '', vendor, language, voice, engine = '', text,
+  renderForCaching = false}) {
  const hash = crypto.createHash('sha1');
  hash.update(`${language}:${vendor}:${voice}:${engine}:${text}`);
  const hexHashKey = hash.digest('hex');
  const accountKey = account_sid ? `:${account_sid}` : '';
-  const namespace = vendor.startsWith('custom') ? vendor : getFileExtension(vendor);
+  const namespace = vendor.startsWith('custom') ? vendor : getFileExtension({vendor, renderForCaching});
  const key = `tts${accountKey}:${namespace}:${hexHashKey}`;
  return key;
 }

-function makeFilePath(vendor, key, salt = '') {
-  const extension = getFileExtension(vendor);
+function makeFilePath({vendor, key, salt = '', renderForCaching = false}) {
+  const extension = getFileExtension({vendor, renderForCaching});
  return `${TMP_FOLDER}/${key.replace('tts:', `tts-${salt}`)}.${extension}`;
 }

-function getFileExtension(vendor) {
+function getFileExtension({vendor, renderForCaching = false}) {
  const mp3Extension = 'mp3';
  const r8Extension = 'r8';

  switch (vendor) {
    case 'azure':
    case 'microsoft':
-      if (!JAMBONES_DISABLE_TTS_STREAMING || JAMBONES_TTS_TRIM_SILENCE) {
+      if (!renderForCaching && !JAMBONES_DISABLE_TTS_STREAMING || JAMBONES_TTS_TRIM_SILENCE) {
        return r8Extension;
      } else {
        return mp3Extension;
@@ -46,7 +48,7 @@ function getFileExtension(vendor) {
    case 'deepgram':
    case 'elevenlabs':
    case 'rimlabs':
-      if (!JAMBONES_DISABLE_TTS_STREAMING) {
+      if (!renderForCaching && !JAMBONES_DISABLE_TTS_STREAMING) {
        return r8Extension;
      } else {
        return mp3Extension;
@@ -1,18 +1,18 @@
 {
  "name": "@jambonz/speech-utils",
-  "version": "0.1.13",
+  "version": "0.1.15",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@jambonz/speech-utils",
-      "version": "0.1.13",
+      "version": "0.1.15",
      "license": "MIT",
      "dependencies": {
        "@aws-sdk/client-polly": "^3.496.0",
        "@aws-sdk/client-sts": "^3.496.0",
        "@google-cloud/text-to-speech": "^5.0.2",
-        "@grpc/grpc-js": "^1.9.14",
+        "@grpc/grpc-js": "^1.11.1",
        "@jambonz/realtimedb-helpers": "^0.8.7",
        "bent": "^7.3.12",
        "debug": "^4.3.4",
@@ -1241,25 +1241,27 @@
      }
    },
    "node_modules/@grpc/grpc-js": {
-      "version": "1.9.15",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
-      "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.11.1.tgz",
+      "integrity": "sha512-gyt/WayZrVPH2w/UTLansS7F9Nwld472JxxaETamrM8HNlsa+jSLNyKAZmhxI2Me4c3mQHFiS1wWHDY1g1Kthw==",
+      "license": "Apache-2.0",
      "dependencies": {
-        "@grpc/proto-loader": "^0.7.8",
-        "@types/node": ">=12.12.47"
+        "@grpc/proto-loader": "^0.7.13",
+        "@js-sdsl/ordered-map": "^4.4.2"
      },
      "engines": {
-        "node": "^8.13.0 || >=10.10.0"
+        "node": ">=12.10.0"
      }
    },
    "node_modules/@grpc/proto-loader": {
-      "version": "0.7.10",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz",
-      "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==",
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
+      "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
+      "license": "Apache-2.0",
      "dependencies": {
        "lodash.camelcase": "^4.3.0",
        "long": "^5.0.0",
-        "protobufjs": "^7.2.4",
+        "protobufjs": "^7.2.5",
        "yargs": "^17.7.2"
      },
      "bin": {
@@ -1509,6 +1511,16 @@
        "@jridgewell/sourcemap-codec": "^1.4.14"
      }
    },
+    "node_modules/@js-sdsl/ordered-map": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
+      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
    "node_modules/@ljharb/resumer": {
      "version": "0.1.3",
      "resolved": "https://registry.npmjs.org/@ljharb/resumer/-/resumer-0.1.3.tgz",
@@ -4096,6 +4108,19 @@
        "node": ">=14"
      }
    },
+    "node_modules/google-gax/node_modules/@grpc/grpc-js": {
+      "version": "1.9.15",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
+      "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@grpc/proto-loader": "^0.7.8",
+        "@types/node": ">=12.12.47"
+      },
+      "engines": {
+        "node": "^8.13.0 || >=10.10.0"
+      }
+    },
    "node_modules/google-protobuf": {
      "version": "3.21.2",
      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz",
@@ -8346,22 +8371,22 @@
      }
    },
    "@grpc/grpc-js": {
-      "version": "1.9.15",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
-      "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.11.1.tgz",
+      "integrity": "sha512-gyt/WayZrVPH2w/UTLansS7F9Nwld472JxxaETamrM8HNlsa+jSLNyKAZmhxI2Me4c3mQHFiS1wWHDY1g1Kthw==",
      "requires": {
-        "@grpc/proto-loader": "^0.7.8",
-        "@types/node": ">=12.12.47"
+        "@grpc/proto-loader": "^0.7.13",
+        "@js-sdsl/ordered-map": "^4.4.2"
      }
    },
    "@grpc/proto-loader": {
-      "version": "0.7.10",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz",
-      "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==",
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
+      "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
      "requires": {
        "lodash.camelcase": "^4.3.0",
        "long": "^5.0.0",
-        "protobufjs": "^7.2.4",
+        "protobufjs": "^7.2.5",
        "yargs": "^17.7.2"
      }
    },
@@ -8548,6 +8573,11 @@
        "@jridgewell/sourcemap-codec": "^1.4.14"
      }
    },
+    "@js-sdsl/ordered-map": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
+      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw=="
+    },
    "@ljharb/resumer": {
      "version": "0.1.3",
      "resolved": "https://registry.npmjs.org/@ljharb/resumer/-/resumer-0.1.3.tgz",
@@ -10471,6 +10501,17 @@
        "proto3-json-serializer": "^2.0.0",
        "protobufjs": "7.2.5",
        "retry-request": "^7.0.0"
+      },
+      "dependencies": {
+        "@grpc/grpc-js": {
+          "version": "1.9.15",
+          "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
+          "integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==",
+          "requires": {
+            "@grpc/proto-loader": "^0.7.8",
+            "@types/node": ">=12.12.47"
+          }
+        }
      }
    },
    "google-protobuf": {
@@ -1,6 +1,6 @@
 {
  "name": "@jambonz/speech-utils",
-  "version": "0.1.13",
+  "version": "0.1.15",
  "description": "TTS-related speech utilities for jambonz",
  "main": "index.js",
  "author": "Dave Horton",
@@ -29,7 +29,7 @@
    "@aws-sdk/client-polly": "^3.496.0",
    "@aws-sdk/client-sts": "^3.496.0",
    "@google-cloud/text-to-speech": "^5.0.2",
-    "@grpc/grpc-js": "^1.9.14",
+    "@grpc/grpc-js": "^1.11.1",
    "@jambonz/realtimedb-helpers": "^0.8.7",
    "bent": "^7.3.12",
    "debug": "^4.3.4",
Author	SHA1	Message	Date
snyk-bot	8421061f60	fix: upgrade @grpc/grpc-js from 1.9.15 to 1.11.1 Snyk has created this PR to upgrade @grpc/grpc-js from 1.9.15 to 1.11.1. See this package in npm: @grpc/grpc-js See this project in Snyk: https://app.snyk.io/org/davehorton/project/6f41db32-9ff7-45b4-83ae-9512305f387b?utm_source=github&utm_medium=referral&page=upgrade-pr	2024-08-21 08:16:53 +00:00
Dave Horton	8f216e64d8	0.1.15	2024-08-12 09:30:09 -04:00
Dave Horton	e1f4486e01	bump version	2024-08-12 09:27:12 -04:00
Dave Horton	b0d6272974	Merge pull request #84 from jambonz/feat/precache_audio_with_tts_stream support precache audio with tts stream enabled	2024-08-12 09:26:00 -04:00
Quan HL	ef23b0807a	add comment	2024-08-12 20:16:24 +07:00
Quan HL	ab7e25243d	improve on check precache	2024-08-12 20:10:43 +07:00
Quan HL	bf0ea14423	install docker	2024-08-12 18:40:47 +07:00
Quan HL	305dabd84b	wip	2024-08-12 18:35:48 +07:00
Quan HL	b6a3fa5081	support precache audio with tts stream enabled	2024-08-12 18:29:01 +07:00