node-red-contrib-huemagic 4.0.2 → 4.1.0

package/huemagic/hue-bridge.js

@@ -79,11 +79,11 @@ module.exports = function(RED)
 
 		//
 		// SUBSCRIBE TO UPDATES FROM THE BRIDGE
-		bridge.subscribe("bridge", "globalRessourceUpdates", async function(info)
+		bridge.subscribe("bridge", "globalResourceUpdates", async function(info)
 		{
 			let currentState = bridge.get(info.updatedType, info.id);
 
-			// RESSOURCE FOUND?
+			// RESOURCE FOUND?
 			if(currentState !== false)
 			{
 				// UPDATE COUNTER
@@ -138,7 +138,7 @@ module.exports = function(RED)
 			done = done || function() { scope.done.apply(scope,arguments); }
 
 			// SET LAST COMMAND
-			scope.lastCommand = msg;
+			scope.lastCommand = RED.util.cloneMessage(msg);
 
 			// GET BRIDGE INFORMATION
 			scope.getBridgeInformation()
@@ -171,7 +171,7 @@ module.exports = function(RED)
 						if(done) { done(error); }
 					});
 				}
-				// FETCH RESSOURCES
+				// FETCH RESOURCES
 				else if(typeof msg.payload != 'undefined' && typeof msg.payload.fetch != 'undefined')
 				{
 					let fetchTypes = [];
@@ -179,7 +179,7 @@ module.exports = function(RED)
 					else if(typeof msg.payload.fetch == 'object') { fetchTypes = msg.payload.fetch; }
 					else { return false; }
 
-					scope.status({fill: "blue", shape: "dot", text: "hue-bridge.node.f-ressources" });
+					scope.status({fill: "blue", shape: "dot", text: "hue-bridge.node.f-resources" });
 
 					// FETCH
 					bridgeInformation.results = {};

package/huemagic/hue-brightness.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()
             {
@@ -95,10 +108,11 @@
                 var notification = RED.notify(scope._("hue-brightness.config.searching"), { type: "compact", modal: true, fixed: true });
 
                 // GET THE SENSORS
-                $.get('hue/ressources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "motion" })
+                $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "motion" })
                 .done( function(data) {
-                    var allRessources = JSON.parse(data);
-                    if(allRessources.length <= 0)
+                    var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
+                    if(allResources.length <= 0)
                     {
                         notification.close();
                         RED.notify(scope._("hue-brightness.config.none-found"), { type: "light_level" });
@@ -106,15 +120,15 @@
                     }
 
                     // SET OPTIONS
-                    allRessources.forEach(function(ressource)
+                    allResources.forEach(function(resource)
                     {
-                        if(ressource.model)
+                        if(resource.model)
                         {
-                            options[ressource.id] = { value: ressource.id, label: ressource.name + " ("+ressource.model+")" };
+                            options[resource.id] = { value: resource.id, label: resource.name + " ("+resource.model+")" };
                         }
                         else
                         {
-                            options[ressource.id] = { value: ressource.id, label: ressource.name };
+                            options[resource.id] = { value: resource.id, label: resource.name };
                         }
                     });
 
@@ -194,4 +208,4 @@
             }
         }
     });
-</script>
+</script>

package/huemagic/hue-brightness.js

@@ -40,7 +40,7 @@ module.exports = function(RED)
 		{
 			let currentState = bridge.get("light_level", info.id);
 
-			// RESSOURCE FOUND?
+			// RESOURCE FOUND?
 			if(currentState !== false)
 			{
 				// SEND MESSAGE
@@ -100,14 +100,25 @@ module.exports = function(RED)
 			done = done || function() { scope.done.apply(scope,arguments); }
 
 			// SET LAST COMMAND
-			scope.lastCommand = msg;
+			scope.lastCommand = RED.util.cloneMessage(msg);
 
 			// CREATE PATCH
 			let patchObject = {};
 
 			// DEFINE SENSOR ID & CURRENT STATE
-			const tempSensorID = (typeof msg.topic != 'undefined' && msg.topic.length > 0) ? msg.topic : config.sensorid;
+			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.");
+				return false;
+			}
+
 			let currentState = bridge.get("light_level", 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") )
@@ -129,10 +140,10 @@ module.exports = function(RED)
 			}
 
 			// TURN ON / OFF
-			if((msg.payload === true || msg.payload === false) && (msg.payload !== currentState.payload.active))
+			if((msg.payload === true || msg.payload === false) && (msg.payload != currentState.payload.active))
 			{
 				// PREPARE PATCH
-				patchObject.enabled = msg.payload;
+				patchObject["enabled"] = (msg.payload == true);
 			}
 
 			//

package/huemagic/hue-buttons.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()
             {
@@ -95,10 +108,11 @@
                 var notification = RED.notify(scope._("hue-buttons.config.searching"), { type: "compact", modal: true, fixed: true });
 
                 // GET THE SENSORS
-                $.get('hue/ressources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "button" })
+                $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "button" })
                 .done( function(data) {
-                    var allRessources = JSON.parse(data);
-                    if(allRessources.length <= 0)
+                    var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
+                    if(allResources.length <= 0)
                     {
                         notification.close();
                         RED.notify(scope._("hue-buttons.config.none-found"), { type: "error" });
@@ -106,15 +120,15 @@
                     }
 
                     // SET OPTIONS
-                    allRessources.forEach(function(ressource)
+                    allResources.forEach(function(resource)
                     {
-                        if(ressource.model)
+                        if(resource.model)
                         {
-                            options[ressource.id] = { value: ressource.id, label: ressource.name + " ("+ressource.model+")" };
+                            options[resource.id] = { value: resource.id, label: resource.name + " ("+resource.model+")" };
                         }
                         else
                         {
-                            options[ressource.id] = { value: ressource.id, label: ressource.name };
+                            options[resource.id] = { value: resource.id, label: resource.name };
                         }
                     });
 

package/huemagic/hue-buttons.js

@@ -43,7 +43,7 @@ module.exports = function(RED)
 		{
 			let currentState = bridge.get("button", info.id);
 
-			// RESSOURCE FOUND?
+			// RESOURCE FOUND?
 			if(currentState !== false)
 			{
 				// SEND MESSAGE
@@ -102,9 +102,9 @@ 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.ressources[config.sensorid]["services"]["button"]))
+							for (const [oneButtonID, oneButton] of Object.entries(bridge.resources[config.sensorid]["services"]["button"]))
 							{
-								delete bridge.ressources[config.sensorid]["services"]["button"][oneButtonID]["button"];
+								delete bridge.resources[config.sensorid]["services"]["button"][oneButtonID]["button"];
 							}
 						}, 3000);
 					}
@@ -121,11 +121,22 @@ module.exports = function(RED)
 			done = done || function() { scope.done.apply(scope,arguments); }
 
 			// SAVE LAST COMMAND
-			scope.lastCommand = msg;
+			scope.lastCommand = RED.util.cloneMessage(msg);
 
 			// DEFINE SENSOR ID
-			const tempSensorID = (typeof msg.topic != 'undefined' && msg.topic.length > 0) ? msg.topic : config.sensorid;
+			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.");
+				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..");
+				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-group.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()
             {
@@ -95,10 +108,11 @@
                 var notification = RED.notify(scope._("hue-group.config.searching"), { type: "compact", modal: true, fixed: true });
 
                 // GET THE GROUPS
-                $.get('hue/ressources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "group" })
+                $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "group" })
                 .done( function(data) {
-                    var allRessources = JSON.parse(data);
-                    if(allRessources.length <= 0)
+                    var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
+                    if(allResources.length <= 0)
                     {
                         notification.close();
                         RED.notify(scope._("hue-group.config.none-found"), { type: "error" });
@@ -106,25 +120,25 @@
                     }
 
                     // SET GROUPS AS OPTIONS
-                    allRessources.forEach(function(ressource)
+                    allResources.forEach(function(resource)
                     {
-                        if(!ressource.name) // ALL SPECIAL
+                        if(!resource.name) // ALL SPECIAL
                         {
-                            options[ressource.id] = { value: ressource.id, label: "● "+scope._("hue-group.config.all") };
+                            options[resource.id] = { value: resource.id, label: "● "+scope._("hue-group.config.all") };
                         }
                     });
 
-                    allRessources.forEach(function(ressource)
+                    allResources.forEach(function(resource)
                     {
-                        if(ressource.name) // REGULAR GROUPS
+                        if(resource.name) // REGULAR GROUPS
                         {
-                            if(ressource.model)
+                            if(resource.model)
                             {
-                                options[ressource.id] = { value: ressource.id, label: ressource.name + " ("+ressource.model+")" };
+                                options[resource.id] = { value: resource.id, label: resource.name + " ("+resource.model+")" };
                             }
                             else
                             {
-                                options[ressource.id] = { value: ressource.id, label: ressource.name };
+                                options[resource.id] = { value: resource.id, label: resource.name };
                             }
                         }
                     });
@@ -205,4 +219,4 @@
             }
         }
     });
-</script>
+</script>

package/huemagic/hue-group.js

@@ -50,7 +50,7 @@ module.exports = function(RED)
 		{
 			let currentState = bridge.get("group", info.id, { colornames: config.colornamer ? true : false });
 
-			// RESSOURCE FOUND?
+			// RESOURCE FOUND?
 			if(currentState !== false)
 			{
 				// NOT IN UNIVERAL MODE? -> CHANGE UI STATES
@@ -102,14 +102,19 @@ module.exports = function(RED)
 			send = send || function() { scope.send.apply(scope,arguments); }
 
 			// SAVE LAST COMMAND
-			scope.lastCommand = msg;
+			scope.lastCommand = RED.util.cloneMessage(msg);
 
 			// CREATE PATCH
 			let patchObject = {};
 
 			// DEFINE SENSOR ID & CURRENT STATE
-			const tempGroupID = (typeof msg.topic != 'undefined' && msg.topic.length > 0) ? msg.topic : config.groupid;
+			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)

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()
             {
@@ -102,10 +115,11 @@
                 var notification = RED.notify(scope._("hue-light.config.searching"), { type: "compact", modal: true, fixed: true });
 
                 // GET THE LIGHTS
-                $.get('hue/ressources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "light" })
+                $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "light" })
                 .done( function(data) {
-                    var allRessources = JSON.parse(data);
-                    if(allRessources.length <= 0)
+                    var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
+                    if(allResources.length <= 0)
                     {
                         notification.close();
                         RED.notify(scope._("hue-light.config.none-found"), { type: "error" });
@@ -113,15 +127,15 @@
                     }
 
                     // SET OPTIONS
-                    allRessources.forEach(function(ressource)
+                    allResources.forEach(function(resource)
                     {
-                        if(ressource.model)
+                        if(resource.model)
                         {
-                            options[ressource.id] = { value: ressource.id, label: ressource.name + " ("+ressource.model+")" };
+                            options[resource.id] = { value: resource.id, label: resource.name + " ("+resource.model+")" };
                         }
                         else
                         {
-                            options[ressource.id] = { value: ressource.id, label: ressource.name };
+                            options[resource.id] = { value: resource.id, label: resource.name };
                         }
                     });
 
@@ -201,4 +215,4 @@
             }
         }
     });
-</script>
+</script>

package/huemagic/hue-light.js

@@ -47,7 +47,7 @@ module.exports = function(RED)
 		{
 			let currentState = bridge.get("light", info.id, { colornames: config.colornamer ? true : false });
 
-			// RESSOURCE FOUND?
+			// RESOURCE FOUND?
 			if(currentState !== false)
 			{
 				// SEND MESSAGE
@@ -115,14 +115,19 @@ module.exports = function(RED)
 			done = done || function() { scope.done.apply(scope,arguments); }
 
 			// SAVE LAST COMMAND
-			scope.lastCommand = msg;
+			scope.lastCommand = RED.util.cloneMessage(msg);
 
 			// CREATE PATCH
 			let patchObject = {};
 
 			// DEFINE SENSOR ID & CURRENT STATE
-			const tempLightID = (typeof msg.topic != 'undefined' && msg.topic.length > 0) ? msg.topic : config.lightid;
+			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)

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()
             {
@@ -95,10 +108,11 @@
                 var notification = RED.notify(scope._("hue-motion.config.searching"), { type: "compact", modal: true, fixed: true });
 
                 // GET THE SENSORS
-                $.get('hue/ressources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "motion" })
+                $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "motion" })
                 .done( function(data) {
-                    var allRessources = JSON.parse(data);
-                    if(allRessources.length <= 0)
+                    var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
+                    if(allResources.length <= 0)
                     {
                         notification.close();
                         RED.notify(scope._("hue-motion.config.none-found"), { type: "error" });
@@ -106,15 +120,15 @@
                     }
 
                     // SET OPTIONS
-                    allRessources.forEach(function(ressource)
+                    allResources.forEach(function(resource)
                     {
-                        if(ressource.model)
+                        if(resource.model)
                         {
-                            options[ressource.id] = { value: ressource.id, label: ressource.name + " ("+ressource.model+")" };
+                            options[resource.id] = { value: resource.id, label: resource.name + " ("+resource.model+")" };
                         }
                         else
                         {
-                            options[ressource.id] = { value: ressource.id, label: ressource.name };
+                            options[resource.id] = { value: resource.id, label: resource.name };
                         }
                     });
 
@@ -194,4 +208,4 @@
             }
         }
     });
-</script>
+</script>

package/huemagic/hue-motion.js

@@ -40,7 +40,7 @@ module.exports = function(RED)
 		{
 			let currentState = bridge.get("motion", info.id);
 
-			// RESSOURCE FOUND?
+			// RESOURCE FOUND?
 			if(currentState !== false)
 			{
 				// SEND MESSAGE
@@ -94,14 +94,25 @@ module.exports = function(RED)
 			done = done || function() { scope.done.apply(scope,arguments); }
 
 			// SAVE LAST COMMAND
-			scope.lastCommand = msg;
+			scope.lastCommand = RED.util.cloneMessage(msg);
 
 			// CREATE PATCH
 			let patchObject = {};
 
 			// DEFINE SENSOR ID & CURRENT STATE
-			const tempSensorID = (typeof msg.topic != 'undefined' && msg.topic.length > 0) ? msg.topic : config.sensorid;
+			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.");
+				return false;
+			}
+
 			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") )
@@ -123,10 +134,10 @@ module.exports = function(RED)
 			}
 
 			// TURN ON / OFF
-			if((msg.payload === true || msg.payload === false) && (msg.payload !== currentState.payload.active))
+			if((msg.payload === true || msg.payload === false) && (msg.payload != currentState.payload.active))
 			{
 				// PREPARE PATCH
-				patchObject.enabled = msg.payload;
+				patchObject["enabled"] = (msg.payload == true);
 			}
 
 			//

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()
             {
@@ -95,10 +108,11 @@
                 var notification = RED.notify(scope._("hue-rules.config.searching"), { type: "compact", modal: true, fixed: true });
 
                 // GET THE SENSORS
-                $.get('hue/ressources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "rule" })
+                $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "rule" })
                 .done( function(data) {
-                    var allRessources = JSON.parse(data);
-                    if(allRessources.length <= 0)
+                    var allResources = JSON.parse(data);
+                    allResources = sortResourcesBy('name', allResources);
+                    if(allResources.length <= 0)
                     {
                         notification.close();
                         RED.notify(scope._("hue-rules.config.none-found"), { type: "error" });
@@ -106,9 +120,9 @@
                     }
 
                     // SET OPTIONS
-                    allRessources.forEach(function(ressource)
+                    allResources.forEach(function(resource)
                     {
-                        options[ressource.id] = { value: ressource.id, label: ressource.name };
+                        options[resource.id] = { value: resource.id, label: resource.name };
                     });
 
                     // SELECT CURRENT VALUE
@@ -187,4 +201,4 @@
             }
         }
     });
-</script>
+</script>

package/huemagic/hue-rules.js

@@ -40,7 +40,7 @@ module.exports = function(RED)
 		{
 			let currentState = bridge.get("rule", info.id);
 
-			// RESSOURCE FOUND?
+			// RESOURCE FOUND?
 			if(currentState !== false)
 			{
 				// NOT IN UNIVERAL MODE? -> CHANGE UI STATES
@@ -84,14 +84,25 @@ module.exports = function(RED)
 			done = done || function() { scope.done.apply(scope,arguments); }
 
 			// SAVE LAST COMMAND
-			scope.lastCommand = msg;
+			scope.lastCommand = RED.util.cloneMessage(msg);
 
 			// CREATE PATCH
 			let patchObject = {};
 
 			// DEFINE SENSOR ID & CURRENT STATE
-			const tempRuleID = (typeof msg.topic != 'undefined' && msg.topic.length > 0) ? msg.topic : config.ruleid;
+			const tempRuleID = (!config.ruleid && typeof msg.topic != 'undefined' && isNaN(msg.topic) == false) ? msg.topic : config.ruleid;
+			if(!tempRuleID)
+			{
+				scope.error("Please submit a valid rule ID.");
+				return false;
+			}
+
 			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)
@@ -100,7 +111,7 @@ module.exports = function(RED)
 				patchObject["status"] = (msg.payload == true) ? 'enabled' : 'disabled';
 
 				// PATCH!
-				bridge.patch("rules", "/rules/"+config.ruleid, patchObject, 1)
+				bridge.patch("rules", "/rules/"+tempRuleID, patchObject, 1)
 				.then(function(response) { bridge.refetchRule(tempRuleID); })
 				.catch(function(errors) { scope.error(errors);  });