feat(app): add diagnostics and update runtime

This commit is contained in:
Codex
2026-06-06 20:42:34 +07:00
parent 925181a3b7
commit 7c40558cd3
23 changed files with 2232 additions and 2792 deletions

View File

@@ -6,6 +6,34 @@
## [Unreleased] ## [Unreleased]
## [0.6.2] — 2026-06-06
### Added
- `npm run verify` и `scripts/verify.ps1`: typecheck, tests, lint, build и
audit summary одним локальным прогоном.
- Diagnostics card в Settings: версии приложения/runtime, userData/store/log
paths, счетчики persisted state, updater/game/GSI/meeting status, открытие
папки логов и копирование diagnostics JSON.
- Renderer error reporting: `ErrorBoundary`, `window.error` и
`unhandledrejection` теперь отправляют отчеты в main logs.
- Electron security hardening: deny-by-default permission handlers и запрет
`webview` attach.
- `docs/SECURITY_TRIAGE.md` с текущим audit baseline и release rules.
### Changed
- Обновлены зависимости: Electron `42.3.3`, electron-builder `26.15.0`,
electron-vite `5.0.0`, Vite `7.3.5`, `@vitejs/plugin-react` `5.2.0`,
electron-updater `6.8.9`, esbuild `0.28.0`.
- Валидация quiet hours стала строгой в renderer и main: значения вроде
`25:00` / `09:99` отклоняются до сохранения.
### Fixed
- `npm audit` снижен с 13 vulnerabilities до 0 после staged upgrade Electron
runtime и build-chain.
## [0.5.8] — 2026-05-22 ## [0.5.8] — 2026-05-22
Автономный QA-проход: проверил все элементы, нашёл и починил несколько Автономный QA-проход: проверил все элементы, нашёл и починил несколько
@@ -446,7 +474,8 @@
иконки), системный трей, автозапуск с Windows, native-уведомления, иконки), системный трей, автозапуск с Windows, native-уведомления,
NSIS-инсталлятор, auto-update через electron-updater. NSIS-инсталлятор, auto-update через electron-updater.
[Unreleased]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.5.8...HEAD [Unreleased]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.6.2...HEAD
[0.6.2]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/compare/v0.5.8...v0.6.2
[0.5.8]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/tag/v0.5.8 [0.5.8]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/tag/v0.5.8
[0.5.7]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/tag/v0.5.7 [0.5.7]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/tag/v0.5.7
[0.5.6]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/tag/v0.5.6 [0.5.6]: https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/tag/v0.5.6

View File

