node-red-contrib-huemagic 4.2.2 → 5.0.0

package/huemagic/hue-bridge.html

@@ -4,19 +4,19 @@
         <input type="text" id="node-input-name" data-i18n="[placeholder]hue-bridge.config.input-name" style="width: calc(100% - 105px)">
     </div>
     <div class="form-row">
-        <label for="node-input-bridge"><i class="fa fa-server"></i> Bridge</label>
+        <label for="node-input-bridge"><i class="fa fa-server"></i> <span data-i18n="hue-bridge.config.bridge"></span></label>
         <input type="text" id="node-input-bridge" style="width: calc(100% - 105px)">
     </div>
     <div class="form-row" style="margin-top: 30px">
-        <div style="display: inline-flex; width: calc(100% - 105px)">
-            <input type="checkbox" id="node-input-skipglobalevents" style="flex: 15px;">
-            <span data-i18n="hue-bridge.config.skipglobalevents-info" style="width: 100%; margin-left: 10px;"></span>
+        <div style="display: inline-flex; align-items: center; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-skipglobalevents" style="flex: 0 0 auto; width: auto; margin: 0;">
+            <span data-i18n="hue-bridge.config.skipglobalevents-info" style="flex: 1; margin-left: 8px;"></span>
         </div>
     </div>
     <div class="form-row">
-        <div style="display: inline-flex; width: calc(100% - 105px)">
-            <input type="checkbox" id="node-input-initevents" style="flex: 15px;">
-            <span data-i18n="hue-bridge.config.sendinitevents-node" style="width: 100%; margin-left: 10px;"></span>
+        <div style="display: inline-flex; align-items: center; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-initevents" style="flex: 0 0 auto; width: auto; margin: 0;">
+            <span data-i18n="hue-bridge.config.sendinitevents-node" style="flex: 1; margin-left: 8px;"></span>
         </div>
     </div>
 </script>
@@ -33,7 +33,7 @@
             initevents: { value: false }
         },
         align: 'left',
-        icon: "hue-bridge.png",
+        icon: "hue-bridge.svg",
         inputs: 1,
         outputs: 1,
         label: function() {

package/huemagic/hue-bridge.js

@@ -52,6 +52,8 @@ module.exports = function(RED)
 				if(forceReload === true)
 				{
 					// REFRESH INFORMATION
+					scope.lastBridgeInformation = null;
+
 					bridge.getBridgeInformation(true)
 					.then(function(updated)
 					{
@@ -60,7 +62,8 @@ module.exports = function(RED)
 					.then(function(bridgeInformation)
 					{
 						resolve(bridgeInformation);
-					});
+					})
+					.catch(function(error) { reject(error); });
 				}
 				else if(scope.lastBridgeInformation !== null)
 				{
@@ -70,8 +73,15 @@ module.exports = function(RED)
 				else
 				{
 					let bridgeInformation = bridge.get("bridge", "bridge", { autoupdate: ((bridge.config.autoupdates && bridge.config.autoupdates == true) || typeof bridge.config.autoupdates == 'undefined') });
-					scope.lastBridgeInformation = Object.assign({}, bridgeInformation);
 
+					// NOT CONNECTED YET? -> NOTHING TO CACHE AND NOTHING TO SEND
+					if(!bridgeInformation)
+					{
+						reject(RED._("hue-bridge.node.error-not-available"));
+						return false;
+					}
+
+					scope.lastBridgeInformation = Object.assign({}, bridgeInformation);
 					resolve(bridgeInformation);
 				}
 			});
@@ -79,7 +89,7 @@ module.exports = function(RED)
 
 		//
 		// SUBSCRIBE TO UPDATES FROM THE BRIDGE
-		bridge.subscribe("bridge", "globalResourceUpdates", async function(info)
+		this.unsubscribe = bridge.subscribe("bridge", "globalResourceUpdates", async function(info)
 		{
 			let currentState = bridge.get(info.updatedType, info.id);
 
@@ -117,7 +127,8 @@ module.exports = function(RED)
 
 						// RESET LAST COMMAND
 						scope.lastCommand = null;
-					});
+					})
+					.catch(function(error) { scope.debug(error); });
 				}
 			}
 
