node-red-contrib-knx-ultimate 1.3.10 → 1.3.11

package/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 <br/>
 <p>
+<b>Version 1.3.11</b> - December 2021<br/>
+- KNX-Ultimate DEVICE node: added the validation of Group Address while deploy, with support for modern addressing up to 31/7/255.<br/>
+</p>
+<p>
 <b>Version 1.3.10</b> - December 2021<br/>
 - FIX: fixed a stupid "Disconnected by Message length mismatch 8/16" error due to a dumb find/replace error in the code.<br/>
 - Added some more log to help resolving issues.<br/>

package/KNXEngine/protocol/KNXUtils.js

@@ -13,17 +13,28 @@ const splitIP = (ip, name = 'ip') => {
 };
 exports.splitIP = splitIP;
 const validateKNXAddress = (address, isGroup = false) => {
+    // 22/12/2021 Supergiovane: https://support.knx.org/hc/en-us/articles/115003188109-Group-Addresses
     if (typeof (address) === 'string') {
         const digits = address.split(/[./]/);
-        if (digits.length < 2 || digits.length > 3) {
-            throw new Error(`Invalid address format: ${address}`);
+        if (digits.length !== 3) {
+            throw new Error(`Invalid address format: ${address} Only 3 level addresses are allowed`);
         }
         let count = 0;
         let newAddress = 0;
         for (let i = digits.length - 1; i >= 0; i--, count++) {
             const digit = Number(digits[i]);
-            if (isNaN(digit) || (count > 1 && digit > 15) || (count === 0 && digit > 255)) {
-                throw new Error(`Invalid digit at pos ${i} inside address: ${address}`);
+            if (isGroup) {
+                // Validating Group Address
+                if (isNaN(digit) || (count === 2 && digit > 31) || (count === 1 && digit > 7) || (count === 0 && digit > 255)) {
+                    // 22/12/2021 Supergiovane disabled digits validation
+                    throw new Error(`Invalid GA digit ${digit} inside address: ${address}`);
+                }
+            } else {
+                // Validating KNX Device Address
+                if (isNaN(digit) || (count > 1 && digit > 15) || (count === 0 && digit > 255)) {
+                    // 22/12/2021 Supergiovane disabled digits validation
+                    throw new Error(`Invalid Individual Address digit ${digit} inside address: ${address}`);
+                }
             }
             if (count === 0) {
                 newAddress = digit;

package/nodes/knxUltimate.js

@@ -1,5 +1,6 @@
 module.exports = function (RED) {
     const _ = require("lodash");
+    const KNXUtils = require("./../KNXEngine/protocol/KNXUtils");
 
     function knxUltimate(config) {
         RED.nodes.createNode(this, config)
@@ -57,15 +58,16 @@ module.exports = function (RED) {
         }
 
         // Check if the node has a valid topic and dpt
-        if (node.listenallga == false) {
-            if (typeof node.topic == "undefined" || typeof node.dpt == "undefined") {
+        if (node.listenallga === false) {
+            if (node.topic === undefined || node.dpt === undefined) {
                 node.setNodeStatus({ fill: "red", shape: "dot", text: "Empty Group Addr. or datapoint.", payload: "", GA: "", dpt: "", devicename: "" })
                 return;
             } else {
-
-                // topic must be in formar x/x/x
-                if (node.topic.split("\/").length < 3) {
-                    node.setNodeStatus({ fill: "red", shape: "dot", text: "Wrong group address format.", payload: "", GA: node.topic, dpt: "", devicename: "" })
+                // Validate the Address
+                try {
+                    KNXUtils.validateKNXAddress(node.topic, true)
+                } catch (error) {
+                    node.setNodeStatus({ fill: "red", shape: "dot", text: "Wrong group address format." + error.message, payload: "", GA: node.topic, dpt: "", devicename: "" })
                     return;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-knx-ultimate",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "Control your KNX intallation via Node-Red! Single Node KNX IN/OUT with optional ETS group address importer. Easy to use and highly configurable.",
   "dependencies": {
     "fs": "0.0.1-security",