node-red-contrib-huemagic 4.0.4 → 4.2.0

package/huemagic/hue-group.js

@@ -8,6 +8,7 @@ module.exports = function(RED)
 
 		const scope = this;
 		const bridge = RED.nodes.getNode(config.bridge);
+		const async = require('async');
 
 		// EXPORT CONFIG
 		this.exportedConfig = config;
@@ -110,6 +111,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 until HueMagic has established a connection with the bridge or check whether the resource ID in the configuration is valid.");
+				return false;
+			}
 
 			// CHECK IF LIGHT ID IS SET
 			if(!tempGroupID)
@@ -153,18 +159,41 @@ module.exports = function(RED)
 					"bri": msg.payload.brightness ? Math.round((254/100)*msg.payload.brightness) : 254
 				};
 
-				bridge.patch("group", currentState.info.idV1 + "/action", patchObject, 1)
-				.then(function(status) {
-					// RESET COLORLOOP ANIMATION AFTER X SECONDS
-					setTimeout(function()
-					{
-						bridge.patch("group", currentState.info.idV1 + "/action", { "effect": "none" }, 1)
-						.then(function() { if(done) { done(); }});
-					}, parseInt(msg.payload.colorloop) * 1000);
-				})
-				.catch(function(errors) {
-					scope.error(errors);
-					scope.status({fill: "red", shape: "ring", text: "hue-group.node.error-input"});
+				// PATCH!
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
+				{
+					bridge.patch("group", currentState.info.idV1 + "/action", patchObject, 1)
+					.then(function(status) {
+						// RESET COLORLOOP ANIMATION AFTER X SECONDS
+						setTimeout(function()
+						{
+							bridge.patch("group", currentState.info.idV1 + "/action", { "effect": "none" }, 1)
+							.then(function() { if(done) { done(); }});
+						}, parseInt(msg.payload.colorloop) * 1000);
+						callback(null, true);
+					})
+					.catch(function(errors) {
+						callback(errors, null);
+					});
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
+						scope.status({fill: "red", shape: "ring", text: "hue-group.node.error-input"});
+					}
+					else if(done)
+					{
+						done();
+					}
 				});
 
 				return false;
@@ -235,42 +264,65 @@ module.exports = function(RED)
 				// SET ALERT EFFECT
 				patchObject["alert"] = "lselect";
 
-				// 1. TURN ON THE LIGHT BULB
-				bridge.patch("group", currentState.info.idV1 + "/action", patchObject, 1)
-				.then(function(status) {
-					setTimeout(function()
+				// PATCH!
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
+				{
+					// 1. TURN ON THE LIGHT BULB
+					bridge.patch("group", currentState.info.idV1 + "/action", patchObject, 1)
+					.then(function(status)
 					{
-						const tempPreviousState = scope.context().get('groupPreviousState');
-						var tempPreviousStatePatch = {};
-
-						tempPreviousStatePatch.dimming = { brightness: tempPreviousState.payload.brightness };
-						if(tempPreviousState.payload.xyColor)
-						{
-							tempPreviousStatePatch.xy = [tempPreviousState.payload.xyColor.x, tempPreviousState.payload.xyColor.y];
-						}
-						else if(tempPreviousState.payload.colorTemp)
+						setTimeout(function()
 						{
-							tempPreviousStatePatch.ct = tempPreviousState.payload.colorTemp;
-						}
+							const tempPreviousState = scope.context().get('groupPreviousState');
+							var tempPreviousStatePatch = {};
 
-						bridge.patch("group", currentState.info.idV1 + "/action", tempPreviousStatePatch, 1)
-						.then(function(status)
-						{
-							return bridge.patch("group", currentState.info.idV1 + "/action", { on: false }, 1);
-						})
-						.then(function(status) {
-							if(done) { done(); }
-							if(tempPreviousState.payload.on === true)
+							tempPreviousStatePatch.dimming = { brightness: tempPreviousState.payload.brightness };
+							if(tempPreviousState.payload.xyColor)
 							{
-								bridge.patch("group", currentState.info.idV1, { on: true }, 1);
+								tempPreviousStatePatch.xy = [tempPreviousState.payload.xyColor.x, tempPreviousState.payload.xyColor.y];
 							}
-						});
-					}, parseInt(msg.payload.alert) * 1000);
-				})
-				.catch(function(errors) {
-					scope.error(errors);
-					scope.status({fill: "red", shape: "ring", text: "hue-group.node.error-input"});
-					if(done) { done(error); }
+							else if(tempPreviousState.payload.colorTemp)
+							{
+								tempPreviousStatePatch.ct = tempPreviousState.payload.colorTemp;
+							}
+
+							bridge.patch("group", currentState.info.idV1 + "/action", tempPreviousStatePatch, 1)
+							.then(function(status)
+							{
+								return bridge.patch("group", currentState.info.idV1 + "/action", { on: false }, 1);
+							})
+							.then(function(status) {
+								if(tempPreviousState.payload.on === true)
+								{
+									bridge.patch("group", currentState.info.idV1, { on: true }, 1);
+								}
+							});
+						}, parseInt(msg.payload.alert) * 1000);
+
+						callback(null, true);
+					})
+					.catch(function(errors) {
+						callback(errors, null);
+					});
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
+						scope.status({fill: "red", shape: "ring", text: "hue-group.node.error-input"});
+					}
+					else if(done)
+					{
+						done();
+					}
 				});
 			}
 			// ANIMATION STARTED?
