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

推进 INI 面板 shell handoff mount DOM renderer

Browse Source
This commit is contained in:
wangdequan
2026-06-15 12:02:25 +08:00
parent 54f8551c50
commit 22ca6ced3f
10 changed files with 223 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,8 @@ import {
createIniPanelShellSessionHandoffPackageMountDisplayViewModel,
createIniPanelShellSessionHandoffPackageMountRenderState,
createIniPanelShellSessionHandoffPackageMountState,
renderIniPanelShellSessionHandoffMountState,
renderIniPanelShellSessionHandoffMountState,
createIniPanelShellSessionHandoffPackageReport,
createIniPanelShellSessionHandoffPackageRenderState,
createIniPanelShellSessionHandoffPackageSchema,
@@ -224,7 +226,9 @@ when an outer shell needs mount-state checks as stable read-only label/value
rows. Use `createIniPanelShellSessionHandoffPackageMountRenderState()` or
`linuxCncIniPanelLaunchApi.getShellSessionHandoffPackageMountRenderState()`
when those rows need a status line and `[data-handoff-shell]` style dataset
flags for DOM rendering. The launch page renders the default waiting mount
flags for DOM rendering. Use `renderIniPanelShellSessionHandoffMountState()` or
`linuxCncIniPanelLaunchApi.renderShellSessionHandoffMountState()` when an outer
shell needs the shared read-only DOM renderer for those rows. The launch page renders the default waiting mount
state into `[data-handoff-mount]`, `[data-handoff-mount-status]`, and
`[data-handoff-mount-rows]` without opening the control page.
The browser workflow smoke

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

@@ -106,6 +106,7 @@
createIniPanelLauncherLinkViewModel,
createIniPanelShellViewModel,
isSupportedIniPanelLaunchApiManifest,
renderIniPanelShellSessionHandoffMountState,
} from "./ui-shell.js";
const shellViewModel = createIniPanelShellViewModel();
@@ -135,23 +136,7 @@
handoffRows.append(term, detail);
}
const handoffMountRenderState = shellViewModel.shellSessionHandoffPackageMountRenderState;
const handoffMount = document.querySelector("[data-handoff-mount]");
handoffMount.dataset.handoffPhase = handoffMountRenderState.dataset.handoffPhase;
handoffMount.dataset.handoffReady = handoffMountRenderState.dataset.handoffReady;
handoffMount.dataset.handoffScope = handoffMountRenderState.dataset.handoffScope;
document.querySelector("[data-handoff-mount-status]").textContent = handoffMountRenderState.statusLine;
const handoffMountRows = document.querySelector("[data-handoff-mount-rows]");
for (const row of handoffMountRenderState.rows) {
const term = document.createElement("dt");
term.dataset.handoffMountRow = row.id;
term.dataset.handoffMountStatus = row.status;
term.textContent = row.label;
const detail = document.createElement("dd");
detail.dataset.handoffMountValue = row.id;
detail.dataset.handoffMountStatus = row.status;
detail.textContent = row.value;
handoffMountRows.append(term, detail);
}
renderIniPanelShellSessionHandoffMountState(handoffMountRenderState, { documentRef: document });
window.linuxCncIniPanelLaunchApi = {
isSupportedLaunchApiManifest: isSupportedIniPanelLaunchApiManifest,
@@ -195,6 +180,9 @@
),
)
),
renderShellSessionHandoffMountState: (renderState, options) => (
renderIniPanelShellSessionHandoffMountState(renderState, options ?? { documentRef: document })
),
isSupportedShellSessionHandoffPackage: shellViewModel.isSupportedShellSessionHandoffPackage,
getLauncherLinks: () => shellViewModel.launcherLinks,
getControlPageApiMethods: () => shellViewModel.controlPage.browserApiMethods,

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

