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>
134 lines
6.2 KiB
TypeScript
134 lines
6.2 KiB
TypeScript
import { test, expect } from './fixtures';
|
|
import { PNG } from 'pngjs';
|
|
import { stableShot, waitForEditorReady } from '../e2e/utils/element-tracker';
|
|
import { loadRectifier, openSimulator, runSimulation } from './utils/sim-harness';
|
|
|
|
/**
|
|
* eeschema simulator end-to-end (docs/features/ngspice-split/): the historic
|
|
* kill-point was SIMULATOR_FRAME never opening (no dlopen for libngspice);
|
|
* now NGSPICE binds the sharedspice client stub and the engine runs in the
|
|
* lazy ngspice_service worker. These specs drive the REAL UI path:
|
|
* project open → Inspect → Simulator → Run → plot, asserting the RPC/event
|
|
* plumbing (window.__ngspiceEvents / __ngspiceLog from the harness provider,
|
|
* tests/kicad/utils/ngspice-service.ts) and the rendered result.
|
|
*
|
|
* Fixture: the complete kicad demo rectifier project — its 1N4148 lives in a
|
|
* sibling diode.mod pulled in via `.include`, so a passing transient also
|
|
* proves the client stub's netlist file shipping (a missing model fails the
|
|
* run with "unable to find definition of model").
|
|
*/
|
|
|
|
function distinctColors(png: PNG): number {
|
|
const colors = new Set<number>();
|
|
// 8x8 grid sampling, same spirit as the 3d-viewer render check.
|
|
const stepX = Math.max(1, Math.floor(png.width / 8));
|
|
const stepY = Math.max(1, Math.floor(png.height / 8));
|
|
|
|
for (let y = 0; y < png.height; y += stepY) {
|
|
for (let x = 0; x < png.width; x += stepX) {
|
|
const i = (png.width * y + x) << 2;
|
|
colors.add((png.data[i] << 16) | (png.data[i + 1] << 8) | png.data[i + 2]);
|
|
}
|
|
}
|
|
return colors.size;
|
|
}
|
|
|
|
test.describe('eeschema simulator', () => {
|
|
test.describe.configure({ mode: 'serial' });
|
|
test.setTimeout(300000);
|
|
|
|
test('Inspect → Simulator opens the frame; service fetches lazily', async ({ page, testLogger }) => {
|
|
const ngspiceFetches: string[] = [];
|
|
page.on('request', (r) => {
|
|
if (r.url().includes('ngspice_service')) ngspiceFetches.push(r.url());
|
|
});
|
|
|
|
await page.goto('/kicad/eeschema.html');
|
|
await waitForEditorReady(page);
|
|
await loadRectifier(page);
|
|
|
|
expect(ngspiceFetches,
|
|
'ngspice_service must NOT be fetched before the simulator opens')
|
|
.toHaveLength(0);
|
|
|
|
await openSimulator(page);
|
|
await stableShot(page, 'eeschema-sim-frame.png');
|
|
|
|
// NGSPICE::init_dll ran inside the frame ctor → the client stub's init
|
|
// RPC booted the worker.
|
|
expect(ngspiceFetches.length,
|
|
'ngspice_service fetched lazily by the simulator open')
|
|
.toBeGreaterThan(0);
|
|
|
|
const all = [...testLogger.consoleLogs, ...testLogger.errors];
|
|
expect(all.filter((l) => l.includes('Aborted(')), 'no aborts').toHaveLength(0);
|
|
});
|
|
|
|
test('transient run: live console stream, vectors reach the plot, plot renders', async ({ page, testLogger }) => {
|
|
await page.goto('/kicad/eeschema.html');
|
|
await waitForEditorReady(page);
|
|
await loadRectifier(page);
|
|
const simWin = await openSimulator(page);
|
|
|
|
await runSimulation(page);
|
|
|
|
const evts = await page.evaluate(() => (window as any).__ngspiceEvents as Array<{
|
|
kind: string; lines?: string[]; finished?: boolean; t: number }>);
|
|
|
|
// Live streaming: console/status output must precede the finish event.
|
|
const finishT = evts.filter((e) => e.kind === 'bg' && e.finished).map((e) => e.t)[0];
|
|
const streamed = evts.filter(
|
|
(e) => (e.kind === 'char' || e.kind === 'stat') && e.t <= finishT);
|
|
expect(streamed.length, 'ngspice output streamed during the run')
|
|
.toBeGreaterThan(3);
|
|
|
|
// The model shipped via .include resolved (a miss fails the run with
|
|
// "unable to find definition" and produces no transient).
|
|
const charText = evts.flatMap((e) => e.lines ?? []).join('\n');
|
|
expect(charText, 'no missing-model errors').not.toMatch(/unable to find definition/i);
|
|
|
|
// The exact final-refresh receipt and drained-waits check above prove
|
|
// this log entry belongs to a vector which reached the plot, not
|
|
// merely a worker response still waiting to copy into native memory.
|
|
const vecPulls = await page.evaluate(() =>
|
|
((window as any).__ngspiceLog as Array<{ kind: string; length?: number }>)
|
|
.filter((l) => l.kind === 'get_vec_info' && (l.length ?? 0) > 100).length);
|
|
expect(vecPulls, 'plot fetched transient vectors').toBeGreaterThan(0);
|
|
|
|
// The plot area rendered something beyond a flat background.
|
|
const shot = await page.locator(`#${simWin}`).screenshot({
|
|
scale: 'css', animations: 'disabled' });
|
|
const png = PNG.sync.read(shot);
|
|
expect(distinctColors(png), 'plot window shows structure (axes/trace)')
|
|
.toBeGreaterThan(6);
|
|
|
|
await stableShot(page, 'eeschema-sim-plot.png');
|
|
|
|
const all = [...testLogger.consoleLogs, ...testLogger.errors];
|
|
expect(all.filter((l) => l.includes('Aborted(')), 'no aborts').toHaveLength(0);
|
|
const corruption = all.filter((l) =>
|
|
l.includes('index out of bounds') || l.includes('indirect call to null')
|
|
|| l.includes('uncaught exception: unwind'));
|
|
expect(corruption, 'no wasm trap').toHaveLength(0);
|
|
});
|
|
|
|
test('a second run after the first succeeds (engine reset path)', async ({ page, testLogger }) => {
|
|
await page.goto('/kicad/eeschema.html');
|
|
await waitForEditorReady(page);
|
|
await loadRectifier(page);
|
|
await openSimulator(page);
|
|
|
|
const firstGeneration = await runSimulation(page);
|
|
const secondGeneration = await runSimulation(page);
|
|
expect(secondGeneration, 'the second run has its own exact generation')
|
|
.toBeGreaterThan(firstGeneration);
|
|
|
|
const finishCount = await page.evaluate(() =>
|
|
((window as any).__ngspiceEvents as Array<{ kind: string; finished?: boolean }>)
|
|
.filter((e) => e.kind === 'bg' && e.finished === true).length);
|
|
expect(finishCount, 'two completed runs').toBeGreaterThanOrEqual(2);
|
|
|
|
const all = [...testLogger.consoleLogs, ...testLogger.errors];
|
|
expect(all.filter((l) => l.includes('Aborted(')), 'no aborts').toHaveLength(0);
|
|
});
|
|
});
|