wangdequan/cnc_wams
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

推进 INI 面板 launch manifest compatibility predicate

Browse Source
This commit is contained in:
wangdequan
2026-06-15 07:05:53 +08:00
parent 6b5999930a
commit 01d168e247
8 changed files with 121 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
text12.txt
View File

@@ -1410,3 +1410,74 @@ host_wasm_opfs_browser_smokes=ok
compatibility helper（例如 `isSupportedIniPanelLaunchApiManifest()` 或等价只读 predicate），让外部
shell 可以用 schema/version 判断 manifest 是否可消费，并由 Node/browser gate 校验；仍保持只读，
不新增控制按钮，不解析 G-code。
十八、2026-06-15 继续执行记录：INI panel launch manifest compatibility predicate
本轮按“第一原则：加快实质性推进”继续推进 SDK/API surface，为 launch manifest 增加只读
compatibility predicate，让外部 shell 能用 schema/version 和必需字段判断 manifest 是否可消费。
完成内容：
- `wasm-port/runtime/ui/ini-panel/ui-shell.js` 新增
`isSupportedIniPanelLaunchApiManifest()`；
- `launch.html` 的 `window.linuxCncIniPanelLaunchApi` 新增
`isSupportedLaunchApiManifest()`；
- `createIniPanelLaunchApiManifest().methods` 新增 `isSupportedLaunchApiManifest`；
- predicate 固定校验：
- manifest 是对象；
- `apiName` 匹配 schema；
- `manifestVersion` 匹配 schema；
- schema fields 全部存在；
- `verify_ini_panel_launch_api_manifest.mjs` 覆盖 supported、错误 version、错误 apiName、
缺少字段和 null 输入；
- `ini_panel_launch_smoke.html` 在真实 launch iframe 中校验支持当前 manifest，并拒绝错误
`manifestVersion`；
- `verify_ini_panel_ui_shell.mjs`、`verify_ini_panel_entry_docs.mjs` 与 `docs/panel-entry.md`
记录并校验 predicate 入口；
- 未新增控制按钮；
- 未解析 G-code；
- 未解释 canonical events；
- 未改变 OPFS/session persistence、LinuxCNC interpreter、tool、parameter、planner 或
LinuxCNC-owned runtime semantics。
验证已通过：
```bash
git diff --check
wasm-port/tests/ui/node/verify_ini_panel_launch_api_manifest.sh
wasm-port/tests/ui/node/verify_ini_panel_ui_shell.sh
wasm-port/tests/ui/node/verify_ini_panel_entry_docs.sh
wasm-port/tests/ui/node/verify_ui_node_smokes.sh
SKIP_INI_BUILD=1 SKIP_INTERP_BUILD=1 wasm-port/tests/browser/verify_ini_panel_browser.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/host/verify_host_smokes.sh
```
关键输出：
```text
ini_panel_launch_api_manifest_node_smoke=ok
ini_panel_ui_shell_node_smoke=ok
ini_panel_entry_docs_node_smoke=ok
ui_node_smokes=ok
browser_ini_opfs_smoke=ok
browser_ini_control_page_smoke=ok
browser_ini_launch_smoke=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
host_wasm_opfs_browser_smokes=ok
```
下一步建议：
继续推进 browser/UI workflow。下一批建议把 control-page browser API 也补齐 schema/version 与
compatibility predicate，使 launch API 和 control-page API 具备一致的外部 shell 接入模型；仍保持
只读，不新增控制按钮，不解析 G-code。

4
wasm-port/docs/panel-entry.md
View File