@@ -295,19 +347,44 @@ module.exports = function(RED)
 					tempPreviousStatePatch.ct = tempPreviousState.payload.colorTemp;
 				}
 
-				bridge.patch("light", currentState.info.lightIds[l], tempPreviousStatePatch).
-				then(function(status)
+				// PATCH!
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
 				{
-					if(tempPreviousState.payload.on === false)
+					bridge.patch("light", currentState.info.lightIds[l], tempPreviousStatePatch).
+					then(function(status)
 					{
-						bridge.patch("light", currentState.info.lightIds[l], { on: { on: false } })
+						if(tempPreviousState.payload.on === false)
+						{
+							bridge.patch("light", currentState.info.lightIds[l], { on: { on: false } })
+							.then(function() { callback(null, true); });
+						}
+						else
+						{
+							bridge.patch("light", currentState.info.lightIds[l], { on: { on: false } })
+							.then(function(status) {
+								callback(null, true);
+								return bridge.patch("light", currentState.info.lightIds[l], { on: { on: true } });
+							});
+						}
+					})
+					.catch(function(errors) { callback(errors, null); });
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
 					}
-					else
+					else if(done)
 					{
-						bridge.patch("light", currentState.info.lightIds[l], { on: { on: false } })
-						.then(function(status) {
-							return bridge.patch("light", currentState.info.lightIds[l], { on: { on: true } })
-						});
+						done();
 					}
 				});
 			}
@@ -511,9 +588,30 @@ module.exports = function(RED)
 					}
 
 					// PATCH!
-					bridge.patch("group", currentState.info.idV1 + "/action", patchObject, 1)
-					.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("group", currentState.info.idV1 + "/action", patchObject, 1)
+						.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/hue-light.html

@@ -88,6 +88,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()
             {
@@ -105,6 +118,7 @@
                 $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "light" })
                 .done( function(data) {
                     var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
                     if(allResources.length <= 0)
                     {
                         notification.close();
@@ -201,4 +215,4 @@
             }
         }
     });
-</script>
+</script>

package/huemagic/hue-light.js

@@ -8,6 +8,7 @@ module.exports = function(RED)
 
 		const scope = this;
 		const bridge = RED.nodes.getNode(config.bridge);
+		const async = require('async');
 
 		// SAVE FUTURE PATCH
 		this.futurePatchState = {};
@@ -123,6 +124,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 until HueMagic has established a connection with the bridge or check whether the resource ID in the configuration is valid.");
+				return false;
+			}
 
 			// CHECK IF LIGHT ID IS SET
 			if(!tempLightID)
@@ -166,18 +172,43 @@ module.exports = function(RED)
 					"bri": msg.payload.brightness ? Math.round((254/100)*msg.payload.brightness) : currentState.brightnessLevel
 				};
 
