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

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.43</b> March 2022<br/>
+- Simplified the configuration by auto discover some IP.<br/>
+- FIX: fixed minor glitches.<br/>
+</p>
 <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/>

package/README.md

@@ -112,7 +112,7 @@ For Google TTS Engine, you can choose pitch and speed rate of the voice.
 
 
 **Node-Red IP**<br/>
-set IP of your node-red machine. Sonos will connect to this address in order to play TTS. You can also write any value you want, for example 127.0.0.1 in this field (**don't leave this field blank in any case**), if you don't want to use Sonos as player. Please see below, the section **TTS-ULTIMATE NODE**, property **Player**.
+set IP of your node-red machine. Write **AUTODISCOVER** to allow the node to auto discover your IP.
 
 **Host Port**<br/>
 Sonos will connect to this port in order to play TTS. Default 1980. Choose a free port. Do not use 1880 or any other port already in use on your computer.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-tts-ultimate",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "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/ttsultimate-config.html

@@ -1,4 +1,5 @@
 <script type="text/javascript">
+    
     RED.nodes.registerType("ttsultimate-config", {
         category: 'config',
         defaults:
@@ -6,7 +7,7 @@
             name: { value: "TTS Service" },
             noderedipaddress:
             {
-                value: "",
+                value: "AUTODISCOVER",
                 required: false,
                 type: "text"
             },
@@ -32,17 +33,18 @@
         },
         oneditprepare: function () {
             var node = this;
-
+     
             // 21/03/2020 Check if the node is the absolute first in the flow. In this case, it has no http server instatiaced
-            $.getJSON('ttsultimateGetEthAddress', (data) => {
-                $("#pleaseDeploy").hide();
+            // $.getJSON('ttsultimateGetEthAddress', (data) => {
+                 $("#pleaseDeploy").hide();
                 $("#allGUI").show();
-            }).fail(function (jqxhr) {
-                $("#pleaseDeploy").show();
-                $("#allGUI").hide();
-            });
+            // }).fail(function (jqxhr) {
+            //     $("#pleaseDeploy").show();
+            //     $("#allGUI").hide();
+            // });
 
-            if (typeof node.noderedipaddress === "undefined") {
+            
+            if (node.noderedipaddress === undefined) {
                 // Put the default address of the machine
                 $.getJSON('ttsultimateGetEthAddress', (data) => {
                     $("#node-config-input-noderedipaddress").val(data);
@@ -157,7 +159,6 @@
             <label for="node-config-input-noderedipaddress"><i class="fa fa-globe"></i> Node-Red IP</label>
             <input type="text" id="node-config-input-noderedipaddress">
         </div>
-        <div class="form-tips" style="margin-top: 8px;background-color:lightgrey;text-align:center">Above option: don't leave this field blank in any case. If you don't use Sonos players, set it to 127.0.0.1. See the README on gitHub.</div>
         <br/>  
 
         <div class="form-row">

package/ttsultimate/ttsultimate-config.js

@@ -19,7 +19,11 @@ module.exports = function (RED) {
     function TTSConfigNode(config) {
         RED.nodes.createNode(this, config);
         var node = this;
-        node.noderedipaddress = typeof config.noderedipaddress === "undefined" ? "" : config.noderedipaddress;
+        node.noderedipaddress = config.noderedipaddress;
+        if (node.noderedipaddress === undefined || node.noderedipaddress === "AUTODISCOVER") {
+            node.noderedipaddress = GetEthAddress();
+            RED.log.info('ttsultimate-config ' + node.id + ': Autodiscover current IP ' + node.noderedipaddress);
+        }
         node.whoIsUsingTheServer = ""; // Client node.id using the server, because only a ttsultimate node can use the serve at once.
         node.ttsservice = config.ttsservice || "googletranslate";
         node.TTSRootFolderPath = (config.TTSRootFolderPath === undefined || config.TTSRootFolderPath === "") ? path.join(RED.settings.userDir, "sonospollyttsstorage") : path.join(config.TTSRootFolderPath, "sonospollyttsstorage");
@@ -212,6 +216,9 @@ module.exports = function (RED) {
         // ######################################################
         // 21/03/2019 Endpoint for retrieving the default IP
         RED.httpAdmin.get("/ttsultimateGetEthAddress", RED.auth.needsPermission('TTSConfigNode.read'), function (req, res) {
+            res.json(GetEthAddress());
+        });
+        function GetEthAddress() {
             var oiFaces = oOS.networkInterfaces();
             var jListInterfaces = [];
             try {
@@ -229,13 +236,12 @@ module.exports = function (RED) {
                 })
             } catch (error) { }
             if (jListInterfaces.length > 0) {
-                res.json(jListInterfaces[0].address); // Retunr the first usable IP
+                return(jListInterfaces[0].address); // Retunr the first usable IP
             } else {
-                res.json("NO ETH INTERFACE FOUND");
+                return("NO ETH INTERFACE FOUND");
             }
-
-        });
-
+        }
+    
         // 20/03/2020 in the middle of coronavirus, get the sonos groups
         RED.httpAdmin.get("/sonosgetAllGroups", RED.auth.needsPermission('TTSConfigNode.read'), function (req, res) {
             var jListGroups = [];

package/ttsultimate/ttsultimate.html

@@ -202,7 +202,7 @@
                 // 24/12/2020 Check if the node is the absolute first in the flow. In this case, it has no http server instatiaced
                 // !oNodeServer.hasOwnProperty("noderedipaddress") is when the config node exists, but not deployed
                 // oNodeServer.noderedipaddress === "" is when the config node has been deployed, but not configured
-                if (oNodeServer === null || !oNodeServer.hasOwnProperty("noderedipaddress")) {
+                if (oNodeServer === null || oNodeServer === undefined || !oNodeServer.hasOwnProperty("noderedipaddress")) {
                     $("#pleaseDeploy").show();
                     $("#allGUI").hide();
                 } else if (oNodeServer.hasOwnProperty("noderedipaddress") && oNodeServer.noderedipaddress === "") {