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

package/panel-binding-editor.js

@@ -25,10 +25,57 @@ function initializeVisualBinding () {
   const momentaryStates = new Map()
   const feedbackModels = new Map()
   const pendingText = new Map()
+  const disabledNodes = new Map()
+  const blockedTelemetry = new Map()
   const cleanup = []
   let disposed = false
   cleanup.push(() => { disposed = true })
   let editing = new URL(window.location.href).searchParams.get('cp-edit') === config.panelId
+
+  function deviceAvailable (id) {
+    return editing || component.__deviceAvailable?.(id) !== false
+  }
+  function sourceVersion (frame, binding) {
+    const stream = binding.readMeta?.meter || binding.readMeta?.xySeries
+    const source = frame?.sources?.find(item => item.device === binding.device && item.streamId === stream?.streamId)
+    return source ? `${source.epoch}:${source.seq}` : frame ? `legacy:${frame.seq}` : null
+  }
+  function setAvailable (node, available) {
+    available = editing || available
+    if (!available) {
+      if (!disabledNodes.has(node)) disabledNodes.set(node, {
+        inert: node.hasAttribute('inert'), aria: node.getAttribute('aria-disabled')
+      })
+      if (node.getAttribute('data-cpv-unavailable') !== 'true') node.setAttribute('data-cpv-unavailable', 'true')
+      if (!node.hasAttribute('inert')) node.setAttribute('inert', '')
+      if (node.getAttribute('aria-disabled') !== 'true') node.setAttribute('aria-disabled', 'true')
+    } else {
+      const original = disabledNodes.get(node)
+      if (!original) return
+      node.removeAttribute('data-cpv-unavailable')
+      if (!original.inert) node.removeAttribute('inert')
+      if (original.aria === null) node.removeAttribute('aria-disabled')
+      else node.setAttribute('aria-disabled', original.aria)
+      disabledNodes.delete(node)
+    }
+  }
+  function refreshAvailability () {
+    for (const [id, binding] of saved) {
+      const node = nodeForBinding(binding)
+      if (!node) continue
+      if (!deviceAvailable(id) && (binding.readMeta?.meter || binding.readMeta?.xySeries)) {
+        const latest = binding.readMeta.meter ? lastMeterFrame : lastXYSeriesFrame
+        if (!blockedTelemetry.has(id)) blockedTelemetry.set(id, sourceVersion(latest?.frame, binding))
+        node.setAttribute(binding.readMeta.meter ? 'data-cpv-meter-valid' : 'data-cpv-xy-series-valid', 'false')
+      }
+      const telemetryValid = !binding.readMeta?.meter && !binding.readMeta?.xySeries ||
+        node.getAttribute(binding.readMeta?.meter ? 'data-cpv-meter-valid' : 'data-cpv-xy-series-valid') === 'true'
+      setAvailable(node, deviceAvailable(id) && telemetryValid)
+    }
+    for (const [node] of disabledNodes) if (!root.contains(node)) setAvailable(node, true)
+    for (const button of buttonPresses.values()) button.controller.check()
+    for (const button of momentaryButtons.values()) button.controller.check()
+  }
   let editSession = null
   let snapshot = null
   let draft = []
@@ -41,6 +88,31 @@ function initializeVisualBinding () {
   let overlayCleanup
   let status
   let loginScreen
+  const resumeKey = `cpv-editor-resume:${config.panelId}`
+  const resumeDataKey = `cpv-editor-resume-data:${config.panelId}`
+
+  function resumePending () {
+    try { return window.sessionStorage?.getItem(resumeKey) === '1' } catch (_) { return false }
+  }
+  function markResumePending (pending) {
+    try {
+      if (pending) window.sessionStorage?.setItem(resumeKey, '1')
+      else window.sessionStorage?.removeItem(resumeKey)
+    } catch (_) {}
+  }
+  function readResumeData () {
+    if (!resumePending()) return null
+    try {
+      const value = JSON.parse(window.sessionStorage?.getItem(resumeDataKey) || 'null')
+      return value?.editorConfig && Array.isArray(value.devices) ? value : null
+    } catch (_) { return null }
+  }
+  function clearResumeData () {
+    try { window.sessionStorage?.removeItem(resumeDataKey) } catch (_) {}
+  }
+  function wait (milliseconds) {
+    return new Promise(resolve => setTimeout(resolve, milliseconds))
+  }
 
   function element (tag, text, className) {
     const node = document.createElement(tag)
@@ -80,7 +152,11 @@ function initializeVisualBinding () {
       body: method === 'POST' ? JSON.stringify(body || {}) : undefined
     }, path === '/apply' ? 120000 : (timeoutMs ?? 12000),
     async response => ({ response, result: await response.json() }))
-    if (!response.ok) throw new Error(result.error || `Request failed (${response.status})`)
+    if (!response.ok) {
+      const error = new Error(result.error || `Request failed (${response.status})`)
+      error.status = response.status
+      throw error
+    }
     return result
   }
   function numericRange (binding, node) {
@@ -231,6 +307,7 @@ function initializeVisualBinding () {
   }
   function showFeedback () {
     for (const [id, binding] of saved) {
+      if (!deviceAvailable(id)) continue
       if (binding.mode === 'write' || binding.readMeta?.meter || binding.readMeta?.xySeries) continue
       const node = nodeForBinding(binding)
       if (!node) continue
@@ -314,7 +391,7 @@ function initializeVisualBinding () {
       controlListeners.set(node, { id, stops })
       if (node.tagName === 'BUTTON' && binding.adapter === 'switch') {
         buttonPresses.set(node, { id, controller: component.__attachButtonPress({ node,
-          canPress: () => !disposed && !editing && component.boundAuthenticated && component.boundFeedbackConnected }) })
+          canPress: () => !disposed && !editing && component.boundAuthenticated && component.boundFeedbackConnected && deviceAvailable(id) }) })
       }
       if (binding.buttonBehavior === 'momentary' && node.tagName === 'BUTTON') {
         if (!momentaryStates.has(id)) momentaryStates.set(id, { seq: 0 })
@@ -322,7 +399,7 @@ function initializeVisualBinding () {
           state: momentaryStates.get(id),
           endpoint: component.__boundPanelConfig().endpoint,
           getSession: () => component.__boundPanelSession,
-          canStart: () => !disposed && !editing && component.boundAuthenticated && component.boundFeedbackConnected,
+          canStart: () => !disposed && !editing && component.boundAuthenticated && component.boundFeedbackConnected && deviceAvailable(id),
           request: (...args) => component.__panelFetch(...args),
           onError: error => console.error('ControlPanel momentary command failed', error) })
         momentaryButtons.set(node, { id, controller })
@@ -331,7 +408,7 @@ function initializeVisualBinding () {
       if (binding.component) {
         if (binding.adapter === 'text-input') {
           const commit = () => {
-            if (disposed || !pendingText.has(id) || editing || !component.boundAuthenticated ||
+            if (disposed || !pendingText.has(id) || editing || !component.boundAuthenticated || !deviceAvailable(id) ||
               nodeForBinding(binding) !== node) return
             const value = pendingText.get(id)
             pendingText.delete(id)
@@ -354,7 +431,7 @@ function initializeVisualBinding () {
         continue
       }
       const send = final => {
-        if (disposed || editing || !component.boundAuthenticated || nodeForBinding(binding) !== node) return
+        if (disposed || editing || !component.boundAuthenticated || !deviceAvailable(id) || nodeForBinding(binding) !== node) return
         try { component.sendBoundControl({ id, value: valueFor(binding, node), final }) } catch (error) {
           console.error('ControlPanel binding command failed', error)
         }
@@ -390,6 +467,7 @@ function initializeVisualBinding () {
       else invalidateXYSeries()
     }
     showFeedback()
+    refreshAvailability()
   }
   function applyMeterFrame (frame, ids) {
     lastMeterFrame = { frame, ids }
@@ -398,9 +476,15 @@ function initializeVisualBinding () {
       if (!target || target.frame === frame) continue
       target.frame = frame
       const { node, binding } = target
-      node.setAttribute('data-cpv-meter-valid', String(frame.valid[index]))
-      node.setAttribute('aria-invalid', String(!frame.valid[index]))
-      if (!frame.valid[index]) continue
+      const id = ids[index], version = sourceVersion(frame, binding)
+      if (!deviceAvailable(id)) blockedTelemetry.set(id, version)
+      const valid = frame.valid[index] && deviceAvailable(id) &&
+        (!blockedTelemetry.has(id) || blockedTelemetry.get(id) !== version)
+      node.setAttribute('data-cpv-meter-valid', String(valid))
+      node.setAttribute('aria-invalid', String(!valid))
+      setAvailable(node, valid)
+      if (!valid) continue
+      blockedTelemetry.delete(id)
       const value = mappedValue(frame.values[index], binding.readMeta, numericRange(binding, node))
       if (binding.model) {
         if (binding.repeat) setRepeatModel(binding, value)
@@ -413,6 +497,7 @@ function initializeVisualBinding () {
     for (const { node } of meterTargets.values()) {
       node.setAttribute('data-cpv-meter-valid', 'false')
       node.setAttribute('aria-invalid', 'true')
+      setAvailable(node, false)
     }
   }
   function applyXYSeriesFrame (frame, ids) {
@@ -423,8 +508,17 @@ function initializeVisualBinding () {
       target.frame = frame
       target.invalidated = false
       const { node, binding } = target
+      const id = ids[index], version = sourceVersion(frame, binding)
+      if (!deviceAvailable(id)) blockedTelemetry.set(id, version)
+      if (!deviceAvailable(id) || (blockedTelemetry.has(id) && blockedTelemetry.get(id) === version)) {
+        node.setAttribute('data-cpv-xy-series-valid', 'false')
+        setAvailable(node, false)
+        continue
+      }
+      if (frame.valid[index]) blockedTelemetry.delete(id)
       node.setAttribute('data-cpv-xy-series-valid', String(frame.valid[index]))
       node.setAttribute('aria-invalid', String(!frame.valid[index]))
+      setAvailable(node, frame.valid[index])
       node.setAttribute('data-cpv-xy-series-seq', String(frame.seq))
       const points = frame.valid[index] ? frame.values[index].map(point => [point[0], point[1]]) : []
       if (binding.model) {
@@ -435,13 +529,15 @@ function initializeVisualBinding () {
   }
   function invalidateXYSeries () {
     lastXYSeriesFrame = null
-    for (const target of xySeriesTargets.values()) {
+    for (const [id, target] of xySeriesTargets) {
       if (target.invalidated) continue
       target.invalidated = true
       target.frame = null
       const { node, binding } = target
       node.setAttribute('data-cpv-xy-series-valid', 'false')
       node.setAttribute('aria-invalid', 'true')
+      setAvailable(node, false)
+      if (!deviceAvailable(id)) continue
       if (binding.model) {
         if (binding.repeat) setRepeatModel(binding, [])
         else if (binding.model in component && !component.$options?.computed?.[binding.model]) component[binding.model] = []
@@ -453,7 +549,7 @@ function initializeVisualBinding () {
       if (!binding.component || !binding.model || binding.mode === 'read') continue
       let finishTimer
       const send = (value, final) => {
-        if (disposed || editing || !component.boundAuthenticated) return
+        if (disposed || editing || !component.boundAuthenticated || !deviceAvailable(id)) return
         try {
           let commandValue
           if (binding.adapter === 'range') {
@@ -492,7 +588,7 @@ function initializeVisualBinding () {
           feedbackModels.delete(id)
           if (Object.is(value, feedbackValue)) return
         }
-        if (disposed || editing || !component.boundAuthenticated) return
+        if (disposed || editing || !component.boundAuthenticated || !deviceAvailable(id)) return
         if (binding.adapter === 'text-input') {
           if (typeof value === 'string' || value == null) pendingText.set(id, value ?? '')
           return
@@ -617,9 +713,9 @@ function initializeVisualBinding () {
       submit.setAttribute('aria-busy', 'true')
       message.textContent = ''
       try {
-        await login(user.value, password.value)
+        const loaded = await login(user.value, password.value)
         if (disposed) return
-        closeLoginScreen()
+        if (loaded !== false) closeLoginScreen()
       } catch (error) {
         message.textContent = error.message
         submit.textContent = 'Log in'
@@ -640,17 +736,20 @@ function initializeVisualBinding () {
       if (!response.ok) throw new Error(result.error || 'Login failed')
       if (disposed) return
       editSession = result
-      await loadEditor()
+      markResumePending(false)
+      return startEditor()
     }, true)
   }
   function normalLoginView () {
     showLoginForm('Sign in', (username, password) => component.loginBoundPanel(username, password))
   }
   async function loadEditor () {
-    snapshot = await request('/config')
-    if (disposed) return
-    const response = await request('/devices')
+    const resumed = readResumeData()
+    const [config, response] = resumed
+      ? [resumed.editorConfig, { devices: resumed.devices }]
+      : await Promise.all([request('/config'), request('/devices')])
     if (disposed) return
+    snapshot = config
     devices = response.devices
     draft = snapshot.bindings.map(entry => ({ ...entry, onebased: numberingMode(entry) }))
     closeOverlay()
@@ -660,6 +759,57 @@ function initializeVisualBinding () {
     updateBindingMarkers()
     meterClient?.setAuth({ endpoint: base, csrf: editSession.csrf, header: 'X-Panel-CSRF' })
     xySeriesClient?.setAuth({ endpoint: base, csrf: editSession.csrf, header: 'X-Panel-CSRF' })
+    closeLoginScreen()
+    clearResumeData()
+  }
+  function loadingError (error, editor, retry) {
+    if (disposed) return
+    const content = coverPage('Unable to load panel', editor ? 'editor' : 'panel', 'error')
+    const message = element('p', error.message, 'cpv-message')
+    message.setAttribute('role', 'alert')
+    content.append(message, button('Retry', () => {
+      coverPage('Loading...', editor ? 'editor' : 'panel')
+      retry()
+    }))
+  }
+  async function startEditor () {
+    try { await loadEditor(); return true } catch (error) {
+      if (disposed) return false
+      if (error.status === 401) { editSession = null; loginView() }
+      else loadingError(error, true, startEditor)
+      return false
+    }
+  }
+  async function restoreEditor () {
+    const resumingAfterApply = resumePending()
+    const attempts = resumingAfterApply ? 25 : 1
+    let lastError
+    for (let attempt = 0; attempt < attempts; attempt += 1) {
+      try {
+        const session = await request('/session')
+        if (disposed) return
+        editSession = session
+        const loaded = await startEditor()
+        if (loaded) markResumePending(false)
+        return
+      } catch (error) {
+        lastError = error
+        if (disposed) return
+        if (!resumingAfterApply || attempt + 1 >= attempts) break
+        await wait(Math.min(250 + attempt * 250, 1000))
+      }
+    }
+    if (disposed) return
+    if (lastError?.status === 401) loginView()
+    else loadingError(lastError || new Error('Editor session unavailable'), true, restoreEditor)
+  }
+  async function restorePanel () {
+    try {
+      const session = await component.restoreBoundPanelSession(12000)
+      if (disposed) return
+      if (session || component.boundAuthenticated) closeLoginScreen()
+      else normalLoginView()
+    } catch (error) { loadingError(error, false, restorePanel) }
   }
   function choose (label, options, selected) {
     const select = element('select')
@@ -709,6 +859,22 @@ function initializeVisualBinding () {
       .map(item => ({ value: item.id, text: item.id })), existing?.device))
     const write = field(form, 'Write point', choose('Write point', [], existing?.writePath))
     const read = field(form, 'Feedback point', choose('Feedback point', [], existing?.readPath || existing?.writePath))
+    const reverse = candidate.adapter === 'switch' ? field(form, 'State reverse', element('input')) : null
+    if (reverse) {
+      reverse.type = 'checkbox'
+      reverse.setAttribute('aria-label', 'State reverse')
+      reverse.checked = matcher.reverse(existing)
+      reverse.closest('label').classList.add('cpv-state-reverse')
+    }
+    function updateReverse () {
+      if (!reverse) return
+      const active = [mode.value !== 'read' && write.value, mode.value !== 'write' && read.value].filter(Boolean)
+      reverse.disabled = !active.length || active.some(path => {
+        const point = targets.find(target => target.path === path)
+        return !point || !matcher.states(point)
+      })
+      reverse.closest('label').dataset.disabled = String(reverse.disabled)
+    }
     const numbering = field(form, 'Numbering', choose('Numbering', [
       { value: 'false', text: 'Zero-based' }, { value: 'true', text: 'One-based' }
     ], String(numberingMode(existing))))
@@ -746,6 +912,7 @@ function initializeVisualBinding () {
         : mode.value === 'write' ? writeCount : Math.min(writeCount, readCount)
       message.textContent = targets.length && !available ? 'No compatible points for this control'
         : targets.length ? '' : 'No points available'
+      updateReverse()
     }
     device.addEventListener('change', async () => {
       const generation = ++targetGeneration
@@ -767,7 +934,9 @@ function initializeVisualBinding () {
     })
     write.addEventListener('change', () => {
       if (mode.value === 'both') read.value = write.value
+      updateReverse()
     })
+    read.addEventListener('change', updateReverse)
     mode.addEventListener('change', updateTargets)
     behavior?.addEventListener('change', () => { updateButtonMode(); updateTargets() })
     updateTargets()
@@ -801,6 +970,7 @@ function initializeVisualBinding () {
         label: name.value.trim(), mode: mode.value, device: device.value,
         writePath: mode.value === 'read' ? '' : write.value,
         readPath: mode.value === 'write' ? '' : read.value,
+        ...(reverse ? { stateReverse: reverse.checked } : {}),
         onebased: numbering.value === 'true'
       }
       draft = draft.filter(item => !sameBindingTarget(item, candidate))
@@ -831,7 +1001,12 @@ function initializeVisualBinding () {
       try {
         await request('/apply', 'POST', {
           rev: snapshot.rev, templateHash: snapshot.templateHash, entries: draft
+        }).then(result => {
+          try {
+            window.sessionStorage?.setItem(resumeDataKey, JSON.stringify(result))
+          } catch (_) {}
         })
+        markResumePending(true)
         window.location.reload()
       } catch (error) {
         inform(error.message, true)
@@ -949,6 +1124,14 @@ function initializeVisualBinding () {
       event.stopImmediatePropagation()
     }, true)
   }
+  for (const name of ['click', 'pointerdown', 'keydown', 'input', 'change']) {
+    listen(root, name, event => {
+      if (!editing && event.target?.closest?.('[data-cpv-unavailable="true"]')) {
+        event.preventDefault()
+        event.stopImmediatePropagation()
+      }
+    }, true)
+  }
   listen(root, 'click', event => { if (selecting) chooseCandidate(event) }, true)
   listen(root, 'keydown', event => {
     if (event.key === 'Enter' && selecting) chooseCandidate(event)
@@ -1026,14 +1209,18 @@ function initializeVisualBinding () {
       for (const button of buttonPresses.values()) button.controller.release()
       for (const button of momentaryButtons.values()) button.controller.release()
     }
+    refreshAvailability()
   }))
+  cleanup.push(this.$watch('boundAvailability', () => { refreshAvailability(); showFeedback() }))
   const unwatch = this.$watch('boundState', showFeedback)
   cleanup.push(() => unwatch(), () => observer.disconnect(), () => toolbar?.remove(),
     () => closeOverlay(), () => closeLoginScreen())
+  cleanup.push(() => { for (const [node] of disabledNodes) setAvailable(node, true) })
   this.__visualBindingCleanup = cleanup
 
   const style = element('style')
   style.textContent = `
+    [data-cpv-unavailable="true"]{filter:grayscale(1) !important;opacity:.45 !important;pointer-events:none !important}
     button[data-cpv-press="true"]{translate:0 2px !important;box-shadow:inset 0 2px 4px #0003 !important}
     .cpv-toolbar,.cpv-dialog,.cpv-menu{font:14px/1.4 system-ui,sans-serif;color:#182224;background:#fff}
     .cpv-toolbar{position:fixed;z-index:2147483000;top:12px;right:12px;display:flex;align-items:center;gap:8px;padding:8px;border:1px solid #9baaad;box-shadow:0 8px 24px #0003;max-width:calc(100vw - 24px)}
@@ -1084,7 +1271,9 @@ function initializeVisualBinding () {
     .cpv-scrim{position:fixed;inset:0;z-index:2147483001;background:#0008;display:flex;align-items:center;justify-content:center;padding:16px}
     .cpv-dialog{width:min(460px,100%);max-height:min(90vh,720px);overflow:auto;padding:28px 18px 18px;border-radius:6px;box-shadow:0 12px 36px #0005}
     .cpv-dialog h2{font-size:18px;margin:0 0 20px}.cpv-field{display:block;margin:10px 0}.cpv-field span{display:block;font-size:12px;margin-bottom:4px}
+    .cpv-field[hidden]{display:none}
     .cpv-field input,.cpv-field select{box-sizing:border-box;width:100%;padding:8px;border:1px solid #86999c;border-radius:4px;background:white;color:#182224;font:inherit}
+    .cpv-state-reverse{display:flex;align-items:center;gap:10px}.cpv-state-reverse span{margin:0}.cpv-field input[type=checkbox]{width:18px;height:18px;padding:0;accent-color:#008d35;flex:none}
     .cpv-field[data-disabled=true] span{color:#66787c}.cpv-field select:disabled{background:#edf1f2;color:#66787c;border-color:#c5cfd1;cursor:not-allowed;opacity:1}
     .cpv-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:16px}.cpv-dialog>button:last-child{margin-top:20px}.cpv-message{min-height:18px;font-size:12px}
     .cpv-menu{position:fixed;z-index:2147483002;width:170px;padding:4px;border:1px solid #9baaad;box-shadow:0 8px 24px #0003}
@@ -1104,25 +1293,14 @@ function initializeVisualBinding () {
     document.body.classList.add('cpv-editing')
     cleanup.push(() => document.body.classList.remove('cpv-editing'))
     coverPage('Loading...', 'editor')
-    request('/session', 'GET', undefined, 2500).then(session => {
-      if (disposed) return
-      editSession = session
-      return loadEditor()
-    })
-      .then(closeLoginScreen).catch(() => loginView())
+    restoreEditor()
   } else {
     coverPage('Loading...', 'panel')
     cleanup.push(this.$watch('boundAuthenticated', authenticated => {
       if (authenticated) closeLoginScreen()
       else if (!loginScreen) normalLoginView()
     }))
-    component.restoreBoundPanelSession(2500).then(session => {
-      if (disposed) return
-      if (session || component.boundAuthenticated) closeLoginScreen()
-      else normalLoginView()
-    }).catch(() => {
-      normalLoginView()
-    })
+    restorePanel()
   }
 }
 

package/panel-momentary.js

@@ -53,7 +53,7 @@ function createMomentaryControls ({ routes, send, onError = () => {}, leaseMs =
     let record = records.get(key)
     if (!record) {
       if (records.size >= 1024) throw Error('Momentary client limit reached')
-      record = { seq: 0, active: false, target: destination(command), identity,
+      record = { seq: 0, active: false, controlId: request.id, target: destination(command), identity,
         off: resolveBoundCommand(routes, { _controlPanel: { kind: 'command', id: request.id, value: false, final: true } }) }
       records.set(key, record)
     }
@@ -62,6 +62,8 @@ function createMomentaryControls ({ routes, send, onError = () => {}, leaseMs =
     record.seq = hold.seq
     if (hold.action === 'release') release(record)
     else if (hold.action === 'start') {
+      if ([...records.values()].some(other => other.active && other.target === record.target &&
+        !Object.is(other.off.payload, record.off.payload))) throw Error('Conflicting momentary state mapping')
       const alreadyHeld = occupied(record.target)
       if (!alreadyHeld) send(command, identity)
       record.active = true
@@ -74,6 +76,10 @@ function createMomentaryControls ({ routes, send, onError = () => {}, leaseMs =
     epoch,
     handle,
     isHeld (command) { sweep(); return occupied(destination(command)) },
+    releaseControl (id) {
+      for (const record of records.values()) if (record.controlId === id) release(record)
+      schedule()
+    },
     releaseSession (token) {
       for (const [key, record] of records) {
         if (record.identity.token === token) { release(record); records.delete(key) }

package/panel-template-instrumentation.js

@@ -66,6 +66,7 @@ function candidateAdapter (node) {
   if (tag === 'meter' || tag === 'progress') return 'meter'
   if (tag === 'canvas' && hasBoundAttribute(node, ['data-points', 'data-series'])) return 'xy-series'
   if (XY_SERIES_CONTAINER_TAGS.has(tag) && hasBoundAttribute(node, ['data-coordinates'])) return 'xy-series'
+  if (attribute(node, 'data-display-only').toLowerCase() === 'true') return null
   if (['span', 'strong', 'b', 'output', 'h1', 'h2', 'h3'].includes(tag) &&
     node.children?.length === 1 && node.children[0].type === 2 &&
     node.children[0].content.trim()) return 'text-display'

package/panel-visual-apply.js

@@ -6,6 +6,27 @@ const { configuredRoutes } = require('./control-bound-protocol')
 const { provisionManagedBridges } = require('./managed-native-bridge')
 const { backupFlow, flowLocation, runtimeDirectory } = require('./managed-bridge-admin')
 
+const snapshotCache = new Map()
+
+function snapshotCacheKey (localPort, adminRoot) {
+  return `${localPort}:${adminRoot}`
+}
+
+async function waitForEditorRoute (localPort, panelId, cookie, fetcher = fetch) {
+  if (!cookie || !Number.isInteger(localPort) || !panelId) return
+  const url = `http://127.0.0.1:${localPort}/control-panel-edit/panels/${panelId}/session`
+  for (let attempt = 0; attempt < 20; attempt += 1) {
+    try {
+      const response = await fetcher(url, {
+        headers: { Cookie: cookie },
+        signal: AbortSignal.timeout(1000)
+      })
+      if (response.ok) return
+    } catch (_) {}
+    if (attempt < 19) await new Promise(resolve => setTimeout(resolve, 150))
+  }
+}
+
 function conflict (message) {
   const error = new Error(message)
   error.status = 409
@@ -24,17 +45,38 @@ function adminUrl (localPort, adminRoot = '/red') {
   return url.href
 }
 
-async function getSnapshot (localPort, fetcher = fetch, adminRoot = '/red') {
-  const response = await fetcher(adminUrl(localPort, adminRoot), {
-    headers: { 'Node-RED-API-Version': 'v2' },
-    signal: AbortSignal.timeout(10000)
-  })
-  if (!response.ok) throw new Error(`Automator Flow read failed (${response.status})`)
-  const snapshot = await response.json()
-  if (typeof snapshot.rev !== 'string' || !Array.isArray(snapshot.flows)) {
-    throw new Error('Automator did not return a versioned Flow')
+async function getSnapshot (localPort, fetcher = fetch, adminRoot = '/red', options = {}) {
+  const key = snapshotCacheKey(localPort, adminRoot)
+  const cached = snapshotCache.get(key)
+  const now = Date.now()
+  if (cached && typeof options.expectedRev === 'string' && cached.snapshot.rev === options.expectedRev) {
+    return cached.snapshot
+  }
+  if (cached && Number.isFinite(options.maxAgeMs) && now - cached.time <= options.maxAgeMs) {
+    return cached.snapshot
+  }
+  try {
+    const response = await fetcher(adminUrl(localPort, adminRoot), {
+      headers: { 'Node-RED-API-Version': 'v2' },
+      signal: AbortSignal.timeout(10000)
+    })
+    if (!response.ok) throw new Error(`Automator Flow read failed (${response.status})`)
+    const snapshot = await response.json()
+    if (typeof snapshot.rev !== 'string' || !Array.isArray(snapshot.flows)) {
+      throw new Error('Automator did not return a versioned Flow')
+    }
+    snapshotCache.set(key, { snapshot, time: Date.now() })
+    return snapshot
+  } catch (error) {
+    const isTimeout = error?.name === 'TimeoutError' || error?.code === 'ABORT_ERR' ||
+      /aborted.*timeout/i.test(String(error?.message || ''))
+    if (isTimeout && cached && Number.isFinite(options.allowStaleMs) &&
+      Date.now() - cached.time <= options.allowStaleMs) {
+      return cached.snapshot
+    }
+    if (isTimeout) throw new Error('Automator Flow is still restarting; retry in a moment')
+    throw error
   }
-  return snapshot
 }
 
 function findPanel (snapshot, panelId) {
@@ -65,12 +107,15 @@ function editorConfig (snapshot, panelId) {
 
 async function applyVisualBindings ({
   panelId, rev, templateHash, entries, userDir, localPort, adminRoot = '/red',
-  catalogBase, fetcher = fetch
+  catalogBase, editorCookie, fetcher = fetch
 }) {
   // The editor authenticates the browser; Flow access stays on the runtime's loopback interface.
   const directory = runtimeDirectory(userDir)
   if (!catalogBase) throw conflict('Device catalog is unavailable')
-  const snapshot = await getSnapshot(localPort, fetcher, adminRoot)
+  if (!Array.isArray(entries) || entries.length > 256) throw conflict('Invalid binding draft')
+  const [snapshot, devices] = await Promise.all([
+    getSnapshot(localPort, fetcher, adminRoot, { expectedRev: rev }), listCatalogDevices(catalogBase, fetcher)
+  ])
   if (snapshot.rev !== rev) throw conflict('Flow changed; refresh the visual editor')
   const panel = findPanel(snapshot, panelId)
   if (inspectTemplate(panel.format).templateHash !== templateHash) {
@@ -81,8 +126,6 @@ async function applyVisualBindings ({
     throw conflict('Deployed Flow differs from the active project file')
   }
 
-  const devices = await listCatalogDevices(catalogBase, fetcher)
-  if (!Array.isArray(entries) || entries.length > 256) throw conflict('Invalid binding draft')
   const deviceIds = [...new Set(entries.map(entry => entry?.device))]
   for (const id of deviceIds) {
     if (!devices.some(device => device.id === id && device.online)) {
@@ -98,11 +141,23 @@ async function applyVisualBindings ({
   nextPanel.nativeBridge = configuredRoutes(nextPanel).size > 0
   const provisioned = provisionManagedBridges(next, { panelId })
 
-  const latest = await getSnapshot(localPort, fetcher, adminRoot)
-  if (latest.rev !== snapshot.rev) throw conflict('Flow changed during validation; refresh and retry')
   if (JSON.stringify(JSON.parse(fs.readFileSync(location.flowFile, 'utf8'))) !== JSON.stringify(snapshot.flows)) {
     throw conflict('Active project changed during validation')
   }
+  // Node order is not a Flow change. An unchanged draft must not restart the
+  // panel and its bridge just because provisioning moved generated nodes.
+  const currentNodes = new Map(snapshot.flows.map(node => [node.id, node]))
+  if (currentNodes.size === snapshot.flows.length && provisioned.flows.length === snapshot.flows.length &&
+    provisioned.flows.every(node => JSON.stringify(node) === JSON.stringify(currentNodes.get(node.id)))) {
+    return {
+      ok: true,
+      rev: snapshot.rev,
+      updated: [],
+      unchanged: true,
+      editorConfig: editorConfig(snapshot, panelId),
+      devices
+    }
+  }
   const backupDir = backupFlow(location, snapshot.rev, snapshot.flows)
   const response = await fetcher(adminUrl(localPort, adminRoot), {
     method: 'POST',
@@ -116,18 +171,22 @@ async function applyVisualBindings ({
   })
   if (!response.ok) throw conflict(`Automator rejected the binding update (${response.status})`)
   const applied = await response.json().catch(() => ({}))
-  let confirmed
-  for (let attempt = 0; attempt < 5; attempt++) {
-    confirmed = await getSnapshot(localPort, fetcher, adminRoot)
-    const confirmedPanel = confirmed.flows.find(node => node.id === panelId)
-    if (confirmedPanel?.visualBindings === nextPanel.visualBindings &&
-      confirmedPanel.bridgeRevisionApplied === provisioned.flows.find(node => node.id === panelId)?.bridgeRevisionApplied) {
-      return { ok: true, rev: confirmed.rev, backupDir, updated: provisioned.updated }
-    }
-    if (confirmed.rev !== snapshot.rev && confirmed.rev !== applied.rev) break
-    if (attempt < 4) await new Promise(resolve => setTimeout(resolve, 200))
+  // The v2 Flow POST is the runtime acknowledgement. Avoid rereading the
+  // complete Flow repeatedly while modified nodes are still restarting.
+  const appliedRev = typeof applied.rev === 'string' ? applied.rev : snapshot.rev
+  snapshotCache.set(snapshotCacheKey(localPort, adminRoot), {
+    snapshot: { rev: appliedRev, flows: provisioned.flows },
+    time: Date.now()
+  })
+  await waitForEditorRoute(localPort, panelId, editorCookie, fetcher)
+  return {
+    ok: true,
+    rev: appliedRev,
+    backupDir,
+    updated: provisioned.updated,
+    editorConfig: editorConfig({ rev: appliedRev, flows: provisioned.flows }, panelId),
+    devices
   }
-  throw conflict('Automator did not confirm the binding update; refresh before retrying')
 }
 
 module.exports = { adminUrl, applyVisualBindings, editorConfig, getSnapshot }