A review of the group-E fixes found 13 further defects; ten were introduced by
those fixes, two pre-existed and were merely relocated, one is deferred.
Services / transport
E-10 retireWorker synthesized no bg/exit frame, so sharedspice's s_bgRunning
mirror stayed latched true after a mid-run worker death: Run stayed
disabled and the promised fresh-worker restart was unreachable for the
whole session. Retirement now dispatches a synthetic controlled-exit
straight to the installed handler (never through dispatchEvt — a
fabricated frame must not touch the credit ledger). Driving the repro
exposed two further defects, both fixed here: a replacement worker
trapped on pre-init engine reads, and the rerun's cm_input_path/circ hit
that uninitialized engine before KiCad's validate() re-init (the native
flow assumes a crashed engine survives in-process — true for the dll,
false for a dead worker). Reads now answer their empty shapes pre-init,
writes lazy-init, and init is idempotent per worker engine.
E-19 dispatchEvt acked only AFTER handler(evt) returned, and the sharedspice
client deliberately rethrows non-trap errors — so each throw leaked one
unit of the 64-frame credit window until the stream died with a
misattributed "transport exceeded". The ack moves to a finally in both
service copies; the throw still propagates (the trap machinery needs it).
E-20 the oversize-line path promises to transfer the accepted prefix, but
with the window full that flush only DEFERS, and stopEventStream wiped
the deferred queue — losing the diagnostics that explain the failure.
The terminal notice now carries them as pendingEvents; both hosts
deliver them in order, unacked (the fatal frame is outside the credit
protocol).
E-21 the 30s prefetch deadline discarded every model already collected and
reported nothing. A caller-owned progress sink ships the partials and
the omission reaches the export report. (Awaiting the aborted collection
was rejected: an in-flight source fetch is not abortable — E-4's
original disease.) Plus a serving-candidate memo, so a .wrl ref served
by its .step fallback stops re-probing the miss on every export.
Scheduler
E-14 _terminalizeNativeTrap classified by message substring, so any plain JS
error QUOTING 'Aborted(' or 'out of bounds' permanently bricked a
healthy instance. Now structural only: instanceof RuntimeError plus a
duck-typed name check (verified in this build's glue that abort() throws
a genuine RuntimeError both pre- and post-runtime-init). Module.onAbort
now latches the gate — the authoritative notification, previously
ignored.
E-15 the shim half: _pumpResume gates on terminal (catching wakes already
queued at latch time) and resolveWait refuses on terminal WITHOUT
consuming the entry, so a frame stays visibly parked rather than
resuming inside a trapped module.
E-16 the E-5 handler read the realm-global scheduler at dispatch instead of
its installing module's; also frees the per-line buffer on the non-trap
rethrow path.
E-11 get_vec trusted the worker's res.length over the transferred arrays.
Observed death shape: a 4 GiB std::vector threw an unhandled
std::length_error that exited the editor's main loop. Now clamped, with
the buffers freed on every failure path.
Guardrails (replacing two deferred refactors: e2e→production-code injection and
collapsing the four copies of the worker-lifecycle machinery)
E-18 the source contract asserted comment-string counts — rewording failed
CI while moving a guard outside its #ifdef passed. It now parses the
#ifdef regions and asserts on code.
service-stub-parity.ts pins what the four lifecycle copies must share:
credit-window equality parsed from source, the finally-ack, boot
deadlines, terminal-notice consumption. The transport numbers are now
single-sourced from the worker.
CI actually runs the gates: the web/standalone vitest suites (which had
NEVER run in CI), the reducer, the source contract and the parity tool —
with a NON_PLAYWRIGHT_GATES check so deleting a step re-fails the lint.
E-22 the e2e occ stub's 60s boot watchdog, deleted in a66e109, is restored in
the ngspice-stub shape with a wedgeNextBoot() repro hook.
Every behavioral fix has red-then-green evidence (the reds were captured first).
E-17 (a stale RUNNING cross-stamping the next run's generation under E-6's
transport deferral) is DEFERRED with its analysis recorded — a real fix needs
run identity on the bg frames.
Test hygiene: the dwell lint now requires the mandated ": <why>" and all 47 bare
markers carry their reason; three export-report dwells became modal-lease polls;
exact-ledger assertions became relative deltas; the dead data-wx-dom-id branch,
an unused fault hook and unused receipt plumbing are gone; abort scans, wx
dialog drivers, the sim harness and the vitest FakeWorker are each one copy now.
Bumps kicad and wxwidgets to their findings-group-e tips.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
139 lines
7.6 KiB
TypeScript
139 lines
7.6 KiB
TypeScript
import { test, expect } from './utils/fixtures';
|
||
import { clickByLabel, waitForWxApp } from './utils/element-tracker';
|
||
|
||
/**
|
||
* Validates the real-DOM title bar for secondary (non-main) wxFrames in the WASM
|
||
* DOM port — the fix for the "3D-viewer can't be dragged / can't be X-closed" bug.
|
||
*
|
||
* Root cause (confirmed): a non-main window's title bar used to be canvas-painted
|
||
* and pointer-events:none, so its clicks had to reach the central #canvas mouse
|
||
* router; an overlapping pointer-events:auto DOM control from another frame stole
|
||
* them. The fix gives ALL non-main top-level windows (secondary frames AND
|
||
* dialogs) a real DOM `.window-titlebar` (drag + `.window-titlebar-close`) that
|
||
* wins hit-testing via normal stacking.
|
||
*
|
||
* Drag dispatches real pointer events on the title bar (→ wx_window_move →
|
||
* wxWindow::Move); close clicks the × (→ wx_window_close → wx Close(); for a
|
||
* modal dialog this ends the modal loop via EndModal).
|
||
*/
|
||
|
||
const URL = '/standalone/secondary-frame-chrome/secondary-frame-chrome_test.html';
|
||
|
||
test.describe('secondary-frame DOM title bar (drag / close)', () => {
|
||
test('frames and dialogs get a draggable, closable DOM title bar', async ({ page }) => {
|
||
await page.goto(URL);
|
||
await waitForWxApp(page);
|
||
|
||
const listWindows = () =>
|
||
page.evaluate(() =>
|
||
Array.from(document.querySelectorAll('#window-container [id^="window-"]')).map((e) => e.id));
|
||
|
||
const styleRect = (id: string) =>
|
||
page.evaluate((wid) => {
|
||
const el = document.getElementById(wid) as HTMLElement | null;
|
||
if (!el) return null;
|
||
const n = (v: string) => parseInt(v || '0', 10) || 0;
|
||
return { left: n(el.style.left), top: n(el.style.top), width: n(el.style.width), height: n(el.style.height) };
|
||
}, id);
|
||
|
||
async function openWindow(buttonLabel: string): Promise<string> {
|
||
const before = await listWindows();
|
||
expect(await clickByLabel(page, buttonLabel), `"${buttonLabel}" should be clickable`).toBe(true);
|
||
await page.waitForFunction(
|
||
(b: string[]) => Array.from(document.querySelectorAll('#window-container [id^="window-"]')).some((e) => !b.includes(e.id)),
|
||
before, { timeout: 15000 });
|
||
const after = await listWindows();
|
||
const id = after.find((w) => !before.includes(w));
|
||
expect(id, `${buttonLabel} should open a new window`).toBeTruthy();
|
||
await page.waitForTimeout(200); // eslint-disable-line -- documented interaction dwell: new-window DOM population settle; no event/registry observable
|
||
return id as string;
|
||
}
|
||
|
||
// Returns true if the window moved after a title-bar drag.
|
||
async function dragViaTitlebar(winId: string): Promise<boolean> {
|
||
const bar = page.locator(`#${winId} .window-titlebar`);
|
||
const box = await bar.boundingBox();
|
||
expect(box, `#${winId} .window-titlebar should have a bounding box`).not.toBeNull();
|
||
const before = await styleRect(winId);
|
||
const sx = box!.x + box!.width / 2;
|
||
const sy = box!.y + box!.height / 2;
|
||
await page.mouse.move(sx, sy);
|
||
await page.mouse.down();
|
||
await page.mouse.move(sx, sy + 90, { steps: 10 });
|
||
await page.mouse.up();
|
||
await page.waitForTimeout(250); // eslint-disable-line -- documented interaction dwell: title-bar drag commit; no event/registry observable
|
||
const after = await styleRect(winId);
|
||
return !!before && !!after && (Math.abs(after.top - before.top) > 5 || Math.abs(after.left - before.left) > 5);
|
||
}
|
||
|
||
async function closeViaTitlebar(winId: string): Promise<boolean> {
|
||
await page.locator(`#${winId} .window-titlebar-close`).click();
|
||
await page.waitForTimeout(400); // eslint-disable-line -- documented interaction dwell: × close / modal EndModal commit; no event/registry observable
|
||
return page.evaluate((wid) => {
|
||
const el = document.getElementById(wid);
|
||
return !el || getComputedStyle(el).display === 'none';
|
||
}, winId);
|
||
}
|
||
|
||
// Returns true if dragging the bottom-right (se) resize handle grew the window.
|
||
async function resizeViaCorner(winId: string): Promise<boolean> {
|
||
const handle = page.locator(`#${winId} .window-resize-se`);
|
||
const box = await handle.boundingBox();
|
||
expect(box, `#${winId} .window-resize-se should have a bounding box`).not.toBeNull();
|
||
const before = await styleRect(winId);
|
||
const sx = box!.x + box!.width / 2;
|
||
const sy = box!.y + box!.height / 2;
|
||
await page.mouse.move(sx, sy);
|
||
await page.mouse.down();
|
||
await page.mouse.move(sx + 60, sy + 60, { steps: 10 });
|
||
await page.mouse.up();
|
||
await page.waitForTimeout(250); // eslint-disable-line -- documented interaction dwell: se-corner resize drag commit; no event/registry observable
|
||
const after = await styleRect(winId);
|
||
return !!before && !!after
|
||
&& (after.width - before.width > 20) && (after.height - before.height > 20);
|
||
}
|
||
|
||
const countResizeHandles = (winId: string) =>
|
||
page.locator(`#${winId} .window-resize-handle`).count();
|
||
|
||
// Every non-main top-level window — frame or dialog — gets a DOM title bar
|
||
// (drag + close ×). Edge-resize handles are added ONLY to windows whose wx
|
||
// style carries wxRESIZE_BORDER: all wxFrames + dialogs that opt in (the
|
||
// resizable dialog), but NOT the plain fixed dialog.
|
||
// resizable — expects 5 resize handles (e/w/s/se/sw); fixed expects 0
|
||
// resizeDraggable — its se corner is on-screen, so assert a real resize drag
|
||
const windows = [
|
||
{ label: 'Open Full GL Frame', resizable: true, resizeDraggable: false },
|
||
{ label: 'Open Rich GL Frame', resizable: true, resizeDraggable: false },
|
||
{ label: 'Open Small Frame', resizable: true, resizeDraggable: true },
|
||
{ label: 'Open Resizable Dialog', resizable: true, resizeDraggable: true },
|
||
{ label: 'Open Modeless Dialog', resizable: false, resizeDraggable: false },
|
||
];
|
||
|
||
for (const { label, resizable, resizeDraggable } of windows) {
|
||
const id = await openWindow(label);
|
||
const hasBar = await page.locator(`#${id} .window-titlebar`).count();
|
||
expect(hasBar, `${label} should have a DOM title bar`).toBe(1);
|
||
|
||
// Resize-handle gate: present (5) iff the window is wxRESIZE_BORDER.
|
||
const handles = await countResizeHandles(id);
|
||
if (resizable) {
|
||
expect(handles, `${label} should have edge-resize handles`).toBe(5);
|
||
if (resizeDraggable) {
|
||
const resized = await resizeViaCorner(id);
|
||
expect(resized, `${label} should resize by dragging its se corner`).toBe(true);
|
||
}
|
||
} else {
|
||
expect(handles, `${label} (no wxRESIZE_BORDER) must NOT be resizable`).toBe(0);
|
||
}
|
||
|
||
// Root-cause check: even with main-frame DOM controls present, the title
|
||
// bar is the top hit-test element at its own location.
|
||
const moved = await dragViaTitlebar(id);
|
||
expect(moved, `${label} should be draggable by its DOM title bar`).toBe(true);
|
||
|
||
const closed = await closeViaTitlebar(id);
|
||
expect(closed, `${label} should close via its × button`).toBe(true);
|
||
}
|
||
});
|
||
});
|