推进 INI 面板 machine file summary helper

This commit is contained in:
2026-06-14 18:39:27 +08:00
parent 083b117c21
commit a60826bfce
6 changed files with 189 additions and 7 deletions

View File

@@ -1540,6 +1540,72 @@ browser_interp_smoke=ok
抽取为纯 helper 并接入 `verify_ui_node_smokes.sh`;保持 helper 只描述 host/runtime 边界, 抽取为纯 helper 并接入 `verify_ui_node_smokes.sh`;保持 helper 只描述 host/runtime 边界,
不扩展 CNC 语义。 不扩展 CNC 语义。
二十四、2026-06-14 继续执行记录INI panel machine file summary helper
本轮继续沿 OPFS/session/UI boundary 推进,把 INI panel 的 machine text file save/load
日志构造收敛为纯 helper并接入 UI Node smoke。
完成内容:
- 新增 `wasm-port/runtime/ui/ini-panel/machine-file-summary.js`
- 导出:
- `createMachineFileSaveSummary(paths, gcodePath)`
- `machineFileSaveLogLines(summary)`
- `createMachineFileLoadSummary(files)`
- `machineFileLoadLogLines(summary)`
- helper 只聚合 OPFS/staging boundary facts
- INI/tool/parameter/G-code OPFS path
- INI/tool/parameter loaded text length
- `wasm-port/runtime/ui/ini-panel/app.js` 的 `Save Machine Files` 和 `Load Machine Files`
日志改为复用该 helper
- 新增 `wasm-port/tests/ui/node/verify_ini_panel_machine_file_summary.mjs` 和 shell wrapper
- `wasm-port/tests/ui/node/verify_ui_node_smokes.sh` 现在覆盖 run/session/machine-file
三组 UI helper
- 未改变 UI runtime、OPFS bridge、interpreter run API、G-code 文本、canonical-event 输出
或 LinuxCNC-owned runtime semantics。
验证已通过:
```bash
git diff --check
wasm-port/tests/ui/node/verify_ini_panel_machine_file_summary.sh
wasm-port/tests/ui/node/verify_ui_node_smokes.sh
wasm-port/tools/verify_vendor_sync.sh
wasm-port/tools/verify_no_standalone_cnc_semantics.sh
SKIP_INTERP_BUILD=1 wasm-port/tests/wasm/node/verify_interp_wasm.sh
SKIP_INTERP_BUILD=1 wasm-port/tests/wasm/node/verify_sim_configs_inventory_wasm.sh
wasm-port/tests/opfs/node/verify_file_service.sh
SKIP_INI_BUILD=1 SKIP_INTERP_BUILD=1 wasm-port/tests/browser/verify_ini_panel_browser.sh
SKIP_INI_BUILD=1 SKIP_INTERP_BUILD=1 wasm-port/tests/browser/verify_interp_browser.sh
wasm-port/tests/host/verify_host_smokes.sh
```
关键输出:
```text
ini_panel_machine_file_summary_node_smoke=ok
ini_panel_run_summary_node_smoke=ok
ini_panel_session_summary_node_smoke=ok
ui_node_smokes=ok
vendor sync up to date
standalone CNC semantics guard complete
interp_wasm_node_smoke=ok
sim_configs_wasm_node_inventory_executed=28
sim_configs_wasm_node_inventory_passed=28
sim_configs_wasm_node_inventory_skipped=131
sim_configs_wasm_node_inventory_unexpected_fail=0
opfs_file_service_node_smoke=ok
browser_ini_opfs_smoke=ok
browser_interp_smoke=ok
host_wasm_opfs_browser_smokes=ok
```
下一步建议:
继续沿 OPFS/session/UI boundary 推进。优先把 machine file helper 补入 UI helper docs
索引或独立文档,确保新 helper 和 `verify_ui_node_smokes.sh` 的关系可发现;仍只做
host/runtime boundary 文档和测试 glue不扩展 CNC 语义。
二十二、2026-06-14 继续执行记录INI panel session load summary helper 二十二、2026-06-14 继续执行记录INI panel session load summary helper
本轮继续沿 OPFS/session/UI boundary 推进,把 machine session load 的 OPFS/WASM 映射 本轮继续沿 OPFS/session/UI boundary 推进,把 machine session load 的 OPFS/WASM 映射

View File

