flightsimulatorplatfrom/OpenSquawk
1
0
Fork 0
mirror of https://github.com/OpenSquawk/OpenSquawk synced 2026-08-10 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(live-atc): arm the silence timer on readback states too

Browse Source 
The timer was only armed for states carrying auto_advance_on_silence. Readback
states carry none — they wait for the pilot — so nothing was armed and ATC
never asked again when the readback did not arrive.

Which window applies to a state is now a pure function: the flow-authored one
for an auto-advance state, the much shorter server-published one for a readback
state. That also makes both cases testable instead of inline in the composable.
This commit is contained in:
itsrubberduck
2026-07-27 00:30:59 +02:00
parent 132f5faf9c
commit a40ce0a7eb
3 changed files with 146 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/composables/useLiveAtcSession.ts
View File

@@ -9,6 +9,7 @@ import type { useRadioSpeech } from '~/composables/useRadioSpeech'
import useCommunicationsEngine from '../../shared/utils/communicationsEngine'
import { generateGermanRegistration } from '../../shared/utils/registration'
import { gateTransmission } from '../../shared/utils/transmissionGate'
import { silenceWindowFor } from '../../shared/utils/silenceTimer'
import {
isSimControlMatch,
isSimControlRejection,
@@ -100,14 +101,16 @@ export function useLiveAtcSession(
const transmitInFlightCount = ref(0)
const transmitInFlight = computed(() => transmitInFlightCount.value > 0)
// --- Silence auto-advance ----------------------------------------------------
// Some pilot states let ATC continue on its own when the pilot stays quiet
// (e.g. the takeoff roll in tower-v1: no report needed, Tower hands off after a
// while anyway). Such states carry auto_advance_on_silence +
// auto_advance_timeout_ms in the runtime tree; whenever the session lands on
// one, arm a timer that fires the backend /timeout endpoint. Any pilot
// transmission or telemetry-fired advance re-arms or clears it via
// applyBackendDecision.
// --- Silence timers ----------------------------------------------------------
// Two kinds of wait fire the backend /timeout endpoint, both armed here (see
// silenceWindowFor for which applies where):
// auto-advance — the pilot owes nothing and ATC carries on by itself (the
// takeoff roll in tower-v1), on the flow-authored window.
// readback — the pilot owes a mandatory readback and has not given it,
// so ATC asks again on the much shorter server-published window.
// Any pilot transmission or telemetry-fired advance re-arms or clears the
// timer via applyBackendDecision, and a fire is dropped if the session or the
// state moved on while it was pending.
let silenceTimer: ReturnType<typeof setTimeout> | null = null
// Consecutive silence-timeouts fired for the SAME state. If the backend keeps
@@ -132,7 +135,9 @@ export function useLiveAtcSession(
function armSilenceTimer() {
clearSilenceTimer()
const state = currentState.value as any
if (!state?.auto_advance_on_silence || !backendSessionId.value) return
if (!backendSessionId.value) return
const window = silenceWindowFor(state)
if (!window) return
if (silenceFireCount.stateId !== state.id) {
silenceFireCount = { stateId: state.id, count: 0 }
@@ -142,10 +147,10 @@ export function useLiveAtcSession(
return
}
const ms = Math.max(1000, Number(state.auto_advance_timeout_ms ?? 30000))
const ms = window.ms
const sessionAtArm = backendSessionId.value
const stateAtArm = state.id
pmLog.debug('SILENCE TIMER armed', { state: stateAtArm, ms })
pmLog.debug('SILENCE TIMER armed', { state: stateAtArm, ms, kind: window.kind })
const fire = async () => {
silenceTimer = null
// Never fire stale: the session ended or the state moved on while waiting.