mirror of
https://github.com/got-feedBack/feedBack.git
synced 2026-07-27 07:13:26 +00:00
* feat(tuner): gate playback until you've tuned — hold autoplay + no-trap Skip/Back/Esc (working-tuning PR 4) When the opt-in auto-open fires because a song needs a different tuning, playback now WAITS behind the tuner instead of starting underneath it — the "tune before you play" model. Built on a new generic core hook window.feedBack.holdAutoplay() (mirrors holdAutoExit): the tuner claims the hold synchronously on song:loading (beating the song:ready autostart) and releases it — or a 12s fail-open backstop does — so a wedged plugin can never strand a song. Generation-guarded; manual Play always wins. No one-way trap: - Skip = "I've tuned" -> plays and records the song's tuning as the instrument's current working tuning (the explicit write-point PR 3 left as 'assumed'). - Back to library / Esc -> leave the song, record nothing (reuses requestExitSong; Esc is the existing player shortcut). - The in-panel x is dropped for an auto-open — Skip/Back/Esc are the dismiss surface. This also keeps the write honest: Skip is the only on-player dismiss that records, so leaving never falsely records a tuning. Stacked on #660 (working-tuning PR 3). Core app.js gains only the generic hook (a test asserts it never references the tuner's internals); shell-agnostic. Needs a desktop smoke-test that the tuner mic doesn't contend with note_detect's scoring input under ASIO/exclusive mode (per the design charrette). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QbexxfTt8q2tAn436MqGWF * fix(tuner): backstop can't cut off tuning + gate race/token hardening (PR #666 review) Review fixes for the autoplay gate: - The 12s fail-open backstop could start playback UNDER a legitimately-open tuner (a slow / mic-verify retune > 12s). holdAutoplay()'s release now carries a .settle() that cancels the backstop; the tuner calls it once the tuner is confirmed open (_gateClaimed), so the hold becomes deliberate and only a dismiss / song switch releases it. (Fail-open still covers "claimed but wedged before deciding".) - The async song:ready handler could release a NEWER song's gate after its await (global _gateClaimed, no guard). It now snapshots _autoOpenGeneration and bails if a newer song took over. - holdAutoplay guarded by song generation, not per-hold — a stale release from an earlier hold could clear a later one. Each hold now mints a unique token that release()/settle() must match. Tests: source-level assertions for the token, settle(), the settle-on-open call, and the song:ready gen-guard. 45 tuner+speed tests green. Codex-reviewed. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: byrongamatos <xasiklas@gmail.com>
200 lines
6.8 KiB
JavaScript
200 lines
6.8 KiB
JavaScript
const { test } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const fs = require('node:fs');
|
|
const path = require('node:path');
|
|
const vm = require('node:vm');
|
|
|
|
const APP_JS = path.join(__dirname, '..', '..', 'static', 'app.js');
|
|
|
|
function extractFunction(src, signature) {
|
|
const start = src.indexOf(signature);
|
|
if (start === -1) throw new Error(`extractFunction: '${signature}' not found in app.js`);
|
|
let scan = start + signature.length;
|
|
if (src[scan] === '(') {
|
|
let parenDepth = 1;
|
|
scan++;
|
|
while (scan < src.length && parenDepth > 0) {
|
|
const ch = src[scan];
|
|
if (ch === '(') parenDepth++;
|
|
else if (ch === ')') parenDepth--;
|
|
scan++;
|
|
}
|
|
}
|
|
const openBrace = src.indexOf('{', scan);
|
|
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++;
|
|
}
|
|
if (depth !== 0) throw new Error(`extractFunction: unbalanced braces after '${signature}'`);
|
|
return src.slice(start, i);
|
|
}
|
|
|
|
function buildSandbox({ juceMode = false } = {}) {
|
|
const elements = new Map();
|
|
const makeElement = (id) => ({
|
|
id,
|
|
value: id === 'speed-slider' ? 135 : '',
|
|
textContent: id === 'speed-label' ? '1.35x' : '',
|
|
style: {},
|
|
});
|
|
for (const id of ['speed-slider', 'speed-label', 'quality-select', 'highway']) {
|
|
elements.set(id, makeElement(id));
|
|
}
|
|
elements.set('speed-presets', {
|
|
id: 'speed-presets',
|
|
querySelectorAll() { return []; },
|
|
});
|
|
const backingCalls = [];
|
|
const sliderInputs = [];
|
|
const audio = {
|
|
playbackRate: 1.35,
|
|
pause() {},
|
|
};
|
|
const jucePlayer = {
|
|
_speed: 1.35,
|
|
setRate(rate) { this._speed = rate; },
|
|
stop() { return Promise.resolve(); },
|
|
};
|
|
const sandbox = {
|
|
console: { log() {}, warn() {}, error() {} },
|
|
audio,
|
|
jucePlayer,
|
|
highway: {
|
|
stop() {},
|
|
init() {},
|
|
connect(url) { sandbox.__connectedUrl = url; },
|
|
getRenderScale: () => 1,
|
|
},
|
|
window: {
|
|
_juceMode: juceMode,
|
|
_juceAudioUrl: juceMode ? '/audio/old-song.ogg' : null,
|
|
_currentSongAudio: { url: '/audio/old-song.ogg' },
|
|
_clearJuceRerouteMemo() {},
|
|
feedBack: {
|
|
isPlaying: true,
|
|
emit() {},
|
|
},
|
|
feedBackDesktop: {
|
|
audio: {
|
|
setBackingSpeed(rate) {
|
|
backingCalls.push(['setBackingSpeed', rate]);
|
|
return Promise.resolve();
|
|
},
|
|
setBackingPreservePitch(value) {
|
|
backingCalls.push(['setBackingPreservePitch', value]);
|
|
return Promise.resolve();
|
|
},
|
|
},
|
|
},
|
|
},
|
|
document: {
|
|
getElementById(id) {
|
|
if (!elements.has(id)) elements.set(id, makeElement(id));
|
|
return elements.get(id);
|
|
},
|
|
querySelector(selector) {
|
|
if (selector === '.screen.active') return { id: 'home' };
|
|
return null;
|
|
},
|
|
},
|
|
location: {
|
|
protocol: 'http:',
|
|
host: 'localhost:9999',
|
|
},
|
|
URLSearchParams,
|
|
setTimeout(fn) { fn(); return 0; },
|
|
clearTimeout() {},
|
|
Promise,
|
|
decodeURIComponent,
|
|
__elements: elements,
|
|
__backingCalls: backingCalls,
|
|
__sliderInputs: sliderInputs,
|
|
};
|
|
sandbox.window.jucePlayer = jucePlayer;
|
|
sandbox.handleSliderInput = (el) => {
|
|
if (el) sliderInputs.push(el.id);
|
|
};
|
|
vm.createContext(sandbox);
|
|
return sandbox;
|
|
}
|
|
|
|
function extractConstLine(src, name) {
|
|
const match = src.match(new RegExp(`const ${name} = [^;]+;`));
|
|
if (!match) throw new Error(`extractConstLine: '${name}' not found in app.js`);
|
|
return match[0];
|
|
}
|
|
|
|
function loadPlaySong(sandbox) {
|
|
const src = fs.readFileSync(APP_JS, 'utf8');
|
|
const resetHelper = src.includes('function _resetPlaybackSpeedForNewSong')
|
|
? extractFunction(src, 'function _resetPlaybackSpeedForNewSong')
|
|
: '';
|
|
const speedPresetHelpers = src.includes('function _updateSpeedPresetButtons')
|
|
? `
|
|
${extractConstLine(src, 'SPEED_PRESET_PCTS')}
|
|
${extractConstLine(src, 'SPEED_SNAP_THRESHOLD')}
|
|
${extractFunction(src, 'function _speedPresetPctFromActive')}
|
|
${extractFunction(src, 'function _updateSpeedPresetButtons')}
|
|
`
|
|
: '';
|
|
const code = `
|
|
var artAbortController = null;
|
|
var isPlaying = true;
|
|
var currentFilename = null;
|
|
var _playerOriginScreen = null;
|
|
var _pendingAutostart = false;
|
|
function _clearAutoExit() {}
|
|
function _clearAutoplayHold() {}
|
|
function _resolvePlayerOrigin() { return 'home'; }
|
|
function _recordPlaybackBridge() {}
|
|
function _cancelCountIn() {}
|
|
function _resetJuceAudioShimChain() {}
|
|
function _resetAudioSeekState() {}
|
|
function setPlayButtonState() {}
|
|
function clearLoop() {}
|
|
function _resetSectionPracticeLog() {}
|
|
function _hideSectionPracticeBar() {}
|
|
function showScreen() {}
|
|
function _getArrangementNamingMode() { return 'default'; }
|
|
function _scheduleSectionPracticeRetries() {}
|
|
function loadSavedLoops() {}
|
|
function _songEventPayload() { return { time: 7, audioT: 7, chartT: 7, perfNow: 7 }; }
|
|
${extractFunction(src, 'function setSpeed')}
|
|
${speedPresetHelpers}
|
|
${resetHelper}
|
|
${extractFunction(src, 'async function playSong')}
|
|
globalThis.__playSong = playSong;
|
|
`;
|
|
vm.runInContext(code, sandbox);
|
|
}
|
|
|
|
test('new song load resets the HTML audio rate, not only the visible speed controls', async () => {
|
|
const sandbox = buildSandbox();
|
|
loadPlaySong(sandbox);
|
|
|
|
await sandbox.__playSong('next-song.archive');
|
|
|
|
assert.equal(sandbox.__elements.get('speed-slider').value, 100);
|
|
assert.match(sandbox.__elements.get('speed-label').textContent, /^1\.0{1,2}x$/);
|
|
assert.equal(sandbox.audio.playbackRate, 1);
|
|
assert.deepEqual(sandbox.__sliderInputs, ['speed-slider']);
|
|
});
|
|
|
|
test('new song load resets the desktop backing rate when the API is available', async () => {
|
|
const sandbox = buildSandbox({ juceMode: true });
|
|
loadPlaySong(sandbox);
|
|
|
|
await sandbox.__playSong('next-song.archive');
|
|
await new Promise((resolve) => setImmediate(resolve));
|
|
|
|
assert.equal(sandbox.jucePlayer._speed, 1);
|
|
assert.deepEqual(sandbox.__backingCalls, [
|
|
['setBackingSpeed', 1],
|
|
['setBackingPreservePitch', true],
|
|
]);
|
|
});
|