@@ -2,8 +2,8 @@
Windows desktop приложение, которое напоминает делать упражнения во время работы за компьютером. Опционально подключается к Dota 2 и после каждого матча превращает статистику (смерти, убийства, ассисты) в количество повторений. Windows desktop приложение, которое напоминает делать упражнения во время работы за компьютером. Опционально подключается к Dota 2 и после каждого матча превращает статистику (смерти, убийства, ассисты) в количество повторений.
[![release](https://img.shields.io/badge/release-v0.5.8-orange)](https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/latest) [![release](https://img.shields.io/badge/release-v0.6.1-orange)](https://git.xn--90adajar8af4h.xn--p1ai/AnRil/laude/releases/latest)
[![tests](https://img.shields.io/badge/tests-203%20passing-green)]() [![tests](https://img.shields.io/badge/tests-238%20passing-green)]()
[![platform](https://img.shields.io/badge/platform-Windows%2010%2F11-blue)]() [![platform](https://img.shields.io/badge/platform-Windows%2010%2F11-blue)]()
## Что внутри ## Что внутри
@@ -45,6 +45,7 @@ npm run dev
```bash ```bash
npm run typecheck # tsc по main + renderer npm run typecheck # tsc по main + renderer
npm run verify # typecheck + tests + lint + build + audit summary
npm run test # vitest в watch-режиме npm run test # vitest в watch-режиме
npm run test:run # vitest один раз (для CI) npm run test:run # vitest один раз (для CI)
npm run build # сборка без NSIS npm run build # сборка без NSIS
@@ -56,8 +57,8 @@ npm run release -- -Bump patch # bump версии + tag + push + upload в G
## Архитектура ## Архитектура
- **Electron 33** — multi-process: main (Node/scheduler/GSI) + preload (contextBridge) + renderer (React) - **Electron 42** — multi-process: main (Node/scheduler/GSI) + preload (contextBridge) + renderer (React)
- **Renderer** — React 18, TypeScript 5, Vite 5, Tailwind 3, framer-motion, react-router, zustand - **Renderer** — React 18, TypeScript 5, Vite 7, Tailwind 3, framer-motion, react-router, zustand
- **Persistence** — единственный JSON-файл `%APPDATA%\Exercise Reminder\app-state.json` (debounced writes) - **Persistence** — единственный JSON-файл `%APPDATA%\Exercise Reminder\app-state.json` (debounced writes)
- **IPC** — типизированные каналы через `src/shared/ipc.ts`, обёрнуто preload-ом - **IPC** — типизированные каналы через `src/shared/ipc.ts`, обёрнуто preload-ом
- **i18n** — самописная микро-система: `src/renderer/src/i18n/dict.ts` (плоский словарь ~200 ключей × 2 языка) + хук `useT()` - **i18n** — самописная микро-система: `src/renderer/src/i18n/dict.ts` (плоский словарь ~200 ключей × 2 языка) + хук `useT()`
@@ -71,19 +72,20 @@ src/main/validate.test.ts (78)
src/renderer/src/lib/history.test.ts (31) src/renderer/src/lib/history.test.ts (31)
src/renderer/src/i18n/i18n.test.ts (15) src/renderer/src/i18n/i18n.test.ts (15)
src/renderer/src/lib/format.test.ts (14) src/renderer/src/lib/format.test.ts (14)
src/main/scheduler.test.ts (13) src/main/scheduler.test.ts (14)
src/main/games/vdf.test.ts (11) src/main/games/vdf.test.ts (11)
src/main/store.test.ts (10) src/main/store.test.ts (12)
src/renderer/src/lib/achievements.test.ts (10) src/renderer/src/lib/achievements.test.ts (10)
src/shared/release-notes.test.ts (9) src/shared/release-notes.test.ts (9)
src/shared/meals.test.ts (8) src/shared/meals.test.ts (8)
src/main/meeting-detect.test.ts (7) src/main/meeting-detect.test.ts (7)
src/shared/quiet-hours.test.ts (7) src/shared/quiet-hours.test.ts (7)
src/main/adaptive.test.ts (6) src/main/adaptive.test.ts (6)
src/renderer/src/lib/day-plan.test.ts (6)
src/shared/types.test.ts (4) src/shared/types.test.ts (4)
src/renderer/src/lib/icon-choices.test.ts (4) src/renderer/src/lib/icon-choices.test.ts (4)
────────────────────────────────────────── ──────────────────────────────────────────
227 238
``` ```
Покрытие: IPC-валидация (упражнения/челленджи/приёмы пищи), persistence (миграции, карантин битого JSON, history cap), scheduler-гейтинг (тихие часы, ВКС-пауза, daily-goal), планирование приёмов пищи по времени суток (DST-safe), детект ВКС, история/стрики (DST), тихие часы (wrap), парсер VDF для Steam-конфигов, достижения, i18n с плюрализацией RU/EN, дефолты shared-типов. Покрытие: IPC-валидация (упражнения/челленджи/приёмы пищи), persistence (миграции, карантин битого JSON, history cap), scheduler-гейтинг (тихие часы, ВКС-пауза, daily-goal), планирование приёмов пищи по времени суток (DST-safe), детект ВКС, история/стрики (DST), тихие часы (wrap), парсер VDF для Steam-конфигов, достижения, i18n с плюрализацией RU/EN, дефолты shared-типов.

88
docs/SECURITY_TRIAGE.md Normal file
View File

@@ -0,0 +1,88 @@
# Security triage
Дата последнего triage: 2026-06-06
Этот файл фиксирует текущий статус `npm audit`, принятые решения по
dependency-upgrade и минимальные правила перед релизом. Он не заменяет
регулярное обновление зависимостей: цель в том, чтобы не терять контекст между
релизами и отличать runtime-риск от build-chain риска.
## Текущий статус
`npm run verify` выполняет:
- typecheck;
- tests;
- lint;
- build;
- audit summary.
Наблюдаемый audit snapshot после upgrade:
- 0 vulnerabilities;
- `npm run verify` проходит полностью;
- `npm run dist:dir` собирает unpacked Windows build.
## Выполненные обновления
- `electron` обновлен до `42.3.3`;
- `electron-builder` обновлен до `26.15.0`;
- `electron-vite` обновлен до `5.0.0`;
- `vite` обновлен до `7.3.5`;
- `@vitejs/plugin-react` обновлен до `5.2.0`;
- `electron-updater` обновлен до `6.8.9`;
- `esbuild` обновлен до `0.28.0`.
`vite` оставлен на major 7, а не поднят до 8, потому что актуальный
`electron-vite@5.0.0` объявляет peer range `^5.0.0 || ^6.0.0 || ^7.0.0`.
Переход на Vite 8 стоит делать отдельным шагом после совместимого релиза
`electron-vite`.
## Runtime baseline
Electron является runtime-платформой приложения, поэтому его audit-риск был
самым важным. После обновления runtime-риск из audit закрыт, но перед релизом
все равно нужен ручной smoke test Electron-поведения.
Текущие mitigations:
- `sandbox: true`;
- `contextIsolation: true`;
- `nodeIntegration: false`;
- строгий preload API через `contextBridge`;
- IPC runtime validation;
- CSP в renderer `index.html`;
- allowlist для внешних URL;
- deny-by-default permission handlers;
- запрет `webview` attach;
- renderer error/unhandled rejection reporting в main logs.
## Build-chain baseline
`electron-builder`, `electron-vite`, `vite` и `esbuild` обновлены отдельным
шагом от runtime upgrade. `npm run dist:dir` подтверждает, что packaged build
создается после обновления build-chain.
Перед публикацией installer все равно нужно проверить:
- NSIS installer build через `npm run dist`;
- запуск установленного приложения;
- сохранение данных в `%APPDATA%\Exercise Reminder\`;
- auto-update metadata и `update-channel`;
- импорт/экспорт данных;
- tray behavior;
- main window и reminder window;
- Dota 2 GSI install/uninstall и callback listener.
## Release rule
Перед релизом:
- `npm run verify`;
- `npm run dist`;
- smoke test installed app;
- проверка `update-channel`;
- повторный `npm audit`.
Если новый audit снова сообщает high runtime issue, релиз нужно считать
blocked, пока риск не разобран отдельно.

4192
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -18,6 +18,7 @@
"format": "prettier --write \"src/**/*.{ts,tsx,css}\" \"*.{json,md}\" \".github/**/*.yml\"", "format": "prettier --write \"src/**/*.{ts,tsx,css}\" \"*.{json,md}\" \".github/**/*.yml\"",
"format:check": "prettier --check \"src/**/*.{ts,tsx,css}\" \"*.{json,md}\"", "format:check": "prettier --check \"src/**/*.{ts,tsx,css}\" \"*.{json,md}\"",
"lint": "eslint src --ext .ts,.tsx --max-warnings 0", "lint": "eslint src --ext .ts,.tsx --max-warnings 0",
"verify": "powershell -ExecutionPolicy Bypass -File scripts/verify.ps1",
"dist": "electron-vite build && electron-builder --win --x64", "dist": "electron-vite build && electron-builder --win --x64",
"dist:dir": "electron-vite build && electron-builder --win --x64 --dir", "dist:dir": "electron-vite build && electron-builder --win --x64 --dir",
"publish": "electron-vite build && electron-builder --win --x64 --publish always", "publish": "electron-vite build && electron-builder --win --x64 --publish always",
@@ -28,7 +29,7 @@
"@fontsource/bricolage-grotesque": "^5.2.10", "@fontsource/bricolage-grotesque": "^5.2.10",
"@fontsource/jetbrains-mono": "^5.2.8", "@fontsource/jetbrains-mono": "^5.2.8",
"@fontsource/plus-jakarta-sans": "^5.2.8", "@fontsource/plus-jakarta-sans": "^5.2.8",
"electron-updater": "^6.8.3", "electron-updater": "^6.8.9",
"framer-motion": "^11.11.17", "framer-motion": "^11.11.17",
"lucide-react": "^0.460.0", "lucide-react": "^0.460.0",
"react": "^18.3.1", "react": "^18.3.1",
@@ -42,12 +43,12 @@
"@types/react-dom": "^18.3.1", "@types/react-dom": "^18.3.1",
"@typescript-eslint/eslint-plugin": "^8.15.0", "@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0", "@typescript-eslint/parser": "^8.15.0",
"@vitejs/plugin-react": "^4.3.3", "@vitejs/plugin-react": "^5.2.0",
"@vitest/coverage-v8": "^4.1.6", "@vitest/coverage-v8": "^4.1.6",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"electron": "^33.2.0", "electron": "^42.3.3",
"electron-builder": "^25.1.8", "electron-builder": "^26.15.0",
"electron-vite": "^2.3.0", "electron-vite": "^5.0.0",
"esbuild": "^0.28.0", "esbuild": "^0.28.0",
"eslint": "^8.57.1", "eslint": "^8.57.1",
"eslint-plugin-react": "^7.37.2", "eslint-plugin-react": "^7.37.2",
@@ -56,7 +57,7 @@
"prettier": "^3.4.1", "prettier": "^3.4.1",
"tailwindcss": "^3.4.15", "tailwindcss": "^3.4.15",
"typescript": "^5.6.3", "typescript": "^5.6.3",
"vite": "^5.4.11", "vite": "^7.3.5",
"vitest": "^4.1.6" "vitest": "^4.1.6"
}, },
"build": { "build": {

31
scripts/verify.ps1 Normal file
View File

@@ -0,0 +1,31 @@
$ErrorActionPreference = 'Stop'
function Invoke-Step {
param(
[Parameter(Mandatory = $true)][string]$Name,
[Parameter(Mandatory = $true)][string]$Command,
[Parameter(Mandatory = $true)][string[]]$Arguments
)
Write-Host ""
Write-Host "==> $Name"
& $Command @Arguments
if ($LASTEXITCODE -ne 0) {
throw "$Name failed with exit code $LASTEXITCODE"
}
}
Invoke-Step 'Typecheck' 'npm.cmd' @('run', 'typecheck')
Invoke-Step 'Tests' 'npm.cmd' @('run', 'test:run')
Invoke-Step 'Lint' 'npm.cmd' @('run', 'lint')
Invoke-Step 'Build' 'npm.cmd' @('run', 'build')
Write-Host ""
Write-Host "==> Audit summary"
& npm.cmd audit --audit-level=moderate
if ($LASTEXITCODE -ne 0) {
Write-Warning 'npm audit reported vulnerabilities. See the output above; verification gates still passed.'
}
Write-Host ""
Write-Host "Verification complete."

79
src/main/diagnostics.ts Normal file
View File

@@ -0,0 +1,79 @@
import { app, clipboard, shell } from 'electron'
import { existsSync, statSync } from 'node:fs'
import type { DiagnosticsInfo } from '@shared/types'
import {
getGsiBaseUrl,
getGsiPort,
isGsiServerRunning
} from './games/gsi-server'
import { listGamesStatus } from './games/registry'
import { getLogDir } from './logger'
import { isMeetingActiveSync } from './meeting-detect'
import { getState, getStorePath } from './store'
import { getUpdaterStatus } from './updater'
function fileSize(path: string): number | null {
try {
if (!path || !existsSync(path)) return null
return statSync(path).size
} catch {
return null
}
}
export async function getDiagnosticsInfo(): Promise<DiagnosticsInfo> {
const state = getState()
const store = getStorePath()
const games = await listGamesStatus()
return {
generatedAt: Date.now(),
app: {
version: app.getVersion(),
isPackaged: app.isPackaged,
platform: process.platform,
arch: process.arch
},
runtime: {
electron: process.versions.electron ?? 'unknown',
chrome: process.versions.chrome ?? 'unknown',
node: process.versions.node
},
paths: {
userData: app.getPath('userData'),
store,
logs: getLogDir()
},
store: {
bytes: fileSize(store),
exercises: state.exercises.length,
meals: state.meals.length,
challenges: state.challenges.length,
history: state.history?.length ?? 0
},
updater: getUpdaterStatus(),
games,
gsi: {
running: isGsiServerRunning(),
port: getGsiPort(),
baseUrl: getGsiBaseUrl()
},
meetingActive: isMeetingActiveSync()
}
}
export async function openLogsFolder(): Promise<{
ok: boolean
error?: string
}> {
const dir = getLogDir()
if (!dir) return { ok: false, error: 'logs-unavailable' }
const error = await shell.openPath(dir)
return error ? { ok: false, error } : { ok: true }
}
export async function copyDiagnosticsToClipboard(): Promise<DiagnosticsInfo> {
const info = await getDiagnosticsInfo()
clipboard.writeText(JSON.stringify(info, null, 2))
return info
}

View File

@@ -144,3 +144,7 @@ export function getGsiBaseUrl(): string {
export function getGsiPort(): number { export function getGsiPort(): number {
return PORT return PORT
} }
export function isGsiServerRunning(): boolean {
return server !== null
}

View File

@@ -14,6 +14,7 @@ import { startGamesRegistry, stopGamesRegistry } from './games/registry'
import { initUpdater, stopUpdater } from './updater' import { initUpdater, stopUpdater } from './updater'
import { IPC } from '@shared/ipc' import { IPC } from '@shared/ipc'
import { log } from './logger' import { log } from './logger'
import { installSecurityHardening } from './security'
const APP_ID = 'com.anril.exercise-reminder' const APP_ID = 'com.anril.exercise-reminder'
@@ -45,6 +46,7 @@ if (!gotLock) {
app.on('second-instance', () => showMainWindow()) app.on('second-instance', () => showMainWindow())
app.whenReady().then(() => { app.whenReady().then(() => {
installSecurityHardening()
registerIpc() registerIpc()
createTray() createTray()

View File

@@ -10,7 +10,12 @@ import {
import type { IpcMainEvent, IpcMainInvokeEvent } from 'electron' import type { IpcMainEvent, IpcMainInvokeEvent } from 'electron'
import { readFileSync, writeFileSync } from 'node:fs' import { readFileSync, writeFileSync } from 'node:fs'
import { IPC } from '@shared/ipc' import { IPC } from '@shared/ipc'
import type { Exercise, GameId, Settings } from '@shared/types' import type {
Exercise,
GameId,
RendererErrorReport,
Settings
} from '@shared/types'
import { import {
addChallenge, addChallenge,
addExercise, addExercise,
@@ -68,6 +73,13 @@ import {
validateSnoozeMinutes validateSnoozeMinutes
} from './validate' } from './validate'
import { log } from './logger' import { log } from './logger'
import {
copyDiagnosticsToClipboard,
getDiagnosticsInfo,
openLogsFolder
} from './diagnostics'
const MAX_RENDERER_ERROR_FIELD = 8_000
/** /**
* Враппер вокруг `ipcMain.handle`: ловит любое исключение в обработчике, * Враппер вокруг `ipcMain.handle`: ловит любое исключение в обработчике,
@@ -105,10 +117,7 @@ function safeOn<F extends (event: IpcMainEvent, ...args: never[]) => void>(
): void { ): void {
ipcMain.on(channel, (event, ...args) => { ipcMain.on(channel, (event, ...args) => {
try { try {
const call = fn as unknown as ( const call = fn as unknown as (e: IpcMainEvent, ...a: unknown[]) => void
e: IpcMainEvent,
...a: unknown[]
) => void
call(event, ...args) call(event, ...args)
} catch (err) { } catch (err) {
log.error(`[ipc] ${channel} (on) threw`, err) log.error(`[ipc] ${channel} (on) threw`, err)
@@ -116,6 +125,21 @@ function safeOn<F extends (event: IpcMainEvent, ...args: never[]) => void>(
}) })
} }
function cleanRendererError(raw: unknown): RendererErrorReport | null {
if (typeof raw !== 'object' || raw === null) return null
const r = raw as Record<string, unknown>
const message = typeof r.message === 'string' ? r.message.trim() : ''
if (!message) return null
const clean = (v: unknown): string | undefined =>
typeof v === 'string' ? v.slice(0, MAX_RENDERER_ERROR_FIELD) : undefined
return {
message: message.slice(0, MAX_RENDERER_ERROR_FIELD),
stack: clean(r.stack),
componentStack: clean(r.componentStack),
source: clean(r.source)
}
}
export function registerIpc(): void { export function registerIpc(): void {
safeHandle(IPC.getState, () => { safeHandle(IPC.getState, () => {
// Без history (см. getStateForRenderer) и с актуальным значением // Без history (см. getStateForRenderer) и с актуальным значением
@@ -136,17 +160,14 @@ export function registerIpc(): void {
return ex return ex
}) })
safeHandle( safeHandle(IPC.updateExercise, (_e, idRaw: unknown, patchRaw: unknown) => {
IPC.updateExercise, const id = validateId(idRaw)
(_e, idRaw: unknown, patchRaw: unknown) => { const patch = validateExercisePatch(patchRaw)
const id = validateId(idRaw) if (!id || !patch) return null
const patch = validateExercisePatch(patchRaw) const ex = updateExercise(id, patch)
if (!id || !patch) return null broadcastState()
const ex = updateExercise(id, patch) return ex
broadcastState() })
return ex
}
)
safeHandle(IPC.deleteExercise, (_e, idRaw: unknown) => { safeHandle(IPC.deleteExercise, (_e, idRaw: unknown) => {
const id = validateId(idRaw) const id = validateId(idRaw)
@@ -156,21 +177,18 @@ export function registerIpc(): void {
return ok return ok
}) })
safeHandle( safeHandle(IPC.toggleExercise, (_e, idRaw: unknown, enabledRaw: unknown) => {
IPC.toggleExercise, const id = validateId(idRaw)
(_e, idRaw: unknown, enabledRaw: unknown) => { if (!id || typeof enabledRaw !== 'boolean') return null
const id = validateId(idRaw) const patch: Partial<Exercise> = { enabled: enabledRaw }
if (!id || typeof enabledRaw !== 'boolean') return null if (enabledRaw) {
const patch: Partial<Exercise> = { enabled: enabledRaw } const ex = getState().exercises.find((e) => e.id === id)
if (enabledRaw) { if (ex) patch.nextFireAt = Date.now() + ex.intervalMinutes * 60_000
const ex = getState().exercises.find((e) => e.id === id)
if (ex) patch.nextFireAt = Date.now() + ex.intervalMinutes * 60_000
}
const ex = updateExercise(id, patch)
broadcastState()
return ex
} }
) const ex = updateExercise(id, patch)
broadcastState()
return ex
})
safeHandle(IPC.markDone, (_e, idRaw: unknown, repsRaw?: unknown) => { safeHandle(IPC.markDone, (_e, idRaw: unknown, repsRaw?: unknown) => {
const id = validateId(idRaw) const id = validateId(idRaw)
@@ -299,6 +317,19 @@ export function registerIpc(): void {
safeHandle(IPC.getMeetingActive, () => isMeetingActiveSync()) safeHandle(IPC.getMeetingActive, () => isMeetingActiveSync())
safeHandle(IPC.getDiagnostics, () => getDiagnosticsInfo())
safeHandle(IPC.openLogsFolder, () => openLogsFolder())
safeHandle(IPC.copyDiagnostics, () => copyDiagnosticsToClipboard())
safeHandle(IPC.reportRendererError, (_e, raw: unknown) => {
const report = cleanRendererError(raw)
if (!report) return false
log.error('[renderer] error reported', report)
return true
})
safeHandle(IPC.quit, () => app.quit()) safeHandle(IPC.quit, () => app.quit())
safeHandle(IPC.reminderClose, () => hideReminderWindow()) safeHandle(IPC.reminderClose, () => hideReminderWindow())
@@ -369,17 +400,14 @@ export function registerIpc(): void {
broadcastState() broadcastState()
return c return c
}) })
safeHandle( safeHandle(IPC.updateChallenge, (_e, idRaw: unknown, patchRaw: unknown) => {
IPC.updateChallenge, const id = validateId(idRaw)
(_e, idRaw: unknown, patchRaw: unknown) => { const patch = validateChallengePatch(patchRaw)
const id = validateId(idRaw) if (!id || !patch) return null
const patch = validateChallengePatch(patchRaw) const c = updateChallenge(id, patch)
if (!id || !patch) return null broadcastState()
const c = updateChallenge(id, patch) return c
broadcastState() })
return c
}
)
safeHandle(IPC.deleteChallenge, (_e, idRaw: unknown) => { safeHandle(IPC.deleteChallenge, (_e, idRaw: unknown) => {
const id = validateId(idRaw) const id = validateId(idRaw)
if (!id) return false if (!id) return false
@@ -387,31 +415,25 @@ export function registerIpc(): void {
broadcastState() broadcastState()
return ok return ok
}) })
safeHandle( safeHandle(IPC.toggleChallenge, (_e, idRaw: unknown, enabledRaw: unknown) => {
IPC.toggleChallenge, const id = validateId(idRaw)
(_e, idRaw: unknown, enabledRaw: unknown) => { if (!id || typeof enabledRaw !== 'boolean') return null
const id = validateId(idRaw) const c = updateChallenge(id, { enabled: enabledRaw })
if (!id || typeof enabledRaw !== 'boolean') return null broadcastState()
const c = updateChallenge(id, { enabled: enabledRaw }) return c
broadcastState() })
return c
}
)
safeHandle(IPC.closeMatchSummary, () => hideReminderWindow()) safeHandle(IPC.closeMatchSummary, () => hideReminderWindow())
safeHandle( safeHandle(IPC.markChallengeDone, (_e, idRaw: unknown, repsRaw: unknown) => {
IPC.markChallengeDone, const id = validateId(idRaw)
(_e, idRaw: unknown, repsRaw: unknown) => { const reps = validateActualReps(repsRaw)
const id = validateId(idRaw) if (!id || reps === undefined || reps <= 0) return false
const reps = validateActualReps(repsRaw) markChallengeDone(id, reps)
if (!id || reps === undefined || reps <= 0) return false broadcastState()
markChallengeDone(id, reps) broadcastHistoryChanged()
broadcastState() return true
broadcastHistoryChanged() })
return true
}
)
// Dev helper: simulate a match end with given stats. NEVER registered in // Dev helper: simulate a match end with given stats. NEVER registered in
// packaged builds — a compromised renderer (XSS, malicious npm dep) could // packaged builds — a compromised renderer (XSS, malicious npm dep) could
@@ -448,17 +470,13 @@ export function registerIpc(): void {
// renderer не получает прямого доступа к ФС. // renderer не получает прямого доступа к ФС.
safeHandle(IPC.exportState, async (event) => { safeHandle(IPC.exportState, async (event) => {
const win = BrowserWindow.fromWebContents(event.sender) ?? undefined const win = BrowserWindow.fromWebContents(event.sender) ?? undefined
const stamp = new Date() const stamp = new Date().toISOString().replace(/[:T]/g, '-').slice(0, 16)
.toISOString()
.replace(/[:T]/g, '-')
.slice(0, 16)
const defaultPath = `laude-backup-${stamp}.json` const defaultPath = `laude-backup-${stamp}.json`
// Native-диалоги OS читают локаль из системы. Title — единственная // Native-диалоги OS читают локаль из системы. Title — единственная
// строка которую мы контролируем; локализуем по settings.language. // строка которую мы контролируем; локализуем по settings.language.
const lang = getState().settings.language ?? 'ru' const lang = getState().settings.language ?? 'ru'
const result = await dialog.showSaveDialog(win!, { const result = await dialog.showSaveDialog(win!, {
title: title: lang === 'en' ? 'Save backup' : 'Сохранить резервную копию',
lang === 'en' ? 'Save backup' : 'Сохранить резервную копию',
defaultPath, defaultPath,
filters: [{ name: 'JSON', extensions: ['json'] }] filters: [{ name: 'JSON', extensions: ['json'] }]
}) })
@@ -480,7 +498,9 @@ export function registerIpc(): void {
const lang = getState().settings.language ?? 'ru' const lang = getState().settings.language ?? 'ru'
const result = await dialog.showOpenDialog(win!, { const result = await dialog.showOpenDialog(win!, {
title: title:
lang === 'en' ? 'Restore from backup' : 'Восстановить из резервной копии', lang === 'en'
? 'Restore from backup'
: 'Восстановить из резервной копии',
properties: ['openFile'], properties: ['openFile'],
filters: [{ name: 'JSON', extensions: ['json'] }] filters: [{ name: 'JSON', extensions: ['json'] }]
}) })

View File

@@ -121,5 +121,6 @@ export const log = {
/** Путь к логам (для диагностики). Возвращает пустую строку до initLogger(). */ /** Путь к логам (для диагностики). Возвращает пустую строку до initLogger(). */
export function getLogDir(): string { export function getLogDir(): string {
ensurePaths()
return logDir return logDir
} }

37
src/main/security.ts Normal file
View File

@@ -0,0 +1,37 @@
import { app, session } from 'electron'
import { log } from './logger'
/**
* Renderer permissions are denied by default. The app does not need camera,
* microphone, geolocation, USB/HID/serial, direct notification permission or
* browser-driven openExternal; all trusted privileged actions go through
* validated IPC handlers in main.
*/
export function installSecurityHardening(): void {
session.defaultSession.setPermissionRequestHandler(
(_webContents, permission, callback, details) => {
log.warn('[security] denied permission request', {
permission,
requestingUrl: 'requestingUrl' in details ? details.requestingUrl : ''
})
callback(false)
}
)
session.defaultSession.setPermissionCheckHandler(
(_webContents, permission, requestingOrigin) => {
log.warn('[security] denied permission check', {
permission,
requestingOrigin
})
return false
}
)
app.on('web-contents-created', (_event, contents) => {
contents.on('will-attach-webview', (event) => {
event.preventDefault()
log.warn('[security] blocked webview attach')
})
})
}

View File

@@ -47,7 +47,7 @@ let cache: PersistedState | null = null
let storePath = '' let storePath = ''
let pendingWrite: NodeJS.Timeout | null = null let pendingWrite: NodeJS.Timeout | null = null
function getStorePath(): string { export function getStorePath(): string {
if (!storePath) { if (!storePath) {
const dir = app.getPath('userData') const dir = app.getPath('userData')
if (!existsSync(dir)) mkdirSync(dir, { recursive: true }) if (!existsSync(dir)) mkdirSync(dir, { recursive: true })
@@ -197,7 +197,8 @@ function sanitizeMeal(raw: unknown, now = Date.now()): Meal | null {
const meal: Meal = { const meal: Meal = {
...base, ...base,
id, id,
nextFireAt: finiteMs(raw.nextFireAt) ?? nextMealOccurrence(base.time, base.days, now) nextFireAt:
finiteMs(raw.nextFireAt) ?? nextMealOccurrence(base.time, base.days, now)
} }
const lastDoneAt = finiteMs(raw.lastDoneAt) const lastDoneAt = finiteMs(raw.lastDoneAt)
if (lastDoneAt !== undefined) meal.lastDoneAt = lastDoneAt if (lastDoneAt !== undefined) meal.lastDoneAt = lastDoneAt

View File

@@ -56,12 +56,8 @@ describe('validateMealInput', () => {
}) })
it('реджектит кривое время', () => { it('реджектит кривое время', () => {
expect( expect(validateMealInput({ name: 'X', time: '99:99', days: [] })).toBeNull()
validateMealInput({ name: 'X', time: '99:99', days: [] }) expect(validateMealInput({ name: 'X', time: 'noon', days: [] })).toBeNull()
).toBeNull()
expect(
validateMealInput({ name: 'X', time: 'noon', days: [] })
).toBeNull()
}) })
it('реджектит дни вне диапазона и дедупит', () => { it('реджектит дни вне диапазона и дедупит', () => {
@@ -124,8 +120,12 @@ describe('validateExerciseInput', () => {
}) })
it('rejects missing required fields', () => { it('rejects missing required fields', () => {
expect(validateExerciseInput({ ...validExercise, name: undefined })).toBeNull() expect(
expect(validateExerciseInput({ ...validExercise, reps: undefined })).toBeNull() validateExerciseInput({ ...validExercise, name: undefined })
).toBeNull()
expect(
validateExerciseInput({ ...validExercise, reps: undefined })
).toBeNull()
expect( expect(
validateExerciseInput({ ...validExercise, intervalMinutes: undefined }) validateExerciseInput({ ...validExercise, intervalMinutes: undefined })
).toBeNull() ).toBeNull()
@@ -221,7 +221,9 @@ describe('validateExercisePatch', () => {
it('accepts partial patches', () => { it('accepts partial patches', () => {
expect(validateExercisePatch({ reps: 12 })).toEqual({ reps: 12 }) expect(validateExercisePatch({ reps: 12 })).toEqual({ reps: 12 })
expect(validateExercisePatch({ name: 'New' })).toEqual({ name: 'New' }) expect(validateExercisePatch({ name: 'New' })).toEqual({ name: 'New' })
expect(validateExercisePatch({ enabled: false })).toEqual({ enabled: false }) expect(validateExercisePatch({ enabled: false })).toEqual({
enabled: false
})
}) })
it('rejects patch with a single invalid field', () => { it('rejects patch with a single invalid field', () => {
@@ -273,7 +275,14 @@ describe('validateChallengeInput', () => {
}) })
it('accepts all valid stats', () => { it('accepts all valid stats', () => {
const stats = ['deaths', 'kills', 'assists', 'last_hits', 'denies', 'duration_min'] const stats = [
'deaths',
'kills',
'assists',
'last_hits',
'denies',
'duration_min'
]
for (const stat of stats) { for (const stat of stats) {
expect(validateChallengeInput({ ...valid, stat })).not.toBeNull() expect(validateChallengeInput({ ...valid, stat })).not.toBeNull()
} }
@@ -288,11 +297,15 @@ describe('validateChallengeInput', () => {
}) })
it('accepts zero multiplier (legitimate "disable" semantics)', () => { it('accepts zero multiplier (legitimate "disable" semantics)', () => {
expect(validateChallengeInput({ ...valid, multiplier: 0 })?.multiplier).toBe(0) expect(
validateChallengeInput({ ...valid, multiplier: 0 })?.multiplier
).toBe(0)
}) })
it('accepts fractional multiplier (e.g. 0.5×)', () => { it('accepts fractional multiplier (e.g. 0.5×)', () => {
expect(validateChallengeInput({ ...valid, multiplier: 0.5 })?.multiplier).toBe(0.5) expect(
validateChallengeInput({ ...valid, multiplier: 0.5 })?.multiplier
).toBe(0.5)
}) })
}) })
@@ -399,7 +412,9 @@ describe('validateSettingsPatch', () => {
it('rejects non-strings', () => { it('rejects non-strings', () => {
expect(validateSettingsPatch({ lastSeenVersion: 42 })).toBeNull() expect(validateSettingsPatch({ lastSeenVersion: 42 })).toBeNull()
expect(validateSettingsPatch({ lastSeenVersion: ['1', '0', '0'] })).toBeNull() expect(
validateSettingsPatch({ lastSeenVersion: ['1', '0', '0'] })
).toBeNull()
}) })
}) })
@@ -426,6 +441,12 @@ describe('validateSettingsPatch', () => {
expect( expect(
validateSettingsPatch({ quietHours: { ...baseQh, from: '2500' } }) validateSettingsPatch({ quietHours: { ...baseQh, from: '2500' } })
).toBeNull() ).toBeNull()
expect(
validateSettingsPatch({ quietHours: { ...baseQh, from: '25:00' } })
).toBeNull()
expect(
validateSettingsPatch({ quietHours: { ...baseQh, to: '09:99' } })
).toBeNull()
expect( expect(
validateSettingsPatch({ quietHours: { ...baseQh, to: 'bedtime' } }) validateSettingsPatch({ quietHours: { ...baseQh, to: 'bedtime' } })
).toBeNull() ).toBeNull()
@@ -479,7 +500,9 @@ describe('validateSettingsPatch', () => {
describe('validateId', () => { describe('validateId', () => {
it('accepts reasonable id strings', () => { it('accepts reasonable id strings', () => {
expect(validateId('abc')).toBe('abc') expect(validateId('abc')).toBe('abc')
expect(validateId('uuid-v4-style-thing-123')).toBe('uuid-v4-style-thing-123') expect(validateId('uuid-v4-style-thing-123')).toBe(
'uuid-v4-style-thing-123'
)
}) })
it('rejects non-strings', () => { it('rejects non-strings', () => {

View File

@@ -43,7 +43,6 @@ const VALID_CATEGORIES: ReminderCategory[] = [
'eyes', 'eyes',
'posture' 'posture'
] ]
const HHMM_RE = /^\d{1,2}:\d{2}$/
function isObj(v: unknown): v is Record<string, unknown> { function isObj(v: unknown): v is Record<string, unknown> {
return typeof v === 'object' && v !== null && !Array.isArray(v) return typeof v === 'object' && v !== null && !Array.isArray(v)
@@ -130,7 +129,11 @@ export function validateExerciseInput(
// dailyGoal: undefined = не задан (нет soft-cap'a), null от UI приводим к // dailyGoal: undefined = не задан (нет soft-cap'a), null от UI приводим к
// undefined; иначе — должен пройти int-range, иначе reject (нельзя // undefined; иначе — должен пройти int-range, иначе reject (нельзя
// отправить из renderer'а NaN/негатив и тихо обнулить). // отправить из renderer'а NaN/негатив и тихо обнулить).
if (raw.dailyGoal !== undefined && raw.dailyGoal !== null && dailyGoal === undefined) { if (
raw.dailyGoal !== undefined &&
raw.dailyGoal !== null &&
dailyGoal === undefined
) {
return null return null
} }
if ( if (
@@ -438,8 +441,8 @@ export function validateSettingsPatch(raw: unknown): Partial<Settings> | null {
enabled === undefined || enabled === undefined ||
from === undefined || from === undefined ||
to === undefined || to === undefined ||
!HHMM_RE.test(from) || validHHMM(from) === undefined ||
!HHMM_RE.test(to) validHHMM(to) === undefined
) { ) {
return null return null
} }

View File

@@ -3,12 +3,14 @@ import { IPC } from '@shared/ipc'
import type { import type {
AppState, AppState,
Challenge, Challenge,
DiagnosticsInfo,
Exercise, Exercise,
GameId, GameId,
GameStatus, GameStatus,
HistoryEntry, HistoryEntry,
MatchSummary, MatchSummary,
Meal, Meal,
RendererErrorReport,
Settings, Settings,
Tick, Tick,
UpdaterStatus UpdaterStatus
@@ -64,6 +66,14 @@ const api = {
getAppVersion: (): Promise<string> => ipcRenderer.invoke(IPC.getAppVersion), getAppVersion: (): Promise<string> => ipcRenderer.invoke(IPC.getAppVersion),
getMeetingActive: (): Promise<boolean> => getMeetingActive: (): Promise<boolean> =>
ipcRenderer.invoke(IPC.getMeetingActive), ipcRenderer.invoke(IPC.getMeetingActive),
getDiagnostics: (): Promise<DiagnosticsInfo> =>
ipcRenderer.invoke(IPC.getDiagnostics),
openLogsFolder: (): Promise<{ ok: boolean; error?: string }> =>
ipcRenderer.invoke(IPC.openLogsFolder),
copyDiagnostics: (): Promise<DiagnosticsInfo> =>
ipcRenderer.invoke(IPC.copyDiagnostics),
reportRendererError: (report: RendererErrorReport): Promise<boolean> =>
ipcRenderer.invoke(IPC.reportRendererError, report),
pauseAll: (): Promise<void> => ipcRenderer.invoke(IPC.pauseAll), pauseAll: (): Promise<void> => ipcRenderer.invoke(IPC.pauseAll),
resumeAll: (): Promise<void> => ipcRenderer.invoke(IPC.resumeAll), resumeAll: (): Promise<void> => ipcRenderer.invoke(IPC.resumeAll),
@@ -164,8 +174,7 @@ const api = {
on(IPC.evtMaximizeChanged, h), on(IPC.evtMaximizeChanged, h),
onMeetingChanged: (h: Handler<boolean>): Unsub => onMeetingChanged: (h: Handler<boolean>): Unsub =>
on(IPC.evtMeetingChanged, h), on(IPC.evtMeetingChanged, h),
onHistoryChanged: (h: Handler<void>): Unsub => onHistoryChanged: (h: Handler<void>): Unsub => on(IPC.evtHistoryChanged, h)
on(IPC.evtHistoryChanged, h)
} }
contextBridge.exposeInMainWorld('api', api) contextBridge.exposeInMainWorld('api', api)

View File

@@ -23,9 +23,13 @@ export class ErrorBoundary extends Component<Props, State> {
} }
componentDidCatch(error: Error, info: ErrorInfo): void { componentDidCatch(error: Error, info: ErrorInfo): void {
// No remote telemetry — log to the local console so a curious user
// (or dev tools session) can capture it.
console.error('[ErrorBoundary]', error, info.componentStack) console.error('[ErrorBoundary]', error, info.componentStack)
void window.api?.reportRendererError?.({
source: 'ErrorBoundary',
message: error.message,
stack: error.stack,
componentStack: info.componentStack ?? undefined
})
} }
reset = (): void => this.setState({ error: null }) reset = (): void => this.setState({ error: null })

View File

@@ -224,6 +224,7 @@ export const ru: Dict = {
'settings.section.language': 'Язык', 'settings.section.language': 'Язык',
'settings.section.updates': 'Обновления', 'settings.section.updates': 'Обновления',
'settings.section.data': 'Данные', 'settings.section.data': 'Данные',
'settings.section.diagnostics': 'Диагностика',
'settings.data.export.label': 'Экспортировать всё', 'settings.data.export.label': 'Экспортировать всё',
'settings.data.export.hint': 'settings.data.export.hint':
'Сохрани резервную копию упражнений, истории, челленджей и настроек в JSON-файл.', 'Сохрани резервную копию упражнений, истории, челленджей и настроек в JSON-файл.',
@@ -238,6 +239,20 @@ export const ru: Dict = {
'Все текущие упражнения, история и настройки будут заменены содержимым файла. Продолжить?', 'Все текущие упражнения, история и настройки будут заменены содержимым файла. Продолжить?',
'settings.data.import.ok': 'Восстановлено', 'settings.data.import.ok': 'Восстановлено',
'settings.data.import.err': 'Файл не подошёл — это не наша резервная копия?', 'settings.data.import.err': 'Файл не подошёл — это не наша резервная копия?',
'settings.diagnostics.app.label': 'Приложение',
'settings.diagnostics.data.label': 'Данные',
'settings.diagnostics.data.legend': 'упр/еда/чел/ист',
'settings.diagnostics.gsi.label': 'Dota GSI',
'settings.diagnostics.hint':
'Технический снимок без токенов: версии, пути, статусы и счетчики.',
'settings.diagnostics.loading': 'Загружаем…',
'settings.diagnostics.err': 'Не удалось собрать диагностику',
'settings.diagnostics.refresh': 'Обновить диагностику',
'settings.diagnostics.copy.btn': 'Копировать',
'settings.diagnostics.copy.ok': 'Диагностика скопирована',
'settings.diagnostics.logs.btn': 'Логи',
'settings.diagnostics.logs.ok': 'Папка логов открыта',
'settings.diagnostics.logs.err': 'Не удалось открыть папку логов',
'settings.section.about': 'О приложении', 'settings.section.about': 'О приложении',
'settings.version.label': 'Версия', 'settings.version.label': 'Версия',
'settings.version.hint': 'Текущая установленная версия приложения.', 'settings.version.hint': 'Текущая установленная версия приложения.',
@@ -623,6 +638,7 @@ export const en: Dict = {
'settings.section.language': 'Language', 'settings.section.language': 'Language',
'settings.section.updates': 'Updates', 'settings.section.updates': 'Updates',
'settings.section.data': 'Data', 'settings.section.data': 'Data',
'settings.section.diagnostics': 'Diagnostics',
'settings.data.export.label': 'Export everything', 'settings.data.export.label': 'Export everything',
'settings.data.export.hint': 'settings.data.export.hint':
'Save a backup of exercises, history, challenges and settings to a JSON file.', 'Save a backup of exercises, history, challenges and settings to a JSON file.',
@@ -637,6 +653,20 @@ export const en: Dict = {
'All current exercises, history and settings will be replaced with the file contents. Continue?', 'All current exercises, history and settings will be replaced with the file contents. Continue?',
'settings.data.import.ok': 'Restored', 'settings.data.import.ok': 'Restored',
'settings.data.import.err': "Couldn't read the file — not our backup?", 'settings.data.import.err': "Couldn't read the file — not our backup?",
'settings.diagnostics.app.label': 'Application',
'settings.diagnostics.data.label': 'Data',
'settings.diagnostics.data.legend': 'ex/meal/ch/hist',
'settings.diagnostics.gsi.label': 'Dota GSI',
'settings.diagnostics.hint':
'Technical snapshot without tokens: versions, paths, statuses and counts.',
'settings.diagnostics.loading': 'Loading…',
'settings.diagnostics.err': 'Could not collect diagnostics',
'settings.diagnostics.refresh': 'Refresh diagnostics',
'settings.diagnostics.copy.btn': 'Copy',
'settings.diagnostics.copy.ok': 'Diagnostics copied',
'settings.diagnostics.logs.btn': 'Logs',
'settings.diagnostics.logs.ok': 'Logs folder opened',
'settings.diagnostics.logs.err': 'Could not open logs folder',
'settings.section.about': 'About', 'settings.section.about': 'About',
'settings.version.label': 'Version', 'settings.version.label': 'Version',
'settings.version.hint': 'Currently installed app version.', 'settings.version.hint': 'Currently installed app version.',

View File

@@ -0,0 +1,32 @@
function errorFields(err: unknown): { message: string; stack?: string } {
if (err instanceof Error) {
return {
message: err.message || err.name,
stack: err.stack
}
}
if (typeof err === 'string') return { message: err }
try {
return { message: JSON.stringify(err) }
} catch {
return { message: String(err) }
}
}
function report(source: string, err: unknown): void {
const { message, stack } = errorFields(err)
if (!message) return
void window.api
?.reportRendererError?.({ source, message, stack })
.catch(() => undefined)
}
export function installRendererErrorReporting(): void {
window.addEventListener('error', (event) => {
report('window.error', event.error ?? event.message)
})
window.addEventListener('unhandledrejection', (event) => {
report('window.unhandledrejection', event.reason)
})
}

View File

@@ -5,6 +5,9 @@ import './styles/globals.css'
import App from './App' import App from './App'
import ReminderApp from './ReminderApp' import ReminderApp from './ReminderApp'
import { ThemeProvider } from './providers/ThemeProvider' import { ThemeProvider } from './providers/ThemeProvider'
import { installRendererErrorReporting } from './lib/reporting'
installRendererErrorReporting()
const params = new URLSearchParams(window.location.search) const params = new URLSearchParams(window.location.search)
const which = params.get('window') ?? 'main' const which = params.get('window') ?? 'main'

View File

@@ -1,6 +1,8 @@
import { useEffect, useState } from 'react' import { useCallback, useEffect, useState } from 'react'
import { Copy, FolderOpen, RefreshCw } from 'lucide-react'
import { useAppStore } from '../store/appStore' import { useAppStore } from '../store/appStore'
import { Switch } from '../components/ui/Switch' import { Switch } from '../components/ui/Switch'
import { Button } from '../components/ui/Button'
import { Card, Row, SectionHeader } from '../components/ui/Card' import { Card, Row, SectionHeader } from '../components/ui/Card'
import { UpdaterCard } from '../components/UpdaterCard' import { UpdaterCard } from '../components/UpdaterCard'
import { WhatsNewModal } from '../components/WhatsNewModal' import { WhatsNewModal } from '../components/WhatsNewModal'
@@ -8,14 +10,16 @@ import { ConfirmModal } from '../components/ui/ConfirmModal'
import { Skeleton } from '../components/ui/Skeleton' import { Skeleton } from '../components/ui/Skeleton'
import { Spinner } from '../components/ui/Spinner' import { Spinner } from '../components/ui/Spinner'
import { RELEASE_NOTES } from '@shared/release-notes' import { RELEASE_NOTES } from '@shared/release-notes'
import { useT } from '../i18n' import { translate, useT } from '../i18n'
import type { import type {
DiagnosticsInfo,
Language, Language,
NotificationMode, NotificationMode,
QuietHours, QuietHours,
Settings as SettingsType, Settings as SettingsType,
Theme Theme
} from '@shared/types' } from '@shared/types'
import { parseHHMM } from '@shared/types'
export default function SettingsPage(): JSX.Element { export default function SettingsPage(): JSX.Element {
const settings = useAppStore((s) => s.state?.settings) const settings = useAppStore((s) => s.state?.settings)
@@ -192,6 +196,11 @@ export default function SettingsPage(): JSX.Element {
<DataCard /> <DataCard />
</div> </div>
<div className="mt-6">
<SectionHeader title={t('settings.section.diagnostics')} />
<DiagnosticsCard />
</div>
<div className="mt-6"> <div className="mt-6">
<SectionHeader title={t('settings.section.about')} /> <SectionHeader title={t('settings.section.about')} />
<AboutCard /> <AboutCard />
@@ -201,6 +210,153 @@ export default function SettingsPage(): JSX.Element {
) )
} }
function DiagnosticsCard(): JSX.Element {
const { t, lang } = useT()
const [info, setInfo] = useState<DiagnosticsInfo | null>(null)
const [busy, setBusy] = useState<'refresh' | 'copy' | 'logs' | null>(null)
const [toast, setToast] = useState<string | null>(null)
const refresh = useCallback(async (): Promise<void> => {
setBusy('refresh')
try {
setInfo(await window.api.getDiagnostics())
} catch {
setToast(translate(lang, 'settings.diagnostics.err'))
} finally {
setBusy(null)
}
}, [lang])
useEffect(() => {
void refresh()
}, [refresh])
useEffect(() => {
if (!toast) return
const id = setTimeout(() => setToast(null), 4000)
return () => clearTimeout(id)
}, [toast])
async function copy(): Promise<void> {
setBusy('copy')
try {
setInfo(await window.api.copyDiagnostics())
setToast(t('settings.diagnostics.copy.ok'))
} catch {
setToast(t('settings.diagnostics.err'))
} finally {
setBusy(null)
}
}
async function openLogs(): Promise<void> {
setBusy('logs')
try {
const r = await window.api.openLogsFolder()
setToast(
r.ok
? t('settings.diagnostics.logs.ok')
: t('settings.diagnostics.logs.err')
)
} catch {
setToast(t('settings.diagnostics.logs.err'))
} finally {
setBusy(null)
}
}
const appLine = info
? `v${info.app.version} · Electron ${info.runtime.electron}`
: t('settings.diagnostics.loading')
const dataLine = info
? `${info.store.exercises}/${info.store.meals}/${info.store.challenges}/${info.store.history}`
: '—'
const gsiLine = info
? `${info.gsi.running ? 'live' : 'off'} · ${info.gsi.baseUrl}`
: '—'
return (
<Card>
<Row>
<div className="flex-1 min-w-0">
<div className="text-[15px] font-semibold leading-tight">
{t('settings.diagnostics.app.label')}
</div>
<div className="text-[13px] text-text/65 mt-1 leading-snug">
{appLine}
</div>
</div>
<Button
type="button"
size="sm"
variant="plain"
onClick={refresh}
disabled={busy !== null}
title={t('settings.diagnostics.refresh')}
aria-label={t('settings.diagnostics.refresh')}
>
<RefreshCw size={16} />
</Button>
</Row>
<Row>
<div className="flex-1 min-w-0">
<div className="text-[15px] font-semibold leading-tight">
{t('settings.diagnostics.data.label')}
</div>
<div className="text-[13px] text-text/65 mt-1 leading-snug">
{dataLine}
</div>
</div>
<div className="text-[12px] text-text/50 font-semibold whitespace-nowrap">
{t('settings.diagnostics.data.legend')}
</div>
</Row>
<Row>
<div className="flex-1 min-w-0">
<div className="text-[15px] font-semibold leading-tight">
{t('settings.diagnostics.gsi.label')}
</div>
<div className="text-[13px] text-text/65 mt-1 leading-snug truncate">
{gsiLine}
</div>
</div>
</Row>
<Row last className="flex-wrap justify-end">
<div className="flex-1 min-w-[180px] text-[13px] text-text/65 leading-snug">
{t('settings.diagnostics.hint')}
</div>
<div className="flex items-center gap-2">
<Button
type="button"
size="sm"
variant="tinted"
onClick={openLogs}
disabled={busy !== null}
>
<FolderOpen size={16} />
{t('settings.diagnostics.logs.btn')}
</Button>
<Button
type="button"
size="sm"
variant="filled"
onClick={copy}
disabled={busy !== null}
>
<Copy size={16} />
{t('settings.diagnostics.copy.btn')}
</Button>
</div>
</Row>
{toast && (
<div className="px-4 py-2.5 text-[13px] text-text/75 bg-accent/8 truncate font-medium">
{toast}
</div>
)}
</Card>
)
}
function AboutCard(): JSX.Element { function AboutCard(): JSX.Element {
const { t } = useT() const { t } = useT()
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)
@@ -399,11 +555,10 @@ function QuietTimesRow({
}): JSX.Element { }): JSX.Element {
const { t } = useT() const { t } = useT()
// Local mirror of from/to so typing doesn't fire an IPC + disk write per // Local mirror of from/to so typing doesn't fire an IPC + disk write per
// keystroke. We commit on blur (or when validation passes during typing). // keystroke. We commit on blur and only send values accepted by the shared
// The HH:MM regex catches the moment the user has typed a full time. // HH:MM parser.
const [from, setFrom] = useState(qh.from) const [from, setFrom] = useState(qh.from)
const [to, setTo] = useState(qh.to) const [to, setTo] = useState(qh.to)
const HHMM = /^\d{1,2}:\d{2}$/
// Sync from props when an external state change happens (lang switch, // Sync from props when an external state change happens (lang switch,
// pause toggle), but only if user isn't mid-edit. // pause toggle), but only if user isn't mid-edit.
@@ -417,7 +572,7 @@ function QuietTimesRow({
const commit = (next: { from?: string; to?: string }): void => { const commit = (next: { from?: string; to?: string }): void => {
const f = next.from ?? from const f = next.from ?? from
const tt = next.to ?? to const tt = next.to ?? to
if (!HHMM.test(f) || !HHMM.test(tt)) return if (parseHHMM(f) === null || parseHHMM(tt) === null) return
if (f === qh.from && tt === qh.to) return if (f === qh.from && tt === qh.to) return
onChange({ ...qh, from: f, to: tt }) onChange({ ...qh, from: f, to: tt })
} }

View File

@@ -19,6 +19,10 @@ export const IPC = {
getAccentColor: 'system:accentColor', getAccentColor: 'system:accentColor',
getOsTheme: 'system:osTheme', getOsTheme: 'system:osTheme',
getAppVersion: 'system:appVersion', getAppVersion: 'system:appVersion',
getDiagnostics: 'system:diagnostics',
openLogsFolder: 'system:openLogsFolder',
copyDiagnostics: 'system:copyDiagnostics',
reportRendererError: 'system:reportRendererError',
pauseAll: 'app:pauseAll', pauseAll: 'app:pauseAll',
resumeAll: 'app:resumeAll', resumeAll: 'app:resumeAll',

View File

@@ -300,7 +300,7 @@ export const DEFAULT_SETTINGS: Settings = {
const HHMM_RE = /^(\d{1,2}):(\d{2})$/ const HHMM_RE = /^(\d{1,2}):(\d{2})$/
/** Parse `HH:MM` into minutes-since-midnight, or `null` if malformed. */ /** Parse `HH:MM` into minutes-since-midnight, or `null` if malformed. */
function parseHHMM(s: string): number | null { export function parseHHMM(s: string): number | null {
const m = HHMM_RE.exec(s) const m = HHMM_RE.exec(s)
if (!m) return null if (!m) return null
const h = Number(m[1]) const h = Number(m[1])
@@ -455,3 +455,45 @@ export type UpdaterStatus =
} }
| { kind: 'downloaded'; version: string } | { kind: 'downloaded'; version: string }
| { kind: 'error'; message: string } | { kind: 'error'; message: string }
export type DiagnosticsInfo = {
generatedAt: number
app: {
version: string
isPackaged: boolean
platform: string
arch: string
}
runtime: {
electron: string
chrome: string
node: string
}
paths: {
userData: string
store: string
logs: string
}
store: {
bytes: number | null
exercises: number
meals: number
challenges: number
history: number
}
updater: UpdaterStatus
games: GameStatus[]
gsi: {
running: boolean
port: number
baseUrl: string
}
meetingActive: boolean
}
export type RendererErrorReport = {
message: string
stack?: string
componentStack?: string
source?: string
}