node-red-contrib-huemagic 5.1.0 → 5.1.1

package/CHANGELOG.md

@@ -2,7 +2,12 @@
 
 # Changelog
 
-### v5.1.0 (latest)
+### v5.1.1 (latest)
+
+* Pressing a button on a Hue Tap Dial Switch no longer also reports the last rotation of its dial under `msg.payload.rotation`, and turning the dial no longer reports the last pressed button ([#456](https://github.com/Foddy/node-red-contrib-huemagic/pull/456)) (thx @FredBlo)
+* A battery or connection update of a switch, dial or doorbell no longer repeats its last press or rotation as if it had just happened ([#456](https://github.com/Foddy/node-red-contrib-huemagic/pull/456)) (thx @FredBlo)
+
+### v5.1.0
 
 **New devices and features**
 

package/README.md

@@ -1218,7 +1218,12 @@ If the status of the node has changed via a certain command, the entire command
 
 # Changelog
 
-### v5.1.0 (latest)
+### v5.1.1 (latest)
+
+* Pressing a button on a Hue Tap Dial Switch no longer also reports the last rotation of its dial under `msg.payload.rotation`, and turning the dial no longer reports the last pressed button ([#456](https://github.com/Foddy/node-red-contrib-huemagic/pull/456)) (thx @FredBlo)
+* A battery or connection update of a switch, dial or doorbell no longer repeats its last press or rotation as if it had just happened ([#456](https://github.com/Foddy/node-red-contrib-huemagic/pull/456)) (thx @FredBlo)
+
+### v5.1.0
 
 **New devices and features**
 

package/huemagic/hue-buttons.js

@@ -75,7 +75,8 @@ module.exports = function(RED)
 		// SUBSCRIBE TO UPDATES FROM THE BRIDGE
 		this.unsubscribe = bridge.subscribe("button", config.sensorid, function(info)
 		{
-			let currentState = bridge.get("button", info.id);
+			// ONLY REPORT THE SERVICE THAT FIRED THIS EVENT, NOT THE LAST PRESS OR ROTATION STILL CACHED
+			let currentState = bridge.get("button", info.id, { updatedType: info.updatedType });
 
 			// RESOURCE FOUND?
 			if(currentState !== false)
@@ -216,13 +217,15 @@ module.exports = function(RED)
 						{
 							scope.status({fill: "grey", shape: "dot", text: "hue-buttons.node.waiting"});
 
-							// REMOVE OLD BUTTON STATES
-							const buttons = (bridge.resources[config.sensorid] && bridge.resources[config.sensorid]["services"]) ? bridge.resources[config.sensorid]["services"]["button"] : false;
-							if(!buttons) { return false; }
+							// REMOVE OLD BUTTON AND DIAL STATES
+							const services = (bridge.resources[config.sensorid] && bridge.resources[config.sensorid]["services"]) ? bridge.resources[config.sensorid]["services"] : {};
 
-							for (const [oneButtonID, oneButton] of Object.entries(buttons))
+							for (const oneType of ["button", "relative_rotary"])
 							{
-								delete buttons[oneButtonID]["button"];
+								for (const oneService of Object.values(services[oneType] || {}))
+								{
+									delete oneService[oneType];
+								}
 							}
 						}, 3000);
 					}

package/huemagic/utils/messages.js

@@ -674,13 +674,16 @@ class HueButtonsMessage
 		const connection = connectivity(resource);
 		const power = battery(resource);
 
+		// A LIVE EVENT ONLY REPORTS THE SERVICE THAT FIRED IT, A STATUS QUERY EVERYTHING STILL CACHED
+		const fired = function(type) { return (!options.updatedType || options.updatedType === type); };
+
 		// FIND PRESSED BUTTON (A DOORBELL BEHAVES EXACTLY LIKE ONE)
 		var pressedButton = false;
 		var isDoorbell = false;
 
 		for (const oneType of ["button", "bell_button"])
 		{
-			const allButtons = resource.services[oneType] ? Object.values(resource.services[oneType]) : [];
+			const allButtons = (fired(oneType) && resource.services[oneType]) ? Object.values(resource.services[oneType]) : [];
 
 			for (var i = allButtons.length - 1; i >= 0; i--)
 			{
@@ -697,7 +700,7 @@ class HueButtonsMessage
 
 		// FIND ROTATION (HUE TAP DIAL, LUTRON AURORA)
 		var rotaryDial = false;
-		const allRotaries = resource.services.relative_rotary ? Object.values(resource.services.relative_rotary) : [];
+		const allRotaries = (fired("relative_rotary") && resource.services.relative_rotary) ? Object.values(resource.services.relative_rotary) : [];
 
 		for (var r = allRotaries.length - 1; r >= 0; r--)
 		{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-huemagic",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "Philips Hue nodes to control bridges, lights, groups, scenes, rules, automations, buttons, switches, dials, doorbells, speakers, motion sensors, cameras, contact sensors, temperature sensors, light level sensors and the Hue Play HDMI Sync Box using Node-RED.",
   "author": "foddy",
   "homepage": "https://github.com/Foddy/node-red-contrib-huemagic",