-				bridge.patch("light", currentState.info.idV1 + "/state", patchObject, 1)
-				.then(function(status) {
-					// RESET COLORLOOP ANIMATION AFTER X SECONDS
-					setTimeout(function()
-					{
-						bridge.patch("light", currentState.info.idV1 + "/state", { "effect": "none" }, 1);
-						if(done) { done(); }
-					}, parseInt(msg.payload.colorloop) * 1000);
-				})
-				.catch(function(errors) {
-					scope.error(errors);
-					scope.status({fill: "red", shape: "ring", text: "hue-light.node.error-input"});
+				// PATCH!
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
+				{
+					bridge.patch("light", currentState.info.idV1 + "/state", patchObject, 1)
+					.then(function(status)
+					{
+						// RESET COLORLOOP ANIMATION AFTER X SECONDS
+						setTimeout(function()
+						{
+							bridge.patch("light", currentState.info.idV1 + "/state", { "effect": "none" }, 1);
+						}, parseInt(msg.payload.colorloop) * 1000);
+
+						callback(null, true);
+					})
+					.catch(function(errors)
+					{
+						callback(errors, null);
+					});
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
+						scope.status({fill: "red", shape: "ring", text: "hue-light.node.error-input"});
+					}
+					else if(done)
+					{
+						done();
+					}
 				});
 
 				return false;
@@ -256,48 +287,72 @@ module.exports = function(RED)
 					scope.status({fill: "grey", shape: "ring", text: "hue-light.node.command"});
 				}
 
-				// 1. TURN ON THE LIGHT BULB
-				bridge.patch("light", tempLightID, patchObject)
-				.then(function(status) {
-					// 2. APPLY ALERT EFFECT
-					const alertEffect = { alert: { action: "breathe" }};
-					return bridge.patch("light", tempLightID, alertEffect);
-				})
-				.then(function(status) {
-					// 3. RESET PREVIOUS STATE (AFTER X SECONDS)
-					setTimeout(function()
-					{
-						const tempPreviousState = scope.context().get('lightPreviousState');
-						var tempPreviousStatePatch = {};
-
-						tempPreviousStatePatch.dimming = { brightness: tempPreviousState.payload.brightness };
-						if(tempPreviousState.payload.xyColor)
-						{
-							tempPreviousStatePatch.color = { xy: tempPreviousState.payload.xyColor };
-						}
-						else if(tempPreviousState.payload.colorTemp)
-						{
-							tempPreviousStatePatch.color_temperature = { mirek: tempPreviousState.payload.colorTemp };
-						}
 
-						bridge.patch("light", tempLightID, tempPreviousStatePatch).
-						then(function(status)
+				// APPLY THE EFFECT
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
+				{
+					// 1. TURN ON THE LIGHT BULB
+					bridge.patch("light", tempLightID, patchObject)
+					.then(function(status) {
+						// 2. APPLY ALERT EFFECT
+						const alertEffect = { alert: { action: "breathe" }};
+						return bridge.patch("light", tempLightID, alertEffect);
+					})
+					.then(function(status) {
+						// 3. RESET PREVIOUS STATE (AFTER X SECONDS)
+						setTimeout(function()
 						{
-							return bridge.patch("light", tempLightID, { on: { on: false } })
-							.then(function() { if(done) { done(); }});
-						})
-						.then(function(status) {
-							if(tempPreviousState.payload.on === true)
+							const tempPreviousState = scope.context().get('lightPreviousState');
+							var tempPreviousStatePatch = {};
+
+							tempPreviousStatePatch.dimming = { brightness: tempPreviousState.payload.brightness };
+							if(tempPreviousState.payload.xyColor)
 							{
-								bridge.patch("light", tempLightID, { on: { on: true } })
-								.then(function() { if(done) { done(); }});
+								tempPreviousStatePatch.color = { xy: tempPreviousState.payload.xyColor };
 							}
-						});
-					}, parseInt(msg.payload.alert) * 1000);
-				})
-				.catch(function(errors) {
-					scope.error(errors);
-					scope.status({fill: "red", shape: "ring", text: "hue-light.node.error-input"});
+							else if(tempPreviousState.payload.colorTemp)
+							{
+								tempPreviousStatePatch.color_temperature = { mirek: tempPreviousState.payload.colorTemp };
+							}
+
+							bridge.patch("light", tempLightID, tempPreviousStatePatch).
+							then(function(status)
+							{
+								return bridge.patch("light", tempLightID, { on: { on: false } })
+								.then(function() { if(done) { done(); }});
+							})
+							.then(function(status) {
+								if(tempPreviousState.payload.on === true)
+								{
+									bridge.patch("light", tempLightID, { on: { on: true } })
+									.then(function() { if(done) { done(); }});
+								}
+							});
+						}, parseInt(msg.payload.alert) * 1000);
+						callback(null, true);
+					})
+					.catch(function(errors) {
+						callback(errors, null);
+					});
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
+						scope.status({fill: "red", shape: "ring", text: "hue-light.node.error-input"});
+					}
+					else if(done)
+					{
+						done();
+					}
 				});
 			}
 			// ANIMATION STARTED?
