From 65b63be434619db2fd747fd0ea78ffef08b52360 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Tue, 10 Nov 2026 17:38:27 -0800 Subject: [PATCH] Clarify watchdog snapshot types and validated parser conversions --- src/main/hang-watchdog/hang-detection-marker.ts | 4 +++- src/main/hang-watchdog/hang-observation-ownership.test.ts | 6 ++++-- src/main/hang-watchdog/hang-observations.ts | 4 ++++ src/main/hang-watchdog/hang-snapshot.ts | 3 +-- src/main/hang-watchdog/main-thread-hang-watchdog.ts | 5 +++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/hang-watchdog/hang-detection-marker.ts b/src/main/hang-watchdog/hang-detection-marker.ts index c79eac7645f..c53ff65eca7 100644 --- a/src/main/hang-watchdog/hang-detection-marker.ts +++ b/src/main/hang-watchdog/hang-detection-marker.ts @@ -59,7 +59,9 @@ export function readAvailableHangDetectionMarker( } raw = readFileSync(markerPath, 'utf8') } catch (error) { - return (error as NodeJS.ErrnoException).code === 'ENOENT' ? null : undefined + return typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT' + ? null + : undefined } try { const parsed: unknown = JSON.parse(raw) diff --git a/src/main/hang-watchdog/hang-observation-ownership.test.ts b/src/main/hang-watchdog/hang-observation-ownership.test.ts index fbebc93c5a4..c3cbf6c7668 100644 --- a/src/main/hang-watchdog/hang-observation-ownership.test.ts +++ b/src/main/hang-watchdog/hang-observation-ownership.test.ts @@ -10,8 +10,10 @@ import { consumeHangDetectionMarker, writeHangDetectionMarker } from './hang-det import { runWatchdog } from './main-thread-hang-watchdog-entry' import { preservePreviousHangDetection } from './previous-hang-detection' -const probes = vi.hoisted(() => ({ pending: [] as ((value: HangMachineSnapshot) => void)[] })) -const files = vi.hoisted(() => ({ unavailablePath: null as string | null })) +const probes = vi.hoisted<{ pending: ((value: HangMachineSnapshot) => void)[] }>(() => ({ + pending: [] +})) +const files = vi.hoisted<{ unavailablePath: string | null }>(() => ({ unavailablePath: null })) vi.mock('node:fs', async (importOriginal) => { const actual = await importOriginal() return { diff --git a/src/main/hang-watchdog/hang-observations.ts b/src/main/hang-watchdog/hang-observations.ts index 45c53ed9d31..45897adf27b 100644 --- a/src/main/hang-watchdog/hang-observations.ts +++ b/src/main/hang-watchdog/hang-observations.ts @@ -19,6 +19,7 @@ export type { } from './hang-observation-schema' function object(value: unknown): Record | null { + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the branch excludes null, primitives and arrays before reading unknown properties. return value !== null && typeof value === 'object' && !Array.isArray(value) ? (value as Record) : null @@ -34,6 +35,7 @@ function numericFields( if (!data) { return null } + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: every supplied key is emitted once with a finite number or null. return Object.fromEntries( keys.map((key) => [key, finite(data[key]) ? data[key] : null]) ) as Record @@ -49,6 +51,7 @@ export function parsePowerReceipt(value: unknown): HangPowerReceipt | null { return null } return { + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixed event allowlist above validates this string union. event: data.event as HangPowerReceipt['event'], observedAt: data.observedAt, receivedAt: data.receivedAt @@ -111,6 +114,7 @@ function parseObservation(value: unknown): HangObservation | null { const gap = object(data.watchdogGap) return { id: data.id, + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixed observation-kind allowlist above validates this string union. kind: data.kind as HangObservation['kind'], detectedAt: data.detectedAt, parentPid: data.parentPid, diff --git a/src/main/hang-watchdog/hang-snapshot.ts b/src/main/hang-watchdog/hang-snapshot.ts index 9ea13aae689..65f1096c3e8 100644 --- a/src/main/hang-watchdog/hang-snapshot.ts +++ b/src/main/hang-watchdog/hang-snapshot.ts @@ -5,8 +5,7 @@ export function captureHangSnapshot(): HangSnapshot { const cpu = process.cpuUsage() let watchdog: NodeJS.CpuUsage | null = null try { - const read = (process as NodeJS.Process & { threadCpuUsage?: () => NodeJS.CpuUsage }) - .threadCpuUsage + const read = process.threadCpuUsage watchdog = read?.call(process) ?? null } catch { // Some Electron runtimes do not expose per-thread CPU counters. diff --git a/src/main/hang-watchdog/main-thread-hang-watchdog.ts b/src/main/hang-watchdog/main-thread-hang-watchdog.ts index 909687e6842..918b91e1852 100644 --- a/src/main/hang-watchdog/main-thread-hang-watchdog.ts +++ b/src/main/hang-watchdog/main-thread-hang-watchdog.ts @@ -67,17 +67,18 @@ export function installMainThreadHangWatchdog(options: { // The worker already exited. } } + const powerEvents: NodeJS.EventEmitter = powerMonitor const powerListeners = (['suspend', 'resume', 'lock-screen', 'unlock-screen'] as const).map( (event) => { const listener = (): void => postMessage({ type: 'power-event', event, observedAt: Date.now() }) - powerMonitor.on(event, listener) + powerEvents.on(event, listener) return { event, listener } } ) const removePowerListeners = (): void => { for (const { event, listener } of powerListeners) { - powerMonitor.off(event, listener) + powerEvents.off(event, listener) } } const heartbeatTimer = setInterval(() => {