fix(audio): generate count-down calls ahead of time with Piper so no number is skipped (1.65.3)
This commit is contained in:
1 parent
62ec97c9e9
commit
13f32fc0d6
8 files changed
+53
-8
No files matched your search
@@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm
|
|||||||
|
|
||||||
No changes recorded yet.
|
No changes recorded yet.
|
||||||
|
|
||||||
|
## 1.65.3 - 2026-11-05
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- With the Piper voice, the start count-down went quiet after "10" and came back at "4": each new line takes Piper about a second to generate, so every number was replaced by the next before it was ready. When the count-down starts, its calls ("10" ... "3", the 30 s and minute calls, "starting to the sound of the tone") are now generated ahead of time in the order they are said, and then play at once from the server's cache.
|
||||||
|
|
||||||
## 1.65.2 - 2026-11-05
|
## 1.65.2 - 2026-11-05
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "rc-racecore",
|
"name": "rc-racecore",
|
||||||
"version": "1.65.2",
|
"version": "1.65.3",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "rc-racecore",
|
"name": "rc-racecore",
|
||||||
"version": "1.65.2",
|
"version": "1.65.3",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"better-sqlite3": "^12.11.1",
|
"better-sqlite3": "^12.11.1",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "rc-racecore",
|
"name": "rc-racecore",
|
||||||
"version": "1.65.2",
|
"version": "1.65.3",
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence",
|
"description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence",
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|||||||
+12
-2
@@ -5,7 +5,7 @@ import { getOverlayModeLabel, buildOverlayPanels, renderOverlaySidePanel, render
|
|||||||
|
|
||||||
import { renderSettings, openSettingsTab } from "./settings.js";
|
import { renderSettings, openSettingsTab } from "./settings.js";
|
||||||
import { buildRaceDayQueue, buildRaceDayPreflight, getRaceDriverIds } from "./race_day_logic.js";
|
import { buildRaceDayQueue, buildRaceDayPreflight, getRaceDriverIds } from "./race_day_logic.js";
|
||||||
import { recordTransponderSighting, buildWarmupCheck, createPrologue, getPrologueRemainingMs, holdPrologue, resumePrologue, setPrologueRemaining, takeDuePrologueCall, formatPrologueTime, getPrologueHandoverMs, normalizePrologueSec } from "./prologue_logic.js";
|
import { recordTransponderSighting, buildWarmupCheck, createPrologue, getPrologueRemainingMs, holdPrologue, resumePrologue, setPrologueRemaining, takeDuePrologueCall, formatPrologueTime, getPrologueHandoverMs, normalizePrologueSec, getPrologueMarks } from "./prologue_logic.js";
|
||||||
import { findTransponderConflict, getDriverProfileId } from "./driver_profile_logic.js";
|
import { findTransponderConflict, getDriverProfileId } from "./driver_profile_logic.js";
|
||||||
import { renderRaceDayView, refreshRaceDayWarmup, refreshRaceDayPrologueClock, updateRaceDayStartDisplay, refreshRaceDayLive } from "./race_day_view.js";
|
import { renderRaceDayView, refreshRaceDayWarmup, refreshRaceDayPrologueClock, updateRaceDayStartDisplay, refreshRaceDayLive } from "./race_day_view.js";
|
||||||
import { normalizeRaceDays, getRaceDay, upsertRaceDay, orderDaySessions, buildDaySchedule, getAutopilotAction, moveInDayOrder, pickBoardDate, getDueCall } from "./day_schedule_logic.js";
|
import { normalizeRaceDays, getRaceDay, upsertRaceDay, orderDaySessions, buildDaySchedule, getAutopilotAction, moveInDayOrder, pickBoardDate, getDueCall } from "./day_schedule_logic.js";
|
||||||
@@ -30,7 +30,7 @@ import { getSessionsForEventHelper, getModeLabelHelper, normalizeStartModeHelper
|
|||||||
import { renderEventWorkspaceView } from "./event_workspace_controller.js";
|
import { renderEventWorkspaceView } from "./event_workspace_controller.js";
|
||||||
import { renderEventManagerMarkup } from "./event_manager_view.js";
|
import { renderEventManagerMarkup } from "./event_manager_view.js";
|
||||||
import { renderEventManagerView } from "./event_manager_controller.js";
|
import { renderEventManagerView } from "./event_manager_controller.js";
|
||||||
import { createDefaultAmmcConfigHelper, getManagedWsUrlHelper, loadAmmcConfigFromBackendHelper, saveAmmcConfigToBackendHelper, refreshAmmcStatusHelper, startManagedAmmcHelper, stopManagedAmmcHelper, applyPersistedStateHelper, hydrateFromBackendHelper, scheduleBackendSyncHelper, syncStateToBackendHelper, pingBackendHelper, checkAppVersionHelper, startAppVersionPollingHelper, startOverlaySyncHelper, startBackgroundHydrationHelper, startOverlayRotationHelper, startOverlayLiveRefreshHelper, ensureAudioContextHelper, playPassingBeepHelper, playFinishSirenHelper, playLeaderCueHelper, playStartCueHelper, playBestLapCueHelper, pushOverlayEventHelper, getSpeechVoicesHelper, speakTextHelper, announceRaceStartedHelper, announceRaceFinishedHelper, handleSessionTimerTickHelper, tickClockHelper } from "./runtime_services.js";
|
import { createDefaultAmmcConfigHelper, getManagedWsUrlHelper, loadAmmcConfigFromBackendHelper, saveAmmcConfigToBackendHelper, refreshAmmcStatusHelper, startManagedAmmcHelper, stopManagedAmmcHelper, applyPersistedStateHelper, hydrateFromBackendHelper, scheduleBackendSyncHelper, syncStateToBackendHelper, pingBackendHelper, checkAppVersionHelper, startAppVersionPollingHelper, startOverlaySyncHelper, startBackgroundHydrationHelper, startOverlayRotationHelper, startOverlayLiveRefreshHelper, ensureAudioContextHelper, playPassingBeepHelper, playFinishSirenHelper, playLeaderCueHelper, playStartCueHelper, playBestLapCueHelper, pushOverlayEventHelper, getSpeechVoicesHelper, speakTextHelper, prefetchSpeechHelper, announceRaceStartedHelper, announceRaceFinishedHelper, handleSessionTimerTickHelper, tickClockHelper } from "./runtime_services.js";
|
||||||
import { connectDecoderHelper, disconnectDecoderHelper, processDecoderMessageHelper } from "./decoder_runtime.js";
|
import { connectDecoderHelper, disconnectDecoderHelper, processDecoderMessageHelper } from "./decoder_runtime.js";
|
||||||
import { listPendingSuspectLaps, releaseSettledSuspectLaps } from "./suspect_laps_logic.js";
|
import { listPendingSuspectLaps, releaseSettledSuspectLaps } from "./suspect_laps_logic.js";
|
||||||
import { writeLocalCache } from "./local_cache.js";
|
import { writeLocalCache } from "./local_cache.js";
|
||||||
@@ -317,11 +317,21 @@ function setRacePrologue(next) {
|
|||||||
clearInterval(prologueTimer);
|
clearInterval(prologueTimer);
|
||||||
prologueTimer = racePrologue ? setInterval(tickRacePrologue, 200) : null;
|
prologueTimer = racePrologue ? setInterval(tickRacePrologue, 200) : null;
|
||||||
}
|
}
|
||||||
|
// Piper generates each line the first time it is said, which can take over a second: the
|
||||||
|
// count-down numbers and the start call are generated while the prologue runs, ahead of time.
|
||||||
|
async function prefetchStartCalls(session) {
|
||||||
|
// In the order they are said; marks longer than this prologue are never said.
|
||||||
|
const totalMs = racePrologue?.totalMs || 0;
|
||||||
|
const calls = [...getPrologueMarks(normalizeStartMode(session.startMode)).filter((mark) => mark.ms < totalMs), { event: "start_sequence" }];
|
||||||
|
const lines = await Promise.all(calls.map((call) => raceAudioEngine.resolveText(call.event, call.variables || {}).catch(() => null)));
|
||||||
|
await prefetchSpeechHelper(lines, { state }, { rate: state.settings.raceAudio?.voiceRate });
|
||||||
|
}
|
||||||
function startRacePrologue(session, seconds) {
|
function startRacePrologue(session, seconds) {
|
||||||
if (!session) return;
|
if (!session) return;
|
||||||
if (!seconds) { setRacePrologue(null); launchFromPrologue(session, { countedDown: false }); return; }
|
if (!seconds) { setRacePrologue(null); launchFromPrologue(session, { countedDown: false }); return; }
|
||||||
setRacePrologue(createPrologue(session.id, seconds * 1000));
|
setRacePrologue(createPrologue(session.id, seconds * 1000));
|
||||||
speakPrologue("prologue_start", session, { heat: session.name, time: formatPrologueTime(seconds * 1000, currentLanguage()) });
|
speakPrologue("prologue_start", session, { heat: session.name, time: formatPrologueTime(seconds * 1000, currentLanguage()) });
|
||||||
|
void prefetchStartCalls(session);
|
||||||
renderView();
|
renderView();
|
||||||
}
|
}
|
||||||
function tickRacePrologue() {
|
function tickRacePrologue() {
|
||||||
|
|||||||
@@ -17,6 +17,16 @@ export function isPiperSpeaking() {
|
|||||||
return Boolean(current);
|
return Boolean(current);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Generates lines on the server ahead of time (it caches them), one after another, so a
|
||||||
|
// count-down "10, 9, 8 ..." plays at once instead of each number taking longer than a second.
|
||||||
|
export async function prefetchPiperLines(lines) {
|
||||||
|
for (const line of lines) {
|
||||||
|
try {
|
||||||
|
await fetch("/api/tts/speech", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(line) });
|
||||||
|
} catch { /* playing falls back to the browser voice anyway */ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Returns true when the line was accepted (it will play via Piper or the fallback).
|
// Returns true when the line was accepted (it will play via Piper or the fallback).
|
||||||
export function speakWithPiper(text, { language, voice = "", rate, volume = 1, interrupt, onEnd, onError, fallback }) {
|
export function speakWithPiper(text, { language, voice = "", rate, volume = 1, interrupt, onEnd, onError, fallback }) {
|
||||||
if (current && !interrupt) return false;
|
if (current && !interrupt) return false;
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ function getMarkMs(marker) {
|
|||||||
return unit === "m" ? Number(amount) * 60000 : Number(amount) * 1000;
|
return unit === "m" ? Number(amount) * 60000 : Number(amount) * 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getPrologueMarks(startMode) {
|
export function getPrologueMarks(startMode) {
|
||||||
const marks = [5, 4, 3, 2].map((minutes) => ({ marker: `m${minutes}`, event: "prologue_minutes", variables: { minutes } }));
|
const marks = [5, 4, 3, 2].map((minutes) => ({ marker: `m${minutes}`, event: "prologue_minutes", variables: { minutes } }));
|
||||||
marks.push({ marker: "m1", event: "race_1_minute" });
|
marks.push({ marker: "m1", event: "race_1_minute" });
|
||||||
// IFMAR 4.2.5: from 30 s the cars may be placed in the starting boxes.
|
// IFMAR 4.2.5: from 30 s the cars may be placed in the starting boxes.
|
||||||
|
|||||||
+7
-1
@@ -417,8 +417,14 @@ export function createRaceAudioEngine(options = {}) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The text a call would say, without saying it (to have Piper generate it ahead of time).
|
||||||
|
async function resolveText(key, variables = {}) {
|
||||||
|
const voice = await resolveVoice(key, { variables });
|
||||||
|
return voice ? { text: voice.text, language: voice.language } : null;
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
loadManifest, playEffect, trigger, runStartSequence,
|
loadManifest, playEffect, trigger, runStartSequence, resolveText,
|
||||||
subscribeStartLights(listener) { lightSubscribers.add(listener); listener(lightState, {}); return () => lightSubscribers.delete(listener); },
|
subscribeStartLights(listener) { lightSubscribers.add(listener); listener(lightState, {}); return () => lightSubscribers.delete(listener); },
|
||||||
cancelStartSequence() { startSequenceGeneration += 1; emitLightState("IDLE"); },
|
cancelStartSequence() { startSequenceGeneration += 1; emitLightState("IDLE"); },
|
||||||
dropVoiceGroup(group) { dropQueuedGroup(String(group || "")); },
|
dropVoiceGroup(group) { dropQueuedGroup(String(group || "")); },
|
||||||
|
|||||||
+14
-1
@@ -1,6 +1,6 @@
|
|||||||
import { normalizeSeries } from "./series_logic.js";
|
import { normalizeSeries } from "./series_logic.js";
|
||||||
import { normalizeRaceDays } from "./day_schedule_logic.js";
|
import { normalizeRaceDays } from "./day_schedule_logic.js";
|
||||||
import { speakWithPiper, isPiperSpeaking } from "./piper_speech.js";
|
import { speakWithPiper, isPiperSpeaking, prefetchPiperLines } from "./piper_speech.js";
|
||||||
export function createDefaultAmmcConfigHelper() {
|
export function createDefaultAmmcConfigHelper() {
|
||||||
return {
|
return {
|
||||||
managedEnabled: false,
|
managedEnabled: false,
|
||||||
@@ -389,6 +389,19 @@ export function selectSpeechVoice(voices, voiceUri, language) {
|
|||||||
|| null;
|
|| null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The same voice, language and speed as speakTextHelper below, so the server's cache matches.
|
||||||
|
export function prefetchSpeechHelper(lines, { state }, options = {}) {
|
||||||
|
if (state.settings.ttsEngine !== "piper") return Promise.resolve();
|
||||||
|
return prefetchPiperLines(lines.filter((line) => line?.text).map((line) => {
|
||||||
|
const language = String(line.language || "").toLowerCase().startsWith("sv") ? "sv" : "en";
|
||||||
|
return {
|
||||||
|
text: line.text, language,
|
||||||
|
voice: language === "sv" ? state.settings.ttsVoiceSv : state.settings.ttsVoiceEn,
|
||||||
|
rate: Math.max(0.65, Math.min(1.35, Number(options.rate ?? state.settings.speechRate ?? 0.95) || 0.95)),
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
export function speakTextHelper(text, { state, currentLanguage }, options = {}) {
|
export function speakTextHelper(text, { state, currentLanguage }, options = {}) {
|
||||||
if (!text) return false;
|
if (!text) return false;
|
||||||
if (state.settings.ttsEngine === "piper" && !options.skipPiper) {
|
if (state.settings.ttsEngine === "piper" && !options.skipPiper) {
|
||||||
|
|||||||
Reference in new issue
Block a user