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

Make machine configuration authoritative and restore native checkpoints exactly

Browse Source
This commit is contained in:
wangdequan
2026-09-18 09:09:41 +08:00
parent 6a69511276
commit 4a568f1f4c
94 changed files with 10882 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
web/worker/opfs-worker-bridge.mjs
View File

@@ -6,6 +6,7 @@ import {
savePowerOffCheckpoint,
saveUiState,
} from "./opfs-ui-state.mjs";
import { DEFAULT_MACHINE, machineDefinition } from "../workspace/machine-definitions.mjs";
const UI_COMMANDS = new Set(["UI_STATE_SAVE", "UI_STATE_LOAD", "UI_STATE_CLEAR"]);
@@ -34,7 +35,7 @@ export async function handleWorkerMessage(session, input) {
// UI cache is a Worker storage service, not a LinuxCNC command. It never
// consumes the WASM protocol sequence or changes task/motion authority.
const payload = object(input.payload);
const options = { contextId: input.context_id, key: payload.key ?? "xyzac-trt" };
const options = { contextId: input.context_id, key: payload.key ?? session.machineDefinition?.id ?? DEFAULT_MACHINE.id };
const result = input.kind === "UI_STATE_SAVE"
? await saveUiState({ ...options, state: payload.state })
: input.kind === "UI_STATE_LOAD"
@@ -44,18 +45,32 @@ export async function handleWorkerMessage(session, input) {
}
let request = input;
if (input?.kind === "LOAD_WORKSPACE" && !object(input.payload).recovery_checkpoint) {
const persisted = await loadPowerOffCheckpoint({ contextId: input.context_id, key: "xyzac-trt" });
if (persisted.status === "verified" && persisted.checkpoint) request = { ...input, payload: { ...object(input.payload), recovery_checkpoint: persisted.checkpoint } };
let recoveryNotice = null;
const configuration = object(input.payload).configuration;
const requestedMachine = machineDefinition(configuration?.entrypoint);
const key = requestedMachine?.id ?? session.machineDefinition?.id ?? DEFAULT_MACHINE.id;
// Automatic restoration belongs to a new Worker session. Explicit INI
// changes and machine switches must not be overwritten by saved state.
if (input?.kind === "LOAD_WORKSPACE" && !session.machineDefinition && (!configuration?.entrypoint || requestedMachine) && !object(input.payload).recovery_checkpoint) {
const persisted = await loadPowerOffCheckpoint({ contextId: input.context_id, key });
if (persisted.status === "verified" && persisted.checkpoint) {
try {
if (configuration && session.core && typeof session.validateRecoveryGeometry === "function") session.validateRecoveryGeometry(persisted.checkpoint.state, configuration);
request = { ...input, payload: { ...object(input.payload), recovery_checkpoint: persisted.checkpoint } };
} catch (error) {
recoveryNotice = { status: "ignored", code: String(error?.message ?? error), reason: "saved_checkpoint_incompatible_with_current_configuration" };
}
}
}
const response = session.accept(request);
const payload = object(response?.payload);
if (recoveryNotice) payload.recovery_persistence = recoveryNotice;
if (input?.kind === "POWER" && response?.kind === "COMMAND_RESULT" && payload.status === "verified") {
if (payload.active === false && payload.recovery_checkpoint) {
const persisted = await savePowerOffCheckpoint({ contextId: input.context_id, checkpoint: payload.recovery_checkpoint, key: "xyzac-trt" });
const persisted = await savePowerOffCheckpoint({ contextId: input.context_id, checkpoint: payload.recovery_checkpoint, key });
payload.recovery_persistence = persisted;
} else if (payload.active === true) {
payload.recovery_persistence = await clearPowerOffCheckpoint({ contextId: input.context_id, key: "xyzac-trt" });
payload.recovery_persistence = await clearPowerOffCheckpoint({ contextId: input.context_id, key });
}
}
return response;