node-red-contrib-room-tools 1.9.4 → 1.9.5

package/panel-visual-bindings.js

@@ -1,5 +1,5 @@
 const { inspectTemplate } = require('./panel-template-instrumentation')
-const { compatibleTarget, controlTypeForAdapter, targetMeta, bindingModes } = require('./control-type-model')
+const { compatibleTarget, controlTypeForAdapter, targetMeta, bindingModes, switchMapping, stateReverse, isMeterTarget } = require('./control-type-model')
 const { meterRoute } = require('./meter-route')
 const { xySeriesRoute } = require('./xy-series-route')
 
@@ -58,6 +58,16 @@ function visualRoutes (config) {
     if (!bindingModes(entry.adapter).includes(entry.mode) || !entry.type || !entry.label) {
       throw new Error(`Invalid visual binding settings: ${id}`)
     }
+    if (entry.adapter === 'meter' && (entry.type !== 'meter' || entry.mode !== 'read' ||
+      !entry.readPath || entry.writePath || entry.writeMeta || !entry.readMeta || !isMeterTarget(entry.readMeta))) {
+      throw Error(`Invalid readonly meter binding: ${id}`)
+    }
+    if (entry.adapter === 'range' && [entry.writeMeta, entry.readMeta].some(meta => meta && isMeterTarget(meta))) {
+      throw Error(`Numeric controls cannot bind to readonly meter targets: ${id}`)
+    }
+    for (const meta of [entry.readMeta, entry.writeMeta]) {
+      if (meta?.availability) require('./device-availability').availabilityRoute(meta.availability)
+    }
     if (entry.readMeta?.meter) {
       meterRoute(entry.readMeta.meter)
       if (entry.adapter !== 'meter' || entry.mode !== 'read' || entry.readMeta.access !== 'ro' ||
@@ -124,6 +134,7 @@ function validatedVisualBindings ({ format, entries, devices, targetsByDevice })
     }
     const target = write || read
     const type = controlTypeForAdapter(raw.adapter, target)
+    const reverse = raw.adapter === 'switch' ? stateReverse(raw, write, read) : undefined
     if (read?.meter && (!Number.isFinite(read.min) || !Number.isFinite(read.max) || read.min >= read.max)) {
       throw Error(`Meter needs a finite device range: ${raw.id}`)
     }
@@ -131,7 +142,7 @@ function validatedVisualBindings ({ format, entries, devices, targetsByDevice })
       const identity = JSON.stringify([raw.device, read?.path, write?.path])
       const modelKey = candidate.repeat ? `${candidate.model}#${raw.instanceKey}` : candidate.model
       const previous = models.get(modelKey)
-      const realtime = Boolean(read?.meter || read?.xySeries)
+      const realtime = raw.adapter === 'meter' || raw.adapter === 'xy-series'
       if (previous && (realtime || previous.realtime) && previous.identity !== identity) {
         throw Error(`Realtime model "${candidate.model}" is already used by another binding; use a separate Vue model for each independent telemetry target`)
       }
@@ -140,6 +151,7 @@ function validatedVisualBindings ({ format, entries, devices, targetsByDevice })
     result[raw.id] = {
       locator: raw.locator, adapter: raw.adapter, type, label: raw.label.trim(), mode: raw.mode,
       ...(candidate.button ? { buttonBehavior: behavior } : {}),
+      ...(raw.adapter === 'switch' ? { stateReverse: reverse } : {}),
       ...(candidate.model ? { model: candidate.model } : {}),
       ...(candidate.repeat ? { repeat: candidate.repeat, instanceKey: raw.instanceKey } : {}),
       ...(candidate.component ? { component: candidate.component } : {}),
@@ -147,8 +159,10 @@ function validatedVisualBindings ({ format, entries, devices, targetsByDevice })
         ? { uiRange: { min: candidate.min, max: candidate.max, step: candidate.step } } : {}),
       device: raw.device,
       writePath: write?.path || '', readPath: read?.path || '',
-      ...(write ? { writeMeta: targetMeta(write, raw.onebased) } : {}),
-      ...(read ? { readMeta: targetMeta(read, raw.onebased) } : {})
+      ...(write ? { writeMeta: targetMeta(write, raw.onebased,
+        raw.adapter === 'switch' ? switchMapping(write, undefined, reverse) : undefined) } : {}),
+      ...(read ? { readMeta: targetMeta(read, raw.onebased,
+        raw.adapter === 'switch' ? switchMapping(read, undefined, reverse) : undefined) } : {})
     }
   }
   return result

package/xy-series-frame.js

@@ -85,8 +85,14 @@ function createRoomXYSeriesReceiver (layout) {
           (valid && points.some(point => !Array.isArray(point) || point.length !== 2 ||
             !finite(point[0]) || !finite(point[1])))) return false
       }
+      if (frame.sources !== undefined && (!Array.isArray(frame.sources) || frame.sources.length > 256 ||
+        frame.sources.some(source => typeof source?.device !== 'string' || source.device.length > 128 ||
+          typeof source.streamId !== 'string' || source.streamId.length > 128 ||
+          typeof source.epoch !== 'string' || source.epoch.length > 128 ||
+          !Number.isSafeInteger(source.seq) || source.seq < 0))) return false
       latest = { values: frame.values.map(points => points.map(point => [point[0], point[1]])),
-        valid: frame.valid.slice(), seq: frame.seq }
+        valid: frame.valid.slice(), seq: frame.seq,
+        ...(frame.sources ? { sources: frame.sources.map(({ device, streamId, epoch, seq }) => ({ device, streamId, epoch, seq })) } : {}) }
       pending = true
       return true
     },