- 新增 SystemBoot 类用于跟踪各模块初始化状态,提供位图标记与报告功能 - 在 main.cpp 中重构初始化流程,按顺序初始化各模块并记录状态 - 添加 system_boot.cpp 模块文件到构建配置 - CAN反馈任务增加冷启动延迟,避免与GD32初始化窗口冲突 refactor(ota): 优化OTA协调器线程安全机制 - 修改 lock()/unlock() 方法返回take结果,确保mutex正确释放 - 修复多任务并发时mutex死锁问题,避免vTaskPriorityDisinherit断言 - 统一finalize失败后的状态复位逻辑,确保协调器回到IDLE状态 - 优化忙状态超时检测与自愈机制 perf(boot): 优化冷启动时序与资源管理 - 简化README中冷启动优化说明,聚焦核心逻辑 - 优化BOD阈值设置为LVL5,改进电源稳定性 - 增加BLE OTA工作线程优先级,减少丢包情况 - 优化堆告警节流机制,在OTA期间降低告警频率 fix(relay): 改进GD32应用存活检测逻辑 - 调整GD32 APP存活验证时序,增加会话建立验证 - 修复HELLO建立session后未验证role的问题 - 优化FINISH后等待APP启动的静默时间与重试机制 - 统一GD32探测逻辑到OTA中继任务 refactor(server): 优化HTTP服务端内存与性能 - 使用静态缓冲区替代动态分配,减少堆碎片化风险 - 优化CAN批量发送期间暂停反馈任务的机制 - 调整BLE连接参数请求逻辑,提升传输性能 - 改进错误处理流程,避免堆紧张时的额外分配 bump(version): 更新固件版本至0.3.50 - 更新版本号从0.3.49到0.3.50 - 更新编译时间戳与Git哈希值
228 lines
6.9 KiB
JavaScript
228 lines
6.9 KiB
JavaScript
/**
|
||
* persist.js - CAN 控制台会话持久化(刷新后恢复)
|
||
*
|
||
* 保存到 localStorage:多 DBC 原文、信号编辑值、勾选/展开、发送节点过滤、
|
||
* 最近发送历史、通道/搜索/原始帧表单。
|
||
*
|
||
* 依赖:dbc.js(state/el/parseDbc/rebuildMergedDbc)
|
||
*/
|
||
import { state, el, parseDbc, rebuildMergedDbc } from './dbc.js?v=20260717x';
|
||
|
||
var LS_KEY = 'dcu_can_session_v1';
|
||
var MAX_HISTORY = 200;
|
||
var SAVE_DEBOUNCE_MS = 350;
|
||
var saveTimer = null;
|
||
var restoring = false;
|
||
|
||
function safeJsonParse(raw) {
|
||
try {
|
||
return JSON.parse(raw);
|
||
} catch (_) {
|
||
return null;
|
||
}
|
||
}
|
||
|
||
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];
|
||
}
|
||
}
|
||
return out;
|
||
}
|
||
|
||
function collectUiFields() {
|
||
return {
|
||
defaultChannel: el.defaultChannel ? el.defaultChannel.value : '0',
|
||
manualChannel: el.manualChannel ? el.manualChannel.value : '0',
|
||
manualId: el.manualId ? el.manualId.value : '',
|
||
manualDlc: el.manualDlc ? el.manualDlc.value : '8',
|
||
manualData: el.manualData ? el.manualData.value : '',
|
||
dbcSearch: el.dbcSearch ? el.dbcSearch.value : ''
|
||
};
|
||
}
|
||
|
||
function applyUiFields(ui) {
|
||
if (!ui) return;
|
||
if (el.defaultChannel && ui.defaultChannel != null) {
|
||
el.defaultChannel.value = String(ui.defaultChannel);
|
||
}
|
||
if (el.manualChannel && ui.manualChannel != null) {
|
||
el.manualChannel.value = String(ui.manualChannel);
|
||
} else if (el.manualChannel && el.defaultChannel) {
|
||
el.manualChannel.value = el.defaultChannel.value;
|
||
}
|
||
if (el.manualId && ui.manualId != null) el.manualId.value = String(ui.manualId);
|
||
if (el.manualDlc && ui.manualDlc != null) el.manualDlc.value = String(ui.manualDlc);
|
||
if (el.manualData && ui.manualData != null) el.manualData.value = String(ui.manualData);
|
||
if (el.dbcSearch && ui.dbcSearch != null) el.dbcSearch.value = String(ui.dbcSearch);
|
||
if (el.canChannelPill && el.defaultChannel) {
|
||
el.canChannelPill.textContent = 'CH' + el.defaultChannel.value;
|
||
}
|
||
}
|
||
|
||
function buildPayload(options) {
|
||
options = options || {};
|
||
var sources = (state.dbcSources || []).map(function (s) {
|
||
return {
|
||
id: s.id,
|
||
name: s.name,
|
||
size: s.size || 0,
|
||
text: s.text || ''
|
||
};
|
||
}).filter(function (s) { return s.text; });
|
||
|
||
var history = Array.isArray(state.history) ? state.history.slice(0, MAX_HISTORY) : [];
|
||
if (options.historyLimit != null) {
|
||
history = history.slice(0, options.historyLimit);
|
||
}
|
||
|
||
return {
|
||
v: 1,
|
||
ts: Date.now(),
|
||
dbcSources: sources,
|
||
selectedMessageKey: state.selectedMessageKey || '',
|
||
signalValues: state.signalValues || {},
|
||
checkedKeys: state.checkedKeys || {},
|
||
expandedKeys: state.expandedKeys || {},
|
||
transmitterFilter: transmitterFilterToPlain(),
|
||
history: history,
|
||
ui: collectUiFields()
|
||
};
|
||
}
|
||
|
||
function writePayload(payload) {
|
||
localStorage.setItem(LS_KEY, JSON.stringify(payload));
|
||
}
|
||
|
||
/** @description 立即写入 localStorage(空间不足时逐步丢弃历史/信号)。 */
|
||
export function saveCanSessionNow() {
|
||
if (restoring) return;
|
||
if (saveTimer) {
|
||
clearTimeout(saveTimer);
|
||
saveTimer = null;
|
||
}
|
||
try {
|
||
writePayload(buildPayload());
|
||
return;
|
||
} catch (e1) {
|
||
/* quota:先砍历史 */
|
||
}
|
||
try {
|
||
writePayload(buildPayload({ historyLimit: 40 }));
|
||
return;
|
||
} catch (e2) {
|
||
/* 再砍信号值,只保 DBC + 勾选 */
|
||
}
|
||
try {
|
||
var slim = buildPayload({ historyLimit: 0 });
|
||
slim.signalValues = {};
|
||
slim.history = [];
|
||
writePayload(slim);
|
||
} catch (e3) {
|
||
/* 放弃 */
|
||
}
|
||
}
|
||
|
||
/** @description 防抖保存(编辑信号/勾选等高频操作)。 */
|
||
export function scheduleCanPersist() {
|
||
if (restoring) return;
|
||
if (saveTimer) clearTimeout(saveTimer);
|
||
saveTimer = setTimeout(function () {
|
||
saveTimer = null;
|
||
saveCanSessionNow();
|
||
}, SAVE_DEBOUNCE_MS);
|
||
}
|
||
|
||
/**
|
||
* @description 从 localStorage 恢复会话到 state + 表单。
|
||
* @returns {{ restored: boolean, dbcCount: number, historyCount: number }}
|
||
*/
|
||
export function loadCanSession() {
|
||
var empty = { restored: false, dbcCount: 0, historyCount: 0 };
|
||
var raw = null;
|
||
try {
|
||
raw = localStorage.getItem(LS_KEY);
|
||
} catch (_) {
|
||
return empty;
|
||
}
|
||
if (!raw) return empty;
|
||
var data = safeJsonParse(raw);
|
||
if (!data || data.v !== 1) return empty;
|
||
|
||
restoring = true;
|
||
try {
|
||
state.dbcSources = [];
|
||
var list = Array.isArray(data.dbcSources) ? data.dbcSources : [];
|
||
for (var i = 0; i < list.length; i++) {
|
||
var src = list[i];
|
||
if (!src || !src.text) continue;
|
||
try {
|
||
var dbc = parseDbc(src.text);
|
||
if (!dbc.messages || !dbc.messages.length) continue;
|
||
state.dbcSources.push({
|
||
id: src.id || ('restored_' + i),
|
||
name: src.name || ('saved_' + (i + 1) + '.dbc'),
|
||
size: src.size || src.text.length,
|
||
text: src.text,
|
||
dbc: dbc
|
||
});
|
||
} catch (_) {
|
||
/* 单文件损坏跳过 */
|
||
}
|
||
}
|
||
rebuildMergedDbc();
|
||
|
||
state.signalValues = (data.signalValues && typeof data.signalValues === 'object')
|
||
? data.signalValues : {};
|
||
state.checkedKeys = (data.checkedKeys && typeof data.checkedKeys === 'object')
|
||
? data.checkedKeys : {};
|
||
state.expandedKeys = (data.expandedKeys && typeof data.expandedKeys === 'object')
|
||
? data.expandedKeys : {};
|
||
state.selectedMessageKey = data.selectedMessageKey || '';
|
||
state.history = Array.isArray(data.history) ? data.history.slice(0, MAX_HISTORY) : [];
|
||
|
||
state.transmitterFilter = Object.create(null);
|
||
if (data.transmitterFilter && typeof data.transmitterFilter === 'object') {
|
||
Object.keys(data.transmitterFilter).forEach(function (k) {
|
||
state.transmitterFilter[k] = !!data.transmitterFilter[k];
|
||
});
|
||
}
|
||
var anyTx = false;
|
||
for (var tk in state.transmitterFilter) {
|
||
if (state.transmitterFilter[tk]) { anyTx = true; break; }
|
||
}
|
||
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)) {
|
||
state.selectedMessageKey = '';
|
||
}
|
||
|
||
applyUiFields(data.ui);
|
||
|
||
return {
|
||
restored: true,
|
||
dbcCount: state.dbcSources.length,
|
||
historyCount: state.history.length
|
||
};
|
||
} finally {
|
||
restoring = false;
|
||
}
|
||
}
|
||
|
||
/** @description 绑定 beforeunload / 可见性,降低丢失。 */
|
||
export function bindCanPersistLifecycle() {
|
||
window.addEventListener('beforeunload', function () {
|
||
saveCanSessionNow();
|
||
});
|
||
document.addEventListener('visibilitychange', function () {
|
||
if (document.visibilityState === 'hidden') saveCanSessionNow();
|
||
});
|
||
}
|