diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a1b5ff..3acf3a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.55.0 - 2026-11-03 + +### Changed + +- The start and the end of a race now sound an air horn instead of a short beep (`start_horn.wav`, and `finish_horn.wav` with two short blasts and a long one). The old sounds are still in the sound pack. +- The count-down before a grid start counts "10, 9, 8 … 3" (it said "Ten seconds to start" before 9). After "3" it is quiet; the start lights come on and the horn sounds 1-3 s later (IFMAR 4.2.6). It used to take up to about 5.5 s. A flying start still gets "Ten seconds to start". + ## 1.54.2 - 2026-11-03 ### Fixed diff --git a/README.md b/README.md index b6e6183..34cc23e 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Swedish version: [README.sv.md](README.sv.md) · Changes: [CHANGELOG.md](CHANGEL ## Highlights - **Race Day page** with heat queue, preflight checks and one-click start. -- **Start procedure as in EFRA/IFMAR:** a count-down with announcements (2 min, 1 min, 30 s, 10 s, 9..3), hold for the grid, flying start for qualifying, and grid start with lights and a random start signal for finals. +- **Start procedure as in EFRA/IFMAR:** a count-down with announcements (2 min, 1 min, 30 s, 10, 9 … 3), hold for the grid, flying start for qualifying, and grid start with lights and a horn 1-3 s after "3" for finals. The start and the end of a race are signalled with an air horn. - **Transponder check** during the count-down: a green tick for every driver seen, and a wrong transponder fixed in one click. - **Qualifying and finals:** generated from the entry list with evenly split heats, A/B/C finals, bump-ups, points tables, tie-breaks and a drag-and-drop grid. - **Series / cup:** a points table, best N or drop X, a club-members-only option, standings per class, and each round run from the series page. @@ -119,7 +119,7 @@ The menu follows how a race day works: **Start** (Dashboard, Race Day), **Create - **During the count-down:** - The track is open. - The announcer calls "Heat 3 starts in 2 minutes", then every minute, 30 s and 10 s. - - For a grid start it also calls "cars to the grid" at 30 s and counts 9..3. + - For a grid start it also calls "cars to the grid" at 30 s and counts "10, 9 … 3" second by second. - **Buttons:** - **Hold** (while cars are put on the grid) and **Resume**. - **+1 min**. @@ -128,7 +128,7 @@ The menu follows how a race day works: **Start** (Dashboard, Race Day), **Create - **Go now**, which warns about drivers not seen. - **Cancel**. - **When the count-down runs out the heat starts by itself.** - - **Grid start** (mass/position): start lights and a random 0-5 s start signal. + - **Grid start** (mass/position): after "3" it is quiet; the start lights come on and the horn sounds 1-3 s later (IFMAR 4.2.6). - **Flying start** (default for qualifying): the signal and "Clock is running". Each car's clock starts at its own first crossing, and a late car's clock starts at the latest 150 % of a lap (EFRA 9.3). - **Staggered start:** cars are called out one by one. - **Transponder check:** every driver in the heat gets a green tick when their transponder crosses during the count-down. A missing driver's transponder can be changed in the panel, or linked to an unknown transponder that just crossed. diff --git a/README.sv.md b/README.sv.md index edfbf73..26e6f4f 100644 --- a/README.sv.md +++ b/README.sv.md @@ -33,7 +33,7 @@ English version: [README.md](README.md) · Ändringar: [CHANGELOG.md](CHANGELOG. ## Höjdpunkter - **Race Day-sida** med heat-kö, förkontroll och start med ett klick. -- **Startförfarande som i EFRA/IFMAR:** nedräkning med utrop (2 min, 1 min, 30 s, 10 s, 9..3), paus medan bilarna ställs upp, flygande start för kval och gridstart med startljus och slumpad startsignal för finaler. +- **Startförfarande som i EFRA/IFMAR:** nedräkning med utrop (2 min, 1 min, 30 s, 10, 9 … 3), paus medan bilarna ställs upp, flygande start för kval och gridstart med startljus och tuta 1-3 s efter "3" för finaler. Start och målgång signaleras med en tryckluftstuta. - **Transponderkontroll** under nedräkningen: grön bock för varje förare som passerat, och fel transponder rättas med ett klick. - **Kval och finaler:** skapas från deltagarlistan med jämnt fördelade heat, A/B/C-finaler, bump-up, poängtabeller, tie-break och grid med dra-och-släpp. - **Serie / cup:** poängtabell, bästa N eller stryk X, val för endast klubbmedlemmar, ställning per klass och varje deltävling sköts från seriesidan. @@ -132,7 +132,7 @@ Gränssnittet finns på svenska och engelska. - **Under nedräkningen:** - Banan är öppen. - Speakern ropar "Heat 3 startar om 2 minuter", sedan varje minut, 30 s och 10 s. - - Vid gridstart ropar den dessutom "bilarna till startplatsen" vid 30 s och räknar 9..3. + - Vid gridstart ropar den dessutom "bilarna till startplatsen" vid 30 s och räknar "10, 9 … 3" sekund för sekund. - **Knappar:** - **Pausa** (medan bilarna ställs upp) och **Fortsätt**. - **+1 min**. @@ -141,7 +141,7 @@ Gränssnittet finns på svenska och engelska. - **Go nu**, som varnar om förare som inte setts. - **Avbryt**. - **När tiden går ut startar heatet av sig självt.** - - **Gridstart** (mass/position): startljus och en slumpad startsignal inom 0-5 s. + - **Gridstart** (mass/position): efter "3" är det tyst; startljusen tänds och tutan går 1-3 s senare (IFMAR 4.2.6). - **Flygande start** (standard för kval): signalen och "Klockan går". Varje bils tid startar vid dess första passering, och en sen bil får klockan startad senast efter 150 % av ett varv (EFRA 9.3). - **Staggered start:** bilarna ropas ut en och en. - **Transponderkontroll:** varje förare i heatet får en grön bock när transpondern passerar under nedräkningen. Saknas någon kan transpondern bytas direkt i panelen, eller kopplas till en okänd transponder som just passerat. diff --git a/package-lock.json b/package-lock.json index 8150107..a38ba30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.54.2", + "version": "1.55.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.54.2", + "version": "1.55.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 38f2b49..5f32d18 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.54.2", + "version": "1.55.0", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/rc-race-sound-pack/README.md b/rc-race-sound-pack/README.md index 7d60168..ab3d5ec 100644 --- a/rc-race-sound-pack/README.md +++ b/rc-race-sound-pack/README.md @@ -25,7 +25,7 @@ Keep announcements dry (no reverb) so they remain intelligible over RC cars and 1. Play `drivers_ready` 2. Play `start_phrase` 3. Wait a random 1–4 seconds -4. Play `effects/start_beep.wav` +4. Play `effects/start_horn.wav` (an air horn; `start_beep.wav` is kept as an alternative) 5. Start race timing on the tone ## Integration diff --git a/rc-race-sound-pack/sound_manifest.json b/rc-race-sound-pack/sound_manifest.json index 241b94f..0bc4cab 100644 --- a/rc-race-sound-pack/sound_manifest.json +++ b/rc-race-sound-pack/sound_manifest.json @@ -2,10 +2,10 @@ "format": { "sample_rate": 48000, "channels": 1, "pcm": "16-bit", "recommended_runtime_gain_db": -6 }, "effects": [ "fastest_lap_trophy.wav", "final_lap.wav", "personal_best.wav", "position_gain.wav", "position_loss.wav", - "race_finish.wav", "start_beep.wav", "track_record_fanfare.wav", "transponder_pass.wav", "warning.wav" + "finish_horn.wav", "race_finish.wav", "start_beep.wav", "start_horn.wav", "track_record_fanfare.wav", "transponder_pass.wav", "warning.wav" ], "events": { - "start_tone": { "effect": "effects/start_beep.wav" }, + "start_tone": { "effect": "effects/start_horn.wav" }, "transponder_pass": { "effect": "effects/transponder_pass.wav" }, "transponder_detected": { "effect": "effects/transponder_pass.wav" }, "training_stable_pace": { "voice": "training_stable_pace" }, @@ -17,8 +17,8 @@ "position_gain": { "effect": "effects/position_gain.wav" }, "position_loss": { "effect": "effects/position_loss.wav" }, "final_lap": { "effect": "effects/final_lap.wav" }, - "race_finished": { "effect": "effects/race_finish.wav" }, - "qualifying_finished": { "effect": "effects/race_finish.wav" }, + "race_finished": { "effect": "effects/finish_horn.wav" }, + "qualifying_finished": { "effect": "effects/finish_horn.wav" }, "race_winner": { "effect": "effects/fastest_lap_trophy.wav" }, "heat_winner": { "effect": "effects/fastest_lap_trophy.wav" }, "overall_winner": { "effect": "effects/fastest_lap_trophy.wav" }, @@ -108,7 +108,7 @@ "runtime": { "start_delay_seconds": { "min": 1.0, "max": 4.0, "randomize": true }, "passing_sound": "effects/transponder_pass.wav", "passing_sound_pool": ["pass_01.wav", "pass_02.wav", "pass_03.wav", "pass_04.wav", "pass_05.wav", "pass_06.wav", "pass_07.wav", "pass_08.wav"], - "start_sound": "effects/start_beep.wav", "fastest_lap_sound": "effects/fastest_lap_trophy.wav", - "track_record_sound": "effects/track_record_fanfare.wav", "finish_sound": "effects/race_finish.wav" + "start_sound": "effects/start_horn.wav", "fastest_lap_sound": "effects/fastest_lap_trophy.wav", + "track_record_sound": "effects/track_record_fanfare.wav", "finish_sound": "effects/finish_horn.wav" } } diff --git a/rc-race-sound-pack/sounds/effects/finish_horn.wav b/rc-race-sound-pack/sounds/effects/finish_horn.wav new file mode 100644 index 0000000..8445422 Binary files /dev/null and b/rc-race-sound-pack/sounds/effects/finish_horn.wav differ diff --git a/rc-race-sound-pack/sounds/effects/start_horn.wav b/rc-race-sound-pack/sounds/effects/start_horn.wav new file mode 100644 index 0000000..a4acf92 Binary files /dev/null and b/rc-race-sound-pack/sounds/effects/start_horn.wav differ diff --git a/src/app.js b/src/app.js index 112987f..4777cd7 100644 --- a/src/app.js +++ b/src/app.js @@ -2818,7 +2818,7 @@ const TRANSLATIONS = { "guide.race_day_7": "7. Session replay i Tidtagning spelar upp sparade passeringar i ett isolerat testläge. Välj session, ladda och kör i 1x, 2x, 5x eller 10x utan att ändra originalresultat eller träningsstatistik.", "guide.race_day_8": "8. Redan när du registrerar eller ändrar en förare under Förare varnar systemet om transpondern redan används av en annan förare (t.ex. i fel klass) och namnger vem - ett komplement till förkontrollens kontroll av dubbla transpondrar inom samma heat. Samma person som kör flera klasser med sin egen transponder flaggas aldrig.", "guide.race_day_9": "9. Kör ni på ett nät där fler har åtkomst (t.ex. arenans WiFi)? Slå på Admin-PIN under Inställningar -> System & backup. Då kräver alla ändringar PIN - resultat, inställningar och uppdatering - medan visning och publika overlay-/träningslänkar fungerar som vanligt. Varje webbläsare loggar in en gång och kommer ihåg det i 30 dagar.", - "guide.race_day_10": "10. Start med nedräkning (som EFRA/IFMAR): välj längd (Go, 30 s, 1, 1:30, 2, 3 eller 5 min - standard per tävling under Race Setup) och tryck Starta. Banan är öppen, speakern ropar ut tiden (varje minut, 30 s, 10 s; vid gridstart även \"bilarna till startplatsen\" vid 30 s och 9..3). Pausa medan bilarna ställs upp, +1 min, Till 30 s (omstart av gridet), Till 10 s, Go nu eller Avbryt. När tiden går ut startar heatet av sig själv: gridstart får startljus och slumpad signal, flygande start ger signalen och \"Klockan går\". Transponderkontrollen visar grön bock för alla som passerat sedan nedräkningen började - saknas någon, byt transponder direkt i panelen eller välj en okänd transponder som passerat. Go nu varnar om någon inte setts.", + "guide.race_day_10": "10. Start med nedräkning (som EFRA/IFMAR): välj längd (Go, 30 s, 1, 1:30, 2, 3 eller 5 min - standard per tävling under Race Setup) och tryck Starta. Banan är öppen, speakern ropar ut tiden (varje minut, 30 s, 10 s; vid gridstart även \"bilarna till startplatsen\" vid 30 s och 10, 9 … 3). Pausa medan bilarna ställs upp, +1 min, Till 30 s (omstart av gridet), Till 10 s, Go nu eller Avbryt. När tiden går ut startar heatet av sig själv: gridstart får tystnad efter \"3\", startljus och tutan 1-3 s senare, flygande start ger signalen och \"Klockan går\". Transponderkontrollen visar grön bock för alla som passerat sedan nedräkningen började - saknas någon, byt transponder direkt i panelen eller välj en okänd transponder som passerat. Go nu varnar om någon inte setts.", "guide.race_day_11": "11. Dagens schema (längst ned på Race Day) visar alla klasser den dagen i en körordning med tider. Ange första start och paus mellan heaten; ▲▼ ändrar ordningen. Ett heat som startar sent eller pausas flyttar resten av dagen. 🖨 Skriv ut körordning ger en lista med tider och förare att sätta upp på tavlan, och 📺 Förarvy (/public-overlay/schedule) visar förarna nästa heat och vilka som kör. Upprop: när ett heat har 10 minuter kvar (ändras under Upprop) frågar Race Day om du vill ropa upp det – 📢 Ropa ut läser upp heatet och förarna i högtalarna och markerar det Uppropad i förarvyn; Senare frågar igen om 2 minuter. ▶ Kör dagen automatiskt startar varje heats nedräkning själv när det är dags och ropar då upp heaten själv (den här webbläsaren måste vara öppen); ■ Stoppa automatiken låter dig köra för hand och sedan slå på den igen; ⏸ Pausa dagen pausar heatet på banan och automatiken tills du fortsätter.", "guide.dashboard_title": "Schemaavvikelse på Översikt", "guide.dashboard_1": "Översikt visar nu skillnaden mellan planerad tid och faktisk körtid för alla startade sessioner.", @@ -4777,7 +4777,7 @@ const TRANSLATIONS = { "guide.race_day_7": "7. Session replay in Timing replays saved passings in an isolated test mode. Select a session, load it, and run at 1x, 2x, 5x, or 10x without modifying source results or training statistics.", "guide.race_day_8": "8. Already when you register or edit a driver under Drivers, the system warns if the transponder is already used by a different driver (e.g. in the wrong class) and names who - a complement to the preflight's duplicate-transponder check within a single heat. The same person racing multiple classes on their own transponder is never flagged.", "guide.race_day_9": "9. Running on a network others can reach (e.g. the venue WiFi)? Turn on the Admin PIN under Settings -> System & backup. Every change then needs the PIN - results, settings and updates - while viewing and public overlay/training links work as usual. Each browser logs in once and is remembered for 30 days.", - "guide.race_day_10": "10. Start with a count-down (as EFRA/IFMAR): pick a length (Go, 30 s, 1, 1:30, 2, 3 or 5 min - the default per event is set in Race Setup) and press Start. The track is open and the announcer calls the time (every minute, 30 s, 10 s; for a grid start also \"cars to the grid\" at 30 s and 9..3). Hold while cars are placed on the grid, +1 min, To 30 s (grid restart), To 10 s, Go now or Cancel. When the time runs out the heat starts by itself: a grid start gets the start lights and a random signal, a flying start gets the signal and \"Clock is running\". The transponder check shows a green tick for everyone who has crossed since the count-down began - if someone is missing, change their transponder right in the panel or pick an unknown transponder that crossed. Go now warns if someone wasn't seen.", + "guide.race_day_10": "10. Start with a count-down (as EFRA/IFMAR): pick a length (Go, 30 s, 1, 1:30, 2, 3 or 5 min - the default per event is set in Race Setup) and press Start. The track is open and the announcer calls the time (every minute, 30 s, 10 s; for a grid start also \"cars to the grid\" at 30 s and 10, 9 … 3). Hold while cars are placed on the grid, +1 min, To 30 s (grid restart), To 10 s, Go now or Cancel. When the time runs out the heat starts by itself: a grid start gets quiet after \"3\", the start lights and the horn 1-3 s later, a flying start gets the signal and \"Clock is running\". The transponder check shows a green tick for everyone who has crossed since the count-down began - if someone is missing, change their transponder right in the panel or pick an unknown transponder that crossed. Go now warns if someone wasn't seen.", "guide.race_day_11": "11. Today's schedule (at the bottom of Race Day) shows every class that day in one running order with times. Set the first start and the break between heats; ▲▼ change the order. A heat that starts late or is paused moves the rest of the day. 🖨 Print running order gives a list with times and drivers for the board in the pits, and 📺 Drivers' board (/public-overlay/schedule) shows drivers the next heats and who drives them. Calls: when a heat is 10 minutes away (set under Call), Race Day asks whether to call it – 📢 Call now reads the heat and its drivers over the speakers and marks it Called on the drivers' board; Later asks again in 2 minutes. ▶ Run the day automatically starts each heat's count-down on its own when it is due and then calls the heats itself (keep this browser open); ■ Stop autopilot lets you run heats by hand and turn it back on later; ⏸ Pause the day pauses the heat on track and the autopilot until you resume.", "guide.dashboard_title": "Schedule drift on overview", "guide.dashboard_1": "Overview now shows the difference between planned time and actual elapsed time for all started sessions.", diff --git a/src/prologue_logic.js b/src/prologue_logic.js index 3633e5e..a1ff55c 100644 --- a/src/prologue_logic.js +++ b/src/prologue_logic.js @@ -110,9 +110,10 @@ function getPrologueMarks(startMode) { marks.push({ marker: "m1", event: "race_1_minute" }); // IFMAR 4.2.5: from 30 s the cars may be placed in the starting boxes. marks.push({ marker: "s30", event: startMode === "flying" ? "race_30_seconds" : "prologue_grid" }); - marks.push({ marker: "s10", event: "race_10_seconds" }); - // IFMAR 4.2.6: from 10 s to 3 s the time is counted down second by second. - if (startMode !== "flying") [9, 8, 7, 6, 5, 4, 3].forEach((seconds) => marks.push({ marker: `s${seconds}`, event: "prologue_count", variables: { seconds } })); + // IFMAR 4.2.6: from 10 s to 3 s the time is counted down second by second ("10, 9 … 3"), + // then it is quiet until the horn. A flying start only gets "ten seconds to start". + if (startMode === "flying") marks.push({ marker: "s10", event: "race_10_seconds" }); + else [10, 9, 8, 7, 6, 5, 4, 3].forEach((seconds) => marks.push({ marker: `s${seconds}`, event: "prologue_count", variables: { seconds } })); return marks.map((mark) => ({ ...mark, ms: getMarkMs(mark.marker) })); } diff --git a/src/race_audio.js b/src/race_audio.js index 7f872af..d55557f 100644 --- a/src/race_audio.js +++ b/src/race_audio.js @@ -7,7 +7,7 @@ export const RACE_AUDIO_EVENT_DEFINITIONS = Object.freeze([ event("race_1_minute", "start", "normal"), event("race_30_seconds", "start", "normal"), event("race_10_seconds", "start", "normal", true, "effects/warning.wav"), event("drivers_ready", "start", "high"), event("start_sequence", "start", "high"), - event("start_tone", "start", "high", false, "effects/start_beep.wav"), + event("start_tone", "start", "high", false, "effects/start_horn.wav"), event("false_start", "start", "critical", true, "effects/warning.wav", 1000), event("restart_race", "start", "high"), event("staggered_release", "start", "normal"), event("prologue_start", "start", "normal"), event("prologue_minutes", "start", "normal"), @@ -27,7 +27,7 @@ export const RACE_AUDIO_EVENT_DEFINITIONS = Object.freeze([ event("one_minute_remaining", "race", "normal"), event("thirty_seconds_remaining", "race", "normal"), event("ten_seconds_remaining", "race", "normal", true, "effects/warning.wav"), event("time_expired", "race", "high", true, "effects/warning.wav"), - event("race_finished", "race", "high", true, "effects/race_finish.wav"), + event("race_finished", "race", "high", true, "effects/finish_horn.wav"), event("track_call", "control", "critical", true, "effects/warning.wav", 1000), event("track_clear", "control", "critical"), event("yellow_flag", "control", "critical", true, "effects/warning.wav"), event("red_flag", "control", "critical", true, "effects/warning.wav"), event("race_paused", "control", "critical", true, "effects/warning.wav"), event("race_resumed", "control", "high"), @@ -38,7 +38,7 @@ export const RACE_AUDIO_EVENT_DEFINITIONS = Object.freeze([ event("entering_pits", "pit", "low", false, "effects/transponder_pass.wav"), event("leaving_pits", "pit", "low", false, "effects/transponder_pass.wav"), event("pit_speed_warning", "pit", "high", true, "effects/warning.wav"), event("qualifying_start", "qualifying", "high"), event("qualifying_remaining", "qualifying", "normal"), - event("qualifying_finished", "qualifying", "high", true, "effects/race_finish.wav"), event("provisional_pole", "qualifying", "normal"), + event("qualifying_finished", "qualifying", "high", true, "effects/finish_horn.wav"), event("provisional_pole", "qualifying", "normal"), event("pole_position", "qualifying", "normal", true, "effects/fastest_lap_trophy.wav"), event("race_winner", "results", "high", true, "effects/fastest_lap_trophy.wav"), event("second_place", "results", "normal"), event("third_place", "results", "normal"), event("podium", "results", "normal"), @@ -320,19 +320,25 @@ export function createRaceAudioEngine(options = {}) { if (session?.type === "qualification") await trigger("qualifying_start").voiceDone; if (cancelled()) return false; await trigger("start_sequence").voiceDone; if (cancelled()) return false; } + // After the count-down's "3" (IFMAR 4.2.6) it is quiet until the horn, 1-3 s later; the + // lights come on within that time. Otherwise: lights, then the random delay from settings. + const afterCountDown = Boolean(callbacks.skipIntro); + const windowMs = afterCountDown ? 1000 + random() * 2000 : 0; + const stepMs = afterCountDown ? Math.round(windowMs / (settings.startLights ? 6 : 1)) : settings.lightIntervalMs; if (settings.startLights) { for (let light = 1; light <= 5; light += 1) { emitLightState(`LIGHT_${light}`, { sessionId: session?.id, lights: light }); callbacks.onLight?.(light); - await wait(settings.lightIntervalMs); if (cancelled()) return false; + await wait(stepMs); if (cancelled()) return false; } } emitLightState("WAIT_RANDOM", { sessionId: session?.id }); - const delaySeconds = settings.randomStartDelay + const delaySeconds = afterCountDown ? stepMs / 1000 + : settings.randomStartDelay ? settings.minStartDelay + random() * (settings.maxStartDelay - settings.minStartDelay) : settings.minStartDelay; callbacks.onArmed?.(delaySeconds); - await wait(delaySeconds * 1000); if (cancelled()) return false; + await wait(Math.round(delaySeconds * 1000)); if (cancelled()) return false; if (cancelled()) return false; emitLightState("GO", { sessionId: session?.id }); await playEffect("start_tone", { force: true }); diff --git a/tests/browser_race_day_start_sequences.js b/tests/browser_race_day_start_sequences.js index 4cbac8e..a2c277c 100644 --- a/tests/browser_race_day_start_sequences.js +++ b/tests/browser_race_day_start_sequences.js @@ -101,7 +101,7 @@ export async function runRaceDayStartSequencesSmoke({ evaluate, navigate, waitFo assert.ok([...observedCountdown].filter((text) => /^0:(0\d|10)$/.test(String(text || ""))).length >= 3, "count-down clock ticked down from 10 s: " + JSON.stringify([...observedCountdown])); await waitFor(async () => (await findSession(sessions[0].id)).status === "running", "heat running after its count-down + light sequence", 20000); const heatLog = (await savedState()).audioEventLog.slice(0, 12).map((entry) => entry.event); - assert.ok(heatLog.includes("prologue_count") && heatLog.includes("race_10_seconds"), "the count-down called 10 s and 9..3: " + JSON.stringify(heatLog)); + assert.ok(heatLog.filter((event) => event === "prologue_count").length === 8 && !heatLog.includes("race_10_seconds"), "the count-down called 10, 9 … 3: " + JSON.stringify(heatLog)); assert.ok(!heatLog.includes("drivers_ready") && !heatLog.includes("race_30_seconds"), "no second count-down after the prologue: " + JSON.stringify(heatLog)); console.log("PASS heat start runs a real count-down + light sequence instead of starting instantly"); diff --git a/tests/prologue_logic.test.js b/tests/prologue_logic.test.js index 73e27e8..2d09450 100644 --- a/tests/prologue_logic.test.js +++ b/tests/prologue_logic.test.js @@ -79,7 +79,7 @@ test("flying start calls the EFRA 9.2b marks: 1 min, 30 s, 10 s (2 min is the op }); test("grid start calls cars to the grid at 30 s and counts 10..3 second by second (IFMAR 4.2.5-4.2.6)", () => { - assert.deepEqual(collectCalls(90000, "position"), ["race_1_minute", "prologue_grid", "race_10_seconds", 9, 8, 7, 6, 5, 4, 3]); + assert.deepEqual(collectCalls(90000, "position"), ["race_1_minute", "prologue_grid", 10, 9, 8, 7, 6, 5, 4, 3]); assert.equal(getPrologueHandoverMs("position"), 3000, "the start signal follows 0-5 s after the 3 s mark"); assert.equal(getPrologueHandoverMs("flying"), 0); }); diff --git a/tests/race_audio.test.js b/tests/race_audio.test.js index b2f33a5..5a04a3d 100644 --- a/tests/race_audio.test.js +++ b/tests/race_audio.test.js @@ -112,7 +112,29 @@ test("after the prologue a grid start skips its own count-down and intro calls", const calls = []; const engine = createRecordingEngine(calls, { startCountdownSeconds: 30 }); await engine.runStartSequence({ id: "f1", type: "final", startMode: "position" }, { onTone: () => calls.push(["timing-start"]), skipCountdown: true, skipIntro: true }); - assert.deepEqual(calls, [["wait", 2000], ["effect", "start_beep.wav"], ["timing-start"]], "only the 0-5 s delay and the horn are left"); + assert.equal(calls.length, 3, "only the quiet and the horn are left"); + assert.equal(calls[0][0], "wait"); + assert.ok(calls[0][1] >= 1000 && calls[0][1] <= 3000, "1-3 s of quiet"); + assert.deepEqual(calls.slice(1), [["effect", "start_beep.wav"], ["timing-start"]]); +}); + +test("after the count-down's 3 it is quiet until the horn 1-3 s later, with the lights inside that time", async () => { + for (const [roll, totalMs] of [[0, 1000], [1, 3000]]) { + const calls = []; + const engine = createRaceAudioEngine({ + fetchImpl: async () => ({ ok: true, json: async () => manifest }), + audioFactory: (src) => ({ play: () => { calls.push(["effect", src.split("/").pop()]); return Promise.resolve(); }, volume: 1 }), + speak: async (text) => { calls.push(["voice", text]); return true; }, + wait: async (ms) => calls.push(["wait", ms]), + random: () => roll, + getSettings: () => normalizeRaceAudioSettings({ startLights: true, lightIntervalMs: 1000, minStartDelay: 4, maxStartDelay: 8 }), + }); + await engine.runStartSequence({ id: "f1", type: "final", startMode: "position" }, { skipCountdown: true, skipIntro: true }); + assert.equal(calls.filter(([kind]) => kind === "voice").length, 0, "nothing is said"); + const waited = calls.filter(([kind]) => kind === "wait").reduce((sum, [, ms]) => sum + ms, 0); + assert.ok(Math.abs(waited - totalMs) <= 6, `horn ${totalMs} ms after the 3, was ${waited}`); + assert.deepEqual(calls.at(-1), ["effect", "start_beep.wav"]); + } }); test("during a race only the passing tone plays by default - no names, personal bests or leader calls", () => { diff --git a/tests/server_persistence.integration.test.js b/tests/server_persistence.integration.test.js index 1d50686..0dc50fe 100644 --- a/tests/server_persistence.integration.test.js +++ b/tests/server_persistence.integration.test.js @@ -115,7 +115,7 @@ test("SQLite API persists state, passings, and overlay session results", { timeo const soundManifestResponse = await fetch(`${baseUrl}/race-sounds/sound_manifest.json`); const soundManifest = await soundManifestResponse.json(); assert.equal(soundManifestResponse.status, 200); - assert.equal(soundManifest.events.start_tone.effect, "effects/start_beep.wav"); + assert.equal(soundManifest.events.start_tone.effect, "effects/start_horn.wav"); assert.equal(soundManifest.voice_events.sv.track_call, "Stopp på banan. Stopp på banan."); const ammcConfigResponse = await fetch(`${baseUrl}/api/ammc/config`, {