From 8c7c2f107973867df3dddffc0eaef8847b797d42 Mon Sep 17 00:00:00 2001 From: wangdequan Date: Mon, 8 Jun 2026 09:16:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E8=A7=84=E5=88=92=E7=BB=A7=E7=BB=AD?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 结论：补齐通用会话快照 envelope 的格式、版本、会话 ID 与对象形状拒绝验证，覆盖 Node OPFS 与 Chromium OPFS 路径，并通过 host/WASM/browser 聚合验证。 --- wasm-port/docs/compatibility-validation.md | 21 ++++---- wasm-port/docs/drift-report.md | 5 +- wasm-port/docs/source-reuse-map.md | 3 +- wasm-port/tests/browser/ini_panel_smoke.html | 52 ++++++++++++++++++- .../tests/opfs/node/verify_file_service.mjs | 47 +++++++++++++++++ 5 files changed, 115 insertions(+), 13 deletions(-) diff --git a/wasm-port/docs/compatibility-validation.md b/wasm-port/docs/compatibility-validation.md index 0126e1d..c7c4819 100644 --- a/wasm-port/docs/compatibility-validation.md +++ b/wasm-port/docs/compatibility-validation.md @@ -99,8 +99,10 @@ directory creation, text save/load, missing file behavior, invalid relative paths, unavailable OPFS storage, and the host-side OPFS path model for INI, tool table, parameter, G-code, preview-cache, and session-snapshot storage targets. It also validates the host-side session snapshot JSON envelope and -round-trip store plus pure-text machine file and G-code stores without -defining CNC machine-state or file-format semantics. It now also validates the +round-trip store, including unsupported format/version, session-id mismatch, +and non-object metadata/payload rejection, plus pure-text machine file and +G-code stores without defining CNC machine-state or file-format semantics. It +now also validates the OPFS-to-WASM parameter-file bridge with a mock interpreter SDK to ensure the host boundary copies text into and out of the WASM filesystem without defining parameter semantics, and that INI-derived machine file names are still @@ -112,8 +114,8 @@ keeping host override policy outside CNC semantics. The browser INI/OPFS smoke script serves `wasm-port/` over localhost and runs Chromium headless against a test page that imports the JS SDK, loads the INI WASM module, queries vendored LinuxCNC INI parsing through the SDK, and -performs an OPFS text-file, generic session snapshot, machine file, and G-code -text round trip. +performs an OPFS text-file, generic session snapshot, invalid snapshot +envelope, machine file, and G-code text round trip. The browser interpreter smoke script serves `wasm-port/` over localhost and runs Chromium headless against a test page that loads the interpreter-core @@ -184,8 +186,8 @@ The validation fails if: | --- | --- | | `tests/wasm/node/verify_ini_wasm.sh` | Validates the browser-facing INI WASM module can be built from vendored LinuxCNC `inifile.cc`, loaded through the JS SDK in Node, and queried through the exported C ABI. | | `tests/wasm/node/verify_interp_wasm.sh` | Validates the initial interpreter-core WASM module can be built from vendored LinuxCNC interpreter source, loaded through the interpreter JS SDK, run the first fixture group through `Interp::execute()` and selected file fixtures through `Interp::open()`/`read()`/`execute()`, match the native canonical event plus required state readback fixtures, and run parameter-file restore/save through vendored LinuxCNC `Interp::restore_parameters()` and `Interp::save_parameters()`. | -| `tests/opfs/node/verify_file_service.sh` | Validates the host-owned OPFS text-file adapter, path model, session snapshot store, machine file store, G-code text store, OPFS-to-WASM parameter/tool-table bridges, and grouped machine-session loading without moving file persistence, parameter semantics, or tool-table semantics into the WASM core. | -| `tests/browser/verify_ini_panel_browser.sh` | Validates the INI SDK, INI/interpreter WASM module loading, OPFS text-file round trip, generic session snapshot round trip, machine file text round trip, G-code text round trip, and the INI panel UI's machine-session load, G-code run, and canonical-event display paths in a real browser runtime. | +| `tests/opfs/node/verify_file_service.sh` | Validates the host-owned OPFS text-file adapter, path model, session snapshot store including envelope rejection paths, machine file store, G-code text store, OPFS-to-WASM parameter/tool-table bridges, and grouped machine-session loading without moving file persistence, parameter semantics, or tool-table semantics into the WASM core. | +| `tests/browser/verify_ini_panel_browser.sh` | Validates the INI SDK, INI/interpreter WASM module loading, OPFS text-file round trip, generic session snapshot round trip plus envelope rejection paths, machine file text round trip, G-code text round trip, and the INI panel UI's machine-session load, G-code run, and canonical-event display paths in a real browser runtime. | | `tests/browser/verify_interp_browser.sh` | Validates the interpreter-core WASM module loads through the interpreter JS SDK in a real browser runtime and runs selected positive and negative canonical fixtures through vendored LinuxCNC `Interp::execute()` plus `Interp::open()`/`read()`/`execute()` via the exported C ABI, including OPFS-backed parameter-file restore/save and tool-table load/save through vendored LinuxCNC source. | | `tests/host/verify_host_smokes.sh` | Runs the current host-side Node, WASM interpreter-core, OPFS, and browser smoke validation with shared WASM builds. | @@ -268,9 +270,10 @@ derived from vendored LinuxCNC INI boolean parsing, INI-derived `[RS274NGC]PARAMETER_FILE` and `[EMCIO]TOOL_TABLE` file names mapped to OPFS machine files, OPFS path-model rejection of invalid INI-derived file names, explicit host session file-name overrides taking precedence over INI-derived -names, and a browser interpreter smoke that uses the same session bridge with -real LinuxCNC INI WASM parsing before saving OPFS-backed parameter and -tool-table text through vendored LinuxCNC file APIs. +names, session snapshot envelope rejection for unsupported format/version and +wrong session id, and a browser interpreter smoke that uses the same session +bridge with real LinuxCNC INI WASM parsing before saving OPFS-backed parameter +and tool-table text through vendored LinuxCNC file APIs. Full browser coverage, full SDK coverage, and richer machine-state validation remain future work. diff --git a/wasm-port/docs/drift-report.md b/wasm-port/docs/drift-report.md index db18a01..a677a8f 100644 --- a/wasm-port/docs/drift-report.md +++ b/wasm-port/docs/drift-report.md @@ -70,8 +70,9 @@ semantic rewrites: host-side path model, generic session snapshot storage, pure-text machine file and G-code storage, parameter/tool-table bridge copying into the interpreter SDK filesystem, grouped machine-session loading, explicit - session file-name overrides, invalid INI-derived machine file names, and a - Chromium localhost round trip for those persistence paths. + session file-name overrides, invalid INI-derived machine file names, generic + session snapshot envelope rejection paths, and a Chromium localhost round + trip for those persistence paths. - Host-side smoke validation is aggregated by `tests/host/verify_host_smokes.sh` so Node, WASM, OPFS, and browser checks run from one command. diff --git a/wasm-port/docs/source-reuse-map.md b/wasm-port/docs/source-reuse-map.md index a3771ab..09f5cd0 100644 --- a/wasm-port/docs/source-reuse-map.md +++ b/wasm-port/docs/source-reuse-map.md @@ -83,7 +83,8 @@ Current validation is intentionally mechanical: `runtime/opfs/file-service.js` adapter. `runtime/opfs/path-model.js` now defines paths for INI, tool table, parameter file, G-code program, preview-cache, and session-snapshot targets. `runtime/opfs/snapshot-store.js` - adds a generic JSON session snapshot envelope. + adds a generic JSON session snapshot envelope and validates its format, + version, session id, metadata, and payload shape. `runtime/opfs/machine-file-store.js` adds pure-text storage for INI, tool table, parameter file, and G-code program content. `runtime/opfs/linuxcnc-parameter-bridge.js` copies OPFS-backed parameter diff --git a/wasm-port/tests/browser/ini_panel_smoke.html b/wasm-port/tests/browser/ini_panel_smoke.html index d17a1ac..46dded0 100644 --- a/wasm-port/tests/browser/ini_panel_smoke.html +++ b/wasm-port/tests/browser/ini_panel_smoke.html @@ -9,7 +9,7 @@