@@ -296,8 +307,22 @@ module.exports = function(RED)
 					// RESET LAST COMMAND
 					scope.lastCommand = null;
 				}
+			})
+			.catch(function(error)
+			{
+				scope.error(error, msg);
+				scope.status({fill: "red", shape: "ring", text: "hue-bridge.node.connecting"});
+				if(done) { done(); }
 			});
 		});
+
+		//
+		// CLOSE NODE / DETACH FROM THE BRIDGE
+		this.on('close', function()
+		{
+			if(scope.unsubscribe) { scope.unsubscribe(); }
+		});
+
 	}
 
 	RED.nodes.registerType("hue-bridge-node", HueBridgeNode);

package/huemagic/hue-brightness.html

@@ -4,7 +4,7 @@
         <input type="text" id="node-input-name" data-i18n="[placeholder]hue-brightness.config.input-name" style="width: calc(100% - 105px)">
     </div>
     <div class="form-row">
-        <label for="node-input-bridge"><i class="fa fa-server"></i> Bridge</label>
+        <label for="node-input-bridge"><i class="fa fa-server"></i> <span data-i18n="hue-brightness.config.bridge"></span></label>
         <input type="text" id="node-input-bridge" style="width: calc(100% - 105px)">
     </div>
     <div class="form-row">
@@ -18,16 +18,26 @@
             </button>
         </div>
     </div>
+    <div class="form-row">
+        <label for="node-input-darkthreshold"><i class="fa fa-adjust"></i> <span data-i18n="hue-brightness.config.darkthreshold"></span></label>
+        <input type="number" id="node-input-darkthreshold" placeholder="90" min="0" style="width: calc(100% - 105px)">
+    </div>
     <div class="form-row" style="margin-top: 30px">
-        <div style="display: inline-flex; width: calc(100% - 105px)">
-            <input type="checkbox" id="node-input-skipevents" style="flex: 15px;">
-            <span data-i18n="hue-brightness.config.skipevents-node" style="width: 100%; margin-left: 10px;"></span>
+        <div style="display: inline-flex; align-items: center; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-skipevents" style="flex: 0 0 auto; width: auto; margin: 0;">
+            <span data-i18n="hue-brightness.config.skipevents-node" style="flex: 1; margin-left: 8px;"></span>
         </div>
     </div>
     <div class="form-row">
-        <div style="display: inline-flex; width: calc(100% - 105px)">
-            <input type="checkbox" id="node-input-initevents" style="flex: 15px;">
-            <span data-i18n="hue-brightness.config.sendinitevents-node" style="width: 100%; margin-left: 10px;"></span>
+        <div style="display: inline-flex; align-items: center; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-initevents" style="flex: 0 0 auto; width: auto; margin: 0;">
+            <span data-i18n="hue-brightness.config.sendinitevents-node" style="flex: 1; margin-left: 8px;"></span>
+        </div>
+    </div>
+    <div class="form-row">
+        <div style="display: inline-flex; align-items: center; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-onlycommands" style="flex: 0 0 auto; width: auto; margin: 0;">
+            <span data-i18n="hue-brightness.config.onlycommands-node" style="flex: 1; margin-left: 8px;"></span>
         </div>
     </div>
 </script>
@@ -40,11 +50,13 @@
             name: { value:"" },
             bridge: { type: "hue-bridge", required: true },
             sensorid: { value:"", required: false },
+            darkthreshold: { value: 90, validate: function(v) { return (v === "" || (!isNaN(v) && v >= 0)); } },
             skipevents: { value: false },
-            initevents: { value: false }
+            initevents: { value: false },
+            onlycommands: { value: false }
         },
         align: 'left',
