Band Lineup 1.12.0: Sync keeps your moves and puts each person in one spot

Two Sync problems found by checking the real October 25 plan against the
board:

- Someone on the plan twice (Mike Powell is Leader and Guitar [Acoustic])
  could fill two spots, pushing a real player off the board. Which spot
  the duplicate took depended on the order Planning Center returned
  people, so it only happened some weeks. Assignment now uses each person
  once.
- Moving a synced person to another spot was undone by the next Sync,
  which re-placed everyone it had filled. A move is now a hand placement
  for the current plan and Sync leaves it alone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

CLAUDE.md

@@ -52,7 +52,7 @@ title-bar controls). The rules that matter most:
   `node tools/slack-mock.js 24716` (Slack; run ProdDash with `SLACK_API_BASE=http://127.0.0.1:24716/api`).
   `node tools/pco-band-mock.js 24710` (Planning Center for Band Lineup; run ProdDash with `BAND_LINEUP_API_BASE=http://127.0.0.1:24710`).
   `node tools/ableset-mock.js 39071` (AbleSet over OSC/UDP; point the AbleSet module at `127.0.0.1:39071`; `--stopped`, `--no-live`, `--speed 4`).
-  `node tools/overflow-tap-mock.js` (ProPresenter slide notes on `127.0.0.1:1602` + the Overflow Dashboard API on `127.0.0.1:24720`; run ProdDash with `OVERFLOW_TAP_API_BASE=http://127.0.0.1:24720`, any email/password signs in; `--fail-switch`, `--expire=20`, `--login=<email>:<password>`).
+  `node tools/vista-midi-mock.js 5104` (a network MIDI / RTP-MIDI session for Vista Cues; point its first sender at `127.0.0.1:5104` and paste the cue sheet it prints; `--invite 127.0.0.1:5040` joins from its side, `--name`, `--channel`, `--every`, `--notes 2,23,8`).
 
 ## Reference code (read-only forks — don't develop these here)
 

README.md

@@ -316,10 +316,15 @@ below. Nothing is installed without someone clicking.
   name, load a named layout (it becomes a local copy — browsers are never
   linked), or reset this browser's dashboard. Loading says what it did —
   *Loaded "FOH": 9 tiles, 2 not shown — Service, #ops aren't offered right
-  now* — with **Undo** in the message to get back the arrangement you had.
-  A tile whose module or picker entry isn't offered at the moment keeps its
-  place and shows nothing, then appears when it is; it is never replaced by
-  the module's default tile. Saving over an existing name asks first, and
+  now; the Layouts menu can remove them* — with **Undo** in the message to
+  get back the arrangement you had. A tile whose module or picker entry
+  isn't offered at the moment keeps its place and shows nothing, then
+  appears when it is; it is never replaced by the module's default tile.
+  While any tile is in that state the same menu has a **Not shown** section
+  listing each one with why — *not offered right now*, *module disabled*,
+  *module not installed* — and a ✕ that removes it and frees its cells, for
+  the tile that is not coming back (a module that stopped offering that
+  kind of tile). Saving over an existing name asks first, and
   the server keeps the copy it replaced: **Restore previous** in Admin →
   Saved layouts swaps it back (and swapping again undoes that). The menu's
   **Grid Size** stepper sets how many columns this browser cuts the board into —
@@ -510,27 +515,6 @@ below. Nothing is installed without someone clicking.
   read from the account), and a folded **Timing** group for the poll
   intervals and a position trim.
   Tile settings: cue name, previous cue, playhead, cue list.
-- **Overflow Tap** — what Overflow's own "ProPresenter Integration" helper
-  app does, inside ProdDash, speaking the same Dashboard API it does: the
-  live slide's notes are read from ProPresenter (the presentation layer and
-  the announcement layer), and when they carry one of the keywords mapped in
-  the Overflow Dashboard, Overflow is told — and points that keyword's Tap
-  groups at its destination, so a tap on a disc follows what is on screen.
-  A slide with no keyword changes nothing. Keywords match as the helper
-  matches them: as a whole word of the notes, any case, punctuation around
-  it ignored (`give` fires on "Give!" and not on "forgiveness"). The tile is
-  one keyword, big: what Tap is on (and since when), its destination and the
-  groups moved, a chip saying whether the slide on screen carries a keyword,
-  and the last four switches with their times; a failed switch turns the
-  tile red with the reason, is retried, and — if switched on in admin —
-  flashes an alert channel. Admin config: the ProPresenter endpoint and an
-  **Overflow Dashboard login** (email and password; Google sign-in has no
-  password, so set one with "Forgot Your Password?"). The keywords, their
-  destinations and their Tap groups stay where Overflow keeps them —
-  Integrations › ProPresenter › Keyword Mappings in the Dashboard — and are
-  read from there on start, every few minutes, and on the tile's refresh
-  button. Tile settings are four switches: destination, groups, slide
-  match, history.
 - **Band Lineup** — the backstage stage board: everyone on stage in their mic
   slot with photo, name and mic/pack label, on one shared board that every
   screen sees the same way — whoever edits it changes it everywhere, over SSE.
@@ -566,6 +550,36 @@ below. Nothing is installed without someone clicking.
   soon as it does) and **Marks** (how long a mark lives).
   Tile settings: campuses, card or list layout, and a **Show** group for the
   day, role, resi source, campuses fed, notes and the updated line.
+- **Vista Cues** — which Vista 3 cue lists are live, for a booth where
+  nobody runs lighting and ProPresenter and the tracks rig fire Vista's cue
+  lists over network MIDI. Vista sends no feedback of any kind (its OSC only
+  takes commands), so the module listens instead: it joins the senders'
+  network MIDI sessions as one more participant, the way Vista does, hears
+  every note Vista hears, and turns each one into "Go on Walk-in", "Release
+  Worship 1"… from the cue sheet pasted into admin. The tile shows the list
+  fired last, large, with how long ago and who fired it; the other lists
+  still live; the recent notes; and which senders are connected. What it
+  shows is what Vista was *told*: if Vista is closed or someone works the
+  desk by hand, the two can differ, and the title bar's eraser forgets every
+  live list. Plain JavaScript (RTP-MIDI over UDP), no helper; on macOS it
+  advertises itself over Bonjour so it shows up in Audio MIDI Setup's
+  Directory. Admin config: up to three senders (a name, and the host and
+  port of each machine's network session — ProPresenter, the tracks rig,
+  Companion; ProdDash keeps inviting itself in, so each session's "Who may
+  connect to me" must be Anyone, or connect from the sender's Directory
+  instead), the cue sheet (one line per note: `0 = Pre Service`,
+  `61 release Walk-in`, `127 release all`, `30 flash Blinder Flash 1` for a
+  momentary hit, also pause, back, note names, a channel, program changes),
+  middle C naming, whether a Go releases the others, and a folded **This
+  machine** group for the session name, port (UDP 5040 and 5041) and
+  Bonjour. A sheet with no release notes uses groups: a line `[Color]`
+  starts one, a Go in a group replaces that group's live list, and the
+  first group is the tile's headline — so the tile reads "Message" with
+  Color · Blue and House · House Lights Message beside it. A Go in that
+  first group (the main scene) takes over the look and clears the rest, as
+  Vista's last-takes-precedence does; FX fired after it layer on again
+  (the **Main group takes over** switch). Tile settings: other lists,
+  recent, senders, unmapped notes — text size is − / + in the title bar.
 - **Clock** — a big booth clock; also the smallest possible module and the
   reference for module authors.
 
@@ -582,14 +596,10 @@ run ProdDash with `SLACK_API_BASE=http://127.0.0.1:24716/api`) and
 `node tools/pco-band-mock.js 24710` (Planning Center for the Band Lineup
 board — a plan, its team members, birthdays and photos — run ProdDash with
 `BAND_LINEUP_API_BASE=http://127.0.0.1:24710`) and
-`node tools/overflow-tap-mock.js` (a ProPresenter whose slide notes carry
-keywords on `127.0.0.1:1602`, announcement layer included, plus the Overflow
-Dashboard API on `127.0.0.1:24720` — run ProdDash with
-`OVERFLOW_TAP_API_BASE=http://127.0.0.1:24720` and sign the module in with
-any email and password; `--fail-switch` refuses every switch,
-`--expire=20` makes sessions expire, `--login=<email>:<password>` accepts
-one login only). See the testing section of the
-[module guide](docs/MODULE-GUIDE.md).
+`node tools/vista-midi-mock.js 5104` (a network MIDI session playing a cue
+sheet's notes, as ProPresenter does for Vista — point Vista Cues' first
+sender at `127.0.0.1:5104` and paste the sheet it prints). See the testing section of
+the [module guide](docs/MODULE-GUIDE.md).
 
 ## Install as a desktop web app
 

docs/MODULE-GUIDE.md

