mirror of
https://github.com/got-feedBack/feedBack.git
synced 2026-08-11 11:19:24 +00:00
* refactor(highway): lift 79 per-instance closure vars into `hwState` (R3c H lift) Collapses createHighway()'s 79 mutable closure `let`s into one per-instance `hwState` object. Scope-resolved rewrite via acorn + eslint-scope: 1059 edits (1057 references + 79 defs - the deleted `let canvas, ctx, ws`), with the four names shadowed in inner scopes (chartTime/ctx/notes/chordTemplates) resolved correctly so only closure-bound refs move. Enables the later module split: extracted renderer/ws modules close over `hwState` as a factory arg, so multi-panel plugins (highway_3d, note_detect, splitscreen) don't share one highway's state. Container is `hwState`, NOT `H` — `H` is already canvas height (70 uses). The frame-time gate caught that collision instantly (0 draws, `H._drawHooks is not iterable` in the shared draw-hook path). PERF (the whole risk): identical to the pre-lift baseline. Draw p50 2.1-2.2 ms, p95 2.7-3.0 ms (pre-lift 2.7-3.2), measured on the Arcturus feedpak, headless. Each closure-slot read became a `hwState.<slot>` monomorphic property load; the hot loop pays nothing. On-device: Byron confirmed the 2D highway plays smoothly. Tests: the ~30 highway JS suites brace-extract functions/patterns from the source; their state references + the monotonic-clock vm sandbox now use `hwState.<slot>` (the const _CHART_MAX_INTERP_MS etc. stay top-level, not lifted). node --test: 1030/1030 green. Two self-inflicted over-replacements caught and reverted (`_lefty` is a prefix of the 3D-local `_leftyCached`; `STRING_COLORS` a suffix of `DEFAULT_STRING_COLORS`) — substring replaces on the brace-extract regexes need word care. Transformer saved at ~/.local/share/feedback-editor/highway-h-lift.mjs. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * test(highway): pin the setNoteStateProvider assertion to hwState._noteStateProvider (CodeRabbit) The [^}]* form matched an unqualified _noteStateProvider =, so a regression to closure-level state could still pass. Require the hwState-qualified assignment. --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
92 lines
4.6 KiB
JavaScript
92 lines
4.6 KiB
JavaScript
// Source-level guard for the renderer-swap canvas reset.
|
|
//
|
|
// Both 3D visualizations are webgl2 renderers, but they paint to
|
|
// different surfaces: the 3D *drum* highway renders directly onto the
|
|
// shared #highway canvas, while the 3D *guitar* highway renders into its
|
|
// own `.h3d-wrap` sibling overlay and never touches #highway. Switching
|
|
// drum -> guitar is webgl2 -> webgl2, so the context-type check alone
|
|
// never replaced the canvas — the last drum frame stayed painted on
|
|
// #highway and bled through the gap the guitar overlay does not cover.
|
|
//
|
|
// The fix replaces the underlying <canvas> on ANY swap to a different
|
|
// renderer instance (not just on a context-type change) so the incoming
|
|
// renderer always starts over a blank surface. These checks lock in the
|
|
// wiring; the createHighway closure owns a WebGL lifecycle too heavy to
|
|
// reproduce in a vm sandbox.
|
|
|
|
const { test } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
|
|
const highwayJs = path.join(__dirname, '..', '..', 'static', 'highway.js');
|
|
|
|
function extractBlock(src, signature) {
|
|
const start = src.indexOf(signature);
|
|
assert.ok(start !== -1, `signature '${signature}' not found`);
|
|
const openBrace = src.indexOf('{', start);
|
|
assert.ok(openBrace !== -1, `opening brace after '${signature}' not found`);
|
|
let depth = 1;
|
|
let i = openBrace + 1;
|
|
while (i < src.length && depth > 0) {
|
|
const ch = src[i];
|
|
if (ch === '{') depth++;
|
|
else if (ch === '}') depth--;
|
|
i++;
|
|
}
|
|
assert.ok(depth === 0, `unbalanced braces after '${signature}'`);
|
|
return src.slice(start, i);
|
|
}
|
|
|
|
test('_setRenderer captures the outgoing renderer before overwriting it', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
const fn = extractBlock(src, 'function _setRenderer(r)');
|
|
// prev must be captured BEFORE _destroyCurrentIfInited and the
|
|
// `_renderer = next` assignment, otherwise the swap detection below
|
|
// would always compare next against itself.
|
|
const prevIdx = fn.search(/const\s+prev\s*=\s*hwState\._renderer/);
|
|
const destroyIdx = fn.search(/_destroyCurrentIfInited\(\)/);
|
|
const assignIdx = fn.search(/^\s*hwState\._renderer\s*=\s*next\s*;/m);
|
|
assert.ok(prevIdx !== -1, 'must capture `const prev = _renderer`');
|
|
assert.ok(destroyIdx !== -1, 'must call _destroyCurrentIfInited');
|
|
assert.ok(assignIdx !== -1, 'must assign `_renderer = next`');
|
|
assert.ok(prevIdx < destroyIdx, 'prev must be captured before _destroyCurrentIfInited');
|
|
assert.ok(prevIdx < assignIdx, 'prev must be captured before `_renderer = next`');
|
|
});
|
|
|
|
test('_setRenderer replaces the canvas on a context-type change OR a viz change', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
const fn = extractBlock(src, 'function _setRenderer(r)');
|
|
// The replace guard must fire on EITHER a context-type change OR a
|
|
// swap to a different visualization. A regression that drops the
|
|
// viz-change clause would let a stale frame bleed through.
|
|
assert.match(
|
|
fn,
|
|
/const\s+_vizChanged\s*=\s*prev\s*&&\s*_rendererVizKey\(next\)\s*!==\s*_rendererVizKey\(prev\)/,
|
|
'_vizChanged must compare _rendererVizKey(next) vs _rendererVizKey(prev), guarded by prev',
|
|
);
|
|
assert.match(
|
|
fn,
|
|
/if\s*\(\s*nextType\s*!==\s*hwState\._currentCanvasContextType\s*\|\|\s*_vizChanged\s*\)\s*\{\s*_replaceCanvas\(nextType\)/,
|
|
'replace guard must be `nextType !== _currentCanvasContextType || _vizChanged`',
|
|
);
|
|
});
|
|
|
|
test('_rendererVizKey keys on the viz id, not object identity (avoids churn on same-viz re-install)', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
const fn = extractBlock(src, 'function _rendererVizKey(r)');
|
|
// Default renderer keys on its singleton; custom renderers key on the
|
|
// viz picker id (pluginId/source) stamped by app.js's _tagVizRenderer,
|
|
// falling back to the object reference only when untagged.
|
|
assert.match(fn, /r\s*===\s*_defaultRenderer/, 'default renderer must key on its own singleton');
|
|
assert.match(fn, /r\.pluginId\s*\|\|\s*r\.source/, 'custom renderers must key on pluginId/source (the viz id)');
|
|
});
|
|
|
|
test('_setRenderer skips the extra replace on first install (prev === null)', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
const fn = extractBlock(src, 'function _setRenderer(r)');
|
|
// The `prev &&` guard avoids a needless swap on the very first install
|
|
// (prev === null) where there is no prior frame to clear.
|
|
assert.match(fn, /_vizChanged\s*=\s*prev\s*&&/, 'must short-circuit _vizChanged when prev is null');
|
|
});
|