node-red-contrib-zwave-js 7.0.0 → 7.0.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
   # node-red-contrib-zwave-js Change Log
 
+  - 7.0.1
+
+    **Changes**
+     - Small optimisations to Express route cleanup.
+
+
   - 7.0.0
 
     **Breaking Changes**

package/package.json

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

package/zwave-js/ui/server.js

@@ -457,19 +457,20 @@ class UIServer {
 			delete this._Context.controller;
 			delete this._Context.input;
 		} else {
-			const Routes = [];
-			this._RED.httpAdmin._router.stack.forEach((R) => {
-				if (R.route === undefined) {
-					Routes.push(R);
-					return;
+			const Check = (Route) => {
+				if (Route.route === undefined) {
+					return true;
 				}
-				if (!R.route.path.startsWith(`/zwave-js/${this._NetworkIdentifier}`)) {
-					Routes.push(R);
-					return;
+				if (
+					!Route.route.path.startsWith(`/zwave-js/${this._NetworkIdentifier}`)
+				) {
+					return true;
 				}
-			});
 
-			this._RED.httpAdmin._router.stack = Routes;
+				return false;
+			};
+			this._RED.httpAdmin._router.stack =
+				this._RED.httpAdmin._router.stack.filter(Check);
 
 			delete this._Context.controller;
 			delete this._Context.input;

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

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