@@ -22,6 +22,12 @@ import {
loadMachineSessionSnapshot, loadMachineSessionSnapshot,
saveMachineSessionSnapshot, saveMachineSessionSnapshot,
} from "../../opfs/snapshot-store.js"; } from "../../opfs/snapshot-store.js";
import {
createMachineFileLoadSummary,
createMachineFileSaveSummary,
machineFileLoadLogLines,
machineFileSaveLogLines,
} from "./machine-file-summary.js";
import { import {
createRunSummary, createRunSummary,
summarizeRunResult, summarizeRunResult,
@@ -546,13 +552,11 @@ document.getElementById("save-machine-files").addEventListener("click", async ()
parameters: DEFAULT_PARAMETERS, parameters: DEFAULT_PARAMETERS,
}); });
const gcodePath = await saveGcodeProgram(UI_SESSION.defaultGcodeFilename, DEFAULT_GCODE); const gcodePath = await saveGcodeProgram(UI_SESSION.defaultGcodeFilename, DEFAULT_GCODE);
const summary = createMachineFileSaveSummary(paths, gcodePath);
setLog( setLog(
[ [
"Saved machine text files to OPFS.", "Saved machine text files to OPFS.",
`INI: ${paths.ini}`, ...machineFileSaveLogLines(summary),
`Tool table: ${paths.toolTable}`,
`Parameters: ${paths.parameters}`,
`G-code: ${gcodePath}`,
].join("\n"), ].join("\n"),
); );
} catch (error) { } catch (error) {
@@ -765,12 +769,11 @@ document.getElementById("load-machine-files").addEventListener("click", async ()
try { try {
const files = await loadMachineTextFiles(MACHINE_ID); const files = await loadMachineTextFiles(MACHINE_ID);
editor.value = files.ini; editor.value = files.ini;
const summary = createMachineFileLoadSummary(files);
setLog( setLog(
[ [
"Loaded machine text files from OPFS.", "Loaded machine text files from OPFS.",
`INI bytes: ${files.ini.length}`, ...machineFileLoadLogLines(summary),
`Tool table bytes: ${files.toolTable.length}`,
`Parameter bytes: ${files.parameters.length}`,
].join("\n"), ].join("\n"),
); );
} catch (error) { } catch (error) {

View File

@@ -0,0 +1,33 @@
export function createMachineFileSaveSummary(paths, gcodePath = null) {
return {
iniOpfsPath: paths?.ini ?? null,
toolTableOpfsPath: paths?.toolTable ?? null,
parameterOpfsPath: paths?.parameters ?? null,
gcodeOpfsPath: gcodePath ?? null,
};
}
export function machineFileSaveLogLines(summary) {
return [
`INI: ${summary.iniOpfsPath ?? "-"}`,
`Tool table: ${summary.toolTableOpfsPath ?? "-"}`,
`Parameters: ${summary.parameterOpfsPath ?? "-"}`,
`G-code: ${summary.gcodeOpfsPath ?? "-"}`,
];
}
export function createMachineFileLoadSummary(files) {
return {
iniBytes: files?.ini?.length ?? 0,
toolTableBytes: files?.toolTable?.length ?? 0,
parameterBytes: files?.parameters?.length ?? 0,
};
}
export function machineFileLoadLogLines(summary) {
return [
`INI bytes: ${summary.iniBytes}`,
`Tool table bytes: ${summary.toolTableBytes}`,
`Parameter bytes: ${summary.parameterBytes}`,
];
}

View File

@@ -0,0 +1,73 @@
import assert from "node:assert/strict";
import {
createMachineFileLoadSummary,
createMachineFileSaveSummary,
machineFileLoadLogLines,
machineFileSaveLogLines,
} from "../../../runtime/ui/ini-panel/machine-file-summary.js";
const saveSummary = createMachineFileSaveSummary({
ini: "linuxcnc/machines/xyzab-tdr/machine.ini",
toolTable: "linuxcnc/machines/xyzab-tdr/tool.tbl",
parameters: "linuxcnc/machines/xyzab-tdr/linuxcnc.var",
}, "linuxcnc/gcode/ui-session.ngc");
assert.deepEqual(saveSummary, {
iniOpfsPath: "linuxcnc/machines/xyzab-tdr/machine.ini",
toolTableOpfsPath: "linuxcnc/machines/xyzab-tdr/tool.tbl",
parameterOpfsPath: "linuxcnc/machines/xyzab-tdr/linuxcnc.var",
gcodeOpfsPath: "linuxcnc/gcode/ui-session.ngc",
});
assert.deepEqual(
machineFileSaveLogLines(saveSummary),
[
"INI: linuxcnc/machines/xyzab-tdr/machine.ini",
"Tool table: linuxcnc/machines/xyzab-tdr/tool.tbl",
"Parameters: linuxcnc/machines/xyzab-tdr/linuxcnc.var",
"G-code: linuxcnc/gcode/ui-session.ngc",
],
);
const loadSummary = createMachineFileLoadSummary({
ini: "[EMC]\nMACHINE = xyzab-tdr\n",
toolTable: "T2 P7 Z3.125\n",
parameters: "5220 1\n",
});
assert.deepEqual(loadSummary, {
iniBytes: 26,
toolTableBytes: 13,
parameterBytes: 7,
});
assert.deepEqual(
machineFileLoadLogLines(loadSummary),
[
"INI bytes: 26",
"Tool table bytes: 13",
"Parameter bytes: 7",
],
);
assert.deepEqual(
createMachineFileSaveSummary(null),
{
iniOpfsPath: null,
toolTableOpfsPath: null,
parameterOpfsPath: null,
gcodeOpfsPath: null,
},
);
assert.deepEqual(
createMachineFileLoadSummary(null),
{
iniBytes: 0,
toolTableBytes: 0,
parameterBytes: 0,
},
);
console.log("ini_panel_machine_file_summary_node_smoke=ok");

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -euo pipefail
ROOT_DIR="$(cd "$(dirname "$0")/../../.." && pwd)"
node "$ROOT_DIR/tests/ui/node/verify_ini_panel_machine_file_summary.mjs"

View File

@@ -5,5 +5,6 @@ ROOT_DIR="$(cd "$(dirname "$0")/../../.." && pwd)"
"$ROOT_DIR/tests/ui/node/verify_ini_panel_run_summary.sh" "$ROOT_DIR/tests/ui/node/verify_ini_panel_run_summary.sh"
"$ROOT_DIR/tests/ui/node/verify_ini_panel_session_summary.sh" "$ROOT_DIR/tests/ui/node/verify_ini_panel_session_summary.sh"
"$ROOT_DIR/tests/ui/node/verify_ini_panel_machine_file_summary.sh"
echo "ui_node_smokes=ok" echo "ui_node_smokes=ok"