node-red-contrib-knx-ultimate 3.2.0 → 3.2.1

package/nodes/knxUltimate.js

@@ -1,4 +1,13 @@
 
+// 10/09/2024 Setup the color logger
+loggerSetup = (options) => {
+  let clog = require("node-color-log").createNamedLogger(options.setPrefix);
+  clog.setLevel(options.loglevel);
+  clog.setDate(() => (new Date()).toLocaleString());
+  return clog;
+}
+
+
 /* eslint-disable max-len */
 module.exports = function (RED) {
   const _ = require('lodash');
@@ -9,9 +18,9 @@ module.exports = function (RED) {
   function knxUltimate(config) {
     RED.nodes.createNode(this, config);
     const node = this;
-    node.server = RED.nodes.getNode(config.server);
+    node.serverKNX = RED.nodes.getNode(config.server);
     // 11/11/2021 Is the node server disabled by the flow "disable" command?
-    if (node.server === null) {
+    if (node.serverKNX === null) {
       node.status({ fill: 'red', shape: 'dot', text: '[THE GATEWAY NODE HAS BEEN DISABLED]' });
       return;
     }
@@ -21,7 +30,7 @@ module.exports = function (RED) {
       fill, shape, text, payload, GA, dpt, devicename,
     }) => {
       try {
-        if (node.server == null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return; }
+        if (node.serverKNX === null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return; }
         if (node.icountMessageInWindow == -999) return; // Locked out, doesn't change status.
         const dDate = new Date();
         // 30/08/2019 Display only the things selected in the config
@@ -32,11 +41,11 @@ module.exports = function (RED) {
         node.status({ fill, shape, text: `${GA + payload + (node.listenallga === true ? ` ${devicename}` : '')} (${dDate.getDate()}, ${dDate.toLocaleTimeString()} ${text}` });
         // 16/02/2020 signal errors to the server
         if (fill.toUpperCase() === 'RED') {
-          if (node.server) {
+          if (node.serverKNX) {
             const oError = {
               nodeid: node.id, topic: node.outputtopic, devicename, GA, text,
             };
-            node.server.reportToWatchdogCalledByKNXUltimateNode(oError);
+            node.serverKNX.reportToWatchdogCalledByKNXUltimateNode(oError);
           }
         }
         // Validate the Address to advise the user. The address can be undefined, because the
@@ -119,7 +128,7 @@ module.exports = function (RED) {
     node.passthrough = (typeof config.passthrough === 'undefined' ? 'no' : config.passthrough);
     node.inputmessage = {}; // Stores the input message to be passed through
     node.timerTTLInputMessage = null; // The stored node.inputmessage has a ttl.
-    node.sysLogger = require('./utils/sysLogger.js').get({ loglevel: node.server.loglevel || 'error' }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
+    node.sysLogger = loggerSetup({ loglevel: node.serverKNX.loglevel, setPrefix: "knxUltimate.js" }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
     node.sendMsgToKNXCode = config.sendMsgToKNXCode || undefined;
     node.receiveMsgFromKNXCode = config.receiveMsgFromKNXCode || undefined;
     if (node.sendMsgToKNXCode === '') node.sendMsgToKNXCode = undefined
@@ -144,7 +153,7 @@ module.exports = function (RED) {
         const blankSpacePosition = _ga.indexOf(" ");
         if (blankSpacePosition > -1) _ga = _ga.substring(0, blankSpacePosition);
         // Is there a GA in the server's exposedGAs?
-        const found = node.server.exposedGAs.find(a => a.ga === _ga);
+        const found = node.serverKNX.exposedGAs.find(a => a.ga === _ga);
         if (found !== undefined) {
           if (_dpt === undefined && found.dpt === undefined) {
             const errM = 'knxUltimate: getGaValue: node ID:' + node.id + ' ' + 'No CSV file imported. Please provide the dpt manually';
@@ -175,7 +184,7 @@ module.exports = function (RED) {
         if (blankSpacePosition > -1) _ga = _ga.substring(0, blankSpacePosition);
         if (_dpt === undefined) {
           // Try getting dpt from ETS CSV
-          const found = node.server.exposedGAs.find(a => a.ga === _ga);
+          const found = node.serverKNX.exposedGAs.find(a => a.ga === _ga);
           if (found === undefined || found.dpt === undefined) {
             const errM = 'knxUltimate: setGAValue: node ID:' + node.id + ' ' + 'No CSV file imported. Please provide the dpt manually';
             RED.log.error(errM);
@@ -183,7 +192,7 @@ module.exports = function (RED) {
             return;
           }
         }
-        node.server.writeQueueAdd({
+        node.serverKNX.sendKNXTelegramToKNXEngine({
           grpaddr: _ga, payload: _value, dpt: _dpt, outputtype: 'write', nodecallerid: node.id,
         });
       } catch (error) {
@@ -195,7 +204,7 @@ module.exports = function (RED) {
     // Used in the KNX Function TAB
     let self = function self(_value) {
       try {
-        node.server.writeQueueAdd({
+        node.serverKNX.sendKNXTelegramToKNXEngine({
           grpaddr: node.topic, payload: _value, dpt: node.dpt, outputtype: 'write', nodecallerid: node.id,
         });
       } catch (error) {
@@ -208,7 +217,7 @@ module.exports = function (RED) {
     let toggle = function toggle() {
       if (node.currentPayload === true || node.currentPayload === false) {
         try {
-          node.server.writeQueueAdd({
+          node.serverKNX.sendKNXTelegramToKNXEngine({
             grpaddr: node.topic, payload: !node.currentPayload, dpt: node.dpt, outputtype: 'write', nodecallerid: node.id,
           });
         } catch (error) {
@@ -257,7 +266,7 @@ module.exports = function (RED) {
 
     node.on('input', (msg) => {
       if (typeof msg === 'undefined') return;
-      if (!node.server) return; // 29/08/2019 Server not instantiate
+      if (!node.serverKNX) return; // 29/08/2019 Server not instantiate
 
       // 11/01/2021 Accept properties change from msg
       // *********************************
@@ -339,7 +348,7 @@ module.exports = function (RED) {
           node.setNodeStatus({
             fill: 'grey', shape: 'dot', text: 'Read', payload: '', GA: grpaddr, dpt: '', devicename: '',
           });
-          node.server.writeQueueAdd({
+          node.serverKNX.sendKNXTelegramToKNXEngine({
             grpaddr, payload: '', dpt: '', outputtype: 'read', nodecallerid: node.id,
           });
         } else { // Listen all GAs
@@ -358,16 +367,16 @@ module.exports = function (RED) {
                 return;
               }
             }
-            node.server.writeQueueAdd({
+            node.serverKNX.sendKNXTelegramToKNXEngine({
               grpaddr, payload: '', dpt: '', outputtype: 'read', nodecallerid: node.id,
             });
           } else {
             // Issue read to all group addresses
             // 25/10/2019 the user is able not import the csv, so i need to check for it. This option should be unckecked by the knxUltimate html config, but..
-            if (typeof node.server.csv !== 'undefined') {
+            if (typeof node.serverKNX.csv !== 'undefined') {
               let delay = 0;
-              for (let index = 0; index < node.server.csv.length; index++) {
-                const element = node.server.csv[index];
+              for (let index = 0; index < node.serverKNX.csv.length; index++) {
+                const element = node.serverKNX.csv[index];
                 const grpaddr = element.ga;
                 // 29/12/2020 Protection over circular references (for example, if you link two Ultimate Nodes toghether with the same group address), to prevent infinite loops
                 if (msg.hasOwnProperty('knx')) {
@@ -378,7 +387,7 @@ module.exports = function (RED) {
                     });
                   }
                 } else {
-                  node.server.writeQueueAdd({
+                  node.serverKNX.sendKNXTelegramToKNXEngine({
                     grpaddr, payload: '', dpt: '', outputtype: 'read', nodecallerid: node.id,
                   });
                   const t = setTimeout(() => { // 21/03/2022 fixed possible memory leak. Previously was setTimeout without "let t = ".
@@ -437,7 +446,7 @@ module.exports = function (RED) {
         node.icountMessageInWindow += 1;
 
         // OUTPUT: Send message to the bus (write/response)
-        if (node.server.knxConnection) {
+        if (node.serverKNX.knxConnection) {
           let { outputtype } = node;
           let grpaddr = '';
           let dpt = '';
@@ -465,8 +474,8 @@ module.exports = function (RED) {
               // No datapoint set. If the CSV is loaded, try to get it from there.
               if (!msg.hasOwnProperty('writeraw')) { // In raw mode, Datapoint is useless
                 // Get the datapoint from the CSV
-                if (typeof node.server.csv !== 'undefined') {
-                  const oGA = node.server.csv.filter((sga) => sga.ga == grpaddr)[0];
+                if (typeof node.serverKNX.csv !== 'undefined') {
+                  const oGA = node.serverKNX.csv.filter((sga) => sga.ga == grpaddr)[0];
                   if (oGA !== undefined) {
                     dpt = oGA.dpt;
                   } else {
@@ -513,9 +522,9 @@ module.exports = function (RED) {
           if (msg.hasOwnProperty('writeraw') && msg.hasOwnProperty('writeraw') !== null) {
             try {
               if (msg.hasOwnProperty('bitlenght') && msg.bitlenght !== null) {
-                node.server.knxConnection.writeRaw(grpaddr, msg.writeraw, msg.bitlenght);
+                node.serverKNX.knxConnection.writeRaw(grpaddr, msg.writeraw, msg.bitlenght);
               } else {
-                node.server.knxConnection.writeRaw(grpaddr, msg.writeraw);
+                node.serverKNX.knxConnection.writeRaw(grpaddr, msg.writeraw);
               }
               node.setNodeStatus({
                 fill: 'green', shape: 'dot', text: 'RAW Write', payload: '', GA: grpaddr, dpt: '', devicename: '',
@@ -531,7 +540,7 @@ module.exports = function (RED) {
           if (outputtype == 'response') {
             try {
               node.currentPayload = msg.payload;// 31/12/2019 Set the current value (because, if the node is a virtual device, then it'll never fire "GroupValue_Write" in the server node, causing the currentPayload to never update)
-              node.server.writeQueueAdd({
+              node.serverKNX.sendKNXTelegramToKNXEngine({
                 grpaddr, payload: msg.payload, dpt, outputtype, nodecallerid: node.id,
               });
               node.setNodeStatus({
@@ -542,7 +551,7 @@ module.exports = function (RED) {
             // 05/01/2021 Updates only the internal currentPayload value.
             try {
               node.currentPayload = msg.payload;
-              node.server.writeQueueAdd({
+              node.serverKNX.sendKNXTelegramToKNXEngine({
                 grpaddr, payload: msg.payload, dpt, outputtype, nodecallerid: node.id,
               });
               node.setNodeStatus({
@@ -552,8 +561,8 @@ module.exports = function (RED) {
           } else {
             try {
               node.currentPayload = msg.payload;// 31/12/2019 Set the current value (because, if the node is a virtual device, then it'll never fire "GroupValue_Write" in the server node, causing the currentPayload to never update)
-              // if (node.server.linkStatus === "connected") {
-              node.server.writeQueueAdd({
+              // if (node.serverKNX.linkStatus === "connected") {
+              node.serverKNX.sendKNXTelegramToKNXEngine({
                 grpaddr, payload: msg.payload, dpt, outputtype, nodecallerid: node.id,
               });
               node.setNodeStatus({
@@ -571,8 +580,8 @@ module.exports = function (RED) {
     node.on('close', (done) => {
       if (node.timerTTLInputMessage !== null) clearTimeout(node.timerTTLInputMessage);
       node.inputmessage = {};
-      if (node.server) {
-        node.server.removeClient(node);
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node);
         try {
           if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info(`knxUltimate: Close: node id ${node.id} with topic ${node.topic || ''} has been removed from the server.`);
         } catch (error) { }
@@ -581,15 +590,15 @@ module.exports = function (RED) {
     });
 
     // On each deploy, add the node to the server list
-    if (node.server) {
-      node.server.addClient(node);
+    if (node.serverKNX) {
+      node.serverKNX.addClient(node);
       if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info(`knxUltimate: addClient: node id ${node.id}` || '' + ` with topic ${node.topic || ''} has been added to the server.`);
       // 05/11/2021 if the node is set to read from bus, issue a read.
       // "node-input-initialread0": "No",
       // "node-input-initialread1": "Leggi dal BUS KNX",
       // "node-input-initialread2": "Leggi l'ultimo valore salvato su file prima della disconnessione.",
       // "node-input-initialread3": "Leggi l'ultimo valore salvato su file prima della disconnessione. Se inesistente, leggi dal BUS KNX",
-      if (node.server.linkStatus === 'connected' && node.initialread === 1 || node.initialread === 3) {
+      if (node.serverKNX.linkStatus === 'connected' && node.initialread === 1 || node.initialread === 3) {
         node.setNodeStatus({
           fill: 'yellow', shape: 'dot', text: 'Get value from BUS.', payload: '', GA: node.topic || '', dpt: '', devicename: '',
         });

package/nodes/knxUltimateAlerter.js

@@ -1,4 +1,5 @@
 
+
 module.exports = function (RED) {
   function knxUltimateAlerter(config) {
     const fs = require('fs');
@@ -9,7 +10,7 @@ module.exports = function (RED) {
 
     RED.nodes.createNode(this, config);
     const node = this;
-    node.server = RED.nodes.getNode(config.server);
+    node.serverKNX = RED.nodes.getNode(config.server);
     node.name = config.name || 'KNX Alerter';
     node.listenallga = true; // Dont' remove this.
     node.notifyreadrequest = false;
@@ -27,22 +28,17 @@ module.exports = function (RED) {
     node.timerSend = null;
     node.whentostart = config.whentostart === undefined ? 'ifnewalert' : config.whentostart;
     node.timerinterval = (config.timerinterval === undefined || config.timerinterval == '') ? '2' : config.timerinterval;
+
     if (config.initialreadGAInRules === undefined) {
       node.initialread = true;
     } else {
       node.initialread = config.initialreadGAInRules !== '0';
     }
 
-    try {
-      node.sysLogger = require('./utils/sysLogger.js').get({ loglevel: node.server.loglevel || 'error' }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
-    } catch (error) {
-      node.sysLogger = 'error';
-    }
-
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload, GA, dpt, devicename }) => {
       try {
-        if (node.server === null) return;
+        if (node.serverKNX === null) return;
         // Log only service statuses, not the GA values
         if (dpt !== undefined) return;
         if (dpt !== '') return;
@@ -159,7 +155,7 @@ module.exports = function (RED) {
 
     // 24/04/2021 perform a read on all GA in the rule list. Called both from node.on("input") and knxUltimate-config
     node.initialReadAllDevicesInRules = () => {
-      if (node.server) {
+      if (node.serverKNX) {
         let grpaddr = '';
         for (let i = 0; i < node.rules.length; i++) {
           // rule is { topic: rowRuleTopic, devicename: rowRuleDeviceName, longdevicename: rowRuleLongDeviceName}
@@ -170,7 +166,7 @@ module.exports = function (RED) {
             // Check if it's a group address
             // const ret = Address.KNXAddress.createFromString(grpaddr, Address.KNXAddress.TYPE_GROUP)
             node.setLocalStatus({ fill: 'grey', shape: 'dot', text: 'Read', payload: '', GA: grpaddr, dpt: '', devicename: rule.devicename });
-            node.server.writeQueueAdd({ grpaddr, payload: '', dpt: '', outputtype: 'read', nodecallerid: node.id });
+            node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr, payload: '', dpt: '', outputtype: 'read', nodecallerid: node.id });
           } catch (error) {
             node.setLocalStatus({ fill: 'grey', shape: 'dot', text: 'Not a KNX GA ' + error.message, payload: '', GA: grpaddr, dpt: '', devicename: rule.devicename });
           }
@@ -216,8 +212,8 @@ module.exports = function (RED) {
 
     node.on('close', function (done) {
       clearTimeout(node.timerSend);
-      if (node.server) {
-        node.server.removeClient(node);
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node);
       }
       done();
     });
@@ -276,10 +272,10 @@ module.exports = function (RED) {
     node.sendNoMoreDevices();
 
     // On each deploy, unsubscribe+resubscribe
-    if (node.server) {
-      node.server.removeClient(node);
+    if (node.serverKNX) {
+      node.serverKNX.removeClient(node);
       if (node.topic !== '' || node.topicSave !== '') {
-        node.server.addClient(node);
+        node.serverKNX.addClient(node);
       }
     }
   }

package/nodes/knxUltimateAutoResponder.js

@@ -1,3 +1,11 @@
+// 10/09/2024 Setup the color logger
+loggerSetup = (options) => {
+  let clog = require("node-color-log").createNamedLogger(options.setPrefix);
+  clog.setLevel(options.loglevel);
+  clog.setDate(() => (new Date()).toLocaleString());
+  return clog;
+}
+
 module.exports = function (RED) {
   const dptlib = require('knxultimate').dptlib;
   const fs = require("fs");
@@ -33,7 +41,7 @@ module.exports = function (RED) {
   function knxUltimateAutoResponder(config) {
     RED.nodes.createNode(this, config)
     const node = this
-    node.server = RED.nodes.getNode(config.server)
+    node.serverKNX = RED.nodes.getNode(config.server)
     node.topic = node.name
     node.name = config.name === undefined ? 'Auto responder' : config.name
     node.outputtopic = node.name
@@ -48,12 +56,12 @@ module.exports = function (RED) {
     node.inputRBE = 'false' // Apply or not RBE to the input (Messages coming from BUS)
     node.exposedGAs = [];
     node.commandText = []; // Raw list Respond To
-    node.sysLogger = require('./utils/sysLogger.js').get({ loglevel: node.server.loglevel || 'error' }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
+    node.sysLogger = loggerSetup({ loglevel: node.serverKNX.loglevel, setPrefix: "knxUltimateAutoResponder.js" }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
 
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload, GA, dpt, devicename }) => {
       // try {
-      //   if (node.server == null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
+      //   if (node.serverKNX === null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
       //   GA = GA === undefined ? '' : GA
       //   payload = payload === undefined ? '' : payload
       //   payload = typeof payload === 'object' ? JSON.stringify(payload) : payload
@@ -64,7 +72,7 @@ module.exports = function (RED) {
     }
 
     node.saveExposedGAs = () => {
-      const sFile = path.join(node.server.userDir, "knxpersistvalues", "knxpersist" + node.id + ".json");
+      const sFile = path.join(node.serverKNX.userDir, "knxpersistvalues", "knxpersist" + node.id + ".json");
       try {
         if (node.exposedGAs.length > 0) {
           fs.writeFileSync(sFile, JSON.stringify(node.exposedGAs));
@@ -75,7 +83,7 @@ module.exports = function (RED) {
       }
     }
     node.loadExposedGAs = () => {
-      const sFile = path.join(node.server.userDir, "knxpersistvalues", "knxpersist" + node.id + ".json");
+      const sFile = path.join(node.serverKNX.userDir, "knxpersistvalues", "knxpersist" + node.id + ".json");
       try {
         node.exposedGAs = JSON.parse(fs.readFileSync(sFile, "utf8"));
       } catch (err) {
@@ -96,11 +104,11 @@ module.exports = function (RED) {
 
 
     // Add the ETS CSV file list to exposedGAs
-    if (node.server.csv === undefined || node.server.csv === '' || node.server.csv.length === 0) {
+    if (node.serverKNX.csv === undefined || node.serverKNX.csv === '' || node.serverKNX.csv.length === 0) {
       node.status({ fill: 'grey', shape: 'ring', text: 'No ETS file imported', payload: '', dpt: '', devicename: '' });
       //return;
     } else {
-      node.server.csv.forEach(element => {
+      node.serverKNX.csv.forEach(element => {
         const curGa = node.exposedGAs.find(a => a.address === element.ga);
         if (curGa === undefined) {
           node.exposedGAs.push({ address: element.ga, dpt: element.dpt, default: undefined, payload: undefined, enabled: false }); // "enabled" will be used to filter only the node.commandText directiver
@@ -198,7 +206,7 @@ module.exports = function (RED) {
           if (retVal !== undefined) {
             const dDate = new Date()
             if (oFoundGA.address !== undefined && oFoundGA.dpt !== undefined && retVal !== undefined) {
-              node.server.writeQueueAdd({ grpaddr: oFoundGA.address, payload: retVal, dpt: oFoundGA.dpt, outputtype: 'response', nodecallerid: node.id });
+              node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr: oFoundGA.address, payload: retVal, dpt: oFoundGA.dpt, outputtype: 'response', nodecallerid: node.id });
               node.status({ fill: 'blue', shape: 'dot', text: 'Respond ' + oFoundGA.address + ' => ' + retVal + ' (' + dDate.getDate() + ', ' + dDate.toLocaleTimeString() + ')' })
             } else {
               node.status({ fill: 'yellow', shape: 'ring', text: 'Issue responding ' + oFoundGA.address + ' => ' + retVal + ' (' + dDate.getDate() + ', ' + dDate.toLocaleTimeString() + ')' })
@@ -221,16 +229,16 @@ module.exports = function (RED) {
       }
 
       node.exposedGAs = [];
-      if (node.server) {
-        node.server.removeClient(node)
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node)
       }
       done()
     })
 
     // On each deploy, unsubscribe+resubscribe
-    if (node.server) {
-      node.server.removeClient(node)
-      node.server.addClient(node)
+    if (node.serverKNX) {
+      node.serverKNX.removeClient(node)
+      node.serverKNX.addClient(node)
     }
   }
   RED.nodes.registerType('knxUltimateAutoResponder', knxUltimateAutoResponder)

package/nodes/knxUltimateGarageDoorBarrierOpener.js

@@ -4,14 +4,22 @@ const _ = require('lodash');
 const KNXUtils = require('knxultimate').KNXUtils;
 const payloadRounder = require('./utils/payloadManipulation');
 
+// 10/09/2024 Setup the color logger
+loggerSetup = (options) => {
+  let clog = require("node-color-log").createNamedLogger(options.setPrefix);
+  clog.setLevel(options.loglevel);
+  clog.setDate(() => (new Date()).toLocaleString());
+  return clog;
+}
+
 module.exports = function (RED) {
 
   function knxUltimateGarageDoorBarrierOpener(config) {
     RED.nodes.createNode(this, config);
     const node = this;
-    node.server = RED.nodes.getNode(config.server);
+    node.serverKNX = RED.nodes.getNode(config.server);
     // 11/11/2021 Is the node server disabled by the flow "disable" command?
-    if (node.server === null) {
+    if (node.serverKNX === null) {
       node.status({ fill: 'red', shape: 'dot', text: '[THE GATEWAY NODE HAS BEEN DISABLED]' });
       return;
     }
@@ -26,7 +34,7 @@ module.exports = function (RED) {
     node.initialread = false;
     node.listenallga = true; // Don't remove
     node.outputtype = 'write';
-    node.sysLogger = require('./utils/sysLogger.js').get({ loglevel: node.server.loglevel || 'error' }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
+    node.sysLogger = loggerSetup({ loglevel: node.serverKNX.loglevel, setPrefix: "knxUltimateGarageDoorOpener.js" }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
 
     // From KNX to the node
     node.GACommand = config.GACommand === undefined ? "" : config.GACommand;
@@ -70,7 +78,7 @@ module.exports = function (RED) {
       fill, shape, text, payload, GA, dpt, devicename,
     }) => {
       try {
-        if (node.server == null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return; }
+        if (node.serverKNX === null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return; }
         const dDate = new Date();
         // 30/08/2019 Display only the things selected in the config
         GA = (typeof GA === 'undefined' || GA === '') ? '' : `(${GA}) `;
@@ -97,7 +105,7 @@ module.exports = function (RED) {
               node.setNodeStatus({
                 fill: 'yellow', shape: 'dot', text: status, payload: '',
               });
-              node.server.writeQueueAdd({
+              node.serverKNX.sendKNXTelegramToKNXEngine({
                 grpaddr: node.GAImpulse, payload: true, dpt: '1.001', outputtype: 'write', nodecallerid: node.id
               });
               if (node.timerMovement !== null) clearTimeout(node.timerMovement);
@@ -127,12 +135,12 @@ module.exports = function (RED) {
 
     node.on('input', (msg) => {
       if (typeof msg === 'undefined') return;
-      if (!node.server) return; // 29/08/2019 Server not instantiate
+      if (!node.serverKNX) return; // 29/08/2019 Server not instantiate
     });
 
     node.on('close', (done) => {
-      if (node.server) {
-        node.server.removeClient(node);
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node);
         try {
           if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info(`knxUltimateGarageDoorBarrierOpener: Close: node id ${node.id} with topic ${node.topic || ''} has been removed from the server.`);
         } catch (error) { }

package/nodes/knxUltimateGlobalContext.js

@@ -29,7 +29,7 @@ module.exports = function (RED) {
   function knxUltimateGlobalContext(config) {
     RED.nodes.createNode(this, config)
     const node = this
-    node.server = RED.nodes.getNode(config.server)
+    node.serverKNX = RED.nodes.getNode(config.server)
     node.topic = node.name
     node.name = config.name === undefined ? 'KNXGlobalContext' : config.name
     node.outputtopic = node.name
@@ -58,7 +58,7 @@ module.exports = function (RED) {
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload, GA, dpt, devicename }) => {
       try {
-        if (node.server == null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
+        if (node.serverKNX === null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
         GA = GA === undefined ? '' : GA
         payload = payload === undefined ? '' : payload
         payload = typeof payload === 'object' ? JSON.stringify(payload) : payload
@@ -71,7 +71,7 @@ module.exports = function (RED) {
     // 02/12/2022 Expose the complete ETS CSV as well
     if (node.exposeAsVariable !== 'exposeAsVariableNO') {
       try {
-        node.server.csv.forEach(element => {
+        node.serverKNX.csv.forEach(element => {
           node.exposedGAs.push({ address: element.ga, dpt: element.dpt, devicename: element.devicename, payload: undefined })
         })
       } catch (error) {
@@ -105,7 +105,7 @@ module.exports = function (RED) {
           // 13/09/2021 retrieve the datapoint if not specified
           if (element.hasOwnProperty('dpt') === false || element.dpt === undefined || element.dpt === '') {
             try {
-              const sDPT = node.server.csv.find(item => item.ga === element.address).dpt
+              const sDPT = node.serverKNX.csv.find(item => item.ga === element.address).dpt
               element.dpt = sDPT
             } catch (error) {
               node.setNodeStatus({ fill: 'RED', shape: 'dot', text: 'Datapoint not found in CSV for ' + element.address, payload: '', GA: '', dpt: '', devicename: '' })
@@ -117,7 +117,7 @@ module.exports = function (RED) {
           }
 
           node.setNodeStatus({ fill: 'green', shape: 'dot', text: 'Write', payload: element.payload, GA: element.address, dpt: element.dpt || '', devicename: '' })
-          node.server.writeQueueAdd({ grpaddr: element.address, payload: element.payload, dpt: element.dpt || '', outputtype: 'write', nodecallerid: node.id })
+          node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr: element.address, payload: element.payload, dpt: element.dpt || '', outputtype: 'write', nodecallerid: node.id })
         }
         oContext = null // 21/03/2022
         node.goTimerGo()
@@ -167,16 +167,16 @@ module.exports = function (RED) {
     node.on('close', function (done) {
       if (node.timerExposedGAs !== null) clearTimeout(node.timerExposedGAs)
       node.exposedGAs = []
-      if (node.server) {
-        node.server.removeClient(node)
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node)
       }
       done()
     })
 
     // On each deploy, unsubscribe+resubscribe
-    if (node.server) {
-      node.server.removeClient(node)
-      node.server.addClient(node)
+    if (node.serverKNX) {
+      node.serverKNX.removeClient(node)
+      node.serverKNX.addClient(node)
     }
   }
   RED.nodes.registerType('knxUltimateGlobalContext', knxUltimateGlobalContext)

package/nodes/knxUltimateHueBattery.js

@@ -2,7 +2,7 @@ module.exports = function (RED) {
   function knxUltimateHueBattery(config) {
     RED.nodes.createNode(this, config);
     const node = this;
-    node.server = RED.nodes.getNode(config.server);
+    node.serverKNX = RED.nodes.getNode(config.server);
     node.serverHue = RED.nodes.getNode(config.serverHue);
     node.topic = node.name;
     node.name = config.name === undefined ? 'Hue' : config.name;
@@ -69,7 +69,7 @@ module.exports = function (RED) {
           knxMsgPayload.payload = _event.power_state.battery_level;
           // Send to KNX bus
           if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) {
-            node.server.writeQueueAdd({
+            node.serverKNX.sendKNXTelegramToKNXEngine({
               grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'write', nodecallerid: node.id,
             });
           }
@@ -100,16 +100,16 @@ module.exports = function (RED) {
       knxMsgPayload.payload = _level;
       // Send to KNX bus
       if (knxMsgPayload.topic !== '' && knxMsgPayload.topic !== undefined) {
-        node.server.writeQueueAdd({
+        node.serverKNX.sendKNXTelegramToKNXEngine({
           grpaddr: knxMsgPayload.topic, payload: knxMsgPayload.payload, dpt: knxMsgPayload.dpt, outputtype: 'response', nodecallerid: node.id,
         });
       }
     };
 
     // On each deploy, unsubscribe+resubscribe
-    if (node.server) {
-      node.server.removeClient(node);
-      node.server.addClient(node);
+    if (node.serverKNX) {
+      node.serverKNX.removeClient(node);
+      node.serverKNX.addClient(node);
     }
     if (node.serverHue) {
       node.serverHue.removeClient(node);
@@ -121,8 +121,8 @@ module.exports = function (RED) {
     });
 
     node.on('close', (done) => {
-      if (node.server) {
-        node.server.removeClient(node);
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node);
       }
       if (node.serverHue) {
         node.serverHue.removeClient(node);