node-red-contrib-huemagic 4.0.4 → 4.0.5

package/README.md

@@ -395,6 +395,7 @@ In contrast to the "Hue Light" node, you have much less status information avail
 | id (string) | Indicates the new ID of the group |
 | idV1 (string / boolean) | Indicates the old ID of the group |
 | name (string) | The currently set name of the group |
+| resources (object) | Contains all devices/resources behind the group
 | type (string) | The type of the group (always `group`) |
 
 #### Status changes under `msg.updated`
@@ -795,7 +796,12 @@ If the status of the node has changed via a certain command, the entire command
 
 # Changelog
 
-### v4.0.4 (latest)
+### v4.0.5 (latest)
+
+* The "Hue Group" node now contains the "resources" information with all linked resources behind the group/zone
+* Fixed an issue that caused Node-RED to restart if a command was sent before a node was initialized
+
+### v4.0.4
 
 * Fixed an issue with the bridge config node checking for updates too frequently ([#246](https://github.com/Foddy/node-red-contrib-huemagic/issues/246#issuecomment-1009376442))
 * Fixed an issue with multiple bridges configured

package/huemagic/hue-brightness.js

@@ -114,6 +114,11 @@ module.exports = function(RED)
 			}
 
 			let currentState = bridge.get("light_level", tempSensorID);
+			if(!currentState)
+			{
+				scope.error("The sensor in not yet available. Please wait for the bridge to connect before sending any command.");
+				return false;
+			}
 
 			// GET CURRENT STATE
 			if( (typeof msg.payload != 'undefined' && typeof msg.payload.status != 'undefined') || (typeof msg.__user_inject_props__ != 'undefined' && msg.__user_inject_props__ == "status") )

package/huemagic/hue-buttons.js

@@ -42,6 +42,11 @@ module.exports = function(RED)
 		bridge.subscribe("button", config.sensorid, function(info)
 		{
 			let currentState = bridge.get("button", info.id);
+			if(!currentState)
+			{
+				scope.error("The button/switch in not yet available. Please wait for the bridge to connect before sending any command.");
+				return false;
+			}
 
 			// RESOURCE FOUND?
 			if(currentState !== false)

package/huemagic/hue-group.js

@@ -110,6 +110,11 @@ module.exports = function(RED)
 			// DEFINE SENSOR ID & CURRENT STATE
 			const tempGroupID = (!config.groupid && typeof msg.topic != 'undefined' && bridge.validResourceID.test(msg.topic) === true) ? msg.topic : config.groupid;
 			let currentState = bridge.get("group", tempGroupID, { colornames: config.colornamer ? true : false });
+			if(!currentState)
+			{
+				scope.error("The group in not yet available. Please wait for the bridge to connect before sending any command.");
+				return false;
+			}
 
 			// CHECK IF LIGHT ID IS SET
 			if(!tempGroupID)

package/huemagic/hue-light.js

@@ -123,6 +123,11 @@ module.exports = function(RED)
 			// DEFINE SENSOR ID & CURRENT STATE
 			const tempLightID = (!config.lightid && typeof msg.topic != 'undefined' && bridge.validResourceID.test(msg.topic) === true) ? msg.topic : config.lightid;
 			let currentState = bridge.get("light", tempLightID, { colornames: config.colornamer ? true : false });
+			if(!currentState)
+			{
+				scope.error("The light in not yet available. Please wait for the bridge to connect before sending any command.");
+				return false;
+			}
 
 			// CHECK IF LIGHT ID IS SET
 			if(!tempLightID)

package/huemagic/hue-motion.js

@@ -108,6 +108,11 @@ module.exports = function(RED)
 			}
 
 			let currentState = bridge.get("motion", tempSensorID);
+			if(!currentState)
+			{
+				scope.error("The sensor in not yet available. Please wait for the bridge to connect before sending any command.");
+				return false;
+			}
 
 			// GET CURRENT STATE
 			if( (typeof msg.payload != 'undefined' && typeof msg.payload.status != 'undefined') || (typeof msg.__user_inject_props__ != 'undefined' && msg.__user_inject_props__ == "status") )

package/huemagic/hue-rules.js

@@ -98,6 +98,11 @@ module.exports = function(RED)
 			}
 
 			let currentState = bridge.get("rule", "rule_" + tempRuleID);
+			if(!currentState)
+			{
+				scope.error("The rule in not yet available. Please wait for the bridge to connect before sending any command.");
+				return false;
+			}
 
 			// CONTROL RULE
 			if(msg.payload === true || msg.payload === false)

package/huemagic/hue-temperature.js

@@ -39,6 +39,11 @@ module.exports = function(RED)
 		bridge.subscribe("temperature", config.sensorid, function(info)
 		{
 			let currentState = bridge.get("temperature", info.id);
+			if(!currentState)
+			{
+				scope.error("The sensor in not yet available. Please wait for the bridge to connect before sending any command.");
+				return false;
+			}
 
 			// RESOURCE FOUND?
 			if(currentState !== false)

package/huemagic/locales/de/hue-group.html

@@ -53,6 +53,7 @@ Anders als beim „Hue Licht“-Node, stehen Ihnen hier viel weniger Statusinfor
 : id (string) : Gibt die neue ID der Gruppe an
 : idV1 (string | boolean) : Gibt die alte ID der Gruppe an
 : name (string) : Der aktuell eingestellte Name des Gruppe
+: resources (object) : Enthält alle Geräte/Ressourcen hinter der Gruppe
 : type (string) : Der Typ des Gruppe (immer `group`)
 
 #### Zustandsänderungen unter `msg.updated`

package/huemagic/locales/en-US/hue-group.html

@@ -53,6 +53,7 @@ In contrast to the "Hue Light" node, you have much less status information avail
 : id (string): Indicates the new ID of the group
 : idV1 (string | boolean): Indicates the old ID of the group
 : name (string): The currently set name of the group
+: resources (object) : Contains all devices/resources behind the group
 : type (string): The type of the group (always `group`)
 
 #### Status changes under `msg.updated`

package/huemagic/utils/messages.js

@@ -119,6 +119,13 @@ class HueGroupMessage
 		let service = Object.values(resource["services"]["grouped_light"])[0];
 		service = options.resources[service.id];
 
+		// GET ALL RESOURCES
+		let allResourcesInsideGroup = {};
+		for (const [type, resources] of Object.entries(resource["services"]))
+		{
+			allResourcesInsideGroup[type] = Object.keys(resource["services"][type]);
+		}
+
 		this.message = {};
 		this.message.payload = {};
 		this.message.payload.on = service.on.on;
@@ -128,6 +135,7 @@ class HueGroupMessage
 		this.message.info.id = resource.id;
 		this.message.info.idV1 = resource.id_v1 ? resource.id_v1 : false; // NEW
 		this.message.info.name = resource.metadata ? resource.metadata.name : "all";
+		this.message.info.resources = allResourcesInsideGroup; // NEW
 		this.message.info.type = "group";
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-huemagic",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "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",