node-red-contrib-huemagic 4.0.4 → 4.2.0

package/huemagic/hue-motion.js

@@ -8,6 +8,7 @@ module.exports = function(RED)
 
 		const scope = this;
 		const bridge = RED.nodes.getNode(config.bridge);
+		const async = require('async');
 
 		// SAVE LAST COMMAND
 		this.lastCommand = null;
@@ -108,6 +109,11 @@ module.exports = function(RED)
 			}
 
 			let currentState = bridge.get("motion", tempSensorID);
+			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.");
+				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") )
@@ -146,9 +152,30 @@ module.exports = function(RED)
 				}
 
 				// PATCH!
-				bridge.patch("motion", tempSensorID, patchObject)
-				.then(function() { if(done) { done(); }})
-				.catch(function(errors) { scope.error(errors);  });
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
+				{
+					bridge.patch("motion", tempSensorID, patchObject)
+					.then(function() { if(done) { callback(null, true); })
+					.catch(function(errors) { callback(errors, null); });
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
+					}
+					else if(done)
+					{
+						done();
+					}
+				});
 			}
 			else
 			{

package/huemagic/hue-rules.html

@@ -81,6 +81,19 @@
                 buttonIcon.removeClass("fa-pencil");
                 buttonIcon.addClass("fa-search");
             }
+            
+            function sortResourcesBy(prop, resources)
+            {
+                return resources.sort((a, b) => {
+                    if ( a[prop] < b[prop] ){
+                        return -1;
+                    }
+                    if ( a[prop] > b[prop] ){
+                        return 1;
+                    }
+                    return 0;
+                });
+            }
 
             function searchAndSelect()
             {
@@ -98,6 +111,7 @@
                 $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "rule" })
                 .done( function(data) {
                     var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
                     if(allResources.length <= 0)
                     {
                         notification.close();
@@ -187,4 +201,4 @@
             }
         }
     });
-</script>
+</script>

package/huemagic/hue-rules.js

@@ -8,6 +8,7 @@ module.exports = function(RED)
 
 		const scope = this;
 		const bridge = RED.nodes.getNode(config.bridge);
+		const async = require('async');
 
 		// SAVE LAST COMMAND
 		this.lastCommand = null;
@@ -98,6 +99,11 @@ module.exports = function(RED)
 			}
 
 			let currentState = bridge.get("rule", "rule_" + tempRuleID);
+			if(!currentState)
+			{
+				scope.error("The rule 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.");
+				return false;
+			}
 
 			// CONTROL RULE
 			if(msg.payload === true || msg.payload === false)
@@ -106,12 +112,30 @@ module.exports = function(RED)
 				patchObject["status"] = (msg.payload == true) ? 'enabled' : 'disabled';
 
 				// PATCH!
-				bridge.patch("rules", "/rules/"+tempRuleID, patchObject, 1)
-				.then(function(response) { bridge.refetchRule(tempRuleID); })
-				.catch(function(errors) { scope.error(errors);  });
-
-				// DONE?
-				if(done) { done(); }
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
+				{
+					bridge.patch("rules", "/rules/"+tempRuleID, patchObject, 1)
+					.then(function(response) { bridge.refetchRule(tempRuleID); callback(null, true); })
+					.catch(function(errors) { callback(errors, null); });
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
+					}
+					else if(done)
+					{
+						done();
+					}
+				});
 			}
 			else
 			{

package/huemagic/hue-scene.html

@@ -67,6 +67,19 @@
                 buttonIcon.removeClass("fa-pencil");
                 buttonIcon.addClass("fa-search");
             }
+            
+            function sortResourcesBy(prop, resources)
+            {
+                return resources.sort((a, b) => {
+                    if ( a[prop] < b[prop] ){
+                        return -1;
+                    }
+                    if ( a[prop] > b[prop] ){
+                        return 1;
+                    }
+                    return 0;
+                });
+            }
 
             function searchAndSelectScenes()
             {
@@ -84,6 +97,7 @@
                 $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "scene" })
                 .done( function(data) {
                     var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
                     if(allResources.length <= 0)
                     {
                         notification.close();
@@ -167,4 +181,4 @@
             }
         }
     });
-</script>
+</script>

package/huemagic/hue-scene.js

@@ -8,6 +8,7 @@ module.exports = function(RED)
 
 		const scope = this;
 		const bridge = RED.nodes.getNode(config.bridge);
+		const async = require('async');
 
 		// GET TARGET WIRED GROUPS
 		this.targetGroups = {};
