mirror of
https://github.com/Matysh/houseplan-card
synced 2026-07-31 08:28:31 +00:00
Matysh
d3db9e30e6
HP-1460-01: v1.46.0 stopped overwriting attachments, but picking a free name and taking it were two steps. Two uploads racing between them agreed on the same name, both answered 200, and one set of bytes replaced the other; files/migrate had the same check-then-copy gap. reserve_filename now claims the name with O_CREAT|O_EXCL as it picks it, and both paths use it. It also splits the extension off the RAW name and budgets the stem against MAX_FILENAME including the collision tag — a maximal name lost its '.pdf' and then grew past the limit, so the view sanitised the request back to a different name and the attachment 404'd for good. HP-1460-02: cleanup lived in an 'except Exception', which CancelledError walks past, only one tmp_path was tracked, promotion had no finally, and the collector only walks marker folders — an aborted transfer stranded a .upload-* that nothing would ever remove. An outer finally owns every temporary, a second 'file' part is refused, promotion failure cleans up, and sweep_upload_temps runs at setup, daily, and inside the commit-scoped collector. Chunks are batched to 1 MB per disk task instead of one per 64 KB. HP-1460-03: the layout event reached the static card and not the full one, so two full cards diverged until a reload. The full card subscribes now and re-reads ONLY the layout, keyed on its revision. Two hazards handled: it records revisions it produced itself, and the reaction is deferred ~200 ms because the event can beat the reply to our own write over the same socket; positions dragged but not yet sent are flushed and merged on top, so a fix for a stale UI cannot become a lost drag. Tests: smoke_layout_sync (fails on a v1.46.0 build), four pure tests for atomic reservation incl. 20-thread concurrency and the length boundary, a backend test walking every failing exit path of an upload, and — as the report asked — an HA-harness test that a repair issue disappears with its space. Docs: CHANGELOG.md + CHANGELOG.ru.md + ARCHITECTURE.md + TESTING.md + STATUS.md.
80 lines
3.6 KiB
JavaScript
80 lines
3.6 KiB
JavaScript
// HP-1460-03: позиции — отдельное состояние. В v1.46.0 событие layout_updated
|
|
// научилась слушать статическая карточка, а полная — нет, поэтому две полные
|
|
// карточки рядом расходились до перезагрузки. Проверяем и обратное: приход
|
|
// чужой ревизии не должен затирать перетаскивание, которое ещё не улетело.
|
|
import { launch, checkAll, finish } from './serve.mjs';
|
|
const { page, browser } = await launch();
|
|
const res = await page.evaluate(async () => {
|
|
const out = {};
|
|
const c = window.__card;
|
|
const base = c.hass.callWS;
|
|
|
|
// общий «сервер»: layout с ревизией и подписчики на событие
|
|
let rev = 5;
|
|
let layout = { dev_a: { x: 10, y: 10 }, dev_b: { x: 20, y: 20 } };
|
|
const subs = [];
|
|
let gets = 0;
|
|
const hass = { ...c.hass,
|
|
callWS: async (m) => {
|
|
if (m.type === 'houseplan/layout/get') { gets++; return { layout: JSON.parse(JSON.stringify(layout)), rev }; }
|
|
if (m.type === 'houseplan/layout/update') {
|
|
layout = { ...layout, [m.device_id]: m.pos }; rev += 1;
|
|
subs.forEach((f) => f({ data: { rev } }));
|
|
return { ok: true, rev };
|
|
}
|
|
return base(m);
|
|
},
|
|
connection: { subscribeEvents: async (cb, ev) => {
|
|
if (ev === 'houseplan_layout_updated') { subs.push(cb); return () => {}; }
|
|
return () => {};
|
|
} },
|
|
};
|
|
c.hass = hass;
|
|
c._serverStorage = true;
|
|
c._layout = JSON.parse(JSON.stringify(layout));
|
|
c._layoutRev = rev;
|
|
c._unsubLayout = await hass.connection.subscribeEvents(
|
|
(e) => c._onLayoutEvent(Number(e?.data?.rev ?? -1)),
|
|
'houseplan_layout_updated',
|
|
);
|
|
out.subscribed = subs.length === 1;
|
|
|
|
// 1) чужая карточка подвинула иконку — наша обязана подхватить без перезагрузки
|
|
layout = { ...layout, dev_a: { x: 77, y: 88 } }; rev += 1;
|
|
subs.forEach((f) => f({ data: { rev } }));
|
|
await new Promise((r) => setTimeout(r, 350));
|
|
out.adoptedRemoteMove = JSON.stringify(c._layout.dev_a) === JSON.stringify({ x: 77, y: 88 });
|
|
out.revFollowed = c._layoutRev === rev;
|
|
|
|
// 2) собственная запись не вызывает лишнего перечитывания
|
|
const before = gets;
|
|
c._layout = { ...c._layout, dev_b: { x: 31, y: 32 } };
|
|
c._dirtyPos.add('dev_b');
|
|
c._persistLayout();
|
|
c._persistLayout.flush();
|
|
await new Promise((r) => setTimeout(r, 350));
|
|
out.ownWriteNoReload = gets === before;
|
|
out.ownWriteKept = JSON.stringify(c._layout.dev_b) === JSON.stringify({ x: 31, y: 32 });
|
|
|
|
// 3) чужая ревизия во время неотправленного перетаскивания не съедает его
|
|
c._layout = { ...c._layout, dev_a: { x: 5, y: 6 } };
|
|
c._dirtyPos.add('dev_a'); // локально подвинули, ещё не отправили
|
|
layout = { ...layout, dev_b: { x: 99, y: 99 } }; rev += 1;
|
|
subs.forEach((f) => f({ data: { rev } }));
|
|
await new Promise((r) => setTimeout(r, 400));
|
|
out.localDragSurvived = JSON.stringify(c._layout.dev_a) === JSON.stringify({ x: 5, y: 6 });
|
|
out.remoteChangeApplied = JSON.stringify(c._layout.dev_b) === JSON.stringify({ x: 99, y: 99 });
|
|
return out;
|
|
});
|
|
// зафиксировано прогоном на v1.46.1 и сверено с кодом
|
|
checkAll(res, {
|
|
subscribed: true,
|
|
adoptedRemoteMove: true,
|
|
revFollowed: true,
|
|
ownWriteNoReload: true,
|
|
ownWriteKept: true,
|
|
localDragSurvived: true,
|
|
remoteChangeApplied: true,
|
|
});
|
|
await finish(browser);
|