@@ -688,8 +688,11 @@ module.exports = {
   tile added from an entry only when that entry (or one of its `aliases`) is
   in your list right now; otherwise the tile keeps its place in the layout,
   draws nothing, and appears the moment your list offers it again — a
-  Service timer waits for PCO Plan, a transcript for its channel. So your
-  client is never asked to render an entry you did not offer at mount time.
+  Service timer waits for PCO Plan, a transcript for its channel. The
+  operator can remove such a tile from the Layouts menu's **Not shown**
+  section, so an entry you retire for good (a send box that moved to another
+  module) leaves no dead cells behind. So your client is never asked to
+  render an entry you did not offer at mount time.
   One case is still yours: an entry that vanishes *after* the tile mounted
   (a timer deleted in ProPresenter mid-service). Render nothing for it — no
   placeholder, no error — and the shell folds the tile away at its next
@@ -1044,7 +1047,8 @@ client-side failures (a tile that fails to start says so in the tile).
 
 **Poke the pieces directly:**
 
-- `GET /api/modules` — what the shell sees (your manifest + non-secret config).
+- `GET /api/modules` — what the shell sees (your manifest + non-secret
+  config; `inactive` names the installed modules that are not running).
 - `GET /api/modules/<id>/...` — your routes, `curl`-able. For SSE:
   `curl -N http://localhost:24500/api/modules/<id>/stream`.
 - `GET /api/admin/state` — enabled flags, health, mount errors.

modules/band-lineup/client.js

@@ -1,5 +1,5 @@
 // Band Lineup — client. Renders the shared stage board from /state + /stream.
-// The Edit button opens an editor: an uploaded-photo library you drag (or click)
+// The Edit button opens an editor: an uploaded-photo library you drag (or tap)
 // into slots, plus rename / clear / upload / delete. Edits go to the server and
 // come back over SSE, so every Band Lineup screen stays in sync. Birthday week
 // (Wed→Tue) rains confetti.
@@ -14,26 +14,107 @@ export default function create({ root, moduleApi }) {
   let selectedLibId = ''; // click-to-place fallback for touch
   const canvases = new Set();
   let raf = null;
-  // Auto-scroll the editor while dragging a photo (native DnD won't do it reliably).
-  let dragScrolling = false;
-  let dragY = 0;
-  let dragBody = null;
-  let dragRaf = null;
-  function startDragAutoScroll() {
-    if (dragRaf) return;
-    const tick = () => {
-      if (!dragScrolling || !dragBody || !dragBody.isConnected) { dragRaf = null; return; }
-      const r = dragBody.getBoundingClientRect();
-      const zone = 90; // generous edge band so you don't have to be pixel-accurate
-      let dy = 0;
-      if (dragY < r.top + zone) dy = -Math.ceil((r.top + zone - dragY) / 4) - 3;
-      else if (dragY > r.bottom - zone) dy = Math.ceil((dragY - (r.bottom - zone)) / 4) + 3;
-      if (dy) dragBody.scrollTop += dy;
-      dragRaf = requestAnimationFrame(tick);
-    };
-    dragRaf = requestAnimationFrame(tick);
+  /* ---------- drag (pointer events: one path for mouse, pen and touch) ----------
+   * Native HTML drag-and-drop never fires for a finger, drops onto a card's child elements
+   * flicker, and a board update arriving mid-drag rebuilt the editor out from under it. This
+   * drives the drag by hand instead: a mouse drags as soon as it moves; a finger holds still for
+   * a moment first (so a quick swipe still scrolls the editor). A floating copy of the photo
+   * follows the pointer, the spot under it lights up, and the editor auto-scrolls near its
+   * edges. Board updates that arrive during a drag wait until it ends. */
+  const DRAG_MOVE_PX = 6;
+  const TOUCH_HOLD_MS = 220;
+  let drag = null;          // { kind: 'lib'|'slot', id, body, ghost, over, x, y, raf }
+  let pending = null;       // a pointerdown that may become a drag
+  let renderHeld = false;   // a state update arrived mid-drag; render when it ends
+
+  function slotUnder(x, y) {
+    const hit = document.elementFromPoint(x, y);
+    const cell = hit && hit.closest ? hit.closest('.bl-edit-slot') : null;
+    return cell && root.contains(cell) ? cell : null;
   }
-  function stopDragAutoScroll() { dragScrolling = false; if (dragRaf) { cancelAnimationFrame(dragRaf); dragRaf = null; } }
+  function beginDrag(p) {
+    const ghost = el('div', 'bl-drag-ghost');
+    ghost.dataset.module = 'band-lineup'; // lives on <body> (above every tile), so it carries its own scope
+    const src = p.source.querySelector('img');
+    if (src) { const img = document.createElement('img'); img.src = src.src; img.alt = ''; ghost.appendChild(img); }
+    else ghost.textContent = p.label || '';
+    document.body.appendChild(ghost);
+    drag = { kind: p.kind, id: p.id, body: p.body, ghost, over: null, x: p.x, y: p.y, raf: null, source: p.source };
+    p.source.classList.add('bl-dragging');
+    root.classList.add('bl-is-dragging');
+    moveDrag(p.x, p.y);
+    const tick = () => {
+      if (!drag) return;
+      const b = drag.body;
+      if (b && b.isConnected) {
+        const r = b.getBoundingClientRect(); const zone = 70; let dy = 0;
+        if (drag.y < r.top + zone) dy = -Math.ceil((r.top + zone - drag.y) / 4) - 2;
+        else if (drag.y > r.bottom - zone) dy = Math.ceil((drag.y - (r.bottom - zone)) / 4) + 2;
+        if (dy) { b.scrollTop += dy; moveDrag(drag.x, drag.y); }
+      }
+      drag.raf = requestAnimationFrame(tick);
+    };
+    drag.raf = requestAnimationFrame(tick);
+  }
+  function moveDrag(x, y) {
+    drag.x = x; drag.y = y;
+    drag.ghost.style.transform = `translate(${x}px, ${y}px)`;
+    const cell = slotUnder(x, y);
+    if (cell !== drag.over) {
+      if (drag.over) drag.over.classList.remove('bl-drop-over');
+      drag.over = cell;
+      if (cell) cell.classList.add('bl-drop-over');
+    }
+  }
+  function endDrag(drop) {
+    const d = drag; drag = null;
+    if (!d) return;
+    if (d.raf) cancelAnimationFrame(d.raf);
+    d.ghost.remove();
+    d.source.classList.remove('bl-dragging');
+    root.classList.remove('bl-is-dragging');
+    if (d.over) d.over.classList.remove('bl-drop-over');
+    if (drop && d.over) {
+      const to = d.over.dataset.index;
+      if (d.kind === 'lib') assign(to, d.id);
+      else if (d.id !== to) api(`/move?from=${d.id}&to=${to}`, { method: 'POST' });
+    }
+    if (renderHeld) { renderHeld = false; render(); }
+  }
+  function cancelPending() { if (pending && pending.timer) clearTimeout(pending.timer); pending = null; }
+  // Make `node` draggable. `kind`/`id` say what is being dragged.
+  function makeDraggable(node, kind, id, body, label) {
+    node.addEventListener('pointerdown', (e) => {
+      if (e.button !== 0 || drag) return;
+      if (e.target.closest('button')) return; // name / clear / delete buttons keep working
+      cancelPending();
+      pending = { kind, id, body, label, source: node, x: e.clientX, y: e.clientY, sx: e.clientX, sy: e.clientY, pointerId: e.pointerId, touch: e.pointerType !== 'mouse', armed: e.pointerType === 'mouse', timer: null };
+      if (pending.touch) {
+        const p = pending;
+        p.timer = setTimeout(() => { if (pending === p) { p.armed = true; beginDrag(p); try { node.setPointerCapture(p.pointerId); } catch { /* gone */ } } }, TOUCH_HOLD_MS);
+      }
+    });
+  }
+  // Document-level move/up so the drag survives leaving the card it started on.
+  function onPointerMove(e) {
+    if (drag) { e.preventDefault(); moveDrag(e.clientX, e.clientY); return; }
+    if (!pending || e.pointerId !== pending.pointerId) return;
+    const dist = Math.hypot(e.clientX - pending.sx, e.clientY - pending.sy);
+    if (pending.touch) { if (dist > 10) cancelPending(); return; } // moved before the hold: it's a scroll
+    if (dist >= DRAG_MOVE_PX) { const p = pending; pending = null; p.x = e.clientX; p.y = e.clientY; beginDrag(p); }
+  }
+  function onPointerUp(e) {
+    if (drag) { e.preventDefault(); suppressClick = true; setTimeout(() => { suppressClick = false; }, 0); endDrag(e.type === 'pointerup'); }
+    cancelPending();
+  }
+  let suppressClick = false; // the click that follows a drop must not also select / place
+  // While a finger drag is live, stop the page from scrolling under it.
+  function onTouchMove(e) { if (drag) e.preventDefault(); }
+  document.addEventListener('pointermove', onPointerMove, { passive: false });
+  document.addEventListener('pointerup', onPointerUp);
+  document.addEventListener('pointercancel', onPointerUp);
+  document.addEventListener('touchmove', onTouchMove, { passive: false });
+  function stopDragAutoScroll() { cancelPending(); endDrag(false); }
 
   /* ---------- confetti (always animates) ---------- */
   function makeParticle(w, h, intensity, seedY) {
@@ -79,6 +160,7 @@ export default function create({ root, moduleApi }) {
   function stopConfetti() { canvases.clear(); if (raf) { cancelAnimationFrame(raf); raf = null; } }
 
   function render() {
+    if (drag) { renderHeld = true; return; }
     stopConfetti();
     stopParallax();
     root.innerHTML = '';
@@ -163,8 +245,6 @@ export default function create({ root, moduleApi }) {
     // board on top and the picture picker (library) below it.
     const wrap = el('div', 'bl-editor bl-editor-nobar');
     const body = el('div', 'bl-editor-body');
-    // Feed the drag auto-scroller the pointer position anywhere over the editor.
-    body.addEventListener('dragover', (e) => { dragY = e.clientY; });
 
     // Slots (drop targets)
     const boardEl = el('div', 'bl-edit-board');
@@ -176,14 +256,7 @@ export default function create({ root, moduleApi }) {
       photo.appendChild(slot.person ? photoNode(slot.person) : el('div', 'bl-edit-drop', '＋'));
       cell.appendChild(photo);
       // An occupied card is a drag SOURCE too — move/swap it to another slot.
-      if (slot.person) {
-        cell.draggable = true;
-        cell.addEventListener('dragstart', (e) => {
-          e.dataTransfer.setData('text/plain', 'slot:' + slot.index); e.dataTransfer.effectAllowed = 'move';
-          dragBody = body; dragScrolling = true; startDragAutoScroll();
-        });
-        cell.addEventListener('dragend', stopDragAutoScroll);
-      }
+      if (slot.person) makeDraggable(cell, 'slot', String(slot.index), body, slot.person.name);
       const nameRow = el('div', 'bl-edit-namerow');
       const nameBtn = el('button', 'bl-edit-name', (slot.person && slot.person.name) || 'Name…');
       nameBtn.addEventListener('click', () => renameSlot(slot.index, slot.person ? slot.person.name : ''));
@@ -191,16 +264,7 @@ export default function create({ root, moduleApi }) {
       if (slot.person) { const clr = el('button', 'bl-edit-clear', '×'); clr.title = 'Clear'; clr.addEventListener('click', () => api(`/slot/${slot.index}/clear`, { method: 'POST' })); nameRow.appendChild(clr); }
       cell.appendChild(nameRow);
       cell.appendChild(el('div', 'bl-edit-label', slot.label || `Slot ${slot.index + 1}`));
-      // drop
-      cell.addEventListener('dragover', (e) => { e.preventDefault(); cell.classList.add('bl-drop-over'); });
-      cell.addEventListener('dragleave', () => cell.classList.remove('bl-drop-over'));
-      cell.addEventListener('drop', (e) => {
-        e.preventDefault(); stopDragAutoScroll(); cell.classList.remove('bl-drop-over');
-        const data = e.dataTransfer.getData('text/plain') || '';
-        if (data.startsWith('lib:')) assign(slot.index, data.slice(4));
-        else if (data.startsWith('slot:')) { const from = data.slice(5); if (from !== String(slot.index)) api(`/move?from=${from}&to=${slot.index}`, { method: 'POST' }); }
-      });
-      cell.addEventListener('click', (e) => { if (e.target.closest('.bl-edit-name') || e.target.closest('.bl-edit-clear')) return; if (selectedLibId) assign(slot.index, selectedLibId); });
+      cell.addEventListener('click', (e) => { if (suppressClick) return; if (e.target.closest('.bl-edit-name') || e.target.closest('.bl-edit-clear')) return; if (selectedLibId) assign(slot.index, selectedLibId); });
       boardEl.appendChild(cell);
     }
     body.appendChild(boardEl);
@@ -210,7 +274,7 @@ export default function create({ root, moduleApi }) {
     const list = state?.library || [];
     if (!list.length) lib.appendChild(el('div', 'bl-lib-empty', 'No photos yet — set a Google Drive folder link in Admin, or hit Sync. Then drag a photo onto a slot.'));
     for (const person of list) {
-      const item = el('div', 'bl-lib-item'); item.draggable = true; item.dataset.id = person.id;
+      const item = el('div', 'bl-lib-item'); item.dataset.id = person.id;
       if (person.id === selectedLibId) item.classList.add('bl-lib-selected');
       const ph = el('div', 'bl-lib-photo'); ph.appendChild(photoNode(person, 'bl-lib-img')); item.appendChild(ph);
       const nm = el('button', 'bl-lib-name', person.name || 'Name…');
@@ -219,12 +283,8 @@ export default function create({ root, moduleApi }) {
       const del = el('button', 'bl-lib-del', '×'); del.title = 'Delete photo';
       del.addEventListener('click', (e) => { e.stopPropagation(); if (confirm(`Delete ${person.name || 'this photo'} from the library?`)) api(`/library/${person.id}/delete`, { method: 'POST' }); });
       item.appendChild(del);
-      item.addEventListener('dragstart', (e) => {
-        e.dataTransfer.setData('text/plain', 'lib:' + person.id); e.dataTransfer.effectAllowed = 'copy';
-        dragBody = body; dragScrolling = true; startDragAutoScroll();
-      });
-      item.addEventListener('dragend', stopDragAutoScroll);
-      item.addEventListener('click', () => { selectedLibId = selectedLibId === person.id ? '' : person.id; renderEditor(); });
+      makeDraggable(item, 'lib', person.id, body, person.name);
+      item.addEventListener('click', () => { if (suppressClick) return; selectedLibId = selectedLibId === person.id ? '' : person.id; renderEditor(); });
       lib.appendChild(item);
     }
     body.appendChild(lib);
@@ -293,6 +353,10 @@ export default function create({ root, moduleApi }) {
       stopConfetti();
       stopParallax();
       stopDragAutoScroll();
+      document.removeEventListener('pointermove', onPointerMove);
+      document.removeEventListener('pointerup', onPointerUp);
+      document.removeEventListener('pointercancel', onPointerUp);
+      document.removeEventListener('touchmove', onTouchMove);
       root.innerHTML = '';
     },
   };

modules/band-lineup/matching.js

@@ -128,7 +128,11 @@ function assignMembersToSlots(slots, members) {
       if (score > bestScore) { bestScore = score; bestIndex = i; }
     }
     if (bestIndex < 0) return null;
-    return pool.splice(bestIndex, 1)[0];
+    const chosen = pool.splice(bestIndex, 1)[0];
+    // One spot per person: someone scheduled twice (Leader + Acoustic) must not fill a second spot.
+    const key = chosen.personId || '';
+    if (key) for (let i = pool.length - 1; i >= 0; i -= 1) if (pool[i].personId === key) pool.splice(i, 1);
+    return chosen;
   });
 }
 

modules/band-lineup/matching.test.js

@@ -65,3 +65,12 @@ console.log('assignment:', JSON.stringify(out));
   assert.strictEqual(bestLibraryMatch('Chris Smith', [{ id: '1', name: 'Chris' }, { id: '2', name: 'Chris' }]), null, 'ambiguous tie → null');
   console.log('bestLibraryMatch: all assertions passed ✓');
 }
+
+// --- one spot per person: someone scheduled twice (Leader + Acoustic) fills one spot only ---
+{
+  const P = (label, name, personId) => ({ label, name, personId });
+  const slots = ['[LEADER, VOX 1, ACOUSTIC] MIX 1', '[GUITAR, 2] MIX 7'];
+  const got = assignMembersToSlots(slots, [P('[Leader]', 'Mike', 'mp'), P('Guitar [Acoustic]', 'Mike', 'mp'), P('Guitar [Rhythm]', 'Craig', 'cs')]).map((m) => (m ? m.name : null));
+  assert.deepStrictEqual(got, ['Mike', 'Craig'], 'Mike once, Craig gets the guitar spot');
+  console.log('one spot per person: all assertions passed ✓');
+}

modules/band-lineup/module.json

@@ -1,7 +1,7 @@
 {
   "id": "band-lineup",
   "name": "Band Lineup",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "proddash": ">=1.4.0",
   "description": "Stage lineup photos with mic/pack labels — a drag-in photo library plus optional Planning Center auto-fill",
   "client": "client.js",

modules/band-lineup/server.js

@@ -247,7 +247,7 @@ module.exports = {
       return {
         configured: pco.configured, serviceTypeSet: Boolean(serviceTypeId),
         reachable: false, lastError: '', lastFetched: 0, columns,
-        plan: null,
+        plan: settings.lastPlan || null, // the last synced plan, so hand placements after a restart stamp right
         slots: effectiveSlots().map((label, index) => ({ index, label, person: null })),
         library: [], choir: choirOn,
       };
@@ -493,7 +493,8 @@ module.exports = {
         await syncPhotos(); // import the photo source (Drive folder or local path) on every sync
         if (pco.configured && serviceTypeId) {
         const plan = pickPlan(await listPlans(serviceTypeId));
-        latest.plan = plan ? { title: plan.title, dates: plan.dates } : null;
+        latest.plan = plan ? { id: String(plan.id), title: plan.title, dates: plan.dates } : null;
+        if (plan) { settings.lastPlan = latest.plan; saveSettings(); }
         if (!plan) { latest.reachable = true; latest.lastError = 'No plan found for that service type.'; }
         else {
 
@@ -521,13 +522,16 @@ module.exports = {
 
         const libEntries = Object.entries(library).map(([id, v]) => ({ id, name: v.name, file: v.file }));
 
-        // Slots a person is sitting in by hand — don't fill them, and don't place that same person twice.
+        // Slots a person was placed in by hand FOR THIS PLAN — don't fill them, and don't place that
+        // same person twice. A hand placement made for an earlier plan (last week's lineup, or one
+        // from before placements were stamped) is stale: Sync replaces it like any synced slot.
         const eff = effectiveSlots();
+        const planId = String(plan.id);
         const openIdx = []; const manualNames = new Set();
         for (let i = 0; i < eff.length; i += 1) {
           const e = board[String(i)];
-          if (e && (e.personId || e.name)) {
-            const nm = e.personId ? (library[e.personId] && library[e.personId].name) : e.name;
+          if (e && (e.personId || e.name || e.pco) && e.plan === planId) {
+            const nm = e.pco ? e.pco.name : e.personId ? (library[e.personId] && library[e.personId].name) : e.name;
             if (nm) manualNames.add(normName(nm));
           } else openIdx.push(i);
         }
@@ -540,8 +544,8 @@ module.exports = {
             const lib = bestLibraryMatch(m.name, libEntries); // folder photo wins over the PCO headshot
             const file = lib && lib.file ? lib.file : await cachePcoPhoto(m.personId, m.photoUrl);
             board[String(i)] = { pco: { name: m.name, file, birthday: m.birthday || '', personId: m.personId } };
-          } else if (board[String(i)] && board[String(i)].pco) {
-            delete board[String(i)]; // was synced, no longer on the plan
+          } else if (board[String(i)]) {
+            delete board[String(i)]; // synced or stale, and no longer on the plan
           }
         }
         saveBoard();
@@ -580,6 +584,7 @@ module.exports = {
     current = {
       streams, getLatest: () => latest, pco, listPlans, photoDir,
       library, board, saveLibrary, saveBoard, rebuildLocal, refresh: () => syncNow(), slots,
+      planId: () => (latest.plan && latest.plan.id) || '',
       photoUrlFor, libraryList,
       setChoir, choirOn: () => choirOn,
     };
@@ -670,6 +675,10 @@ module.exports = {
         const from = String(p.get('from') || ''); const to = String(p.get('to') || '');
         if (!/^\d+$/.test(from) || !/^\d+$/.test(to) || from === to) return json(res, 400, { error: 'Bad move.' });
         const a = current.board[from]; const b = current.board[to];
+        // Moving a spot is a hand placement for this plan: Sync must not move it back.
+        const plan = current.planId();
+        if (a) a.plan = plan;
+        if (b) b.plan = plan;
         if (a === undefined) delete current.board[to]; else current.board[to] = a;
         if (b === undefined) delete current.board[from]; else current.board[from] = b;
         current.saveBoard(); current.rebuildLocal();
@@ -684,7 +693,7 @@ module.exports = {
         const personId = String(q.get('personId') || '').trim();
         if (!/^\d+$/.test(slot)) return json(res, 400, { error: 'Bad slot.' });
         if (personId && !current.library[personId]) return json(res, 404, { error: 'No such library photo.' });
-        if (personId) current.board[slot] = { personId, name: '' };
+        if (personId) current.board[slot] = { personId, name: '', plan: current.planId() };
         else delete current.board[slot];
         current.saveBoard(); current.rebuildLocal();
         json(res, 200, { ok: true });
@@ -702,6 +711,7 @@ module.exports = {
         const name = String(q.get('name') || '').trim();
         const existing = current.board[index] || { personId: '', name: '' };
         existing.name = name;
+        existing.plan = current.planId();
         if (!existing.personId && !name) delete current.board[index];
         else current.board[index] = existing;
         current.saveBoard(); current.rebuildLocal();

modules/band-lineup/style.css

@@ -230,3 +230,20 @@
   background: color-mix(in srgb, var(--bg) 60%, transparent); color: var(--text); cursor: pointer; font-size: 0.85em; line-height: 1;
 }
 [data-module="band-lineup"] .bl-lib-del:hover { background: var(--danger); color: #fff; }
+
+/* Drag: the floating photo that follows the pointer (appended to <body>, so it scopes itself). */
+[data-module="band-lineup"].bl-drag-ghost {
+  position: fixed; left: 0; top: 0; z-index: 10000; pointer-events: none;
+  width: 72px; aspect-ratio: 3 / 4; margin: -48px 0 0 -36px; border-radius: 8px; overflow: hidden;
+  border: 2px solid var(--accent); background: var(--panel, #222); color: var(--text); font-size: 11px;
+  display: flex; align-items: center; justify-content: center; text-align: center;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.45); opacity: 0.92;
+}
+[data-module="band-lineup"].bl-drag-ghost img { width: 100%; height: 100%; object-fit: cover; object-position: center top; }
+[data-module="band-lineup"] .bl-lib-item,
+[data-module="band-lineup"] .bl-edit-slot { -webkit-user-select: none; user-select: none; -webkit-touch-callout: none; }
+[data-module="band-lineup"] .bl-edit-slot img,
+[data-module="band-lineup"] .bl-lib-item img { -webkit-user-drag: none; pointer-events: none; }
+[data-module="band-lineup"] .bl-dragging { opacity: 0.35; }
+[data-module="band-lineup"].bl-is-dragging, [data-module="band-lineup"] .bl-is-dragging { cursor: grabbing; }
+[data-module="band-lineup"] .bl-is-dragging .bl-edit-slot { transition: box-shadow 0.08s; }

modules/overflow-tap/client.js

@@ -1,233 +0,0 @@
-/* Overflow Tap — the tile.
- *
- * One fact matters across a booth: which keyword Tap is on right now, and
- * whether the switch actually landed. That is the big line. Under it, the
- * destination it maps to and the groups it moved; a small line says whether
- * the slide on screen carries a keyword at all; and the last four switches
- * sit at the bottom with their times, so a tech can see the service's trail.
- *
- * Everything comes from the server's `state` stream. The tile never talks to
- * ProPresenter or Overflow itself.
- */
-
-const HISTORY_SHOWN = 4;
-
-const ICON_REFRESH = '<svg viewBox="0 0 16 16" width="13" height="13" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M13.5 8a5.5 5.5 0 1 1-1.6-3.9"/><path d="M13.5 2.5v3h-3"/></svg>';
-
-export default function create({ root, moduleApi }) {
-  let state = null;
-  let stream = null;
-  let refreshBtn = null;
-  let streamDown = false; // the shared ProdDash stream dropped; cleared by the next state
-
-  const settings = () => moduleApi.instanceSettings || {};
-  const on = (key) => settings()[key] !== false;
-
-  function el(tag, className, text) {
-    const node = document.createElement(tag);
-    if (className) node.className = className;
-    if (text !== undefined && text !== null) node.textContent = text;
-    return node;
-  }
-
-  function clock(ms) {
-    if (!ms) return '';
-    try {
-      return new Date(ms).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' });
-    } catch {
-      return '';
-    }
-  }
-
-  /** The one-line reason the tile cannot do its job, or '' when it can. */
-  function blocker() {
-    if (!state) return 'Waiting for ProdDash';
-    const pp = state.propresenter || {};
-    const of = state.overflow || {};
-    if (!pp.configured) return 'No ProPresenter host — set one in /admin';
-    if (!of.configured) return 'No Overflow login — add it in /admin';
-    if (of.reachable && !(state.keywords || []).length) return 'No keyword mappings in the Overflow Dashboard yet';
-    return '';
-  }
-
-  function render() {
-    root.textContent = '';
-    const box = el('div', 'ot-root');
-    root.append(box);
-
-    const stop = blocker();
-    if (stop) {
-      box.append(el('div', 'ot-empty', stop));
-      return;
-    }
-
-    const pp = state.propresenter || {};
-    const of = state.overflow || {};
-    const cur = state.current;
-    const offline = streamDown || !pp.reachable || !of.reachable;
-
-    if (offline) {
-      box.classList.add('is-offline');
-      const why = streamDown ? 'ProdDash connection lost'
-        : !of.reachable ? (of.error || 'Overflow unreachable')
-          : (pp.error ? `ProPresenter unreachable — ${pp.error}` : 'ProPresenter unreachable');
-      box.append(el('div', 'ot-offline', why));
-    }
-
-    const main = el('div', 'ot-main');
-    if (cur) {
-      // The label carries the state and, when there is one, the moment it
-      // became true; the small lines under the destination are the groups
-      // moved — or, when the switch failed, what went wrong, in their place
-      // (a tile has room for one or the other).
-      let label = `TAP IS ON · since ${clock(cur.at)}`;
-      let tone = 'ok';
-      let note = '';
-      if (cur.pending) {
-        label = cur.attempts > 1 ? `SWITCHING · attempt ${cur.attempts}` : 'SWITCHING';
-        tone = 'muted';
-      } else if (!cur.ok) {
-        label = `NOT SWITCHED · ${clock(cur.at)}`;
-        tone = 'alert';
-        note = cur.error || '';
-      }
-      main.dataset.tone = tone;
-      main.append(el('div', 'ot-label', label));
-      main.append(el('div', 'ot-keyword', cur.keyword));
-      if (on('showDestination')) main.append(el('div', 'ot-dest', cur.destination || ''));
-      if (note) main.append(el('div', 'ot-error', note));
-      else if (on('showGroups') && cur.groups && cur.groups.length) main.append(el('div', 'ot-groups', cur.groups.join(' · ')));
-    } else {
-      main.dataset.tone = 'muted';
-      main.append(el('div', 'ot-label', 'NO KEYWORD YET'));
-      main.append(el('div', 'ot-keyword is-none', '—'));
-      main.append(el('div', 'ot-dest', 'Tap stays where Overflow left it'));
-    }
-    box.append(main);
-
-    if (on('showSlide')) {
-      const slide = state.slide || {};
-      const ann = state.announcement || {};
-      const slideKeys = Array.isArray(slide.keywords) ? slide.keywords : [];
-      const annKeys = Array.isArray(ann.keywords) ? ann.keywords : [];
-      let text;
-      let cls = 'ot-slide';
-      if (!pp.reachable) { text = 'ProPresenter: not answering'; cls += ' is-muted'; }
-      else if (!slide.live && !ann.live) { text = 'Nothing live in ProPresenter'; cls += ' is-muted'; }
-      else if (slideKeys.length || annKeys.length) {
-        const parts = [];
-        if (slideKeys.length) parts.push(`This slide: ${slideKeys.join(' + ')}`);
-        if (annKeys.length) parts.push(`Announcement: ${annKeys.join(' + ')}`);
-        text = parts.join(' · ');
-        cls += ' is-hit';
-      } else if (slide.live) { text = slide.hasNotes ? 'This slide: no keyword' : 'This slide: no notes'; cls += ' is-muted'; }
-      else { text = 'Announcement: no keyword'; cls += ' is-muted'; }
-      box.append(el('div', cls, text));
-    }
-
-    if (on('showHistory')) {
-      const rows = (state.history || []).slice(0, HISTORY_SHOWN);
-      const list = el('ol', 'ot-history');
-      if (!rows.length) {
-        list.append(el('li', 'ot-h-empty', cur ? 'No earlier switches' : 'No switches yet'));
-      }
-      for (const h of rows) {
-        const row = el('li', `ot-h-row${h.ok ? '' : ' is-failed'}`);
-        row.title = h.ok
-          ? `${h.keyword} → ${h.destination || ''}${h.groups && h.groups.length ? ` on ${h.groups.join(', ')}` : ''}`
-          : `${h.keyword}: ${h.error || 'failed'}`;
-        row.append(el('span', 'ot-h-time', clock(h.at)));
-        row.append(el('span', 'ot-h-kw', h.keyword));
-        row.append(el('span', 'ot-h-dest', h.destination || ''));
-        row.append(el('span', 'ot-h-mark', h.ok ? '✓' : '✕'));
-        list.append(row);
-      }
-      box.append(list);
-    }
-  }
-
-  function applyStatus() {
-    if (!state) return moduleApi.setStatus('connecting', 'Waiting for ProdDash');
-    const s = state.status === 'ok' || state.status === 'connecting' || state.status === 'error' ? state.status : 'connecting';
-    moduleApi.setStatus(s, state.message || '');
-  }
-
-  function handleState(e) {
-    try {
-      state = JSON.parse(e.data);
-    } catch {
-      return;
-    }
-    streamDown = false;
-    applyStatus();
-    render();
-  }
-
-  async function backfill() {
-    try {
-      const res = await moduleApi.fetch('/state');
-      if (!res.ok) return;
-      const body = await res.json();
-      if (!body || !body.state || !stream) return;
-      state = body.state;
-      streamDown = false;
-      applyStatus();
-      render();
-    } catch {
-      /* the stream will bring the next state */
-    }
-  }
-
-  async function refresh() {
-    if (!refreshBtn) return;
-    refreshBtn.classList.add('active');
-    try {
-      const res = await moduleApi.fetch('/refresh', { method: 'POST' });
-      if (!res.ok) {
-        let why = `Keyword refresh failed (${res.status})`;
-        try { why = (await res.json()).error || why; } catch { /* keep the status */ }
-        moduleApi.setStatus('error', why);
-      }
-    } catch (err) {
-      moduleApi.setStatus('error', `Keyword refresh failed: ${err && err.message ? err.message : err}`);
-    } finally {
-      refreshBtn.classList.remove('active');
-    }
-  }
-
-  return {
-    start() {
-      moduleApi.setStatus('connecting', 'Connecting');
-      refreshBtn = moduleApi.header.addButton({
-        icon: ICON_REFRESH,
-        title: 'Refresh keywords',
-        onClick: refresh,
-      });
-      stream = moduleApi.sse('/stream', {
-        // A fresh connection replays the state; a tile joining a stream the
-        // page already carries gets only `open`, and the server sends state
-        // on change alone — so backfill, or a second tile waits for the next
-        // switch to draw anything.
-        open() { backfill(); },
-        error() {
-          moduleApi.setStatus('error', 'Lost the connection to ProdDash');
-          streamDown = true;
-          render();
-        },
-        events: { state: handleState },
-      });
-      render();
-    },
-
-    stop() {
-      if (stream) stream.close();
-      stream = null;
-      refreshBtn = null;
-      root.textContent = '';
-    },
-
-    onConfigChange() {
-      render();
-    },
-  };
-}

modules/overflow-tap/keywords.js

@@ -1,66 +0,0 @@
-'use strict';
-
-/**
- * Keyword matching — which of Overflow's keywords a slide's notes carry.
- *
- * Pure functions, no I/O, so keywords.selftest.js can pin every rule down:
- *
- *   cleanNotes(raw)                 → the notes with ProPresenter's invisible padding removed
- *   keywordMatches(notes, keyword)  → boolean
- *   matchKeywords(notes, keywords)  → every keyword (in the order given) the notes carry
- *   sameSet(a, b)                   → the two keyword lists hold the same keywords
- *
- * The rule is Overflow's own helper's: the notes are split into whitespace-
- * separated words, each stripped of surrounding punctuation and lower-cased,
- * and a keyword fires when it is one of those words. So `give` fires on
- * "give", "Give!", "#give" and "(give)", and not on "forgiveness", "giveaway"
- * or "give_now". Phrases work too, bounded the same way on both ends —
- * something the helper cannot do, but nothing it would have matched is lost.
- */
-
-const ZERO_WIDTH = /[​-‍⁠]/g;
-
-function cleanNotes(raw) {
-  return String(raw ?? '').replace(ZERO_WIDTH, '').replace(/\r\n?/g, '\n');
-}
-
-function norm(s) {
-  return String(s ?? '').trim().toLowerCase().replace(/\s+/g, ' ');
-}
-
-function escapeRe(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
-function keywordMatches(notes, keyword) {
-  const n = cleanNotes(notes);
-  const k = norm(keyword);
-  if (!k || !n.trim()) return false;
-  const flat = n.toLowerCase().replace(/\s+/g, ' ');
-  const re = new RegExp(`(?:^|[^\\p{L}\\p{N}_])${escapeRe(k)}(?=$|[^\\p{L}\\p{N}_])`, 'u');
-  return re.test(flat);
-}
-
-/** Every keyword the notes carry, in the order the list gives them, each once. Entries may be strings or objects with a `keyword`. */
-function matchKeywords(notes, keywords) {
-  const out = [];
-  const seen = new Set();
-  for (const raw of keywords || []) {
-    const k = typeof raw === 'string' ? raw : raw && raw.keyword;
-    const key = norm(k);
-    if (!key || seen.has(key)) continue;
-    if (keywordMatches(notes, k)) {
-      seen.add(key);
-      out.push(String(k).trim());
-    }
-  }
-  return out;
-}
-
-function sameSet(a, b) {
-  const x = [...(a || [])].map(norm).sort();
-  const y = [...(b || [])].map(norm).sort();
-  return x.length === y.length && x.every((v, i) => v === y[i]);
-}
-
-module.exports = { cleanNotes, norm, keywordMatches, matchKeywords, sameSet };

modules/overflow-tap/keywords.selftest.js

@@ -1,76 +0,0 @@
-'use strict';
-
-/**
- * Self-test for keywords.js — the matching rules, pinned.
- *
- *   node modules/overflow-tap/keywords.selftest.js
- */
-
-const assert = require('node:assert/strict');
-const { keywordMatches, matchKeywords, sameSet, cleanNotes } = require('./keywords');
-
-let n = 0;
-function test(name, fn) {
-  n += 1;
-  try {
-    fn();
-    console.log(`ok   ${name}`);
-  } catch (err) {
-    console.log(`FAIL ${name}\n     ${err.message}`);
-    process.exitCode = 1;
-  }
-}
-
-test('a keyword fires as a word of the notes, whatever the case', () => {
-  assert.equal(keywordMatches('give', 'give'), true);
-  assert.equal(keywordMatches('Give', 'give'), true);
-  assert.equal(keywordMatches('please GIVE today', 'give'), true);
-});
-
-test('surrounding punctuation is ignored, as the helper strips it', () => {
-  assert.equal(keywordMatches('give!', 'give'), true);
-  assert.equal(keywordMatches('#give now', 'give'), true);
-  assert.equal(keywordMatches('go to (give) now', 'give'), true);
-  assert.equal(keywordMatches('"give"', 'give'), true);
-  assert.equal(keywordMatches('give.', 'give'), true);
-});
-
-test('a keyword inside another word does not fire', () => {
-  assert.equal(keywordMatches('a sermon on forgiveness', 'give'), false);
-  assert.equal(keywordMatches('giveaway', 'give'), false);
-  assert.equal(keywordMatches('give_now', 'give'), false);
-});
-
-test('a phrase keyword is bounded the same way', () => {
-  assert.equal(keywordMatches('Please fill out your Next   Steps card', 'next steps'), true);
-  assert.equal(keywordMatches('nextsteps', 'next steps'), false);
-});
-
-test('regex characters in a keyword are literal', () => {
-  assert.equal(keywordMatches('give.now', 'give.now'), true);
-  assert.equal(keywordMatches('giveXnow', 'give.now'), false);
-});
-
-test('empty notes never match; zero-width padding is ignored', () => {
-  assert.equal(keywordMatches('', 'give'), false);
-  assert.equal(keywordMatches('​', 'give'), false);
-  assert.equal(cleanNotes('​give'), 'give');
-  assert.equal(keywordMatches('​give', 'give'), true);
-});
-
-test('matchKeywords returns every hit, in list order, once each', () => {
-  const list = ['connect', 'give', 'prayer', { keyword: 'Events' }];
-  assert.deepEqual(matchKeywords('give and connect, then events', list), ['connect', 'give', 'Events']);
-  assert.deepEqual(matchKeywords('just worship', list), []);
-  assert.deepEqual(matchKeywords('give', []), []);
-  assert.deepEqual(matchKeywords('give give', ['give', 'GIVE']), ['give']);
-});
-
-test('sameSet compares keyword lists regardless of order and case', () => {
-  assert.equal(sameSet(['give', 'connect'], ['Connect', 'give']), true);
-  assert.equal(sameSet(['give'], ['give', 'connect']), false);
-  assert.equal(sameSet([], []), true);
-  assert.equal(sameSet(['give'], []), false);
-});
-
-console.log(`${n} tests, exit ${process.exitCode || 0}`);

modules/overflow-tap/module.json

@@ -1,112 +0,0 @@
-{
-  "id": "overflow-tap",
-  "name": "Overflow Tap",
-  "version": "1.0.0",
-  "proddash": ">=1.11.0",
-  "description": "Switches Overflow Tap destinations from keywords in ProPresenter slide notes",
-  "permissions": [
-    {
-      "kind": "local-network",
-      "reason": "Reaching ProPresenter on this network"
-    }
-  ],
-  "client": "client.js",
-  "server": "server.js",
-  "style": "style.css",
-  "minSize": {
-    "w": 2,
-    "h": 2
-  },
-  "defaultSize": {
-    "w": 4,
-    "h": 3
-  },
-  "configGroups": {
-    "ProPresenter": {
-      "help": "The ProPresenter whose slide notes carry the keywords. Enable the network in ProPresenter's Preferences › Network and enter the host and port shown there. Only the live slide's notes (and the announcement layer's) are read — nothing on the stage screens changes."
-    },
-    "Overflow": {
-      "collapsed": "whenSet",
-      "help": "An Overflow Dashboard login with Tap access — what Overflow's own ProPresenter helper app signs in with. Google sign-in does not work here: the account needs a password (Forgot Your Password? on the Dashboard sets one). The keywords, their destinations and their Tap groups are managed in the Dashboard under Integrations › ProPresenter › Keyword Mappings and read from there; after changing them, press the tile's refresh button or wait a few minutes."
-    },
-    "Alerts": {
-      "toggle": "alertEnabled",
-      "collapsed": true,
-      "help": "Flash the dashboards listening on this channel when a switch fails — Overflow unreachable or refusing the change — so someone can fix Tap by hand before the moment passes."
-    }
-  },
-  "configSchema": {
-    "propresenter": {
-      "type": "endpoint",
-      "label": "ProPresenter",
-      "group": "ProPresenter",
-      "default": {
-        "host": "",
-        "port": 1025
-      }
-    },
-    "password": {
-      "type": "password",
-      "label": "API password",
-      "group": "ProPresenter",
-      "default": "",
-      "help": "Only if a password is set in ProPresenter's network preferences."
-    },
-    "overflowEmail": {
-      "type": "string",
-      "label": "Email",
-      "group": "Overflow",
-      "default": ""
-    },
-    "overflowPassword": {
-      "type": "password",
-      "label": "Password",
-      "group": "Overflow",
-      "default": ""
-    },
-    "nonprofitId": {
-      "type": "string",
-      "label": "Nonprofit ID",
-      "group": "Overflow",
-      "default": "",
-      "help": "Leave blank: a church login carries its own. Only an @overflow.co staff login needs one."
-    },
-    "alertEnabled": {
-      "type": "switch",
-      "label": "Alert when a switch fails",
-      "group": "Alerts",
-      "default": false
-    },
-    "alertChannel": {
-      "type": "number",
-      "label": "Channel",
-      "group": "Alerts",
-      "default": 1,
-      "min": 1,
-      "max": 6,
-      "help": "1–6; each dashboard chooses the channels it listens to in its Layouts menu."
-    }
-  },
-  "instanceSchema": {
-    "showDestination": {
-      "type": "switch",
-      "label": "Destination",
-      "default": true
-    },
-    "showGroups": {
-      "type": "switch",
-      "label": "Groups",
-      "default": true
-    },
-    "showSlide": {
-      "type": "switch",
-      "label": "Slide match",
-      "default": true
-    },
-    "showHistory": {
-      "type": "switch",
-      "label": "History",
-      "default": true
-    }
-  }
-}

modules/overflow-tap/overflow.js

@@ -1,174 +0,0 @@
-'use strict';
-
-/**
- * Overflow Dashboard API — the calls Overflow's own "ProPresenter Integration"
- * helper app (1.2.3) makes, read from its bundle on 2026-10-11. None of this is
- * in Overflow's public API reference (which documents only reads for Tap): it
- * is the Dashboard's own backend, used with a Dashboard login — the same
- * email and password the helper asks for. Google sign-in does not work here;
- * the account needs a password (Overflow's article says the same).
- *
- *   POST /nonprofit-dashboard/authentication/login/jwt
- *          { email, password } → { token }      a JWT; its payload carries
- *          email, nonprofitId, permissions [{ action, subject }] (subject TAP
- *          or all is required), nonprofits [...], exp
- *   GET  /nonprofit-dashboard/propresenter/nonprofits/{nonprofitId}/keywords
- *          → [ { keyword, destinationName, tapGroups: [{ id, tapGroupName }], … } ]
- *          the Dashboard's Integrations › ProPresenter › Keyword Mappings
- *   POST /nonprofit-dashboard/propresenter/nonprofits/{nonprofitId}/keywords?syncNonprofit=true
- *          { keywords: ["give"] } → the same list, updated      THE SWITCH:
- *          Overflow points the keyword's groups at its destination
- *   GET  /nonprofit-dashboard/propresenter/nonprofits?search=&limit=
- *   POST /nonprofit-dashboard/propresenter/nonprofits/{nonprofitId}/select
- *          only for an @overflow.co staff login, which has no nonprofit of its
- *          own and must pick one first
- *
- * Bearer auth on everything after login. A 401 means the session is gone —
- * sign in again. The helper's own wording for a refused login is kept here
- * (401 invalid email or password, 429 too many attempts, 403 locked).
- *
- * OVERFLOW_TAP_API_BASE=http://127.0.0.1:24720 points the client at
- * tools/overflow-tap-mock.js.
- */
-
-const DEFAULT_API_BASE = 'https://server.overflow.co';
-const API_BASE = String(process.env.OVERFLOW_TAP_API_BASE || DEFAULT_API_BASE).replace(/\/+$/, '');
-const DASH = '/nonprofit-dashboard';
-const TIMEOUT_MS = 10000;
-const TRIGGER_TIMEOUT_MS = 15000;
-
-class OverflowError extends Error {
-  constructor(message, { status = 0, retryable = false, auth = false } = {}) {
-    super(message);
-    this.name = 'OverflowError';
-    this.status = status;
-    this.retryable = retryable;
-    this.auth = auth; // the session was refused: sign in again before retrying
-  }
-}
-
-/** The JWT's payload, or null when the token is not one. No signature check — we only read our own session. */
-function decodeJwt(token) {
-  const parts = String(token || '').split('.');
-  if (parts.length !== 3) return null;
-  try {
-    const b64 = parts[1].replace(/-/g, '+').replace(/_/g, '/');
-    return JSON.parse(Buffer.from(b64, 'base64').toString('utf8'));
-  } catch {
-    return null;
-  }
-}
-
-/** What the module needs to know about a session, from its token. */
-function describeSession(token) {
-  const p = decodeJwt(token) || {};
-  const email = String(p.email || '');
-  const perms = Array.isArray(p.permissions) ? p.permissions : [];
-  const nonprofits = Array.isArray(p.nonprofits)
-    ? p.nonprofits.map((n) => ({ id: String((n && n.id) || ''), name: String((n && n.name) || '') })).filter((n) => n.id)
-    : [];
-  return {
-    email,
-    staff: email.toLowerCase().endsWith('@overflow.co'),
-    nonprofitId: p.nonprofitId ? String(p.nonprofitId) : '',
-    nonprofits,
-    hasTap: perms.some((x) => x && (x.subject === 'TAP' || x.subject === 'all')),
-    expiresAt: Number.isFinite(Number(p.exp)) ? Number(p.exp) * 1000 : 0,
-  };
-}
-
-function createOverflowClient({ fetchImpl = globalThis.fetch } = {}) {
-  async function request(method, path, { query, body, token, timeout = TIMEOUT_MS } = {}) {
-    const url = new URL(API_BASE + path);
-    for (const [k, v] of Object.entries(query || {})) {
-      if (v === undefined || v === null || v === '') continue;
-      url.searchParams.set(k, String(v));
-    }
-    const headers = { Accept: 'application/json' };
-    if (token) headers.Authorization = `Bearer ${token}`;
-    if (body !== undefined) headers['Content-Type'] = 'application/json';
-    const ctl = new AbortController();
-    const timer = setTimeout(() => ctl.abort(), timeout);
-    let res;
-    try {
-      res = await fetchImpl(url, { method, headers, body: body === undefined ? undefined : JSON.stringify(body), signal: ctl.signal });
-    } catch (err) {
-      const aborted = err && err.name === 'AbortError';
-      const cause = err && err.cause && (err.cause.code || err.cause.message);
-      throw new OverflowError(
-        aborted ? `Overflow did not answer within ${timeout / 1000} s` : `Overflow unreachable: ${err.message}${cause ? ` (${cause})` : ''}`,
-        { retryable: true },
-      );
-    } finally {
-      clearTimeout(timer);
-    }
-    const text = await res.text();
-    let data = null;
-    if (text) {
-      try { data = JSON.parse(text); } catch { data = null; }
-    }
-    if (!res.ok) {
-      const detail = data && (data.message || data.error || data.detail);
-      const what = Array.isArray(detail) ? detail.join('; ') : (detail ? String(detail) : '');
-      throw new OverflowError(what ? `Overflow answered ${res.status}: ${what}` : `Overflow answered ${res.status} ${res.statusText}`.trim(), {
-        status: res.status,
-        auth: res.status === 401,
-        retryable: res.status === 429 || res.status >= 500,
-      });
-    }
-    return data;
-  }
-
-  return {
-    base: API_BASE,
-
-    /** Sign in with a Dashboard login; resolves to the JWT. */
-    async login(email, password) {
-      try {
-        const data = await request('POST', `${DASH}/authentication/login/jwt`, { body: { email, password } });
-        const token = data && data.token;
-        if (!token || typeof token !== 'string') throw new OverflowError('Overflow sign-in answered without a token');
-        return token;
-      } catch (err) {
-        if (!(err instanceof OverflowError) || !err.status) throw err;
-        if (err.status === 401) throw new OverflowError('Overflow refused the sign-in: invalid email or password', { status: 401 });
-        if (err.status === 429) throw new OverflowError('Overflow refused the sign-in: too many attempts — wait a while', { status: 429, retryable: true });
-        if (err.status === 403) throw new OverflowError('Overflow refused the sign-in: account locked', { status: 403 });
-        throw err;
-      }
-    },
-
-    /** The Keyword Mappings for a nonprofit, as the Dashboard holds them. */
-    async listKeywords(token, nonprofitId) {
-      const data = await request('GET', `${DASH}/propresenter/nonprofits/${encodeURIComponent(nonprofitId)}/keywords`, { token });
-      return Array.isArray(data) ? data : [];
-    },
-
-    /** Tell Overflow these keywords are on screen; it moves their groups. Resolves to the updated list when one comes back. */
-    async trigger(token, nonprofitId, keywords) {
-      const data = await request('POST', `${DASH}/propresenter/nonprofits/${encodeURIComponent(nonprofitId)}/keywords`, {
-        query: { syncNonprofit: 'true' },
-        body: { keywords },
-        token,
-        timeout: TRIGGER_TIMEOUT_MS,
-      });
-      return Array.isArray(data) ? data : null;
-    },
-
-    /** Staff logins only: the nonprofits this login may act for. */
-    async searchNonprofits(token, search = '', limit = 10) {
-      const data = await request('GET', `${DASH}/propresenter/nonprofits`, { token, query: { search, limit } });
-      const list = (data && data.data && data.data.nonprofits) || (data && data.nonprofits) || (data && data.data) || data;
-      return Array.isArray(list)
-        ? list.map((n) => ({ id: String((n && n.id) || ''), name: String((n && n.name) || ''), slug: String((n && n.slug) || '') }))
-        : [];
-    },
-
-    /** Staff logins only: bind the session to one nonprofit before reading its keywords. */
-    selectNonprofit(token, nonprofitId) {
-      return request('POST', `${DASH}/propresenter/nonprofits/${encodeURIComponent(nonprofitId)}/select`, { token, body: {} });
-    },
-  };
-}
-
-module.exports = { createOverflowClient, OverflowError, decodeJwt, describeSession, API_BASE, DEFAULT_API_BASE };

modules/overflow-tap/server.js

@@ -1,648 +0,0 @@
-'use strict';
-
-/**
- * Overflow Tap — server entry.
- *
- * Does what Overflow's "ProPresenter Integration" helper app does, inside
- * ProdDash: watches the live slide in ProPresenter (the presentation layer
- * and the announcement layer), and when its notes carry one of the keywords
- * mapped in the Overflow Dashboard, tells Overflow — which points that
- * keyword's Tap groups at its destination, so what people reach when they
- * tap a disc follows what is on screen. A slide with no keyword changes
- * nothing; the last destination stays until the next keyworded slide.
- *
- *   GET  /state      → the view-model every tile draws
- *   GET  /stream     → SSE, `state` events on every change (heartbeated)
- *   POST /refresh    → re-read the keyword mappings from the Dashboard now
- *   GET  /keywords   → the mappings as read, for a look while setting up
- *
- * ProPresenter is polled (GET /v1/status/slide for the presentation layer,
- * GET /v1/announcement/slide_index for announcements, once a second each —
- * small requests, nothing heavier) because its chunked update stream is the
- * thing that goes quiet without saying so. Overflow is the Dashboard's own
- * API, signed in with a Dashboard login — the calls, and where they come
- * from, are at the top of overflow.js. Keyword mappings are read on start,
- * every few minutes after that, on /refresh, and from every trigger's answer.
- *
- * OVERFLOW_TAP_API_BASE=http://127.0.0.1:24720 points the module at
- * tools/overflow-tap-mock.js, which also plays a ProPresenter on :1602.
- */
-
-const crypto = require('crypto');
-const { createOverflowClient, OverflowError, describeSession } = require('./overflow');
-const { matchKeywords, sameSet, cleanNotes, norm } = require('./keywords');
-
-const POLL_MS = 1000;                  // ProPresenter, while it answers
-const RETRY_MS = 3000;                 // ProPresenter, while it does not
-const PP_TIMEOUT_MS = 4000;
-const HEARTBEAT_MS = 15000;
-const KEYWORDS_REFRESH_MS = 5 * 60 * 1000;
-const OVERFLOW_RETRY_MS = 30 * 1000;
-const LOGIN_MIN_GAP_MS = 20 * 1000;    // a refused sign-in is not retried sooner (429 = "too many attempts")
-const SESSION_MARGIN_MS = 60 * 1000;   // sign in again this long before the token expires
-const SWITCH_RETRY_MS = 10 * 1000;
-const SWITCH_RETRIES = 3;
-const HISTORY_MAX = 8;                 // the tile shows four; a few more for the hover
-const ALERT_SECONDS = 30;
-
-/** Set by init(), read by routes() — both are rebuilt together on a config save. */
-let current = null;
-
-/**
- * The signed-in session, kept across re-inits for the same login: an admin
- * saving config five times in a minute must not become five sign-ins
- * (Overflow refuses that with 429). Keyed on a hash of the login, so a
- * changed email or password starts fresh; the token itself never leaves the
- * server process.
- */
-let sessionCache = null; // { key, token, expiresAt, email, nonprofitId }
-
-function json(res, code, body) {
-  res.writeHead(code, { 'Content-Type': 'application/json; charset=utf-8', 'Cache-Control': 'no-store' });
-  res.end(JSON.stringify(body));
-}
-
-/** One line for a log or a tile; a fetch failure names its cause (ECONNREFUSED, ENOTFOUND…). */
-function describe(err) {
-  if (err instanceof OverflowError) return err.message;
-  if (err && err.name === 'AbortError') return 'timed out';
-  const msg = err && err.message ? err.message : String(err);
-  const cause = err && err.cause && (err.cause.code || err.cause.message);
-  return cause && !msg.includes(String(cause)) ? `${msg} (${cause})` : msg;
-}
-
-function unique(list) {
-  const seen = new Set();
-  const out = [];
-  for (const v of list) {
-    const k = norm(v);
-    if (!k || seen.has(k)) continue;
-    seen.add(k);
-    out.push(v);
-  }
-  return out;
-}
-
-/** The destination and group names Overflow attached to a keyword mapping, whatever the field names turn out to be. */
-function destinationOf(entry) {
-  return String((entry && (entry.destinationName || (entry.destination && entry.destination.name))) || '');
-}
-function groupsOf(entry) {
-  const list = entry && Array.isArray(entry.tapGroups) ? entry.tapGroups : [];
-  return list.map((g) => String((g && (g.tapGroupName || g.name || g.id)) || '')).filter(Boolean);
-}
-
-module.exports = {
-  init({ config, log, shell }) {
-    /* ── config ────────────────────────────────────────────────────── */
-    const ep = config.propresenter && typeof config.propresenter === 'object' ? config.propresenter : {};
-    const host = String(ep.host || '').trim();
-    const port = Number(ep.port) || 1025;
-    const ppPassword = String(config.password || '');
-    const email = String(config.overflowEmail || '').trim();
-    const ofPassword = String(config.overflowPassword || '');
-    const staffNonprofit = String(config.nonprofitId || '').trim();
-    const configured = Boolean(email && ofPassword);
-    const alertEnabled = Boolean(config.alertEnabled);
-    const alertChannel = Math.min(6, Math.max(1, Math.round(Number(config.alertChannel) || 1)));
-    const sessionKey = crypto.createHash('sha256').update(`${email}\n${ofPassword}`).digest('hex');
-
-    const overflow = createOverflowClient();
-
-    /* ── state ─────────────────────────────────────────────────────── */
-    const streams = new Set();
-    const timers = new Set();
-    let stopped = false;
-    let lastFrame = '';
-
-    let keywordCache = new Map(); // norm(keyword) → the Dashboard's entry
-    let session = null;           // { token, expiresAt, email, nonprofitId }
-    let lastLoginAt = 0;
-    let lastLoginError = null;
-    let wanted = null;            // the keywords Tap should be on: { keywords, keyword, destination, groups }
-    let inFlight = false;
-    let retriesLeft = 0;
-    let retryTimer = null;
-    let alertRaised = false;
-
-    // Presentation layer: the slide /v1/status/slide reports.
-    let lastSlideKey = null;
-    let lastSlide = null;
-    let lastPresKeywords = [];
-    // Announcement layer: the slide /v1/announcement/slide_index points at, read from /v1/announcement/active.
-    let annSupported = true;
-    let lastAnnKey = null;
-    let annNotes = '';
-    let annLive = false;
-    let lastAnnKeywords = [];
-
-    const state = {
-      status: 'connecting',
-      message: '',
-      propresenter: { configured: Boolean(host), reachable: false, error: '', host, port },
-      overflow: { configured, reachable: false, error: '', keywords: 0, loadedAt: 0 },
-      keywords: [],
-      slide: { live: false, keywords: [], hasNotes: false },
-      announcement: { live: false, keywords: [] },
-      current: null,
-      history: [],
-      updatedAt: 0,
-    };
-
-    /* ── timers that die with the handle ───────────────────────────── */
-
-    function later(fn, ms) {
-      const t = setTimeout(() => {
-        timers.delete(t);
-        if (!stopped) fn();
-      }, ms);
-      t.unref?.();
-      timers.add(t);
-      return t;
-    }
-
-    /* ── health, shared by the admin line and the tiles ────────────── */
-
-    function assess(forAdmin = false) {
-      const pp = state.propresenter;
-      const of = state.overflow;
-      if (!pp.configured) return ['error', 'No ProPresenter host configured — set one in /admin'];
-      if (!of.configured) return ['error', 'Overflow login not set — add the email and password in /admin'];
-      if (!of.reachable) return ['error', of.error || 'Signing in to Overflow…'];
-      if (!pp.reachable) return ['error', pp.error ? `ProPresenter unreachable: ${pp.error}` : 'Reaching ProPresenter…'];
-      if (!state.keywords.length) return ['error', 'No keyword mappings in the Overflow Dashboard (Integrations › ProPresenter)'];
-      if (state.current && !state.current.pending && !state.current.ok) {
-        return ['error', `Tap not switched to ${state.current.keyword} — ${state.current.error}`];
-      }
-      if (state.current && state.current.pending) return ['connecting', `Switching Tap to ${state.current.keyword}…`];
-      const n = state.keywords.length;
-      const who = forAdmin && session && session.email ? `${session.email}, ` : '';
-      return ['ok', `Following ${host}:${port} · Overflow: ${who}${n} keyword${n === 1 ? '' : 's'}`];
-    }
-
-    function publish() {
-      if (stopped) return;
-      [state.status, state.message] = assess(false);
-      const { updatedAt, ...rest } = state;
-      let frame;
-      try {
-        frame = JSON.stringify(rest);
-      } catch {
-        return;
-      }
-      if (frame === lastFrame) return;
-      lastFrame = frame;
-      state.updatedAt = Date.now();
-      const payload = `event: state\ndata: ${JSON.stringify(state)}\n\n`;
-      for (const res of streams) {
-        try {
-          res.write(payload);
-        } catch {
-          streams.delete(res);
-        }
-      }
-    }
-
-    /* ── the Overflow session ──────────────────────────────────────── */
-
-    async function ensureSession() {
-      const now = Date.now();
-      if (session && now < session.expiresAt - SESSION_MARGIN_MS) return session;
-      if (sessionCache && sessionCache.key === sessionKey && now < sessionCache.expiresAt - SESSION_MARGIN_MS) {
-        session = sessionCache;
-        return session;
-      }
-      if (lastLoginError && now - lastLoginAt < LOGIN_MIN_GAP_MS) throw lastLoginError;
-      lastLoginAt = now;
-      let token;
-      try {
-        token = await overflow.login(email, ofPassword);
-      } catch (err) {
-        lastLoginError = err;
-        throw err;
-      }
-      lastLoginError = null;
-      const info = describeSession(token);
-      if (!info.hasTap) throw new OverflowError('This Overflow login has no Tap permission — use one with the Organization Admin or Tap Only role');
-      let nonprofitId = info.nonprofitId || (info.nonprofits.length === 1 ? info.nonprofits[0].id : '');
-      if (info.staff) {
-        if (!staffNonprofit) throw new OverflowError('An @overflow.co login has no nonprofit of its own — enter the Nonprofit ID in /admin');
-        await overflow.selectNonprofit(token, staffNonprofit);
-        nonprofitId = staffNonprofit;
-      } else if (!nonprofitId) {
-        nonprofitId = staffNonprofit;
-      }
-      if (!nonprofitId) throw new OverflowError('This Overflow login carries no nonprofit — enter the Nonprofit ID in /admin');
-      session = { token, expiresAt: info.expiresAt || now + 12 * 3600 * 1000, email: info.email || email, nonprofitId };
-      sessionCache = { key: sessionKey, ...session };
-      log(`signed in to Overflow as ${session.email} (nonprofit ${nonprofitId})`);
-      return session;
-    }
-
-    function dropSession() {
-      session = null;
-      if (sessionCache && sessionCache.key === sessionKey) sessionCache = null;
-    }
-
-    /** Run a signed-in call; when the session is refused, sign in again once and retry. */
-    async function withSession(fn) {
-      const s = await ensureSession();
-      try {
-        return await fn(s);
-      } catch (err) {
-        if (!(err instanceof OverflowError) || !err.auth) throw err;
-        dropSession();
-        const again = await ensureSession();
-        return fn(again);
-      }
-    }
-
-    /* ── the keyword mappings ──────────────────────────────────────── */
-
-    function rebuildKeywordView() {
-      state.keywords = [...keywordCache.values()].map((e) => ({
-        keyword: String(e.keyword).trim(),
-        destination: destinationOf(e),
-        groups: groupsOf(e),
-      }));
-      state.overflow.keywords = state.keywords.length;
-    }
-
-    /** Replace the cache with the Dashboard's list (`merge` folds a partial answer into it instead). */
-    function applyKeywordList(list, merge = false) {
-      const next = merge ? new Map(keywordCache) : new Map();
-      for (const entry of list || []) {
-        if (!entry || typeof entry !== 'object') continue;
-        const k = norm(entry.keyword);
-        if (!k) continue;
-        if (entry.active === false || entry.enabled === false || entry.isActive === false) {
-          next.delete(k);
-          continue;
-        }
-        next.set(k, entry);
-      }
-      keywordCache = next;
-      rebuildKeywordView();
-    }
-
-    let loading = null;
-    let refreshTimer = null;
-
-    async function loadKeywords() {
-      if (stopped || !configured) return;
-      if (loading) return loading;
-      loading = (async () => {
-        try {
-          const list = await withSession((s) => overflow.listKeywords(s.token, s.nonprofitId));
-          applyKeywordList(list);
-          state.overflow.reachable = true;
-          state.overflow.error = '';
-          state.overflow.loadedAt = Date.now();
-          reconsider(); // a slide already up when the mappings arrive takes effect now
-        } catch (err) {
-          state.overflow.reachable = false;
-          state.overflow.error = describe(err);
-          log(`Overflow: ${state.overflow.error}`);
-        }
-        publish();
-      })();
-      try {
-        await loading;
-      } finally {
-        loading = null;
-      }
-      if (stopped) return;
-      if (refreshTimer) {
-        clearTimeout(refreshTimer);
-        timers.delete(refreshTimer);
-      }
-      refreshTimer = later(loadKeywords, state.overflow.reachable ? KEYWORDS_REFRESH_MS : OVERFLOW_RETRY_MS);
-    }
-
-    /* ── the switch ────────────────────────────────────────────────── */
-
-    function describeTarget(keys) {
-      const entries = keys.map((k) => keywordCache.get(norm(k))).filter(Boolean);
-      return {
-        keywords: keys,
-        keyword: keys.join(' + '),
-        destination: unique(entries.map(destinationOf).filter(Boolean)).join(' + '),
-        groups: unique(entries.flatMap(groupsOf)),
-      };
-    }
-
-    function pushHistory(entry) {
-      const { pending, ...rest } = entry;
-      state.history.unshift(rest);
-      if (state.history.length > HISTORY_MAX) state.history.length = HISTORY_MAX;
-    }
-
-    function raiseAlert(keyword) {
-      if (!alertEnabled || !shell || typeof shell.alert !== 'function') return;
-      alertRaised = true;
-      Promise.resolve(shell.alert({ channel: alertChannel, level: 'medium', text: `Tap not switched: ${keyword}`, duration: ALERT_SECONDS }))
-        .catch((err) => log(`alert refused: ${describe(err)}`));
-    }
-
-    function clearAlert() {
-      if (!alertRaised || !shell || typeof shell.clearAlert !== 'function') return;
-      alertRaised = false;
-      Promise.resolve(shell.clearAlert(alertChannel)).catch(() => {});
-    }
-
-    function requestSwitch(target) {
-      wanted = target;
-      retriesLeft = SWITCH_RETRIES;
-      if (retryTimer) {
-        clearTimeout(retryTimer);
-        timers.delete(retryTimer);
-        retryTimer = null;
-      }
-      runSwitch();
-    }
-
-    async function runSwitch() {
-      if (stopped || inFlight || !wanted) return;
-      const target = wanted;
-      const cur = state.current;
-      const sameTarget = cur && sameSet(cur.keywords, target.keywords);
-      if (sameTarget && cur.ok) return; // already there
-      inFlight = true;
-      let entry;
-      if (sameTarget) {
-        entry = cur; // another go at the same switch
-      } else {
-        if (cur) pushHistory(cur);
-        entry = {
-          keyword: target.keyword,
-          keywords: target.keywords,
-          destination: target.destination,
-          groups: target.groups,
-          at: Date.now(),
-          ok: false,
-          pending: true,
-          error: '',
-          attempts: 0,
-        };
-        state.current = entry;
-      }
-      entry.pending = true;
-      entry.attempts += 1;
-      publish();
-      try {
-        const answer = await withSession((s) => overflow.trigger(s.token, s.nonprofitId, target.keywords));
-        if (answer) {
-          applyKeywordList(answer, true);
-          const fresh = describeTarget(target.keywords);
-          entry.destination = fresh.destination || entry.destination;
-          entry.groups = fresh.groups.length ? fresh.groups : entry.groups;
-        }
-        entry.ok = true;
-        entry.error = '';
-        entry.at = Date.now();
-        clearAlert();
-        log(`Tap → ${entry.destination || '?'} (${target.keyword})${entry.groups.length ? ` on ${entry.groups.join(', ')}` : ''}`);
-      } catch (err) {
-        if (stopped) return;
-        entry.ok = false;
-        entry.error = describe(err);
-        log(`Tap not switched to ${target.keyword}: ${entry.error}`);
-        if (retriesLeft > 0) {
-          retriesLeft -= 1;
-          retryTimer = later(() => {
-            retryTimer = null;
-            runSwitch();
-          }, SWITCH_RETRY_MS);
-        }
-        raiseAlert(target.keyword);
-      } finally {
-        entry.pending = false;
-        inFlight = false;
-        publish();
-        if (!stopped && wanted !== target) runSwitch(); // a newer keyword arrived meanwhile
-      }
-    }
-
-    /* ── what is on screen, and what to do about it ────────────────── */
-
-    /**
-     * The helper's rule, per layer: when the set of keywords the layer's
-     * slide carries changes to a non-empty set, send it. Returning to a
-     * keyword after a slide without one sends it again; staying on the same
-     * keyword across slides sends nothing.
-     */
-    function reconsider() {
-      const list = [...keywordCache.values()];
-      const presNotes = lastSlide ? cleanNotes(lastSlide.notes) : '';
-      const presKeys = lastSlide ? matchKeywords(presNotes, list) : [];
-      state.slide = { live: Boolean(lastSlide), keywords: presKeys, hasNotes: Boolean(presNotes.trim()) };
-      const presChanged = !sameSet(presKeys, lastPresKeywords);
-      if (presChanged) lastPresKeywords = presKeys;
-
-      const annKeys = annLive ? matchKeywords(annNotes, list) : [];
-      state.announcement = { live: annLive, keywords: annKeys };
-      const annChanged = !sameSet(annKeys, lastAnnKeywords);
-      if (annChanged) lastAnnKeywords = annKeys;
-
-      const batch = [];
-      if (presChanged && presKeys.length) batch.push(...presKeys);
-      if (annChanged && annKeys.length) batch.push(...annKeys);
-      if (batch.length) requestSwitch(describeTarget(unique(batch)));
-    }
-
-    /* ── ProPresenter ──────────────────────────────────────────────── */
-
-    function ppUrl(target) {
-      const u = new URL(`http://${host}:${port}${target}`);
-      if (ppPassword) u.searchParams.set('password', ppPassword);
-      return u;
-    }
-
-    async function ppJson(target) {
-      const ctl = new AbortController();
-      const timer = setTimeout(() => ctl.abort(), PP_TIMEOUT_MS);
-      try {
-        const res = await fetch(ppUrl(target), { headers: { Accept: 'application/json' }, signal: ctl.signal });
-        if (!res.ok) {
-          const err = new Error(`ProPresenter ${res.status} ${res.statusText}`);
-          err.status = res.status;
-          throw err;
-        }
-        const text = await res.text();
-        return text ? JSON.parse(text) : null;
-      } finally {
-        clearTimeout(timer);
-      }
-    }
-
-    /** The presentation layer: /v1/status/slide names the live slide and carries its notes. */
-    async function pollSlide() {
-      const data = await ppJson('/v1/status/slide');
-      const cur = data && data.current && typeof data.current === 'object' ? data.current : null;
-      const key = cur ? `${cur.uuid || ''}\u0000${cur.text || ''}\u0000${cur.notes || ''}` : '';
-      if (key === lastSlideKey) return false;
-      lastSlideKey = key;
-      lastSlide = cur;
-      return true;
-    }
-
-    /**
-     * The announcement layer: its slide index names the document and the
-     * slide; the document's slides (every group's, in order, disabled ones
-     * included — that is the index's space) carry the notes. An older
-     * ProPresenter without this API answers 404 once and is left alone.
-     */
-    async function pollAnnouncement() {
-      if (!annSupported) return false;
-      let idx;
-      try {
-        idx = await ppJson('/v1/announcement/slide_index');
-      } catch (err) {
-        if (err && err.status === 404) {
-          annSupported = false;
-          log('this ProPresenter has no announcement layer API — following the presentation layer only');
-          return false;
-        }
-        throw err;
-      }
-      const node = idx && idx.announcement_index;
-      if (!node || !Number.isInteger(node.index)) {
-        if (lastAnnKey === '') return false;
-        lastAnnKey = '';
-        annLive = false;
-        annNotes = '';
-        return true;
-      }
-      const id = node.presentation_id || {};
-      const key = `${id.uuid || ''}\u0000${id.name || ''}\u0000${node.index}`;
-      if (key === lastAnnKey) return false;
-      const doc = await ppJson('/v1/announcement/active');
-      const ann = doc && doc.announcement;
-      const slides = [];
-      for (const g of (ann && Array.isArray(ann.groups) ? ann.groups : [])) {
-        for (const s of (g && Array.isArray(g.slides) ? g.slides : [])) slides.push(s);
-      }
-      const slide = slides[node.index];
-      annNotes = slide ? cleanNotes(slide.notes) : '';
-      annLive = true;
-      lastAnnKey = key;
-      return true;
-    }
-
-    async function pollTick() {
-      if (stopped) return;
-      let ok = false;
-      let changed = false;
-      try {
-        changed = await pollSlide();
-        state.propresenter.reachable = true;
-        state.propresenter.error = '';
-        ok = true;
-        try {
-          if (await pollAnnouncement()) changed = true;
-        } catch {
-          /* the presentation poll already said ProPresenter answers; a hiccup here waits for the next tick */
-        }
-      } catch (err) {
-        state.propresenter.reachable = false;
-        state.propresenter.error = err && err.name === 'AbortError' ? 'timed out' : describe(err);
-      }
-      if (changed) reconsider();
-      publish();
-      later(pollTick, ok ? POLL_MS : RETRY_MS);
-    }
-
-    /* ── go ────────────────────────────────────────────────────────── */
-
-    if (host) {
-      pollTick();
-      log(`following ProPresenter at ${host}:${port}`);
-    } else {
-      log('no ProPresenter host configured — set one in /admin');
-    }
-    if (configured) {
-      loadKeywords();
-      log(`Overflow at ${overflow.base}`);
-    } else {
-      log('Overflow login not set — add the email and password in /admin');
-    }
-    publish();
-
-    const heartbeat = setInterval(() => {
-      for (const res of streams) {
-        try {
-          res.write(': ping\n\n');
-        } catch {
-          streams.delete(res);
-        }
-      }
-    }, HEARTBEAT_MS);
-    heartbeat.unref?.();
-
-    const handle = {
-      streams,
-      configured,
-      getState: () => state,
-      refresh: () => loadKeywords(),
-    };
-    current = handle;
-
-    return {
-      stop() {
-        stopped = true;
-        clearInterval(heartbeat);
-        for (const t of timers) clearTimeout(t);
-        timers.clear();
-        clearAlert();
-        for (const res of streams) {
-          try { res.end(); } catch { /* already gone */ }
-        }
-        streams.clear();
-        if (current === handle) current = null;
-      },
-      health() {
-        const [status, message] = assess(true);
-        return { status, message };
-      },
-    };
-  },
-
-  routes() {
-    return {
-      'GET /state': (req, res) => {
-        if (!current) return json(res, 503, { error: 'Overflow Tap is not running.' });
-        json(res, 200, { state: current.getState() });
-      },
-
-      'GET /stream': (req, res) => {
-        res.writeHead(200, {
-          'Content-Type': 'text/event-stream; charset=utf-8',
-          'Cache-Control': 'no-cache, no-transform',
-          Connection: 'keep-alive',
-          'X-Accel-Buffering': 'no',
-        });
-        res.write('retry: 3000\n\n');
-        if (!current) return void res.end();
-        res.write(`event: state\ndata: ${JSON.stringify(current.getState())}\n\n`);
-        try { req.socket.setKeepAlive(true, 15000); } catch { /* gone */ }
-        current.streams.add(res);
-        req.on('close', () => current && current.streams.delete(res));
-      },
-
-      'POST /refresh': async (req, res) => {
-        if (!current) return json(res, 503, { error: 'Overflow Tap is not running.' });
-        if (!current.configured) return json(res, 400, { error: 'Overflow login is not set.' });
-        await current.refresh();
-        const st = current.getState();
-        if (!st.overflow.reachable) return json(res, 502, { error: st.overflow.error || 'Overflow unreachable.' });
-        json(res, 200, { ok: true, keywords: st.overflow.keywords });
-      },
-
-      'GET /keywords': (req, res) => {
-        if (!current) return json(res, 503, { error: 'Overflow Tap is not running.' });
-        const st = current.getState();
-        json(res, 200, { keywords: st.keywords, loadedAt: st.overflow.loadedAt, error: st.overflow.error });
-      },
-    };
-  },
-};

modules/overflow-tap/style.css

@@ -1,213 +0,0 @@
-/* Overflow Tap — scoped under its tile via [data-module="overflow-tap"] and
-   styled with the shell's variables only. Sizes hang off the tile (container
-   units) so the keyword reads from across a booth on a big tile and still
-   fits a 2×2. */
-
-[data-module="overflow-tap"] {
-  container-type: size;
-}
-
-[data-module="overflow-tap"] .ot-root {
-  position: absolute;
-  inset: 0;
-  display: flex;
-  flex-direction: column;
-  align-items: stretch;
-  padding: clamp(4px, 4cqmin, 18px);
-  gap: clamp(2px, 1.8cqmin, 10px);
-  overflow: hidden;
-  color: var(--text);
-  user-select: none;
-  -webkit-user-select: none;
-}
-
-[data-module="overflow-tap"] .ot-offline {
-  flex-shrink: 0;
-  font-size: clamp(0.6rem, 4.6cqmin, 0.9rem);
-  font-weight: 700;
-  color: var(--danger);
-  text-transform: uppercase;
-  letter-spacing: 0.04em;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-[data-module="overflow-tap"] .ot-root.is-offline .ot-main,
-[data-module="overflow-tap"] .ot-root.is-offline .ot-slide,
-[data-module="overflow-tap"] .ot-root.is-offline .ot-history {
-  opacity: 0.45;
-  filter: grayscale(0.6);
-}
-
-/* ── the live keyword ───────────────────────────────────────────── */
-
-[data-module="overflow-tap"] .ot-main {
-  --tone: var(--accent);
-  flex: 1 1 auto;
-  min-height: 0;
-  container-type: size;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: 0;
-  text-align: center;
-  overflow: hidden;
-}
-[data-module="overflow-tap"] .ot-main[data-tone="ok"] { --tone: var(--accent); }
-[data-module="overflow-tap"] .ot-main[data-tone="warn"] { --tone: var(--warn); }
-[data-module="overflow-tap"] .ot-main[data-tone="alert"] { --tone: var(--danger); }
-[data-module="overflow-tap"] .ot-main[data-tone="muted"] { --tone: var(--muted); }
-
-[data-module="overflow-tap"] .ot-label {
-  color: var(--tone);
-  font-size: clamp(0.5rem, 9cqh, 0.95rem);
-  font-weight: 700;
-  letter-spacing: 0.14em;
-  line-height: 1.2;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  font-variant-numeric: tabular-nums;
-}
-
-[data-module="overflow-tap"] .ot-keyword {
-  color: var(--tone);
-  font-size: min(clamp(1rem, 38cqh, 7rem), 18cqw);
-  font-weight: 750;
-  line-height: 1.15;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-[data-module="overflow-tap"] .ot-keyword.is-none { color: var(--muted); }
-[data-module="overflow-tap"] .ot-main[data-tone="muted"] .ot-keyword {
-  animation: ot-pulse 1.2s ease-in-out infinite;
-}
-@keyframes ot-pulse {
-  0%, 100% { opacity: 1; }
-  50% { opacity: 0.45; }
-}
-
-[data-module="overflow-tap"] .ot-dest {
-  color: var(--text);
-  font-size: min(clamp(0.7rem, 16cqh, 1.9rem), 8cqw);
-  font-weight: 600;
-  line-height: 1.2;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-[data-module="overflow-tap"] .ot-main[data-tone="muted"] .ot-dest { color: var(--muted); font-weight: 500; }
-
-[data-module="overflow-tap"] .ot-groups {
-  color: var(--muted);
-  font-size: clamp(0.5rem, 9cqh, 0.95rem);
-  line-height: 1.3;
-  flex-shrink: 0;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-[data-module="overflow-tap"] .ot-error {
-  color: var(--danger);
-  font-size: clamp(0.5rem, 9cqh, 0.95rem);
-  line-height: 1.3;
-  max-width: 100%;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-[data-module="overflow-tap"] .ot-error.is-warn { color: var(--warn); }
-
-/* ── this slide ─────────────────────────────────────────────────── */
-
-[data-module="overflow-tap"] .ot-slide {
-  flex-shrink: 0;
-  text-align: center;
-  font-size: clamp(0.55rem, 4.8cqmin, 0.95rem);
-  color: var(--text);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 0.25em 0.6em;
-  border-radius: 999px;
-  background: color-mix(in srgb, var(--text) 7%, transparent);
-  align-self: center;
-  max-width: 100%;
-}
-[data-module="overflow-tap"] .ot-slide.is-muted { color: var(--muted); }
-[data-module="overflow-tap"] .ot-slide.is-hit {
-  color: var(--accent-text);
-  background: color-mix(in srgb, var(--accent) 80%, transparent);
-  font-weight: 650;
-}
-[data-module="overflow-tap"] .ot-slide.is-warn {
-  color: var(--warn);
-  background: color-mix(in srgb, var(--warn) 16%, transparent);
-}
-
-/* ── the trail ──────────────────────────────────────────────────── */
-
-[data-module="overflow-tap"] .ot-history {
-  flex-shrink: 0;
-  list-style: none;
-  margin: 0;
-  padding: 0.3em 0 0;
-  border-top: 1px solid var(--border);
-  font-size: clamp(0.55rem, 4.6cqmin, 0.95rem);
-  display: flex;
-  flex-direction: column;
-  gap: 0.1em;
-}
-
-[data-module="overflow-tap"] .ot-h-row {
-  display: grid;
-  grid-template-columns: auto minmax(0, 1fr) minmax(0, 1.4fr) auto;
-  align-items: baseline;
-  gap: 0 0.7em;
-  color: var(--text);
-}
-[data-module="overflow-tap"] .ot-h-row.is-failed .ot-h-kw,
-[data-module="overflow-tap"] .ot-h-row.is-failed .ot-h-mark { color: var(--danger); }
-[data-module="overflow-tap"] .ot-h-time {
-  color: var(--muted);
-  font-variant-numeric: tabular-nums;
-}
-[data-module="overflow-tap"] .ot-h-kw { font-weight: 650; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-[data-module="overflow-tap"] .ot-h-dest { color: var(--muted); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-[data-module="overflow-tap"] .ot-h-mark { color: var(--accent); font-weight: 700; }
-[data-module="overflow-tap"] .ot-h-empty { color: var(--muted); text-align: center; }
-
-/* On a short tile the trail would crowd the keyword out: keep the
-   keyword, drop the trail. Inside the keyword block the same rule: when
-   it is short, the small lines go before the keyword does. */
-@container (max-height: 120px) {
-  [data-module="overflow-tap"] .ot-history { display: none; }
-}
-@container (max-height: 70px) {
-  [data-module="overflow-tap"] .ot-groups,
-  [data-module="overflow-tap"] .ot-error { display: none; }
-}
-@container (max-height: 46px) {
-  [data-module="overflow-tap"] .ot-dest,
-  [data-module="overflow-tap"] .ot-label { display: none; }
-}
-
-[data-module="overflow-tap"] .ot-empty {
-  position: absolute;
-  inset: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 6%;
-  color: var(--muted);
-  text-align: center;
-  font-size: clamp(0.65rem, 5.5cqmin, 1rem);
-}

modules/resi-cues/module.json

@@ -1,7 +1,7 @@
 {
   "id": "resi-cues",
   "name": "Resi Cues",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "proddash": ">=1.4.0",
   "description": "Time until the next Resi cue point, on the board and as a timer",
   "provides": ["timers"],

modules/resi-cues/resi.js

@@ -39,6 +39,9 @@ function msToPosition(total) {
 
 const WINDOW_MS = 120000;   // how long a reading stays useful
 const JUMP_FLOOR_MS = 5000; // the smallest move ever treated as a seek
+const LOGIN_BACKOFF_MS = 15000;      // first wait after a failed Resi login
+const LOGIN_BACKOFF_MAX_MS = 300000; // longest wait between login attempts
+const SESSION_FRESH_MS = 60000;      // a refusal younger than this is a permission, not an expired session
 
 /**
  * Resi republishes a decoder's `position` only every few seconds, on an irregular
@@ -61,6 +64,8 @@ function createPlayhead(options) {
   let offsets = [];      // { at, off } — off is mediaMs - wall time it was read
   let spreads = [];      // how far apart honest readings sit: this link's noise
   let gaps = [];         // how long between the playhead actually moving
+  let changes = 0;       // readings that differed from the one before
+  let rejected = false;  // the last gap looked like a pause and was skipped
   let base;              // the trusted offset
   let lastMedia;
   let lastNewAt;
@@ -90,15 +95,25 @@ function createPlayhead(options) {
           spreads = spreads.concat(-delta).slice(-20);
         }
       }
-      if (lastNewAt !== undefined) {
+      // The first reading lands at an arbitrary point in Resi's cycle, so the gap
+      // from it to the next one is only a fraction of the real cadence. Learning
+      // from it locked in a 2s cadence that rejected every honest 30s gap.
+      if (lastNewAt !== undefined && changes > 0) {
         const gap = t - lastNewAt;
         // The gap either side of a pause is not Resi's cadence — recording it
         // would inflate the estimate and make the next pause slow to notice.
+        // But a pause is one gap; twice in a row is the cadence having changed.
         const worst = gaps.length ? Math.max.apply(null, gaps) : 0;
-        if (gap > 0 && gap < 60000 && (!worst || gap <= worst * 3)) {
-          gaps = gaps.concat(gap).slice(-8);
+        if (gap > 0 && gap < 60000) {
+          if (!worst || gap <= worst * 3 || rejected) {
+            gaps = gaps.concat(gap).slice(-8);
+            rejected = false;
+          } else {
+            rejected = true;
+          }
         }
       }
+      if (lastNewAt !== undefined) changes++;
       offsets = offsets.concat({ at: t, off });
       lastMedia = mediaMs;
       lastNewAt = t;
@@ -118,7 +133,9 @@ function createPlayhead(options) {
     // Only call it paused once the playhead has been still for clearly longer than
     // Resi's own cadence. A fixed timeout mistakes a slow update for a stop, and a
     // countdown that freezes mid-service is the worse failure of the two.
-    const pauseAfter = Math.max(15000, Math.min(45000, cadenceMs * 2.5 + 6000));
+    // Until a full gap has been measured the cadence is unknown; assume the slowest
+    // Resi plausibly is, or a 30s publisher reads as paused 15s after every start.
+    const pauseAfter = cadenceMs ? Math.max(15000, Math.min(45000, cadenceMs * 2.5 + 6000)) : 45000;
     const playing = base !== undefined && t - lastNewAt < pauseAfter;
     if (!playing) {
       return { estMs: lastEst !== undefined ? lastEst : lastMedia, playing: false, cadenceMs };
@@ -161,13 +178,43 @@ function createResiClient(options) {
     return h;
   }
 
+  /* A failed login used to be retried on the very next poll -- once a second, for
+     ever. Resi answers that with 429s, and since the retries never let up, the
+     account never got out of them. So a failure now holds off further attempts,
+     doubling from 15s to 5min (or as long as Resi's Retry-After asks), and every
+     call in between fails at once with the same reason instead of signing in. */
+  const now = typeof opts.now === 'function' ? opts.now : () => Date.now();
+  let loginFailures = 0;
+  let loginBlockedUntil = 0;
+  let loginError = '';
+
   async function login() {
-    const res = await doFetch(`${RESI}/api/v3/login?newToken=true`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', Accept: 'application/json' },
-      body: JSON.stringify({ userName: opts.username, password: opts.password }),
-    });
-    if (!res.ok) throw new Error(`Resi login failed (${res.status})`);
+    if (now() < loginBlockedUntil) {
+      const wait = Math.ceil((loginBlockedUntil - now()) / 1000);
+      throw new Error(`${loginError} — retrying in ${wait}s`);
+    }
+    let res;
+    try {
+      res = await doFetch(`${RESI}/api/v3/login?newToken=true`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', Accept: 'application/json' },
+        body: JSON.stringify({ userName: opts.username, password: opts.password }),
+      });
+    } catch (err) {
+      holdOff(`Resi unreachable (${(err && err.message) || err})`, 0);
+      throw new Error(loginError);
+    }
+    if (!res.ok) {
+      const reason = res.status === 429 ? 'Resi is rate-limiting this login (429)'
+        : res.status === 400 || res.status === 401 ? `Resi rejected the login (${res.status}) — check the password`
+          : `Resi login failed (${res.status})`;
+      const retryAfter = Number(res.headers && res.headers.get && res.headers.get('retry-after')) || 0;
+      holdOff(reason, retryAfter * 1000);
+      throw new Error(reason);
+    }
+    loginFailures = 0;
+    loginBlockedUntil = 0;
+    loginError = '';
     const setCookies = (res.headers.getSetCookie && res.headers.getSetCookie())
       || (res.headers.get('set-cookie') ? [res.headers.get('set-cookie')] : []);
     const jar = {};
@@ -179,24 +226,49 @@ function createResiClient(options) {
     token = jar.livingas1 || '';
     if (!token) throw new Error('Resi login returned no session cookie');
     cookieHeader = Object.keys(jar).map((k) => `${k}=${jar[k]}`).join('; ');
-    loggedInAt = Date.now();
+    loggedInAt = now();
     const me = await get('/api_v2.svc/users/me');
     customerId = (me && me.customerId) || '';
     if (!customerId) throw new Error('This Resi account has no customerId');
     return me;
   }
 
-  async function ensureSession() {
-    if (!token || Date.now() - loggedInAt > 50 * 60 * 1000) await login();
+  function holdOff(reason, askedMs) {
+    loginFailures++;
+    const backoff = Math.min(LOGIN_BACKOFF_MAX_MS, LOGIN_BACKOFF_MS * 2 ** (loginFailures - 1));
+    loginBlockedUntil = now() + Math.max(backoff, askedMs || 0);
+    loginError = reason;
   }
 
+  async function ensureSession() {
+    if (!token || now() - loggedInAt > 50 * 60 * 1000) await login();
+  }
+
+  /* The same hold-off covers every request, not just the login. A 401/403 used to
+     sign in again on the spot, every time: for a login that simply isn't allowed to
+     see a venue, that was a fresh sign-in on every poll. Now a refusal straight
+     after signing in is taken as what it is -- a permission -- and held off like a
+     failed login; only an older session is renewed. A 429 holds off too. */
   async function get(path) {
-    const res = await doFetch(RESI + path, { method: 'GET', headers: headers() });
-    if (res.status === 401 || res.status === 403) {
+    if (now() < loginBlockedUntil) {
+      const wait = Math.ceil((loginBlockedUntil - now()) / 1000);
+      throw new Error(`${loginError} — retrying in ${wait}s`);
+    }
+    let res = await doFetch(RESI + path, { method: 'GET', headers: headers() });
+    if ((res.status === 401 || res.status === 403) && now() - loggedInAt > SESSION_FRESH_MS) {
       await login();
-      const retry = await doFetch(RESI + path, { method: 'GET', headers: headers() });
-      if (!retry.ok) throw new Error(`Resi ${path} failed (${retry.status})`);
-      return retry.json();
+      res = await doFetch(RESI + path, { method: 'GET', headers: headers() });
+    }
+    if (res.status === 401 || res.status === 403) {
+      const where = path.includes('/venues') ? 'its venues'
+        : path.includes('/players') ? "this venue's decoders" : 'part of the account';
+      holdOff(`This Resi login isn't allowed to see ${where} (${res.status}) — ask a Resi admin for access`, 0);
+      throw new Error(loginError);
+    }
+    if (res.status === 429) {
+      const retryAfter = Number(res.headers && res.headers.get && res.headers.get('retry-after')) || 0;
+      holdOff('Resi is rate-limiting requests (429)', retryAfter * 1000);
+      throw new Error(loginError);
     }
     if (!res.ok) throw new Error(`Resi ${path} failed (${res.status})`);
     return res.json();
@@ -216,7 +288,10 @@ function createResiClient(options) {
       try {
         return (await get(`${path}?_=${Date.now()}`)) || [];
       } catch (err) {
-        if (!/\((4\d\d)\)/.test(String(err.message))) throw err;
+        // Only an objection to the parameter itself; a refusal or a "slow down"
+        // (401/403/429) is about the login, and dropping it then lost fresh readings.
+        const code = (String(err.message).match(/\((4\d\d)\)/) || [])[1];
+        if (!code || ['401', '403', '429'].includes(code)) throw err;
         cacheBust = false;
       }
     }

modules/resi-cues/resi.test.js

@@ -197,6 +197,32 @@ test('surroundingCues puts a cue you are exactly on behind you', () => {
   assert.strictEqual(surroundingCues([], 1000).next, null);
 });
 
+/* ── starting partway through Resi's cycle ─────────────────────────────── */
+
+// Seen live at North Attleboro: Resi publishing every ~30s, and the board starting a
+// few seconds before a publish. The first "gap" it measured was 2s (9s after a
+// reboot), and once that was the cadence every honest 30s gap was thrown out as a
+// pause gap -- so playback read as paused 15s into every update, the countdown froze,
+// and the next cue (and its name) stopped moving on.
+for (const [into, burst] of [[28000, false], [21000, false], [0, true]]) {
+  test(`30s Resi, started ${into / 1000}s into its cycle${burst ? ', 2s burst after a seek' : ''}: never falsely paused`, () => {
+    const w = makeWorld({ cadence: 30000, lag: 1000, jitter: 2000, net: 500 });
+    w.lastPublish = w.t - into;
+    const head = createPlayhead({ now: () => w.t });
+    const second = () => { w.advance(1000); head.note(w.poll()); return head.read(); };
+    let paused = 0;
+    for (let i = 0; i < 100; i++) if (!second().playing) paused++;
+    if (burst) {
+      w.media += 15 * 60000;                       // a seek, published at once...
+      w.lastPublish = w.t - w.nextCadence;
+      second(); second();
+      w.lastPublish = w.t - w.nextCadence;          // ...and again 2s later
+    }
+    for (let i = 0; i < 300; i++) if (!second().playing) paused++;
+    assert.strictEqual(paused, 0, `read as paused for ${paused}s while playing`);
+  });
+}
+
 /* ── the matrix ────────────────────────────────────────────────────────── */
 
 const argv = process.argv.slice(2).map(Number);

modules/resi-cues/server.js

@@ -70,6 +70,7 @@ function emptyTimers(now) {
 }
 
 let current = null; // the live handle, shared with routes()
+let pickerClient = null; // { key, client } for the decoder picker when the module isn't running those credentials
 
 module.exports = {
   init({ config, log }) {
@@ -146,7 +147,9 @@ module.exports = {
             elapsedMs: null,
             remainingMs,
             targetMs: Math.max(1000, state.next.ms - from),
-            status: { text: state.next.name || 'Next cue', tone: state.playing ? 'ok' : 'warn' },
+            // The label already is the cue's name, and it is what the card is titled
+            // with; repeating it on the status line only crowded the card.
+            status: { text: state.playing ? 'Next cue' : 'Held', tone: state.playing ? 'ok' : 'warn' },
             detail: state.event || '',
           });
         }
@@ -271,6 +274,7 @@ module.exports = {
       stateStreams,
       timerStreams,
       resi,
+      credentialsKey: `${username}\n${password}`,
       configured: Boolean(username && password),
       stop() {
         stopped = true;
@@ -332,9 +336,21 @@ module.exports = {
           return json(res, 200, { options: [], note: 'Enter the Resi login first' });
         }
         try {
-          const client = createResiClient({
-            username: String(config.username), password: String(config.password),
-          });
+          // The running module's client when it has these credentials, else one kept
+          // per login: a fresh client per request signed in on every admin page load,
+          // and its own hold-off never applied -- which kept Resi rate-limiting.
+          const username = String(config.username).trim();
+          const key = `${username}\n${config.password}`;
+          let client;
+          if (current && current.resi && current.credentialsKey === key) client = current.resi;
+          else {
+            if (!pickerClient || pickerClient.key !== key) {
+              pickerClient = { key, client: createResiClient({
+                username, password: String(config.password),
+              }) };
+            }
+            client = pickerClient.client;
+          }
           const options = [];
           for (const v of await client.venues()) {
             for (const p of await client.players(v.uuid)) {

modules/resi-cues/server.test.js

@@ -18,8 +18,9 @@
 const assert = require('assert');
 
 let passed = 0;
-function test(name, fn) {
-  fn();
+// Awaited, so an async test finishes before the next one changes the world under it.
+async function test(name, fn) {
+  await fn();
   passed++;
   console.log(`  ok  ${name}`);
 }
@@ -101,7 +102,7 @@ function collect(route, req) {
 
   const routes = server.routes({ config: {}, log: (m) => logged.push(m) });
 
-  test('signs in once and finds the configured decoder', () => {
+  await test('signs in once and finds the configured decoder', () => {
     assert.strictEqual(world.logins, 1, 'should sign in exactly once');
     const state = handle.state;
     assert.strictEqual(state.status, 'ok', state.message);
@@ -110,20 +111,20 @@ function collect(route, req) {
     assert.strictEqual(state.cues.length, 3);
   });
 
-  test('works out the cue either side of the playhead', () => {
+  await test('works out the cue either side of the playhead', () => {
     const state = handle.state;
     assert.strictEqual(state.next.name, 'Campus Host');
     assert.strictEqual(state.prev.name, 'Welcome');
     assert.ok(Math.abs(state.estMs - 528000) < 2000, `playhead was ${state.estMs}`);
   });
 
-  test('/state answers the same snapshot as the stream', () => {
+  await test('/state answers the same snapshot as the stream', () => {
     const res = collect(routes['GET /state']);
     assert.strictEqual(res.code, 200);
     assert.deepStrictEqual(JSON.parse(res.body), handle.state);
   });
 
-  test('/stream opens with an event so a new tile paints at once', () => {
+  await test('/stream opens with an event so a new tile paints at once', () => {
     const res = collect(routes['GET /stream']);
     assert.strictEqual(res.code, 200);
     assert.strictEqual(res.headers['Content-Type'], 'text/event-stream; charset=utf-8');
@@ -131,7 +132,7 @@ function collect(route, req) {
     assert.ok(res.body.includes('event: state'), 'should send an initial state event');
   });
 
-  test('/timers offers the countdown and the playhead, shaped as the guide says', () => {
+  await test('/timers offers the countdown and the playhead, shaped as the guide says', () => {
     const snap = JSON.parse(collect(routes['GET /timers']).body);
     assert.strictEqual(snap.source, 'resi-cues');
     assert.strictEqual(snap.label, 'Resi');
@@ -145,7 +146,7 @@ function collect(route, req) {
     assert.ok(Math.abs(next.remainingMs - 222000) < 2000, `remaining was ${next.remainingMs}`);
     // the countdown runs from the cue before it, so a consumer can colour progress
     assert.strictEqual(next.targetMs, 450000);
-    assert.strictEqual(next.status.text, 'Campus Host');
+    assert.strictEqual(next.status.text, 'Next cue');   // the name is the label; not repeated
     assert.ok(next.startedAt <= snap.updatedAt, 'startedAt must be in the past');
 
     assert.strictEqual(playhead.id, 'playhead');
@@ -154,7 +155,7 @@ function collect(route, req) {
     assert.ok(Math.abs(playhead.elapsedMs - 528000) < 2000);
   });
 
-  test('a cue fired at the host moves the countdown on the next poll', async () => {
+  await test('a cue fired at the host moves the countdown on the next poll', async () => {
     world.position = '00:12:40.000';         // jumped past Campus Host
     tickFn();
     await settle();
@@ -162,10 +163,10 @@ function collect(route, req) {
     assert.strictEqual(state.next.name, 'Message');
     assert.strictEqual(state.prev.name, 'Campus Host');
     const snap = JSON.parse(collect(routes['GET /timers']).body);
-    assert.strictEqual(snap.timers[0].label, 'Message');
+    assert.strictEqual(snap.timers[0].label, 'Message');   // the card's name follows the cue
   });
 
-  test('a decoder with no event reports nothing playing rather than stale cues', async () => {
+  await test('a decoder with no event reports nothing playing rather than stale cues', async () => {
     world.eventId = '';
     tickFn();
     await settle();
@@ -174,13 +175,13 @@ function collect(route, req) {
     assert.strictEqual(handle.state.event, '');
   });
 
-  test('health speaks about the upstream, not about itself', () => {
+  await test('health speaks about the upstream, not about itself', () => {
     const h = handle.health();
     assert.ok(['ok', 'connecting', 'error'].includes(h.status), h.status);
     assert.ok(h.message.length > 0, 'health should say something useful');
   });
 
-  test('an unconfigured module idles instead of hammering Resi', () => {
+  await test('an unconfigured module idles instead of hammering Resi', () => {
     const before = world.logins;
     const idle = server.init({ config: {}, log: () => {} });
     assert.strictEqual(world.logins, before, 'must not sign in with no credentials');
@@ -189,12 +190,90 @@ function collect(route, req) {
     idle.stop();
   });
 
-  test('stop() leaves nothing running', () => {
+  await test('stop() leaves nothing running', () => {
     handle.stop();
     const res = collect(routes['GET /state']);
     assert.strictEqual(JSON.parse(res.body).status, 'error');
   });
 
+  // Seen live at North Attleboro: a failed login was retried on every 1s poll, so
+  // Resi answered 429 and kept answering it, and the decoder picker stayed empty.
+  await test('a failed login holds off instead of retrying every poll', async () => {
+    const { createResiClient } = require('./resi');
+    let t = 1700000000000;
+    let logins = 0;
+    let limited = true;
+    const client = createResiClient({
+      username: 'a@b.c',
+      password: 'secret',
+      now: () => t,
+      fetch: async (url) => {
+        const path = String(url).replace('https://central.resi.io', '').split('?')[0];
+        if (path === '/api/v3/login') {
+          logins++;
+          if (limited) return reply({}, { ok: false, status: 429 });
+          return reply({}, { headers: { get: () => null, getSetCookie: () => ['livingas1=T; Path=/'] } });
+        }
+        if (path === '/api_v2.svc/users/me') return reply({ customerId: 'CUST' });
+        if (path === '/api/v3/customers/CUST/venues') return reply([{ uuid: 'V1' }]);
+        return reply({}, { ok: false, status: 404 });
+      },
+    });
+    const poll = async () => { try { await client.venues(); return 'ok'; } catch (e) { return e.message; } };
+
+    assert.match(await poll(), /rate-limiting/);
+    for (let i = 0; i < 60; i++) { t += 1000; await poll(); }   // a minute of 1s polls
+    assert.ok(logins <= 3, `signed in ${logins} times in a minute while rate-limited`);
+    assert.match(await poll(), /retrying in \d+s/, 'the wait is shown, not hidden');
+
+    limited = false;
+    t += 5 * 60000;                                             // past the longest hold-off
+    assert.strictEqual(await poll(), 'ok', 'recovers once Resi lets it in');
+    const after = logins;
+    for (let i = 0; i < 30; i++) { t += 1000; await poll(); }
+    assert.strictEqual(logins, after, 'a good session is not signed in again');
+  });
+
+  await test('a rejected password says so', async () => {
+    const { createResiClient } = require('./resi');
+    const client = createResiClient({
+      username: 'a@b.c', password: 'wrong', now: () => 0,
+      fetch: async () => reply({}, { ok: false, status: 400 }),
+    });
+    await assert.rejects(client.venues(), /check the password/);
+  });
+
+  // Seen live: media@waters.church signs in fine but may not list venues (403). The
+  // client answered every 403 by signing in again -- a fresh login on every poll.
+  await test('a login that may not see venues is held off, not signed in every poll', async () => {
+    const { createResiClient } = require('./resi');
+    let t = 1700000000000;
+    let logins = 0;
+    let venueCalls = 0;
+    const client = createResiClient({
+      username: 'a@b.c', password: 'secret', now: () => t,
+      fetch: async (url) => {
+        const path = String(url).replace('https://central.resi.io', '').split('?')[0];
+        if (path === '/api/v3/login') {
+          logins++;
+          return reply({}, { headers: { get: () => null, getSetCookie: () => ['livingas1=T; Path=/'] } });
+        }
+        if (path === '/api_v2.svc/users/me') return reply({ customerId: 'CUST' });
+        if (path === '/api/v3/customers/CUST/venues') { venueCalls++; return reply({}, { ok: false, status: 403 }); }
+        return reply({}, { ok: false, status: 404 });
+      },
+    });
+    const poll = async () => { try { await client.venues(); return 'ok'; } catch (e) { return e.message; } };
+
+    assert.match(await poll(), /isn't allowed to see its venues \(403\)/);
+    for (let i = 0; i < 120; i++) { t += 1000; await poll(); }   // two minutes of 1s polls
+    // At most one renewal once the session is over a minute old (in case it really
+    // had expired), then the hold-off keeps growing -- not one sign-in per poll.
+    assert.ok(logins <= 2, `signed in ${logins} times in two minutes for a permission problem`);
+    assert.ok(venueCalls <= 8, `asked for venues ${venueCalls} times in two minutes (a poll each would be 121)`);
+    assert.match(await poll(), /ask a Resi admin/);
+  });
+
   globalThis.setInterval = realSetInterval;
   globalThis.clearInterval = realClearInterval;
   console.log(`\n${passed} tests passed`);

modules/vista-cues/client.js

@@ -0,0 +1,262 @@
+/* Vista Cues — client part.
+
+   One tile: the cue list most recently fired, big, with how long ago and
+   who fired it; under it the other lists still live, the recent notes, and
+   which senders we are in session with. All of it comes from the server's
+   one `state` event; between events only the "how long ago" clocks move. */
+
+const MINUS_SVG = '<svg viewBox="0 0 16 16" width="13" height="13" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"><path d="M3.5 8h9"/></svg>';
+const PLUS_SVG = '<svg viewBox="0 0 16 16" width="13" height="13" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"><path d="M3.5 8h9M8 3.5v9"/></svg>';
+const CLEAR_SVG = '<svg viewBox="0 0 16 16" width="13" height="13" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M6.2 13.5h7.3"/><path d="M2.8 9.6 8.9 3.5a1.4 1.4 0 0 1 2 0l2.1 2.1a1.4 1.4 0 0 1 0 2l-5.9 5.9H5.6L2.8 10.7a.8.8 0 0 1 0-1.1Z"/><path d="m6 6.4 4.1 4.1"/></svg>';
+
+const ACTION_LABEL = {
+  go: 'Go',
+  release: 'Release',
+  releaseAll: 'Release all',
+  pause: 'Pause',
+  back: 'Back',
+  flash: 'Flash',
+  cleared: 'Cleared',
+  '': '—',
+};
+
+function esc(s) {
+  return String(s ?? '').replace(/[&<>"']/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
+}
+
+/** 75 000 ms → "1:15", 3 725 000 → "1:02:05". */
+function since(ms) {
+  const s = Math.max(0, Math.floor(ms / 1000));
+  const h = Math.floor(s / 3600);
+  const m = Math.floor((s % 3600) / 60);
+  const ss = String(s % 60).padStart(2, '0');
+  return h ? `${h}:${String(m).padStart(2, '0')}:${ss}` : `${m}:${ss}`;
+}
+
+function clockTime(ms) {
+  return new Date(ms).toLocaleTimeString([], { hour: 'numeric', minute: '2-digit', second: '2-digit' });
+}
+
+export default function create({ root, moduleApi }) {
+  const prefs = () => moduleApi.instanceSettings || {};
+  const on = (k, dflt = true) => (prefs()[k] === undefined ? dflt : prefs()[k] !== false);
+  const scale = () => Math.min(2.5, Math.max(0.5, Number(prefs().textScale) || 1));
+
+  let state = null;
+  let skew = 0;            // server clock − our clock
+  let stream = null;
+  let tick = null;
+  let el = {};
+  let resizeObserver = null;
+
+  const serverNow = () => Date.now() + skew;
+
+  /* ── fitting the big name to its box ─────────────────────────────── */
+
+  function fit(node) {
+    if (!node || !node.isConnected) return;
+    node.style.fontSize = '';
+    const avail = node.parentElement ? node.parentElement.clientWidth : node.clientWidth;
+    let size = parseFloat(getComputedStyle(node).fontSize) || 16;
+    for (let i = 0; i < 3 && node.scrollWidth > avail + 0.5 && size > 10; i += 1) {
+      size = Math.max(10, size * (avail / node.scrollWidth) * 0.98);
+      node.style.fontSize = `${size}px`;
+    }
+  }
+
+  /* ── drawing ─────────────────────────────────────────────────────── */
+
+  function build() {
+    root.innerHTML = `
+      <div class="vc-root">
+        <div class="vc-offline" hidden></div>
+        <div class="vc-body">
+          <div class="vc-now">
+            <div class="vc-kicker"><span class="vc-pill"></span><span class="vc-ago"></span></div>
+            <div class="vc-name-wrap"><div class="vc-name"></div></div>
+            <div class="vc-meta"></div>
+          </div>
+          <div class="vc-active"></div>
+          <div class="vc-recent"></div>
+          <div class="vc-sources"></div>
+        </div>
+      </div>`;
+    const q = (s) => root.querySelector(s);
+    el = {
+      root: q('.vc-root'),
+      offline: q('.vc-offline'),
+      pill: q('.vc-pill'),
+      ago: q('.vc-ago'),
+      name: q('.vc-name'),
+      meta: q('.vc-meta'),
+      active: q('.vc-active'),
+      recent: q('.vc-recent'),
+      sources: q('.vc-sources'),
+    };
+  }
+
+  function render() {
+    if (!el.root) return;
+    el.root.style.setProperty('--vc-scale', String(scale()));
+    const s = state;
+    if (!s) {
+      el.name.textContent = 'Connecting…';
+      el.root.dataset.tone = 'muted';
+      return;
+    }
+
+    const connected = s.sources.filter((x) => x.connected);
+    const offline = !s.listening || !connected.length;
+    el.root.classList.toggle('is-offline', offline);
+    el.offline.hidden = !offline;
+    el.offline.textContent = !s.listening ? 'Not listening' : 'No MIDI session';
+
+    // Now
+    const cur = s.current;
+    if (cur) {
+      el.root.dataset.tone = cur.state === 'paused' ? 'warn' : 'ok';
+      el.pill.textContent = cur.state === 'paused' ? 'Paused' : 'Live';
+      el.pill.hidden = false;
+      if (el.name.textContent !== cur.name) { el.name.textContent = cur.name; fit(el.name); }
+      const bits = [];
+      if (cur.goes > 1) bits.push(`Go ×${cur.goes}`);
+      if (cur.source) bits.push(cur.source);
+      if (cur.lastAction === 'back') bits.push('Back');
+      el.meta.textContent = bits.join(' · ');
+    } else {
+      el.root.dataset.tone = 'muted';
+      el.pill.hidden = true;
+      const msg = s.rules ? 'No cue list live' : 'No cue lists mapped';
+      if (el.name.textContent !== msg) { el.name.textContent = msg; fit(el.name); }
+      el.meta.textContent = s.rules ? (s.log.length ? '' : 'Waiting for the first cue') : 'Add the cue sheet in /admin → Vista Cues';
+    }
+
+    // Other live lists
+    el.active.hidden = !on('showActive') || !s.active.length;
+    if (!el.active.hidden) {
+      el.active.innerHTML = s.active.map((l) => `
+        <div class="vc-chip${l.state === 'paused' ? ' is-paused' : ''}" title="${esc(l.source || '')}">
+          ${l.group ? `<span class="vc-chip-group">${esc(l.group)}</span>` : ''}
+          <span class="vc-chip-name">${esc(l.name)}</span>
+          <span class="vc-chip-ago" data-since="${l.lastAt}"></span>
+        </div>`).join('');
+    }
+
+    // Recent
+    const showUnmapped = on('showUnmapped', false);
+    const rows = s.log.filter((e) => e.mapped || showUnmapped).slice(0, 12);
+    el.recent.hidden = !on('showRecent') || !rows.length;
+    if (!el.recent.hidden) {
+      el.recent.innerHTML = rows.map((e) => `
+        <div class="vc-row${e.mapped ? '' : ' is-unmapped'}" data-action="${esc(e.action)}">
+          <span class="vc-row-time">${esc(clockTime(e.at))}</span>
+          <span class="vc-row-action">${esc(e.mapped ? (ACTION_LABEL[e.action] ?? e.action) : 'Unmapped')}</span>
+          <span class="vc-row-list">${esc(e.mapped ? e.list : e.trigger)}</span>
+          <span class="vc-row-source">${esc(e.source)}</span>
+        </div>`).join('');
+    }
+
+    // Senders
+    el.sources.hidden = !on('showSources') || !s.sources.length;
+    if (!el.sources.hidden) {
+      el.sources.innerHTML = s.sources.map((x) => `
+        <span class="vc-src${x.connected ? ' is-on' : ''}" title="${esc(x.connected ? `${x.name || x.label} · ${x.address}` : (x.error || 'Joining…'))}">
+          <span class="vc-dot"></span>${esc(x.label)}
+        </span>`).join('');
+    }
+
+    updateClocks();
+    reportStatus();
+  }
+
+  function updateClocks() {
+    if (!state || !el.root) return;
+    const now = serverNow();
+    const cur = state.current;
+    el.ago.textContent = cur ? since(now - cur.lastAt) : '';
+    el.ago.title = cur ? `Fired ${clockTime(cur.firedAt)}` : '';
+    root.querySelectorAll('[data-since]').forEach((n) => {
+      n.textContent = since(now - Number(n.dataset.since));
+    });
+  }
+
+  function reportStatus() {
+    const s = state;
+    if (!s) return;
+    if (!s.listening) return moduleApi.setStatus('error', s.error || 'Not listening for MIDI');
+    const connected = s.sources.filter((x) => x.connected);
+    const waiting = s.sources.filter((x) => !x.connected);
+    if (!connected.length) {
+      const why = waiting.length ? `Joining ${waiting.map((x) => `${x.label}${x.error ? ` (${x.error})` : ''}`).join(', ')}` : 'No MIDI session connected';
+      return moduleApi.setStatus('error', why);
+    }
+    const msg = `Hearing ${connected.map((x) => x.label).join(', ')}${waiting.length ? ` · not ${waiting.map((x) => x.label).join(', ')}` : ''}`;
+    return moduleApi.setStatus(waiting.length ? 'connecting' : 'ok', msg);
+  }
+
+  function take(next) {
+    if (!next) return;
+    skew = Number(next.now) ? Number(next.now) - Date.now() : 0;
+    state = next;
+    render();
+  }
+
+  async function refresh() {
+    try {
+      const r = await moduleApi.fetch('/state');
+      if (r.ok) take((await r.json()).state);
+    } catch { /* the stream will say so */ }
+  }
+
+  /* ── title bar ───────────────────────────────────────────────────── */
+
+  function bump(delta) {
+    const next = Math.round(Math.min(2.5, Math.max(0.5, scale() + delta)) * 10) / 10;
+    moduleApi.saveInstanceSettings({ textScale: next });
+    render();
+    fit(el.name);
+  }
+
+  return {
+    start() {
+      build();
+      render();
+      moduleApi.header.addButton({ icon: MINUS_SVG, title: 'Smaller text', onClick: () => bump(-0.1) });
+      moduleApi.header.addButton({ icon: PLUS_SVG, title: 'Larger text', onClick: () => bump(0.1) });
+      moduleApi.header.addButton({
+        icon: CLEAR_SVG,
+        title: 'Clear live lists',
+        async onClick() {
+          try { await moduleApi.fetch('/clear', { method: 'POST' }); } catch { /* status says why */ }
+        },
+      });
+      moduleApi.setStatus('connecting', 'Connecting…');
+      stream = moduleApi.sse('/stream', {
+        open() { refresh(); },
+        error() { moduleApi.setStatus('error', 'Lost connection to ProdDash'); },
+        events: {
+          state(e) {
+            try { take(JSON.parse(e.data)); } catch { /* malformed frame */ }
+          },
+        },
+      });
+      refresh();
+      tick = setInterval(updateClocks, 1000);
+      if (typeof ResizeObserver === 'function') {
+        resizeObserver = new ResizeObserver(() => fit(el.name));
+        resizeObserver.observe(root);
+      }
+    },
+    stop() {
+      clearInterval(tick);
+      tick = null;
+      if (stream) { stream.close(); stream = null; }
+      if (resizeObserver) { resizeObserver.disconnect(); resizeObserver = null; }
+      root.innerHTML = '';
+      el = {};
+    },
+    onResize() {
+      fit(el.name);
+    },
+  };
+}

modules/vista-cues/mapping.js

@@ -0,0 +1,148 @@
+'use strict';
+
+/**
+ * The admin page's "Cue lists" text → rules, and MIDI events → what Vista
+ * was told to do.
+ *
+ * One rule per line, the way it reads on a cue sheet:
+ *
+ *   60 = Walk-in                  note 60 fires Go on "Walk-in"
+ *   C3 = Worship 1                note names work too (see "Middle C" in admin)
+ *   61 release Walk-in            release a list
+ *   62 pause Walk-in              also: back, pause, go (the default)
+ *   127 release all               every list off
+ *   ch2:64 = Message              only on MIDI channel 2 (otherwise any channel)
+ *   pc5 = Baptism                 a program change instead of a note
+ *   65 = "Back Lights"            quote a name that starts with an action word
+ *   # anything after a # is a comment
+ *
+ * Groups: a line "[Colors]" starts a group, and every rule below it belongs
+ * to it until the next "[…]" ("[]" ends grouping). A Go in a group replaces
+ * whichever list of that group was live — firing "Blue" ends "Red" — which is
+ * how a sheet without release notes still says what is on. The first group
+ * in the sheet is the headline the tile shows largest.
+ *
+ *   30 flash Blinder Flash 1      a momentary hit: logged, never left live
+ *
+ * The separator between the trigger and the rest may be "=", "-", ":", "→",
+ * a tab or just a space, so a column pasted from a spreadsheet works.
+ */
+
+const NOTE_NAMES = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
+const NAMES_SHARP = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B'];
+
+const ACTIONS = [
+  // Longest first, so "release all" wins over "release".
+  [/^(release[\s_-]*all|all[\s_-]*off|releaseall|clear)\b/i, 'releaseAll'],
+  [/^(release|off|stop|kill)\b/i, 'release'],
+  [/^(pause|hold)\b/i, 'pause'],
+  [/^(back|previous|prev)\b/i, 'back'],
+  [/^(flash|hit|momentary)\b/i, 'flash'],
+  [/^(go|fire|play|start)\b/i, 'go'],
+];
+
+/** Octave offset: with middle C (note 60) called "C3", C-2 is note 0; with "C4", C-1 is. */
+function octaveBase(middleC) {
+  return middleC === 'C4' ? 1 : 2;
+}
+
+/** "F#2" → note number, or null. */
+function noteFromName(token, middleC) {
+  const m = /^([a-g])(#|♯|b|♭)?(-?\d+)$/i.exec(token);
+  if (!m) return null;
+  let pc = NOTE_NAMES[m[1].toLowerCase()];
+  if (m[2] === '#' || m[2] === '♯') pc += 1;
+  if (m[2] === 'b' || m[2] === '♭') pc -= 1;
+  const n = (Number(m[3]) + octaveBase(middleC)) * 12 + pc;
+  return n >= 0 && n <= 127 ? n : null;
+}
+
+function noteName(n, middleC) {
+  return `${NAMES_SHARP[n % 12]}${Math.floor(n / 12) - octaveBase(middleC)}`;
+}
+
+/**
+ * Parse the whole text. Returns `{ rules, errors, groups }` (groups in sheet order); a line that can't be read
+ * is reported (line number + why) and skipped, never fatal.
+ */
+function parseMapping(text, { middleC = 'C3' } = {}) {
+  const rules = [];
+  const errors = [];
+  const groups = [];
+  let group = '';
+  String(text || '').split(/\r?\n/).forEach((raw, i) => {
+    // A comment is a # that starts the line or follows a space ("C#3" and "Song #2" are not).
+    const line = raw.replace(/(^|\s)#(\s.*|$)/, '').trim();
+    if (!line) return;
+    const header = /^\[(.*)\]$/.exec(line);
+    if (header) {
+      group = header[1].trim();
+      if (group && !groups.includes(group)) groups.push(group);
+      return;
+    }
+    const m = /^(?:ch(?:annel)?\s*(\d{1,2})\s*[:/]\s*)?(pc\s*\d{1,3}|note\s*\d{1,3}|\d{1,3}|[a-g](?:#|♯|b|♭)?-?\d)\s*(?:[=:\t→>|,-]+\s*|\s+|$)(.*)$/i.exec(line);
+    if (!m) {
+      errors.push({ line: i + 1, text: raw.trim(), why: 'starts with no note' });
+      return;
+    }
+    const channel = m[1] ? Number(m[1]) : null;
+    if (channel != null && (channel < 1 || channel > 16)) {
+      errors.push({ line: i + 1, text: raw.trim(), why: 'channel must be 1–16' });
+      return;
+    }
+    const trig = m[2].replace(/\s+/g, '').toLowerCase();
+    let kind = 'note';
+    let number;
+    if (trig.startsWith('pc')) {
+      kind = 'program';
+      number = Number(trig.slice(2));
+    } else if (trig.startsWith('note')) {
+      number = Number(trig.slice(4));
+    } else if (/^\d+$/.test(trig)) {
+      number = Number(trig);
+    } else {
+      number = noteFromName(m[2].replace(/\s+/g, ''), middleC);
+    }
+    if (number == null || !Number.isInteger(number) || number < 0 || number > 127) {
+      errors.push({ line: i + 1, text: raw.trim(), why: 'note must be 0–127' });
+      return;
+    }
+    let rest = m[3].trim();
+    let action = 'go';
+    const quoted = (t) => /^"(.*)"$/.exec(t);
+    for (const [re, a] of quoted(rest) ? [] : ACTIONS) {
+      const am = re.exec(rest);
+      if (am) {
+        action = a;
+        rest = rest.slice(am[0].length).replace(/^[\s=:→>|,-]+/, '').trim();
+        break;
+      }
+    }
+    const q = quoted(rest);
+    if (q) rest = q[1].trim();
+    if (action !== 'releaseAll' && !rest) {
+      errors.push({ line: i + 1, text: raw.trim(), why: 'no cue list name' });
+      return;
+    }
+    rules.push({ line: i + 1, channel, kind, number, action, list: action === 'releaseAll' ? '' : rest, group });
+  });
+  return { rules, errors, groups };
+}
+
+/** The first rule a MIDI event matches, or null. Only note-ons and program changes fire anything. */
+function match(rules, event) {
+  let kind;
+  let number;
+  if (event.type === 'noteon') { kind = 'note'; number = event.note; }
+  else if (event.type === 'program') { kind = 'program'; number = event.program; }
+  else return null;
+  return rules.find((r) => r.kind === kind && r.number === number && (r.channel == null || r.channel === event.channel)) || null;
+}
+
+/** "Note 60 (C3) · ch 1" — how an event is named on the tile. */
+function triggerLabel(event, middleC) {
+  if (event.type === 'program') return `PC ${event.program} · ch ${event.channel}`;
+  return `Note ${event.note} (${noteName(event.note, middleC)}) · ch ${event.channel}`;
+}
+
+module.exports = { parseMapping, match, noteName, noteFromName, triggerLabel };

modules/vista-cues/module.json

@@ -0,0 +1,166 @@
+{
+  "id": "vista-cues",
+  "name": "Vista Cues",
+  "version": "1.0.1",
+  "proddash": ">=1.5.0",
+  "description": "Which Vista 3 cue lists are live: hears the network MIDI that ProPresenter and Tracks send Vista",
+  "permissions": [
+    {
+      "kind": "local-network",
+      "reason": "Joining the network MIDI sessions that fire Vista's cue lists"
+    }
+  ],
+  "client": "client.js",
+  "server": "server.js",
+  "style": "style.css",
+  "minSize": {
+    "w": 2,
+    "h": 1
+  },
+  "defaultSize": {
+    "w": 5,
+    "h": 4
+  },
+  "configSchema": {
+    "source1Name": {
+      "type": "string",
+      "label": "Name",
+      "default": "ProPresenter",
+      "group": "First sender",
+      "help": "What the tile calls notes from this machine."
+    },
+    "source1": {
+      "type": "endpoint",
+      "label": "Session",
+      "default": {
+        "host": "",
+        "port": 5004
+      },
+      "group": "First sender",
+      "help": "The Mac whose network MIDI session sends Vista its notes, and that session's port (Audio MIDI Setup → Window → Show MIDI Studio → Network; usually 5004)."
+    },
+    "source2Name": {
+      "type": "string",
+      "label": "Name",
+      "default": "Tracks",
+      "group": "Second sender"
+    },
+    "source2": {
+      "type": "endpoint",
+      "label": "Session",
+      "default": {
+        "host": "",
+        "port": 5004
+      },
+      "group": "Second sender",
+      "help": "Leave the host empty if this machine joins us from its own side instead."
+    },
+    "source3Name": {
+      "type": "string",
+      "label": "Name",
+      "default": "Companion",
+      "group": "Third sender"
+    },
+    "source3": {
+      "type": "endpoint",
+      "label": "Session",
+      "default": {
+        "host": "",
+        "port": 5004
+      },
+      "group": "Third sender",
+      "help": "Companion on this machine counts too: its network session's host and port (this Mac's own name works)."
+    },
+    "cueLists": {
+      "type": "text",
+      "label": "Cue lists",
+      "default": "",
+      "group": "Cue lists",
+      "help": "One per line from the cue sheet: 60 = Walk-in · 61 release Walk-in · 127 release all · 30 flash Blinder 1 (momentary). A line like [Colors] starts a group: a Go in a group replaces that group's live list; the first group is the tile's headline. Also pause, back, note names, ch2:64, pc5, and \"quotes\" around a name starting with one of those words."
+    },
+    "middleC": {
+      "type": "select",
+      "label": "Middle C",
+      "default": "C3",
+      "options": [
+        {
+          "value": "C3",
+          "label": "C3 (Ableton, Yamaha)"
+        },
+        {
+          "value": "C4",
+          "label": "C4 (Logic, scientific)"
+        }
+      ],
+      "group": "Cue lists",
+      "help": "Only matters for note names in the sheet. Note 60 is middle C either way."
+    },
+    "headTakesOver": {
+      "type": "switch",
+      "label": "Main group takes over",
+      "default": true,
+      "group": "Cue lists",
+      "help": "On: a Go in the sheet's first [group] (the main scene) clears every other live list, as a new scene takes over the look. FX fired after it layer on top again."
+    },
+    "exclusive": {
+      "type": "switch",
+      "label": "Go releases others",
+      "default": false,
+      "group": "Cue lists",
+      "help": "On: a Go replaces every other live list, groups or not. Leave off when lists stack, and use groups instead."
+    },
+    "sessionName": {
+      "type": "string",
+      "label": "Session name",
+      "default": "ProdDash Lighting",
+      "group": "This machine",
+      "help": "How ProdDash appears in other Macs' Audio MIDI Setup Directory."
+    },
+    "sessionPort": {
+      "type": "number",
+      "label": "Session port",
+      "default": 5040,
+      "min": 1024,
+      "max": 65534,
+      "group": "This machine",
+      "help": "UDP; this one and the next are used. Anything not already taken by a MIDI session on this machine."
+    },
+    "advertise": {
+      "type": "switch",
+      "label": "Bonjour",
+      "default": true,
+      "group": "This machine",
+      "help": "List this machine in Audio MIDI Setup's Directory on the network (macOS)."
+    }
+  },
+  "configGroups": {
+    "First sender": {
+      "help": "ProdDash joins the senders' network MIDI sessions, like Vista does, so it hears every note Vista hears. On each sender, in Audio MIDI Setup → MIDI Network Setup, the session must be enabled and 'Who may connect to me' set to Anyone. Or skip the address and connect to \"ProdDash Lighting\" from that Mac's Directory instead."
+    },
+    "This machine": {
+      "collapsed": true
+    }
+  },
+  "instanceSchema": {
+    "showActive": {
+      "type": "switch",
+      "label": "Other lists",
+      "default": true
+    },
+    "showRecent": {
+      "type": "switch",
+      "label": "Recent",
+      "default": true
+    },
+    "showSources": {
+      "type": "switch",
+      "label": "Senders",
+      "default": true
+    },
+    "showUnmapped": {
+      "type": "switch",
+      "label": "Unmapped notes",
+      "default": false
+    }
+  }
+}

modules/vista-cues/rtpmidi.js

@@ -0,0 +1,630 @@
+'use strict';
+
+/**
+ * A listen-only RTP-MIDI (AppleMIDI) session participant, in plain Node.
+ *
+ * This is the protocol behind a macOS "Network" MIDI session (Audio MIDI
+ * Setup → MIDI Network Setup) and rtpMIDI on Windows: two UDP ports, a
+ * control port P and a data port P+1. A session sends every MIDI message to
+ * every participant it is connected to, so joining the same session Vista is
+ * in hears exactly the notes Vista hears.
+ *
+ * Both ways of joining work:
+ *  - someone invites us (we show up in Audio MIDI Setup's Directory, or they
+ *    add our address by hand) and we accept anyone;
+ *  - we invite them (`invite(host, port)`), and keep re-inviting until they
+ *    accept, then keep the connection alive with clock syncs.
+ *
+ * We never send MIDI. Packet layouts follow Apple's AppleMIDI session
+ * protocol and RFC 6295 (RTP payload for MIDI).
+ */
+
+const dgram = require('dgram');
+const dns = require('dns');
+const crypto = require('crypto');
+const { EventEmitter } = require('events');
+
+const SIG = 0xffff;
+const CMD = { IN: 0x494e, OK: 0x4f4b, NO: 0x4e4f, BY: 0x4259, CK: 0x434b, RS: 0x5253 };
+const PROTOCOL_VERSION = 2;
+
+const INVITE_RETRY_MS = 1500;     // between invitation attempts while setting up
+const INVITE_ATTEMPTS = 12;       // then give up for a while…
+const REINVITE_MS = 5000;         // …and start over after this long
+const SYNC_FAST_MS = 1500;        // first few clock syncs, close together
+const SYNC_MS = 10000;            // then this often, as macOS does
+const SYNC_TIMEOUT_MS = 25000;    // no sync answer for this long → connection is gone
+const IDLE_MS = 90000;            // an inbound participant we have not heard from at all
+const FEEDBACK_MS = 1000;         // receiver feedback (lets the sender trim its journal)
+
+/** The session clock: 100 µs ticks since this process started the session. */
+function makeClock() {
+  const t0 = process.hrtime.bigint();
+  return () => (process.hrtime.bigint() - t0) / 100000n;
+}
+
+function randomU32() {
+  return crypto.randomBytes(4).readUInt32BE(0);
+}
+
+/* ── packets ─────────────────────────────────────────────────────────── */
+
+function sessionPacket(cmd, token, ssrc, name) {
+  const nameBuf = name == null ? Buffer.alloc(0) : Buffer.from(`${name}\0`, 'utf8');
+  const b = Buffer.alloc(16 + nameBuf.length);
+  b.writeUInt16BE(SIG, 0);
+  b.writeUInt16BE(cmd, 2);
+  b.writeUInt32BE(PROTOCOL_VERSION, 4);
+  b.writeUInt32BE(token >>> 0, 8);
+  b.writeUInt32BE(ssrc >>> 0, 12);
+  nameBuf.copy(b, 16);
+  return b;
+}
+
+function syncPacket(ssrc, count, ts) {
+  const b = Buffer.alloc(36);
+  b.writeUInt16BE(SIG, 0);
+  b.writeUInt16BE(CMD.CK, 2);
+  b.writeUInt32BE(ssrc >>> 0, 4);
+  b.writeUInt8(count, 8);
+  for (let i = 0; i < 3; i++) b.writeBigUInt64BE(BigInt.asUintN(64, ts[i] || 0n), 12 + i * 8);
+  return b;
+}
+
+function feedbackPacket(ssrc, seq) {
+  const b = Buffer.alloc(12);
+  b.writeUInt16BE(SIG, 0);
+  b.writeUInt16BE(CMD.RS, 2);
+  b.writeUInt32BE(ssrc >>> 0, 4);
+  b.writeUInt16BE(seq & 0xffff, 8);
+  return b;
+}
+
+/** A session command (IN/OK/NO/BY/CK/RS), or null when it isn't one. */
+function parseSession(buf) {
+  if (buf.length < 4 || buf.readUInt16BE(0) !== SIG) return null;
+  const cmd = buf.readUInt16BE(2);
+  if (cmd === CMD.CK) {
+    if (buf.length < 36) return null;
+    return {
+      cmd,
+      ssrc: buf.readUInt32BE(4),
+      count: buf.readUInt8(8),
+      ts: [buf.readBigUInt64BE(12), buf.readBigUInt64BE(20), buf.readBigUInt64BE(28)],
+    };
+  }
+  if (cmd === CMD.RS) {
+    if (buf.length < 12) return null;
+    return { cmd, ssrc: buf.readUInt32BE(4), seq: buf.readUInt16BE(8) };
+  }
+  if (cmd === CMD.IN || cmd === CMD.OK || cmd === CMD.NO || cmd === CMD.BY) {
+    if (buf.length < 16) return null;
+    let name = '';
+    if (buf.length > 16) {
+      const end = buf.indexOf(0, 16);
+      name = buf.toString('utf8', 16, end < 0 ? buf.length : end);
+    }
+    return { cmd, version: buf.readUInt32BE(4), token: buf.readUInt32BE(8), ssrc: buf.readUInt32BE(12), name };
+  }
+  return null;
+}
+
+/** Data bytes that follow a status byte (sysex is handled separately). */
+function dataLength(status) {
+  const hi = status & 0xf0;
+  if (hi === 0xc0 || hi === 0xd0) return 1;
+  if (hi < 0xf0) return 2;
+  if (status === 0xf1 || status === 0xf3) return 1;
+  if (status === 0xf2) return 2;
+  return 0;
+}
+
+/**
+ * The MIDI commands in one RTP-MIDI packet (RFC 6295 §3), as
+ * `{ status, data: [..] }` in order. Journal data is ignored: we only show
+ * what is happening, and a note lost on the wire is one Vista also missed.
+ */
+function parseRtpMidi(buf) {
+  if (buf.length < 13 || (buf[0] >> 6) !== 2) return null;
+  const cc = buf[0] & 0x0f;
+  const ext = Boolean(buf[0] & 0x10);
+  const seq = buf.readUInt16BE(2);
+  const ssrc = buf.readUInt32BE(8);
+  let off = 12 + cc * 4;
+  if (ext) {
+    if (buf.length < off + 4) return null;
+    off += 4 + buf.readUInt16BE(off + 2) * 4;
+  }
+  if (off >= buf.length) return null;
+  const header = buf[off];
+  const big = Boolean(header & 0x80);
+  const zero = Boolean(header & 0x20);
+  let len = header & 0x0f;
+  if (big) {
+    if (off + 1 >= buf.length) return null;
+    len = (len << 8) | buf[off + 1];
+    off += 2;
+  } else {
+    off += 1;
+  }
+  const end = Math.min(buf.length, off + len);
+  const messages = [];
+  let running = 0;
+  let first = true;
+  while (off < end) {
+    if (!first || zero) {
+      // Delta time: 1–4 octets, high bit means "more follow".
+      let n = 0;
+      while (off < end && (buf[off] & 0x80) && n < 3) { off++; n++; }
+      off++;
+      if (off >= end) break;
+    }
+    first = false;
+    let status = buf[off];
+    if (status & 0x80) {
+      off++;
+    } else if (running) {
+      status = running;
+    } else {
+      break; // data byte with nothing to run on: give up on this packet
+    }
+    if (status === 0xf0 || status === 0xf7) {
+      // A sysex, or a segment of one: runs to F7 (end), F0 (more follows) or F4 (cancelled).
+      const start = off;
+      while (off < end && buf[off] !== 0xf7 && buf[off] !== 0xf0 && buf[off] !== 0xf4) off++;
+      const data = Array.from(buf.subarray(start, off));
+      off++;
+      messages.push({ status, data });
+      running = 0;
+      continue;
+    }
+    if (status < 0xf0) running = status;
+    else if (status < 0xf8) running = 0; // system common cancels running status; realtime doesn't
+    const n = dataLength(status);
+    if (off + n > end) break;
+    messages.push({ status, data: Array.from(buf.subarray(off, off + n)) });
+    off += n;
+  }
+  return { seq, ssrc, messages };
+}
+
+/** `{ status, data }` → a plain event, or null for what nobody here cares about. */
+function describe(msg) {
+  const hi = msg.status & 0xf0;
+  const channel = (msg.status & 0x0f) + 1;
+  if (hi === 0x90 && msg.data[1] > 0) return { type: 'noteon', channel, note: msg.data[0], velocity: msg.data[1] };
+  if (hi === 0x80 || (hi === 0x90 && msg.data[1] === 0)) return { type: 'noteoff', channel, note: msg.data[0] };
+  if (hi === 0xc0) return { type: 'program', channel, program: msg.data[0] };
+  if (hi === 0xb0) return { type: 'cc', channel, controller: msg.data[0], value: msg.data[1] };
+  return null;
+}
+
+/* ── the session ─────────────────────────────────────────────────────── */
+
+class Session extends EventEmitter {
+  /**
+   * @param {{ name: string, port: number, log?: Function }} opts
+   * Events: 'midi' ({ participant, event }), 'change' (participants or
+   * listening changed), 'listening' (both ports bound).
+   */
+  constructor({ name, port, log }) {
+    super();
+    this.name = name || 'ProdDash';
+    this.port = port;
+    this.log = log || (() => {});
+    this.ssrc = randomU32();
+    this.now = makeClock();
+    this.control = null;
+    this.data = null;
+    this.participants = new Map(); // key → participant
+    this.invites = new Map();      // key "host:port" → outbound invitation
+    this.strangers = new Map();    // address → when we last told it we're not in its session
+    this.timers = new Set();
+    this.stopped = false;
+    this.error = '';
+  }
+
+  /**
+   * Open both ports. Resolves once both are bound — or once the first try
+   * failed, with `error` set. A port that is busy (our own previous session
+   * still closing after a config save, or another program) is retried every
+   * few seconds for as long as the session runs; 'listening' fires when it
+   * finally binds.
+   */
+  start() {
+    this.every(FEEDBACK_MS, () => this.sendFeedback());
+    this.every(5000, () => this.reap());
+    return new Promise((resolve) => {
+      let first = true;
+      const attempt = (delay) => this.later(delay, async () => {
+        const ok = await this.bind();
+        if (ok) {
+          this.error = '';
+          this.emit('listening');
+          this.emit('change');
+        } else {
+          this.emit('change');
+          attempt(first ? 250 : 3000);
+        }
+        if (first) { first = false; resolve(ok); }
+      });
+      attempt(0);
+    });
+  }
+
+  /** Bind control and data sockets together; on failure close both. */
+  bind() {
+    const open = (port, which) => new Promise((resolve) => {
+      const sock = dgram.createSocket('udp4');
+      const fail = (e) => {
+        try { sock.close(); } catch { /* not open */ }
+        resolve({ sock: null, port, e });
+      };
+      sock.once('error', fail);
+      sock.bind(port, () => {
+        sock.removeListener('error', fail);
+        sock.on('error', (e) => this.log(`socket error on ${port}: ${e.message}`));
+        sock.on('message', (buf, rinfo) => {
+          try { this.onPacket(buf, rinfo, which); } catch (e) { this.log(`bad packet from ${rinfo.address}: ${e.message}`); }
+        });
+        resolve({ sock, port });
+      });
+    });
+    return Promise.all([open(this.port, 'control'), open(this.port + 1, 'data')]).then(([c, d]) => {
+      if (this.stopped || !c.sock || !d.sock) {
+        for (const x of [c, d]) if (x.sock) { try { x.sock.close(); } catch { /* closed */ } }
+        const bad = !c.sock ? c : d;
+        if (bad.e) {
+          const msg = bad.e.code === 'EADDRINUSE'
+            ? `UDP port ${bad.port} is in use on this machine — pick another session port in /admin`
+            : `UDP port ${bad.port}: ${bad.e.message}`;
+          if (msg !== this.error) this.log(msg);
+          this.error = msg;
+        }
+        return false;
+      }
+      this.control = c.sock;
+      this.data = d.sock;
+      return true;
+    });
+  }
+
+  stop() {
+    this.stopped = true;
+    for (const t of this.timers) { clearTimeout(t); clearInterval(t); }
+    this.timers.clear();
+    const control = this.control;
+    const data = this.data;
+    const close = () => {
+      for (const s of [control, data]) { try { s && s.close(); } catch { /* closed */ } }
+    };
+    // Say goodbye, then close once the goodbyes have left (a config save
+    // re-inits straight away and wants these ports back).
+    const byes = [...this.participants.values()].filter((p) => p.connected);
+    let left = byes.length;
+    if (!control || !left) close();
+    else {
+      for (const p of byes) {
+        try {
+          control.send(sessionPacket(CMD.BY, p.token, this.ssrc), p.controlPort, p.address, () => { if (--left === 0) close(); });
+        } catch { if (--left === 0) close(); }
+      }
+    }
+    this.control = null;
+    this.data = null;
+    this.participants.clear();
+    this.invites.clear();
+  }
+
+  every(ms, fn) {
+    const t = setInterval(fn, ms);
+    t.unref?.();
+    this.timers.add(t);
+    return t;
+  }
+
+  later(ms, fn) {
+    const t = setTimeout(() => { this.timers.delete(t); if (!this.stopped) fn(); }, ms);
+    t.unref?.();
+    this.timers.add(t);
+    return t;
+  }
+
+  send(sock, buf, port, address) {
+    if (!sock || this.stopped) return;
+    try { sock.send(buf, port, address); } catch { /* socket closed */ }
+  }
+
+  /** Every participant, for display. */
+  list() {
+    return [...this.participants.values()].map((p) => ({
+      name: p.name,
+      address: p.address,
+      port: p.controlPort,
+      connected: p.connected,
+      outbound: p.outbound,
+      lastHeard: p.lastHeard || null,
+      since: p.since || null,
+    }));
+  }
+
+  /* — outbound invitations — */
+
+  /**
+   * Keep a connection to the session at host:port. Re-invites on its own
+   * whenever the connection drops. Returns the invitation's state object.
+   */
+  invite(host, port, label) {
+    const key = `${host}:${port}`;
+    if (this.invites.has(key)) return this.invites.get(key);
+    const inv = { key, host, port, label: label || host, address: '', token: 0, attempts: 0, stage: 'idle', error: '', timer: null };
+    this.invites.set(key, inv);
+    this.beginInvite(inv);
+    return inv;
+  }
+
+  beginInvite(inv) {
+    if (this.stopped || !this.invites.has(inv.key)) return;
+    dns.lookup(inv.host, { family: 4 }, (err, address) => {
+      if (this.stopped) return;
+      if (err) {
+        inv.error = `can't find ${inv.host}`;
+        inv.stage = 'idle';
+        this.emit('change');
+        this.later(REINVITE_MS, () => this.beginInvite(inv));
+        return;
+      }
+      inv.address = address;
+      // Already in a session with that machine (it invited us)? Nothing to do.
+      const existing = this.findByAddress(address, inv.port);
+      if (existing && existing.connected) {
+        existing.label = inv.label;
+        inv.stage = 'connected';
+        inv.error = '';
+        this.emit('change');
+        return;
+      }
+      inv.token = randomU32();
+      inv.attempts = 0;
+      inv.stage = 'control';
+      this.sendInvite(inv);
+    });
+  }
+
+  sendInvite(inv) {
+    if (this.stopped || !this.invites.has(inv.key)) return;
+    if (inv.stage !== 'control' && inv.stage !== 'data') return;
+    if (inv.attempts >= INVITE_ATTEMPTS) {
+      inv.error = inv.error || 'no answer';
+      inv.stage = 'idle';
+      this.emit('change');
+      this.later(REINVITE_MS, () => this.beginInvite(inv));
+      return;
+    }
+    inv.attempts++;
+    const sock = inv.stage === 'control' ? this.control : this.data;
+    const port = inv.stage === 'control' ? inv.port : inv.port + 1;
+    this.send(sock, sessionPacket(CMD.IN, inv.token, this.ssrc, this.name), port, inv.address);
+    clearTimeout(inv.timer);
+    inv.timer = this.later(INVITE_RETRY_MS, () => this.sendInvite(inv));
+  }
+
+  inviteFor(rinfo, token) {
+    for (const inv of this.invites.values()) {
+      if (inv.token === token && inv.address === rinfo.address) return inv;
+    }
+    return null;
+  }
+
+  findByAddress(address, controlPort) {
+    for (const p of this.participants.values()) {
+      if (p.address === address && (controlPort == null || p.controlPort === controlPort)) return p;
+    }
+    return null;
+  }
+
+  /* — packets in — */
+
+  onPacket(buf, rinfo, which) {
+    const s = parseSession(buf);
+    if (!s) {
+      if (which === 'data') this.onRtp(buf, rinfo);
+      return;
+    }
+    const sock = which === 'control' ? this.control : this.data;
+    switch (s.cmd) {
+      case CMD.IN: return this.onInvitation(s, rinfo, which, sock);
+      case CMD.OK: return this.onAccepted(s, rinfo, which);
+      case CMD.NO: return this.onRejected(s, rinfo);
+      case CMD.BY: return this.onBye(s, rinfo);
+      case CMD.CK: return this.onSync(s, rinfo);
+      default: return undefined; // RS from a peer: nothing for a listener to do
+    }
+  }
+
+  onInvitation(s, rinfo, which, sock) {
+    // We accept anyone: being in more sessions only means hearing more cues.
+    this.send(sock, sessionPacket(CMD.OK, s.token, this.ssrc, this.name), rinfo.port, rinfo.address);
+    const key = `in:${s.ssrc}`;
+    let p = this.participants.get(key);
+    if (which === 'control') {
+      if (!p) {
+        p = {
+          key, ssrc: s.ssrc, token: s.token, name: s.name || rinfo.address, label: '',
+          address: rinfo.address, controlPort: rinfo.port, dataPort: rinfo.port + 1,
+          outbound: false, connected: false, lastSeq: -1, fedBack: -1, lastHeard: Date.now(), since: 0,
+        };
+        this.participants.set(key, p);
+        this.log(`invited by "${p.name}" at ${rinfo.address}:${rinfo.port}`);
+      } else {
+        p.token = s.token;
+        p.controlPort = rinfo.port;
+        p.name = s.name || p.name;
+      }
+    } else if (p) {
+      p.dataPort = rinfo.port;
+      p.connected = true;
+      p.since = Date.now();
+      p.lastHeard = Date.now();
+      this.log(`in session with "${p.name}" (${p.address})`);
+      for (const inv of this.invites.values()) {
+        if (inv.address === p.address && inv.port === p.controlPort) {
+          p.label = inv.label;
+          inv.stage = 'connected';
+          inv.error = '';
+          clearTimeout(inv.timer);
+        }
+      }
+      this.emit('change');
+    }
+  }
+
+  onAccepted(s, rinfo, which) {
+    const inv = this.inviteFor(rinfo, s.token);
+    if (!inv) return;
+    clearTimeout(inv.timer);
+    if (which === 'control' && inv.stage === 'control') {
+      inv.stage = 'data';
+      inv.attempts = 0;
+      inv.remoteName = s.name;
+      this.sendInvite(inv);
+      return;
+    }
+    if (which === 'data' && inv.stage === 'data') {
+      const key = `out:${inv.key}`;
+      // Drop any stale record of the same remote before taking the new one.
+      for (const [k, q] of this.participants) if (q.ssrc === s.ssrc && k !== key) this.participants.delete(k);
+      const p = {
+        key, ssrc: s.ssrc, token: inv.token, name: inv.remoteName || s.name || inv.host, label: inv.label,
+        address: rinfo.address, controlPort: inv.port, dataPort: rinfo.port,
+        outbound: true, connected: true, lastSeq: -1, fedBack: -1,
+        lastHeard: Date.now(), lastSyncAnswer: Date.now(), since: Date.now(), syncs: 0,
+      };
+      this.participants.set(key, p);
+      inv.stage = 'connected';
+      inv.error = '';
+      this.log(`joined "${p.name}" at ${inv.host} (${rinfo.address}:${inv.port})`);
+      this.emit('change');
+      this.startSync(p, inv);
+    }
+  }
+
+  onRejected(s, rinfo) {
+    const inv = this.inviteFor(rinfo, s.token);
+    if (!inv) return;
+    clearTimeout(inv.timer);
+    inv.stage = 'idle';
+    inv.error = 'the session refused us — set "Who may connect" to Anyone in Audio MIDI Setup';
+    this.log(`${inv.host}: invitation refused`);
+    this.emit('change');
+    this.later(REINVITE_MS * 2, () => this.beginInvite(inv));
+  }
+
+  onBye(s, rinfo) {
+    for (const [k, p] of this.participants) {
+      if (p.ssrc === s.ssrc && p.address === rinfo.address) this.drop(k, 'left the session');
+    }
+  }
+
+  drop(key, why) {
+    const p = this.participants.get(key);
+    if (!p) return;
+    this.participants.delete(key);
+    clearInterval(p.syncTimer);
+    this.timers.delete(p.syncTimer);
+    this.log(`"${p.name}" ${why}`);
+    // If we were asked to keep this one, go and get it back.
+    for (const inv of this.invites.values()) {
+      if (inv.address === p.address && inv.port === p.controlPort && inv.stage === 'connected') {
+        inv.stage = 'idle';
+        inv.error = why;
+        this.later(p.outbound ? 1000 : REINVITE_MS, () => this.beginInvite(inv));
+      }
+    }
+    this.emit('change');
+  }
+
+  /* — clock sync — */
+
+  startSync(p) {
+    const tick = () => {
+      if (!this.participants.has(p.key)) return;
+      if (Date.now() - p.lastSyncAnswer > SYNC_TIMEOUT_MS) {
+        this.send(this.control, sessionPacket(CMD.BY, p.token, this.ssrc), p.controlPort, p.address);
+        this.drop(p.key, 'stopped answering');
+        return;
+      }
+      this.send(this.data, syncPacket(this.ssrc, 0, [this.now(), 0n, 0n]), p.dataPort, p.address);
+      p.syncs++;
+      if (p.syncs === 6) {
+        clearInterval(p.syncTimer);
+        this.timers.delete(p.syncTimer);
+        p.syncTimer = this.every(SYNC_MS, tick);
+      }
+    };
+    p.syncTimer = this.every(SYNC_FAST_MS, tick);
+    tick();
+  }
+
+  onSync(s, rinfo) {
+    const p = [...this.participants.values()].find((q) => q.ssrc === s.ssrc);
+    if (p) p.lastHeard = Date.now();
+    if (s.count === 0) {
+      this.send(this.data, syncPacket(this.ssrc, 1, [s.ts[0], this.now(), 0n]), rinfo.port, rinfo.address);
+    } else if (s.count === 1) {
+      if (p) p.lastSyncAnswer = Date.now();
+      this.send(this.data, syncPacket(this.ssrc, 2, [s.ts[0], s.ts[1], this.now()]), rinfo.port, rinfo.address);
+    }
+    // count 2 completes a sync someone else started; nothing to answer.
+  }
+
+  /** Drop inbound participants that have gone quiet (their machine slept or left without a BY). */
+  reap() {
+    const now = Date.now();
+    for (const [k, p] of this.participants) {
+      if (!p.outbound && now - (p.lastHeard || 0) > IDLE_MS) this.drop(k, 'went quiet');
+    }
+  }
+
+  sendFeedback() {
+    for (const p of this.participants.values()) {
+      if (!p.connected || p.lastSeq < 0 || p.lastSeq === p.fedBack) continue;
+      p.fedBack = p.lastSeq;
+      this.send(this.control, feedbackPacket(this.ssrc, p.lastSeq), p.controlPort, p.address);
+    }
+  }
+
+  /* — MIDI — */
+
+  onRtp(buf, rinfo) {
+    const pkt = parseRtpMidi(buf);
+    if (!pkt) return;
+    let p = [...this.participants.values()].find((q) => q.ssrc === pkt.ssrc && q.connected);
+    if (!p) {
+      // MIDI from someone not in a session with us (a stale session after our restart).
+      // Ask them to start over so the session comes back properly — once in a while, not per note.
+      const last = this.strangers.get(rinfo.address) || 0;
+      if (Date.now() - last > 5000) {
+        this.strangers.set(rinfo.address, Date.now());
+        this.send(this.control, sessionPacket(CMD.BY, 0, this.ssrc), rinfo.port - 1, rinfo.address);
+      }
+      return;
+    }
+    p.lastHeard = Date.now();
+    p.lastSeq = pkt.seq;
+    for (const m of pkt.messages) {
+      const event = describe(m);
+      if (event) this.emit('midi', { participant: p, event });
+    }
+  }
+}
+
+module.exports = {
+  Session,
+  parseRtpMidi,
+  parseSession,
+  describe,
+  sessionPacket,
+  syncPacket,
+  CMD,
+};

modules/vista-cues/server.js

@@ -0,0 +1,371 @@
+'use strict';
+
+/**
+ * Vista Cues — server part.
+ *
+ * Vista 3 cannot say what it is playing: its OSC is input-only and it sends
+ * no feedback. What it *does* have is a network MIDI session that
+ * ProPresenter and the tracks rig fire cue lists through. A session sends
+ * every message to every participant, so this module joins those sessions
+ * as one more participant (rtpmidi.js) and hears exactly what Vista hears.
+ * The admin's "Cue lists" sheet (mapping.js) turns each note into
+ * "Go on Walk-in", "Release Worship 1"…, and from those the module keeps
+ * which lists are live.
+ *
+ *   GET  /state   → { state }                     (instant paint)
+ *   GET  /stream  → SSE: `state` on every change
+ *   POST /clear   → forget which lists are live (when Vista was reset by hand)
+ *
+ * What the tile shows is what Vista was told, not what Vista confirmed: if
+ * Vista is closed or someone works the desk by hand, the two can differ.
+ */
+
+const fs = require('fs');
+const { spawn } = require('child_process');
+const { Session } = require('./rtpmidi');
+const { parseMapping, match, triggerLabel } = require('./mapping');
+
+const HEARTBEAT_MS = 15000;
+const LOG_MAX = 40;
+const DNS_SD = '/usr/bin/dns-sd';
+
+let current = null;
+
+function emptyState(extra = {}) {
+  return {
+    listening: false,
+    error: '',
+    sessionName: '',
+    port: null,
+    advertised: false,
+    sources: [],
+    current: null,
+    active: [],
+    log: [],
+    mappingErrors: [],
+    rules: 0,
+    now: Date.now(),
+    ...extra,
+  };
+}
+
+function endpointOf(v) {
+  const ep = v && typeof v === 'object' ? v : {};
+  return { host: String(ep.host || '').trim(), port: Number(ep.port) || 5004 };
+}
+
+module.exports = {
+  init({ config, log }) {
+    const sessionName = String(config.sessionName || '').trim() || 'ProdDash Lighting';
+    const port = Math.round(Number(config.sessionPort)) || 5040;
+    const middleC = config.middleC === 'C4' ? 'C4' : 'C3';
+    const exclusive = config.exclusive === true;
+    const headTakesOver = config.headTakesOver !== false;
+    const { rules, errors: mappingErrors, groups } = parseMapping(config.cueLists, { middleC });
+    if (mappingErrors.length) {
+      for (const e of mappingErrors) log(`cue lists line ${e.line} skipped (${e.why}): ${e.text}`);
+    }
+
+    const senders = [
+      { label: String(config.source1Name || '').trim() || 'ProPresenter', ...endpointOf(config.source1) },
+      { label: String(config.source2Name || '').trim() || 'Tracks', ...endpointOf(config.source2) },
+      { label: String(config.source3Name || '').trim() || 'Companion', ...endpointOf(config.source3) },
+    ].filter((s) => s.host);
+
+    const streams = new Set();
+    const lists = new Map();   // lower-cased name → { name, group, state, firedAt, lastAt, lastAction, source, trigger, goes }
+    const history = [];        // newest first
+    let currentKey = '';
+    let lastFrame = '';
+    let advertiser = null;
+    let advertised = false;
+    let stopped = false;
+
+    if (port < 1024 || port > 65534) throw new Error('Session port must be between 1024 and 65534');
+
+    const session = new Session({ name: sessionName, port, log });
+    const invites = senders.map((s) => ({ ...s, inv: null }));
+
+    /* ── what Vista was told ─────────────────────────────────────── */
+
+    function sourceLabel(p) {
+      return p.label || p.name || p.address;
+    }
+
+    function record(entry) {
+      history.unshift({ at: Date.now(), ...entry });
+      if (history.length > LOG_MAX) history.length = LOG_MAX;
+    }
+
+    function apply(rule, source, trigger) {
+      const now = Date.now();
+      const key = rule.list.toLowerCase();
+      record({ action: rule.action, list: rule.list, group: rule.group, source, trigger, mapped: true });
+      if (rule.action === 'flash') return; // a momentary hit: in the log, never live
+      if (rule.action === 'releaseAll') {
+        lists.clear();
+        currentKey = '';
+        return;
+      }
+      if (rule.action === 'release') {
+        lists.delete(key);
+        if (currentKey === key) currentKey = newestKey();
+        return;
+      }
+      let l = lists.get(key);
+      if (rule.action === 'go') {
+        // A Go replaces the other lists of its group. A Go in the first group (the
+        // main scene) takes over everything, as Vista's last-takes-precedence does;
+        // and with "Go releases others" on, every Go does.
+        const takeover = exclusive || (headTakesOver && rule.group && rule.group === groups[0]);
+        for (const [k, other] of [...lists]) {
+          if (k !== key && (takeover || (rule.group && other.group === rule.group))) lists.delete(k);
+        }
+        if (!l) {
+          l = { name: rule.list, group: rule.group, state: 'active', firedAt: now, goes: 0 };
+          lists.set(key, l);
+        }
+        l.state = 'active';
+        l.goes++;
+        l.lastAt = now;
+        l.lastAction = 'go';
+        l.source = source;
+        l.trigger = trigger;
+        currentKey = key;
+        return;
+      }
+      // pause / back act on a list that is live; on one that isn't, they only go in the log.
+      if (!l) return;
+      l.lastAt = now;
+      l.lastAction = rule.action;
+      l.source = source;
+      l.trigger = trigger;
+      if (rule.action === 'pause') l.state = 'paused'; // the next Go resumes it
+      if (rule.action === 'back') { l.state = 'active'; l.goes = Math.max(1, l.goes - 1); }
+    }
+
+    function newestKey() {
+      let best = '';
+      let at = -1;
+      for (const [k, l] of lists) if (l.lastAt > at) { best = k; at = l.lastAt; }
+      return best;
+    }
+
+    session.on('midi', ({ participant, event }) => {
+      if (event.type !== 'noteon' && event.type !== 'program') return;
+      const source = sourceLabel(participant);
+      const trigger = triggerLabel(event, middleC);
+      const rule = match(rules, event);
+      if (rule) {
+        apply(rule, source, trigger);
+        log(`${source}: ${trigger} → ${rule.action}${rule.list ? ` ${rule.list}` : ''}`);
+      } else {
+        record({ action: '', list: '', source, trigger, mapped: false });
+      }
+      broadcast();
+    });
+    session.on('change', () => broadcast());
+    // Senders are joined once our ports are ours — straight away normally,
+    // or a moment later when a busy port frees up.
+    session.on('listening', () => {
+      if (stopped) return;
+      log(`session "${sessionName}" listening on UDP ${port}/${port + 1}`);
+      for (const s of invites) s.inv = session.invite(s.host, s.port, s.label);
+      if (!advertiser) advertise();
+    });
+
+    /* ── the view-model ──────────────────────────────────────────── */
+
+    function sources() {
+      const out = [];
+      const seen = new Set();
+      for (const s of invites) {
+        const inv = s.inv;
+        const p = inv && [...session.participants.values()].find((q) => q.connected && q.address === inv.address && q.controlPort === inv.port);
+        if (p) seen.add(p.key);
+        out.push({
+          label: s.label,
+          name: p ? p.name : '',
+          address: inv?.address || s.host,
+          configured: true,
+          connected: Boolean(p),
+          error: p ? '' : (inv?.error || ''),
+          lastHeard: p ? p.lastHeard : null,
+        });
+      }
+      for (const p of session.participants.values()) {
+        if (seen.has(p.key) || !p.connected) continue;
+        out.push({ label: p.label || p.name, name: p.name, address: p.address, configured: false, connected: true, error: '', lastHeard: p.lastHeard });
+      }
+      return out;
+    }
+
+    function groupRank(l) {
+      const i = groups.indexOf(l.group);
+      return i < 0 ? groups.length : i;
+    }
+
+    function buildState() {
+      const live = [...lists.values()].sort((a, b) => b.lastAt - a.lastAt);
+      // The headline: the live list of the sheet's first group (the scene, say,
+      // rather than whichever colour changed last); without groups, the last Go.
+      const head = groups[0];
+      const cur = (head && live.find((l) => l.group === head))
+        || (currentKey ? lists.get(currentKey) : null)
+        || null;
+      return {
+        listening: Boolean(session.control),
+        error: session.error,
+        sessionName,
+        port,
+        advertised,
+        sources: sources(),
+        current: cur || null,
+        // The rest in sheet order of their group, so a colour chip stays put as it changes.
+        active: live.filter((l) => l !== cur).sort((a, b) => groupRank(a) - groupRank(b) || b.lastAt - a.lastAt),
+        headline: head || '',
+        log: history,
+        mappingErrors,
+        rules: rules.length,
+        now: Date.now(),
+      };
+    }
+
+    function send(payload) {
+      for (const res of streams) {
+        try { res.write(payload); } catch { streams.delete(res); }
+      }
+    }
+
+    function broadcast() {
+      if (stopped) return;
+      const state = buildState();
+      const { now, sources: src, ...rest } = state;
+      // lastHeard moves with every packet; leave it out of change detection.
+      const frame = JSON.stringify({ ...rest, src: src.map(({ lastHeard, ...s }) => s) });
+      if (frame === lastFrame) return;
+      lastFrame = frame;
+      send(`event: state\ndata: ${JSON.stringify(state)}\n\n`);
+    }
+
+    const keepalive = setInterval(() => send(': ping\n\n'), HEARTBEAT_MS);
+    keepalive.unref?.();
+
+    /* ── being found: Bonjour on macOS ───────────────────────────── */
+
+    // Advertising _apple-midi._udp puts us in Audio MIDI Setup's Directory on
+    // every Mac here, so a sender can add us with a click. macOS ships the
+    // dns-sd tool; we run it as a child and stop it with the module. Elsewhere
+    // nothing is advertised and senders are joined by address alone.
+    function advertise() {
+      if (stopped || config.advertise === false || process.platform !== 'darwin' || !fs.existsSync(DNS_SD)) return;
+      advertiser = spawn(DNS_SD, ['-R', sessionName, '_apple-midi._udp', 'local', String(port)], { stdio: ['ignore', 'pipe', 'pipe'] });
+      advertiser.stdout.on('data', (d) => {
+        if (/Name now registered and active/i.test(String(d)) && !advertised) {
+          advertised = true;
+          log(`advertised as "${sessionName}" on port ${port}`);
+          broadcast();
+        }
+      });
+      advertiser.stderr.on('data', () => {});
+      advertiser.on('error', (e) => { log(`dns-sd: ${e.message}`); advertiser = null; });
+      advertiser.on('exit', () => {
+        advertiser = null;
+        advertised = false;
+        if (!stopped) setTimeout(advertise, 5000).unref?.();
+      });
+    }
+
+    /* ── start ───────────────────────────────────────────────────── */
+
+    session.start().then(() => broadcast());
+
+    current = {
+      streams,
+      getState: buildState,
+      clear() {
+        lists.clear();
+        currentKey = '';
+        record({ action: 'cleared', list: '', source: 'Dashboard', trigger: '', mapped: true });
+        broadcast();
+      },
+    };
+
+    return {
+      stop() {
+        stopped = true;
+        clearInterval(keepalive);
+        session.stop();
+        if (advertiser) { try { advertiser.kill(); } catch { /* gone */ } advertiser = null; }
+        for (const res of streams) { try { res.end(); } catch { /* gone */ } }
+        streams.clear();
+        if (current && current.streams === streams) current = null;
+      },
+      health() {
+        if (session.error) return { status: 'error', message: session.error };
+        const src = sources();
+        const on = src.filter((s) => s.connected);
+        const lines = mappingErrors.length ? ` · ${mappingErrors.length} cue-list line${mappingErrors.length === 1 ? '' : 's'} not understood (first: line ${mappingErrors[0].line})` : '';
+        const map = rules.length ? '' : ' · no cue lists mapped yet';
+        if (on.length) {
+          const off = src.filter((s) => !s.connected).map((s) => `${s.label} (${s.error || 'joining…'})`);
+          return {
+            status: off.length ? 'connecting' : 'ok',
+            message: `In session with ${on.map((s) => s.label).join(', ')}${off.length ? ` · waiting for ${off.join(', ')}` : ''}${map}${lines}`,
+          };
+        }
+        const where = advertised ? `advertised as "${sessionName}"` : `port ${port}`;
+        if (src.length) {
+          return { status: 'connecting', message: `Joining ${src.map((s) => `${s.label}${s.error ? ` (${s.error})` : ''}`).join(', ')} · ${where}${map}${lines}` };
+        }
+        return { status: 'connecting', message: `Waiting for a MIDI session to connect · ${where}${map}${lines}` };
+      },
+    };
+  },
+
+  /**
+   * One picker entry, so the ＋ menu gives Vista Cues a heading of its own —
+   * a module with no list sits headless under whichever module precedes it
+   * (Slack, alphabetically). Tiles added before this keep working: they
+   * have no variant and use the module's schema.
+   */
+  tiles() {
+    return [{
+      id: 'live',
+      name: 'Live cue lists',
+      description: 'The main scene Vista is running, the FX on top, and what fired them',
+      defaultSize: { w: 5, h: 4 },
+      minSize: { w: 2, h: 1 },
+    }];
+  },
+
+  routes() {
+    const sendJson = (res, code, body) => {
+      res.writeHead(code, { 'Content-Type': 'application/json; charset=utf-8', 'Cache-Control': 'no-store' });
+      res.end(JSON.stringify(body));
+    };
+    return {
+      'GET /state': (req, res) => sendJson(res, 200, { state: current ? current.getState() : emptyState() }),
+      'GET /stream': (req, res) => {
+        res.writeHead(200, {
+          'Content-Type': 'text/event-stream; charset=utf-8',
+          'Cache-Control': 'no-cache, no-transform',
+          Connection: 'keep-alive',
+          'X-Accel-Buffering': 'no',
+        });
+        res.write('retry: 3000\n\n');
+        res.write(`event: state\ndata: ${JSON.stringify(current ? current.getState() : emptyState())}\n\n`);
+        if (!current) return void res.end();
+        try { req.socket.setKeepAlive(true, 15000); } catch { /* gone */ }
+        const set = current.streams;
+        set.add(res);
+        req.on('close', () => set.delete(res));
+      },
+      'POST /clear': (req, res) => {
+        if (!current) return sendJson(res, 503, { error: 'Vista Cues is not running' });
+        current.clear();
+        return sendJson(res, 200, { ok: true });
+      },
+    };
+  },
+};

modules/vista-cues/style.css

@@ -0,0 +1,185 @@
+/* Vista Cues. Sizes hang off the tile (container units) times the tile's
+   own text scale (--vc-scale, the title bar's − / +), so one tile reads the
+   same at 3×2 on a laptop as at 8×5 on a wall. Colours are the shell's. */
+
+[data-module="vista-cues"] .vc-root {
+  --tone: var(--text);
+  --vc-scale: 1;
+  position: absolute;
+  inset: 0;
+  container-type: size;
+  overflow: hidden;
+  color: var(--text);
+  font-variant-numeric: tabular-nums;
+  user-select: none;
+  -webkit-user-select: none;
+}
+[data-module="vista-cues"] .vc-root[data-tone="ok"] { --tone: var(--accent); }
+[data-module="vista-cues"] .vc-root[data-tone="warn"] { --tone: var(--warn); }
+[data-module="vista-cues"] .vc-root[data-tone="muted"] { --tone: var(--muted); }
+[data-module="vista-cues"] [hidden] { display: none !important; }
+
+[data-module="vista-cues"] .vc-body {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  flex-direction: column;
+  gap: calc(clamp(3px, 2.5cqh, 14px) * var(--vc-scale));
+  padding: clamp(6px, 3.5cqmin, 22px);
+  min-width: 0;
+}
+
+[data-module="vista-cues"] .vc-offline {
+  position: absolute;
+  top: clamp(4px, 3cqmin, 14px);
+  right: clamp(6px, 3.5cqmin, 22px);
+  z-index: 2;
+  font-size: calc(clamp(9px, 4.5cqmin, 14px) * var(--vc-scale));
+  font-weight: 700;
+  letter-spacing: 0.05em;
+  text-transform: uppercase;
+  color: var(--danger);
+}
+[data-module="vista-cues"] .vc-root.is-offline .vc-now { opacity: 0.45; filter: grayscale(0.6); }
+
+/* ── now ── */
+
+[data-module="vista-cues"] .vc-now {
+  flex: 0 0 auto;
+  min-width: 0;
+  padding-left: clamp(6px, 2cqmin, 14px);
+  border-left: clamp(3px, 1.1cqmin, 7px) solid var(--tone);
+}
+[data-module="vista-cues"] .vc-kicker {
+  display: flex;
+  align-items: center;
+  gap: 0.6em;
+  font-size: calc(clamp(10px, 5cqmin, 18px) * var(--vc-scale));
+  color: var(--muted);
+}
+[data-module="vista-cues"] .vc-pill {
+  padding: 0.05em 0.55em;
+  border-radius: 999px;
+  font-weight: 800;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  background: var(--tone);
+  color: var(--accent-text);
+}
+[data-module="vista-cues"] .vc-root[data-tone="warn"] .vc-pill { color: var(--bg); }
+[data-module="vista-cues"] .vc-ago { font-weight: 600; }
+[data-module="vista-cues"] .vc-name-wrap { min-width: 0; }
+[data-module="vista-cues"] .vc-name {
+  font-size: calc(clamp(16px, 14cqmin, 96px) * var(--vc-scale));
+  line-height: 1.12;
+  font-weight: 800;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: var(--text);
+}
+[data-module="vista-cues"] .vc-root[data-tone="muted"] .vc-name { color: var(--muted); font-weight: 600; }
+[data-module="vista-cues"] .vc-meta {
+  font-size: calc(clamp(10px, 4.6cqmin, 18px) * var(--vc-scale));
+  color: var(--muted);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+[data-module="vista-cues"] .vc-meta:empty { display: none; }
+
+/* ── other live lists ── */
+
+[data-module="vista-cues"] .vc-active {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.4em;
+  flex: 0 0 auto;
+  font-size: calc(clamp(10px, 4.4cqmin, 17px) * var(--vc-scale));
+}
+[data-module="vista-cues"] .vc-chip {
+  display: inline-flex;
+  align-items: baseline;
+  gap: 0.5em;
+  max-width: 100%;
+  padding: 0.2em 0.65em;
+  border-radius: 6px;
+  border: 1px solid color-mix(in srgb, var(--accent) 45%, transparent);
+  background: color-mix(in srgb, var(--accent) 14%, transparent);
+}
+[data-module="vista-cues"] .vc-chip.is-paused {
+  border-color: color-mix(in srgb, var(--warn) 55%, transparent);
+  background: color-mix(in srgb, var(--warn) 14%, transparent);
+}
+[data-module="vista-cues"] .vc-chip-name {
+  font-weight: 700;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+[data-module="vista-cues"] .vc-chip-ago,
+[data-module="vista-cues"] .vc-chip-group { color: var(--muted); }
+[data-module="vista-cues"] .vc-chip-group { font-size: 0.8em; text-transform: uppercase; letter-spacing: 0.04em; }
+
+/* ── recent ── */
+
+[data-module="vista-cues"] .vc-recent {
+  flex: 1 1 auto;
+  min-height: 0;
+  overflow: hidden;
+  font-size: calc(clamp(10px, 3.8cqmin, 15px) * var(--vc-scale));
+  border-top: 1px solid var(--border);
+  padding-top: 0.35em;
+}
+[data-module="vista-cues"] .vc-row {
+  display: grid;
+  grid-template-columns: auto 6.2em minmax(0, 1fr) auto;
+  gap: 0.8em;
+  align-items: baseline;
+  padding: 0.12em 0;
+  white-space: nowrap;
+}
+[data-module="vista-cues"] .vc-row > span { overflow: hidden; text-overflow: ellipsis; }
+[data-module="vista-cues"] .vc-row-time,
+[data-module="vista-cues"] .vc-row-source { color: var(--muted); }
+[data-module="vista-cues"] .vc-row-action { font-weight: 700; color: var(--accent); }
+[data-module="vista-cues"] .vc-row[data-action="release"] .vc-row-action,
+[data-module="vista-cues"] .vc-row[data-action="releaseAll"] .vc-row-action,
+[data-module="vista-cues"] .vc-row[data-action="cleared"] .vc-row-action { color: var(--muted); }
+[data-module="vista-cues"] .vc-row[data-action="pause"] .vc-row-action { color: var(--warn); }
+[data-module="vista-cues"] .vc-row[data-action="flash"] .vc-row-action { color: var(--text); }
+[data-module="vista-cues"] .vc-row.is-unmapped { opacity: 0.6; }
+[data-module="vista-cues"] .vc-row.is-unmapped .vc-row-action { color: var(--muted); font-weight: 500; }
+
+@container (max-width: 300px) {
+  [data-module="vista-cues"] .vc-row { grid-template-columns: 5.2em minmax(0, 1fr); }
+  [data-module="vista-cues"] .vc-row-time,
+  [data-module="vista-cues"] .vc-row-source { display: none; }
+}
+@container (max-height: 140px) {
+  [data-module="vista-cues"] .vc-recent,
+  [data-module="vista-cues"] .vc-active { display: none; }
+}
+
+/* ── senders ── */
+
+[data-module="vista-cues"] .vc-sources {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.9em;
+  margin-top: auto;
+  font-size: calc(clamp(9px, 3.4cqmin, 13px) * var(--vc-scale));
+  color: var(--muted);
+}
+[data-module="vista-cues"] .vc-src { display: inline-flex; align-items: center; gap: 0.4em; }
+[data-module="vista-cues"] .vc-dot {
+  width: 0.65em;
+  height: 0.65em;
+  border-radius: 50%;
+  background: var(--danger);
+}
+[data-module="vista-cues"] .vc-src.is-on { color: var(--text); }
+[data-module="vista-cues"] .vc-src.is-on .vc-dot { background: var(--accent); }
+@container (max-height: 140px) {
+  [data-module="vista-cues"] .vc-sources { display: none; }
+}

modules/vista-cues/vista.test.js

@@ -0,0 +1,371 @@
+'use strict';
+
+/**
+ * Tests for Vista Cues.
+ *
+ *   node modules/vista-cues/vista.test.js
+ *
+ * Plain Node, no dependencies; exits non-zero on the first failure. Covers
+ * the cue-sheet parser, RTP-MIDI packet decoding, and a real session over
+ * loopback UDP: a fake sender invites the module's session, plays notes, and
+ * the server entry's state follows.
+ */
+
+const assert = require('assert');
+const dgram = require('dgram');
+const http = require('http');
+const { parseMapping, match, noteFromName } = require('./mapping');
+const { parseRtpMidi, describe, Session } = require('./rtpmidi');
+
+let passed = 0;
+async function test(name, fn) {
+  await fn();
+  passed++;
+  console.log(`  ok  ${name}`);
+}
+
+const wait = (ms) => new Promise((r) => setTimeout(r, ms));
+async function until(fn, ms = 3000) {
+  const end = Date.now() + ms;
+  while (Date.now() < end) {
+    if (fn()) return;
+    await wait(20);
+  }
+  throw new Error('timed out waiting');
+}
+
+/* ── a minimal independent sender ─────────────────────────────────────── */
+
+function sessionPkt(cmd, token, ssrc, name) {
+  const n = name == null ? Buffer.alloc(0) : Buffer.from(`${name}\0`);
+  const b = Buffer.alloc(16 + n.length);
+  b.writeUInt16BE(0xffff, 0);
+  b.write(cmd, 2, 'ascii');
+  b.writeUInt32BE(2, 4);
+  b.writeUInt32BE(token, 8);
+  b.writeUInt32BE(ssrc, 12);
+  n.copy(b, 16);
+  return b;
+}
+
+function rtp(ssrc, seq, midiBytes, flags = 0) {
+  const midi = Buffer.from(midiBytes);
+  const b = Buffer.alloc(13 + midi.length);
+  b[0] = 0x80;
+  b[1] = 0x61;
+  b.writeUInt16BE(seq, 2);
+  b.writeUInt32BE(1234, 4);
+  b.writeUInt32BE(ssrc, 8);
+  b[12] = flags | midi.length;
+  midi.copy(b, 13);
+  return b;
+}
+
+/** A sender that accepts invitations (like a Mac session) and can play notes. */
+async function fakeSender(port, name) {
+  const ssrc = 0x0badf00d;
+  const control = dgram.createSocket('udp4');
+  const data = dgram.createSocket('udp4');
+  const peers = [];
+  const syncs = [];
+  let seq = 100;
+  const handle = (sock, which) => (buf, r) => {
+    const cmd = buf.toString('ascii', 2, 4);
+    if (cmd === 'IN') {
+      sock.send(sessionPkt('OK', buf.readUInt32BE(8), ssrc, name), r.port, r.address);
+      if (which === 'data') peers.push({ address: r.address, port: r.port });
+    } else if (cmd === 'CK') {
+      syncs.push(buf[8]);
+      if (buf[8] === 0) {
+        const out = Buffer.from(buf);
+        out.writeUInt32BE(ssrc, 4);
+        out[8] = 1;
+        data.send(out, r.port, r.address);
+      }
+    }
+  };
+  control.on('message', handle(control, 'control'));
+  data.on('message', handle(data, 'data'));
+  await new Promise((r) => control.bind(port, '127.0.0.1', r));
+  await new Promise((r) => data.bind(port + 1, '127.0.0.1', r));
+  return {
+    peers,
+    syncs,
+    note(n, ch = 1) {
+      for (const p of peers) data.send(rtp(ssrc, seq++, [0x90 | (ch - 1), n, 100, 0x00, n, 0]), p.port, p.address);
+    },
+    close() { control.close(); data.close(); },
+  };
+}
+
+function freePort() {
+  return new Promise((resolve) => {
+    const s = dgram.createSocket('udp4');
+    s.bind(0, () => { const p = s.address().port; s.close(() => resolve(p)); });
+  });
+}
+
+/** Two adjacent free UDP ports, as a session needs. */
+async function freePair() {
+  for (let i = 0; i < 20; i++) {
+    const p = await freePort();
+    if (p > 65000) continue;
+    const ok = await new Promise((resolve) => {
+      const s = dgram.createSocket('udp4');
+      s.on('error', () => resolve(false));
+      s.bind(p + 1, () => s.close(() => resolve(true)));
+    });
+    if (ok) return p;
+  }
+  throw new Error('no free port pair');
+}
+
+(async () => {
+  console.log('mapping');
+
+  await test('reads the cue sheet forms', () => {
+    const { rules, errors } = parseMapping([
+      '# comment',
+      '60 = Walk-in',
+      'C3 - Worship 1',
+      '61 release Walk-in',
+      '62\tPause\tWorship 1',
+      '127 release all',
+      'ch2:64 = Message   # only on channel 2',
+      'pc5 = Baptism',
+      'note 66: Go: Song #2',
+      '67 = "Back Lights"',
+      'F#2 = Hazer',
+    ].join('\n'));
+    assert.deepStrictEqual(errors, []);
+    const brief = rules.map((r) => [r.channel, r.kind, r.number, r.action, r.list]);
+    assert.deepStrictEqual(brief, [
+      [null, 'note', 60, 'go', 'Walk-in'],
+      [null, 'note', 60, 'go', 'Worship 1'],
+      [null, 'note', 61, 'release', 'Walk-in'],
+      [null, 'note', 62, 'pause', 'Worship 1'],
+      [null, 'note', 127, 'releaseAll', ''],
+      [2, 'note', 64, 'go', 'Message'],
+      [null, 'program', 5, 'go', 'Baptism'],
+      [null, 'note', 66, 'go', 'Song #2'],
+      [null, 'note', 67, 'go', 'Back Lights'],
+      [null, 'note', 54, 'go', 'Hazer'],
+    ]);
+  });
+
+  await test('middle C naming', () => {
+    assert.strictEqual(noteFromName('C3', 'C3'), 60);
+    assert.strictEqual(noteFromName('C4', 'C4'), 60);
+    assert.strictEqual(noteFromName('C-2', 'C3'), 0);
+    assert.strictEqual(noteFromName('Bb3', 'C3'), 70);
+  });
+
+  await test('bad lines are reported, not fatal', () => {
+    const { rules, errors } = parseMapping('hello\n200 = Big\n61 release\nch17:3 = X\n60 = OK');
+    assert.strictEqual(rules.length, 1);
+    assert.deepStrictEqual(errors.map((e) => e.line), [1, 2, 3, 4]);
+  });
+
+  await test('groups and flashes', () => {
+    const { rules, groups, errors } = parseMapping('5 = Loose\n[Scene]\n0 = Pre Service\n8 = Message\n[Color]\n23 = Blue\n30 flash Blinder Flash 1\n[]\n9 = After');
+    assert.deepStrictEqual(errors, []);
+    assert.deepStrictEqual(groups, ['Scene', 'Color']);
+    assert.deepStrictEqual(rules.map((r) => [r.number, r.group, r.action]), [
+      [5, '', 'go'], [0, 'Scene', 'go'], [8, 'Scene', 'go'], [23, 'Color', 'go'], [30, 'Color', 'flash'], [9, '', 'go'],
+    ]);
+  });
+
+  await test('the NA cue sheet parses cleanly', () => {
+    const fs = require('fs');
+    const path = require('path');
+    const file = path.join(__dirname, '..', '..', '..', 'NA cue sheet.txt');
+    if (!fs.existsSync(file)) return;
+    const { rules, errors, groups } = parseMapping(fs.readFileSync(file, 'utf8'));
+    assert.deepStrictEqual(errors, []);
+    assert.strictEqual(rules.length, 53); // every note marked TRUE for NA in the sheet
+    assert.deepStrictEqual(groups, ['Main', 'Color', 'Blinders', 'Build', 'House', 'Lekos']);
+    assert.strictEqual(new Set(rules.map((r) => r.number)).size, rules.length);
+  });
+
+  await test('matching respects channel and kind', () => {
+    const { rules } = parseMapping('ch2:64 = Two\n64 = Any\npc64 = Program');
+    assert.strictEqual(match(rules, { type: 'noteon', channel: 2, note: 64 }).list, 'Two');
+    assert.strictEqual(match(rules, { type: 'noteon', channel: 1, note: 64 }).list, 'Any');
+    assert.strictEqual(match(rules, { type: 'program', channel: 1, program: 64 }).list, 'Program');
+    assert.strictEqual(match(rules, { type: 'noteoff', channel: 1, note: 64 }), null);
+  });
+
+  console.log('rtp-midi');
+
+  await test('note on + running-status note off', () => {
+    const p = parseRtpMidi(rtp(7, 9, [0x90, 60, 100, 0x00, 60, 0]));
+    assert.strictEqual(p.ssrc, 7);
+    assert.strictEqual(p.seq, 9);
+    assert.deepStrictEqual(p.messages.map(describe), [
+      { type: 'noteon', channel: 1, note: 60, velocity: 100 },
+      { type: 'noteoff', channel: 1, note: 60 },
+    ]);
+  });
+
+  await test('Z flag, multi-byte deltas, program change, sysex in between', () => {
+    const p = parseRtpMidi(rtp(7, 1, [0x05, 0xc2, 4, 0x81, 0x00, 0xf0, 0x7f, 0x01, 0xf7, 0x00, 0x93, 61, 9], 0x20));
+    assert.deepStrictEqual(p.messages.map(describe).filter(Boolean), [
+      { type: 'program', channel: 3, program: 4 },
+      { type: 'noteon', channel: 4, note: 61, velocity: 9 },
+    ]);
+  });
+
+  await test('journal bytes after the command section are ignored', () => {
+    const b = Buffer.concat([rtp(7, 1, [0x90, 62, 1], 0x40), Buffer.from([0x80, 0x00, 0x05, 0x01, 0x02])]);
+    assert.deepStrictEqual(parseRtpMidi(b).messages.map(describe), [{ type: 'noteon', channel: 1, note: 62, velocity: 1 }]);
+  });
+
+  console.log('session');
+
+  await test('invites a sender, keeps sync, and hears its notes', async () => {
+    const senderPort = await freePair();
+    const sender = await fakeSender(senderPort, 'Fake PP');
+    const port = await freePair();
+    const s = new Session({ name: 'Test', port });
+    assert.ok(await s.start());
+    const heard = [];
+    s.on('midi', ({ participant, event }) => heard.push([participant.label, event.type, event.note]));
+    s.invite('127.0.0.1', senderPort, 'ProPresenter');
+    await until(() => s.list().some((p) => p.connected));
+    await until(() => sender.syncs.includes(2)); // we answered its count-1 with a count-2
+    sender.note(60);
+    await until(() => heard.length >= 2);
+    assert.deepStrictEqual(heard, [['ProPresenter', 'noteon', 60], ['ProPresenter', 'noteoff', 60]]);
+    s.stop();
+    sender.close();
+    await wait(80);
+  });
+
+  await test('a config save re-inits on the same port straight away', async () => {
+    const senderPort = await freePair();
+    const sender = await fakeSender(senderPort, 'Fake PP');
+    const port = await freePair();
+    const mod = require('./server');
+    const config = { sessionPort: port, advertise: false, source1: { host: '127.0.0.1', port: senderPort } };
+    let handle = mod.init({ config, log: () => {} });
+    await until(() => handle.health().status === 'ok');
+    handle.stop();
+    handle = mod.init({ config, log: () => {} }); // what the shell does on save: stop(), then init()
+    await until(() => handle.health().status === 'ok');
+    handle.stop();
+    sender.close();
+    await wait(80);
+  });
+
+  await test('a port taken by someone else is reported, then taken once free', async () => {
+    const port = await freePair();
+    const squatter = dgram.createSocket('udp4');
+    await new Promise((r) => squatter.bind(port + 1, r));
+    const s = new Session({ name: 'Test', port });
+    let listening = false;
+    s.on('listening', () => { listening = true; });
+    assert.strictEqual(await s.start(), false);
+    assert.match(s.error, /in use/);
+    squatter.close();
+    await until(() => listening, 5000);
+    assert.strictEqual(s.error, '');
+    s.stop();
+  });
+
+  await test('server entry: notes become live cue lists, over HTTP', async () => {
+    const senderPort = await freePair();
+    const sender = await fakeSender(senderPort, 'Fake PP');
+    const port = await freePair();
+    const mod = require('./server');
+    const handle = mod.init({
+      config: {
+        sessionPort: port,
+        advertise: false,
+        source1Name: 'ProPresenter',
+        source1: { host: '127.0.0.1', port: senderPort },
+        cueLists: '60 = Walk-in\n61 = Worship 1\n70 release Walk-in\n127 release all',
+      },
+      log: () => {},
+    });
+    const routes = mod.routes({});
+    const server = http.createServer((req, res) => {
+      const r = routes[`${req.method} ${req.url}`];
+      if (r) r(req, res); else { res.writeHead(404); res.end(); }
+    });
+    await new Promise((r) => server.listen(0, '127.0.0.1', r));
+    const get = async (path, method = 'GET') => {
+      const res = await fetch(`http://127.0.0.1:${server.address().port}${path}`, { method });
+      return res.json();
+    };
+    const state = async () => (await get('/state')).state;
+
+    await until(() => sender.peers.length > 0);
+    await until(() => handle.health().status === 'ok');
+    sender.note(60);
+    await wait(100);
+    sender.note(61);
+    await wait(100);
+    let st = await state();
+    assert.strictEqual(st.current.name, 'Worship 1');
+    assert.deepStrictEqual(st.active.map((l) => l.name), ['Walk-in']);
+    assert.strictEqual(st.current.source, 'ProPresenter');
+    assert.strictEqual(st.sources[0].connected, true);
+
+    sender.note(70);
+    sender.note(99); // unmapped
+    await wait(150);
+    st = await state();
+    assert.deepStrictEqual(st.active, []);
+    assert.strictEqual(st.log[0].mapped, false);
+    assert.match(st.log[0].trigger, /Note 99/);
+
+    sender.note(127);
+    await wait(100);
+    st = await state();
+    assert.strictEqual(st.current, null);
+
+    sender.note(60);
+    await wait(100);
+    await get('/clear', 'POST');
+    st = await state();
+    assert.strictEqual(st.current, null);
+    assert.strictEqual(st.log[0].action, 'cleared');
+    handle.stop();
+
+    // Groups: a Go replaces its group's live list; the first group is the headline; flashes stay out.
+    const h2 = mod.init({
+      config: {
+        sessionPort: port, advertise: false, source1: { host: '127.0.0.1', port: senderPort },
+        cueLists: '[Scene]\n0 = Pre Service\n8 = Message\n[Color]\n22 = Red\n23 = Blue\n30 flash Blinder Flash 1',
+      },
+      log: () => {},
+    });
+    await until(() => h2.health().status === 'ok');
+    for (const n of [0, 22, 23, 30]) { sender.note(n); await wait(60); }
+    await wait(100);
+    st = await state();
+    assert.strictEqual(st.current.name, 'Pre Service');
+    assert.deepStrictEqual(st.active.map((l) => [l.group, l.name]), [['Color', 'Blue']]); // Blue replaced Red
+    assert.strictEqual(st.log[0].action, 'flash');
+    sender.note(8); // a new main scene takes over the look…
+    await wait(100);
+    st = await state();
+    assert.strictEqual(st.current.name, 'Message');
+    assert.deepStrictEqual(st.active, []);
+    sender.note(22); // …and FX fired after it layer on top again
+    await wait(100);
+    st = await state();
+    assert.deepStrictEqual(st.active.map((l) => l.name), ['Red']);
+    h2.stop();
+
+    server.close();
+    sender.close();
+    await wait(80);
+  });
+
+  console.log(`\n${passed} passed`);
+  process.exit(0);
+})().catch((e) => {
+  console.error(e);
+  process.exit(1);
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "proddash",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "private": true,
   "description": "Modular production dashboard for Waters Church \u2014 zero-dependency Node server + vanilla client",
   "license": "UNLICENSED",

public/shell.js

@@ -188,6 +188,10 @@ function menuItem(label, onClick, { sub = '', danger = false, disabled = false,
 /* ── module registry ────────────────────────────────────────────────── */
 
 let registry = new Map(); // module id -> manifest from GET /api/modules
+/* The installed modules that are not running — disabled, or needing a newer
+   shell — id -> { id, name, reason }, from the same GET. Read for one thing:
+   to say why a tile one of them left in the layout is not drawn. */
+let inactiveModules = new Map();
 
 /** fetch that gives up after `ms`. A request the browser has queued behind
     held connections would otherwise pend forever, and so would anything
@@ -208,6 +212,7 @@ async function loadRegistry() {
     if (!res.ok) throw new Error('modules ' + res.status);
     const body = await res.json();
     registry = new Map((body.modules || []).map((m) => [m.id, m]));
+    inactiveModules = new Map((body.inactive || []).map((m) => [m.id, m]));
     return true;
   } catch {
     return false;
@@ -487,7 +492,9 @@ const GEAR_SVG = '<svg viewBox="0 0 90 90" fill="currentColor" aria-hidden="true
    registry offers them again: a Service timer waits for PCO Plan, a
    transcript for its channel. Never the module's default in their place —
    a wall of "All timers" where five different timers were is worse than
-   five gaps that fill themselves in. */
+   five gaps that fill themselves in. For the one that is not coming back
+   (a module stopped offering that kind of tile) the Layouts menu lists them
+   under Not shown, each with a ✕ — the only way to let its cells go. */
 
 function tileIsOffered(tile) {
   const man = registry.get(tile.module);
@@ -521,6 +528,7 @@ function reconcileOfferedTiles() {
   if (changed) rebuildDividers();
   scheduleOfferedRecheck();
   refreshEmptyState(); // the registry may have gone from nothing to something
+  repaintUnshown(); // a Not shown row goes the moment its tile is drawn again
 }
 
 /* A module's entry list can change without anyone saving admin config: PCO
@@ -540,10 +548,90 @@ function scheduleOfferedRecheck() {
   }, OFFERED_RECHECK_MS);
 }
 
+/** The tiles a layout holds that the board is not showing, each with what
+    to call it and, in a few words, why it is not drawn. */
+function unshownTiles() {
+  return tiles.filter((t) => !tileEls.has(t.id)).map((tile) => {
+    const man = registry.get(tile.module);
+    if (man) {
+      const title = tile.title || (tile.variant ? `${man.name} · ${tile.variant}` : man.name);
+      return { tile, title, reason: 'not offered right now' };
+    }
+    const off = inactiveModules.get(tile.module);
+    if (off) {
+      const reason = off.reason === 'incompatible' ? 'module needs a newer ProdDash' : 'module disabled';
+      return { tile, title: tile.title || off.name || tile.module, reason };
+    }
+    return { tile, title: tile.title || tile.module, reason: 'module not installed' };
+  });
+}
+
 /** The tiles a layout holds that the board is not showing, by name. */
 function unshownTileNames() {
-  return tiles.filter((t) => !tileEls.has(t.id))
-    .map((t) => t.title || registry.get(t.module)?.name || t.module);
+  return unshownTiles().map((u) => u.title);
+}
+
+/* Repaints the Layouts menu's Not shown section while the menu is open —
+   set by unshownSection(), called whenever tiles become offered or stop
+   being, so the list never lags the board behind it. */
+let repaintUnshown = () => {};
+
+/** The Layouts menu's Not shown section: one row per tile the layout holds
+    that the board is not drawing — its name, why in a word or two, and a ✕
+    that removes it — present only while there is one. A tile that waits for
+    its module (a Service timer before PCO Plan is up) is listed but can stay;
+    this exists for the one that will never be back, which would otherwise
+    hold its cells with no control anywhere to let them go. */
+function unshownSection() {
+  const wrap = document.createElement('div');
+  wrap.className = 'menu-unshown';
+  const signature = (list) => list.map((u) => `${u.tile.id}|${u.reason}`).join('\n');
+  let painted = '';
+  const paint = () => {
+    wrap.innerHTML = '';
+    const list = unshownTiles();
+    painted = signature(list);
+    wrap.hidden = !list.length;
+    if (!list.length) return;
+    const divider = document.createElement('div');
+    divider.className = 'menu-divider';
+    const title = document.createElement('div');
+    title.className = 'menu-title';
+    title.textContent = 'Not shown';
+    wrap.append(divider, title);
+    for (const { tile, title: name, reason } of list) {
+      const row = document.createElement('div');
+      row.className = 'menu-item menu-unshown-row';
+      const label = document.createElement('span');
+      label.textContent = name;
+      const sub = document.createElement('span');
+      sub.className = 'sub';
+      sub.textContent = reason;
+      label.appendChild(sub);
+      const remove = document.createElement('button');
+      remove.type = 'button';
+      remove.className = 'menu-x';
+      remove.setAttribute('data-tip', 'Remove');
+      remove.setAttribute('aria-label', `Remove ${name}`);
+      remove.innerHTML = CLOSE_SVG;
+      remove.addEventListener('click', (e) => {
+        // The row goes with the tile, so the click must not reach the
+        // document as one from outside the menu — the menu stays open
+        // to show the next row (or none), as the stepper and Alerts do.
+        e.stopPropagation();
+        removeTile(tile.id); // saves the layout and frees the cells, as a drawn tile's ✕ does
+        paint();
+      });
+      row.append(label, remove);
+      wrap.appendChild(row);
+    }
+  };
+  paint();
+  // Only when something changed: the registry is re-read every few seconds
+  // while a tile is folded away, and rows rebuilt under the pointer for
+  // nothing would lose the tooltip (and the click) the operator was on.
+  repaintUnshown = () => { if (wrap.isConnected && signature(unshownTiles()) !== painted) paint(); };
+  return wrap;
 }
 
 function buildTile(tile) {
@@ -2253,6 +2341,7 @@ wireDropdown('layout-btn', 'layout-menu', async (menu, stillOpen) => {
   // how one is arranged.
   menu.appendChild(gridStepper());
   menu.appendChild(alertsFold());
+  menu.appendChild(unshownSection()); // only while a tile the layout holds is not drawn
   const stepperDivider = document.createElement('div');
   stepperDivider.className = 'menu-divider';
   menu.appendChild(stepperDivider);
@@ -2344,7 +2433,7 @@ wireDropdown('layout-btn', 'layout-menu', async (menu, stillOpen) => {
         const count = `${tiles.length} tile${tiles.length === 1 ? '' : 's'}`;
         const gridNote = COLS !== gridBefore ? ` on a ${COLS}-column grid` : '';
         const note = unshown.length
-          ? `, ${unshown.length} not shown — ${unshown.join(', ')} ${unshown.length === 1 ? 'isn’t' : 'aren’t'} offered right now`
+          ? `, ${unshown.length} not shown — ${unshown.join(', ')} ${unshown.length === 1 ? 'isn’t' : 'aren’t'} offered right now; the Layouts menu can remove ${unshown.length === 1 ? 'it' : 'them'}`
           : '';
         toast(`Loaded “${l.name}”: ${count}${gridNote}${note}`, false, {
           ms: unshown.length ? 10000 : 7000,

public/style.css

@@ -368,6 +368,33 @@ body[data-alert="critical"] .tile.is-tinted {
   text-transform: uppercase;
 }
 
+/* the Layouts menu's Not shown rows: a tile the layout holds but the board
+   is not drawing, why in a word or two, and the ✕ that removes it */
+.menu-unshown[hidden] { display: none; }
+.menu-unshown-row { cursor: default; }
+.menu-unshown-row:hover { background: none; }
+.menu-unshown-row > span:first-child {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.menu-x {
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 22px;
+  height: 22px;
+  background: none;
+  border: none;
+  border-radius: 5px;
+  color: var(--muted);
+  cursor: pointer;
+}
+.menu-x:hover { background: var(--border); color: var(--danger); }
+.menu-x svg { width: 12px; height: 12px; display: block; }
+
 /* ── grid ──────────────────────────────────────────────────────────── */
 
 #gridwrap {

server.js

@@ -2336,8 +2336,17 @@ function handleRequest(req, res) {
 
   /* — shell API — */
   if (urlPath === '/api/modules' && req.method === 'GET') {
+    // Beside what dashboards may load: the installed modules that are not
+    // running, by id and name only, so a tile one of them left in a layout
+    // can say why it is not drawn ("module disabled") instead of guessing at
+    // "not installed". Nothing of their config travels with it.
+    const inactive = [...manifests.keys()].filter((id) => !isActive(id)).map((id) => ({
+      id,
+      name: String(manifests.get(id).name || id),
+      reason: isEnabled(id) ? 'incompatible' : 'disabled',
+    }));
     Promise.all([...manifests.keys()].filter(isActive).map(clientManifest))
-      .then((list) => sendJson(res, 200, { modules: list }))
+      .then((list) => sendJson(res, 200, { modules: list, inactive }))
       .catch((err) => {
         console.error('[proddash] /api/modules failed:', err);
         if (!res.headersSent) sendJson(res, 500, { error: 'Server error.' });

tools/overflow-tap-mock.js

@@ -1,255 +0,0 @@
-/**
- * Mock ProPresenter slide status + mock Overflow Dashboard API, for developing
- * the overflow-tap module without a live ProPresenter or an Overflow account.
- *
- *   node tools/overflow-tap-mock.js [--pp=1602] [--overflow=24720] [--step=4000]
- *                                   [--login=<email>:<password>] [--expire=<seconds>]
- *                                   [--fail-switch] [--slow] [--no-announcements]
- *
- * ProPresenter side (127.0.0.1:1602 by default) — the routes the module uses,
- * with a service that advances every --step ms:
- *   GET /version                      reachability probe
- *   GET /v1/status/slide              { current: { uuid, text, notes }, next }, cycling
- *                                     through slides whose notes carry keywords
- *                                     ("give", "Next steps: connect", "prayer"),
- *                                     slides with other notes ("forgiveness" —
- *                                     must NOT fire "give"), a slide whose
- *                                     keyword is not mapped on the account, and
- *                                     a stretch with nothing live.
- *   GET /v1/announcement/slide_index  the announcement layer: a three-slide
- *                                     document whose index advances every third
- *                                     step; its middle slide carries "events".
- *   GET /v1/announcement/active       that document, groups → slides → notes.
- *                                     --no-announcements answers 404 to both,
- *                                     like an older ProPresenter.
- *
- * Overflow side (127.0.0.1:24720 by default; run ProdDash with
- * OVERFLOW_TAP_API_BASE=http://127.0.0.1:24720) — the Dashboard API the
- * module speaks (see modules/overflow-tap/overflow.js):
- *   POST /nonprofit-dashboard/authentication/login/jwt      any non-empty email +
- *        password signs in (--login=<email>:<password> demands that pair,
- *        answering 401 otherwise); the token expires after --expire seconds
- *        (3600 by default — set 20 to exercise the sign-in-again path). An
- *        @overflow.co email gets a staff token with no nonprofit of its own.
- *   GET  /nonprofit-dashboard/propresenter/nonprofits          staff: the nonprofits
- *   POST /nonprofit-dashboard/propresenter/nonprofits/{id}/select
- *   GET  /nonprofit-dashboard/propresenter/nonprofits/{id}/keywords   four mappings:
- *        give → Give Online (every group), connect → Connect Card (Lobby),
- *        prayer → Prayer Request (every group), events → Events (Lobby, Kids
- *        Wing). "baptism" is deliberately unmapped.
- *   POST /nonprofit-dashboard/propresenter/nonprofits/{id}/keywords?syncNonprofit=true
- *        { keywords } — moves the groups and answers the updated list.
- *        --fail-switch answers 500 instead, to exercise the failure path.
- * Every signed-in call needs a Bearer token this mock issued and has not
- * expired, or it answers 401. --slow adds a two-second delay to every Overflow
- * answer.
- *
- * Every incoming request is logged so we can confirm what the module does.
- */
-'use strict';
-
-const http = require('http');
-const crypto = require('crypto');
-
-const args = process.argv.slice(2);
-const opt = (name, dflt) => {
-  const a = args.find((x) => x.startsWith(`--${name}=`));
-  return a ? a.slice(name.length + 3) : dflt;
-};
-const PP_PORT = Number.parseInt(opt('pp', '1602'), 10);
-const OF_PORT = Number.parseInt(opt('overflow', '24720'), 10);
-const STEP_MS = Number.parseInt(opt('step', '4000'), 10);
-const LOGIN = opt('login', '');
-const EXPIRE_S = Number.parseInt(opt('expire', '3600'), 10);
-const FAIL_SWITCH = args.includes('--fail-switch');
-const SLOW = args.includes('--slow');
-const NO_ANN = args.includes('--no-announcements');
-
-function sendJson(res, code, body, extra = {}) {
-  res.writeHead(code, { 'Content-Type': 'application/json', ...extra });
-  res.end(body === undefined ? '' : JSON.stringify(body));
-}
-
-/* ── ProPresenter ────────────────────────────────────────────────── */
-
-const SLIDES = [
-  { uuid: 'S1', text: 'Welcome to Waters Church', notes: '' },
-  { uuid: 'S2', text: 'Give online', notes: 'give' },
-  { uuid: 'S3', text: 'Amazing grace, how sweet the sound', notes: 'Chorus x2' },
-  { uuid: 'S4', text: 'Fill out a Connect Card', notes: 'Next steps: connect' },
-  { uuid: 'S5', text: 'A sermon on forgiveness', notes: 'forgiveness — do not switch on this' },
-  { uuid: 'S6', text: 'Pray with us', notes: 'prayer' },
-  { uuid: 'S7', text: 'Baptism Sunday', notes: 'baptism' },
-  null, // nothing live
-  { uuid: 'S8', text: 'Give online (again)', notes: 'give' },
-  { uuid: 'S9', text: 'See you next week', notes: '' },
-];
-const ANNOUNCEMENT = {
-  id: { uuid: 'ANN-1', name: 'Announcements', index: 0 },
-  presentation_path: 'Announcements',
-  groups: [
-    { name: 'Loop', slides: [
-      { enabled: true, notes: '', text: 'Welcome', label: '' },
-      { enabled: true, notes: 'events', text: 'Upcoming events', label: '' },
-      { enabled: true, notes: '', text: 'Thanks for coming', label: '' },
-    ] },
-  ],
-};
-let step = 0;
-setInterval(() => { step += 1; }, STEP_MS).unref();
-const slideIdx = () => step % SLIDES.length;
-const annIdx = () => Math.floor(step / 3) % ANNOUNCEMENT.groups[0].slides.length;
-
-function slidePayload() {
-  const cur = SLIDES[slideIdx()];
-  const nxt = SLIDES[(slideIdx() + 1) % SLIDES.length];
-  return {
-    current: cur ? { uuid: cur.uuid, text: cur.text, notes: cur.notes } : null,
-    next: nxt ? { uuid: nxt.uuid, text: nxt.text, notes: nxt.notes } : null,
-  };
-}
-
-http.createServer((req, res) => {
-  const url = new URL(req.url, `http://${req.headers.host}`);
-  const p = url.pathname;
-  console.log(`[pp] ${req.method} ${p}`);
-  if (p === '/version') return sendJson(res, 200, { name: 'Overflow mock', platform: 'mac', host_description: 'ProPresenter 21 (mock)', api_version: 'v1' });
-  if (p === '/v1/status/slide') return sendJson(res, 200, slidePayload());
-  if (p === '/v1/status/layers') return sendJson(res, 200, { slide: Boolean(SLIDES[slideIdx()]), media: false, announcements: !NO_ANN });
-  if (p === '/v1/announcement/slide_index') {
-    if (NO_ANN) return sendJson(res, 404, { error: 'not found' });
-    return sendJson(res, 200, { announcement_index: { index: annIdx(), presentation_id: ANNOUNCEMENT.id } });
-  }
-  if (p === '/v1/announcement/active') {
-    if (NO_ANN) return sendJson(res, 404, { error: 'not found' });
-    return sendJson(res, 200, { announcement: ANNOUNCEMENT });
-  }
-  sendJson(res, 404, { error: 'not found' });
-}).listen(PP_PORT, '127.0.0.1', () => {
-  console.log(`[pp] mock ProPresenter on http://127.0.0.1:${PP_PORT} (slide every ${STEP_MS} ms${NO_ANN ? ', no announcement layer' : ''})`);
-});
-
-/* ── Overflow Dashboard ──────────────────────────────────────────── */
-
-const NONPROFIT = { id: '6710f34fd5061afeec3eab00', name: 'Waters Church (mock)', slug: 'waters-church' };
-const DESTINATIONS = {
-  give: { id: '6710f34fd5061afeec3eab01', name: 'Give Online' },
-  connect: { id: '6710f34fd5061afeec3eab02', name: 'Connect Card' },
-  prayer: { id: '6710f34fd5061afeec3eab03', name: 'Prayer Request' },
-  events: { id: '6710f34fd5061afeec3eab04', name: 'Events' },
-};
-const GROUPS = [
-  { id: '6710f34fd5061afeec3eab11', tapGroupName: 'Auditorium', destinationId: DESTINATIONS.events.id },
-  { id: '6710f34fd5061afeec3eab12', tapGroupName: 'Lobby', destinationId: DESTINATIONS.events.id },
-  { id: '6710f34fd5061afeec3eab13', tapGroupName: 'Kids Wing', destinationId: DESTINATIONS.connect.id },
-];
-const groupRef = (g) => ({ id: g.id, tapGroupName: g.tapGroupName });
-const KEYWORDS = [
-  { id: 'kw1', keyword: 'give', destinationId: DESTINATIONS.give.id, destinationName: DESTINATIONS.give.name, tapGroups: GROUPS.map(groupRef), active: true },
-  { id: 'kw2', keyword: 'connect', destinationId: DESTINATIONS.connect.id, destinationName: DESTINATIONS.connect.name, tapGroups: [groupRef(GROUPS[1])], active: true },
-  { id: 'kw3', keyword: 'prayer', destinationId: DESTINATIONS.prayer.id, destinationName: DESTINATIONS.prayer.name, tapGroups: GROUPS.map(groupRef), active: true },
-  { id: 'kw4', keyword: 'events', destinationId: DESTINATIONS.events.id, destinationName: DESTINATIONS.events.name, tapGroups: [groupRef(GROUPS[1]), groupRef(GROUPS[2])], active: true },
-];
-const stampedKeywords = () => KEYWORDS.map((k) => ({ ...k, nonprofitId: NONPROFIT.id, updatedAt: new Date().toISOString() }));
-
-const tokens = new Map(); // token → { email, exp, nonprofitId }
-
-function issueToken(email) {
-  const staff = email.toLowerCase().endsWith('@overflow.co');
-  const now = Math.floor(Date.now() / 1000);
-  const payload = {
-    id: 'user-1',
-    email,
-    fullName: 'Mock User',
-    role: staff ? 'overflowSupport' : 'orgAdmin',
-    permissions: [{ action: 'manage', subject: 'TAP' }],
-    nonprofits: staff ? [] : [{ id: NONPROFIT.id, name: NONPROFIT.name, slug: NONPROFIT.slug }],
-    iat: now,
-    exp: now + EXPIRE_S,
-  };
-  if (!staff) payload.nonprofitId = NONPROFIT.id;
-  const b64 = (o) => Buffer.from(JSON.stringify(o)).toString('base64url');
-  const token = `${b64({ alg: 'HS256', typ: 'JWT' })}.${b64(payload)}.${crypto.randomBytes(16).toString('base64url')}`;
-  tokens.set(token, { email, exp: payload.exp, nonprofitId: staff ? '' : NONPROFIT.id });
-  return token;
-}
-
-function bearer(req) {
-  const m = /^Bearer\s+(.+)$/.exec(String(req.headers.authorization || ''));
-  if (!m) return null;
-  const t = tokens.get(m[1]);
-  if (!t) return null;
-  if (Date.now() / 1000 >= t.exp) return null;
-  return t;
-}
-
-function readBody(req) {
-  return new Promise((resolve) => {
-    let body = '';
-    req.on('data', (c) => (body += c));
-    req.on('end', () => {
-      try { resolve(JSON.parse(body || '{}')); } catch { resolve(null); }
-    });
-  });
-}
-
-http.createServer(async (req, res) => {
-  const url = new URL(req.url, `http://${req.headers.host}`);
-  const p = url.pathname;
-  const answer = (code, body) => {
-    const go = () => sendJson(res, code, body);
-    if (SLOW) setTimeout(go, 2000);
-    else go();
-  };
-  console.log(`[overflow] ${req.method} ${p}${url.search}`);
-
-  if (req.method === 'POST' && p === '/nonprofit-dashboard/authentication/login/jwt') {
-    const body = await readBody(req);
-    const email = String((body && body.email) || '').trim();
-    const password = String((body && body.password) || '');
-    if (!email || !password) return answer(400, { statusCode: 400, message: 'email and password are required' });
-    if (LOGIN && `${email}:${password}` !== LOGIN) return answer(401, { statusCode: 401, message: 'Invalid email or password' });
-    console.log(`[overflow]   signed in ${email} (token expires in ${EXPIRE_S} s)`);
-    return answer(200, { token: issueToken(email) });
-  }
-
-  const session = bearer(req);
-  if (!session) return answer(401, { statusCode: 401, message: 'Unauthorized' });
-
-  if (req.method === 'GET' && p === '/nonprofit-dashboard/propresenter/nonprofits') {
-    return answer(200, { data: { nonprofits: [NONPROFIT] } });
-  }
-  const sel = /^\/nonprofit-dashboard\/propresenter\/nonprofits\/([^/]+)\/select$/.exec(p);
-  if (req.method === 'POST' && sel) {
-    if (sel[1] !== NONPROFIT.id) return answer(404, { statusCode: 404, message: 'Nonprofit not found' });
-    session.nonprofitId = NONPROFIT.id;
-    return answer(204);
-  }
-  const kw = /^\/nonprofit-dashboard\/propresenter\/nonprofits\/([^/]+)\/keywords$/.exec(p);
-  if (kw) {
-    if (kw[1] !== NONPROFIT.id || session.nonprofitId !== NONPROFIT.id) return answer(403, { statusCode: 403, message: 'Forbidden' });
-    if (req.method === 'GET') return answer(200, stampedKeywords());
-    if (req.method === 'POST') {
-      const body = await readBody(req);
-      const keys = body && Array.isArray(body.keywords) ? body.keywords.map((k) => String(k).toLowerCase().trim()) : [];
-      if (!keys.length) return answer(400, { statusCode: 400, message: 'keywords is required' });
-      if (FAIL_SWITCH) return answer(500, { statusCode: 500, message: 'Internal server error' });
-      for (const k of keys) {
-        const entry = KEYWORDS.find((x) => x.keyword === k);
-        if (!entry) {
-          console.log(`[overflow]   "${k}" is not a mapped keyword — ignored`);
-          continue;
-        }
-        for (const g of entry.tapGroups) {
-          const group = GROUPS.find((x) => x.id === g.id);
-          if (group) group.destinationId = entry.destinationId;
-        }
-        console.log(`[overflow]   ${entry.tapGroups.map((g) => g.tapGroupName).join(', ')} → ${entry.destinationName} (${k})`);
-      }
-      return answer(200, stampedKeywords());
-    }
-  }
-  answer(404, { statusCode: 404, message: `Cannot ${req.method} ${p}` });
-}).listen(OF_PORT, '127.0.0.1', () => {
-  console.log(`[overflow] mock Overflow Dashboard API on http://127.0.0.1:${OF_PORT}${FAIL_SWITCH ? ' (every switch answers 500)' : ''}${LOGIN ? ' (one login accepted)' : ''}${EXPIRE_S < 3600 ? ` (tokens expire after ${EXPIRE_S} s)` : ''}`);
-});

tools/vista-midi-mock.js

@@ -0,0 +1,177 @@
+#!/usr/bin/env node
+'use strict';
+
+/**
+ * A stand-in for the ProPresenter Mac's network MIDI session, for the Vista
+ * Cues module: an RTP-MIDI (AppleMIDI) session that accepts invitations and
+ * plays a cue sheet's notes to everyone in it, the way ProPresenter's MIDI
+ * actions reach Vista.
+ *
+ *   node tools/vista-midi-mock.js 5104             # wait to be invited on UDP 5104/5105
+ *   node tools/vista-midi-mock.js 5104 --invite 127.0.0.1:5040
+ *                                                  # …or invite ProdDash yourself
+ *   --name "Tracks Laptop"   session name (default "ProPresenter Mock")
+ *   --every 4                seconds between cues (default 4)
+ *   --channel 1              MIDI channel (default 1)
+ *   --notes 2,23,8,30        play these notes in a loop instead of the built-in sheet's
+ *
+ * Point Vista Cues' "First sender" at 127.0.0.1 port 5104 and paste the
+ * sheet this prints into "Cue lists". Kill it to watch the tile go red;
+ * start it again to watch it come back.
+ *
+ * Written separately from the module's own rtpmidi.js on purpose, so a bug
+ * there is not mirrored here.
+ */
+
+const dgram = require('dgram');
+
+const argv = process.argv.slice(2);
+const opt = (name, dflt) => {
+  const i = argv.indexOf(`--${name}`);
+  return i >= 0 && argv[i + 1] ? argv[i + 1] : dflt;
+};
+const PORT = Number(argv.find((a) => /^\d+$/.test(a))) || 5104;
+const NAME = opt('name', 'ProPresenter Mock');
+const EVERY = Number(opt('every', 4)) * 1000;
+const CHANNEL = Math.min(16, Math.max(1, Number(opt('channel', 1)))) - 1;
+const INVITE = opt('invite', '');
+
+const SHEET = [
+  '60 = Walk-in',
+  '61 = Worship 1',
+  '62 = Worship 2',
+  '63 = Message',
+  '64 pause Worship 2',
+  '70 release Walk-in',
+  '71 release Worship 1',
+  '127 release all',
+];
+const NOTES = opt('notes', '');
+const SCRIPT = NOTES ? NOTES.split(',').map(Number).filter((n) => n >= 0 && n <= 127) : [60, 61, 70, 62, 64, 64, 71, 90, 63, 127];
+
+const ssrc = (Math.random() * 0xffffffff) >>> 0;
+const t0 = process.hrtime.bigint();
+const now = () => (process.hrtime.bigint() - t0) / 100000n;
+let seq = Math.floor(Math.random() * 0xffff);
+
+const peers = new Map(); // ssrc → { address, controlPort, dataPort, token, name, ready }
+
+function session(cmd, token, name) {
+  const n = name == null ? Buffer.alloc(0) : Buffer.from(`${name}\0`);
+  const b = Buffer.alloc(16 + n.length);
+  b.writeUInt16BE(0xffff, 0);
+  b.write(cmd, 2, 'ascii');
+  b.writeUInt32BE(2, 4);
+  b.writeUInt32BE(token >>> 0, 8);
+  b.writeUInt32BE(ssrc, 12);
+  n.copy(b, 16);
+  return b;
+}
+
+function ck(count, ts) {
+  const b = Buffer.alloc(36);
+  b.writeUInt16BE(0xffff, 0);
+  b.write('CK', 2, 'ascii');
+  b.writeUInt32BE(ssrc, 4);
+  b[8] = count;
+  ts.forEach((t, i) => b.writeBigUInt64BE(BigInt.asUintN(64, t), 12 + i * 8));
+  return b;
+}
+
+/** One RTP-MIDI packet: note on, then (delta 0, running status) the note off. */
+function notePacket(note) {
+  const midi = Buffer.from([0x90 | CHANNEL, note, 100, 0x00, note, 0x00]);
+  const b = Buffer.alloc(12 + 1 + midi.length);
+  b[0] = 0x80;
+  b[1] = 0x61;
+  seq = (seq + 1) & 0xffff;
+  b.writeUInt16BE(seq, 2);
+  b.writeUInt32BE(Number(now() & 0xffffffffn), 4);
+  b.writeUInt32BE(ssrc, 8);
+  b[12] = midi.length; // B=0 J=0 Z=0 P=0, LEN
+  midi.copy(b, 13);
+  return b;
+}
+
+const control = dgram.createSocket('udp4');
+const data = dgram.createSocket('udp4');
+
+function onPacket(sock, which) {
+  return (buf, r) => {
+    if (buf.length < 4 || buf.readUInt16BE(0) !== 0xffff) return;
+    const cmd = buf.toString('ascii', 2, 4);
+    if (cmd === 'IN') {
+      const token = buf.readUInt32BE(8);
+      const them = buf.readUInt32BE(12);
+      const end = buf.indexOf(0, 16);
+      const name = buf.toString('utf8', 16, end < 0 ? buf.length : end);
+      sock.send(session('OK', token, NAME), r.port, r.address);
+      const p = peers.get(them) || { address: r.address, token, name, ready: false };
+      if (which === 'control') p.controlPort = r.port;
+      else { p.dataPort = r.port; p.ready = true; console.log(`[mock] "${name}" joined from ${r.address}`); }
+      peers.set(them, p);
+    } else if (cmd === 'OK') {
+      // Our own invitation (--invite) was accepted.
+      const them = buf.readUInt32BE(12);
+      const end = buf.indexOf(0, 16);
+      const name = buf.toString('utf8', 16, end < 0 ? buf.length : end);
+      if (which === 'control') {
+        pending.stage = 'data';
+        data.send(session('IN', pending.token, NAME), pending.port + 1, pending.host);
+      } else {
+        pending.stage = 'done';
+        peers.set(them, { address: r.address, controlPort: pending.port, dataPort: r.port, token: pending.token, name, ready: true });
+        console.log(`[mock] joined "${name}" at ${r.address}:${pending.port}`);
+      }
+    } else if (cmd === 'BY') {
+      const them = buf.readUInt32BE(12);
+      if (peers.delete(them)) console.log('[mock] a participant left');
+    } else if (cmd === 'CK') {
+      const count = buf[8];
+      const ts = [buf.readBigUInt64BE(12), buf.readBigUInt64BE(20), buf.readBigUInt64BE(28)];
+      if (count === 0) data.send(ck(1, [ts[0], now(), 0n]), r.port, r.address);
+      else if (count === 1) data.send(ck(2, [ts[0], ts[1], now()]), r.port, r.address);
+    }
+  };
+}
+
+const pending = { stage: '', host: '', port: 0, token: 0 };
+
+control.on('message', onPacket(control, 'control'));
+data.on('message', onPacket(data, 'data'));
+control.bind(PORT, () => data.bind(PORT + 1, () => {
+  console.log(`[mock] session "${NAME}" on UDP ${PORT}/${PORT + 1}, channel ${CHANNEL + 1}`);
+  console.log('[mock] cue sheet for Vista Cues → Cue lists:\n  ' + SHEET.join('\n  '));
+  if (INVITE) {
+    const [host, port] = INVITE.split(':');
+    Object.assign(pending, { stage: 'control', host, port: Number(port) || 5040, token: (Math.random() * 0xffffffff) >>> 0 });
+    const tryInvite = () => {
+      if (pending.stage === 'done') return;
+      pending.stage = 'control';
+      control.send(session('IN', pending.token, NAME), pending.port, pending.host);
+      setTimeout(tryInvite, 2000);
+    };
+    tryInvite();
+  }
+}));
+
+// Clock sync, as the session that started it would do (harmless otherwise).
+setInterval(() => {
+  for (const p of peers.values()) if (p.ready) data.send(ck(0, [now(), 0n, 0n]), p.dataPort, p.address);
+}, 10000);
+
+let step = 0;
+setInterval(() => {
+  const ready = [...peers.values()].filter((p) => p.ready);
+  if (!ready.length) return;
+  const note = SCRIPT[step % SCRIPT.length];
+  step += 1;
+  const pkt = notePacket(note);
+  for (const p of ready) data.send(pkt, p.dataPort, p.address);
+  console.log(`[mock] note ${note} → ${ready.length} participant${ready.length === 1 ? '' : 's'}`);
+}, EVERY);
+
+process.on('SIGINT', () => {
+  for (const p of peers.values()) control.send(session('BY', p.token), p.controlPort, p.address);
+  setTimeout(() => process.exit(0), 100);
+});