@@ -143,6 +143,7 @@ export function createIniPanelLaunchApiManifest(entries = getVisibleIniPanelEntr
"getShellSessionHandoffPackageMountState",
"getShellSessionHandoffPackageMountDisplayViewModel",
"getShellSessionHandoffPackageMountRenderState",
"renderShellSessionHandoffMountState",
"isSupportedShellSessionHandoffPackage",
"getLauncherLinks",
"getControlPageApiMethods",
@@ -1078,6 +1079,55 @@ export function createIniPanelShellSessionHandoffPackageMountRenderState(
};
}
export function renderIniPanelShellSessionHandoffMountState(
renderState = createIniPanelShellSessionHandoffPackageMountRenderState(),
{
documentRef = globalThis.document,
mountNode = documentRef?.querySelector?.("[data-handoff-mount]"),
statusNode = documentRef?.querySelector?.("[data-handoff-mount-status]"),
rowsNode = documentRef?.querySelector?.("[data-handoff-mount-rows]"),
rowDatasetPrefix = "handoffMount",
} = {},
) {
if (!documentRef?.createElement) {
throw new Error("A DOM document is required to render shell handoff mount state.");
}
if (!mountNode || !statusNode || !rowsNode) {
throw new Error("Mount, status, and rows nodes are required to render shell handoff mount state.");
}
mountNode.dataset.handoffPhase = renderState?.dataset?.handoffPhase ?? "blocked";
mountNode.dataset.handoffReady = renderState?.dataset?.handoffReady ?? "false";
mountNode.dataset.handoffScope = renderState?.dataset?.handoffScope ?? "mount";
statusNode.textContent = renderState?.statusLine ?? "Blocked: No mount render state";
rowsNode.replaceChildren();
const rows = Array.isArray(renderState?.rows) ? renderState.rows : [];
for (const row of rows) {
const term = documentRef.createElement("dt");
term.dataset[`${rowDatasetPrefix}Row`] = row.id;
term.dataset[`${rowDatasetPrefix}Status`] = row.status;
term.textContent = row.label;
const detail = documentRef.createElement("dd");
detail.dataset[`${rowDatasetPrefix}Value`] = row.id;
detail.dataset[`${rowDatasetPrefix}Status`] = row.status;
detail.textContent = row.value;
rowsNode.append(term, detail);
}
return {
rendered: true,
statusLine: statusNode.textContent,
rowCount: rows.length,
rowIds: rows.map(({ id }) => id),
dataset: {
handoffPhase: mountNode.dataset.handoffPhase,
handoffReady: mountNode.dataset.handoffReady,
handoffScope: mountNode.dataset.handoffScope,
},
};
}
export function createIniPanelShellViewModel(entries = getVisibleIniPanelEntries()) {
const shellIntegrationManifest = createIniPanelShellIntegrationManifest(entries);
const shellIntegrationReadiness = createIniPanelShellIntegrationReadiness(shellIntegrationManifest);
@@ -1190,6 +1240,7 @@ export function createIniPanelShellViewModel(entries = getVisibleIniPanelEntries
createShellSessionHandoffPackageMountState: createIniPanelShellSessionHandoffPackageMountState,
createShellSessionHandoffPackageMountDisplayViewModel: createIniPanelShellSessionHandoffPackageMountDisplayViewModel,
createShellSessionHandoffPackageMountRenderState: createIniPanelShellSessionHandoffPackageMountRenderState,
renderShellSessionHandoffMountState: renderIniPanelShellSessionHandoffMountState,
isSupportedShellSessionHandoffPackage: isSupportedIniPanelShellSessionHandoffPackage,
controlPage: {
browserApiSchema: createControlPageBrowserApiSchema(),

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

@@ -90,6 +90,7 @@
!launchApi?.getShellSessionHandoffPackageMountState ||
!launchApi?.getShellSessionHandoffPackageMountDisplayViewModel ||
!launchApi?.getShellSessionHandoffPackageMountRenderState ||
!launchApi?.renderShellSessionHandoffMountState ||
!launchApi?.isSupportedShellSessionHandoffPackage ||
!launchApi?.getLauncherLinks ||
!launchApi?.getControlPageApiMethods
@@ -130,7 +131,7 @@
);
assertEqual(
launchApiManifest.methods.join(","),
"isSupportedLaunchApiManifest,getLaunchApiSchema,getLaunchApiManifest,getShellIntegrationSchema,getShellIntegrationManifest,getShellIntegrationReadiness,getShellSessionHandoffSummarySchema,getShellSessionHandoffSummary,isSupportedShellSessionHandoffSummary,getShellSessionHandoffCompatibilityReport,getShellSessionHandoffDisplayViewModel,getShellSessionHandoffSnapshot,getShellSessionHandoffRenderState,getShellSessionHandoffActionPlan,getShellSessionHandoffChecklist,getShellSessionHandoffPackageSchema,getShellSessionHandoffPackage,getShellSessionHandoffPackageReport,getShellSessionHandoffPackageDisplayViewModel,getShellSessionHandoffPackageRenderState,getShellSessionHandoffPackageMountState,getShellSessionHandoffPackageMountDisplayViewModel,getShellSessionHandoffPackageMountRenderState,isSupportedShellSessionHandoffPackage,getLauncherLinks,getControlPageApiMethods",
"isSupportedLaunchApiManifest,getLaunchApiSchema,getLaunchApiManifest,getShellIntegrationSchema,getShellIntegrationManifest,getShellIntegrationReadiness,getShellSessionHandoffSummarySchema,getShellSessionHandoffSummary,isSupportedShellSessionHandoffSummary,getShellSessionHandoffCompatibilityReport,getShellSessionHandoffDisplayViewModel,getShellSessionHandoffSnapshot,getShellSessionHandoffRenderState,getShellSessionHandoffActionPlan,getShellSessionHandoffChecklist,getShellSessionHandoffPackageSchema,getShellSessionHandoffPackage,getShellSessionHandoffPackageReport,getShellSessionHandoffPackageDisplayViewModel,getShellSessionHandoffPackageRenderState,getShellSessionHandoffPackageMountState,getShellSessionHandoffPackageMountDisplayViewModel,getShellSessionHandoffPackageMountRenderState,renderShellSessionHandoffMountState,isSupportedShellSessionHandoffPackage,getLauncherLinks,getControlPageApiMethods",
"launch API manifest methods",
);
const shellIntegrationSchema = launchApi.getShellIntegrationSchema();

49
wasm-port/tests/browser/ini_panel_shell_integration_workflow_smoke.html
View File

@@ -44,28 +44,6 @@
return frame.contentDocument;
}
function renderExternalShellMountState(renderState) {
const mountNode = document.querySelector("[data-external-shell-mount]");
const statusNode = document.querySelector("[data-external-shell-mount-status]");
const rowsNode = document.querySelector("[data-external-shell-mount-rows]");
mountNode.dataset.handoffPhase = renderState.dataset.handoffPhase;
mountNode.dataset.handoffReady = renderState.dataset.handoffReady;
mountNode.dataset.handoffScope = renderState.dataset.handoffScope;
statusNode.textContent = renderState.statusLine;
rowsNode.replaceChildren();
for (const row of renderState.rows) {
const term = document.createElement("dt");
term.dataset.externalMountRow = row.id;
term.dataset.externalMountStatus = row.status;
term.textContent = row.label;
const detail = document.createElement("dd");
detail.dataset.externalMountValue = row.id;
detail.dataset.externalMountStatus = row.status;
detail.textContent = row.value;
rowsNode.append(term, detail);
}
}
try {
const iniText = `[EMC]
MACHINE = browser-shell-integration
@@ -107,6 +85,7 @@ TOOL_TABLE = browser-shell-tool.tbl
!launchApi?.getShellSessionHandoffPackageMountState ||
!launchApi?.getShellSessionHandoffPackageMountDisplayViewModel ||
!launchApi?.getShellSessionHandoffPackageMountRenderState ||
!launchApi?.renderShellSessionHandoffMountState ||
!launchApi?.isSupportedShellSessionHandoffPackage
) {
throw new Error("launch API namespace did not expose shell integration helpers");
@@ -130,7 +109,16 @@ TOOL_TABLE = browser-shell-tool.tbl
const handoffPackageMountState = launchApi.getShellSessionHandoffPackageMountState();
const handoffPackageMountDisplay = launchApi.getShellSessionHandoffPackageMountDisplayViewModel();
const handoffPackageMountRenderState = launchApi.getShellSessionHandoffPackageMountRenderState();
renderExternalShellMountState(handoffPackageMountRenderState);
const waitingMountRenderResult = launchApi.renderShellSessionHandoffMountState(
handoffPackageMountRenderState,
{
documentRef: document,
mountNode: document.querySelector("[data-external-shell-mount]"),
statusNode: document.querySelector("[data-external-shell-mount-status]"),
rowsNode: document.querySelector("[data-external-shell-mount-rows]"),
rowDatasetPrefix: "externalMount",
},
);
assertEqual(handoffSummarySchema.summaryVersion, 1, "shell handoff summary schema version");
assertEqual(
launchApi.isSupportedShellSessionHandoffSummary(handoffSummary),
@@ -195,6 +183,8 @@ TOOL_TABLE = browser-shell-tool.tbl
assertEqual(handoffPackageMountState.sessionLoadState.phase, "waiting-panel", "shell handoff package mount-state default session");
assertEqual(handoffPackageMountDisplay.detailText, "session-load-state", "shell handoff package mount display detail");
assertEqual(handoffPackageMountRenderState.statusLine, "Blocked: session-load-state", "shell handoff package mount render-state status");
assertEqual(waitingMountRenderResult.rendered, true, "external shell waiting mount render result");
assertEqual(waitingMountRenderResult.rowCount, 5, "external shell waiting mount row count");
assertEqual(
document.querySelector("[data-external-shell-mount-status]").textContent,
"Blocked: session-load-state",
@@ -287,11 +277,22 @@ TOOL_TABLE = browser-shell-tool.tbl
);
const readyMountDisplay = launchApi.getShellSessionHandoffPackageMountDisplayViewModel(readyMountState);
const readyMountRenderState = launchApi.getShellSessionHandoffPackageMountRenderState(readyMountState);
renderExternalShellMountState(readyMountRenderState);
const readyMountRenderResult = launchApi.renderShellSessionHandoffMountState(
readyMountRenderState,
{
documentRef: document,
mountNode: document.querySelector("[data-external-shell-mount]"),
statusNode: document.querySelector("[data-external-shell-mount-status]"),
rowsNode: document.querySelector("[data-external-shell-mount-rows]"),
rowDatasetPrefix: "externalMount",
},
);
assertEqual(readyMountState.ready, true, "shell handoff package mount-state readiness");
assertEqual(readyMountState.sessionLoadState.phase, "ready", "shell handoff package mount-state ready session");
assertEqual(readyMountDisplay.detailText, "No blocking reasons", "shell handoff package ready mount display");
assertEqual(readyMountRenderState.statusLine, "Ready: No blocking reasons", "shell handoff package ready mount render-state");
assertEqual(readyMountRenderResult.rendered, true, "external shell ready mount render result");
assertEqual(readyMountRenderResult.dataset.handoffReady, "true", "external shell ready mount render dataset");
assertEqual(
document.querySelector("[data-external-shell-mount-status]").textContent,
"Ready: No blocking reasons",

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

@@ -27,6 +27,7 @@ import {
createIniPanelShellSessionHandoffPackageMountDisplayViewModel,
createIniPanelShellSessionHandoffPackageMountRenderState,
createIniPanelShellSessionHandoffPackageMountState,
renderIniPanelShellSessionHandoffMountState,
createIniPanelShellSessionHandoffPackageReport,
createIniPanelShellSessionHandoffPackageRenderState,
createIniPanelShellSessionHandoffPackageSchema,
@@ -92,6 +93,7 @@ const requiredShellExports = [
"createIniPanelShellSessionHandoffPackageMountDisplayViewModel",
"createIniPanelShellSessionHandoffPackageMountRenderState",
"createIniPanelShellSessionHandoffPackageMountState",
"renderIniPanelShellSessionHandoffMountState",
"createIniPanelShellSessionHandoffPackageReport",
"createIniPanelShellSessionHandoffPackageRenderState",
"createIniPanelShellSessionHandoffPackageSchema",
@@ -432,6 +434,8 @@ assert.match(docText, /\bdata-handoff-shell\b/);
assert.match(docText, /\bdata-handoff-status\b/);
assert.match(docText, /\bdata-handoff-rows\b/);
assert.match(docText, /\bdata-external-shell-mount\b/);
assert.match(docText, /\brenderIniPanelShellSessionHandoffMountState\b/);
assert.match(docText, /\blinuxCncIniPanelLaunchApi\.renderShellSessionHandoffMountState\b/);
assert.match(docText, /\blinuxCncIniPanelLaunchApi\.getControlPageApiMethods\b/);
assert.match(docText, /\bini_panel_shell_integration_workflow_smoke\.html\b/);
assert.match(browserIniPanelText, /\bini_panel_shell_integration_workflow_smoke\.html\b/);
@@ -448,6 +452,7 @@ assert.match(shellIntegrationWorkflowSmokeText, /\bgetShellSessionHandoffPackage
assert.match(shellIntegrationWorkflowSmokeText, /\bgetShellSessionHandoffPackage\b/);
assert.match(shellIntegrationWorkflowSmokeText, /\bgetShellSessionHandoffPackageReport\b/);
assert.match(shellIntegrationWorkflowSmokeText, /\bgetShellSessionHandoffPackageMountRenderState\b/);
assert.match(shellIntegrationWorkflowSmokeText, /\brenderShellSessionHandoffMountState\b/);
assert.match(shellIntegrationWorkflowSmokeText, /\bdata-external-shell-mount\b/);
assert.match(shellIntegrationWorkflowSmokeText, /\bdata-external-mount-value\b/);
assert.match(shellIntegrationWorkflowSmokeText, /\bisSupportedShellSessionHandoffPackage\b/);

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

@@ -63,6 +63,7 @@ assert.deepEqual(manifest, {
"getShellSessionHandoffPackageMountState",
"getShellSessionHandoffPackageMountDisplayViewModel",
"getShellSessionHandoffPackageMountRenderState",
"renderShellSessionHandoffMountState",
"isSupportedShellSessionHandoffPackage",
"getLauncherLinks",
"getControlPageApiMethods",
@@ -181,6 +182,7 @@ assert.match(launchText, /\bgetShellSessionHandoffPackageRenderState\b/);
assert.match(launchText, /\bgetShellSessionHandoffPackageMountState\b/);
assert.match(launchText, /\bgetShellSessionHandoffPackageMountDisplayViewModel\b/);
assert.match(launchText, /\bgetShellSessionHandoffPackageMountRenderState\b/);
assert.match(launchText, /\brenderShellSessionHandoffMountState\b/);
assert.match(launchText, /\bisSupportedShellSessionHandoffPackage\b/);
assert.match(launchText, /\bdata-handoff-mount\b/);
assert.match(launchText, /\bdata-handoff-mount-status\b/);

6
wasm-port/tests/ui/node/verify_ini_panel_shell_integration_manifest.mjs
View File

@@ -148,7 +148,7 @@ assert.deepEqual(readiness, {
counts: {
pages: 2,
launcherLinks: 2,
launchMethods: 26,
launchMethods: 27,
controlPageMethods: 11,
persistenceCapabilities: 3,
},
@@ -210,7 +210,7 @@ assert.deepEqual(handoffSummary, {
counts: {
pages: 2,
launcherLinks: 2,
launchMethods: 26,
launchMethods: 27,
controlPageMethods: 11,
persistenceCapabilities: 3,
},
@@ -1077,7 +1077,7 @@ assert.deepEqual(createIniPanelShellIntegrationReadiness(blockedManifest), {
counts: {
pages: 2,
launcherLinks: 2,
launchMethods: 26,
launchMethods: 27,
controlPageMethods: 11,
persistenceCapabilities: 3,
},

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

@@ -23,6 +23,7 @@ import {
createIniPanelShellSessionHandoffPackageMountDisplayViewModel,
createIniPanelShellSessionHandoffPackageMountRenderState,
createIniPanelShellSessionHandoffPackageMountState,
renderIniPanelShellSessionHandoffMountState,
createIniPanelShellSessionHandoffPackageReport,
createIniPanelShellSessionHandoffPackageRenderState,
createIniPanelShellSessionHandoffPackageSchema,
@@ -93,6 +94,7 @@ assert.equal(typeof createIniPanelShellSessionHandoffPackageDisplayViewModel, "f
assert.equal(typeof createIniPanelShellSessionHandoffPackageMountDisplayViewModel, "function");
assert.equal(typeof createIniPanelShellSessionHandoffPackageMountRenderState, "function");
assert.equal(typeof createIniPanelShellSessionHandoffPackageMountState, "function");
assert.equal(typeof renderIniPanelShellSessionHandoffMountState, "function");
assert.equal(typeof createIniPanelShellSessionHandoffPackageReport, "function");
assert.equal(typeof createIniPanelShellSessionHandoffPackageRenderState, "function");
assert.equal(typeof createIniPanelShellSessionHandoffPackageSchema, "function");
@@ -660,6 +662,10 @@ assert.equal(
shellViewModel.createShellSessionHandoffPackageMountRenderState,
createIniPanelShellSessionHandoffPackageMountRenderState,
);
assert.equal(
shellViewModel.renderShellSessionHandoffMountState,
renderIniPanelShellSessionHandoffMountState,
);
assert.equal(shellViewModel.createShellSessionHandoffPackageReport, createIniPanelShellSessionHandoffPackageReport);
assert.equal(shellViewModel.createShellSessionHandoffPackageSchema, createIniPanelShellSessionHandoffPackageSchema);
assert.equal(shellViewModel.isSupportedShellSessionHandoffPackage, isSupportedIniPanelShellSessionHandoffPackage);
@@ -715,6 +721,48 @@ const controller = createMachineSessionControlPageController({
},
});
const mountRowsNode = {
children: [],
replaceChildren() {
this.children = [];
},
append(...nodes) {
this.children.push(...nodes);
},
};
const mountNode = { dataset: {} };
const mountStatusNode = { textContent: "" };
const mountDocument = {
createElement: (tagName) => ({ tagName, dataset: {}, textContent: "" }),
};
assert.deepEqual(
renderIniPanelShellSessionHandoffMountState(shellViewModel.shellSessionHandoffPackageMountRenderState, {
documentRef: mountDocument,
mountNode,
statusNode: mountStatusNode,
rowsNode: mountRowsNode,
}),
{
rendered: true,
statusLine: "Blocked: session-load-state",
rowCount: 5,
rowIds: [
"package-render-state",
"target-page",
"required-methods",
"session-load-state",
"blocking-reasons",
],
dataset: {
handoffPhase: "blocked",
handoffReady: "false",
handoffScope: "mount",
},
},
);
assert.equal(mountRowsNode.children[7].dataset.handoffMountValue, "session-load-state");
assert.equal(mountRowsNode.children[7].dataset.handoffMountStatus, "blocked");
assert.deepEqual(controller.render(), { rendered: true });
assert.equal(statusNode.textContent, "run-gcode | ok | -");
assert.equal(renderedView.status.runStatus, "ok");