mirror of
https://github.com/got-feedBack/feedBack.git
synced 2026-07-24 13:51:39 +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>
130 lines
8.7 KiB
JavaScript
130 lines
8.7 KiB
JavaScript
// Source-level guards for the per-note judgment hook (feedBack#254):
|
|
// highway.setNoteStateProvider / getNoteStateProvider / getNoteState,
|
|
// bundle.getNoteState, isDefaultRenderer, and the _noteState
|
|
// normalization rules. The createHighway closure owns canvas + WebGL
|
|
// lifecycle that's too heavy for a vm sandbox, so — like the other
|
|
// highway tests in this dir — these lock in the wiring by inspecting
|
|
// the source rather than executing it.
|
|
|
|
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');
|
|
const highway3dJs = path.join(__dirname, '..', '..', 'plugins', 'highway_3d', 'screen.js');
|
|
|
|
// Brace-balanced extraction (same helper shape as highway_visibility.test.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('highway declares the note-state provider slot', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
assert.match(src, /hwState\._noteStateProvider\s*=\s*null/, 'missing _noteStateProvider (provider slot, null = none)');
|
|
});
|
|
|
|
test('public API exposes setNoteStateProvider / getNoteStateProvider / getNoteState / isDefaultRenderer', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
assert.match(src, /setNoteStateProvider\s*\(\s*fn\s*\)\s*\{[^}]*hwState\._noteStateProvider\s*=/, 'setNoteStateProvider must assign _noteStateProvider');
|
|
assert.match(src, /setNoteStateProvider\s*\(\s*fn\s*\)\s*\{[^}]*typeof\s+fn\s*===\s*['"]function['"][^}]*:\s*null/, 'setNoteStateProvider must coerce non-functions (incl. null) to null');
|
|
assert.match(src, /getNoteStateProvider\s*\(\s*\)\s*\{\s*return\s+hwState\._noteStateProvider/, 'getNoteStateProvider must return the slot');
|
|
assert.match(src, /getNoteState\s*\(\s*note\s*,\s*chartTime\s*\)\s*\{\s*return\s+_noteState\s*\(/, 'getNoteState must delegate to _noteState');
|
|
assert.match(src, /isDefaultRenderer\s*\(\s*\)\s*\{\s*return\s+hwState\._renderer\s*===\s*_defaultRenderer\s*\|\|\s*hwState\._renderer\s*==\s*null/, 'isDefaultRenderer must be (_renderer === _defaultRenderer || _renderer == null)');
|
|
});
|
|
|
|
test('_makeBundle exposes getNoteState (stable reference, no per-frame alloc)', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
const fn = extractBlock(src, 'function _makeBundle()');
|
|
// The bundle field must point straight at _noteState — not a fresh
|
|
// arrow each frame (the per-frame allocation the review flagged).
|
|
assert.match(fn, /getNoteState\s*[:=]\s*_noteState\b/, 'bundle.getNoteState must be the stable _noteState reference');
|
|
});
|
|
|
|
test('_makeBundle exposes getNoteStateProvider as a stable reference (feedBack#254)', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
const fn = extractBlock(src, 'function _makeBundle()');
|
|
// Same allocation discipline as getNoteState: highway_3d uses this
|
|
// bundle field to tell "provider attached" from "no provider but
|
|
// getNoteState still exists and returns null", so a per-frame arrow
|
|
// here would both burn allocations on the hot path and could trip
|
|
// identity-based guards in renderer code.
|
|
assert.match(
|
|
fn,
|
|
/getNoteStateProvider\s*[:=]\s*_getNoteStateProvider\b/,
|
|
'bundle.getNoteStateProvider must be the stable _getNoteStateProvider reference (not a per-frame arrow)'
|
|
);
|
|
// Sanity: the stable accessor exists per-createHighway-instance
|
|
// (alongside _noteStateProvider in the closure) and returns the
|
|
// slot, so renderers see a live "is a provider registered?" view.
|
|
assert.match(
|
|
src,
|
|
/function\s+_getNoteStateProvider\s*\(\s*\)\s*\{\s*return\s+hwState\._noteStateProvider\s*;?\s*\}/,
|
|
'_getNoteStateProvider must be defined as a stable named function returning _noteStateProvider'
|
|
);
|
|
});
|
|
|
|
test('_noteState normalizes provider output as documented', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
const fn = extractBlock(src, 'function _noteState(note, chartTime)');
|
|
assert.match(fn, /if\s*\(\s*!hwState\._noteStateProvider\s*\)\s*return\s+null/, 'must short-circuit when no provider is registered');
|
|
assert.match(fn, /try\s*\{[\s\S]*_noteStateProvider\s*\([\s\S]*catch[\s\S]*return\s+null/, 'must call the provider inside try/catch and return null on throw');
|
|
assert.match(fn, /state\s*!==\s*['"]hit['"]\s*&&\s*state\s*!==\s*['"]active['"]\s*&&\s*state\s*!==\s*['"]miss['"]/, 'must reject states other than hit/active/miss');
|
|
assert.match(fn, /Math\.max\(\s*0\s*,\s*Math\.min\(\s*1\s*,\s*raw\.alpha\s*\)\s*\)/, 'must clamp alpha to [0,1]');
|
|
assert.match(fn, /if\s*\(\s*alpha\s*<=\s*0\s*\)\s*return\s+null/, 'must return null when alpha resolves to <= 0');
|
|
assert.match(fn, /const\s+live\s*=\s*\(raw\s*&&\s*typeof\s+raw\s*===\s*['"]object['"]\s*&&\s*raw\.live\s*===\s*true\)/, 'must pass through the provider live flag');
|
|
assert.match(fn, /return\s*\{\s*state\s*,\s*alpha\s*,\s*color\s*,\s*live\s*\}/, 'must return the normalized { state, alpha, color, live }');
|
|
});
|
|
|
|
test('default 2D renderer threads note state into drawNote / drawSustains / chord path', () => {
|
|
const src = fs.readFileSync(highwayJs, 'utf8');
|
|
// drawNote takes the trailing `ns` param.
|
|
assert.match(src, /function\s+drawNote\(\s*W\s*,\s*H\s*,\s*x\s*,\s*y\s*,\s*scale\s*,\s*string\s*,\s*fret\s*,\s*opts\s*,\s*ns\s*\)/, 'drawNote must accept the trailing ns param');
|
|
// drawNotes / drawSustains / drawChords gate the lookup on the provider.
|
|
assert.match(src, /_noteStateProvider\s*\?\s*_noteState\(\s*n\s*,\s*n\.t\s*\)\s*:\s*null/, 'visible-note paths must skip the lookup when no provider is set');
|
|
assert.match(src, /_noteStateProvider\s*\?\s*_noteState\(\s*cn\s*,\s*ch\.t\s*\)\s*:\s*null/, 'chord-note path must key the lookup by the chord time and gate on the provider');
|
|
});
|
|
|
|
test('3D highway captures bundle.getNoteState and overrides legacy hit/miss with the provider verdict', () => {
|
|
const src = fs.readFileSync(highway3dJs, 'utf8');
|
|
assert.match(src, /_ndGetNoteState\s*=\s*\(bundle\s*&&\s*typeof\s+bundle\.getNoteState\s*===\s*['"]function['"]\)\s*\?\s*bundle\.getNoteState\s*:\s*null/, 'update() must capture bundle.getNoteState into _ndGetNoteState');
|
|
// Provider verdict wins: miss => not _showHit; otherwise provider state
|
|
// or the legacy fallback (`hit`) plus the pre-hit ghost window preview.
|
|
assert.match(src, /const\s+_showHit\s*=\s*\(\s*_ndState\s*===\s*['"]miss['"]\s*\)\s*\?\s*false\s*:\s*\(\s*_ndState\s*\?\s*_ndGood\s*:\s*\(\s*hit\s*\|\|\s*\(\s*n\.f\s*>\s*0\s*&&\s*inGhostWin\s*\)\s*\)\s*\)/, '_showHit must honor a provider "miss" and fall back to the hit/ghost heuristic only with no verdict');
|
|
});
|
|
|
|
test('3D highway captures _ndHasProvider via bundle.getNoteStateProvider (feedBack#254)', () => {
|
|
const src = fs.readFileSync(highway3dJs, 'utf8');
|
|
// Detect-mode behavior — verdict-window cull extension, chord-frame
|
|
// hold floor, and the smart drawNote cull — must be gated on a real
|
|
// provider being registered, not on the always-present bundle.
|
|
// getNoteState. Capture via bundle.getNoteStateProvider() with a
|
|
// fallback to the getNoteState-existence check so downlevel hosts
|
|
// (no getNoteStateProvider) still behave as before.
|
|
assert.match(
|
|
src,
|
|
/_ndHasProvider\s*=\s*\(bundle\s*&&\s*typeof\s+bundle\.getNoteStateProvider\s*===\s*['"]function['"]\)[\s\S]{0,80}bundle\.getNoteStateProvider\s*\(\s*\)\s*!=\s*null[\s\S]{0,80}:\s*!!_ndGetNoteState/,
|
|
'update() must derive _ndHasProvider from bundle.getNoteStateProvider() with a fallback to _ndGetNoteState'
|
|
);
|
|
// Verdict-window cull and chord-frame hold floor + smart drawNote
|
|
// cull must all gate on _ndHasProvider (not _ndGetNoteState alone).
|
|
assert.match(src, /ndVerdictT0\s*=\s*_ndHasProvider/, 'ndVerdictT0 outer-loop extension must gate on _ndHasProvider');
|
|
assert.match(src, /if\s*\(\s*_ndHasProvider\s*&&\s*chordTailHoldS\s*<\s*NOTEDETECT_GEM_VERDICT_WINDOW/,
|
|
'chord-frame hold floor must gate on _ndHasProvider');
|
|
assert.match(src, /if\s*\(\s*!_ndHasProvider\s*\|\|\s*dt\s*<\s*-NOTEDETECT_GEM_VERDICT_WINDOW\s*\)\s*return/,
|
|
'drawNote smart-cull provider probe must gate on _ndHasProvider');
|
|
});
|