feat(wasm): occ-split — lazy occ_service worker; kicad_editor drops OCC (−31%)
Move OpenCASCADE out of the merged editor image into occ_service: a separate
emscripten module (-sASYNCIFY=0, MODULARIZE, in-container -Oz finalize, 2N+8
pre-warmed pthread pool) booted lazily in a dedicated Web Worker on the first
STEP export or STEP/IGES model parse. kicad_editor.wasm ~190 MB -> 130 MB;
sessions that never touch OCC never fetch its 57 MB. STEP export works in the
browser for the first time: the unchanged desktop dialog runs EXPORTER_STEP,
whose wasm shadow suspends into globalThis.occService and the export bytes go
straight to a browser download (never entering the editor heap). STEP/IGES 3D
models parse in the worker via the oce shadow (S3D WriteCache/ReadCache wire).
- wasm/occ-service/: service CMake target (hooked from the kicad fork's
top-level CMakeLists, wasm/editor pattern), embind entry
(occExport/occLoadModel), wxConfig pre-js.
- wasm/stubs/{exporter_step,oce_plugin}_stub.cpp: EM_ASYNC_JS worker bridges
(callee-shadowing; no caller #ifdefs).
- web/standalone: provider installed whenever the kicad_editor bundle boots
(cross-face safe); ONE shared worker-boot source occ-worker.js (vite ?raw;
the e2e stub reads the same file) — blob worker with locateFile absolutized
against the glue URL; export download-name guard.
- deps: OCC builds with RapidJSON so its glTF/GLB writer exists — pinned to
the vcpkg master snapshot 2025-02-26 (24b5e7a8b27f), the same code official
KiCad consumes via vcpkg.json's opencascade[rapidjson]; rapidjson's latest
tag (v1.1.0, 2016) is ill-formed under modern clang.
- tests: occ-export dialog e2e (lazy-fetch boundary + STEP download bytes),
occ-probe incl. a 9-format matrix (step/stpz/brep/xao/ply/stl/glb/u3d/pdf),
3d-viewer-models hard-asserts the worker parse; occ provider stub installed
ambiently by the kicad fixtures.
Validated against desktop kicad-cli 10.0.4: geometric exact equality (bbox
delta 0 um, volume delta 0.0000%) for STEP/GLB/STL/BREP/STPZ across three
boards and option sweeps — with desktop OCC 7.9 vs wasm OCC 7.8; PLY/XAO/PDF
structurally equal; U3D same-size (quantizer float LSBs differ). Full kicad
e2e green on Firefox and Chromium; standalone verified end to end (lazy fetch
only on the Export click; export.step 60,628 B ISO-10303-21; loadModel 700 KB
STEP -> 569 KB scenegraph cache).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
96abe5d4a5
commit
db9d6ee04b
28 changed files with 2296 additions and 23 deletions
|
|
@ -210,7 +210,10 @@ function main() {
|
|||
env.VITE_REPO_URL = a.repo;
|
||||
|
||||
const viteArgs = ["--dir", "web", "--filter", "@pcbjam/standalone", "dev"];
|
||||
if (a.port) viteArgs.push("--", "--port", String(a.port));
|
||||
// No "--" separator: pnpm forwards script args verbatim, so a literal "--"
|
||||
// reaches vite and makes it IGNORE the flags after it ("vite -- --port N"
|
||||
// starts on the default port). Appending directly yields "vite --port N".
|
||||
if (a.port) viteArgs.push("--port", String(a.port));
|
||||
|
||||
console.log("dev-demo: standalone in demo mode (R2-only backend, no partykit)");
|
||||
console.log(` VITE_LIBS_SOURCE=${env.VITE_LIBS_SOURCE}${env.VITE_LIBS_MANIFEST_URL ? ` (${env.VITE_LIBS_MANIFEST_URL})` : ""}`);
|
||||
|
|
|
|||
|
|
@ -34,16 +34,23 @@ import {
|
|||
// bundle, booted with a runtime --frame flag (editor-unification Part 2) — none of
|
||||
// them publishes anything of its own. The frontend maps tools onto bundles via
|
||||
// TOOL_BUNDLE. sym_convert is a node CLI, not served.
|
||||
// occ_service is the lazy OCC worker module (STEP export + STEP/IGES model
|
||||
// parsing for the PCB frames, docs/features/occ-split/) — served, but headless:
|
||||
// no wx glue, no image archive.
|
||||
const TOOLS = [
|
||||
"kicad_editor",
|
||||
"pl_editor",
|
||||
"gerbview",
|
||||
"calculator",
|
||||
"occ_service",
|
||||
];
|
||||
|
||||
// Files that make up a self-contained tool bundle. `<tool>` is substituted.
|
||||
const SHARED_FILES = ["wx.js", "wx-dom.js", "images.tar.gz"];
|
||||
const toolFiles = (tool) => [`${tool}.wasm`, `${tool}.js`, ...SHARED_FILES];
|
||||
const toolFiles = (tool) =>
|
||||
tool === "occ_service"
|
||||
? [`${tool}.wasm`, `${tool}.js`]
|
||||
: [`${tool}.wasm`, `${tool}.js`, ...SHARED_FILES];
|
||||
|
||||
// Per-file HTTP rules (see the 0001 header matrix). `compress` is whether the
|
||||
// publisher compresses + sets Content-Encoding; images.tar.gz must stay RAW
|
||||
|
|
|
|||
Loading…
Reference in a new issue