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

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 [![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.45</b> April 2022<br/>
+- NEW: Additional players now resumes the queue as well (previously, only the main player was doing so).<br/>
+</p>
+<p>
+<b>Version 1.0.44</b> April 2022<br/>
+- NEW: you can now adjust the additional player's volume, adapting it to the main sonos player volume. This is useful in case you've some recessed speakers, "speaking" too low or some too near speakers, "speaking" too high. You can adapt the volume in the config window or dinamically via msg input.<br/>
+- Updated the README.<br/>
+</p>
+<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.
@@ -169,7 +169,8 @@ Select your Sonos primary player. (It's strongly suggested to set a fixed IP for
 It's possibile to group players, so your announcement can be played on all selected players. For this to happen, you need to select your primary coordinator player. All other players will be then controlled by this coordinator.
 
 **Additional Players** <br/>
-Here you can add all additional players that will be grouped toghether to the *Main Sonos Player* coordinator group. You can add a player using the "ADD" button, below the list.
+Here you can add all additional players that will be grouped toghether to the *Main Sonos Player* coordinator group. You can add a player using the "ADD" button, below the list.<br/>
+For each additional player, you can adjust their volume, based on the **Main Sonos Player** volume -+100.
 
 
 ## INPUT MESSAGES TO THE NODE <br/>
@@ -287,7 +288,9 @@ The setting is retained until the node receives another msg.setConfig or until n
 
  >  **property setPlayerGroupArray**<br/>
    Sets the array of players beloging to the group, if any.<br/>
-   If you have only one additional player, you need to ever put it into an array. See below.
+   You can also specify the volume variation from the main volume player, to adapt the additional player's perceived volume to the main sonos player volume.<br/>
+   For example, if you have a speaker mounted in celiling, having less perceived volume, you can "push" the volume up, to match the whole perceived volume. Just add **#** after the IP and a number from -100 to 100 to subtract or add volume ***compared to the main sonos volume***. For example, if the sonos main player volume is 40, you can push this celing speaker's volume to further 10, so it'll have the real volume of 50. See below, the example.<br/>
+   Note: Even if you have only one additional player, you need to put it into an array.
 
 ```js
 // Set main player IP
@@ -300,14 +303,15 @@ return msg;
 ```
 
 ```js
-// Set player IP and additional players
+// Set player IP and additional players with their optional adapted volume, relative to the main sonos player volume.
+// You can specify the aditional player's volume adaptation
 // The setting is retained until the node receives another msg.setConfig or until node-red is restarted.
 var config= {
     setMainPlayerIP:"192.168.1.109",
     setPlayerGroupArray:[
-        "192.168.1.110",
-        "192.168.1.111",
-        "192.168.1.112"
+        "192.168.1.110", // This additional player will use the same volume as the main sonos player.
+        "192.168.1.111#-10", // This additional player will use the main sonos player's volume, minus 10.
+        "192.168.1.112#20" // This additional player will use the main sonos player's volume, plus 20.
     ]
 };
 msg.setConfig = config;
@@ -315,7 +319,7 @@ return msg;
 ```
 
 ```js
-// If you have only one additional player
+// If you have only one additional player, without setting their adjusted volume.
 // The setting is retained until the node receives another msg.setConfig or until node-red is restarted.
 var config= {
     setMainPlayerIP:"192.168.1.109",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-tts-ultimate",
-  "version": "1.0.42",
+  "version": "1.0.45",
   "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 === "") {
@@ -402,16 +402,32 @@
                 //#region ADDITIONAL PLAYERS
                 // 20/03/2020 ADDITIONAL PLAYERS
                 // ##########################################################
-                var previousValueType = { value: "prev", label: this._("switch.previous"), hasValue: false };
+                //var previousValueType = { value: "prev", label: this._("switch.previous"), hasValue: false };
+
+                // Add Selectbox with the volume for the additional players
+                function addAdditionalPlayerVolumeUI(row, _currentVolume = 0) {
+                    let oAdjustVolume = $('<select/>', { class: "rowRulePlayerHostAdjustVolume", type: "text", style: "width:200px; margin-left: 5px; text-align: left;" }).appendTo(row);
+                    for (let index = -100; index < 100; index += 5) {
+                        let sTesto = "";
+                        if (index === 0) sTesto = "Same volume as Main Sonos Player";
+                        if (index < 0) sTesto = "Decrease volume by " + Math.abs(index) ;
+                        if (index > 0) sTesto = "Increase volume by " + index;
+                        oAdjustVolume.append($("<option></option>")
+                            .attr("value", index)
+                            .text(sTesto)
+                        )
+                    }
+                    oAdjustVolume.val(_currentVolume);
+                }
                 function resizeRule(rule) { }
+
                 $("#node-input-rule-container").css('min-height', '150px').css('min-width', '450px').editableList({
                     addItem: function (container, i, opt) { // row, index, data
-                        // opt.r is: { topic: rowRuleTopic, devicename: rowRuleDeviceName, dpt:rowRuleDPT, send: rowRuleSend}
 
                         if (!opt.hasOwnProperty('r')) {
                             opt.r = {};
                         }
-                        var rule = opt.r;
+                        let rule = opt.r;
                         if (!opt.hasOwnProperty('i')) {
                             opt._i = Math.floor((0x99999 - 0x10000) * Math.random()).toString();
                         }
@@ -422,8 +438,7 @@
 
 
                         var row = $('<div class="form-row"/>').appendTo(container);
-                        var oPlayer = $('<label>Discovering.... wait...</label>', { class: "rowRulePlayerHost", type: "text", style: "width:300px; margin-left: 5px; text-align: left;" }).appendTo(row);
-
+                        var oPlayer = $('<label>Discovering.... wait...</label>', { class: "rowRulePlayerHost", type: "text", style: "width:200px; margin-left: 5px; text-align: left;" }).appendTo(row);
                         oPlayer.on("change", function () {
                             resizeRule(container);
                         });
@@ -432,16 +447,18 @@
                             if (typeof data === "string" && data == "ERRORDISCOVERY") { // 10/04/2020 if error in discovery, fallback to manual IP input
                                 // Transform the dropdown to a simple input
                                 oPlayer.remove();
-                                oPlayer = $('<input/>', { class: "rowRulePlayerHost", type: "text", style: "width:300px; margin-left: 5px; text-align: left;" }).appendTo(row);
+                                oPlayer = $('<input/>', { class: "rowRulePlayerHost", type: "text", style: "width:200px; margin-left: 5px; text-align: left;" }).appendTo(row);
+                                addAdditionalPlayerVolumeUI(row, rule.hostVolumeAdjust);
                             } else {
                                 oPlayer.remove();
-                                oPlayer = $('<select/>', { class: "rowRulePlayerHost", type: "text", style: "width:300px; margin-left: 5px; text-align: left;" }).appendTo(row);
+                                oPlayer = $('<select/>', { class: "rowRulePlayerHost", type: "text", style: "width:200px; margin-left: 5px; text-align: left;" }).appendTo(row);
                                 data.sort().forEach(oGroup => {
                                     oPlayer.append($("<option></option>")
                                         .attr("value", oGroup.host)
                                         .text(oGroup.name + " (" + oGroup.host + ")")
                                     )
                                 });
+                                addAdditionalPlayerVolumeUI(row, rule.hostVolumeAdjust);
                             }
                             oPlayer.val(rule.host);
                         });
@@ -460,7 +477,7 @@
 
                 // 20/03/2020 For each rule, create a row
                 for (var i = 0; i < this.rules.length; i++) {
-                    var rule = this.rules[i];
+                    let rule = this.rules[i];
                     $("#node-input-rule-container").editableList('addItem', { r: rule, i: i });
                 }
                 // ##########################################################
@@ -469,14 +486,14 @@
                 node.refreshHailingList();
 
             }, oneditsave: function () {
-                var node = this;
-
-                var rules = $("#node-input-rule-container").editableList('items');
+                let node = this;
+                let rules = $("#node-input-rule-container").editableList('items');
                 node.rules = [];
                 rules.each(function (i) {
-                    var rule = $(this);
-                    var rowRulePlayerHost = rule.find(".rowRulePlayerHost").val();
-                    node.rules.push({ host: rowRulePlayerHost });
+                    let rule = $(this);
+                    let rowRulePlayerHost = rule.find(".rowRulePlayerHost").val();
+                    let rowRulePlayerHostAdjustVolume = rule.find(".rowRulePlayerHostAdjustVolume").val();
+                    node.rules.push({ host: rowRulePlayerHost, hostVolumeAdjust: rowRulePlayerHostAdjustVolume });
                 });
                 this.propertyType = $("#node-input-property").typedInput('type');
             },

package/ttsultimate/ttsultimate.js

@@ -95,12 +95,12 @@ module.exports = function (RED) {
 
         //#region ASYNC DECLARATIONS
         // 30/12/2020 we are at the end of this crazy 2020
-        function getMusicQueue() {
+        function getMusicQueue(_oPlayer = node.SonosClient) {
             return new Promise(function (resolve, reject) {
                 var oRet = null;
-                node.SonosClient.currentTrack().then(track => {
+                _oPlayer.currentTrack().then(track => {
                     oRet = track;// .queuePosition || 1; // Get the current track  in the queue.
-                    node.SonosClient.getCurrentState().then(state => {
+                    _oPlayer.getCurrentState().then(state => {
                         // A music queue is playing and no TTS is speaking?
                         oRet.state = state;
                         resolve(oRet);
@@ -115,11 +115,12 @@ module.exports = function (RED) {
             });
         };
 
+
         let iWaitAfterSync = 500;
         // 24/08/2021 Sync wrapper
-        function PLAYSync(_toPlay) {
+        function PLAYSync(_toPlay, _oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.play(_toPlay).then(result => {
+                _oPlayer.play(_toPlay).then(result => {
                     if (iWaitAfterSync > 2000) console.log("PLAYSYNC")
                     let t = setTimeout(() => {
                         resolve(true);
@@ -132,9 +133,9 @@ module.exports = function (RED) {
         }
 
         // 24/08/2021 Sync wrapper
-        function SEEKSync(_Position) {
+        function SEEKSync(_Position, _oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.seek(_Position).then(result => {
+                _oPlayer.seek(_Position).then(result => {
                     if (iWaitAfterSync > 2000) console.log("SEEKSync", _Position)
                     let t = setTimeout(() => {
                         resolve(true);
@@ -147,9 +148,9 @@ module.exports = function (RED) {
         }
 
         // 24/08/2021 Sync wrapper
-        function SELECTQUEUESync() {
+        function SELECTQUEUESync(_oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.selectQueue().then(result => {
+                _oPlayer.selectQueue().then(result => {
                     if (iWaitAfterSync > 2000) console.log("SELECTQUEUESync")
                     try {
                         STOPSync(); // The SetQueue automatically starts playing, so i need to stop it now!
@@ -166,10 +167,10 @@ module.exports = function (RED) {
         }
 
         // 24/08/2021 Sync wrapper
-        function SELECTTRACKSync(_queuePositiom) {
+        function SELECTTRACKSync(_queuePosition, _oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.selectTrack(_queuePositiom).then(result => {
-                    if (iWaitAfterSync > 2000) console.log("SELECTTRACKSync", _queuePositiom)
+                _oPlayer.selectTrack(_queuePosition).then(result => {
+                    if (iWaitAfterSync > 2000) console.log("SELECTTRACKSync", _queuePosition)
                     let t = setTimeout(() => {
                         resolve(true);
                     }, iWaitAfterSync);
@@ -181,9 +182,9 @@ module.exports = function (RED) {
         }
 
         // 24/08/2021 Sync wrapper
-        function STOPSync() {
+        function STOPSync(_oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.stop().then(result => {
+                _oPlayer.stop().then(result => {
                     if (iWaitAfterSync > 2000) console.log("STOPSync")
                     let t = setTimeout(() => {
                         resolve(true);
@@ -196,9 +197,9 @@ module.exports = function (RED) {
         }
 
         // 24/08/2021 Sync wrapper
-        function GETVOLUMESync() {
+        function GETVOLUMESync(_oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.getVolume().then(volume => {
+                _oPlayer.getVolume().then(volume => {
                     if (iWaitAfterSync > 2000) console.log("GETVOLUMESync", volume)
                     resolve(volume);
                 }).catch(err => {
@@ -209,9 +210,9 @@ module.exports = function (RED) {
         }
 
         // 24/08/2021 Sync wrapper
-        function SETVOLUMESync(_volume) {
+        function SETVOLUMESync(_volume, _oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.setVolume(_volume).then(result => {
+                _oPlayer.setVolume(_volume).then(result => {
                     if (iWaitAfterSync > 2000) console.log("SETVOLUMESync", _volume)
                     resolve(true);
                 }).catch(err => {
@@ -222,9 +223,9 @@ module.exports = function (RED) {
         }
 
         // 24/08/2021 Sync wrapper
-        function setAVTransportURISync(_Uri) {
+        function setAVTransportURISync(_Uri, _oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.setAVTransportURI(_Uri).then(volume => {
+                _oPlayer.setAVTransportURI(_Uri).then(volume => {
                     if (iWaitAfterSync > 2000) console.log("setAVTransportURISync", _Uri)
                     resolve(true);
                 }).catch(err => {
@@ -235,9 +236,9 @@ module.exports = function (RED) {
         }
 
         // 24/08/2021 Sync wrapper
-        function getCurrentStateSync() {
+        function getCurrentStateSync(_oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.getCurrentState().then(state => {
+                _oPlayer.getCurrentState().then(state => {
                     resolve(state);
                 }).catch(err => {
                     RED.log.error("ttsultimate: Error getCurrentStateSync: " + err.message);
@@ -247,9 +248,9 @@ module.exports = function (RED) {
         }
 
         // 21/10/2021 Sync wrapper
-        function GETMutedSync() {
+        function GETMutedSync(_oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.getMuted().then(state => {
+                _oPlayer.getMuted().then(state => {
                     resolve(state);
                 }).catch(err => {
                     RED.log.error("ttsultimate: Error GETMutedSync: " + err.message);
@@ -259,9 +260,9 @@ module.exports = function (RED) {
         }
 
         // 21/10/2021 Sync wrapper
-        function SETMutedSync(_muted) {
+        function SETMutedSync(_muted, _oPlayer = node.SonosClient) {
             return new Promise((resolve, reject) => {
-                node.SonosClient.setMuted(_muted).then(state => {
+                _oPlayer.setMuted(_muted).then(state => {
                     resolve(state);
                 }).catch(err => {
                     RED.log.error("ttsultimate: Error SETMutedSync: " + err.message);
@@ -283,15 +284,12 @@ module.exports = function (RED) {
             }
             // 30/03/2020 in the middle of coronavirus emergency. Group Speakers
             for (let index = 0; index < node.oAdditionalSonosPlayers.length; index++) {
-                const element = node.oAdditionalSonosPlayers[index];
-                try {
-                    await element.joinGroup(node.sonosCoordinatorGroupName);
-                } catch (error) {
-                    RED.log.warn("ttsultimate: Error joining device " + error.message);
-                }
-                // 02/07/2021 Get the player's volume set by app, to be set again in ungroupspealers
+                let element = node.oAdditionalSonosPlayers[index].oPlayer;
+               
+                // 02/07/2021 Get the additional's player's volume set by app and the current track, to be set again in ungroupspealers
                 try {
                     element.additionalPlayerPreviousVolumeSetByApp = await element.getVolume();
+                    element.additionalPlayerCurrentTrack = await getMusicQueue(element);
                 } catch (error) {
                     RED.log.warn("ttsultimate: Error setting volume of joined device " + error.message);
                 }
@@ -301,6 +299,12 @@ module.exports = function (RED) {
                 } catch (error) {
                     RED.log.warn("ttsultimate: Error getMuted of joined device " + error.message);
                 }
+
+                try {
+                    await element.joinGroup(node.sonosCoordinatorGroupName);
+                } catch (error) {
+                    RED.log.warn("ttsultimate: Error joining device " + error.message);
+                }
             };
         }
 
@@ -322,7 +326,7 @@ module.exports = function (RED) {
             }
 
             for (let index = 0; index < node.oAdditionalSonosPlayers.length; index++) {
-                const element = node.oAdditionalSonosPlayers[index];
+                let element = node.oAdditionalSonosPlayers[index].oPlayer;
                 try {
                     await element.leaveGroup();
                 } catch (error) {
@@ -401,9 +405,10 @@ module.exports = function (RED) {
             });
             // Fill the node.oAdditionalSonosPlayers with all sonos object in the rules
             for (let index = 0; index < node.rules.length; index++) {
-                const element = node.rules[index];
-                node.oAdditionalSonosPlayers.push(new sonos.Sonos(element.host));
-                RED.log.info("ttsultimate: FOUND ADDITIONAL PLAYER " + element.host);
+                let element = node.rules[index]; // Rule row is {host:"192.168.1.12,hostVolumeAdjust:0}
+                // 12/04/2022 Create an object containing the addidtional player and the adapted volume
+                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);
             }
 
 
@@ -432,7 +437,7 @@ module.exports = function (RED) {
 
 
         // 30/12/2020 Supergiovane resume queue for radio, queue music, TV in , line in etc.
-        async function resumeMusicQueue(_oTrack) {
+        async function resumeMusicQueue(_oTrack, _oPlayer = node.SonosClient) {
 
             if (_oTrack !== null) {
                 // Do some checks on the track.
@@ -457,12 +462,13 @@ module.exports = function (RED) {
                 if (_oTrack.state === "playing") {
                     // 03/09/2021 Play if it was playing
                     try {
-                        await PLAYSync(_oTrack.uri);
+                        await PLAYSync(_oTrack.uri, _oPlayer);
                     } catch (error) {
                         return error;
                     }
                     try {
-                        await SEEKSync(_oTrack.position);
+                        await delay(1000);
+                        await SEEKSync(_oTrack.position, _oPlayer);
                     } catch (error) {
                         // Don't care
                     }
@@ -470,31 +476,33 @@ module.exports = function (RED) {
             } else {
                 if (_oTrack.trackType === "musicqueue") { // This indicates that is an audio file or stream station
                     try {
-                        await SELECTQUEUESync();
+                        await SELECTQUEUESync(_oPlayer);
                     } catch (error) {
                         return error;
                     }
                     try {
-                        await SELECTTRACKSync(_oTrack.queuePosition);
+                        await delay(1000);
+                        await SELECTTRACKSync(_oTrack.queuePosition, _oPlayer);
                     } catch (error) {
                         return error;
                     }
                     try {
-                        await SEEKSync(_oTrack.position);
+                        await delay(1000);
+                        await SEEKSync(_oTrack.position, _oPlayer);
                     } catch (error) {
                         // Don't care
                     }
                     if (_oTrack.state === "playing") {
                         // 24/08/2021 Play if it was playing
                         try {
-                            await PLAYSync();
+                            await PLAYSync(_oPlayer);
                         } catch (error) {
                             return error;
                         }
                     } else {
                         /// 03/09/2021
                         try {
-                            await STOPSync();
+                            await STOPSync(_oPlayer);
                         } catch (error) {
                             return error;
                         }
@@ -503,7 +511,7 @@ module.exports = function (RED) {
                     // Line in, TV in, etc...
                     if (_oTrack.state === "playing") {
                         try {
-                            await setAVTransportURISync(_oTrack.uri);
+                            await setAVTransportURISync(_oTrack.uri, _oPlayer);
                         } catch (error) {
                             return error;
                         }
@@ -513,6 +521,7 @@ module.exports = function (RED) {
             let t = setTimeout(() => { return true; }, 5000); // Wait some seconds 
         };
 
+
         // Handle the queue
         async function HandleQueue() {
             node.bBusyPlayingQueue = true;
@@ -523,6 +532,7 @@ module.exports = function (RED) {
                 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;
                 }
@@ -530,7 +540,7 @@ module.exports = function (RED) {
                 // 05/12/2020 Set "completed" to false and send it
                 node.msg.completed = false;
                 try {
-                    await groupSpeakersSync(); // 20/03/2020 Group Speakers toghether    
+                    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 });
@@ -655,21 +665,26 @@ module.exports = function (RED) {
 
                             // Set Volume
                             try {
-                                let volTemp = 0
+                                let volTemp = 0;
                                 if (node.currentMSGbeingSpoken.hasOwnProperty("volume")) {
-                                    volTemp = node.currentMSGbeingSpoken.volume;
+                                    volTemp = Number(node.currentMSGbeingSpoken.volume);
                                 } else {
-                                    volTemp = node.sSonosVolume;
+                                    volTemp = Number(node.sSonosVolume);
                                 }
                                 await SETVOLUMESync(volTemp);
                                 if (node.unmuteIfMuted) await SETMutedSync(false); // 21/10/2021 Unmute
 
                                 if (node.oAdditionalSonosPlayers.length > 0) {
-                                    // 05/07/2021 set the volume of additional coordinatores
+                                    // 05/07/2021 set the volume of additional coordinators
                                     for (let index = 0; index < node.oAdditionalSonosPlayers.length; index++) {
-                                        const element = node.oAdditionalSonosPlayers[index];
+                                        let element = node.oAdditionalSonosPlayers[index].oPlayer;
+                                        //node.oAdditionalSonosPlayers.push({ oPlayer: new sonos.Sonos(element.host), hostVolumeAdjust: element.hostVolumeAdjust });
                                         try {
-                                            await element.setVolume(volTemp);
+                                            // 12/04/20222 Set the adjusted volume, based on the main player volume + the adjusted volume in %
+                                            let iAdjustedVol = Number(volTemp) + Number((node.oAdditionalSonosPlayers[index].hostVolumeAdjust || 0));
+                                            if (iAdjustedVol < 0) iAdjustedVol = 0;
+                                            if (iAdjustedVol > 100) iAdjustedVol = 100;
+                                            await element.setVolume(iAdjustedVol);
                                             if (node.unmuteIfMuted) await element.setMuted(false); // 21/10/2021 Unmute
                                         } catch (error) {
                                             RED.log.error("ttsultimate: Handlequeue: Unable to set the volume on additional player " + error.message);
@@ -760,7 +775,7 @@ module.exports = function (RED) {
 
                     // Ungroup speaker
                     try {
-                        await ungroupSpeakersSync();
+                        await ungroupSpeakersSync(); // Ungroup speakers 
                     } catch (error) {
                         // Don't care.
                         node.setNodeStatus({ fill: "red", shape: "ring", text: "Error ungrouping speakers: " + error.message });
@@ -782,6 +797,24 @@ module.exports = function (RED) {
                         node.setNodeStatus({ fill: 'red', shape: 'ring', text: "Error resuming queue: " + error.message });
                     }
 
+
+                    // 19/04/2022 Resume music queue of additional players
+                    for (let index = 0; index < node.oAdditionalSonosPlayers.length; index++) {
+                        let addPlayer = node.oAdditionalSonosPlayers[index].oPlayer;
+                        let trackAddPlayer = addPlayer.additionalPlayerCurrentTrack;
+                        if (trackAddPlayer !== null) {
+                            try {
+                                await resumeMusicQueue(trackAddPlayer, addPlayer);
+                                node.setNodeStatus({ fill: 'green', shape: 'ring', text: "Done resuming queue additional player " + addPlayer.host || "" });
+                            } catch (error) {
+                                // Dont care
+                                RED.log.warn("ttsultimate: Error resuming music queue of additional player " + error.message + " " + addPlayer.host || "");
+                            }
+                        } else {
+                            node.setNodeStatus({ fill: 'green', shape: 'ring', text: "No queue to resume for " + addPlayer.host || "" });
+                        }
+                    }
+
                     // Signal end playing
                     let t = setTimeout(() => {
                         node.msg.completed = true;
@@ -843,9 +876,18 @@ module.exports = function (RED) {
                     // Fill the node.oAdditionalSonosPlayers with all sonos IPs in the setPlayerGroupArray
                     node.oAdditionalSonosPlayers = [];
                     for (let index = 0; index < msg.setConfig.setPlayerGroupArray.length; index++) {
-                        const element = msg.setConfig.setPlayerGroupArray[index];
-                        node.oAdditionalSonosPlayers.push(new sonos.Sonos(element));
-                        RED.log.info("ttsultimate: new group player set by msg: " + element);
+                        const sRow = msg.setConfig.setPlayerGroupArray[index];
+                        let host = "";
+                        let hostVolumeAdjust = 0;
+                        if (sRow.includes("#")) {
+                            host = sRow.split("#")[0];
+                            hostVolumeAdjust = sRow.split("#")[1];
+                        } else {
+                            host = sRow;
+                        }
+                        //node.oAdditionalSonosPlayers.push({ oPlayer: new sonos.Sonos(element.host), hostVolumeAdjust: element.hostVolumeAdjust });
+                        node.oAdditionalSonosPlayers.push({ oPlayer: new sonos.Sonos(host), hostVolumeAdjust: Number(hostVolumeAdjust) });
+                        RED.log.info("ttsultimate: new group player set by msg: " + host + " adjusted volume: " + Number(hostVolumeAdjust));
                     }
                 };
             };