node-red-contrib-zwave-js 7.2.0-beta.2 → 7.2.1-beta.5

package/CHANGELOG.md

@@ -1,5 +1,23 @@
   # node-red-contrib-zwave-js Change Log
 
+  - 7.2.1
+
+    **New Features**
+      - Implemented a Firmware Update Service, that allows to install Firmware on devices that have known updates
+      - 2 new event types have been added : **ALIVE**, **DEAD** - these allow you to monitor if a device has been marked dead
+        or alive accordingly.
+
+    **Bug Fixes**
+      - Modal alerts are now rendering HTML content once again
+      - Missing `normalizedObject.label` for Thermostat devices
+
+    **Changes**  
+      - Association Management has been updated, and changes are now applied in batch.
+      - For battery operated devices, certain UI actions now ask you to wake up said device before anything is comitted.
+      - Bump ZWave JS
+      - Bump Winston
+      - Bump ESlint
+
   - 7.1.2
 
     **Changes**  

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-red-contrib-zwave-js",
-	"version": "7.2.0-beta.2",
+	"version": "7.2.1-beta.5",
 	"license": "MIT",
 	"description": "The most powerful, high performing and highly polished Z-Wave node for Node-RED based on Z-Wave JS. If you want a fully featured Z-Wave framework in your Node-RED instance, you have found it.",
 	"dependencies": {

package/resources/UITab/client.js

@@ -277,6 +277,9 @@ const ZwaveJsUI = (function () {
 	let HoveredNode = undefined; // Hovered Node
 	let selectedNode; // Selected Node
 	let LastTargetForBA; // BA TArget
+	let WakeResolver; // Resolve for wake wait
+	let WakeResolverTarget; // Target Wake Node
+	let NodesListed = false; // nodes listed
 
 	function modalAlert(message, title) {
 		const Buts = {
@@ -720,6 +723,24 @@ const ZwaveJsUI = (function () {
 			});
 	}
 
+	async function WaitForNodeWake(NodeID) {
+		const WD = modalPrompt(
+			'This device is asleep, please wake it up...',
+			'Waiting for device to wake up',
+			[],
+			false
+		);
+
+		WakeResolverTarget = NodeID;
+		await new Promise((res) => {
+			WakeResolver = res;
+		});
+
+		WakeResolver = undefined;
+		WakeResolverTarget = undefined;
+		WD.dialog('destroy');
+	}
+
 	function AssociationMGMT() {
 		ControllerCMD(
 			DCs.getAllAssociationGroups.API,
@@ -738,17 +759,13 @@ const ZwaveJsUI = (function () {
 					title: `ZWave Association Management: Node ${HoveredNode.nodeId}`,
 					minHeight: 75,
 					buttons: {
-						'Commit Changes': function () {
+						'Commit Changes': async function () {
 							const nodeRow = $('#zwave-js-node-list').find(
 								`[data-nodeid='${HoveredNode.nodeId}']`
 							);
 
 							if (nodeRow.data().info.status.toUpperCase() === 'ASLEEP') {
-								modalAlert(
-									'This node is a sleep, please wake up the node before commiting Association changes',
-									'Node is a sleep'
-								);
-								return;
+								await WaitForNodeWake(HoveredNode.nodeId);
 							}
 
 							const Removals = $('#zwave-js-associations-table').find(
@@ -1152,7 +1169,7 @@ const ZwaveJsUI = (function () {
 				} else {
 					Nodes.forEach((N) => $('#zwave-js-node-list').append(renderNode(N)));
 				}
-
+				NodesListed = true;
 				$('#zwave-js-node-properties').treeList('empty');
 			})
 			.catch((err) => {
@@ -2438,17 +2455,13 @@ const ZwaveJsUI = (function () {
 			}
 		});
 
-		CheckForUpdate = () => {
+		CheckForUpdate = async () => {
 			const Node = parseInt($('#NODE_FWC option:selected').val());
 
 			const nodeRow = $('#zwave-js-node-list').find(`[data-nodeid='${Node}']`);
 
 			if (nodeRow.data().info.status.toUpperCase() === 'ASLEEP') {
-				modalAlert(
-					'This node is a sleep, please wake up the node before checking for Firmware updates',
-					'Node is a sleep'
-				);
-				return;
+				await WaitForNodeWake(Node);
 			}
 
 			ControllerCMD(
@@ -2714,15 +2727,29 @@ const ZwaveJsUI = (function () {
 				const nodeRow = $('#zwave-js-node-list').find(
 					`[data-nodeid='${data.node}']`
 				);
-				nodeRow.data().info.status = data.status;
+
+				if (NodesListed) {
+					nodeRow.data().info.status = data.status;
+				}
+
 				if (data.status == 'READY') {
 					if (DriverReady) {
 						GetNodesThrottled();
 					}
 				} else {
-					nodeRow
-						.find('.zwave-js-node-row-status')
-						.html(renderStatusIcon(data.status.toUpperCase()));
+					if (
+						data.node === WakeResolverTarget &&
+						WakeResolver !== undefined &&
+						(data.status.toUpperCase() === 'AWAKE' ||
+							data.status.toUpperCase() === 'ALIVE')
+					) {
+						WakeResolver();
+					}
+					if (NodesListed) {
+						nodeRow
+							.find('.zwave-js-node-row-status')
+							.html(renderStatusIcon(data.status.toUpperCase()));
+					}
 				}
 				break;
 		}

package/zwave-js/ui/server.js

@@ -484,6 +484,10 @@ class UIServer {
 	}
 
 	_WireNodeEvents(node) {
+		if (node.isControllerNode) {
+			return;
+		}
+
 		// Status
 		node.on('sleep', (node) => {
 			this._SendNodeStatus(node, 'ASLEEP');

package/zwave-js/zwave-js.js

@@ -45,6 +45,8 @@ module.exports = function (RED) {
 	const event_ValueAdded = new SanitizedEventName('value added');
 	const event_Wake = new SanitizedEventName('wake up');
 	const event_Sleep = new SanitizedEventName('sleep');
+	const event_Dead = new SanitizedEventName('dead');
+	const event_Alive = new SanitizedEventName('alive');
 	const event_InterviewStarted = new SanitizedEventName('interview started');
 	const event_InterviewFailed = new SanitizedEventName('interview failed');
 	const event_InterviewCompleted = new SanitizedEventName(
@@ -1674,7 +1676,9 @@ module.exports = function (RED) {
 				} else {
 					let Name;
 					switch (VID.commandClass) {
-						case 67: // Thermo Setpoint;
+						// Thermostat Setpoint
+						case 'Thermostat Setpoint':
+						case 67:
 							Name = ZWaveJS.getEnumMemberName(
 								ZWaveJS.ThermostatSetpointType,
 								VID.propertyKey
@@ -1753,6 +1757,8 @@ module.exports = function (RED) {
 				'VALUE_UPDATED',
 				'SLEEP',
 				'WAKE_UP',
+				'DEAD',
+				'ALIVE',
 				'VALUE_ID_LIST',
 				'GET_VALUE_RESPONSE',
 				'GET_VALUE_METADATA_RESPONSE'
@@ -2025,11 +2031,11 @@ module.exports = function (RED) {
 		}
 
 		function WireNodeEvents(Node) {
-			Node.once(event_Ready.zwaveName, (N) => {
-				if (N.isControllerNode) {
-					return;
-				}
+			if (Node.isControllerNode) {
+				return;
+			}
 
+			Node.once(event_Ready.zwaveName, () => {
 				Node.on(event_FirmwareUpdateFinished.zwaveName, (N, S) => {
 					Send(N, event_FirmwareUpdateFinished.redName, S);
 				});
@@ -2064,6 +2070,14 @@ module.exports = function (RED) {
 				Node.on(event_Sleep.zwaveName, (N) => {
 					Send(N, event_Sleep.redName);
 				});
+
+				Node.on(event_Dead.zwaveName, (N) => {
+					Send(N, event_Dead.redName);
+				});
+
+				Node.on(event_Alive.zwaveName, (N) => {
+					Send(N, event_Alive.redName);
+				});
 			});
 
 			Node.on(event_InterviewStarted.zwaveName, (N) => {