diff --git a/text12.txt b/text12.txt index 1be6129..f9a3cff 100644 --- a/text12.txt +++ b/text12.txt @@ -928,3 +928,72 @@ host_wasm_opfs_browser_smokes=ok `getControlPageApiMethods()`,明确 `getControlPageContract()`、`readControlPageStatus()`、 `loadControlPageSessionState()`、`refreshControlPage()`、`renderControlPage()` 的 browser-exposed 方法清单,并由 Node/browser gate 双向校验;仍保持只读,不新增控制按钮,不解析 G-code。 + +十一、2026-06-15 继续执行记录:INI panel browser control-page API methods manifest + +本轮按“第一原则:加快实质性推进”继续推进 SDK/API surface,为真实 browser control-page API +增加轻量方法清单,使外部页面能先发现 browser-exposed 方法,再调用只读 contract、status、 +session load 与 refresh/render workflow。 + +完成内容: + +- `wasm-port/runtime/ui/ini-panel/control-page.js` 新增 + `createControlPageBrowserApiMethods()`; +- `window.linuxCncIniPanelControlPageApi` 新增 `getControlPageApiMethods()`; +- browser-exposed 方法清单固定包含: + - `getControlPageApiMethods` + - `getControlPageContract` + - `getControlView` + - `getPanelApi` + - `loadControlPageSessionState` + - `readControlPageStatus` + - `refreshControlPage` + - `renderControlPage` +- `ini_panel_control_page_smoke.html` 在真实 control-page iframe 中校验方法清单与 namespace + 实际函数一致; +- `docs/panel-entry.md` 记录 + `linuxCncIniPanelControlPageApi.getControlPageApiMethods()` browser API; +- `verify_ini_panel_entry_docs.mjs` 覆盖 browser API methods helper、源码入口和文档入口; +- 未新增控制按钮; +- 未解析 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_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_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。下一批建议把 browser control-page API methods manifest 纳入 +launch page 或 shell view-model 暴露,让入口页也能展示/消费可用 read-only control-page API +清单;仍保持只读,不新增控制按钮,不解析 G-code,不解释 canonical events。 diff --git a/wasm-port/docs/panel-entry.md b/wasm-port/docs/panel-entry.md index f8c572e..5095409 100644 --- a/wasm-port/docs/panel-entry.md +++ b/wasm-port/docs/panel-entry.md @@ -71,6 +71,9 @@ contract lists readonly status fields for `stateBundle`, `workflowStatus`, The browser control page also exposes this contract through `linuxCncIniPanelControlPageApi.getControlPageContract()`, so real iframe-based smokes can verify the same API shape before reading the embedded panel state. +Use `linuxCncIniPanelControlPageApi.getControlPageApiMethods()` when a browser +outer page needs the exact exposed method list before calling the read-only +control page API. Use `linuxCncIniPanelControlPageApi.readControlPageStatus()` when a browser outer page needs the same readonly status snapshot from the real embedded control page after save/load session workflows. diff --git a/wasm-port/runtime/ui/ini-panel/control-page.js b/wasm-port/runtime/ui/ini-panel/control-page.js index e3d94cf..9b9cb7f 100644 --- a/wasm-port/runtime/ui/ini-panel/control-page.js +++ b/wasm-port/runtime/ui/ini-panel/control-page.js @@ -21,7 +21,21 @@ const controller = createMachineSessionControlPageController({ controller.mount(); +export function createControlPageBrowserApiMethods() { + return [ + "getControlPageApiMethods", + "getControlPageContract", + "getControlView", + "getPanelApi", + "loadControlPageSessionState", + "readControlPageStatus", + "refreshControlPage", + "renderControlPage", + ]; +} + window.linuxCncIniPanelControlPageApi = { + getControlPageApiMethods: createControlPageBrowserApiMethods, getControlView: controller.getControlView, getControlPageContract: createIniPanelShellControlPageContract, getPanelApi: controller.getPanelApi, diff --git a/wasm-port/tests/browser/ini_panel_control_page_smoke.html b/wasm-port/tests/browser/ini_panel_control_page_smoke.html index 58ceda7..a480f06 100644 --- a/wasm-port/tests/browser/ini_panel_control_page_smoke.html +++ b/wasm-port/tests/browser/ini_panel_control_page_smoke.html @@ -61,7 +61,18 @@ TOOL_TABLE = browser-tool.tbl const controlDoc = await loadControlPageFrame(); const controlPageApi = controlDoc.defaultView.linuxCncIniPanelControlPageApi; + const expectedControlPageApiMethods = [ + "getControlPageApiMethods", + "getControlPageContract", + "getControlView", + "getPanelApi", + "loadControlPageSessionState", + "readControlPageStatus", + "refreshControlPage", + "renderControlPage", + ]; if ( + !controlPageApi?.getControlPageApiMethods || !controlPageApi?.getControlView || !controlPageApi?.getControlPageContract || !controlPageApi?.getPanelApi || @@ -72,6 +83,16 @@ TOOL_TABLE = browser-tool.tbl ) { throw new Error("control page API namespace did not expose control helpers"); } + assertEqual( + controlPageApi.getControlPageApiMethods().join(","), + expectedControlPageApiMethods.join(","), + "control page browser API methods manifest", + ); + assertEqual( + expectedControlPageApiMethods.every((methodName) => typeof controlPageApi[methodName] === "function"), + true, + "control page browser API namespace methods", + ); const controlPageContract = controlPageApi.getControlPageContract(); assertEqual( diff --git a/wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs b/wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs index 5e6d75f..e3e09ab 100644 --- a/wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs +++ b/wasm-port/tests/ui/node/verify_ini_panel_entry_docs.mjs @@ -120,9 +120,12 @@ assert.deepEqual( assert.equal(createIniPanelShellViewModel().controlPage.readStatus, readMachineSessionReadonlyStatus); assert.equal(createIniPanelShellViewModel().controlPage.refresh, refreshMachineSessionControlPage); assert.equal(typeof createIniPanelShellViewModel().controlPage.renderView, "function"); +assert.match(controlPageText, /\bexport function createControlPageBrowserApiMethods\b/); +assert.match(controlPageText, /\bgetControlPageApiMethods\b/); assert.match(controlPageText, /\bgetControlPageContract\b/); assert.match(controlPageText, /\breadControlPageStatus\b/); assert.match(controlPageText, /\bcreateIniPanelShellControlPageContract\b/); +assert.match(docText, /\blinuxCncIniPanelControlPageApi\.getControlPageApiMethods\b/); assert.match(docText, /\blinuxCncIniPanelControlPageApi\.getControlPageContract\b/); assert.match(docText, /\blinuxCncIniPanelControlPageApi\.readControlPageStatus\b/);