${escapeHtml(item.semantic)}
@@ -1214,6 +1271,13 @@
logKeys: new Set(),
extensionFingerprint: "",
};
+ const extensionControlSync = {
+ revision: -1,
+ requestId: "",
+ running: false,
+ stopped: true,
+ controller: null,
+ };
const nonDispatchTaskSources = new Set(["mode_editor_compile"]);
function isDispatchTask(task = {}) {
@@ -2074,6 +2138,183 @@
}
}
+ function extensionControlDelivery(action = {}) {
+ const state = String(action.state || "pending");
+ const defaults = {
+ pending: ["not_submitted", "等待下发"],
+ executing: ["executing", "正在下发"],
+ submitted_unverified: ["submitted", "已下发 · 物理效果未确认"],
+ verified_success: ["submitted", "执行已确认"],
+ failed: ["failed", "下发失败"],
+ aborted: ["aborted", "已中止"],
+ };
+ const [deliveryState, deliveryLabel] = defaults[state] || defaults.pending;
+ return {
+ deliveryState,
+ deliveryLabel: String(action.state_label || deliveryLabel),
+ deliveryDetail: String(action.state_detail || ""),
+ };
+ }
+
+ function extensionControlResult(snapshot = {}) {
+ const requestId = String(snapshot.last_request_id || "");
+ const actions = Array.isArray(snapshot.action_statuses)
+ ? snapshot.action_statuses
+ : [];
+ return {
+ request_id: requestId,
+ utterance: "车端 MQTT 外设控制",
+ status: snapshot.state === "failed" ? "failed" : "succeeded",
+ execution_mode: "hardware",
+ control_transport: "extension_mqtt",
+ orchestration_route: "vehicle_mqtt_extension_control",
+ validated_control_commands: actions.map((action, position) => {
+ const index = Number.isInteger(Number(action.index))
+ ? Number(action.index)
+ : position;
+ const atMs = Math.max(0, Number(action.at_ms) || 0);
+ const slot = Number(action.slot);
+ const extensionName = String(action.extension_name || "红外外设");
+ const actionName = String(action.action || "红外动作");
+ const targetScope = String(action.target_scope || "external-device");
+ const delivery = extensionControlDelivery(action);
+ return {
+ domain: "self_extension",
+ channel: "IR",
+ category: `${extensionName} · target_scope=${targetScope} · at_ms=${atMs}`,
+ semantic_instruction: `${extensionName} · ${actionName}`,
+ actual_command: `infrared emit ${slot}`,
+ delivery_state: delivery.deliveryState,
+ delivery_label: delivery.deliveryLabel,
+ delivery_detail: [delivery.deliveryDetail, `at_ms=${atMs}`]
+ .filter(Boolean)
+ .join(" · "),
+ delivery_transport: "车端 MQTT → 红外 TCP",
+ frames: [{
+ label: "GSCU1B TCP",
+ value: JSON.stringify({ action: "emit", data: { no: slot }, type: "infrared" }),
+ }],
+ operation: {
+ id: `${requestId || "extension-ctl"}:${index}`,
+ domain: "self_extension",
+ capability: "infrared.emit",
+ target: { device: targetScope, name: extensionName },
+ parameters: { action: actionName, slot },
+ parse_source: "vehicle_mqtt_extension",
+ },
+ };
+ }),
+ };
+ }
+
+ function renderExtensionControlRejection(snapshot = {}) {
+ const panel = $("#v2CanCommandPanel");
+ const list = $("#v2CanCommandList");
+ const count = $("#v2CanCommandCount");
+ if (!panel || !list || !count) return;
+ count.textContent = "0";
+ panel.dataset.state = "error";
+ panel.open = true;
+ list.innerHTML = `车端 MQTT 外设控制已拒绝：${escapeHtml(snapshot.last_error || "消息未通过校验")}
`; + if (ui.sidebarCollapsed) setSidebarCollapsed(false); + requestAnimationFrame(syncSidebarLogBaseline); + } + + function applyExtensionControlSnapshot(snapshot = {}) { + const revision = Number(snapshot.revision); + if (!Number.isInteger(revision)) return; + if (revision < extensionControlSync.revision) { + extensionControlSync.revision = -1; + extensionControlSync.requestId = ""; + } + if (revision <= extensionControlSync.revision) return; + extensionControlSync.revision = revision; + const requestId = String(snapshot.last_request_id || ""); + const state = String(snapshot.state || ""); + const actions = Array.isArray(snapshot.action_statuses) + ? snapshot.action_statuses + : []; + if (requestId) extensionControlSync.requestId = requestId; + + if (actions.length) { + renderParsedCanCommands(extensionControlResult(snapshot), { reveal: true }); + appendSyncLog({ + key: `extension-control:${requestId}:${state}:${snapshot.executed_action_count || 0}`, + category: "extension", + title: state === "completed" + ? "车端 MQTT 外设控制已下发" + : state === "failed" + ? "车端 MQTT 外设控制下发失败" + : "正在执行车端 MQTT 外设控制", + detail: `${actions.length} 条红外指令 · ${snapshot.last_error || state}`, + status: state === "failed" ? "error" : state === "completed" ? "success" : "info", + }); + return; + } + if (requestId && ["rejected", "queue_full"].includes(state)) { + renderExtensionControlRejection(snapshot); + appendSyncLog({ + key: `extension-control:${requestId}:${state}`, + category: "extension", + title: "车端 MQTT 外设控制已拒绝", + detail: String(snapshot.last_error || "消息未通过校验"), + status: "error", + }); + } + } + + const extensionControlRetryDelay = () => new Promise((resolve) => { + window.setTimeout(resolve, 1000); + }); + + async function monitorExtensionControl() { + if (extensionControlSync.running) return; + extensionControlSync.running = true; + extensionControlSync.stopped = false; + try { + while (!extensionControlSync.stopped) { + const controller = new AbortController(); + extensionControlSync.controller = controller; + const query = new URLSearchParams({ + after_revision: String(extensionControlSync.revision), + timeout_ms: "25000", + }); + try { + const response = await fetch(`/api/extension/control/status?${query}`, { + credentials: "same-origin", + cache: "no-store", + headers: { Accept: "application/json" }, + signal: controller.signal, + }); + if (!response.ok) throw new Error(`HTTP ${response.status}`); + applyExtensionControlSnapshot(await response.json()); + } catch (error) { + if (extensionControlSync.stopped || error?.name === "AbortError") break; + console.warn("[extension-control-sync]", error); + await extensionControlRetryDelay(); + } finally { + if (extensionControlSync.controller === controller) { + extensionControlSync.controller = null; + } + } + } + } finally { + extensionControlSync.running = false; + } + } + + function startExtensionControlMonitor() { + if (extensionControlSync.running) return; + extensionControlSync.stopped = false; + void monitorExtensionControl(); + } + + function stopExtensionControlMonitor() { + extensionControlSync.stopped = true; + extensionControlSync.controller?.abort(); + extensionControlSync.controller = null; + } + function applyDisplaySnapshot(snapshot) { const synchronizedCatalog = Array.isArray(snapshot?.extension?.catalog) ? snapshot.extension.catalog @@ -2461,6 +2702,9 @@ appendSyncLog({ key: "client:ready", category: "sync", title: "同步控制台已就绪", detail: "正在连接车机任务与设备状态服务", status: "info" }); pollVehicleDisplaySync(); displaySync.pollTimer = window.setInterval(pollVehicleDisplaySync, 2000); + startExtensionControlMonitor(); + window.addEventListener("pagehide", stopExtensionControlMonitor); + window.addEventListener("pageshow", startExtensionControlMonitor); const updateClock = () => { if ($("#v2SyncClock")) $("#v2SyncClock").textContent = new Intl.DateTimeFormat("zh-CN", { hour: "2-digit", minute: "2-digit", second: "2-digit", hour12: false, diff --git a/apps/web-console/gesture-control.js b/apps/web-console/gesture-control.js index cbe1946..652fb53 100755 --- a/apps/web-console/gesture-control.js +++ b/apps/web-console/gesture-control.js @@ -566,7 +566,7 @@ async function loadGestureRuntime() { async function loadRecognizer() { if (state.recognizer) return; $("#gestureSafetyText").textContent = "正在加载手势模型…"; - const { FilesetResolver, GestureRecognizer } = await import(VISION_MODULE); + const { FilesetResolver, GestureRecognizer } = await import(/* @vite-ignore */ VISION_MODULE); const fileset = await FilesetResolver.forVisionTasks(VISION_WASM); const modelResponse = await window.CognitiveAgentNetwork.request("/api/gesture/model", { cache: "force-cache", diff --git a/apps/web-console/index.html b/apps/web-console/index.html index 2103283..e761b18 100755 --- a/apps/web-console/index.html +++ b/apps/web-console/index.html @@ -11,630 +11,45 @@Cabin / reference_vehicle / dry-run
-可控参数电源 · 温度 · 风量/风向
-只读信号档位 · 车速 · 四门锁状态
-可控参数开关 / 停止 · 位置
- -可控参数阅读灯 · 氛围亮度 · 色号
- -可控参数四窗独立 · 开/关/停 · 位置
- -可控参数近/远光 · 雾灯 · 转向灯
- -# 等待生成 FunctionConfig--ModeDRY-RUN# 等待 CAN 编译按来源与运行方式整理，快速定位并管理模式
-点击“生成指令”后，这里会显示由后端解析、校验并编译的控制指令流。
-修改自然语言后需要重新生成指令，才能点击完成永久保存。
- -