node-red-contrib-zwave-js 6.5.1 → 6.5.5

package/CHANGELOG.md

@@ -1,13 +1,49 @@
   # node-red-contrib-zwave-js Change Log
 
+  - 6.5.5
+  
+    **Fixes**
+     - Fix NPM Ignore rules
+
+  - 6.5.4
+
+    **Changes**
+     - Smart Start Web Application, has been moved to use the express instance provided by Node RED
+       - Live QR Scanning now requires Node RED to be SSL Enabled - basic QR capture can still be used without SSL.
+     - Added Min Node RED Version to package.json
+     - Switched static resources to use /resources/ endpoint provided by Node RED
+     - Added node examples
+     - Bump Zwave JS to 8.11.3  
+     - Bump ESLint to 8.8.0
+
+  - 6.5.3
+
+    **Fixes**
+     - Wait for driver unload.
+
+  - 6.5.2
+
+    **Fixes**
+     - Don't soley depend on the **node removed** event to progress the exclusion Wizard
+     - Check if a node is selected before opening up a dialog
+
+    **New Features**
+     - Expose the Driver option to disable Optimistic Value Updates
+     - Added the ability to hide the status label for device and event filter nodes
+
+    **Changes**
+     - Renamed the **Abort** button during S2 inclusion to better identify its intention
+     - Bump ZWJS to 8.11.2  
+     - Bump Winston to 3.5.0
+
   - 6.5.1
 
     **Fixes**
-     - Battery icon/popup text in the UI is now (finally) kept in sync.
-     - Driver readiness  for Health Checks and Keep Alive requests in the UI
+     - Battery icon/popup text in the UI is now (finally) kept in sync
+     - Driver readiness for Health Checks and Keep Alive requests in the UI
 
     **Changes**
-     - Improvements to node redynees in the UI
+     - Improvements to node readiness in the UI
      - Bump ZWJS to 8.11.0  
 
 
@@ -15,8 +51,8 @@
 
     **New Features**
      - Added the ability to keep a node awake via the UI
-     - Added a new method in the UI to report the health of a nodes conection to the controller.
-     - Added native camera/image capture controls for Smart Start QR Scanning on the mobile client.
+     - Added a new method in the UI to report the health of a nodes conection to the controller
+     - Added native camera/image capture controls for Smart Start QR Scanning on the mobile client
     
     **Changes**
      - Replace **EventEmitter** with an internal instance - to address a **MaxListenersExceeded** warning.

package/README.md

@@ -1,4 +1,4 @@
-![Image](./resources/ReadMe.png)  
+![Image](./GHImages/ReadMe.png)  
 
 # node-red-contrib-zwave-js
 
