node-red-contrib-knx-ultimate 1.3.6 → 1.3.7

package/CHANGELOG.md

@@ -4,7 +4,12 @@
 
 <br/>
 <p>
-<b>Version 1.3.5</b> - December 2021<br/>
+<b>Version 1.3.7</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/>
+</p>
+<p>
+<b>Version 1.3.5 - REMOVED FROM REPO due to "Disconnected by Message length mismatch 8/16" error</b> - December 2021<br/>
 - New KNX Engine has been enabled again, after fixing some glitches.<br/>
 </p>
 <p>

package/KNXEngine/KNXClient.js

@@ -205,7 +205,7 @@ class KNXClient extends EventEmitter {
         let adpu = {};
         DPTLib.populateAPDU(_data, adpu, _dptid);
         let iDatapointType = parseInt(_dptid.substr(0, _dptid.indexOf(".")));
-        let isSixBits = adpu.bitlength <= 6; 
+        let isSixBits = adpu.bitlength <= 6;
         //let isSixBits = [1,2,3,5,9,10,11,14,18].includes(iDatapointType);
         //console.log("isSixBits", isSixBits, "Includes (should be = isSixBits)", [1, 2, 3, 5, 9, 10, 11, 14, 18].includes(iDatapointType), "ADPU BitLenght", adpu.bitlength);
         try {
@@ -248,10 +248,16 @@ class KNXClient extends EventEmitter {
                     if (knxPacket.cEMIMessage.npdu.isGroupRead) sTPCI = "Read";
                     if (knxPacket.cEMIMessage.npdu.isGroupResponse) sTPCI = "Response";
                     if (knxPacket.cEMIMessage.npdu.isGroupWrite) sTPCI = "Write";
-                    this.sysLogger.debug("Sending KNX packet: " + knxPacket.constructor.name + " Host:" + this._peerHost + ":" + this._peerPort + " channelID:" + knxPacket.channelID + " seqCounter:" + knxPacket.seqCounter + " Dest:" + knxPacket.cEMIMessage.dstAddress.toString(), " Data:" + knxPacket.cEMIMessage.npdu.dataValue.toString("hex") + " TPCI:" + sTPCI);
+                    // Composing debug string
+                    let sDebugString = "???";
+                    try {
+                        sDebugString = "Data: " + JSON.stringify(knxPacket.cEMIMessage.npdu);
+                        sDebugString += " srcAddress: " + knxPacket.cEMIMessage.srcAddress.toString();
+                        sDebugString += " dstAddress: " + knxPacket.cEMIMessage.dstAddress.toString();
+                    } catch (error) { }
+                    this.sysLogger.debug("Sending KNX packet: " + knxPacket.constructor.name + " " + sDebugString + " Host:" + this._peerHost + ":" + this._peerPort + " channelID:" + knxPacket.channelID + " seqCounter:" + knxPacket.seqCounter + " Dest:" + knxPacket.cEMIMessage.dstAddress.toString(), " Data:" + knxPacket.cEMIMessage.npdu.dataValue.toString("hex") + " TPCI:" + sTPCI);
                 }
             } catch (error) {
-                this.sysLogger.debug("Sending KNX packet error " + error.message || "");
             }
         }
 
