node-red-contrib-knx-ultimate 2.5.0 → 3.0.0-beta1

package/nodes/utils/payloadManipulation.js

@@ -2,7 +2,7 @@
   * @param {object} [_oNode]
   * @param {any} [jsValue]
   */
-exports.Manipulate = function roundPayload (_oNode, jsValue) {
+exports.Manipulate = function roundPayload(_oNode, jsValue) {
   // 19/01/2023 FORMATTING THE OUTPUT PAYLOAD BASED ON SINGLE NODE SETUP
   //* ********************************************************
   // Formatting the msg output value
@@ -38,3 +38,51 @@ exports.Manipulate = function roundPayload (_oNode, jsValue) {
   }
   //* ********************************************************
 }
+
+// KNXULtimate nodes
+module.exports.KNXULtimateChangeConfigByInputMSG = function KNXULtimateChangeConfigByInputMSG(msg, node, config) {
+
+  if (!msg.setConfig.hasOwnProperty('setGroupAddress') || !msg.setConfig.hasOwnProperty('setDPT')) {
+    node.setNodeStatus({
+      fill: 'red', shape: 'ring', text: `setGroupAddress and setDPT are mandatory`, payload: '', GA: '', dpt: '', devicename: '',
+    });
+    return;
+  }
+
+  // Set DPT
+  node.dpt = msg.setConfig.setDPT;
+  config.dpt = msg.setConfig.setDPT;
+
+  // SET GORUP ADDRESS
+  node.topic = msg.setConfig.setGroupAddress;
+  config.topic = msg.setConfig.setGroupAddress
+  node.outputtopic = (config.outputtopic === undefined || config.outputtopic === '') ? msg.setConfig.setGroupAddress : config.outputtopic; // 07/02/2020 Importante, per retrocompatibilità
+  config.outputtopic = node.outputtopic;
+
+  // Read from the ETS file, the missing props
+  if (node.server.csv !== undefined && node.server.csv !== null) {
+    // Read it from ETS File
+    const found = node.server.csv.find(item => item.ga === msg.setConfig.setGroupAddress);
+    if (found !== undefined) {
+      if (msg.setConfig.setDPT === 'auto') {
+        node.dpt = found.dpt; // SET THE DPT
+        config.dpt = found.dpt;
+      }
+      node.name = found.devicename;
+      config.name = found.devicename;
+    }
+  }
+  // If DPT is still "auto", something has going wrong
+  if (node.dpt === 'auto') {
+    // Unable to retrieve the datapoint
+    node.setNodeStatus({
+      fill: 'red', shape: 'ring', text: `Unable to retrieve the datapoint from the ETS file`, payload: '', GA: '', dpt: '', devicename: '',
+    });
+    if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error(`knxUltimate: setConfig: Node.id: ${node.id} error: Unable to retrieve the datapoint from the ETS file`);
+  } else {
+    node.setNodeStatus({
+      fill: 'blue', shape: 'ring', text: `Config changed. Current GA: ${node.topic} DPT: ${node.dpt}`, payload: '', GA: '', dpt: '', devicename: node.name,
+    });
+  }
+
+};

package/nodes/utils/utils.js

@@ -53,5 +53,9 @@ module.exports.fetchFromObject = function fetchFromObject(
   if (typeof _msg[_payloadPropName] === "object") return undefined;
   return _msg[_payloadPropName];
 };
+
+
 const DEFAULTTRANSLATIONINPUT =
   "on:true\noff:false\nactive:true\ninactive:false\nopen:true\nclosed:false\nclose:false\n1:true\n0:false\ntrue:true\nfalse:false\nhome:true\nnot_home:false\nnormal:false\nviolated:true";
+
+

package/package.json

@@ -3,13 +3,15 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "2.5.0",
+  "version": "3.0.0-beta1",
   "description": "Control your KNX intallation via Node-Red! A bunch of KNX nodes, with integrated Philips HUE control and ETS group address importer. Easy to use and highly configurable.",
   "dependencies": {
     "binary-parser": "2.2.1",
     "crypto-js": "4.2.0",
     "dns-sync": "0.2.1",
     "eventsource": "2.0.2",
+    "js-yaml": "4.1.0",
+    "knxultimate": ">=2.3.3",
     "lodash": "4.17.21",
     "log-driver": "1.2.7",
     "mkdirp": "3.0.1",
@@ -17,8 +19,7 @@
     "path": "0.12.7",
     "ping": "0.4.4",
     "simple-get": "4.0.1",
-    "xml2js": "0.6.0",
-    "js-yaml": "4.1.0"
+    "xml2js": "0.6.0"
   },
   "node-red": {
     "version": ">=3.1.1",

package/resources/htmlUtils.js

@@ -0,0 +1,27 @@
+// 31/03/2020 Search Helper
+function htmlUtilsfullCSVSearch(sourceText, searchString) {
+    let aSearchWords = [];
+    if (searchString.toLowerCase().includes('exactmatch')) {
+        // Find only the strict exact match of group address. For example, if the string is 0/0/2exactmatch, i return only the item in the csv having
+        // group address 0/0/2 (and not also, for example 0/0/20)
+        // I can have also an exact string like '0/0/1exactmatch 1.000', (GA or any text, plus the datapoint) and i must take it into consideration
+        let aSearchStrings = searchString.split(' ');
+        for (let index = 0; index < aSearchStrings.length; index++) {
+            const element = aSearchStrings[index];
+            if (element.includes('exactmatch')) {
+                aSearchWords.push(element.replace('exactmatch', ' ')); // The last ' ' allow to return the exact match
+            } else {
+                aSearchWords.push(element); // The last ' ' allow to return the exact match
+            }
+        }
+    } else {
+        aSearchWords = searchString.toLowerCase().split(" ");
+    }
+
+    // This searches for all words in a string
+    let i = 0;
+    for (let index = 0; index < aSearchWords.length; index++) {
+        if (sourceText.toLowerCase().indexOf(aSearchWords[index]) > -1) i += 1;
+    }
+    return i == aSearchWords.length;
+}