fix(api): guard task-queue name resolution against corrupted rows (#44)
This commit is contained in:
+16
-10
@@ -223,26 +223,32 @@ async function taskQueue(db: GameDb): Promise<QueueDto[]> {
|
||||
const techName = new Map(tech.map((t): [number, string] => [t.id, t.name]))
|
||||
const crewName = (id: number) => crew.find((c) => c.id === id)?.name ?? 'unknown'
|
||||
|
||||
// Corrupted-row tolerance: every JSON read goes through a guarded parse — a malformed
|
||||
// payload / helpers / type degrades to `unknown` / [] instead of throwing out of this
|
||||
// pure read (one bad row must not 500 the /api/world, /api/system and /api/crew routes).
|
||||
const parse = <T>(raw: string): T | null => { try { return JSON.parse(raw) as T } catch { return null } }
|
||||
const parseHelpers = (raw: string): number[] => { const v = parse<unknown>(raw); return Array.isArray(v) ? (v as number[]) : [] }
|
||||
|
||||
// targetLabel from the 4a payload shapes, per type (the Task interface in tasks.ts): the
|
||||
// target's display name (the jump destination, the scanned body, the researched tech), the
|
||||
// ship system's name with the verb suffixed for upgrade/expand, and the SHIP_TYPES string
|
||||
// as-is for a build (its label lives in the payload, so it never misses). A deleted lookup
|
||||
// target falls back to `unknown`.
|
||||
// as-is for a build. A deleted lookup target, a malformed payload, or a missing field
|
||||
// falls back to `unknown`.
|
||||
const labelFor: Record<TaskType, (payload: string) => string> = {
|
||||
JUMP: (payload) => systemName.get((JSON.parse(payload) as { systemId: number }).systemId) ?? 'unknown',
|
||||
EXPLORE: (payload) => planetName.get((JSON.parse(payload) as { planetId: number }).planetId) ?? 'unknown',
|
||||
SHIP_UPGRADE: (payload) => `${systemName.get((JSON.parse(payload) as { systemId: number }).systemId) ?? 'unknown'} — upgrade`,
|
||||
SHIP_EXPAND: (payload) => `${systemName.get((JSON.parse(payload) as { systemId: number }).systemId) ?? 'unknown'} — expand`,
|
||||
SHIP_BUILD: (payload) => (JSON.parse(payload) as { type: string }).type,
|
||||
RESEARCH: (payload) => techName.get((JSON.parse(payload) as { techId: number }).techId) ?? 'unknown',
|
||||
JUMP: (payload) => { const p = parse<{ systemId: number }>(payload); return p ? (systemName.get(p.systemId) ?? 'unknown') : 'unknown' },
|
||||
EXPLORE: (payload) => { const p = parse<{ planetId: number }>(payload); return p ? (planetName.get(p.planetId) ?? 'unknown') : 'unknown' },
|
||||
SHIP_UPGRADE: (payload) => { const p = parse<{ systemId: number }>(payload); return p ? `${systemName.get(p.systemId) ?? 'unknown'} — upgrade` : 'unknown' },
|
||||
SHIP_EXPAND: (payload) => { const p = parse<{ systemId: number }>(payload); return p ? `${systemName.get(p.systemId) ?? 'unknown'} — expand` : 'unknown' },
|
||||
SHIP_BUILD: (payload) => parse<{ type: string }>(payload)?.type ?? 'unknown',
|
||||
RESEARCH: (payload) => { const p = parse<{ techId: number }>(payload); return p ? (techName.get(p.techId) ?? 'unknown') : 'unknown' },
|
||||
}
|
||||
|
||||
const queue = taskRows.map((t) => ({
|
||||
id: t.id,
|
||||
type: t.type as TaskType,
|
||||
targetLabel: labelFor[t.type as TaskType](t.payload),
|
||||
targetLabel: labelFor[t.type as TaskType]?.(t.payload) ?? 'unknown',
|
||||
leadName: crewName(t.leadCrewId),
|
||||
helperNames: (JSON.parse(t.helpers) as number[]).map(crewName),
|
||||
helperNames: parseHelpers(t.helpers).map(crewName),
|
||||
remaining: t.remaining,
|
||||
status: t.status as TaskStatus,
|
||||
queuedAtTurn: t.queuedAtTurn,
|
||||
|
||||
Reference in New Issue
Block a user