9 Commits

Author SHA1 Message Date
Codex
baf96ca0fa chore(release): v0.6.2 2026-06-06 20:52:33 +07:00
Codex
7c40558cd3 feat(app): add diagnostics and update runtime 2026-06-06 20:42:34 +07:00
Codex
925181a3b7 feat(dashboard): add daily plan summary 2026-06-06 13:31:06 +07:00
Codex
8196bd3351 chore: force tls 1.2 for release uploads 2026-06-06 12:53:39 +07:00
Codex
b5f6952ad2 chore(release): v0.6.1 2026-06-06 12:37:53 +07:00
Codex
ffe80b62c4 fix: harden reminders and state handling 2026-06-06 02:27:04 +07:00
AnRil
ad000c722e fix(meals): плавная анимация переключателя в обе стороны
Список «Питания» разбивался на два <Card> (активные/выключенные). При
переключении строка переезжала между списками → её Switch размонтировался и
монтировался заново, и ползунок анимировался только при включении (mount
x:0→20), а при выключении — нет.

Теперь единый keyed-список (включённые сверху): Switch остаётся смонтированным,
ползунок плавно ездит в обе стороны, а строка «переезжает» в свою группу через
framer layout-анимацию. Иконке добавлен transition-colors. Глобальный Switch не
трогал — Упражнения/Дашборд не затронуты.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-06 00:13:07 +07:00
AnRil
c0827f887f chore(release): v0.6.0 2026-06-05 22:16:52 +07:00
AnRil
bef733a877 feat(meals): вкладка «Питание» — напоминания о еде по времени суток
Новая модель Meal — напоминание по настенным часам (time HH:MM + дни недели),
в отличие от interval-based Exercise. Отдельная вкладка «Питание» с пресетами
быстрого добавления (Завтрак/Обед/Ужин/Перекус).

- shared: тип Meal, meals в AppState, nextMealOccurrence (DST-safe), SAMPLE_MEALS,
  MEAL_PRESETS; IPC-каналы meal:* + evtFireMeal
- main: валидация (строгая HH:MM-проверка диапазона), store-мутаторы с пересчётом
  nextFireAt, scheduler.checkDueMeals (гейт только globalEnabled, grace-окно 120с,
  игнор тихих часов/ВКС), notifications.fireMealReminder, IPC-хендлеры
- renderer: вкладка Meals + MealEditor (время/дни/иконка), MealReminder в окне
  напоминания (Поел/Отложить, TTS), пункт в Sidebar, маршрут, i18n RU/EN, иконки
  UtensilsCrossed/Soup
- persistence: meals additive (без bump схемы — старые state'ы получают [])
- +24 теста (203 -> 227): nextMealOccurrence, валидаторы приёмов пищи,
  scheduler meal-gating (вкл/выкл, grace, игнор тихих часов)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-03 23:45:34 +07:00
47 changed files with 5806 additions and 2859 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

@@ -12,7 +12,7 @@
- **Build**: electron-vite 2 + Vite 5 + electron-builder 25 (NSIS, x64 only) - **Build**: electron-vite 2 + Vite 5 + electron-builder 25 (NSIS, x64 only)
- **UI**: React 18 + TypeScript 5 + Tailwind 3 + framer-motion + react-router (HashRouter) + zustand 5 - **UI**: React 18 + TypeScript 5 + Tailwind 3 + framer-motion + react-router (HashRouter) + zustand 5
- **Auto-update**: electron-updater 6, generic provider, фиксированный канал - **Auto-update**: electron-updater 6, generic provider, фиксированный канал
- **Тесты**: Vitest 4 (203 теста, все зелёные) - **Тесты**: Vitest 4 (227 тестов, все зелёные)
- **Lint/format**: ESLint 8 (flat-ish .eslintrc.cjs) + Prettier 3 + EditorConfig - **Lint/format**: ESLint 8 (flat-ish .eslintrc.cjs) + Prettier 3 + EditorConfig
- **Иконки**: lucide-react (whitelisted lookup через `ICON_CHOICES`) - **Иконки**: lucide-react (whitelisted lookup через `ICON_CHOICES`)
- **Шрифты**: Plus Jakarta Sans, Bricolage Grotesque, JetBrains Mono (Google Fonts CDN) - **Шрифты**: Plus Jakarta Sans, Bricolage Grotesque, JetBrains Mono (Google Fonts CDN)
@@ -68,6 +68,20 @@
- Wrap-around (22:00 → 07:00) корректно — при wrap-active проверяется день *начала* окна - Wrap-around (22:00 → 07:00) корректно — при wrap-active проверяется день *начала* окна
- Тесты в `src/shared/quiet-hours.test.ts` - Тесты в `src/shared/quiet-hours.test.ts`
### Питание / приёмы пищи (вкладка «Питание»)
- **Отдельная модель `Meal`** (`src/shared/types.ts`): напоминание ПО ВРЕМЕНИ СУТОК
(`time` HH:MM + `days` weekdays), в отличие от interval-based `Exercise`
- `nextMealOccurrence(time, days, fromMs)` — следующее срабатывание, календарная
арифметика (DST-safe, как history.ts). Тесты в `src/shared/meals.test.ts`
- Scheduler `checkDueMeals()` (`src/main/scheduler.ts`): гейтит **только**
`globalEnabled` (НЕ тихие часы / НЕ ВКС — время задано пользователем явно).
Grace-окно `MEAL_GRACE_MS=120s`: приём, пропущенный давно (сон/выкл), тихо
переносится без срабатывания, чтобы не вывалить пачку напоминаний разом
- Окно напоминания: `evtFireMeal``MealReminder` в `ReminderApp.tsx` (зелёный
акцент `bg-success`, кнопки «Поел» / «Отложить»)
- Пресеты быстрого добавления — `MEAL_PRESETS` (имена через i18n-ключи)
- Время валидируется строго (`validHHMM` в validate.ts — диапазон, не только форма)
### История / стрики ### История / стрики
- `src/renderer/src/lib/history.ts` — DST-safe через `shiftDays()` (calendar `setDate`, не ms-арифметика) - `src/renderer/src/lib/history.ts` — DST-safe через `shiftDays()` (calendar `setDate`, не ms-арифметика)
- Cap 10k записей, trim oldest 10% на overflow - Cap 10k записей, trim oldest 10% на overflow
@@ -119,38 +133,41 @@ npm run release -- -Bump patch
| `package.json` | version, publish.url, scripts, deps | | `package.json` | version, publish.url, scripts, deps |
| `src/main/store.ts` | persistence, migrations, validation, atomic writes | | `src/main/store.ts` | persistence, migrations, validation, atomic writes |
| `src/main/ipc.ts` | IPC handlers с валидацией | | `src/main/ipc.ts` | IPC handlers с валидацией |
| `src/main/scheduler.ts` | таймеры упражнений, powerMonitor | | `src/main/scheduler.ts` | таймеры упражнений (interval) + приёмы пищи (clock-time), powerMonitor |
| `src/main/games/dota2.ts` + `gsi-server.ts` | GSI приём матчей | | `src/main/games/dota2.ts` + `gsi-server.ts` | GSI приём матчей |
| `src/main/updater.ts` | auto-update logic, silent retries | | `src/main/updater.ts` | auto-update logic, silent retries |
| `src/shared/types.ts` | shared типы, дефолты, isQuietAt | | `src/shared/types.ts` | shared типы, дефолты, isQuietAt |
| `src/shared/ipc.ts` | IPC channel types | | `src/shared/ipc.ts` | IPC channel types |
| `src/renderer/src/i18n/dict.ts` | словари | | `src/renderer/src/i18n/dict.ts` | словари |
| `src/renderer/src/pages/Dashboard.tsx` | главная | | `src/renderer/src/pages/Dashboard.tsx` | главная |
| `src/renderer/src/ReminderApp.tsx` | окно напоминания | | `src/renderer/src/pages/Meals.tsx` + `components/MealEditor.tsx` | вкладка «Питание» |
| `src/renderer/src/ReminderApp.tsx` | окно напоминания (упражнение / еда / матч) |
## Тесты (203) ## Тесты (227)
``` ```
src/main/validate.test.ts (68) 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) ← main: gating + приёмы пищи
src/main/games/vdf.test.ts (11) src/main/games/vdf.test.ts (11)
src/main/store.test.ts (10) ← main: миграции/карантин/cap src/main/store.test.ts (10) ← main: миграции/карантин/cap
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/main/scheduler.test.ts (8) ← main: gating-логика src/shared/meals.test.ts (8) ← nextMealOccurrence (DST-safe)
src/main/meeting-detect.test.ts (7) ← main: детект ВКС + кэш/timeout src/main/meeting-detect.test.ts (7) ← main: детект ВКС + кэш/timeout
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/shared/types.test.ts (4) src/shared/types.test.ts (4)
src/renderer/src/lib/icon-choices.test.ts (3) src/renderer/src/lib/icon-choices.test.ts (4)
``` ```
Покрываются: IPC-валидация, persistence (миграции/карантин/cap), scheduler-gating Покрываются: IPC-валидация (упражнения/челленджи/приёмы пищи), persistence
(тихие часы/ВКС/daily-goal), детект ВКС (мок child_process), helpers, история/стрики (миграции/карантин/cap), scheduler-gating (тихие часы/ВКС/daily-goal), планирование
(DST), тихие часы (wrap+filter), VDF-парсер Steam, достижения, i18n с плюрализацией, приёмов пищи по времени суток (DST-safe, grace-окно, игнор тихих часов), детект ВКС
дефолты. (мок child_process), helpers, история/стрики (DST), тихие часы (wrap+filter),
VDF-парсер Steam, достижения, i18n с плюрализацией, дефолты.
Паттерн для main-тестов: `vi.mock('electron'|'./store'|'node:child_process')` + Паттерн для main-тестов: `vi.mock('electron'|'./store'|'node:child_process')` +
`vi.resetModules()` + dynamic import (сброс module-level состояния между тестами). `vi.resetModules()` + dynamic import (сброс module-level состояния между тестами).

View File

@@ -2,13 +2,14 @@
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)]()
## Что внутри ## Что внутри
- **Гибкие напоминания** — любое количество упражнений, интервал от минуты до часов, разные иконки. - **Гибкие напоминания** — любое количество упражнений, интервал от минуты до часов, разные иконки.
- **Питание** — отдельная вкладка с приёмами пищи по времени суток (завтрак/обед/ужин/перекусы), выбор дней недели, пресеты быстрого добавления. Напоминания по настенным часам, а не по интервалу.
- **История и стрики** — heatmap-календарь активности, ежедневный счётчик, серия дней подряд. - **История и стрики** — heatmap-календарь активности, ежедневный счётчик, серия дней подряд.
- **Тихие часы** — окно времени когда напоминания подавляются (например `22:00 → 08:00`), с выбором дней недели. - **Тихие часы** — окно времени когда напоминания подавляются (например `22:00 → 08:00`), с выбором дней недели.
- **Сделал частично** — степпер `/+` в окне напоминания: если ты сделал 5 из 10, в историю запишется честное число. - **Сделал частично** — степпер `/+` в окне напоминания: если ты сделал 5 из 10, в историю запишется честное число.
@@ -44,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
@@ -55,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()`
@@ -66,25 +68,27 @@ npm run release -- -Bump patch # bump версии + tag + push + upload в G
## Тесты ## Тесты
``` ```
src/main/validate.test.ts (68) 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 (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/main/scheduler.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 (3) src/renderer/src/lib/icon-choices.test.ts (4)
────────────────────────────────────────── ──────────────────────────────────────────
203 ✓ 238
``` ```
Покрытие: IPC-валидация, persistence (миграции, карантин битого JSON, history cap), scheduler-гейтинг (тихие часы, ВКС-пауза, daily-goal), детект ВКС, история/стрики (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, пока риск не разобран отдельно.

5102
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{ {
"name": "laude", "name": "laude",
"version": "0.5.8", "version": "0.6.2",
"description": "Exercise reminder — Windows desktop app", "description": "Exercise reminder — Windows desktop app",
"main": "out/main/index.js", "main": "out/main/index.js",
"author": "AnRil", "author": "AnRil",
@@ -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,11 +43,13 @@
"@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",
"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",
"eslint": "^8.57.1", "eslint": "^8.57.1",
"eslint-plugin-react": "^7.37.2", "eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.0.0", "eslint-plugin-react-hooks": "^5.0.0",
@@ -54,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": {

View File

@@ -116,9 +116,6 @@ $pkgJson = [System.IO.File]::ReadAllText($pkgPath, $utf8NoBom)
$pkgJson = $pkgJson -replace "`"version`":\s*`"$current`"", "`"version`": `"$next`"" $pkgJson = $pkgJson -replace "`"version`":\s*`"$current`"", "`"version`": `"$next`""
[System.IO.File]::WriteAllText($pkgPath, $pkgJson, $utf8NoBom) [System.IO.File]::WriteAllText($pkgPath, $pkgJson, $utf8NoBom)
git add package.json
git commit -m "chore(release): $tag"
# --- Quality gates ------------------------------------------------------ # --- Quality gates ------------------------------------------------------
if (-not $SkipBuild) { if (-not $SkipBuild) {
Write-Host "Typecheck..." -ForegroundColor Cyan Write-Host "Typecheck..." -ForegroundColor Cyan
@@ -145,6 +142,12 @@ foreach ($f in @($installer, $blockmap, $manifest)) {
} }
} }
# Commit only after quality gates and artifact verification pass. If a check
# fails, package.json remains modified but history does not get a broken
# release commit/tag.
git add package.json
git commit -m "chore(release): $tag"
# --- Tag + push --------------------------------------------------------- # --- Tag + push ---------------------------------------------------------
Write-Host "Tagging $tag and pushing..." -ForegroundColor Cyan Write-Host "Tagging $tag and pushing..." -ForegroundColor Cyan
git tag -a $tag -m "Release $tag" git tag -a $tag -m "Release $tag"

View File

