Files
houseplan-card/src/space-dialog.ts
T
Claude 857369b18b fix(plans): загрузка плана по HTTP, предел 8 МБ проверяется до отправки (#617)
План уходил base64 в WebSocket-кадре: файл больше ~3 МиБ давал кадр больше
4 МиБ, HA закрывал сокет до обработчика, и обещанные 8 МБ были недостижимы.

- бэкенд: HouseplanPlanUploadView (POST /api/houseplan/plans/upload), потоковый
  предел MAX_PLAN_BYTES (read_bounded), общий writer store_plan_upload для view
  и ws_plan_set (контракт WS без изменений);
- карточка: stagePlanFile/uploadPlanFile/renderPlanBackdropGuard в
  backdrop-pick.ts для обоих рантаймов; PlanFilePayload хранит Blob вместо b64;
  SVG больше предела — тост при выборе, растр — диалог #39 только с уменьшенной
  копией, копия больше предела не попадает в staging, 413 называет предел;
- i18n toast.plan_too_large, backdrop.over_limit_body (en/ru/de/fr);
  USER-GUIDE ru/en, CHANGELOG ru/en, docs/testing-notes (#617);
- тесты: test/plan-upload-limit.test.mjs, tests_backend/test_plan_upload.py,
  test_ha_upload.py (#617), smoke_plan_upload_limit.mjs; три смока переведены
  с b64/plan/set на blob/fetchWithAuth; мутанты plan-upload-*;
- база монолита: hostRefs +3 (общий хелпер плана вместо двух копий в рантаймах,
  новый тост уменьшенной копии).

Issue: #617
User-Visible: yes
2026-09-24 19:57:41 +03:00

193 lines
6.0 KiB
TypeScript

import { roomTempRangeOf, type FillColorEntry, type RoomTempRange } from './logic';
import type { ZeroWallStyle } from './types';
export type SpacePlanSource = 'file' | 'draw';
export interface SpaceCopyDraft {
title: string;
busy: boolean;
token: number;
}
export interface SpaceDialogState {
mode: 'edit' | 'create';
spaceId?: string;
title: string;
planUrl: string | null;
planFile: { ext: string; blob: Blob; aspect: number; name: string } | null;
/** Server-side plan picker state; asset files are never inferred garbage. */
pickSaved?: boolean;
saved?: Array<{
name: string; url: string; size: number; modified: number; used_by: string[];
}> | null;
savedBusy?: boolean;
savedAspect?: number;
source: SpacePlanSource;
showBorders: boolean;
showNames: boolean;
zeroWallStyle: ZeroWallStyle;
displayTouched: boolean;
hideDecor: boolean;
hideOpenings: boolean;
roomColor: string;
roomOpacity: number;
bgColor: string | null;
bgMode: 'static' | 'daynight' | null;
northDeg: number | null;
/** Ephemeral text shown by the custom-north input; never persisted. */
northDegInput?: string;
sunRays: boolean | null;
fillMode: 'none' | 'lqi' | 'light' | 'temp' | 'custom';
customFill: FillColorEntry | null;
glowEnabled: boolean;
tempMin: number;
tempMax: number;
/** Ephemeral text shown by required temperature inputs; never persisted. */
tempMinInput?: string;
tempMaxInput?: string;
showLqi: boolean;
cardFontScale: number;
labelTemp: boolean;
labelHum: boolean;
labelLqi: boolean;
labelLight: boolean;
cellCm: number;
cellCmInput?: string;
cellCmTouched?: boolean;
deleteBlockers?: number;
copy?: SpaceCopyDraft;
busy: boolean;
}
export interface SpaceDisplayDraft {
source: SpacePlanSource;
showBorders: boolean;
showNames: boolean;
/** Ephemeral create-dialog guard; never persisted in the House Plan config. */
displayTouched: boolean;
}
/**
* A current empty space is still a complete wall-model document. In
* particular, model v8+ forbids using an absent catalogue to mean "no walls":
* absence means an outdated/partial writer, while an empty array is the
* canonical empty catalogue.
*/
export function createEmptySpaceConfig(id: string, title: string): Record<string, unknown> {
return {
id,
title,
plan_url: null,
view_box: [0, 0, 1, 1],
rooms: [],
wall_segments: [],
};
}
/** Source-specific visible defaults for a fresh create/onboarding step. */
export function initialSpaceDisplayDraft(source: SpacePlanSource = 'file'): SpaceDisplayDraft {
const visible = source === 'draw';
return {
source,
showBorders: visible,
showNames: visible,
displayTouched: false,
};
}
/**
* Project source defaults only while the owner has not changed either display
* switch. Once touched, the pair is one user choice and must survive switches.
*/
export function switchSpacePlanSource<T extends SpaceDisplayDraft>(
draft: T,
source: SpacePlanSource,
): T {
if (draft.displayTouched) return { ...draft, source };
const visible = source === 'draw';
return { ...draft, source, showBorders: visible, showNames: visible };
}
/** Changing either switch protects the complete pair from source projection. */
export function touchSpaceDisplay<T extends SpaceDisplayDraft>(
draft: T,
field: 'showBorders' | 'showNames',
value: boolean,
): T {
return { ...draft, [field]: value, displayTouched: true };
}
/** Numeric dialog fields consume the complete value; decimal comma is valid. */
export function strictNumber(value: string): number | null {
const text = String(value ?? '').trim().replace(',', '.');
if (!/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/.test(text)) return null;
const parsed = Number(text);
return Number.isFinite(parsed) ? parsed : null;
}
export interface RoomTempThresholdDraft {
valid: boolean;
min: number | null;
max: number | null;
}
/** Parse room threshold inputs without conflating an empty field with zero. */
export function roomTempThresholdDraft(
rawMin: string,
rawMax: string,
): RoomTempThresholdDraft {
const parse = (raw: string): { valid: boolean; value: number | null } => {
if (String(raw ?? '').trim() === '') return { valid: true, value: null };
const value = strictNumber(raw);
return { valid: value !== null, value };
};
const lower = parse(rawMin);
const upper = parse(rawMax);
if (!lower.valid || !upper.valid) {
return { valid: false, min: lower.value, max: upper.value };
}
if (lower.value !== null && upper.value !== null && lower.value > upper.value) {
return { valid: true, min: upper.value, max: lower.value };
}
return { valid: true, min: lower.value, max: upper.value };
}
/** Resolve saved or pending room bounds through the same production inheritance rule. */
export function roomTempRangeFromDraft(
spaceMin: number,
spaceMax: number,
room: { settings?: { temp_min?: unknown; temp_max?: unknown } | null },
rawMin: string,
rawMax: string,
useDraft: boolean,
): RoomTempRange {
const draft = roomTempThresholdDraft(rawMin, rawMax);
const source = useDraft && draft.valid
? { settings: { ...(room.settings || {}), temp_min: draft.min, temp_max: draft.max } }
: room;
return roomTempRangeOf(spaceMin, spaceMax, source);
}
export function roomTempThresholdInputValues(
settings: { temp_min?: unknown; temp_max?: unknown } | null | undefined,
): [string, string] {
const value = (value: unknown): string =>
typeof value === 'number' && Number.isFinite(value) ? String(value) : '';
return [value(settings?.temp_min), value(settings?.temp_max)];
}
/** Mutate a dialog-owned settings draft; false means the inputs must not be saved. */
export function applyRoomTempThresholdDraft(
settings: Record<string, unknown>,
rawMin: string,
rawMax: string,
): boolean {
const draft = roomTempThresholdDraft(rawMin, rawMax);
if (!draft.valid) return false;
if (draft.min === null) delete settings.temp_min;
else settings.temp_min = draft.min;
if (draft.max === null) delete settings.temp_max;
else settings.temp_max = draft.max;
return true;
}