@@ -27,6 +27,7 @@ import {
refreshMachineSessionControlPage,
controlPageStatusText,
renderMachineSessionControlView,
isSupportedIniPanelLaunchApiManifest,
} from "../runtime/ui/ini-panel/ui-shell.js";
```
@@ -92,6 +93,9 @@ Use `createIniPanelLaunchApiSchema()`,
`linuxCncIniPanelLaunchApi.getLaunchApiSchema()`, or `manifestVersion` when an
outer shell needs to check launch manifest compatibility before consuming these
fields.
Use `isSupportedIniPanelLaunchApiManifest()` or
`linuxCncIniPanelLaunchApi.isSupportedLaunchApiManifest()` for a read-only
compatibility predicate before using a launch manifest.
The control-page refresh workflow lives in
`runtime/ui/ini-panel/control-page-refresh-workflow.js`. Use

2
wasm-port/runtime/ui/ini-panel/launch.html
View File

@@ -76,6 +76,7 @@
import {
createIniPanelLauncherLinkViewModel,
createIniPanelShellViewModel,
isSupportedIniPanelLaunchApiManifest,
} from "./ui-shell.js";
const shellViewModel = createIniPanelShellViewModel();
@@ -90,6 +91,7 @@
}
window.linuxCncIniPanelLaunchApi = {
isSupportedLaunchApiManifest: isSupportedIniPanelLaunchApiManifest,
getLaunchApiSchema: () => shellViewModel.launchApiSchema,
getLaunchApiManifest: () => shellViewModel.launchApiManifest,
getLauncherLinks: () => shellViewModel.launcherLinks,

11
wasm-port/runtime/ui/ini-panel/ui-shell.js
View File

@@ -77,12 +77,23 @@ export function createIniPanelLaunchApiSchema() {
};
}
export function isSupportedIniPanelLaunchApiManifest(manifest, schema = createIniPanelLaunchApiSchema()) {
if (!manifest || typeof manifest !== "object") {
return false;
}
if (manifest.apiName !== schema.apiName || manifest.manifestVersion !== schema.manifestVersion) {
return false;
}
return schema.fields.every((fieldName) => Object.hasOwn(manifest, fieldName));
}
export function createIniPanelLaunchApiManifest(entries = getVisibleIniPanelEntries()) {
const schema = createIniPanelLaunchApiSchema();
return {
apiName: schema.apiName,
manifestVersion: schema.manifestVersion,
methods: [
"isSupportedLaunchApiManifest",
"getLaunchApiSchema",
"getLaunchApiManifest",
"getLauncherLinks",

13
wasm-port/tests/browser/ini_panel_launch_smoke.html
View File

@@ -66,6 +66,7 @@
const launchDoc = await loadLaunchFrame();
const launchApi = launchDoc.defaultView.linuxCncIniPanelLaunchApi;
if (
!launchApi?.isSupportedLaunchApiManifest ||
!launchApi?.getLaunchApiSchema ||
!launchApi?.getLaunchApiManifest ||
!launchApi?.getLauncherLinks ||
@@ -85,6 +86,16 @@
"launch API schema persistence field",
);
const launchApiManifest = launchApi.getLaunchApiManifest();
assertEqual(
launchApi.isSupportedLaunchApiManifest(launchApiManifest),
true,
"launch API supports manifest",
);
assertEqual(
launchApi.isSupportedLaunchApiManifest({ ...launchApiManifest, manifestVersion: 2 }),
false,
"launch API rejects unsupported manifest version",
);
assertEqual(
launchApiManifest.apiName,
"ini-panel-launch",
@@ -97,7 +108,7 @@
);
assertEqual(
launchApiManifest.methods.join(","),
"getLaunchApiSchema,getLaunchApiManifest,getLauncherLinks,getControlPageApiMethods",
"isSupportedLaunchApiManifest,getLaunchApiSchema,getLaunchApiManifest,getLauncherLinks,getControlPageApiMethods",
"launch API manifest methods",
);
assertEqual(

7
wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs
View File

@@ -19,6 +19,7 @@ import {
readMachineSessionReadonlyStatus,
refreshMachineSessionControlPage,
getVisibleIniPanelEntries,
isSupportedIniPanelLaunchApiManifest,
} from "../../../runtime/ui/ini-panel/ui-shell.js";
const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -48,6 +49,7 @@ const requiredShellExports = [
"createIniPanelShellViewModel",
"getIniPanelEntryByHref",
"getVisibleIniPanelEntries",
"isSupportedIniPanelLaunchApiManifest",
"createMachineSessionControlPageController",
"createMachineSessionReadonlyStatus",
"createMachineSessionReadonlyStatusApiManifest",
@@ -102,6 +104,7 @@ assert.deepEqual(createIniPanelShellViewModel().pages, getVisibleIniPanelEntries
assert.deepEqual(createIniPanelShellViewModel().launcherLinks, createIniPanelLauncherLinkViewModel());
assert.deepEqual(createIniPanelShellViewModel().launchApiSchema, createIniPanelLaunchApiSchema());
assert.deepEqual(createIniPanelShellViewModel().launchApiManifest, createIniPanelLaunchApiManifest());
assert.equal(isSupportedIniPanelLaunchApiManifest(createIniPanelShellViewModel().launchApiManifest), true);
assert.equal(createIniPanelShellViewModel().launchApiManifest.manifestVersion, createIniPanelLaunchApiSchema().manifestVersion);
assert.deepEqual(
createIniPanelShellViewModel().controlPage.contract,
@@ -137,8 +140,10 @@ assert.equal(typeof createIniPanelShellViewModel().controlPage.renderView, "func
assert.match(shellText, /\bexport function createControlPageBrowserApiMethods\b/);
assert.match(shellText, /\bexport function createIniPanelLaunchApiSchema\b/);
assert.match(shellText, /\bexport function createIniPanelLaunchApiManifest\b/);
assert.match(shellText, /\bexport function isSupportedIniPanelLaunchApiManifest\b/);
assert.match(controlPageText, /\bgetControlPageApiMethods\b/);
assert.match(launchText, /\blinuxCncIniPanelLaunchApi\b/);
assert.match(launchText, /\bisSupportedLaunchApiManifest\b/);
assert.match(launchText, /\bgetLaunchApiSchema\b/);
assert.match(launchText, /\bgetLaunchApiManifest\b/);
assert.match(launchText, /\bgetControlPageApiMethods\b/);
@@ -150,6 +155,8 @@ assert.match(docText, /\blinuxCncIniPanelControlPageApi\.getControlPageContract\
assert.match(docText, /\blinuxCncIniPanelControlPageApi\.readControlPageStatus\b/);
assert.match(docText, /\bcreateIniPanelLaunchApiManifest\b/);
assert.match(docText, /\bcreateIniPanelLaunchApiSchema\b/);
assert.match(docText, /\bisSupportedIniPanelLaunchApiManifest\b/);
assert.match(docText, /\blinuxCncIniPanelLaunchApi\.isSupportedLaunchApiManifest\b/);
assert.match(docText, /\blinuxCncIniPanelLaunchApi\.getLaunchApiSchema\b/);
assert.match(docText, /\blinuxCncIniPanelLaunchApi\.getLaunchApiManifest\b/);
assert.match(docText, /\blinuxCncIniPanelLaunchApi\.getControlPageApiMethods\b/);

11
wasm-port/tests/ui/node/verify_ini_panel_launch_api_manifest.mjs
View File

@@ -10,6 +10,7 @@ import {
createIniPanelLaunchApiSchema,
createIniPanelShellViewModel,
getVisibleIniPanelEntries,
isSupportedIniPanelLaunchApiManifest,
} from "../../../runtime/ui/ini-panel/ui-shell.js";
const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -38,6 +39,7 @@ assert.deepEqual(manifest, {
apiName: "ini-panel-launch",
manifestVersion: 1,
methods: [
"isSupportedLaunchApiManifest",
"getLaunchApiSchema",
"getLaunchApiManifest",
"getLauncherLinks",
@@ -88,6 +90,13 @@ assert.deepEqual(manifest, {
assert.deepEqual(createIniPanelShellViewModel().launchApiManifest, manifest);
assert.deepEqual(createIniPanelShellViewModel().launchApiSchema, schema);
assert.equal(createIniPanelShellViewModel().launchApiManifest.manifestVersion, schema.manifestVersion);
assert.equal(isSupportedIniPanelLaunchApiManifest(manifest), true);
assert.equal(isSupportedIniPanelLaunchApiManifest({ ...manifest, manifestVersion: 2 }), false);
assert.equal(isSupportedIniPanelLaunchApiManifest({ ...manifest, apiName: "other" }), false);
const missingFieldManifest = { ...manifest };
delete missingFieldManifest.persistenceCapabilities;
assert.equal(isSupportedIniPanelLaunchApiManifest(missingFieldManifest), false);
assert.equal(isSupportedIniPanelLaunchApiManifest(null), false);
assert.deepEqual(getVisibleIniPanelEntries(), INI_PANEL_ENTRIES);
manifest.visibleEntries[0].title = "changed";
@@ -122,6 +131,8 @@ assert.deepEqual(customManifest.targetPages, [
assert.match(shellText, /\bexport function createIniPanelLaunchApiManifest\b/);
assert.match(shellText, /\bexport function createIniPanelLaunchApiSchema\b/);
assert.match(shellText, /\bexport function isSupportedIniPanelLaunchApiManifest\b/);
assert.match(launchText, /\bisSupportedLaunchApiManifest\b/);
assert.match(launchText, /\bgetLaunchApiSchema\b/);
assert.match(launchText, /\bgetLaunchApiManifest\b/);
assert.match(launchText, /\blinuxCncIniPanelLaunchApi\b/);

3
wasm-port/tests/ui/node/verify_ini_panel_ui_shell.mjs
View File

@@ -17,6 +17,7 @@ import {
getIniPanelEntryByHref,
getIniPanelEntryManifest,
getVisibleIniPanelEntries,
isSupportedIniPanelLaunchApiManifest,
loadMachineSessionForControlPageWorkflow,
readMachineSessionReadonlyStatus,
refreshMachineSessionControlPage,
@@ -55,6 +56,7 @@ assert.equal(typeof loadMachineSessionForControlPageWorkflow, "function");
assert.equal(typeof readMachineSessionReadonlyStatus, "function");
assert.equal(typeof refreshMachineSessionControlPage, "function");
assert.equal(typeof renderMachineSessionControlView, "function");
assert.equal(typeof isSupportedIniPanelLaunchApiManifest, "function");
const shellManifest = getIniPanelEntryManifest();
shellManifest[0].title = "changed";
@@ -93,6 +95,7 @@ assert.deepEqual(shellViewModel.pages, [
assert.deepEqual(shellViewModel.launcherLinks, createIniPanelLauncherLinkViewModel());
assert.deepEqual(shellViewModel.launchApiSchema, createIniPanelLaunchApiSchema());
assert.deepEqual(shellViewModel.launchApiManifest, createIniPanelLaunchApiManifest());
assert.equal(isSupportedIniPanelLaunchApiManifest(shellViewModel.launchApiManifest), true);
assert.equal(shellViewModel.launchApiManifest.manifestVersion, createIniPanelLaunchApiSchema().manifestVersion);
assert.deepEqual(shellViewModel.controlPage.browserApiMethods, createControlPageBrowserApiMethods());
assert.equal(shellViewModel.controlPage.createController, createMachineSessionControlPageController);