From ff10db44166a0f92f0f792a4eb03761876c3ab78 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 24 Aug 2021 21:13:42 +0100
Subject: [PATCH 01/70] 5.1.0

---
 CHANGELOG.md           | 11 +++++++++++
 package.json           |  2 +-
 zwave-js/zwave-js.html | 13 ++++++++++++-
 zwave-js/zwave-js.js   | 29 ++++++++++++++++++++++++-----
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56187c3d..3c9a7efb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
   # node-red-contrib-zwave-js Change Log
 
+  - 5.1.0
+     **New Features**
+     - Added a new **event-filter** node, allowing node events to be filter with ease.
+     - Added the ability to pipe log messages to a 2nd output pin of the Controller Node
+
+     **Fixes**
+     - Fix phantom parentheses in node location.
+
+     **Changes**
+     - Improvements to S2 paring wizard.
+
    - 5.0.0
 
      **Breaking Changes**
diff --git a/package.json b/package.json
index 8ab628c4..b4d384e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-zwave-js",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "license": "MIT",
   "description": "An extremely easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
   "dependencies": {
diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html
index 96d032dd..579f4e28 100644
--- a/zwave-js/zwave-js.html
+++ b/zwave-js/zwave-js.html
@@ -359,6 +359,7 @@
                 ackTimeout: { value: undefined },
                 controllerTimeout: { value: undefined },
                 sendResponseTimeout: { value: undefined },
+                logLevelPin: { value: "none" },
                 logLevel: { value: "none" },
                 logFile: { value: undefined },
                 logNodeFilter: { value: undefined },
@@ -501,7 +502,17 @@
         <strong>Z-Wave JS Logging</strong>
     </p>
     <div class="form-row">
-        <label  for="node-input-logLevel" style="width:130px"><i class="fa fa-pencil"></i> Log Level</label>
+        <label  for="node-input-logLevelPin" style="width:130px"><i class="fa fa-pencil"></i> Level (Pin 2)</label>
+        <select id="node-input-logLevelPin">
+            <option value="none">Logging Disabled</option>
+            <option value="error">Error</option>
+            <option value="warn">Warn</option>
+            <option value="info">Info</option>
+            <option value="verbose">Verbose</option>
+            <option value="debug">Debug</option>
+            <option value="silly">Silly</option>
+        </select>
+        <label  for="node-input-logLevel" style="width:130px"><i class="fa fa-pencil"></i> Level (File)</label>
         <select id="node-input-logLevel">
             <option value="none">Logging Disabled</option>
             <option value="error">Error</option>
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index ffda1c8d..27329913 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -22,6 +22,7 @@ module.exports = function (RED) {
         let Driver;
         let Logger;
         let FileTransport;
+        let StreamTransport;
 
         const MaxDriverAttempts = 3;
         let DriverAttempts = 0;
@@ -95,10 +96,12 @@ module.exports = function (RED) {
             }, 5000);
         }
 
-        // Create Logger (if enabled)
-        if (config.logLevel !== 'none') {
+        // Create Logger (if needed)
+        if (config.logLevel !== 'none' || config.logLevelPin !== 'none') {
             Logger = Winston.createLogger();
+        }
 
+        if(config.logLevel !== 'none'){
             const FileTransportOptions = {
                 filename: Path.join(RED.settings.userDir, 'zwave-js-log.txt'),
                 format: createDefaultTransportFormat(false, false),
@@ -107,11 +110,22 @@ module.exports = function (RED) {
             if (config.logFile !== undefined && config.logFile.length > 0) {
                 FileTransportOptions.filename = config.logFile;
             }
-
             FileTransport = new Winston.transports.File(FileTransportOptions);
             Logger.add(FileTransport);
         }
 
+        if(config.logLevelPin !== 'none'){
+            const StreamTransportOptions = {
+                format: Winston.format.json(),
+                level: config.logLevelPin
+            };
+    
+            StreamTransport = new Winston.transports.File(StreamTransportOptions);
+            Logger.add(StreamTransport);
+        }
+
+
+
         node.status({
             fill: 'red',
             shape: 'dot',
@@ -130,7 +144,6 @@ module.exports = function (RED) {
         DriverOptions.logConfig = {};
         if (Logger !== undefined) {
             DriverOptions.logConfig.enabled = true;
-
             if (
                 config.logNodeFilter !== undefined &&
                 config.logNodeFilter.length > 0
@@ -142,7 +155,13 @@ module.exports = function (RED) {
                 });
                 DriverOptions.logConfig.nodeFilter = NodesArray;
             }
-            DriverOptions.logConfig.transports = [FileTransport];
+            DriverOptions.logConfig.transports = [];
+            if(FileTransport !== undefined){
+                DriverOptions.logConfig.transports.push(FileTransport)
+            }
+            if(StreamTransport !== undefined){
+                DriverOptions.logConfig.transports.push(StreamTransport)
+            }
         } else {
             DriverOptions.logConfig.enabled = false;
         }

From 4722cc2e34f2fc72abeacff96d03bf30853a763d Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 24 Aug 2021 21:14:20 +0100
Subject: [PATCH 02/70] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c9a7efb..e904d48b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
   # node-red-contrib-zwave-js Change Log
 
-  - 5.1.0
+  - 5.1.0  
+  
      **New Features**
      - Added a new **event-filter** node, allowing node events to be filter with ease.
      - Added the ability to pipe log messages to a 2nd output pin of the Controller Node

From 5c3e1ebdcdf6c57442db173724598cdc313f0172 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 24 Aug 2021 21:57:11 +0100
Subject: [PATCH 03/70] Update zwave-js.js

---
 zwave-js/zwave-js.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index 27329913..b7975274 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -116,11 +116,12 @@ module.exports = function (RED) {
 
         if(config.logLevelPin !== 'none'){
             const StreamTransportOptions = {
+                stream: ,
                 format: Winston.format.json(),
                 level: config.logLevelPin
             };
     
-            StreamTransport = new Winston.transports.File(StreamTransportOptions);
+            StreamTransport = new Winston.transports.Stream(StreamTransportOptions);
             Logger.add(StreamTransport);
         }
 

From 0ef644c33f144ba1abdec54f2caaa6d8f190273d Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Wed, 25 Aug 2021 12:12:19 +0100
Subject: [PATCH 04/70] Update zwave-js.html

---
 zwave-js/zwave-js.html | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html
index 579f4e28..8ef26da4 100644
--- a/zwave-js/zwave-js.html
+++ b/zwave-js/zwave-js.html
@@ -365,7 +365,8 @@
                 logNodeFilter: { value: undefined },
                 sendUsageStatistics: { value: true },
                 valueCacheDiskThrottle: { value: "normal" },
-                customConfigPath: { value: undefined }
+                customConfigPath: { value: undefined },
+                outputs: { value: 1 },
             },
             inputs: 1,
             outputs: 1,
@@ -374,12 +375,27 @@
                 return this.name;
             },
             onpaletteadd: ZwaveJsUI.init,
-            oneditprepare: SortUI
+            oneditprepare: SortUI,
+            oneditsave: SortIO
         });
 
 
+    function SortIO(){
+        if($("#node-input-logLevelPin").val() !== 'none'){
+            this.outputs = 2
+        }
+        else{
+            this.outputs = 1
+        }
+    }
+
     function SortUI() {
 
+        // 5.0 -> 5.1
+        if(this.logLevelPin === undefined){
+            $("#node-input-logLevelPin").val('none');
+        }
+
         // 3.3 -> 3.4 
         if (this.valueCacheDiskThrottle === undefined) {
             $("#node-input-valueCacheDiskThrottle").val('normal');
@@ -512,6 +528,8 @@
             <option value="debug">Debug</option>
             <option value="silly">Silly</option>
         </select>
+    </div>
+    <div class="form-row">
         <label  for="node-input-logLevel" style="width:130px"><i class="fa fa-pencil"></i> Level (File)</label>
         <select id="node-input-logLevel">
             <option value="none">Logging Disabled</option>

From 648ef0f4aee509916a57937a0ff6a33f29ae46d8 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Wed, 25 Aug 2021 15:17:11 +0100
Subject: [PATCH 05/70] 5.1.0

---
 package.json         |  3 ++-
 zwave-js/zwave-js.js | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b4d384e5..156c98b9 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
     "express": "4.17.1",
     "serialport": "9.2.0",
     "winston": "3.3.3",
-    "zwave-js": "8.1.1"
+    "zwave-js": "8.2.1",
+    "memorystream": "0.3.1" 
   },
   "devDependencies": {
     "eslint": "7.31.0",
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index b7975274..7356ed69 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -10,6 +10,7 @@ module.exports = function (RED) {
     } = require('@zwave-js/core');
     const ZWaveJSPackage = require('zwave-js/package.json');
     const Winston = require('winston');
+    const MemoryStream = require('memorystream');
 
     const UI = require('./ui/server.js');
     UI.init(RED);
@@ -23,6 +24,7 @@ module.exports = function (RED) {
         let Logger;
         let FileTransport;
         let StreamTransport;
+        let MS;
 
         const MaxDriverAttempts = 3;
         let DriverAttempts = 0;
@@ -115,18 +117,20 @@ module.exports = function (RED) {
         }
 
         if(config.logLevelPin !== 'none'){
+
+            MS = new MemoryStream();
+            MS.on('data',(C) => {
+                node.send([undefined,{payload:JSON.parse(C.toString())}])
+            })
             const StreamTransportOptions = {
-                stream: ,
+                stream: MS,
                 format: Winston.format.json(),
                 level: config.logLevelPin
             };
-    
             StreamTransport = new Winston.transports.Stream(StreamTransportOptions);
             Logger.add(StreamTransport);
         }
 
-
-
         node.status({
             fill: 'red',
             shape: 'dot',
@@ -357,6 +361,14 @@ module.exports = function (RED) {
             UI.unregister();
             Driver.destroy();
             RED.events.off('zwjs:node:command', processMessageEvent);
+            if(Logger !== undefined){
+                Logger.clear();
+                Logger = undefined
+            }
+            if(MS !== undefined){
+                MS.destroy();
+                MS = undefined;
+            }
             if (done) {
                 done();
             }

From a67d3784dfe15b04d3d97d09d3d69b7c80bae6d3 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Wed, 25 Aug 2021 15:34:20 +0100
Subject: [PATCH 06/70] Update client.js

---
 zwave-js/ui/client.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index 930b671f..e59320f7 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -1005,7 +1005,7 @@ const ZwaveJsUI = (function () {
 					.find(`[data-nodeid='${node}'].zwave-js-node-row-location`)
 					.html(`(${object})`);
 				if (node == selectedNode) {
-					$('#zwave-js-selected-node-location').text(object);
+					$('#zwave-js-selected-node-location').text(`(${object})`);
 				}
 				GetNodes();
 				input.hide();
@@ -1013,7 +1013,9 @@ const ZwaveJsUI = (function () {
 			});
 		} else {
 			input.show();
-			input.val($('#zwave-js-selected-node-location').text());
+			let CurrentLocation = $('#zwave-js-selected-node-location').text();
+			CurrentLocation = CurrentLocation.substring(1, CurrentLocation.length-1);
+			input.val(CurrentLocation);
 			Button.html('Go');
 		}
 	}

From 08588af0aa0b29db0c18555277e67d3a429a2683 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Wed, 25 Aug 2021 18:20:21 +0100
Subject: [PATCH 07/70] 5.1.0

---
 package.json               |   3 +-
 zwave-js/event-filter.html | 104 +++++++++++++++++++++++++++++++++++++
 zwave-js/event-filter.js   |  24 +++++++++
 zwave-js/icons/rbe.png     | Bin 0 -> 252 bytes
 4 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 zwave-js/event-filter.html
 create mode 100644 zwave-js/event-filter.js
 create mode 100644 zwave-js/icons/rbe.png

diff --git a/package.json b/package.json
index 156c98b9..10758e5d 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,8 @@
   "node-red": {
     "nodes": {
       "zwave-js": "zwave-js/zwave-js.js",
-      "zwave-device": "zwave-js/zwave-device.js"
+      "zwave-device": "zwave-js/zwave-device.js",
+      "event-filter": "zwave-js/event-filter.js"
     }
   },
   "repository": {
diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
new file mode 100644
index 00000000..0f33d664
--- /dev/null
+++ b/zwave-js/event-filter.html
@@ -0,0 +1,104 @@
+<script type="text/javascript">
+
+    RED.nodes.registerType('event-filter',
+        {
+            category: 'ZWave JS',
+            color: 'rgb(46,145,205)',
+            defaults:
+            {
+                name: { value: "ZWave Event Filter" },
+            },
+            inputs: 1,
+            outputs: 1,
+            icon: "rbe.png",
+            label: function () {
+                return this.name;
+            }
+        });
+
+    
+
+</script>
+
+<script type="text/x-red" data-template-name="event-filter">
+
+  
+   
+    <p>
+        <strong>Basic settings.</strong><br />
+        Note: This node works in conjunction with the main Z-Wave JS Controller node,<br />
+        therefore, ensure it is in any one of your flows, and in a deployed state.
+    </p>
+    <div class="form-row">
+        <label for="node-input-name" style="width:130px"><i class="fa fa-pencil"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="My ZWave Node">
+    </div>
+    <div class="form-row">
+        <label for="node-input-filteredMode" style="width:130px"><i class="fa fa-pencil"></i> Mode</label>
+        <select id="node-input-filteredMode" onchange="SortFilterChange()">
+            <option value="All">All Nodes</option>
+            <option value="Multiple">Multiple Nodes</option>
+            <option value="Multicast">Multicast</option>
+            <option value="Single">Specific Node</option>
+            <option value="Message">As Specified</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-datamode" style="width:130px"><i class="fa fa-pencil"></i> Data Mode</label>
+        <select id="node-input-datamode">
+            <option value="Send/Receive">Send/Receive</option>
+            <option value="Send">Send</option>
+            <option value="Receive">Receive</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-filteredNodeId" style="width:130px"><i class="fa fa-pencil"></i> Node ID(s)</label>
+        <select id="node-input-filteredNodeId">
+        </select>
+
+    </div>
+    <hr />
+    <table>
+        <tr>
+            <td style="width:70px;vertical-align:top"><strong>All Nodes</strong></td>
+            <td> - Will listen for updates on All Nodes.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
+        </tr>
+        <tr><td colspan="2">&nbsp;</td></tr>
+        <tr>
+            <td style="width:70px;vertical-align:top"><strong>Multiple Nodes</strong></td>
+            <td> - Will listen for updates on the specified Nodes.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
+        </tr>
+        <tr><td colspan="2">&nbsp;</td></tr>
+        <tr>
+            <td style="width:70px;vertical-align:top"><strong>Multicast</strong></td>
+            <td> - Like <strong>Multiple Nodes</strong>, but uses Multicast for outgoing payloads.<br /> - <strong>node</strong> in your outgoing payload, is ignored.<br /> - Limited to <strong>ValueAPI</strong> -> <strong>setValue</strong> and <strong>CCAPI</strong> set type commands only<br /> - Requires support from the device(s)</td>
+        </tr>
+        <tr><td colspan="2">&nbsp;</td></tr>
+        <tr>
+            <td style="width:70px;vertical-align:top"><strong>Specific Node</strong></td>
+            <td> - Will listen for updates on the specified Node.<br /> - <strong>node</strong>, in your outgoing payload, is ignored.</td>
+        </tr>
+        <tr><td colspan="2">&nbsp;</td></tr>
+        <tr>
+            <td style="width:70px;vertical-align:top"><strong>As Specified</strong></td>
+            <td> - Will listen for updates on the Node, that it last addressed a message to.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
+        </tr>
+        <tr><td colspan="2">&nbsp;</td></tr>
+        <tr>
+            <td style="width:70px;vertical-align:top"><strong>Subflow Variable</strong></td>
+            <td> - Like <strong>Specific Node</strong>, but Node ID is taken from a <strong>ZW_NODE_ID</strong> subflow variable.<br /> - <strong>node</strong>, in your outgoing payload, is ignored.</td>
+        </tr>
+    </table>
+    
+   
+   
+   
+    
+   
+</script>
+
+<script type="text/x-red" data-help-name="event-filter">
+    <p>A Z-Wave event filter.</p>
+
+ 
+</script>
\ No newline at end of file
diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
new file mode 100644
index 00000000..3700d526
--- /dev/null
+++ b/zwave-js/event-filter.js
@@ -0,0 +1,24 @@
+'use strict';
+module.exports = function (RED) {
+	function Init(config) {
+		RED.nodes.createNode(this, config);
+		const node = this;
+
+
+		node.on('input', Input);
+
+		async function Input(msg, send, done) {
+			send(msg);
+			if (done) {
+				done();
+			}
+		}
+
+		node.on('close', (done) => {
+			if (done) {
+				done();
+			}
+		});
+	}
+	RED.nodes.registerType('event-filter', Init);
+};
diff --git a/zwave-js/icons/rbe.png b/zwave-js/icons/rbe.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc397210a30d8e962d2acd02cfe76ed481cbe38c
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^${@_a1|;QfZjJ;}Y)RhkE<hRxemd{22U45`9+AZi
z4BWyX%*Zfnjs#GUy~NYkmHj?DznBi^+?_|R0EId|T^vIq4!@ngo3p_|z$KkOnORz3
zi+cA4&gd-?!iEybtY7zaSm?*zsLV0p=J@FD;n%aEr9+?l<kTlVoAecv7>$%qUMt^z
zH0J4s183Gfdwx?`@2S_qMAy_JWyzBsZbp+P_N1tM-sY3_aGed46oYgF-+>9nHY=Ey
qw;T-#D*xW)QgvnL?u`QT6WFue4=`mGIrRV?#o+1c=d#Wzp$P!@rc(L<

literal 0
HcmV?d00001


From 2c4a5414a9ed7c410db40e94ff2052e033aab2fa Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Wed, 25 Aug 2021 19:55:46 +0100
Subject: [PATCH 08/70] Update event-filter.html

---
 zwave-js/event-filter.html | 111 ++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 68 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 0f33d664..ddf37e25 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -1,4 +1,10 @@
-<script type="text/javascript">
+<style>
+  #sortable { list-style-type: none; margin: 0; padding: 0; width: 100%; }
+  #sortable li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; font-size: 1.4em; height: 18px; }
+  #sortable li span { position: absolute; margin-left: -1.3em; }
+</style>
+
+<script type="text/javascript">
 
     RED.nodes.registerType('event-filter',
         {
@@ -7,88 +13,57 @@
             defaults:
             {
                 name: { value: "ZWave Event Filter" },
+                outputs: {value: 3}
             },
             inputs: 1,
-            outputs: 1,
+            outputs: 3,
             icon: "rbe.png",
             label: function () {
                 return this.name;
-            }
+            },
+
+            oneditprepare: SortUI,
+            oneditsave:DoSave
         });
 
-    
+        function SortUI(){
+            $( "#sortable" ).sortable();
+        }
+
+        function DoSave(){
+            this.outputs = $('#sortable').children().length;
+        }
+
+        function Add(){
+
+            $('#sortable').append('<li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Other</li>')
+        }
+
+      
 
 </script>
 
 <script type="text/x-red" data-template-name="event-filter">
 
   
-   
     <p>
-        <strong>Basic settings.</strong><br />
-        Note: This node works in conjunction with the main Z-Wave JS Controller node,<br />
-        therefore, ensure it is in any one of your flows, and in a deployed state.
+        Add your filter sets below.<br />
+        each set of filters, becomes an output pin.<br /><br />
+        A filter set can include the event(s) to be filtered, and optionally ValueID(s)
     </p>
-    <div class="form-row">
-        <label for="node-input-name" style="width:130px"><i class="fa fa-pencil"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="My ZWave Node">
-    </div>
-    <div class="form-row">
-        <label for="node-input-filteredMode" style="width:130px"><i class="fa fa-pencil"></i> Mode</label>
-        <select id="node-input-filteredMode" onchange="SortFilterChange()">
-            <option value="All">All Nodes</option>
-            <option value="Multiple">Multiple Nodes</option>
-            <option value="Multicast">Multicast</option>
-            <option value="Single">Specific Node</option>
-            <option value="Message">As Specified</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-input-datamode" style="width:130px"><i class="fa fa-pencil"></i> Data Mode</label>
-        <select id="node-input-datamode">
-            <option value="Send/Receive">Send/Receive</option>
-            <option value="Send">Send</option>
-            <option value="Receive">Receive</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-input-filteredNodeId" style="width:130px"><i class="fa fa-pencil"></i> Node ID(s)</label>
-        <select id="node-input-filteredNodeId">
-        </select>
-
-    </div>
-    <hr />
-    <table>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>All Nodes</strong></td>
-            <td> - Will listen for updates on All Nodes.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>Multiple Nodes</strong></td>
-            <td> - Will listen for updates on the specified Nodes.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>Multicast</strong></td>
-            <td> - Like <strong>Multiple Nodes</strong>, but uses Multicast for outgoing payloads.<br /> - <strong>node</strong> in your outgoing payload, is ignored.<br /> - Limited to <strong>ValueAPI</strong> -> <strong>setValue</strong> and <strong>CCAPI</strong> set type commands only<br /> - Requires support from the device(s)</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>Specific Node</strong></td>
-            <td> - Will listen for updates on the specified Node.<br /> - <strong>node</strong>, in your outgoing payload, is ignored.</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>As Specified</strong></td>
-            <td> - Will listen for updates on the Node, that it last addressed a message to.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>Subflow Variable</strong></td>
-            <td> - Like <strong>Specific Node</strong>, but Node ID is taken from a <strong>ZW_NODE_ID</strong> subflow variable.<br /> - <strong>node</strong>, in your outgoing payload, is ignored.</td>
-        </tr>
-    </table>
+
+    <button onclick="Add()">Add</button>
+
+    
+
+    <ul id="sortable">
+        <li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Motion</li>
+        <li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Smoke</li>
+        <li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Air Temp</li>
+
+      </ul>
+       
+   
     
    
    

From eff325c293b080d61e65a95dee6179f9229042d8 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Wed, 25 Aug 2021 21:24:48 +0100
Subject: [PATCH 09/70] 5.1.0

---
 zwave-js/event-filter.html | 11 +++++++++++
 zwave-js/ui/client.js      |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index ddf37e25..62970abf 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -39,6 +39,17 @@
             $('#sortable').append('<li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Other</li>')
         }
 
+        function ShowMe(message){
+            if($('#sortable').length > 0){
+                
+                $('#sortable').append(message)
+            }
+            else{
+                alert('No filter-node is currently being modifed.')
+            }
+            
+        }
+
       
 
 </script>
diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index e59320f7..48cbdc67 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -1718,6 +1718,9 @@ const ZwaveJsUI = (function () {
 					title: 'Information',
 					minHeight: 75,
 					buttons: {
+						'Add To Filter Set':function(){
+							ShowMe(JSON.stringify(data.valueId))
+						},
 						Close: function () {
 							$(this).dialog('destroy');
 						}

From d55ed4fe35e8d40cfbed645de8237193982af823 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Wed, 25 Aug 2021 21:41:53 +0100
Subject: [PATCH 10/70] 5.1.0

---
 zwave-js/event-filter.html | 7 +++----
 zwave-js/ui/client.js      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 62970abf..db74a2b2 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -39,13 +39,12 @@
             $('#sortable').append('<li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Other</li>')
         }
 
-        function ShowMe(message){
+        function AddValueIDToFilter(ValueID){
             if($('#sortable').length > 0){
-                
-                $('#sortable').append(message)
+                $('#sortable').append(ValueID)
             }
             else{
-                alert('No filter-node is currently being modifed.')
+                alert('No filter-node is currently being modified.')
             }
             
         }
diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index 48cbdc67..36be5d5c 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -1719,7 +1719,7 @@ const ZwaveJsUI = (function () {
 					minHeight: 75,
 					buttons: {
 						'Add To Filter Set':function(){
-							ShowMe(JSON.stringify(data.valueId))
+							AddValueIDToFilter(data.valueId)
 						},
 						Close: function () {
 							$(this).dialog('destroy');

From 16827f478397ad960b0b8ff281fbb2fb76237542 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Thu, 26 Aug 2021 09:06:15 +0100
Subject: [PATCH 11/70] Update event-filter.html

---
 zwave-js/event-filter.html | 54 +++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index db74a2b2..689649ec 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -1,10 +1,4 @@
-<style>
-  #sortable { list-style-type: none; margin: 0; padding: 0; width: 100%; }
-  #sortable li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; font-size: 1.4em; height: 18px; }
-  #sortable li span { position: absolute; margin-left: -1.3em; }
-</style>
-
-<script type="text/javascript">
+<script type="text/javascript">
 
     RED.nodes.registerType('event-filter',
         {
@@ -27,25 +21,30 @@
         });
 
         function SortUI(){
-            $( "#sortable" ).sortable();
-        }
+            $("#filtersets").editableList({
+                header: $('<div>').append('<div>Filter Sets - order defines outputs</div>'),
+                sortable: true,
+                removable: true, 
+                addButton: 'add',
+                addItem:function(container, index, data){
 
-        function DoSave(){
-            this.outputs = $('#sortable').children().length;
-        }
+                 
 
-        function Add(){
+            
+
+                 $(container).html("<strong>Name:</strong> Motion and Air Temp Changes<br /><strong>Events:</strong> 1<br /><strong>ValueIDs:</strong> 2");
+                
+                }
+            });
 
-            $('#sortable').append('<li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Other</li>')
+            $("#filtersets").editableList('addItem',{name:"banana"});
+        }
+
+        function DoSave(){
+            //this.outputs = $('#sortable').children().length;
         }
 
         function AddValueIDToFilter(ValueID){
-            if($('#sortable').length > 0){
-                $('#sortable').append(ValueID)
-            }
-            else{
-                alert('No filter-node is currently being modified.')
-            }
             
         }
 
@@ -62,17 +61,12 @@
         A filter set can include the event(s) to be filtered, and optionally ValueID(s)
     </p>
 
-    <button onclick="Add()">Add</button>
-
-    
-
-    <ul id="sortable">
-        <li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Motion</li>
-        <li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Smoke</li>
-        <li class="ui-state-default"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span>VALUE_UPDATE: properyKey -> Air Temp</li>
+  
+<div>
+   <ol id="filtersets" style="min-height:350px;min-width:400px">
+   </ol>
+</div>
 
-      </ul>
-       
    
     
    

From 7886249e9c57542cce15aa3d53b3fe5409e63e30 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Thu, 26 Aug 2021 21:20:32 +0100
Subject: [PATCH 12/70] Update event-filter.html

---
 zwave-js/event-filter.html | 70 ++++++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 14 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 689649ec..229311c4 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -7,41 +7,83 @@
             defaults:
             {
                 name: { value: "ZWave Event Filter" },
-                outputs: {value: 3}
+                filters: {value:[]},
+                outputs: {value: 0}
             },
             inputs: 1,
-            outputs: 3,
+            outputs: 0,
             icon: "rbe.png",
             label: function () {
                 return this.name;
             },
-
             oneditprepare: SortUI,
-            oneditsave:DoSave
+            oneditsave:DoSave,
+            outputLabels: function(index) {
+                return this.filters[index].name
+            }
         });
 
         function SortUI(){
+
             $("#filtersets").editableList({
                 header: $('<div>').append('<div>Filter Sets - order defines outputs</div>'),
                 sortable: true,
                 removable: true, 
-                addButton: 'add',
-                addItem:function(container, index, data){
+                addButton: 'Add Filter Set',
+                addItem:AddItem
+            });
 
-                 
+            this.filters.forEach((Item) => {
+                $("#filtersets").editableList('addItem',Item);
+            });
 
+        }
+        
+        function AddItem(container, index, data){
+            if (Object.keys(data).length === 0) {
+                    data.index = index;
+                    data.name = "Filter Name"
+                    data.valueIds = []
+                    data.events = ["VALUE_UPDATED"]
+                }
             
+            $(container).data('filter',data)
+            $(container).html('<strong>Name:</strong> <input class="data-name" value="'+data.name+'" type="text"><br /><strong>ValueIDs:</strong> <span class="data-vids">"'+data.valueIds.length+'</span><br /><strong>Events:</strong><br /><input class="data-event-VALUE_UPDATED" type="checkbox"> VALUE_UPDATED<br /><input class="data-event-VALUE_NOTIFICATION" type="checkbox"> VALUE_NOTIFICATION<br /><input class="data-event-NOTIFICATION" type="checkbox"> NOTIFICATION<br /><input class="data-event-GET_VALUE_RESPONSE" type="checkbox"> GET_VALUE_RESPONSE');
+            SortChecbox($(container))
+        }
 
-                 $(container).html("<strong>Name:</strong> Motion and Air Temp Changes<br /><strong>Events:</strong> 1<br /><strong>ValueIDs:</strong> 2");
-                
-                }
-            });
+        function SortChecbox(El){
 
-            $("#filtersets").editableList('addItem',{name:"banana"});
+            const Data = El.data('filter');
+            Data.events.forEach((EV) =>{
+                El.find(".data-event-"+EV).prop('checked',true);
+            })
         }
 
         function DoSave(){
-            //this.outputs = $('#sortable').children().length;
+
+            this.outputs = $("#filtersets").editableList('length')
+            const Items = $("#filtersets").editableList('items')
+            const Events = ["VALUE_UPDATED","VALUE_NOTIFICATION","NOTIFICATION","GET_VALUE_RESPONSE"]
+            this.filters = [];
+
+            for(let i = 0;i<Items.length;i++){
+
+                const El = $(Items[i])
+                const ItemData = Items[i].data('filter');
+
+                ItemData.events = []
+                Events.forEach((EV) =>{
+
+                    if(El.find(".data-event-"+EV).prop('checked')){
+                        ItemData.events.push(EV)
+                    }
+                })
+                
+                ItemData.index = i;
+                ItemData.name = El.find(".data-name").val();
+                this.filters.push(ItemData);
+            }
         }
 
         function AddValueIDToFilter(ValueID){
@@ -63,7 +105,7 @@
 
   
 <div>
-   <ol id="filtersets" style="min-height:350px;min-width:400px">
+   <ol id="filtersets" style="min-height:450px;min-width:400px">
    </ol>
 </div>
 

From 37fa2ad168bab866faff8dbe87d4c7d076b1813a Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Thu, 26 Aug 2021 21:53:41 +0100
Subject: [PATCH 13/70] Update event-filter.js

---
 zwave-js/event-filter.js | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index 3700d526..8a200962 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -8,10 +8,41 @@ module.exports = function (RED) {
 		node.on('input', Input);
 
 		async function Input(msg, send, done) {
-			send(msg);
-			if (done) {
-				done();
+
+
+			if(msg.payload !== undefined && msg.payload.event !== undefined){
+				send(msg);
+			}
+			else{
+				if (done) {
+					done();
+				}
+			}
+
+			
+			
+		}
+
+		function IsValueIDMatch(ValueID, MSG){
+
+			let Root = MSG.payload;
+			if(Root.hasOwnProperty("valueId")){
+				Root = MSG.payload.valueId;
 			}
+
+			const ValueIDKeys = Object.keys(ValueID)
+			const MSGKeys = Object.keys(Root)
+
+			ValueIDKeys.forEach((VIDK) =>{
+				if(MSGKeys.includes(VIDK)){
+					if(Root[VIDK] !== ValueID[VIDK]){
+						return false
+					}
+				}else{
+					return false;
+				}
+			})
+			return true;
 		}
 
 		node.on('close', (done) => {

From f428c9dfa404af39314e02d920339bb9097b2f16 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Thu, 26 Aug 2021 22:27:25 +0100
Subject: [PATCH 14/70] Update event-filter.js

---
 zwave-js/event-filter.js | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index 8a200962..4505582d 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -9,18 +9,31 @@ module.exports = function (RED) {
 
 		async function Input(msg, send, done) {
 
-
 			if(msg.payload !== undefined && msg.payload.event !== undefined){
-				send(msg);
+
+				const Filters = config.filters;
+
+				Filters.forEach((F) =>{
+					if(F.events.length > 0){
+						if(F.events.includes(msg.event)){
+							if(F.valueIds.length > 0){
+								
+
+
+							}
+							else{
+								send(msg);
+								break;
+							}
+						}
+					}
+				})
 			}
-			else{
-				if (done) {
-					done();
-				}
+			
+			if (done) {
+				done();
 			}
 
-			
-			
 		}
 
 		function IsValueIDMatch(ValueID, MSG){
@@ -33,16 +46,21 @@ module.exports = function (RED) {
 			const ValueIDKeys = Object.keys(ValueID)
 			const MSGKeys = Object.keys(Root)
 
+			let Match = true
+
 			ValueIDKeys.forEach((VIDK) =>{
 				if(MSGKeys.includes(VIDK)){
 					if(Root[VIDK] !== ValueID[VIDK]){
-						return false
+						Match = false;
+						break;
 					}
 				}else{
-					return false;
+					Match = false;
+					break;
 				}
 			})
-			return true;
+
+			return Match;
 		}
 
 		node.on('close', (done) => {

From 30783126e74d28f0a0bc25384a9ecdbbd3d540bc Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Fri, 27 Aug 2021 10:02:20 +0100
Subject: [PATCH 15/70] 5.1.0

---
 zwave-js/event-filter.html | 49 +++++++++++++++++++++++++++++----
 zwave-js/event-filter.js   | 55 ++++++++++++++++++++++++--------------
 2 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 229311c4..3c6cb8d5 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -7,11 +7,11 @@
             defaults:
             {
                 name: { value: "ZWave Event Filter" },
-                filters: {value:[]},
-                outputs: {value: 0}
+                filters: {value:[{strict:false,index:0,name:"Catch-All",valueIds:[],events:["VALUE_UPDATED","VALUE_NOTIFICATION","NOTIFICATION","GET_VALUE_RESPONSE"]}]},
+                outputs: {value: 1}
             },
             inputs: 1,
-            outputs: 0,
+            outputs: 1,
             icon: "rbe.png",
             label: function () {
                 return this.name;
@@ -23,6 +23,9 @@
             }
         });
 
+        
+                
+
         function SortUI(){
 
             $("#filtersets").editableList({
@@ -33,6 +36,8 @@
                 addItem:AddItem
             });
 
+            
+
             this.filters.forEach((Item) => {
                 $("#filtersets").editableList('addItem',Item);
             });
@@ -45,10 +50,39 @@
                     data.name = "Filter Name"
                     data.valueIds = []
                     data.events = ["VALUE_UPDATED"]
+                    data.strict = false
                 }
             
             $(container).data('filter',data)
-            $(container).html('<strong>Name:</strong> <input class="data-name" value="'+data.name+'" type="text"><br /><strong>ValueIDs:</strong> <span class="data-vids">"'+data.valueIds.length+'</span><br /><strong>Events:</strong><br /><input class="data-event-VALUE_UPDATED" type="checkbox"> VALUE_UPDATED<br /><input class="data-event-VALUE_NOTIFICATION" type="checkbox"> VALUE_NOTIFICATION<br /><input class="data-event-NOTIFICATION" type="checkbox"> NOTIFICATION<br /><input class="data-event-GET_VALUE_RESPONSE" type="checkbox"> GET_VALUE_RESPONSE');
+
+            const HTML = `
+            <table style="width:100%">
+                <tr>
+                    <td>Name</td>
+                    <td><input class="data-name" value="${data.name}" type="text"></td>
+                </tr>
+                <tr>
+                    <td>ValueIDs</td>
+                    <td><span class="data-vids">${data.valueIds.length}</span></td>
+                </tr>
+                <tr>
+                    <td>Strict (Match Endpoint)</td>
+                    <td><input class="data-event-Endpoint" type="checkbox"></td>
+                </tr>
+                <tr>
+                    <td>Events</td>
+                    <td>
+                        <input class="data-event-VALUE_UPDATED" type="checkbox"> VALUE_UPDATED<br />
+                        <input class="data-event-VALUE_NOTIFICATION" type="checkbox"> VALUE_NOTIFICATION<br />
+                        <input class="data-event-NOTIFICATION" type="checkbox"> NOTIFICATION<br />
+                        <input class="data-event-GET_VALUE_RESPONSE" type="checkbox"> GET_VALUE_RESPONSE
+                    </td>
+                </tr>
+            
+            `; 
+
+
+            $(container).html(HTML);
             SortChecbox($(container))
         }
 
@@ -58,6 +92,10 @@
             Data.events.forEach((EV) =>{
                 El.find(".data-event-"+EV).prop('checked',true);
             })
+
+            if(Data.strict){
+                El.find(".data-event-Endpoint").prop('checked',true);
+            }
         }
 
         function DoSave(){
@@ -79,9 +117,10 @@
                         ItemData.events.push(EV)
                     }
                 })
-                
+
                 ItemData.index = i;
                 ItemData.name = El.find(".data-name").val();
+                ItemData.strict = El.find(".data-event-Endpoint").prop('checked');
                 this.filters.push(ItemData);
             }
         }
diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index 4505582d..1dbb81e4 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -12,55 +12,70 @@ module.exports = function (RED) {
 			if(msg.payload !== undefined && msg.payload.event !== undefined){
 
 				const Filters = config.filters;
-
-				Filters.forEach((F) =>{
-					if(F.events.length > 0){
-						if(F.events.includes(msg.event)){
-							if(F.valueIds.length > 0){
-								
-
-
+				let Matched = false
+
+				for (const Filter of Filters) {
+					if(Filter.events.length > 0){
+						if(Filter.events.includes(msg.payload.event)){
+							if(Filter.valueIds.length > 0){
+								for (const ValueID of Filter.valueIds) {
+									if(IsValueIDMatch(ValueID,msg)){
+										msg.filter = Filter
+										send(msg)
+										Matched = true;
+										break;
+									}
+								}
+								if(Matched){
+									break;
+								}
 							}
 							else{
-								send(msg);
+								msg.filter = Filter
+								send(msg)
 								break;
 							}
 						}
 					}
-				})
+				}  
 			}
-			
+
 			if (done) {
 				done();
 			}
-
 		}
 
 		function IsValueIDMatch(ValueID, MSG){
 
 			let Root = MSG.payload;
-			if(Root.hasOwnProperty("valueId")){
+			if(Root.hasOwnProperty("valueId") && Root.hasOwnProperty("response") ){
 				Root = MSG.payload.valueId;
 			}
 
 			const ValueIDKeys = Object.keys(ValueID)
 			const MSGKeys = Object.keys(Root)
 
+			if(!config.strict){
+				ValueIDKeys = ValueIDKeys.filter((K) => K !== 'endpoint');
+			}
+
 			let Match = true
 
-			ValueIDKeys.forEach((VIDK) =>{
+			for(const VIDK of ValueIDKeys){
 				if(MSGKeys.includes(VIDK)){
 					if(Root[VIDK] !== ValueID[VIDK]){
-						Match = false;
+						Match = false
 						break;
 					}
-				}else{
-					Match = false;
-					break;
 				}
-			})
-
+				else{
+					Match = false
+					break
+				}
+			}
 			return Match;
+
+			
 		}
 
 		node.on('close', (done) => {

From cda12572064bb2a460b03e3c3a364aea7aa9621f Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Fri, 27 Aug 2021 20:54:42 +0100
Subject: [PATCH 16/70] Update event-filter.html

---
 zwave-js/event-filter.html | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 3c6cb8d5..1704ce2e 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -54,6 +54,7 @@
                 }
             
             $(container).data('filter',data)
+            $(container).click(SetActiveFilter);
 
             const HTML = `
             <table style="width:100%">
@@ -86,6 +87,20 @@
             SortChecbox($(container))
         }
 
+        let ActiveFilter;
+
+        function SetActiveFilter(){
+
+
+            const Items = $("#filtersets").editableList('items');
+            for(let i = 0;i<Items.length;i++){
+                Items[i].css({backgroundColor:'white'});
+            }
+            $(this).css({backgroundColor:'lightgray'});
+
+            ActiveFilter = $(this);
+        }
+
         function SortChecbox(El){
 
             const Data = El.data('filter');
@@ -126,6 +141,11 @@
         }
 
         function AddValueIDToFilter(ValueID){
+
+            ActiveFilter.data('filter').valueIds.push(ValueID);
+            const Count = ActiveFilter.data('filter').valueIds.length
+
+            ActiveFilter.find(".data-vids").html(Count);
             
         }
 

From fb7a8282833ded37270c41112121e982931ba880 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Fri, 27 Aug 2021 22:08:33 +0100
Subject: [PATCH 17/70] 5.1.0

---
 zwave-js/event-filter.js | 17 ++++++++++++-----
 zwave-js/ui/client.js    |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index 1dbb81e4..91283655 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -9,19 +9,25 @@ module.exports = function (RED) {
 
 		async function Input(msg, send, done) {
 
+			const SendingArray = new Array(config.filters.length);
+
 			if(msg.payload !== undefined && msg.payload.event !== undefined){
 
 				const Filters = config.filters;
 				let Matched = false
 
+				let ArrayIndex = -1;
+
 				for (const Filter of Filters) {
+					ArrayIndex++;
 					if(Filter.events.length > 0){
 						if(Filter.events.includes(msg.payload.event)){
 							if(Filter.valueIds.length > 0){
 								for (const ValueID of Filter.valueIds) {
 									if(IsValueIDMatch(ValueID,msg)){
 										msg.filter = Filter
-										send(msg)
+										SendingArray[ArrayIndex] = msg;
+										send(SendingArray)
 										Matched = true;
 										break;
 									}
@@ -32,7 +38,8 @@ module.exports = function (RED) {
 							}
 							else{
 								msg.filter = Filter
-								send(msg)
+								SendingArray[ArrayIndex] = msg;
+								send(SendingArray)
 								break;
 							}
 						}
@@ -47,12 +54,12 @@ module.exports = function (RED) {
 
 		function IsValueIDMatch(ValueID, MSG){
 
-			let Root = MSG.payload;
+			let Root = MSG.payload.object;
 			if(Root.hasOwnProperty("valueId") && Root.hasOwnProperty("response") ){
-				Root = MSG.payload.valueId;
+				Root = MSG.payload.object.valueId;
 			}
 
-			const ValueIDKeys = Object.keys(ValueID)
+			let ValueIDKeys = Object.keys(ValueID)
 			const MSGKeys = Object.keys(Root)
 
 			if(!config.strict){
diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index 36be5d5c..30f0ccc6 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -1720,6 +1720,7 @@ const ZwaveJsUI = (function () {
 					buttons: {
 						'Add To Filter Set':function(){
 							AddValueIDToFilter(data.valueId)
+							$(this).dialog('destroy');
 						},
 						Close: function () {
 							$(this).dialog('destroy');

From 76d40649fdfe038c933fe5db66e7a80354ceb794 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 11:21:38 +0100
Subject: [PATCH 18/70] 5.1.0

---
 README.md                    |    3 +-
 package.json                 |    8 +-
 zwave-js/Pin2LogTransport.js |   29 +
 zwave-js/event-filter.html   |   65 +-
 zwave-js/event-filter.js     |   60 +-
 zwave-js/zwave-js.js         | 3290 +++++++++++++++++-----------------
 6 files changed, 1760 insertions(+), 1695 deletions(-)
 create mode 100644 zwave-js/Pin2LogTransport.js

diff --git a/README.md b/README.md
index 317ecdca..df208fca 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # node-red-contrib-zwave-js
 
-THE ultimate Z-Wave node for node-red based on Z-Wave JS.  
+THE most powerful Z-Wave node for node-red based on Z-Wave JS.  
 If you want a fully featured Z-Wave runtime in your node-red instance, look no further.  
 <br />  
 > ### ...node-red-contrib-zwave-js is _hands down the best zwave to node red option on the planet._  
@@ -22,6 +22,7 @@ If you want a fully featured Z-Wave runtime in your node-red instance, look no f
     - Network Actions (Include, Exclude, Heal etc etc)
   - 2 Different API models, catering for both experienced and inexperienced users.
   - Use one node for your entire network, or a node per Z-Wave device.
+  - An extremely advanced filter node, to route zwave messages around your flow(s).
   - Supports multicast to send commands to mulltiple nodes at the same time.
   - Access to all supported CC's provided by Z-Wave JS.
 
diff --git a/package.json b/package.json
index 10758e5d..22d6cc7d 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,15 @@
 {
   "name": "node-red-contrib-zwave-js",
-  "version": "5.1.0",
+  "version": "5.1.0-beta.1",
   "license": "MIT",
-  "description": "An extremely easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
+  "description": "An extremely powerful, easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
   "dependencies": {
     "@serialport/bindings": "9.2.0",
     "express": "4.17.1",
     "serialport": "9.2.0",
     "winston": "3.3.3",
-    "zwave-js": "8.2.1",
-    "memorystream": "0.3.1" 
+    "winston-transport": "4.4.0",
+    "zwave-js": "8.2.1"
   },
   "devDependencies": {
     "eslint": "7.31.0",
diff --git a/zwave-js/Pin2LogTransport.js b/zwave-js/Pin2LogTransport.js
new file mode 100644
index 00000000..4ccfcb58
--- /dev/null
+++ b/zwave-js/Pin2LogTransport.js
@@ -0,0 +1,29 @@
+const Stream = require('stream');
+const WinstonTransport = require('winston-transport');
+
+class Pin2LogTransport extends WinstonTransport {
+	constructor(options) {
+		super(options);
+		this.formattedMessageSymbol = Symbol.for('message');
+		this.passThroughStream = new Stream.PassThrough();
+	}
+}
+
+Pin2LogTransport.prototype.log = function (info, next) {
+	const logObject = JSON.stringify(info);
+	this.passThroughStream.write(logObject);
+	next();
+};
+
+Pin2LogTransport.prototype.getStream = function () {
+	return this.passThroughStream;
+};
+
+Pin2LogTransport.prototype.destroy = function () {
+	this.passThroughStream.end();
+	this.passThroughStream.destroy();
+};
+
+module.exports = {
+	Pin2LogTransport: Pin2LogTransport
+};
diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 1704ce2e..23752966 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -1,5 +1,7 @@
 <script type="text/javascript">
 
+    let Changed = false;
+
     RED.nodes.registerType('event-filter',
         {
             category: 'ZWave JS',
@@ -8,7 +10,8 @@
             {
                 name: { value: "ZWave Event Filter" },
                 filters: {value:[{strict:false,index:0,name:"Catch-All",valueIds:[],events:["VALUE_UPDATED","VALUE_NOTIFICATION","NOTIFICATION","GET_VALUE_RESPONSE"]}]},
-                outputs: {value: 1}
+                outputs: {value: 1},
+                changeDate: {value:undefined}
             },
             inputs: 1,
             outputs: 1,
@@ -17,7 +20,10 @@
                 return this.name;
             },
             oneditprepare: SortUI,
-            oneditsave:DoSave,
+            oneditsave: DoSave,
+            oneditcancel: function(){
+                Changed = false;
+            },
             outputLabels: function(index) {
                 return this.filters[index].name
             }
@@ -63,8 +69,8 @@
                     <td><input class="data-name" value="${data.name}" type="text"></td>
                 </tr>
                 <tr>
-                    <td>ValueIDs</td>
-                    <td><span class="data-vids">${data.valueIds.length}</span></td>
+                    <td>ValueIDs <span class="data-vid-count">${data.valueIds.length}</span> </td>
+                    <td><input class="data-valueid-editor" value="" type="text"></td>
                 </tr>
                 <tr>
                     <td>Strict (Match Endpoint)</td>
@@ -82,13 +88,46 @@
             
             `; 
 
-
             $(container).html(HTML);
+
+            const Refresh = $('<button>')
+                .addClass('ui-button')
+                .addClass('ui-corner-all')
+                .addClass('ui-widget')
+                .addClass('rightButton')
+                .html('&#8635;')
+                .click(()=>{
+                    SyncEdits()
+                })
+                .insertAfter($(container).find('.data-valueid-editor'))
+            $(container).find('.data-valueid-editor').typedInput({types: ["json"],default: "json"});
+            $(container).find('.data-valueid-editor').typedInput('value',JSON.stringify(data.valueIds));
+
+            
             SortChecbox($(container))
+
+     
         }
 
+        
         let ActiveFilter;
 
+        function SyncEdits(){
+
+
+            const JSONs = ActiveFilter.find('.data-valueid-editor').typedInput('value');
+            const NewObject = JSON.parse(JSONs);
+
+            ActiveFilter.data('filter').valueIds = NewObject
+            const Count = NewObject.length;
+            ActiveFilter.find(".data-vid-count").html(Count);
+
+            Changed = true;
+
+            
+        }
+
+
         function SetActiveFilter(){
 
 
@@ -115,6 +154,11 @@
 
         function DoSave(){
 
+            if(Changed){
+                this.changeDate = new Date();
+                Changed = false
+            }
+
             this.outputs = $("#filtersets").editableList('length')
             const Items = $("#filtersets").editableList('items')
             const Events = ["VALUE_UPDATED","VALUE_NOTIFICATION","NOTIFICATION","GET_VALUE_RESPONSE"]
@@ -142,10 +186,15 @@
 
         function AddValueIDToFilter(ValueID){
 
-            ActiveFilter.data('filter').valueIds.push(ValueID);
-            const Count = ActiveFilter.data('filter').valueIds.length
+            const VIDs = ActiveFilter.data('filter').valueIds;
+
+            VIDs.push(ValueID);
+            const Count = VIDs.length
+
+            ActiveFilter.find(".data-vid-count").html(Count);
+            ActiveFilter.find('.data-valueid-editor').typedInput('value',JSON.stringify(VIDs));
 
-            ActiveFilter.find(".data-vids").html(Count);
+            Changed = true;
             
         }
 
diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index 91283655..8353746a 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -4,47 +4,43 @@ module.exports = function (RED) {
 		RED.nodes.createNode(this, config);
 		const node = this;
 
-
 		node.on('input', Input);
 
 		async function Input(msg, send, done) {
-
 			const SendingArray = new Array(config.filters.length);
 
-			if(msg.payload !== undefined && msg.payload.event !== undefined){
-
+			if (msg.payload !== undefined && msg.payload.event !== undefined) {
 				const Filters = config.filters;
-				let Matched = false
+				let Matched = false;
 
 				let ArrayIndex = -1;
 
 				for (const Filter of Filters) {
 					ArrayIndex++;
-					if(Filter.events.length > 0){
-						if(Filter.events.includes(msg.payload.event)){
-							if(Filter.valueIds.length > 0){
+					if (Filter.events.length > 0) {
+						if (Filter.events.includes(msg.payload.event)) {
+							if (Filter.valueIds.length > 0) {
 								for (const ValueID of Filter.valueIds) {
-									if(IsValueIDMatch(ValueID,msg)){
-										msg.filter = Filter
+									if (IsValueIDMatch(ValueID, msg)) {
+										msg.filter = Filter;
 										SendingArray[ArrayIndex] = msg;
-										send(SendingArray)
+										send(SendingArray);
 										Matched = true;
 										break;
 									}
 								}
-								if(Matched){
+								if (Matched) {
 									break;
 								}
-							}
-							else{
-								msg.filter = Filter
+							} else {
+								msg.filter = Filter;
 								SendingArray[ArrayIndex] = msg;
-								send(SendingArray)
+								send(SendingArray);
 								break;
 							}
 						}
 					}
-				}  
+				}
 			}
 
 			if (done) {
@@ -52,37 +48,33 @@ module.exports = function (RED) {
 			}
 		}
 
-		function IsValueIDMatch(ValueID, MSG){
-
+		function IsValueIDMatch(ValueID, MSG) {
 			let Root = MSG.payload.object;
-			if(Root.hasOwnProperty("valueId") && Root.hasOwnProperty("response") ){
+			if (Root.hasOwnProperty('valueId') && Root.hasOwnProperty('response')) {
 				Root = MSG.payload.object.valueId;
 			}
 
-			let ValueIDKeys = Object.keys(ValueID)
-			const MSGKeys = Object.keys(Root)
+			let ValueIDKeys = Object.keys(ValueID);
+			const MSGKeys = Object.keys(Root);
 
-			if(!config.strict){
+			if (!config.strict) {
 				ValueIDKeys = ValueIDKeys.filter((K) => K !== 'endpoint');
 			}
 
-			let Match = true
+			let Match = true;
 
-			for(const VIDK of ValueIDKeys){
-				if(MSGKeys.includes(VIDK)){
-					if(Root[VIDK] !== ValueID[VIDK]){
-						Match = false
+			for (const VIDK of ValueIDKeys) {
+				if (MSGKeys.includes(VIDK)) {
+					if (Root[VIDK] !== ValueID[VIDK]) {
+						Match = false;
 						break;
 					}
-				}
-				else{
-					Match = false
-					break
+				} else {
+					Match = false;
+					break;
 				}
 			}
 			return Match;
-
-			
 		}
 
 		node.on('close', (done) => {
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index 7356ed69..205e4ca5 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -1,1650 +1,1644 @@
 module.exports = function (RED) {
-    const SP = require('serialport');
-    const Path = require('path');
-    const ModulePackage = require('../package.json');
-    const ZWaveJS = require('zwave-js');
-    const {
-        createDefaultTransportFormat,
-        CommandClasses,
-        ZWaveErrorCodes
-    } = require('@zwave-js/core');
-    const ZWaveJSPackage = require('zwave-js/package.json');
-    const Winston = require('winston');
-    const MemoryStream = require('memorystream');
-
-    const UI = require('./ui/server.js');
-    UI.init(RED);
-    const NodeList = {};
-
-    function Init(config) {
-        RED.nodes.createNode(this, config);
-        const node = this;
-
-        let Driver;
-        let Logger;
-        let FileTransport;
-        let StreamTransport;
-        let MS;
-
-        const MaxDriverAttempts = 3;
-        let DriverAttempts = 0;
-        const RetryTime = 5000;
-        let DriverOptions = {};
-
-        const NodeStats = {};
-        let ControllerStats;
-
-        // Log function
-        const Log = function (level, label, direction, tag1, msg, tag2) {
-            if (Logger !== undefined) {
-                const logEntry = {
-                    direction: '  ',
-                    message: msg,
-                    level: level,
-                    label: label,
-                    timestamp: new Date().toJSON(),
-                    multiline: Array.isArray(msg)
-                };
-                if (direction !== undefined) {
-                    logEntry.direction = direction === 'IN' ? '« ' : '» ';
-                }
-                if (tag1 !== undefined) {
-                    logEntry.primaryTags = tag1;
-                }
-                if (tag2 !== undefined) {
-                    logEntry.secondaryTags = tag2;
-                }
-                Logger.log(logEntry);
-            }
-        };
-
-        // eslint-disable-next-line no-unused-vars
-        let RestoreReadyTimer;
-        function RestoreReadyStatus() {
-            if (RestoreReadyTimer !== undefined) {
-                clearTimeout(RestoreReadyTimer);
-                RestoreReadyTimer = undefined;
-            }
-
-            RestoreReadyTimer = setTimeout(() => {
-                const NotReady = [];
-                let AllReady = true;
-
-                Driver.controller.nodes.forEach((N) => {
-                    if (
-                        !N.ready ||
-                        ZWaveJS.InterviewStage[N.interviewStage] !== 'Complete'
-                    ) {
-                        NotReady.push(N.id);
-                        AllReady = false;
-                    }
-                });
-
-                if (AllReady) {
-                    node.status({
-                        fill: 'green',
-                        shape: 'dot',
-                        text: 'All nodes ready!'
-                    });
-                    UI.status('All nodes ready!');
-                } else {
-                    node.status({
-                        fill: 'yellow',
-                        shape: 'dot',
-                        text: 'Nodes : ' + NotReady.toString() + ' not ready.'
-                    });
-                    UI.status('Nodes : ' + NotReady.toString() + ' not ready.');
-                }
-            }, 5000);
-        }
-
-        // Create Logger (if needed)
-        if (config.logLevel !== 'none' || config.logLevelPin !== 'none') {
-            Logger = Winston.createLogger();
-        }
-
-        if(config.logLevel !== 'none'){
-            const FileTransportOptions = {
-                filename: Path.join(RED.settings.userDir, 'zwave-js-log.txt'),
-                format: createDefaultTransportFormat(false, false),
-                level: config.logLevel
-            };
-            if (config.logFile !== undefined && config.logFile.length > 0) {
-                FileTransportOptions.filename = config.logFile;
-            }
-            FileTransport = new Winston.transports.File(FileTransportOptions);
-            Logger.add(FileTransport);
-        }
-
-        if(config.logLevelPin !== 'none'){
-
-            MS = new MemoryStream();
-            MS.on('data',(C) => {
-                node.send([undefined,{payload:JSON.parse(C.toString())}])
-            })
-            const StreamTransportOptions = {
-                stream: MS,
-                format: Winston.format.json(),
-                level: config.logLevelPin
-            };
-            StreamTransport = new Winston.transports.Stream(StreamTransportOptions);
-            Logger.add(StreamTransport);
-        }
-
-        node.status({
-            fill: 'red',
-            shape: 'dot',
-            text: 'Starting Z-Wave driver...'
-        });
-        UI.status('Starting Z-Wave driver...');
-
-        RED.events.on('zwjs:node:command', processMessageEvent);
-        async function processMessageEvent(MSG) {
-            await Input(MSG, undefined, undefined, true);
-        }
-
-        DriverOptions = {};
-
-        // Logging
-        DriverOptions.logConfig = {};
-        if (Logger !== undefined) {
-            DriverOptions.logConfig.enabled = true;
-            if (
-                config.logNodeFilter !== undefined &&
-                config.logNodeFilter.length > 0
-            ) {
-                const Nodes = config.logNodeFilter.split(',');
-                const NodesArray = [];
-                Nodes.forEach((N) => {
-                    NodesArray.push(parseInt(N));
-                });
-                DriverOptions.logConfig.nodeFilter = NodesArray;
-            }
-            DriverOptions.logConfig.transports = [];
-            if(FileTransport !== undefined){
-                DriverOptions.logConfig.transports.push(FileTransport)
-            }
-            if(StreamTransport !== undefined){
-                DriverOptions.logConfig.transports.push(StreamTransport)
-            }
-        } else {
-            DriverOptions.logConfig.enabled = false;
-        }
-
-        DriverOptions.storage = {};
-
-        // Cache Dir
-        Log(
-            'debug',
-            'NDERED',
-            undefined,
-            '[options] [storage.cacheDir]',
-            Path.join(RED.settings.userDir, 'zwave-js-cache')
-        );
-        DriverOptions.storage.cacheDir = Path.join(
-            RED.settings.userDir,
-            'zwave-js-cache'
-        );
-
-        // Custom  Config Path
-        if (
-            config.customConfigPath !== undefined &&
-            config.customConfigPath.length > 0
-        ) {
-            Log(
-                'debug',
-                'NDERED',
-                undefined,
-                '[options] [storage.deviceConfigPriorityDir]',
-                config.customConfigPath
-            );
-            DriverOptions.storage.deviceConfigPriorityDir = config.customConfigPath;
-        }
-
-        // Disk throttle
-        if (
-            config.valueCacheDiskThrottle !== undefined &&
-            config.valueCacheDiskThrottle.length > 0
-        ) {
-            Log(
-                'debug',
-                'NDERED',
-                undefined,
-                '[options] [storage.throttle]',
-                config.valueCacheDiskThrottle
-            );
-            DriverOptions.storage.throttle = config.valueCacheDiskThrottle;
-        }
-
-        // Timeout
-        DriverOptions.timeouts = {};
-        if (config.ackTimeout !== undefined && config.ackTimeout.length > 0) {
-            Log(
-                'debug',
-                'NDERED',
-                undefined,
-                '[options] [timeouts.ack]',
-                config.ackTimeout
-            );
-            DriverOptions.timeouts.ack = parseInt(config.ackTimeout);
-        }
-        if (
-            config.controllerTimeout !== undefined &&
-            config.controllerTimeout.length > 0
-        ) {
-            Log(
-                'debug',
-                'NDERED',
-                undefined,
-                '[options] [timeouts.response]',
-                config.controllerTimeout
-            );
-            DriverOptions.timeouts.response = parseInt(config.controllerTimeout);
-        }
-        if (
-            config.sendResponseTimeout !== undefined &&
-            config.sendResponseTimeout.length > 0
-        ) {
-            Log(
-                'debug',
-                'NDERED',
-                undefined,
-                '[options] [timeouts.report]',
-                config.sendResponseTimeout
-            );
-            DriverOptions.timeouts.report = parseInt(config.sendResponseTimeout);
-        }
-
-        DriverOptions.securityKeys = {};
-
-        const GetKey = (Property, ZWAVEJSName) => {
-            if (config[Property] !== undefined && config[Property].length > 0) {
-                if (
-                    config[Property].startsWith('[') &&
-                    config[Property].endsWith(']')
-                ) {
-                    const RemoveBrackets = config[Property].replace('[', '').replace(
-                        ']',
-                        ''
-                    );
-                    const _Array = RemoveBrackets.split(',');
-                    const _Buffer = [];
-                    for (let i = 0; i < _Array.length; i++) {
-                        if (!isNaN(_Array[i].trim())) {
-                            _Buffer.push(parseInt(_Array[i].trim()));
-                        }
-                    }
-                    Log(
-                        'debug',
-                        'NDERED',
-                        undefined,
-                        '[options] [securityKeys.' + ZWAVEJSName + ']',
-                        'Provided as array',
-                        '[' + _Buffer.length + ' bytes]'
-                    );
-                    if (_Buffer.length === 16) {
-                        DriverOptions.securityKeys[ZWAVEJSName] = Buffer.from(_Buffer);
-                    }
-                } else {
-                    Log(
-                        'debug',
-                        'NDERED',
-                        undefined,
-                        '[options] [securityKeys.' + ZWAVEJSName + ']',
-                        'Provided as string',
-                        '[' + config[Property].length + ' characters]'
-                    );
-                    if (config[Property].length === 16) {
-                        DriverOptions.securityKeys[ZWAVEJSName] = Buffer.from(
-                            config[Property]
-                        );
-                    }
-                }
-            }
-        };
-
-        GetKey('encryptionKey', 'S0_Legacy');
-        GetKey('encryptionKeyS2U', 'S2_Unauthenticated');
-        GetKey('encryptionKeyS2A', 'S2_Authenticated');
-        GetKey('encryptionKeyS2AC', 'S2_AccessControl');
-
-        function ShareNodeList() {
-            for (const Location in NodeList) delete NodeList[Location];
-
-            NodeList['No location'] = [];
-            Driver.controller.nodes.forEach((ZWN) => {
-                if (ZWN.isControllerNode()) {
-                    return;
-                }
-                const Node = {
-                    id: ZWN.id,
-                    name: ZWN.name !== undefined ? ZWN.name : 'No name',
-                    location: ZWN.location !== undefined ? ZWN.location : 'No location'
-                };
-                if (!NodeList.hasOwnProperty(Node.location)) {
-                    NodeList[Node.location] = [];
-                }
-                NodeList[Node.location].push(Node);
-            });
-        }
-
-        function NodeCheck(ID, SkipReady) {
-            if (Driver.controller.nodes.get(ID) === undefined) {
-                const ErrorMSG = 'Node ' + ID + ' does not exist.';
-                throw new Error(ErrorMSG);
-            }
-
-            if (!SkipReady) {
-                if (!Driver.controller.nodes.get(ID).ready) {
-                    const ErrorMSG =
-                        'Node ' + ID + ' is not yet ready to receive commands.';
-                    throw new Error(ErrorMSG);
-                }
-            }
-        }
-
-        function ThrowVirtualNodeLimit() {
-            throw new Error(
-                'Multicast only supports ValueAPI:setValue and CCAPI set type commands.'
-            );
-        }
-
-        node.on('close', (removed, done) => {
-            const Type = removed ? 'DELETE' : 'RESTART';
-            Log(
-                'info',
-                'NDERED',
-                undefined,
-                '[SHUTDOWN] [' + Type + ']',
-                'Cleaning up...'
-            );
-            UI.unregister();
-            Driver.destroy();
-            RED.events.off('zwjs:node:command', processMessageEvent);
-            if(Logger !== undefined){
-                Logger.clear();
-                Logger = undefined
-            }
-            if(MS !== undefined){
-                MS.destroy();
-                MS = undefined;
-            }
-            if (done) {
-                done();
-            }
-        });
-
-        node.on('input', Input);
-
-        async function Input(msg, send, done, internal) {
-            let Type = 'CONTROLLER';
-            if (internal !== undefined && internal) {
-                Type = 'EVENT';
-            }
-
-            Log('debug', 'NDERED', 'IN', '[' + Type + ']', 'Payload received.');
-
-            try {
-                const Mode = msg.payload.mode;
-                switch (Mode) {
-                    case 'IEAPI':
-                        await IEAPI(msg);
-                        break;
-                    case 'CCAPI':
-                        await CCAPI(msg, send);
-                        break;
-                    case 'ValueAPI':
-                        await ValueAPI(msg, send);
-                        break;
-                    case 'DriverAPI':
-                        await DriverAPI(msg, send);
-                        break;
-                    case 'ControllerAPI':
-                        await ControllerAPI(msg, send);
-                        break;
-                    case 'AssociationsAPI':
-                        await AssociationsAPI(msg, send);
-                        break;
-                }
-
-                if (done) {
-                    done();
-                }
-            } catch (er) {
-                Log('error', 'NDERED', undefined, '[ERROR] [INPUT]', er.message);
-
-                if (done) {
-                    done(er);
-                } else {
-                    node.error(er);
-                }
-            }
-        }
-
-        let _GrantResolve;
-        let _DSKResolve;
-
-        function CheckKey(strategy) {
-            if (strategy === 2) {
-                return;
-            }
-
-            const KeyRequirementsCFG = {
-                0: [
-                    'S0_Legacy',
-                    'S2_Unauthenticated',
-                    'S2_Authenticated',
-                    'S2_AccessControl'
-                ],
-                3: ['S0_Legacy'],
-                4: ['S2_Unauthenticated', 'S2_Authenticated', 'S2_AccessControl']
-            };
-
-            const KeyRequirementsLable = {
-                0: ['S0 ', 'S2 Unauth ', 'S2 Auth ', 'S2 Access Ctrl'],
-                3: ['S0'],
-                4: ['S2 Unauth ', 'S2 Auth ', 'S2 Access Ctrl']
-            };
-
-            const Set = KeyRequirementsCFG[strategy];
-
-            Set.forEach((KR) => {
-                if (DriverOptions.securityKeys[KR] === undefined) {
-                    const Label = KeyRequirementsLable[strategy];
-                    throw new Error(
-                        'The chosen inclusion strategy require the following keys to be present: ' +
-                        Label
-                    );
-                }
-            });
-        }
-
-        async function IEAPI(msg) {
-            const Method = msg.payload.method;
-            const Params = msg.payload.params || [];
-
-            const Callbacks = {
-                grantSecurityClasses: GrantSecurityClasses,
-                validateDSKAndEnterPIN: ValidateDSK,
-                abort: Abort
-            };
-
-            switch (Method) {
-                case 'beginInclusion':
-                    CheckKey(Params[0].strategy);
-                    Params[0].userCallbacks = Callbacks;
-                    await Driver.controller.beginInclusion(Params[0]);
-                    break;
-
-                case 'beginExclusion':
-                    await Driver.controller.beginExclusion();
-                    break;
-
-                case 'grantClasses':
-                    Grant(Params[0]);
-                    break;
-
-                case 'verifyDSK':
-                    VerifyDSK(Params[0]);
-                    break;
-
-                case 'replaceNode':
-                    CheckKey(Params[1].strategy);
-                    Params[1].userCallbacks = Callbacks;
-                    await Driver.controller.replaceFailedNode(Params[0], Params[1]);
-                    break;
-
-                case 'stop':
-                    const IS = await Driver.controller.stopInclusion();
-                    const ES = await Driver.controller.stopExclusion();
-                    if (IS || ES) {
-                        RestoreReadyStatus();
-                    }
-                    break;
-            }
-            return;
-        }
-
-        function GrantSecurityClasses(RequestedClasses) {
-            UI.sendEvent('node-inclusion-step', 'grant security', {
-                classes: RequestedClasses
-            });
-            return new Promise((res) => {
-                _GrantResolve = res;
-            });
-        }
-
-        function Grant(Classes) {
-            _GrantResolve({
-                securityClasses: Classes,
-                clientSideAuth: false
-            });
-        }
-
-        function ValidateDSK(DSK) {
-            UI.sendEvent('node-inclusion-step', 'verify dsk', { dsk: DSK });
-            return new Promise((res) => {
-                _DSKResolve = res;
-            });
-        }
-
-        function VerifyDSK(Pin) {
-            _DSKResolve(Pin);
-        }
-
-        function Abort() {
-            UI.sendEvent('node-inclusion-step', 'aborted');
-        }
-
-        async function ControllerAPI(msg, send) {
-            const Method = msg.payload.method;
-            const Params = msg.payload.params || [];
-            const ReturnNode = { id: '' };
-
-            Log(
-                'debug',
-                'NDERED',
-                'IN',
-                undefined,
-                printParams('ControllerAPI', undefined, Method, Params)
-            );
-
-            let SupportsNN = false;
-
-            switch (Method) {
-                case 'abortFirmwareUpdate':
-                    NodeCheck(Params[0]);
-                    ReturnNode.id = Params[0];
-                    await Driver.controller.nodes.get(Params[0]).abortFirmwareUpdate();
-                    Send(ReturnNode, 'FIRMWARE_UPDATE_ABORTED', undefined, send);
-                    break;
-
-                case 'beginFirmwareUpdate':
-                    NodeCheck(Params[0]);
-                    ReturnNode.id = Params[0];
-                    const Format = ZWaveJS.guessFirmwareFileFormat(Params[2], Params[3]);
-                    const Firmware = ZWaveJS.extractFirmware(Params[3], Format);
-                    await Driver.controller.nodes
-                        .get(Params[0])
-                        .beginFirmwareUpdate(Firmware.data, Params[1]);
-                    Send(ReturnNode, 'FIRMWARE_UPDATE_STARTED', Params[1], send);
-                    break;
-
-                case 'getRFRegion':
-                    const RFR = await Driver.controller.getRFRegion();
-                    Send(undefined, 'CURRENT_RF_REGION', ZWaveJS.RFRegion[RFR], send);
-                    break;
-
-                case 'setRFRegion':
-                    await Driver.controller.setRFRegion(ZWaveJS.RFRegion[Params[0]]);
-                    Send(undefined, 'RF_REGION_SET', Params[0], send);
-                    break;
-
-                case 'toggleRF':
-                    await Driver.controller.toggleRF(Params[0]);
-                    Send(undefined, 'RF_STATUS', Params[0], send);
-                    break;
-
-                case 'getNodes':
-                    const Nodes = [];
-                    Driver.controller.nodes.forEach((N) => {
-                        Nodes.push({
-                            nodeId: N.id,
-                            name: N.name,
-                            location: N.location,
-                            status: ZWaveJS.NodeStatus[N.status],
-                            ready: N.ready,
-                            interviewStage: ZWaveJS.InterviewStage[N.interviewStage],
-                            zwavePlusVersion: N.zwavePlusVersion,
-                            zwavePlusNodeType: N.zwavePlusNodeType,
-                            zwavePlusRoleType: N.zwavePlusRoleType,
-                            isListening: N.isListening,
-                            isFrequentListening: N.isFrequentListening,
-                            canSleep: N.canSleep,
-                            isRouting: N.isRouting,
-                            supportedDataRates: N.supportedDataRates,
-                            maxDataRate: N.maxDataRate,
-                            supportsSecurity: N.supportsSecurity,
-                            isSecure: N.isSecure,
-                            highestSecurityClass: N.getHighestSecurityClass(),
-                            protocolVersion: ZWaveJS.ProtocolVersion[N.protocolVersion],
-                            manufacturerId: N.manufacturerId,
-                            productId: N.productId,
-                            productType: N.productType,
-                            firmwareVersion: N.firmwareVersion,
-                            deviceConfig: N.deviceConfig,
-                            isControllerNode: N.isControllerNode(),
-                            supportsBeaming: N.supportsBeaming,
-                            keepAwake: N.keepAwake
-                        });
-                    });
-                    Send(undefined, 'NODE_LIST', Nodes, send);
-                    break;
-
-                case 'keepNodeAwake':
-                    NodeCheck(Params[0]);
-                    ReturnNode.id = Params[0];
-                    Driver.controller.nodes.get(Params[0]).keepAwake = Params[1];
-                    Send(ReturnNode, 'NODE_KEEP_AWAKE', Params[1], send);
-                    break;
-
-                case 'getNodeNeighbors':
-                    NodeCheck(Params[0]);
-                    const NIDs = await Driver.controller.getNodeNeighbors(Params[0]);
-                    ReturnNode.id = Params[0];
-                    Send(ReturnNode, 'NODE_NEIGHBORS', NIDs, send);
-                    break;
-
-                case 'setNodeName':
-                    NodeCheck(Params[0]);
-                    Driver.controller.nodes.get(Params[0]).name = Params[1];
-                    SupportsNN = Driver.controller.nodes
-                        .get(Params[0])
-                        .supportsCC(CommandClasses['Node Naming and Location']);
-                    if (SupportsNN) {
-                        await Driver.controller.nodes
-                            .get(Params[0])
-                            .commandClasses['Node Naming and Location'].setName(Params[1]);
-                    }
-                    ReturnNode.id = Params[0];
-                    Send(ReturnNode, 'NODE_NAME_SET', Params[1], send);
-                    ShareNodeList();
-                    break;
-
-                case 'setNodeLocation':
-                    NodeCheck(Params[0]);
-                    Driver.controller.nodes.get(Params[0]).location = Params[1];
-                    SupportsNN = Driver.controller.nodes
-                        .get(Params[0])
-                        .supportsCC(CommandClasses['Node Naming and Location']);
-                    if (SupportsNN) {
-                        await Driver.controller.nodes
-                            .get(Params[0])
-                            .commandClasses['Node Naming and Location'].setLocation(
-                                Params[1]
-                            );
-                    }
-                    ReturnNode.id = Params[0];
-                    Send(ReturnNode, 'NODE_LOCATION_SET', Params[1], send);
-                    ShareNodeList();
-                    break;
-
-                case 'refreshInfo':
-                    NodeCheck(Params[0], true);
-                    const Stage =
-                        ZWaveJS.InterviewStage[
-                        Driver.controller.nodes.get(Params[0]).interviewStage
-                        ];
-                    if (Stage !== 'Complete') {
-                        const ErrorMSG =
-                            'Node ' +
-                            Params[0] +
-                            ' is already being interviewed. Current interview stage : ' +
-                            Stage +
-                            '';
-                        throw new Error(ErrorMSG);
-                    } else {
-                        await Driver.controller.nodes.get(Params[0]).refreshInfo();
-                    }
-                    break;
-
-                case 'hardReset':
-                    await Driver.hardReset();
-                    Send(undefined, 'CONTROLLER_RESET_COMPLETE', undefined, send);
-                    break;
-
-                case 'healNode':
-                    NodeCheck(Params[0]);
-                    ReturnNode.id = Params[0];
-                    Send(ReturnNode, 'NODE_HEAL_STARTED', undefined, send);
-                    node.status({
-                        fill: 'yellow',
-                        shape: 'dot',
-                        text: 'Node Heal Started: ' + Params[0]
-                    });
-                    UI.status('Node Heal Started: ' + Params[0]);
-                    const HealResponse = await Driver.controller.healNode(Params[0]);
-                    if (HealResponse) {
-                        node.status({
-                            fill: 'green',
-                            shape: 'dot',
-                            text: 'Node Heal Successful: ' + Params[0]
-                        });
-                        UI.status('Node Heal Successful: ' + Params[0]);
-                    } else {
-                        node.status({
-                            fill: 'red',
-                            shape: 'dot',
-                            text: 'Node Heal Unsuccessful: ' + Params[0]
-                        });
-                        UI.status('Node Heal Unsuccessful: ' + Params[0]);
-                    }
-                    Send(
-                        ReturnNode,
-                        'NODE_HEAL_FINISHED',
-                        { success: HealResponse },
-                        send
-                    );
-                    RestoreReadyStatus();
-                    break;
-
-                case 'beginHealingNetwork':
-                    await Driver.controller.beginHealingNetwork();
-                    Send(undefined, 'NETWORK_HEAL_STARTED', undefined, send);
-                    node.status({
-                        fill: 'yellow',
-                        shape: 'dot',
-                        text: 'Network Heal Started.'
-                    });
-                    UI.status('Network Heal Started.');
-                    break;
-
-                case 'stopHealingNetwork':
-                    await Driver.controller.stopHealingNetwork();
-                    Send(undefined, 'NETWORK_HEAL_STOPPED', undefined, send);
-                    node.status({
-                        fill: 'blue',
-                        shape: 'dot',
-                        text: 'Network Heal Stopped.'
-                    });
-                    UI.status('Network Heal Stopped.');
-                    RestoreReadyStatus();
-                    break;
-
-                case 'removeFailedNode':
-                    await Driver.controller.removeFailedNode(Params[0]);
-                    break;
-
-                case 'proprietaryFunction':
-                    const ZWaveMessage = new ZWaveJS.Message(Driver, {
-                        type: ZWaveJS.MessageType.Request,
-                        functionType: Params[0],
-                        payload: Params[1]
-                    });
-
-                    const MessageSettings = {
-                        priority: ZWaveJS.MessagePriority.Controller,
-                        supportCheck: false
-                    };
-
-                    await Driver.sendMessage(ZWaveMessage, MessageSettings);
-                    break;
-            }
-
-            return;
-        }
-
-        async function ValueAPI(msg, send) {
-            const Method = msg.payload.method;
-            const Params = msg.payload.params || [];
-            const Node = msg.payload.node;
-            const Multicast = Array.isArray(Node);
-
-            let ZWaveNode;
-            if (Multicast) {
-                ZWaveNode = Driver.controller.getMulticastGroup(Node);
-            } else {
-                NodeCheck(Node);
-                ZWaveNode = Driver.controller.nodes.get(Node);
-            }
-
-            Log(
-                'debug',
-                'NDERED',
-                'IN',
-                '[Node: ' + ZWaveNode.id + ']',
-                printParams('ValueAPI', undefined, Method, Params)
-            );
-
-            const ReturnNode = { id: ZWaveNode.id };
-
-            switch (Method) {
-                case 'getDefinedValueIDs':
-                    if (Multicast) ThrowVirtualNodeLimit();
-                    const VIDs = ZWaveNode.getDefinedValueIDs();
-                    Send(ReturnNode, 'VALUE_ID_LIST', VIDs, send);
-                    break;
-
-                case 'getValueMetadata':
-                    if (Multicast) ThrowVirtualNodeLimit();
-                    const M = ZWaveNode.getValueMetadata(Params[0]);
-                    const ReturnObjectM = {
-                        response: M,
-                        valueId: Params[0]
-                    };
-                    Send(ReturnNode, 'GET_VALUE_METADATA_RESPONSE', ReturnObjectM, send);
-                    break;
-
-                case 'getValue':
-                    if (Multicast) ThrowVirtualNodeLimit();
-                    const V = ZWaveNode.getValue(Params[0]);
-                    const ReturnObject = {
-                        response: V,
-                        valueId: Params[0]
-                    };
-                    Send(ReturnNode, 'GET_VALUE_RESPONSE', ReturnObject, send);
-                    break;
-
-                case 'setValue':
-                    if (Params.length > 2) {
-                        await ZWaveNode.setValue(Params[0], Params[1], Params[2]);
-                    } else {
-                        await ZWaveNode.setValue(Params[0], Params[1]);
-                    }
-                    break;
-
-                case 'pollValue':
-                    if (Multicast) ThrowVirtualNodeLimit();
-                    await ZWaveNode.pollValue(Params[0]);
-                    break;
-            }
-
-            return;
-        }
-
-        async function CCAPI(msg, send) {
-            const CC = msg.payload.cc;
-            const Method = msg.payload.method;
-            const Params = msg.payload.params || [];
-            const Node = msg.payload.node;
-            const Endpoint = msg.payload.endpoint || 0;
-            const EnumSelection = msg.payload.enums;
-            const ForceUpdate = msg.payload.forceUpdate;
-            const Multicast = Array.isArray(Node);
-            let IsEventResponse = true;
-
-            let ZWaveNode;
-            if (Multicast) {
-                ZWaveNode = Driver.controller.getMulticastGroup(Node);
-            } else {
-                NodeCheck(Node);
-                ZWaveNode = Driver.controller.nodes.get(Node);
-            }
-
-            Log(
-                'debug',
-                'NDERED',
-                'IN',
-                '[Node: ' + ZWaveNode.id + ']',
-                printParams('CCAPI', CC, Method, Params)
-            );
-
-            if (msg.payload.responseThroughEvent !== undefined) {
-                IsEventResponse = msg.payload.responseThroughEvent;
-            }
-
-            const ReturnNode = { id: ZWaveNode.id };
-
-            if (EnumSelection !== undefined) {
-                const ParamIndexs = Object.keys(EnumSelection);
-                ParamIndexs.forEach((PI) => {
-                    const EnumName = EnumSelection[PI];
-                    const Enum = ZWaveJS[EnumName];
-                    Params[PI] = Enum[Params[PI]];
-                });
-            }
-
-            const Result = await ZWaveNode.getEndpoint(Endpoint).invokeCCAPI(
-                CommandClasses[CC],
-                Method,
-                ...Params
-            );
-            if (!IsEventResponse && ForceUpdate === undefined) {
-                Send(ReturnNode, 'VALUE_UPDATED', Result, send);
-            }
-
-            if (ForceUpdate !== undefined) {
-                if (Multicast) ThrowVirtualNodeLimit();
-
-                const ValueID = {
-                    commandClass: CommandClasses[CC],
-                    endpoint: Endpoint
-                };
-                Object.keys(ForceUpdate).forEach((VIDK) => {
-                    ValueID[VIDK] = ForceUpdate[VIDK];
-                });
-                Log(
-                    'debug',
-                    'NDERED',
-                    undefined,
-                    '[POLL]',
-                    printForceUpdate(Node, ValueID)
-                );
-                await ZWaveNode.pollValue(ValueID);
-            }
-
-            return;
-        }
-
-        async function DriverAPI(msg, send) {
-            const Method = msg.payload.method;
-            const Params = msg.payload.params || [];
-
-            Log(
-                'debug',
-                'NDERED',
-                'IN',
-                undefined,
-                printParams('DriverAPI', undefined, Method, Params)
-            );
-
-            switch (Method) {
-                case 'getNodeStatistics':
-                    if (Params.length < 1) {
-                        Send(undefined, 'NODE_STATISTICS', NodeStats, send);
-                    } else {
-                        const Stats = {};
-                        Params.forEach((NID) => {
-                            if (NodeStats.hasOwnProperty(NID)) {
-                                Stats[NID] = NodeStats[NID];
-                            }
-                        });
-                        Send(undefined, 'NODE_STATISTICS', Stats, send);
-                    }
-                    break;
-
-                case 'getControllerStatistics':
-                    if (ControllerStats === undefined) {
-                        Send(
-                            undefined,
-                            'CONTROLER_STATISTICS',
-                            'Statistics Are Pending',
-                            send
-                        );
-                    } else {
-                        Send(undefined, 'CONTROLER_STATISTICS', ControllerStats, send);
-                    }
-                    break;
-
-                case 'getValueDB':
-                    const Result = [];
-                    if (Params.length < 1) {
-                        Driver.controller.nodes.forEach((N) => {
-                            Params.push(N.id);
-                        });
-                    }
-                    Params.forEach((NID) => {
-                        const G = {
-                            nodeId: NID,
-                            nodeName: getNodeInfoForPayload(NID, 'name'),
-                            nodeLocation: getNodeInfoForPayload(NID, 'location'),
-                            values: []
-                        };
-                        const VIDs = Driver.controller.nodes.get(NID).getDefinedValueIDs();
-                        VIDs.forEach((VID) => {
-                            const V = Driver.controller.nodes.get(NID).getValue(VID);
-                            const VI = {
-                                currentValue: V,
-                                valueId: VID
-                            };
-                            G.values.push(VI);
-                        });
-                        Result.push(G);
-                    });
-                    Send(undefined, 'VALUE_DB', Result, send);
-                    break;
-            }
-
-            return;
-        }
-
-        async function AssociationsAPI(msg, send) {
-            const Method = msg.payload.method;
-            const Params = msg.payload.params || [];
-
-            Log(
-                'debug',
-                'NDERED',
-                'IN',
-                undefined,
-                printParams('AssociationsAPI', undefined, Method, Params)
-            );
-
-            const ReturnNode = { id: '' };
-            let ResultData;
-            let PL;
-            switch (Method) {
-                case 'getAssociationGroups':
-                    NodeCheck(Params[0].nodeId);
-                    ResultData = Driver.controller.getAssociationGroups(Params[0]);
-                    PL = [];
-                    ResultData.forEach((FV, FK) => {
-                        const A = {
-                            GroupID: FK,
-                            AssociationGroupInfo: FV
-                        };
-                        PL.push(A);
-                    });
-
-                    ReturnNode.id = Params[0].nodeId;
-                    Send(
-                        ReturnNode,
-                        'ASSOCIATION_GROUPS',
-                        { SourceAddress: Params[0], Groups: PL },
-                        send
-                    );
-                    break;
-
-                case 'getAllAssociationGroups':
-                    NodeCheck(Params[0]);
-                    ResultData = Driver.controller.getAllAssociationGroups(Params[0]);
-                    PL = [];
-                    ResultData.forEach((FV, FK) => {
-                        const A = {
-                            Endpoint: FK,
-                            Groups: []
-                        };
-                        FV.forEach((SV, SK) => {
-                            const B = {
-                                GroupID: SK,
-                                AssociationGroupInfo: SV
-                            };
-                            A.Groups.push(B);
-                        });
-                        PL.push(A);
-                    });
-
-                    ReturnNode.id = Params[0];
-                    Send(ReturnNode, 'ALL_ASSOCIATION_GROUPS', PL, send);
-                    break;
-
-                case 'getAssociations':
-                    NodeCheck(Params[0].nodeId);
-                    ResultData = Driver.controller.getAssociations(Params[0]);
-                    PL = [];
-                    ResultData.forEach((FV, FK) => {
-                        const A = {
-                            GroupID: FK,
-                            AssociationAddress: []
-                        };
-                        FV.forEach((AA) => {
-                            A.AssociationAddress.push(AA);
-                        });
-
-                        PL.push(A);
-                    });
-
-                    ReturnNode.id = Params[0].nodeId;
-                    Send(
-                        ReturnNode,
-                        'ASSOCIATIONS',
-                        { SourceAddress: Params[0], Associations: PL },
-                        send
-                    );
-                    break;
-
-                case 'getAllAssociations':
-                    NodeCheck(Params[0]);
-                    ResultData = Driver.controller.getAllAssociations(Params[0]);
-                    PL = [];
-                    ResultData.forEach((FV, FK) => {
-                        const A = {
-                            AssociationAddress: FK,
-                            Associations: []
-                        };
-                        FV.forEach((SV, SK) => {
-                            const B = {
-                                GroupID: SK,
-                                AssociationAddress: SV
-                            };
-                            A.Associations.push(B);
-                        });
-                        PL.push(A);
-                    });
-
-                    ReturnNode.id = Params[0];
-                    Send(ReturnNode, 'ALL_ASSOCIATIONS', PL, send);
-                    break;
-
-                case 'addAssociations':
-                    NodeCheck(Params[0].nodeId);
-                    Params[2].forEach((A) => {
-                        if (
-                            !Driver.controller.isAssociationAllowed(Params[0], Params[1], A)
-                        ) {
-                            const ErrorMSG =
-                                'Association: Source ' + JSON.stringify(Params[0]);
-                            +', Group ' +
-                                Params[1] +
-                                ', Destination ' +
-                                JSON.stringify(A) +
-                                ' is not allowed.';
-                            throw new Error(ErrorMSG);
-                        }
-                    });
-                    await Driver.controller.addAssociations(
-                        Params[0],
-                        Params[1],
-                        Params[2]
-                    );
-                    ReturnNode.id = Params[0].nodeId;
-                    Send(ReturnNode, 'ASSOCIATIONS_ADDED', undefined, send);
-                    break;
-
-                case 'removeAssociations':
-                    NodeCheck(Params[0].nodeId);
-                    await Driver.controller.removeAssociations(
-                        Params[0],
-                        Params[1],
-                        Params[2]
-                    );
-                    ReturnNode.id = Params[0].nodeId;
-                    Send(ReturnNode, 'ASSOCIATIONS_REMOVED', undefined, send);
-                    break;
-
-                case 'removeNodeFromAllAssociations':
-                    NodeCheck(Params[0]);
-                    await Driver.controller.removeNodeFromAllAssociations(Params[0]);
-                    ReturnNode.id = Params[0];
-                    Send(ReturnNode, 'ALL_ASSOCIATIONS_REMOVED', undefined, send);
-                    break;
-            }
-
-            return;
-        }
-
-        function printParams(Mode, CC, Method, Params) {
-            const Lines = [];
-            if (CC !== undefined) {
-                Lines.push(
-                    '[API: ' + Mode + '] [CC: ' + CC + '] [Method: ' + Method + ']'
-                );
-            } else {
-                Lines.push('[API: ' + Mode + '] [Method: ' + Method + ']');
-            }
-
-            if (Params.length > 0) {
-                Lines.push('└─[params]');
-                let i = 0;
-                Params.forEach((P) => {
-                    if (typeof P === 'object') {
-                        Lines.push('    ' + (i + ': ') + JSON.stringify(P));
-                    } else {
-                        Lines.push('    ' + (i + ': ') + P);
-                    }
-                    i++;
-                });
-            }
-
-            return Lines;
-        }
-
-        function printForceUpdate(NID, Value) {
-            const Lines = [];
-            Lines.push('[Node: ' + NID + ']');
-
-            if (Value !== undefined) {
-                Lines.push('└─[ValueID]');
-
-                const OBKeys = Object.keys(Value);
-                OBKeys.forEach((K) => {
-                    Lines.push('    ' + (K + ': ') + Value[K]);
-                });
-            }
-            return Lines;
-        }
-
-        function getNodeInfoForPayload(NodeID, Property) {
-            try {
-                const Prop = Driver.controller.nodes.get(parseInt(NodeID))[Property];
-                return Prop;
-            } catch (err) {
-                return undefined;
-            }
-        }
-
-        function Send(Node, Subject, Value, send) {
-            const PL = {};
-
-            if (Node !== undefined) {
-                PL.node = Node.id;
-            }
-
-            if (Node !== undefined) {
-                const N = getNodeInfoForPayload(Node.id, 'name');
-                if (N !== undefined) {
-                    PL.nodeName = N;
-                }
-                const L = getNodeInfoForPayload(Node.id, 'location');
-                if (L !== undefined) {
-                    PL.nodeLocation = L;
-                }
-            }
-            (PL.event = Subject), (PL.timestamp = new Date().toJSON());
-            if (Value !== undefined) {
-                PL.object = Value;
-            }
-
-            let _Subject = '';
-            if (Node !== undefined) {
-                _Subject = '[Node: ' + Node.id + '] [' + Subject + ']';
-            } else {
-                _Subject = '[' + Subject + ']';
-            }
-
-            Log('debug', 'NDERED', 'OUT', _Subject, 'Forwarding payload...');
-
-            if (send) {
-                send({ payload: PL });
-            } else {
-                node.send({ payload: PL });
-            }
-
-            const AllowedSubjectsForDNs = [
-                'VALUE_NOTIFICATION',
-                'NOTIFICATION',
-                'VALUE_UPDATED',
-                'SLEEP',
-                'WAKE_UP',
-                'VALUE_ID_LIST',
-                'GET_VALUE_RESPONSE',
-                'GET_VALUE_METADATA_RESPONSE'
-            ];
-
-            if (AllowedSubjectsForDNs.includes(Subject)) {
-                RED.events.emit('zwjs:node:event:all', { payload: PL });
-                RED.events.emit('zwjs:node:event:' + Node.id, { payload: PL });
-            }
-        }
-
-        InitDriver();
-        StartDriver();
-
-        function InitDriver() {
-            DriverAttempts++;
-            try {
-                Log('info', 'NDERED', undefined, undefined, 'Initializing driver...');
-                Driver = new ZWaveJS.Driver(config.serialPort, DriverOptions);
-
-                if (
-                    config.sendUsageStatistics !== undefined &&
-                    config.sendUsageStatistics
-                ) {
-                    Log('info', 'NDERED', undefined, '[TELEMETRY]', 'Enabling...');
-                    Driver.enableStatistics({
-                        applicationName: ModulePackage.name,
-                        applicationVersion: ModulePackage.version
-                    });
-                } else {
-                    Log('info', 'NDERED', undefined, '[TELEMETRY]', 'Disabling...');
-                    Driver.disableStatistics();
-                }
-            } catch (e) {
-                Log('error', 'NDERED', undefined, '[ERROR] [INIT]', e.message);
-                node.error(e);
-                return;
-            }
-
-            WireDriverEvents();
-            UI.unregister();
-            UI.register(Driver, Input);
-        }
-
-        function WireDriverEvents() {
-            Driver.on('error', (e) => {
-                if (e.code === ZWaveErrorCodes.Driver_Failed) {
-                    if (DriverAttempts >= MaxDriverAttempts) {
-                        Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
-                        node.error(e);
-                    } else {
-                        Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
-                        Log(
-                            'debug',
-                            'NDERED',
-                            undefined,
-                            undefined,
-                            'Will retry in ' +
-                            RetryTime +
-                            'ms. Attempted: ' +
-                            DriverAttempts +
-                            ', Max: ' +
-                            MaxDriverAttempts
-                        );
-                        node.error(
-                            new Error(
-                                'Driver Failed: Will retry in ' +
-                                RetryTime +
-                                'ms. Attempted: ' +
-                                DriverAttempts +
-                                ', Max: ' +
-                                MaxDriverAttempts
-                            )
-                        );
-                        InitDriver();
-                        setTimeout(StartDriver, RetryTime);
-                    }
-                } else {
-                    Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
-                    node.error(e);
-                }
-            });
-
-            Driver.on('all nodes ready', () => {
-                node.status({ fill: 'green', shape: 'dot', text: 'All nodes ready!' });
-                UI.status('All nodes ready!');
-            });
-
-            Driver.once('driver ready', () => {
-                DriverAttempts = 0;
-
-                node.status({
-                    fill: 'yellow',
-                    shape: 'dot',
-                    text: 'Initializing network...'
-                });
-                UI.status('Initializing network...');
-
-                // Add, Remove
-                Driver.controller.on('node added', (N) => {
-                    ShareNodeList();
-                    WireNodeEvents(N);
-                    Send(N, 'NODE_ADDED');
-                    Send(N, 'INTERVIEW_STARTED');
-                    node.status({
-                        fill: 'yellow',
-                        shape: 'dot',
-                        text: 'Node: ' + N.id + ' interview started.'
-                    });
-                    UI.status('Node: ' + N.id + ' interview started.');
-                });
-
-                Driver.controller.on('node removed', (N) => {
-                    ShareNodeList();
-                    Send(N, 'NODE_REMOVED');
-                });
-
-                // Stats
-                Driver.controller.on('statistics updated', (S) => {
-                    ControllerStats = S;
-                });
-
-                // Include
-                Driver.controller.on('inclusion started', (Secure) => {
-                    Send(undefined, 'INCLUSION_STARTED', { isSecureInclude: Secure });
-                    node.status({
-                        fill: 'yellow',
-                        shape: 'dot',
-                        text: 'Inclusion Started. Secure: ' + Secure
-                    });
-                    UI.status('Inclusion Started. Secure: ' + Secure);
-                });
-
-                Driver.controller.on('inclusion failed', () => {
-                    Send(undefined, 'INCLUSION_FAILED');
-                    node.status({ fill: 'red', shape: 'dot', text: 'Inclusion failed.' });
-                    UI.status('Inclusion failed.');
-                    RestoreReadyStatus();
-                });
-
-                Driver.controller.on('inclusion stopped', () => {
-                    Send(undefined, 'INCLUSION_STOPPED');
-                    node.status({
-                        fill: 'green',
-                        shape: 'dot',
-                        text: 'Inclusion Stopped.'
-                    });
-                    UI.status('Inclusion Stopped.');
-                });
-
-                // Exclusion
-                Driver.controller.on('exclusion started', () => {
-                    Send(undefined, 'EXCLUSION_STARTED');
-                    node.status({
-                        fill: 'yellow',
-                        shape: 'dot',
-                        text: 'Exclusion Started.'
-                    });
-                    UI.status('Exclusion Started.');
-                });
-
-                Driver.controller.on('exclusion failed', () => {
-                    Send(undefined, 'EXCLUSION_FAILED');
-                    node.status({ fill: 'red', shape: 'dot', text: 'Exclusion failed.' });
-                    UI.status('Exclusion failed.');
-                    RestoreReadyStatus();
-                });
-
-                Driver.controller.on('exclusion stopped', () => {
-                    Send(undefined, 'EXCLUSION_STOPPED');
-                    node.status({
-                        fill: 'green',
-                        shape: 'dot',
-                        text: 'Exclusion stopped.'
-                    });
-                    UI.status('Exclusion stopped.');
-                    RestoreReadyStatus();
-                });
-
-                // Network Heal
-                Driver.controller.on('heal network done', () => {
-                    Send(undefined, 'NETWORK_HEAL_DONE', {
-                        Successful: Heal_Done,
-                        Failed: Heal_Failed,
-                        Skipped: Heal_Skipped
-                    });
-                    node.status({
-                        fill: 'green',
-                        shape: 'dot',
-                        text: 'Network heal done.'
-                    });
-                    UI.status('Network heal done.');
-                    RestoreReadyStatus();
-                });
-
-                const Heal_Pending = [];
-                const Heal_Done = [];
-                const Heal_Failed = [];
-                const Heal_Skipped = [];
-
-                Driver.controller.on('heal network progress', (P) => {
-                    Heal_Pending.length = 0;
-                    Heal_Done.length = 0;
-                    Heal_Failed.length = 0;
-                    Heal_Skipped.length = 0;
-
-                    P.forEach((V, K) => {
-                        switch (V) {
-                            case 'pending':
-                                Heal_Pending.push(K);
-                                break;
-                            case 'done':
-                                Heal_Done.push(K);
-                                break;
-                            case 'failed':
-                                Heal_Failed.push(K);
-                                break;
-                            case 'skipped':
-                                Heal_Skipped.push(K);
-                                break;
-                        }
-                    });
-
-                    const Processed =
-                        Heal_Done.length + Heal_Failed.length + Heal_Skipped.length;
-                    const Remain = Heal_Pending.length;
-
-                    const Completed = (100 * Processed) / (Processed + Remain);
-
-                    node.status({
-                        fill: 'yellow',
-                        shape: 'dot',
-                        text:
-                            'Healing network ' +
-                            Math.round(Completed) +
-                            '%, Skipped:[' +
-                            Heal_Skipped +
-                            '], Failed:[' +
-                            Heal_Failed +
-                            ']'
-                    });
-
-                    UI.status(
-                        'Healing network ' +
-                        Math.round(Completed) +
-                        '%, Skipped:[' +
-                        Heal_Skipped +
-                        '], Failed:[' +
-                        Heal_Failed +
-                        ']'
-                    );
-                });
-
-                ShareNodeList();
-
-                Driver.controller.nodes.forEach((ZWN) => {
-                    WireNodeEvents(ZWN);
-                });
-            });
-        }
-
-        function WireNodeEvents(Node) {
-            Node.on('ready', (N) => {
-                if (N.isControllerNode()) {
-                    return;
-                }
-
-                Node.on('statistics updated', (N, S) => {
-                    NodeStats[Node.id] = S;
-                });
-
-                Node.on('firmware update finished', (N, S) => {
-                    Send(N, 'FIRMWARE_UPDATE_COMPLETE', S);
-                });
-
-                Node.on('value notification', (N, VL) => {
-                    Send(N, 'VALUE_NOTIFICATION', VL);
-                });
-
-                Node.on('notification', (N, CC, ARGS) => {
-                    const OBJ = {
-                        ccId: CC,
-                        args: ARGS
-                    };
-                    Send(N, 'NOTIFICATION', OBJ);
-                });
-
-                Node.on('value added', (N, VL) => {
-                    Send(N, 'VALUE_UPDATED', VL);
-                });
-
-                Node.on('value updated', (N, VL) => {
-                    Send(N, 'VALUE_UPDATED', VL);
-                });
-
-                Node.on('wake up', (N) => {
-                    Send(N, 'WAKE_UP');
-                });
-
-                Node.on('sleep', (N) => {
-                    Send(N, 'SLEEP');
-                });
-            });
-
-            Node.on('interview started', (N) => {
-                Send(N, 'INTERVIEW_STARTED');
-                node.status({
-                    fill: 'yellow',
-                    shape: 'dot',
-                    text: 'Node: ' + N.id + ' interview started.'
-                });
-                UI.status('Node: ' + N.id + ' interview started.');
-            });
-
-            Node.on('interview failed', (N, Er) => {
-                Send(N, 'INTERVIEW_FAILED', Er);
-                node.status({
-                    fill: 'red',
-                    shape: 'dot',
-                    text: 'Node: ' + N.id + ' interview failed.'
-                });
-                UI.status('Node: ' + N.id + ' interview failed.');
-                RestoreReadyStatus();
-            });
-
-            Node.on('interview completed', (N) => {
-                Send(N, 'INTERVIEW_COMPLETE');
-                node.status({
-                    fill: 'green',
-                    shape: 'dot',
-                    text: 'Node: ' + N.id + ' interview completed.'
-                });
-                UI.status('Node: ' + N.id + ' interview completed.');
-                RestoreReadyStatus();
-            });
-        }
-
-        function StartDriver() {
-            Log('info', 'NDERED', undefined, undefined, 'Starting driver...');
-            Driver.start()
-                .catch((e) => {
-                    if (e.code === ZWaveErrorCodes.Driver_Failed) {
-                        if (DriverAttempts >= MaxDriverAttempts) {
-                            Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
-                            node.error(e);
-                        } else {
-                            Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
-                            Log(
-                                'debug',
-                                'NDERED',
-                                undefined,
-                                undefined,
-                                'Will retry in ' +
-                                RetryTime +
-                                'ms. Attempted: ' +
-                                DriverAttempts +
-                                ', Max: ' +
-                                MaxDriverAttempts
-                            );
-                            node.error(
-                                new Error(
-                                    'Driver failed: Will retry in ' +
-                                    RetryTime +
-                                    'ms. Attempted: ' +
-                                    DriverAttempts +
-                                    ', Max: ' +
-                                    MaxDriverAttempts
-                                )
-                            );
-                            InitDriver();
-                            setTimeout(StartDriver, RetryTime);
-                        }
-                    } else {
-                        Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
-                        node.error(e);
-                    }
-                })
-                .then(() => {
-                    // now what - just sit and wait.
-                });
-        }
-    }
-
-    RED.nodes.registerType('zwave-js', Init);
-
-    RED.httpAdmin.get('/zwjsgetnodelist', function (req, res) {
-        res.json(NodeList);
-    });
-
-    RED.httpAdmin.get('/zwjsgetversion', function (req, res) {
-        res.json({
-            zwjsversion: ZWaveJSPackage.version,
-            moduleversion: ModulePackage.version
-        });
-    });
-
-    RED.httpAdmin.get(
-        '/zwjsgetports',
-        RED.auth.needsPermission('serial.read'),
-        function (req, res) {
-            SP.list()
-                .then((ports) => {
-                    const a = ports.map((p) => p.path);
-                    res.json(a);
-                })
-                .catch((err) => {
-                    RED.log.error('Error listing serial ports', err);
-                    res.json([]);
-                });
-        }
-    );
+	const SP = require('serialport');
+	const Path = require('path');
+	const ModulePackage = require('../package.json');
+	const ZWaveJS = require('zwave-js');
+	const {
+		createDefaultTransportFormat,
+		CommandClasses,
+		ZWaveErrorCodes
+	} = require('@zwave-js/core');
+	const ZWaveJSPackage = require('zwave-js/package.json');
+	const Winston = require('winston');
+	const { Pin2LogTransport } = require('./Pin2LogTransport');
+
+	const UI = require('./ui/server.js');
+	UI.init(RED);
+	const NodeList = {};
+
+	function Init(config) {
+		RED.nodes.createNode(this, config);
+		const node = this;
+
+		let Driver;
+		let Logger;
+		let FileTransport;
+		let Pin2Transport;
+
+		const MaxDriverAttempts = 3;
+		let DriverAttempts = 0;
+		const RetryTime = 5000;
+		let DriverOptions = {};
+
+		const NodeStats = {};
+		let ControllerStats;
+
+		// Log function
+		const Log = function (level, label, direction, tag1, msg, tag2) {
+			if (Logger !== undefined) {
+				const logEntry = {
+					direction: '  ',
+					message: msg,
+					level: level,
+					label: label,
+					timestamp: new Date().toJSON(),
+					multiline: Array.isArray(msg)
+				};
+				if (direction !== undefined) {
+					logEntry.direction = direction === 'IN' ? '« ' : '» ';
+				}
+				if (tag1 !== undefined) {
+					logEntry.primaryTags = tag1;
+				}
+				if (tag2 !== undefined) {
+					logEntry.secondaryTags = tag2;
+				}
+				Logger.log(logEntry);
+			}
+		};
+
+		// eslint-disable-next-line no-unused-vars
+		let RestoreReadyTimer;
+		function RestoreReadyStatus() {
+			if (RestoreReadyTimer !== undefined) {
+				clearTimeout(RestoreReadyTimer);
+				RestoreReadyTimer = undefined;
+			}
+
+			RestoreReadyTimer = setTimeout(() => {
+				const NotReady = [];
+				let AllReady = true;
+
+				Driver.controller.nodes.forEach((N) => {
+					if (
+						!N.ready ||
+						ZWaveJS.InterviewStage[N.interviewStage] !== 'Complete'
+					) {
+						NotReady.push(N.id);
+						AllReady = false;
+					}
+				});
+
+				if (AllReady) {
+					node.status({
+						fill: 'green',
+						shape: 'dot',
+						text: 'All nodes ready!'
+					});
+					UI.status('All nodes ready!');
+				} else {
+					node.status({
+						fill: 'yellow',
+						shape: 'dot',
+						text: 'Nodes : ' + NotReady.toString() + ' not ready.'
+					});
+					UI.status('Nodes : ' + NotReady.toString() + ' not ready.');
+				}
+			}, 5000);
+		}
+
+		// Create Logger (if needed)
+		if (config.logLevel !== 'none' || config.logLevelPin !== 'none') {
+			Logger = Winston.createLogger();
+		}
+
+		if (config.logLevel !== 'none') {
+			const FileTransportOptions = {
+				filename: Path.join(RED.settings.userDir, 'zwave-js-log.txt'),
+				format: createDefaultTransportFormat(false, false),
+				level: config.logLevel
+			};
+			if (config.logFile !== undefined && config.logFile.length > 0) {
+				FileTransportOptions.filename = config.logFile;
+			}
+			FileTransport = new Winston.transports.File(FileTransportOptions);
+			Logger.add(FileTransport);
+		}
+
+		if (config.logLevelPin !== 'none') {
+			const Options = {
+				level: config.logLevelPin
+			};
+			Pin2Transport = new Pin2LogTransport(Options);
+			Pin2Transport.getStream().on('data', (chunk) => {
+				node.send([undefined, JSON.parse(chunk.toString())]);
+			});
+			Logger.add(Pin2Transport);
+		}
+
+		node.status({
+			fill: 'red',
+			shape: 'dot',
+			text: 'Starting Z-Wave driver...'
+		});
+		UI.status('Starting Z-Wave driver...');
+
+		RED.events.on('zwjs:node:command', processMessageEvent);
+		async function processMessageEvent(MSG) {
+			await Input(MSG, undefined, undefined, true);
+		}
+
+		DriverOptions = {};
+
+		// Logging
+		DriverOptions.logConfig = {};
+		if (Logger !== undefined) {
+			DriverOptions.logConfig.enabled = true;
+			if (
+				config.logNodeFilter !== undefined &&
+				config.logNodeFilter.length > 0
+			) {
+				const Nodes = config.logNodeFilter.split(',');
+				const NodesArray = [];
+				Nodes.forEach((N) => {
+					NodesArray.push(parseInt(N));
+				});
+				DriverOptions.logConfig.nodeFilter = NodesArray;
+			}
+			DriverOptions.logConfig.transports = [];
+			if (FileTransport !== undefined) {
+				DriverOptions.logConfig.transports.push(FileTransport);
+			}
+			if (Pin2Transport !== undefined) {
+				DriverOptions.logConfig.transports.push(Pin2Transport);
+			}
+		} else {
+			DriverOptions.logConfig.enabled = false;
+		}
+
+		DriverOptions.storage = {};
+
+		// Cache Dir
+		Log(
+			'debug',
+			'NDERED',
+			undefined,
+			'[options] [storage.cacheDir]',
+			Path.join(RED.settings.userDir, 'zwave-js-cache')
+		);
+		DriverOptions.storage.cacheDir = Path.join(
+			RED.settings.userDir,
+			'zwave-js-cache'
+		);
+
+		// Custom  Config Path
+		if (
+			config.customConfigPath !== undefined &&
+			config.customConfigPath.length > 0
+		) {
+			Log(
+				'debug',
+				'NDERED',
+				undefined,
+				'[options] [storage.deviceConfigPriorityDir]',
+				config.customConfigPath
+			);
+			DriverOptions.storage.deviceConfigPriorityDir = config.customConfigPath;
+		}
+
+		// Disk throttle
+		if (
+			config.valueCacheDiskThrottle !== undefined &&
+			config.valueCacheDiskThrottle.length > 0
+		) {
+			Log(
+				'debug',
+				'NDERED',
+				undefined,
+				'[options] [storage.throttle]',
+				config.valueCacheDiskThrottle
+			);
+			DriverOptions.storage.throttle = config.valueCacheDiskThrottle;
+		}
+
+		// Timeout
+		DriverOptions.timeouts = {};
+		if (config.ackTimeout !== undefined && config.ackTimeout.length > 0) {
+			Log(
+				'debug',
+				'NDERED',
+				undefined,
+				'[options] [timeouts.ack]',
+				config.ackTimeout
+			);
+			DriverOptions.timeouts.ack = parseInt(config.ackTimeout);
+		}
+		if (
+			config.controllerTimeout !== undefined &&
+			config.controllerTimeout.length > 0
+		) {
+			Log(
+				'debug',
+				'NDERED',
+				undefined,
+				'[options] [timeouts.response]',
+				config.controllerTimeout
+			);
+			DriverOptions.timeouts.response = parseInt(config.controllerTimeout);
+		}
+		if (
+			config.sendResponseTimeout !== undefined &&
+			config.sendResponseTimeout.length > 0
+		) {
+			Log(
+				'debug',
+				'NDERED',
+				undefined,
+				'[options] [timeouts.report]',
+				config.sendResponseTimeout
+			);
+			DriverOptions.timeouts.report = parseInt(config.sendResponseTimeout);
+		}
+
+		DriverOptions.securityKeys = {};
+
+		const GetKey = (Property, ZWAVEJSName) => {
+			if (config[Property] !== undefined && config[Property].length > 0) {
+				if (
+					config[Property].startsWith('[') &&
+					config[Property].endsWith(']')
+				) {
+					const RemoveBrackets = config[Property].replace('[', '').replace(
+						']',
+						''
+					);
+					const _Array = RemoveBrackets.split(',');
+					const _Buffer = [];
+					for (let i = 0; i < _Array.length; i++) {
+						if (!isNaN(_Array[i].trim())) {
+							_Buffer.push(parseInt(_Array[i].trim()));
+						}
+					}
+					Log(
+						'debug',
+						'NDERED',
+						undefined,
+						'[options] [securityKeys.' + ZWAVEJSName + ']',
+						'Provided as array',
+						'[' + _Buffer.length + ' bytes]'
+					);
+					if (_Buffer.length === 16) {
+						DriverOptions.securityKeys[ZWAVEJSName] = Buffer.from(_Buffer);
+					}
+				} else {
+					Log(
+						'debug',
+						'NDERED',
+						undefined,
+						'[options] [securityKeys.' + ZWAVEJSName + ']',
+						'Provided as string',
+						'[' + config[Property].length + ' characters]'
+					);
+					if (config[Property].length === 16) {
+						DriverOptions.securityKeys[ZWAVEJSName] = Buffer.from(
+							config[Property]
+						);
+					}
+				}
+			}
+		};
+
+		GetKey('encryptionKey', 'S0_Legacy');
+		GetKey('encryptionKeyS2U', 'S2_Unauthenticated');
+		GetKey('encryptionKeyS2A', 'S2_Authenticated');
+		GetKey('encryptionKeyS2AC', 'S2_AccessControl');
+
+		function ShareNodeList() {
+			for (const Location in NodeList) delete NodeList[Location];
+
+			NodeList['No location'] = [];
+			Driver.controller.nodes.forEach((ZWN) => {
+				if (ZWN.isControllerNode()) {
+					return;
+				}
+				const Node = {
+					id: ZWN.id,
+					name: ZWN.name !== undefined ? ZWN.name : 'No name',
+					location: ZWN.location !== undefined ? ZWN.location : 'No location'
+				};
+				if (!NodeList.hasOwnProperty(Node.location)) {
+					NodeList[Node.location] = [];
+				}
+				NodeList[Node.location].push(Node);
+			});
+		}
+
+		function NodeCheck(ID, SkipReady) {
+			if (Driver.controller.nodes.get(ID) === undefined) {
+				const ErrorMSG = 'Node ' + ID + ' does not exist.';
+				throw new Error(ErrorMSG);
+			}
+
+			if (!SkipReady) {
+				if (!Driver.controller.nodes.get(ID).ready) {
+					const ErrorMSG =
+						'Node ' + ID + ' is not yet ready to receive commands.';
+					throw new Error(ErrorMSG);
+				}
+			}
+		}
+
+		function ThrowVirtualNodeLimit() {
+			throw new Error(
+				'Multicast only supports ValueAPI:setValue and CCAPI set type commands.'
+			);
+		}
+
+		node.on('close', (removed, done) => {
+			const Type = removed ? 'DELETE' : 'RESTART';
+			Log(
+				'info',
+				'NDERED',
+				undefined,
+				'[SHUTDOWN] [' + Type + ']',
+				'Cleaning up...'
+			);
+			UI.unregister();
+			Driver.destroy();
+			RED.events.off('zwjs:node:command', processMessageEvent);
+			if (Logger !== undefined) {
+				Logger.clear();
+				Logger = undefined;
+			}
+			if (Pin2Transport !== undefined) {
+				Pin2Transport.destroy();
+			}
+			if (done) {
+				done();
+			}
+		});
+
+		node.on('input', Input);
+
+		async function Input(msg, send, done, internal) {
+			let Type = 'CONTROLLER';
+			if (internal !== undefined && internal) {
+				Type = 'EVENT';
+			}
+
+			Log('debug', 'NDERED', 'IN', '[' + Type + ']', 'Payload received.');
+
+			try {
+				const Mode = msg.payload.mode;
+				switch (Mode) {
+					case 'IEAPI':
+						await IEAPI(msg);
+						break;
+					case 'CCAPI':
+						await CCAPI(msg, send);
+						break;
+					case 'ValueAPI':
+						await ValueAPI(msg, send);
+						break;
+					case 'DriverAPI':
+						await DriverAPI(msg, send);
+						break;
+					case 'ControllerAPI':
+						await ControllerAPI(msg, send);
+						break;
+					case 'AssociationsAPI':
+						await AssociationsAPI(msg, send);
+						break;
+				}
+
+				if (done) {
+					done();
+				}
+			} catch (er) {
+				Log('error', 'NDERED', undefined, '[ERROR] [INPUT]', er.message);
+
+				if (done) {
+					done(er);
+				} else {
+					node.error(er);
+				}
+			}
+		}
+
+		let _GrantResolve;
+		let _DSKResolve;
+
+		function CheckKey(strategy) {
+			if (strategy === 2) {
+				return;
+			}
+
+			const KeyRequirementsCFG = {
+				0: [
+					'S0_Legacy',
+					'S2_Unauthenticated',
+					'S2_Authenticated',
+					'S2_AccessControl'
+				],
+				3: ['S0_Legacy'],
+				4: ['S2_Unauthenticated', 'S2_Authenticated', 'S2_AccessControl']
+			};
+
+			const KeyRequirementsLable = {
+				0: ['S0 ', 'S2 Unauth ', 'S2 Auth ', 'S2 Access Ctrl'],
+				3: ['S0'],
+				4: ['S2 Unauth ', 'S2 Auth ', 'S2 Access Ctrl']
+			};
+
+			const Set = KeyRequirementsCFG[strategy];
+
+			Set.forEach((KR) => {
+				if (DriverOptions.securityKeys[KR] === undefined) {
+					const Label = KeyRequirementsLable[strategy];
+					throw new Error(
+						'The chosen inclusion strategy require the following keys to be present: ' +
+							Label
+					);
+				}
+			});
+		}
+
+		async function IEAPI(msg) {
+			const Method = msg.payload.method;
+			const Params = msg.payload.params || [];
+
+			const Callbacks = {
+				grantSecurityClasses: GrantSecurityClasses,
+				validateDSKAndEnterPIN: ValidateDSK,
+				abort: Abort
+			};
+
+			switch (Method) {
+				case 'beginInclusion':
+					CheckKey(Params[0].strategy);
+					Params[0].userCallbacks = Callbacks;
+					await Driver.controller.beginInclusion(Params[0]);
+					break;
+
+				case 'beginExclusion':
+					await Driver.controller.beginExclusion();
+					break;
+
+				case 'grantClasses':
+					Grant(Params[0]);
+					break;
+
+				case 'verifyDSK':
+					VerifyDSK(Params[0]);
+					break;
+
+				case 'replaceNode':
+					CheckKey(Params[1].strategy);
+					Params[1].userCallbacks = Callbacks;
+					await Driver.controller.replaceFailedNode(Params[0], Params[1]);
+					break;
+
+				case 'stop':
+					const IS = await Driver.controller.stopInclusion();
+					const ES = await Driver.controller.stopExclusion();
+					if (IS || ES) {
+						RestoreReadyStatus();
+					}
+					break;
+			}
+			return;
+		}
+
+		function GrantSecurityClasses(RequestedClasses) {
+			UI.sendEvent('node-inclusion-step', 'grant security', {
+				classes: RequestedClasses
+			});
+			return new Promise((res) => {
+				_GrantResolve = res;
+			});
+		}
+
+		function Grant(Classes) {
+			_GrantResolve({
+				securityClasses: Classes,
+				clientSideAuth: false
+			});
+		}
+
+		function ValidateDSK(DSK) {
+			UI.sendEvent('node-inclusion-step', 'verify dsk', { dsk: DSK });
+			return new Promise((res) => {
+				_DSKResolve = res;
+			});
+		}
+
+		function VerifyDSK(Pin) {
+			_DSKResolve(Pin);
+		}
+
+		function Abort() {
+			UI.sendEvent('node-inclusion-step', 'aborted');
+		}
+
+		async function ControllerAPI(msg, send) {
+			const Method = msg.payload.method;
+			const Params = msg.payload.params || [];
+			const ReturnNode = { id: '' };
+
+			Log(
+				'debug',
+				'NDERED',
+				'IN',
+				undefined,
+				printParams('ControllerAPI', undefined, Method, Params)
+			);
+
+			let SupportsNN = false;
+
+			switch (Method) {
+				case 'abortFirmwareUpdate':
+					NodeCheck(Params[0]);
+					ReturnNode.id = Params[0];
+					await Driver.controller.nodes.get(Params[0]).abortFirmwareUpdate();
+					Send(ReturnNode, 'FIRMWARE_UPDATE_ABORTED', undefined, send);
+					break;
+
+				case 'beginFirmwareUpdate':
+					NodeCheck(Params[0]);
+					ReturnNode.id = Params[0];
+					const Format = ZWaveJS.guessFirmwareFileFormat(Params[2], Params[3]);
+					const Firmware = ZWaveJS.extractFirmware(Params[3], Format);
+					await Driver.controller.nodes
+						.get(Params[0])
+						.beginFirmwareUpdate(Firmware.data, Params[1]);
+					Send(ReturnNode, 'FIRMWARE_UPDATE_STARTED', Params[1], send);
+					break;
+
+				case 'getRFRegion':
+					const RFR = await Driver.controller.getRFRegion();
+					Send(undefined, 'CURRENT_RF_REGION', ZWaveJS.RFRegion[RFR], send);
+					break;
+
+				case 'setRFRegion':
+					await Driver.controller.setRFRegion(ZWaveJS.RFRegion[Params[0]]);
+					Send(undefined, 'RF_REGION_SET', Params[0], send);
+					break;
+
+				case 'toggleRF':
+					await Driver.controller.toggleRF(Params[0]);
+					Send(undefined, 'RF_STATUS', Params[0], send);
+					break;
+
+				case 'getNodes':
+					const Nodes = [];
+					Driver.controller.nodes.forEach((N) => {
+						Nodes.push({
+							nodeId: N.id,
+							name: N.name,
+							location: N.location,
+							status: ZWaveJS.NodeStatus[N.status],
+							ready: N.ready,
+							interviewStage: ZWaveJS.InterviewStage[N.interviewStage],
+							zwavePlusVersion: N.zwavePlusVersion,
+							zwavePlusNodeType: N.zwavePlusNodeType,
+							zwavePlusRoleType: N.zwavePlusRoleType,
+							isListening: N.isListening,
+							isFrequentListening: N.isFrequentListening,
+							canSleep: N.canSleep,
+							isRouting: N.isRouting,
+							supportedDataRates: N.supportedDataRates,
+							maxDataRate: N.maxDataRate,
+							supportsSecurity: N.supportsSecurity,
+							isSecure: N.isSecure,
+							highestSecurityClass: N.getHighestSecurityClass(),
+							protocolVersion: ZWaveJS.ProtocolVersion[N.protocolVersion],
+							manufacturerId: N.manufacturerId,
+							productId: N.productId,
+							productType: N.productType,
+							firmwareVersion: N.firmwareVersion,
+							deviceConfig: N.deviceConfig,
+							isControllerNode: N.isControllerNode(),
+							supportsBeaming: N.supportsBeaming,
+							keepAwake: N.keepAwake
+						});
+					});
+					Send(undefined, 'NODE_LIST', Nodes, send);
+					break;
+
+				case 'keepNodeAwake':
+					NodeCheck(Params[0]);
+					ReturnNode.id = Params[0];
+					Driver.controller.nodes.get(Params[0]).keepAwake = Params[1];
+					Send(ReturnNode, 'NODE_KEEP_AWAKE', Params[1], send);
+					break;
+
+				case 'getNodeNeighbors':
+					NodeCheck(Params[0]);
+					const NIDs = await Driver.controller.getNodeNeighbors(Params[0]);
+					ReturnNode.id = Params[0];
+					Send(ReturnNode, 'NODE_NEIGHBORS', NIDs, send);
+					break;
+
+				case 'setNodeName':
+					NodeCheck(Params[0]);
+					Driver.controller.nodes.get(Params[0]).name = Params[1];
+					SupportsNN = Driver.controller.nodes
+						.get(Params[0])
+						.supportsCC(CommandClasses['Node Naming and Location']);
+					if (SupportsNN) {
+						await Driver.controller.nodes
+							.get(Params[0])
+							.commandClasses['Node Naming and Location'].setName(Params[1]);
+					}
+					ReturnNode.id = Params[0];
+					Send(ReturnNode, 'NODE_NAME_SET', Params[1], send);
+					ShareNodeList();
+					break;
+
+				case 'setNodeLocation':
+					NodeCheck(Params[0]);
+					Driver.controller.nodes.get(Params[0]).location = Params[1];
+					SupportsNN = Driver.controller.nodes
+						.get(Params[0])
+						.supportsCC(CommandClasses['Node Naming and Location']);
+					if (SupportsNN) {
+						await Driver.controller.nodes
+							.get(Params[0])
+							.commandClasses['Node Naming and Location'].setLocation(
+								Params[1]
+							);
+					}
+					ReturnNode.id = Params[0];
+					Send(ReturnNode, 'NODE_LOCATION_SET', Params[1], send);
+					ShareNodeList();
+					break;
+
+				case 'refreshInfo':
+					NodeCheck(Params[0], true);
+					const Stage =
+						ZWaveJS.InterviewStage[
+							Driver.controller.nodes.get(Params[0]).interviewStage
+						];
+					if (Stage !== 'Complete') {
+						const ErrorMSG =
+							'Node ' +
+							Params[0] +
+							' is already being interviewed. Current interview stage : ' +
+							Stage +
+							'';
+						throw new Error(ErrorMSG);
+					} else {
+						await Driver.controller.nodes.get(Params[0]).refreshInfo();
+					}
+					break;
+
+				case 'hardReset':
+					await Driver.hardReset();
+					Send(undefined, 'CONTROLLER_RESET_COMPLETE', undefined, send);
+					break;
+
+				case 'healNode':
+					NodeCheck(Params[0]);
+					ReturnNode.id = Params[0];
+					Send(ReturnNode, 'NODE_HEAL_STARTED', undefined, send);
+					node.status({
+						fill: 'yellow',
+						shape: 'dot',
+						text: 'Node Heal Started: ' + Params[0]
+					});
+					UI.status('Node Heal Started: ' + Params[0]);
+					const HealResponse = await Driver.controller.healNode(Params[0]);
+					if (HealResponse) {
+						node.status({
+							fill: 'green',
+							shape: 'dot',
+							text: 'Node Heal Successful: ' + Params[0]
+						});
+						UI.status('Node Heal Successful: ' + Params[0]);
+					} else {
+						node.status({
+							fill: 'red',
+							shape: 'dot',
+							text: 'Node Heal Unsuccessful: ' + Params[0]
+						});
+						UI.status('Node Heal Unsuccessful: ' + Params[0]);
+					}
+					Send(
+						ReturnNode,
+						'NODE_HEAL_FINISHED',
+						{ success: HealResponse },
+						send
+					);
+					RestoreReadyStatus();
+					break;
+
+				case 'beginHealingNetwork':
+					await Driver.controller.beginHealingNetwork();
+					Send(undefined, 'NETWORK_HEAL_STARTED', undefined, send);
+					node.status({
+						fill: 'yellow',
+						shape: 'dot',
+						text: 'Network Heal Started.'
+					});
+					UI.status('Network Heal Started.');
+					break;
+
+				case 'stopHealingNetwork':
+					await Driver.controller.stopHealingNetwork();
+					Send(undefined, 'NETWORK_HEAL_STOPPED', undefined, send);
+					node.status({
+						fill: 'blue',
+						shape: 'dot',
+						text: 'Network Heal Stopped.'
+					});
+					UI.status('Network Heal Stopped.');
+					RestoreReadyStatus();
+					break;
+
+				case 'removeFailedNode':
+					await Driver.controller.removeFailedNode(Params[0]);
+					break;
+
+				case 'proprietaryFunction':
+					const ZWaveMessage = new ZWaveJS.Message(Driver, {
+						type: ZWaveJS.MessageType.Request,
+						functionType: Params[0],
+						payload: Params[1]
+					});
+
+					const MessageSettings = {
+						priority: ZWaveJS.MessagePriority.Controller,
+						supportCheck: false
+					};
+
+					await Driver.sendMessage(ZWaveMessage, MessageSettings);
+					break;
+			}
+
+			return;
+		}
+
+		async function ValueAPI(msg, send) {
+			const Method = msg.payload.method;
+			const Params = msg.payload.params || [];
+			const Node = msg.payload.node;
+			const Multicast = Array.isArray(Node);
+
+			let ZWaveNode;
+			if (Multicast) {
+				ZWaveNode = Driver.controller.getMulticastGroup(Node);
+			} else {
+				NodeCheck(Node);
+				ZWaveNode = Driver.controller.nodes.get(Node);
+			}
+
+			Log(
+				'debug',
+				'NDERED',
+				'IN',
+				'[Node: ' + ZWaveNode.id + ']',
+				printParams('ValueAPI', undefined, Method, Params)
+			);
+
+			const ReturnNode = { id: ZWaveNode.id };
+
+			switch (Method) {
+				case 'getDefinedValueIDs':
+					if (Multicast) ThrowVirtualNodeLimit();
+					const VIDs = ZWaveNode.getDefinedValueIDs();
+					Send(ReturnNode, 'VALUE_ID_LIST', VIDs, send);
+					break;
+
+				case 'getValueMetadata':
+					if (Multicast) ThrowVirtualNodeLimit();
+					const M = ZWaveNode.getValueMetadata(Params[0]);
+					const ReturnObjectM = {
+						response: M,
+						valueId: Params[0]
+					};
+					Send(ReturnNode, 'GET_VALUE_METADATA_RESPONSE', ReturnObjectM, send);
+					break;
+
+				case 'getValue':
+					if (Multicast) ThrowVirtualNodeLimit();
+					const V = ZWaveNode.getValue(Params[0]);
+					const ReturnObject = {
+						response: V,
+						valueId: Params[0]
+					};
+					Send(ReturnNode, 'GET_VALUE_RESPONSE', ReturnObject, send);
+					break;
+
+				case 'setValue':
+					if (Params.length > 2) {
+						await ZWaveNode.setValue(Params[0], Params[1], Params[2]);
+					} else {
+						await ZWaveNode.setValue(Params[0], Params[1]);
+					}
+					break;
+
+				case 'pollValue':
+					if (Multicast) ThrowVirtualNodeLimit();
+					await ZWaveNode.pollValue(Params[0]);
+					break;
+			}
+
+			return;
+		}
+
+		async function CCAPI(msg, send) {
+			const CC = msg.payload.cc;
+			const Method = msg.payload.method;
+			const Params = msg.payload.params || [];
+			const Node = msg.payload.node;
+			const Endpoint = msg.payload.endpoint || 0;
+			const EnumSelection = msg.payload.enums;
+			const ForceUpdate = msg.payload.forceUpdate;
+			const Multicast = Array.isArray(Node);
+			let IsEventResponse = true;
+
+			let ZWaveNode;
+			if (Multicast) {
+				ZWaveNode = Driver.controller.getMulticastGroup(Node);
+			} else {
+				NodeCheck(Node);
+				ZWaveNode = Driver.controller.nodes.get(Node);
+			}
+
+			Log(
+				'debug',
+				'NDERED',
+				'IN',
+				'[Node: ' + ZWaveNode.id + ']',
+				printParams('CCAPI', CC, Method, Params)
+			);
+
+			if (msg.payload.responseThroughEvent !== undefined) {
+				IsEventResponse = msg.payload.responseThroughEvent;
+			}
+
+			const ReturnNode = { id: ZWaveNode.id };
+
+			if (EnumSelection !== undefined) {
+				const ParamIndexs = Object.keys(EnumSelection);
+				ParamIndexs.forEach((PI) => {
+					const EnumName = EnumSelection[PI];
+					const Enum = ZWaveJS[EnumName];
+					Params[PI] = Enum[Params[PI]];
+				});
+			}
+
+			const Result = await ZWaveNode.getEndpoint(Endpoint).invokeCCAPI(
+				CommandClasses[CC],
+				Method,
+				...Params
+			);
+			if (!IsEventResponse && ForceUpdate === undefined) {
+				Send(ReturnNode, 'VALUE_UPDATED', Result, send);
+			}
+
+			if (ForceUpdate !== undefined) {
+				if (Multicast) ThrowVirtualNodeLimit();
+
+				const ValueID = {
+					commandClass: CommandClasses[CC],
+					endpoint: Endpoint
+				};
+				Object.keys(ForceUpdate).forEach((VIDK) => {
+					ValueID[VIDK] = ForceUpdate[VIDK];
+				});
+				Log(
+					'debug',
+					'NDERED',
+					undefined,
+					'[POLL]',
+					printForceUpdate(Node, ValueID)
+				);
+				await ZWaveNode.pollValue(ValueID);
+			}
+
+			return;
+		}
+
+		async function DriverAPI(msg, send) {
+			const Method = msg.payload.method;
+			const Params = msg.payload.params || [];
+
+			Log(
+				'debug',
+				'NDERED',
+				'IN',
+				undefined,
+				printParams('DriverAPI', undefined, Method, Params)
+			);
+
+			switch (Method) {
+				case 'getNodeStatistics':
+					if (Params.length < 1) {
+						Send(undefined, 'NODE_STATISTICS', NodeStats, send);
+					} else {
+						const Stats = {};
+						Params.forEach((NID) => {
+							if (NodeStats.hasOwnProperty(NID)) {
+								Stats[NID] = NodeStats[NID];
+							}
+						});
+						Send(undefined, 'NODE_STATISTICS', Stats, send);
+					}
+					break;
+
+				case 'getControllerStatistics':
+					if (ControllerStats === undefined) {
+						Send(
+							undefined,
+							'CONTROLER_STATISTICS',
+							'Statistics Are Pending',
+							send
+						);
+					} else {
+						Send(undefined, 'CONTROLER_STATISTICS', ControllerStats, send);
+					}
+					break;
+
+				case 'getValueDB':
+					const Result = [];
+					if (Params.length < 1) {
+						Driver.controller.nodes.forEach((N) => {
+							Params.push(N.id);
+						});
+					}
+					Params.forEach((NID) => {
+						const G = {
+							nodeId: NID,
+							nodeName: getNodeInfoForPayload(NID, 'name'),
+							nodeLocation: getNodeInfoForPayload(NID, 'location'),
+							values: []
+						};
+						const VIDs = Driver.controller.nodes.get(NID).getDefinedValueIDs();
+						VIDs.forEach((VID) => {
+							const V = Driver.controller.nodes.get(NID).getValue(VID);
+							const VI = {
+								currentValue: V,
+								valueId: VID
+							};
+							G.values.push(VI);
+						});
+						Result.push(G);
+					});
+					Send(undefined, 'VALUE_DB', Result, send);
+					break;
+			}
+
+			return;
+		}
+
+		async function AssociationsAPI(msg, send) {
+			const Method = msg.payload.method;
+			const Params = msg.payload.params || [];
+
+			Log(
+				'debug',
+				'NDERED',
+				'IN',
+				undefined,
+				printParams('AssociationsAPI', undefined, Method, Params)
+			);
+
+			const ReturnNode = { id: '' };
+			let ResultData;
+			let PL;
+			switch (Method) {
+				case 'getAssociationGroups':
+					NodeCheck(Params[0].nodeId);
+					ResultData = Driver.controller.getAssociationGroups(Params[0]);
+					PL = [];
+					ResultData.forEach((FV, FK) => {
+						const A = {
+							GroupID: FK,
+							AssociationGroupInfo: FV
+						};
+						PL.push(A);
+					});
+
+					ReturnNode.id = Params[0].nodeId;
+					Send(
+						ReturnNode,
+						'ASSOCIATION_GROUPS',
+						{ SourceAddress: Params[0], Groups: PL },
+						send
+					);
+					break;
+
+				case 'getAllAssociationGroups':
+					NodeCheck(Params[0]);
+					ResultData = Driver.controller.getAllAssociationGroups(Params[0]);
+					PL = [];
+					ResultData.forEach((FV, FK) => {
+						const A = {
+							Endpoint: FK,
+							Groups: []
+						};
+						FV.forEach((SV, SK) => {
+							const B = {
+								GroupID: SK,
+								AssociationGroupInfo: SV
+							};
+							A.Groups.push(B);
+						});
+						PL.push(A);
+					});
+
+					ReturnNode.id = Params[0];
+					Send(ReturnNode, 'ALL_ASSOCIATION_GROUPS', PL, send);
+					break;
+
+				case 'getAssociations':
+					NodeCheck(Params[0].nodeId);
+					ResultData = Driver.controller.getAssociations(Params[0]);
+					PL = [];
+					ResultData.forEach((FV, FK) => {
+						const A = {
+							GroupID: FK,
+							AssociationAddress: []
+						};
+						FV.forEach((AA) => {
+							A.AssociationAddress.push(AA);
+						});
+
+						PL.push(A);
+					});
+
+					ReturnNode.id = Params[0].nodeId;
+					Send(
+						ReturnNode,
+						'ASSOCIATIONS',
+						{ SourceAddress: Params[0], Associations: PL },
+						send
+					);
+					break;
+
+				case 'getAllAssociations':
+					NodeCheck(Params[0]);
+					ResultData = Driver.controller.getAllAssociations(Params[0]);
+					PL = [];
+					ResultData.forEach((FV, FK) => {
+						const A = {
+							AssociationAddress: FK,
+							Associations: []
+						};
+						FV.forEach((SV, SK) => {
+							const B = {
+								GroupID: SK,
+								AssociationAddress: SV
+							};
+							A.Associations.push(B);
+						});
+						PL.push(A);
+					});
+
+					ReturnNode.id = Params[0];
+					Send(ReturnNode, 'ALL_ASSOCIATIONS', PL, send);
+					break;
+
+				case 'addAssociations':
+					NodeCheck(Params[0].nodeId);
+					Params[2].forEach((A) => {
+						if (
+							!Driver.controller.isAssociationAllowed(Params[0], Params[1], A)
+						) {
+							const ErrorMSG =
+								'Association: Source ' + JSON.stringify(Params[0]);
+							+', Group ' +
+								Params[1] +
+								', Destination ' +
+								JSON.stringify(A) +
+								' is not allowed.';
+							throw new Error(ErrorMSG);
+						}
+					});
+					await Driver.controller.addAssociations(
+						Params[0],
+						Params[1],
+						Params[2]
+					);
+					ReturnNode.id = Params[0].nodeId;
+					Send(ReturnNode, 'ASSOCIATIONS_ADDED', undefined, send);
+					break;
+
+				case 'removeAssociations':
+					NodeCheck(Params[0].nodeId);
+					await Driver.controller.removeAssociations(
+						Params[0],
+						Params[1],
+						Params[2]
+					);
+					ReturnNode.id = Params[0].nodeId;
+					Send(ReturnNode, 'ASSOCIATIONS_REMOVED', undefined, send);
+					break;
+
+				case 'removeNodeFromAllAssociations':
+					NodeCheck(Params[0]);
+					await Driver.controller.removeNodeFromAllAssociations(Params[0]);
+					ReturnNode.id = Params[0];
+					Send(ReturnNode, 'ALL_ASSOCIATIONS_REMOVED', undefined, send);
+					break;
+			}
+
+			return;
+		}
+
+		function printParams(Mode, CC, Method, Params) {
+			const Lines = [];
+			if (CC !== undefined) {
+				Lines.push(
+					'[API: ' + Mode + '] [CC: ' + CC + '] [Method: ' + Method + ']'
+				);
+			} else {
+				Lines.push('[API: ' + Mode + '] [Method: ' + Method + ']');
+			}
+
+			if (Params.length > 0) {
+				Lines.push('└─[params]');
+				let i = 0;
+				Params.forEach((P) => {
+					if (typeof P === 'object') {
+						Lines.push('    ' + (i + ': ') + JSON.stringify(P));
+					} else {
+						Lines.push('    ' + (i + ': ') + P);
+					}
+					i++;
+				});
+			}
+
+			return Lines;
+		}
+
+		function printForceUpdate(NID, Value) {
+			const Lines = [];
+			Lines.push('[Node: ' + NID + ']');
+
+			if (Value !== undefined) {
+				Lines.push('└─[ValueID]');
+
+				const OBKeys = Object.keys(Value);
+				OBKeys.forEach((K) => {
+					Lines.push('    ' + (K + ': ') + Value[K]);
+				});
+			}
+			return Lines;
+		}
+
+		function getNodeInfoForPayload(NodeID, Property) {
+			try {
+				const Prop = Driver.controller.nodes.get(parseInt(NodeID))[Property];
+				return Prop;
+			} catch (err) {
+				return undefined;
+			}
+		}
+
+		function Send(Node, Subject, Value, send) {
+			const PL = {};
+
+			if (Node !== undefined) {
+				PL.node = Node.id;
+			}
+
+			if (Node !== undefined) {
+				const N = getNodeInfoForPayload(Node.id, 'name');
+				if (N !== undefined) {
+					PL.nodeName = N;
+				}
+				const L = getNodeInfoForPayload(Node.id, 'location');
+				if (L !== undefined) {
+					PL.nodeLocation = L;
+				}
+			}
+			(PL.event = Subject), (PL.timestamp = new Date().toJSON());
+			if (Value !== undefined) {
+				PL.object = Value;
+			}
+
+			let _Subject = '';
+			if (Node !== undefined) {
+				_Subject = '[Node: ' + Node.id + '] [' + Subject + ']';
+			} else {
+				_Subject = '[' + Subject + ']';
+			}
+
+			Log('debug', 'NDERED', 'OUT', _Subject, 'Forwarding payload...');
+
+			if (send) {
+				send({ payload: PL });
+			} else {
+				node.send({ payload: PL });
+			}
+
+			const AllowedSubjectsForDNs = [
+				'VALUE_NOTIFICATION',
+				'NOTIFICATION',
+				'VALUE_UPDATED',
+				'SLEEP',
+				'WAKE_UP',
+				'VALUE_ID_LIST',
+				'GET_VALUE_RESPONSE',
+				'GET_VALUE_METADATA_RESPONSE'
+			];
+
+			if (AllowedSubjectsForDNs.includes(Subject)) {
+				RED.events.emit('zwjs:node:event:all', { payload: PL });
+				RED.events.emit('zwjs:node:event:' + Node.id, { payload: PL });
+			}
+		}
+
+		InitDriver();
+		StartDriver();
+
+		function InitDriver() {
+			DriverAttempts++;
+			try {
+				Log('info', 'NDERED', undefined, undefined, 'Initializing driver...');
+				Driver = new ZWaveJS.Driver(config.serialPort, DriverOptions);
+
+				if (
+					config.sendUsageStatistics !== undefined &&
+					config.sendUsageStatistics
+				) {
+					Log('info', 'NDERED', undefined, '[TELEMETRY]', 'Enabling...');
+					Driver.enableStatistics({
+						applicationName: ModulePackage.name,
+						applicationVersion: ModulePackage.version
+					});
+				} else {
+					Log('info', 'NDERED', undefined, '[TELEMETRY]', 'Disabling...');
+					Driver.disableStatistics();
+				}
+			} catch (e) {
+				Log('error', 'NDERED', undefined, '[ERROR] [INIT]', e.message);
+				node.error(e);
+				return;
+			}
+
+			WireDriverEvents();
+			UI.unregister();
+			UI.register(Driver, Input);
+		}
+
+		function WireDriverEvents() {
+			Driver.on('error', (e) => {
+				if (e.code === ZWaveErrorCodes.Driver_Failed) {
+					if (DriverAttempts >= MaxDriverAttempts) {
+						Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
+						node.error(e);
+					} else {
+						Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
+						Log(
+							'debug',
+							'NDERED',
+							undefined,
+							undefined,
+							'Will retry in ' +
+								RetryTime +
+								'ms. Attempted: ' +
+								DriverAttempts +
+								', Max: ' +
+								MaxDriverAttempts
+						);
+						node.error(
+							new Error(
+								'Driver Failed: Will retry in ' +
+									RetryTime +
+									'ms. Attempted: ' +
+									DriverAttempts +
+									', Max: ' +
+									MaxDriverAttempts
+							)
+						);
+						InitDriver();
+						setTimeout(StartDriver, RetryTime);
+					}
+				} else {
+					Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
+					node.error(e);
+				}
+			});
+
+			Driver.on('all nodes ready', () => {
+				node.status({ fill: 'green', shape: 'dot', text: 'All nodes ready!' });
+				UI.status('All nodes ready!');
+			});
+
+			Driver.once('driver ready', () => {
+				DriverAttempts = 0;
+
+				node.status({
+					fill: 'yellow',
+					shape: 'dot',
+					text: 'Initializing network...'
+				});
+				UI.status('Initializing network...');
+
+				// Add, Remove
+				Driver.controller.on('node added', (N) => {
+					ShareNodeList();
+					WireNodeEvents(N);
+					Send(N, 'NODE_ADDED');
+					Send(N, 'INTERVIEW_STARTED');
+					node.status({
+						fill: 'yellow',
+						shape: 'dot',
+						text: 'Node: ' + N.id + ' interview started.'
+					});
+					UI.status('Node: ' + N.id + ' interview started.');
+				});
+
+				Driver.controller.on('node removed', (N) => {
+					ShareNodeList();
+					Send(N, 'NODE_REMOVED');
+				});
+
+				// Stats
+				Driver.controller.on('statistics updated', (S) => {
+					ControllerStats = S;
+				});
+
+				// Include
+				Driver.controller.on('inclusion started', (Secure) => {
+					Send(undefined, 'INCLUSION_STARTED', { isSecureInclude: Secure });
+					node.status({
+						fill: 'yellow',
+						shape: 'dot',
+						text: 'Inclusion Started. Secure: ' + Secure
+					});
+					UI.status('Inclusion Started. Secure: ' + Secure);
+				});
+
+				Driver.controller.on('inclusion failed', () => {
+					Send(undefined, 'INCLUSION_FAILED');
+					node.status({ fill: 'red', shape: 'dot', text: 'Inclusion failed.' });
+					UI.status('Inclusion failed.');
+					RestoreReadyStatus();
+				});
+
+				Driver.controller.on('inclusion stopped', () => {
+					Send(undefined, 'INCLUSION_STOPPED');
+					node.status({
+						fill: 'green',
+						shape: 'dot',
+						text: 'Inclusion Stopped.'
+					});
+					UI.status('Inclusion Stopped.');
+				});
+
+				// Exclusion
+				Driver.controller.on('exclusion started', () => {
+					Send(undefined, 'EXCLUSION_STARTED');
+					node.status({
+						fill: 'yellow',
+						shape: 'dot',
+						text: 'Exclusion Started.'
+					});
+					UI.status('Exclusion Started.');
+				});
+
+				Driver.controller.on('exclusion failed', () => {
+					Send(undefined, 'EXCLUSION_FAILED');
+					node.status({ fill: 'red', shape: 'dot', text: 'Exclusion failed.' });
+					UI.status('Exclusion failed.');
+					RestoreReadyStatus();
+				});
+
+				Driver.controller.on('exclusion stopped', () => {
+					Send(undefined, 'EXCLUSION_STOPPED');
+					node.status({
+						fill: 'green',
+						shape: 'dot',
+						text: 'Exclusion stopped.'
+					});
+					UI.status('Exclusion stopped.');
+					RestoreReadyStatus();
+				});
+
+				// Network Heal
+				Driver.controller.on('heal network done', () => {
+					Send(undefined, 'NETWORK_HEAL_DONE', {
+						Successful: Heal_Done,
+						Failed: Heal_Failed,
+						Skipped: Heal_Skipped
+					});
+					node.status({
+						fill: 'green',
+						shape: 'dot',
+						text: 'Network heal done.'
+					});
+					UI.status('Network heal done.');
+					RestoreReadyStatus();
+				});
+
+				const Heal_Pending = [];
+				const Heal_Done = [];
+				const Heal_Failed = [];
+				const Heal_Skipped = [];
+
+				Driver.controller.on('heal network progress', (P) => {
+					Heal_Pending.length = 0;
+					Heal_Done.length = 0;
+					Heal_Failed.length = 0;
+					Heal_Skipped.length = 0;
+
+					P.forEach((V, K) => {
+						switch (V) {
+							case 'pending':
+								Heal_Pending.push(K);
+								break;
+							case 'done':
+								Heal_Done.push(K);
+								break;
+							case 'failed':
+								Heal_Failed.push(K);
+								break;
+							case 'skipped':
+								Heal_Skipped.push(K);
+								break;
+						}
+					});
+
+					const Processed =
+						Heal_Done.length + Heal_Failed.length + Heal_Skipped.length;
+					const Remain = Heal_Pending.length;
+
+					const Completed = (100 * Processed) / (Processed + Remain);
+
+					node.status({
+						fill: 'yellow',
+						shape: 'dot',
+						text:
+							'Healing network ' +
+							Math.round(Completed) +
+							'%, Skipped:[' +
+							Heal_Skipped +
+							'], Failed:[' +
+							Heal_Failed +
+							']'
+					});
+
+					UI.status(
+						'Healing network ' +
+							Math.round(Completed) +
+							'%, Skipped:[' +
+							Heal_Skipped +
+							'], Failed:[' +
+							Heal_Failed +
+							']'
+					);
+				});
+
+				ShareNodeList();
+
+				Driver.controller.nodes.forEach((ZWN) => {
+					WireNodeEvents(ZWN);
+				});
+			});
+		}
+
+		function WireNodeEvents(Node) {
+			Node.on('ready', (N) => {
+				if (N.isControllerNode()) {
+					return;
+				}
+
+				Node.on('statistics updated', (N, S) => {
+					NodeStats[Node.id] = S;
+				});
+
+				Node.on('firmware update finished', (N, S) => {
+					Send(N, 'FIRMWARE_UPDATE_COMPLETE', S);
+				});
+
+				Node.on('value notification', (N, VL) => {
+					Send(N, 'VALUE_NOTIFICATION', VL);
+				});
+
+				Node.on('notification', (N, CC, ARGS) => {
+					const OBJ = {
+						ccId: CC,
+						args: ARGS
+					};
+					Send(N, 'NOTIFICATION', OBJ);
+				});
+
+				Node.on('value added', (N, VL) => {
+					Send(N, 'VALUE_UPDATED', VL);
+				});
+
+				Node.on('value updated', (N, VL) => {
+					Send(N, 'VALUE_UPDATED', VL);
+				});
+
+				Node.on('wake up', (N) => {
+					Send(N, 'WAKE_UP');
+				});
+
+				Node.on('sleep', (N) => {
+					Send(N, 'SLEEP');
+				});
+			});
+
+			Node.on('interview started', (N) => {
+				Send(N, 'INTERVIEW_STARTED');
+				node.status({
+					fill: 'yellow',
+					shape: 'dot',
+					text: 'Node: ' + N.id + ' interview started.'
+				});
+				UI.status('Node: ' + N.id + ' interview started.');
+			});
+
+			Node.on('interview failed', (N, Er) => {
+				Send(N, 'INTERVIEW_FAILED', Er);
+				node.status({
+					fill: 'red',
+					shape: 'dot',
+					text: 'Node: ' + N.id + ' interview failed.'
+				});
+				UI.status('Node: ' + N.id + ' interview failed.');
+				RestoreReadyStatus();
+			});
+
+			Node.on('interview completed', (N) => {
+				Send(N, 'INTERVIEW_COMPLETE');
+				node.status({
+					fill: 'green',
+					shape: 'dot',
+					text: 'Node: ' + N.id + ' interview completed.'
+				});
+				UI.status('Node: ' + N.id + ' interview completed.');
+				RestoreReadyStatus();
+			});
+		}
+
+		function StartDriver() {
+			Log('info', 'NDERED', undefined, undefined, 'Starting driver...');
+			Driver.start()
+				.catch((e) => {
+					if (e.code === ZWaveErrorCodes.Driver_Failed) {
+						if (DriverAttempts >= MaxDriverAttempts) {
+							Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
+							node.error(e);
+						} else {
+							Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
+							Log(
+								'debug',
+								'NDERED',
+								undefined,
+								undefined,
+								'Will retry in ' +
+									RetryTime +
+									'ms. Attempted: ' +
+									DriverAttempts +
+									', Max: ' +
+									MaxDriverAttempts
+							);
+							node.error(
+								new Error(
+									'Driver failed: Will retry in ' +
+										RetryTime +
+										'ms. Attempted: ' +
+										DriverAttempts +
+										', Max: ' +
+										MaxDriverAttempts
+								)
+							);
+							InitDriver();
+							setTimeout(StartDriver, RetryTime);
+						}
+					} else {
+						Log('error', 'NDERED', undefined, '[ERROR] [DRIVER]', e.message);
+						node.error(e);
+					}
+				})
+				.then(() => {
+					// now what - just sit and wait.
+				});
+		}
+	}
+
+	RED.nodes.registerType('zwave-js', Init);
+
+	RED.httpAdmin.get('/zwjsgetnodelist', function (req, res) {
+		res.json(NodeList);
+	});
+
+	RED.httpAdmin.get('/zwjsgetversion', function (req, res) {
+		res.json({
+			zwjsversion: ZWaveJSPackage.version,
+			moduleversion: ModulePackage.version
+		});
+	});
+
+	RED.httpAdmin.get(
+		'/zwjsgetports',
+		RED.auth.needsPermission('serial.read'),
+		function (req, res) {
+			SP.list()
+				.then((ports) => {
+					const a = ports.map((p) => p.path);
+					res.json(a);
+				})
+				.catch((err) => {
+					RED.log.error('Error listing serial ports', err);
+					res.json([]);
+				});
+		}
+	);
 };

From a1ffa9d78d53ad5ac7274195f87c69619a5eba7a Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 11:40:48 +0100
Subject: [PATCH 19/70] Update event-filter.html

---
 zwave-js/event-filter.html | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 23752966..5ac27594 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -205,17 +205,22 @@
 <script type="text/x-red" data-template-name="event-filter">
 
   
+   
+
+    <div class="form-row">
+        <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>
+
     <p>
         Add your filter sets below.<br />
         each set of filters, becomes an output pin.<br /><br />
         A filter set can include the event(s) to be filtered, and optionally ValueID(s)
     </p>
-
-  
-<div>
-   <ol id="filtersets" style="min-height:450px;min-width:400px">
-   </ol>
-</div>
+    
+    <div>
+        <ol id="filtersets" style="min-height:450px;min-width:400px"> </ol>
+    </div>
 
    
     

From 7cc4eaab775fe2869126fd296e4081b6a8fa6aec Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 11:57:34 +0100
Subject: [PATCH 20/70] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e904d48b..8357d6d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
   - 5.1.0  
   
      **New Features**
-     - Added a new **event-filter** node, allowing node events to be filter with ease.
+     - Added an extremely advanced **event-filter** node, allowing node events to be filtered with ease.
      - Added the ability to pipe log messages to a 2nd output pin of the Controller Node
 
      **Fixes**
@@ -11,6 +11,7 @@
 
      **Changes**
      - Improvements to S2 paring wizard.
+     - Bump Zwave JS to 8.2.1
 
    - 5.0.0
 

From d92e009946593f2d524d62c5d968c6aaa70302ac Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 12:27:33 +0100
Subject: [PATCH 21/70] Update zwave-js.html

---
 zwave-js/zwave-js.html | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html
index 8ef26da4..75a58b5b 100644
--- a/zwave-js/zwave-js.html
+++ b/zwave-js/zwave-js.html
@@ -88,7 +88,12 @@
                         </td>
                     </tr>
                     <tr>
-                        <td style="text-align: center;">Place your ZWave device into 'Inclusion Mode'</td>
+                        <td style="text-align: center;">
+                            Place your ZWave device into 'Inclusion Mode'
+                            <br />
+                            <br />
+                            <span id="countdown" style="color: darkgray; font-size: 18px;">30</span>
+                        </td>
                     </tr>
                 </table>
             </div>
@@ -102,7 +107,12 @@
                         </td>
                     </tr>
                     <tr>
-                        <td style="text-align: center;">Place your ZWave device into 'Exclusion Mode'</td>
+                        <td style="text-align: center;">
+                            Place your ZWave device into 'Exclusion Mode'
+                            <br />
+                            <br />
+                            <span id="countdown" style="color: darkgray; font-size: 18px;">30</span>
+                        </td>
                     </tr>
                 </table>
             </div>
@@ -114,6 +124,9 @@
 
                 </table>
                 <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 20px; margin-left: 39%;" onclick="GrantSelected()">Grant Selected</button>
+                <br />
+                <br />
+                <span id="countdown" style="color: darkgray; font-size: 18px; text-align: center;">240</span>
             </div>
              <!--DSK-->
             <div class="step-tab-panel" data-step="DSK">
@@ -133,6 +146,9 @@
                   
                 </table>
                 <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 20px; margin-left: 39%;" onclick="ValidateDSK()">Verify</button>
+                <br />
+                <br />
+                <span id="countdown" style="color: darkgray; font-size: 18px; text-align: center;">240</span>
             </div>
             <!--Add Done-->
             <div class="step-tab-panel" data-step="AddDone">

From bd9854be89c5c11661e6897ac4ccd399e96c190f Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 12:36:54 +0100
Subject: [PATCH 22/70] Update zwave-js.html

---
 zwave-js/zwave-js.html | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html
index 75a58b5b..1b816a9d 100644
--- a/zwave-js/zwave-js.html
+++ b/zwave-js/zwave-js.html
@@ -92,7 +92,7 @@
                             Place your ZWave device into 'Inclusion Mode'
                             <br />
                             <br />
-                            <span id="countdown" style="color: darkgray; font-size: 18px;">30</span>
+                            <span id="countdown" style="color: darkgray; font-size: 18px;">30 seconds remaining...</span>
                         </td>
                     </tr>
                 </table>
@@ -111,7 +111,7 @@
                             Place your ZWave device into 'Exclusion Mode'
                             <br />
                             <br />
-                            <span id="countdown" style="color: darkgray; font-size: 18px;">30</span>
+                            <span id="countdown" style="color: darkgray; font-size: 18px;">30 seconds remaining...</span>
                         </td>
                     </tr>
                 </table>
@@ -125,8 +125,7 @@
                 </table>
                 <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 20px; margin-left: 39%;" onclick="GrantSelected()">Grant Selected</button>
                 <br />
-                <br />
-                <span id="countdown" style="color: darkgray; font-size: 18px; text-align: center;">240</span>
+                <div id="countdown" style="color: darkgray; font-size: 18px; text-align: center;">240 seconds remaining...</div>
             </div>
              <!--DSK-->
             <div class="step-tab-panel" data-step="DSK">
@@ -147,8 +146,7 @@
                 </table>
                 <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 20px; margin-left: 39%;" onclick="ValidateDSK()">Verify</button>
                 <br />
-                <br />
-                <span id="countdown" style="color: darkgray; font-size: 18px; text-align: center;">240</span>
+                <div id="countdown" style="color: darkgray; font-size: 18px; text-align: center;">240  seconds remaining...</div>
             </div>
             <!--Add Done-->
             <div class="step-tab-panel" data-step="AddDone">

From 961702d08d8fc4aad70565eca88718a9c70cdbcf Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 13:19:00 +0100
Subject: [PATCH 23/70] 5.1.0

---
 zwave-js/ui/client.js  | 74 ++++++++++++++++++++++++++++++++++++------
 zwave-js/zwave-js.html | 10 +++---
 2 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index 30f0ccc6..61a45ce5 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -15,7 +15,7 @@ let DriverReady = false;
 const ZwaveJsUI = (function () {
 	function modalAlert(message, title) {
 		const Buts = {
-			Ok: function () { }
+			Ok: function () {}
 		};
 		modalPrompt(message, title, Buts);
 	}
@@ -850,6 +850,8 @@ const ZwaveJsUI = (function () {
 					id: 'IEButton',
 					text: 'Abort',
 					click: function () {
+						ClearIETimer();
+						ClearSecurityCountDown();
 						ControllerCMD('IEAPI', 'stop', undefined, undefined, true);
 						$(this).dialog('destroy');
 					}
@@ -1014,7 +1016,10 @@ const ZwaveJsUI = (function () {
 		} else {
 			input.show();
 			let CurrentLocation = $('#zwave-js-selected-node-location').text();
-			CurrentLocation = CurrentLocation.substring(1, CurrentLocation.length-1);
+			CurrentLocation = CurrentLocation.substring(
+				1,
+				CurrentLocation.length - 1
+			);
 			input.val(CurrentLocation);
 			Button.html('Go');
 		}
@@ -1355,6 +1360,8 @@ const ZwaveJsUI = (function () {
 		switch (data.type) {
 			case 'node-collection-change':
 				if (data.event === 'node added') {
+					ClearIETimer();
+					ClearSecurityCountDown();
 					GetNodes();
 					if (
 						data.inclusionResult.lowSecurity !== undefined &&
@@ -1367,6 +1374,8 @@ const ZwaveJsUI = (function () {
 					$('#IEButton').text('Close');
 				}
 				if (data.event === 'node removed') {
+					ClearIETimer();
+					ClearSecurityCountDown();
 					GetNodes();
 					StepsAPI.setStepIndex(StepList.RemoveDone);
 					$('#IEButton').text('Close');
@@ -1376,15 +1385,21 @@ const ZwaveJsUI = (function () {
 			case 'node-inclusion-step':
 				if (data.event === 'grant security') {
 					ListRequestedClass(data.classes);
+					ClearIETimer();
+					StartSecurityCountDown();
 				}
 				if (data.event === 'verify dsk') {
 					DisplayDSK(data.dsk);
+					ClearIETimer();
+					StartSecurityCountDown();
 				}
 				if (data.event === 'inclusion started') {
 					StepsAPI.setStepIndex(StepList.NIF);
+					StartIECountDown();
 				}
 				if (data.event === 'exclusion started') {
 					StepsAPI.setStepIndex(StepList.Remove);
+					StartIECountDown();
 				}
 				break;
 
@@ -1403,6 +1418,45 @@ const ZwaveJsUI = (function () {
 		}
 	}
 
+	let Timer;
+	let IETime;
+	let SecurityTime;
+	function ClearIETimer() {
+		if (Timer !== undefined) {
+			clearInterval(Timer);
+			Timer = undefined;
+		}
+	}
+	function StartIECountDown() {
+		ClearIETimer();
+		IETime = 30;
+		Timer = setInterval(() => {
+			IETime--;
+			$('.countdown').html(IETime + ' seconds remaining...');
+			if (IETime <= 0) {
+				ClearIETimer();
+				$('#IEButton').click();
+			}
+		}, 1000);
+	}
+	function ClearSecurityCountDown() {
+		if (Timer !== undefined) {
+			clearInterval(Timer);
+			Timer = undefined;
+		}
+	}
+	function StartSecurityCountDown() {
+		ClearSecurityCountDown();
+		SecurityTime = 240;
+		Timer = setInterval(() => {
+			SecurityTime--;
+			$('.countdown').html(SecurityTime + ' seconds remaining...');
+			if (SecurityTime <= 0) {
+				ClearSecurityCountDown();
+			}
+		}, 1000);
+	}
+
 	function renderNode(node) {
 		let SM = '';
 		if (node.highestSecurityClass !== undefined) {
@@ -1692,12 +1746,12 @@ const ZwaveJsUI = (function () {
 			valueId.propertyKeyName ??
 			valueId.propertyName ??
 			valueId.property +
-			(valueId.propertyKey !== undefined
-				? `[0x${valueId.propertyKey
-					.toString(16)
-					.toUpperCase()
-					.padStart(2, '0')}]`
-				: '');
+				(valueId.propertyKey !== undefined
+					? `[0x${valueId.propertyKey
+							.toString(16)
+							.toUpperCase()
+							.padStart(2, '0')}]`
+					: '');
 		$('<span>')
 			.addClass('zwave-js-node-property-name')
 			.text(label)
@@ -1718,8 +1772,8 @@ const ZwaveJsUI = (function () {
 					title: 'Information',
 					minHeight: 75,
 					buttons: {
-						'Add To Filter Set':function(){
-							AddValueIDToFilter(data.valueId)
+						'Add To Filter Set': function () {
+							AddValueIDToFilter(data.valueId);
 							$(this).dialog('destroy');
 						},
 						Close: function () {
diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html
index 1b816a9d..ca7e9526 100644
--- a/zwave-js/zwave-js.html
+++ b/zwave-js/zwave-js.html
@@ -92,7 +92,7 @@
                             Place your ZWave device into 'Inclusion Mode'
                             <br />
                             <br />
-                            <span id="countdown" style="color: darkgray; font-size: 18px;">30 seconds remaining...</span>
+                            <span class="countdown" style="color: darkgray; font-size: 18px;"></span>
                         </td>
                     </tr>
                 </table>
@@ -111,7 +111,7 @@
                             Place your ZWave device into 'Exclusion Mode'
                             <br />
                             <br />
-                            <span id="countdown" style="color: darkgray; font-size: 18px;">30 seconds remaining...</span>
+                            <span class="countdown" style="color: darkgray; font-size: 18px;"></span>
                         </td>
                     </tr>
                 </table>
@@ -125,7 +125,8 @@
                 </table>
                 <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 20px; margin-left: 39%;" onclick="GrantSelected()">Grant Selected</button>
                 <br />
-                <div id="countdown" style="color: darkgray; font-size: 18px; text-align: center;">240 seconds remaining...</div>
+                <br />
+                <div class="countdown" style="color: darkgray; font-size: 18px; text-align: center;"></div>
             </div>
              <!--DSK-->
             <div class="step-tab-panel" data-step="DSK">
@@ -146,7 +147,8 @@
                 </table>
                 <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 20px; margin-left: 39%;" onclick="ValidateDSK()">Verify</button>
                 <br />
-                <div id="countdown" style="color: darkgray; font-size: 18px; text-align: center;">240  seconds remaining...</div>
+                <br />
+                <div class="countdown" style="color: darkgray; font-size: 18px; text-align: center;"></div>
             </div>
             <!--Add Done-->
             <div class="step-tab-panel" data-step="AddDone">

From 5ea9b8be0d28f03fca2435c4f9aa4f5e9a4a2eae Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 13:31:02 +0100
Subject: [PATCH 24/70] 5.1.0

---
 zwave-js/ui/client.js  |  8 +++++++-
 zwave-js/zwave-js.html | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index 61a45ce5..2045be45 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -683,7 +683,8 @@ const ZwaveJsUI = (function () {
 		AddDone: 5,
 		AddDoneInsecure: 6,
 		RemoveDone: 7,
-		ReplaceSecurityMode: 8
+		ReplaceSecurityMode: 8,
+		Aborted: 9
 	};
 	const Security2Class = {
 		0: {
@@ -1401,6 +1402,11 @@ const ZwaveJsUI = (function () {
 					StepsAPI.setStepIndex(StepList.Remove);
 					StartIECountDown();
 				}
+				if (data.event === 'aborted') {
+					StepsAPI.setStepIndex(StepList.Aborted);
+					ClearIETimer();
+					ClearSecurityCountDown();
+				}
 				break;
 
 			case 'node-status':
diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html
index ca7e9526..36f01939 100644
--- a/zwave-js/zwave-js.html
+++ b/zwave-js/zwave-js.html
@@ -22,6 +22,7 @@
             <li data-step-target="AddDoneInsecure"></li>
             <li data-step-target="RemoveDone"></li>
             <li data-step-target="ReplaceSecurityMode"></li>
+            <li data-step-target="Aborted"></li>
         </ul>
         <div class="step-content" style="border: none;">
             <!-- Secuity Mode-->
@@ -224,6 +225,21 @@
                     </tr>
                 </table>
             </div>
+              <!--Aborted-->
+              <div class="step-tab-panel" data-step="Aborted">
+                <br />
+                <table style="width: 100%; height: 290px;">
+                    <tr>
+                        <td style="text-align: center;">
+                            <img src="zwave-js/res/NodeAddedInsecure.png" width="200px">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="text-align: center;">The inclusion routine was aborted.<br />
+                            The device may or may not have been added to your network.</td>
+                    </tr>
+                </table>
+            </div>
         </div>
     </div>
 </script>

From 5b5261ee3756048b65dcdadac38af428f07c9745 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 13:39:16 +0100
Subject: [PATCH 25/70] 5.1.0

---
 CHANGELOG.md           |  2 +-
 zwave-js/ui/client.js  | 14 ++++++------
 zwave-js/zwave-js.html |  2 +-
 zwave-js/zwave-js.js   | 52 +++++++++++++++++++++---------------------
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8357d6d2..877ef207 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@
      - Fix phantom parentheses in node location.
 
      **Changes**
-     - Improvements to S2 paring wizard.
+     - Improvements to the device paring wizard.
      - Bump Zwave JS to 8.2.1
 
    - 5.0.0
diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index 2045be45..a37eb7f9 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -15,7 +15,7 @@ let DriverReady = false;
 const ZwaveJsUI = (function () {
 	function modalAlert(message, title) {
 		const Buts = {
-			Ok: function () {}
+			Ok: function () { }
 		};
 		modalPrompt(message, title, Buts);
 	}
@@ -1752,12 +1752,12 @@ const ZwaveJsUI = (function () {
 			valueId.propertyKeyName ??
 			valueId.propertyName ??
 			valueId.property +
-				(valueId.propertyKey !== undefined
-					? `[0x${valueId.propertyKey
-							.toString(16)
-							.toUpperCase()
-							.padStart(2, '0')}]`
-					: '');
+			(valueId.propertyKey !== undefined
+				? `[0x${valueId.propertyKey
+					.toString(16)
+					.toUpperCase()
+					.padStart(2, '0')}]`
+				: '');
 		$('<span>')
 			.addClass('zwave-js-node-property-name')
 			.text(label)
diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html
index 36f01939..cb8852e9 100644
--- a/zwave-js/zwave-js.html
+++ b/zwave-js/zwave-js.html
@@ -177,7 +177,7 @@
                     </tr>
                     <tr>
                         <td style="text-align: center;">Your device has been added to the network,<br />
-                            But the requested secruity class could not be achieved!</td>
+                            but the requested security class could not be achieved!</td>
                     </tr>
                 </table>
             </div>
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index 205e4ca5..86739b1d 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -447,7 +447,7 @@ module.exports = function (RED) {
 					const Label = KeyRequirementsLable[strategy];
 					throw new Error(
 						'The chosen inclusion strategy require the following keys to be present: ' +
-							Label
+						Label
 					);
 				}
 			});
@@ -667,7 +667,7 @@ module.exports = function (RED) {
 					NodeCheck(Params[0], true);
 					const Stage =
 						ZWaveJS.InterviewStage[
-							Driver.controller.nodes.get(Params[0]).interviewStage
+						Driver.controller.nodes.get(Params[0]).interviewStage
 						];
 					if (Stage !== 'Complete') {
 						const ErrorMSG =
@@ -1288,20 +1288,20 @@ module.exports = function (RED) {
 							undefined,
 							undefined,
 							'Will retry in ' +
+							RetryTime +
+							'ms. Attempted: ' +
+							DriverAttempts +
+							', Max: ' +
+							MaxDriverAttempts
+						);
+						node.error(
+							new Error(
+								'Driver Failed: Will retry in ' +
 								RetryTime +
 								'ms. Attempted: ' +
 								DriverAttempts +
 								', Max: ' +
 								MaxDriverAttempts
-						);
-						node.error(
-							new Error(
-								'Driver Failed: Will retry in ' +
-									RetryTime +
-									'ms. Attempted: ' +
-									DriverAttempts +
-									', Max: ' +
-									MaxDriverAttempts
 							)
 						);
 						InitDriver();
@@ -1474,12 +1474,12 @@ module.exports = function (RED) {
 
 					UI.status(
 						'Healing network ' +
-							Math.round(Completed) +
-							'%, Skipped:[' +
-							Heal_Skipped +
-							'], Failed:[' +
-							Heal_Failed +
-							']'
+						Math.round(Completed) +
+						'%, Skipped:[' +
+						Heal_Skipped +
+						'], Failed:[' +
+						Heal_Failed +
+						']'
 					);
 				});
 
@@ -1583,20 +1583,20 @@ module.exports = function (RED) {
 								undefined,
 								undefined,
 								'Will retry in ' +
+								RetryTime +
+								'ms. Attempted: ' +
+								DriverAttempts +
+								', Max: ' +
+								MaxDriverAttempts
+							);
+							node.error(
+								new Error(
+									'Driver failed: Will retry in ' +
 									RetryTime +
 									'ms. Attempted: ' +
 									DriverAttempts +
 									', Max: ' +
 									MaxDriverAttempts
-							);
-							node.error(
-								new Error(
-									'Driver failed: Will retry in ' +
-										RetryTime +
-										'ms. Attempted: ' +
-										DriverAttempts +
-										', Max: ' +
-										MaxDriverAttempts
 								)
 							);
 							InitDriver();

From b2e421bfca930cfa9d3b9b220f32b655db7fa971 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 13:54:29 +0100
Subject: [PATCH 26/70] Update event-filter.html

---
 zwave-js/event-filter.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 5ac27594..dd16a17e 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -234,5 +234,19 @@
 <script type="text/x-red" data-help-name="event-filter">
     <p>A Z-Wave event filter.</p>
 
+    <p>
+        <code>Input:</code><br />
+        A <strong>payload</strong> object from the controller or device-node to be processed.<br />
+
+    </p>
+
+    <p>
+        <code>Output:</code><br />
+        A <strong>payload</strong> containing  the event if it had a matching rule.<br />
+        A <strong>filter</strong> object will also be provided, that denotes the matched rule.
+
+    </p>
+
+
  
 </script>
\ No newline at end of file

From 4fd8fa07634f69128522f0d1b3cb445bce057067 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 14:12:52 +0100
Subject: [PATCH 27/70] Update zwave-js.js

---
 zwave-js/zwave-js.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index 86739b1d..c4fcf4a6 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -358,7 +358,6 @@ module.exports = function (RED) {
 			RED.events.off('zwjs:node:command', processMessageEvent);
 			if (Logger !== undefined) {
 				Logger.clear();
-				Logger = undefined;
 			}
 			if (Pin2Transport !== undefined) {
 				Pin2Transport.destroy();

From 0bb568578bb42c648edcdfaa68ddf0635987bff0 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 14:21:16 +0100
Subject: [PATCH 28/70] Update zwave-js.js

---
 zwave-js/zwave-js.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index c4fcf4a6..a21cec3e 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -358,9 +358,14 @@ module.exports = function (RED) {
 			RED.events.off('zwjs:node:command', processMessageEvent);
 			if (Logger !== undefined) {
 				Logger.clear();
+				Logger = undefined;
 			}
 			if (Pin2Transport !== undefined) {
 				Pin2Transport.destroy();
+				Pin2Transport = undefined;
+			}
+			if (FileTransport !== undefined) {
+				FileTransport = undefined;
 			}
 			if (done) {
 				done();

From f4601985aa71f888dda22939e1232f6be3ec0675 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 15:23:41 +0100
Subject: [PATCH 29/70] 5.1.0

---
 resources/{FilterNode.PNG => DeviceNode.PNG} | Bin
 resources/FillterNode.PNG                    | Bin 0 -> 9211 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename resources/{FilterNode.PNG => DeviceNode.PNG} (100%)
 create mode 100644 resources/FillterNode.PNG

diff --git a/resources/FilterNode.PNG b/resources/DeviceNode.PNG
similarity index 100%
rename from resources/FilterNode.PNG
rename to resources/DeviceNode.PNG
diff --git a/resources/FillterNode.PNG b/resources/FillterNode.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..d20ff42775ed133f384b609e7a1ede9b2d48d9e3
GIT binary patch
literal 9211
zcmd71WmFx_(l)%YKycl-yKdZFf?FWCY#>;0cXxNUAR!6CEjYm;NN{%z?!JL{bD#4(
z=dADh`~G-mt?sGruB)!<s-CrGYNFIsWYLg`kO2Syn!KF!djJ4N94Z?ky@B@ARh{|(
z0P>8rl$4shloW-Uvx9}TtvLW77nPQQsF^YZ9N2rDB&H2Ql6%`uod<X?i6N7SUWA>T
z7>X?=sfI;d+Z1dgAp_6cLRGYWfIO&&i2?+6t?~^PeHO(>;niHl_Y7U}+iUk&6|v;(
zbm4Lt{<xbP0Qem0M3YRS0~cuE)WOZm9hj7x{QDOgKv*1(Kn)PplP0gj!I1>08M?2!
zdFBmFy+rddFAsQm?j%YZ$Z&!QoWvYkA8Kkw`boVdpiMQ32yjC>&tV(MU}#1(VP$+z
z(cQ_c%icwvmdi0_b#a${H!mJa2v{E?iPr=G7SPYRkegs>&~+C=iZki4sSQG_LE3{G
zl)l&|t;@>@3S`pr$hshyz~EeTumyy%bRBfgrFkwu5)@7UK*Z;pC`UK6!SXDYup6Ln
zAMeW<fxtN^X{}SvN$%|LQHL-6O(&Ow**jULEh;;eB{hOpiBlVxDL5poq89qeVXS;m
zehfFP`h(NO!g<O_2Eu@Ht*b;ilXfY0BF_-XzNZmYH?o&|@Ndv|-G_6Ouygqo0}6#)
zo}t>KrpWI+K}?;RWIxIZK<H?hzln<uM6_?d`pekPtooYxW|n!3X+HUK*f5o{=zbth
zAjcJMpp$4YN+$pOn|3Hly<%@Kv<y-k%n#Mxc2+r#Q_nL2(hFN82O&wrps#aI)4vV$
zeJ=7frw&4)iTOem#9q)PX+&Jm1#}@jA{dJwQvoono%FhSDv}4JU_Sj$1yzv({&4m(
zW?ncc!SJ8s0u~<`3-*b(nd|`Tni$$_teIzpY2*aka~g<x;`jux8eoK@ATCG5)nDZB
zA&!`6n-a*G5z|cY&Em+wV5(~D)L`do7+aVbF#bFWdSK5wgB1*Ym#!n00fNXn&=Y_Q
z2DAZs)<p=yD3B1<DTqo?2qktCS+`L+D2*8iqC-s!aT!Rl#ZBeV@g#nHcK!xi7Jegs
zJ+3<b_AiSo;X&Amgx@&k)td*@VlZbp0`V{48EWR+x^*OevV0Vjb>SvVwxGGL500$9
zNcQ1>y0tg-t6}|N5<UZ>LyL-I)o&Q+m@x6;6lBbcO1_zY<J6=r1I|Q#l5#7u|BU-B
z<D04#OLn-$=i`ahzwEBC*)d~MAgL-D?P842ITL#meB*w9O|JM*5sDLP`aDhMGe5=x
z>M%8;zxN&ukPI07TJA;#ubS292+m?32BGzog6pakt8Hq8s+H&6Z9$FXLcu*7u1<~o
z<ObaFA;SY{n~fXj8)NI0TW=i6&uQAQRtd?2Rr_Mj`|cDV5)f;M8-xqOAQ1vqIir%s
z@eJ(?y$<yY<?ZI_2AHINldq?Fz}$+`?M>@tGNnF;J*PZpjgsc1^h&l!kuJe2VVcC6
zq<v4mkCUa)NQsy{HRyaH=uFz2=bHdYmn_s#gD`$i_5CfVAhJWU!?9CLq&zASSJAJb
zU#V3*TkdXnoF*u-VvzSmRJC2L{ryws1J88^5j+}7oH$y1KW7|K91f8O_d9OuY?bVZ
z?B;A69*j>$vm_;(-+<F#rUX676-5!*<FAEQrS;-O8I9463GP9>pTlNqr%i3lt<!8s
zXAfqHW=lV{exm;bnyj1<{ZjF{_%G0vS0th%-#^tq=h-W}i+h&)xt?c==&NDDjf7=O
zd?&i`SEaA=d+B4AhT-<r_Khd+R)8zA-c};S?F-&0*X{>~<30k0HZ8ZVCs(!mvR~Kc
zBChSO%&s&3p3a<3l5?<gBk?2>*mCh(o=qm&|8>YTZ(2C3-$=w79h{T<SikT$cETl`
zH>7XSM3ZBTD?IKxt|xY<-zT;;PF9&k8Cxk@Ia`S=3tKs>G^;d6Sx6~jG<KwDBzlBs
z<Rk}YBx_glvSK%Hmz;%#HJL?Azg`Db??9)P6@`_Ug<Ma)98!K!{;9%V&#WSAc41bi
z+{YG7%tu_P95>3NKR>&o^|7_5aSq*V&zipRM?<TbYNO=>{yg9Ot-v@b6=^i79*NN?
zdrp#|*;ecr;Tp*bi3`cCfT&}UV3-h|P=i3bQ=`+a;2i&&YhhDp6N`tno7eHD!`~h&
z``&YLyTF~s#fqNeAFUCs)9n*}gFPeED`u?&q@_Tv@aA-{A)GD3_2%Wvl0ABmN0o0?
zu~C5Ml8>bi`4w5NwLprP%i4%PISzUJA2RYVP!HdV$Iq(nKl2G&+K0EjYtsdLoog?I
z!`W$lg1z2&>jV^N{A6d8<IIlMU>{5-2JUYx--I%Waxo1^A^g2G(wLK&oFoUp7Mgky
zR2(2yBgYZ?QsAihTwO$uNOwkfK>~$ruZ*Uwa8!L%>bpjnF7*xdoFcL@&H~!}8Emwo
zg^8RZ@;;sZ?LG)6v5=63`{>cv8kHKEnmniarh6yEt<?d<-l~LvL~t5~>R&lcRVBr8
zRY)Rks%BD&Tz*m;_x-16qiBXNJa`$|nJr>&A63qBSzX>tE>9{<+5c(CZM8bt@$$ZO
z-p$Ld5-s3*(GjE*VSEBV;Hz+dP3KDP8k^7O7(v^%-|1MtzvR6PzY~QZKi4T0K+l0h
zPy#pwEcchb9Jd1(A-YVas;;}%-P~_5eynnsY*_xc_3ysD(!G34jlPA=OB7Um7QJ!i
znzU2}TrVRp{fqD~Sd&kja=hBJ*;QeYC2Y-U5Fsz)AO{KMu7R*9lmymE0~(|0hIxzg
z?7lz9Qpf=Y!A9MNlj<K0>TAC_Fxu?rn~&GVnv)JIXJoLD>tMBP{!-ZdeU#P-6as4F
zcIv0qmsRwB{wO2=;!(K9lUkOhpm<t-W7K}=b9GyE+B(-%zR<X<Pgr%N&}`;qexK2>
z+@S66_)vHdQR9|%*fQ5zwbl&ND$%xa^R6=vk%^lbnfZZF#_rSV$h<-0{Yv`1KAU!n
z*2$v6GSgbwx9IXuD;AA*J&mB5?gM=u7#`)N>z`E%&nAct1J`-aLc|_~M@(ziUO%mF
zS40YZvTayDG2fcr0+0M!Ku*Sc2_xi(w};1|wU-7JgRlIUKI^{ivVKnzPa%iI>u<bz
z#tZAEL?S}afATK!omdy~rIEwPZp-Gsq&`m_7h}l^#d9R^Jlj5B-fY!xnUAVnZtiXX
zO=608zBJrQ-$ljqo;GfE@<ZNxOx}GQWjxk6RK-!v$R!if@U$o~oP540U$+eyfW#y2
zCI49w7JKx)4U0s{U<)@8o*Oz4b{X2692z#tP&F_yvTi=`Z)hH_IJ~Q}?<6~QKeg}J
zb*g9>sQX&sVR5>D=s)*o6{*GPobGXVM!(MfdR3*#?^b1zw9jyLrOQX))@TjXB=!LA
zlN#x%l_g4GB0m(Xd>VcDNf*|-scEccJeSf$kMYp_1oF>#dN%*O&A4N|!&Pi~9WoX|
zA0Zj;o&U#6^i1-?^vZl+jQgeLDQ)IQ!OPi8u?@eM=X%4{^?Xi)gWK9{yNll(2R7Hm
zo!`mh1co`en;6+$FJ$^&VE?jiBFxy)xU54j!0r)ve!QV`GM^bry%VblgUh)-q6Ao-
zrd;Glm_UzYqaVu}pWS++3?V0=KP&K*3`ock0=PW`XvzT;*b@vwNha~^gjs3H46Ee7
z*x1U>K`G`f{HncF)W5MWootUPU;s_LfDVO${&ya+aegZixIP$xH*If~tGHQ;c04rF
zrp=pBAuDuO&jsF)N7Pijrr^#$FYx2J`1$?LRDIC*TrG1Qc?)G_025S30>DIA1K^<&
z473qJ8vp>891cK)-m#%g`ZMhRtip(YhWj5GVEC#ip&=zN54~%cIh&i?yI486X2|x#
zK~2qAYwEb_C@Tq?IoPq8d~`51XY;gke1!mnJq4know=(Cg{PgZy^Ely2-QCtf>8N&
z8bn3$kBX~}2$hbq8ikaDvpEG18#fy}l_)X=1%<HlM+?FC((nEahmJ(3tXy3k1wkMW
z4-YmEE;a{eOAv>EfB=Y{6U52M3e{kB@v?U{@np4kq5hYV|FI)&?qcR_?dWRlU{CRC
z*TmGp%~gbo>Xqn!uYdVz?rHrWCVQ8EZwtCX(CZ3_gN+^ZzqX-J;n!I~HEU0ETODa@
zJ7{>I9HLyD?85)(|NmD0!}u@c2N!c^DF-_!&{gz5@%=aWzZd_%z<(%p|3fLj_1}#D
zweWACFz9vT{}qUTMfsmuXqZKjg+c$DGEwAwSrjk;0L+({meBNsIX1LT#hr8OsLDbM
z$Ko=5_lts8{>Vy#1sj&q#%bJ?xz=1)*EMzCDOK7j-i*ExhhDTXC53-1Du7>B)~Stz
zp5B>cC_U76A)U4c$&3cx$|MO8G~XKt4kQdGv^dT<^_iK`Fr4C=LY<jfxoY1Vadn&d
zp?&LDb>MTm>T%dmgQ>0#j|(I783`*A&m^Z|C_0epGZH_1D&YE^8a!@Lk&O7;YO7Ww
z;z}e2ScO1u3<lU}@d>KW@H+K|RcP8!D6M!q;;R8GEHzk`#mc#GX4vRJ?9Z!kP)lm{
zNDMGQyE&U4JQ%1UwNq%1#h?eZ9@BW(u<^<T|Lyjb5tkKeU1sTe(GjYl20QHo?ct+=
zFtoplj=k-gpc)J?2O`iORwgD88$99O&T9bGfVxTcf5pvI>6weMF_jI6^3#Pn?Z(qZ
z>aQxi3T<^FWe1NHUrT6e>8^ax{^5V3#$^7Hm>pxY^ILby{NakZmtZPjLs-aET#pwy
zFFQMXyBS}5xXVnrwys^_W?(?BPE%Ult<!BjpN&vmRAD4?(tr5xYa9mIU}s7VOZ&1v
zs`OcB30A%nb$xUgio~L>^_htLln@Ij@G(g%Uvks*pAluGnt4-I`n7lzi$Y#a2D)+Q
zgkO2o7{6KT=m#&pC^}auy&;muh7)$#jXhdy*Pm@v9b8Y=lZGm?X~JtY%ndIIc_0fE
zV$vi777L{!O1k2c(4$IPB!4NpX+pCMfK4k^JTPN@Z!TCuYs7RoSC!GyBKW<mEIA5?
zUcubl{Ilz`?YnLrJ3G6{c|7?K_aU*LilDh5q-3w!Zen2)p!zVw<2*!wy+V7^hC{C+
zCnXhPJ6|mUWYwc_*&7@E*0I4-QqGfWb=ZI#gn}BxG{rcVMw&(p1SMZwT+~+_{{5Rc
zn!`7|J(Q9sli8>i@BR)OZY1f%TlY0i9Iz=IkNVpBOQ3so5o|No-z5Bw6a$Ml?QPg#
zV<p!F=;8PnDc-!FG(kP3@889wpr{y@4(^D;26tRX9u!0U><JIVUayv@z<&?jtgn>#
zTlO_?>1*i04>FOWu&n!aYa}9}HBvU*REQzc!LwDXrv{B&IARdGkmOh{sc_@m%nZ-E
z^w62r(k+t!<u7`%X0?7}O-el4eYA0YBh{0Gn#tu=+Jy2YP!$RPjJC_lE2)6&I=D?Q
zp6{d^eqh@FZF~xOTwGkO@BKyYA+Z*C{%v(xoAjr5>4F!B@%q-*rz!`UaZd(vo9o}}
zE~<Xq{B8`Nnw*_U5w0YLJ|>CANcHoa3-ba-n^m^RG?KRmau;Tj+&G2zT5=sj)i~>X
zr&-iy;;uBE^hOSe4wVZzz1w{e8FHiF-V01DG7`@mC~g)JM~jP6SGTvS++1raJ~_1^
z&&^ZfD8(2E)hHYs9>#2aXex9?XYHi8NBe><A`6Yc1zeDpKGW%y!BJ{6&;oDBp(_~S
zzHk|!hq?f3YiF0%6M><qs2Jn3b~;(>&KSk_+qw<Ouj%W1y)CIqZ-CpMEj5pb`P<vb
z`T`)KE~~{d9@SoL{CZXjLjrGHn;cD(NTNcX9hIe1`-It}(T`S*5<EAp%~D22MdO&b
zm|W5DOPh9^ub{NN_NGQZ%aF{)A*$j}(oB<0py>)+8&PZ=WcGBeUK`nXEJot}<I5L5
z^6LWz)ywz3d%Ek>EY4V~lstt^j`}I!FNW*zq>zUv!H|M4a{XWO;pB;3L-r_(+Yx!b
zSgDB_)iKv+I^fYAnFjHkbhlJvcs&IH;q3g^4s9C4B+GSF131eTr>M(gjPsi`=x4VS
z1w~XyaAO2V?g;(A4~m7vP>#cH3;jw(apnjm6>=XeRnGZ%G+)DZHl%Hsu0noF<XhhS
zK`;Ae=*O{JZ37%>CZZ{Z9bW5mXIoBGNkq=r=5Ex=6=RZ9)(Y-<MhA1LeOYGTt)ino
z(QV91r_4yV&tv12W=L<rBOeE!FonfKZR(c$ZB?KBLrw3=efD6c6XQU#@nSY@$Hfoq
z)~%{@e*q*Pg1!?2X7^KO(=}n%Qt#kQ41c=o1B#TpDPt_Immbr~mMPLY{QySyB^Rqh
zG^@)H#+|J{zGyoq*e;_H?{6++MDD`p*C0Q8MQ_{^{=(88{YZ#GnCL%wuAT33h%$UE
z2r6#Rv4ALXFpDm=QjeyuoJrN>RbaPX#uOIMZrJXw9WR>ly+|K*jD9y4U$(g58Gq@a
zXgRoQ0S9vbrLQ|Pqrx}N_7;_6cs>%_YOhv^@`DglRASc<Kg-(o=zrgVT^rd<h#?91
zS;ZE`x%;r@5~4t^)a@NebDaHx+2b=xUJg4aur}HeL+R-dZjcDgz~)xWD7V8@J46`I
zit~(csY(9E?L*5Kr!oBXOF?q2Oj<8xeFh6Gdj^&@R(cE+hl{(#Q-!0B0C~~{uBOap
zA`Is~EA7dANkfX5dU*a5=Re&`FWGXL01WV&j*j+IlJOhwj}=Je9FGsGealw^RA>${
zem)JE@mjZM4|DalDLU&d^Gh-@PJiB5RxJ7vU`Fy(^sq!WA5WR~Pk)_NIuuq2njzIc
z7pUs5tTVNiX>Y^^8VJ0RsAr{=H}pPB!DNl2IxWw*`_p-Xrq?h9F|95Q*jhm$;Fr6z
zU^*Ef7Naa}9ZsuxG;+HhIDx>*F`4j#3yo1=OAr&MX?3Z2-)TkpIkYZuWs+HR+t%pk
z1M7}3f_ZXp-6vSXf8l4}o4N>ITuy9rR3h+x*^cdG_9(Dai3IQaHWM&^5c)aNG_hcC
z+gh!e-pv&Hh@j2=JR%mk^4!)NaHER-GGR&k9OG~$CU|KfQj0S?QAZJNsTT0l<2h(f
z>X<v;Q&&rlqGKFS=%zArxYEVPil?stlH5!Fh!Q1sj-Xv-%zgj%HcC)o_<Wm9uW_vG
z?AA3GtM$aEGXCy&RTJ@Qa{|A8Lfdh}aYRAV-Btnq<L{SlQYEn-dyh7xwJ$0oz0KoJ
zSSoLtHww|BX@lkr!<`%KfBHEPccZXkx8AF&Ie2txDOSf9+7pMP{q2AAQq*WG_s#!_
z2dB@VMq25KrKV6+<$%+oEmLtX%H$D5M1LNqdc})zOa69jq+NL=RF|q%A{;jy4`Opi
z84g~8z|eeyKIsKPm}6k?OlAiUV0&&jF<Bw*iYZe4$(`vXxEsHO`K-uw41o`1=ID;I
zoP90!3oRBAAA^Y%<Z>)h{Rupjgp^GrPN3S%AEoPBzz#Gw_JyC_^zq9EtA>OU)Da2c
zv0;=8M>gBmWWp1|t2zRcsT289TJx^q$x1&c+-9YReJ|L0XQ`2p^blt$1J*4?k|z;N
zwoRFghY5dVh)n4#cmcAcNjWN>O02}>?N}K5EK--utO2F??Ds=VEmmmUZ@p_;jV{K}
zUIrSJmAku%g!)9rC6|5Wu|2yVw)}PYZQ&4!xSYsX@~{2(2gUZWg?uBEUIsjEco8_b
zA6L<r$)^yTk>7}57IKrzr@K6%DgHt8%m6use9aAN$ovi#mv5YM0Ew9d-GV4Z%G#e@
zL!4gd^DdJljZrC0J2!IAho9e4aJFF7PanbPaQN^|I^i^Lb7CTxibj&&n_8^F&Y^81
za!dicm>z`^2bmJzdH)RJYoW#JM%zHj(IP;RL><LKGBv|Zt|r7#3`{{lYRX}}>|?q2
zBMCBc%wcg0{bDI6N*G=DOMJE_p<ChOul(S^Ccn!)Q;XGYgeAg)?3Q1oMa=Z()^s$E
z)A^#&LkX)kI4G^h8K!ca=8nUEpQ+|mVLgI*$MLv^Uj`r1ZRBTtmwc=Q05U8<w<Wba
ziv{{#gA?89LMf@o-@NTtBBuu7>Z<_*mo)1w=u9M<0#03T(bq@1ekrwJhp@h(xZ<gB
z;Oh!~1W^askiP7T-7pgQtS5;+zIPA3`aGO#FRm)^b+E(W4t@|l48h7CQbM4onp<x*
zzo9D*g0yA|iJsak0l73PHzMdAK}t^sCb1axu11^X98JUV;&*Dlp3=-QS_DUP^<~yS
zE&kMM&6y$#YZb;7@KU3B^W%EPXl{6NawjAbaXyL1@a8FJJ$w|H<=b#e*a2i6<#L?Z
zkERW^uXee`=-4-qkX^?yIX;I8ajXrsuVq(x7sI`w$8~}in?YM9bczu&#0<yBCBr{O
z_Qi2GYhIl_lGB1dr4lyDaK|0(E@1;5ogGr#pm4DbzVH9jHiao>(KfA&6lU2z^&z$+
za^=F(F9G#t*hWIc)18)GGE@2seh^AN;Fz*0U)IAXoz#p`F2DpiHp{=bw;(u7*2cC!
zj*KcZOA%`otfVcV>IB4PRl`IYirnY6xbW5fvC@DJ>`M4Nx3h}6$>Y&VI1$SxKY1Ru
zJ%)=~szTH2m{ap-GRf55i=b+L{UPF~*Lho>jf}+_YH-UM=)_O(qPs^G_AKmU&)Xb0
z{ls;I;WYSoKnMLS%2`iKjqnLdXJ@PWNN@sres_u-Ty3N(p_mMfdP0s4(sfLsP=@0^
zWZ3*_NHYruQMeWz8$*gHRa_~~nlD#}AQ_zKRwI&oL?<@BmTt`pDej$csAtFM`O<-#
zz5$l>oln?ff)QE%PC#)^T)U??j9@5w)r+yJrQ&$jx7!s8lKZ(Ov!9FdPT~=`JWn{R
zVQIiDf!?+OhtVR^i2t1p>4?5}^9^T*(EcgOZ+f#3x2arWTkE)qXgT<%6;#fOnw*#E
zAA|yiFbDhXL=HyCZ>KZFbEASh@~wcrz0Kb%kqk`VtQjt1Si0?(POZEdT4-1c!n<%b
zhAlB7VaO~d!0hKgPERuekYmtjNHPFJQ0Og8e+IDed_fY(P=cvNG{#2<z(q+s7uayo
z6Y$Hgqqy-$Wm=fl4z7u8tKQI>RaOrM7h>?q)lOD_5C}zS9;zvB#WcFN3k(@5ZvRC<
z2-s~|+pmZ_Uo3!B#N;T@!O#0x^y@Qv-&s0ICe8+gzITnGRLbI%X|!F~oV`7Dpv%Oe
z9Y`S0fLqa^3iY=7;6yiN8qV6Wt6oyJ9MMF?LYRnTX%xnYgsMXydd|uB7&S2)x10-*
z-)_1$fAHnRN~_DyH0R-oyuGjUDhwV&TfGXUW_;Vs1ss|TA1a?lN#RieQ_8Ww8KlwQ
zbx9g=Ld)=nJDkAB*EfA$tO^KpUp-v@$<LzLvmn`j-1zhxt1#<lw~PAzYFIgIC!2}T
zT{V0t+vgQX$$Uj8ps<TnNyjc1;&>g4qKw{zOYwJP2(tiS0<+Mw1lJH;ZIaj06_nXy
zimPKCt1)>|Cp712E>$CvF-}Hj)w0!~p>cp7;FNwBkKbz#5yR@0$s!n;r=9Y(62PEU
z=l_nvYMI!PqqB)BSZ;%#VZLU1CWqCpy3qe~F4Ck30_K_@(MQ|pe^9#a{n!Avzk#eS
z*8k(j0R5jRQ|Mm{DX_(DcNmHWc43IPchoq&Ar*H38E7v!Dtx{oAih3yps&)qWUd9a
zke&XwE^O2^wru)g2PoZ%z1Jc0O2O1=lM}LG`W|*E7ol-*srFBRB0LVEyvHJQ7Ub04
zlSWigU|GHY4>t7W5$<hGf)^0RK!gh?o$2!IEU`r=&lr<Ycsk<V%bt!HBhF{=3{xOz
z2N;q=EGt=Kc>lq&kC4VI2Z2JW#bs{gR2lw$$0V&k{khP?{;!y&i(#dnqu5*6Yh4|_
zO|fwb_0llM3#8BRimj*dj*XoZ{Yl>?AWmE?>=1<B;CfS!r?_6xvqV0DKuwxbY5^Fh
zDQD-p;VzfVZXE2Gq2hT%W7K0bKXbw13)P^(fTJ@vE&3R65mV!KP|1grMQqn3sTugr
z7FVhha9cta!Wnla$w|kSGEoK{?imxrg_M_I#2^!Vf{1gA8{gtH4C+%|SEvdkd~32H
zKJYV?0`8y-R#{eU&^v^?Q<f&IgCMvju@H>qk7s|`rQysi>OHQ#(c$v)p%(nUA@|c^
z@)DV!z|Q2eDUv=qk38Ms%e8C$5E4zy1&Dg11i;EFti$$hYi*n2*PVv3J4TV?Y;rLt
zJ<P*$ETQ4fGD?zT)}*9jAdq&;YeZGaQrQ_htSTPC)X$GijxX!_tPmBs0?=ki6>BH>
zgIY;1s@ro0^gO+$XxnF8+S1U~Qrj@v$RQJ&PFbPdnZVgh_86yAiqlK;R2{<A6BTl}
zmwm<m^+$2w?Lr3mB`3Q5ldF~<bR#Fh#;8GJuEJ*hu{4>d#{$d_SDwY{&Xyf^iE5Kc
z3TmqT2*vs8sIvw3IdiBj#j#y+ftCBAB|y4HM*(bKK}yDC%{MryCJJwHimb2Eez5EM
zF~9^cSZ}OyT4ZYNF7NK_HHT36qf@}4QCTxHj^`2F9k*5~#1dlYCKu_WQhp+NIoKWk
zQU;6R&lU>bOQ03dn}m|*?5pf@EQ_fM>BvCd>`Y2D%X`!6yEuo1DD)jEo=fzvvqS`c
z^+#Csd03XzKFshVSVW19lELD`n{L=6V(=GyU0tnBptvD_vmTid?+3d0?~W-|%9cJW
zc*(}{BQ8U=yRe99vv$yOLnM3<^t0khi`W3u?PR&R9r5BLvke`-wm%!8NvKo1tEB1n
z=2r>pexjhSi-KIyF9?68USWf1u+Xz0Ig4~wNL)HNqR13BYfyUe#nMB8S}R2Bwbalp
zzHWdomC5H|WW>W_1OM%Z$leFBADq$RT9^!1eVEu)_#Y97D>R|s-MB$*@1Qk`s#e)F
z4d}oYS|!U=c5SeKrLlq5ye?aOGzDZRI<a1H(Bb3r`{P&4FMZU)i6?ZmfM`zq>Y5t$
zrbLAf`B{sg%ZkFX*D8s0f_Nb)9P=$qJQ0t=C&hDEvDF6cSJyTr!9E^&M~C0jAGTQE
z&&*S5r*aRs$v2!tOt1~EA)tGlmdK}+td^%a6M{&w-+m1T6|O-mdK3v*XZTVKd@G!t
z<?89I`gFyz31en)A~RG`FtvqTHJl@eO!3=(As-}OJtu?xsl`2bq+5p^42hKdxVv~A
z1C-Oa{PbP4QP#atd+7O&z#7O>l`j*OmWuqM39Ttocpz!!xMu-vk_GU-njbU~>3aKF
zAsj7#=lz>Tt&0|}y?=Dniwx4bIa**|@;FY?pg-5}&(m=i8GipBn=rysSEIrRtBD;e
zGVO!hXkUZ#PWe8kpP;{^Z4(eX9xyhD#13m%j|}w<TI|6Kk~0nLDXTG3`X>RAm};=G
zNOBeLpd(}qXc@BmkZVQ<I-rt-W`>HQfd~p?5QZiLrRtBS8FUbd1l5WRoc{D$3_XLw
zS=vN3;$EXf1=XU4egEU1LjWy4Ri8a5@n}KA{{JjV&<moYXG0Tu1gQ@6e*-{XMn$?(
I5*+-00PHj5_y7O^

literal 0
HcmV?d00001


From 542c49dd81342c8725187d123bfe3bb482851472 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sat, 28 Aug 2021 15:26:49 +0100
Subject: [PATCH 30/70] 5.1.0

---
 zwave-js/ui/client.js | 14 ++++++------
 zwave-js/zwave-js.js  | 52 +++++++++++++++++++++----------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index a37eb7f9..2045be45 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -15,7 +15,7 @@ let DriverReady = false;
 const ZwaveJsUI = (function () {
 	function modalAlert(message, title) {
 		const Buts = {
-			Ok: function () { }
+			Ok: function () {}
 		};
 		modalPrompt(message, title, Buts);
 	}
@@ -1752,12 +1752,12 @@ const ZwaveJsUI = (function () {
 			valueId.propertyKeyName ??
 			valueId.propertyName ??
 			valueId.property +
-			(valueId.propertyKey !== undefined
-				? `[0x${valueId.propertyKey
-					.toString(16)
-					.toUpperCase()
-					.padStart(2, '0')}]`
-				: '');
+				(valueId.propertyKey !== undefined
+					? `[0x${valueId.propertyKey
+							.toString(16)
+							.toUpperCase()
+							.padStart(2, '0')}]`
+					: '');
 		$('<span>')
 			.addClass('zwave-js-node-property-name')
 			.text(label)
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index a21cec3e..d375c519 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -451,7 +451,7 @@ module.exports = function (RED) {
 					const Label = KeyRequirementsLable[strategy];
 					throw new Error(
 						'The chosen inclusion strategy require the following keys to be present: ' +
-						Label
+							Label
 					);
 				}
 			});
@@ -671,7 +671,7 @@ module.exports = function (RED) {
 					NodeCheck(Params[0], true);
 					const Stage =
 						ZWaveJS.InterviewStage[
-						Driver.controller.nodes.get(Params[0]).interviewStage
+							Driver.controller.nodes.get(Params[0]).interviewStage
 						];
 					if (Stage !== 'Complete') {
 						const ErrorMSG =
@@ -1292,20 +1292,20 @@ module.exports = function (RED) {
 							undefined,
 							undefined,
 							'Will retry in ' +
-							RetryTime +
-							'ms. Attempted: ' +
-							DriverAttempts +
-							', Max: ' +
-							MaxDriverAttempts
-						);
-						node.error(
-							new Error(
-								'Driver Failed: Will retry in ' +
 								RetryTime +
 								'ms. Attempted: ' +
 								DriverAttempts +
 								', Max: ' +
 								MaxDriverAttempts
+						);
+						node.error(
+							new Error(
+								'Driver Failed: Will retry in ' +
+									RetryTime +
+									'ms. Attempted: ' +
+									DriverAttempts +
+									', Max: ' +
+									MaxDriverAttempts
 							)
 						);
 						InitDriver();
@@ -1478,12 +1478,12 @@ module.exports = function (RED) {
 
 					UI.status(
 						'Healing network ' +
-						Math.round(Completed) +
-						'%, Skipped:[' +
-						Heal_Skipped +
-						'], Failed:[' +
-						Heal_Failed +
-						']'
+							Math.round(Completed) +
+							'%, Skipped:[' +
+							Heal_Skipped +
+							'], Failed:[' +
+							Heal_Failed +
+							']'
 					);
 				});
 
@@ -1587,20 +1587,20 @@ module.exports = function (RED) {
 								undefined,
 								undefined,
 								'Will retry in ' +
-								RetryTime +
-								'ms. Attempted: ' +
-								DriverAttempts +
-								', Max: ' +
-								MaxDriverAttempts
-							);
-							node.error(
-								new Error(
-									'Driver failed: Will retry in ' +
 									RetryTime +
 									'ms. Attempted: ' +
 									DriverAttempts +
 									', Max: ' +
 									MaxDriverAttempts
+							);
+							node.error(
+								new Error(
+									'Driver failed: Will retry in ' +
+										RetryTime +
+										'ms. Attempted: ' +
+										DriverAttempts +
+										', Max: ' +
+										MaxDriverAttempts
 								)
 							);
 							InitDriver();

From 889d40cea549d29f79bf47a68d45c4ddc5f08238 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 29 Aug 2021 17:38:35 +0100
Subject: [PATCH 31/70] Update event-filter.js

---
 zwave-js/event-filter.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index 8353746a..495888f0 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -21,7 +21,7 @@ module.exports = function (RED) {
 						if (Filter.events.includes(msg.payload.event)) {
 							if (Filter.valueIds.length > 0) {
 								for (const ValueID of Filter.valueIds) {
-									if (IsValueIDMatch(ValueID, msg)) {
+									if (IsValueIDMatch(ValueID, msg, msg.payload.event === 'GET_VALUE_RESPONSE')) {
 										msg.filter = Filter;
 										SendingArray[ArrayIndex] = msg;
 										send(SendingArray);
@@ -48,12 +48,12 @@ module.exports = function (RED) {
 			}
 		}
 
-		function IsValueIDMatch(ValueID, MSG) {
+		function IsValueIDMatch(ValueID, MSG, Response) {
 			let Root = MSG.payload.object;
-			if (Root.hasOwnProperty('valueId') && Root.hasOwnProperty('response')) {
+			if(Response){
 				Root = MSG.payload.object.valueId;
 			}
-
+			
 			let ValueIDKeys = Object.keys(ValueID);
 			const MSGKeys = Object.keys(Root);
 

From f78dc1657c6ae9d9dfc428607cb1bfb8d3ff24d4 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 29 Aug 2021 21:07:18 +0100
Subject: [PATCH 32/70] 5.1.0

---
 resources/{FillterNode.PNG => FilterNode.PNG} | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename resources/{FillterNode.PNG => FilterNode.PNG} (100%)

diff --git a/resources/FillterNode.PNG b/resources/FilterNode.PNG
similarity index 100%
rename from resources/FillterNode.PNG
rename to resources/FilterNode.PNG

From c9884d4f5cb39e5f1362a7a8d81e99c54a2281e3 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Mon, 30 Aug 2021 13:43:50 +0100
Subject: [PATCH 33/70] 5.1.0

---
 zwave-js/event-filter.html | 22 ++++++++++++++++------
 zwave-js/event-filter.js   | 28 ++++++++++++++++++++++++++++
 zwave-js/ui/client.js      |  8 ++++++--
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index dd16a17e..2dbb69ed 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -23,6 +23,7 @@
             oneditsave: DoSave,
             oneditcancel: function(){
                 Changed = false;
+                ActiveFilter = undefined;
             },
             outputLabels: function(index) {
                 return this.filters[index].name
@@ -182,19 +183,28 @@
                 ItemData.strict = El.find(".data-event-Endpoint").prop('checked');
                 this.filters.push(ItemData);
             }
+
+            ActiveFilter = undefined;
         }
 
         function AddValueIDToFilter(ValueID){
 
-            const VIDs = ActiveFilter.data('filter').valueIds;
+            if(ActiveFilter !== undefined){
+                const VIDs = ActiveFilter.data('filter').valueIds;
 
-            VIDs.push(ValueID);
-            const Count = VIDs.length
+                VIDs.push(ValueID);
+                const Count = VIDs.length
 
-            ActiveFilter.find(".data-vid-count").html(Count);
-            ActiveFilter.find('.data-valueid-editor').typedInput('value',JSON.stringify(VIDs));
+                ActiveFilter.find(".data-vid-count").html(Count);
+                ActiveFilter.find('.data-valueid-editor').typedInput('value',JSON.stringify(VIDs));
 
-            Changed = true;
+                Changed = true;
+                return true;
+            }else{
+                return false;
+            }
+
+           
             
         }
 
diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index 495888f0..0cb9246d 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -24,6 +24,11 @@ module.exports = function (RED) {
 									if (IsValueIDMatch(ValueID, msg, msg.payload.event === 'GET_VALUE_RESPONSE')) {
 										msg.filter = Filter;
 										SendingArray[ArrayIndex] = msg;
+										node.status({
+											fill: 'green',
+											shape: 'dot',
+											text: 'Last match: '+Filter.name
+										});
 										send(SendingArray);
 										Matched = true;
 										break;
@@ -35,13 +40,36 @@ module.exports = function (RED) {
 							} else {
 								msg.filter = Filter;
 								SendingArray[ArrayIndex] = msg;
+								node.status({
+									fill: 'green',
+									shape: 'dot',
+									text: 'Last match: '+Filter.name
+								});
+								Matched = true;
 								send(SendingArray);
 								break;
 							}
 						}
 					}
 				}
+
+				if(!Matched){
+					node.status({
+						fill: 'yellow',
+						shape: 'dot',
+						text: 'No match'
+					});
+				}
 			}
+			else{
+				node.status({
+					fill: 'red',
+					shape: 'dot',
+					text: 'Not a ZWave message'
+				});
+			}
+
+		
 
 			if (done) {
 				done();
diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index 2045be45..843ea6cd 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -1779,8 +1779,12 @@ const ZwaveJsUI = (function () {
 					minHeight: 75,
 					buttons: {
 						'Add To Filter Set': function () {
-							AddValueIDToFilter(data.valueId);
-							$(this).dialog('destroy');
+							if(AddValueIDToFilter(data.valueId)){
+								$(this).dialog('destroy');
+							}else{
+								modalAlert('Please activate the target filter set.','No Active Filter Set')
+							}
+							
 						},
 						Close: function () {
 							$(this).dialog('destroy');

From 4903cf70dafbee6b570157c85bbc5c4a78662a76 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Mon, 30 Aug 2021 19:21:44 +0100
Subject: [PATCH 34/70] Update event-filter.html

---
 zwave-js/event-filter.html | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 2dbb69ed..afda81ee 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -1,6 +1,7 @@
 <script type="text/javascript">
 
     let Changed = false;
+    let ActiveFilter = undefined;
 
     RED.nodes.registerType('event-filter',
         {
@@ -30,11 +31,7 @@
             }
         });
 
-        
-                
-
         function SortUI(){
-
             $("#filtersets").editableList({
                 header: $('<div>').append('<div>Filter Sets - order defines outputs</div>'),
                 sortable: true,
@@ -42,9 +39,6 @@
                 addButton: 'Add Filter Set',
                 addItem:AddItem
             });
-
-            
-
             this.filters.forEach((Item) => {
                 $("#filtersets").editableList('addItem',Item);
             });
@@ -59,7 +53,6 @@
                     data.events = ["VALUE_UPDATED"]
                     data.strict = false
                 }
-            
             $(container).data('filter',data)
             $(container).click(SetActiveFilter);
 
@@ -90,7 +83,6 @@
             `; 
 
             $(container).html(HTML);
-
             const Refresh = $('<button>')
                 .addClass('ui-button')
                 .addClass('ui-corner-all')
@@ -103,19 +95,13 @@
                 .insertAfter($(container).find('.data-valueid-editor'))
             $(container).find('.data-valueid-editor').typedInput({types: ["json"],default: "json"});
             $(container).find('.data-valueid-editor').typedInput('value',JSON.stringify(data.valueIds));
-
-            
             SortChecbox($(container))
-
-     
         }
 
         
-        let ActiveFilter;
+        
 
         function SyncEdits(){
-
-
             const JSONs = ActiveFilter.find('.data-valueid-editor').typedInput('value');
             const NewObject = JSON.parse(JSONs);
 
@@ -124,42 +110,33 @@
             ActiveFilter.find(".data-vid-count").html(Count);
 
             Changed = true;
-
-            
         }
 
 
         function SetActiveFilter(){
-
-
             const Items = $("#filtersets").editableList('items');
             for(let i = 0;i<Items.length;i++){
                 Items[i].css({backgroundColor:'white'});
             }
             $(this).css({backgroundColor:'lightgray'});
-
             ActiveFilter = $(this);
         }
 
         function SortChecbox(El){
-
             const Data = El.data('filter');
             Data.events.forEach((EV) =>{
                 El.find(".data-event-"+EV).prop('checked',true);
             })
-
             if(Data.strict){
                 El.find(".data-event-Endpoint").prop('checked',true);
             }
         }
 
         function DoSave(){
-
             if(Changed){
                 this.changeDate = new Date();
                 Changed = false
             }
-
             this.outputs = $("#filtersets").editableList('length')
             const Items = $("#filtersets").editableList('items')
             const Events = ["VALUE_UPDATED","VALUE_NOTIFICATION","NOTIFICATION","GET_VALUE_RESPONSE"]

From d79a0f3e6db4e2833581818de542ee68f1aa9b20 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 31 Aug 2021 16:31:35 +0100
Subject: [PATCH 35/70] Update event-filter.html

---
 zwave-js/event-filter.html | 60 ++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 16 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index afda81ee..d0739da8 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -10,7 +10,7 @@
             defaults:
             {
                 name: { value: "ZWave Event Filter" },
-                filters: {value:[{strict:false,index:0,name:"Catch-All",valueIds:[],events:["VALUE_UPDATED","VALUE_NOTIFICATION","NOTIFICATION","GET_VALUE_RESPONSE"]}]},
+                filters: {value:[]},
                 outputs: {value: 1},
                 changeDate: {value:undefined}
             },
@@ -32,30 +32,58 @@
         });
 
         function SortUI(){
+
+            $("#node-input-outputs").val("{}");
+
             $("#filtersets").editableList({
                 header: $('<div>').append('<div>Filter Sets - order defines outputs</div>'),
                 sortable: true,
                 removable: true, 
                 addButton: 'Add Filter Set',
-                addItem:AddItem
+                addItem:AddItem,
+                sortItems:SortItems
             });
+
+            const OPs = JSON.parse($("#node-input-outputs").val())
             this.filters.forEach((Item) => {
                 $("#filtersets").editableList('addItem',Item);
+                OPs[Item.id] = Item.index;
             });
+            $("#node-input-outputs").val(JSON.stringify(OPs))
+
+        }
+
+        function SortItems(Items){
+
+            const OPs = JSON.parse($("#node-input-outputs").val()||"{}")
+            for(let i = 0;i<Items.length;i++){
+                Items[i].data('data').index = i;
+                OPs[Items[i].data('data').id] = i;
+            }
+            $("#node-input-outputs").val(JSON.stringify(OPs))
 
         }
         
         function AddItem(container, index, data){
+            
+
             if (Object.keys(data).length === 0) {
-                    data.index = index;
-                    data.name = "Filter Name"
-                    data.valueIds = []
-                    data.events = ["VALUE_UPDATED"]
-                    data.strict = false
-                }
-            $(container).data('filter',data)
+                data.index = index;
+                data.name = "Filter Name"
+                data.valueIds = []
+                data.events = ["VALUE_UPDATED"]
+                data.strict = false
+                data.id = Math.floor((0x99999 - 0x10000) * Math.random()).toString()
+
+                const OPs = JSON.parse($("#node-input-outputs").val()||"{}")
+                OPs[data.id] = index;
+                $("#node-input-outputs").val(JSON.stringify(OPs))
+            }
+            $(container).data('data',data)
             $(container).click(SetActiveFilter);
 
+            
+
             const HTML = `
             <table style="width:100%">
                 <tr>
@@ -105,7 +133,7 @@
             const JSONs = ActiveFilter.find('.data-valueid-editor').typedInput('value');
             const NewObject = JSON.parse(JSONs);
 
-            ActiveFilter.data('filter').valueIds = NewObject
+            ActiveFilter.data('data').valueIds = NewObject
             const Count = NewObject.length;
             ActiveFilter.find(".data-vid-count").html(Count);
 
@@ -123,7 +151,7 @@
         }
 
         function SortChecbox(El){
-            const Data = El.data('filter');
+            const Data = El.data('data');
             Data.events.forEach((EV) =>{
                 El.find(".data-event-"+EV).prop('checked',true);
             })
@@ -137,7 +165,7 @@
                 this.changeDate = new Date();
                 Changed = false
             }
-            this.outputs = $("#filtersets").editableList('length')
+            //this.outputs = $("#filtersets").editableList('length')
             const Items = $("#filtersets").editableList('items')
             const Events = ["VALUE_UPDATED","VALUE_NOTIFICATION","NOTIFICATION","GET_VALUE_RESPONSE"]
             this.filters = [];
@@ -145,7 +173,7 @@
             for(let i = 0;i<Items.length;i++){
 
                 const El = $(Items[i])
-                const ItemData = Items[i].data('filter');
+                const ItemData = Items[i].data('data');
 
                 ItemData.events = []
                 Events.forEach((EV) =>{
@@ -155,7 +183,7 @@
                     }
                 })
 
-                ItemData.index = i;
+                //ItemData.index = i;
                 ItemData.name = El.find(".data-name").val();
                 ItemData.strict = El.find(".data-event-Endpoint").prop('checked');
                 this.filters.push(ItemData);
@@ -167,7 +195,7 @@
         function AddValueIDToFilter(ValueID){
 
             if(ActiveFilter !== undefined){
-                const VIDs = ActiveFilter.data('filter').valueIds;
+                const VIDs = ActiveFilter.data('data').valueIds;
 
                 VIDs.push(ValueID);
                 const Count = VIDs.length
@@ -191,7 +219,7 @@
 
 <script type="text/x-red" data-template-name="event-filter">
 
-  
+  <input type="hidden" id="node-input-outputs">
    
 
     <div class="form-row">

From 0d2271c55a2988718eb4a08aa5ecadf38a878ee1 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 31 Aug 2021 17:30:22 +0100
Subject: [PATCH 36/70] Update event-filter.html

---
 zwave-js/event-filter.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index d0739da8..81b97706 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -45,9 +45,13 @@
             });
 
             const OPs = JSON.parse($("#node-input-outputs").val())
+            let I = 0;
             this.filters.forEach((Item) => {
+                Item._id = I;
                 $("#filtersets").editableList('addItem',Item);
-                OPs[Item.id] = Item.index;
+
+                OPs[Item._id] = I
+                I++;
             });
             $("#node-input-outputs").val(JSON.stringify(OPs))
 
@@ -58,7 +62,7 @@
             const OPs = JSON.parse($("#node-input-outputs").val()||"{}")
             for(let i = 0;i<Items.length;i++){
                 Items[i].data('data').index = i;
-                OPs[Items[i].data('data').id] = i;
+                OPs[Items[i].data('data')._id ?? Items[i].data('data').id] = i;
             }
             $("#node-input-outputs").val(JSON.stringify(OPs))
 
@@ -183,7 +187,7 @@
                     }
                 })
 
-                //ItemData.index = i;
+                delete ItemData["_i"];
                 ItemData.name = El.find(".data-name").val();
                 ItemData.strict = El.find(".data-event-Endpoint").prop('checked');
                 this.filters.push(ItemData);

From dd5dbce2e5f4dbf6181575193847ca5144e21865 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 31 Aug 2021 18:59:55 +0100
Subject: [PATCH 37/70] 5.1.0

---
 zwave-js/event-filter.html | 41 +++++++++++++++++++++++++++++---------
 zwave-js/event-filter.js   | 12 ++++++++++-
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 81b97706..c33b269b 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -11,11 +11,11 @@
             {
                 name: { value: "ZWave Event Filter" },
                 filters: {value:[]},
-                outputs: {value: 1},
+                outputs: {value: 0},
                 changeDate: {value:undefined}
             },
             inputs: 1,
-            outputs: 1,
+            outputs: 0,
             icon: "rbe.png",
             label: function () {
                 return this.name;
@@ -31,9 +31,20 @@
             }
         });
 
+        function compare( a, b ) {
+                if (a.index < b.index) {
+                    return -1;
+                }
+                if (a.index > b.index) {
+                    return 1;
+                }
+                return 0;
+        }
+
         function SortUI(){
 
             $("#node-input-outputs").val("{}");
+            const OPs = JSON.parse($("#node-input-outputs").val())
 
             $("#filtersets").editableList({
                 header: $('<div>').append('<div>Filter Sets - order defines outputs</div>'),
@@ -41,15 +52,14 @@
                 removable: true, 
                 addButton: 'Add Filter Set',
                 addItem:AddItem,
-                sortItems:SortItems
+                sortItems:SortItems,
+                removeItem:RemoveItem
             });
 
-            const OPs = JSON.parse($("#node-input-outputs").val())
             let I = 0;
-            this.filters.forEach((Item) => {
+            this.filters.sort(compare).forEach((Item) => {
                 Item._id = I;
                 $("#filtersets").editableList('addItem',Item);
-
                 OPs[Item._id] = I
                 I++;
             });
@@ -67,6 +77,20 @@
             $("#node-input-outputs").val(JSON.stringify(OPs))
 
         }
+
+        function RemoveItem(Item){
+
+            const OPs = JSON.parse($("#node-input-outputs").val()||"{}")
+            if(item.hasOwnProperty("_id")){
+                OPs[Item._id] = -1
+            }
+            else{
+                delete OPs[Item.id]
+            }
+            
+            
+            $("#node-input-outputs").val(JSON.stringify(OPs))
+        }
         
         function AddItem(container, index, data){
             
@@ -169,8 +193,7 @@
                 this.changeDate = new Date();
                 Changed = false
             }
-            //this.outputs = $("#filtersets").editableList('length')
-            const Items = $("#filtersets").editableList('items')
+            const Items = $("#filtersets").editableList('items').sort(compare)
             const Events = ["VALUE_UPDATED","VALUE_NOTIFICATION","NOTIFICATION","GET_VALUE_RESPONSE"]
             this.filters = [];
 
@@ -187,7 +210,7 @@
                     }
                 })
 
-                delete ItemData["_i"];
+                delete ItemData._id
                 ItemData.name = El.find(".data-name").val();
                 ItemData.strict = El.find(".data-event-Endpoint").prop('checked');
                 this.filters.push(ItemData);
diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index 0cb9246d..c2243233 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -6,6 +6,16 @@ module.exports = function (RED) {
 
 		node.on('input', Input);
 
+		function compare( a, b ) {
+			if (a.index < b.index) {
+				return -1;
+			}
+			if (a.index > b.index) {
+				return 1;
+			}
+			return 0;
+		}
+
 		async function Input(msg, send, done) {
 			const SendingArray = new Array(config.filters.length);
 
@@ -15,7 +25,7 @@ module.exports = function (RED) {
 
 				let ArrayIndex = -1;
 
-				for (const Filter of Filters) {
+				for (const Filter of Filters.sort(compare)) {
 					ArrayIndex++;
 					if (Filter.events.length > 0) {
 						if (Filter.events.includes(msg.payload.event)) {

From c5954293fc9856d1092bb37371b7ddc82bc1361e Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 31 Aug 2021 19:13:00 +0100
Subject: [PATCH 38/70] Update event-filter.html

---
 zwave-js/event-filter.html | 359 ++++++++++++++++++-------------------
 1 file changed, 178 insertions(+), 181 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index c33b269b..66a32380 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -3,116 +3,115 @@
     let Changed = false;
     let ActiveFilter = undefined;
 
-    RED.nodes.registerType('event-filter',
-        {
-            category: 'ZWave JS',
-            color: 'rgb(46,145,205)',
-            defaults:
-            {
-                name: { value: "ZWave Event Filter" },
-                filters: {value:[]},
-                outputs: {value: 0},
-                changeDate: {value:undefined}
-            },
-            inputs: 1,
-            outputs: 0,
-            icon: "rbe.png",
-            label: function () {
-                return this.name;
-            },
-            oneditprepare: SortUI,
-            oneditsave: DoSave,
-            oneditcancel: function(){
-                Changed = false;
-                ActiveFilter = undefined;
-            },
-            outputLabels: function(index) {
-                return this.filters[index].name
-            }
-        });
+    RED.nodes.registerType('event-filter', {
+        category: 'ZWave JS',
+        color: 'rgb(46,145,205)',
+        defaults: {
+            name: { value: "ZWave Event Filter" },
+            filters: { value: [] },
+            outputs: { value: 0 },
+            changeDate: { value: undefined }
+        },
+        inputs: 1,
+        outputs: 0,
+        icon: "rbe.png",
+        label: function () {
+            return this.name;
+        },
+        oneditprepare: SortUI,
+        oneditsave: DoSave,
+        oneditcancel: function () {
+            Changed = false;
+            ActiveFilter = undefined;
+        },
+        outputLabels: function (index) {
+            return this.filters[index].name
+        }
+    });
 
-        function compare( a, b ) {
-                if (a.index < b.index) {
-                    return -1;
-                }
-                if (a.index > b.index) {
-                    return 1;
-                }
-                return 0;
+    function compare(a, b) {
+        if (a.index < b.index) {
+            return -1;
+        }
+        if (a.index > b.index) {
+            return 1;
         }
+        return 0;
+    }
+
+    function SortUI() {
+
+        $("#node-input-outputs").val("{}");
+        const OPs = JSON.parse($("#node-input-outputs").val())
+
+        $("#filtersets").editableList({
+            header: $('<div>').append('<div>Filter Sets - order defines outputs</div>'),
+            sortable: true,
+            removable: true,
+            addButton: 'Add Filter Set',
+            addItem: AddItem,
+            sortItems: SortItems,
+            removeItem: RemoveItem
+        });
 
-        function SortUI(){
+        let I = 0;
+        this.filters.sort(compare).forEach((Item) => {
+            Item._id = I;
+            $("#filtersets").editableList('addItem', Item);
+            OPs[Item._id] = I
+            I++;
+        });
+        $("#node-input-outputs").val(JSON.stringify(OPs))
 
-            $("#node-input-outputs").val("{}");
-            const OPs = JSON.parse($("#node-input-outputs").val())
+    }
 
-            $("#filtersets").editableList({
-                header: $('<div>').append('<div>Filter Sets - order defines outputs</div>'),
-                sortable: true,
-                removable: true, 
-                addButton: 'Add Filter Set',
-                addItem:AddItem,
-                sortItems:SortItems,
-                removeItem:RemoveItem
-            });
+    function SortItems(Items) {
 
-            let I = 0;
-            this.filters.sort(compare).forEach((Item) => {
-                Item._id = I;
-                $("#filtersets").editableList('addItem',Item);
-                OPs[Item._id] = I
-                I++;
-            });
-            $("#node-input-outputs").val(JSON.stringify(OPs))
+        const OPs = JSON.parse($("#node-input-outputs").val() || "{}")
 
+        for (let i = 0; i < Items.length; i++) {
+            Items[i].data('data').index = i;
+            OPs[Items[i].data('data')._id ?? Items[i].data('data').id] = i;
         }
+        $("#node-input-outputs").val(JSON.stringify(OPs))
 
-        function SortItems(Items){
+    }
 
-            const OPs = JSON.parse($("#node-input-outputs").val()||"{}")
-            for(let i = 0;i<Items.length;i++){
-                Items[i].data('data').index = i;
-                OPs[Items[i].data('data')._id ?? Items[i].data('data').id] = i;
-            }
-            $("#node-input-outputs").val(JSON.stringify(OPs))
+    function RemoveItem(Item) {
 
+        const OPs = JSON.parse($("#node-input-outputs").val() || "{}")
+        if (Item.hasOwnProperty("_id")) {
+            OPs[Item._id] = -1
+        } else {
+            delete OPs[Item.id]
         }
 
-        function RemoveItem(Item){
-
-            const OPs = JSON.parse($("#node-input-outputs").val()||"{}")
-            if(item.hasOwnProperty("_id")){
-                OPs[Item._id] = -1
-            }
-            else{
-                delete OPs[Item.id]
-            }
-            
-            
-            $("#node-input-outputs").val(JSON.stringify(OPs))
+        const Items = $("#filtersets").editableList('items');
+        for (let i = 0; i < Items.length; i++) {
+            OPs[Items[i].data('data')._id ?? Items[i].data('data').id] = i
         }
-        
-        function AddItem(container, index, data){
-            
 
-            if (Object.keys(data).length === 0) {
-                data.index = index;
-                data.name = "Filter Name"
-                data.valueIds = []
-                data.events = ["VALUE_UPDATED"]
-                data.strict = false
-                data.id = Math.floor((0x99999 - 0x10000) * Math.random()).toString()
-
-                const OPs = JSON.parse($("#node-input-outputs").val()||"{}")
-                OPs[data.id] = index;
-                $("#node-input-outputs").val(JSON.stringify(OPs))
-            }
-            $(container).data('data',data)
-            $(container).click(SetActiveFilter);
+        $("#node-input-outputs").val(JSON.stringify(OPs))
+    }
 
-            
+    function AddItem(container, index, data) {
 
-            const HTML = `
+        if (Object.keys(data).length === 0) {
+            data.index = index;
+            data.name = "Filter Name"
+            data.valueIds = []
+            data.events = ["VALUE_UPDATED"]
+            data.strict = false
+            data.id = Math.floor((0x99999 - 0x10000) * Math.random()).toString()
+
+            const OPs = JSON.parse($("#node-input-outputs").val() || "{}")
+            OPs[data.id] = index;
+            $("#node-input-outputs").val(JSON.stringify(OPs))
+        }
+        $(container).data('data', data)
+        $(container).click(SetActiveFilter);
+
+        const HTML = `
             <table style="width:100%">
                 <tr>
                     <td>Name</td>
@@ -136,112 +135,110 @@
                     </td>
                 </tr>
             
-            `; 
-
-            $(container).html(HTML);
-            const Refresh = $('<button>')
-                .addClass('ui-button')
-                .addClass('ui-corner-all')
-                .addClass('ui-widget')
-                .addClass('rightButton')
-                .html('&#8635;')
-                .click(()=>{
-                    SyncEdits()
-                })
-                .insertAfter($(container).find('.data-valueid-editor'))
-            $(container).find('.data-valueid-editor').typedInput({types: ["json"],default: "json"});
-            $(container).find('.data-valueid-editor').typedInput('value',JSON.stringify(data.valueIds));
-            SortChecbox($(container))
-        }
-
-        
-        
-
-        function SyncEdits(){
-            const JSONs = ActiveFilter.find('.data-valueid-editor').typedInput('value');
-            const NewObject = JSON.parse(JSONs);
-
-            ActiveFilter.data('data').valueIds = NewObject
-            const Count = NewObject.length;
-            ActiveFilter.find(".data-vid-count").html(Count);
-
-            Changed = true;
+            `;
+
+        $(container).html(HTML);
+        const Refresh = $('<button>')
+            .addClass('ui-button')
+            .addClass('ui-corner-all')
+            .addClass('ui-widget')
+            .addClass('rightButton')
+            .html('&#8635;')
+            .click(() => {
+                SyncEdits()
+            })
+            .insertAfter($(container).find('.data-valueid-editor'))
+        $(container).find('.data-valueid-editor').typedInput({
+            types: ["json"],
+            default: "json"
+        });
+        $(container).find('.data-valueid-editor').typedInput('value', JSON.stringify(data.valueIds));
+        SortChecbox($(container))
+    }
+
+    function SyncEdits() {
+        const JSONs = ActiveFilter.find('.data-valueid-editor').typedInput('value');
+        const NewObject = JSON.parse(JSONs);
+
+        ActiveFilter.data('data').valueIds = NewObject
+        const Count = NewObject.length;
+        ActiveFilter.find(".data-vid-count").html(Count);
+
+        Changed = true;
+    }
+
+    function SetActiveFilter() {
+        const Items = $("#filtersets").editableList('items');
+        for (let i = 0; i < Items.length; i++) {
+            Items[i].css({
+                backgroundColor: 'white'
+            });
         }
-
-
-        function SetActiveFilter(){
-            const Items = $("#filtersets").editableList('items');
-            for(let i = 0;i<Items.length;i++){
-                Items[i].css({backgroundColor:'white'});
-            }
-            $(this).css({backgroundColor:'lightgray'});
-            ActiveFilter = $(this);
+        $(this).css({
+            backgroundColor: 'lightgray'
+        });
+        ActiveFilter = $(this);
+    }
+
+    function SortChecbox(El) {
+        const Data = El.data('data');
+        Data.events.forEach((EV) => {
+            El.find(".data-event-" + EV).prop('checked', true);
+        })
+        if (Data.strict) {
+            El.find(".data-event-Endpoint").prop('checked', true);
         }
+    }
 
-        function SortChecbox(El){
-            const Data = El.data('data');
-            Data.events.forEach((EV) =>{
-                El.find(".data-event-"+EV).prop('checked',true);
-            })
-            if(Data.strict){
-                El.find(".data-event-Endpoint").prop('checked',true);
-            }
+    function DoSave() {
+        if (Changed) {
+            this.changeDate = new Date();
+            Changed = false
         }
+        const Items = $("#filtersets").editableList('items').sort(compare)
+        const Events = ["VALUE_UPDATED", "VALUE_NOTIFICATION", "NOTIFICATION", "GET_VALUE_RESPONSE"]
+        this.filters = [];
 
-        function DoSave(){
-            if(Changed){
-                this.changeDate = new Date();
-                Changed = false
-            }
-            const Items = $("#filtersets").editableList('items').sort(compare)
-            const Events = ["VALUE_UPDATED","VALUE_NOTIFICATION","NOTIFICATION","GET_VALUE_RESPONSE"]
-            this.filters = [];
-
-            for(let i = 0;i<Items.length;i++){
+        for (let i = 0; i < Items.length; i++) {
 
-                const El = $(Items[i])
-                const ItemData = Items[i].data('data');
+            const El = $(Items[i])
+            const ItemData = Items[i].data('data');
 
-                ItemData.events = []
-                Events.forEach((EV) =>{
+            ItemData.events = []
+            Events.forEach((EV) => {
 
-                    if(El.find(".data-event-"+EV).prop('checked')){
-                        ItemData.events.push(EV)
-                    }
-                })
-
-                delete ItemData._id
-                ItemData.name = El.find(".data-name").val();
-                ItemData.strict = El.find(".data-event-Endpoint").prop('checked');
-                this.filters.push(ItemData);
-            }
+                if (El.find(".data-event-" + EV).prop('checked')) {
+                    ItemData.events.push(EV)
+                }
+            })
 
-            ActiveFilter = undefined;
+            delete ItemData._id
+            ItemData.name = El.find(".data-name").val();
+            ItemData.strict = El.find(".data-event-Endpoint").prop('checked');
+            this.filters.push(ItemData);
         }
 
-        function AddValueIDToFilter(ValueID){
+        ActiveFilter = undefined;
+    }
 
-            if(ActiveFilter !== undefined){
-                const VIDs = ActiveFilter.data('data').valueIds;
+    function AddValueIDToFilter(ValueID) {
 
-                VIDs.push(ValueID);
-                const Count = VIDs.length
+        if (ActiveFilter !== undefined) {
+            const VIDs = ActiveFilter.data('data').valueIds;
 
-                ActiveFilter.find(".data-vid-count").html(Count);
-                ActiveFilter.find('.data-valueid-editor').typedInput('value',JSON.stringify(VIDs));
+            VIDs.push(ValueID);
+            const Count = VIDs.length
 
-                Changed = true;
-                return true;
-            }else{
-                return false;
-            }
+            ActiveFilter.find(".data-vid-count").html(Count);
+            ActiveFilter.find('.data-valueid-editor').typedInput('value', JSON.stringify(VIDs));
 
-           
-            
+            Changed = true;
+            return true;
+        } else {
+            return false;
         }
 
-      
-
+    }
 </script>
 
 <script type="text/x-red" data-template-name="event-filter">

From 5e1749d6f6f28056687fee213f80fc38b452b85a Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 31 Aug 2021 19:59:05 +0100
Subject: [PATCH 39/70] Update event-filter.html

---
 zwave-js/event-filter.html | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 66a32380..252a3537 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -88,6 +88,7 @@
 
         const Items = $("#filtersets").editableList('items');
         for (let i = 0; i < Items.length; i++) {
+            Items[i].data('data').index = i
             OPs[Items[i].data('data')._id ?? Items[i].data('data').id] = i
         }
 
@@ -110,6 +111,7 @@
         }
         $(container).data('data', data)
         $(container).click(SetActiveFilter);
+        $(container).parent().css({height:'45px',overflow:'hidden'})
 
         const HTML = `
             <table style="width:100%">
@@ -170,14 +172,18 @@
     function SetActiveFilter() {
         const Items = $("#filtersets").editableList('items');
         for (let i = 0; i < Items.length; i++) {
-            Items[i].css({
-                backgroundColor: 'white'
-            });
+
+          //  Items[i].css({
+          //      backgroundColor: 'white'
+          //  });
+            Items[i].parent().animate({height: "45px"}, 200)
         }
-        $(this).css({
-            backgroundColor: 'lightgray'
-        });
+       // $(this).css({
+        //    backgroundColor: 'lightgray'
+       // });
         ActiveFilter = $(this);
+
+        $(this).parent().animate({height: "200px"}, 200)
     }
 
     function SortChecbox(El) {

From 1b581b92e69f324a0b2fcc3f034a47c920fef211 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 31 Aug 2021 20:35:51 +0100
Subject: [PATCH 40/70] Update event-filter.html

---
 zwave-js/event-filter.html | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 252a3537..1602b7ef 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -170,20 +170,15 @@
     }
 
     function SetActiveFilter() {
-        const Items = $("#filtersets").editableList('items');
-        for (let i = 0; i < Items.length; i++) {
 
-          //  Items[i].css({
-          //      backgroundColor: 'white'
-          //  });
-            Items[i].parent().animate({height: "45px"}, 200)
+        if(ActiveFilter === undefined || ActiveFilter.data('data').id !== $(this).data('data').id){
+            const Items = $("#filtersets").editableList('items');
+            for (let i = 0; i < Items.length; i++) {
+                Items[i].parent().animate({height: "45px"}, 200)
+            }
+            ActiveFilter = $(this);
+            $(this).parent().animate({height: "200px"}, 200)
         }
-       // $(this).css({
-        //    backgroundColor: 'lightgray'
-       // });
-        ActiveFilter = $(this);
-
-        $(this).parent().animate({height: "200px"}, 200)
     }
 
     function SortChecbox(El) {

From 5d909c264994b20612e3949873b723887f1aba1d Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Tue, 31 Aug 2021 20:59:14 +0100
Subject: [PATCH 41/70] 5.1.0

---
 package.json             |  2 +-
 zwave-js/event-filter.js | 25 ++++++++++++++-----------
 zwave-js/ui/client.js    | 10 ++++++----
 zwave-js/zwave-js.js     |  2 +-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 22d6cc7d..c4a43490 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-zwave-js",
-  "version": "5.1.0-beta.1",
+  "version": "5.1.0-beta.2",
   "license": "MIT",
   "description": "An extremely powerful, easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
   "dependencies": {
diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index c2243233..ec315135 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -6,7 +6,7 @@ module.exports = function (RED) {
 
 		node.on('input', Input);
 
-		function compare( a, b ) {
+		function compare(a, b) {
 			if (a.index < b.index) {
 				return -1;
 			}
@@ -31,13 +31,19 @@ module.exports = function (RED) {
 						if (Filter.events.includes(msg.payload.event)) {
 							if (Filter.valueIds.length > 0) {
 								for (const ValueID of Filter.valueIds) {
-									if (IsValueIDMatch(ValueID, msg, msg.payload.event === 'GET_VALUE_RESPONSE')) {
+									if (
+										IsValueIDMatch(
+											ValueID,
+											msg,
+											msg.payload.event === 'GET_VALUE_RESPONSE'
+										)
+									) {
 										msg.filter = Filter;
 										SendingArray[ArrayIndex] = msg;
 										node.status({
 											fill: 'green',
 											shape: 'dot',
-											text: 'Last match: '+Filter.name
+											text: 'Last match: ' + Filter.name
 										});
 										send(SendingArray);
 										Matched = true;
@@ -53,7 +59,7 @@ module.exports = function (RED) {
 								node.status({
 									fill: 'green',
 									shape: 'dot',
-									text: 'Last match: '+Filter.name
+									text: 'Last match: ' + Filter.name
 								});
 								Matched = true;
 								send(SendingArray);
@@ -63,15 +69,14 @@ module.exports = function (RED) {
 					}
 				}
 
-				if(!Matched){
+				if (!Matched) {
 					node.status({
 						fill: 'yellow',
 						shape: 'dot',
 						text: 'No match'
 					});
 				}
-			}
-			else{
+			} else {
 				node.status({
 					fill: 'red',
 					shape: 'dot',
@@ -79,8 +84,6 @@ module.exports = function (RED) {
 				});
 			}
 
-		
-
 			if (done) {
 				done();
 			}
@@ -88,10 +91,10 @@ module.exports = function (RED) {
 
 		function IsValueIDMatch(ValueID, MSG, Response) {
 			let Root = MSG.payload.object;
-			if(Response){
+			if (Response) {
 				Root = MSG.payload.object.valueId;
 			}
-			
+
 			let ValueIDKeys = Object.keys(ValueID);
 			const MSGKeys = Object.keys(Root);
 
diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index 843ea6cd..87dd7622 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -1779,12 +1779,14 @@ const ZwaveJsUI = (function () {
 					minHeight: 75,
 					buttons: {
 						'Add To Filter Set': function () {
-							if(AddValueIDToFilter(data.valueId)){
+							if (AddValueIDToFilter(data.valueId)) {
 								$(this).dialog('destroy');
-							}else{
-								modalAlert('Please activate the target filter set.','No Active Filter Set')
+							} else {
+								modalAlert(
+									'Please activate the target filter set.',
+									'No Active Filter Set'
+								);
 							}
-							
 						},
 						Close: function () {
 							$(this).dialog('destroy');
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index d375c519..14a38624 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -121,7 +121,7 @@ module.exports = function (RED) {
 			};
 			Pin2Transport = new Pin2LogTransport(Options);
 			Pin2Transport.getStream().on('data', (chunk) => {
-				node.send([undefined, JSON.parse(chunk.toString())]);
+				node.send([undefined, { payload: JSON.parse(chunk.toString()) }]);
 			});
 			Logger.add(Pin2Transport);
 		}

From 1615047e6108ef05fd5e7e545270eafef4e502aa Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Thu, 2 Sep 2021 17:04:01 +0100
Subject: [PATCH 42/70] 5.1.0

---
 package.json             |  3 +-
 zwave-js/event-filter.js | 53 ++++++++++++++++++------------
 zwave-js/ui/client.js    | 70 ++++++++++++----------------------------
 zwave-js/zwave-js.html   | 58 ++++++++++++++++++++++++++++-----
 zwave-js/zwave-js.js     | 30 +++++++++++++----
 5 files changed, 129 insertions(+), 85 deletions(-)

diff --git a/package.json b/package.json
index c4a43490..91d08180 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "node-red-contrib-zwave-js",
-  "version": "5.1.0-beta.2",
+  "version": "5.1.0-beta.3",
   "license": "MIT",
   "description": "An extremely powerful, easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
   "dependencies": {
     "@serialport/bindings": "9.2.0",
     "express": "4.17.1",
+    "lodash": "4.17.21",
     "serialport": "9.2.0",
     "winston": "3.3.3",
     "winston-transport": "4.4.0",
diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index ec315135..aae78fb9 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -1,5 +1,7 @@
 'use strict';
 module.exports = function (RED) {
+	const LD = require('lodash');
+
 	function Init(config) {
 		RED.nodes.createNode(this, config);
 		const node = this;
@@ -35,7 +37,7 @@ module.exports = function (RED) {
 										IsValueIDMatch(
 											ValueID,
 											msg,
-											msg.payload.event === 'GET_VALUE_RESPONSE'
+											msg.payload.event
 										)
 									) {
 										msg.filter = Filter;
@@ -89,33 +91,44 @@ module.exports = function (RED) {
 			}
 		}
 
-		function IsValueIDMatch(ValueID, MSG, Response) {
+		function IsValueIDMatch(ValueID, MSG, Event) {
+
+			
 			let Root = MSG.payload.object;
-			if (Response) {
-				Root = MSG.payload.object.valueId;
-			}
 
-			let ValueIDKeys = Object.keys(ValueID);
-			const MSGKeys = Object.keys(Root);
+			if (Event === "GET_VALUE_RESPONSE") {
+				Root = Root.valueId;
+				if(!config.strict){
+					delete ValueID["endpoint"]
+				}
+				const Result = LD.isMatch(Root,ValueID)
+				return Result;
+			}
 
-			if (!config.strict) {
-				ValueIDKeys = ValueIDKeys.filter((K) => K !== 'endpoint');
+			if(Event === "VALUE_UPDATED"){
+				if(!config.strict){
+					delete ValueID["endpoint"]
+				}
+				const Result = LD.isMatch(Root,ValueID)
+				return Result;
 			}
 
-			let Match = true;
+			if(Event === "NOTIFICATION"){
+				if(!config.strict){
+					delete ValueID.args["endpoint"]
+				}
+				const Result = LD.isMatch(Root,ValueID)
+				return Result;
+			}
 
-			for (const VIDK of ValueIDKeys) {
-				if (MSGKeys.includes(VIDK)) {
-					if (Root[VIDK] !== ValueID[VIDK]) {
-						Match = false;
-						break;
-					}
-				} else {
-					Match = false;
-					break;
+			if(Event === "VALUE_NOTIFICATION"){
+				if(!config.strict){
+					delete ValueID["endpoint"]
 				}
+				const Result = LD.isMatch(Root,ValueID)
+				return Result;
 			}
-			return Match;
+			
 		}
 
 		node.on('close', (done) => {
diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index 87dd7622..c5fd5e5a 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -12,6 +12,21 @@ let GrantSelected;
 let ValidateDSK;
 let DriverReady = false;
 
+let StepsAPI;
+const StepList = {
+	SecurityMode: 0,
+	NIF: 1,
+	Remove: 2,
+	Classes: 3,
+	DSK: 4,
+	AddDone: 5,
+	AddDoneInsecure: 6,
+	RemoveDone: 7,
+	ReplaceSecurityMode: 8,
+	Aborted: 9
+};
+
+
 const ZwaveJsUI = (function () {
 	function modalAlert(message, title) {
 		const Buts = {
@@ -673,55 +688,10 @@ const ZwaveJsUI = (function () {
 			});
 	}
 
-	let StepsAPI;
-	const StepList = {
-		SecurityMode: 0,
-		NIF: 1,
-		Remove: 2,
-		Classes: 3,
-		DSK: 4,
-		AddDone: 5,
-		AddDoneInsecure: 6,
-		RemoveDone: 7,
-		ReplaceSecurityMode: 8,
-		Aborted: 9
-	};
-	const Security2Class = {
-		0: {
-			name: 'S2 Unauthenticated',
-			description:
-				'Like S2 Authenticated, but without verification, that the device being added, is the correct one.'
-		},
-		1: {
-			name: 'S2 Authenticated',
-			description:
-				'Allows the device that is being added, to be verifed that it is the corect one.'
-		},
-		2: {
-			name: 'S2 Access Control',
-			description:
-				'S2 for door locks, garage doors, access control systems etc.'
-		},
-		7: {
-			name: 'S0 Legacy',
-			description: "S0 for devices that don't support S2."
-		}
-	};
-
 	function ListRequestedClass(Classes) {
-		Classes.securityClasses.forEach((SC) => {
-			const Class = Security2Class[SC.toString()];
-			$('#S2Classes').append(`
-			<tr>
-				<td style="width:130px">
-				 	<input type="checkbox" id="SC_${SC}" class="SecurityClassCB"> 
-				</td>
-				<td>
-					<lable class="SCLable" style="font-weight: bold;font-size: 18px;" for="SC_${SC}">${Class.name}</lable><br />
-					${Class.description}
-				</td>
-			</tr>
-			`);
+		Classes.forEach((SC) => {
+			$("tr#TR_"+SC).css({opacity:1.0})
+			$("input#SC_"+SC).prop('disabled',false)
 		});
 
 		StepsAPI.setStepIndex(StepList.Classes);
@@ -735,7 +705,7 @@ const ZwaveJsUI = (function () {
 	ValidateDSK = () => {
 		const B = event.target;
 
-		$(B).html('Please wait...');
+		$(B).html('Exchanging encryption keys, Please wait...');
 		$(B).prop('disabled', true);
 
 		ControllerCMD('IEAPI', 'verifyDSK', undefined, [$('#SC_DSK').val()], true);
@@ -744,7 +714,7 @@ const ZwaveJsUI = (function () {
 	GrantSelected = () => {
 		const B = event.target;
 
-		$(B).html('Please wait...');
+		$(B).html('Exchanging encryption keys, Please wait...');
 		$(B).prop('disabled', true);
 
 		const Granted = [];
diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html
index cb8852e9..247075c0 100644
--- a/zwave-js/zwave-js.html
+++ b/zwave-js/zwave-js.html
@@ -90,7 +90,8 @@
                     </tr>
                     <tr>
                         <td style="text-align: center;">
-                            Place your ZWave device into 'Inclusion Mode'
+                            Place your ZWave device into 'Inclusion Mode'.<br />
+                            Please ensure your device is within close proximity to the controller.
                             <br />
                             <br />
                             <span class="countdown" style="color: darkgray; font-size: 18px;"></span>
@@ -109,7 +110,8 @@
                     </tr>
                     <tr>
                         <td style="text-align: center;">
-                            Place your ZWave device into 'Exclusion Mode'
+                            Place your ZWave device into 'Exclusion Mode'.<br />
+                            Please ensure your device is within close proximity to the controller.
                             <br />
                             <br />
                             <span class="countdown" style="color: darkgray; font-size: 18px;"></span>
@@ -119,12 +121,48 @@
             </div>
             <!--Requested Security Classes-->
             <div class="step-tab-panel" data-step="Classes">
-                <br />
                 Select the S2 Security Classes you wish to grant!
                 <table id="S2Classes" style="width: 100%; padding: 10px;" cellpadding="5">
 
+                    <tr id="TR_2" style="opacity: 0.4;">
+                        <td style="width:130px">
+                             <input type="checkbox" id="SC_2" class="SecurityClassCB" disabled> 
+                        </td>
+                        <td>
+                            <lable class="SCLable" style="font-weight: bold;font-size: 18px;" for="SC_2">S2 Access Control</lable><br />
+                            S2 for door locks, garage doors, access control systems etc.
+                        </td>
+                    </tr>
+                    <tr  id="TR_1" style="opacity: 0.4;">
+                        <td style="width:130px">
+                             <input type="checkbox" id="SC_1" class="SecurityClassCB" disabled> 
+                        </td>
+                        <td>
+                            <lable class="SCLable" style="font-weight: bold;font-size: 18px;" for="SC_1">S2 Authenticated</lable><br />
+                            Allows the device that is being added, to be verifed that it is the corect one.
+                        </td>
+                    </tr>
+                    <tr  id="TR_0" style="opacity: 0.4;">
+                        <td style="width:130px">
+                             <input type="checkbox" id="SC_0" class="SecurityClassCB" disabled> 
+                        </td>
+                        <td>
+                            <lable class="SCLable" style="font-weight: bold;font-size: 18px;" for="SC_0">S2 Unauthenticated</lable><br />
+                            Like S2 Authenticated, but without verification that the device being added, is the correct one.
+                        </td>
+                    </tr>
+                    <tr  id="TR_7" style="opacity: 0.4;">
+                        <td style="width:130px">
+                             <input type="checkbox" id="SC_7" class="SecurityClassCB" disabled> 
+                        </td>
+                        <td>
+                            <lable class="SCLable" style="font-weight: bold;font-size: 18px;" for="SC_7">S0 Legacy</lable><br />
+                            S0 for devices that don't support S2.
+                        </td>
+                    </tr>
+
                 </table>
-                <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 20px; margin-left: 39%;" onclick="GrantSelected()">Grant Selected</button>
+                <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 10px; margin-left: 39%;" onclick="GrantSelected()">Grant Selected</button>
                 <br />
                 <br />
                 <div class="countdown" style="color: darkgray; font-size: 18px; text-align: center;"></div>
@@ -161,8 +199,9 @@
                         </td>
                     </tr>
                     <tr>
-                        <td style="text-align: center;">Your device has been added to the network,<br />
-                            it's interview will begin in a moment. It is safe to close this dialog.</td>
+                        <td style="text-align: center;">
+                            Your device has been added to the network. It will now be interviewed.<br />
+                            Please ensure it remains in close proximity, until the interview completes.</td>
                     </tr>
                 </table>
             </div>
@@ -176,8 +215,11 @@
                         </td>
                     </tr>
                     <tr>
-                        <td style="text-align: center;">Your device has been added to the network,<br />
-                            but the requested security class could not be achieved!</td>
+                        <td style="text-align: center;">
+                            Your device has been added to the network,<br />
+                            but the requested security class couldn't be achieved,<br /><br />
+                            It will now be interviewed.<br>Please ensure it remains in close proximity, until the interview completes.
+                        </td>
                     </tr>
                 </table>
             </div>
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index 14a38624..7154a12b 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -25,6 +25,10 @@ module.exports = function (RED) {
 		let FileTransport;
 		let Pin2Transport;
 
+		let _GrantResolve = undefined;
+		let _DSKResolve = undefined;
+		let _ClientSideAuth = undefined;
+
 		const MaxDriverAttempts = 3;
 		let DriverAttempts = 0;
 		const RetryTime = 5000;
@@ -419,9 +423,6 @@ module.exports = function (RED) {
 			}
 		}
 
-		let _GrantResolve;
-		let _DSKResolve;
-
 		function CheckKey(strategy) {
 			if (strategy === 2) {
 				return;
@@ -498,14 +499,23 @@ module.exports = function (RED) {
 					if (IS || ES) {
 						RestoreReadyStatus();
 					}
+					if(_GrantResolve !== undefined){
+						_GrantResolve(false);
+						_GrantResolve = undefined
+					}
+					if(_DSKResolve !== undefined){
+						_DSKResolve(false);
+						_DSKResolve = undefined
+					}
 					break;
 			}
 			return;
 		}
 
-		function GrantSecurityClasses(RequestedClasses) {
+		function GrantSecurityClasses(_Request) {
+			_ClientSideAuth = _Request.clientSideAuth
 			UI.sendEvent('node-inclusion-step', 'grant security', {
-				classes: RequestedClasses
+				classes: _Request.securityClasses
 			});
 			return new Promise((res) => {
 				_GrantResolve = res;
@@ -515,8 +525,9 @@ module.exports = function (RED) {
 		function Grant(Classes) {
 			_GrantResolve({
 				securityClasses: Classes,
-				clientSideAuth: false
+				clientSideAuth: _ClientSideAuth
 			});
+			_GrantResolve = undefined;
 		}
 
 		function ValidateDSK(DSK) {
@@ -528,9 +539,16 @@ module.exports = function (RED) {
 
 		function VerifyDSK(Pin) {
 			_DSKResolve(Pin);
+			_DSKResolve = undefined;
 		}
 
 		function Abort() {
+			if(_GrantResolve !== undefined){
+				_GrantResolve = undefined
+			}
+			if(_DSKResolve !== undefined){
+				_DSKResolve = undefined
+			}
 			UI.sendEvent('node-inclusion-step', 'aborted');
 		}
 

From 4e72570359ed0247983965ceed0ce198cfddec13 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Fri, 3 Sep 2021 10:41:18 +0100
Subject: [PATCH 43/70] 5.1.0

---
 package.json                 |  4 +--
 zwave-js/Pin2LogTransport.js | 21 +++++++---------
 zwave-js/event-filter.js     | 48 +++++++++++++++---------------------
 zwave-js/ui/client.js        | 13 ++++++----
 zwave-js/zwave-js.js         | 29 +++++++++++-----------
 5 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/package.json b/package.json
index 91d08180..fff5cdb7 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,12 @@
   "description": "An extremely powerful, easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
   "dependencies": {
     "@serialport/bindings": "9.2.0",
+    "serialport": "9.2.0",
     "express": "4.17.1",
     "lodash": "4.17.21",
-    "serialport": "9.2.0",
     "winston": "3.3.3",
     "winston-transport": "4.4.0",
-    "zwave-js": "8.2.1"
+    "zwave-js": "8.2.2"
   },
   "devDependencies": {
     "eslint": "7.31.0",
diff --git a/zwave-js/Pin2LogTransport.js b/zwave-js/Pin2LogTransport.js
index 4ccfcb58..0b9addb1 100644
--- a/zwave-js/Pin2LogTransport.js
+++ b/zwave-js/Pin2LogTransport.js
@@ -1,27 +1,24 @@
-const Stream = require('stream');
 const WinstonTransport = require('winston-transport');
 
+let _CallBack = undefined;
+
 class Pin2LogTransport extends WinstonTransport {
 	constructor(options) {
+		_CallBack = options.callback;
+		delete options.callback;
 		super(options);
-		this.formattedMessageSymbol = Symbol.for('message');
-		this.passThroughStream = new Stream.PassThrough();
 	}
 }
 
 Pin2LogTransport.prototype.log = function (info, next) {
-	const logObject = JSON.stringify(info);
-	this.passThroughStream.write(logObject);
+	if (_CallBack !== undefined) {
+		_CallBack(info);
+	}
 	next();
 };
 
-Pin2LogTransport.prototype.getStream = function () {
-	return this.passThroughStream;
-};
-
-Pin2LogTransport.prototype.destroy = function () {
-	this.passThroughStream.end();
-	this.passThroughStream.destroy();
+Pin2LogTransport.close = function () {
+	_CallBack = undefined;
 };
 
 module.exports = {
diff --git a/zwave-js/event-filter.js b/zwave-js/event-filter.js
index aae78fb9..39c71bc7 100644
--- a/zwave-js/event-filter.js
+++ b/zwave-js/event-filter.js
@@ -21,7 +21,11 @@ module.exports = function (RED) {
 		async function Input(msg, send, done) {
 			const SendingArray = new Array(config.filters.length);
 
-			if (msg.payload !== undefined && msg.payload.event !== undefined) {
+			if (
+				msg.payload !== undefined &&
+				msg.payload.event !== undefined &&
+				msg.payload.node !== undefined
+			) {
 				const Filters = config.filters;
 				let Matched = false;
 
@@ -33,13 +37,7 @@ module.exports = function (RED) {
 						if (Filter.events.includes(msg.payload.event)) {
 							if (Filter.valueIds.length > 0) {
 								for (const ValueID of Filter.valueIds) {
-									if (
-										IsValueIDMatch(
-											ValueID,
-											msg,
-											msg.payload.event
-										)
-									) {
+									if (IsValueIDMatch(ValueID, msg, msg.payload.event)) {
 										msg.filter = Filter;
 										SendingArray[ArrayIndex] = msg;
 										node.status({
@@ -92,43 +90,37 @@ module.exports = function (RED) {
 		}
 
 		function IsValueIDMatch(ValueID, MSG, Event) {
-
-			
 			let Root = MSG.payload.object;
 
-			if (Event === "GET_VALUE_RESPONSE") {
+			if (Event === 'GET_VALUE_RESPONSE') {
 				Root = Root.valueId;
-				if(!config.strict){
-					delete ValueID["endpoint"]
+				if (!config.strict) {
+					delete ValueID['endpoint'];
 				}
-				const Result = LD.isMatch(Root,ValueID)
+				const Result = LD.isMatch(Root, ValueID);
 				return Result;
 			}
 
-			if(Event === "VALUE_UPDATED"){
-				if(!config.strict){
-					delete ValueID["endpoint"]
+			if (Event === 'VALUE_UPDATED') {
+				if (!config.strict) {
+					delete ValueID['endpoint'];
 				}
-				const Result = LD.isMatch(Root,ValueID)
+				const Result = LD.isMatch(Root, ValueID);
 				return Result;
 			}
 
-			if(Event === "NOTIFICATION"){
-				if(!config.strict){
-					delete ValueID.args["endpoint"]
-				}
-				const Result = LD.isMatch(Root,ValueID)
+			if (Event === 'NOTIFICATION') {
+				const Result = LD.isMatch(Root, ValueID);
 				return Result;
 			}
 
-			if(Event === "VALUE_NOTIFICATION"){
-				if(!config.strict){
-					delete ValueID["endpoint"]
+			if (Event === 'VALUE_NOTIFICATION') {
+				if (!config.strict) {
+					delete ValueID['endpoint'];
 				}
-				const Result = LD.isMatch(Root,ValueID)
+				const Result = LD.isMatch(Root, ValueID);
 				return Result;
 			}
-			
 		}
 
 		node.on('close', (done) => {
diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index c5fd5e5a..b66ab99a 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -26,7 +26,6 @@ const StepList = {
 	Aborted: 9
 };
 
-
 const ZwaveJsUI = (function () {
 	function modalAlert(message, title) {
 		const Buts = {
@@ -690,8 +689,8 @@ const ZwaveJsUI = (function () {
 
 	function ListRequestedClass(Classes) {
 		Classes.forEach((SC) => {
-			$("tr#TR_"+SC).css({opacity:1.0})
-			$("input#SC_"+SC).prop('disabled',false)
+			$('tr#TR_' + SC).css({ opacity: 1.0 });
+			$('input#SC_' + SC).prop('disabled', false);
 		});
 
 		StepsAPI.setStepIndex(StepList.Classes);
@@ -705,7 +704,9 @@ const ZwaveJsUI = (function () {
 	ValidateDSK = () => {
 		const B = event.target;
 
-		$(B).html('Exchanging encryption keys, Please wait...');
+		$(B).html('Please wait...');
+		ClearIETimer();
+		ClearSecurityCountDown();
 		$(B).prop('disabled', true);
 
 		ControllerCMD('IEAPI', 'verifyDSK', undefined, [$('#SC_DSK').val()], true);
@@ -714,7 +715,9 @@ const ZwaveJsUI = (function () {
 	GrantSelected = () => {
 		const B = event.target;
 
-		$(B).html('Exchanging encryption keys, Please wait...');
+		$(B).html('Please wait...');
+		ClearIETimer();
+		ClearSecurityCountDown();
 		$(B).prop('disabled', true);
 
 		const Granted = [];
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index 7154a12b..8ce09002 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -119,14 +119,16 @@ module.exports = function (RED) {
 			Logger.add(FileTransport);
 		}
 
+		function P2Log(Info) {
+			node.send([undefined, { payload: Info }]);
+		}
+
 		if (config.logLevelPin !== 'none') {
 			const Options = {
-				level: config.logLevelPin
+				level: config.logLevelPin,
+				callback: P2Log
 			};
 			Pin2Transport = new Pin2LogTransport(Options);
-			Pin2Transport.getStream().on('data', (chunk) => {
-				node.send([undefined, { payload: JSON.parse(chunk.toString()) }]);
-			});
 			Logger.add(Pin2Transport);
 		}
 
@@ -365,7 +367,6 @@ module.exports = function (RED) {
 				Logger = undefined;
 			}
 			if (Pin2Transport !== undefined) {
-				Pin2Transport.destroy();
 				Pin2Transport = undefined;
 			}
 			if (FileTransport !== undefined) {
@@ -499,13 +500,13 @@ module.exports = function (RED) {
 					if (IS || ES) {
 						RestoreReadyStatus();
 					}
-					if(_GrantResolve !== undefined){
+					if (_GrantResolve !== undefined) {
 						_GrantResolve(false);
-						_GrantResolve = undefined
+						_GrantResolve = undefined;
 					}
-					if(_DSKResolve !== undefined){
+					if (_DSKResolve !== undefined) {
 						_DSKResolve(false);
-						_DSKResolve = undefined
+						_DSKResolve = undefined;
 					}
 					break;
 			}
@@ -513,7 +514,7 @@ module.exports = function (RED) {
 		}
 
 		function GrantSecurityClasses(_Request) {
-			_ClientSideAuth = _Request.clientSideAuth
+			_ClientSideAuth = _Request.clientSideAuth;
 			UI.sendEvent('node-inclusion-step', 'grant security', {
 				classes: _Request.securityClasses
 			});
@@ -543,11 +544,11 @@ module.exports = function (RED) {
 		}
 
 		function Abort() {
-			if(_GrantResolve !== undefined){
-				_GrantResolve = undefined
+			if (_GrantResolve !== undefined) {
+				_GrantResolve = undefined;
 			}
-			if(_DSKResolve !== undefined){
-				_DSKResolve = undefined
+			if (_DSKResolve !== undefined) {
+				_DSKResolve = undefined;
 			}
 			UI.sendEvent('node-inclusion-step', 'aborted');
 		}

From 9b11d24e05910a830bfd176e0a82f4db145b27f7 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Fri, 3 Sep 2021 11:11:27 +0100
Subject: [PATCH 44/70] 5.1.0

---
 zwave-js/event-filter.html |  506 +++++++------
 zwave-js/zwave-device.html |  646 ++++++++--------
 zwave-js/zwave-js.html     | 1421 +++++++++++++++++++-----------------
 3 files changed, 1325 insertions(+), 1248 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 1602b7ef..00d68c8e 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -1,119 +1,116 @@
 <script type="text/javascript">
-
-    let Changed = false;
-    let ActiveFilter = undefined;
-
-    RED.nodes.registerType('event-filter', {
-        category: 'ZWave JS',
-        color: 'rgb(46,145,205)',
-        defaults: {
-            name: { value: "ZWave Event Filter" },
-            filters: { value: [] },
-            outputs: { value: 0 },
-            changeDate: { value: undefined }
-        },
-        inputs: 1,
-        outputs: 0,
-        icon: "rbe.png",
-        label: function () {
-            return this.name;
-        },
-        oneditprepare: SortUI,
-        oneditsave: DoSave,
-        oneditcancel: function () {
-            Changed = false;
-            ActiveFilter = undefined;
-        },
-        outputLabels: function (index) {
-            return this.filters[index].name
-        }
-    });
-
-    function compare(a, b) {
-        if (a.index < b.index) {
-            return -1;
-        }
-        if (a.index > b.index) {
-            return 1;
-        }
-        return 0;
-    }
-
-    function SortUI() {
-
-        $("#node-input-outputs").val("{}");
-        const OPs = JSON.parse($("#node-input-outputs").val())
-
-        $("#filtersets").editableList({
-            header: $('<div>').append('<div>Filter Sets - order defines outputs</div>'),
-            sortable: true,
-            removable: true,
-            addButton: 'Add Filter Set',
-            addItem: AddItem,
-            sortItems: SortItems,
-            removeItem: RemoveItem
-        });
-
-        let I = 0;
-        this.filters.sort(compare).forEach((Item) => {
-            Item._id = I;
-            $("#filtersets").editableList('addItem', Item);
-            OPs[Item._id] = I
-            I++;
-        });
-        $("#node-input-outputs").val(JSON.stringify(OPs))
-
-    }
-
-    function SortItems(Items) {
-
-        const OPs = JSON.parse($("#node-input-outputs").val() || "{}")
-
-        for (let i = 0; i < Items.length; i++) {
-            Items[i].data('data').index = i;
-            OPs[Items[i].data('data')._id ?? Items[i].data('data').id] = i;
-        }
-        $("#node-input-outputs").val(JSON.stringify(OPs))
-
-    }
-
-    function RemoveItem(Item) {
-
-        const OPs = JSON.parse($("#node-input-outputs").val() || "{}")
-        if (Item.hasOwnProperty("_id")) {
-            OPs[Item._id] = -1
-        } else {
-            delete OPs[Item.id]
-        }
-
-        const Items = $("#filtersets").editableList('items');
-        for (let i = 0; i < Items.length; i++) {
-            Items[i].data('data').index = i
-            OPs[Items[i].data('data')._id ?? Items[i].data('data').id] = i
-        }
-
-        $("#node-input-outputs").val(JSON.stringify(OPs))
-    }
-
-    function AddItem(container, index, data) {
-
-        if (Object.keys(data).length === 0) {
-            data.index = index;
-            data.name = "Filter Name"
-            data.valueIds = []
-            data.events = ["VALUE_UPDATED"]
-            data.strict = false
-            data.id = Math.floor((0x99999 - 0x10000) * Math.random()).toString()
-
-            const OPs = JSON.parse($("#node-input-outputs").val() || "{}")
-            OPs[data.id] = index;
-            $("#node-input-outputs").val(JSON.stringify(OPs))
-        }
-        $(container).data('data', data)
-        $(container).click(SetActiveFilter);
-        $(container).parent().css({height:'45px',overflow:'hidden'})
-
-        const HTML = `
+	let Changed = false;
+	let ActiveFilter = undefined;
+
+	RED.nodes.registerType('event-filter', {
+		category: 'ZWave JS',
+		color: 'rgb(46,145,205)',
+		defaults: {
+			name: { value: 'ZWave Event Filter' },
+			filters: { value: [] },
+			outputs: { value: 0 },
+			changeDate: { value: undefined }
+		},
+		inputs: 1,
+		outputs: 0,
+		icon: 'rbe.png',
+		label: function () {
+			return this.name;
+		},
+		oneditprepare: SortUI,
+		oneditsave: DoSave,
+		oneditcancel: function () {
+			Changed = false;
+			ActiveFilter = undefined;
+		},
+		outputLabels: function (index) {
+			return this.filters[index].name;
+		}
+	});
+
+	function compare(a, b) {
+		if (a.index < b.index) {
+			return -1;
+		}
+		if (a.index > b.index) {
+			return 1;
+		}
+		return 0;
+	}
+
+	function SortUI() {
+		$('#node-input-outputs').val('{}');
+		const OPs = JSON.parse($('#node-input-outputs').val());
+
+		$('#filtersets').editableList({
+			header: $('<div>').append(
+				'<div>Filter Sets - order defines outputs</div>'
+			),
+			sortable: true,
+			removable: true,
+			addButton: 'Add Filter Set',
+			addItem: AddItem,
+			sortItems: SortItems,
+			removeItem: RemoveItem
+		});
+
+		let I = 0;
+		this.filters.sort(compare).forEach((Item) => {
+			Item._id = I;
+			$('#filtersets').editableList('addItem', Item);
+			OPs[Item._id] = I;
+			I++;
+		});
+		$('#node-input-outputs').val(JSON.stringify(OPs));
+	}
+
+	function SortItems(Items) {
+		const OPs = JSON.parse($('#node-input-outputs').val() || '{}');
+
+		for (let i = 0; i < Items.length; i++) {
+			Items[i].data('data').index = i;
+			OPs[Items[i].data('data')._id ?? Items[i].data('data').id] = i;
+		}
+		$('#node-input-outputs').val(JSON.stringify(OPs));
+	}
+
+	function RemoveItem(Item) {
+		const OPs = JSON.parse($('#node-input-outputs').val() || '{}');
+		if (Item.hasOwnProperty('_id')) {
+			OPs[Item._id] = -1;
+		} else {
+			delete OPs[Item.id];
+		}
+
+		const Items = $('#filtersets').editableList('items');
+		for (let i = 0; i < Items.length; i++) {
+			Items[i].data('data').index = i;
+			OPs[Items[i].data('data')._id ?? Items[i].data('data').id] = i;
+		}
+
+		$('#node-input-outputs').val(JSON.stringify(OPs));
+	}
+
+	function AddItem(container, index, data) {
+		if (Object.keys(data).length === 0) {
+			data.index = index;
+			data.name = 'Filter Name';
+			data.valueIds = [];
+			data.events = ['VALUE_UPDATED'];
+			data.strict = false;
+			data.id = Math.floor((0x99999 - 0x10000) * Math.random()).toString();
+
+			const OPs = JSON.parse($('#node-input-outputs').val() || '{}');
+			OPs[data.id] = index;
+			$('#node-input-outputs').val(JSON.stringify(OPs));
+		}
+		$(container).data('data', data);
+		$(container).click(SetActiveFilter);
+		$(container)
+			.parent()
+			.css({ height: '45px', overflow: 'hidden', minWidth: '400px' });
+
+		const HTML = `
             <table style="width:100%">
                 <tr>
                     <td>Name</td>
@@ -139,154 +136,153 @@
             
             `;
 
-        $(container).html(HTML);
-        const Refresh = $('<button>')
-            .addClass('ui-button')
-            .addClass('ui-corner-all')
-            .addClass('ui-widget')
-            .addClass('rightButton')
-            .html('&#8635;')
-            .click(() => {
-                SyncEdits()
-            })
-            .insertAfter($(container).find('.data-valueid-editor'))
-        $(container).find('.data-valueid-editor').typedInput({
-            types: ["json"],
-            default: "json"
-        });
-        $(container).find('.data-valueid-editor').typedInput('value', JSON.stringify(data.valueIds));
-        SortChecbox($(container))
-    }
-
-    function SyncEdits() {
-        const JSONs = ActiveFilter.find('.data-valueid-editor').typedInput('value');
-        const NewObject = JSON.parse(JSONs);
-
-        ActiveFilter.data('data').valueIds = NewObject
-        const Count = NewObject.length;
-        ActiveFilter.find(".data-vid-count").html(Count);
-
-        Changed = true;
-    }
-
-    function SetActiveFilter() {
-
-        if(ActiveFilter === undefined || ActiveFilter.data('data').id !== $(this).data('data').id){
-            const Items = $("#filtersets").editableList('items');
-            for (let i = 0; i < Items.length; i++) {
-                Items[i].parent().animate({height: "45px"}, 200)
-            }
-            ActiveFilter = $(this);
-            $(this).parent().animate({height: "200px"}, 200)
-        }
-    }
-
-    function SortChecbox(El) {
-        const Data = El.data('data');
-        Data.events.forEach((EV) => {
-            El.find(".data-event-" + EV).prop('checked', true);
-        })
-        if (Data.strict) {
-            El.find(".data-event-Endpoint").prop('checked', true);
-        }
-    }
-
-    function DoSave() {
-        if (Changed) {
-            this.changeDate = new Date();
-            Changed = false
-        }
-        const Items = $("#filtersets").editableList('items').sort(compare)
-        const Events = ["VALUE_UPDATED", "VALUE_NOTIFICATION", "NOTIFICATION", "GET_VALUE_RESPONSE"]
-        this.filters = [];
-
-        for (let i = 0; i < Items.length; i++) {
-
-            const El = $(Items[i])
-            const ItemData = Items[i].data('data');
-
-            ItemData.events = []
-            Events.forEach((EV) => {
-
-                if (El.find(".data-event-" + EV).prop('checked')) {
-                    ItemData.events.push(EV)
-                }
-            })
-
-            delete ItemData._id
-            ItemData.name = El.find(".data-name").val();
-            ItemData.strict = El.find(".data-event-Endpoint").prop('checked');
-            this.filters.push(ItemData);
-        }
-
-        ActiveFilter = undefined;
-    }
-
-    function AddValueIDToFilter(ValueID) {
-
-        if (ActiveFilter !== undefined) {
-            const VIDs = ActiveFilter.data('data').valueIds;
-
-            VIDs.push(ValueID);
-            const Count = VIDs.length
-
-            ActiveFilter.find(".data-vid-count").html(Count);
-            ActiveFilter.find('.data-valueid-editor').typedInput('value', JSON.stringify(VIDs));
-
-            Changed = true;
-            return true;
-        } else {
-            return false;
-        }
-
-    }
+		$(container).html(HTML);
+		const Refresh = $('<button>')
+			.addClass('ui-button')
+			.addClass('ui-corner-all')
+			.addClass('ui-widget')
+			.addClass('rightButton')
+			.html('&#8635;')
+			.click(() => {
+				SyncEdits();
+			})
+			.insertAfter($(container).find('.data-valueid-editor'));
+		$(container)
+			.find('.data-valueid-editor')
+			.typedInput({
+				types: ['json'],
+				default: 'json'
+			});
+		$(container)
+			.find('.data-valueid-editor')
+			.typedInput('value', JSON.stringify(data.valueIds));
+		SortChecbox($(container));
+	}
+
+	function SyncEdits() {
+		const JSONs = ActiveFilter.find('.data-valueid-editor').typedInput('value');
+		const NewObject = JSON.parse(JSONs);
+
+		ActiveFilter.data('data').valueIds = NewObject;
+		const Count = NewObject.length;
+		ActiveFilter.find('.data-vid-count').html(Count);
+
+		Changed = true;
+	}
+
+	function SetActiveFilter() {
+		if (
+			ActiveFilter === undefined ||
+			ActiveFilter.data('data').id !== $(this).data('data').id
+		) {
+			const Items = $('#filtersets').editableList('items');
+			for (let i = 0; i < Items.length; i++) {
+				Items[i].parent().animate({ height: '45px' }, 200);
+			}
+			ActiveFilter = $(this);
+			$(this).parent().animate({ height: '200px' }, 200);
+		}
+	}
+
+	function SortChecbox(El) {
+		const Data = El.data('data');
+		Data.events.forEach((EV) => {
+			El.find('.data-event-' + EV).prop('checked', true);
+		});
+		if (Data.strict) {
+			El.find('.data-event-Endpoint').prop('checked', true);
+		}
+	}
+
+	function DoSave() {
+		if (Changed) {
+			this.changeDate = new Date();
+			Changed = false;
+		}
+		const Items = $('#filtersets').editableList('items').sort(compare);
+		const Events = [
+			'VALUE_UPDATED',
+			'VALUE_NOTIFICATION',
+			'NOTIFICATION',
+			'GET_VALUE_RESPONSE'
+		];
+		this.filters = [];
+
+		for (let i = 0; i < Items.length; i++) {
+			const El = $(Items[i]);
+			const ItemData = Items[i].data('data');
+
+			ItemData.events = [];
+			Events.forEach((EV) => {
+				if (El.find('.data-event-' + EV).prop('checked')) {
+					ItemData.events.push(EV);
+				}
+			});
+
+			delete ItemData._id;
+			ItemData.name = El.find('.data-name').val();
+			ItemData.strict = El.find('.data-event-Endpoint').prop('checked');
+			this.filters.push(ItemData);
+		}
+
+		ActiveFilter = undefined;
+	}
+
+	function AddValueIDToFilter(ValueID) {
+		if (ActiveFilter !== undefined) {
+			const VIDs = ActiveFilter.data('data').valueIds;
+
+			VIDs.push(ValueID);
+			const Count = VIDs.length;
+
+			ActiveFilter.find('.data-vid-count').html(Count);
+			ActiveFilter.find('.data-valueid-editor').typedInput(
+				'value',
+				JSON.stringify(VIDs)
+			);
+
+			Changed = true;
+			return true;
+		} else {
+			return false;
+		}
+	}
 </script>
 
 <script type="text/x-red" data-template-name="event-filter">
 
-  <input type="hidden" id="node-input-outputs">
-   
-
-    <div class="form-row">
-        <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>
-
-    <p>
-        Add your filter sets below.<br />
-        each set of filters, becomes an output pin.<br /><br />
-        A filter set can include the event(s) to be filtered, and optionally ValueID(s)
-    </p>
-    
-    <div>
-        <ol id="filtersets" style="min-height:450px;min-width:400px"> </ol>
-    </div>
-
-   
-    
-   
-   
-   
-    
-   
-</script>
+	<input type="hidden" id="node-input-outputs">
 
-<script type="text/x-red" data-help-name="event-filter">
-    <p>A Z-Wave event filter.</p>
 
-    <p>
-        <code>Input:</code><br />
-        A <strong>payload</strong> object from the controller or device-node to be processed.<br />
+	  <div class="form-row">
+	      <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>
+
+	  <p>
+	      Add your filter sets below.<br />
+	      each set of filters, becomes an output pin.<br /><br />
+	      A filter set can include the event(s) to be filtered, and optionally ValueID(s)
+	  </p>
 
-    </p>
+	  <div>
+	      <ol id="filtersets" style="min-height:450px;min-width:400px"> </ol>
+	  </div>
+</script>
+
+<script type="text/x-red" data-help-name="event-filter">
+	<p>A Z-Wave event filter.</p>
 
-    <p>
-        <code>Output:</code><br />
-        A <strong>payload</strong> containing  the event if it had a matching rule.<br />
-        A <strong>filter</strong> object will also be provided, that denotes the matched rule.
+	<p>
+	    <code>Input:</code><br />
+	    A <strong>payload</strong> object from the controller or device-node to be processed.<br />
 
-    </p>
+	</p>
 
+	<p>
+	    <code>Output:</code><br />
+	    A <strong>payload</strong> containing  the event if it had a matching rule.<br />
+	    A <strong>filter</strong> object will also be provided, that denotes the matched rule.
 
- 
-</script>
\ No newline at end of file
+	</p>
+</script>
diff --git a/zwave-js/zwave-device.html b/zwave-js/zwave-device.html
index 649841cb..f5dbb413 100644
--- a/zwave-js/zwave-device.html
+++ b/zwave-js/zwave-device.html
@@ -1,342 +1,320 @@
 <script type="text/javascript">
-
-    RED.nodes.registerType('zwave-device',
-        {
-            category: 'ZWave JS',
-            color: 'rgb(46,145,205)',
-            defaults:
-            {
-                name: { value: "Some Z-Wave Device" },
-                filteredNodeId: { value: "All" },
-                multicast: { value: false },
-                datamode: { value: "Send/Receive" },
-                outputs: { value: 1 },
-                inputs: { value: 1 }
-
-            },
-            inputs: 1,
-            outputs: 1,
-            icon: "Node.svg",
-            label: function () {
-                return this.name;
-            },
-            oneditprepare: SortUI,
-            oneditsave: SetIO
-        });
-
-    function SetIO() {
-
-        // I/O
-        switch ($("#node-input-datamode").val()) {
-            case "Send":
-                this.outputs = 0;
-                this.inputs = 1;
-                break
-
-            case "Receive":
-                this.outputs = 1;
-                this.inputs = 0;
-                break
-
-            default:
-                this.outputs = 1;
-                this.inputs = 1;
-                break
-        }
-    }
-
-    function SortUI() {
-
-        let node = this
-
-        // Subflow Options
-        const inSubflow = !!RED.nodes.subflow(node.z)
-        if (inSubflow) {
-            $("#node-input-filteredMode").append(new Option("Subflow Variable: ZW_NODE_ID", "Var"))
-        }
-
-        // I/O
-        if (this.datamode === undefined) {
-            $("#node-input-datamode").val('Send/Receive');
-        }
-
-        $.getJSON("zwjsgetnodelist", (data) => {
-
-            let Mode = $("#node-input-filteredMode")
-            let Filter = $("#node-input-filteredNodeId")
-
-            Filter.empty()
-
-            let Locations = Object.keys(data);
-
-            Locations.forEach((L) => {
-                let Location = data[L];
-                if (Location.length > 0) {
-
-                    let OG = $("<optgroup label=\" --- " + L + " --- \">");
-                    Location.forEach((node) => {
-                        OG.append(new Option(node.id + " : " + node.name, node.id.toString()))
-                    })
-                    Filter.append(OG)
-                }
-
-            })
-
-            if (this.filteredNodeId !== undefined) {
-
-                // Single
-                if (parseInt(this.filteredNodeId) !== NaN) {
-                    Filter.css('height', '');
-                    Filter.attr('multiple', null)
-                    Filter.val(this.filteredNodeId)
-                    Filter.prop('disabled', false);
-                    Mode.val('Single')
-
-                }
-
-                // Multiple, Multicast
-                if (Array.isArray(this.filteredNodeId)) {
-                    Filter.css('height', '150px');
-                    Filter.attr('multiple', '')
-                    Filter.val(this.filteredNodeId)
-                    Filter.prop('disabled', false);
-                    if (this.multicast) {
-                        Mode.val('Multicast')
-                    }
-                    else {
-                        Mode.val('Multiple')
-                    }
-                }
-
-                // All
-                if (this.filteredNodeId === "All") {
-                    Filter.css('height', '');
-                    Filter.attr('multiple', null)
-                    Filter.append(new Option("N/A", "All"));
-                    Filter.val("All")
-                    Filter.prop('disabled', true);
-                    Mode.val('All')
-                }
-
-                // As Specifed
-                if (this.filteredNodeId === "AS") {
-                    Filter.css('height', '');
-                    Filter.attr('multiple', null)
-                    Filter.append(new Option("N/A", "AS"));
-                    Filter.val("AS")
-                    Filter.prop('disabled', true);
-                    Mode.val('Message')
-                }
-
-                // Variable
-                if (this.filteredNodeId === "Var") {
-                    Filter.css('height', '');
-                    Filter.attr('multiple', null)
-                    Filter.append(new Option("N/A", "Var"));
-                    Filter.val("Var")
-                    Filter.prop('disabled', true);
-                    Mode.val('Var')
-                }
-
-            } else {
-
-                Filter.attr('multiple', null)
-                Filter.css('height', '');
-                Filter.append(new Option("N/A", "All"));
-                Filter.val("All")
-                Filter.prop('disabled', true);
-                Mode.val('All')
-            }
-
-
-        })
-    }
-
-    function SortFilterChange() {
-
-        let Mode = $("#node-input-filteredMode")
-        let Filter = $("#node-input-filteredNodeId")
-
-        switch (Mode.val()) {
-            case "All":
-                Filter.css('height', '');
-                Filter.find('[value="Select Node"]').remove();
-                Filter.find('[value="AS"]').remove();
-                Filter.find('[value="Var"]').remove();
-                Filter.prepend(new Option("N/A", "All"));
-                Filter.val("All")
-                Filter.prop('disabled', true);
-                Filter.attr('multiple', null)
-                $("#node-input-multicast").prop('checked', false);
-                break;
-
-            case "Message":
-                Filter.css('height', '');
-                Filter.find('[value="Select Node"]').remove();
-                Filter.find('[value="All"]').remove();
-                Filter.find('[value="Var"]').remove();
-                Filter.prepend(new Option("N/A", "AS"));
-                Filter.val("AS")
-                Filter.prop('disabled', true);
-                Filter.attr('multiple', null)
-                $("#node-input-multicast").prop('checked', false);
-                break;
-
-            case "Multiple":
-                Filter.css('height', '150px');
-                Filter.find('[value="Select Node"]').remove();
-                Filter.find('[value="All"]').remove();
-                Filter.find('[value="AS"]').remove();
-                Filter.find('[value="Var"]').remove();
-                Filter.prop('disabled', false);
-                Filter.attr('multiple', '')
-                $("#node-input-multicast").prop('checked', false);
-                break;
-
-            case "Multicast":
-                Filter.css('height', '150px');
-                Filter.find('[value="Select Node"]').remove();
-                Filter.find('[value="All"]').remove();
-                Filter.find('[value="AS"]').remove();
-                Filter.find('[value="Var"]').remove();
-                Filter.prop('disabled', false);
-                Filter.attr('multiple', '')
-                $("#node-input-multicast").prop('checked', true);
-                break;
-
-            case "Var":
-                Filter.css('height', '');
-                Filter.find('[value="Select Node"]').remove();
-                Filter.find('[value="AS"]').remove();
-                Filter.prepend(new Option("N/A", "Var"));
-                Filter.val("Var")
-                Filter.prop('disabled', true);
-                Filter.attr('multiple', null)
-                $("#node-input-multicast").prop('checked', false);
-                break;
-
-            default:
-                Filter.css('height', '');
-                Filter.find('[value="All"]').remove();
-                Filter.find('[value="AS"]').remove();
-                Filter.find('[value="Var"]').remove();
-                Filter.prepend(new Option("Select Node", "Select Node"));
-                Filter.val("Select Node")
-                Filter.prop('disabled', false);
-                Filter.attr('multiple', null)
-                $("#node-input-multicast").prop('checked', false);
-                break;
-        }
-    }
-
+	RED.nodes.registerType('zwave-device', {
+		category: 'ZWave JS',
+		color: 'rgb(46,145,205)',
+		defaults: {
+			name: { value: 'Some Z-Wave Device' },
+			filteredNodeId: { value: 'All' },
+			multicast: { value: false },
+			datamode: { value: 'Send/Receive' },
+			outputs: { value: 1 },
+			inputs: { value: 1 }
+		},
+		inputs: 1,
+		outputs: 1,
+		icon: 'Node.svg',
+		label: function () {
+			return this.name;
+		},
+		oneditprepare: SortUI,
+		oneditsave: SetIO
+	});
+
+	function SetIO() {
+		// I/O
+		switch ($('#node-input-datamode').val()) {
+			case 'Send':
+				this.outputs = 0;
+				this.inputs = 1;
+				break;
+
+			case 'Receive':
+				this.outputs = 1;
+				this.inputs = 0;
+				break;
+
+			default:
+				this.outputs = 1;
+				this.inputs = 1;
+				break;
+		}
+	}
+
+	function SortUI() {
+		let node = this;
+
+		// Subflow Options
+		const inSubflow = !!RED.nodes.subflow(node.z);
+		if (inSubflow) {
+			$('#node-input-filteredMode').append(
+				new Option('Subflow Variable: ZW_NODE_ID', 'Var')
+			);
+		}
+
+		// I/O
+		if (this.datamode === undefined) {
+			$('#node-input-datamode').val('Send/Receive');
+		}
+
+		$.getJSON('zwjsgetnodelist', (data) => {
+			let Mode = $('#node-input-filteredMode');
+			let Filter = $('#node-input-filteredNodeId');
+
+			Filter.empty();
+
+			let Locations = Object.keys(data);
+
+			Locations.forEach((L) => {
+				let Location = data[L];
+				if (Location.length > 0) {
+					let OG = $('<optgroup label=" --- ' + L + ' --- ">');
+					Location.forEach((node) => {
+						OG.append(
+							new Option(node.id + ' : ' + node.name, node.id.toString())
+						);
+					});
+					Filter.append(OG);
+				}
+			});
+
+			if (this.filteredNodeId !== undefined) {
+				// Single
+				if (parseInt(this.filteredNodeId) !== NaN) {
+					Filter.css('height', '');
+					Filter.attr('multiple', null);
+					Filter.val(this.filteredNodeId);
+					Filter.prop('disabled', false);
+					Mode.val('Single');
+				}
+
+				// Multiple, Multicast
+				if (Array.isArray(this.filteredNodeId)) {
+					Filter.css('height', '150px');
+					Filter.attr('multiple', '');
+					Filter.val(this.filteredNodeId);
+					Filter.prop('disabled', false);
+					if (this.multicast) {
+						Mode.val('Multicast');
+					} else {
+						Mode.val('Multiple');
+					}
+				}
+
+				// All
+				if (this.filteredNodeId === 'All') {
+					Filter.css('height', '');
+					Filter.attr('multiple', null);
+					Filter.append(new Option('N/A', 'All'));
+					Filter.val('All');
+					Filter.prop('disabled', true);
+					Mode.val('All');
+				}
+
+				// As Specifed
+				if (this.filteredNodeId === 'AS') {
+					Filter.css('height', '');
+					Filter.attr('multiple', null);
+					Filter.append(new Option('N/A', 'AS'));
+					Filter.val('AS');
+					Filter.prop('disabled', true);
+					Mode.val('Message');
+				}
+
+				// Variable
+				if (this.filteredNodeId === 'Var') {
+					Filter.css('height', '');
+					Filter.attr('multiple', null);
+					Filter.append(new Option('N/A', 'Var'));
+					Filter.val('Var');
+					Filter.prop('disabled', true);
+					Mode.val('Var');
+				}
+			} else {
+				Filter.attr('multiple', null);
+				Filter.css('height', '');
+				Filter.append(new Option('N/A', 'All'));
+				Filter.val('All');
+				Filter.prop('disabled', true);
+				Mode.val('All');
+			}
+		});
+	}
+
+	function SortFilterChange() {
+		let Mode = $('#node-input-filteredMode');
+		let Filter = $('#node-input-filteredNodeId');
+
+		switch (Mode.val()) {
+			case 'All':
+				Filter.css('height', '');
+				Filter.find('[value="Select Node"]').remove();
+				Filter.find('[value="AS"]').remove();
+				Filter.find('[value="Var"]').remove();
+				Filter.prepend(new Option('N/A', 'All'));
+				Filter.val('All');
+				Filter.prop('disabled', true);
+				Filter.attr('multiple', null);
+				$('#node-input-multicast').prop('checked', false);
+				break;
+
+			case 'Message':
+				Filter.css('height', '');
+				Filter.find('[value="Select Node"]').remove();
+				Filter.find('[value="All"]').remove();
+				Filter.find('[value="Var"]').remove();
+				Filter.prepend(new Option('N/A', 'AS'));
+				Filter.val('AS');
+				Filter.prop('disabled', true);
+				Filter.attr('multiple', null);
+				$('#node-input-multicast').prop('checked', false);
+				break;
+
+			case 'Multiple':
+				Filter.css('height', '150px');
+				Filter.find('[value="Select Node"]').remove();
+				Filter.find('[value="All"]').remove();
+				Filter.find('[value="AS"]').remove();
+				Filter.find('[value="Var"]').remove();
+				Filter.prop('disabled', false);
+				Filter.attr('multiple', '');
+				$('#node-input-multicast').prop('checked', false);
+				break;
+
+			case 'Multicast':
+				Filter.css('height', '150px');
+				Filter.find('[value="Select Node"]').remove();
+				Filter.find('[value="All"]').remove();
+				Filter.find('[value="AS"]').remove();
+				Filter.find('[value="Var"]').remove();
+				Filter.prop('disabled', false);
+				Filter.attr('multiple', '');
+				$('#node-input-multicast').prop('checked', true);
+				break;
+
+			case 'Var':
+				Filter.css('height', '');
+				Filter.find('[value="Select Node"]').remove();
+				Filter.find('[value="AS"]').remove();
+				Filter.prepend(new Option('N/A', 'Var'));
+				Filter.val('Var');
+				Filter.prop('disabled', true);
+				Filter.attr('multiple', null);
+				$('#node-input-multicast').prop('checked', false);
+				break;
+
+			default:
+				Filter.css('height', '');
+				Filter.find('[value="All"]').remove();
+				Filter.find('[value="AS"]').remove();
+				Filter.find('[value="Var"]').remove();
+				Filter.prepend(new Option('Select Node', 'Select Node'));
+				Filter.val('Select Node');
+				Filter.prop('disabled', false);
+				Filter.attr('multiple', null);
+				$('#node-input-multicast').prop('checked', false);
+				break;
+		}
+	}
 </script>
 
 <script type="text/x-red" data-template-name="zwave-device">
 
-    <input type="checkbox" id="node-input-multicast" style="display: none">
-   
-    <p>
-        <strong>Basic settings.</strong><br />
-        Note: This node works in conjunction with the main Z-Wave JS Controller node,<br />
-        therefore, ensure it is in any one of your flows, and in a deployed state.
-    </p>
-    <div class="form-row">
-        <label for="node-input-name" style="width:130px"><i class="fa fa-pencil"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="My ZWave Node">
-    </div>
-    <div class="form-row">
-        <label for="node-input-filteredMode" style="width:130px"><i class="fa fa-pencil"></i> Mode</label>
-        <select id="node-input-filteredMode" onchange="SortFilterChange()">
-            <option value="All">All Nodes</option>
-            <option value="Multiple">Multiple Nodes</option>
-            <option value="Multicast">Multicast</option>
-            <option value="Single">Specific Node</option>
-            <option value="Message">As Specified</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-input-datamode" style="width:130px"><i class="fa fa-pencil"></i> Data Mode</label>
-        <select id="node-input-datamode">
-            <option value="Send/Receive">Send/Receive</option>
-            <option value="Send">Send</option>
-            <option value="Receive">Receive</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label for="node-input-filteredNodeId" style="width:130px"><i class="fa fa-pencil"></i> Node ID(s)</label>
-        <select id="node-input-filteredNodeId">
-        </select>
-
-    </div>
-    <hr />
-    <table>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>All Nodes</strong></td>
-            <td> - Will listen for updates on All Nodes.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>Multiple Nodes</strong></td>
-            <td> - Will listen for updates on the specified Nodes.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>Multicast</strong></td>
-            <td> - Like <strong>Multiple Nodes</strong>, but uses Multicast for outgoing payloads.<br /> - <strong>node</strong> in your outgoing payload, is ignored.<br /> - Limited to <strong>ValueAPI</strong> -> <strong>setValue</strong> and <strong>CCAPI</strong> set type commands only<br /> - Requires support from the device(s)</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>Specific Node</strong></td>
-            <td> - Will listen for updates on the specified Node.<br /> - <strong>node</strong>, in your outgoing payload, is ignored.</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>As Specified</strong></td>
-            <td> - Will listen for updates on the Node, that it last addressed a message to.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr>
-            <td style="width:70px;vertical-align:top"><strong>Subflow Variable</strong></td>
-            <td> - Like <strong>Specific Node</strong>, but Node ID is taken from a <strong>ZW_NODE_ID</strong> subflow variable.<br /> - <strong>node</strong>, in your outgoing payload, is ignored.</td>
-        </tr>
-    </table>
-    
-   
-   
-   
-    
-   
+	<input type="checkbox" id="node-input-multicast" style="display: none">
+
+	<p>
+	    <strong>Basic settings.</strong><br />
+	    Note: This node works in conjunction with the main Z-Wave JS Controller node,<br />
+	    therefore, ensure it is in any one of your flows, and in a deployed state.
+	</p>
+	<div class="form-row">
+	    <label for="node-input-name" style="width:130px"><i class="fa fa-pencil"></i> Name</label>
+	    <input type="text" id="node-input-name" placeholder="My ZWave Node">
+	</div>
+	<div class="form-row">
+	    <label for="node-input-filteredMode" style="width:130px"><i class="fa fa-pencil"></i> Mode</label>
+	    <select id="node-input-filteredMode" onchange="SortFilterChange()">
+	        <option value="All">All Nodes</option>
+	        <option value="Multiple">Multiple Nodes</option>
+	        <option value="Multicast">Multicast</option>
+	        <option value="Single">Specific Node</option>
+	        <option value="Message">As Specified</option>
+	    </select>
+	</div>
+	<div class="form-row">
+	    <label for="node-input-datamode" style="width:130px"><i class="fa fa-pencil"></i> Data Mode</label>
+	    <select id="node-input-datamode">
+	        <option value="Send/Receive">Send/Receive</option>
+	        <option value="Send">Send</option>
+	        <option value="Receive">Receive</option>
+	    </select>
+	</div>
+	<div class="form-row">
+	    <label for="node-input-filteredNodeId" style="width:130px"><i class="fa fa-pencil"></i> Node ID(s)</label>
+	    <select id="node-input-filteredNodeId">
+	    </select>
+
+	</div>
+	<hr />
+	<table>
+	    <tr>
+	        <td style="width:70px;vertical-align:top"><strong>All Nodes</strong></td>
+	        <td> - Will listen for updates on All Nodes.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
+	    </tr>
+	    <tr><td colspan="2">&nbsp;</td></tr>
+	    <tr>
+	        <td style="width:70px;vertical-align:top"><strong>Multiple Nodes</strong></td>
+	        <td> - Will listen for updates on the specified Nodes.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
+	    </tr>
+	    <tr><td colspan="2">&nbsp;</td></tr>
+	    <tr>
+	        <td style="width:70px;vertical-align:top"><strong>Multicast</strong></td>
+	        <td> - Like <strong>Multiple Nodes</strong>, but uses Multicast for outgoing payloads.<br /> - <strong>node</strong> in your outgoing payload, is ignored.<br /> - Limited to <strong>ValueAPI</strong> -> <strong>setValue</strong> and <strong>CCAPI</strong> set type commands only<br /> - Requires support from the device(s)</td>
+	    </tr>
+	    <tr><td colspan="2">&nbsp;</td></tr>
+	    <tr>
+	        <td style="width:70px;vertical-align:top"><strong>Specific Node</strong></td>
+	        <td> - Will listen for updates on the specified Node.<br /> - <strong>node</strong>, in your outgoing payload, is ignored.</td>
+	    </tr>
+	    <tr><td colspan="2">&nbsp;</td></tr>
+	    <tr>
+	        <td style="width:70px;vertical-align:top"><strong>As Specified</strong></td>
+	        <td> - Will listen for updates on the Node, that it last addressed a message to.<br /> - You will need to specify the <strong>node</strong>, in your outgoing payload.</td>
+	    </tr>
+	    <tr><td colspan="2">&nbsp;</td></tr>
+	    <tr>
+	        <td style="width:70px;vertical-align:top"><strong>Subflow Variable</strong></td>
+	        <td> - Like <strong>Specific Node</strong>, but Node ID is taken from a <strong>ZW_NODE_ID</strong> subflow variable.<br /> - <strong>node</strong>, in your outgoing payload, is ignored.</td>
+	    </tr>
+	</table>
 </script>
 
 <script type="text/x-red" data-help-name="zwave-device">
-    <p>A Z-Wave device node.</p>
-
-    <p>
-        <code>Input:</code><br />
-        A <strong>payload</strong> object containing a command to send.<br />
-        <strong>params</strong> will be dependant on the type of command you are sending.
-<pre>
-{
-   mode: "CCAPI",
-   cc: "Configuration",
-   method: "set",
-   params: [0x18,0x03,1]
-}
-</pre>
-    </p>
-
-    <p>
-        <code>Output:</code><br />
-        A <strong>payload</strong> containing an event that has occured within the zwave network.<br />
-        The contents of <strong>object</strong> is dependant on the event.
-<pre>
-{
-   event: "VALUE_UPDATED",
-   timestamp: "23-12-2020T12:23:23+000",
-   object: ...
-}
-</pre>
-    </p>
-
-
-</script>
\ No newline at end of file
+	    <p>A Z-Wave device node.</p>
+
+	    <p>
+	        <code>Input:</code><br />
+	        A <strong>payload</strong> object containing a command to send.<br />
+	        <strong>params</strong> will be dependant on the type of command you are sending.
+	<pre>
+	{
+	   mode: "CCAPI",
+	   cc: "Configuration",
+	   method: "set",
+	   params: [0x18,0x03,1]
+	}
+	</pre>
+	    </p>
+
+	    <p>
+	        <code>Output:</code><br />
+	        A <strong>payload</strong> containing an event that has occured within the zwave network.<br />
+	        The contents of <strong>object</strong> is dependant on the event.
+	<pre>
+	{
+	   event: "VALUE_UPDATED",
+	   timestamp: "23-12-2020T12:23:23+000",
+	   object: ...
+	}
+	</pre>
+	    </p>
+</script>
diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html
index 247075c0..03d212a5 100644
--- a/zwave-js/zwave-js.html
+++ b/zwave-js/zwave-js.html
@@ -2,689 +2,792 @@
 <script type="text/javascript" src="zwave-js/res/vis-network.min.js"></script>
 <script type="text/javascript" src="zwave-js/res/handlebars.min.js"></script>
 <script type="text/javascript" src="zwave-js/res/jquery-steps.min.js"></script>
-<link rel="stylesheet" href="zwave-js/res/styles.css">
-<link rel="stylesheet" href="zwave-js/res/jquery-steps.css">
-
-
+<link rel="stylesheet" href="zwave-js/res/styles.css" />
+<link rel="stylesheet" href="zwave-js/res/jquery-steps.css" />
 
 <!-- templates used for modal dialogs *-->
 
 <!--Inclusion-->
 <script id="TPL_Include" type="text/x-handlebars-template">
-    <div class="step-app" id="IncludeWizard">
-        <ul class="step-steps" style="display: none;">
-            <li data-step-target="SecurityMode"></li>
-            <li data-step-target="NIF"></li>
-            <li data-step-target="Remove"></li>
-            <li data-step-target="Classes"></li>
-            <li data-step-target="DSK"></li>
-            <li data-step-target="AddDone"></li>
-            <li data-step-target="AddDoneInsecure"></li>
-            <li data-step-target="RemoveDone"></li>
-            <li data-step-target="ReplaceSecurityMode"></li>
-            <li data-step-target="Aborted"></li>
-        </ul>
-        <div class="step-content" style="border: none;">
-            <!-- Secuity Mode-->
-            <div class="step-tab-panel" data-step="SecurityMode">
-                <br />
-                <table style="width: 100%; height: 290px;">
-                    <tr>
-                        <td style="text-align: left;width: 200px;vertical-align: top; ">
-                            <button class="ui-button ui-corner-all ui-widget SecrutiyButton" onclick="StartInclusionExclusion('Default')">Default</button><br />
-                        </td>
-                        <td style="text-align: left; vertical-align: top; ">
-                            S2 when supported, else S0 only when necessary, no encryption otherwise (recommended).<br /><br />
-                            <input type="checkbox" id="PS0">
-                            <label for="S0">Prefer S0 over no encryption</label>
-                        </td>
-                    </tr>
-                    <tr style="opacity: 0.5;">
-                        <td style="text-align: left;vertical-align: top; ">
-                            <button class="ui-button ui-corner-all ui-widget SecrutiyButton" onclick="StartInclusionExclusion('SmartStart')" disabled>Smart Start</button>
-                        </td>
-                        <td style="text-align: left;vertical-align: top; ">
-                            S2 Smart Start is not yet supported.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: left; vertical-align: top; ">
-                            <button class="ui-button ui-corner-all ui-widget SecrutiyButton" onclick="StartInclusionExclusion('S0')">S0</button>
-                        </td>
-                        <td style="text-align: left; vertical-align: top; ">
-                            Use S0 only, evan if S2 is supported (not recommended)
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: left; vertical-align: top; ">
-                            <button class="ui-button ui-corner-all ui-widget SecrutiyButton" onclick="StartInclusionExclusion('None')">No Encryption</button>
-                        </td>
-                        <td style="text-align: left; vertical-align: top; ">
-                            Add a node which will not use security (not recommended)
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="2">
-                            <hr />
-                        </td>
-                        
-                    </tr>
-                    <tr>
-                        <td style="text-align: left; vertical-align: top; ">
-                            <button class="ui-button ui-corner-all ui-widget SecrutiyButton" onclick="StartInclusionExclusion('Remove')">Remove Node</button>
-                        </td>
-                        <td style="text-align: left; vertical-align: top; ">
-                            Remove a node from your network
-                        </td>
-                    </tr>
-                </table>
-            </div>
-            <!--Wait for NIF-->
-            <div class="step-tab-panel" data-step="NIF">
-                <br />
-                <table style="width: 100%; height: 290px;">
-                    <tr>
-                        <td style="text-align: center;">
-                            <img src="zwave-js/res/Include.png" width="200px">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: center;">
-                            Place your ZWave device into 'Inclusion Mode'.<br />
-                            Please ensure your device is within close proximity to the controller.
-                            <br />
-                            <br />
-                            <span class="countdown" style="color: darkgray; font-size: 18px;"></span>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-             <!--Wait for Removal-->
-             <div class="step-tab-panel" data-step="Remove">
-                <br />
-                <table style="width: 100%; height: 290px;">
-                    <tr>
-                        <td style="text-align: center;">
-                            <img src="zwave-js/res/Exclude.png" width="200px">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: center;">
-                            Place your ZWave device into 'Exclusion Mode'.<br />
-                            Please ensure your device is within close proximity to the controller.
-                            <br />
-                            <br />
-                            <span class="countdown" style="color: darkgray; font-size: 18px;"></span>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-            <!--Requested Security Classes-->
-            <div class="step-tab-panel" data-step="Classes">
-                Select the S2 Security Classes you wish to grant!
-                <table id="S2Classes" style="width: 100%; padding: 10px;" cellpadding="5">
-
-                    <tr id="TR_2" style="opacity: 0.4;">
-                        <td style="width:130px">
-                             <input type="checkbox" id="SC_2" class="SecurityClassCB" disabled> 
-                        </td>
-                        <td>
-                            <lable class="SCLable" style="font-weight: bold;font-size: 18px;" for="SC_2">S2 Access Control</lable><br />
-                            S2 for door locks, garage doors, access control systems etc.
-                        </td>
-                    </tr>
-                    <tr  id="TR_1" style="opacity: 0.4;">
-                        <td style="width:130px">
-                             <input type="checkbox" id="SC_1" class="SecurityClassCB" disabled> 
-                        </td>
-                        <td>
-                            <lable class="SCLable" style="font-weight: bold;font-size: 18px;" for="SC_1">S2 Authenticated</lable><br />
-                            Allows the device that is being added, to be verifed that it is the corect one.
-                        </td>
-                    </tr>
-                    <tr  id="TR_0" style="opacity: 0.4;">
-                        <td style="width:130px">
-                             <input type="checkbox" id="SC_0" class="SecurityClassCB" disabled> 
-                        </td>
-                        <td>
-                            <lable class="SCLable" style="font-weight: bold;font-size: 18px;" for="SC_0">S2 Unauthenticated</lable><br />
-                            Like S2 Authenticated, but without verification that the device being added, is the correct one.
-                        </td>
-                    </tr>
-                    <tr  id="TR_7" style="opacity: 0.4;">
-                        <td style="width:130px">
-                             <input type="checkbox" id="SC_7" class="SecurityClassCB" disabled> 
-                        </td>
-                        <td>
-                            <lable class="SCLable" style="font-weight: bold;font-size: 18px;" for="SC_7">S0 Legacy</lable><br />
-                            S0 for devices that don't support S2.
-                        </td>
-                    </tr>
-
-                </table>
-                <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 10px; margin-left: 39%;" onclick="GrantSelected()">Grant Selected</button>
-                <br />
-                <br />
-                <div class="countdown" style="color: darkgray; font-size: 18px; text-align: center;"></div>
-            </div>
-             <!--DSK-->
-            <div class="step-tab-panel" data-step="DSK">
-                <br />
-                Please enter the pin code as found on the device packaging/user manual, Please also verify the DSK matches that of the device you're adding.
-                <br />
-                <table id="S2DSK" style="width: 100%; padding: 10px; margin-top: 100px;" cellpadding="5">
-                    <tr>
-                        <td style="text-align: center;">PIN</td>
-                        <td style="text-align: center;">DSK</td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: center;"><input type="text" id="SC_DSK" style="width: 70px;text-align: center;"></td>
-                        <td style="text-align: center;" id="DSK_Previw"></td>
-                    </tr>
-                    
-                  
-                </table>
-                <button class="ui-button ui-corner-all ui-widget SecrutiyButton" style="margin-top: 20px; margin-left: 39%;" onclick="ValidateDSK()">Verify</button>
-                <br />
-                <br />
-                <div class="countdown" style="color: darkgray; font-size: 18px; text-align: center;"></div>
-            </div>
-            <!--Add Done-->
-            <div class="step-tab-panel" data-step="AddDone">
-                <br />
-                <table style="width: 100%; height: 290px;">
-                    <tr>
-                        <td style="text-align: center;">
-                            <img src="zwave-js/res/NodeAdded.png" width="200px">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: center;">
-                            Your device has been added to the network. It will now be interviewed.<br />
-                            Please ensure it remains in close proximity, until the interview completes.</td>
-                    </tr>
-                </table>
-            </div>
-             <!--Add Done Insecure-->
-             <div class="step-tab-panel" data-step="AddDoneInsecure">
-                <br />
-                <table style="width: 100%; height: 290px;">
-                    <tr>
-                        <td style="text-align: center;">
-                            <img src="zwave-js/res/NodeAddedInsecure.png" width="200px">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: center;">
-                            Your device has been added to the network,<br />
-                            but the requested security class couldn't be achieved,<br /><br />
-                            It will now be interviewed.<br>Please ensure it remains in close proximity, until the interview completes.
-                        </td>
-                    </tr>
-                </table>
-            </div>
-             <!--Remove Done-->
-             <div class="step-tab-panel" data-step="RemoveDone">
-                <br />
-                <table style="width: 100%; height: 290px;">
-                    <tr>
-                        <td style="text-align: center;">
-                            <img src="zwave-js/res/NodeRemoved.png" width="200px">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: center;">Your device has been removed from the network.</td>
-                    </tr>
-                </table>
-            </div>
-            <!--Replace Mode-->
-            <div class="step-tab-panel" data-step="ReplaceSecurityMode">
-                <br />
-                <table style="width: 100%; height: 160px;">
-                    <tr>
-                        <td style="text-align: left;width: 200px;vertical-align: top; ">
-                            <button class="ui-button ui-corner-all ui-widget SecrutiyButton" onclick="StartReplace('S2')">S2</button>
-                        </td>
-                        <td style="text-align: left; vertical-align: top; ">
-                            The replacement node will use S2 Security. (Reccomended)
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: left;width: 200px;vertical-align: top; ">
-                            <button class="ui-button ui-corner-all ui-widget SecrutiyButton" onclick="StartReplace('S0')">S0</button>
-                        </td>
-                        <td style="text-align: left; vertical-align: top; ">
-                            The replacement node will use S0 Security. (Not Reccomended)
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: left;width: 200px;vertical-align: top; ">
-                            <button class="ui-button ui-corner-all ui-widget SecrutiyButton" onclick="StartReplace('None')">No Encryption</button>
-                        </td>
-                        <td style="text-align: left; vertical-align: top; ">
-                            The replacement node will not use Security. (Not Reccomended)
-                        </td>
-                    </tr>
-                </table>
-            </div>
-              <!--Aborted-->
-              <div class="step-tab-panel" data-step="Aborted">
-                <br />
-                <table style="width: 100%; height: 290px;">
-                    <tr>
-                        <td style="text-align: center;">
-                            <img src="zwave-js/res/NodeAddedInsecure.png" width="200px">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="text-align: center;">The inclusion routine was aborted.<br />
-                            The device may or may not have been added to your network.</td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-    </div>
+	<div class='step-app' id='IncludeWizard'>
+		<ul class='step-steps' style='display: none;'>
+			<li data-step-target='SecurityMode'></li>
+			<li data-step-target='NIF'></li>
+			<li data-step-target='Remove'></li>
+			<li data-step-target='Classes'></li>
+			<li data-step-target='DSK'></li>
+			<li data-step-target='AddDone'></li>
+			<li data-step-target='AddDoneInsecure'></li>
+			<li data-step-target='RemoveDone'></li>
+			<li data-step-target='ReplaceSecurityMode'></li>
+			<li data-step-target='Aborted'></li>
+		</ul>
+		<div class='step-content' style='border: none;'>
+			<!-- Secuity Mode-->
+			<div class='step-tab-panel' data-step='SecurityMode'>
+				<br />
+				<table style='width: 100%; height: 290px;'>
+					<tr>
+						<td style='text-align: left;width: 200px;vertical-align: top; '>
+							<button
+								class='ui-button ui-corner-all ui-widget SecrutiyButton'
+								onclick="StartInclusionExclusion('Default')"
+							>Default</button><br />
+						</td>
+						<td style='text-align: left; vertical-align: top; '>
+							S2 when supported, else S0 only when necessary, no encryption
+							otherwise (recommended).<br /><br />
+							<input type='checkbox' id='PS0' />
+							<label for='S0'>Prefer S0 over no encryption</label>
+						</td>
+					</tr>
+					<tr style='opacity: 0.5;'>
+						<td style='text-align: left;vertical-align: top; '>
+							<button
+								class='ui-button ui-corner-all ui-widget SecrutiyButton'
+								onclick="StartInclusionExclusion('SmartStart')"
+								disabled
+							>Smart Start</button>
+						</td>
+						<td style='text-align: left;vertical-align: top; '>
+							S2 Smart Start is not yet supported.
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: left; vertical-align: top; '>
+							<button
+								class='ui-button ui-corner-all ui-widget SecrutiyButton'
+								onclick="StartInclusionExclusion('S0')"
+							>S0</button>
+						</td>
+						<td style='text-align: left; vertical-align: top; '>
+							Use S0 only, evan if S2 is supported (not recommended)
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: left; vertical-align: top; '>
+							<button
+								class='ui-button ui-corner-all ui-widget SecrutiyButton'
+								onclick="StartInclusionExclusion('None')"
+							>No Encryption</button>
+						</td>
+						<td style='text-align: left; vertical-align: top; '>
+							Add a node which will not use security (not recommended)
+						</td>
+					</tr>
+					<tr>
+						<td colspan='2'>
+							<hr />
+						</td>
+
+					</tr>
+					<tr>
+						<td style='text-align: left; vertical-align: top; '>
+							<button
+								class='ui-button ui-corner-all ui-widget SecrutiyButton'
+								onclick="StartInclusionExclusion('Remove')"
+							>Remove Node</button>
+						</td>
+						<td style='text-align: left; vertical-align: top; '>
+							Remove a node from your network
+						</td>
+					</tr>
+				</table>
+			</div>
+			<!--Wait for NIF-->
+			<div class='step-tab-panel' data-step='NIF'>
+				<br />
+				<table style='width: 100%; height: 290px;'>
+					<tr>
+						<td style='text-align: center;'>
+							<img src='zwave-js/res/Include.png' width='200px' />
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: center;'>
+							Place your ZWave device into 'Inclusion Mode'.<br />
+							Please ensure your device is within close proximity to the
+							controller.
+							<br />
+							<br />
+							<span
+								class='countdown'
+								style='color: darkgray; font-size: 18px;'
+							></span>
+						</td>
+					</tr>
+				</table>
+			</div>
+			<!--Wait for Removal-->
+			<div class='step-tab-panel' data-step='Remove'>
+				<br />
+				<table style='width: 100%; height: 290px;'>
+					<tr>
+						<td style='text-align: center;'>
+							<img src='zwave-js/res/Exclude.png' width='200px' />
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: center;'>
+							Place your ZWave device into 'Exclusion Mode'.<br />
+							Please ensure your device is within close proximity to the
+							controller.
+							<br />
+							<br />
+							<span
+								class='countdown'
+								style='color: darkgray; font-size: 18px;'
+							></span>
+						</td>
+					</tr>
+				</table>
+			</div>
+			<!--Requested Security Classes-->
+			<div class='step-tab-panel' data-step='Classes'>
+				Select the S2 Security Classes you wish to grant!
+				<table
+					id='S2Classes'
+					style='width: 100%; padding: 10px;'
+					cellpadding='5'
+				>
+
+					<tr id='TR_2' style='opacity: 0.4;'>
+						<td style='width:130px'>
+							<input
+								type='checkbox'
+								id='SC_2'
+								class='SecurityClassCB'
+								disabled
+							/>
+						</td>
+						<td>
+							<lable
+								class='SCLable'
+								style='font-weight: bold;font-size: 18px;'
+								for='SC_2'
+							>S2 Access Control</lable><br />
+							S2 for door locks, garage doors, access control systems etc.
+						</td>
+					</tr>
+					<tr id='TR_1' style='opacity: 0.4;'>
+						<td style='width:130px'>
+							<input
+								type='checkbox'
+								id='SC_1'
+								class='SecurityClassCB'
+								disabled
+							/>
+						</td>
+						<td>
+							<lable
+								class='SCLable'
+								style='font-weight: bold;font-size: 18px;'
+								for='SC_1'
+							>S2 Authenticated</lable><br />
+							Allows the device that is being added, to be verifed that it is
+							the corect one.
+						</td>
+					</tr>
+					<tr id='TR_0' style='opacity: 0.4;'>
+						<td style='width:130px'>
+							<input
+								type='checkbox'
+								id='SC_0'
+								class='SecurityClassCB'
+								disabled
+							/>
+						</td>
+						<td>
+							<lable
+								class='SCLable'
+								style='font-weight: bold;font-size: 18px;'
+								for='SC_0'
+							>S2 Unauthenticated</lable><br />
+							Like S2 Authenticated, but without verification that the device
+							being added, is the correct one.
+						</td>
+					</tr>
+					<tr id='TR_7' style='opacity: 0.4;'>
+						<td style='width:130px'>
+							<input
+								type='checkbox'
+								id='SC_7'
+								class='SecurityClassCB'
+								disabled
+							/>
+						</td>
+						<td>
+							<lable
+								class='SCLable'
+								style='font-weight: bold;font-size: 18px;'
+								for='SC_7'
+							>S0 Legacy</lable><br />
+							S0 for devices that don't support S2.
+						</td>
+					</tr>
+
+				</table>
+				<button
+					class='ui-button ui-corner-all ui-widget SecrutiyButton'
+					style='margin-top: 10px; margin-left: 39%;'
+					onclick='GrantSelected()'
+				>Grant Selected</button>
+				<br />
+				<br />
+				<div
+					class='countdown'
+					style='color: darkgray; font-size: 18px; text-align: center;'
+				></div>
+			</div>
+			<!--DSK-->
+			<div class='step-tab-panel' data-step='DSK'>
+				<br />
+				Please enter the pin code as found on the device packaging/user manual,
+				Please also verify the DSK matches that of the device you're adding.
+				<br />
+				<table
+					id='S2DSK'
+					style='width: 100%; padding: 10px; margin-top: 100px;'
+					cellpadding='5'
+				>
+					<tr>
+						<td style='text-align: center;'>PIN</td>
+						<td style='text-align: center;'>DSK</td>
+					</tr>
+					<tr>
+						<td style='text-align: center;'><input
+								type='text'
+								id='SC_DSK'
+								style='width: 70px;text-align: center;'
+							/></td>
+						<td style='text-align: center;' id='DSK_Previw'></td>
+					</tr>
+
+				</table>
+				<button
+					class='ui-button ui-corner-all ui-widget SecrutiyButton'
+					style='margin-top: 20px; margin-left: 39%;'
+					onclick='ValidateDSK()'
+				>Verify</button>
+				<br />
+				<br />
+				<div
+					class='countdown'
+					style='color: darkgray; font-size: 18px; text-align: center;'
+				></div>
+			</div>
+			<!--Add Done-->
+			<div class='step-tab-panel' data-step='AddDone'>
+				<br />
+				<table style='width: 100%; height: 290px;'>
+					<tr>
+						<td style='text-align: center;'>
+							<img src='zwave-js/res/NodeAdded.png' width='200px' />
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: center;'>
+							Your device has been added to the network. It will now be
+							interviewed.<br />
+							Please ensure it remains in close proximity, until the interview
+							completes.</td>
+					</tr>
+				</table>
+			</div>
+			<!--Add Done Insecure-->
+			<div class='step-tab-panel' data-step='AddDoneInsecure'>
+				<br />
+				<table style='width: 100%; height: 290px;'>
+					<tr>
+						<td style='text-align: center;'>
+							<img src='zwave-js/res/NodeAddedInsecure.png' width='200px' />
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: center;'>
+							Your device has been added to the network,<br />
+							but the requested security class couldn't be achieved,<br /><br />
+							It will now be interviewed.<br />Please ensure it remains in close
+							proximity, until the interview completes.
+						</td>
+					</tr>
+				</table>
+			</div>
+			<!--Remove Done-->
+			<div class='step-tab-panel' data-step='RemoveDone'>
+				<br />
+				<table style='width: 100%; height: 290px;'>
+					<tr>
+						<td style='text-align: center;'>
+							<img src='zwave-js/res/NodeRemoved.png' width='200px' />
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: center;'>Your device has been removed from
+							the network.</td>
+					</tr>
+				</table>
+			</div>
+			<!--Replace Mode-->
+			<div class='step-tab-panel' data-step='ReplaceSecurityMode'>
+				<br />
+				<table style='width: 100%; height: 160px;'>
+					<tr>
+						<td style='text-align: left;width: 200px;vertical-align: top; '>
+							<button
+								class='ui-button ui-corner-all ui-widget SecrutiyButton'
+								onclick="StartReplace('S2')"
+							>S2</button>
+						</td>
+						<td style='text-align: left; vertical-align: top; '>
+							The replacement node will use S2 Security. (Reccomended)
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: left;width: 200px;vertical-align: top; '>
+							<button
+								class='ui-button ui-corner-all ui-widget SecrutiyButton'
+								onclick="StartReplace('S0')"
+							>S0</button>
+						</td>
+						<td style='text-align: left; vertical-align: top; '>
+							The replacement node will use S0 Security. (Not Reccomended)
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: left;width: 200px;vertical-align: top; '>
+							<button
+								class='ui-button ui-corner-all ui-widget SecrutiyButton'
+								onclick="StartReplace('None')"
+							>No Encryption</button>
+						</td>
+						<td style='text-align: left; vertical-align: top; '>
+							The replacement node will not use Security. (Not Reccomended)
+						</td>
+					</tr>
+				</table>
+			</div>
+			<!--Aborted-->
+			<div class='step-tab-panel' data-step='Aborted'>
+				<br />
+				<table style='width: 100%; height: 290px;'>
+					<tr>
+						<td style='text-align: center;'>
+							<img src='zwave-js/res/NodeAddedInsecure.png' width='200px' />
+						</td>
+					</tr>
+					<tr>
+						<td style='text-align: center;'>The inclusion routine was aborted.<br
+							/>
+							The device may or may not have been added to your network.</td>
+					</tr>
+				</table>
+			</div>
+		</div>
+	</div>
 </script>
 
 <!--Associations-->
 <script id="TPL_Associations" type="text/x-handlebars-template">
-
-    <table style="margin-bottom: 20px;">
-        <tbody>
-            <tr>
-                <td>Endpoint</td>
-                <td>
-                    <select id="NODE_EP" style="width: 150px;">
-                        <option>Select Endpoint...</option>
-                        {{#endpoints}}
-                          <option value="{{Endpoint}}">{{Endpoint}}</option>
-                        {{/endpoints}}
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>Association Group</td>
-                <td>
-                    <select id="NODE_G" style="width: 150px;">
-                        <option>Select Group...</option>
-                    </select>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-
-
-    Target Node(s) for selected Endpoint &amp; Association Group
-    <table id="zwave-js-associations-table" cellpadding="5" cellspacing="0">
-        <tr>
-            <td style="width: 33%;">Node ID</td>
-            <td style="width: 33%;">Endpoint</td>
-            <td style="width: 33%;">&nbsp;</td>
-        </tr>
-        
-        
-    </table>
-    <div style="text-align: right;">
-        <input id="AMAddBTN" class="ui-button ui-corner-all ui-widget" type="button" value="Add">
-    </div>
-
+	<table style='margin-bottom: 20px;'>
+		<tbody>
+			<tr>
+				<td>Endpoint</td>
+				<td>
+					<select id='NODE_EP' style='width: 150px;'>
+						<option>Select Endpoint...</option>
+						{{#endpoints}}
+							<option value='{{Endpoint}}'>{{Endpoint}}</option>
+						{{/endpoints}}
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td>Association Group</td>
+				<td>
+					<select id='NODE_G' style='width: 150px;'>
+						<option>Select Group...</option>
+					</select>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	Target Node(s) for selected Endpoint &amp; Association Group
+	<table id='zwave-js-associations-table' cellpadding='5' cellspacing='0'>
+		<tr>
+			<td style='width: 33%;'>Node ID</td>
+			<td style='width: 33%;'>Endpoint</td>
+			<td style='width: 33%;'>&nbsp;</td>
+		</tr>
+
+	</table>
+	<div style='text-align: right;'>
+		<input
+			id='AMAddBTN'
+			class='ui-button ui-corner-all ui-widget'
+			type='button'
+			value='Add'
+		/>
+	</div>
 </script>
 
 <!--Map-->
 <script id="TPL_Map" type="text/x-handlebars-template">
-
-    <div class="zwave-js-selected-node-map-info">
-        <table style="width:100%">
-            <tr>
-                <td style="width:120px; vertical-align:top">Node ID</td>
-                <td id="NM_ID">No Node Selected</td>
-            </tr>
-            <tr>
-                <td style="width:120px; vertical-align:top">Name</td>
-                <td id="NM_Name">&nbsp;</td>
-            </tr>
-            <tr>
-                <td style="width:120px; vertical-align:top">Location</td>
-                <td id="NM_LOC">&nbsp;</td>
-            </tr>
-            <tr>
-                <td style="width:120px; vertical-align:top">Manufacturer/Model</td>
-                <td id="NM_MOD">&nbsp;</td>
-            </tr>
-            <tr>
-                <td style="width:120px; vertical-align:top">Status</td>
-                <td id="NM_Status">&nbsp;</td>
-            </tr>
-            <tr style="word-break: break-all;">
-                <td style="width:120px; vertical-align:top">Route Slaves</td>
-                <td id="NM_Slaves">&nbsp;</td>
-            </tr>
-            <tr style="word-break: break-all;">
-                <td style="width:120px; vertical-align:top">Route Clients</td>
-                <td id="NM_Clients">&nbsp;</td>
-            </tr>
-
-        </table>
-        <div id="zwave-js-selected-node-map-info-stats" style="position: absolute;bottom: 5px;width:100%;text-align: center;">RX:0, <span style="color: red;">RXD:0</span>, TX:0, <span style="color: red;">TXD:0</span>, <span style="color: red;">TO:0</span></div>
-    </div>
-
-    <div id="Network" style="width: 100%; height: 100%;">
-    </div>
-
+	<div class='zwave-js-selected-node-map-info'>
+		<table style='width:100%'>
+			<tr>
+				<td style='width:120px; vertical-align:top'>Node ID</td>
+				<td id='NM_ID'>No Node Selected</td>
+			</tr>
+			<tr>
+				<td style='width:120px; vertical-align:top'>Name</td>
+				<td id='NM_Name'>&nbsp;</td>
+			</tr>
+			<tr>
+				<td style='width:120px; vertical-align:top'>Location</td>
+				<td id='NM_LOC'>&nbsp;</td>
+			</tr>
+			<tr>
+				<td style='width:120px; vertical-align:top'>Manufacturer/Model</td>
+				<td id='NM_MOD'>&nbsp;</td>
+			</tr>
+			<tr>
+				<td style='width:120px; vertical-align:top'>Status</td>
+				<td id='NM_Status'>&nbsp;</td>
+			</tr>
+			<tr style='word-break: break-all;'>
+				<td style='width:120px; vertical-align:top'>Route Slaves</td>
+				<td id='NM_Slaves'>&nbsp;</td>
+			</tr>
+			<tr style='word-break: break-all;'>
+				<td style='width:120px; vertical-align:top'>Route Clients</td>
+				<td id='NM_Clients'>&nbsp;</td>
+			</tr>
+
+		</table>
+		<div
+			id='zwave-js-selected-node-map-info-stats'
+			style='position: absolute;bottom: 5px;width:100%;text-align: center;'
+		>RX:0,
+			<span style='color: red;'>RXD:0</span>, TX:0,
+			<span style='color: red;'>TXD:0</span>,
+			<span style='color: red;'>TO:0</span></div>
+	</div>
+
+	<div id='Network' style='width: 100%; height: 100%;'>
+	</div>
 </script>
 
 <!--Firmware-->
 <script id="TPL_Firmware" type="text/x-handlebars-template">
-
-    <div style="border: 1px solid red; margin-top: 10px; width: 650px; margin-left: auto; margin-right: auto; padding: 5px;">
-        This software is provided as-is. The developer(s) of <strong>node-red-contrib-zwave-js</strong> or any libraries it<br>
-        uses, are not responsible for any damage that may result from your attempt to upgrade the firmware.<br><br>You are performing this upgrade, soley at your own risk.
-    </div>
-
-    <div id="FWForm" style="width: 650px; margin-left: auto; margin-right: auto; margin-top: 10px; padding: 5px;">
-        <table>
-            <tbody>
-                <tr>
-                    <td>Target Node</td>
-                    <td>
-                        <select id="NODE_FW">
-                         <option>Select Node...</option>
-                            {{#each nodes}}
-                              {{#if this.length}}
-                                   <optgroup label=" --- {{@key}} --- ">
-                                       {{#each this}}
-                                          <option value="{{id}}">{{id}} - {{name}}</option>
-                                       {{/each}}
-                                   </optgroup>
-                              {{/if}}
-                            {{/each}}
-                        </select>
-                    </td>
-                    </tr>
-                    <tr>
-                        <td>Firmware Update Target</td>
-                        <td>
-                            <input type="number" value="0" min="0" max="2" id="TARGET_FW">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Firmware Update File</td>
-                        <td><input type="file" id="FILE_FW"></td>
-                    </tr>
-                </tbody>
-            </table>
-        </div> 
+	<div
+		style='border: 1px solid red; margin-top: 10px; width: 650px; margin-left: auto; margin-right: auto; padding: 5px;'
+	>
+		This software is provided as-is. The developer(s) of
+		<strong>node-red-contrib-zwave-js</strong>
+		or any libraries it<br />
+		uses, are not responsible for any damage that may result from your attempt
+		to upgrade the firmware.<br /><br />You are performing this upgrade, soley
+		at your own risk.
+	</div>
+
+	<div
+		id='FWForm'
+		style='width: 650px; margin-left: auto; margin-right: auto; margin-top: 10px; padding: 5px;'
+	>
+		<table>
+			<tbody>
+				<tr>
+					<td>Target Node</td>
+					<td>
+						<select id='NODE_FW'>
+							<option>Select Node...</option>
+							{{#each nodes}}
+								{{#if this.length}}
+									<optgroup label=' --- {{@key}} --- '>
+										{{#each this}}
+											<option value='{{id}}'>{{id}} - {{name}}</option>
+										{{/each}}
+									</optgroup>
+								{{/if}}
+							{{/each}}
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td>Firmware Update Target</td>
+					<td>
+						<input type='number' value='0' min='0' max='2' id='TARGET_FW' />
+					</td>
+				</tr>
+				<tr>
+					<td>Firmware Update File</td>
+					<td><input type='file' id='FILE_FW' /></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
 </script>
 
 <script type="text/javascript">
-
-    RED.nodes.registerType('zwave-js',
-        {
-            category: 'ZWave JS',
-            color: 'rgb(46,145,205)',
-            defaults:
-            {
-                serialPort: { value: undefined },
-                name: { value: "Z-Wave JS Controller" },
-                encryptionKey: { value: undefined },
-                encryptionKeyS2U: { value: undefined },
-                encryptionKeyS2A: { value: undefined },
-                encryptionKeyS2AC: { value: undefined },
-                ackTimeout: { value: undefined },
-                controllerTimeout: { value: undefined },
-                sendResponseTimeout: { value: undefined },
-                logLevelPin: { value: "none" },
-                logLevel: { value: "none" },
-                logFile: { value: undefined },
-                logNodeFilter: { value: undefined },
-                sendUsageStatistics: { value: true },
-                valueCacheDiskThrottle: { value: "normal" },
-                customConfigPath: { value: undefined },
-                outputs: { value: 1 },
-            },
-            inputs: 1,
-            outputs: 1,
-            icon: "ZWJS.svg",
-            label: function () {
-                return this.name;
-            },
-            onpaletteadd: ZwaveJsUI.init,
-            oneditprepare: SortUI,
-            oneditsave: SortIO
-        });
-
-
-    function SortIO(){
-        if($("#node-input-logLevelPin").val() !== 'none'){
-            this.outputs = 2
-        }
-        else{
-            this.outputs = 1
-        }
-    }
-
-    function SortUI() {
-
-        // 5.0 -> 5.1
-        if(this.logLevelPin === undefined){
-            $("#node-input-logLevelPin").val('none');
-        }
-
-        // 3.3 -> 3.4 
-        if (this.valueCacheDiskThrottle === undefined) {
-            $("#node-input-valueCacheDiskThrottle").val('normal');
-        }
-
-        $.getJSON("zwjsgetports", (data) => {
-
-            $("#node-input-serialPort").empty()
-            $("#node-input-serialPort").append(new Option("Select Port", "Select Port"));
-            $("#node-input-serialPort").append(new Option("Custom Path...", "Custom Path..."));
-
-            $("#node-input-serialPort").append(
-                data.map(function (option) {
-                    return new Option(option, option);
-                })
-            )
-
-            if (this.serialPort !== undefined) {
-
-                if (data.indexOf(this.serialPort) < 0) {
-                    $("#node-input-serialPort").append(new Option(this.serialPort, this.serialPort));
-                }
-
-                $("#node-input-serialPort").val(this.serialPort)
-
-            } else {
-                $("#node-input-serialPort").val("Select Port")
-            }
-
-            $("#node-input-serialPort").change(function (event) {
-
-                var Value = event.target.value;
-
-                if (Value === "Custom Path...") {
-
-                    Value = prompt("Enter custom serial path.")
-                    if (Value !== null) {
-                        Value = Value.trim()
-                        $("#node-input-serialPort").append(new Option(Value, Value));
-                        $("#node-input-serialPort").val(Value)
-                    }
-                }
-            });
-        });
-
-        $.getJSON("zwjsgetversion", function (data) {
-            $("#MOD_Version").val(data.moduleversion)
-            $("#ZWJS_Version").val(data.zwjsversion)
-        })
-    }
-
-
-
+	RED.nodes.registerType('zwave-js', {
+		category: 'ZWave JS',
+		color: 'rgb(46,145,205)',
+		defaults: {
+			serialPort: { value: undefined },
+			name: { value: 'Z-Wave JS Controller' },
+			encryptionKey: { value: undefined },
+			encryptionKeyS2U: { value: undefined },
+			encryptionKeyS2A: { value: undefined },
+			encryptionKeyS2AC: { value: undefined },
+			ackTimeout: { value: undefined },
+			controllerTimeout: { value: undefined },
+			sendResponseTimeout: { value: undefined },
+			logLevelPin: { value: 'none' },
+			logLevel: { value: 'none' },
+			logFile: { value: undefined },
+			logNodeFilter: { value: undefined },
+			sendUsageStatistics: { value: true },
+			valueCacheDiskThrottle: { value: 'normal' },
+			customConfigPath: { value: undefined },
+			outputs: { value: 1 }
+		},
+		inputs: 1,
+		outputs: 1,
+		icon: 'ZWJS.svg',
+		label: function () {
+			return this.name;
+		},
+		onpaletteadd: ZwaveJsUI.init,
+		oneditprepare: SortUI,
+		oneditsave: SortIO
+	});
+
+	function SortIO() {
+		if ($('#node-input-logLevelPin').val() !== 'none') {
+			this.outputs = 2;
+		} else {
+			this.outputs = 1;
+		}
+	}
+
+	function SortUI() {
+		// 5.0 -> 5.1
+		if (this.logLevelPin === undefined) {
+			$('#node-input-logLevelPin').val('none');
+		}
+
+		// 3.3 -> 3.4
+		if (this.valueCacheDiskThrottle === undefined) {
+			$('#node-input-valueCacheDiskThrottle').val('normal');
+		}
+
+		$.getJSON('zwjsgetports', (data) => {
+			$('#node-input-serialPort').empty();
+			$('#node-input-serialPort').append(
+				new Option('Select Port', 'Select Port')
+			);
+			$('#node-input-serialPort').append(
+				new Option('Custom Path...', 'Custom Path...')
+			);
+
+			$('#node-input-serialPort').append(
+				data.map(function (option) {
+					return new Option(option, option);
+				})
+			);
+
+			if (this.serialPort !== undefined) {
+				if (data.indexOf(this.serialPort) < 0) {
+					$('#node-input-serialPort').append(
+						new Option(this.serialPort, this.serialPort)
+					);
+				}
+
+				$('#node-input-serialPort').val(this.serialPort);
+			} else {
+				$('#node-input-serialPort').val('Select Port');
+			}
+
+			$('#node-input-serialPort').change(function (event) {
+				var Value = event.target.value;
+
+				if (Value === 'Custom Path...') {
+					Value = prompt('Enter custom serial path.');
+					if (Value !== null) {
+						Value = Value.trim();
+						$('#node-input-serialPort').append(new Option(Value, Value));
+						$('#node-input-serialPort').val(Value);
+					}
+				}
+			});
+		});
+
+		$.getJSON('zwjsgetversion', function (data) {
+			$('#MOD_Version').val(data.moduleversion);
+			$('#ZWJS_Version').val(data.zwjsversion);
+		});
+	}
 </script>
 
 <script type="text/x-red" data-template-name="zwave-js">
 
-    <p>
-        <strong>Z-Wave JS Analytics Reporting.</strong><br />
-        Sending Analytics, helps the Z-Wave JS project focus on areas that are most prevalent.<br />
-        No personal or personally identifiable information is collected, this includes internet addressable values.<br /><br />
-        To read about the information collected, click <a target="_blank" href="https://zwave-js.github.io/node-zwave-js/#/data-collection/user-disclosure">HERE</a>. 
-        
-    </p>
-    <div class="form-row">
-        <label  for="node-input-sendUsageStatistics" style="width:130px"><i class="fa fa-pencil"></i> Send Analytics</label>
-        <input type="checkbox" id="node-input-sendUsageStatistics">
-    </div>
-
-    <p>
-        <strong>Basic settings.</strong>
-    </p>
-    <div class="form-row">
-        <label for="node-input-name" style="width:130px"><i class="fa fa-pencil"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Zwave Controller">
-    </div>
-    <div class="form-row">
-        <label for="node-input-serialPort" style="width:130px"><i class="fa fa-pencil"></i> Serial Port</label>
-        <select id="node-input-serialPort">
-        </select>
-
-    </div>
-    <p>
-        <strong>Encryption Keys</strong>
-    </p>
-    <div class="form-row">
-        <label for="node-input-encryptionKey" style="width:130px"><i class="fa fa-pencil"></i> S0</label>
-        <input type="text" id="node-input-encryptionKey" placeholder="[0x01,0x02,..] or plain text">
-    </div>
-    <div class="form-row">
-        <label for="node-input-encryptionKeyS2U" style="width:130px"><i class="fa fa-pencil"></i> S2 Unauth</label>
-        <input type="text" id="node-input-encryptionKeyS2U" placeholder="[0x01,0x02,..] or plain text">
-    </div>
-    <div class="form-row">
-        <label for="node-input-encryptionKeyS2A" style="width:130px"><i class="fa fa-pencil"></i> S2 Auth</label>
-        <input type="text" id="node-input-encryptionKeyS2A" placeholder="[0x01,0x02,..] or plain text">
-    </div>
-    <div class="form-row">
-        <label for="node-input-encryptionKeyS2AC" style="width:130px"><i class="fa fa-pencil"></i> S2 Access Ctrl</label>
-        <input type="text" id="node-input-encryptionKeyS2AC" placeholder="[0x01,0x02,..] or plain text">
-    </div>
-    <br />
-    <p>
-        <strong>Timeouts (ms).</strong>
-    </p>
-    <div class="form-row">
-        <label  for="node-input-ackTimeout" style="width:130px"><i class="fa fa-pencil"></i> ACK</label>
-        <input type="text" id="node-input-ackTimeout" placeholder="Use Default">
-    </div>
-    <div class="form-row">
-        <label  for="node-input-controllerTimeout" style="width:130px"><i class="fa fa-pencil"></i> Controller</label>
-        <input type="text" id="node-input-controllerTimeout" placeholder="Use Default">
-    </div>
-    <div class="form-row">
-        <label  for="node-input-sendResponseTimeout" style="width:130px"><i class="fa fa-pencil"></i> Req -> Res</label>
-        <input type="text" id="node-input-sendResponseTimeout" placeholder="Use Default">
-    </div>
-    <br />
-    <p>
-        <strong>Z-Wave JS Logging</strong>
-    </p>
-    <div class="form-row">
-        <label  for="node-input-logLevelPin" style="width:130px"><i class="fa fa-pencil"></i> Level (Pin 2)</label>
-        <select id="node-input-logLevelPin">
-            <option value="none">Logging Disabled</option>
-            <option value="error">Error</option>
-            <option value="warn">Warn</option>
-            <option value="info">Info</option>
-            <option value="verbose">Verbose</option>
-            <option value="debug">Debug</option>
-            <option value="silly">Silly</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label  for="node-input-logLevel" style="width:130px"><i class="fa fa-pencil"></i> Level (File)</label>
-        <select id="node-input-logLevel">
-            <option value="none">Logging Disabled</option>
-            <option value="error">Error</option>
-            <option value="warn">Warn</option>
-            <option value="info">Info</option>
-            <option value="verbose">Verbose</option>
-            <option value="debug">Debug</option>
-            <option value="silly">Silly</option>
-        </select>
-    </div>
-    <div class="form-row">
-        <label  for="node-input-logFile" style="width:130px"><i class="fa fa-pencil"></i> Log File</label>
-        <input type="text" id="node-input-logFile" placeholder="zwave-js-log.txt">
-    </div>
-    <div class="form-row">
-        <label  for="node-input-logFile" style="width:130px"><i class="fa fa-pencil"></i> Node Filter</label>
-        <input type="text" id="node-input-logNodeFilter" placeholder="2,5,24">
-    </div>
-    <br />
-    <p>
-        <strong>Advanced Driver Settings.</strong>
-    </p>
-    <div class="form-row">
-        <label  for="node-input-customConfigPath" style="width:130px"><i class="fa fa-pencil"></i> Custom CFG Dir</label>
-        <input type="text" id="node-input-customConfigPath" placeholder="/some/directory">
-    </div>
-    <div class="form-row">
-        <label  for="node-input-valueCacheDiskThrottle" style="width:130px"><i class="fa fa-pencil"></i> Disk IO Throttle</label>
-        <select id="node-input-valueCacheDiskThrottle">
-            <option value="normal">Normal</option>
-            <option value="slow">Slow</option>
-            <option value="fast">Fast</option>
-        </select>
-    </div>
-    <br />
-    <p>
-        <strong>Version Information.</strong>
-    </p>
-    <div class="form-row">
-        <label  for="MOD_Version" style="width:130px"><i class="fa fa-info"></i> Module Version</label>
-        <input type="text" id="MOD_Version" readonly>
-    </div>
-    <div class="form-row">
-        <label  for="ZWJS_Version" style="width:130px"><i class="fa fa-info"></i> Driver Version</label>
-        <input type="text" id="ZWJS_Version" readonly>
-    </div>
-   
+	<p>
+	    <strong>Z-Wave JS Analytics Reporting.</strong><br />
+	    Sending Analytics, helps the Z-Wave JS project focus on areas that are most prevalent.<br />
+	    No personal or personally identifiable information is collected, this includes internet addressable values.<br /><br />
+	    To read about the information collected, click <a target="_blank" href="https://zwave-js.github.io/node-zwave-js/#/data-collection/user-disclosure">HERE</a>.
+
+	</p>
+	<div class="form-row">
+	    <label  for="node-input-sendUsageStatistics" style="width:130px"><i class="fa fa-pencil"></i> Send Analytics</label>
+	    <input type="checkbox" id="node-input-sendUsageStatistics">
+	</div>
+
+	<p>
+	    <strong>Basic settings.</strong>
+	</p>
+	<div class="form-row">
+	    <label for="node-input-name" style="width:130px"><i class="fa fa-pencil"></i> Name</label>
+	    <input type="text" id="node-input-name" placeholder="Zwave Controller">
+	</div>
+	<div class="form-row">
+	    <label for="node-input-serialPort" style="width:130px"><i class="fa fa-pencil"></i> Serial Port</label>
+	    <select id="node-input-serialPort">
+	    </select>
+
+	</div>
+	<p>
+	    <strong>Encryption Keys</strong>
+	</p>
+	<div class="form-row">
+	    <label for="node-input-encryptionKey" style="width:130px"><i class="fa fa-pencil"></i> S0</label>
+	    <input type="text" id="node-input-encryptionKey" placeholder="[0x01,0x02,..] or plain text">
+	</div>
+	<div class="form-row">
+	    <label for="node-input-encryptionKeyS2U" style="width:130px"><i class="fa fa-pencil"></i> S2 Unauth</label>
+	    <input type="text" id="node-input-encryptionKeyS2U" placeholder="[0x01,0x02,..] or plain text">
+	</div>
+	<div class="form-row">
+	    <label for="node-input-encryptionKeyS2A" style="width:130px"><i class="fa fa-pencil"></i> S2 Auth</label>
+	    <input type="text" id="node-input-encryptionKeyS2A" placeholder="[0x01,0x02,..] or plain text">
+	</div>
+	<div class="form-row">
+	    <label for="node-input-encryptionKeyS2AC" style="width:130px"><i class="fa fa-pencil"></i> S2 Access Ctrl</label>
+	    <input type="text" id="node-input-encryptionKeyS2AC" placeholder="[0x01,0x02,..] or plain text">
+	</div>
+	<br />
+	<p>
+	    <strong>Timeouts (ms).</strong>
+	</p>
+	<div class="form-row">
+	    <label  for="node-input-ackTimeout" style="width:130px"><i class="fa fa-pencil"></i> ACK</label>
+	    <input type="text" id="node-input-ackTimeout" placeholder="Use Default">
+	</div>
+	<div class="form-row">
+	    <label  for="node-input-controllerTimeout" style="width:130px"><i class="fa fa-pencil"></i> Controller</label>
+	    <input type="text" id="node-input-controllerTimeout" placeholder="Use Default">
+	</div>
+	<div class="form-row">
+	    <label  for="node-input-sendResponseTimeout" style="width:130px"><i class="fa fa-pencil"></i> Req -> Res</label>
+	    <input type="text" id="node-input-sendResponseTimeout" placeholder="Use Default">
+	</div>
+	<br />
+	<p>
+	    <strong>Z-Wave JS Logging</strong>
+	</p>
+	<div class="form-row">
+	    <label  for="node-input-logLevelPin" style="width:130px"><i class="fa fa-pencil"></i> Level (Pin 2)</label>
+	    <select id="node-input-logLevelPin">
+	        <option value="none">Logging Disabled</option>
+	        <option value="error">Error</option>
+	        <option value="warn">Warn</option>
+	        <option value="info">Info</option>
+	        <option value="verbose">Verbose</option>
+	        <option value="debug">Debug</option>
+	        <option value="silly">Silly</option>
+	    </select>
+	</div>
+	<div class="form-row">
+	    <label  for="node-input-logLevel" style="width:130px"><i class="fa fa-pencil"></i> Level (File)</label>
+	    <select id="node-input-logLevel">
+	        <option value="none">Logging Disabled</option>
+	        <option value="error">Error</option>
+	        <option value="warn">Warn</option>
+	        <option value="info">Info</option>
+	        <option value="verbose">Verbose</option>
+	        <option value="debug">Debug</option>
+	        <option value="silly">Silly</option>
+	    </select>
+	</div>
+	<div class="form-row">
+	    <label  for="node-input-logFile" style="width:130px"><i class="fa fa-pencil"></i> Log File</label>
+	    <input type="text" id="node-input-logFile" placeholder="zwave-js-log.txt">
+	</div>
+	<div class="form-row">
+	    <label  for="node-input-logFile" style="width:130px"><i class="fa fa-pencil"></i> Node Filter</label>
+	    <input type="text" id="node-input-logNodeFilter" placeholder="2,5,24">
+	</div>
+	<br />
+	<p>
+	    <strong>Advanced Driver Settings.</strong>
+	</p>
+	<div class="form-row">
+	    <label  for="node-input-customConfigPath" style="width:130px"><i class="fa fa-pencil"></i> Custom CFG Dir</label>
+	    <input type="text" id="node-input-customConfigPath" placeholder="/some/directory">
+	</div>
+	<div class="form-row">
+	    <label  for="node-input-valueCacheDiskThrottle" style="width:130px"><i class="fa fa-pencil"></i> Disk IO Throttle</label>
+	    <select id="node-input-valueCacheDiskThrottle">
+	        <option value="normal">Normal</option>
+	        <option value="slow">Slow</option>
+	        <option value="fast">Fast</option>
+	    </select>
+	</div>
+	<br />
+	<p>
+	    <strong>Version Information.</strong>
+	</p>
+	<div class="form-row">
+	    <label  for="MOD_Version" style="width:130px"><i class="fa fa-info"></i> Module Version</label>
+	    <input type="text" id="MOD_Version" readonly>
+	</div>
+	<div class="form-row">
+	    <label  for="ZWJS_Version" style="width:130px"><i class="fa fa-info"></i> Driver Version</label>
+	    <input type="text" id="ZWJS_Version" readonly>
+	</div>
 </script>
 
 <script type="text/x-red" data-help-name="zwave-js">
-    <p>A Z-Wave Controller for node red.</p>
-
-    <p>
-        <code>Input:</code><br />
-        A <strong>payload</strong> object containing a command.<br />
-        <strong>params</strong> will be dependant on the type of command you are sending.
-<pre>
-{
-   node: 2,
-   mode: "CCAPI",
-   cc: "Configuration",
-   method: "set",
-   params: [0x18,0x03,1]
-}
-</pre>
-    </p>
-
-    <p>
-        <code>Output:</code><br />
-        A <strong>payload</strong> containing an event that has occured within the zwave network.<br />
-        The contents of <strong>object</strong> is dependant on the event.
-<pre>
-{
-   node: 2,
-   event: "VALUE_UPDATED",
-   timestamp: "23-12-2020T12:23:23+000",
-   object: ...
-}
-</pre>
-    </p>
-
-
-</script>
\ No newline at end of file
+	    <p>A Z-Wave Controller for node red.</p>
+
+	    <p>
+	        <code>Input:</code><br />
+	        A <strong>payload</strong> object containing a command.<br />
+	        <strong>params</strong> will be dependant on the type of command you are sending.
+	<pre>
+	{
+	   node: 2,
+	   mode: "CCAPI",
+	   cc: "Configuration",
+	   method: "set",
+	   params: [0x18,0x03,1]
+	}
+	</pre>
+	    </p>
+
+	    <p>
+	        <code>Output:</code><br />
+	        A <strong>payload</strong> containing an event that has occured within the zwave network.<br />
+	        The contents of <strong>object</strong> is dependant on the event.
+	<pre>
+	{
+	   node: 2,
+	   event: "VALUE_UPDATED",
+	   timestamp: "23-12-2020T12:23:23+000",
+	   object: ...
+	}
+	</pre>
+	    </p>
+</script>

From b0b0a6a75498901fbe90ff57f365dbfb71ee8891 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Fri, 3 Sep 2021 11:14:58 +0100
Subject: [PATCH 45/70] Update event-filter.html

---
 zwave-js/event-filter.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index 00d68c8e..f10adcb4 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -106,9 +106,8 @@
 		}
 		$(container).data('data', data);
 		$(container).click(SetActiveFilter);
-		$(container)
-			.parent()
-			.css({ height: '45px', overflow: 'hidden', minWidth: '400px' });
+		$(container).css({ minWidth: '400px' });
+		$(container).parent().css({ height: '45px', overflow: 'hidden' });
 
 		const HTML = `
             <table style="width:100%">

From e0098a931815570a42204f47702ea3178602e50e Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 12:48:35 +0100
Subject: [PATCH 46/70] Update README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index df208fca..e8a799cd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 ![Image](./resources/ReadMe.png)  
 
 # node-red-contrib-zwave-js
+<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js">
+<img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js/latest">
+
 
 THE most powerful Z-Wave node for node-red based on Z-Wave JS.  
 If you want a fully featured Z-Wave runtime in your node-red instance, look no further.  

From b59cee6124ce2df11e7d5fc9d01b226486bbaf6e Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 12:50:02 +0100
Subject: [PATCH 47/70] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e8a799cd..2c935d0e 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
 ![Image](./resources/ReadMe.png)  
 
 # node-red-contrib-zwave-js
-<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js">
-<img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js/latest">
+<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js/latest">
 
 
 THE most powerful Z-Wave node for node-red based on Z-Wave JS.  

From 5497fbaa0d2c149fad7276f22067e275f6320134 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 12:54:56 +0100
Subject: [PATCH 48/70] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2c935d0e..c87efec9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![Image](./resources/ReadMe.png)  
 
 # node-red-contrib-zwave-js
-<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js/latest">
+<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js/latest"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js">
 
 
 THE most powerful Z-Wave node for node-red based on Z-Wave JS.  

From 346927c67b5c0aae4377b33e0ab769b0ba479deb Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 12:57:09 +0100
Subject: [PATCH 49/70] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c87efec9..c7fea334 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![Image](./resources/ReadMe.png)  
 
 # node-red-contrib-zwave-js
-<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js/latest"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js">
+<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js">
 
 
 THE most powerful Z-Wave node for node-red based on Z-Wave JS.  

From 7c30fbaed64468d2efd9d651f45f41cd28a07049 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:00:39 +0100
Subject: [PATCH 50/70] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c7fea334..d37f9f85 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![Image](./resources/ReadMe.png)  
 
 # node-red-contrib-zwave-js
-<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js">
+<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js">
 
 
 THE most powerful Z-Wave node for node-red based on Z-Wave JS.  

From 03df2a8e23adedda28fefc862e7957c894a4a3b8 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:04:59 +0100
Subject: [PATCH 51/70] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d37f9f85..9cd3880e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 ![Image](./resources/ReadMe.png)  
 
+<p align="center">
 # node-red-contrib-zwave-js
 <img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js">
+</p>
 
 
 THE most powerful Z-Wave node for node-red based on Z-Wave JS.  

From 8dced20aceb4baaaf97fb3d67879d8ccc2b2d06d Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:05:50 +0100
Subject: [PATCH 52/70] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9cd3880e..25c165da 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 ![Image](./resources/ReadMe.png)  
 
 <p align="center">
-# node-red-contrib-zwave-js
+<h2>node-red-contrib-zwave-js</h2>
+<hr />
 <img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js">
 </p>
 

From 9e930d0c55b261a637c56d7cf9234519efb289c9 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:06:56 +0100
Subject: [PATCH 53/70] Update README.md

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 25c165da..e8fdb7f9 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
 ![Image](./resources/ReadMe.png)  
 
-<p align="center">
-<h2>node-red-contrib-zwave-js</h2>
-<hr />
+# node-red-contrib-wave-js
+
 <img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js">
-</p>
+
 
 
 THE most powerful Z-Wave node for node-red based on Z-Wave JS.  

From 17a66b5f0fabe8005233f73169e5515cce89e5ee Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:09:38 +0100
Subject: [PATCH 54/70] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e8fdb7f9..354029ae 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # node-red-contrib-wave-js
 
-<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js">
+<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js"> <img alt="David" src="https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js">
 
 
 

From 4107886479b41792103d1dfd1fe6457fe6567d66 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:25:02 +0100
Subject: [PATCH 55/70] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 354029ae..f86240e6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # node-red-contrib-wave-js
 
-<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js"> <img alt="David" src="https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js">
+<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js"> <img alt="npms.io (maintenance)" src="https://img.shields.io/npms-io/maintenance-score/node-red-contrib-zwave-js"> <img alt="David" src="https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js">
 
 
 

From 6cd06a62845ccdf5c2d3fcc37b8c5b8b948e09a8 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:54:16 +0100
Subject: [PATCH 56/70] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f86240e6..df489d44 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 # node-red-contrib-wave-js
 
-<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> <img alt="LGTM Grade" src="https://img.shields.io/lgtm/grade/javascript/github/zwave-js/node-red-contrib-zwave-js"> <img alt="npms.io (maintenance)" src="https://img.shields.io/npms-io/maintenance-score/node-red-contrib-zwave-js"> <img alt="David" src="https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js">
+<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> 
+[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/zwave-js/node-red-contrib-zwave-js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/zwave-js/node-red-contrib-zwave-js/context:javascript) <img alt="npms.io (maintenance)" src="https://img.shields.io/npms-io/maintenance-score/node-red-contrib-zwave-js"> <img alt="David" src="https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js">
 
 
 

From ea41133142a25a13b9cdfd1ed172df34b233fe93 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:02:38 +0100
Subject: [PATCH 57/70] Update README.md

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index df489d44..fea07ceb 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,11 @@
 
 # node-red-contrib-wave-js
 
-<img alt="NPM" src="https://img.shields.io/npm/l/node-red-contrib-zwave-js"> <img alt="NPM" src="https://img.shields.io/npm/v/node-red-contrib-zwave-js"> <img alt="node-current" src="https://img.shields.io/node/v/node-red-contrib-zwave-js"> 
-[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/zwave-js/node-red-contrib-zwave-js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/zwave-js/node-red-contrib-zwave-js/context:javascript) <img alt="npms.io (maintenance)" src="https://img.shields.io/npms-io/maintenance-score/node-red-contrib-zwave-js"> <img alt="David" src="https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js">
-
+[![License](https://img.shields.io/npm/l/node-red-contrib-zwave-js)](https://github.com/zwave-js/node-red-contrib-zwave-js/blob/main/LICENSE)
+[![Version](https://img.shields.io/npm/v/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
+[![Node Version](https://img.shields.io/node/v/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
+[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/zwave-js/node-red-contrib-zwave-js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/zwave-js/node-red-contrib-zwave-js/context:javascript)
+[![Maintenance](https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 
 
 THE most powerful Z-Wave node for node-red based on Z-Wave JS.  

From be76e28ee94c54d63ca34f63f070377d22fd48c8 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:05:03 +0100
Subject: [PATCH 58/70] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fea07ceb..a3ad5fb3 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,8 @@
 [![Version](https://img.shields.io/npm/v/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 [![Node Version](https://img.shields.io/node/v/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/zwave-js/node-red-contrib-zwave-js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/zwave-js/node-red-contrib-zwave-js/context:javascript)
-[![Maintenance](https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
+[![Maintenance (https://img.shields.io/npms-io/maintenance-score/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
+[![Dependencies](https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 
 
 THE most powerful Z-Wave node for node-red based on Z-Wave JS.  

From 72e414dff12317acff201b89f4cbff2c55ba4883 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:05:54 +0100
Subject: [PATCH 59/70] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a3ad5fb3..a8fe4e0d 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [![Version](https://img.shields.io/npm/v/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 [![Node Version](https://img.shields.io/node/v/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/zwave-js/node-red-contrib-zwave-js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/zwave-js/node-red-contrib-zwave-js/context:javascript)
-[![Maintenance (https://img.shields.io/npms-io/maintenance-score/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
+[![Maintenance] (https://img.shields.io/npms-io/maintenance-score/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 [![Dependencies](https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 
 

From f9c3e5ed0a2051603c460594ee4cb7a329bc4846 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:06:19 +0100
Subject: [PATCH 60/70] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a8fe4e0d..c03e38c4 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [![Version](https://img.shields.io/npm/v/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 [![Node Version](https://img.shields.io/node/v/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/zwave-js/node-red-contrib-zwave-js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/zwave-js/node-red-contrib-zwave-js/context:javascript)
-[![Maintenance] (https://img.shields.io/npms-io/maintenance-score/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
+[![Maintenance](https://img.shields.io/npms-io/maintenance-score/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 [![Dependencies](https://img.shields.io/david/marcus-j-davies/node-red-contrib-zwave-js)](https://www.npmjs.com/package/node-red-contrib-zwave-js)
 
 

From 747f820a93611ec8bd1e20c38c9a541ab4086330 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:13:32 +0100
Subject: [PATCH 61/70] Update zwave-device.html

---
 zwave-js/zwave-device.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zwave-js/zwave-device.html b/zwave-js/zwave-device.html
index f5dbb413..57386c09 100644
--- a/zwave-js/zwave-device.html
+++ b/zwave-js/zwave-device.html
@@ -79,7 +79,7 @@
 
 			if (this.filteredNodeId !== undefined) {
 				// Single
-				if (parseInt(this.filteredNodeId) !== NaN) {
+				if (!isNaN(parseInt(this.filteredNodeId))) {
 					Filter.css('height', '');
 					Filter.attr('multiple', null);
 					Filter.val(this.filteredNodeId);

From 5dafb905c60ff5dc5949e5c813e3843dc36d8ef7 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 15:45:52 +0100
Subject: [PATCH 62/70] 5.1.0

---
 zwave-js/ui/client.js | 2 +-
 zwave-js/zwave-js.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js
index b66ab99a..3461f3d2 100644
--- a/zwave-js/ui/client.js
+++ b/zwave-js/ui/client.js
@@ -365,7 +365,7 @@ const ZwaveJsUI = (function () {
 			_Nodes.push(ND);
 		});
 
-		if (Neigbhors === undefined) {
+		if (typeof Neigbhors === 'undefined') {
 			Nodes.forEach((N) => {
 				if (N.isControllerNode) {
 					return;
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index 8ce09002..6e0ee946 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -1190,7 +1190,7 @@ module.exports = function (RED) {
 			const Lines = [];
 			Lines.push('[Node: ' + NID + ']');
 
-			if (Value !== undefined) {
+			if (typeof Value !== 'undefined') {
 				Lines.push('└─[ValueID]');
 
 				const OBKeys = Object.keys(Value);

From a8e3393846fbff18e64d3147598a38bc38f7e6f1 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 15:55:01 +0100
Subject: [PATCH 63/70] Update package.json

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index fff5cdb7..e04e5b64 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "license": "MIT",
   "description": "An extremely powerful, easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
   "dependencies": {
-    "@serialport/bindings": "9.2.0",
-    "serialport": "9.2.0",
+    "@serialport/bindings": "9.2.1",
+    "serialport": "9.2.1",
     "express": "4.17.1",
     "lodash": "4.17.21",
     "winston": "3.3.3",
@@ -21,7 +21,7 @@
     "npm": ">=6.14.13"
   },
   "scripts": {
-    "preinstall": "npm install @serialport/bindings@9.2.0 --build-from-source  && npm install serialport@9.2.0 --build-from-source"
+    "preinstall": "npm install @serialport/bindings@9.2.1 --build-from-source  && npm install serialport@9.2.1 --build-from-source"
   },
   "keywords": [
     "node-red",

From 6145d8f220c4d808ffee2082240388c1256afcc2 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 17:08:31 +0100
Subject: [PATCH 64/70] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e04e5b64..861eb198 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "description": "An extremely powerful, easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
   "dependencies": {
     "@serialport/bindings": "9.2.1",
-    "serialport": "9.2.1",
     "express": "4.17.1",
     "lodash": "4.17.21",
+    "serialport": "9.2.1",
     "winston": "3.3.3",
     "winston-transport": "4.4.0",
     "zwave-js": "8.2.2"

From 8394337f3944dad1c28e144d54b026ac264bd4fa Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 20:09:05 +0100
Subject: [PATCH 65/70] Update event-filter.html

---
 zwave-js/event-filter.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zwave-js/event-filter.html b/zwave-js/event-filter.html
index f10adcb4..15e06303 100644
--- a/zwave-js/event-filter.html
+++ b/zwave-js/event-filter.html
@@ -136,7 +136,7 @@
             `;
 
 		$(container).html(HTML);
-		const Refresh = $('<button>')
+		$('<button>')
 			.addClass('ui-button')
 			.addClass('ui-corner-all')
 			.addClass('ui-widget')

From 41fa13d4a54b3db4ea63f2bd3a2051e85d5cfe41 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 21:05:15 +0100
Subject: [PATCH 66/70] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 861eb198..568fa9d7 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "serialport": "9.2.1",
     "winston": "3.3.3",
     "winston-transport": "4.4.0",
-    "zwave-js": "8.2.2"
+    "zwave-js": "^8.2.2"
   },
   "devDependencies": {
     "eslint": "7.31.0",

From c04f7a337054e0f8a90aa29f41da01dfa78e3ad4 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 21:53:05 +0100
Subject: [PATCH 67/70] Update package.json

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 568fa9d7..6ffd8959 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,10 @@
   "license": "MIT",
   "description": "An extremely powerful, easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
   "dependencies": {
-    "@serialport/bindings": "9.2.1",
+    "@serialport/bindings": "9.2.0",
+    "serialport": "9.2.0",
     "express": "4.17.1",
     "lodash": "4.17.21",
-    "serialport": "9.2.1",
     "winston": "3.3.3",
     "winston-transport": "4.4.0",
     "zwave-js": "^8.2.2"
@@ -21,7 +21,7 @@
     "npm": ">=6.14.13"
   },
   "scripts": {
-    "preinstall": "npm install @serialport/bindings@9.2.1 --build-from-source  && npm install serialport@9.2.1 --build-from-source"
+    "preinstall": "npm install @serialport/bindings@9.2.0 --build-from-source  && npm install serialport@9.2.0 --build-from-source"
   },
   "keywords": [
     "node-red",

From 36edb4f869c0dc9ada877793846c3f048e338386 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 22:01:43 +0100
Subject: [PATCH 68/70] Update zwave-js.js

---
 zwave-js/zwave-js.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index 6e0ee946..71aa1152 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -1339,6 +1339,7 @@ module.exports = function (RED) {
 			Driver.on('all nodes ready', () => {
 				node.status({ fill: 'green', shape: 'dot', text: 'All nodes ready!' });
 				UI.status('All nodes ready!');
+				Send(undefined,"ALL_NODES_READY")
 			});
 
 			Driver.once('driver ready', () => {

From a6b499aef8ecd691401a9e92f834ebf182d92bb0 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Sun, 5 Sep 2021 22:11:01 +0100
Subject: [PATCH 69/70] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 877ef207..ef873571 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,13 +5,14 @@
      **New Features**
      - Added an extremely advanced **event-filter** node, allowing node events to be filtered with ease.
      - Added the ability to pipe log messages to a 2nd output pin of the Controller Node
+     - Added a new event type: **ALL_NODES_READY** 
 
      **Fixes**
      - Fix phantom parentheses in node location.
 
      **Changes**
      - Improvements to the device paring wizard.
-     - Bump Zwave JS to 8.2.1
+     - Bump Zwave JS to 8.2.2
 
    - 5.0.0
 

From 9cec40ca673c73a2d322bdee335fbc0d1851bc18 Mon Sep 17 00:00:00 2001
From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com>
Date: Mon, 6 Sep 2021 00:26:58 +0100
Subject: [PATCH 70/70] 5.1.0

---
 CHANGELOG.md         | 2 +-
 package.json         | 6 +++---
 zwave-js/zwave-js.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef873571..9599dfe2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 
      **Changes**
      - Improvements to the device paring wizard.
-     - Bump Zwave JS to 8.2.2
+     - Bump Zwave JS to 8.2.3
 
    - 5.0.0
 
diff --git a/package.json b/package.json
index 6ffd8959..a3cf21e1 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,16 @@
 {
   "name": "node-red-contrib-zwave-js",
-  "version": "5.1.0-beta.3",
+  "version": "5.1.0",
   "license": "MIT",
   "description": "An extremely powerful, easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
   "dependencies": {
     "@serialport/bindings": "9.2.0",
-    "serialport": "9.2.0",
     "express": "4.17.1",
     "lodash": "4.17.21",
+    "serialport": "9.2.0",
     "winston": "3.3.3",
     "winston-transport": "4.4.0",
-    "zwave-js": "^8.2.2"
+    "zwave-js": "^8.2.3"
   },
   "devDependencies": {
     "eslint": "7.31.0",
diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
index 71aa1152..42766fb1 100644
--- a/zwave-js/zwave-js.js
+++ b/zwave-js/zwave-js.js
@@ -1339,7 +1339,7 @@ module.exports = function (RED) {
 			Driver.on('all nodes ready', () => {
 				node.status({ fill: 'green', shape: 'dot', text: 'All nodes ready!' });
 				UI.status('All nodes ready!');
-				Send(undefined,"ALL_NODES_READY")
+				Send(undefined, 'ALL_NODES_READY');
 			});
 
 			Driver.once('driver ready', () => {