node-red-contrib-knx-ultimate 1.2.56 → 1.2.57

package/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 <br/>
 <p>
+<b>Version 1.2.57</b> - November 2021<br/>
+- Added following datapoints:<br/>
+- 12.100 counter timesec (s)<br/>
+- 12.101 counter timemin (min)<br/>
+- 12.102 counter timehrs (h)<br/>
+- 12.1200 volume liquid (l)<br/>
+</p>
+<p>
 <b>Version 1.2.56</b> - November 2021<br/>
 - FIX: hotfix echo in tunneling mode doesn't work since 1.2.55.<br/>
 </p>

package/knxultimate-api2/src/Connection.js

@@ -26,22 +26,23 @@ const onUdpSocketMessage = function (msg /*, rinfo, callback */) {
   //   // DISCONNECT_RESPONSE:  0x020a,
   //   var pera =true;
   // }
-
+  
   try {
     let reader = KnxNetProtocol.createReader(msg)
     let dg
-
+    
     reader.KNXNetHeader('tmp')
-
+    
     if (reader.next()['tmp']) {
       dg = reader.next()['tmp']
     }
-
+    
     /* Catch broken messages       */
     if (dg) {
       /*******************************/
       // if (pera === true) console.log ("BANANA OCCHIO PERA TRUE",msg.toString("hex"),dg)
       const descr = this.datagramDesc(dg)
+      
 
       KnxLog.get().trace('(%s): Received %s message: %j', this.compositeState(), descr, dg)
 
@@ -84,7 +85,6 @@ const onUdpSocketMessage = function (msg /*, rinfo, callback */) {
     }
     /*******************************/
   } catch (err) {
-    console.trace(err)
     KnxLog.get().debug('(%s): Incomplete/unparseable UDP packet: %s: %s',
       this.compositeState(), err, msg.toString()
     );
@@ -214,17 +214,17 @@ const send = function (datagram, callback) {
 
   if (datagram.constructor !== Buffer) {
     try {
-      this.writer = KnxNetProtocol.createWriter()      
-    } catch (error) {      
+      this.writer = KnxNetProtocol.createWriter()
+    } catch (error) {
     }
 
 
     // Forge the datagram
     try {
-      ret = this.writer.KNXNetHeader(datagram)  
-    } catch (error) {      
+      ret = this.writer.KNXNetHeader(datagram)
+    } catch (error) {
     }
-    
+
 
     // Check if ret.buffer is null ==> if this.writer.KNXNetHeader() failed
     if (ret === null || ret.buffer === null) {
@@ -376,7 +376,7 @@ const Disconnect = function (/* cb */) {
     //KnxLog.get().info('Socket disconnected.');
     //console.log("BANANA Socket disconnected.")
     //this.socket.disconnect();
-  } catch (error) { 
+  } catch (error) {
     //console.log("BANANA ORRORE Socket disconnected.",error)
   }
   try {

package/knxultimate-api2/src/FSM.js

@@ -688,12 +688,13 @@ const initialize = function (options) {
   this.isTunnelConnected = false; // 08/04/2021 Supergiovane: signal that the tunnel is up or down
   this.useTunneling = options.forceTunneling || false
   this.localEchoInTunneling = typeof options.localEchoInTunneling !== "undefined" ? options.localEchoInTunneling : true; // 24/03/2021 Supergiovane (local echo of emitEvent if in tunneling mode)
+  this.isSecureKNXEnabled = options.isSecureKNXEnabled || false; // Is using KNX-Secure?
 
-  this.remoteEndpoint = {
-    addrstring: options.ipAddr,
-    addr: ipaddr.parse(options.ipAddr),
-    port: options.ipPort || 3671
-  }
+    this.remoteEndpoint = {
+      addrstring: options.ipAddr,
+      addr: ipaddr.parse(options.ipAddr),
+      port: options.ipPort || 3671
+    }
 
   let range = this.remoteEndpoint.addr.range()
   this.log.debug('initializing %s connection to %s', range, this.remoteEndpoint.addrstring)

package/knxultimate-api2/src/KnxConstants.js

@@ -229,7 +229,8 @@ KnxConstants.KNX_RSM_CMDS = {
 
 // KNX protocol version 27/07/2021
 KnxConstants.PROTOCOL_VERSION = {
-  KNXNETIP_VERSION_10 : 0x10
+  KNXNETIP_VERSION_10 : 0x10,
+  KNXNETIP_VERSION_13 : 0x13 // Secure
 }
 
 // The broadcast group address on every KNX bus

package/knxultimate-api2/src/KnxProtocol.js

@@ -855,8 +855,19 @@ KnxProtocol.define('KNXNetHeader', {
             this.buffer.length + hdr.header_length, this.total_length)
         }
         //! Sono arrivato qui
-        // 27/07/2021 check if the frame is secured
-        //hdr.isSecure = hdr.protocol_version == KnxConstants.PROTOCOL_VERSION.KNXNETIP_VERSION_10 && ((service_type & KnxConstants.KNX_SECURE.SecureWrapper) == KnxConstants.KNX_SECURE.SecureWrapper);
+        // 18/11/2021 check if the frame is secured
+       //hdr.isSecure = hdr.protocol_version == KnxConstants.PROTOCOL_VERSION.KNXNETIP_VERSION_13;
+       //console.log("BANANA HEADER",hdr);
+
+        // console.log("BANANA", this.isSecureKNXEnabled, hdr);
+        // if (this.isSecureKNXEnabled !== undefined) {
+        //   if (this.isSecureKNXEnabled && hdr.protocol_version !== KnxConstants.PROTOCOL_VERSION.KNXNETIP_VERSION_13) {
+        //     console.log("Ricevuto header non Secure, scarto");
+        //     throw new Error("Unsecure Header received while secure-knx was enabled.");
+        //   } else {
+        //     console.log("Ricevuto header Secure, procedo")
+        //   };
+        // }
 
         switch (hdr.service_type) {
           //        case SERVICE_TYPE.SEARCH_REQUEST:

package/knxultimate-api2/src/dptlib/dpt12.js

@@ -43,7 +43,19 @@ return msg;`
 exports.subtypes = {
   // 12.001 counter pulses
   "001": {
-    "name": "Counter pulses (unsigned)", "desc": "counter pulses"
+    "name": "Counter pulses (unsigned)", "desc": "Counter pulses"
+  },
+  "100": {
+    "name": "Counter timesec (s)", "desc": "Counter timesec (s)"
+  },
+  "101": {
+    "name": "Counter timemin (min)", "desc": "Counter timemin (min)"
+  },
+  "102": {
+    "name": "Counter timehrs (h)", "desc": "Counter timehrs (h)"
+  },
+  "1200": {
+    "name": "Volume liquid (l)", "desc": "Volume liquid (l)"
   },
   "1201": {
     "name": "Volume (m3)", "desc": "Volume m3"

package/nodes/knxUltimate-config.js

@@ -177,8 +177,8 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                 if (node.knxSecureSelected) {
                     node.jKNXSecureKeyring = await knx.KNXSecureKeyring.load(node.keyringFileXML, node.credentials.keyringFilePassword);
                     RED.log.info("KNX-Secure: Keyring for ETS proj " + node.jKNXSecureKeyring.ETSProjectName + ", created by " + node.jKNXSecureKeyring.ETSCreatedBy + " on " + node.jKNXSecureKeyring.ETSCreated + " succesfully validated with provided password, using node " + node.name || node.id);
-                }else{
-                    RED.log.info("KNX-Unsecure: connection to insecure interface/router using node " + node.name || node.id);                    
+                } else {
+                    RED.log.info("KNX-Unsecure: connection to insecure interface/router using node " + node.name || node.id);
                 }
             })();
         } catch (error) {
@@ -612,7 +612,7 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
         };
 
 
-        //08/10/2021 Called from the Watchdog or other nodes needing to set the properties
+        // 08/10/2021 
         var knxConnectionProperties = null;
         setKnxConnectionProperties = () => {
             // 25/08/2021 Moved out of node.initKNXConnection 
@@ -627,6 +627,7 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                 autoReconnect: false,
                 reconnectDelayMs: 5000,
                 manualConnect: true,
+                isSecureKNXEnabled: node.knxSecureSelected,
                 TTL: 128, // 11/11/2021 Supergiovane: added adjustable TTL (128 is wrote on the Gira Router PDF user manual)
                 //minimumDelay: 60, // With api2 it works again, but better handling it on knx-ultimate queue
                 handlers: {
@@ -989,7 +990,7 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                                     msg.previouspayload = typeof input.currentPayload !== "undefined" ? input.currentPayload : ""; // 24/01/2020 Added previous payload
                                     input.currentPayload = msg.payload;// Set the current value for the RBE input
                                     input.setNodeStatus({ fill: "green", shape: "dot", text: "", payload: msg.payload, GA: input.topic, dpt: input.dpt, devicename: "" });
-                                    input.handleSend(msg);                                    
+                                    input.handleSend(msg);
                                 };
                             };
                         });

package/package.json

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