mirror of
https://github.com/OpenSquawk/OpenSquawk
synced 2026-08-10 19:36:04 +08:00
fix(clearance): generate octal squawks and skip reserved codes
genSquawk() drew a decimal number in 1000-8999, so clearances could contain the digits 8 or 9 — codes no transponder can dial. Replace it with a shared generateSquawk() that draws four octal digits and re-rolls the reserved codes (7500/7600/7700, 7000, 2000, 1200, 0000). shared/learn/scenario.ts had its own octal generator that could still draw an emergency code; it now uses the same helper. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
import type { AirlineData, AirportData, Frequency, FrequencyType, Scenario } from './types'
|
import type { AirlineData, AirportData, Frequency, FrequencyType, Scenario } from './types'
|
||||||
|
import { generateSquawk } from '../utils/transponder'
|
||||||
|
|
||||||
const natoMap: Record<string, string> = {
|
const natoMap: Record<string, string> = {
|
||||||
A: 'Alpha',
|
A: 'Alpha',
|
||||||
@@ -214,14 +215,6 @@ function codeToPhonetic(value: string): string {
|
|||||||
.trim()
|
.trim()
|
||||||
}
|
}
|
||||||
|
|
||||||
function generateSquawk(): string {
|
|
||||||
let code = ''
|
|
||||||
for (let i = 0; i < 4; i++) {
|
|
||||||
code += String(randInt(0, 7))
|
|
||||||
}
|
|
||||||
return code
|
|
||||||
}
|
|
||||||
|
|
||||||
export function digitsToWords(value: string): string {
|
export function digitsToWords(value: string): string {
|
||||||
return value
|
return value
|
||||||
.split('')
|
.split('')
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import type {
|
|||||||
} from '../types/decision'
|
} from '../types/decision'
|
||||||
import type { FlowActivationInstruction, FlowActivationMode, LLMDecisionTrace } from '../types/llm'
|
import type { FlowActivationInstruction, FlowActivationMode, LLMDecisionTrace } from '../types/llm'
|
||||||
import { normalizeRadioPhrase, DEFAULT_AIRLINE_TELEPHONY } from './radioSpeech'
|
import { normalizeRadioPhrase, DEFAULT_AIRLINE_TELEPHONY } from './radioSpeech'
|
||||||
|
import { generateSquawk } from './transponder'
|
||||||
|
|
||||||
// --- DecisionTree runtime types ---
|
// --- DecisionTree runtime types ---
|
||||||
type Role = 'pilot' | 'atc' | 'system'
|
type Role = 'pilot' | 'atc' | 'system'
|
||||||
@@ -783,7 +784,7 @@ export default function useCommunicationsEngine() {
|
|||||||
dest: fpl.arr || fpl.arrival || 'EDDM',
|
dest: fpl.arr || fpl.arrival || 'EDDM',
|
||||||
stand: genStand(),
|
stand: genStand(),
|
||||||
runway: genRunway(),
|
runway: genRunway(),
|
||||||
squawk: fpl.assignedsquawk || genSquawk(),
|
squawk: fpl.assignedsquawk || generateSquawk(),
|
||||||
atis_code: genATIS(),
|
atis_code: genATIS(),
|
||||||
sid: genSID(fpl.route || ''),
|
sid: genSID(fpl.route || ''),
|
||||||
transition: 'DCT',
|
transition: 'DCT',
|
||||||
@@ -1509,10 +1510,6 @@ export default function useCommunicationsEngine() {
|
|||||||
return arr[Math.floor(Math.random() * arr.length)]
|
return arr[Math.floor(Math.random() * arr.length)]
|
||||||
}
|
}
|
||||||
|
|
||||||
function genSquawk() {
|
|
||||||
return String(Math.floor(Math.random() * 8000 + 1000)).padStart(4, '0')
|
|
||||||
}
|
|
||||||
|
|
||||||
function genATIS() {
|
function genATIS() {
|
||||||
const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
||||||
return letters[Math.floor(Math.random() * letters.length)]
|
return letters[Math.floor(Math.random() * letters.length)]
|
||||||
|
|||||||
39
shared/utils/transponder.ts
Normal file
39
shared/utils/transponder.ts
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
/**
|
||||||
|
* Transponder (SSR) code generation.
|
||||||
|
*
|
||||||
|
* A squawk is an *octal* four-digit code — every digit is 0–7, because each
|
||||||
|
* digit is encoded in three pulse positions. A code containing 8 or 9 cannot be
|
||||||
|
* dialled into a real transponder, so it must never reach a clearance.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Codes ATC will not assign as a discrete code.
|
||||||
|
*
|
||||||
|
* 7500/7600/7700 are the ICAO emergency codes (unlawful interference, radio
|
||||||
|
* failure, general emergency); 7000 is the European VFR conspicuity code and
|
||||||
|
* 1200 its US equivalent; 2000 is the code for entering from a non-SSR area;
|
||||||
|
* 0000 is a non-code used to indicate a transponder fault.
|
||||||
|
*/
|
||||||
|
export const RESERVED_SQUAWKS = new Set([
|
||||||
|
'7500', '7600', '7700', '7000', '2000', '1200', '0000',
|
||||||
|
])
|
||||||
|
|
||||||
|
/** True when `code` is a well-formed, assignable discrete squawk. */
|
||||||
|
export function isValidSquawk(code: string): boolean {
|
||||||
|
if (!/^[0-7]{4}$/.test(code)) return false
|
||||||
|
return !RESERVED_SQUAWKS.has(code)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A random assignable discrete squawk: four octal digits, no reserved code. */
|
||||||
|
export function generateSquawk(): string {
|
||||||
|
// The reserved set is tiny next to the 4096-code space, so re-rolling
|
||||||
|
// terminates immediately in practice; the bound just makes that guaranteed.
|
||||||
|
for (let attempt = 0; attempt < 20; attempt++) {
|
||||||
|
let code = ''
|
||||||
|
for (let digit = 0; digit < 4; digit++) {
|
||||||
|
code += String(Math.floor(Math.random() * 8))
|
||||||
|
}
|
||||||
|
if (isValidSquawk(code)) return code
|
||||||
|
}
|
||||||
|
return '1000'
|
||||||
|
}
|
||||||
49
tests/shared/transponder.test.ts
Normal file
49
tests/shared/transponder.test.ts
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
import { test } from 'node:test'
|
||||||
|
import assert from 'node:assert/strict'
|
||||||
|
import { RESERVED_SQUAWKS, generateSquawk, isValidSquawk } from '../../shared/utils/transponder.ts'
|
||||||
|
|
||||||
|
// Enough draws that a decimal generator (which would emit 8/9 roughly a quarter
|
||||||
|
// of the time per digit) could not pass by chance.
|
||||||
|
const DRAWS = 5000
|
||||||
|
|
||||||
|
test('generateSquawk only ever emits octal digits', () => {
|
||||||
|
for (let i = 0; i < DRAWS; i++) {
|
||||||
|
const code = generateSquawk()
|
||||||
|
assert.match(code, /^[0-7]{4}$/, `non-octal squawk generated: ${code}`)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
test('generateSquawk never emits a reserved code', () => {
|
||||||
|
for (let i = 0; i < DRAWS; i++) {
|
||||||
|
const code = generateSquawk()
|
||||||
|
assert.ok(!RESERVED_SQUAWKS.has(code), `reserved squawk generated: ${code}`)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
test('generateSquawk covers the code space rather than returning a constant', () => {
|
||||||
|
const seen = new Set<string>()
|
||||||
|
for (let i = 0; i < DRAWS; i++) seen.add(generateSquawk())
|
||||||
|
assert.ok(seen.size > 1000, `expected a spread of codes, got ${seen.size} distinct`)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('isValidSquawk rejects the digits a transponder cannot display', () => {
|
||||||
|
assert.equal(isValidSquawk('2891'), false)
|
||||||
|
assert.equal(isValidSquawk('4592'), false)
|
||||||
|
assert.equal(isValidSquawk('1234'), true)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('isValidSquawk rejects reserved codes', () => {
|
||||||
|
assert.equal(isValidSquawk('7500'), false)
|
||||||
|
assert.equal(isValidSquawk('7600'), false)
|
||||||
|
assert.equal(isValidSquawk('7700'), false)
|
||||||
|
assert.equal(isValidSquawk('7000'), false)
|
||||||
|
assert.equal(isValidSquawk('2000'), false)
|
||||||
|
assert.equal(isValidSquawk('0000'), false)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('isValidSquawk rejects malformed input', () => {
|
||||||
|
assert.equal(isValidSquawk(''), false)
|
||||||
|
assert.equal(isValidSquawk('123'), false)
|
||||||
|
assert.equal(isValidSquawk('12345'), false)
|
||||||
|
assert.equal(isValidSquawk('12A4'), false)
|
||||||
|
})
|
||||||
Reference in New Issue
Block a user