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

package/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 <br/>
 <p>
-<b>Version 1.3.11</b> - December 2021<br/>
+<b>Version 1.3.12</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>

package/KNXEngine/protocol/KNXUtils.js

@@ -16,18 +16,26 @@ 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 !== 3) {
+        if (digits.length < 2 || digits.length > 3) {
             throw new Error(`Invalid address format: ${address} Only 3 level addresses are allowed`);
         }
+        if ((digits.length === 3 && address === "0/0/0") || (digits.length === 1 && address === "0/0")) throw new Error(`Invalid address: ${address}`);
+
         let count = 0;
         let newAddress = 0;
         for (let i = digits.length - 1; i >= 0; i--, count++) {
             const digit = Number(digits[i]);
-            if (isGroup) {
+            if (isGroup && digits.length === 3) {
                 // 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}`);
+                    throw new Error(`Invalid 3 levels GA digit ${digit} inside address: ${address}`);
+                }
+            } else if (isGroup && digits.length === 2) {
+                // Validating Group Address
+                if (isNaN(digit) || (count === 1 && digit > 31) || (count === 0 && digit > 2047)) {
+                    // 22/12/2021 Supergiovane disabled digits validation
+                    throw new Error(`Invalid 2 levels GA digit ${digit} inside address: ${address}`);
                 }
             } else {
                 // Validating KNX Device Address

package/nodes/knxUltimate-config.js

@@ -425,19 +425,6 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
         node.addClient = (_Node) => {
             // Check if node already exists
             if (node.nodeClients.filter(x => x.id === _Node.id).length === 0) {
-                // Check if the node has a valid topic and dpt
-                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 format x/x/x
-                        if (_Node.topic.split("\/").length < 3) {
-                            _Node.setNodeStatus({ fill: "red", shape: "dot", text: "Wrong group address (topic: " + _Node.topic + ") format.", payload: "", GA: "", dpt: "", devicename: "" })
-                            return;
-                        }
-                    }
-                }
                 // Add _Node to the clients array
                 if (node.autoReconnect) {
                     _Node.setNodeStatus({ fill: "grey", shape: "ring", text: "Node initialized.", payload: "", GA: "", dpt: "", devicename: "" });

package/nodes/knxUltimate.js

@@ -67,7 +67,7 @@ module.exports = function (RED) {
                 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: "" })
+                    node.setNodeStatus({ fill: "red", shape: "dot", text: 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.11",
+  "version": "1.3.12",
   "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",