node-red-contrib-knx-ultimate 1.3.15 → 1.3.16

package/CHANGELOG.md

@@ -4,6 +4,12 @@
 
 <br/>
 <p>
+<b>Version 1.3.16</b> - Januar 2022<br/>
+- KNXEngine: there are some weird KNX gateways out there, either sending malformed header or CEMI messages. Now KNX-Ultimate will simply ignore these bad messages. Prior, it was disconnecting.<br/>
+- KNXEngine: KNX-Secure packets are silently discarded for now, until KNX Secure will be ready.<br/>
+- KNXEngine: added more logs to for troubleshooting pourposes.<br/>
+</p>
+<p>
 <b>Version 1.3.15</b> - Januar 2022<br/>
 - KNXEngine: better handling of disconnection in UDP mode, allowing very old grandpa KNX/IP interfaces enough time to understand what's happening, avoiding it to go crazy.<br/>
 - KNXEngine: corrected Curve Crypto in KNX-Secure (KNX Secure is not enabled yet!).<br/>

package/KNXEngine/KNXClient.js

@@ -300,7 +300,7 @@ class KNXClient extends EventEmitter {
                 if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Sending KNX packet: Send TCP Catch error: " + error.message || "Undef error");
                 try {
                     this.emit(KNXClientEvents.error, error);
-                } catch (error) {}
+                } catch (error) { }
             }
         }
     }