@@ -30,6 +30,10 @@ param(
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
# Windows PowerShell 5.1 can default to older TLS settings and fail against
# modern HTTPS endpoints before curl.exe gets a chance to upload assets.
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
$repoOwner = 'AnRil' $repoOwner = 'AnRil'
$repoName = 'laude' $repoName = 'laude'
$giteaHost = 'git.xn--90adajar8af4h.xn--p1ai' $giteaHost = 'git.xn--90adajar8af4h.xn--p1ai'

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

@@ -0,0 +1,119 @@
import { beforeEach, describe, expect, it, vi } from 'vitest'
const h = vi.hoisted(() => ({
provider: {
displayName: 'Dota 2',
start: vi.fn(),
stop: vi.fn(),
detect: vi.fn(),
install: vi.fn(),
uninstall: vi.fn(),
reconcile: vi.fn()
},
startGsiServer: vi.fn(),
stopGsiServer: vi.fn(),
onLaunchOptionsApplied: vi.fn(),
gamesEnabled: { dota2: true },
fireMatchSummary: vi.fn(),
log: { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() }
}))
vi.mock('electron', () => ({
BrowserWindow: { getAllWindows: () => [] }
}))
vi.mock('./dota2', () => ({
Dota2Provider: vi.fn(function Dota2Provider() {
return h.provider
})
}))
vi.mock('./gsi-server', () => ({
startGsiServer: h.startGsiServer,
stopGsiServer: h.stopGsiServer
}))
vi.mock('./steam-launch-options', () => ({
onLaunchOptionsApplied: h.onLaunchOptionsApplied
}))
vi.mock('../store', () => ({
getChallenges: () => [],
getGamesEnabled: () => h.gamesEnabled
}))
vi.mock('../notifications', () => ({
fireMatchSummary: h.fireMatchSummary
}))
vi.mock('../logger', () => ({
log: h.log
}))
async function loadRegistry(): Promise<typeof import('./registry')> {
return import('./registry')
}
beforeEach(() => {
vi.resetModules()
h.provider.start.mockResolvedValue(undefined)
h.provider.stop.mockResolvedValue(undefined)
h.provider.detect.mockResolvedValue({
id: 'dota2',
name: 'Dota 2',
installed: true,
integrationActive: true,
launchOptionStatus: 'applied',
enabled: true
})
h.provider.install.mockResolvedValue(undefined)
h.provider.uninstall.mockResolvedValue(undefined)
h.provider.reconcile.mockResolvedValue(undefined)
h.startGsiServer.mockReset()
h.startGsiServer.mockResolvedValue(undefined)
h.stopGsiServer.mockReset()
h.stopGsiServer.mockResolvedValue(undefined)
h.onLaunchOptionsApplied.mockClear()
h.fireMatchSummary.mockClear()
h.log.info.mockClear()
h.log.warn.mockClear()
h.log.error.mockClear()
h.log.debug.mockClear()
})
describe('games registry lifecycle', () => {
it('сбрасывает running после ошибки старта GSI и позволяет повторный старт', async () => {
h.startGsiServer
.mockRejectedValueOnce(new Error('port busy'))
.mockResolvedValueOnce(undefined)
const { startGamesRegistry } = await loadRegistry()
await startGamesRegistry()
await startGamesRegistry()
expect(h.startGsiServer).toHaveBeenCalledTimes(2)
expect(h.provider.start).toHaveBeenCalledTimes(1)
})
it('stopGamesRegistry ждёт полного shutdown GSI-сервера', async () => {
let releaseStop!: () => void
const stopPromise = new Promise<void>((resolve) => {
releaseStop = resolve
})
h.stopGsiServer.mockReturnValue(stopPromise)
const { startGamesRegistry, stopGamesRegistry } = await loadRegistry()
await startGamesRegistry()
let resolved = false
const pending = stopGamesRegistry().then(() => {
resolved = true
})
await Promise.resolve()
expect(resolved).toBe(false)
releaseStop()
await pending
expect(resolved).toBe(true)
})
})

View File

@@ -87,6 +87,7 @@ export async function startGamesRegistry(): Promise<void> {
await startGsiServer() await startGsiServer()
log.info('[games] GSI server started on port 4701') log.info('[games] GSI server started on port 4701')
} catch (err) { } catch (err) {
running = false
log.error('[games] GSI server failed to start', err) log.error('[games] GSI server failed to start', err)
return return
} }
@@ -119,7 +120,7 @@ export async function stopGamesRegistry(): Promise<void> {
for (const id of Object.keys(providers) as GameId[]) { for (const id of Object.keys(providers) as GameId[]) {
await providers[id].stop() await providers[id].stop()
} }
stopGsiServer() await stopGsiServer()
} }
export async function listGamesStatus(): Promise<GameStatus[]> { export async function listGamesStatus(): Promise<GameStatus[]> {

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,13 +10,20 @@ 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,
addMeal,
clearHistory, clearHistory,
deleteChallenge, deleteChallenge,
deleteExercise, deleteExercise,
deleteMeal,
exportState, exportState,
getHistory, getHistory,
getState, getState,
@@ -24,11 +31,13 @@ import {
importState, importState,
markChallengeDone, markChallengeDone,
markDone, markDone,
markMealDone,
setGameEnabled, setGameEnabled,
skip, skip,
snooze, snooze,
updateChallenge, updateChallenge,
updateExercise, updateExercise,
updateMeal,
updateSettings updateSettings
} from './store' } from './store'
import { broadcastHistoryChanged, broadcastState } from './state-actions' import { broadcastHistoryChanged, broadcastState } from './state-actions'
@@ -58,10 +67,19 @@ import {
validateExerciseInput, validateExerciseInput,
validateExercisePatch, validateExercisePatch,
validateId, validateId,
validateMealInput,
validateMealPatch,
validateSettingsPatch, validateSettingsPatch,
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`: ловит любое исключение в обработчике,
@@ -99,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)
@@ -110,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) и с актуальным значением
@@ -130,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)
@@ -150,28 +177,27 @@ 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)
if (!id) return null if (!id) return null
const ex = markDone(id, validateActualReps(repsRaw)) const ex = markDone(id, validateActualReps(repsRaw))
broadcastState() if (ex) {
broadcastHistoryChanged() broadcastState()
broadcastHistoryChanged()
}
return ex return ex
}) })
@@ -180,8 +206,10 @@ export function registerIpc(): void {
const minutes = validateSnoozeMinutes(minRaw) const minutes = validateSnoozeMinutes(minRaw)
if (!id || minutes === null) return null if (!id || minutes === null) return null
const ex = snooze(id, minutes) const ex = snooze(id, minutes)
broadcastState() if (ex) {
broadcastHistoryChanged() broadcastState()
broadcastHistoryChanged()
}
return ex return ex
}) })
@@ -189,11 +217,58 @@ export function registerIpc(): void {
const id = validateId(idRaw) const id = validateId(idRaw)
if (!id) return null if (!id) return null
const ex = skip(id) const ex = skip(id)
broadcastState() if (ex) {
broadcastHistoryChanged() broadcastState()
broadcastHistoryChanged()
}
return ex return ex
}) })
// Meals (приёмы пищи — напоминания по времени суток)
safeHandle(IPC.addMeal, (_e, input: unknown) => {
const safe = validateMealInput(input)
if (!safe) return null
const m = addMeal(safe)
broadcastState()
return m
})
safeHandle(IPC.updateMeal, (_e, idRaw: unknown, patchRaw: unknown) => {
const id = validateId(idRaw)
const patch = validateMealPatch(patchRaw)
if (!id || !patch) return null
const m = updateMeal(id, patch)
broadcastState()
return m
})
safeHandle(IPC.deleteMeal, (_e, idRaw: unknown) => {
const id = validateId(idRaw)
if (!id) return false
const ok = deleteMeal(id)
broadcastState()
return ok
})
safeHandle(IPC.toggleMeal, (_e, idRaw: unknown, enabledRaw: unknown) => {
const id = validateId(idRaw)
if (!id || typeof enabledRaw !== 'boolean') return null
const m = updateMeal(id, { enabled: enabledRaw })
broadcastState()
return m
})
safeHandle(IPC.markMealDone, (_e, idRaw: unknown) => {
const id = validateId(idRaw)
if (!id) return null
const m = markMealDone(id)
if (m) {
broadcastState()
broadcastHistoryChanged()
}
return m
})
safeHandle(IPC.updateSettings, (_e, patchRaw: unknown) => { safeHandle(IPC.updateSettings, (_e, patchRaw: unknown) => {
const patch = validateSettingsPatch(patchRaw) const patch = validateSettingsPatch(patchRaw)
if (!patch) return null if (!patch) return null
@@ -242,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())
@@ -312,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
@@ -330,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
@@ -391,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'] }]
}) })
@@ -423,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
} }

View File

@@ -21,6 +21,8 @@ const h = vi.hoisted(() => ({
log: { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() } log: { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() }
})) }))
const originalPlatform = process.platform
vi.mock('node:child_process', () => ({ vi.mock('node:child_process', () => ({
exec: (cmd: string, opts: unknown, cb: ExecCb) => { exec: (cmd: string, opts: unknown, cb: ExecCb) => {
h.calls += 1 h.calls += 1
@@ -39,8 +41,16 @@ async function load(): Promise<typeof import('./meeting-detect')> {
return import('./meeting-detect') return import('./meeting-detect')
} }
function setPlatform(platform: NodeJS.Platform): void {
Object.defineProperty(process, 'platform', {
value: platform,
configurable: true
})
}
beforeEach(() => { beforeEach(() => {
vi.resetModules() vi.resetModules()
setPlatform('win32')
h.calls = 0 h.calls = 0
h.execImpl = (_cmd, _opts, cb) => cb(null, { stdout: '' }) h.execImpl = (_cmd, _opts, cb) => cb(null, { stdout: '' })
h.log.info.mockClear() h.log.info.mockClear()
@@ -48,6 +58,7 @@ beforeEach(() => {
}) })
afterEach(() => { afterEach(() => {
setPlatform(originalPlatform)
vi.restoreAllMocks() vi.restoreAllMocks()
}) })
@@ -96,14 +107,9 @@ describe('isMeetingActive', () => {
}) })
it('на не-Windows возвращает false без вызова tasklist', async () => { it('на не-Windows возвращает false без вызова tasklist', async () => {
const original = process.platform setPlatform('linux')
Object.defineProperty(process, 'platform', { value: 'linux' }) const { isMeetingActive } = await load()
try { expect(await isMeetingActive()).toBe(false)
const { isMeetingActive } = await load() expect(h.calls).toBe(0)
expect(await isMeetingActive()).toBe(false)
expect(h.calls).toBe(0)
} finally {
Object.defineProperty(process, 'platform', { value: original })
}
}) })
}) })

View File

@@ -1,5 +1,10 @@
import { Notification, app } from 'electron' import { Notification, app } from 'electron'
import type { Exercise, MatchSummary, NotificationMode } from '@shared/types' import type {
Exercise,
MatchSummary,
Meal,
NotificationMode
} from '@shared/types'
import { IPC } from '@shared/ipc' import { IPC } from '@shared/ipc'
import { import {
createReminderWindow, createReminderWindow,
@@ -12,6 +17,35 @@ export function fireReminder(exercise: Exercise, mode: NotificationMode): void {
if (mode === 'modal' || mode === 'both') showModal(exercise) if (mode === 'modal' || mode === 'both') showModal(exercise)
} }
export function fireMealReminder(meal: Meal, mode: NotificationMode): void {
if (mode === 'toast' || mode === 'both') showMealToast(meal)
if (mode === 'modal' || mode === 'both') showMealModal(meal)
}
function showMealToast(meal: Meal): void {
if (!Notification.isSupported()) return
const n = new Notification({
title: app.getName(),
body: meal.name,
silent: false
})
n.on('click', () => showReminderWindow())
n.show()
}
function showMealModal(meal: Meal): void {
const win = createReminderWindow()
const send = (): void => {
win.webContents.send(IPC.evtFireMeal, meal)
}
if (win.webContents.isLoading()) {
win.webContents.once('did-finish-load', send)
} else {
send()
}
showReminderWindow()
}
export function fireMatchSummary(summary: MatchSummary): void { export function fireMatchSummary(summary: MatchSummary): void {
if (Notification.isSupported()) { if (Notification.isSupported()) {
const totalReps = summary.results.reduce((s, r) => s + r.reps, 0) const totalReps = summary.results.reduce((s, r) => s + r.reps, 0)

View File

@@ -2,6 +2,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
import type { import type {
Exercise, Exercise,
HistoryEntry, HistoryEntry,
Meal,
QuietHours, QuietHours,
Settings Settings
} from '@shared/types' } from '@shared/types'
@@ -16,10 +17,13 @@ import { DEFAULT_SETTINGS } from '@shared/types'
const h = vi.hoisted(() => ({ const h = vi.hoisted(() => ({
settings: null as Settings | null, settings: null as Settings | null,
exercises: [] as Exercise[], exercises: [] as Exercise[],
meals: [] as Meal[],
history: [] as HistoryEntry[], history: [] as HistoryEntry[],
meetingActive: false, meetingActive: false,
fireReminder: vi.fn(), fireReminder: vi.fn(),
fireMealReminder: vi.fn(),
updateExercise: vi.fn(), updateExercise: vi.fn(),
updateMeal: vi.fn(),
broadcastState: vi.fn(), broadcastState: vi.fn(),
refreshMeetingState: vi.fn(), refreshMeetingState: vi.fn(),
adjustNextFireAt: vi.fn((_ex: Exercise, candidate: number) => candidate) adjustNextFireAt: vi.fn((_ex: Exercise, candidate: number) => candidate)
@@ -32,14 +36,23 @@ vi.mock('electron', () => ({
vi.mock('./store', () => ({ vi.mock('./store', () => ({
getSettings: () => h.settings, getSettings: () => h.settings,
getExercises: () => h.exercises, getExercises: () => h.exercises,
getMeals: () => h.meals,
getHistory: () => h.history, getHistory: () => h.history,
updateExercise: (id: string, patch: Partial<Exercise>) => { updateExercise: (id: string, patch: Partial<Exercise>) => {
h.updateExercise(id, patch) h.updateExercise(id, patch)
const ex = h.exercises.find((e) => e.id === id) const ex = h.exercises.find((e) => e.id === id)
return ex ? { ...ex, ...patch } : undefined return ex ? { ...ex, ...patch } : undefined
},
updateMeal: (id: string, patch: Partial<Meal>) => {
h.updateMeal(id, patch)
const m = h.meals.find((e) => e.id === id)
return m ? { ...m, ...patch } : undefined
} }
})) }))
vi.mock('./notifications', () => ({ fireReminder: h.fireReminder })) vi.mock('./notifications', () => ({
fireReminder: h.fireReminder,
fireMealReminder: h.fireMealReminder
}))
vi.mock('./state-actions', () => ({ broadcastState: h.broadcastState })) vi.mock('./state-actions', () => ({ broadcastState: h.broadcastState }))
vi.mock('./meeting-detect', () => ({ vi.mock('./meeting-detect', () => ({
isMeetingActiveSync: () => h.meetingActive, isMeetingActiveSync: () => h.meetingActive,
@@ -78,14 +91,30 @@ async function loadScheduler(): Promise<typeof import('./scheduler')> {
return import('./scheduler') return import('./scheduler')
} }
function makeMeal(over: Partial<Meal> = {}): Meal {
return {
id: 'm1',
name: 'Обед',
time: '13:00',
icon: 'Soup',
enabled: true,
days: [],
nextFireAt: Date.now() - 1000, // due, в пределах grace
...over
}
}
beforeEach(() => { beforeEach(() => {
vi.resetModules() vi.resetModules()
h.settings = { ...DEFAULT_SETTINGS } h.settings = { ...DEFAULT_SETTINGS }
h.exercises = [] h.exercises = []
h.meals = []
h.history = [] h.history = []
h.meetingActive = false h.meetingActive = false
h.fireReminder.mockClear() h.fireReminder.mockClear()
h.fireMealReminder.mockClear()
h.updateExercise.mockClear() h.updateExercise.mockClear()
h.updateMeal.mockClear()
h.broadcastState.mockClear() h.broadcastState.mockClear()
h.refreshMeetingState.mockClear() h.refreshMeetingState.mockClear()
h.adjustNextFireAt.mockClear() h.adjustNextFireAt.mockClear()
@@ -157,6 +186,21 @@ describe('checkDueExercises gating', () => {
expect(h.updateExercise).toHaveBeenCalled() expect(h.updateExercise).toHaveBeenCalled()
}) })
it('dailyGoal использует reps snapshot из истории, а не текущие reps упражнения', async () => {
h.exercises = [makeExercise({ reps: 25, dailyGoal: 20 })]
h.history = [
{
ts: Date.now(),
exerciseId: 'ex1',
action: 'done',
reps: 10
}
]
const { forceCheck } = await loadScheduler()
forceCheck()
expect(h.fireReminder).toHaveBeenCalledTimes(1)
})
it('adaptive: применяет adjustNextFireAt к кандидату', async () => { it('adaptive: применяет adjustNextFireAt к кандидату', async () => {
h.exercises = [makeExercise({ adaptive: true })] h.exercises = [makeExercise({ adaptive: true })]
const { forceCheck } = await loadScheduler() const { forceCheck } = await loadScheduler()
@@ -165,3 +209,49 @@ describe('checkDueExercises gating', () => {
expect(h.fireReminder).toHaveBeenCalledTimes(1) expect(h.fireReminder).toHaveBeenCalledTimes(1)
}) })
}) })
describe('checkDueMeals', () => {
it('fire-ит приём пищи, чьё время наступило (в пределах grace)', async () => {
h.meals = [makeMeal()]
const { forceCheck } = await loadScheduler()
forceCheck()
expect(h.fireMealReminder).toHaveBeenCalledTimes(1)
// Переносит nextFireAt вперёд.
expect(h.updateMeal).toHaveBeenCalled()
})
it('пропускает выключенный приём пищи', async () => {
h.meals = [makeMeal({ enabled: false })]
const { forceCheck } = await loadScheduler()
forceCheck()
expect(h.fireMealReminder).not.toHaveBeenCalled()
})
it('не fire-ит при globalEnabled=false', async () => {
h.settings = { ...DEFAULT_SETTINGS, globalEnabled: false }
h.meals = [makeMeal()]
const { forceCheck } = await loadScheduler()
forceCheck()
expect(h.fireMealReminder).not.toHaveBeenCalled()
})
it('пропущенный давно (> grace) переносится без срабатывания', async () => {
h.meals = [makeMeal({ nextFireAt: Date.now() - 10 * 60_000 })]
const { forceCheck } = await loadScheduler()
forceCheck()
expect(h.fireMealReminder).not.toHaveBeenCalled()
expect(h.updateMeal).toHaveBeenCalled() // всё равно переносим вперёд
})
it('приёмы пищи ИГНОРИРУЮТ тихие часы (в отличие от упражнений)', async () => {
h.settings = { ...DEFAULT_SETTINGS, quietHours: quietWindowAroundNow() }
h.exercises = [makeExercise()]
h.meals = [makeMeal()]
const { forceCheck } = await loadScheduler()
forceCheck()
// Упражнение подавлено тихими часами...
expect(h.fireReminder).not.toHaveBeenCalled()
// ...а приём пищи всё равно срабатывает.
expect(h.fireMealReminder).toHaveBeenCalledTimes(1)
})
})

View File

@@ -1,16 +1,24 @@
import { powerMonitor, BrowserWindow } from 'electron' import { powerMonitor, BrowserWindow } from 'electron'
import { IPC } from '@shared/ipc' import { IPC } from '@shared/ipc'
import type { Exercise, Tick, HistoryEntry } from '@shared/types' import type { Exercise, Tick, HistoryEntry } from '@shared/types'
import { isQuietAt } from '@shared/types' import { isQuietAt, nextMealOccurrence } from '@shared/types'
import { getExercises, getHistory, getSettings, updateExercise } from './store' import {
import { fireReminder } from './notifications' getExercises,
getHistory,
getMeals,
getSettings,
updateExercise,
updateMeal
} from './store'
import { fireMealReminder, fireReminder } from './notifications'
import { broadcastState } from './state-actions' import { broadcastState } from './state-actions'
import { isMeetingActiveSync, refreshMeetingState } from './meeting-detect' import { isMeetingActiveSync, refreshMeetingState } from './meeting-detect'
import { adjustNextFireAt } from './adaptive' import { adjustNextFireAt } from './adaptive'
/** /**
* Сколько reps пользователь сделал по упражнению `ex` за сегодня (local day). * Сколько reps пользователь сделал по упражнению `ex` за сегодня (local day).
* Учитываем actualReps если задано (частичное выполнение), иначе planned reps. * Учитываем actualReps если задано (частичное выполнение), затем snapshot
* reps из истории, и только потом текущие planned reps упражнения.
*/ */
function repsDoneToday(ex: Exercise, history: HistoryEntry[]): number { function repsDoneToday(ex: Exercise, history: HistoryEntry[]): number {
const todayKey = new Date() const todayKey = new Date()
@@ -21,7 +29,7 @@ function repsDoneToday(ex: Exercise, history: HistoryEntry[]): number {
if (e.action !== 'done') continue if (e.action !== 'done') continue
if (e.exerciseId !== ex.id) continue if (e.exerciseId !== ex.id) continue
if (e.ts < startMs) continue if (e.ts < startMs) continue
sum += e.actualReps ?? ex.reps sum += e.actualReps ?? e.reps ?? ex.reps
} }
return sum return sum
} }
@@ -95,6 +103,39 @@ function checkDueExercises(): void {
if (anyFired) broadcastState() if (anyFired) broadcastState()
} }
/**
* Окно «опоздания»: приём пищи, чьё время прошло более чем на это, считаем
* пропущенным (ноут спал / приложение было выключено) и тихо переносим на
* следующее вхождение БЕЗ срабатывания — чтобы не вывалить пачку
* напоминаний разом при включении вечером. Чуть больше CHECK_MS с запасом.
*/
const MEAL_GRACE_MS = 120_000
/**
* Приёмы пищи — по времени суток. В отличие от упражнений, НЕ подчиняются
* тихим часам и ВКС-паузе: пользователь явно задал время. Гейтит только
* глобальная пауза (globalEnabled). Срабатывает в пределах grace-окна после
* запланированного времени; в любом случае переносит nextFireAt вперёд.
*/
function checkDueMeals(): void {
const settings = getSettings()
if (!settings.globalEnabled) return
const now = Date.now()
let anyChanged = false
for (const meal of getMeals()) {
if (!meal.enabled) continue
if (meal.nextFireAt > now) continue
if (now - meal.nextFireAt <= MEAL_GRACE_MS) {
fireMealReminder(meal, settings.notificationMode)
}
updateMeal(meal.id, {
nextFireAt: nextMealOccurrence(meal.time, meal.days, now)
})
anyChanged = true
}
if (anyChanged) broadcastState()
}
function broadcastTicks(): void { function broadcastTicks(): void {
const now = Date.now() const now = Date.now()
const ticks: Tick[] = getExercises().map((e) => ({ const ticks: Tick[] = getExercises().map((e) => ({
@@ -113,6 +154,7 @@ function tick(): void {
if (now - lastCheckAt >= CHECK_MS) { if (now - lastCheckAt >= CHECK_MS) {
lastCheckAt = now lastCheckAt = now
checkDueExercises() checkDueExercises()
checkDueMeals()
} }
} }

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

@@ -8,6 +8,7 @@ import {
} from 'node:fs' } from 'node:fs'
import { tmpdir } from 'node:os' import { tmpdir } from 'node:os'
import { join } from 'node:path' import { join } from 'node:path'
import { DEFAULT_SETTINGS } from '@shared/types'
/** /**
* Тесты persistence-слоя. Мокаем electron.app.getPath на временную директорию * Тесты persistence-слоя. Мокаем electron.app.getPath на временную директорию
@@ -147,6 +148,43 @@ describe('store · history cap', () => {
}) })
}) })
describe('store · meal history', () => {
it('markMealDone пишет meal-entry в историю', async () => {
writeFileSync(
statePath(),
JSON.stringify({
exercises: [],
meals: [
{
id: 'm1',
name: 'Обед',
time: '13:00',
icon: 'Soup',
enabled: true,
days: [],
nextFireAt: Date.now() + 60_000
}
],
challenges: [],
history: []
}),
'utf-8'
)
const { markMealDone, getHistory } = await load()
expect(markMealDone('m1')).toBeDefined()
expect(getHistory()).toMatchObject([
{
exerciseId: 'meal:m1',
action: 'done',
reps: 1,
name: 'Обед',
source: 'meal'
}
])
})
})
describe('store · clearHistory', () => { describe('store · clearHistory', () => {
it('удаляет записи старше границы и возвращает количество', async () => { it('удаляет записи старше границы и возвращает количество', async () => {
const ex = { const ex = {
@@ -195,4 +233,79 @@ describe('store · export / import', () => {
expect(importState('not json at all')).toBe(false) expect(importState('not json at all')).toBe(false)
expect(importState('42')).toBe(false) expect(importState('42')).toBe(false)
}) })
it('import сохраняет валидные части snapshot и отбрасывает повреждённые записи', async () => {
const validExercise = {
id: 'x1',
name: 'Тест',
reps: 10,
icon: 'Activity',
intervalMinutes: 30,
enabled: true,
nextFireAt: Date.now() + 1000
}
const validMeal = {
id: 'm1',
name: 'Обед',
time: '13:00',
icon: 'Soup',
enabled: true,
days: [],
nextFireAt: Date.now() + 1000
}
const validChallenge = {
id: 'c1',
name: 'За убийства',
gameId: 'dota2',
stat: 'kills',
multiplier: 1,
exerciseName: 'Отжимания',
icon: 'Dumbbell',
enabled: true
}
const { importState, getState, getSettings, getHistory } = await load()
expect(
importState(
JSON.stringify({
exercises: [
validExercise,
{ ...validExercise, id: 'bad-ex', intervalMinutes: -5 }
],
meals: [validMeal, { ...validMeal, id: 'bad-meal', time: '25:00' }],
settings: {
globalEnabled: false,
snoozeMinutes: -1,
language: 'xx'
},
challenges: [
validChallenge,
{ ...validChallenge, id: 'bad-challenge', gameId: 'cs2' }
],
gamesEnabled: { dota2: true, cs2: true },
history: [
{ ts: 100, exerciseId: 'x1', action: 'done', reps: 10 },
{ ts: -1, exerciseId: 'x1', action: 'done', reps: 10 },
{
ts: 200,
exerciseId: 'meal:m1',
action: 'done',
reps: 1,
source: 'meal'
}
]
})
)
).toBe(true)
const state = getState()
expect(state.exercises.map((e) => e.id)).toEqual(['x1'])
expect(state.meals.map((m) => m.id)).toEqual(['m1'])
expect(state.challenges.map((c) => c.id)).toEqual(['c1'])
expect(state.gamesEnabled).toEqual({ dota2: true })
expect(getHistory().map((e) => e.ts)).toEqual([100, 200])
expect(getSettings().globalEnabled).toBe(false)
expect(getSettings().snoozeMinutes).toBe(DEFAULT_SETTINGS.snoozeMinutes)
expect(getSettings().language).toBe(DEFAULT_SETTINGS.language)
})
}) })

View File

@@ -17,11 +17,22 @@ import {
GameId, GameId,
HistoryAction, HistoryAction,
HistoryEntry, HistoryEntry,
HistorySource,
Meal,
nextMealOccurrence,
PersistedState, PersistedState,
SAMPLE_EXERCISES, SAMPLE_EXERCISES,
SAMPLE_MEALS,
Settings Settings
} from '@shared/types' } from '@shared/types'
import { log } from './logger' import { log } from './logger'
import {
validateChallengeInput,
validateExerciseInput,
validateId,
validateMealInput,
validateSettingsPatch
} from './validate'
/** /**
* Keep at most this many history entries (≈2.7 years at 10/day). * Keep at most this many history entries (≈2.7 years at 10/day).
@@ -36,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 })
@@ -53,6 +64,11 @@ function makeInitial(): PersistedState {
id: randomUUID(), id: randomUUID(),
nextFireAt: now + e.intervalMinutes * 60_000 nextFireAt: now + e.intervalMinutes * 60_000
})), })),
meals: SAMPLE_MEALS.map((m) => ({
...m,
id: randomUUID(),
nextFireAt: nextMealOccurrence(m.time, m.days, now)
})),
settings: { ...DEFAULT_SETTINGS }, settings: { ...DEFAULT_SETTINGS },
challenges: [ challenges: [
{ {
@@ -102,6 +118,137 @@ function isValidParsed(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)
} }
function finiteMs(v: unknown): number | undefined {
return typeof v === 'number' &&
Number.isFinite(v) &&
v >= 0 &&
v <= Number.MAX_SAFE_INTEGER
? v
: undefined
}
function intInRange(v: unknown, min: number, max: number): number | undefined {
if (typeof v !== 'number' || !Number.isFinite(v)) return undefined
const n = Math.trunc(v)
return n >= min && n <= max ? n : undefined
}
function safeStr(v: unknown, max = 200): string | undefined {
if (typeof v !== 'string') return undefined
if (v.length === 0 || v.length > max) return undefined
return v
}
const SETTINGS_KEYS: (keyof Settings)[] = [
'globalEnabled',
'notificationMode',
'soundEnabled',
'voicePromptsEnabled',
'meetingAutoPause',
'startWithWindows',
'minimizeToTray',
'startMinimized',
'theme',
'language',
'snoozeMinutes',
'quietHours',
'lastSeenVersion'
]
const GAME_IDS: GameId[] = ['dota2']
const HISTORY_ACTIONS: HistoryAction[] = ['done', 'skip', 'snooze']
const HISTORY_SOURCES: HistorySource[] = ['reminder', 'meal', 'match']
function sanitizeSettings(raw: unknown): Settings {
const out: Settings = { ...DEFAULT_SETTINGS }
if (!isValidParsed(raw)) return out
for (const key of SETTINGS_KEYS) {
if (!(key in raw)) continue
const patch = validateSettingsPatch({ [key]: raw[key] })
if (patch) Object.assign(out, patch)
}
return out
}
function sanitizeExercise(raw: unknown, now = Date.now()): Exercise | null {
if (!isValidParsed(raw)) return null
const id = validateId(raw.id)
const base = validateExerciseInput(raw)
if (!id || !base) return null
const exercise: Exercise = {
...base,
id,
nextFireAt: finiteMs(raw.nextFireAt) ?? now + base.intervalMinutes * 60_000
}
const lastDoneAt = finiteMs(raw.lastDoneAt)
if (lastDoneAt !== undefined) exercise.lastDoneAt = lastDoneAt
return exercise
}
function sanitizeMeal(raw: unknown, now = Date.now()): Meal | null {
if (!isValidParsed(raw)) return null
const id = validateId(raw.id)
const base = validateMealInput(raw)
if (!id || !base) return null
const meal: Meal = {
...base,
id,
nextFireAt:
finiteMs(raw.nextFireAt) ?? nextMealOccurrence(base.time, base.days, now)
}
const lastDoneAt = finiteMs(raw.lastDoneAt)
if (lastDoneAt !== undefined) meal.lastDoneAt = lastDoneAt
return meal
}
function sanitizeChallenge(raw: unknown): Challenge | null {
if (!isValidParsed(raw)) return null
const id = validateId(raw.id)
const base = validateChallengeInput(raw)
if (!id || !base) return null
return { ...base, id }
}
function sanitizeGamesEnabled(raw: unknown): Partial<Record<GameId, boolean>> {
const out: Partial<Record<GameId, boolean>> = {}
if (!isValidParsed(raw)) return out
for (const id of GAME_IDS) {
if (typeof raw[id] === 'boolean') out[id] = raw[id]
}
return out
}
function sanitizeHistoryEntry(raw: unknown): HistoryEntry | null {
if (!isValidParsed(raw)) return null
const ts = finiteMs(raw.ts)
const exerciseId = validateId(raw.exerciseId)
const action =
typeof raw.action === 'string' &&
HISTORY_ACTIONS.includes(raw.action as HistoryAction)
? (raw.action as HistoryAction)
: undefined
if (ts === undefined || !exerciseId || action === undefined) return null
const entry: HistoryEntry = { ts, exerciseId, action }
const actualReps = intInRange(raw.actualReps, 0, 100_000)
if (actualReps !== undefined) entry.actualReps = actualReps
const reps = intInRange(raw.reps, 0, 100_000)
if (reps !== undefined) entry.reps = reps
const name = safeStr(raw.name)
if (name !== undefined) entry.name = name
if (
typeof raw.source === 'string' &&
HISTORY_SOURCES.includes(raw.source as HistorySource)
) {
entry.source = raw.source as HistorySource
}
return entry
}
/** /**
* Current persisted-state schema version. Bump this and add a migration to * Current persisted-state schema version. Bump this and add a migration to
* MIGRATIONS whenever the on-disk shape changes in a non-additive way. * MIGRATIONS whenever the on-disk shape changes in a non-additive way.
@@ -147,19 +294,36 @@ function runMigrations(s: StoredState): StoredState {
/** Coerce a (possibly partial) migrated state into a fully-formed PersistedState. */ /** Coerce a (possibly partial) migrated state into a fully-formed PersistedState. */
function coerce(s: StoredState): PersistedState { function coerce(s: StoredState): PersistedState {
const now = Date.now()
return { return {
exercises: Array.isArray(s.exercises) ? (s.exercises as Exercise[]) : [], exercises: Array.isArray(s.exercises)
settings: { ? s.exercises.flatMap((raw) => {
...DEFAULT_SETTINGS, const exercise = sanitizeExercise(raw, now)
...(isValidParsed(s.settings) ? (s.settings as Partial<Settings>) : {}) return exercise ? [exercise] : []
}, })
challenges: Array.isArray(s.challenges)
? (s.challenges as Challenge[])
: [], : [],
gamesEnabled: isValidParsed(s.gamesEnabled) // Additive: старые state'ы без `meals` получают пустой список (см. философию
? (s.gamesEnabled as Partial<Record<GameId, boolean>>) // миграций — additive-поля не требуют bump'а схемы).
: {}, meals: Array.isArray(s.meals)
history: Array.isArray(s.history) ? (s.history as HistoryEntry[]) : [] ? s.meals.flatMap((raw) => {
const meal = sanitizeMeal(raw, now)
return meal ? [meal] : []
})
: [],
settings: sanitizeSettings(s.settings),
challenges: Array.isArray(s.challenges)
? s.challenges.flatMap((raw) => {
const challenge = sanitizeChallenge(raw)
return challenge ? [challenge] : []
})
: [],
gamesEnabled: sanitizeGamesEnabled(s.gamesEnabled),
history: Array.isArray(s.history)
? s.history.flatMap((raw) => {
const entry = sanitizeHistoryEntry(raw)
return entry ? [entry] : []
})
: []
} }
} }
@@ -360,6 +524,7 @@ export function getStateForRenderer(): AppState {
const p = getState() const p = getState()
return { return {
exercises: p.exercises, exercises: p.exercises,
meals: p.meals,
settings: p.settings, settings: p.settings,
challenges: p.challenges, challenges: p.challenges,
gamesEnabled: p.gamesEnabled gamesEnabled: p.gamesEnabled
@@ -467,6 +632,79 @@ export function skip(id: string): Exercise | undefined {
return ex return ex
} }
// -------------------------------------------------------------------------
// Meals (приёмы пищи — по времени суток)
// -------------------------------------------------------------------------
export function getMeals(): Meal[] {
return getState().meals
}
export function addMeal(
input: Omit<Meal, 'id' | 'nextFireAt' | 'lastDoneAt'>
): Meal {
const state = getState()
const meal: Meal = {
...input,
id: randomUUID(),
nextFireAt: nextMealOccurrence(input.time, input.days, Date.now())
}
state.meals.push(meal)
scheduleWrite()
return meal
}
export function updateMeal(
id: string,
patch: Partial<Omit<Meal, 'id'>>
): Meal | undefined {
const state = getState()
const idx = state.meals.findIndex((m) => m.id === id)
if (idx === -1) return undefined
const merged: Meal = { ...state.meals[idx], ...patch }
// Если поменялось время/дни/вкл — и nextFireAt не задан явно — пересчитать
// следующее срабатывание (toggle-on тоже сюда попадает).
if (
(patch.time !== undefined ||
patch.days !== undefined ||
patch.enabled !== undefined) &&
patch.nextFireAt === undefined
) {
merged.nextFireAt = nextMealOccurrence(merged.time, merged.days, Date.now())
}
state.meals[idx] = merged
scheduleWrite()
return merged
}
export function deleteMeal(id: string): boolean {
const state = getState()
const before = state.meals.length
state.meals = state.meals.filter((m) => m.id !== id)
const ok = state.meals.length < before
if (ok) scheduleWrite()
return ok
}
export function markMealDone(id: string): Meal | undefined {
const state = getState()
const meal = state.meals.find((m) => m.id === id)
if (!meal) return undefined
meal.lastDoneAt = Date.now()
// nextFireAt обычно уже перенесён планировщиком в момент срабатывания;
// подстраховка на случай ручного вызова — гарантируем будущее время.
if (meal.nextFireAt <= Date.now()) {
meal.nextFireAt = nextMealOccurrence(meal.time, meal.days, Date.now())
}
appendHistory(`meal:${id}`, 'done', {
reps: 1,
name: meal.name,
source: 'meal'
})
scheduleWrite()
return meal
}
/** /**
* Записать выполнение челленджа из match summary в историю. Не привязано * Записать выполнение челленджа из match summary в историю. Не привязано
* к конкретному Exercise (челлендж может ссылаться на упражнение, которое * к конкретному Exercise (челлендж может ссылаться на упражнение, которое
@@ -561,8 +799,8 @@ export function exportState(): string {
/** /**
* Импорт snapshot'а. Перезаписывает текущий state. Возвращает true при * Импорт snapshot'а. Перезаписывает текущий state. Возвращает true при
* успехе. Идёт через тот же coerce + runMigrations что и load() — это * успехе. Идёт через тот же coerce + runMigrations что и load(): валидные
* валидирует тип/диапазоны. * записи сохраняются, повреждённые записи/поля отбрасываются.
* *
* НЕ объединяет с текущим state (merge сложен: дубликаты id, конфликты * НЕ объединяет с текущим state (merge сложен: дубликаты id, конфликты
* settings) — простое replace. Перед импортом UI должен спросить * settings) — простое replace. Перед импортом UI должен спросить

View File

@@ -18,12 +18,86 @@ import {
validateExercisePatch, validateExercisePatch,
validateChallengeInput, validateChallengeInput,
validateChallengePatch, validateChallengePatch,
validateMealInput,
validateMealPatch,
validateSettingsPatch, validateSettingsPatch,
validateId, validateId,
validateActualReps, validateActualReps,
validateSnoozeMinutes validateSnoozeMinutes
} from './validate' } from './validate'
describe('validateMealInput', () => {
it('принимает валидный приём пищи', () => {
const r = validateMealInput({
name: 'Обед',
time: '13:00',
icon: 'Soup',
enabled: true,
days: [1, 2, 3, 4, 5]
})
expect(r).toEqual({
name: 'Обед',
time: '13:00',
icon: 'Soup',
enabled: true,
days: [1, 2, 3, 4, 5]
})
})
it('дефолтит icon и enabled', () => {
const r = validateMealInput({ name: 'Ужин', time: '19:00', days: [] })
expect(r?.icon).toBe('UtensilsCrossed')
expect(r?.enabled).toBe(true)
})
it('реджектит без имени / времени', () => {
expect(validateMealInput({ time: '13:00', days: [] })).toBeNull()
expect(validateMealInput({ name: 'X', days: [] })).toBeNull()
})
it('реджектит кривое время', () => {
expect(validateMealInput({ name: 'X', time: '99:99', days: [] })).toBeNull()
expect(validateMealInput({ name: 'X', time: 'noon', days: [] })).toBeNull()
})
it('реджектит дни вне диапазона и дедупит', () => {
expect(
validateMealInput({ name: 'X', time: '13:00', days: [7] })
).toBeNull()
const r = validateMealInput({
name: 'X',
time: '13:00',
days: [1, 1, 2]
})
expect(r?.days).toEqual([1, 2])
})
it('реджектит не-объект', () => {
expect(validateMealInput(null)).toBeNull()
expect(validateMealInput('meal')).toBeNull()
})
})
describe('validateMealPatch', () => {
it('частичный патч только заданных полей', () => {
expect(validateMealPatch({ time: '07:30' })).toEqual({ time: '07:30' })
expect(validateMealPatch({ enabled: false })).toEqual({ enabled: false })
})
it('реджектит кривое время в патче', () => {
expect(validateMealPatch({ time: '25:00' })).toBeNull()
})
it('пропускает scheduler-поля с range-check', () => {
expect(validateMealPatch({ nextFireAt: 123 })).toEqual({ nextFireAt: 123 })
expect(validateMealPatch({ nextFireAt: -1 })).toBeNull()
})
it('реджектит кривые дни', () => {
expect(validateMealPatch({ days: [0, 8] })).toBeNull()
})
})
const validExercise = { const validExercise = {
name: 'Push-ups', name: 'Push-ups',
reps: 10, reps: 10,
@@ -46,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()
@@ -143,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', () => {
@@ -195,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()
} }
@@ -210,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)
}) })
}) })
@@ -321,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()
}) })
}) })
@@ -348,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()
@@ -401,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

@@ -14,7 +14,9 @@
import type { import type {
Challenge, Challenge,
Exercise, Exercise,
GameId,
GameStat, GameStat,
Meal,
Settings, Settings,
Theme, Theme,
Language, Language,
@@ -26,6 +28,7 @@ const MAX_STR_LEN = 200
const VALID_THEMES: Theme[] = ['system', 'light', 'dark'] const VALID_THEMES: Theme[] = ['system', 'light', 'dark']
const VALID_LANGS: Language[] = ['ru', 'en'] const VALID_LANGS: Language[] = ['ru', 'en']
const VALID_NOTIFY: NotificationMode[] = ['toast', 'modal', 'both'] const VALID_NOTIFY: NotificationMode[] = ['toast', 'modal', 'both']
const VALID_GAME_IDS: GameId[] = ['dota2']
const VALID_STATS: GameStat[] = [ const VALID_STATS: GameStat[] = [
'deaths', 'deaths',
'kills', 'kills',
@@ -40,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)
@@ -78,6 +80,34 @@ function oneOf<T extends string>(
: undefined : undefined
} }
/**
* Строгая проверка "HH:MM": не только форма, но и диапазон (часы 0..23,
* минуты 0..59). В отличие от HHMM_RE (используется в quietHours лишь для
* формы) — приём пищи с временем '25:00' сломал бы nextMealOccurrence.
*/
function validHHMM(v: unknown): string | undefined {
const s = safeStr(v, 8)
if (s === undefined) return undefined
const m = /^(\d{1,2}):(\d{2})$/.exec(s)
if (!m) return undefined
const h = Number(m[1])
const min = Number(m[2])
if (h > 23 || min > 59) return undefined
return s
}
/** Дни недели: массив целых 0..6 без дубликатов. null = невалидно. */
function weekdays(v: unknown): number[] | null {
if (!Array.isArray(v)) return null
const out: number[] = []
for (const d of v) {
const n = intInRange(d, 0, 6)
if (n === undefined) return null
if (!out.includes(n)) out.push(n)
}
return out
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Exercise validators // Exercise validators
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@@ -99,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 (
@@ -188,6 +222,69 @@ export function validateExercisePatch(
return out return out
} }
// -----------------------------------------------------------------------
// Meal validators (приёмы пищи — по времени суток)
// -----------------------------------------------------------------------
export function validateMealInput(
raw: unknown
): Omit<Meal, 'id' | 'nextFireAt' | 'lastDoneAt'> | null {
if (!isObj(raw)) return null
const name = safeStr(raw.name)
const time = validHHMM(raw.time)
const icon = safeStr(raw.icon, 64) ?? 'UtensilsCrossed'
const enabled = bool(raw.enabled) ?? true
const days = weekdays(raw.days)
if (name === undefined || time === undefined || days === null) {
return null
}
return { name, time, icon, enabled, days }
}
export function validateMealPatch(
raw: unknown
): Partial<Omit<Meal, 'id'>> | null {
if (!isObj(raw)) return null
const out: Partial<Omit<Meal, 'id'>> = {}
if ('name' in raw) {
const v = safeStr(raw.name)
if (v === undefined) return null
out.name = v
}
if ('time' in raw) {
const v = validHHMM(raw.time)
if (v === undefined) return null
out.time = v
}
if ('icon' in raw) {
const v = safeStr(raw.icon, 64)
if (v === undefined) return null
out.icon = v
}
if ('enabled' in raw) {
const v = bool(raw.enabled)
if (v === undefined) return null
out.enabled = v
}
if ('days' in raw) {
const v = weekdays(raw.days)
if (v === null) return null
out.days = v
}
// Scheduler-controlled fields (store reschedules через тот же boundary).
if ('nextFireAt' in raw) {
const v = numInRange(raw.nextFireAt, 0, Number.MAX_SAFE_INTEGER)
if (v === undefined) return null
out.nextFireAt = v
}
if ('lastDoneAt' in raw) {
const v = numInRange(raw.lastDoneAt, 0, Number.MAX_SAFE_INTEGER)
if (v === undefined) return null
out.lastDoneAt = v
}
return out
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Challenge validators // Challenge validators
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@@ -197,7 +294,7 @@ export function validateChallengeInput(
): Omit<Challenge, 'id'> | null { ): Omit<Challenge, 'id'> | null {
if (!isObj(raw)) return null if (!isObj(raw)) return null
const name = safeStr(raw.name) const name = safeStr(raw.name)
const gameId = safeStr(raw.gameId, 32) const gameId = oneOf(raw.gameId, VALID_GAME_IDS)
const stat = oneOf(raw.stat, VALID_STATS) const stat = oneOf(raw.stat, VALID_STATS)
const multiplier = numInRange(raw.multiplier, 0, 1000) const multiplier = numInRange(raw.multiplier, 0, 1000)
const exerciseName = safeStr(raw.exerciseName) const exerciseName = safeStr(raw.exerciseName)
@@ -214,7 +311,7 @@ export function validateChallengeInput(
} }
return { return {
name, name,
gameId: gameId as Challenge['gameId'], gameId,
stat, stat,
multiplier, multiplier,
exerciseName, exerciseName,
@@ -344,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,11 +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,
RendererErrorReport,
Settings, Settings,
Tick, Tick,
UpdaterStatus UpdaterStatus
@@ -41,6 +44,19 @@ const api = {
ipcRenderer.invoke(IPC.snooze, id, minutes), ipcRenderer.invoke(IPC.snooze, id, minutes),
skip: (id: string): Promise<Exercise> => ipcRenderer.invoke(IPC.skip, id), skip: (id: string): Promise<Exercise> => ipcRenderer.invoke(IPC.skip, id),
// Meals
addMeal: (
input: Omit<Meal, 'id' | 'nextFireAt' | 'lastDoneAt'>
): Promise<Meal> => ipcRenderer.invoke(IPC.addMeal, input),
updateMeal: (id: string, patch: Partial<Meal>): Promise<Meal> =>
ipcRenderer.invoke(IPC.updateMeal, id, patch),
deleteMeal: (id: string): Promise<boolean> =>
ipcRenderer.invoke(IPC.deleteMeal, id),
toggleMeal: (id: string, enabled: boolean): Promise<Meal> =>
ipcRenderer.invoke(IPC.toggleMeal, id, enabled),
markMealDone: (id: string): Promise<Meal> =>
ipcRenderer.invoke(IPC.markMealDone, id),
updateSettings: (patch: Partial<Settings>): Promise<Settings> => updateSettings: (patch: Partial<Settings>): Promise<Settings> =>
ipcRenderer.invoke(IPC.updateSettings, patch), ipcRenderer.invoke(IPC.updateSettings, patch),
@@ -50,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),
@@ -136,6 +160,7 @@ const api = {
onTick: (h: Handler<Tick[]>): Unsub => on(IPC.evtTick, h), onTick: (h: Handler<Tick[]>): Unsub => on(IPC.evtTick, h),
onFire: (h: Handler<Exercise>): Unsub => on(IPC.evtFire, h), onFire: (h: Handler<Exercise>): Unsub => on(IPC.evtFire, h),
onFireMeal: (h: Handler<Meal>): Unsub => on(IPC.evtFireMeal, h),
onMatchEnd: (h: Handler<MatchSummary>): Unsub => on(IPC.evtMatchEnd, h), onMatchEnd: (h: Handler<MatchSummary>): Unsub => on(IPC.evtMatchEnd, h),
onStateChanged: (h: Handler<AppState>): Unsub => on(IPC.evtStateChanged, h), onStateChanged: (h: Handler<AppState>): Unsub => on(IPC.evtStateChanged, h),
onThemeChanged: (h: Handler<'light' | 'dark'>): Unsub => onThemeChanged: (h: Handler<'light' | 'dark'>): Unsub =>
@@ -149,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

@@ -9,6 +9,7 @@ import { Skeleton } from './components/ui/Skeleton'
import { unseenVersions } from '@shared/release-notes' import { unseenVersions } from '@shared/release-notes'
import Dashboard from './pages/Dashboard' import Dashboard from './pages/Dashboard'
import Exercises from './pages/Exercises' import Exercises from './pages/Exercises'
import Meals from './pages/Meals'
import GamesPage from './pages/Games' import GamesPage from './pages/Games'
import ChallengesPage from './pages/Challenges' import ChallengesPage from './pages/Challenges'
import SettingsPage from './pages/Settings' import SettingsPage from './pages/Settings'
@@ -152,6 +153,7 @@ function RoutedPages({ onNav }: { onNav: () => void }): JSX.Element {
<Routes location={location}> <Routes location={location}>
<Route path="/" element={<Dashboard />} /> <Route path="/" element={<Dashboard />} />
<Route path="/exercises" element={<Exercises />} /> <Route path="/exercises" element={<Exercises />} />
<Route path="/meals" element={<Meals />} />
<Route path="/games" element={<GamesPage />} /> <Route path="/games" element={<GamesPage />} />
<Route path="/challenges" element={<ChallengesPage />} /> <Route path="/challenges" element={<ChallengesPage />} />
<Route path="/settings" element={<SettingsPage />} /> <Route path="/settings" element={<SettingsPage />} />

View File

@@ -13,6 +13,7 @@ import {
import type { import type {
Exercise, Exercise,
MatchSummary, MatchSummary,
Meal,
Settings, Settings,
ChallengeResult, ChallengeResult,
Language Language
@@ -26,8 +27,11 @@ import { translate, translateN } from './i18n'
type Mode = type Mode =
| { kind: 'idle' } | { kind: 'idle' }
| { kind: 'exercise'; exercise: Exercise } | { kind: 'exercise'; exercise: Exercise }
| { kind: 'meal'; meal: Meal }
| { kind: 'match'; summary: MatchSummary; done: Set<string> } | { kind: 'match'; summary: MatchSummary; done: Set<string> }
type ActiveMode = Exclude<Mode, { kind: 'idle' }>
/** Минимальный нативный confirm. В reminder-окне нет места для модалки, /** Минимальный нативный confirm. В reminder-окне нет места для модалки,
* проще использовать встроенный диалог. */ * проще использовать встроенный диалог. */
function nativeConfirm(message: string): boolean { function nativeConfirm(message: string): boolean {
@@ -39,6 +43,8 @@ export default function ReminderApp(): JSX.Element {
const [mode, setMode] = useState<Mode>({ kind: 'idle' }) const [mode, setMode] = useState<Mode>({ kind: 'idle' })
const [settings, setSettings] = useState<Settings | null>(null) const [settings, setSettings] = useState<Settings | null>(null)
const settingsRef = useRef<Settings | null>(null) const settingsRef = useRef<Settings | null>(null)
const modeRef = useRef<Mode>({ kind: 'idle' })
const queueRef = useRef<ActiveMode[]>([])
// ChallengeId'ы, для которых уже отправили markChallengeDone IPC. ref, // ChallengeId'ы, для которых уже отправили markChallengeDone IPC. ref,
// не state — нужен только для дедупа rapid double-click. Сбрасывается // не state — нужен только для дедупа rapid double-click. Сбрасывается
// когда приходит новый match summary (см. onMatchEnd ниже). // когда приходит новый match summary (см. onMatchEnd ниже).
@@ -48,48 +54,31 @@ export default function ReminderApp(): JSX.Element {
settingsRef.current = settings settingsRef.current = settings
}, [settings]) }, [settings])
useEffect(() => {
modeRef.current = mode
}, [mode])
useEffect(() => { useEffect(() => {
window.api.getState().then((s) => setSettings(s.settings)) window.api.getState().then((s) => setSettings(s.settings))
const u0 = window.api.onStateChanged((s) => setSettings(s.settings)) const u0 = window.api.onStateChanged((s) => setSettings(s.settings))
const u1 = window.api.onFire((ex) => { const u1 = window.api.onFire((ex) => {
setMode({ kind: 'exercise', exercise: ex }) enqueueMode({ kind: 'exercise', exercise: ex })
const s = settingsRef.current })
if (s?.soundEnabled) playBeep() const u1b = window.api.onFireMeal((meal) => {
if (s?.voicePromptsEnabled) { enqueueMode({ kind: 'meal', meal })
// Задержка 800ms даёт пользователю шанс decrement'нуть stepper до
// фактического количества — TTS прозвучит уже под реальную цифру,
// если успел нажать -. Иначе скажет планируемые reps.
const lang = s.language ?? 'ru'
setTimeout(() => {
const phrase =
lang === 'ru'
? `${ex.name}. ${ex.reps} ${repWordRu(ex.reps)}`
: `${ex.name}. ${ex.reps} ${ex.reps === 1 ? 'rep' : 'reps'}`
speak(phrase, lang)
}, 800)
}
}) })
const u2 = window.api.onMatchEnd((summary) => { const u2 = window.api.onMatchEnd((summary) => {
// Новый матч — сбрасываем дедуп challenge'ей. enqueueMode({ kind: 'match', summary, done: new Set() })
sentChallengesRef.current = new Set()
setMode({ kind: 'match', summary, done: new Set() })
const s = settingsRef.current
if (s?.soundEnabled) playBeep()
if (s?.voicePromptsEnabled) {
const total = summary.results.reduce((acc, r) => acc + r.reps, 0)
const lang = s.language ?? 'ru'
const phrase =
lang === 'ru'
? `Матч завершён. ${total} ${repWordRu(total)} ждут.`
: `Match complete. ${total} ${total === 1 ? 'rep' : 'reps'} await.`
speak(phrase, lang)
}
}) })
return () => { return () => {
u0() u0()
u1() u1()
u1b()
u2() u2()
} }
// IPC-подписки должны жить один раз; enqueueMode читает актуальный mode
// через ref, поэтому зависимость здесь не нужна.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []) }, [])
// ESC closes the match summary view too — keyboard parity with exercise mode. // ESC closes the match summary view too — keyboard parity with exercise mode.
@@ -103,6 +92,63 @@ export default function ReminderApp(): JSX.Element {
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [mode.kind]) }, [mode.kind])
function enqueueMode(next: ActiveMode): void {
if (modeRef.current.kind === 'idle') {
activateMode(next)
return
}
queueRef.current.push(next)
}
function activateMode(next: ActiveMode): void {
if (next.kind === 'match') {
// Новый match summary получает чистый дедуп-сет только когда реально
// становится активным; иначе queued summary не сбивает текущий матч.
sentChallengesRef.current = new Set()
}
modeRef.current = next
setMode(next)
playAlertFor(next)
}
function playAlertFor(next: ActiveMode): void {
const s = settingsRef.current
if (s?.soundEnabled) playBeep()
if (!s?.voicePromptsEnabled) return
const lang = s.language ?? 'ru'
if (next.kind === 'exercise') {
const ex = next.exercise
// Задержка 800ms даёт пользователю шанс decrement'нуть stepper до
// фактического количества — TTS прозвучит уже под реальную цифру,
// если успел нажать -. Иначе скажет планируемые reps.
setTimeout(() => {
const phrase =
lang === 'ru'
? `${ex.name}. ${ex.reps} ${repWordRu(ex.reps)}`
: `${ex.name}. ${ex.reps} ${ex.reps === 1 ? 'rep' : 'reps'}`
speak(phrase, lang)
}, 800)
return
}
if (next.kind === 'meal') {
const phrase =
lang === 'ru'
? `Пора поесть. ${next.meal.name}`
: `Time to eat. ${next.meal.name}`
speak(phrase, lang)
return
}
const total = next.summary.results.reduce((acc, r) => acc + r.reps, 0)
const phrase =
lang === 'ru'
? `Матч завершён. ${total} ${repWordRu(total)} ждут.`
: `Match complete. ${total} ${total === 1 ? 'rep' : 'reps'} await.`
speak(phrase, lang)
}
function close(): void { function close(): void {
// Если в Match Summary остались незакрытые челленджи — подтверждаем, // Если в Match Summary остались незакрытые челленджи — подтверждаем,
// чтобы пользователь не «пролетел» окно по привычке и не потерял // чтобы пользователь не «пролетел» окно по привычке и не потерял
@@ -125,6 +171,12 @@ export default function ReminderApp(): JSX.Element {
if (!nativeConfirm(msg)) return if (!nativeConfirm(msg)) return
} }
} }
const next = queueRef.current.shift()
if (next) {
activateMode(next)
return
}
modeRef.current = { kind: 'idle' }
setMode({ kind: 'idle' }) setMode({ kind: 'idle' })
window.api.reminderClose() window.api.reminderClose()
} }
@@ -145,6 +197,17 @@ export default function ReminderApp(): JSX.Element {
/> />
) )
} }
if (mode.kind === 'meal') {
return (
<MealReminder
key={mode.meal.id + ':' + mode.meal.nextFireAt}
meal={mode.meal}
snoozeMinutes={settings?.snoozeMinutes ?? 5}
lang={lang}
onClose={close}
/>
)
}
return ( return (
<MatchSummaryView <MatchSummaryView
summary={mode.summary} summary={mode.summary}
@@ -164,13 +227,16 @@ export default function ReminderApp(): JSX.Element {
} }
// 2) Functional update: rapid-click race-safe. // 2) Functional update: rapid-click race-safe.
setMode((m) => setMode((m) =>
m.kind === 'match' {
? { if (m.kind !== 'match') return m
const nextMode: Mode = {
kind: 'match', kind: 'match',
summary: m.summary, summary: m.summary,
done: new Set([...m.done, id]) done: new Set([...m.done, id])
} }
: m modeRef.current = nextMode
return nextMode
}
) )
}} }}
onClose={close} onClose={close}
@@ -350,6 +416,106 @@ function ExerciseReminder({
) )
} }
function MealReminder({
meal,
snoozeMinutes,
lang,
onClose
}: {
meal: Meal
snoozeMinutes: number
lang: Language
onClose: () => void
}): JSX.Element {
const t = (key: string, vars?: Record<string, string | number>): string =>
translate(lang, key, vars)
async function done(): Promise<void> {
await window.api.markMealDone(meal.id)
onClose()
}
async function snooze(): Promise<void> {
// «Отложить» = напомнить снова через snoozeMinutes (перетираем
// запланированный планировщиком nextFireAt на завтра).
await window.api.updateMeal(meal.id, {
nextFireAt: Date.now() + snoozeMinutes * 60_000
})
onClose()
}
useEffect(() => {
function onKey(e: KeyboardEvent): void {
const targetTag = (e.target as HTMLElement | null)?.tagName
if (e.key === 'Enter') {
e.preventDefault()
void done()
} else if (e.key === 'Escape') {
e.preventDefault()
onClose()
} else if ((e.key === ' ' || e.code === 'Space') && targetTag !== 'BUTTON') {
e.preventDefault()
void snooze()
}
}
window.addEventListener('keydown', onKey)
return () => window.removeEventListener('keydown', onKey)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [snoozeMinutes])
return (
<div className="reminder-shell flex flex-col h-full">
<div className="titlebar-drag h-8 px-2 flex items-center justify-end">
<button
onClick={onClose}
className="titlebar-nodrag w-7 h-6 grid place-items-center rounded-md hover:bg-destructive hover:text-white text-text/45 active:scale-90 transition-all"
aria-label={t('btn.close')}
>
<X size={13} strokeWidth={2.5} />
</button>
</div>
<div className="flex-1 flex flex-col items-center justify-center px-8 text-center">
<motion.div
initial={{ scale: 0.7, opacity: 0 }}
animate={{ scale: 1, opacity: 1 }}
transition={{ type: 'spring', stiffness: 300, damping: 24 }}
className="relative mb-6"
>
<div className="w-24 h-24 rounded-full bg-success text-white grid place-items-center shadow-[0_8px_30px_-8px_rgb(var(--success)/0.5)]">
<Icon name={meal.icon} size={44} strokeWidth={2} />
</div>
</motion.div>
<div className="text-[13px] uppercase tracking-[0.18em] text-success font-bold">
{t('meal.cta')}
</div>
<h1 className="font-serif text-[30px] leading-tight tracking-tight mt-2 mb-3 font-bold">
{meal.name}
</h1>
<div className="text-[13px] text-text/65 mt-1 inline-flex items-center gap-1.5 font-medium font-mono-num">
<Clock size={12} strokeWidth={2.4} /> {meal.time}
</div>
</div>
<div className="px-4 pb-4 space-y-2">
<button
onClick={done}
className="w-full h-12 rounded-2xl bg-success text-white text-[16px] font-bold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
>
<Check size={17} strokeWidth={2.5} /> {t('meal.btn.ate')}
</button>
<button
onClick={snooze}
className="w-full h-11 rounded-2xl bg-surface-2 text-text text-[15px] font-semibold inline-flex items-center justify-center gap-1.5 active:scale-[0.98] transition-transform"
>
<Clock size={15} strokeWidth={2.5} />{' '}
{t('btn.snooze_min', { n: snoozeMinutes })}
</button>
</div>
</div>
)
}
function MatchSummaryView({ function MatchSummaryView({
summary, summary,
done, done,

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

@@ -0,0 +1,204 @@
import { useEffect, useState } from 'react'
import type { Meal } from '@shared/types'
import { Modal } from './ui/Modal'
import { Button } from './ui/Button'
import { ICON_CHOICES, Icon } from '../lib/icon'
import { useT } from '../i18n'
export type MealDraft = {
name: string
time: string
icon: string
enabled: boolean
days: number[]
}
const EMPTY: MealDraft = {
name: '',
time: '13:00',
icon: 'UtensilsCrossed',
enabled: true,
days: []
}
// Понедельник-первый порядок для UI; значения — индексы getDay() (0=Вс).
const WEEKDAY_ORDER = [1, 2, 3, 4, 5, 6, 0]
type Props = {
open: boolean
meal?: Meal | null
onClose: () => void
onSave: (draft: MealDraft) => void
}
export function MealEditor({
open,
meal,
onClose,
onSave
}: Props): JSX.Element {
const [draft, setDraft] = useState<MealDraft>(EMPTY)
const { t } = useT()
useEffect(() => {
if (meal) {
setDraft({
name: meal.name,
time: meal.time,
icon: meal.icon,
enabled: meal.enabled,
days: meal.days
})
} else {
setDraft(EMPTY)
}
}, [meal, open])
const canSave =
draft.name.trim().length > 0 && /^\d{1,2}:\d{2}$/.test(draft.time)
const weekdayLabels = t('meals.weekdays').split(',')
function toggleDay(dow: number): void {
setDraft((d) => ({
...d,
days: d.days.includes(dow)
? d.days.filter((x) => x !== dow)
: [...d.days, dow]
}))
}
return (
<Modal
open={open}
onClose={onClose}
title={meal ? t('editor.meal.title.edit') : t('editor.meal.title.new')}
footer={
<>
<Button variant="plain" onClick={onClose}>
{t('btn.cancel')}
</Button>
<Button disabled={!canSave} onClick={() => onSave(draft)}>
{t('btn.save')}
</Button>
</>
}
>
<div className="space-y-5">
<div className="rounded-2xl bg-surface-2 p-4 flex items-center gap-4">
<div className="w-14 h-14 rounded-2xl bg-accent text-white grid place-items-center shrink-0">
<Icon name={draft.icon} size={26} strokeWidth={2.2} />
</div>
<div className="min-w-0">
<div className="font-display text-[18px] font-semibold tracking-tight truncate">
{draft.name || t('editor.meal.preview.placeholder')}
</div>
<div className="text-[13px] text-text/55 mt-0.5 font-mono-num">
{draft.time}
</div>
</div>
</div>
<Field label={t('editor.field.name')}>
<input
value={draft.name}
onChange={(e) => setDraft({ ...draft, name: e.target.value })}
placeholder={t('editor.meal.name.placeholder')}
className="ios-input"
autoFocus
/>
</Field>
<Field label={t('editor.meal.field.time')}>
<input
type="time"
value={draft.time}
onChange={(e) => setDraft({ ...draft, time: e.target.value })}
className="ios-input font-mono-num"
/>
</Field>
<Field label={t('editor.meal.field.days')}>
<div className="grid grid-cols-7 gap-1.5">
{WEEKDAY_ORDER.map((dow) => {
const active = draft.days.includes(dow)
return (
<button
key={dow}
type="button"
aria-pressed={active}
onClick={() => toggleDay(dow)}
className={[
'h-10 rounded-xl text-[13px] font-semibold transition-all active:scale-95',
active
? 'bg-accent text-white'
: 'bg-surface-2 text-text/65 hover:text-text'
].join(' ')}
>
{weekdayLabels[dow]}
</button>
)
})}
</div>
<div className="text-[12px] text-text/55 mt-1.5 leading-snug">
{t('editor.meal.field.days.hint')}
</div>
</Field>
<Field label={t('editor.field.icon')}>
<div className="grid grid-cols-8 gap-2 max-h-44 overflow-y-auto p-2 rounded-2xl bg-surface-2">
{ICON_CHOICES.map((name) => (
<button
key={name}
type="button"
onClick={() => setDraft({ ...draft, icon: name })}
className={[
'h-10 w-10 grid place-items-center rounded-xl transition-all active:scale-90',
draft.icon === name
? 'bg-accent text-white'
: 'bg-surface text-text/65 hover:text-text'
].join(' ')}
>
<Icon name={name} size={17} strokeWidth={2.2} />
</button>
))}
</div>
</Field>
</div>
<style>{`
.ios-input {
width: 100%;
height: 44px;
padding: 0 14px;
border-radius: 12px;
border: 0;
background: rgb(var(--surface-2));
color: rgb(var(--text));
font-size: 15px;
outline: none;
transition: box-shadow .15s ease;
}
.ios-input:focus {
box-shadow: 0 0 0 2px rgb(var(--accent) / 0.45);
}
`}</style>
</Modal>
)
}
function Field({
label,
children
}: {
label: string
children: React.ReactNode
}): JSX.Element {
return (
<label className="block">
<span className="block text-[12px] font-medium text-text/55 mb-1.5">
{label}
</span>
{children}
</label>
)
}

View File

@@ -1,7 +1,15 @@
import { useEffect, useRef } from 'react' import { useEffect, useRef } from 'react'
import { NavLink } from 'react-router-dom' import { NavLink } from 'react-router-dom'
import { AnimatePresence, motion } from 'framer-motion' import { AnimatePresence, motion } from 'framer-motion'
import { Sun, Dumbbell, Joystick, Flame, Settings2, X } from 'lucide-react' import {
Sun,
Dumbbell,
UtensilsCrossed,
Joystick,
Flame,
Settings2,
X
} from 'lucide-react'
import { useT } from '../i18n' import { useT } from '../i18n'
type Item = { type Item = {
@@ -20,6 +28,12 @@ const items: Item[] = [
icon: Dumbbell, icon: Dumbbell,
tint: 'bg-info' tint: 'bg-info'
}, },
{
to: '/meals',
labelKey: 'nav.meals',
icon: UtensilsCrossed,
tint: 'bg-success'
},
{ to: '/games', labelKey: 'nav.games', icon: Joystick, tint: 'bg-accent-2' }, { to: '/games', labelKey: 'nav.games', icon: Joystick, tint: 'bg-accent-2' },
{ {
to: '/challenges', to: '/challenges',

View File

@@ -14,6 +14,7 @@ export const ru: Dict = {
// Sidebar / nav // Sidebar / nav
'nav.today': 'Сегодня', 'nav.today': 'Сегодня',
'nav.exercises': 'Упражнения', 'nav.exercises': 'Упражнения',
'nav.meals': 'Питание',
'nav.games': 'Игры', 'nav.games': 'Игры',
'nav.challenges': 'Челленджи', 'nav.challenges': 'Челленджи',
'nav.settings': 'Настройки', 'nav.settings': 'Настройки',
@@ -84,6 +85,42 @@ export const ru: Dict = {
'dashboard.meeting.title': 'Не дёргаем — ты на встрече', 'dashboard.meeting.title': 'Не дёргаем — ты на встрече',
'dashboard.meeting.hint': 'dashboard.meeting.hint':
'Запущен Zoom / Teams / Discord / Webex / Slack-huddle. Напоминания возобновятся когда закроешь.', 'Запущен Zoom / Teams / Discord / Webex / Slack-huddle. Напоминания возобновятся когда закроешь.',
'dashboard.plan.title': 'План дня',
'dashboard.plan.subtitle': 'Следующее действие и дневные цели',
'dashboard.plan.due_count': '{n} ждёт',
'dashboard.plan.all_caught_up': 'всё спокойно',
'dashboard.plan.next_action': 'Следующее действие',
'dashboard.plan.kind.exercise': 'упражнение',
'dashboard.plan.kind.meal': 'питание',
'dashboard.plan.due_now': 'можно сделать сейчас',
'dashboard.plan.next_in': 'через {time}',
'dashboard.plan.paused': 'напоминания на паузе',
'dashboard.plan.meal_time': 'в {time}',
'dashboard.plan.done_now': 'Сделал',
'dashboard.plan.ate_now': 'Поел',
'dashboard.plan.clear.title': 'На сегодня чисто',
'dashboard.plan.clear.hint': 'Можно отдохнуть или добавить новое действие',
'dashboard.plan.goals': 'Дневные цели',
'dashboard.plan.goals.progress': '{done}/{goal}',
'dashboard.plan.goals.remaining': 'осталось {n}',
'dashboard.plan.goals.hint': 'прогресс по упражнениям с дневной целью',
'dashboard.plan.goals.empty':
'Добавь дневную цель в упражнении, чтобы видеть прогресс',
'dashboard.plan.meals': 'Питание',
'dashboard.plan.meals.progress': '{done}/{total}',
'dashboard.plan.recovery': 'Режим',
'dashboard.plan.recovery.first.title': 'Первый шаг',
'dashboard.plan.recovery.first.hint': 'Начни с одного лёгкого действия',
'dashboard.plan.recovery.return.title': 'Мягкий возврат',
'dashboard.plan.recovery.return.hint':
'{n} дн. без действий — начни с минимума',
'dashboard.plan.recovery.steady.title': 'Ритм держится',
'dashboard.plan.recovery.steady.today': 'сегодня уже есть действие',
'dashboard.plan.recovery.steady.yesterday': 'вчера был активный день',
'dashboard.plan.recovery.steady.none': 'держим спокойный темп',
'dashboard.plan.up_next': 'Дальше',
'dashboard.plan.item.remaining': 'осталось {n}',
'dashboard.plan.item.reps': '{n} раз',
'dashboard.empty.title': 'Программа пуста', 'dashboard.empty.title': 'Программа пуста',
'dashboard.empty.hint': 'Добавь первое упражнение, чтобы начать', 'dashboard.empty.hint': 'Добавь первое упражнение, чтобы начать',
@@ -95,6 +132,34 @@ export const ru: Dict = {
'exercises.row.meta': '{reps} раз · {interval}', 'exercises.row.meta': '{reps} раз · {interval}',
'exercises.empty': 'Программа пуста — добавь первое упражнение', 'exercises.empty': 'Программа пуста — добавь первое упражнение',
// Meals (приёмы пищи)
'meals.kicker': 'Режим питания',
'meals.title': 'Питание',
'meals.presets': 'Быстрое добавление',
'meals.schedule': 'Расписание',
'meals.section.active': 'Активные · {n}',
'meals.section.disabled': 'Выключенные · {n}',
'meals.empty': 'Пока нет приёмов пищи — добавь первый или выбери пресет',
'meals.everyday': 'ежедневно',
'meals.weekdays': 'Вс,Пн,Вт,Ср,Чт,Пт,Сб',
'meals.preset.breakfast': 'Завтрак',
'meals.preset.lunch': 'Обед',
'meals.preset.dinner': 'Ужин',
'meals.preset.snack': 'Перекус',
// Meal editor
'editor.meal.title.new': 'Новый приём пищи',
'editor.meal.title.edit': 'Изменить приём пищи',
'editor.meal.preview.placeholder': 'Без названия',
'editor.meal.name.placeholder': 'Например, Обед',
'editor.meal.field.time': 'Время',
'editor.meal.field.days': 'Дни недели',
'editor.meal.field.days.hint': 'Ничего не выбрано — напоминаем каждый день',
// Meal reminder window
'meal.cta': 'Пора поесть',
'meal.btn.ate': 'Поел',
// Exercise editor // Exercise editor
'editor.exercise.title.new': 'Новое упражнение', 'editor.exercise.title.new': 'Новое упражнение',
'editor.exercise.title.edit': 'Редактировать', 'editor.exercise.title.edit': 'Редактировать',
@@ -159,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-файл.',
@@ -173,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': 'Текущая установленная версия приложения.',
@@ -239,9 +319,11 @@ export const ru: Dict = {
'updater.available.title': 'Доступна v{v}', 'updater.available.title': 'Доступна v{v}',
'updater.downloading.title': 'Загружаем обновление', 'updater.downloading.title': 'Загружаем обновление',
'updater.downloading.subtitle': '{got} / {total} МБ · {speed} МБ/с', 'updater.downloading.subtitle': '{got} / {total} МБ · {speed} МБ/с',
'updater.downloading.hint': 'Можно закрыть это окно — скачивание продолжится в фоне.', 'updater.downloading.hint':
'Можно закрыть это окно — скачивание продолжится в фоне.',
'updater.downloaded.title': 'Готово · v{v}', 'updater.downloaded.title': 'Готово · v{v}',
'updater.downloaded.subtitle': 'Нажми «Рестарт» — приложение моментально откроется в новой версии.', 'updater.downloaded.subtitle':
'Нажми «Рестарт» — приложение моментально откроется в новой версии.',
'updater.error.title': 'Ошибка проверки', 'updater.error.title': 'Ошибка проверки',
'updater.idle.title': 'Проверить обновления', 'updater.idle.title': 'Проверить обновления',
'updater.idle.subtitle': 'Авто-проверка раз в час', 'updater.idle.subtitle': 'Авто-проверка раз в час',
@@ -347,6 +429,7 @@ export const en: Dict = {
// Sidebar / nav // Sidebar / nav
'nav.today': 'Today', 'nav.today': 'Today',
'nav.exercises': 'Exercises', 'nav.exercises': 'Exercises',
'nav.meals': 'Meals',
'nav.games': 'Games', 'nav.games': 'Games',
'nav.challenges': 'Challenges', 'nav.challenges': 'Challenges',
'nav.settings': 'Settings', 'nav.settings': 'Settings',
@@ -416,6 +499,42 @@ export const en: Dict = {
'dashboard.meeting.hint': 'dashboard.meeting.hint':
'Zoom / Teams / Discord / Webex / Slack-huddle is running. Reminders resume when you close it.', 'Zoom / Teams / Discord / Webex / Slack-huddle is running. Reminders resume when you close it.',
'dashboard.paused.hint': 'Resume to continue countdown', 'dashboard.paused.hint': 'Resume to continue countdown',
'dashboard.plan.title': 'Day plan',
'dashboard.plan.subtitle': 'Next action and daily goals',
'dashboard.plan.due_count': '{n} due',
'dashboard.plan.all_caught_up': 'all clear',
'dashboard.plan.next_action': 'Next action',
'dashboard.plan.kind.exercise': 'exercise',
'dashboard.plan.kind.meal': 'meal',
'dashboard.plan.due_now': 'ready now',
'dashboard.plan.next_in': 'in {time}',
'dashboard.plan.paused': 'reminders paused',
'dashboard.plan.meal_time': 'at {time}',
'dashboard.plan.done_now': 'Done',
'dashboard.plan.ate_now': 'Ate',
'dashboard.plan.clear.title': 'Clear for today',
'dashboard.plan.clear.hint': 'Rest or add another action',
'dashboard.plan.goals': 'Daily goals',
'dashboard.plan.goals.progress': '{done}/{goal}',
'dashboard.plan.goals.remaining': '{n} left',
'dashboard.plan.goals.hint': 'progress across exercises with daily goals',
'dashboard.plan.goals.empty':
'Add a daily goal to an exercise to see progress',
'dashboard.plan.meals': 'Meals',
'dashboard.plan.meals.progress': '{done}/{total}',
'dashboard.plan.recovery': 'Mode',
'dashboard.plan.recovery.first.title': 'First step',
'dashboard.plan.recovery.first.hint': 'Start with one easy action',
'dashboard.plan.recovery.return.title': 'Gentle return',
'dashboard.plan.recovery.return.hint':
'{n} days without actions — start small',
'dashboard.plan.recovery.steady.title': 'Rhythm holding',
'dashboard.plan.recovery.steady.today': 'you already logged one today',
'dashboard.plan.recovery.steady.yesterday': 'yesterday stayed active',
'dashboard.plan.recovery.steady.none': 'keep a calm pace',
'dashboard.plan.up_next': 'Up next',
'dashboard.plan.item.remaining': '{n} left',
'dashboard.plan.item.reps': '{n} reps',
'dashboard.empty.title': 'Program is empty', 'dashboard.empty.title': 'Program is empty',
'dashboard.empty.hint': 'Add your first exercise to start', 'dashboard.empty.hint': 'Add your first exercise to start',
@@ -427,6 +546,34 @@ export const en: Dict = {
'exercises.row.meta': '{reps} reps · {interval}', 'exercises.row.meta': '{reps} reps · {interval}',
'exercises.empty': 'Program is empty — add your first exercise', 'exercises.empty': 'Program is empty — add your first exercise',
// Meals
'meals.kicker': 'Eating schedule',
'meals.title': 'Meals',
'meals.presets': 'Quick add',
'meals.schedule': 'Schedule',
'meals.section.active': 'Active · {n}',
'meals.section.disabled': 'Disabled · {n}',
'meals.empty': 'No meals yet — add one or pick a preset',
'meals.everyday': 'every day',
'meals.weekdays': 'Sun,Mon,Tue,Wed,Thu,Fri,Sat',
'meals.preset.breakfast': 'Breakfast',
'meals.preset.lunch': 'Lunch',
'meals.preset.dinner': 'Dinner',
'meals.preset.snack': 'Snack',
// Meal editor
'editor.meal.title.new': 'New meal',
'editor.meal.title.edit': 'Edit meal',
'editor.meal.preview.placeholder': 'Untitled',
'editor.meal.name.placeholder': 'e.g. Lunch',
'editor.meal.field.time': 'Time',
'editor.meal.field.days': 'Days of week',
'editor.meal.field.days.hint': 'None selected — reminds every day',
// Meal reminder window
'meal.cta': 'Time to eat',
'meal.btn.ate': 'Ate it',
// Exercise editor // Exercise editor
'editor.exercise.title.new': 'New exercise', 'editor.exercise.title.new': 'New exercise',
'editor.exercise.title.edit': 'Edit', 'editor.exercise.title.edit': 'Edit',
@@ -491,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.',
@@ -505,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.',
@@ -571,9 +733,11 @@ export const en: Dict = {
'updater.available.title': 'v{v} available', 'updater.available.title': 'v{v} available',
'updater.downloading.title': 'Downloading update', 'updater.downloading.title': 'Downloading update',
'updater.downloading.subtitle': '{got} / {total} MB · {speed} MB/s', 'updater.downloading.subtitle': '{got} / {total} MB · {speed} MB/s',
'updater.downloading.hint': 'You can close this window — download continues in the background.', 'updater.downloading.hint':
'You can close this window — download continues in the background.',
'updater.downloaded.title': 'Ready · v{v}', 'updater.downloaded.title': 'Ready · v{v}',
'updater.downloaded.subtitle': 'Click Restart — the app will reopen instantly in the new version.', 'updater.downloaded.subtitle':
'Click Restart — the app will reopen instantly in the new version.',
'updater.error.title': 'Check failed', 'updater.error.title': 'Check failed',
'updater.idle.title': 'Check for updates', 'updater.idle.title': 'Check for updates',
'updater.idle.subtitle': 'Auto-check every hour', 'updater.idle.subtitle': 'Auto-check every hour',

View File

@@ -0,0 +1,135 @@
import { describe, expect, it } from 'vitest'
import type { Exercise, HistoryEntry, Meal } from '@shared/types'
import { computeTodayPlan } from './day-plan'
const NOW = new Date(2026, 5, 6, 12, 0, 0, 0).getTime()
const HOUR = 60 * 60 * 1000
const DAY = 24 * HOUR
function exercise(partial: Partial<Exercise> & { id: string }): Exercise {
return {
id: partial.id,
name: partial.name ?? partial.id,
reps: partial.reps ?? 10,
icon: partial.icon ?? 'Activity',
intervalMinutes: partial.intervalMinutes ?? 30,
enabled: partial.enabled ?? true,
nextFireAt: partial.nextFireAt ?? NOW + HOUR,
category: partial.category,
dailyGoal: partial.dailyGoal,
adaptive: partial.adaptive
}
}
function meal(partial: Partial<Meal> & { id: string }): Meal {
return {
id: partial.id,
name: partial.name ?? partial.id,
time: partial.time ?? '13:00',
icon: partial.icon ?? 'UtensilsCrossed',
enabled: partial.enabled ?? true,
days: partial.days ?? [],
nextFireAt: partial.nextFireAt ?? NOW + HOUR
}
}
function done(
exerciseId: string,
ts = NOW,
reps?: number,
actualReps?: number
): HistoryEntry {
const entry: HistoryEntry = { exerciseId, ts, action: 'done' }
if (reps !== undefined) entry.reps = reps
if (actualReps !== undefined) entry.actualReps = actualReps
return entry
}
describe('computeTodayPlan', () => {
it('summarises daily goals and puts due exercises first', () => {
const plan = computeTodayPlan({
now: NOW,
exercises: [
exercise({ id: 'pushups', dailyGoal: 30, nextFireAt: NOW - 1 }),
exercise({ id: 'water', dailyGoal: 2, reps: 1, nextFireAt: NOW + HOUR })
],
meals: [meal({ id: 'lunch', nextFireAt: NOW + 30 * 60_000 })],
history: [done('pushups', NOW - HOUR, 10)]
})
expect(plan.goalDone).toBe(10)
expect(plan.goalTarget).toBe(32)
expect(plan.goalRemaining).toBe(22)
expect(plan.dueCount).toBe(1)
expect(plan.nextItem?.id).toBe('pushups')
expect(plan.nextItem?.due).toBe(true)
})
it('removes completed daily goals from the action list', () => {
const plan = computeTodayPlan({
now: NOW,
exercises: [
exercise({ id: 'squats', dailyGoal: 20, nextFireAt: NOW - HOUR })
],
meals: [],
history: [done('squats', NOW - HOUR, 20)]
})
expect(plan.goalRemaining).toBe(0)
expect(plan.items).toHaveLength(0)
expect(plan.nextItem).toBeUndefined()
})
it('tracks meal completion via meal history entries', () => {
const plan = computeTodayPlan({
now: NOW,
exercises: [],
meals: [
meal({ id: 'breakfast', nextFireAt: NOW - HOUR }),
meal({ id: 'lunch', nextFireAt: NOW + HOUR })
],
history: [done('meal:breakfast', NOW - 2 * HOUR, 1)]
})
expect(plan.enabledMeals).toBe(2)
expect(plan.doneMeals).toBe(1)
expect(plan.remainingMeals).toBe(1)
expect(plan.items.map((item) => item.id)).toEqual(['lunch'])
})
it('enters recovery mode after two inactive days', () => {
const plan = computeTodayPlan({
now: NOW,
exercises: [exercise({ id: 'a' })],
meals: [],
history: [done('a', NOW - 3 * DAY)]
})
expect(plan.recovery).toEqual({ kind: 'recovery', daysSinceDone: 3 })
})
it('uses first-run state when no done history exists', () => {
const plan = computeTodayPlan({
now: NOW,
exercises: [exercise({ id: 'a' })],
meals: [],
history: []
})
expect(plan.recovery).toEqual({ kind: 'first-run' })
})
it('ignores disabled exercises and meals', () => {
const plan = computeTodayPlan({
now: NOW,
exercises: [exercise({ id: 'a', enabled: false, dailyGoal: 100 })],
meals: [meal({ id: 'm', enabled: false })],
history: []
})
expect(plan.enabledExercises).toBe(0)
expect(plan.enabledMeals).toBe(0)
expect(plan.goalTarget).toBe(0)
expect(plan.items).toHaveLength(0)
})
})

View File

@@ -0,0 +1,187 @@
import type {
Exercise,
HistoryEntry,
Meal,
ReminderCategory
} from '@shared/types'
import { dayKey } from './history'
export type PlanItemKind = 'exercise' | 'meal'
export type PlanItem = {
kind: PlanItemKind
id: string
name: string
icon: string
nextFireAt: number
due: boolean
doneToday: boolean
category?: ReminderCategory
reps?: number
goal?: number
doneReps?: number
remainingReps?: number
time?: string
}
export type RecoveryState =
| { kind: 'first-run' }
| { kind: 'recovery'; daysSinceDone: number }
| { kind: 'steady'; daysSinceDone: number | null }
export type TodayPlan = {
goalDone: number
goalTarget: number
goalRemaining: number
enabledExercises: number
enabledMeals: number
doneMeals: number
remainingMeals: number
dueCount: number
items: PlanItem[]
nextItem?: PlanItem
recovery: RecoveryState
}
function localDayOrdinal(ts: number): number {
const d = new Date(ts)
return Math.floor(
Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()) / 86_400_000
)
}
function doneRepsForExercise(
entries: HistoryEntry[],
exercise: Exercise,
today: string
): number {
let sum = 0
for (const e of entries) {
if (e.action !== 'done') continue
if (e.exerciseId !== exercise.id) continue
if (dayKey(e.ts) !== today) continue
sum += e.actualReps ?? e.reps ?? exercise.reps
}
return sum
}
function mealDoneToday(
entries: HistoryEntry[],
meal: Meal,
today: string
): boolean {
const id = `meal:${meal.id}`
return entries.some(
(e) => e.action === 'done' && e.exerciseId === id && dayKey(e.ts) === today
)
}
function computeRecovery(entries: HistoryEntry[], now: number): RecoveryState {
const latestDone = entries
.filter((e) => e.action === 'done' && e.ts <= now)
.reduce<number | null>((latest, e) => {
if (latest === null) return e.ts
return e.ts > latest ? e.ts : latest
}, null)
if (latestDone === null) return { kind: 'first-run' }
const daysSinceDone = Math.max(
0,
localDayOrdinal(now) - localDayOrdinal(latestDone)
)
return daysSinceDone >= 2
? { kind: 'recovery', daysSinceDone }
: { kind: 'steady', daysSinceDone }
}
function sortPlanItems(a: PlanItem, b: PlanItem): number {
if (a.due !== b.due) return a.due ? -1 : 1
if (a.nextFireAt !== b.nextFireAt) return a.nextFireAt - b.nextFireAt
if (a.kind !== b.kind) return a.kind === 'exercise' ? -1 : 1
return a.name.localeCompare(b.name)
}
export function computeTodayPlan({
exercises,
meals,
history,
now = Date.now()
}: {
exercises: Exercise[]
meals: Meal[]
history: HistoryEntry[]
now?: number
}): TodayPlan {
const today = dayKey(now)
const enabledExercises = exercises.filter((e) => e.enabled)
const enabledMeals = meals.filter((m) => m.enabled)
let goalDone = 0
let goalTarget = 0
const exerciseItems = enabledExercises
.map<PlanItem>((exercise) => {
const doneReps = doneRepsForExercise(history, exercise, today)
const goal =
exercise.dailyGoal !== undefined && exercise.dailyGoal > 0
? exercise.dailyGoal
: undefined
const remainingReps =
goal !== undefined ? Math.max(0, goal - doneReps) : undefined
const complete = goal !== undefined && remainingReps === 0
if (goal !== undefined) {
goalTarget += goal
goalDone += Math.min(doneReps, goal)
}
return {
kind: 'exercise',
id: exercise.id,
name: exercise.name,
icon: exercise.icon,
category: exercise.category ?? 'exercise',
reps: exercise.reps,
goal,
doneReps,
remainingReps,
doneToday: doneReps > 0,
due: !complete && exercise.nextFireAt <= now,
nextFireAt: exercise.nextFireAt
}
})
.filter((item) => item.remainingReps !== 0)
const mealItems = enabledMeals
.map<PlanItem>((meal) => {
const doneToday = mealDoneToday(history, meal, today)
return {
kind: 'meal',
id: meal.id,
name: meal.name,
icon: meal.icon,
time: meal.time,
doneToday,
due: !doneToday && meal.nextFireAt <= now,
nextFireAt: meal.nextFireAt
}
})
.filter((item) => !item.doneToday)
const items = [...exerciseItems, ...mealItems].sort(sortPlanItems)
return {
goalDone,
goalTarget,
goalRemaining: Math.max(0, goalTarget - goalDone),
enabledExercises: enabledExercises.length,
enabledMeals: enabledMeals.length,
doneMeals: enabledMeals.length - mealItems.length,
remainingMeals: mealItems.length,
dueCount: items.filter((item) => item.due).length,
items,
nextItem: items[0],
recovery: computeRecovery(history, now)
}
}

View File

@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest' import { describe, expect, it } from 'vitest'
import { ICON_CHOICES } from './icon-choices' import { ICON_CHOICES } from './icon-choices'
import { SAMPLE_EXERCISES } from '@shared/types' import { MEAL_PRESETS, SAMPLE_EXERCISES, SAMPLE_MEALS } from '@shared/types'
describe('ICON_CHOICES', () => { describe('ICON_CHOICES', () => {
// Если иконка SAMPLE_EXERCISES не входит в whitelist, при первом запуске // Если иконка SAMPLE_EXERCISES не входит в whitelist, при первом запуске
@@ -16,6 +16,22 @@ describe('ICON_CHOICES', () => {
} }
}) })
it('contains every icon used by SAMPLE_MEALS and MEAL_PRESETS', () => {
const allowed = new Set<string>(ICON_CHOICES)
for (const m of SAMPLE_MEALS) {
expect(
allowed.has(m.icon),
`icon "${m.icon}" for meal "${m.name}" is not in ICON_CHOICES`
).toBe(true)
}
for (const p of MEAL_PRESETS) {
expect(
allowed.has(p.icon),
`icon "${p.icon}" for preset "${p.nameKey}" is not in ICON_CHOICES`
).toBe(true)
}
})
it('has no duplicates', () => { it('has no duplicates', () => {
expect(new Set(ICON_CHOICES).size).toBe(ICON_CHOICES.length) expect(new Set(ICON_CHOICES).size).toBe(ICON_CHOICES.length)
}) })

View File

@@ -21,7 +21,9 @@ export const ICON_CHOICES = [
'Apple', 'Apple',
'GlassWater', 'GlassWater',
'BookOpen', 'BookOpen',
'Sparkles' 'Sparkles',
'UtensilsCrossed',
'Soup'
] as const ] as const
export type IconName = (typeof ICON_CHOICES)[number] export type IconName = (typeof ICON_CHOICES)[number]

View File

@@ -19,7 +19,9 @@ import {
Apple, Apple,
GlassWater, GlassWater,
BookOpen, BookOpen,
Sparkles Sparkles,
UtensilsCrossed,
Soup
} from 'lucide-react' } from 'lucide-react'
import type { LucideProps } from 'lucide-react' import type { LucideProps } from 'lucide-react'
import { ICON_CHOICES, type IconName } from './icon-choices' import { ICON_CHOICES, type IconName } from './icon-choices'
@@ -44,7 +46,9 @@ const ICON_MAP: Record<IconName, React.ComponentType<LucideProps>> = {
Apple, Apple,
GlassWater, GlassWater,
BookOpen, BookOpen,
Sparkles Sparkles,
UtensilsCrossed,
Soup
} }
/** /**

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

@@ -7,7 +7,11 @@ import {
Flame, Flame,
Activity, Activity,
TrendingUp, TrendingUp,
Video Video,
CalendarCheck,
Target,
RotateCcw,
Check
} from 'lucide-react' } from 'lucide-react'
import { useAppStore } from '../store/appStore' import { useAppStore } from '../store/appStore'
import { ExerciseCard } from '../components/ExerciseCard' import { ExerciseCard } from '../components/ExerciseCard'
@@ -16,9 +20,20 @@ import { HistoryHeatmap } from '../components/HistoryHeatmap'
import { AchievementsCard } from '../components/AchievementsCard' import { AchievementsCard } from '../components/AchievementsCard'
import { Button } from '../components/ui/Button' import { Button } from '../components/ui/Button'
import { ConfirmModal } from '../components/ui/ConfirmModal' import { ConfirmModal } from '../components/ui/ConfirmModal'
import type { Exercise, GameStatus, HistoryEntry } from '@shared/types' import type {
Exercise,
GameStatus,
HistoryEntry,
Language
} from '@shared/types'
import { formatCountdown } from '../lib/format' import { formatCountdown } from '../lib/format'
import { useT } from '../i18n' import { useT, type TFn } from '../i18n'
import { Icon } from '../lib/icon'
import {
computeTodayPlan,
type PlanItem,
type TodayPlan
} from '../lib/day-plan'
import { import {
currentStreak, currentStreak,
dailyReps, dailyReps,
@@ -38,7 +53,9 @@ export default function Dashboard(): JSX.Element {
// on every render — `state?.exercises ?? []` creates a fresh array each time // on every render — `state?.exercises ?? []` creates a fresh array each time
// the parent re-renders even when nothing changed. // the parent re-renders even when nothing changed.
const exercises = useMemo(() => state?.exercises ?? [], [state?.exercises]) const exercises = useMemo(() => state?.exercises ?? [], [state?.exercises])
const meals = useMemo(() => state?.meals ?? [], [state?.meals])
const settings = state?.settings const settings = state?.settings
const [planActionKey, setPlanActionKey] = useState<string | null>(null)
// Игры: запрашиваем реальный статус (integrationActive + launchOption // Игры: запрашиваем реальный статус (integrationActive + launchOption
// applied), а не просто `state.gamesEnabled`. Без этого badge показывал // applied), а не просто `state.gamesEnabled`. Без этого badge показывал
@@ -51,13 +68,12 @@ export default function Dashboard(): JSX.Element {
}, []) }, [])
const gamesLive = games.some( const gamesLive = games.some(
(g) => (g) =>
g.enabled && g.enabled && g.integrationActive && g.launchOptionStatus === 'applied'
g.integrationActive &&
g.launchOptionStatus === 'applied'
) )
// «Включена, но не готова» — отдельное состояние, в badge другой tone. // «Включена, но не готова» — отдельное состояние, в badge другой tone.
const gamesEnabledButNotLive = games.some( const gamesEnabledButNotLive = games.some(
(g) => g.enabled && (!g.integrationActive || g.launchOptionStatus !== 'applied') (g) =>
g.enabled && (!g.integrationActive || g.launchOptionStatus !== 'applied')
) )
// Local history mirror. Перетягиваем (а) на mount, (б) при изменении // Local history mirror. Перетягиваем (а) на mount, (б) при изменении
@@ -109,6 +125,11 @@ export default function Dashboard(): JSX.Element {
} }
}, [exercises, ticks]) }, [exercises, ticks])
const plan = useMemo(() => {
void ticks
return computeTodayPlan({ exercises, meals, history })
}, [exercises, meals, history, ticks])
const paused = !settings?.globalEnabled const paused = !settings?.globalEnabled
function openCreate(): void { function openCreate(): void {
@@ -137,6 +158,17 @@ export default function Dashboard(): JSX.Element {
if (!settings) return if (!settings) return
await window.api.updateSettings({ globalEnabled: !settings.globalEnabled }) await window.api.updateSettings({ globalEnabled: !settings.globalEnabled })
} }
async function handlePlanItemDone(item: PlanItem): Promise<void> {
const key = `${item.kind}:${item.id}`
if (planActionKey !== null) return
setPlanActionKey(key)
try {
if (item.kind === 'meal') await window.api.markMealDone(item.id)
else await window.api.markDone(item.id)
} finally {
setPlanActionKey(null)
}
}
const today = new Date().toLocaleDateString( const today = new Date().toLocaleDateString(
lang === 'en' ? 'en-US' : 'ru-RU', lang === 'en' ? 'en-US' : 'ru-RU',
@@ -211,7 +243,11 @@ export default function Dashboard(): JSX.Element {
/> />
<HeroStat <HeroStat
tone={ tone={
gamesLive ? 'success' : gamesEnabledButNotLive ? 'warning' : 'muted' gamesLive
? 'success'
: gamesEnabledButNotLive
? 'warning'
: 'muted'
} }
label={t('dashboard.stat.tracking')} label={t('dashboard.stat.tracking')}
value={ value={
@@ -239,13 +275,6 @@ export default function Dashboard(): JSX.Element {
/> />
</div> </div>
{history.length > 0 && (
<div className="mb-8 space-y-3">
<HistoryHeatmap history={history} exercises={exercises} />
<AchievementsCard history={history} exercises={exercises} />
</div>
)}
{paused && ( {paused && (
<motion.div <motion.div
initial={{ opacity: 0, y: -4 }} initial={{ opacity: 0, y: -4 }}
@@ -289,6 +318,22 @@ export default function Dashboard(): JSX.Element {
</motion.div> </motion.div>
)} )}
<TodayPlanPanel
plan={plan}
paused={paused}
lang={lang}
t={t}
actionBusy={planActionKey !== null}
onItemDone={(item) => void handlePlanItemDone(item)}
/>
{history.length > 0 && (
<div className="mb-8 space-y-3">
<HistoryHeatmap history={history} exercises={exercises} />
<AchievementsCard history={history} exercises={exercises} />
</div>
)}
<div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-2 gap-4"> <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-2 gap-4">
<AnimatePresence> <AnimatePresence>
{exercises.map((ex) => ( {exercises.map((ex) => (
@@ -348,6 +393,340 @@ export default function Dashboard(): JSX.Element {
) )
} }
function TodayPlanPanel({
plan,
paused,
lang,
t,
actionBusy,
onItemDone
}: {
plan: TodayPlan
paused: boolean
lang: Language
t: TFn
actionBusy: boolean
onItemDone: (item: PlanItem) => void
}): JSX.Element {
const nextItem = plan.nextItem
const upcoming = plan.items.slice(nextItem ? 1 : 0, nextItem ? 4 : 3)
const goalPct =
plan.goalTarget > 0
? Math.min(100, Math.round((plan.goalDone / plan.goalTarget) * 100))
: 0
const mealPct =
plan.enabledMeals > 0
? Math.min(100, Math.round((plan.doneMeals / plan.enabledMeals) * 100))
: 0
const recovery = recoveryCopy(plan, t)
return (
<section className="mb-8 bg-surface rounded-3xl p-5 shadow-card dark:ring-0.5 dark:ring-hairline/30">
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
<div className="flex items-center gap-3 min-w-0">
<div className="w-10 h-10 rounded-2xl bg-accent/12 text-accent grid place-items-center shrink-0">
<CalendarCheck size={19} strokeWidth={2.5} />
</div>
<div className="min-w-0">
<h2 className="font-display text-[22px] font-bold leading-tight">
{t('dashboard.plan.title')}
</h2>
<div className="text-[14px] text-text/60 mt-0.5">
{t('dashboard.plan.subtitle')}
</div>
</div>
</div>
<div
className={[
'self-start sm:self-auto h-8 px-3 rounded-full inline-flex items-center text-[13px] font-semibold',
plan.dueCount > 0
? 'bg-accent/12 text-accent'
: 'bg-success/12 text-success'
].join(' ')}
>
{plan.dueCount > 0
? t('dashboard.plan.due_count', { n: plan.dueCount })
: t('dashboard.plan.all_caught_up')}
</div>
</div>
<div className="mt-5 grid grid-cols-1 lg:grid-cols-[1.35fr_0.95fr_0.95fr] border-y border-hairline/35 divide-y lg:divide-y-0 lg:divide-x divide-hairline/35">
<div className="py-4 lg:pr-5 min-w-0">
<div className="text-[13px] text-text/55 font-semibold">
{t('dashboard.plan.next_action')}
</div>
{nextItem ? (
<>
<div className="mt-3 flex items-center gap-3 min-w-0">
<PlanItemGlyph item={nextItem} />
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2 min-w-0">
<div className="font-display text-[20px] leading-tight font-bold truncate">
{nextItem.name}
</div>
{nextItem.due && (
<span className="shrink-0 w-2 h-2 rounded-full bg-accent" />
)}
</div>
<div className="text-[13px] text-text/60 mt-1 truncate">
{t(`dashboard.plan.kind.${nextItem.kind}`)} ·{' '}
{planItemMeta(nextItem, t)}
</div>
</div>
</div>
<div className="mt-4 flex flex-col sm:flex-row sm:items-center gap-3">
<div className="text-[14px] text-text/70 flex-1 min-w-0">
{planItemTiming(nextItem, paused, lang, t)}
</div>
<Button
size="sm"
variant={nextItem.kind === 'meal' ? 'success' : 'filled'}
disabled={actionBusy}
onClick={() => onItemDone(nextItem)}
className="sm:w-auto w-full"
>
<Check size={14} strokeWidth={2.5} />
{nextItem.kind === 'meal'
? t('dashboard.plan.ate_now')
: t('dashboard.plan.done_now')}
</Button>
</div>
</>
) : (
<div className="mt-3 min-w-0">
<div className="font-display text-[20px] leading-tight font-bold">
{t('dashboard.plan.clear.title')}
</div>
<div className="text-[14px] text-text/60 mt-1">
{t('dashboard.plan.clear.hint')}
</div>
</div>
)}
</div>
<div className="py-4 lg:px-5 min-w-0">
<div className="flex items-center gap-2 text-[13px] text-text/55 font-semibold">
<Target size={14} strokeWidth={2.5} />
{t('dashboard.plan.goals')}
</div>
<div className="mt-3 flex items-end justify-between gap-3">
<div className="font-mono-num text-[24px] font-bold leading-none">
{plan.goalTarget > 0
? t('dashboard.plan.goals.progress', {
done: plan.goalDone,
goal: plan.goalTarget
})
: '—'}
</div>
{plan.goalTarget > 0 && (
<div className="text-[13px] text-text/60">
{t('dashboard.plan.goals.remaining', {
n: plan.goalRemaining
})}
</div>
)}
</div>
<ProgressBar pct={goalPct} tone="accent" />
<div className="text-[13px] text-text/58 mt-3">
{plan.goalTarget > 0
? t('dashboard.plan.goals.hint')
: t('dashboard.plan.goals.empty')}
</div>
{plan.enabledMeals > 0 && (
<div className="mt-5">
<div className="flex items-center justify-between gap-3">
<div className="text-[13px] text-text/55 font-semibold">
{t('dashboard.plan.meals')}
</div>
<div className="font-mono-num text-[14px] font-bold">
{t('dashboard.plan.meals.progress', {
done: plan.doneMeals,
total: plan.enabledMeals
})}
</div>
</div>
<ProgressBar pct={mealPct} tone="success" />
</div>
)}
</div>
<div className="py-4 lg:pl-5 min-w-0">
<div className="flex items-center gap-2 text-[13px] text-text/55 font-semibold">
<RotateCcw size={14} strokeWidth={2.5} />
{t('dashboard.plan.recovery')}
</div>
<div className="mt-3 flex items-start gap-3">
<div
className={[
'w-9 h-9 rounded-xl grid place-items-center shrink-0',
recovery.tone
].join(' ')}
>
<RotateCcw size={17} strokeWidth={2.5} />
</div>
<div className="min-w-0">
<div className="font-display text-[20px] leading-tight font-bold">
{recovery.title}
</div>
<div className="text-[14px] text-text/60 mt-1">
{recovery.hint}
</div>
</div>
</div>
</div>
</div>
{upcoming.length > 0 && (
<div className="pt-4">
<div className="text-[13px] text-text/55 font-semibold mb-2">
{t('dashboard.plan.up_next')}
</div>
<div className="divide-y divide-hairline/35">
{upcoming.map((item) => (
<PlanListRow
key={`${item.kind}:${item.id}`}
item={item}
paused={paused}
lang={lang}
t={t}
/>
))}
</div>
</div>
)}
</section>
)
}
function PlanItemGlyph({ item }: { item: PlanItem }): JSX.Element {
const dueClass = item.due
? 'bg-accent text-white'
: item.kind === 'meal'
? 'bg-success/12 text-success'
: 'bg-accent/12 text-accent'
return (
<div
className={[
'w-11 h-11 rounded-2xl grid place-items-center shrink-0',
dueClass
].join(' ')}
>
<Icon name={item.icon} size={20} />
</div>
)
}
function PlanListRow({
item,
paused,
lang,
t
}: {
item: PlanItem
paused: boolean
lang: Language
t: TFn
}): JSX.Element {
return (
<div className="py-3 flex items-center gap-3 min-w-0">
<PlanItemGlyph item={item} />
<div className="flex-1 min-w-0">
<div className="font-semibold text-[15px] leading-tight truncate">
{item.name}
</div>
<div className="text-[13px] text-text/58 mt-1 truncate">
{planItemMeta(item, t)}
</div>
</div>
<div className="text-[13px] text-text/62 shrink-0 max-w-[42%] truncate">
{planItemTiming(item, paused, lang, t)}
</div>
</div>
)
}
function ProgressBar({
pct,
tone
}: {
pct: number
tone: 'accent' | 'success'
}): JSX.Element {
return (
<div className="mt-3 h-2 rounded-full bg-hairline/35 overflow-hidden">
<div
className={[
'h-full rounded-full transition-all duration-300',
tone === 'accent' ? 'bg-accent' : 'bg-success'
].join(' ')}
style={{ width: `${pct}%` }}
/>
</div>
)
}
function planItemMeta(item: PlanItem, t: TFn): string {
if (item.kind === 'meal') {
return item.time
? t('dashboard.plan.meal_time', { time: item.time })
: t('dashboard.plan.kind.meal')
}
if (item.goal !== undefined) {
return t('dashboard.plan.item.remaining', {
n: item.remainingReps ?? 0
})
}
return t('dashboard.plan.item.reps', { n: item.reps ?? 1 })
}
function planItemTiming(
item: PlanItem,
paused: boolean,
lang: Language,
t: TFn
): string {
if (item.due) return t('dashboard.plan.due_now')
if (paused) return t('dashboard.plan.paused')
return t('dashboard.plan.next_in', {
time: formatCountdown(item.nextFireAt - Date.now(), lang)
})
}
function recoveryCopy(
plan: TodayPlan,
t: TFn
): { title: string; hint: string; tone: string } {
if (plan.recovery.kind === 'first-run') {
return {
title: t('dashboard.plan.recovery.first.title'),
hint: t('dashboard.plan.recovery.first.hint'),
tone: 'bg-info/12 text-info'
}
}
if (plan.recovery.kind === 'recovery') {
return {
title: t('dashboard.plan.recovery.return.title'),
hint: t('dashboard.plan.recovery.return.hint', {
n: plan.recovery.daysSinceDone
}),
tone: 'bg-warning/12 text-warning'
}
}
return {
title: t('dashboard.plan.recovery.steady.title'),
hint:
plan.recovery.daysSinceDone === 0
? t('dashboard.plan.recovery.steady.today')
: plan.recovery.daysSinceDone === 1
? t('dashboard.plan.recovery.steady.yesterday')
: t('dashboard.plan.recovery.steady.none'),
tone: 'bg-success/12 text-success'
}
}
function HeroStat({ function HeroStat({
tone, tone,
label, label,

View File

@@ -0,0 +1,195 @@
import { useState } from 'react'
import { Plus, ChevronRight, UtensilsCrossed } from 'lucide-react'
import { AnimatePresence, motion } from 'framer-motion'
import { useAppStore } from '../store/appStore'
import { MealEditor, type MealDraft } from '../components/MealEditor'
import { Button } from '../components/ui/Button'
import { Switch } from '../components/ui/Switch'
import { Card, Row, SectionHeader } from '../components/ui/Card'
import { Icon } from '../lib/icon'
import { useT } from '../i18n'
import { MEAL_PRESETS, type Meal } from '@shared/types'
/** Сводка дней недели приёма пищи: «ежедневно» или короткие названия. */
function daysLabel(days: number[], t: (k: string) => string): string {
if (days.length === 0) return t('meals.everyday')
const labels = t('meals.weekdays').split(',')
// Порядок Пн..Вс для читабельности.
const order = [1, 2, 3, 4, 5, 6, 0]
return order
.filter((d) => days.includes(d))
.map((d) => labels[d])
.join(', ')
}
export default function Meals(): JSX.Element {
const meals = useAppStore((s) => s.state?.meals ?? [])
const [editorOpen, setEditorOpen] = useState(false)
const [editing, setEditing] = useState<Meal | null>(null)
const { t } = useT()
// Единый список (включённые сверху). Важно: НЕ разбиваем на два <Card>, иначе
// при переключении строка переезжает между списками → её Switch
// размонтируется/монтируется заново, и анимация ползунка есть только при
// включении (mount с x:0→20), а при выключении нет. В одном keyed-списке
// компонент остаётся смонтированным → ползунок плавно ездит в обе стороны,
// а строка «переезжает» в свою группу через layout-анимацию.
const ordered = [...meals].sort((a, b) =>
a.enabled === b.enabled ? 0 : a.enabled ? -1 : 1
)
async function addPreset(
preset: (typeof MEAL_PRESETS)[number]
): Promise<void> {
await window.api.addMeal({
name: t(preset.nameKey),
time: preset.time,
icon: preset.icon,
enabled: true,
days: []
})
}
return (
<div className="h-full overflow-y-auto">
<div className="max-w-3xl mx-auto px-4 sm:px-6 lg:px-10 pt-8 pb-12">
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4 mb-8">
<div>
<div className="text-[14px] text-text/65 font-semibold">
{t('meals.kicker')}
</div>
<h1 className="font-serif text-[34px] sm:text-[40px] leading-[1.02] tracking-tight mt-1 font-bold">
{t('meals.title')}
</h1>
</div>
<Button
onClick={() => {
setEditing(null)
setEditorOpen(true)
}}
>
<Plus size={15} strokeWidth={2.5} /> {t('btn.add')}
</Button>
</div>
{/* Пресеты быстрого добавления */}
<SectionHeader title={t('meals.presets')} />
<div className="flex flex-wrap gap-2 mb-7">
{MEAL_PRESETS.map((p) => (
<button
key={p.nameKey}
onClick={() => addPreset(p)}
className="inline-flex items-center gap-2 h-10 px-3.5 rounded-2xl bg-surface-2 hover:bg-accent/15 hover:text-accent text-text/80 text-[14px] font-semibold transition-colors active:scale-95"
>
<Icon name={p.icon} size={16} strokeWidth={2.3} />
{t(p.nameKey)}
<span className="font-mono-num text-text/45 text-[13px]">
{p.time}
</span>
</button>
))}
</div>
{meals.length > 0 && (
<>
<SectionHeader title={t('meals.schedule')} />
<Card>
<AnimatePresence initial={false}>
{ordered.map((m, i) => (
<motion.div
key={m.id}
layout
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
exit={{ opacity: 0 }}
transition={{ duration: 0.18, ease: 'easeOut' }}
>
<MealRow
meal={m}
last={i === ordered.length - 1}
meta={`${m.time} · ${daysLabel(m.days, t)}`}
onEdit={() => {
setEditing(m)
setEditorOpen(true)
}}
/>
</motion.div>
))}
</AnimatePresence>
</Card>
</>
)}
{meals.length === 0 && (
<Card>
<div className="px-5 py-12 flex flex-col items-center text-center">
<div className="inline-flex w-14 h-14 rounded-2xl bg-accent text-white items-center justify-center mb-4">
<UtensilsCrossed size={24} strokeWidth={2.3} />
</div>
<div className="text-text/65 text-[15px] font-medium max-w-xs leading-snug">
{t('meals.empty')}
</div>
</div>
</Card>
)}
<MealEditor
open={editorOpen}
meal={editing}
onClose={() => setEditorOpen(false)}
onSave={async (draft: MealDraft) => {
if (editing) await window.api.updateMeal(editing.id, draft)
else await window.api.addMeal(draft)
setEditorOpen(false)
}}
/>
</div>
</div>
)
}
function MealRow({
meal,
last,
meta,
onEdit
}: {
meal: Meal
last: boolean
meta: string
onEdit: () => void
}): JSX.Element {
return (
<Row last={last}>
<div
className={[
'w-9 h-9 rounded-lg grid place-items-center shrink-0 transition-colors duration-200',
meal.enabled ? 'bg-accent text-white' : 'bg-text/15 text-text/45'
].join(' ')}
>
<Icon name={meal.icon} size={18} strokeWidth={2.2} />
</div>
<button
onClick={onEdit}
className="flex-1 min-w-0 text-left active:opacity-70 transition-opacity"
>
<div className="text-[16px] font-semibold truncate leading-tight">
{meal.name}
</div>
<div className="text-[14px] text-text/65 mt-1 font-medium font-mono-num">
{meta}
</div>
</button>
<Switch
checked={meal.enabled}
onChange={(v) => window.api.toggleMeal(meal.id, v)}
/>
<button
onClick={onEdit}
className="text-text/30 hover:text-text/60 transition-colors"
>
<ChevronRight size={16} />
</button>
</Row>
)
}

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

@@ -8,10 +8,21 @@ export const IPC = {
snooze: 'exercise:snooze', snooze: 'exercise:snooze',
skip: 'exercise:skip', skip: 'exercise:skip',
// Meals (приёмы пищи — напоминания по времени суток)
addMeal: 'meal:add',
updateMeal: 'meal:update',
deleteMeal: 'meal:delete',
toggleMeal: 'meal:toggle',
markMealDone: 'meal:markDone',
updateSettings: 'settings:update', updateSettings: 'settings:update',
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',
@@ -60,6 +71,7 @@ export const IPC = {
// events from main → renderer // events from main → renderer
evtTick: 'evt:tick', evtTick: 'evt:tick',
evtFire: 'evt:fire', evtFire: 'evt:fire',
evtFireMeal: 'evt:fireMeal',
evtMatchEnd: 'evt:matchEnd', evtMatchEnd: 'evt:matchEnd',
evtStateChanged: 'evt:stateChanged', evtStateChanged: 'evt:stateChanged',
evtThemeChanged: 'evt:themeChanged', evtThemeChanged: 'evt:themeChanged',
@@ -69,7 +81,7 @@ export const IPC = {
evtMaximizeChanged: 'evt:maximizeChanged', evtMaximizeChanged: 'evt:maximizeChanged',
evtMeetingChanged: 'evt:meetingChanged', evtMeetingChanged: 'evt:meetingChanged',
/** /**
* Шлётся когда история мутирует (markDone / snooze / skip / * Шлётся когда история мутирует (markDone / markMealDone / snooze / skip /
* markChallengeDone / clearHistory / import). Renderer'у достаточно * markChallengeDone / clearHistory / import). Renderer'у достаточно
* перезапросить getHistory. Раньше Dashboard переключал history по * перезапросить getHistory. Раньше Dashboard переключал history по
* `exercises` ref'у — но markDone мутирует Exercise in place, ref не * `exercises` ref'у — но markDone мутирует Exercise in place, ref не

70
src/shared/meals.test.ts Normal file
View File

@@ -0,0 +1,70 @@
import { describe, it, expect } from 'vitest'
import { nextMealOccurrence } from './types'
/**
* Тесты планирования приёмов пищи по времени суток. Используем фиксированную
* «отправную точку» в локальном времени; helper тоже работает в локальном TZ,
* поэтому тесты детерминированы независимо от таймзоны CI.
*
* 2026-01-15 — четверг (getDay() === 4).
*/
const THU_10_00 = new Date(2026, 0, 15, 10, 0, 0, 0).getTime()
const THU_14_00 = new Date(2026, 0, 15, 14, 0, 0, 0).getTime()
const DAY_MS = 24 * 60 * 60 * 1000
describe('nextMealOccurrence', () => {
it('возвращает сегодняшнее время, если оно ещё не наступило', () => {
const r = new Date(nextMealOccurrence('13:00', [], THU_10_00))
expect(r.getDate()).toBe(15)
expect(r.getHours()).toBe(13)
expect(r.getMinutes()).toBe(0)
})
it('переносит на завтра, если время сегодня уже прошло', () => {
const r = new Date(nextMealOccurrence('08:00', [], THU_10_00))
expect(r.getDate()).toBe(16)
expect(r.getHours()).toBe(8)
})
it('всегда строго в будущем относительно from', () => {
expect(nextMealOccurrence('13:00', [], THU_10_00)).toBeGreaterThan(
THU_10_00
)
expect(nextMealOccurrence('08:00', [], THU_10_00)).toBeGreaterThan(
THU_10_00
)
})
it('учитывает фильтр дней недели (только пятница)', () => {
// Четверг 10:00, напоминание 13:00, дни = [5] (пятница) → завтра 16-е.
const r = new Date(nextMealOccurrence('13:00', [5], THU_10_00))
expect(r.getDate()).toBe(16)
expect(r.getDay()).toBe(5)
expect(r.getHours()).toBe(13)
})
it('сегодня входит в фильтр и время не прошло → сегодня', () => {
const r = new Date(nextMealOccurrence('13:00', [4], THU_10_00))
expect(r.getDate()).toBe(15)
expect(r.getDay()).toBe(4)
})
it('единственный день недели, время прошло → следующая неделя', () => {
// Четверг 14:00, 13:00 уже прошло, дни = [4] → следующий четверг 22-е.
const r = new Date(nextMealOccurrence('13:00', [4], THU_14_00))
expect(r.getDate()).toBe(22)
expect(r.getDay()).toBe(4)
})
it('пустой массив дней = каждый день', () => {
const r = new Date(nextMealOccurrence('23:59', [], THU_10_00))
expect(r.getDate()).toBe(15)
})
it('малформированное время → +24ч (safety)', () => {
expect(nextMealOccurrence('99:99', [], THU_10_00)).toBe(THU_10_00 + DAY_MS)
expect(nextMealOccurrence('not-a-time', [], THU_10_00)).toBe(
THU_10_00 + DAY_MS
)
})
})

View File

@@ -42,6 +42,40 @@ export type Exercise = {
adaptive?: boolean adaptive?: boolean
} }
/**
* Приём пищи — напоминание ПО ВРЕМЕНИ СУТОК (в отличие от Exercise, который
* по интервалу). Срабатывает, когда настенные часы достигают `time` в активный
* день недели; после этого `nextFireAt` пересчитывается на следующее вхождение.
*/
export type Meal = {
id: string
name: string
/** "HH:MM" 24ч — время напоминания. */
time: string
icon: string
enabled: boolean
/** Дни недели 0=Вс..6=Сб, когда напоминать. Пусто = каждый день. */
days: number[]
/** Вычисляемое: epoch ms следующего срабатывания. */
nextFireAt: number
lastDoneAt?: number
}
/** Пресет быстрого добавления приёма пищи. Имя резолвится через i18n. */
export type MealPreset = {
/** i18n-ключ локализованного имени, напр. 'meals.preset.breakfast'. */
nameKey: string
time: string
icon: string
}
export const MEAL_PRESETS: MealPreset[] = [
{ nameKey: 'meals.preset.breakfast', time: '08:00', icon: 'Coffee' },
{ nameKey: 'meals.preset.lunch', time: '13:00', icon: 'UtensilsCrossed' },
{ nameKey: 'meals.preset.dinner', time: '19:00', icon: 'Soup' },
{ nameKey: 'meals.preset.snack', time: '16:00', icon: 'Apple' }
]
export type NotificationMode = 'toast' | 'modal' | 'both' export type NotificationMode = 'toast' | 'modal' | 'both'
export type Theme = 'light' | 'dark' | 'system' export type Theme = 'light' | 'dark' | 'system'
export type Language = 'ru' | 'en' export type Language = 'ru' | 'en'
@@ -99,6 +133,7 @@ export type Settings = {
*/ */
export type AppState = { export type AppState = {
exercises: Exercise[] exercises: Exercise[]
meals: Meal[]
settings: Settings settings: Settings
challenges: Challenge[] challenges: Challenge[]
gamesEnabled: Partial<Record<GameId, boolean>> gamesEnabled: Partial<Record<GameId, boolean>>
@@ -112,10 +147,11 @@ export type PersistedState = AppState & {
export type HistoryAction = 'done' | 'skip' | 'snooze' export type HistoryAction = 'done' | 'skip' | 'snooze'
/** /**
* Источник записи: обычное напоминание (от scheduler'а) или матч (челлендж). * Источник записи: обычное напоминание (от scheduler'а), приём пищи или
* матч (челлендж).
* Используется для UI («подтянулся в матче» vs «по таймеру») и аналитики. * Используется для UI («подтянулся в матче» vs «по таймеру») и аналитики.
*/ */
export type HistorySource = 'reminder' | 'match' export type HistorySource = 'reminder' | 'meal' | 'match'
export type HistoryEntry = { export type HistoryEntry = {
/** ms epoch */ /** ms epoch */
@@ -264,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])
@@ -314,6 +350,37 @@ export function isQuietAt(qh: QuietHours, now: Date): boolean {
return false return false
} }
/**
* Следующее срабатывание приёма пищи СТРОГО после `fromMs`: ближайший день
* (включая сегодня, если время ещё не прошло), чей weekday входит в `days`
* (пустой массив = каждый день). Считает через календарную арифметику
* (`setDate`/`setHours`), а не ms — корректно переживает переход на летнее/
* зимнее время (см. урок history.ts). Малформ `time` → `fromMs + 24ч`.
*/
export function nextMealOccurrence(
time: string,
days: number[],
fromMs: number
): number {
const hm = parseHHMM(time)
const dayMs = 24 * 60 * 60 * 1000
if (hm === null) return fromMs + dayMs
const h = Math.floor(hm / 60)
const min = hm % 60
const base = new Date(fromMs)
// 0..7: ищем ближайший активный день. 7 — запас на случай, когда выбран
// единственный день недели, и сегодняшнее время уже прошло.
for (let i = 0; i <= 7; i++) {
const cand = new Date(base)
cand.setDate(cand.getDate() + i)
cand.setHours(h, min, 0, 0)
if (cand.getTime() <= fromMs) continue
const dow = cand.getDay()
if (days.length === 0 || days.includes(dow)) return cand.getTime()
}
return fromMs + dayMs
}
export const SAMPLE_EXERCISES: Omit<Exercise, 'id' | 'nextFireAt'>[] = [ export const SAMPLE_EXERCISES: Omit<Exercise, 'id' | 'nextFireAt'>[] = [
{ {
name: 'Приседания', name: 'Приседания',
@@ -357,6 +424,22 @@ export const SAMPLE_EXERCISES: Omit<Exercise, 'id' | 'nextFireAt'>[] = [
} }
] ]
/**
* Стартовые приёмы пищи — выключены по умолчанию (как hydration/eyes/posture).
* Пользователь включает нужные на вкладке «Питание» или добавляет свои.
*/
export const SAMPLE_MEALS: Omit<Meal, 'id' | 'nextFireAt'>[] = [
{ name: 'Завтрак', time: '08:00', icon: 'Coffee', enabled: false, days: [] },
{
name: 'Обед',
time: '13:00',
icon: 'UtensilsCrossed',
enabled: false,
days: []
},
{ name: 'Ужин', time: '19:00', icon: 'Soup', enabled: false, days: [] }
]
export type UpdaterStatus = export type UpdaterStatus =
| { kind: 'idle'; lastCheckedAt?: number } | { kind: 'idle'; lastCheckedAt?: number }
| { kind: 'unsupported'; reason: string } | { kind: 'unsupported'; reason: string }
@@ -372,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
}