node-red-contrib-zwave-js 7.2.0-beta.3 → 7.2.1-beta.6

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.3",
+	"version": "7.2.1-beta.6",
 	"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

@@ -279,6 +279,7 @@ const ZwaveJsUI = (function () {
 	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 = {
@@ -506,11 +507,43 @@ const ZwaveJsUI = (function () {
 		FWRunning = false;
 	}
 
-	function PerformUpdate() {
+	async function PerformUpdateFromService(Node, File) {
+		const nodeRow = $('#zwave-js-node-list').find(`[data-nodeid='${Node}']`);
+		if (nodeRow.data().info.status.toUpperCase() === 'ASLEEP') {
+			await WaitForNodeWake(Node);
+		}
+
+		ControllerCMD(
+			DCs.beginOTAFirmwareUpdate.API,
+			DCs.beginOTAFirmwareUpdate.name,
+			undefined,
+			[Node, File],
+			DCs.beginOTAFirmwareUpdate.noWait
+		)
+			.then(() => {
+				FWRunning = true;
+				selectNode(Node);
+				$(":button:contains('Begin Update')")
+					.prop('disabled', true)
+					.addClass('ui-state-disabled');
+				$('#FWProgress').css({ display: 'block' });
+			})
+			.catch((err) => {
+				modalAlert(err.responseText || err.message, 'Firmware rejected');
+				throw new Error(err.responseText || err.message);
+			});
+	}
+
+	async function PerformUpdate() {
 		const FE = $('#FILE_FW')[0].files[0];
 		const NID = parseInt($('#NODE_FW option:selected').val());
 		const Target = $('#TARGET_FW').val();
 
+		const nodeRow = $('#zwave-js-node-list').find(`[data-nodeid='${NID}']`);
+		if (nodeRow.data().info.status.toUpperCase() === 'ASLEEP') {
+			await WaitForNodeWake(NID);
+		}
+
 		const FD = new FormData();
 		FD.append('Binary', FE);
 		FD.append('NodeID', NID);
@@ -1168,7 +1201,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) => {
@@ -2475,7 +2508,11 @@ const ZwaveJsUI = (function () {
 						//
 						const Container = $('<div>');
 						Container.append(
-							`<strong>Version ${object[0].version}</strong><br /><br />`
+							`Current Version <strong>${
+								nodeRow.data().info.firmwareVersion
+							}</strong> New Version <strong>${
+								object[0].version
+							}</strong><br /><br />`
 						);
 
 						Container.append('<strong>Change Log</strong>');
@@ -2487,37 +2524,15 @@ const ZwaveJsUI = (function () {
 						});
 						CLL.appendTo(Container);
 
-						const Buttons = {
-							Update: function () {
-								$(this)
-									.prop('disabled', true)
-									.addClass('ui-state-disabled')
-									.text('Please wait...');
+						const Buttons = {};
 
-								// Yuk!
-								const File = object[0].files.filter((F) => F.target === 0)[0];
+						for (let i = 0; i < object[0].files.length; i++) {
+							const File = object[0].files[i];
+							Buttons[`Update (Target ${File.target})`] = function () {
+								PerformUpdateFromService(Node, File);
+							};
+						}
 
-								ControllerCMD(
-									DCs.beginOTAFirmwareUpdate.API,
-									DCs.beginOTAFirmwareUpdate.name,
-									undefined,
-									[Node, File],
-									DCs.beginOTAFirmwareUpdate.noWait
-								)
-									.then(() => {
-										FWRunning = true;
-										selectNode(Node);
-										$('#FWProgress').css({ display: 'block' });
-									})
-									.catch((err) => {
-										modalAlert(
-											err.responseText || err.message,
-											'Could not begin update'
-										);
-										throw new Error(err.responseText || err.message);
-									});
-							}
-						};
 						modalPrompt(
 							Container,
 							'Firmware Update Available',
@@ -2726,7 +2741,11 @@ 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();
@@ -2740,9 +2759,11 @@ const ZwaveJsUI = (function () {
 					) {
 						WakeResolver();
 					}
-					nodeRow
-						.find('.zwave-js-node-row-status')
-						.html(renderStatusIcon(data.status.toUpperCase()));
+					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) => {