node-red-contrib-tts-ultimate 2.0.3 → 2.0.5

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square)](https://www.paypal.me/techtoday) 
 
+<p>
+<b>Version 2.0.5</b> October 2023<br/>
+- Speed up emitting msg, when not using Sonos.<br/>
+</p>
+<p>
+<b>Version 2.0.4</b> August 2023<br/>
+- Removed unused new AWS api.<br/>
+- Updated old AWS api to the latest.<br/>
+</p>
 <p>
 <b>Version 2.0.3</b> August 2023<br/>
 - Fixed duplicated filenames.<br/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-tts-ultimate",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Transforms the text in speech and hear it using Sonos player or generate an audio file to be used with third parties nodes. Works with voices from Amazon, Google (without credentials as well), Microsoft TTS Azure, ElevenLabs.io TTS or your own voice. You can also only create a TTS file to be read by third party nodes. Update of the popular SonosPollyTTS node.",
   "main": "index.js",
   "scripts": {
@@ -40,8 +40,8 @@
   },
   "homepage": "https://github.com/Supergiovane/node-red-contrib-tts-ultimate",
   "dependencies": {
-    "aws-sdk": "2.1404.0",
-    "@aws-sdk/client-polly":"3.215.0",
+    "aws-sdk": "2.1444.0",
+    
     "fs": "0.0.1-security",
     "sonos": "1.14.1",
     "formidable": "1.2.2",

package/ttsultimate/ttsultimate.js

@@ -369,7 +369,7 @@ module.exports = function (RED) {
         // 27/11/2019 Check Sonos connection health
 
         node.CheckSonosConnection = () => {
-            if (node.playertype !== "noplayer") {
+            if (node.playertype === "sonos") {
                 node.SonosClient.getCurrentState().then(state => {
 
                     // 11/12/202020 The connection with Sonos is OK. 
@@ -392,7 +392,7 @@ module.exports = function (RED) {
                     node.oTimerSonosConnectionCheck = setTimeout(function () { node.CheckSonosConnection(); }, 10000);
                 });
             } else {
-                node.setNodeStatus({ fill: "green", shape: "dot", text: "Sonos is connected." });
+                node.setNodeStatus({ fill: "green", shape: "dot", text: "Ready." });
                 node.msg.connectionerror = false;
                 node.send([null, { payload: node.msg.connectionerror }]);
             }
@@ -417,8 +417,6 @@ module.exports = function (RED) {
                 node.oAdditionalSonosPlayers.push({ oPlayer: new sonos.Sonos(element.host), hostVolumeAdjust: Number(element.hostVolumeAdjust) });
                 RED.log.info("ttsultimate: FOUND ADDITIONAL PLAYER " + element.host + " Adjusted volume: " + element.hostVolumeAdjust);
             }
-
-
             // 27/11/2019 Start the connection healty check
             node.oTimerSonosConnectionCheck = setTimeout(function () { node.CheckSonosConnection(); }, 5000);
         } else if (node.playertype === "noplayer") {
@@ -427,7 +425,6 @@ module.exports = function (RED) {
 
         node.setNodeStatus({ fill: 'grey', shape: 'ring', text: 'Initialized.' });
 
-
         // 22/09/2020 Flush Queue and set to stopped
         node.flushQueue = () => {
             // 10/04/2018 Remove the TTS message from the queue
@@ -439,8 +436,6 @@ module.exports = function (RED) {
             if (node.server.whoIsUsingTheServer === node.id) node.server.whoIsUsingTheServer = "";
         }
 
-
-
         // 30/12/2020 Supergiovane resume queue for radio, queue music, TV in , line in etc.
         async function resumeMusicQueue(_oTrack, _oPlayer = node.SonosClient) {
 
@@ -526,43 +521,46 @@ module.exports = function (RED) {
             let t = setTimeout(() => { return true; }, 5000); // Wait some seconds 
         };
 
-
         // Handle the queue
         async function HandleQueue() {
             node.bBusyPlayingQueue = true;
             node.server.whoIsUsingTheServer = node.id; // Signal to other ttsultimate node, that i'm using the Sonos device
             try {
 
-                // Get the current music queue, if one
-                var oCurTrack = null;
-                try {
-                    oCurTrack = await getMusicQueue();
-                    // 19/04/2022 The current track of additional players is read in the groupSpeakerySync function
-                } catch (error) {
-                    oCurTrack = null;
-                }
+                if (node.playertype !== "noplayer") {
+                    // Get the current music queue, if one
+                    var oCurTrack = null;
+                    try {
+                        oCurTrack = await getMusicQueue();
+                        // 19/04/2022 The current track of additional players is read in the groupSpeakerySync function
+                    } catch (error) {
+                        oCurTrack = null;
+                    }
 
-                // 05/12/2020 Set "completed" to false and send it
-                node.msg.completed = false;
-                try {
-                    await groupSpeakersSync(); // 20/03/2020 Group Speakers toghether and reads each current track   
-                } catch (error) {
-                    // Don't care.
-                    node.setNodeStatus({ fill: "red", shape: "ring", text: "Error grouping speakers: " + error.message });
-                    RED.log.error("ttsultimate: Error grouping speakers: " + error.message);
-                }
+                    // 05/12/2020 Set "completed" to false and send it
+                    node.msg.completed = false;
+                    try {
+                        await groupSpeakersSync(); // 20/03/2020 Group Speakers toghether and reads each current track   
+                    } catch (error) {
+                        // Don't care.
+                        node.setNodeStatus({ fill: "red", shape: "ring", text: "Error grouping speakers: " + error.message });
+                        RED.log.error("ttsultimate: Error grouping speakers: " + error.message);
+                    }
 
-                node.send([{ passThroughMessage: node.passThroughMessage, payload: node.msg.completed }, null]);
+                    node.send([{ passThroughMessage: node.passThroughMessage, payload: node.msg.completed }, null]);
 
-                // 24/08/2021 If something was playing, stop the player https://github.com/Supergiovane/node-red-contrib-tts-ultimate/issues/32
-                try {
-                    //await node.SonosClient.stop(); //.then(result => {
-                    await STOPSync();
-                } catch (error) {
-                    //RED.log.error("ttsultimate: Error stopping in HandleSend: " + error.message);
+                    // 24/08/2021 If something was playing, stop the player https://github.com/Supergiovane/node-red-contrib-tts-ultimate/issues/32
+                    try {
+                        //await node.SonosClient.stop(); //.then(result => {
+                        await STOPSync();
+                    } catch (error) {
+                        //RED.log.error("ttsultimate: Error stopping in HandleSend: " + error.message);
+                    }
+                } else {
+                    node.msg.completed = false;
+                    node.send([{ passThroughMessage: node.passThroughMessage, payload: node.msg.completed }, null]);
                 }
 
-
                 while (node.tempMSGStorage.length > 0) {
                     node.currentMSGbeingSpoken = node.tempMSGStorage.shift()//node.tempMSGStorage[0];// Advise the whole node of the currently spoken MSG
                     const msg = node.currentMSGbeingSpoken.payload.toString(); // Get the text to be spoken
@@ -874,20 +872,19 @@ module.exports = function (RED) {
                         node.send([{ passThroughMessage: node.passThroughMessage, payload: node.msg.completed }, null]);
                         node.bBusyPlayingQueue = false
                         node.server.whoIsUsingTheServer = ""; // Signal to other ttsultimate node, that i'm not using the Sonos device anymore
-                    }, 1000)
+                    }, 500)
 
                 } else if (node.playertype === "noplayer") {
                     // End task if no player is selected.
                     // Output the array of files
-
                     // Signal end playing
-                    let t = setTimeout(() => {
-                        node.msg.completed = true;
-                        node.currentMSGbeingSpoken = {};
-                        node.send([{ passThroughMessage: node.passThroughMessage, payload: node.msg.completed, filesArray: noPlayerFileArray }, null]);
-                        node.bBusyPlayingQueue = false
-                        node.server.whoIsUsingTheServer = ""; // Signal to other ttsultimate node, that i'm not using the Sonos device anymore
-                    }, 1000)
+                    //let t = setTimeout(() => {
+                    node.msg.completed = true;
+                    node.currentMSGbeingSpoken = {};
+                    node.send([{ passThroughMessage: node.passThroughMessage, payload: node.msg.completed, filesArray: noPlayerFileArray }, null]);
+                    node.bBusyPlayingQueue = false
+                    node.server.whoIsUsingTheServer = ""; // Signal to other ttsultimate node, that i'm not using the Sonos device anymore
+                    //}, 1000)
                 }
 
             } catch (error) {
@@ -1028,14 +1025,18 @@ module.exports = function (RED) {
                     // There is already a priority message being spoken, do nothing
                     node.setNodeStatus({ fill: 'grey', shape: 'ring', text: 'There is already a priority message being spoken...queuing' });
                 } else {
-                    node.SonosClient.stop().then(result => {
-                        node.bTimeOutPlay = true;
+                    if (node.playertype !== 'noplayer') {
+                        node.SonosClient.stop().then(result => {
+                            node.bTimeOutPlay = true;
+                            node.currentMSGbeingSpoken = msg; // Set immediately, otherwise if comes new flow messages, currentMSGbeingSpoken is too old.
+                        }).catch(err => {
+                            // Don't care
+                            node.bTimeOutPlay = true;
+                            node.currentMSGbeingSpoken = msg;// Set immediately, otherwise if comes new flow messages, currentMSGbeingSpoken is too old.
+                        })
+                    } else {
                         node.currentMSGbeingSpoken = msg; // Set immediately, otherwise if comes new flow messages, currentMSGbeingSpoken is too old.
-                    }).catch(err => {
-                        // Don't care
-                        node.bTimeOutPlay = true;
-                        node.currentMSGbeingSpoken = msg;// Set immediately, otherwise if comes new flow messages, currentMSGbeingSpoken is too old.
-                    })
+                    }
                 }
 
             } else {
@@ -1047,44 +1048,6 @@ module.exports = function (RED) {
             }
             // ########################
 
-            // // 03/01/2022 if ssml is enabled, disable the auto split function
-            // if (!node.ssml) {
-            //     // SSML disabled
-            //     // 30/01/2021 split the text if it's too long, otherwies i'll have issues with filename too long.
-            //     if (msg.payload.length >= node.server.limitTTSFilenameLenght) {
-            //         let sTemp = "";
-            //         let aSeps = [".", ",", ":", ";", "!", "?"];
-            //         let sPayload = msg.payload.replace(/[\r\n]+/gm, "");
-            //         for (let index = 0; index < sPayload.length; index++) {
-            //             const element = sPayload.substr(index, 1);
-            //             sTemp += element;
-            //             if (aSeps.indexOf(element) > -1 && sTemp.length > 20) {
-            //                 const oMsg = RED.util.cloneMessage(msg);
-            //                 oMsg.payload = sTemp;
-            //                 node.tempMSGStorage.push(oMsg);
-            //                 sTemp = "";
-            //             }
-            //             if (sTemp.length > node.server.limitTTSFilenameLenght && element === " ") {
-            //                 // Split using space
-            //                 const oMsg = RED.util.cloneMessage(msg);
-            //                 oMsg.payload = sTemp;
-            //                 node.tempMSGStorage.push(oMsg);
-            //                 sTemp = "";
-            //             }
-            //         }
-            //         // Remaining
-            //         const oMsg = RED.util.cloneMessage(msg);
-            //         oMsg.payload = sTemp;
-            //         node.tempMSGStorage.push(oMsg);
-
-            //     } else {
-            //         node.tempMSGStorage.push(msg);
-            //     }
-            // } else {
-            //     // SSML enabled
-            //     node.tempMSGStorage.push(msg);
-            // }
-
             // Starts main queue watching
             node.tempMSGStorage.push(msg);
             node.waitForQueue();
@@ -1107,7 +1070,8 @@ module.exports = function (RED) {
                     node.setNodeStatus({ fill: 'yellow', shape: 'ring', text: "Sonos is occupied by " + node.server.whoIsUsingTheServer + " Retry..." });
                 }
                 node.waitForQueue();
-            }, 1000);
+            }, node.playertype === "noplayer" ? 100 : 1000);
+
         }
 
         node.on('close', function (done) {