node-red-contrib-room-tools 1.8.4 → 1.8.8

package/control-type-model.js

@@ -1,39 +1,38 @@
 const contract = require('./control-type-contract.json')
 
-const ADAPTER_FAMILIES = Object.freeze({
-  range: ['number'],
-  switch: ['boolean'],
-  meter: ['number'],
-  'text-display': ['text', 'number', 'enum', 'boolean'],
-  'text-input': ['text'],
-  select: ['enum']
-})
 
-const READ_ONLY = new Set(['meter', 'text-display'])
 
-function targetFamily (target) {
-  if (target.controlSchemaVersion !== contract.schemaVersion) return null
-  const definition = contract.types[String(target.controlType || '').toLowerCase()]
-  if (!definition) return null
-  const type = target.type
-  if (definition.family === 'number' && !['integer', 'float'].includes(type)) return null
-  if (definition.family === 'boolean' && type !== 'boolean' &&
-    !(type === 'integer' && target.booleanEncoding === 'integer01' &&
-      target.min === 0 && target.max === 1)) return null
-  if (definition.family === 'text' && !['string', 'dstring'].includes(type)) return null
-  if (definition.family === 'enum' && !['enum', 'integer', 'string'].includes(type)) return null
-  return definition.family
+// Used by both server validation and the injected editor; keep it self-contained.
+function createTargetMatcher (typeContract) {
+  const families = {
+    range: ['number'], switch: ['boolean'], meter: ['number'],
+    'text-display': ['text', 'number', 'enum', 'boolean'], 'text-input': ['text'], select: ['enum']
+  }
+  function family (target) {
+    if (target.controlSchemaVersion !== typeContract.schemaVersion) return null
+    const definition = typeContract.types[String(target.controlType || '').toLowerCase()]
+    if (!definition) return null
+    const type = target.type
+    if (definition.family === 'number' && !['integer', 'float'].includes(type)) return null
+    if (definition.family === 'boolean' && type !== 'boolean' &&
+      !(type === 'integer' && target.booleanEncoding === 'integer01' &&
+        target.min === 0 && target.max === 1)) return null
+    if (definition.family === 'text' && !['string', 'dstring'].includes(type)) return null
+    if (definition.family === 'enum' && !['enum', 'integer', 'string'].includes(type)) return null
+    return definition.family
+  }
+  function compatible (adapter, target, direction, candidate = {}) {
+    if (target.kind !== 'param' || !families[adapter]?.includes(family(target))) return false
+    if (direction === 'write' && ['meter', 'text-display'].includes(adapter)) return false
+    if (!['read', 'write'].includes(direction)) return false
+    if (!(direction === 'write' ? ['wo', 'rw'] : ['ro', 'rw']).includes(target.access)) return false
+    if (candidate.unit && candidate.unit !== target.unit) return false
+    return true
+  }
+  return { family, compatible }
 }
 
-function compatibleTarget (adapter, target, direction, candidate = {}) {
-  const family = targetFamily(target)
-  if (!family || target.kind !== 'param' || !ADAPTER_FAMILIES[adapter]?.includes(family)) return false
-  if (direction === 'write' && READ_ONLY.has(adapter)) return false
-  if (direction === 'write' && !['wo', 'rw'].includes(target.access)) return false
-  if (direction === 'read' && !['ro', 'rw'].includes(target.access)) return false
-  if (candidate.unit && candidate.unit !== target.unit) return false
-  return true
-}
+const { family: targetFamily, compatible: compatibleTarget } = createTargetMatcher(contract)
 
 function controlTypeForAdapter (adapter, target) {
   if (!compatibleTarget(adapter, target, 'read') && !compatibleTarget(adapter, target, 'write')) {
@@ -60,4 +59,4 @@ function targetMeta (target, onebased) {
   }
 }
 
-module.exports = { contract, compatibleTarget, controlTypeForAdapter, targetFamily, targetMeta }
+module.exports = { contract, createTargetMatcher, compatibleTarget, controlTypeForAdapter, targetFamily, targetMeta }

package/gateway.cjs

@@ -1,134 +1,23 @@
 const crypto = require('node:crypto')
+const { readJsonBody, replyJson: reply, sameOrigin } = require('./panel-http')
 
-const PREFIX = '/room-panel-api'
-const CONTINUOUS_INTERVAL_MS = 40
 const FEEDBACK_HEARTBEAT_MS = 20000
 
-const defaults = () => ({
-  scene: 'meeting', display: true, source: '无线投屏', volume: 42,
-  muted: false, light: 80, curtains: 75, temperature: 23, meeting: false
-})
-
-const fields = {
-  'display/power': 'display',
-  'display/source': 'source',
-  'audio/volume': 'volume',
-  'audio/mute': 'muted',
-  'lighting/brightness': 'light',
-  'room/curtain': 'curtains',
-  'climate/temperature': 'temperature',
-  'room/scene': 'scene',
-  'room/meeting': 'meeting'
-}
-
-const controlPolicies = {
-  'display/power': { type: 'power', mode: 'discrete' },
-  'display/source': { type: 'source', mode: 'discrete' },
-  'audio/volume': { type: 'level', mode: 'continuous' },
-  'audio/mute': { type: 'mute', mode: 'discrete' },
-  'lighting/brightness': { type: 'dimmer', mode: 'continuous' },
-  'room/curtain': { type: 'position', mode: 'continuous' },
-  'climate/temperature': { type: 'position', mode: 'continuous' },
-  'room/scene': { type: 'preset', mode: 'discrete' },
-  'room/meeting': { type: 'preset', mode: 'discrete' },
-  'room/reset': { type: 'preset', mode: 'discrete' }
-}
-
-const ranges = {
-  volume: [0, 100], light: [0, 100], curtains: [0, 100], temperature: [16, 30]
-}
-
-const presets = {
-  focus: { light: 85, curtains: 80, volume: 25, display: true },
-  cinema: { light: 20, curtains: 10, volume: 65, display: true },
-  social: { light: 70, curtains: 80, volume: 40, display: true },
-  unwind: { light: 35, curtains: 80, volume: 32, display: true },
-  meeting: { light: 80, curtains: 75, volume: 42, source: '无线投屏', display: true },
-  present: { light: 30, curtains: 10, volume: 55, source: 'HDMI 1', display: true },
-  video: { light: 65, curtains: 35, volume: 65, source: '视频会议', display: true },
-  relax: { light: 45, curtains: 100, volume: 20, source: '无线投屏', display: false }
-}
-
-function valid (key, value) {
-  if (ranges[key]) {
-    return typeof value === 'number' && Number.isFinite(value) &&
-      value >= ranges[key][0] && value <= ranges[key][1]
-  }
-  if (['display', 'muted', 'meeting'].includes(key)) return typeof value === 'boolean'
-  if (key === 'source') return ['无线投屏', 'HDMI 1', 'HDMI 2', '视频会议'].includes(value)
-  if (key === 'scene') return ['custom', ...Object.keys(presets)].includes(value)
-  return false
-}
-
-function createLatestWinsDispatcher ({
-  onDispatch,
-  intervalMs = CONTINUOUS_INTERVAL_MS,
-  now = Date.now,
-  setTimer = setTimeout,
-  clearTimer = clearTimeout
-}) {
-  if (typeof onDispatch !== 'function') throw Error('onDispatch must be a function')
-  if (!Number.isFinite(intervalMs) || intervalMs < 0) throw Error('intervalMs must be non-negative')
-
-  const controls = new Map()
-  let closed = false
-
-  const schedule = (key, control) => {
-    if (closed || control.timer || !control.pending) return
-    const elapsed = control.lastSentAt === null ? intervalMs : now() - control.lastSentAt
-    const wait = Math.max(0, intervalMs - elapsed)
-    if (wait === 0) dispatch(key, control)
-    else control.timer = setTimer(() => dispatch(key, control), wait)
-  }
-
-  const dispatch = (key, control) => {
-    control.timer = null
-    if (closed || !control.pending) return
-    const message = control.pending
-    control.pending = null
-    control.lastSentAt = now()
-    onDispatch(message)
-    if (control.pending) schedule(key, control)
-  }
-
-  return {
-    push (key, message) {
-      if (closed) return false
-      let control = controls.get(key)
-      if (!control) {
-        control = { pending: null, timer: null, lastSentAt: null }
-        controls.set(key, control)
-      }
-      // 同一房间、设备、控制号始终最多只有一个尚未发送的连续目标。
-      control.pending = message
-      schedule(key, control)
-      return true
-    },
-    close () {
-      closed = true
-      for (const control of controls.values()) {
-        if (control.timer) clearTimer(control.timer)
-      }
-      controls.clear()
-    }
-  }
-}
-
 function createGateway ({
   username,
   password,
   room = 'room-01',
-  onCommand = () => {},
   onBoundCommand,
   onBoundLogin,
-  boundOnly = false,
   secureCookie = false,
   prefix,
-  continuousIntervalMs = CONTINUOUS_INTERVAL_MS,
   sessionTtlMs = 8 * 3600000,
   restoredSessions
 }) {
-  const routePrefix = prefix || PREFIX + '/regions/' + encodeURIComponent(room)
+  const routePrefix = prefix
+  if (typeof prefix !== 'string' || !/^\/control-panel-api\/panels\/[A-Za-z0-9._-]+$/.test(prefix)) {
+    throw Error('A panel-scoped API prefix is required')
+  }
   if (!username || typeof password !== 'string' || password.length < 12) {
     throw Error('Set a username and password of at least 12 characters')
   }
@@ -149,17 +38,9 @@ function createGateway ({
     }
   }
   const attempts = new Map()
-  const continuousDispatcher = createLatestWinsDispatcher({
-    onDispatch: onCommand,
-    intervalMs: continuousIntervalMs
-  })
   const subscribers = new Set()
-  let desiredState = defaults()
-  let reportedState = {}
   const boundState = new Map()
   let boundRevision = 0
-  let revision = 0
-  let commandRevision = 0
   let closed = false
   let heartbeatTimer = null
 
@@ -197,17 +78,6 @@ function createGateway ({
     }
   }
 
-  function feedbackMessage (topic = 'room/state', payload = reportedState, controlKey) {
-    return {
-      room,
-      kind: 'state',
-      topic,
-      payload,
-      state: { ...reportedState },
-      revision,
-      ...(controlKey ? { controlKey } : {})
-    }
-  }
 
   function broadcastFeedback (message) {
     for (const subscriber of [...subscribers]) sendFeedbackEvent(subscriber, message)
@@ -219,32 +89,9 @@ function createGateway ({
     }
   }
 
-  function feedback (msg) {
-    if (boundOnly) throw Error('Use boundFeedback for a bound panel')
-    if (msg.room !== room || msg.kind !== 'state') {
-      throw Error('Feedback requires matching room and kind=state')
-    }
-    const values = msg.topic === 'room/state'
-      ? msg.payload
-      : fields[msg.topic] ? { [fields[msg.topic]]: msg.payload } : null
-    if (!values || typeof values !== 'object' || Array.isArray(values) ||
-      !Object.keys(values).length ||
-      Object.entries(values).some(([key, value]) => !valid(key, value))) {
-      throw Error('Invalid feedback')
-    }
-    reportedState = { ...reportedState, ...values }
-    revision++
-    const message = feedbackMessage(
-      msg.topic,
-      msg.topic === 'room/state' ? { ...reportedState } : msg.payload,
-      typeof msg.controlKey === 'string' ? msg.controlKey : undefined
-    )
-    broadcastFeedback(message)
-    return message
-  }
 
   function boundFeedback (items) {
-    if (!boundOnly || !Array.isArray(items) || !items.length ||
+    if (!Array.isArray(items) || !items.length ||
       items.some(item => !item || typeof item.id !== 'string' || !item.id ||
         !Object.hasOwn(item, 'value'))) {
       throw Error('Invalid bound feedback')
@@ -264,33 +111,6 @@ function createGateway ({
     }
   }
 
-  function reply (res, status, data, headers = {}) {
-    res.writeHead(status, {
-      'Content-Type': 'application/json; charset=utf-8',
-      'Cache-Control': 'no-store',
-      'X-Content-Type-Options': 'nosniff',
-      ...headers
-    })
-    res.end(JSON.stringify(data))
-  }
-
-  async function body (req) {
-    if (!String(req.headers['content-type'] || '').startsWith('application/json')) {
-      throw Error('JSON required')
-    }
-    if (req.body !== undefined) {
-      if (Buffer.isBuffer(req.body)) return JSON.parse(req.body.toString('utf8'))
-      if (typeof req.body === 'string') return JSON.parse(req.body)
-      if (req.body && typeof req.body === 'object' && Object.keys(req.body).length) return req.body
-    }
-    let raw = ''
-    for await (const chunk of req) {
-      raw += chunk
-      if (Buffer.byteLength(raw) > 8192) throw Error('Request too large')
-    }
-    return JSON.parse(raw)
-  }
-
   const cookieName = 'room_panel_' + Buffer.from(room).toString('hex')
   const cookie = (token, maxAge, req) => `${cookieName}=${token}; Path=${routePrefix}; HttpOnly; SameSite=Strict; Max-Age=${maxAge}${secureCookie && req.socket.encrypted ? '; Secure' : ''}`
 
@@ -313,8 +133,7 @@ function createGateway ({
       for (const [ip, attempt] of attempts) if (attempt.until < now) attempts.delete(ip)
 
       if (req.method === 'POST') {
-        const origin = req.headers.origin
-        if (!origin || new URL(origin).host !== req.headers.host) {
+        if (!sameOrigin(req)) {
           reply(res, 403, { error: 'Origin rejected' })
           return true
         }
@@ -329,7 +148,7 @@ function createGateway ({
         }
         entry.count++
         attempts.set(ip, entry)
-        const data = await body(req)
+        const data = await readJsonBody(req, 8192)
         const supplied = String(data.password || '')
         if (supplied.length > 256) {
           reply(res, 401, { error: 'Invalid credentials' })
@@ -355,7 +174,7 @@ function createGateway ({
         reply(res, 200, { room, username, csrf }, {
           'Set-Cookie': cookie(token, Math.ceil(sessionTtlMs / 1000), req)
         })
-        if (boundOnly && typeof onBoundLogin === 'function') {
+        if (typeof onBoundLogin === 'function') {
           queueMicrotask(() => { if (!closed) onBoundLogin({ room, user: username }) })
         }
         return true
@@ -390,7 +209,7 @@ function createGateway ({
         const subscriber = { res, token }
         subscribers.add(subscriber)
         res.on('close', () => closeSubscriber(subscriber))
-        sendFeedbackEvent(subscriber, boundOnly ? boundSnapshot() : feedbackMessage())
+        sendFeedbackEvent(subscriber, boundSnapshot())
         ensureHeartbeat()
         return true
       }
@@ -399,7 +218,7 @@ function createGateway ({
           reply(res, 403, { error: 'Region denied' })
           return true
         }
-        reply(res, 200, boundOnly ? boundSnapshot() : feedbackMessage())
+        reply(res, 200, boundSnapshot())
         return true
       }
       if (path === routePrefix + '/logout' && req.method === 'POST') {
@@ -413,7 +232,7 @@ function createGateway ({
           reply(res, 404, { error: 'Not found' })
           return true
         }
-        const data = await body(req)
+        const data = await readJsonBody(req, 8192)
         if (data.room !== room) {
           reply(res, 403, { error: 'Region denied' })
           return true
@@ -425,64 +244,6 @@ function createGateway ({
         reply(res, 200, { ok: true })
         return true
       }
-      if (path === routePrefix + '/command' && req.method === 'POST') {
-        if (boundOnly) {
-          reply(res, 404, { error: 'Not found' })
-          return true
-        }
-        const data = await body(req)
-        if (data.room !== room) {
-          reply(res, 403, { error: 'Region denied' })
-          return true
-        }
-
-        const key = fields[data.topic]
-        const policy = controlPolicies[data.topic]
-        const invalidValue = data.topic === 'room/reset'
-          ? data.payload !== true
-          : !key || !valid(key, data.payload) || (key === 'scene' && !presets[data.payload])
-        const invalidType = data.controlType !== undefined && data.controlType !== policy?.type
-        const controlKey = data.controlKey === undefined ? data.topic : data.controlKey
-        const invalidControlKey = typeof controlKey !== 'string' ||
-          !/^[a-zA-Z0-9._:/-]{1,160}$/.test(controlKey)
-        if (!policy || invalidValue || invalidType || invalidControlKey ||
-          (data.final !== undefined && typeof data.final !== 'boolean')) {
-          reply(res, 400, { error: 'Invalid control value' })
-          return true
-        }
-
-        let next = { ...desiredState }
-        if (data.topic === 'room/reset') next = defaults()
-        else if (key === 'scene') next = { ...next, ...presets[data.payload], scene: data.payload }
-        else {
-          next[key] = data.payload
-          if (['light', 'curtains'].includes(key)) next.scene = 'custom'
-          if (key === 'meeting' && data.payload) next.display = true
-        }
-
-        const command = {
-          room,
-          topic: data.topic,
-          payload: data.payload,
-          kind: 'command',
-          controlType: policy.type,
-          controlKey,
-          final: data.final === true,
-          user: username,
-          state: next
-        }
-
-        if (policy.mode === 'continuous') {
-          continuousDispatcher.push(room + ':' + controlKey, command)
-        } else {
-          onCommand(command)
-        }
-
-        desiredState = next
-        commandRevision++
-        reply(res, 200, { ok: true, revision, commandRevision })
-        return true
-      }
 
       reply(res, 404, { error: 'Not found' })
     } catch (error) {
@@ -493,7 +254,6 @@ function createGateway ({
 
   return {
     handler,
-    feedback,
     boundFeedback,
     sessionSnapshot () {
       return new Map([...sessions].filter(([, session]) => session.expiry > Date.now())
@@ -501,7 +261,6 @@ function createGateway ({
     },
     close () {
       closed = true
-      continuousDispatcher.close()
       for (const subscriber of [...subscribers]) closeSubscriber(subscriber)
       if (heartbeatTimer) clearInterval(heartbeatTimer)
       heartbeatTimer = null
@@ -511,11 +270,4 @@ function createGateway ({
   }
 }
 
-module.exports = {
-  CONTINUOUS_INTERVAL_MS,
-  FEEDBACK_HEARTBEAT_MS,
-  PREFIX,
-  controlPolicies,
-  createGateway,
-  createLatestWinsDispatcher
-}
+module.exports = { createGateway }

package/managed-bridge-admin.js

@@ -2,16 +2,10 @@ const crypto = require('node:crypto')
 const fs = require('node:fs')
 const path = require('node:path')
 
-function flowDigest (flows) {
-  return crypto.createHash('sha256').update(JSON.stringify(flows)).digest('hex')
-}
-
-function localDirectory (userDir, remoteAddress) {
-  const address = String(remoteAddress || '')
-  if (!['127.0.0.1', '::1', '::ffff:127.0.0.1'].includes(address)) {
-    throw new Error('Managed bridge editor is restricted to a local request')
-  }
-  return fs.realpathSync(userDir)
+function runtimeDirectory (userDir) {
+  const directory = fs.realpathSync(userDir)
+  if (!fs.statSync(directory).isDirectory()) throw new Error('Node-RED user directory must be a directory')
+  return directory
 }
 
 function regularFile (file) {
@@ -87,4 +81,4 @@ function backupFlow (location, rev, flows) {
   return backupDir
 }
 
-module.exports = { backupFlow, flowDigest, localDirectory, flowLocation }
+module.exports = { backupFlow, runtimeDirectory, flowLocation }

package/native-binding-plan.js

@@ -152,7 +152,7 @@ function compileNativeBindingPlan ({ panel, targets, scopeId }) {
   })
   const subflow = {
     id: subflowId, type: 'subflow', name: `Binding bridge ${scopeId}`,
-    info: 'Generated local PoC. Requires a Controller node and authenticated command source.',
+    info: 'Generated panel binding bridge. Requires a Controller node and authenticated command source.',
     category: 'panel binding',
     in: [{ x: 170, y: 150, wires: [{ id: routerId }] }],
     out: readTargets.size