@@ -322,21 +377,44 @@ module.exports = function(RED)
 					tempPreviousStatePatch.color_temperature = { mirek: tempPreviousState.payload.colorTemp };
 				}
 
-				bridge.patch("light", tempLightID, tempPreviousStatePatch).
-				then(function(status)
+				// PATCH!
+				async.retry({
+					times: 3,
+					errorFilter: function(err) {
+						return (err.status == 503);
+					},
+					interval: function(retryCount) { return retryCount*2000; }
+				},
+				function(callback, results)
 				{
-					if(tempPreviousState.payload.on === false)
+					bridge.patch("light", tempLightID, tempPreviousStatePatch)
+					.then(function(status)
 					{
-						bridge.patch("light", tempLightID, { on: { on: false } })
-						.then(function() { if(done) { done(); }});
+						if(tempPreviousState.payload.on === false)
+						{
+							bridge.patch("light", tempLightID, { on: { on: false } })
+							.then(function() { callback(null, true); });
+						}
+						else
+						{
+							bridge.patch("light", tempLightID, { on: { on: false } })
+							.then(function(status) {
+								callback(null, true);
+								return bridge.patch("light", tempLightID, { on: { on: true } });
+							});
+						}
+					})
+					.catch(function(errors) { callback(errors, null); });
+				},
+				function(errors, success)
+				{
+					if(errors)
+					{
+						scope.error(errors);
 					}
-					else
+					else if(done)
 					{
-						bridge.patch("light", tempLightID, { on: { on: false } })
-						.then(function(status) {
-							if(done) { done(); }
-							return bridge.patch("light", tempLightID, { on: { on: true } })
-						});
+						done();
 					}
 				});
 			}
@@ -608,16 +686,42 @@ module.exports = function(RED)
 				}
 
 				// SET DOMINANT COLORS FROM IMAGE
-				if(typeof msg.payload != 'undefined' && typeof msg.payload.image != 'undefined' && typeof currentState.payload.xyColor != 'undefined')
+				if(typeof msg.payload != 'undefined' && typeof msg.payload.image != 'undefined' && (typeof currentState.payload.xyColor != 'undefined' || typeof currentState.payload.gradient != 'undefined'))
 				{
-					var colors = await colorUtils.getColors(msg.payload.image);
+					let colors = await colorUtils.getColors(msg.payload.image);
 					if(colors.length > 0)
 					{
-						var colorsHEX = colors.map(color => color.hex());
-						let rgbFromHex = colorUtils.hexRgb(colorsHEX[0]);
-						patchObject["color"] = {
-							xy: colorUtils.rgbToXy(rgbFromHex[0], rgbFromHex[1], rgbFromHex[2], currentState.info.model.colorGamut)
-						};
+						let colorsHEX = colors.map(color => color.hex());
+
+						// SET MULTIPLE COLORS ON SUPPORTED LIGHTS
+						if(typeof currentState.payload.gradient != 'undefined')
+						{
+							let XYColorSet = [];
+
+							for (var i = 0; i < currentState.payload.gradient.totalColors; i++)
+							{
+								if(typeof colorsHEX[i] != 'undefined')
+								{
+									let rgbFromHex = colorUtils.hexRgb(colorsHEX[i]);
+									XYColorSet.push({
+										color: { xy: colorUtils.rgbToXy(rgbFromHex[0], rgbFromHex[1], rgbFromHex[2], currentState.info.model.colorGamut) }
+									});
+								}
+							}
+
+							if(XYColorSet.length > 0)
+							{
+								patchObject["gradient"] = { points: XYColorSet };
+							}
+						}
+						// SET SINGLE COLOR
+						else
+						{
+							let rgbFromHex = colorUtils.hexRgb(colorsHEX[0]);
+							patchObject["color"] = {
+								xy: colorUtils.rgbToXy(rgbFromHex[0], rgbFromHex[1], rgbFromHex[2], currentState.info.model.colorGamut)
+							};
+						}
 					}
 				}
 
@@ -713,9 +817,30 @@ module.exports = function(RED)
 					}
 
 					// PATCH!
-					bridge.patch("light", tempLightID, 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("light", tempLightID, 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/hue-motion.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: "motion" })
                 .done( function(data) {
                     var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
                     if(allResources.length <= 0)
                     {
                         notification.close();
@@ -194,4 +208,4 @@
             }
         }
     });
-</script>
+</script>