node-red-contrib-huemagic 2.8.2 → 4.0.0

package/huemagic/hue-motion.html

@@ -1,27 +1,34 @@
 <script type="text/x-red" data-template-name="hue-motion">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="hue-motion.config.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]hue-motion.config.input-name">
+        <input type="text" id="node-input-name" data-i18n="[placeholder]hue-motion.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>
-        <input type="text" id="node-input-bridge">
+        <input type="text" id="node-input-bridge" style="width: calc(100% - 105px)">
     </div>
     <div class="form-row">
         <label for="node-input-sensorid"><i class="fa fa-eye"></i> <span data-i18n="hue-motion.config.sensor"></span></label>
-        <div style="display: inline-block; position: relative; width: 70%; height: 20px;">
-            <div style="position: absolute; left: 0px; right: 40px;">
-                <input type="text" id="node-input-sensorid" placeholder="1" style="width: 100%"/>
+        <div style="display: inline-flex; width: calc(100% - 105px)">
+            <div id="input-select-toggle" style="flex-grow: 1;">
+                <input type="text" id="node-input-sensorid" placeholder="00000000-0000-0000-0000-000000000000" style="width: 100%"/>
             </div>
-            <a id="node-config-input-scan-sensors" class="editor-button" style="position: absolute; right: 0px; top: 0px;">
+            <button id="node-config-input-scan-sensors" type="button" class="red-ui-button" style="margin-left: 10px;">
                 <i class="fa fa-search"></i>
-            </a>
+            </button>
+        </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-motion.config.skipevents-node" style="width: 100%; margin-left: 10px;"></span>
         </div>
     </div>
     <div class="form-row">
-        <label for="node-input-skipevents"><i class="fa fa-sign-out"></i> <span data-i18n="hue-motion.config.skipevents"></span></label>
-        <input type="checkbox" id="node-input-skipevents" style="display:inline-block; width:22px; vertical-align:baseline;"><span data-i18n="hue-motion.config.skipevents-node"></span>
-        </label>
+        <div style="display: inline-flex; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-initevents" style="flex: 15px;">
+            <span data-i18n="hue-motion.config.sendinitevents-node" style="width: 100%; margin-left: 10px;"></span>
+        </div>
     </div>
 </script>
 
@@ -30,90 +37,161 @@
         category: 'HueMagic',
         color: '#9876d3',
         defaults: {
-            name: {value:""},
-            bridge: {type: "hue-bridge", required: true},
-            sensorid: {value:"", required: true, validate: RED.validators.number()},
-            skipevents: {value: false}
+            name: { value:"" },
+            bridge: { type: "hue-bridge", required: true },
+            sensorid: { value:"", required: false },
+            skipevents: { value: false },
+            initevents: { value: false }
         },
+        align: 'left',
+        icon: "hue-motion.png",
         inputs: 1,
         outputs: 1,
+        label: function() {
+            return this.name || this._("hue-motion.node.title");
+        },
+        paletteLabel: function() {
+            return this._("hue-motion.node.title");
+        },
         inputLabels: function() {
             return this._("hue-motion.node.input");
         },
         outputLabels: function() {
             return this._("hue-motion.node.output");
         },
