feat: /meta для версии в футере и устойчивый разбор JSON

Reviewed-on: #16

.env.example

@@ -24,10 +24,16 @@ API_PORT=3001
 # CALENDAR_RUN_MOCK_DB=1
 
 # ─── CORS ────────────────────────────────────────────────────
+# Должен совпадать с origin в браузере (схема + хост + порт, без пути), иначе API «молчит».
 # Локальный Vite: http://localhost:5173
 # Стек с фронтом на 3033: http://localhost:3033
+# Прод: https://ваш-домен  — несколько origin через запятую: https://a.ru,https://www.a.ru
 CORS_ORIGIN=http://localhost:5173
 
+# ─── Версия API (опционально) ─────────────────────────────────
+# Если в образе не удаётся прочитать package.json, подставьте вручную (видно в GET /health).
+# APP_VERSION=1.0.0
+
 # ─── Frontend (Vite, локально из каталога frontend/) ─────────
 # В Docker-образе фронта базовый URL API задаётся при сборке (/api), не из .env.
 VITE_API_BASE_URL=http://localhost:3001

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "calendar-run-backend",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "build": "tsc",

backend/src/app.ts

@@ -7,11 +7,16 @@ import racesRouter from "./routes/races";
 export function createApp(): express.Express {
   const app = express();
 
-  app.use(cors({ origin: config.corsOrigin, methods: ["GET", "POST", "PATCH", "DELETE"] }));
+  app.use(
+    cors({ origin: config.corsOrigin, methods: ["GET", "POST", "PATCH", "DELETE", "OPTIONS"] }),
+  );
   app.use(express.json());
 
   app.use(healthRouter);
   app.use(racesRouter);
+  // Тот же API под /api/* — если прокси не снимает префикс или запрос идёт напрямую на порт бэкенда с /api.
+  app.use("/api", healthRouter);
+  app.use("/api", racesRouter);
 
   app.use((err: unknown, _req: Request, res: Response, _next: NextFunction) => {
     if (err instanceof SyntaxError && "body" in err) {

backend/src/config.ts

@@ -33,5 +33,21 @@ export const config = {
         password: requireEnv("DB_PASSWORD"),
       },
   apiPort: parseInt(process.env.PORT || process.env.API_PORT || "3001", 10),
-  corsOrigin: process.env.CORS_ORIGIN || "http://localhost:5173",
+  /** Одно значение или несколько через запятую (прод: https://домен) */
+  corsOrigin: parseCorsOrigins(),
 };
+
+function parseCorsOrigins(): string | string[] {
+  const raw = process.env.CORS_ORIGIN?.trim();
+  if (!raw) {
+    return "http://localhost:5173";
+  }
+  const parts = raw.split(",").map((s) => s.trim()).filter(Boolean);
+  if (parts.length === 0) {
+    return "http://localhost:5173";
+  }
+  if (parts.length === 1) {
+    return parts[0]!;
+  }
+  return parts;
+}

backend/src/routes/health.ts

@@ -8,6 +8,11 @@ router.get("/health", (_req: Request, res: Response) => {
   res.json({ status: "ok", version: getBackendVersion() });
 });
 
+/** Версия для UI; путь без «health», чтобы реже резался фильтрами/прокси. */
+router.get("/meta", (_req: Request, res: Response) => {
+  res.json({ version: getBackendVersion() });
+});
+
 router.get("/ready", async (_req: Request, res: Response) => {
   const dbOk = await checkDbConnection();
   if (dbOk) {

backend/src/version.ts

@@ -7,8 +7,18 @@ export function getBackendVersion(): string {
   if (cached) {
     return cached;
   }
-  const pkgPath = path.join(__dirname, "..", "package.json");
+  const fromEnv = process.env.APP_VERSION?.trim();
-  const raw = fs.readFileSync(pkgPath, "utf-8");
+  if (fromEnv) {
-  cached = (JSON.parse(raw) as { version: string }).version;
+    cached = fromEnv;
-  return cached;
+    return cached;
+  }
+  try {
+    const pkgPath = path.join(__dirname, "..", "package.json");
+    const raw = fs.readFileSync(pkgPath, "utf-8");
+    cached = (JSON.parse(raw) as { version: string }).version;
+    return cached;
+  } catch {
+    cached = "0.0.0";
+    return cached;
+  }
 }

backend/test/app.test.ts

@@ -12,6 +12,23 @@ test("GET /health returns ok", async () => {
   assert.ok(res.body.version.length > 0);
 });
 
+test("GET /api/health returns ok (prefix without proxy strip)", async () => {
+  const res = await request(app).get("/api/health").expect(200);
+  assert.equal(res.body.status, "ok");
+});
+
+test("GET /meta returns version for UI footer", async () => {
+  const res = await request(app).get("/meta").expect(200);
+  assert.equal(typeof res.body.version, "string");
+  assert.ok(res.body.version.length > 0);
+});
+
+test("GET /api/meta mirrors GET /meta", async () => {
+  const res = await request(app).get("/api/meta").expect(200);
+  assert.equal(typeof res.body.version, "string");
+  assert.ok(res.body.version.length > 0);
+});
+
 test("GET /ready succeeds with mock database", async () => {
   const res = await request(app).get("/ready").expect(200);
   assert.equal(res.body.status, "ready");
@@ -34,6 +51,11 @@ test("GET /races accepts year and month", async () => {
   assert.ok(Array.isArray(res.body));
 });
 
+test("GET /api/races mirrors GET /races", async () => {
+  const res = await request(app).get("/api/races?year=2026&month=5").expect(200);
+  assert.ok(Array.isArray(res.body));
+});
+
 test("GET /races/:id returns not_found", async () => {
   const res = await request(app).get("/races/does-not-exist").expect(404);
   assert.equal(res.body.error, "not_found");

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "calendar-run-frontend",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

frontend/src/api/errors.ts

@@ -35,7 +35,8 @@ function normalizeApiCode(value: string | undefined): ApiErrorCode {
     value === "validation_error" ||
     value === "not_found" ||
     value === "database_unavailable" ||
-    value === "conflict"
+    value === "conflict" ||
+    value === "unknown_error"
   ) {
     return value;
   }
@@ -62,6 +63,17 @@ export function toApiError(status: number, payload: unknown): ApiError {
     });
   }
 
+  if (!hasStructuredApiError(payload) && (status === 401 || status === 403 || status === 404)) {
+    return new ApiError({
+      code: "network_error",
+      status,
+      message:
+        status === 404
+          ? "API не найден по этому адресу. Проверьте прокси и префикс /api."
+          : "Запрос отклонён сервером. Проверьте переменную CORS_ORIGIN на бэкенде.",
+    });
+  }
+
   const maybePayload = payload as ApiErrorPayload;
   const code = normalizeApiCode(maybePayload?.error);
   const details = Array.isArray(maybePayload?.details)
@@ -88,6 +100,8 @@ export function getApiErrorMessage(code: ApiErrorCode): string {
       return "Запись с таким идентификатором уже существует.";
     case "network_error":
       return "Не удалось связаться с сервером.";
+    case "unknown_error":
+      return "Сервер не смог обработать запрос. Попробуйте позже или обновите страницу.";
     default:
       return "Произошла неизвестная ошибка.";
   }

frontend/src/api/health.ts

@@ -5,6 +5,15 @@ export type HealthResponse = {
   version: string;
 };
 
+export type BackendMetaResponse = {
+  version: string;
+};
+
 export async function getHealth(init?: RequestInit): Promise<HealthResponse> {
   return requestJson<HealthResponse>("/health", init);
 }
+
+/** Версия бэкенда для футера (отдельный путь от /health — меньше ложных блокировок). */
+export async function getBackendMeta(init?: RequestInit): Promise<BackendMetaResponse> {
+  return requestJson<BackendMetaResponse>("/meta", init);
+}

frontend/src/api/http.ts

@@ -8,16 +8,30 @@ function buildUrl(path: string): string {
 }
 
 async function parseResponseBody(response: Response): Promise<unknown> {
-  const contentType = response.headers.get("content-type") ?? "";
+  const text = await response.text();
-  if (!contentType.includes("application/json")) {
+  if (!text.trim()) {
     return null;
   }
 
-  try {
+  const contentType = response.headers.get("content-type") ?? "";
-    return await response.json();
+  if (contentType.includes("application/json")) {
-  } catch {
+    try {
-    return null;
+      return JSON.parse(text) as unknown;
+    } catch {
+      return null;
+    }
   }
+
+  const trimmed = text.trim();
+  if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+    try {
+      return JSON.parse(text) as unknown;
+    } catch {
+      return null;
+    }
+  }
+
+  return null;
 }
 
 const GATEWAY_RETRY_STATUSES = new Set([502, 503, 504]);
@@ -35,10 +49,15 @@ export async function requestJson<T>(path: string, init?: RequestInit): Promise<
 
   for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
     try {
+      const defaultHeaders: Record<string, string> = {};
+      if (method !== "GET" && method !== "HEAD") {
+        defaultHeaders["Content-Type"] = "application/json";
+      }
+
       const response = await fetch(buildUrl(path), {
         ...init,
         headers: {
-          "Content-Type": "application/json",
+          ...defaultHeaders,
           ...(init?.headers ?? {}),
         },
       });

frontend/src/api/index.ts

@@ -1,5 +1,5 @@
 export type { CreateRacePayload, Race, RacesQuery, RaceStatus, UpdateRacePayload } from "./types";
 export { ApiError, getApiErrorMessage } from "./errors";
-export type { HealthResponse } from "./health";
+export type { BackendMetaResponse, HealthResponse } from "./health";
-export { getHealth } from "./health";
+export { getBackendMeta, getHealth } from "./health";
 export { getRaceById, getRaces, createRace, updateRace, deleteRace } from "./races";

frontend/src/app/layouts/AppShellFooter.tsx

@@ -1,21 +1,29 @@
 import { useEffect, useState } from "react";
-import { getHealth } from "../../api";
+import { getBackendMeta } from "../../api";
 import { FRONTEND_VERSION } from "../../frontendVersion";
 
+function isAbortError(error: unknown): boolean {
+  return (
+    (error instanceof DOMException && error.name === "AbortError") ||
+    (error instanceof Error && error.name === "AbortError")
+  );
+}
+
 export function AppShellFooter(): JSX.Element {
   const [backendVersion, setBackendVersion] = useState<string | null>(null);
 
   useEffect(() => {
     const ac = new AbortController();
-    void getHealth({ signal: ac.signal })
+    void getBackendMeta({ signal: ac.signal })
-      .then((h) => {
+      .then((meta) => {
         if (ac.signal.aborted) {
           return;
         }
-        setBackendVersion(h.version);
+        const v = meta.version;
+        setBackendVersion(typeof v === "string" && v.length > 0 ? v : "не указана");
       })
-      .catch(() => {
+      .catch((err) => {
-        if (ac.signal.aborted) {
+        if (ac.signal.aborted || isAbortError(err)) {
           return;
         }
         setBackendVersion("недоступна");

frontend/src/lib/index.ts

@@ -8,6 +8,7 @@ export {
   isCloseDistance,
   parseFinishTimeToSeconds,
   parseRaceDate,
+  raceNeedsResultEntry,
   sortByDateAsc,
   sortByDateDesc,
   splitRacesByDate,

frontend/src/lib/raceMetrics.ts

@@ -122,18 +122,36 @@ export function getPaceLabel(finishTime: string | null, distanceKm: number): str
   return `${String(paceMinutes).padStart(2, "0")}:${String(paceRemainder).padStart(2, "0")} /км`;
 }
 
-export function getRaceStatusClassName(status: Race["status"]): string {
+function isPastDateNeedingResult(status: Race["status"], raceDate: string): boolean {
-  const base = "race-card__status";
+  if (status !== "planned" && status !== "registered") {
-  if (status === "completed") {
+    return false;
-    return `${base} ${base}--completed`;
   }
-  if (status === "registered") {
+  const today = new Date();
-    return `${base} ${base}--registered`;
+  today.setHours(0, 0, 0, 0);
-  }
+  return parseRaceDate(raceDate).getTime() < today.getTime();
-  return `${base} ${base}--planned`;
 }
 
-export function getRaceStatusLabel(status: Race["status"]): string {
+export function raceNeedsResultEntry(race: Race): boolean {
+  return isPastDateNeedingResult(race.status, race.date);
+}
+
+export function getRaceStatusClassName(status: Race["status"], raceDate?: string): string {
+  const base = "race-card__status";
+  let tier = `${base}--planned`;
+  if (status === "completed") {
+    tier = `${base}--completed`;
+  } else if (status === "registered") {
+    tier = `${base}--registered`;
+  }
+  const needs =
+    raceDate && isPastDateNeedingResult(status, raceDate) ? ` ${base}--needs-result` : "";
+  return `${base} ${tier}${needs}`;
+}
+
+export function getRaceStatusLabel(status: Race["status"], raceDate?: string): string {
+  if (raceDate && isPastDateNeedingResult(status, raceDate)) {
+    return "внесите результат";
+  }
   if (status === "completed") {
     return "пробежал";
   }

frontend/src/pages/RaceDetailsPage.tsx

@@ -7,6 +7,7 @@ import {
   getPaceLabel,
   getRaceStatusClassName,
   getRaceStatusLabel,
+  raceNeedsResultEntry,
 } from "../lib";
 import type { Race } from "../api";
 
@@ -148,9 +149,19 @@ export function RaceDetailsPage(): JSX.Element {
             {formatRaceDate(race.date)} · {formatDistance(race.distanceKm)}
           </p>
         </div>
-        <span className={getRaceStatusClassName(race.status)}>{getRaceStatusLabel(race.status)}</span>
+        <span className={getRaceStatusClassName(race.status, race.date)}>{getRaceStatusLabel(race.status, race.date)}</span>
       </div>
 
+      {raceNeedsResultEntry(race) ? (
+        <p className="race-details-past-hint" role="status">
+          Дата старта уже прошла —{" "}
+          <Link className="race-details-past-hint__link" to={`/races/${race.id}/edit`}>
+            внесите результат или обновите статус
+          </Link>
+          .
+        </p>
+      ) : null}
+
       <div className="race-details-actions">
         <Link className="btn btn--primary" to={`/races/${race.id}/edit`}>
           Редактировать
@@ -202,7 +213,7 @@ export function RaceDetailsPage(): JSX.Element {
             </div>
             <div className="race-details-meta__item">
               <dt className="race-details-meta__key">Статус</dt>
-              <dd className="race-details-meta__value">{getRaceStatusLabel(race.status)}</dd>
+              <dd className="race-details-meta__value">{getRaceStatusLabel(race.status, race.date)}</dd>
             </div>
             <DetailLink label="Сайт организатора" url={race.officialUrl} />
             <DetailItem label="Время старта" value={race.startTime} />

frontend/src/pages/RacesPage.tsx

@@ -64,7 +64,7 @@ function RaceList(props: { title: string; races: Race[] }): JSX.Element {
                   {formatRaceDate(race.date)} · {formatDistance(race.distanceKm)}
                 </p>
               </div>
-              <span className={getRaceStatusClassName(race.status)}>{getRaceStatusLabel(race.status)}</span>
+              <span className={getRaceStatusClassName(race.status, race.date)}>{getRaceStatusLabel(race.status, race.date)}</span>
             </li>
           ))}
         </ul>

frontend/src/styles/global.css

@@ -291,6 +291,31 @@ a {
   color: #8a5a00;
 }
 
+.race-card__status--needs-result {
+  outline: 1px solid var(--color-warning);
+}
+
+.race-details-past-hint {
+  margin: 0 0 var(--space-4);
+  padding: var(--space-3) var(--space-4);
+  border-radius: var(--radius-md);
+  border: 1px solid var(--color-warning);
+  background: #fffaf0;
+  color: var(--color-text);
+  font-size: var(--font-size-caption);
+}
+
+.race-details-past-hint__link {
+  color: var(--color-accent);
+  font-weight: 600;
+  text-decoration: underline;
+}
+
+.race-details-past-hint__link:hover,
+.race-details-past-hint__link:focus-visible {
+  outline: none;
+}
+
 .races-filter {
   margin-top: var(--space-5);
   display: flex;