小龙虾
a47a027178
- 添加了upload-esp32.js用于处理ESP32的OTA上传，包括文件上传、SHA-256验证和设备重启。 - 引入了upload-gd32.js，用于触发GD32 OTA中继并跟踪中继进度。 - 针对OTA流程，增强了会话管理和错误处理能力。 - 通过在上传过程中显示吐司通知和进度更新，改进了用户反馈。
212 lines
8.8 KiB
JavaScript
212 lines
8.8 KiB
JavaScript
/**
|
||
* upload-gd32.js - GD32 中继 OTA 触发 + relay 态跟踪
|
||
*
|
||
* 从 app.js 的「GD32 OTA 触发（带 SHA-256 校验，对齐 BLE 0xF7）」段提取。
|
||
* 包含：relay 进度观察定时器、markGd32OtaUiComplete、triggerGd32Relay。
|
||
*
|
||
* 共享状态（通过 window.* 引用）：
|
||
* window.gd32CompleteAnnounced / window.relayWatchLastSeq / window.gd32RelaySessionLive
|
||
* window.pollingPausedForUpload / window.statusPollIntervalMs
|
||
* window.otaSessionState / window.lastSysStateCode / window.lastRelayState
|
||
*
|
||
* 未拆分的函数（通过 window.* 引用）：
|
||
* window.otaSessionTransition / window.OtaSessionState / window.otaSessionActive
|
||
* window.markPhaseDone / window.setProgress / window.updateSystemStatusUi
|
||
* window.cleanupAfterOtaFailure / window.scheduleStatusPoll / window.pollLogs
|
||
* window.resumePollingAfterUpload / window.getBaseUrl / window.showToast / window.addLog
|
||
*/
|
||
import { showToast } from '../common/toast.js';
|
||
import { addLog } from '../common/log.js';
|
||
import {
|
||
otaSessionTransition, otaSessionActive, OtaSessionState
|
||
} from './session.js';
|
||
import { markPhaseDone, setProgress } from './progress.js';
|
||
|
||
/**
|
||
* GD32 中继进度观察：以 /system/status 为唯一真相源。
|
||
* 日志环只有 64 条，中继/擦除期间 INFO 会被挤掉，时间戳还是浏览器本地时间——
|
||
* 绝不能用「最后一条日志停在 SEND_SIZE」判断卡死。
|
||
*/
|
||
let relayWatchTimerId = null;
|
||
let relayWatchInFlight = false;
|
||
window.gd32CompleteAnnounced = false;
|
||
window.relayWatchLastSeq = -1;
|
||
/** 本会话是否已观察到真实中继态（1~4），避免旧 relay_state=5 残留导致一点击就“完成” */
|
||
window.gd32RelaySessionLive = false;
|
||
|
||
export function markGd32OtaUiComplete(msg) {
|
||
// 已公告过：禁止再改 className / setProgress / toast，否则每 400ms 重触发动效会「疯狂跳 ✓」
|
||
if (window.gd32CompleteAnnounced) {
|
||
return;
|
||
}
|
||
/* 仅本会话 RELAYING/FAILED 可宣布完成；IDLE/UPLOADING 时 status 里的旧 relay 残留一律忽略 */
|
||
if (window.otaSessionState !== OtaSessionState.RELAYING &&
|
||
window.otaSessionState !== OtaSessionState.FAILED) {
|
||
return;
|
||
}
|
||
window.gd32CompleteAnnounced = true;
|
||
stopRelayProgressWatch();
|
||
|
||
markPhaseDone('gd32Ota');
|
||
window.currentOtaTarget = null;
|
||
setProgress(100, msg || 'GD32 刷写完成');
|
||
var sbDone = document.getElementById('stageStatusBar');
|
||
var stDone = document.getElementById('stageStatusText');
|
||
if (sbDone) sbDone.className = 'stage-status-bar ok';
|
||
if (stDone) stDone.textContent = msg || 'GD32 刷写完成';
|
||
if (window.otaSessionState === OtaSessionState.RELAYING ||
|
||
window.otaSessionState === OtaSessionState.FAILED) {
|
||
otaSessionTransition(OtaSessionState.DONE);
|
||
}
|
||
addLog('I', 'OTA', msg || 'GD32 刷写完成');
|
||
showToast(msg || 'GD32 刷写完成', 'success');
|
||
}
|
||
|
||
export function stopRelayProgressWatch() {
|
||
if (relayWatchTimerId) {
|
||
clearInterval(relayWatchTimerId);
|
||
relayWatchTimerId = null;
|
||
}
|
||
relayWatchInFlight = false;
|
||
if (window.statusPollIntervalMs < 1000) {
|
||
window.statusPollIntervalMs = 1000;
|
||
}
|
||
}
|
||
|
||
export function startRelayProgressWatch() {
|
||
stopRelayProgressWatch();
|
||
if (window.pollingPausedForUpload) {
|
||
window.resumePollingAfterUpload();
|
||
}
|
||
window.statusPollIntervalMs = 400;
|
||
window.scheduleStatusPoll(0);
|
||
window.pollLogs();
|
||
addLog('I', 'OTA', '跟踪中继进度：看进度条与 relay_seq（/system/status），勿只看日志');
|
||
relayWatchTimerId = setInterval(function () {
|
||
var active = window.otaSessionState === OtaSessionState.RELAYING ||
|
||
(window.otaSessionState === OtaSessionState.FAILED &&
|
||
(window.lastSysStateCode === 3 || window.lastRelayState >= 1 && window.lastRelayState <= 4));
|
||
if (!active) {
|
||
if (window.otaSessionState === OtaSessionState.DONE) {
|
||
stopRelayProgressWatch();
|
||
}
|
||
return;
|
||
}
|
||
if (relayWatchInFlight) return;
|
||
relayWatchInFlight = true;
|
||
fetch(window.getBaseUrl() + '/system/status', { signal: AbortSignal.timeout(3000) })
|
||
.then(function (resp) { return resp.ok ? resp.json() : null; })
|
||
.then(function (data) {
|
||
if (!data) return;
|
||
try { window.updateSystemStatusUi(data); } catch (e) { /* ignore */ }
|
||
var o = data.ota || {};
|
||
var code = Number(o.sys_state_code);
|
||
var rstate = Number(o.relay_state);
|
||
var alive = !!o.gd32_app_alive;
|
||
var rseq = Number(o.relay_seq) || 0;
|
||
var rtot = Number(o.relay_total_packets) || 0;
|
||
if (rstate >= 1 && rstate <= 4) {
|
||
window.gd32RelaySessionLive = true;
|
||
}
|
||
if (window.gd32RelaySessionLive &&
|
||
(code === 4 || rstate === 5 ||
|
||
(alive && rtot > 0 && rseq >= rtot && rstate >= 3))) {
|
||
markGd32OtaUiComplete('GD32 刷写完成');
|
||
window.pollLogs();
|
||
return;
|
||
}
|
||
if (code === 8 || rstate === 255) {
|
||
stopRelayProgressWatch();
|
||
window.pollLogs();
|
||
return;
|
||
}
|
||
// 前端进度同步：包数变化时更新进度条（updateSystemStatusUi 已做）并写一条前端日志
|
||
// 后端不再打「转发进度」文字，只靠这里 + 进度条
|
||
if (rtot > 0 && rseq > 0 && rseq !== window.relayWatchLastSeq) {
|
||
window.relayWatchLastSeq = rseq;
|
||
var pct = Math.round(rseq * 100 / rtot);
|
||
setProgress(60 + Math.round(pct * 0.30),
|
||
'已转发 ' + rseq + ' / ' + rtot + ' 包 (' + pct + '%)');
|
||
addLog('I', 'OTA', '转发 ' + rseq + '/' + rtot + ' (' + pct + '%)');
|
||
}
|
||
})
|
||
.catch(function () { /* 下轮继续 */ })
|
||
.then(function () { relayWatchInFlight = false; });
|
||
}, 400);
|
||
}
|
||
|
||
/** @description 触发 GD32 中继 OTA 流程（通过 HTTP 接口）。 */
|
||
export async function triggerGd32Relay() {
|
||
var sha256 = window._gd32FileSha256;
|
||
if (!sha256) {
|
||
addLog('E', 'OTA', '缺少 GD32 文件 SHA-256，请先上传文件');
|
||
showToast('SHA-256 缺失', 'error');
|
||
window.cleanupAfterOtaFailure('SHA-256 缺失');
|
||
return;
|
||
}
|
||
addLog('I', 'OTA', 'GD32 SHA-256: ' + sha256 + ' → 触发中继...');
|
||
showToast('正在触发 GD32 OTA', 'success');
|
||
setProgress(48, '校验 SHA 并触发 GD32 中继…');
|
||
try {
|
||
// 仅触发中继（设备端异步跑），不阻塞到刷写结束；SHA 读分区可能数秒
|
||
var resp = await fetch(window.getBaseUrl() + '/ota/relay', {
|
||
method: 'POST',
|
||
headers: { 'Content-Type': 'application/json' },
|
||
body: JSON.stringify({ sha256: sha256 }),
|
||
signal: AbortSignal.timeout(120000)
|
||
});
|
||
var text = await resp.text();
|
||
if (resp.ok) {
|
||
try {
|
||
var data = JSON.parse(text);
|
||
if (data.sha256) addLog('I', 'OTA', '设备端 SHA-256: ' + data.sha256);
|
||
} catch (_) {}
|
||
addLog('I', 'OTA', 'GD32 OTA 已触发；进度看状态栏包数（勿只看日志时间戳）');
|
||
showToast('GD32 OTA 已触发', 'success');
|
||
setProgress(50, '中继已启动，同步进度…');
|
||
window.gd32CompleteAnnounced = false;
|
||
window.relayWatchLastSeq = -1;
|
||
startRelayProgressWatch();
|
||
} else {
|
||
// 尝试解析错误响应中的 device SHA
|
||
try {
|
||
var err = JSON.parse(text);
|
||
if (err.device) {
|
||
addLog('E', 'OTA', 'GD32 SHA-256 不匹配: 设备=' + err.device + ' 前端=' + sha256);
|
||
showToast('SHA-256 不匹配', 'error');
|
||
window.cleanupAfterOtaFailure('SHA-256 不匹配');
|
||
return;
|
||
}
|
||
} catch (_) {}
|
||
addLog('E', 'OTA', 'GD32 触发失败: HTTP ' + resp.status + ' ' + text);
|
||
showToast('GD32 触发失败', 'error');
|
||
window.cleanupAfterOtaFailure('触发失败 HTTP ' + resp.status);
|
||
}
|
||
} catch (e) {
|
||
// 请求超时/断连 ≠ 设备未启动中继：先探测 status 再决定是否标失败
|
||
try {
|
||
var probe = await fetch(window.getBaseUrl() + '/system/status', {
|
||
signal: AbortSignal.timeout(3000)
|
||
});
|
||
if (probe.ok) {
|
||
var st = await probe.json();
|
||
var o = st.ota || {};
|
||
var code = Number(o.sys_state_code);
|
||
var rstate = Number(o.relay_state);
|
||
if (code === 3 || (rstate >= 1 && rstate <= 4)) {
|
||
addLog('W', 'OTA', '触发请求中断(' + e.message + ')，但设备已在中继，继续跟踪进度');
|
||
showToast('设备已在刷写，同步进度中', 'success');
|
||
if (window.otaSessionState !== OtaSessionState.RELAYING) {
|
||
otaSessionTransition(OtaSessionState.RELAYING);
|
||
}
|
||
try { window.updateSystemStatusUi(st); } catch (_) {}
|
||
startRelayProgressWatch();
|
||
return;
|
||
}
|
||
}
|
||
} catch (_) { /* probe 失败再走失败清理 */ }
|
||
addLog('E', 'OTA', 'GD32 触发失败: ' + e.message);
|
||
showToast('GD32 触发失败', 'error');
|
||
window.cleanupAfterOtaFailure('触发异常');
|
||
}
|
||
} |