mirror of
https://github.com/got-feedBack/feedBack.git
synced 2026-07-22 12:52:29 +00:00
73 bare `highway.x` references -> `window.highway.x`, across app.js and 10 other files. Provably a NO-OP today. It is the precondition for flipping highway.js to a module. ━━━ WHY THIS HAS TO LAND FIRST ━━━ highway.js is a CLASSIC script. Its top-level `const highway = createHighway()` therefore creates a GLOBAL LEXICAL BINDING — visible as a bare name to every other classic script AND to every ES module. 73 call sites quietly rely on that. The moment highway.js becomes a module, that binding is gone. `const` in a module is module-scoped, not global. Every one of those 73 sites becomes a ReferenceError, and the flip is impossible until they say what they mean. `window.highway = highway` is already set, to the same object, on the same line. So this is an identity rewrite — verified in the browser below. ━━━ THE REWRITE BIT ME THREE TIMES. REGEX IS NOT ENOUGH FOR THIS. ━━━ 1. A SHADOWED LOCAL. capabilities/note-detection.js does `const highway = window.highway`. Its 9 bare uses are LOCAL and already correct; a blind rewrite would have emitted `const window.highway = window.highway`. Excluded. 2. HALF-CONVERTED GUARDS — the dangerous one. Six sites read `typeof highway !== 'undefined' && highway && typeof highway.setTime === 'function'`. The regex converted the CONSEQUENT and left the TEST, which is WORSE than not touching them: after the flip `typeof highway` is 'undefined', so each guard is PERMANENTLY FALSE and the code behind it silently never runs. transport.js's was the seek->setTime sync: the chart clock would have quietly desynced after every seek, with nothing failing. All six now test window.highway. 3. TWO MORE BARE REFERENCES, found by Codex [P2] and confirmed by an AST scan: app.js:3114 and :3176 use `highway && typeof window.highway.getSections === 'function'`. My grep searched for `typeof highway`, not `highway &&`. After the flip these throw, the catch swallows it, and the editor silently falls back to a ±4s edit window and arrangement 0. Regex missed a shadow, a half-conversion, and two bare reads. The final check is an AST pass that resolves scopes and reports every `highway` identifier not bound locally. It now reports ZERO. VERIFIED. A/B against origin/main in two browsers, 15 probes, IDENTICAL, zero page errors: window.highway is the same object as the bare global, the whole API surface resolves, a real song plays, the chart clock advances, getPerf().drawMs > 0 — and `seek syncs chart` passes, which is the exact guard I nearly broke in (2). node 1045, pytest 2416, ESLint 0, Codex 0. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
370 lines
18 KiB
JavaScript
370 lines
18 KiB
JavaScript
/*
|
|
* fee[dB]ack v0.3.0 — P22 player chrome.
|
|
*
|
|
* Drives the v3 player overlay (static/v3/index.html #player): the Up-Next
|
|
* section pill, the hover-reveal left icon rail + its feature popovers, the
|
|
* auto-hiding bottom transport, and the speed-level visual (bars + chevrons).
|
|
*
|
|
* Design contract: the actual controls are the SAME legacy elements/handlers
|
|
* (ids unchanged), just relocated into rail popovers — so app.js/window.highway.js
|
|
* keep populating and reacting to them unmodified. This module only adds
|
|
* presentation behavior (open/close, reveal/hide, mirror state). It runs only
|
|
* while #player is the active screen.
|
|
*/
|
|
(function () {
|
|
'use strict';
|
|
|
|
const $ = (id) => document.getElementById(id);
|
|
const player = () => $('player');
|
|
const now = () => (window.performance && performance.now ? performance.now() : (window.__pcNow = (window.__pcNow || 0) + 16));
|
|
|
|
const IDLE_MS = 2500; // transport hides after this much pointer stillness
|
|
const UPNEXT_MS = 160; // throttle the Up-Next recompute (~6 Hz)
|
|
|
|
let rafId = null, running = false;
|
|
let lastMove = 0, lastUpNext = 0;
|
|
let openPop = null; // { btn, pop }
|
|
// Hover state over #player-controls, maintained by mouseenter/mouseleave
|
|
// (wired in start()). tickIdle previously called matches(':hover') every
|
|
// rAF frame, which forces a style recalc — profiled hot (feedBack perf).
|
|
let overControls = false;
|
|
const _onControlsEnter = () => { overControls = true; };
|
|
const _onControlsLeave = () => { overControls = false; };
|
|
// Up-Next pill: cached element refs (re-resolved when detached) and
|
|
// last-written values, so the 6 Hz recompute only touches the DOM when
|
|
// something actually changed — unconditional textContent/width writes
|
|
// re-triggered layout every tick.
|
|
let upnextEls = null; // { pill, nm, eta, fill }
|
|
let upnextLast = { name: null, eta: null, prog: -1, hidden: null };
|
|
|
|
// ── v3 UI signal + plugin-control slot API ───────────────────────────────
|
|
// Lets plugins detect v3 (window.feedBack.uiVersion === 'v3') and mount
|
|
// controls into a stable slot instead of the auto-hiding transport.
|
|
window.feedBack = window.feedBack || {};
|
|
window.feedBack.uiVersion = 'v3';
|
|
window.feedBack.ui = window.feedBack.ui || {};
|
|
window.feedBack.ui.version = 'v3';
|
|
window.feedBack.ui.playerControlSlot = function () { return $('v3-plugin-controls-slot'); };
|
|
|
|
// ── Plugin-control re-homing shim ────────────────────────────────────────
|
|
// Legacy plugins inject controls into #player-controls (now an auto-hiding
|
|
// minimal transport, often via a now-deleted separator anchor). Move any
|
|
// non-native child into the always-reachable Plugins rail popover. Moving a
|
|
// node preserves its identity + listeners, so the plugin's own toggle logic
|
|
// keeps working.
|
|
function updatePluginSlotState() {
|
|
const slot = $('v3-plugin-controls-slot');
|
|
if (!slot) return;
|
|
// Count only controls that are actually shown — plugins inject hidden
|
|
// gear/settings panels (display:none / .hidden) too, which shouldn't
|
|
// inflate the badge.
|
|
const n = Array.prototype.filter.call(slot.children, (el) =>
|
|
el.nodeType === 1 &&
|
|
!el.hasAttribute('hidden') &&
|
|
!(el.classList && el.classList.contains('hidden')) &&
|
|
(el.style ? el.style.display !== 'none' : true)).length;
|
|
const empty = $('v3-plugin-slot-empty');
|
|
if (empty) empty.style.display = n ? 'none' : '';
|
|
const badge = $('v3-plugin-count');
|
|
if (badge) {
|
|
if (n) { badge.textContent = String(n); badge.hidden = false; }
|
|
else { badge.hidden = true; }
|
|
}
|
|
}
|
|
function rehomePluginControls() {
|
|
const bar = $('player-controls');
|
|
const slot = $('v3-plugin-controls-slot');
|
|
if (!bar || !slot) return;
|
|
// Snapshot children first — appendChild mutates the live list.
|
|
Array.prototype.slice.call(bar.children).forEach((el) => {
|
|
if (el.nodeType !== 1 || el.hasAttribute('data-v3-native')) return;
|
|
slot.appendChild(el); // move (identity + listeners preserved)
|
|
});
|
|
updatePluginSlotState();
|
|
}
|
|
function installRehomeObserver() {
|
|
const bar = $('player-controls');
|
|
if (!bar || bar.dataset.pcRehome) return;
|
|
bar.dataset.pcRehome = '1';
|
|
rehomePluginControls(); // initial sweep
|
|
// Only addedNodes matter; our own moves are removals from the bar and
|
|
// never re-trigger a move, so there's no loop.
|
|
try {
|
|
new MutationObserver((muts) => {
|
|
if (muts.some((m) => m.addedNodes && m.addedNodes.length)) rehomePluginControls();
|
|
}).observe(bar, { childList: true });
|
|
} catch (e) { /* MutationObserver always present in target browsers */ }
|
|
// Also watch the slot itself: v3-aware plugins mount controls straight
|
|
// into it (bypassing #player-controls), and plugins show/hide their own
|
|
// controls — both must refresh the badge/empty state.
|
|
const slot = $('v3-plugin-controls-slot');
|
|
if (slot) {
|
|
try {
|
|
new MutationObserver(updatePluginSlotState).observe(slot, {
|
|
childList: true, subtree: true, attributes: true,
|
|
attributeFilter: ['class', 'style', 'hidden'],
|
|
});
|
|
} catch (e) { /* non-fatal */ }
|
|
}
|
|
}
|
|
|
|
// ── Rail popovers ───────────────────────────────────────────────────────
|
|
function setPopOpenFlag(on) {
|
|
const p = player();
|
|
if (p) p.classList.toggle('pop-open', !!on);
|
|
}
|
|
function closePop() {
|
|
if (!openPop) return;
|
|
if (openPop.pop) openPop.pop.classList.add('hidden');
|
|
if (openPop.btn) {
|
|
openPop.btn.setAttribute('aria-expanded', 'false');
|
|
openPop.btn.classList.remove('is-active');
|
|
}
|
|
openPop = null;
|
|
setPopOpenFlag(false);
|
|
}
|
|
function openPopFor(btn) {
|
|
const key = btn.getAttribute('data-rail');
|
|
const pop = $('v3-rail-pop-' + key);
|
|
if (!pop) return;
|
|
if (openPop && openPop.pop === pop) { closePop(); return; } // toggle
|
|
closePop();
|
|
pop.classList.remove('hidden');
|
|
btn.setAttribute('aria-expanded', 'true');
|
|
btn.classList.add('is-active');
|
|
openPop = { btn: btn, pop: pop };
|
|
setPopOpenFlag(true);
|
|
// Lazily mount the P18 audio-routing widget the first time it's shown.
|
|
if (key === 'audio' && window.v3AudioRouting && typeof window.v3AudioRouting.render === 'function') {
|
|
try { window.v3AudioRouting.render($('v3-rail-audio-routing')); } catch (e) { /* non-fatal */ }
|
|
}
|
|
}
|
|
|
|
// Reflect the real highway lyrics state onto the Mic rail icon (lyrics
|
|
// default ON and persist in localStorage, so click-parity would desync).
|
|
function syncLyricsIcon() {
|
|
const rail = $('v3-player-rail');
|
|
const lyr = rail && rail.querySelector('[data-rail-action="lyrics"]');
|
|
if (!lyr) return;
|
|
const on = (window.highway && typeof window.highway.getLyricsVisible === 'function')
|
|
? window.highway.getLyricsVisible()
|
|
: lyr.classList.contains('is-active');
|
|
lyr.classList.toggle('is-active', !!on);
|
|
lyr.setAttribute('aria-pressed', on ? 'true' : 'false');
|
|
}
|
|
function wireRail() {
|
|
const rail = $('v3-player-rail');
|
|
if (!rail || rail.dataset.pcWired) return;
|
|
rail.dataset.pcWired = '1';
|
|
rail.querySelectorAll('[data-rail]').forEach((b) =>
|
|
b.addEventListener('click', (e) => { e.stopPropagation(); openPopFor(b); }));
|
|
// Mic icon: a direct lyrics toggle (clicks the hidden canonical button so
|
|
// window.highway.toggleLyrics() + any label logic runs), mirroring on/off state.
|
|
const lyr = rail.querySelector('[data-rail-action="lyrics"]');
|
|
if (lyr) lyr.addEventListener('click', (e) => {
|
|
e.stopPropagation();
|
|
const real = $('btn-lyrics');
|
|
if (real) real.click(); // runs window.highway.toggleLyrics() via its onclick
|
|
else if (window.highway && typeof window.highway.toggleLyrics === 'function') window.highway.toggleLyrics();
|
|
syncLyricsIcon(); // reflect the ACTUAL toggled state, not click parity
|
|
});
|
|
// Click-outside + Esc close (bound once; harmless when no popover open).
|
|
if (!window.__pcGlobalClose) {
|
|
window.__pcGlobalClose = true;
|
|
document.addEventListener('click', (e) => {
|
|
if (!openPop) return;
|
|
if (openPop.pop.contains(e.target) || openPop.btn.contains(e.target)) return;
|
|
closePop();
|
|
});
|
|
document.addEventListener('keydown', (e) => { if (e.key === 'Escape') closePop(); });
|
|
}
|
|
}
|
|
|
|
// ── Up Next pill ─────────────────────────────────────────────────────────
|
|
function _upnextRefs() {
|
|
// Cache refs; re-resolve only when a node detached (screen re-mount).
|
|
if (!upnextEls || !upnextEls.pill || !upnextEls.pill.isConnected) {
|
|
const pill = $('v3-upnext');
|
|
if (!pill) return null;
|
|
upnextEls = {
|
|
pill,
|
|
nm: $('v3-upnext-name'),
|
|
eta: $('v3-upnext-eta'),
|
|
fill: $('v3-upnext-bar-fill'),
|
|
};
|
|
// Fresh nodes → forget last-written state so everything re-syncs.
|
|
upnextLast = { name: null, eta: null, prog: -1, hidden: null };
|
|
}
|
|
return upnextEls;
|
|
}
|
|
function _upnextSetHidden(els, hidden) {
|
|
if (upnextLast.hidden === hidden) return;
|
|
upnextLast.hidden = hidden;
|
|
els.pill.classList.toggle('hidden', hidden);
|
|
}
|
|
function updateUpNext() {
|
|
const els = _upnextRefs();
|
|
if (!els) return;
|
|
// Gated by the core "Show 'Up Next'" pref (Gameplay tab, default ON).
|
|
if (window.feedBack && window.feedBack.showUpNext === false) { _upnextSetHidden(els, true); return; }
|
|
const hw = window.highway;
|
|
const secs = (hw && typeof hw.getSections === 'function') ? hw.getSections() : null;
|
|
const t = (hw && typeof hw.getTime === 'function') ? hw.getTime() : null;
|
|
if (!Array.isArray(secs) || !secs.length || t == null || isNaN(t)) { _upnextSetHidden(els, true); return; }
|
|
let next = null;
|
|
for (let i = 0; i < secs.length; i++) {
|
|
if (typeof secs[i].time === 'number' && secs[i].time > t + 0.05) { next = secs[i]; break; }
|
|
}
|
|
if (!next) { _upnextSetHidden(els, true); return; }
|
|
const dt = Math.max(0, next.time - t);
|
|
// Coarsened eta (whole seconds from 10 s out, 1 decimal inside) +
|
|
// write-on-change: drops textContent writes (each a layout pass)
|
|
// from ~6/s to ~1/s.
|
|
const name = next.name || '—';
|
|
const etaText = 'in ' + (dt >= 10 ? Math.round(dt) + '' : dt.toFixed(1)) + 's';
|
|
if (els.nm && name !== upnextLast.name) { upnextLast.name = name; els.nm.textContent = name; }
|
|
if (els.eta && etaText !== upnextLast.eta) { upnextLast.eta = etaText; els.eta.textContent = etaText; }
|
|
// Progress bar: fraction of the current section elapsed toward `next`.
|
|
// Previous boundary is the last section at/before now (else song start).
|
|
if (els.fill) {
|
|
let prevT = 0;
|
|
for (let i = 0; i < secs.length; i++) {
|
|
if (typeof secs[i].time === 'number' && secs[i].time <= t) prevT = secs[i].time;
|
|
else break;
|
|
}
|
|
const span = next.time - prevT;
|
|
const prog = span > 0 ? Math.max(0, Math.min(1, (t - prevT) / span)) : 0;
|
|
const q = Math.round(prog * 1000) / 1000;
|
|
if (q !== upnextLast.prog) {
|
|
upnextLast.prog = q;
|
|
// scaleX is compositor-only — width writes re-ran layout.
|
|
// Pairs with transform-origin:left on #v3-upnext-bar-fill.
|
|
els.fill.style.transform = 'scaleX(' + q + ')';
|
|
}
|
|
}
|
|
_upnextSetHidden(els, false);
|
|
}
|
|
|
|
// ── Speed visual (bars + chevrons reflect #speed-slider) ──────────────────
|
|
function updateSpeedViz() {
|
|
const s = $('speed-slider');
|
|
if (!s) return;
|
|
const min = parseFloat(s.min) || 25, max = parseFloat(s.max) || 150;
|
|
const frac = Math.min(1, Math.max(0, (parseFloat(s.value) - min) / (max - min)));
|
|
const bars = document.querySelectorAll('#player-controls .v3-speed-bars i');
|
|
const onBars = Math.round(frac * bars.length);
|
|
bars.forEach((b, i) => b.classList.toggle('on', i < onBars));
|
|
const chev = document.querySelectorAll('#player-controls .v3-chevrons i');
|
|
const onChev = Math.round(frac * chev.length);
|
|
chev.forEach((c, i) => c.classList.toggle('on', i < onChev));
|
|
}
|
|
|
|
// ── Auto-hide transport ───────────────────────────────────────────────────
|
|
function revealChrome() {
|
|
const p = player();
|
|
if (!p) return;
|
|
p.classList.add('chrome-active');
|
|
p.classList.remove('chrome-idle');
|
|
lastMove = now();
|
|
}
|
|
function tickIdle() {
|
|
const p = player();
|
|
if (!p) return;
|
|
const playBtn = $('btn-play');
|
|
const playing = playBtn && playBtn.getAttribute('aria-pressed') === 'true';
|
|
// overControls maintained by mouseenter/mouseleave (see start()) —
|
|
// matches(':hover') here forced a per-frame style recalc.
|
|
// Keep the transport up while paused, hovering it, or a popover is open.
|
|
if (openPop || overControls || !playing) { lastMove = now(); return; }
|
|
if (now() - lastMove > IDLE_MS) {
|
|
p.classList.remove('chrome-active');
|
|
p.classList.add('chrome-idle');
|
|
}
|
|
}
|
|
|
|
// ── rAF loop ──────────────────────────────────────────────────────────────
|
|
function loop() {
|
|
const t = now();
|
|
if (t - lastUpNext >= UPNEXT_MS) {
|
|
lastUpNext = t;
|
|
updateUpNext();
|
|
// Re-sync the lyrics icon so programmatic window.highway.setLyricsVisible()
|
|
// (e.g. from lyrics_karaoke) isn't left stale; cheap + idempotent.
|
|
syncLyricsIcon();
|
|
// Reconcile the edge-driven hover flag against ground truth at
|
|
// this throttled cadence (~6 Hz, not per frame). Covers both
|
|
// failure modes of pure mouseenter/mouseleave tracking: a
|
|
// missed mouseleave (controls hidden/detached under the
|
|
// pointer → flag stuck true, transport never auto-hides) and
|
|
// a re-created #player-controls node whose listeners were
|
|
// lost (flag stuck false-ish / dead). matches(':hover') on a
|
|
// detached node is simply false, so this also self-clears.
|
|
const c = $('player-controls');
|
|
overControls = !!(c && typeof c.matches === 'function' && c.matches(':hover'));
|
|
}
|
|
tickIdle();
|
|
rafId = requestAnimationFrame(loop);
|
|
}
|
|
|
|
// ── Lifecycle ───────────────────────────────────────────────────────────--
|
|
function start() {
|
|
if (running) return;
|
|
const p = player();
|
|
if (!p) return;
|
|
running = true;
|
|
wireRail();
|
|
p.addEventListener('mousemove', revealChrome);
|
|
p.addEventListener('touchstart', revealChrome, { passive: true });
|
|
const c = $('player-controls');
|
|
if (c) {
|
|
overControls = typeof c.matches === 'function' && c.matches(':hover');
|
|
c.addEventListener('mouseenter', _onControlsEnter);
|
|
c.addEventListener('mouseleave', _onControlsLeave);
|
|
}
|
|
const s = $('speed-slider');
|
|
if (s && !s.dataset.pcVizWired) { s.dataset.pcVizWired = '1'; s.addEventListener('input', updateSpeedViz); }
|
|
updateSpeedViz();
|
|
syncLyricsIcon();
|
|
rehomePluginControls(); // sweep controls a plugin injected before/at player open
|
|
revealChrome();
|
|
if (!rafId) loop();
|
|
}
|
|
function stop() {
|
|
if (!running) return;
|
|
running = false;
|
|
if (rafId) { cancelAnimationFrame(rafId); rafId = null; }
|
|
const p = player();
|
|
if (p) {
|
|
p.removeEventListener('mousemove', revealChrome);
|
|
p.removeEventListener('touchstart', revealChrome);
|
|
p.classList.remove('chrome-active', 'chrome-idle');
|
|
}
|
|
const c = $('player-controls');
|
|
if (c) {
|
|
c.removeEventListener('mouseenter', _onControlsEnter);
|
|
c.removeEventListener('mouseleave', _onControlsLeave);
|
|
}
|
|
overControls = false;
|
|
closePop();
|
|
}
|
|
function syncActivation() {
|
|
const p = player();
|
|
if (!p) return;
|
|
if (p.classList.contains('active')) start(); else stop();
|
|
}
|
|
function init() {
|
|
const p = player();
|
|
if (!p) return;
|
|
installRehomeObserver(); // always on, so plugin injections are caught whenever they happen
|
|
try {
|
|
new MutationObserver(syncActivation).observe(p, { attributes: true, attributeFilter: ['class'] });
|
|
} catch (e) { /* MutationObserver always present in target browsers */ }
|
|
syncActivation();
|
|
}
|
|
|
|
// `defer` runs this at readyState 'interactive' — later scripts have not
|
|
// evaluated yet, so wait for DOMContentLoaded (see static/v3/index.html).
|
|
if (document.readyState !== 'complete') document.addEventListener('DOMContentLoaded', init);
|
|
else init();
|
|
})();
|