feat(ble): 完善BLE OTA架构并优化性能

- 实现BLE OTA数据路径分离：添加ble_ota_data.cpp处理重排序/工作线程/DATA_IN，
  和ble_ota_host.cpp处理GATT/GAP/广播/主机功能
- 将滑动ACK窗口从32增大到64，实测Windows WebBT环境下固件传输速度提升约10%
  （从40KB/s提升到44KB/s），内存消耗约30KB重排序缓冲区
- 优化调试日志级别，将OTA相关信息从INFO调整为DBG以减少日志冗余

refactor(can): 改进CAN反馈监听机制

- 将CAN反馈任务从1Hz主动轮询模式改为被动事件监听模式，
  使用SpiMaster::takeEvent()替代主动发送0xC1轮询请求
- 更新相关头文件注释说明架构变更，将"周期性轮询"改为"被动接收推送"
- 修改调试日志级别，将暂停/恢复状态日志从INFO调整为DBG

tools/js/can/dbc.js

@@ -88,7 +88,8 @@ export function bytesToHex(bytes) {
 /** @description 转义 CSS 选择器中的特殊字符。 */
 export function cssEscape(value) {
   if (window.CSS && CSS.escape) return CSS.escape(value);
-  return String(value).replace(/[^a-zA-Z0-9_-]/g, function (ch) { return '\\\\' + ch; });
+  /* fallback：每个非安全字符前加单个反斜杠（CSS 转义），双引号属性值内可安全使用 */
+  return String(value).replace(/[^a-zA-Z0-9_-]/g, function (ch) { return '\\' + ch; });
 }
 
 /** @description 去除回车并 trim，用于 DBC 搜索等输入归一化。 */
@@ -232,7 +233,7 @@ export function parseDbc(text) {
       signal.comment = comments.signals[String(msg.idRaw) + ':' + signal.name] || '';
       signal.enumMap = valueTables[String(msg.idRaw) + ':' + signal.name] || {};
       var dv = sigDefaults[String(msg.idRaw) + ':' + signal.name];
-      signal.defaultValue = (dv != null && Number.isFinite(Number(dv))) ? dv : null;
+      signal.defaultValue = (dv != null && Number.isFinite(Number(dv))) ? Number(dv) : null;
     });
   });
 
@@ -251,6 +252,16 @@ export function findSignal(message, signalName) {
   return null;
 }
 
