node-red-contrib-knx-ultimate 6.1.0 → 6.2.0

package/examples/Matter Controller - Semantic Flow Input.json

@@ -0,0 +1,248 @@
+[
+  {
+    "id": "matter_semantic_tab",
+    "type": "tab",
+    "label": "Matter Controller - Flow input",
+    "disabled": false,
+    "info": "Example of the semantic msg.payload = { function, value } contract for Control Matter from KNX (BETA).\n\nAfter importing:\n1. Open the example Matter Controller node.\n2. Select your existing Matter Controller configuration and a commissioned non-light endpoint.\n3. Enable Node Input/Output PINs.\n4. In the Flow input section shown below the PIN selector, use only the Inject nodes matching functions advertised by the device.\n\nThis example creates no matter-config and sends no command automatically."
+  },
+  {
+    "id": "matter_semantic_instructions",
+    "type": "comment",
+    "z": "matter_semantic_tab",
+    "name": "1. Open the Controller, select matter-config + endpoint, then enable the flow PINs",
+    "info": "The Inject nodes are alternative examples: one endpoint normally does not support every function shown. Use only functions listed in the Controller node's Flow input section.",
+    "x": 520,
+    "y": 60,
+    "wires": []
+  },
+  {
+    "id": "matter_semantic_supported",
+    "type": "comment",
+    "z": "matter_semantic_tab",
+    "name": "2. Trigger only Inject nodes supported by the selected endpoint",
+    "info": "No Inject is configured to run automatically. Reads omit value; writes include value.",
+    "x": 340,
+    "y": 110,
+    "wires": []
+  },
+  {
+    "id": "matter_semantic_on",
+    "type": "inject",
+    "z": "matter_semantic_tab",
+    "name": "On: {onoff, true}",
+    "props": [
+      {
+        "p": "payload",
+        "v": "{\"function\":\"onoff\",\"value\":true}",
+        "vt": "json"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "x": 190,
+    "y": 180,
+    "wires": [
+      [
+        "matter_semantic_controller"
+      ]
+    ]
+  },
+  {
+    "id": "matter_semantic_off",
+    "type": "inject",
+    "z": "matter_semantic_tab",
+    "name": "Off: {onoff, false}",
+    "props": [
+      {
+        "p": "payload",
+        "v": "{\"function\":\"onoff\",\"value\":false}",
+        "vt": "json"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "x": 190,
+    "y": 230,
+    "wires": [
+      [
+        "matter_semantic_controller"
+      ]
+    ]
+  },
+  {
+    "id": "matter_semantic_level",
+    "type": "inject",
+    "z": "matter_semantic_tab",
+    "name": "Level 50%",
+    "props": [
+      {
+        "p": "payload",
+        "v": "{\"function\":\"level\",\"value\":50}",
+        "vt": "json"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "x": 180,
+    "y": 280,
+    "wires": [
+      [
+        "matter_semantic_controller"
+      ]
+    ]
+  },
+  {
+    "id": "matter_semantic_position",
+    "type": "inject",
+    "z": "matter_semantic_tab",
+    "name": "Cover position 35%",
+    "props": [
+      {
+        "p": "payload",
+        "v": "{\"function\":\"position\",\"value\":35}",
+        "vt": "json"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "x": 190,
+    "y": 330,
+    "wires": [
+      [
+        "matter_semantic_controller"
+      ]
+    ]
+  },
+  {
+    "id": "matter_semantic_setpoint",
+    "type": "inject",
+    "z": "matter_semantic_tab",
+    "name": "Setpoint 21,5 °C",
+    "props": [
+      {
+        "p": "payload",
+        "v": "{\"function\":\"setpoint\",\"value\":21.5}",
+        "vt": "json"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "x": 190,
+    "y": 380,
+    "wires": [
+      [
+        "matter_semantic_controller"
+      ]
+    ]
+  },
+  {
+    "id": "matter_semantic_temperature",
+    "type": "inject",
+    "z": "matter_semantic_tab",
+    "name": "Read temperature",
+    "props": [
+      {
+        "p": "payload",
+        "v": "{\"function\":\"temperature\"}",
+        "vt": "json"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "x": 190,
+    "y": 430,
+    "wires": [
+      [
+        "matter_semantic_controller"
+      ]
+    ]
+  },
+  {
+    "id": "matter_semantic_identify",
+    "type": "inject",
+    "z": "matter_semantic_tab",
+    "name": "Identify",
+    "props": [
+      {
+        "p": "payload",
+        "v": "{\"function\":\"identify\"}",
+        "vt": "json"
+      }
+    ],
+    "repeat": "",
+    "crontab": "",
+    "once": false,
+    "onceDelay": 0.1,
+    "topic": "",
+    "x": 170,
+    "y": 480,
+    "wires": [
+      [
+        "matter_semantic_controller"
+      ]
+    ]
+  },
+  {
+    "id": "matter_semantic_controller",
+    "type": "knxUltimateMatterControllerDevice",
+    "z": "matter_semantic_tab",
+    "server": "",
+    "serverMatter": "",
+    "matterControllerMode": "single",
+    "universalService": "batteryMonitor",
+    "matterNodeId": "",
+    "matterEndpointId": 1,
+    "matterDeviceName": "",
+    "matterDeviceCapabilities": "",
+    "matterMappings": "[]",
+    "name": "SELECT A MATTER ENDPOINT",
+    "readStatusAtStartup": "no",
+    "enableNodePINS": "yes",
+    "updateLocalStateFromKNXWrite": true,
+    "inputs": 1,
+    "outputs": 1,
+    "x": 570,
+    "y": 330,
+    "wires": [
+      [
+        "matter_semantic_debug"
+      ]
+    ]
+  },
+  {
+    "id": "matter_semantic_debug",
+    "type": "debug",
+    "z": "matter_semantic_tab",
+    "name": "Complete Matter response",
+    "active": true,
+    "tosidebar": true,
+    "console": false,
+    "tostatus": true,
+    "complete": "true",
+    "targetType": "full",
+    "statusVal": "payload",
+    "statusType": "auto",
+    "x": 850,
+    "y": 330,
+    "wires": []
+  }
+]

package/nodes/commonFunctions.js

@@ -7,7 +7,6 @@ const yaml = require('js-yaml')
 const dptlib = require('knxultimate').dptlib
 const customHTTP = require('./utils/http')
 const KNXClient = require('knxultimate').KNXClient
-const sysLogger = require('./utils/sysLogger')
 const { normalizeAuthFromAccessTokenQuery } = require('./utils/httpAdminAccessToken')
 
 // DATAPONT MANIPULATION HELPERS
@@ -62,52 +61,6 @@ module.exports = (RED) => {
   function commonFunctions () {
     const node = this
 
-    const ensureBuffer = (rawValue) => {
-      if (!rawValue) return null
-      if (Buffer.isBuffer(rawValue)) return rawValue
-      if (Array.isArray(rawValue)) return Buffer.from(rawValue)
-      if (typeof rawValue === 'object' && Array.isArray(rawValue.data)) return Buffer.from(rawValue.data)
-      if (rawValue.type === 'Buffer' && Array.isArray(rawValue.data)) return Buffer.from(rawValue.data)
-      return null
-    }
-
-    const guessDptFromRawValue = (rawBuffer) => {
-      if (!rawBuffer || !rawBuffer.length) return null
-      if (rawBuffer.length === 1) {
-        if (rawBuffer[0] === 0 || rawBuffer[0] === 1) return '1.001'
-        return '5.001'
-      }
-      if (rawBuffer.length === 4) return '14.056'
-      if (rawBuffer.length === 2) return '9.001'
-      if (rawBuffer.length === 3) return '11.001'
-      if (rawBuffer.length === 14) return '16.001'
-
-      const dpts = Object.entries(dptlib).filter(onlyDptKeys).map(extractBaseNo).sort(sortBy('base')).reduce(toConcattedSubtypes, [])
-      for (let index = 0; index < dpts.length; index++) {
-        try {
-          const resolved = dptlib.resolve(dpts[index].value)
-          if (!resolved) continue
-          const jsValue = dptlib.fromBuffer(rawBuffer, resolved)
-          if (typeof jsValue !== 'undefined') return dpts[index].value
-        } catch (error) { /* empty */ }
-      }
-      return null
-    }
-
-    const formatDisplayValue = (value) => {
-      if (value === null || value === undefined) return ''
-      if (value instanceof Date) return value.toISOString()
-      if (typeof value === 'object') {
-        try {
-          return JSON.stringify(value)
-        } catch (error) {
-          return String(value)
-        }
-      }
-      if (typeof value === 'boolean') return value ? 'true' : 'false'
-      return String(value)
-    }
-
     // // Gather infos about all interfaces on the lan and provides a static variable utils.aDiscoveredknxGateways
     // try {
     //     require('./utils/utils').DiscoverKNXGateways()
@@ -624,133 +577,6 @@ module.exports = (RED) => {
       }
     })
 
-    RED.httpAdmin.get('/knxUltimateMonitor', RED.auth.needsPermission('knxUltimate-config.read'), (req, res) => {
-      try {
-        const server = RED.nodes.getNode(req.query.serverId)
-        if (!server) {
-          res.json({ items: [], error: 'NO_SERVER' })
-          return
-        }
-        const items = Array.isArray(server.exposedGAs) ? server.exposedGAs.map((entry) => {
-          const rawBuffer = ensureBuffer(entry?.rawValue)
-          const rawHex = rawBuffer ? rawBuffer.toString('hex') : ''
-          let dpt = entry?.dpt
-          let guessed = false
-          if ((!dpt || dpt === '') && rawBuffer) {
-            const inferred = guessDptFromRawValue(rawBuffer)
-            if (inferred) {
-              dpt = inferred
-              guessed = true
-            }
-          }
-          let value = null
-          if (rawBuffer && dpt) {
-            try {
-              const resolved = dptlib.resolve(dpt)
-              if (resolved) value = dptlib.fromBuffer(rawBuffer, resolved)
-            } catch (error) { /* empty */ }
-          }
-          return {
-            ga: entry?.ga || '',
-            devicename: entry?.devicename || '',
-            dpt: dpt || '',
-            dptGuessed: guessed,
-            rawHex,
-            value,
-            valueText: formatDisplayValue(value),
-            updatedAt: entry?.updatedAt || null
-          }
-        }).sort((a, b) => a.ga.localeCompare(b.ga)) : []
-        res.json({ items })
-      } catch (error) {
-        try { RED.log.error(`KNXUltimate: knxUltimateMonitor error: ${error.message}`) } catch (e) { }
-        res.json({ items: [], error: error.message })
-      }
-    })
-
-    RED.httpAdmin.post('/knxUltimateMonitorToggle', RED.auth.needsPermission('knxUltimate-config.write'), (req, res) => {
-      try {
-        const serverId = req.body?.serverId
-        const ga = req.body?.ga
-        const server = serverId ? RED.nodes.getNode(serverId) : null
-        if (!server) {
-          res.json({ status: 'error', error: 'NO_SERVER' })
-          return
-        }
-        if (!ga) {
-          res.json({ status: 'error', error: 'NO_GA' })
-          return
-        }
-        const entry = Array.isArray(server.exposedGAs) ? server.exposedGAs.find((item) => item.ga === ga) : undefined
-        if (!entry) {
-          res.json({ status: 'error', error: 'GA_NOT_FOUND' })
-          return
-        }
-        const rawBuffer = ensureBuffer(entry.rawValue)
-        let dpt = entry.dpt
-        if (!rawBuffer) {
-          res.json({ status: 'error', error: 'NO_CURRENT_VALUE' })
-          return
-        }
-        if (!dpt) {
-          const inferred = guessDptFromRawValue(rawBuffer)
-          if (inferred) dpt = inferred
-        }
-        let currentValue = null
-        if (dpt) {
-          try {
-            const resolved = dptlib.resolve(dpt)
-            if (resolved) currentValue = dptlib.fromBuffer(rawBuffer, resolved)
-          } catch (error) { currentValue = null }
-        }
-        if (typeof currentValue !== 'boolean') {
-          res.json({ status: 'error', error: 'NOT_BOOLEAN' })
-          return
-        }
-        const nextValue = !currentValue
-        const sendDpt = dpt || '1.001'
-        try {
-          server.sendKNXTelegramToKNXEngine({
-            grpaddr: ga,
-            payload: nextValue,
-            dpt: sendDpt,
-            outputtype: 'write',
-            nodecallerid: 'knxUltimateMonitor'
-          })
-        } catch (error) {
-          res.json({ status: 'error', error: error.message })
-          return
-        }
-        res.json({ status: 'ok', value: nextValue })
-      } catch (error) {
-        try { RED.log.error(`KNXUltimate: knxUltimateMonitorToggle error: ${error.message}`) } catch (e) { }
-        res.json({ status: 'error', error: error.message })
-      }
-    })
-
-    RED.httpAdmin.get('/knxUltimateDebugLog', RED.auth.needsPermission('knxUltimate-config.read'), (req, res) => {
-      try {
-        const rawSince = req.query?.sinceSeq ?? req.query?.since ?? req.query?.after ?? null
-        let sinceSeq = null
-        if (rawSince !== null && rawSince !== undefined) {
-          const parsed = Number(rawSince)
-          if (!Number.isNaN(parsed) && Number.isFinite(parsed)) {
-            sinceSeq = Math.floor(parsed)
-          }
-        }
-        const snapshot = sinceSeq === null ? sysLogger.getDebugSnapshot() : sysLogger.getDebugSnapshot({ sinceSeq })
-        res.json({
-          entries: snapshot.entries,
-          latestSeq: snapshot.latestSeq,
-          total: snapshot.total,
-          limit: snapshot.limit
-        })
-      } catch (error) {
-        try { RED.log.error(`KNXUltimate: knxUltimateDebugLog error: ${error.message}`) } catch (e) { }
-        res.json({ entries: [], error: error.message })
-      }
-    })
-
     RED.httpAdmin.post('/KNXUltimateLocateHueDevice', async (req, res) => {
       const respondError = (status, message) => {
         res.status(status).json({ error: message })