@@ -612,7 +612,7 @@ class KNXClient extends EventEmitter {
         this._heartbeatTimer = setTimeout(() => {
             this._heartbeatTimer = null;
             try {
-                console.log("BANANA OH! getConnectionStatus Timeout", this._heartbeatFailures, "su", this.max_HeartbeatFailures);
+                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: getConnectionStatus Timeout " + this._heartbeatFailures + " out of " + this.max_HeartbeatFailures);
                 //this.emit(KNXClientEvents.error, timeoutError);
             } catch (error) {
             }
@@ -639,7 +639,7 @@ class KNXClient extends EventEmitter {
         this._awaitingResponseType = KNXConstants.KNX_CONSTANTS.DISCONNECT_RESPONSE;
         this._sendDisconnectRequestMessage(this._channelID);
         //this._timerTimeoutSendDisconnectRequestMessage = setTimeout(() => {
-            this._setDisconnected();
+        this._setDisconnected();
         //}, 1000 * KNXConstants.KNX_CONSTANTS.CONNECT_REQUEST_TIMEOUT);
     }
     isConnected() {
@@ -717,7 +717,6 @@ class KNXClient extends EventEmitter {
     _processInboundMessage(msg, rinfo) {
 
         try {
-
             // Composing debug string
             try {
                 if (this.sysLogger !== undefined && this.sysLogger !== null) {
@@ -730,6 +729,9 @@ class KNXClient extends EventEmitter {
                 }
             } catch (error) { }
 
+            // BUGFIXING https://github.com/Supergiovane/node-red-contrib-knx-ultimate/issues/162
+            //msg = Buffer.from("0610053000102900b06011fe11150080","hex");
+
             const { knxHeader, knxMessage } = KNXProtocol.KNXProtocol.parseMessage(msg);
 
             // 26/12/2021 ROUTING LOST MESSAGE OR BUSY
@@ -950,11 +952,12 @@ class KNXClient extends EventEmitter {
         }
         catch (e) {
             try {
-                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Received KNX packet: Error processing inbound message: " + e.message + " " + sProcessInboundLog + " ChannelID:" + this._channelID + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Received KNX packet: Error processing inbound message: " + e.message + " " + sProcessInboundLog + " ChannelID:" + this._channelID + " Host:" + this._options.ipAddr + ":" + this._options.ipPort + ". This means that KNX-Ultimate received a malformed Header or CEMI message from your KNX Gateway.");
             } catch (error) { }
             try {
-                this.emit(KNXClientEvents.error, e);
-                this._setDisconnected();
+                // 05/01/2022 Avoid disconnecting, because there are many bugged knx gateways out there!
+                //this.emit(KNXClientEvents.error, e);
+                //this._setDisconnected();
             } catch (error) { }
 
         }

package/KNXEngine/protocol/KNXHeader.js

@@ -20,15 +20,18 @@ class KNXHeader {
     }
     static createFromBuffer(buffer, offset = 0) {
         if (buffer.length < KNXConstants.KNX_CONSTANTS.HEADER_SIZE_10) {
+            if (sysLogger !== undefined && sysLogger !== null) sysLogger.error("KNXHeader: createFromBuffer: incomplete buffer. Buffer length: " + buffer.length + " expected HEADER_SIZE_10 equals to " + KNXConstants.KNX_CONSTANTS.HEADER_SIZE_10);
             throw new Error('Incomplete buffer');
         }
         const header_length = buffer.readUInt8(offset);
         if (header_length !== KNXConstants.KNX_CONSTANTS.HEADER_SIZE_10) {
+            if (sysLogger !== undefined && sysLogger !== null) sysLogger.error("KNXHeader: createFromBuffer: invalid header_length. header_length: " + header_length + " expected HEADER_SIZE_10 equals to " + KNXConstants.KNX_CONSTANTS.HEADER_SIZE_10);
             throw new Error(`Invalid buffer length ${header_length}`);
         }
         offset += 1;
         const version = buffer.readUInt8(offset);
         if (version !== KNXConstants.KNX_CONSTANTS.KNXNETIP_VERSION_10) {
+            if (sysLogger !== undefined && sysLogger !== null) sysLogger.error("KNXHeader: createFromBuffer: Unknown header version. Version: " + version + " expected KNXNETIP_VERSION_10 to " + KNXConstants.KNX_CONSTANTS.KNXNETIP_VERSION_10);
             throw new Error(`Unknown version ${version}`);
         }
         offset += 1;

package/KNXEngine/protocol/KNXProtocol.js

@@ -17,6 +17,7 @@ const KNXTunnelingRequest = require("./KNXTunnelingRequest");
 const KNXTunnelingAck = require("./KNXTunnelingAck");
 const KNXRoutingIndication = require("./KNXRoutingIndication"); // 07/12/2021
 const KNXSecureSessionRequest = require("./KNXSecureSessionRequest"); // 07/12/2021
+const sysLogger = require("./../KnxLog.js").get(); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window            
 
 const HPAI = require("./HPAI");
 

package/KNXEngine/protocol/cEMI/NPDU.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NPDU = void 0;
 const CEMIConstants = require("./CEMIConstants");
 const KNXDataBuffer = require("../KNXDataBuffer");
+const sysLogger = require("./../../KnxLog.js").get(); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window            
+
+
 class NPDU {
     constructor(_tpci = 0x0, _apci = 0x0, _data = null) {
         this._tpci = _tpci;
@@ -45,7 +48,7 @@ class NPDU {
         if (!(data instanceof KNXDataBuffer.KNXDataBuffer)) {
             throw new Error('Invalid data Buffer');
         }
-        
+
         if (data.sixBits() && data.length === 1 && data.value.readUInt8(0) < 0x3F) {
             this.apci = (this.apci & 0xC0) | data.value.readUInt8(0);
             this._data = null;
@@ -104,12 +107,34 @@ class NPDU {
     }
     static createFromBuffer(buffer, offset = 0) {
         if (offset > buffer.length) {
+            if (sysLogger !== undefined && sysLogger !== null) sysLogger.error("NPDU: createFromBuffer: offset out of buffer range ");
             throw new Error(`offset ${offset}  out of buffer range ${buffer.length}`);
         }
-        const npduLength = buffer.readUInt8(offset++);
-        const tpci = buffer.readUInt8(offset++);
-        const apci = buffer.readUInt8(offset++);
-        const data = npduLength > 1 ? buffer.slice(offset, offset + npduLength - 1) : null;
+        let npduLength = null;
+        let tpci = null;
+        let apci = null;
+        let data = null;
+
+        try {
+            npduLength = buffer.readUInt8(offset++);
+        } catch (error) {
+            if (sysLogger !== undefined && sysLogger !== null) sysLogger.error("NPDU: createFromBuffer: error npduLength: " + error.message);
+        }
+        try {
+            tpci = buffer.readUInt8(offset++);
+        } catch (error) {
+            if (sysLogger !== undefined && sysLogger !== null) sysLogger.error("NPDU: createFromBuffer: error tpci: " + error.message);
+        }
+        try {
+            apci = buffer.readUInt8(offset++);
+        } catch (error) {
+            if (sysLogger !== undefined && sysLogger !== null) sysLogger.error("NPDU: createFromBuffer: error apci: " + error.message);
+        }
+        try {
+            data = npduLength > 1 ? buffer.slice(offset, offset + npduLength - 1) : null;
+        } catch (error) {
+            if (sysLogger !== undefined && sysLogger !== null) sysLogger.error("NPDU: createFromBuffer: error data: " + error.message);
+        }
         return new NPDU(tpci, apci, data == null ? null : new KNXDataBuffer.KNXDataBuffer(data));
     }
     toBuffer() {

package/README.md

@@ -38,7 +38,7 @@ payload = {red:255, green:200, blue:30} // Put some colors in our life
 
 ## KNX SECURE
 
-KNX-Secure is under development and **should** be ready by the end of the year. I'm collecting money to buy a KNX Secure Router. You can help me by clicking here [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square)](https://www.paypal.me/techtoday) 
+KNX-Secure is under development and **should** be ready by mid 2022. You can help me by clicking here [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square)](https://www.paypal.me/techtoday) 
 
 ## HELP, SAMPLES, TROUBLESHOOT, WIKI, FAQ, BEST PRACTICES
 

package/nodes/knxUltimate-config.js

@@ -758,7 +758,9 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                     // Start the timer to do initial read.
                     if (node.timerDoInitialRead !== null) clearTimeout(node.timerDoInitialRead);
                     node.timerDoInitialRead = setTimeout(DoInitialReadFromKNXBusOrFile, 6000); // 17/02/2020 Do initial read of all nodes requesting initial read
-                    node.setAllClientsStatus("Connected", "green", "Wait for telegrams.")
+                    setTimeout(() => {
+                        node.setAllClientsStatus("Connected.", "green", "On duty.")
+                    }, 500);                    
                     if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info("knxUltimate-config: Connected to %o", info);
                 });
                 node.knxConnection.on(knx.KNXClient.KNXClientEvents.connecting, info => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-knx-ultimate",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "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",