node-red-contrib-zwave-js 7.2.0-beta.2 → 7.2.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-red-contrib-zwave-js",
-	"version": "7.2.0-beta.2",
+	"version": "7.2.0-beta.3",
 	"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,8 @@ 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
 
 	function modalAlert(message, title) {
 		const Buts = {
@@ -720,6 +722,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 +758,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(
@@ -2438,17 +2454,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(
@@ -2720,6 +2732,14 @@ const ZwaveJsUI = (function () {
 						GetNodesThrottled();
 					}
 				} else {
+					if (
+						data.node === WakeResolverTarget &&
+						WakeResolver !== undefined &&
+						(data.status.toUpperCase() === 'AWAKE' ||
+							data.status.toUpperCase() === 'ALIVE')
+					) {
+						WakeResolver();
+					}
 					nodeRow
 						.find('.zwave-js-node-row-status')
 						.html(renderStatusIcon(data.status.toUpperCase()));