@@ -72,9 +73,32 @@ module.exports = function(RED)
 
 					if(targetGroup)
 					{
-						bridge.patch("group", targetGroup.info.idV1 + "/action", { "scene": targetSceneID }, 1)
-						.catch(function(errors) {
-							scope.error(errors);
+						// PATCH!
+						async.retry({
+							times: 3,
+							errorFilter: function(err) {
+								return (err.status == 503);
+							},
+							interval: function(retryCount) { return retryCount*2000; }
+						},
+						function(callback, results)
+						{
+							bridge.patch("group", targetGroup.info.idV1 + "/action", { "scene": targetSceneID }, 1)
+							.then(function() { callback(null, true); })
+							.catch(function(errors) {
+								callback(errors, null);
+							});
+						},
+						function(errors, success)
+						{
+							if(errors)
+							{
+								scope.error(errors);
+							}
+							else if(done)
+							{
+								done();
+							}
 						});
 					}
 				}
@@ -87,27 +111,49 @@ module.exports = function(RED)
 			else
 			{
 				// RECALL SCENE
-				patchObject["recall"] = { status: "active" };
+				patchObject["recall"] = { action: "active" };
 
 				// CHANGE NODE UI STATE
 				scope.status({fill: "grey", shape: "ring", text: "hue-scene.node.command"});
 
 				// PATCH!
-				bridge.patch("scene", sceneDef, patchObject)
-				.then(function()
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
 				{
-					scope.status({fill: "blue", shape: "dot", text: "hue-scene.node.recalled"});
-					if(done) { done(); }
-
-					// RESET STATUS AFTER 1 SECOND
-					setTimeout(function() {
-						scope.status({});
-					}, 1000);
-				})
-				.catch(function(errors) { scope.error(errors);  });
+					bridge.patch("scene", sceneDef, patchObject)
+					.then(function()
+					{
+						scope.status({fill: "blue", shape: "dot", text: "hue-scene.node.recalled"});
+
+						// RESET STATUS AFTER 1 SECOND
+						setTimeout(function() {
+							scope.status({});
+						}, 1000);
+
+						callback(null, true);
+					})
+					.catch(function(errors) { callback(errors, null); });
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
+					}
+					else if(done)
+					{
+						done();
+					}
+				});
 			}
 		});
 	}
 
 	RED.nodes.registerType("hue-scene", HueScene);
-}
+}

package/huemagic/hue-temperature.html

@@ -81,6 +81,19 @@
                 buttonIcon.removeClass("fa-pencil");
                 buttonIcon.addClass("fa-search");
             }
+            
+            function sortResourcesBy(prop, resources)
+            {
+                return resources.sort((a, b) => {
+                    if ( a[prop] < b[prop] ){
+                        return -1;
+                    }
+                    if ( a[prop] > b[prop] ){
+                        return 1;
+                    }
+                    return 0;
+                });
+            }
 
             function searchAndSelect()
             {
@@ -98,6 +111,7 @@
                 $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "temperature" })
                 .done( function(data) {
                     var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
                     if(allResources.length <= 0)
                     {
                         notification.close();
@@ -194,4 +208,4 @@
             }
         }
     });
-</script>
+</script>

package/huemagic/hue-temperature.js

@@ -8,6 +8,7 @@ module.exports = function(RED)
 
 		const scope = this;
 		const bridge = RED.nodes.getNode(config.bridge);
+		const async = require('async');
 
 		// SAVE LAST COMMAND
 		this.lastCommand = null;
@@ -116,6 +117,11 @@ module.exports = function(RED)
 			}
 
 			let currentState = bridge.get("temperature", tempSensorID);
+			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.");
+				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") )
@@ -154,9 +160,30 @@ module.exports = function(RED)
 				}
 
 				// PATCH!
