node-red-contrib-zwave-js 7.0.0-beta.1 → 7.0.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
   # node-red-contrib-zwave-js Change Log
 
+  - 7.0.1
+
+    **Changes**
+     - Small optimisations to Express route cleanup.
+
+
   - 7.0.0
 
     **Breaking Changes**
@@ -13,12 +19,12 @@
     **New Features**
      - **VALUE_UPDATED**, **VALUE_NOTIFICATION**, **GET_VALUE_RESPONSE** and **VALUE_DB** now contain a **normalizedObject** property.
        This property aims to make it easy to utilise the value change, in that it summarises the event with easy to understand property names.
-     - New UI Layout - We have overhauled the UI, and focused on making it fit more into the node red style guide.
-     - An entierly new User Interface to render a Network Mesh Map.
+     - An entierly new side panel UI. This redesign aims to better align with the Node RED style guide.
+     - An entierly new Network Mesh Map, that is now based on routing header information instead of Node Neighbours.
      - Network statistics now include route information that is obtained during communication, and is used
        as the basis of the new map.
      - Multiple ZWave sticks/Networks are now supported (finally)
-       - all message will contain a property of **networkId** to indentify the source network.  
+       - All message will contain a property of **networkId** to indentify the source network.  
          **WARNING**: Before adding another network - please ensure you open up the currently configured Controller  
                and save it again (Remembering to deploy) - this will allign the current network to ID 1
      - Improved Recovery when the USB/ZWave transceiver has been removed/re-introduced.
@@ -28,7 +34,7 @@
     **Fixes**
      - Nodes that are not marked as ready can now be removed correctly.
      - Fix potential issue when **httpAdminRoot** has a custom value.
-     - various performance, stability and optimisations to the UI.
+     - Various performance, stability and optimisations to the UI.
      - UI Interaction is no longer picked up by Device Nodes.
 
     **Changes**

package/README.md