-        align: 'right',
-        icon: "bridge.png",
-        paletteLabel: function() {
-            return this._("hue-motion.node.title");
-        },
-        label: function() {
-            return this.name || this._("hue-motion.node.title");
-        },
         oneditprepare: function()
         {
-            var scope = this;
+            const scope = this;
+            let options = [];
 
-            function manualMotionSensorID()
+            function manualInput()
             {
+                // GET CURRENT SELECTED VALUE
                 var current = $('#node-input-sensorid').val();
-                $('#node-input-sensorid').replaceWith('<input type="text" id="node-input-sensorid" style="width: 100%"/>');
-                $('#node-input-sensorid').val(current);
+
+                // REMOVE SELECT FIELD
+                $('#input-select-toggle').empty();
+
+                // CREATE NEW INPUT FIELD
+                $('#input-select-toggle').append('<input type="text" id="node-input-sensorid" placeholder="00000000-0000-0000-0000-000000000000" style="width: 100%" value="'+current+'" />');
+
+                // CHANGE BUTTON ICON
+                var button = $("#node-config-input-scan-sensors");
+                var buttonIcon = button.find("i");
+                buttonIcon.removeClass("fa-pencil");
+                buttonIcon.addClass("fa-search");
             }
 
-            function searchAndSelectMotionSensor()
+            function searchAndSelect()
             {
+                // GET CURRENT BRIDGE CONFIGURATION
+                var bridgeConfig = RED.nodes.node($('#node-input-bridge option:selected').val());
+                if(!bridgeConfig) { return false; }
+
+                // GET CURRENT SELECTED VALUE
                 var current = $('#node-input-sensorid').val();
-                $('#node-input-sensorid').replaceWith('<select id="node-input-sensorid" style="width: 100%"></select>');
-                $('#node-input-sensorid').append('<option selected="selected" value="null">'+scope._("hue-motion.config.searching")+'</option>');
 
-                var bridgeConfig = RED.nodes.node($('#node-input-bridge option:selected').val());
-                $.get('hue/sensors', {bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "ZLLPresence"})
-                .done(function(data) {
-                    var motionSensors = JSON.parse(data);
+                // TRIGGER SEARCHING NOTIFICATION
+                var notification = RED.notify(scope._("hue-motion.config.searching"), { type: "compact", modal: true, fixed: true });
 
-                    if(motionSensors.length <= 0)
+                // GET THE SENSORS
+                $.get('hue/ressources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "motion" })
+                .done( function(data) {
+                    var allRessources = JSON.parse(data);
+                    if(allRessources.length <= 0)
                     {
-                        RED.notify(scope._("hue-motion.config.none-found"), "error");
+                        notification.close();
+                        RED.notify(scope._("hue-motion.config.none-found"), { type: "error" });
+                        return false;
                     }
 
-                    // RESET OPTIONS
-                    $('#node-input-sensorid').empty();
-
-                    // SET MOTION SENSORS AS OPTIONS
-                    motionSensors.forEach(function(sensor)
+                    // SET OPTIONS
+                    allRessources.forEach(function(ressource)
                     {
-                        $('#node-input-sensorid').append('<option value="' + sensor.id + '">' + sensor.name + '</option>');
+                        if(ressource.model)
+                        {
+                            options[ressource.id] = { value: ressource.id, label: ressource.name + " ("+ressource.model+")" };
+                        }
+                        else
+                        {
+                            options[ressource.id] = { value: ressource.id, label: ressource.name };
+                        }
                     });
 
                     // SELECT CURRENT VALUE
-                    $('#node-input-sensorid').val(current);
+                    $("#node-input-sensorid").typedInput({
+                        types: [
+                            {
+                                value: current,
+                                options: Object.values(options)
+                            }
+                        ]
+                    });
+
+                    // CHANGE BUTTON ICON
+                    var button = $("#node-config-input-scan-sensors");
+                    var buttonIcon = button.find("i");
+                    buttonIcon.removeClass("fa-search");
+                    buttonIcon.addClass("fa-pencil");
+
+                    // CLOSE SEARCH NOTIFICATION
+                    notification.close();
                 })
                 .fail(function()
                 {
+                    notification.close();
                     RED.notify(scope._("hue-motion.config.unknown-error"), "error");
                 });
             }
 
-            $(document).on('change', '#node-input-sensorid', function()
+            // CHANGED SENSOR ID? -> REPLACE NAME (IF POSSIBLE)
+            $(document).on('change', '#node-input-sensorid', function(e)
             {
-                var sensorName = $('#node-input-sensorid option:selected').text();
-                if(sensorName.length > 0)
+                let currentSelectedOptionID = $(e.currentTarget).val();
+                let currentSelectedOptionValue = (currentSelectedOptionID.length > 0 && options[currentSelectedOptionID]) ? options[currentSelectedOptionID].label : false;
+
+                if(currentSelectedOptionValue !== false)
                 {
-                    $('#node-input-name').val(sensorName);
+                    $('#node-input-name').val(currentSelectedOptionValue.split(" (")[0]);
                 }
             });
 
+            // TOGGLE SELECT/INPUT FIELD
             $('#node-config-input-scan-sensors').click(function()
             {
-                if($('#node-input-sensorid').prop("tagName") === "INPUT")
+                if($('#input-select-toggle').find(".red-ui-typedInput-container").length > 0)
                 {
-                    searchAndSelectMotionSensor();
-                } else {
-                    manualMotionSensorID();
+                    manualInput();
+                }
+                else
+                {
+                    searchAndSelect();
                 }
             });
+        },
+        button: {
+            enabled: function() {
+                return (this.sensorid && this.sensorid.length > 1)
+            },
+            visible: function() {
+                return (this.sensorid && this.sensorid.length > 1)
+            },
+            onclick: function()
+            {
+                const node = this;
+                if(node.bridge)
+                {
+                    $.ajax({
+                        url: "inject/" + node.id,
+                        type: "POST",
+                        data: JSON.stringify({ __user_inject_props__: "status"}),
+                        contentType: "application/json; charset=utf-8",
+                        success: function (resp) {
+                            RED.notify(node.name + ": " + node._("hue-motion.node.statusmsg"), { type: "success", id: "status", timeout: 2000 });
+                        }
+                    });
+                }
+            }
         }
     });
 </script>

package/huemagic/hue-motion.js

@@ -5,134 +5,163 @@ module.exports = function(RED)
 	function HueMotion(config)
 	{
 		RED.nodes.createNode(this, config);
-		var scope = this;
-		let bridge = RED.nodes.getNode(config.bridge);
-		let { HueMotionMessage } = require('../utils/messages');
 
-		// SAVE LAST STATE
-		var lastState = false;
+		const scope = this;
+		const bridge = RED.nodes.getNode(config.bridge);
+
+		// SAVE LAST COMMAND
+		this.lastCommand = null;
 
 		//
 		// CHECK CONFIG
-		if(!config.sensorid || bridge == null)
+		if(bridge == null)
 		{
 			this.status({fill: "red", shape: "ring", text: "hue-motion.node.not-configured"});
 			return false;
 		}
 
+		//
+		// UNIVERSAL MODE?
+		if(!config.sensorid)
+		{
+			this.status({fill: "grey", shape: "dot", text: "hue-motion.node.universal"});
+		}
+
 		//
 		// UPDATE STATE
-		scope.status({fill: "grey", shape: "dot", text: "hue-motion.node.no-motion"});
+		if(config.sensorid)
+		{
+			this.status({fill: "grey", shape: "dot", text: "hue-motion.node.no-motion"});
+		}
 
 		//
-		// ON UPDATE
-		bridge.events.on('sensor' + config.sensorid, function(sensor)
+		// SUBSCRIBE TO UPDATES FROM THE BRIDGE
+		bridge.subscribe("motion", config.sensorid, function(info)
 		{
-			if(sensor.config.reachable == false)
-			{
-				// SEND STATUS
-				scope.status({fill: "red", shape: "ring", text: "hue-motion.node.not-reachable"});
-			}
-			else if(sensor.config.on == true)
-			{
-				// SEND STATUS
-				if(sensor.state.presence)
-				{
-					scope.status({fill: "green", shape: "dot", text: "hue-motion.node.motion"});
-				}
-				else
-				{
-					scope.status({fill: "grey", shape: "dot", text: "hue-motion.node.activated"});
-				}
+			let currentState = bridge.get("motion", info.id);
 
+			// RESSOURCE FOUND?
+			if(currentState !== false)
+			{
 				// SEND MESSAGE
-				var hueMotion = new HueMotionMessage(sensor, true, lastState);
-				if(!config.skipevents) { scope.send(hueMotion.msg); }
+				if(!config.skipevents && (config.initevents || info.suppressMessage == false))
+				{
+					// SET LAST COMMAND
+					if(scope.lastCommand !== null)
+					{
+						currentState.command = scope.lastCommand;
+					}
 
-				// SAVE LAST STATE
-				lastState = sensor;
-			}
-			else if(sensor.config.on == false)
-			{
-				// SEND STATUS
-				scope.status({fill: "red", shape: "ring", text: "hue-motion.node.deactivated"});
+					// SEND STATE
+					scope.send(currentState);
 
-				// SEND MESSAGE
-				var hueMotion = new HueMotionMessage(sensor, false, lastState);
-				if(!config.skipevents) { scope.send(hueMotion.msg); }
+					// RESET LAST COMMAND
+					scope.lastCommand = null;
+				}
 
-				// SAVE LAST STATE
-				lastState = sensor;
+				// NOT IN UNIVERAL MODE? -> CHANGE UI STATES
+				if(config.sensorid)
+				{
+					if(currentState.payload.reachable == false)
+					{
+						scope.status({fill: "red", shape: "ring", text: "hue-motion.node.not-reachable"});
+					}
+					else if(currentState.payload.active == true)
+					{
+						if(currentState.payload.motion)
+						{
+							scope.status({fill: "green", shape: "dot", text: "hue-motion.node.motion"});
+						}
+						else
+						{
+							scope.status({fill: "grey", shape: "dot", text: "hue-motion.node.activated"});
+						}
+					}
+					else if(currentState.payload.active == false)
+					{
+						scope.status({fill: "red", shape: "ring", text: "hue-motion.node.deactivated"});
+					}
+				}
 			}
 		});
 
-
 		//
-		// DISABLE / ENABLE SENSOR
+		// CONTROL SENSOR
 		this.on('input', function(msg, send, done)
 		{
-			// Node-RED < 1.0
+			// REDEFINE SEND AND DONE IF NOT AVAILABLE
 			send = send || function() { scope.send.apply(scope,arguments); }
+			done = done || function() { scope.done.apply(scope,arguments); }
+
+			// SAVE LAST COMMAND
+			scope.lastCommand = msg;
+
+			// CREATE PATCH
+			let patchObject = {};
+
+			// DEFINE SENSOR ID & CURRENT STATE
+			const tempSensorID = (msg.topic != null) ? msg.topic : config.sensorid;
+			let currentState = bridge.get("motion", tempSensorID);
 
 			// GET CURRENT STATE
-			if(typeof msg.payload != 'undefined' && typeof msg.payload.status != 'undefined')
+			if( (typeof msg.payload != 'undefined' && typeof msg.payload.status != 'undefined') || (typeof msg.__user_inject_props__ != 'undefined' && msg.__user_inject_props__ == "status") )
 			{
-				bridge.client.sensors.getById(config.sensorid)
-				.then(sensor => {
-					var hueMotion = new HueMotionMessage(sensor, (sensor.config.on) ? true : false, lastState);
+				// SET LAST COMMAND
+				if(scope.lastCommand !== null)
+				{
+					currentState.command = scope.lastCommand;
+				}
 
-					// SAVE LAST STATE
-					lastState = sensor;
+				// SEND STATE
+				scope.send(currentState);
 
-					return send(hueMotion.msg);
-				});
+				// RESET LAST COMMAND
+				scope.lastCommand = null;
 
+				if(done) { done(); }
 				return true;
 			}
 
-			// CONTROL
-			if(msg.payload == true || msg.payload == false)
+			// TURN ON / OFF
+			if((msg.payload === true || msg.payload === false) && (msg.payload !== currentState.payload.active))
 			{
-				bridge.client.sensors.getById(config.sensorid)
-				.then(sensor => {
-					sensor.config.on = msg.payload;
-					return bridge.client.sensors.save(sensor);
-				})
-				.then(sensor => {
-					var hueMotion = new HueMotionMessage(sensor, msg.payload, lastState);
-
-					// SEND STATUS
-					if(msg.payload == false)
-					{
-						scope.status({fill: "red", shape: "ring", text: "hue-motion.node.deactivated"});
-					}
-					else
-					{
-						scope.status({fill: "green", shape: "dot", text: "hue-motion.node.activated"});
-					}
+				// PREPARE PATCH
+				patchObject.enabled = msg.payload;
+			}
 
-					// SEND MESSAGE
-					if(!config.skipevents) { send(hueMotion.msg); }
-					if(done) { done(); }
-
-					// SAVE LAST STATE
-					lastState = sensor;
-				})
-				.catch(error => {
-					scope.error(error, msg);
-					if(done) { done(error); }
-				});
+			//
+			// SHOULD PATCH?
+			if(Object.values(patchObject).length > 0)
+			{
+				// CHANGE NODE UI STATE
+				if(config.sensorid)
+				{
+					scope.status({fill: "grey", shape: "ring", text: "hue-motion.node.command"});
+				}
+
+				// PATCH!
+				bridge.patch("motion", tempSensorID, patchObject)
+				.then(function() { if(done) { done(); }})
+				.catch(function(errors) { scope.error(errors);  });
 			}
-		});
+			else
+			{
+				// SET LAST COMMAND
+				if(scope.lastCommand !== null)
+				{
+					currentState.command = scope.lastCommand;
+				}
 
+				// SEND STATE
+				scope.send(currentState);
 
-		//
-		// CLOSE NODE / REMOVE EVENT LISTENER
-		this.on('close', function()
-		{
-			bridge.events.removeAllListeners('sensor' + config.sensorid);
+				// RESET LAST COMMAND
+				scope.lastCommand = null;
+
+				if(done) { done(); }
+			}
 		});
 	}
 
 	RED.nodes.registerType("hue-motion", HueMotion);
-}
+}