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>
133 lines
5.7 KiB
TypeScript
133 lines
5.7 KiB
TypeScript
import type { Page } from '@playwright/test';
|
|
import { expect } from '@playwright/test';
|
|
import * as path from 'path';
|
|
import {
|
|
clickByTooltip,
|
|
clickMenuBarItem,
|
|
clickMenuItemByText,
|
|
findByTooltip,
|
|
} from '../../e2e/utils/element-tracker';
|
|
import { injectFileIntoMemfs } from './fs-inject';
|
|
|
|
/**
|
|
* Shared eeschema-simulator harness (one copy for eeschema-sim.spec.ts and
|
|
* eeschema-sim-recovery.spec.ts): rectifier project load, Inspect → Simulator
|
|
* open, and the exact applied-generation run driver.
|
|
*/
|
|
|
|
const RECTIFIER_DIR = path.resolve(__dirname, '..', '..', '..',
|
|
'kicad', 'demos', 'simulation', 'rectifier');
|
|
const MEMFS_DIR = '/home/kicad/documents/rectifier';
|
|
const PROJECT_FILES = ['rectifier.kicad_sch', 'rectifier.kicad_pro', 'diode.mod',
|
|
'rectifier_schlib.kicad_sym', 'sym-lib-table', 'rectifier.wbk'];
|
|
|
|
export async function loadRectifier(page: Page): Promise<void> {
|
|
for (const f of PROJECT_FILES)
|
|
await injectFileIntoMemfs(page, path.join(RECTIFIER_DIR, f), `${MEMFS_DIR}/${f}`);
|
|
|
|
await page.evaluate(async (sch: string) => {
|
|
await (window as any).Module.kicadOpenFile(sch);
|
|
}, `${MEMFS_DIR}/rectifier.kicad_sch`);
|
|
|
|
await expect
|
|
.poll(async () => page.title(), { timeout: 120000 })
|
|
.toMatch(/rectifier/i);
|
|
}
|
|
|
|
/** Open Inspect → Simulator and return the new top-level window's DOM id. */
|
|
export async function openSimulator(page: Page): Promise<string> {
|
|
const idsBefore = await page.$$eval('#window-container [id^="window-"]',
|
|
(els) => els.map((e) => e.id));
|
|
|
|
expect(await clickMenuBarItem(page, 'Inspect'), 'Inspect menu').toBe(true);
|
|
await clickMenuItemByText(page, 'Simulator');
|
|
|
|
await page.waitForFunction((before: string[]) => {
|
|
const ids = Array.from(
|
|
document.querySelectorAll('#window-container [id^="window-"]'),
|
|
(e) => e.id);
|
|
return ids.some((id) => !before.includes(id));
|
|
}, idsBefore, { timeout: 60000 });
|
|
|
|
const idsAfter = await page.$$eval('#window-container [id^="window-"]',
|
|
(els) => els.map((e) => e.id));
|
|
const simWin = idsAfter.find((id) => !idsBefore.includes(id));
|
|
expect(simWin, 'simulator window appeared').toBeTruthy();
|
|
return simWin!;
|
|
}
|
|
|
|
/**
|
|
* Poll until the Run Simulation tool is enabled. The Run tool's
|
|
* ENABLE(!simRunning) condition is a wxUpdateUIEvent check, and the WASM port
|
|
* only reliably re-evaluates those when input events pump the loop — nudge
|
|
* the mouse each poll or the toolbar can hold a stale state forever.
|
|
*/
|
|
export async function waitForRunToolEnabled(page: Page, timeout = 60000): Promise<void> {
|
|
await expect
|
|
.poll(async () => {
|
|
await page.mouse.move(4, 4);
|
|
await page.mouse.move(8, 8);
|
|
const el = await findByTooltip(page, 'Run Simulation', { elementType: 'tool' });
|
|
return !!el && el.enabled;
|
|
}, { message: 'Run Simulation tool must be enabled', timeout })
|
|
.toBe(true);
|
|
}
|
|
|
|
/**
|
|
* Run the loaded workbook's analysis and await the exact native run generation
|
|
* only after its final plot, operating-point, and canvas refresh calls return.
|
|
*/
|
|
export async function runSimulation(page: Page): Promise<number> {
|
|
// The simulator window div appears while the frame ctor is still
|
|
// suspended in the init RPC; the toolbar registers its tools only after
|
|
// init completes and the frame first paints.
|
|
await waitForRunToolEnabled(page);
|
|
|
|
const generationCheckpoint = await page.evaluate(() => {
|
|
const hooks = (globalThis as any).__ngspiceServiceTestHooks;
|
|
if (!hooks || typeof hooks.appliedGenerationCheckpoint !== 'function'
|
|
|| typeof hooks.waitForAppliedGenerationAfter !== 'function') {
|
|
throw new Error('exact ngspice applied-generation hooks are missing');
|
|
}
|
|
return hooks.appliedGenerationCheckpoint() as number;
|
|
});
|
|
|
|
expect(await clickByTooltip(page, 'Run Simulation', { elementType: 'tool' }),
|
|
'Run tool').toBe(true);
|
|
|
|
const appliedReceipt = await page.evaluate(async (after: number) => {
|
|
const hooks = (globalThis as any).__ngspiceServiceTestHooks;
|
|
return await hooks.waitForAppliedGenerationAfter(after, 120000);
|
|
}, generationCheckpoint);
|
|
expect(appliedReceipt.generation, 'the clicked run published a newer applied generation')
|
|
.toBeGreaterThan(generationCheckpoint);
|
|
|
|
// The native receipt fires after the final refreshes. Additionally
|
|
// require the scheduler to hold no parked ngspice wait — a stale
|
|
// suspended frame here means the finish path leaked a wait. (The codex
|
|
// line awaited the execution owner's barrier; that machinery does not
|
|
// exist on the JSPI line, and wait drainage is its observable
|
|
// equivalent.)
|
|
await expect.poll(
|
|
() => page.evaluate(() => {
|
|
const scheduler = (globalThis as any).__wxScheduler;
|
|
return scheduler?.pendingWaits?.('ngspice') ?? -1;
|
|
}),
|
|
{ message: 'no ngspice wait may stay parked after the applied receipt', timeout: 30000 },
|
|
).toBe(0);
|
|
|
|
// Vector traffic is result validation only. It is deliberately not used as
|
|
// completion evidence because periodic OnSimRefresh(false) pulls can look
|
|
// identical to the final pull at the worker boundary.
|
|
const vectorReceipt = await page.evaluate(() =>
|
|
((window as any).__ngspiceLog as Array<{
|
|
sequence: number; kind: string; error?: string; length?: number;
|
|
}>).find((entry) => entry.kind === 'get_vec_info'
|
|
&& entry.error === undefined
|
|
&& (entry.length ?? -1) >= 101) ?? null,
|
|
);
|
|
expect(vectorReceipt, 'the applied run returned a non-trivial successful vector')
|
|
.not.toBeNull();
|
|
|
|
return appliedReceipt.generation;
|
|
}
|