0.0.40

lib/add-file-to-cache.js

@@ -4,10 +4,11 @@ const EXPIRES = (process.env.JAMBONES_TTS_CACHE_DURATION_MINS || 4 * 60) * 60; /
 
 async function addFileToCache(client, logger, path,
   {account_sid, vendor, language, voice, deploymentId, engine, text}) {
+  let key;
   logger = logger || noopLogger;
 
   try {
-    const key = makeSynthKey({
+    key = makeSynthKey({
       account_sid,
       vendor,
       language: language || '',
@@ -15,15 +16,15 @@ async function addFileToCache(client, logger, path,
       engine,
       text,
     });
-    const audioBuffer = fs.readFile(path);
+    const audioBuffer = await fs.readFile(path);
     await client.setex(key, EXPIRES, audioBuffer.toString('base64'));
   } catch (err) {
     logger.error(err, 'addFileToCache: Error');
-    return false;
+    return;
   }
 
-  logger.debug(`addFileToCache: added ${path} to cache`);
+  logger.debug(`addFileToCache: added ${path} to cache with key ${key}`);
-  return true;
+  return key;
 }
 
 module.exports = addFileToCache;

lib/synth-audio.js

@@ -143,6 +143,10 @@ async function synthAudio(client, logger, stats, { account_sid,
     (
       process.env.JAMBONES_TTS_TRIM_SILENCE &&
       ['microsoft', 'azure'].includes(vendor)
+    ) ||
+    (
+      process.env.JAMBONES_ELEVENLABS_STREAMING &&
+      vendor === 'elevenlabs'
     )
   ) {
     filePath = `${TMP_FOLDER}/${key.replace('tts:', `tts-${salt || ''}`)}.r8`;
@@ -607,8 +611,8 @@ const synthElevenlabs = async(logger, {credentials, options, stats, language, vo
   const {api_key, model_id, options: credOpts} = credentials;
   const opts = !!options && Object.keys(options).length !== 0 ? options : JSON.parse(credOpts || '{}');
 
-  /* if the env is set to stream then bag out, unless we are specifically rendering to generate a cache file */
+  /* default to using the streaming interface, unless disabled by env var OR we want just a cache file */
-  if (process.env.JAMBONES_ELEVENLABS_STREAMING && !renderForCaching) {
+  if (!process.env.JAMBONES_DISABLE_TTS_STREAMING && !renderForCaching) {
     let params = '';
     params += `{api_key=${api_key}`;
     params += `,model_id=${model_id}`;
@@ -621,7 +625,7 @@ const synthElevenlabs = async(logger, {credentials, options, stats, language, vo
     params += '}';
 
     return {
-      filePath: `say:${params}${text.replace(/\n/g, ' ')}`,
+      filePath: `say:${params}${text.replace(/\n/g, ' ').replace(/\r/g, ' ')}`,
       servedFromCache: false,
       rtt: 0
     };

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@jambonz/speech-utils",
-  "version": "0.0.37",
+  "version": "0.0.40",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@jambonz/speech-utils",
-      "version": "0.0.37",
+      "version": "0.0.40",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-polly": "^3.496.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jambonz/speech-utils",
-  "version": "0.0.37",
+  "version": "0.0.40",
   "description": "TTS-related speech utilities for jambonz",
   "main": "index.js",
   "author": "Dave Horton",