node-red-contrib-tts-ultimate 1.0.41 → 1.0.42

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square)](https://www.paypal.me/techtoday) 
 
+<p>
+<b>Version 1.0.42</b> March 2022<br/>
+- FIX: fix purging option that wasn't working if you set to always purge the cached files at startup.<br/>
+- FIX: invalid code in some sync functions.<br/>
+</p>
 <p>
 <b>Version 1.0.41</b> March 2022<br/>
 - NEW: for Polly TTS, you can choose between neural and standard engine.<br/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-tts-ultimate",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "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, 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": {

package/ttsultimate/ownfileultimate.html

@@ -81,7 +81,7 @@
                                 return;
                             }
                             // The only way is to wait some time, then refresh
-                            setTimeout(function () {
+                            let t = setTimeout(function () {
                                 node.refreshListaFiles().then((success, error) => {
                                     $("#ownFileUpload").val("");// Otherwise will not re-upload a file with the same name
                                     $("#node-input-selectedFile").val("OwnFile_" + file.name);

package/ttsultimate/ttsultimate-config.js

@@ -538,22 +538,20 @@ module.exports = function (RED) {
         if (node.purgediratrestart === "purge") {
             // Delete all files, that are'nt OwnFiles_
             try {
-                fs.readdirSync(path.join(node.TTSRootFolderPath, "ttsfiles"), (err, files) => {
-                    try {
-                        if (files.length > 0) {
-                            files.forEach(function (file) {
-                                RED.log.info("ttsultimate-config " + node.id + ": Deleted TTS file " + path.join(node.TTSRootFolderPath, "ttsfiles", file));
-                                try {
-                                    fs.unlinkSync(path.join(node.TTSRootFolderPath, "ttsfiles", file));
-                                } catch (error) {
-                                }
-                            });
-                        };
-                    } catch (error) {
+                let files = fs.readdirSync(path.join(node.TTSRootFolderPath, "ttsfiles"));
+                try {
+                    if (files.length > 0) {
+                        files.forEach(function (file) {
+                            RED.log.info("ttsultimate-config " + node.id + ": Deleted TTS file " + path.join(node.TTSRootFolderPath, "ttsfiles", file));
+                            try {
+                                fs.unlinkSync(path.join(node.TTSRootFolderPath, "ttsfiles", file));
+                            } catch (error) {
+                            }
+                        });
+                    };
+                } catch (error) { }
 
-                    }
 
-                });
             } catch (error) { }
         };
 
@@ -572,13 +570,13 @@ module.exports = function (RED) {
                 var query = url_parts.query;
 
                 res.setHeader('Content-Disposition', 'attachment; filename=tts.mp3')
-                if (fs.existsSync(query.f)) {
+                if (fs.existsSync(query.f.toString())) {
                     // 26/01/2021 security check
                     // File should be something like mydocs/.node-red/sonospollyttsstorage/ttsfiles/Hello_de-DE.mp3
-                    if (path.extname(query.f) === ".mp3" && path.dirname(path.dirname(query.f)).endsWith("sonospollyttsstorage")) {
-                        var readStream = fs.createReadStream(query.f);
+                    if (path.extname(query.f.toString()) === ".mp3" && path.dirname(path.dirname(query.f.toString())).endsWith("sonospollyttsstorage")) {
+                        var readStream = fs.createReadStream(query.f.toString());
                         readStream.on("error", function (error) {
-                            RED.log.error("ttsultimate-config " + node.id + ": Playsonos error opening stream : " + query.f + ' : ' + error);
+                            RED.log.error("ttsultimate-config " + node.id + ": Playsonos error opening stream : " + query.f.toString() + ' : ' + error);
                             res.end();
                             return;
                         });
@@ -637,7 +635,7 @@ module.exports = function (RED) {
             } catch (error) {
 
             }
-            setTimeout(function () {
+            let t = setTimeout(function () {
                 // Wait some time to allow time to do promises.
                 done();
             }, 500);

package/ttsultimate/ttsultimate.html

@@ -336,7 +336,7 @@
                                 }
                                 // Refresh the combo
                                 // The only way is to wait some time, then refresh
-                                setTimeout(function () {
+                                let t = setTimeout(function () {
                                     node.refreshHailingList().then((success, error) => {
                                         $("#ownFileUpload").val("");// Otherwise will not re-upload a file with the same name
                                         $("#node-input-sonoshailing").val("Hailing_" + file.name);

package/ttsultimate/ttsultimate.js

@@ -52,7 +52,7 @@ module.exports = function (RED) {
             return;
         }
         node.ssml = config.ssml;
-        node.oTimerSonosConnectionCheck;
+        node.oTimerSonosConnectionCheck = null;
         node.sSonosIPAddress = "";
         node.sonosCoordinatorGroupName = "";
         node.sonoshailing = "0"; // Hailing file
@@ -78,6 +78,7 @@ module.exports = function (RED) {
         node.unmuteIfMuted = config.unmuteIfMuted === undefined ? false : config.unmuteIfMuted; // 21/10/2021 Unmute if previiously muted.
         node.sonosCoordinatorIsPreviouslyMuted = false;
         node.passThroughMessage = {};
+        node.bTimeOutPlay = false;
 
         if (typeof node.server !== "undefined" && node.server !== null) {
             node.sNoderedURL = node.server.sNoderedURL || "";
@@ -120,7 +121,7 @@ module.exports = function (RED) {
             return new Promise((resolve, reject) => {
                 node.SonosClient.play(_toPlay).then(result => {
                     if (iWaitAfterSync > 2000) console.log("PLAYSYNC")
-                    setTimeout(() => {
+                    let t = setTimeout(() => {
                         resolve(true);
                     }, iWaitAfterSync);
                 }).catch(err => {
@@ -135,7 +136,7 @@ module.exports = function (RED) {
             return new Promise((resolve, reject) => {
                 node.SonosClient.seek(_Position).then(result => {
                     if (iWaitAfterSync > 2000) console.log("SEEKSync", _Position)
-                    setTimeout(() => {
+                    let t = setTimeout(() => {
                         resolve(true);
                     }, iWaitAfterSync);
                 }).catch(err => {
@@ -154,7 +155,7 @@ module.exports = function (RED) {
                         STOPSync(); // The SetQueue automatically starts playing, so i need to stop it now!
                     } catch (error) {
                     }
-                    setTimeout(() => {
+                    let t = setTimeout(() => {
                         resolve(true);
                     }, iWaitAfterSync);
                 }).catch(err => {
@@ -169,7 +170,7 @@ module.exports = function (RED) {
             return new Promise((resolve, reject) => {
                 node.SonosClient.selectTrack(_queuePositiom).then(result => {
                     if (iWaitAfterSync > 2000) console.log("SELECTTRACKSync", _queuePositiom)
-                    setTimeout(() => {
+                    let t = setTimeout(() => {
                         resolve(true);
                     }, iWaitAfterSync);
                 }).catch(err => {
@@ -184,7 +185,7 @@ module.exports = function (RED) {
             return new Promise((resolve, reject) => {
                 node.SonosClient.stop().then(result => {
                     if (iWaitAfterSync > 2000) console.log("STOPSync")
-                    setTimeout(() => {
+                    let t = setTimeout(() => {
                         resolve(true);
                     }, iWaitAfterSync);
                 }).catch(err => {
@@ -509,7 +510,7 @@ module.exports = function (RED) {
                     }
                 }
             }
-            setTimeout(() => { return true; }, 5000); // Wait some seconds 
+            let t = setTimeout(() => { return true; }, 5000); // Wait some seconds 
         };
 
         // Handle the queue
@@ -619,13 +620,14 @@ module.exports = function (RED) {
                                     data = await synthesizeSpeechMicrosoftAzureTTS(node.server.microsoftAzureTTS, params);
                                 }
                                 // Save the downloaded file into the cache
-                                fs.writeFileSync(sFileToBePlayed, data, function (error, result) {
-                                    if (error) {
-                                        RED.log.error("ttsultimate: node id: " + node.id + " Unable to save the file " + error.message);
-                                        node.setNodeStatus({ fill: "red", shape: "ring", text: "Unable to save the file " + sFileToBePlayed + " " + error.message });
-                                        throw (error);
-                                    }
-                                });
+                                try {
+                                    fs.writeFileSync(sFileToBePlayed, data);
+                                } catch (error) {
+                                    RED.log.error("ttsultimate: node id: " + node.id + " Unable to save the file " + error.message);
+                                    node.setNodeStatus({ fill: "red", shape: "ring", text: "Unable to save the file " + sFileToBePlayed + " " + error.message });
+                                    throw (error);
+                                }
+
                             } catch (error) {
                                 RED.log.error("ttsultimate: node id: " + node.id + " Error Downloading TTS: " + error.message + ". THE TTS SERVICE MAY BE DOWN.");
                                 node.setNodeStatus({ fill: 'red', shape: 'ring', text: 'Error Downloading TTS:' + error.message });
@@ -781,7 +783,7 @@ module.exports = function (RED) {
                     }
 
                     // Signal end playing
-                    setTimeout(() => {
+                    let t = setTimeout(() => {
                         node.msg.completed = true;
                         node.currentMSGbeingSpoken = {};
                         node.send([{ passThroughMessage: node.passThroughMessage, payload: node.msg.completed }, null]);
@@ -794,7 +796,7 @@ module.exports = function (RED) {
                     // Output the array of files
 
                     // Signal end playing
-                    setTimeout(() => {
+                    let t = setTimeout(() => {
                         node.msg.completed = true;
                         node.currentMSGbeingSpoken = {};
                         node.send([{ passThroughMessage: node.passThroughMessage, payload: node.msg.completed, filesArray: noPlayerFileArray }, null]);