+/**
+ * @description 按 key 在当前合并 DBC 中查找报文（O(1)，走 messageMap）。
+ *              messageMap 由 rebuildMergedDbc() 维护，key 格式与 message.key / state.selectedMessageKey 一致。
+ *              无 DBC 或 key 不存在时返回 null。
+ */
+export function findMessageByKey(key) {
+  if (!state.dbc || !state.dbc.messageMap || !key) return null;
+  return state.dbc.messageMap[key] || null;
+}
+
 /** @description 解析 SG_ 行的 multiplex token（M / mN / 空）。 */
 export function parseMultiplexToken(token) {
   if (!token) return { role: null, value: null };

tools/js/can/messages.js

@@ -7,14 +7,13 @@
  *       common/utils.js（escapeHtml/formatBytes）、
  *       signals.js（renderInlineSignalGrid/ensureMessageDefaults/updateEncodedPreview）。
  */
-import { state, el, padHex, normalizeWhitespace, cssEscape } from './dbc.js?v=20260717x';
-import { escapeHtml as sanitizeHtml, formatBytes } from '../common/utils.js?v=20260717x';
+import { state, el, padHex, normalizeWhitespace, cssEscape, findMessageByKey } from './dbc.js?v=20260717x';
+import { escapeHtml, formatBytes } from '../common/utils.js?v=20260717x';
 import { renderInlineSignalGrid, ensureMessageDefaults, updateEncodedPreview } from './signals.js?v=20260717x';
 import { scheduleCanPersist } from './persist.js?v=20260717x';
 
 // ==================== DBC 文件信息 ====================
-/** @description 更新 DBC 文件信息卡片（文件名/报文数/信号数/节点数/大小）。 */
-/** @description 刷新多 DBC 摘要条与文件 chip 列表。 */
+/** @description 更新 DBC 文件信息卡片（文件名/报文数/信号数/节点数/大小），并刷新多 DBC 摘要条与文件 chip 列表。 */
 export function updateDbcFileInfo() {
   var sources = state.dbcSources || [];
   var has = sources.length > 0;
@@ -54,9 +53,9 @@ export function updateDbcFileInfo() {
     el.dbcFileChips.innerHTML = sources.map(function (s) {
       var nMsg = (s.dbc && s.dbc.messages) ? s.dbc.messages.length : 0;
       return '' +
-        '<span class="dbc-file-chip" data-source-id="' + sanitizeHtml(s.id) + '" title="' + sanitizeHtml(s.name) + ' · ' + nMsg + ' 报文">' +
-          '<span class="dbc-file-chip-name">' + sanitizeHtml(s.name) + '</span>' +
-          '<button type="button" class="dbc-file-chip-remove" data-remove-id="' + sanitizeHtml(s.id) + '" title="移除此文件">×</button>' +
+        '<span class="dbc-file-chip" data-source-id="' + escapeHtml(s.id) + '" title="' + escapeHtml(s.name) + ' · ' + nMsg + ' 报文">' +
+          '<span class="dbc-file-chip-name">' + escapeHtml(s.name) + '</span>' +
+          '<button type="button" class="dbc-file-chip-remove" data-remove-id="' + escapeHtml(s.id) + '" title="移除此文件">×</button>' +
         '</span>';
     }).join('');
   }
@@ -93,7 +92,7 @@ export function filterMessages() {
 
 // ==================== 发送节点过滤 ====================
 /** @description 收集 DBC 中所有发送节点（去重 + 排序）。 */
-export function collectTransmitters() {
+function collectTransmitters() {
   var set = Object.create(null);
   var list = [];
   if (!state.dbc) return list;
@@ -106,10 +105,10 @@ export function collectTransmitters() {
 }
 
 /** @description 渲染发送节点过滤面板的复选框列表。 */
-export function renderNodeFilterList() {
+function renderNodeFilterList() {
   if (!el.nodeFilterList) return;
   var txs = collectTransmitters();
-  var kw = (el.nodeFilterSearch && el.nodeFilterSearch.value || '').trim().toLowerCase();
+  var kw = (el.nodeFilterSearch ? (el.nodeFilterSearch.value || '') : '').trim().toLowerCase();
   if (kw) txs = txs.filter(function (n) { return n.toLowerCase().indexOf(kw) >= 0; });
   if (!txs.length) {
     el.nodeFilterList.innerHTML = '<div class="status-empty">无匹配节点</div>';
@@ -125,8 +124,8 @@ export function renderNodeFilterList() {
   el.nodeFilterList.innerHTML = txs.map(function (name) {
     var checked = !!state.transmitterFilter[name] ? ' checked' : '';
     return '<label class="can-node-filter-item">' +
-      '<input type="checkbox" data-node="' + sanitizeHtml(name) + '"' + checked + '>' +
-      '<span class="can-node-filter-name">' + sanitizeHtml(name) + '</span>' +
+      '<input type="checkbox" data-node="' + escapeHtml(name) + '"' + checked + '>' +
+      '<span class="can-node-filter-name">' + escapeHtml(name) + '</span>' +
       '<span class="can-node-filter-count">' + (counts[name] || 0) + '</span>' +
       '</label>';
   }).join('');
@@ -167,7 +166,7 @@ export function updateNodeFilterLabel() {
 }
 
 /** @description 打开/关闭发送节点过滤面板。 */
-export function setNodeFilterPanelOpen(open) {
+function setNodeFilterPanelOpen(open) {
   if (!el.nodeFilterPanel || !el.nodeFilterBtn) return;
   if (open) {
     renderNodeFilterList();
@@ -245,23 +244,23 @@ export function renderMessageList() {
     var comment = msg.comment || '';
     if (comment.length > 36) comment = comment.slice(0, 36) + '...';
     var rowHtml = '' +
-      '<div class="message-row' + active + '" data-key="' + sanitizeHtml(msg.key) + '" role="button" tabindex="0">' +
-      '<span class="message-col message-col-check"><input type="checkbox" class="message-check" data-key="' + sanitizeHtml(msg.key) + '"' + checked + '></span>' +
-      '<span class="message-col message-col-toggle"><button type="button" class="message-toggle' + (expanded ? ' expanded' : '') + '" data-key="' + sanitizeHtml(msg.key) + '" aria-label="展开/收起信号">' + caret + '</button></span>' +
+      '<div class="message-row' + active + '" data-key="' + escapeHtml(msg.key) + '" role="button" tabindex="0">' +
+      '<span class="message-col message-col-check"><input type="checkbox" class="message-check" data-key="' + escapeHtml(msg.key) + '"' + checked + '></span>' +
+      '<span class="message-col message-col-toggle"><button type="button" class="message-toggle' + (expanded ? ' expanded' : '') + '" data-key="' + escapeHtml(msg.key) + '" aria-label="展开/收起信号">' + caret + '</button></span>' +
       '<span class="message-col message-col-index">' + (index + 1) + '</span>' +
-      '<span class="message-col message-col-dbc" title="' + sanitizeHtml(msg.sourceName || '-') + '">' +
-        sanitizeHtml(msg.sourceName ? String(msg.sourceName).replace(/\.dbc$/i, '') : '-') + '</span>' +
-      '<span class="message-col message-col-name" title="' + sanitizeHtml(msg.name) + '">' +
-        sanitizeHtml(msg.name) + '</span>' +
-      '<span class="message-col message-col-id">' + sanitizeHtml(idHex) + '</span>' +
-      '<span class="message-col message-col-channel">CH' + sanitizeHtml(channelTxt) + '</span>' +
-      '<span class="message-col message-col-type">' + sanitizeHtml(msg.isExtended ? '扩展' : '标准') + '</span>' +
-      '<span class="message-col message-col-dlc">' + sanitizeHtml(msg.dlc) + '</span>' +
-      '<span class="message-col message-col-signal">' + sanitizeHtml(msg.signals.length) + '</span>' +
-      '<span class="message-col message-col-node" title="' + sanitizeHtml(msg.transmitter || 'Vector__XXX') + '">' + sanitizeHtml(msg.transmitter || 'Vector__XXX') + '</span>' +
-      '<span class="message-col message-col-comment" title="' + sanitizeHtml(msg.comment || '') + '">' + sanitizeHtml(comment || '-') + '</span>' +
+      '<span class="message-col message-col-dbc" title="' + escapeHtml(msg.sourceName || '-') + '">' +
+        escapeHtml(msg.sourceName ? String(msg.sourceName).replace(/\.dbc$/i, '') : '-') + '</span>' +
+      '<span class="message-col message-col-name" title="' + escapeHtml(msg.name) + '">' +
+        escapeHtml(msg.name) + '</span>' +
+      '<span class="message-col message-col-id">' + escapeHtml(idHex) + '</span>' +
+      '<span class="message-col message-col-channel">CH' + escapeHtml(channelTxt) + '</span>' +
+      '<span class="message-col message-col-type">' + escapeHtml(msg.isExtended ? '扩展' : '标准') + '</span>' +
+      '<span class="message-col message-col-dlc">' + escapeHtml(msg.dlc) + '</span>' +
+      '<span class="message-col message-col-signal">' + escapeHtml(msg.signals.length) + '</span>' +
+      '<span class="message-col message-col-node" title="' + escapeHtml(msg.transmitter || 'Vector__XXX') + '">' + escapeHtml(msg.transmitter || 'Vector__XXX') + '</span>' +
+      '<span class="message-col message-col-comment" title="' + escapeHtml(msg.comment || '') + '">' + escapeHtml(comment || '-') + '</span>' +
       '</div>';
-    var expandHtml = '<div class="message-row-expand" data-key="' + sanitizeHtml(msg.key) + '"' + (expanded ? '' : ' hidden') + '>' +
+    var expandHtml = '<div class="message-row-expand" data-key="' + escapeHtml(msg.key) + '"' + (expanded ? '' : ' hidden') + '>' +
       '<div class="signal-table-host"></div>' +
       '</div>';
     return rowHtml + expandHtml;
@@ -331,10 +330,7 @@ function handleMessageRowClick(event) {
 
 function toggleMessageExpand(key) {
   if (!state.dbc) return;
-  var msg = null;
-  for (var i = 0; i < state.dbc.messages.length; i++) {
-    if (state.dbc.messages[i].key === key) { msg = state.dbc.messages[i]; break; }
-  }
+  var msg = findMessageByKey(key);
   if (!msg) return;
   var willExpand = !state.expandedKeys[key];
   if (willExpand) {
@@ -384,13 +380,7 @@ export function updateBatchUi() {
 /** @description 选中指定 key 的报文，并刷新列表/信号编辑/编码预览。 */
 export function selectMessage(key) {
   if (!state.dbc) return;
-  var msg = null;
-  for (var i = 0; i < state.dbc.messages.length; i++) {
-    if (state.dbc.messages[i].key === key) {
-      msg = state.dbc.messages[i];
-      break;
-    }
-  }
+  var msg = findMessageByKey(key);
   if (!msg) return;
   state.selectedMessageKey = key;
   ensureMessageDefaults(msg);

tools/js/can/persist.js

@@ -25,9 +25,7 @@ function safeJsonParse(raw) {
 function transmitterFilterToPlain() {
   var out = {};
   for (var k in state.transmitterFilter) {
-    if (Object.prototype.hasOwnProperty.call(state.transmitterFilter, k) || state.transmitterFilter[k]) {
-      out[k] = !!state.transmitterFilter[k];
-    }
+    if (state.transmitterFilter[k]) out[k] = true;
   }
   return out;
 }
@@ -196,11 +194,8 @@ export function loadCanSession() {
     state.transmitterFilterEmpty = !anyTx;
 
     /* 选中键若不存在则清空，交由调用方选第一条 */
-    if (state.selectedMessageKey && state.dbc && state.dbc.messageMap) {
-      if (!state.dbc.messageMap[state.selectedMessageKey]) {
-        state.selectedMessageKey = '';
-      }
-    } else if (state.selectedMessageKey && (!state.dbc || !state.dbc.messages.length)) {
+    if (state.selectedMessageKey &&
+        (!state.dbc || !state.dbc.messageMap[state.selectedMessageKey])) {
       state.selectedMessageKey = '';
     }
 

tools/js/can/send.js

@@ -13,7 +13,7 @@
  * 的 formatTime（含毫秒）不同，以保证发送历史时间戳输出格式一致。
  */
 import { state, el, getBaseUrl, padHex, bytesToHex, parseNumericId } from './dbc.js?v=20260717x';
-import { escapeHtml as sanitizeHtml } from '../common/utils.js?v=20260717x';
+import { escapeHtml } from '../common/utils.js?v=20260717x';
 import { showToast } from '../common/toast.js?v=20260717x';
 import { updateBatchUi } from './messages.js?v=20260717x';
 import { ensureMessageDefaults, getSignalValueMap, getSelectedMessage, updateEncodedPreview, encodeMessageData } from './signals.js?v=20260717x';
@@ -29,13 +29,13 @@ function formatTime(date) {
 }
 
 // ==================== 发送错误码描述 ====================
-export var CAN_SEND_ERR_DESC = {
+var CAN_SEND_ERR_DESC = {
   '-1': '参数错误（通道/ID/DLC 无效）',
   '-2': 'SPI 通信失败（ESP32 与 GD32 通信异常）',
   '-3': 'GD32 CAN 总线拒绝',
 };
 
-export var GD32_ERR_DESC = {
+var GD32_ERR_DESC = {
   0xE0: 'payload 过短',
   0xE1: '通道号非法',
   0xE2: 'BUS_OFF（总线离线，检查接线/终端电阻/对端上电）',
@@ -46,7 +46,7 @@ export var GD32_ERR_DESC = {
 };
 
 /** @description 构建发送响应的可读文本（成功显示 recv，失败拼接 CAN_SEND_ERR_DESC + GD32_ERR_DESC）。 */
-export function buildSendResponseText(result) {
+function buildSendResponseText(result) {
   if (result.status === 'ok') {
     return result.recv ? ('0x' + result.recv + ' (' + result.recv_len + ' 字节)') : '无响应数据';
   }
@@ -133,11 +133,27 @@ function updateResponseBox(box, textEl, result, mode) {
     el.manualHint.className = 'helper-note ' + (result.status === 'ok' ? 'ok' : 'err');
     el.manualHint.innerHTML = result.status === 'ok'
       ? '原始帧已发送到设备，若有响应则显示在下方。'
-      : '设备返回错误码 <b>' + sanitizeHtml(result.code) + '</b>。';
+      : '设备返回错误码 <b>' + escapeHtml(result.code) + '</b>。';
   }
 }
 
 // ==================== 发送历史 ====================
+/**
+ * 构造一条历史条目。集中字段，避免多处重复拼对象。
+ */
+function makeHistoryEntry(opts) {
+  return {
+    time: formatTime(new Date()),
+    mode: opts.mode,
+    ok: opts.ok,
+    channel: opts.channel,
+    idHex: opts.idHex,
+    dlc: opts.dlc,
+    dataHex: opts.dataHex || '',
+    resultText: opts.resultText
+  };
+}
+
 /**
  * @param {object} entry
  * @param {{ silent?: boolean }} [opts] silent=true 时不立刻重绘/落盘（批量用）
@@ -162,11 +178,11 @@ export function renderHistory() {
     var meta = 'CH' + item.channel + ' · ' + item.idHex + ' · DLC ' + item.dlc;
     return '' +
       '<div class="history-item history-item-row' + (item.ok ? '' : ' is-err') + '">' +
-      '<span class="history-item-tag ' + (item.ok ? 'ok' : 'err') + '">' + sanitizeHtml(item.mode) + '</span>' +
-      '<span class="history-item-time">' + sanitizeHtml(item.time) + '</span>' +
-      '<span class="history-item-main" title="' + sanitizeHtml(meta) + '">' + sanitizeHtml(meta) + '</span>' +
-      '<span class="history-item-hex" title="' + sanitizeHtml(item.dataHex || '') + '">' + sanitizeHtml(item.dataHex || '--') + '</span>' +
-      '<span class="history-item-foot" title="' + sanitizeHtml(item.resultText || '') + '">' + sanitizeHtml(item.resultText) + '</span>' +
+      '<span class="history-item-tag ' + (item.ok ? 'ok' : 'err') + '">' + escapeHtml(item.mode) + '</span>' +
+      '<span class="history-item-time">' + escapeHtml(item.time) + '</span>' +
+      '<span class="history-item-main" title="' + escapeHtml(meta) + '">' + escapeHtml(meta) + '</span>' +
+      '<span class="history-item-hex" title="' + escapeHtml(item.dataHex || '') + '">' + escapeHtml(item.dataHex || '--') + '</span>' +
+      '<span class="history-item-foot" title="' + escapeHtml(item.resultText || '') + '">' + escapeHtml(item.resultText) + '</span>' +
       '</div>';
   }).join('');
 }
@@ -191,128 +207,115 @@ export async function sendCheckedMessages() {
   var ok = 0, fail = 0;
   var silent = { silent: true };
 
-  /* 先全部编码，避免发到一半才因编码失败打断节奏 */
-  var prepared = [];
-  for (var i = 0; i < keys.length; i++) {
-    var key = keys[i];
-    var msg = null;
-    for (var m = 0; m < state.dbc.messages.length; m++) {
-      if (state.dbc.messages[m].key === key) { msg = state.dbc.messages[m]; break; }
-    }
-    if (!msg) continue;
-    ensureMessageDefaults(msg);
-    var idHex = '0x' + padHex(msg.id, msg.isExtended ? 8 : 3);
-    var dataBytes;
-    try {
-      dataBytes = encodeMessageData(msg, getSignalValueMap(msg));
-    } catch (err) {
-      fail++;
-      addHistoryEntry({
-        time: formatTime(new Date()),
-        mode: 'BATCH',
-        ok: false,
-        channel: channel,
-        idHex: idHex,
-        dlc: msg.dlc,
-        dataHex: '',
-        resultText: msg.name + ' · 编码失败: ' + err.message
-      }, silent);
-      continue;
-    }
-    var dataHex = bytesToHex(dataBytes);
-    var dlc = (typeof msg.dlc === 'number') ? msg.dlc : dataBytes.length;
-    prepared.push({
-      msg: msg,
-      idHex: idHex,
-      dlc: dlc,
-      dataHex: dataHex,
-      frame: { id: msg.id, dlc: dlc, data: dataHex }
-    });
+  /* 按 key 建索引，避免勾选数百条时 O(n²) 扫描 messages */
+  var msgByKey = Object.create(null);
+  for (var mi = 0; mi < state.dbc.messages.length; mi++) {
+    var mm = state.dbc.messages[mi];
+    msgByKey[mm.key] = mm;
   }
 
-  /* 分块批量接口；不支持时整段回退为无间隔单帧 */
-  var useBatchApi = true;
-  for (var off = 0; off < prepared.length; ) {
-    var chunk = prepared.slice(off, off + BATCH_CHUNK);
-    off += chunk.length;
-    var frames = chunk.map(function (p) { return p.frame; });
-    var results = null;
-
-    if (useBatchApi) {
+  try {
+    /* 先全部编码，避免发到一半才因编码失败打断节奏 */
+    var prepared = [];
+    for (var i = 0; i < keys.length; i++) {
+      var key = keys[i];
+      var msg = msgByKey[key];
+      if (!msg) continue;
+      ensureMessageDefaults(msg);
+      var idHex = '0x' + padHex(msg.id, msg.isExtended ? 8 : 3);
+      var dataBytes;
       try {
-        results = await sendCanBatchRequest(channel, frames);
-        if (results.length !== chunk.length) {
-          throw new Error('results 长度不匹配');
-        }
-      } catch (err) {
-        useBatchApi = false;
-        results = null;
-        /* 本 chunk 改单帧紧接 */
-      }
-    }
-
-    if (results) {
-      for (var r = 0; r < chunk.length; r++) {
-        var item = chunk[r];
-        var result = results[r] || { status: 'error', code: -3 };
-        if (result.status === 'ok') ok++; else fail++;
-        addHistoryEntry({
-          time: formatTime(new Date()),
-          mode: 'BATCH',
-          ok: result.status === 'ok',
-          channel: channel,
-          idHex: item.idHex,
-          dlc: item.dlc,
-          dataHex: item.dataHex || '',
-          resultText: item.msg.name + ' · ' + buildSendResponseText(result)
-        }, silent);
-      }
-      continue;
-    }
-
-    /* 回退：逐帧 HTTP，帧间无 sleep、无重试 */
-    for (var s = 0; s < chunk.length; s++) {
-      var one = chunk[s];
-      try {
-        var oneResult = await sendCanRequest({
-          ch: channel,
-          id: one.frame.id,
-          dlc: one.frame.dlc,
-          data: one.frame.data
-        });
-        if (oneResult.status === 'ok') ok++; else fail++;
-        addHistoryEntry({
-          time: formatTime(new Date()),
-          mode: 'BATCH',
-          ok: oneResult.status === 'ok',
-          channel: channel,
-          idHex: one.idHex,
-          dlc: one.dlc,
-          dataHex: one.dataHex || '',
-          resultText: one.msg.name + ' · ' + buildSendResponseText(oneResult)
-        }, silent);
+        dataBytes = encodeMessageData(msg, getSignalValueMap(msg));
       } catch (err) {
         fail++;
-        addHistoryEntry({
-          time: formatTime(new Date()),
-          mode: 'BATCH',
-          ok: false,
-          channel: channel,
-          idHex: one.idHex,
-          dlc: one.dlc,
-          dataHex: one.dataHex || '',
-          resultText: one.msg.name + ' · ' + err.message
-        }, silent);
+        addHistoryEntry(makeHistoryEntry({
+          mode: 'BATCH', ok: false, channel: channel, idHex: idHex,
+          dlc: msg.dlc, dataHex: '',
+          resultText: msg.name + ' · 编码失败: ' + err.message
+        }), silent);
+        continue;
+      }
+      var dataHex = bytesToHex(dataBytes);
+      var dlc = (typeof msg.dlc === 'number') ? msg.dlc : dataBytes.length;
+      prepared.push({
+        msg: msg,
+        idHex: idHex,
+        dlc: dlc,
+        dataHex: dataHex,
+        frame: { id: msg.id, dlc: dlc, data: dataHex }
+      });
+    }
+
+    /* 分块批量接口；不支持时整段回退为无间隔单帧 */
+    var useBatchApi = true;
+    for (var off = 0; off < prepared.length; ) {
+      var chunk = prepared.slice(off, off + BATCH_CHUNK);
+      off += chunk.length;
+      var frames = chunk.map(function (p) { return p.frame; });
+      var results = null;
+
+      if (useBatchApi) {
+        try {
+          results = await sendCanBatchRequest(channel, frames);
+          if (results.length !== chunk.length) {
+            throw new Error('results 长度不匹配');
+          }
+        } catch (err) {
+          useBatchApi = false;
+          results = null;
+          /* 本 chunk 改单帧紧接 */
+        }
+      }
+
+      if (results) {
+        for (var r = 0; r < chunk.length; r++) {
+          var item = chunk[r];
+          var result = results[r] || { status: 'error', code: -3 };
+          if (result.status === 'ok') ok++; else fail++;
+          addHistoryEntry(makeHistoryEntry({
+            mode: 'BATCH', ok: result.status === 'ok', channel: channel,
+            idHex: item.idHex, dlc: item.dlc, dataHex: item.dataHex,
+            resultText: item.msg.name + ' · ' + buildSendResponseText(result)
+          }), silent);
+        }
+        continue;
+      }
+
+      /* 回退：逐帧 HTTP，帧间无 sleep、无重试 */
+      for (var s = 0; s < chunk.length; s++) {
+        var one = chunk[s];
+        try {
+          var oneResult = await sendCanRequest({
+            ch: channel,
+            id: one.frame.id,
+            dlc: one.frame.dlc,
+            data: one.frame.data
+          });
+          if (oneResult.status === 'ok') ok++; else fail++;
+          addHistoryEntry(makeHistoryEntry({
+            mode: 'BATCH', ok: oneResult.status === 'ok', channel: channel,
+            idHex: one.idHex, dlc: one.dlc, dataHex: one.dataHex,
+            resultText: one.msg.name + ' · ' + buildSendResponseText(oneResult)
+          }), silent);
+        } catch (err) {
+          fail++;
+          addHistoryEntry(makeHistoryEntry({
+            mode: 'BATCH', ok: false, channel: channel,
+            idHex: one.idHex, dlc: one.dlc, dataHex: one.dataHex,
+            resultText: one.msg.name + ' · ' + err.message
+          }), silent);
+        }
       }
     }
-  }
 
-  renderHistory();
-  scheduleCanPersist();
-  state.batchInFlight = false;
-  updateBatchUi();
-  var tone = fail === 0 ? 'success' : (ok === 0 ? 'error' : 'warning');
-  showToast('批量发送完成：成功 ' + ok + '，失败 ' + fail, tone);
+    renderHistory();
+    scheduleCanPersist();
+    var tone = fail === 0 ? 'success' : (ok === 0 ? 'error' : 'warning');
+    showToast('批量发送完成：成功 ' + ok + '，失败 ' + fail, tone);
+  } finally {
+    state.batchInFlight = false;
+    updateBatchUi();
+  }
 }
 
 // ==================== 选中报文发送 ====================
@@ -338,16 +341,12 @@ export async function sendSelectedMessage() {
   try {
     var result = await sendCanRequest(payload);
     updateResponseBox(el.dbcResp, el.dbcRespText, result, 'dbc');
-    addHistoryEntry({
-      time: formatTime(new Date()),
-      mode: 'DBC',
-      ok: result.status === 'ok',
-      channel: channel,
+    addHistoryEntry(makeHistoryEntry({
+      mode: 'DBC', ok: result.status === 'ok', channel: channel,
       idHex: '0x' + padHex(msg.id, msg.isExtended ? 8 : 3),
-      dlc: msg.dlc,
-      dataHex: bytesToHex(state.generatedData),
+      dlc: msg.dlc, dataHex: bytesToHex(state.generatedData),
       resultText: buildSendResponseText(result)
-    });
+    }));
     showToast(result.status === 'ok' ? 'DBC 报文发送成功' : '发送失败', result.status === 'ok' ? 'success' : 'error');
   } catch (err) {
     if (el.dbcResp) {
@@ -355,16 +354,12 @@ export async function sendSelectedMessage() {
       el.dbcResp.className = 'can-response err';
       el.dbcRespText.textContent = err.message;
     }
-    addHistoryEntry({
-      time: formatTime(new Date()),
-      mode: 'DBC',
-      ok: false,
-      channel: channel,
+    addHistoryEntry(makeHistoryEntry({
+      mode: 'DBC', ok: false, channel: channel,
       idHex: '0x' + padHex(msg.id, msg.isExtended ? 8 : 3),
-      dlc: msg.dlc,
-      dataHex: bytesToHex(state.generatedData),
+      dlc: msg.dlc, dataHex: bytesToHex(state.generatedData),
       resultText: err.message
-    });
+    }));
     showToast('发送失败: ' + err.message, 'error');
   }
 }
@@ -397,7 +392,7 @@ export function refreshManualHint() {
     el.manualHint.innerHTML = '原始 HEX 合法，当前长度 <b>' + (dataHex.length / 2) + '</b> 字节。';
   } catch (err) {
     el.manualHint.className = 'helper-note err';
-    el.manualHint.innerHTML = sanitizeHtml(err.message);
+    el.manualHint.innerHTML = escapeHtml(err.message);
   }
 }
 
@@ -427,16 +422,12 @@ export async function sendManualFrame() {
       data: dataHex
     });
     updateResponseBox(el.manualResp, el.manualRespText, result, 'manual');
-    addHistoryEntry({
-      time: formatTime(new Date()),
-      mode: 'RAW',
-      ok: result.status === 'ok',
-      channel: channel,
+    addHistoryEntry(makeHistoryEntry({
+      mode: 'RAW', ok: result.status === 'ok', channel: channel,
       idHex: '0x' + padHex(id, id > 0x7FF ? 8 : 3),
-      dlc: dlc,
-      dataHex: dataHex,
+      dlc: dlc, dataHex: dataHex,
       resultText: buildSendResponseText(result)
-    });
+    }));
     showToast(result.status === 'ok' ? '原始帧发送成功' : '发送失败', result.status === 'ok' ? 'success' : 'error');
   } catch (err) {
     if (el.manualResp) {
@@ -444,16 +435,12 @@ export async function sendManualFrame() {
       el.manualResp.className = 'can-response err';
       el.manualRespText.textContent = err.message;
     }
-    addHistoryEntry({
-      time: formatTime(new Date()),
-      mode: 'RAW',
-      ok: false,
-      channel: channel,
+    addHistoryEntry(makeHistoryEntry({
+      mode: 'RAW', ok: false, channel: channel,
       idHex: '0x' + padHex(id, id > 0x7FF ? 8 : 3),
-      dlc: dlc,
-      dataHex: dataHex,
+      dlc: dlc, dataHex: dataHex,
       resultText: err.message
-    });
+    }));
     showToast('发送失败: ' + err.message, 'error');
   }
 }

tools/js/can/signals.js

@@ -5,7 +5,7 @@
  *
  * 依赖：dbc.js（state/el/padHex/bytesToHex/cssEscape/findSignal）、common/utils.js（escapeHtml）。
  */
-import { state, el, padHex, bytesToHex, cssEscape, findSignal } from './dbc.js?v=20260717x';
+import { state, el, padHex, bytesToHex, cssEscape, findSignal, findMessageByKey } from './dbc.js?v=20260717x';
 import { escapeHtml as sanitizeHtml } from '../common/utils.js?v=20260717x';
 import { scheduleCanPersist } from './persist.js?v=20260717x';
 
@@ -53,10 +53,7 @@ function getDefaultSignalValue(signal) {
 /** @description 获取当前选中的报文对象（无选中返回 null）。 */
 export function getSelectedMessage() {
   if (!state.dbc || !state.selectedMessageKey) return null;
-  for (var i = 0; i < state.dbc.messages.length; i++) {
-    if (state.dbc.messages[i].key === state.selectedMessageKey) return state.dbc.messages[i];
-  }
-  return null;
+  return findMessageByKey(state.selectedMessageKey);
 }
 
 function getMultiplexerSignal(message) {
@@ -111,6 +108,7 @@ export function renderInlineSignalGrid(message, host) {
 function renderSignalRow(message, signal, index) {
   var bag = getSignalValueMap(message);
   var enumKeys = Object.keys(signal.enumMap || {});
+  var enumCount = enumKeys.length;
   var bitRange = signal.startBit + '|' + signal.length + ' @' + (signal.byteOrder === 'little' ? 'Intel' : 'Motorola');
   var rangeText = '';
   if (Number.isFinite(signal.min) || Number.isFinite(signal.max)) {
@@ -123,7 +121,7 @@ function renderSignalRow(message, signal, index) {
   var comment = signal.comment || '-';
   if (comment.length > 48) comment = comment.slice(0, 48) + '...';
   var inputHtml = '';
-  if (enumKeys.length) {
+  if (enumCount) {
     inputHtml = '<select class="input signal-input signal-input-compact" data-msg="' + sanitizeHtml(message.key) + '" data-signal="' + sanitizeHtml(signal.name) + '">' +
       enumKeys.map(function (key) {
         var label = signal.enumMap[key];
@@ -145,7 +143,7 @@ function renderSignalRow(message, signal, index) {
     '<span class="signal-cell signal-cell-value">' + inputHtml + '</span>' +
     '<span class="signal-cell signal-cell-range">' +
     '<b>' + sanitizeHtml(rangeText) + '</b>' +
-    (enumKeys.length ? '<small>' + sanitizeHtml(enumKeys.slice(0, 3).map(function (key) { return key + ':' + signal.enumMap[key]; }).join(' / ')) + (enumKeys.length > 3 ? ' ...' : '') + '</small>' : '<small>' + sanitizeHtml(factorText) + '</small>') +
+    (enumCount ? '<small>' + sanitizeHtml(enumKeys.slice(0, 3).map(function (key) { return key + ':' + signal.enumMap[key]; }).join(' / ')) + (enumCount > 3 ? ' ...' : '') + '</small>' : '<small>' + sanitizeHtml(factorText) + '</small>') +
     '</span>' +
     '<span class="signal-cell signal-cell-meta">' +
     '<b>' + sanitizeHtml(bitRange) + '</b>' +
@@ -160,15 +158,16 @@ function handleSignalInputEvent(evt) {
   var key = input.getAttribute('data-msg');
   var name = input.getAttribute('data-signal');
   if (!key || !name || !state.dbc) return;
-  var message = null;
-  for (var i = 0; i < state.dbc.messages.length; i++) {
-    if (state.dbc.messages[i].key === key) { message = state.dbc.messages[i]; break; }
-  }
+  var message = findMessageByKey(key);
   if (!message) return;
   setSignalValue(message, name, input.value);
   var signal = findSignal(message, name);
   if (signal && signal.multiplexRole === 'mux') {
-    var inlineGrid = document.querySelector('.message-row-expand[data-key="' + cssEscape(key) + '"] .signal-table-host');
+    /* MUX 值变更后需重建信号表格（激活信号集变化）。
+     * 限定在 el.messageList 作用域内查找，避免多列表/多 DBC 场景匹配到错误节点
+     *（与 messages.js 中 toggleMessageExpand 的作用域策略一致）。 */
+    var root = el.messageList || document;
+    var inlineGrid = root.querySelector('.message-row-expand[data-key="' + cssEscape(key) + '"] .signal-table-host');
     if (inlineGrid) renderInlineSignalGrid(message, inlineGrid);
   }
   if (key === state.selectedMessageKey) updateEncodedPreview();
@@ -256,7 +255,7 @@ export function encodeMessageData(message, signalValues) {
   return bytes;
 }
 
-/** @description 粗判信号位域是否至少有一部分落在 dlc 字节内（越界整段则跳过）。 */
+/** @description 粗判信号位域是否完全落在 dlc 字节内（越界整段则跳过）。 */
 function signalFitsInDlc(signal, dlc) {
   if (!signal || dlc <= 0) return false;
   var maxBit = dlc * 8 - 1;
@@ -264,9 +263,22 @@ function signalFitsInDlc(signal, dlc) {
     var end = signal.startBit + signal.length - 1;
     return signal.startBit >= 0 && signal.startBit <= maxBit && end <= maxBit;
   }
-  /* Motorola：用起始位所在字节粗判；更严的检查仍在 setBitByIndex */
-  var startByte = Math.floor(signal.startBit / 8);
-  return startByte >= 0 && startByte < dlc && signal.length > 0;
+  /* float：要求整段字节落在 DLC 内（startBit 必须字节对齐，由 writeFloatSignal 另校验） */
+  if (signal.valueType === 'float' || signal.valueType === 'double') {
+    var startByte = signal.startBit / 8;
+    var byteLen = signal.length / 8;
+    return startByte >= 0 && Number.isInteger(startByte) &&
+           startByte + byteLen <= dlc;
+  }
+  /* Motorola：用 buildMotorolaBitPositions 计算实际占用位序，检查最大位是否落在 DLC 内。
+   * 此前仅判 startByte，长跨字节信号末位可能越界 → 会被 setBitByIndex 抛错而非跳过，
+   * 与 little 分支"越界整段跳过"语义不一致；这里统一为"越界即跳过"。 */
+  if (signal.length <= 0 || signal.length > 64) return false;
+  var positions = buildMotorolaBitPositions(signal.startBit, signal.length);
+  for (var j = 0; j < positions.length; j++) {
+    if (positions[j] < 0 || positions[j] > maxBit) return false;
+  }
+  return true;
 }
 
 function parseSignalInput(signal, inputValue) {
@@ -274,6 +286,16 @@ function parseSignalInput(signal, inputValue) {
   if (value === '' || value == null) value = getDefaultSignalValue(signal);
   var num = Number(value);
   if (!Number.isFinite(num)) throw new Error(signal.name + ' 不是合法数字');
+  /* enum 信号：取值是离散枚举 key（数字字符串），DBC 的 min/max 是物理连续值范围，
+   * 对 enum 不适用 —— 合法 enum 值可能落在 [min,max] 之外（例如 fault 枚举）。
+   * 因此 enum 信号只做"值必须 ∈ enumMap keys"的校验，跳过 min/max。 */
+  var enumKeys = Object.keys(signal.enumMap || {});
+  if (enumKeys.length) {
+    if (enumKeys.indexOf(String(value)) < 0) {
+      throw new Error(signal.name + ' 不是合法枚举值：' + value);
+    }
+    return { numeric: num, text: String(value).trim() };
+  }
   if (Number.isFinite(signal.min) && num < signal.min) {
     throw new Error(signal.name + ' 低于最小值 ' + signal.min);
   }
@@ -296,6 +318,10 @@ function physicalToRawBigInt(signal, parsedValue) {
       isIntegerLike(parsedValue.text)) {
     return BigInt(parsedValue.text);
   }
+  /* factor=0 是 DBC 异常情况（规范上 factor 不应为 0），此处为防御性兜底：
+   *   - 有 offset：物理值直接减 offset 作为 raw（把 offset 视为"物理=raw 的偏移基线"）
+   *   - 无 offset：物理值即 raw
+   * 实际 DBC 不应走到此分支，但避免除零导致 NaN。 */
   var rawNumber = signal.factor === 0
     ? Math.round(signal.offset ? (parsedValue.numeric - signal.offset) : parsedValue.numeric)
     : Math.round((parsedValue.numeric - signal.offset) / signal.factor);
@@ -367,13 +393,21 @@ function writeFloatSignal(bytes, signal, physicalValue) {
   if (signal.startBit % 8 !== 0) {
     throw new Error(signal.name + ' 浮点信号起始位必须按字节对齐');
   }
-  var buffer = new ArrayBuffer(signal.length / 8);
+  var startByte = signal.startBit / 8;
+  var byteLen = signal.length / 8;
+  /* 越界防御：signalFitsInDlc 已在 encodeMessageData 入口过滤，这里二次断言，
+   * 避免任何直接调用方（如未来新增的 decode 路径）漏检导致写越界。 */
+  if (startByte + byteLen > bytes.length) {
+    throw new Error(signal.name + ' 浮点信号写入越界：startByte=' + startByte +
+      ' + length=' + byteLen + ' > 缓冲区 ' + bytes.length + ' 字节');
+  }
+  var buffer = new ArrayBuffer(byteLen);
   var view = new DataView(buffer);
   if (signal.length === 32) view.setFloat32(0, physicalValue, true);
   else view.setFloat64(0, physicalValue, true);
   var rawBytes = new Uint8Array(buffer);
   for (var i = 0; i < rawBytes.length; i++) {
-    bytes[(signal.startBit / 8) + i] = rawBytes[i];
+    bytes[startByte + i] = rawBytes[i];
   }
 }
 
@@ -393,7 +427,7 @@ function setBitByIndex(bytes, bitIndex, bitValue) {
   var bitInByte = bitIndex % 8;
   if (byteIndex < 0 || byteIndex >= bytes.length) {
     throw new Error('信号写入越界，bit=' + bitIndex +
-      '（缓冲区 ' + bytes.length + ' 字节 / DLC=' + bytes.length + '）');
+      '（缓冲区 ' + bytes.length + ' 字节）');
   }
   if (bitValue) bytes[byteIndex] |= (1 << bitInByte);
   else bytes[byteIndex] &= ~(1 << bitInByte);