@@ -47,10 +47,10 @@ Included with the contrib is a [user interface](https://github.com/zwave-js/node
 ![Image](./GHImages/Demo.png)
 
 There are 4 node types included with this contrib ([click here](https://github.com/zwave-js/node-red-contrib-zwave-js/wiki/node-types) for full details about these nodes)
- - `zwave-js`: this node is used to set up a connection to your USB Z-Wave controller, set security keys, and manage various advanced controller options
- - `zwave-device`: this node is used to send and receive messages to one or more of the Z-Wave devices on your network
- - `event-filter`: this node is used to filter and sort messages from your Z-Wave devices
- - `cmd-factory`: this node simplifies creation of messages being sent to your Z-Wave devices
+ - `ZWave Controller`: this node is used to set up a connection to your USB Z-Wave controller, set security keys, and manage various advanced controller options
+ - `ZWave Device`: this node is used to send and receive messages to one or more of the Z-Wave devices on your network
+ - `Event Filter`: this node is used to filter and sort messages from your Z-Wave devices
+ - `CMD Factory`: this node simplifies creation of messages being sent to your Z-Wave devices
 
 ### Getting Started Links
  - [Installing](https://github.com/zwave-js/node-red-contrib-zwave-js/wiki/getting-started): system requirements and install instructions

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-red-contrib-zwave-js",
-	"version": "7.0.0-beta.1",
+	"version": "7.0.1",
 	"license": "MIT",
 	"description": "An extremely powerful, easy to use, and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
 	"dependencies": {
@@ -9,10 +9,10 @@
 		"serialport": "^10.4.0",
 		"winston": "^3.7.2",
 		"winston-transport": "^4.5.0",
-		"zwave-js": "^9.0.7"
+		"zwave-js": "^9.2.1"
 	},
 	"devDependencies": {
-		"eslint": "^8.14.0",
+		"eslint": "^8.15.0",
 		"prettier": "^2.6.2"
 	},
 	"scripts": {

package/resources/MeshMap/Map.html

@@ -7,20 +7,35 @@
 		<script src="https://unpkg.com/weaverjs@1.2.0/dist/weaver.min.js"></script>
 		<script type="text/javascript" src="{BASE}/cytoscape-spread.js"></script>
 		<script type="text/javascript" src="{BASE}/maprender.js"></script>
+
+		<style>
+			#Details {
+				width: 400px;
+				height: 400px;
+				background-color: rgb(241, 241, 241);
+				font-size: 14px;
+				font-family: 'Helvetica Neue Light', 'Calibiri Light', Roboto;
+				-webkit-border-radius: 6px;
+				-moz-border-radius: 6px;
+				border-radius: 6px;
+				border-style: solid;
+				border-width: 1px;
+				-webkit-box-shadow: 10px 10px 5px -7px rgba(0, 0, 0, 0.75);
+				-moz-box-shadow: 10px 10px 5px -7px rgba(0, 0, 0, 0.75);
+				box-shadow: 10px 10px 5px -7px rgba(0, 0, 0, 0.75);
+				padding: 10px;
+				box-sizing: content-box;
+			}
+		</style>
 	</head>
 	<body style="height: 100%">
 		<div style="display: flex; width: 100%; height: 100%">
-			<div
-				id="Details"
-				style="
-					width: 400px;
-					height: 100%;
-					background-color: rgb(241, 241, 241);
-					font-size: 16px;
-					font-family: 'Helvetica Neue Light', 'Calibiri Light', Roboto;
-				"
-			>
-				Select A node to view information.
+			<div id="Details">
+				<span
+					>Select A node to view information.<br /><br />NOTE: Disconnected
+					Nodes will have their routes determined, after they first
+					communicate.</span
+				>
 			</div>
 			<div
 				id="NetworkMesh"

package/resources/MeshMap/maprender.js

@@ -22,16 +22,22 @@ function Render(Base) {
 		if (N.controller) {
 			const EL = {
 				data: {
+					isController: N.controller,
 					id: N.nodeId,
 					name: 'Controller',
+					nameOnly: `Controller`,
+					location: `Hopefully away from interference.`,
 					fontSize: '12px',
-					icon: `${Base}/Stick.png`
+					icon: `${Base}/Stick.png`,
+					powerSource: { type: 'bus' },
+					statistics: N.statistics
 				}
 			};
 			Elements.push(EL);
 		} else {
 			const EL = {
 				data: {
+					isController: N.controller,
 					id: N.nodeId,
 					name: `${N.nodeId} - ${N.name || 'No Name'}`,
 					nameOnly: `${N.name || 'No Name'}`,
@@ -160,20 +166,31 @@ function LoadData() {
 	const NodePath = this.data('path');
 
 	Mesh.edges().css({ lineColor: '#ededed', 'target-arrow-color': '#f1f1f1' });
-	let MST = 1;
-	NodePath.forEach((PS) => {
-		const Color =
-			Mesh.edges("[id='" + PS + "']").data().target === '1' ? 'green' : 'black';
 
-		setTimeout(() => {
-			Mesh.edges("[id='" + PS + "']").css({
-				lineColor: Color,
-				zIndex: 100,
-				'target-arrow-color': 'black'
-			});
-		}, 150 * MST);
-		MST++;
-	});
+	if (NodePath !== undefined) {
+		Mesh.edges().css({ lineColor: '#ededed', 'target-arrow-color': '#f1f1f1' });
+		let MST = 1;
+		NodePath.forEach((PS) => {
+			const Color =
+				Mesh.edges("[id='" + PS + "']").data().target === '1'
+					? 'green'
+					: 'black';
+
+			setTimeout(() => {
+				Mesh.edges("[id='" + PS + "']").css({
+					lineColor: Color,
+					zIndex: 100,
+					'target-arrow-color': 'black'
+				});
+			}, 150 * MST);
+			MST++;
+		});
+	} else {
+		Mesh.edges("[target='1']").css({
+			lineColor: 'green',
+			'target-arrow-color': 'black'
+		});
+	}
 
 	// Node
 	const Node = $('<li>');
@@ -245,21 +262,53 @@ function LoadData() {
 
 	const NetStatsDetails = $('<ul>');
 	NetStatsDetails.appendTo(NetStats);
-	$(`<li>Commands TX: ${this.data('statistics').commandsTX}</li>`).appendTo(
-		NetStatsDetails
-	);
-	$(
-		`<li>Commands TXD: ${this.data('statistics').commandsDroppedTX}</li>`
-	).appendTo(NetStatsDetails);
-	$(`<li>Commands RX: ${this.data('statistics').commandsRX}</li>`).appendTo(
-		NetStatsDetails
-	);
-	$(
-		`<li>Commands RXD: ${this.data('statistics').commandsDroppedRX}</li>`
-	).appendTo(NetStatsDetails);
-	$(`<li>Timeouts: ${this.data('statistics').timeoutResponse}</li>`).appendTo(
-		NetStatsDetails
-	);
+
+	if (this.data('isController')) {
+		$(`<li>Messages TX: ${this.data('statistics').messagesTX}</li>`).appendTo(
+			NetStatsDetails
+		);
+		$(
+			`<li>Messages Dropped TX: ${
+				this.data('statistics').messagesDroppedTX
+			}</li>`
+		).appendTo(NetStatsDetails);
+
+		$(`<li>Messages RX: ${this.data('statistics').messagesRX}</li>`).appendTo(
+			NetStatsDetails
+		);
+		$(
+			`<li>Messages Dropped RX: ${
+				this.data('statistics').messagesDroppedRX
+			}</li>`
+		).appendTo(NetStatsDetails);
+		$(`<li>NAK: ${this.data('statistics').NAK}</li>`).appendTo(NetStatsDetails);
+		$(`<li>CAN: ${this.data('statistics').CAN}</li>`).appendTo(NetStatsDetails);
+		$(`<li>ACK Timeout: ${this.data('statistics').timeoutACK}</li>`).appendTo(
+			NetStatsDetails
+		);
+		$(
+			`<li>Response Timeout: ${this.data('statistics').timeoutResponse}</li>`
+		).appendTo(NetStatsDetails);
+		$(
+			`<li>Callback Timeout: ${this.data('statistics').timeoutCallback}</li>`
+		).appendTo(NetStatsDetails);
+	} else {
+		$(`<li>Commands TX: ${this.data('statistics').commandsTX}</li>`).appendTo(
+			NetStatsDetails
+		);
+		$(
+			`<li>Commands TXD: ${this.data('statistics').commandsDroppedTX}</li>`
+		).appendTo(NetStatsDetails);
+		$(`<li>Commands RX: ${this.data('statistics').commandsRX}</li>`).appendTo(
+			NetStatsDetails
+		);
+		$(
+			`<li>Commands RXD: ${this.data('statistics').commandsDroppedRX}</li>`
+		).appendTo(NetStatsDetails);
+		$(`<li>Timeouts: ${this.data('statistics').timeoutResponse}</li>`).appendTo(
+			NetStatsDetails
+		);
+	}
 
 	$('#Details').html(Data);
 }

package/resources/UITab/client.js

@@ -67,6 +67,11 @@ const DCs = {
 		name: 'getNodeStatistics',
 		noWait: false
 	},
+	getControllerStatistics: {
+		API: 'DriverAPI',
+		name: 'getControllerStatistics',
+		noWait: false
+	},
 	checkKeyReq: {
 		API: 'IEAPI',
 		name: 'checkKeyReq',
@@ -258,10 +263,12 @@ const ZwaveJsUI = (function () {
 			};
 		}
 
-		$('<div>')
+		const D = $('<div>')
 			.css({ padding: 10, maxWidth: 500, wordWrap: 'break-word' })
 			.html(message)
 			.dialog(Options);
+
+		return D;
 	}
 
 	function ShowCommandViewer() {
@@ -531,6 +538,13 @@ const ZwaveJsUI = (function () {
 					PL[2][0].endpoint = parseInt(EI.val());
 				}
 
+				const D = modalPrompt(
+					'Adding Association...',
+					'Please wait.',
+					[],
+					false
+				);
+
 				ControllerCMD(
 					DCs.addAssociations.API,
 					DCs.addAssociations.name,
@@ -539,9 +553,11 @@ const ZwaveJsUI = (function () {
 					DCs.addAssociations.noWait
 				)
 					.then(() => {
+						D.dialog('destroy');
 						GMGroupSelected();
 					})
 					.catch((err) => {
+						D.dialog('destroy');
 						if (err.status === 504) {
 							modalAlert(
 								'The device maybe in a sleeping state, the association will be added later.',
@@ -574,6 +590,13 @@ const ZwaveJsUI = (function () {
 
 		const Buttons = {
 			Yes: function () {
+				const D = modalPrompt(
+					'Removing Association',
+					'Please wait.',
+					[],
+					false
+				);
+
 				ControllerCMD(
 					DCs.removeAssociations.API,
 					DCs.removeAssociations.name,
@@ -582,9 +605,11 @@ const ZwaveJsUI = (function () {
 					DCs.removeAssociations.noWait
 				)
 					.then(() => {
+						D.dialog('destroy');
 						GMGroupSelected();
 					})
 					.catch((err) => {
+						D.dialog('destroy');
 						if (err.status === 504) {
 							modalAlert(
 								'The device maybe in a sleeping state, the association will be removed later.',
@@ -751,7 +776,20 @@ const ZwaveJsUI = (function () {
 						_Nodes.push(_Node);
 					});
 
-					res(_Nodes);
+					ControllerCMD(
+						DCs.getControllerStatistics.API,
+						DCs.getControllerStatistics.name,
+						undefined,
+						undefined,
+						DCs.getControllerStatistics.noWait
+					)
+						.then(({ object }) => {
+							_Nodes.filter((_PC) => _PC.controller)[0].statistics = object;
+							res(_Nodes);
+						})
+						.catch((err) => {
+							rej(err.responseText);
+						});
 				})
 				.catch((err) => {
 					rej(err.responseText);
@@ -839,6 +877,10 @@ const ZwaveJsUI = (function () {
 		if (NoTimeoutFor.includes(method)) {
 			Options.timeout = 0;
 			Payload.noTimeout = true;
+		} else {
+			// Hopefully we will never have to depend on this, if so - there is something seriously wrong with the network, that the user should resolve.
+			// Out internal timeouts of 10s will see to anything driver/server related
+			Options.timeout = 30000;
 		}
 
 		if (mode !== 'IEAPI') {
@@ -949,13 +991,13 @@ const ZwaveJsUI = (function () {
 				} else {
 					Nodes.forEach((N) => $('#zwave-js-node-list').append(renderNode(N)));
 				}
+
+				$('#zwave-js-node-properties').treeList('empty');
 			})
 			.catch((err) => {
 				modalAlert(err.responseText, 'Could not fetch nodes.');
 				throw new Error(err.responseText);
 			});
-
-		$('#zwave-js-node-properties > div > div > div > ol').empty();
 	}
 
 	function sortByKey(obj) {
@@ -1553,6 +1595,12 @@ const ZwaveJsUI = (function () {
 		}
 		const Buttons = {
 			'Yes - Remove': function () {
+				const D = modalPrompt(
+					'Checking if Node has failed...',
+					'Please wait.',
+					[],
+					false
+				);
 				Removing = true;
 				ControllerCMD(
 					DCs.removeFailedNode.API,
@@ -1562,10 +1610,12 @@ const ZwaveJsUI = (function () {
 					DCs.removeFailedNode.noWait
 				)
 					.catch((err) => {
+						D.dialog('destroy');
 						modalAlert(err.responseText, 'Could not remove the Node.');
 						Removing = false;
 					})
 					.then(() => {
+						D.dialog('destroy');
 						Removing = false;
 					});
 			}
@@ -1769,8 +1819,10 @@ const ZwaveJsUI = (function () {
 		});
 		BA.appendTo(CTTD3);
 
+		// Group
 		const Group = $('<button>');
 		Group.click(() => {
+			IsDriverReady();
 			if (GroupedNodes) {
 				GroupedNodes = false;
 				Group.find('i').removeClass('fa-indent');
@@ -2256,213 +2308,206 @@ const ZwaveJsUI = (function () {
 	}
 
 	function AddOverlayNodeButtons(Node, Row) {
-		if (Node === undefined && Row === undefined) {
-			if (BA !== undefined) {
-				BA.css({
-					display: 'none'
-				});
-			}
+		HoveredNode = Node;
+
+		Row.children().css({ display: 'none' });
+		Row.children().first().css({ display: 'block' });
+		Row.css({ height: '30px' });
+
+		if (BA === undefined) {
+			BA = $('<div>');
+			BA.css({
+				position: 'relative',
+				left: '-1px',
+				backgroundColor: 'inherit'
+			});
+
+			const NameLocation = $('<button>');
+			NameLocation.click(() => {
+				event.stopPropagation();
+				IsNodeReady(HoveredNode);
+				NameNode();
+			});
+			NameLocation.addClass(
+				'red-ui-button red-ui-button-small zwave-js-round-square'
+			);
+			NameLocation.css({
+				width: '30px',
+				height: '30px',
+				marginRight: '1px'
+			});
+			NameLocation.append('<i class="fa fa-pencil fa-lg"></i>');
+			RED.popover.tooltip(NameLocation, 'Edit Name / Location');
+			BA.append(NameLocation);
+
+			const _HealthCheck = $('<button>');
+			_HealthCheck.click(() => {
+				event.stopPropagation();
+				IsNodeReady(HoveredNode);
+				HealthCheck();
+			});
+			_HealthCheck.addClass(
+				'red-ui-button red-ui-button-small zwave-js-round-square'
+			);
+			_HealthCheck.css({
+				width: '30px',
+				height: '30px',
+				marginRight: '1px'
+			});
+			_HealthCheck.append('<i class="fa fa-stethoscope fa-lg"></i>');
+			RED.popover.tooltip(_HealthCheck, 'Run Health Check');
+			BA.append(_HealthCheck);
+
+			const Heal = $('<button>');
+			Heal.click(() => {
+				event.stopPropagation();
+				IsNodeReady(HoveredNode);
+				StartNodeHeal();
+			});
+			Heal.addClass('red-ui-button red-ui-button-small zwave-js-round-square');
+			Heal.css({
+				width: '30px',
+				height: '30px',
+				marginRight: '1px'
+			});
+			Heal.append('<i class="fa fa-medkit fa-lg"></i>');
+			RED.popover.tooltip(Heal, 'Heal Node');
+			BA.append(Heal);
+
+			const Associations = $('<button>');
+			Associations.click(() => {
+				event.stopPropagation();
+				IsNodeReady(HoveredNode);
+				AssociationMGMT();
+			});
+			Associations.addClass(
+				'red-ui-button red-ui-button-small zwave-js-round-square'
+			);
+			Associations.css({
+				width: '30px',
+				height: '30px',
+				marginRight: '1px'
+			});
+			Associations.append('<i class="fa fa-code-fork fa-lg"></i>');
+			RED.popover.tooltip(Associations, 'Association Management');
+			BA.append(Associations);
+
+			const Interview = $('<button>');
+			Interview.click(() => {
+				event.stopPropagation();
+				IsNodeReady(HoveredNode);
+				InterviewNode();
+			});
+			Interview.addClass(
+				'red-ui-button red-ui-button-small zwave-js-round-square'
+			);
+			Interview.css({
+				width: '30px',
+				height: '30px',
+				marginRight: '1px'
+			});
+			Interview.append('<i class="fa fa-handshake-o fa-lg"></i>');
+			RED.popover.tooltip(Interview, 'Re-Interview Node');
+			BA.append(Interview);
+
+			const RemoveFailed = $('<button>');
+			RemoveFailed.click(() => {
+				event.stopPropagation();
+				RemoveFailedNode();
+			});
+			RemoveFailed.addClass(
+				'red-ui-button red-ui-button-small zwave-js-round-square'
+			);
+			RemoveFailed.css({
+				width: '30px',
+				height: '30px',
+				marginRight: '1px'
+			});
+			RemoveFailed.append('<i class="fa  fa-trash-o fa-lg"></i>');
+			RED.popover.tooltip(RemoveFailed, 'Remove Failed Node');
+			BA.append(RemoveFailed);
+
+			const ReplaceFailed = $('<button>');
+			ReplaceFailed.click(() => {
+				event.stopPropagation();
+				ShowReplacePrompt();
+			});
+			ReplaceFailed.addClass(
+				'red-ui-button red-ui-button-small zwave-js-round-square'
+			);
+			ReplaceFailed.css({
+				width: '30px',
+				height: '30px',
+				marginRight: '1px'
+			});
+			ReplaceFailed.append('<i class="fa fa-chain-broken fa-lg"></i>');
+			RED.popover.tooltip(ReplaceFailed, 'Replace Failed Node');
+			BA.append(ReplaceFailed);
+
+			const _OpenDB = $('<button>');
+			_OpenDB.click(() => {
+				IsNodeReady(HoveredNode);
+				OpenDB();
+			});
+			_OpenDB.addClass(
+				'red-ui-button red-ui-button-small zwave-js-round-square'
+			);
+			_OpenDB.css({
+				width: '30px',
+				height: '30px',
+				marginRight: '1px'
+			});
+			_OpenDB.append('<i class="fa fa-database fa-lg"></i>');
+			RED.popover.tooltip(_OpenDB, 'Open in Device Browser');
+			BA.append(_OpenDB);
 		} else {
-			HoveredNode = Node;
-
-			Row.children().css({ display: 'none' });
-			Row.children().first().css({ display: 'block' });
-			Row.css({ height: '30px' });
-
-			if (BA === undefined) {
-				BA = $('<div>');
-				BA.css({
-					position: 'relative',
-					left: '-1px',
-					backgroundColor: 'inherit'
-				});
+			BA.css({
+				display: 'block'
+			});
+		}
 
-				const NameLocation = $('<button>');
-				NameLocation.click(() => {
-					event.stopPropagation();
-					IsNodeReady(HoveredNode);
-					NameNode();
-				});
-				NameLocation.addClass(
-					'red-ui-button red-ui-button-small zwave-js-round-square'
-				);
-				NameLocation.css({
-					width: '30px',
-					height: '30px',
-					marginRight: '1px'
-				});
-				NameLocation.append('<i class="fa fa-pencil fa-lg"></i>');
-				RED.popover.tooltip(NameLocation, 'Edit Name / Location');
-				BA.append(NameLocation);
-
-				const _HealthCheck = $('<button>');
-				_HealthCheck.click(() => {
-					event.stopPropagation();
-					IsNodeReady(HoveredNode);
-					HealthCheck();
-				});
-				_HealthCheck.addClass(
-					'red-ui-button red-ui-button-small zwave-js-round-square'
-				);
-				_HealthCheck.css({
-					width: '30px',
-					height: '30px',
-					marginRight: '1px'
-				});
-				_HealthCheck.append('<i class="fa fa-stethoscope fa-lg"></i>');
-				RED.popover.tooltip(_HealthCheck, 'Run Health Check');
-				BA.append(_HealthCheck);
-
-				const Heal = $('<button>');
-				Heal.click(() => {
-					event.stopPropagation();
-					IsNodeReady(HoveredNode);
-					StartNodeHeal();
-				});
-				Heal.addClass(
-					'red-ui-button red-ui-button-small zwave-js-round-square'
-				);
-				Heal.css({
-					width: '30px',
-					height: '30px',
-					marginRight: '1px'
-				});
-				Heal.append('<i class="fa fa-medkit fa-lg"></i>');
-				RED.popover.tooltip(Heal, 'Heal Node');
-				BA.append(Heal);
-
-				const Associations = $('<button>');
-				Associations.click(() => {
-					event.stopPropagation();
-					IsNodeReady(HoveredNode);
-					AssociationMGMT();
-				});
-				Associations.addClass(
-					'red-ui-button red-ui-button-small zwave-js-round-square'
-				);
-				Associations.css({
-					width: '30px',
-					height: '30px',
-					marginRight: '1px'
-				});
-				Associations.append('<i class="fa fa-code-fork fa-lg"></i>');
-				RED.popover.tooltip(Associations, 'Association Management');
-				BA.append(Associations);
-
-				const Interview = $('<button>');
-				Interview.click(() => {
-					event.stopPropagation();
-					IsNodeReady(HoveredNode);
-					InterviewNode();
-				});
-				Interview.addClass(
-					'red-ui-button red-ui-button-small zwave-js-round-square'
-				);
-				Interview.css({
-					width: '30px',
-					height: '30px',
-					marginRight: '1px'
-				});
-				Interview.append('<i class="fa fa-handshake-o fa-lg"></i>');
-				RED.popover.tooltip(Interview, 'Re-Interview Node');
-				BA.append(Interview);
-
-				const RemoveFailed = $('<button>');
-				RemoveFailed.click(() => {
-					event.stopPropagation();
-					RemoveFailedNode();
-				});
-				RemoveFailed.addClass(
-					'red-ui-button red-ui-button-small zwave-js-round-square'
-				);
-				RemoveFailed.css({
-					width: '30px',
-					height: '30px',
-					marginRight: '1px'
-				});
-				RemoveFailed.append('<i class="fa  fa-trash-o fa-lg"></i>');
-				RED.popover.tooltip(RemoveFailed, 'Remove Failed Node');
-				BA.append(RemoveFailed);
-
-				const ReplaceFailed = $('<button>');
-				ReplaceFailed.click(() => {
-					event.stopPropagation();
-					ShowReplacePrompt();
-				});
-				ReplaceFailed.addClass(
-					'red-ui-button red-ui-button-small zwave-js-round-square'
-				);
-				ReplaceFailed.css({
-					width: '30px',
-					height: '30px',
-					marginRight: '1px'
-				});
-				ReplaceFailed.append('<i class="fa fa-chain-broken fa-lg"></i>');
-				RED.popover.tooltip(ReplaceFailed, 'Replace Failed Node');
-				BA.append(ReplaceFailed);
-
-				const _OpenDB = $('<button>');
-				_OpenDB.click(() => {
-					IsNodeReady(HoveredNode);
-					OpenDB();
-				});
-				_OpenDB.addClass(
-					'red-ui-button red-ui-button-small zwave-js-round-square'
-				);
-				_OpenDB.css({
-					width: '30px',
-					height: '30px',
-					marginRight: '1px'
-				});
-				_OpenDB.append('<i class="fa fa-database fa-lg"></i>');
-				RED.popover.tooltip(_OpenDB, 'Open in Device Browser');
-				BA.append(_OpenDB);
-			} else {
-				BA.css({
-					display: 'block'
-				});
-			}
+		Row.append(BA);
+	}
 
-			Row.append(BA);
+	function ResetBA() {
+		if (LastTargetForBA !== undefined) {
+			LastTargetForBA.children().css({ display: 'block' });
+		}
+		if (BA !== undefined) {
+			BA.css({
+				display: 'none'
+			});
 		}
 	}
 
 	function renderNode(node) {
-		let Timer;
-
 		return $('<div>')
 			.addClass('red-ui-treeList-label zwave-js-node-row')
 			.attr('data-nodeid', node.nodeId)
 			.data('info', node)
-			.dblclick(() => {
-				if (LastTargetForBA !== undefined)
-					LastTargetForBA.children().css({ display: 'block' });
-
-				const Row = $('.zwave-js-node-row[data-nodeid="' + node.nodeId + '"]');
-				AddOverlayNodeButtons(node, $(Row));
-				LastTargetForBA = $(Row);
-
-				clearTimeout(Timer);
-				Timer = undefined;
-			})
-			.click(() => {
+			.click((e) => {
 				if (selectedNode === node.nodeId) {
+					ResetBA();
 					const Row = $(
 						'.zwave-js-node-row[data-nodeid="' + node.nodeId + '"]'
 					);
 					AddOverlayNodeButtons(node, $(Row));
 					LastTargetForBA = $(Row);
 					return;
+				} else {
+					if (e.shiftKey) {
+						ResetBA();
+						const Row = $(
+							'.zwave-js-node-row[data-nodeid="' + node.nodeId + '"]'
+						);
+						AddOverlayNodeButtons(node, $(Row));
+						LastTargetForBA = $(Row);
+					} else {
+						ResetBA();
+						IsNodeReady(node);
+						selectNode(node.nodeId);
+					}
 				}
-				clearTimeout(Timer);
-				Timer = undefined;
-				Timer = setTimeout(() => {
-					if (LastTargetForBA !== undefined)
-						LastTargetForBA.children().css({ display: 'block' });
-					AddOverlayNodeButtons();
-					IsNodeReady(node);
-					selectNode(node.nodeId);
-				}, 250);
 			})
 			.append(
 				$('<div>').html(node.nodeId).addClass('zwave-js-node-row-id'),
@@ -2636,10 +2681,7 @@ const ZwaveJsUI = (function () {
 
 	function updateNodeFetchStatus(text) {
 		$('#zwave-js-node-properties').treeList('data', [
-			{
-				label: text,
-				class: 'zwave-js-node-fetch-status'
-			}
+			{ label: text, class: 'zwave-js-node-fetch-status' }
 		]);
 	}
 

package/zwave-js/ui/server.js

@@ -265,7 +265,7 @@ class UIServer {
 				const timeout = setTimeout(() => {
 					TimedOut = true;
 					res.status(504).end();
-				}, 5000);
+				}, 10000);
 
 				if (req.body.noTimeout) {
 					clearTimeout(timeout);
@@ -457,19 +457,20 @@ class UIServer {
 			delete this._Context.controller;
 			delete this._Context.input;
 		} else {
-			const Routes = [];
-			this._RED.httpAdmin._router.stack.forEach((R) => {
-				if (R.route === undefined) {
-					Routes.push(R);
-					return;
+			const Check = (Route) => {
+				if (Route.route === undefined) {
+					return true;
 				}
-				if (!R.route.path.startsWith(`/zwave-js/${this._NetworkIdentifier}`)) {
-					Routes.push(R);
-					return;
+				if (
+					!Route.route.path.startsWith(`/zwave-js/${this._NetworkIdentifier}`)
+				) {
+					return true;
 				}
-			});
 
-			this._RED.httpAdmin._router.stack = Routes;
+				return false;
+			};
+			this._RED.httpAdmin._router.stack =
+				this._RED.httpAdmin._router.stack.filter(Check);
 
 			delete this._Context.controller;
 			delete this._Context.input;

package/zwave-js/ui/smartstart/server.js

@@ -81,32 +81,22 @@ function ParseCode(req, res) {
 	}
 }
 
-const RemovePaths = () => {
-	const Routes = [];
-
-	_HTTPAdmin._router.stack.forEach((R) => {
-		if (R.route === undefined) {
-			Routes.push(R);
-			return;
-		}
-
-		if (R.route.path.startsWith(`/zwave-js/${_NetworkID}/smartstart-event`)) {
-			return;
-		}
-
-		if (R.route.path.startsWith(`/zwave-js/smartstart-scanner`)) {
-			return;
-		}
-
-		Routes.push(R);
-	});
-
-	return Routes;
-};
-
 const Stop = () => {
 	if (_NetworkID !== undefined) {
-		_HTTPAdmin._router.stack = RemovePaths();
+		const Check = (Route) => {
+			if (Route.route === undefined) {
+				return true;
+			}
+			if (
+				!Route.route.path.startsWith(`/zwave-js/smartstart-scanner`) &&
+				!Route.route.path.startsWith(`/zwave-js/${_NetworkID}/smartstart-event`)
+			) {
+				return true;
+			}
+			return false;
+		};
+
+		_HTTPAdmin._router.stack = _HTTPAdmin._router.stack.filter(Check);
 
 		_Enabled = false;
 		_Callback = undefined;

package/zwave-js/zwave-js.html

@@ -950,11 +950,13 @@
 					$('#node-input-serialPort').val('Select Port');
 				}
 
+				const OV = this.serialPort ?? '';
+
 				$('#node-input-serialPort').change(function (event) {
 					var Value = event.target.value;
 
 					if (Value === 'Custom Path...') {
-						Value = prompt('Enter custom serial path.');
+						Value = prompt('Enter custom serial path.', OV);
 						if (Value !== null) {
 							Value = Value.trim();
 							$('#node-input-serialPort').append(new Option(Value, Value));

package/zwave-js/zwave-js.js

@@ -914,7 +914,9 @@ module.exports = function (RED) {
 									property: 'isLow'
 								})
 							},
-							statistics: N.statistics
+							statistics: N.isControllerNode
+								? Driver.controller.statistics
+								: N.statistics
 						});
 					});
 					Nodes.sort((A, B) => A.nodeId - B.nodeId);