-        icon: "hue-brightness.png",
+        icon: "hue-brightness.svg",
         inputs: 1,
         outputs: 1,
         label: function() {

package/huemagic/hue-brightness.js

@@ -37,15 +37,15 @@ module.exports = function(RED)
 
 		//
 		// SUBSCRIBE TO UPDATES FROM THE BRIDGE
-		bridge.subscribe("light_level", config.sensorid, function(info)
+		this.unsubscribe = bridge.subscribe("light_level", config.sensorid, function(info)
 		{
-			let currentState = bridge.get("light_level", info.id);
+			let currentState = bridge.get("light_level", info.id, { darkThreshold: config.darkthreshold });
 
 			// RESOURCE FOUND?
 			if(currentState !== false)
 			{
 				// SEND MESSAGE
-				if(!config.skipevents && (config.initevents || info.suppressMessage == false))
+				if(!config.skipevents && (config.initevents || info.suppressMessage == false) && (!config.onlycommands || scope.lastCommand !== null))
 				{
 					// SET LAST COMMAND
 					if(scope.lastCommand !== null)
@@ -110,14 +110,14 @@ module.exports = function(RED)
 			const tempSensorID = (!config.sensorid && typeof msg.topic != 'undefined' && bridge.validResourceID.test(msg.topic) === true) ? msg.topic : config.sensorid;
 			if(!tempSensorID)
 			{
-				scope.error("Please submit a valid sensor ID.");
+				scope.error(RED._("hue-brightness.node.error-no-id"), msg);
 				return false;
 			}
 
-			let currentState = bridge.get("light_level", tempSensorID);
+			let currentState = bridge.get("light_level", tempSensorID, { darkThreshold: config.darkthreshold });
 			if(!currentState)
 			{
-				scope.error("The sensor in not yet available. Please wait until HueMagic has established a connection with the bridge or check whether the resource ID in the configuration is valid.");
+				scope.error(RED._("hue-brightness.node.error-not-available"), msg);
 				return false;
 			}
 
@@ -159,11 +159,11 @@ module.exports = function(RED)
 
 				// PATCH!
 				async.retry({
-					times: 3,
+					times: 5,
 					errorFilter: function(err) {
-						return (err.status == 503);
+						return (err.status == 503 || err.status == 429);
 					},
-					interval: function(retryCount) { return retryCount*2000; }
+					interval: function(retryCount) { return 750*retryCount; }
 				},
 				function(callback, results)
 				{
@@ -196,9 +196,19 @@ module.exports = function(RED)
 
 				// RESET LAST COMMAND
 				scope.lastCommand = null;
+
+				if(done) { done(); }
 			}
 		});
+
+		//
+		// CLOSE NODE / DETACH FROM THE BRIDGE
+		this.on('close', function()
+		{
+			if(scope.unsubscribe) { scope.unsubscribe(); }
+		});
+
 	}
 
 	RED.nodes.registerType("hue-brightness", HueBrightness);
-}
+}

package/huemagic/hue-buttons.html

@@ -4,7 +4,7 @@
         <input type="text" id="node-input-name" data-i18n="[placeholder]hue-buttons.config.input-name" style="width: calc(100% - 105px)">
     </div>
     <div class="form-row">
-        <label for="node-input-bridge"><i class="fa fa-server"></i> Bridge</label>
+        <label for="node-input-bridge"><i class="fa fa-server"></i> <span data-i18n="hue-buttons.config.bridge"></span></label>
         <input type="text" id="node-input-bridge" style="width: calc(100% - 105px)">
     </div>
     <div class="form-row">
@@ -19,15 +19,21 @@
         </div>
     </div>
     <div class="form-row" style="margin-top: 30px">
-        <div style="display: inline-flex; width: calc(100% - 105px)">
-            <input type="checkbox" id="node-input-skipevents" style="flex: 15px;">
-            <span data-i18n="hue-buttons.config.skipevents-node" style="width: 100%; margin-left: 10px;"></span>
+        <div style="display: inline-flex; align-items: center; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-skipevents" style="flex: 0 0 auto; width: auto; margin: 0;">
+            <span data-i18n="hue-buttons.config.skipevents-node" style="flex: 1; margin-left: 8px;"></span>
         </div>
     </div>
     <div class="form-row">
-        <div style="display: inline-flex; width: calc(100% - 105px)">
-            <input type="checkbox" id="node-input-initevents" style="flex: 15px;">
-            <span data-i18n="hue-buttons.config.sendinitevents-node" style="width: 100%; margin-left: 10px;"></span>
+        <div style="display: inline-flex; align-items: center; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-initevents" style="flex: 0 0 auto; width: auto; margin: 0;">
+            <span data-i18n="hue-buttons.config.sendinitevents-node" style="flex: 1; margin-left: 8px;"></span>
+        </div>
+    </div>
+    <div class="form-row">
+        <div style="display: inline-flex; align-items: center; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-onlycommands" style="flex: 0 0 auto; width: auto; margin: 0;">
+            <span data-i18n="hue-buttons.config.onlycommands-node" style="flex: 1; margin-left: 8px;"></span>
         </div>
     </div>
 </script>
@@ -41,10 +47,11 @@
             bridge: { type: "hue-bridge", required: true },
             sensorid: { value:"", required: false },
             skipevents: { value: false },
-            initevents: { value: false }
+            initevents: { value: false },
+            onlycommands: { value: false }
         },
         align: 'left',
-        icon: "hue-buttons.png",
+        icon: "hue-buttons.svg",
         inputs: 1,
         outputs: 1,
         label: function() {

package/huemagic/hue-buttons.js

@@ -8,6 +8,7 @@ module.exports = function(RED)
 
 		const scope = this;
 		const bridge = RED.nodes.getNode(config.bridge);
+		const async = require('async');
 
 		// NODE UI STATUS TIMEOUT
 		this.timeout = null;
@@ -15,6 +16,14 @@ module.exports = function(RED)
 		// SAVE LAST COMMAND
 		this.lastCommand = null;
 
+		//
+		// CLOSE NODE
+		this.on('close', function()
+		{
+			if(scope.timeout !== null) { clearTimeout(scope.timeout); }
+			if(scope.unsubscribe) { scope.unsubscribe(); }
+		});
+
 		//
 		// CHECK CONFIG
 		if(bridge == null)
@@ -39,15 +48,17 @@ module.exports = function(RED)
 
 		//
 		// SUBSCRIBE TO UPDATES FROM THE BRIDGE
-		bridge.subscribe("button", config.sensorid, function(info)
+		this.unsubscribe = bridge.subscribe("button", config.sensorid, function(info)
 		{
 			let currentState = bridge.get("button", info.id);
 
 			// RESOURCE FOUND?
 			if(currentState !== false)
 			{
+				const hasEvent = (currentState.payload.button !== false || currentState.payload.rotation !== false);
+
 				// SEND MESSAGE
-				if(!config.skipevents && currentState.payload.button !== false && (config.initevents || info.suppressMessage == false))
+				if(!config.skipevents && hasEvent && (config.initevents || info.suppressMessage == false) && (!config.onlycommands || scope.lastCommand !== null))
 				{
 					// SET LAST COMMAND
 					if(scope.lastCommand !== null)
@@ -65,35 +76,47 @@ module.exports = function(RED)
 				// NOT IN UNIVERAL MODE? -> CHANGE UI STATES
 				if(config.sensorid)
 				{
-					if(currentState.payload.button === false)
+					if(!hasEvent)
 					{
 						scope.status({fill: "grey", shape: "dot", text: "hue-buttons.node.waiting"});
 					}
 					else
 					{
-						var action = "";
-						switch (currentState.payload.action)
+						var statusText = "";
+
+						if(currentState.payload.button === false)
 						{
-						  case "initial_press":
-						    action = "(pressed)";
-						    break;
-						  case "repeat":
-						    action = "(repeated)";
-						    break;
-						  case "short_release":
-						    action = "(short press)";
-						    break;
-						  case "long_release":
-						    action = "(long press)";
-						    break;
-						  case "double_short_release":
-						  	action = "(double pressed)";
-						  	break;
-						  default:
-						    action = "(pressed)";
+							const rotation = currentState.payload.rotation;
+							statusText = RED._(rotation.clockwise ? "hue-buttons.node.dial-clockwise" : "hue-buttons.node.dial-counterclockwise", { degrees: rotation.degrees });
 						}
+						else
+						{
+							var action = "";
+							switch (currentState.payload.action)
+							{
+							  case "repeat":
+							    action = "action-repeated";
+							    break;
+							  case "short_release":
+							    action = "action-shortreleased";
+							    break;
+							  case "long_press":
+							    action = "action-holded";
+							    break;
+							  case "long_release":
+							    action = "action-longreleased";
+							    break;
+							  case "double_short_release":
+							  	action = "action-doublepressed";
+							  	break;
+							  default:
+							    action = "action-pressed";
+							}
 
-						scope.status({fill: "blue", shape: "dot", text: "Button #"+ currentState.payload.button + " " + action });
+							statusText = RED._("hue-buttons.node.button-status", { button: currentState.payload.button, action: RED._("hue-buttons.node." + action) });
+						}
+
+						scope.status({fill: "blue", shape: "dot", text: statusText });
 
 						// RESET TO WAITING AFTER 3 SECONDS
 						if(scope.timeout !== null) { clearTimeout(scope.timeout); };
@@ -102,9 +125,12 @@ module.exports = function(RED)
 							scope.status({fill: "grey", shape: "dot", text: "hue-buttons.node.waiting"});
 
 							// REMOVE OLD BUTTON STATES
-							for (const [oneButtonID, oneButton] of Object.entries(bridge.resources[config.sensorid]["services"]["button"]))
+							const buttons = (bridge.resources[config.sensorid] && bridge.resources[config.sensorid]["services"]) ? bridge.resources[config.sensorid]["services"]["button"] : false;
+							if(!buttons) { return false; }
+
+							for (const [oneButtonID, oneButton] of Object.entries(buttons))
 							{
-								delete bridge.resources[config.sensorid]["services"]["button"][oneButtonID]["button"];
+								delete buttons[oneButtonID]["button"];
 							}
 						}, 3000);
 					}
@@ -127,14 +153,14 @@ module.exports = function(RED)
 			const tempSensorID = (!config.sensorid && typeof msg.topic != 'undefined' && bridge.validResourceID.test(msg.topic) === true) ? msg.topic : config.sensorid;
 			if(!tempSensorID)
 			{
-				scope.error("Please submit a valid button ID.");
+				scope.error(RED._("hue-buttons.node.error-no-id"), msg);
 				return false;
 			}
 
 			let currentState = bridge.get("button", tempSensorID);
 			if(!currentState)
 			{
-				scope.error("The button/switch in not yet available. Please wait until HueMagic has established a connection with the bridge or check whether the resource ID in the configuration is valid.");
+				scope.error(RED._("hue-buttons.node.error-not-available"), msg);
 				return false;
 			}
 
@@ -156,6 +182,43 @@ module.exports = function(RED)
 				if(done) { done(); }
 				return true;
 			}
+
+			// SWITCH BETWEEN ROCKER AND PUSHBUTTON MODE (WALL SWITCH MODULE)
+			if(typeof msg.payload != 'undefined' && typeof msg.payload.switchMode != 'undefined')
+			{
+				if(!currentState.info.switchModes)
+                {
+					scope.error(RED._("hue-buttons.node.error-no-switchmode"), msg);
+					return false;
+				}
+
+				if(currentState.info.switchModes.indexOf(msg.payload.switchMode) === -1)
+				{
+					scope.error(RED._("hue-buttons.node.error-invalid-switchmode", { modes: currentState.info.switchModes.join(", ") }), msg);
+					return false;
+				}
+
+				async.retry({
+					times: 5,
+					errorFilter: function(err) {
+						return (err.status == 503 || err.status == 429);
+					},
+					interval: function(retryCount) { return 750*retryCount; }
+				},
+				function(callback, results)
+				{
+					bridge.patch("switch_input_configuration", tempSensorID, { switch_mode: { mode: msg.payload.switchMode } })
+					.then(function() { callback(null, true); })
+					.catch(function(errors) { callback(errors, null); });
+				},
+				function(errors, success)
+				{
+					if(errors) { scope.error(errors, msg); }
+					else if(done) { done(); }
+				});
+
+				return true;
+			}
 		});
 	}