node-red-contrib-huemagic 4.2.1 → 4.2.2

package/CHANGELOG.md

@@ -1,8 +1,14 @@
-[![Hue Magic Logo](https://gistcdn.githack.com/Foddy/062045775c28f5993ad646aba80e678c/raw/27e90d22bde68d9c92aed520c0c0c2cb8a22b7fd/huemagicv3x.svg)](https://flows.nodered.org/node/node-red-contrib-huemagic)
+[![Hue Magic Logo](https://gist.githubusercontent.com/Foddy/9b647b910d03a31cee40f97c3988dd1c/raw/7ee635bd958ad04d7ba53c6c40ec401f879bffc2/huemagic-logo.svg)](https://flows.nodered.org/node/node-red-contrib-huemagic)
 
 # Changelog
 
-### v4.2.1 (latest)
+### v4.2.2 (latest)
+
+* HueMagic can now be installed again on older Node-RED versions without official support
+* Fixed an issue for Hue Group nodes not getting/updating their current status ([#342](https://github.com/Foddy/node-red-contrib-huemagic/issues/342)) (thx @bmdevx)
+* Fixed an error with non-functioning node configurations
+
+### v4.2.1
 
 * Commands are now re-executed up to three times if they fail due to a bridge timeout
 * The "image" option on the "Hue Light" node will now set the corresponding gradient colors on supported resources

package/README.md

@@ -796,7 +796,13 @@ If the status of the node has changed via a certain command, the entire command
 
 # Changelog
 
-### v4.2.1 (latest)
+### v4.2.2 (latest)
+
+* HueMagic can now be installed again on older Node-RED versions without official support
+* Fixed an issue for Hue Group nodes not getting/updating their current status ([#342](https://github.com/Foddy/node-red-contrib-huemagic/issues/342)) (thx @bmdevx)
+* Fixed an error with non-functioning node configurations
+
+### v4.2.1
 
 * Commands are now re-executed up to three times if they fail due to a bridge timeout
 * The "image" option on the "Hue Light" node will now set the corresponding gradient colors on supported resources
@@ -879,7 +885,7 @@ If the status of the node has changed via a certain command, the entire command
 * Other optimizations, dependency updates and clean up
 
 ### Previous versions
-A complete overview of the updates can be viewed in the [changelog](https://github.com/Foddy/node-red-contrib-huemagic/blob/master/CHANGELOG.md)…
+The full changelog [changelog](https://github.com/Foddy/node-red-contrib-huemagic/blob/master/CHANGELOG.md) can be viewed here…
 
 
 ***

package/huemagic/hue-bridge-config.js

@@ -34,10 +34,10 @@ module.exports = function(RED)
 		this.lastStates = {};
 		this.events = new events.EventEmitter();
 		this.patchQueue = null;
-		this.timerWatchDog = null; // 31/01/2022 Supergiovane: watchdog for the connection with the bridge
+		this.timerWatchDog = null;
 
 		// RESOURCE ID PATTERN
-		this.validResourceID = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/gi;
+		this.validResourceID = /[a-zA-Z0-9]/gi;
 
 		// FIRMWARE UPDATE TIMEOUT
 		this.firmwareUpdateTimeout = null;
@@ -45,20 +45,21 @@ module.exports = function(RED)
 		// CREATE NODE
 		RED.nodes.createNode(scope, config);
 
-		this.startWatchdog = function() {
-				// 31/01/2022 Supergiovane: Check wether the bridge is connected.
-				if (this.timerWatchDog !== null) clearTimeout(this.timerWatchDog);
-				this.timerWatchDog = setTimeout(() => {
-				try {
+		// PERIODICALLY CHECK WETHER BRIDGE IS CONNECTED
+		this.startWatchdog = function()
+		{
+			if (this.timerWatchDog !== null) clearTimeout(this.timerWatchDog);
+			this.timerWatchDog = setTimeout(function()
+			{
+				try
+				{
 					API.request({ config: config, resource: "/config", version: 1 })
 					.then(function(bridgeInformation)
 					{
-						// The bridge is still connected
 						scope.startWatchdog();
 					})
 					.catch(function(error)
 					{
-						// Error connecting to the bridge
 						scope.log("Error requesting info from the bridge. Reconnect in some secs. " + error.message);
 						scope.start();
 					});		
@@ -66,14 +67,12 @@ module.exports = function(RED)
 					scope.log("Lost connection with the bridge. Reconnect in some secs. " + error.message);
 					scope.start();
 				}
-				
 			}, 10000);
 		}
+
 		// INITIALIZE
 		this.start = function()
 		{
-			this.startWatchdog(); // 31/01/2022 Supergiovane: starts the watchdog.
-
 			scope.log("Initializing the bridge ("+config.bridge+")…");
 			API.init({ config: config })
 			.then(function(bridge) {
@@ -101,6 +100,9 @@ module.exports = function(RED)
 
 				// START LOOKING FOR FIRMWARE-UPDATES
 				scope.autoUpdateFirmware();
+
+				// START WATCHDOG
+				scope.startWatchdog();
 				return true;
 			})
 			.catch(function(error)

package/huemagic/hue-magic.html

@@ -52,8 +52,6 @@
 {
     position: relative;
     cursor: pointer;
-
-    border-radius: 20px;
     overflow: hidden;
 
     border: 2px solid #fff;

package/huemagic/utils/api.js

@@ -252,15 +252,16 @@ function API()
 				}
 
 				// RESOURCE HAS GROUPED SERVICES?
-				if(fullResource["grouped_services"])
+				if (fullResource["services"])
 				{
-					for (var g = fullResource["grouped_services"].length - 1; g >= 0; g--)
+					for (serviceType in fullResource["services"])
 					{
-						const groupedService = fullResource["grouped_services"][g];
-						const groupedServiceID = groupedService["rid"];
-
-						if(!processedResources["_groupsOf"][groupedServiceID]) { processedResources["_groupsOf"][groupedServiceID] = []; }
-						processedResources["_groupsOf"][groupedServiceID].push(fullResource.id);
+						const grouped_services = fullResource['services'][serviceType];
+						for (groupedServiceID in grouped_services)
+						{
+							if (!processedResources["_groupsOf"][groupedServiceID]) { processedResources["_groupsOf"][groupedServiceID] = []; }
+							processedResources["_groupsOf"][groupedServiceID].push(fullResource.id);
+						}
 					}
 				}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-huemagic",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Philips Hue node to control bridges, lights, groups, scenes, rules, taps, switches, buttons, motion sensors, temperature sensors and Lux sensors using Node-RED.",
   "author": "foddy",
   "homepage": "https://github.com/Foddy/node-red-contrib-huemagic",
@@ -27,7 +27,6 @@
     "iot"
   ],
   "node-red": {
-    "version": ">=2.1.0",
     "nodes": {
       "hue-bridge": "huemagic/hue-bridge-config.js",
       "hue-bridge-node": "huemagic/hue-bridge.js",