-				bridge.patch("temperature", tempSensorID, patchObject)
-				.then(function() { if(done) { done(); }})
-				.catch(function(errors) { scope.error(errors);  });
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
+				{
+					bridge.patch("temperature", tempSensorID, patchObject)
+					.then(function() { callback(null, true); })
+					.catch(function(errors) { callback(errors, null); });
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
+					}
+					else if(done)
+					{
+						done();
+					}
+				});
 			}
 			else
 			{

package/huemagic/locales/de/hue-bridge-config.html

@@ -13,6 +13,14 @@ Geben Sie die Hue Bridge-IP-Adresse manuell ein oder drücken Sie den Button, um
 
 Geben Sie den Hue Bridge API-Schlüssel manuell ein oder drücken Sie den Button, um einen neuen Schlüssel zu erstellen. Wenn Sie einen neuen Schlüssel erstellen möchten, müssen Sie innerhalb des Zeitfensters von 20 Sekunden den physischen Button der Bridge betätigen, um den Prozess abzuschließen.
 
+### Worker
+
+Der „Worker“-Wert bestimmt die Anzahl der parallelen Befehle, die HueMagic an die Bridge gleichzeitig schicken darf. Laut offizieller Dokumentation der Philips Hue Bridge, sollten nicht mehr als 10 Befehle pro Sekunde abgeschickt werden, da sonst die Gefahr besteht, dass die Bridge die Anfragen nicht so schnell verarbeiten kann und Fehler auswirft.
+
+Wenn mehr Befehle gleichzeitig abgeschickt werden als der hier gesetzte Wert, wird HueMagic die Befehle nacheinander ausführen, sobald der Durchsatz wieder möglich ist.
+
+Setzen Sie hier einen Wert unter 10 (z. B. 4 bis 7), wenn Sie auch außerhalb von HueMagic Befehle an die Bridge senden, um den von Philips Hue empfohlenen Durchsatz an Befehlen / Sekunde einzuhalten.
+
 ### Automatische Firmware-Updates
 
 HueMagic prüft periodisch nach verfügbaren Philips Hue Firmware Updates und installiert sie automatisch, wenn sie verfügbar sind. Sie können dieses Verhalten deaktivieren, indem Sie die entsprechende Checkbox anklicken.

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-bridge-config.html

@@ -13,6 +13,14 @@ Enter the Hue Bridge IP address manually or press the button to call up all loca
 
 Enter the Hue Bridge API key manually or press the button to create a new key. If you want to create a new key, you have to press the physical button of the bridge within the time window of 20 seconds to complete the process.
 
+### Worker
+
+The "Worker" value determines the number of parallel commands that HueMagic is allowed to send to the bridge at the same time. According to the official documentation of the Philips Hue bridge, no more than 10 commands should be sent per second, otherwise there is a risk that the bridge will not be able to process the requests as quickly and will throw errors.
+
+If more commands are sent at the same time than the value set here, HueMagic will execute the commands in sequence as soon as throughput is possible again.
+
+Set this to a value below 10 (e.g. 4 to 7) if you also send commands to the bridge outside of HueMagic in order to comply with the Philips Hue recommended throughput of commands/second.
+
 ### Automatic firmware updates
 
 HueMagic periodically checks for available Philips Hue firmware updates and automatically installs them when they are available. You can deactivate this behavior by clicking the corresponding checkbox.

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

@@ -79,7 +79,7 @@ If the "fetch" command has been used on the node, the bridge outputs the corresp
 
 #### Global status messages under `msg.updated` (optional)
 
-Unless deactivated, the node outputs an updated status message for each resource on the bridge. The status message under * msg.updated * follows the pattern of the respective resource and varies depending on the type of device that was last updated.
+Unless deactivated, the node outputs an updated status message for each resource on the bridge. The status message under `msg.updated` follows the pattern of the respective resource and varies depending on the type of device that was last updated.
 
 #### Last command under `msg.command` (optional)
 

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/locales/en-US/hue-light.html

@@ -38,7 +38,7 @@ In addition to simply switching it on and off, there are also many other options
 : gradient (object {hex […]}): An object with a supported color object (e.g. `hex`,` rgb`, ...) and several colors to set a gradient to supported lights
 : mixColor (object): A color to be mixed with the current light color. Can accept `color`, `hex`, `rgb` or `xyColor` objects and optionally `amount` (int) to indicate the mixing ratio in percent
 : image (string): Path of an image (local or on the web) to set the current color of the light to the average color of the image
-: saturation (int): percentage of the saturation of the current color (beta)
+: saturation (int): Percentage of the saturation of the current color (beta)
 : colorTemp (int | string): Value between 153 and 500 to set the color temperature of the light or the values `cold`, `normal`, `warm`, `hot` and `auto` - where `auto` is the color temperature based on the current time
 : incrementColorTemp (int | boolean): Value by how much the color temperature should be warmer or `true` to make the color temperature warmer in steps of 50
 : decrementColorTemp (int | boolean): Value by how much the color temperature should be colder or `true` to make the color temperature colder in steps of 50

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

@@ -13,7 +13,7 @@ To play or stop an animation, pass an object with the following content to the n
 
 : payload (boolean): `true`, starts the animation, `false`, stops the animation
 
-### Own animations
+### Custom animations
 
 If you pass your own animation to the node, the preselected, pre-defined animation (if set) will be temporarily replaced by yours. Own HueMagic animations are a sequence of commands that have been combined in an array. Each array element forms a step - whereby a step can also consist of several frames (transition effects).
 

package/huemagic/utils/api.js

@@ -90,14 +90,7 @@ function API()
 			{
 				if(version === 2)
 				{
-					if(response.data.errors.length > 0)
-					{
-						reject(response.data.errors);
-					}
-					else
-					{
-						resolve(response.data.data);
-					}
+					resolve(response.data.data);
 				}
 				else if(version === 1)
 				{
@@ -106,7 +99,7 @@ function API()
 			})
 			.catch(function(error)
 			{
-				reject(error);
+				reject({ status: error.response.status, errors: error.response.data.errors ? error.response.data.errors : error.response.data});
 			});
 		});
 	}
@@ -154,7 +147,7 @@ function API()
 				// ERROR? -> RETRY?
 				scope.events[config.id].onerror = function(error)
 				{
-					console.log("HueMagic:", "Connection to bridge lost. Trying to reconnect again in 30 seconds…", err);
+					console.log("HueMagic:", "Connection to bridge lost. Trying to reconnect again in 30 seconds…", error);
 					setTimeout(function(){ scope.subscribe(config, callback); }, 30000);
 					resolve(true);
 				}