@@ -37,13 +37,13 @@ Since `node-red-contrib-zwave-js` is based on [Z-Wave JS](https://zwave-js.githu
 
 ### The User Interface
 
-![Image](./resources/ZWUI.gif) 
+![Image](./GHImages/ZWUI.gif) 
 
 Included with the contrib is a [user interface](https://github.com/zwave-js/node-red-contrib-zwave-js/wiki/User-Interface) where Z-Wave network management is handled. The controller side of the UI is used to include/exclude devices, heal the network, update firmware, and view the network map for diagnosing problems. The device side of the UI is used to configure devices, manage associations, and provide setup help for the nodes which will be used in your flows.
 
 ### The Nodes
 
-![Image](./resources/Demo.png)
+![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

package/examples/Full Example.json

@@ -0,0 +1 @@
+[{"id":"2f2f5384cf841491","type":"tab","label":"Full Example","disabled":false,"info":"","env":[]},{"id":"159049e0f35da22b","type":"zwave-js","z":"2f2f5384cf841491","d":true,"serialPort":"Select Port","name":"Z-Wave JS Controller","encryptionKey":"","encryptionKeyS2U":"","encryptionKeyS2A":"","encryptionKeyS2AC":"","ackTimeout":"","controllerTimeout":"","sendResponseTimeout":"","sendDataCallback":"","serialAPIStarted":"","logLevelPin":"none","logLevel":"none","logFile":"","logNodeFilter":"","sendUsageStatistics":true,"valueCacheDiskThrottle":"normal","customConfigPath":"","intvwUserCodes":false,"softResetUSB":false,"outputs":1,"disableOptimisticValueUpdate":false,"x":700,"y":160,"wires":[["21a01062cb3b9839"]]},{"id":"68dc316395696ed4","type":"comment","z":"2f2f5384cf841491","name":"Controller Node (Read Me)","info":"The controller node : **zwave-js**  \nis the main node. It is the node that all communication is passed.\n\nThis node supports all commands.  \n\nTo set it up, double click and select your serial port,  \nand if using security, provide your encryption keys (or generate new ones)\n\n**NOTE:** Only 1 copy of this node can be deployed.  \nThis node has been disabled, as to not affect any setup you may have already achieved.","x":710,"y":120,"wires":[]},{"id":"6dcd0dc03e0c3559","type":"zwave-device","z":"2f2f5384cf841491","name":"Some Z-Wave Device","filteredNodeId":"All","multicast":false,"datamode":"Send/Receive","messagesPerMS":1,"messageInterval":250,"isolated":false,"outputs":1,"inputs":1,"showStatus":true,"x":860,"y":380,"wires":[["dbb0e87b15b2fd3c"]]},{"id":"dcd9a6bacdcab86b","type":"comment","z":"2f2f5384cf841491","name":"Zwave Device (Read Me)","info":"A single, or mulitple zwave device : **zwave-device**.  \nThis node can represent one or multiple zwave devices.  \n\nIt communicates with the main **zwave-js** node.\n\nMany copies of this node can be deployed.","x":870,"y":340,"wires":[]},{"id":"42b77dc6dca017d8","type":"function","z":"2f2f5384cf841491","name":"Command","func":"// Changing a Binary Switch State (to true) on node 5\n// You can obtain a ValueID - by double clicking a value title in the UI\n\nlet ValueID = {\n    \"commandClassName\": \"Binary Switch\",\n    \"commandClass\": 37,\n    \"endpoint\": 0,\n    \"property\": \"targetValue\",\n    \"propertyName\": \"targetValue\"\n}\nlet Message = {\n    \"payload\": {\n        \"mode\": \"ValueAPI\",\n        \"node\": 5,/* This can be omitted, if your device node is set to Specific Node */\n        \"method\": \"setValue\",\n        \"params\": [ValueID,true]\n    }\n}\nreturn Message","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":430,"y":380,"wires":[["6dcd0dc03e0c3559","59b4cf7d6f673102"]]},{"id":"80583e90febe9a15","type":"inject","z":"2f2f5384cf841491","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","x":240,"y":380,"wires":[["42b77dc6dca017d8"]]},{"id":"c09caf2bfa47f0f4","type":"comment","z":"2f2f5384cf841491","name":"Manually constructing commands","info":"","x":320,"y":340,"wires":[]},{"id":"a34dcb38a73f4bc4","type":"comment","z":"2f2f5384cf841491","name":"Commands can be sent directly to the controler","info":"","x":460,"y":240,"wires":[]},{"id":"31396cd9b583e1d7","type":"cmd-factory","z":"2f2f5384cf841491","name":"ZWave CMD Factory","node":"Node","endpoint":"","cc":"Select Command Class","method":"Select Method","params":"payload","noEvent":false,"forceUpdate":"forceUpdate","api":"ValueAPI","vapiMode":"setValue","vapiValue":"Value","vapiValueId":"ValueID","vapiOptions":"","x":660,"y":540,"wires":[["6dcd0dc03e0c3559"]]},{"id":"d4cc366646c4013d","type":"comment","z":"2f2f5384cf841491","name":"Constructing commands with CMD-Factory","info":"","x":350,"y":500,"wires":[]},{"id":"8fb56f9d226bef12","type":"function","z":"2f2f5384cf841491","name":"Command Values","func":"// Node, ValueID and Value are referenced in the CMD Factory.\n// It uses JSONata so can be highly configurable.\n\n\nmsg.Node = 5;\nmsg.ValueID = {\n    \"commandClassName\": \"Binary Switch\",\n    \"commandClass\": 37,\n    \"endpoint\": 0,\n    \"property\": \"targetValue\",\n    \"propertyName\": \"targetValue\"\n};\nmsg.Value = false;\n\nreturn msg;","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":430,"y":540,"wires":[["31396cd9b583e1d7"]]},{"id":"83159be8b5438fc4","type":"inject","z":"2f2f5384cf841491","name":"","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"","payload":"","payloadType":"date","x":240,"y":540,"wires":[["8fb56f9d226bef12"]]},{"id":"dbb0e87b15b2fd3c","type":"event-filter","z":"2f2f5384cf841491","name":"ZWave Event Filter","filters":[{"index":0,"name":"Temp Changes","valueIds":[{"commandClassName":"Multilevel Sensor","commandClass":49,"endpoint":0,"property":"Air temperature","propertyName":"Air temperature"}],"events":["VALUE_UPDATED"],"strict":false,"id":"210290","_id":0},{"index":1,"name":"Light Level Changes","valueIds":[{"commandClassName":"Multilevel Sensor","commandClass":49,"endpoint":0,"property":"Illuminance","propertyName":"Illuminance"}],"events":["VALUE_UPDATED"],"strict":false,"id":"293826","_id":1}],"outputs":2,"changeDate":"2022-02-01T16:55:32.003Z","showStatus":true,"x":1210,"y":380,"wires":[["899af27929142c45"],["f7d66b6a07aa4868"]]},{"id":"f662f69f25a23e83","type":"comment","z":"2f2f5384cf841491","name":"Event Filter (Read Me)","info":"A node to split/ route events : **event-filter**.  \nThis node can direct various events and ValueIDs out to different paths.  \n\nEach filter can group 1 or more ValueIDs - you can add them from the UI.  \ndouble click a value title and choose 'Add To Filter Set' whilst a filter set is  expaned","x":1220,"y":340,"wires":[]},{"id":"59b4cf7d6f673102","type":"change","z":"2f2f5384cf841491","name":"","rules":[],"action":"","property":"","from":"","to":"","reg":false,"x":555,"y":160,"wires":[[]],"l":false},{"id":"899af27929142c45","type":"function","z":"2f2f5384cf841491","name":"Do something with temp change value","func":"const Temp = msg.payload.object.newValue","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":1530,"y":340,"wires":[[]]},{"id":"f7d66b6a07aa4868","type":"function","z":"2f2f5384cf841491","name":"Do something with light level change value","func":"const Lux = msg.payload.object.newValue","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":1550,"y":400,"wires":[[]]},{"id":"21a01062cb3b9839","type":"change","z":"2f2f5384cf841491","name":"","rules":[],"action":"","property":"","from":"","to":"","reg":false,"x":1075,"y":360,"wires":[[]],"l":false},{"id":"a13f0bc39b98b13e","type":"comment","z":"2f2f5384cf841491","name":"The controller also emits all events","info":"","x":960,"y":240,"wires":[]}]

package/package.json

@@ -1,25 +1,25 @@
 {
 	"name": "node-red-contrib-zwave-js",
-	"version": "6.5.1",
+	"version": "6.5.5",
 	"license": "MIT",
 	"description": "An extremely powerful, easy to use, and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
 	"dependencies": {
-		"express": "^4.17.2",
 		"limiter": "^2.1.0",
 		"lodash": "^4.17.21",
 		"serialport": "9.2.8",
-		"winston": "^3.4.0",
+		"winston": "^3.5.1",
 		"winston-transport": "^4.4.2",
-		"zwave-js": "^8.11.0",
-		"ip": "^1.1.5"
+		"zwave-js": "^8.11.3"
 	},
 	"devDependencies": {
-		"eslint": "^8.6.0",
+		"eslint": "^8.8.0",
 		"prettier": "^2.5.1"
 	},
+	"scripts": {
+		"validate": "node-red-dev validate -o validation_result.json"
+	},
 	"engines": {
-		"node": ">=12.22.2",
-		"npm": ">=6.14.13"
+		"node": ">=12.22.2"
 	},
 	"keywords": [
 		"node-red",
@@ -32,6 +32,7 @@
 		"home"
 	],
 	"node-red": {
+		"version": ">=2.0.0",
 		"nodes": {
 			"zwave-js": "zwave-js/zwave-js.js",
 			"zwave-device": "zwave-js/zwave-device.js",

package/{zwave-js/ui/smartstart/ui → resources/SmartStart}/Livescan.html

@@ -74,9 +74,13 @@
 		</div>
 
 		<script>
-			SendActive().then(() => {
-				Start();
-			});
+			SendActive()
+				.then(() => {
+					Start();
+				})
+				.catch((Err) => {
+					alert(Err);
+				});
 		</script>
 	</body>
 </html>

package/{zwave-js/ui/smartstart/ui → resources/SmartStart}/Scanchoice.html

@@ -18,9 +18,9 @@
 				font-size: 16px;
 			}
 		</style>
-		<script src="jquery-3.6.0.min.js"></script>
-		<script src="jsQR.js"></script>
-		<script src="scripts.js"></script>
+		<script src="./jquery-3.6.0.min.js"></script>
+		<script src="./jsQR.js"></script>
+		<script src="./scripts.js"></script>
 		<style type="text/css">
 			body {
 				font-family: HelveticaNeue-Light, Roboto;
@@ -35,15 +35,16 @@
 			Select the Camera Source Mode
 		</p>
 
+		<input type="button" value="Native (More Control)" onclick="GrabImage()" />
 		<input
+			id="LiveScanButton"
 			type="button"
-			value="Native (Slower, More Control)"
-			onclick="GrabImage()"
-		/>
-		<input
-			type="button"
-			value="Live (Faster, Less Control)"
-			onclick="location.href='Livescan.html'"
+			value="Live (Less Control, Requires SSL)"
+			onclick="location.href='./Livescan.html'"
+			style="filter: grayscale(1); pointer-events: none"
 		/>
+		<script>
+			EnableLive();
+		</script>
 	</body>
 </html>

package/{zwave-js/ui/smartstart/ui → resources/SmartStart}/scripts.js

@@ -7,15 +7,19 @@ let offset;
 const ScannedCodes = {};
 
 function GrabImage() {
-	SendActive().then(() => {
-		const FI = document.createElement('input');
-		FI.hidden = true;
-		document.body.append(FI);
-		FI.addEventListener('change', SubmitPhoto, false);
-		FI.setAttribute('type', 'file');
-		FI.setAttribute('accept', 'image/*;capture=camera');
-		FI.click();
-	});
+	SendActive()
+		.then(() => {
+			const FI = document.createElement('input');
+			FI.hidden = true;
+			document.body.append(FI);
+			FI.addEventListener('change', SubmitPhoto, false);
+			FI.setAttribute('type', 'file');
+			FI.setAttribute('accept', 'image/*;capture=camera');
+			FI.click();
+		})
+		.catch((Err) => {
+			alert(Err);
+		});
 }
 
 function SubmitPhoto(e) {
@@ -157,10 +161,18 @@ function tick() {
 	}
 }
 
-function SendActive() {
-	return new Promise((resolve) => {
-		$.ajax({ url: '/event.started', method: 'get', async: false });
-		resolve();
+async function SendActive() {
+	return new Promise((resolve, reject) => {
+		const Res = $.ajax({
+			url: '../../../../zwave-js/smartstart-event/started',
+			method: 'get',
+			async: false
+		});
+		if (Res.status === 200) {
+			resolve();
+		} else {
+			reject('Smart start is not ready.');
+		}
 	});
 }
 
@@ -204,7 +216,7 @@ function SendCode(Code, skipRender) {
 		} else {
 			let Result;
 			$.ajax({
-				url: '/event.code/' + Code.data,
+				url: '../../../../zwave-js/smartstart-event/code/' + Code.data,
 				method: 'get',
 				success: (data) => {
 					Result = data;
@@ -217,3 +229,9 @@ function SendCode(Code, skipRender) {
 		}
 	});
 }
+
+function EnableLive() {
+	if (location.protocol === 'https:') {
+		$('#LiveScanButton').css({ filter: '', pointerEvents: 'all' });
+	}
+}

package/{zwave-js/ui → resources/UITab}/client.js

@@ -25,7 +25,8 @@ const StepList = {
 	SmartStart: 10,
 	SmartStartList: 11,
 	SmartStartListEdit: 12,
-	SmartStartDone: 13
+	SmartStartDone: 13,
+	RemoveDoneUnconfirmed: 14
 };
 
 const JSONFormatter = {};
@@ -212,6 +213,7 @@ const ZwaveJsUI = (function () {
 
 	function HealthCheck() {
 		IsDriverReady();
+		IsNodeSelected();
 		const Buttons = {
 			'Yes (1 Round)': () => {
 				RenderHealthCheck(1);
@@ -233,6 +235,7 @@ const ZwaveJsUI = (function () {
 
 	function KeepAwake() {
 		IsDriverReady();
+		IsNodeSelected();
 		const Node = $(
 			".red-ui-treeList-label.zwave-js-node-row[data-nodeid='" +
 				selectedNode +
@@ -793,6 +796,13 @@ const ZwaveJsUI = (function () {
 		return $.ajax(Options);
 	}
 
+	function IsNodeSelected() {
+		if (selectedNode === undefined) {
+			modalAlert('Please select a Node.', 'No Node Selected');
+			throw new Error('No Node Selected');
+		}
+	}
+
 	function IsDriverReady() {
 		if (!DriverReady) {
 			modalAlert(
@@ -1268,6 +1278,7 @@ const ZwaveJsUI = (function () {
 
 	function RenameNode(KB, El) {
 		IsDriverReady();
+		IsNodeSelected();
 		let input;
 		let Button;
 		if (KB === true) {
@@ -1302,6 +1313,7 @@ const ZwaveJsUI = (function () {
 
 	function SetNodeLocation(KB, El) {
 		IsDriverReady();
+		IsNodeSelected();
 		let input;
 		let Button;
 		if (KB === true) {
@@ -1350,6 +1362,7 @@ const ZwaveJsUI = (function () {
 	}
 
 	function OpenDB() {
+		IsNodeSelected();
 		const info =
 			$(`.zwave-js-node-row.selected`).data('info')?.deviceConfig || {};
 		const id = [
@@ -1379,6 +1392,7 @@ const ZwaveJsUI = (function () {
 					if (err.status !== 504) {
 						modalAlert(err.responseText, 'Could Not Remove Node');
 					}
+
 					Removing = false;
 				});
 			}
@@ -1604,6 +1618,7 @@ const ZwaveJsUI = (function () {
 			.css('min-width', '125px')
 			.click(() => {
 				IsDriverReady();
+				IsNodeSelected();
 				InterviewNode();
 			})
 			.html('Interview Node')
@@ -1615,6 +1630,7 @@ const ZwaveJsUI = (function () {
 			.css('min-width', '125px')
 			.click(() => {
 				IsDriverReady();
+				IsNodeSelected();
 				StartNodeHeal();
 			})
 			.html('Heal Node')
@@ -1628,6 +1644,7 @@ const ZwaveJsUI = (function () {
 			.css('min-width', '125px')
 			.click(() => {
 				IsDriverReady();
+				IsNodeSelected();
 				RemoveFailedNode();
 			})
 			.html('Remove Failed Node')
@@ -1638,6 +1655,7 @@ const ZwaveJsUI = (function () {
 			.css('min-width', '125px')
 			.click(() => {
 				IsDriverReady();
+				IsNodeSelected();
 				ShowReplacePrompt();
 			})
 			.html('Replace Failed Node')
@@ -1651,6 +1669,7 @@ const ZwaveJsUI = (function () {
 			.css('min-width', '125px')
 			.click(() => {
 				IsDriverReady();
+				IsNodeSelected();
 				AssociationMGMT();
 			})
 			.html('Association Management')
@@ -1661,6 +1680,7 @@ const ZwaveJsUI = (function () {
 			.css('min-width', '125px')
 			.click(() => {
 				IsDriverReady();
+				IsNodeSelected();
 				getProperties();
 			})
 			.html('Refresh Property List')
@@ -1741,6 +1761,7 @@ const ZwaveJsUI = (function () {
 		$('#zwave-js-controller-status').html(data.status);
 	}
 
+	let RemovedShown = false;
 	function handleControllerEvent(topic, data) {
 		switch (data.type) {
 			case 'node-collection-change':
@@ -1759,9 +1780,11 @@ const ZwaveJsUI = (function () {
 					$('#IEButton').text('Close');
 				}
 				if (data.event === 'node removed') {
+					RemovedShown = true;
 					ClearIETimer();
 					ClearSecurityCountDown();
 					GetNodes();
+					selectedNode = undefined;
 					StepsAPI.setStepIndex(StepList.RemoveDone);
 					$('#IEButton').text('Close');
 				}
@@ -1769,11 +1792,13 @@ const ZwaveJsUI = (function () {
 
 			case 'node-inclusion-step':
 				if (data.event === 'grant security') {
+					$('#IEButton').text('Abort S2 Bootstrap');
 					ListRequestedClass(data.classes);
 					ClearIETimer();
 					StartSecurityCountDown();
 				}
 				if (data.event === 'verify dsk') {
+					$('#IEButton').text('Abort S2 Bootstrap');
 					DisplayDSK(data.dsk);
 					ClearIETimer();
 					StartSecurityCountDown();
@@ -1785,6 +1810,15 @@ const ZwaveJsUI = (function () {
 				if (data.event === 'exclusion started') {
 					StepsAPI.setStepIndex(StepList.Remove);
 					StartIECountDown();
+					RemovedShown = false;
+				}
+				if (data.event === 'exclusion stopped') {
+					if (!RemovedShown) {
+						ClearIETimer();
+						ClearSecurityCountDown();
+						StepsAPI.setStepIndex(StepList.RemoveDoneUnconfirmed);
+						$('#IEButton').text('Close');
+					}
 				}
 				if (data.event === 'aborted') {
 					StepsAPI.setStepIndex(StepList.Aborted);

package/validation_result.json

@@ -0,0 +1,18 @@
+{
+	"package": { "name": "node-red-contrib-zwave-js", "version": "6.5.4" },
+	"P01": { "test": true, "license": "MIT" },
+	"P03": { "test": true },
+	"P04": { "test": true },
+	"P08": { "test": true },
+	"P05": { "test": true },
+	"P06": { "test": true, "versions": ["2.2.0"] },
+	"P07": { "test": false, "version": ">=12.22.2" },
+	"N01": { "test": true },
+	"N02": {
+		"test": true,
+		"nodes": ["zwave-js", "zwave-device", "event-filter", "cmd-factory"]
+	},
+	"D01": { "test": true, "total": 6 },
+	"D02": { "test": true },
+	"D03": { "test": true }
+}

package/zwave-js/cmd-factory.html

@@ -23,7 +23,8 @@
 		label: function () {
 			return this.name;
 		},
-		oneditprepare: SortUI
+		oneditprepare: SortUI,
+		paletteLabel: 'cmd-factory'
 	});
 
 	function GoToInfo() {

package/zwave-js/event-filter.html

@@ -9,7 +9,8 @@
 			name: { value: 'ZWave Event Filter' },
 			filters: { value: [] },
 			outputs: { value: 0 },
-			changeDate: { value: undefined }
+			changeDate: { value: undefined },
+			showStatus: { value: true }
 		},
 		inputs: 1,
 		outputs: 0,
@@ -25,7 +26,8 @@
 		},
 		outputLabels: function (index) {
 			return this.filters[index].name;
-		}
+		},
+		paletteLabel: 'event-filter'
 	});
 
 	function compare(a, b) {
@@ -257,6 +259,10 @@
 	      <label for="node-input-name" style="width:130px"><i class="fa fa-pencil"></i> Name</label>
 	      <input type="text" id="node-input-name" placeholder="Filter Name">
 	  </div>
+	  <div class="form-row">
+	    <label for="node-input-showStatus" style="width:130px"><i class="fa fa-pencil"></i> Show Status</label>
+	    <input type="checkbox" id="node-input-showStatus" />
+	</div>
 
 	  <div>
 	      <ol id="filtersets" style="min-height:450px;min-width:400px"> </ol>

package/zwave-js/event-filter.js

@@ -5,6 +5,20 @@ module.exports = function (RED) {
 		RED.nodes.createNode(this, config);
 		const node = this;
 
+		function UpdateStatus(Color, Shape, Text) {
+			if (config.showStatus === undefined || config.showStatus) {
+				node.status({
+					fill: Color,
+					shape: Shape,
+					text: Text
+				});
+			} else {
+				node.status({});
+			}
+		}
+
+		node.status({});
+
 		node.on('input', Input);
 
 		function compare(a, b) {
@@ -46,11 +60,8 @@ module.exports = function (RED) {
 									) {
 										msg.filter = Filter;
 										SendingArray[ArrayIndex] = msg;
-										node.status({
-											fill: 'green',
-											shape: 'dot',
-											text: 'Last match: ' + Filter.name
-										});
+										UpdateStatus('green', 'dot', 'Last match: ' + Filter.name);
+
 										send(SendingArray);
 										Matched = true;
 										break;
@@ -62,11 +73,8 @@ module.exports = function (RED) {
 							} else {
 								msg.filter = Filter;
 								SendingArray[ArrayIndex] = msg;
-								node.status({
-									fill: 'green',
-									shape: 'dot',
-									text: 'Last match: ' + Filter.name
-								});
+								UpdateStatus('green', 'dot', 'Last match: ' + Filter.name);
+
 								Matched = true;
 								send(SendingArray);
 								break;
@@ -76,18 +84,10 @@ module.exports = function (RED) {
 				}
 
 				if (!Matched) {
-					node.status({
-						fill: 'yellow',
-						shape: 'dot',
-						text: 'No match'
-					});
+					UpdateStatus('yellow', 'dot', 'No match');
 				}
 			} else {
-				node.status({
-					fill: 'red',
-					shape: 'dot',
-					text: 'Not a ZWave message'
-				});
+				UpdateStatus('red', 'dot', 'Not a ZWave message');
 			}
 
 			if (done) {

package/zwave-js/ui/server.js

@@ -1,4 +1,3 @@
-const express = require('express');
 const SP = require('serialport');
 const ModulePackage = require('../../package.json');
 const { CommandClasses } = require('@zwave-js/core');
@@ -244,9 +243,6 @@ module.exports = {
 			}
 		);
 
-		/* Res */
-		RED.httpAdmin.use('/zwave-js/res', express.static(__dirname));
-
 		// Frimware
 		RED.httpAdmin.post(
 			'/zwave-js/firmwareupdate/:code',
@@ -284,13 +280,14 @@ module.exports = {
 		);
 
 		// Smart Start
+		SmartStart.Prep(RED.httpAdmin);
 		RED.httpAdmin.get(
 			'/zwave-js/smartstart/:Method',
 			RED.auth.needsPermission('flows.write'),
 			async (req, res) => {
 				switch (req.params.Method) {
 					case 'startserver':
-						SmartStart.Start(SmartStartCallback).then((QRCode) => {
+						SmartStart.Start(SmartStartCallback, req).then((QRCode) => {
 							res.status(200);
 							res.end(QRCode);
 						});
@@ -413,6 +410,13 @@ module.exports = {
 				});
 			});
 
+			_Context.controller.on('exclusion stopped', () => {
+				_RED.comms.publish(`/zwave-js/cmd`, {
+					type: 'node-inclusion-step',
+					event: 'exclusion stopped'
+				});
+			});
+
 			_Context.controller.on('node added', (N, IR) => {
 				WireNodeEvents(N);
 				_RED.comms.publish(`/zwave-js/cmd`, {

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

@@ -1,60 +1,55 @@
-const express = require('express');
-const https = require('https');
-const fs = require('fs');
-const path = require('path');
-const ip = require('ip');
-
-let App;
-let Server;
 let _Callback;
+let _Enabled = false;
 
-const Options = {
-	pfx: fs.readFileSync(path.join(__dirname, 'certificate.p12')),
-	passphrase: 'password1'
+const Prep = (HTTPAdmin) => {
+	HTTPAdmin.get('/zwave-js/smartstart-event/started', SendStarted);
+	HTTPAdmin.get('/zwave-js/smartstart-event/code/:Code', ParseCode);
 };
 
-const Start = (Callback) => {
+const CheckStatus = (res) => {
+	if (_Enabled) {
+		return true;
+	} else {
+		res.sendStatus(503).end();
+		return false;
+	}
+};
+
+const Start = (Callback, Req) => {
 	_Callback = Callback;
-	App = express();
-	App.use(express.static(path.join(__dirname, 'ui')));
-	App.get('/event.started', SendStarted);
-	App.get('/event.code/:Code', ParseCode);
-	Server = https.createServer(Options, App);
+	_Enabled = true;
 
+	const Secure = Req.connection.encrypted !== undefined;
+	const Prot = Secure ? 'https://' : 'http://';
 	return new Promise((resolve) => {
-		Server.listen(0, () => {
-			resolve(
-				'https://' +
-					ip.address() +
-					':' +
-					Server.address().port +
-					'/Scanchoice.html'
-			);
-		});
+		resolve(
+			`${Prot}${Req.headers.host}/resources/node-red-contrib-zwave-js/SmartStart/Scanchoice.html`
+		);
 	});
 };
 
 function SendStarted(req, res) {
-	_Callback('Started');
-	res.status(200);
-	res.end();
+	if (CheckStatus(res)) {
+		_Callback('Started');
+		res.status(200);
+		res.end();
+	}
 }
 
 function ParseCode(req, res) {
-	const Result = _Callback('Code', req.params.Code);
-	res.status(200);
-	res.end(Result.toString());
+	if (CheckStatus(res)) {
+		const Result = _Callback('Code', req.params.Code);
+		res.status(200);
+		res.end(Result.toString());
+	}
 }
 
 const Stop = () => {
-	if (Server !== undefined) {
-		Server.close();
-		Server = undefined;
-		App = undefined;
-	}
+	_Enabled = false;
 };
 
 module.exports = {
 	Start: Start,
-	Stop: Stop
+	Stop: Stop,
+	Prep: Prep
 };

package/zwave-js/zwave-device.html

@@ -11,7 +11,8 @@
 			messageInterval: { value: 250 },
 			isolated: { value: false },
 			outputs: { value: 1 },
-			inputs: { value: 1 }
+			inputs: { value: 1 },
+			showStatus: { value: true }
 		},
 		inputs: 1,
 		outputs: 1,
@@ -20,7 +21,8 @@
 			return this.name;
 		},
 		oneditprepare: SortUI,
-		oneditsave: SetIO
+		oneditsave: SetIO,
+		paletteLabel: 'zwave-device'
 	});
 
 	function SetIO() {
@@ -287,6 +289,10 @@
 	    <select id="node-input-filteredNodeId">
 	    </select>
 	</div>
+	<div class="form-row">
+	    <label for="node-input-showStatus" style="width:130px"><i class="fa fa-pencil"></i> Show Status</label>
+	    <input type="checkbox" id="node-input-showStatus" />
+	</div>
 	<div class="form-tips" id="node-tip">
 		    Note: This node works in conjunction with the main Z-Wave JS Controller node, therefore, ensure the controller node is in one of your flows and in a deployed state before using this node.
 		</div>

package/zwave-js/zwave-device.js

@@ -6,6 +6,18 @@ module.exports = function (RED) {
 		RED.nodes.createNode(this, config);
 		const RedNode = this;
 
+		function UpdateStatus(Color, Shape, Text) {
+			if (config.showStatus === undefined || config.showStatus) {
+				RedNode.status({
+					fill: Color,
+					shape: Shape,
+					text: Text
+				});
+			} else {
+				RedNode.status({});
+			}
+		}
+
 		const LimiterSettings = {
 			tokensPerInterval: 1,
 			interval: 250
@@ -73,18 +85,10 @@ module.exports = function (RED) {
 			}
 			if (config.multicast) {
 				DeviceMode = 'Multicast';
-				RedNode.status({
-					fill: 'green',
-					shape: 'dot',
-					text: 'Mode: Mulitcast'
-				});
+				UpdateStatus('green', 'dot', 'Mode: Multicast');
 			} else {
 				DeviceMode = 'Multiple';
-				RedNode.status({
-					fill: 'green',
-					shape: 'dot',
-					text: 'Mode: Multiple'
-				});
+				UpdateStatus('green', 'dot', 'Mode: Multiple');
 			}
 		} else if (!isNaN(config.filteredNodeId)) {
 			DeviceMode = 'Specific';
@@ -94,24 +98,20 @@ module.exports = function (RED) {
 					processEventMessage
 				);
 			}
-			RedNode.status({
-				fill: 'green',
-				shape: 'dot',
-				text: `Mode: Specific Node (${config.filteredNodeId})`
-			});
+			UpdateStatus(
+				'green',
+				'dot',
+				`Mode: Specific Node (${config.filteredNodeId})`
+			);
 		} else if (config.filteredNodeId === 'All') {
 			DeviceMode = 'All';
 			if (Out) {
 				NodeEventEmitter.on('zwjs:node:event:all', processEventMessage);
 			}
-			RedNode.status({ fill: 'green', shape: 'dot', text: 'Mode: All Nodes' });
+			UpdateStatus('green', 'dot', 'Mode: All Nodes');
 		} else if (config.filteredNodeId === 'AS') {
 			DeviceMode = 'AS';
-			RedNode.status({
-				fill: 'green',
-				shape: 'dot',
-				text: 'Mode: As Specifed (Waiting)'
-			});
+			UpdateStatus('yellow', 'dot', 'Mode: As Specified (Waiting)');
 		}
 
 		function processEventMessage(MSG) {
@@ -157,11 +157,7 @@ module.exports = function (RED) {
 								);
 							}
 							DynamicIDListener = Node;
-							RedNode.status({
-								fill: 'green',
-								shape: 'dot',
-								text: `Mode: As Specifed (${Node})`
-							});
+							UpdateStatus('green', 'dot', `Mode: As Specified (${Node})`);
 						}
 						break;
 
@@ -200,21 +196,14 @@ module.exports = function (RED) {
 
 				if (DeviceMode === 'Multiple' && msg.payload.node === undefined) {
 					for (let i = 0; i < config.filteredNodeId.length; i++) {
-						RedNode.status({
-							fill: 'yellow',
-							shape: 'dot',
-							text: 'Mode: Multiple (Throttling)'
-						});
+						UpdateStatus('yellow', 'dot', 'Mode: Multiple (Throttling)');
+
 						await RateLimiter.removeTokens(1);
 						const TR = LD.cloneDeep(msg);
 						TR.payload.node = parseInt(config.filteredNodeId[i]);
 						NodeEventEmitter.emit('zwjs:node:command', TR);
 					}
-					RedNode.status({
-						fill: 'green',
-						shape: 'dot',
-						text: 'Mode: Multiple'
-					});
+					UpdateStatus('green', 'dot', 'Mode: Multiple');
 				} else {
 					NodeEventEmitter.emit('zwjs:node:command', msg);
 				}

package/zwave-js/zwave-js.html

@@ -1,15 +1,36 @@
-<script type="text/javascript" src="zwave-js/res/handlebars.min.js"></script>
+<script
+	type="text/javascript"
+	src="resources/node-red-contrib-zwave-js/UITab/handlebars.min.js"
+></script>
 <script>
 	Handlebars.registerHelper('inc', function (value, options) {
 		return parseInt(value) + 1;
 	});
 </script>
-<script type="text/javascript" src="zwave-js/res/client.js"></script>
-<script type="text/javascript" src="zwave-js/res/vis-network.min.js"></script>
-<script type="text/javascript" src="zwave-js/res/jquery-steps.min.js"></script>
-<script type="text/javascript" src="zwave-js/res/qrcode.min.js"></script>
-<link rel="stylesheet" href="zwave-js/res/styles.css" />
-<link rel="stylesheet" href="zwave-js/res/jquery-steps.css" />
+<script
+	type="text/javascript"
+	src="resources/node-red-contrib-zwave-js/UITab/client.js"
+></script>
+<script
+	type="text/javascript"
+	src="resources/node-red-contrib-zwave-js/UITab/vis-network.min.js"
+></script>
+<script
+	type="text/javascript"
+	src="resources/node-red-contrib-zwave-js/UITab/jquery-steps.min.js"
+></script>
+<script
+	type="text/javascript"
+	src="resources/node-red-contrib-zwave-js/UITab/qrcode.min.js"
+></script>
+<link
+	rel="stylesheet"
+	href="resources/node-red-contrib-zwave-js/UITab/styles.css"
+/>
+<link
+	rel="stylesheet"
+	href="resources/node-red-contrib-zwave-js/UITab/jquery-steps.css"
+/>
 
 <!-- templates used for modal dialogs *-->
 
@@ -108,6 +129,7 @@
 			<li data-step-target='SmartStartList'></li>
 			<li data-step-target='SmartStartListEdit'></li>
 			<li data-step-target='SmartStartDone'></li>
+			<li data-step-target='RemoveDoneUnconfirmed'></li>
 		</ul>
 		<div class='step-content' style='border: none;'>
 			<!-- Secuity Mode-->
@@ -205,7 +227,10 @@
 				<table style='width: 100%; height: 290px;'>
 					<tr>
 						<td style='text-align: center;'>
-							<img src='zwave-js/res/Include.png' width='200px' />
+							<img
+								src='resources/node-red-contrib-zwave-js/UITab/Include.png'
+								width='200px'
+							/>
 						</td>
 					</tr>
 					<tr>
@@ -229,7 +254,10 @@
 				<table style='width: 100%; height: 290px;'>
 					<tr>
 						<td style='text-align: center;'>
-							<img src='zwave-js/res/Exclude.png' width='200px' />
+							<img
+								src='resources/node-red-contrib-zwave-js/UITab/Exclude.png'
+								width='200px'
+							/>
 						</td>
 					</tr>
 					<tr>
@@ -387,7 +415,10 @@
 				<table style='width: 100%; height: 290px;'>
 					<tr>
 						<td style='text-align: center;'>
-							<img src='zwave-js/res/NodeAdded.png' width='200px' />
+							<img
+								src='resources/node-red-contrib-zwave-js/UITab/NodeAdded.png'
+								width='200px'
+							/>
 						</td>
 					</tr>
 					<tr>
@@ -405,7 +436,10 @@
 				<table style='width: 100%; height: 290px;'>
 					<tr>
 						<td style='text-align: center;'>
-							<img src='zwave-js/res/NodeAddedInsecure.png' width='200px' />
+							<img
+								src='resources/node-red-contrib-zwave-js/UITab/NodeError.png'
+								width='200px'
+							/>
 						</td>
 					</tr>
 					<tr>
@@ -424,7 +458,10 @@
 				<table style='width: 100%; height: 290px;'>
 					<tr>
 						<td style='text-align: center;'>
-							<img src='zwave-js/res/NodeRemoved.png' width='200px' />
+							<img
+								src='resources/node-red-contrib-zwave-js/UITab/NodeRemoved.png'
+								width='200px'
+							/>
 						</td>
 					</tr>
 					<tr>
@@ -478,7 +515,10 @@
 				<table style='width: 100%; height: 290px;'>
 					<tr>
 						<td style='text-align: center;'>
-							<img src='zwave-js/res/NodeAddedInsecure.png' width='200px' />
+							<img
+								src='resources/node-red-contrib-zwave-js/UITab/NodeError.png'
+								width='200px'
+							/>
 						</td>
 					</tr>
 					<tr>
@@ -586,6 +626,24 @@
 					broadcast has been recieved, the device should get interviewed and
 					added to your network.</p>
 			</div>
+			<!--Remove Done Uncofirmed-->
+			<div class='step-tab-panel' data-step='RemoveDoneUnconfirmed'>
+				<br />
+				<table style='width: 100%; height: 290px;'>
+					<tr>
+						<td style='text-align: center;'>
+							<img
+								src='resources/node-red-contrib-zwave-js/UITab/NodeError.png'
+								width='200px'
+							/>
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: center;'>Node exclusion has finished.<br />No
+							nodes were removed from this network.</td>
+					</tr>
+				</table>
+			</div>
 		</div>
 	</div>
 </script>
@@ -856,7 +914,8 @@
 			customConfigPath: { value: undefined },
 			intvwUserCodes: { value: false },
 			softResetUSB: { value: false },
-			outputs: { value: 1 }
+			outputs: { value: 1 },
+			disableOptimisticValueUpdate: { value: false }
 		},
 		inputs: 1,
 		outputs: 1,
@@ -866,7 +925,8 @@
 		},
 		onpaletteadd: ZwaveJsUI.init,
 		oneditprepare: SortUI,
-		oneditsave: SortIO
+		oneditsave: SortIO,
+		paletteLabel: 'zwave-js'
 	});
 
 	function SortIO() {
@@ -1058,6 +1118,10 @@
 	        <option value="fast">Fast</option>
 	    </select>
 	</div>
+	<div class="form-row">
+	    <label  for="node-input-disableOptimisticValueUpdate" style="width:130px"><i class="fa fa-pencil"></i> No Optimistic</label>
+	    <input type="checkbox" id="node-input-disableOptimisticValueUpdate">
+	</div>
 	<div class="form-row">
 	    <label  for="node-input-intvwUserCodes" style="width:130px"><i class="fa fa-pencil"></i> Lock Code Intvw</label>
 	    <input type="checkbox" id="node-input-intvwUserCodes">

package/zwave-js/zwave-js.js

@@ -221,6 +221,41 @@ module.exports = function (RED) {
 			DriverOptions.interview = {
 				queryAllUserCodes: true
 			};
+		} else {
+			Log(
+				'debug',
+				'NDERED',
+				undefined,
+				'[options] [interview.queryAllUserCodes]',
+				'Disabled'
+			);
+			DriverOptions.interview = {
+				queryAllUserCodes: false
+			};
+		}
+
+		// Optimsitic Value Updates
+		if (
+			config.disableOptimisticValueUpdate !== undefined &&
+			config.disableOptimisticValueUpdate
+		) {
+			Log(
+				'debug',
+				'NDERED',
+				undefined,
+				'[options] [disableOptimisticValueUpdate]',
+				'Enabled'
+			);
+			DriverOptions.disableOptimisticValueUpdate = true;
+		} else {
+			Log(
+				'debug',
+				'NDERED',
+				undefined,
+				'[options] [disableOptimisticValueUpdate]',
+				'Disabled'
+			);
+			DriverOptions.disableOptimisticValueUpdate = false;
 		}
 
 		// Soft Reset
@@ -440,21 +475,25 @@ module.exports = function (RED) {
 				'Cleaning up...'
 			);
 			UI.unregister();
-			Driver.destroy();
-			NodeEventEmitter.removeListener('zwjs:node:command', processMessageEvent);
-			if (Logger !== undefined) {
-				Logger.clear();
-				Logger = undefined;
-			}
-			if (Pin2Transport !== undefined) {
-				Pin2Transport = undefined;
-			}
-			if (FileTransport !== undefined) {
-				FileTransport = undefined;
-			}
-			if (done) {
-				done();
-			}
+			Driver.destroy().then(() => {
+				NodeEventEmitter.removeListener(
+					'zwjs:node:command',
+					processMessageEvent
+				);
+				if (Logger !== undefined) {
+					Logger.clear();
+					Logger = undefined;
+				}
+				if (Pin2Transport !== undefined) {
+					Pin2Transport = undefined;
+				}
+				if (FileTransport !== undefined) {
+					FileTransport = undefined;
+				}
+				if (done) {
+					done();
+				}
+			});
 		});
 
 		RedNode.on('input', Input);