@@ -261,7 +267,7 @@ class KNXClient extends EventEmitter {
             try {
                 this._clientSocket.send(knxPacket.toBuffer(), this._peerPort, this._peerHost, err => {
                     if (err) {
-                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: Send UDP: " + err.message || "Undef error");
+                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Sending KNX packet: Send UDP sending error: " + err.message || "Undef error");
                         try {
                             this.emit(KNXClientEvents.error, err);
                         } catch (error) {
@@ -270,7 +276,7 @@ class KNXClient extends EventEmitter {
 
                 });
             } catch (error) {
-                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Sending KNX packet via UDP ERROR: " + error.message + " " + typeof (knxPacket) + " seqCounter:" + knxPacket.seqCounter);
+                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Sending KNX packet: Send UDP Catch error: " + error.message + " " + typeof (knxPacket) + " seqCounter:" + knxPacket.seqCounter);
                 try {
                     //this.emit(KNXClientEvents.error, error);
                 } catch (error) {
@@ -282,13 +288,13 @@ class KNXClient extends EventEmitter {
             try {
                 this._clientSocket.write(knxPacket.toBuffer(), err => {
                     if (err) {
-                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: Send TCP: " + err.message || "Undef error");
+                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Sending KNX packet: Send TCP sending error: " + err.message || "Undef error");
                         this.emit(KNXClientEvents.error, err);
                     }
 
                 });
             } catch (error) {
-                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: Send TCP Catch: " + error.message || "Undef error");
+                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) {
@@ -767,8 +773,16 @@ class KNXClient extends EventEmitter {
 
                 if (knxTunnelingRequest.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_IND) {
 
+                    // Composing debug string
+                    let sDebugString = "???";
+                    try {
+                        sDebugString = "Data: " + JSON.stringify(knxTunnelingRequest.cEMIMessage.npdu);
+                        sDebugString += " srcAddress: " + knxTunnelingRequest.cEMIMessage.srcAddress.toString();
+                        sDebugString += " dstAddress: " + knxTunnelingRequest.cEMIMessage.dstAddress.toString();
+                    } catch (error) { }
+
                     try {
-                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING_REQUEST L_DATA_IND, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING: L_DATA_IND, " + sDebugString + " ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
                     } catch (error) { }
 
                     try {
@@ -780,7 +794,7 @@ class KNXClient extends EventEmitter {
                 else if (knxTunnelingRequest.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_CON) {
 
                     try {
-                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING_REQUEST L_DATA_CON, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING: L_DATA_CON, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
                     } catch (error) { }
 
                 }
@@ -795,7 +809,7 @@ class KNXClient extends EventEmitter {
                 }
 
                 try {
-                    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING_ACK, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingAck.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING: TUNNELING_ACK, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingAck.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
                 } catch (error) { }
 
                 this._incSeqNumber(knxTunnelingAck.seqCounter);
@@ -804,7 +818,7 @@ class KNXClient extends EventEmitter {
                     if (this._tunnelReqTimer.get(knxTunnelingAck.seqCounter) !== null) clearTimeout(this._tunnelReqTimer.get(knxTunnelingAck.seqCounter));
                     this._tunnelReqTimer.delete(knxTunnelingAck.seqCounter);
                     try {
-                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("_processInboundMessage: DELETED_TUNNELING_ACK FROM PENDING ACK's, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingAck.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING: DELETED_TUNNELING_ACK FROM PENDING ACK's, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingAck.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
                     } catch (error) { }
                 }
                 else {
@@ -812,16 +826,30 @@ class KNXClient extends EventEmitter {
                     // Avoid warning if the KNXEngine is set to ignore ACK's telegrams
                     if (!this._options.suppress_ack_ldatareq) {
                         try {
-                            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("_processInboundMessage: Unexpected Tunnel Ack with seqCounter = " + knxTunnelingAck.seqCounter);
+                            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Received KNX packet: TUNNELING: Unexpected Tunnel Ack with seqCounter = " + knxTunnelingAck.seqCounter);
                         } catch (error) { }
                         //this.emit(KNXClientEvents.error, `Unexpected Tunnel Ack ${knxTunnelingAck.seqCounter}`);
                     }
                 }
 
             } else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.ROUTING_INDICATION) {
+
                 // 07/12/2021 Multicast routing indication
                 const knxRoutingInd = knxMessage;
                 if (knxRoutingInd.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_IND) {
+
+                    // Composing debug string
+                    let sDebugString = "???";
+                    try {
+                        sDebugString = "Data: " + JSON.stringify(knxRoutingInd.cEMIMessage.npdu);
+                        sDebugString += " srcAddress: " + knxRoutingInd.cEMIMessage.srcAddress.toString();
+                        sDebugString += " dstAddress: " + knxRoutingInd.cEMIMessage.dstAddress.toString();
+                    } catch (error) { }
+
+                    try {
+                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: ROUTING: L_DATA_IND, " + sDebugString + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                    } catch (error) { }
+
                     try {
                         this.emit(KNXClientEvents.indication, knxRoutingInd, false, msg.toString("hex"));
                     } catch (error) {
@@ -829,6 +857,10 @@ class KNXClient extends EventEmitter {
                 }
                 else if (knxRoutingInd.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_CON) {
 
+                    try {
+                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: ROUTING: L_DATA_CON, Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                    } catch (error) { }
+
                 }
 
             } else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.ROUTING_LOST_MESSAGE) {

package/KNXEngine/protocol/KNXHeader.js

@@ -1,13 +1,13 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KNXHeader = void 0;
-const KNXConstants_1 = require("./KNXConstants");
+const KNXConstants = require("./KNXConstants");
 class KNXHeader {
     constructor(type, length) {
-        this._headerLength = KNXConstants_1.KNX_CONSTANTS.HEADER_SIZE_10;
-        this._version = KNXConstants_1.KNX_CONSTANTS.KNXNETIP_VERSION_10;
+        this._headerLength = KNXConstants.KNX_CONSTANTS.HEADER_SIZE_10;
+        this._version = KNXConstants.KNX_CONSTANTS.KNXNETIP_VERSION_10;
         this.service_type = type;
-        this.length = KNXConstants_1.KNX_CONSTANTS.HEADER_SIZE_10 + length;
+        this.length = KNXConstants.KNX_CONSTANTS.HEADER_SIZE_10 + length;
     }
     get headerLength() {
         return this._headerLength;
@@ -16,16 +16,16 @@ class KNXHeader {
         return this._version;
     }
     static createFromBuffer(buffer, offset = 0) {
-        if (buffer.length < KNXConstants_1.KNX_CONSTANTS.HEADER_SIZE_10) {
+        if (buffer.length < KNXConstants.KNX_CONSTANTS.HEADER_SIZE_10) {
             throw new Error('Incomplete buffer');
         }
         const header_length = buffer.readUInt8(offset);
-        if (header_length !== KNXConstants_1.KNX_CONSTANTS.HEADER_SIZE_10) {
+        if (header_length !== KNXConstants.KNX_CONSTANTS.HEADER_SIZE_10) {
             throw new Error(`Invalid buffer length ${header_length}`);
         }
         offset += 1;
         const version = buffer.readUInt8(offset);
-        if (version !== KNXConstants_1.KNX_CONSTANTS.KNXNETIP_VERSION_10) {
+        if (version !== KNXConstants.KNX_CONSTANTS.KNXNETIP_VERSION_10) {
             throw new Error(`Unknown version ${version}`);
         }
         offset += 1;

package/package.json

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

package/_config.yml

@@ -1 +0,0 @@
-theme: jekyll-theme-hacker