小龙虾
5a89cec34b
- 移除OtaCoordinator中重复的状态查询锁操作，改为单次取值后比较 - 将GD32存储wrapper函数改为inline实现并移入头文件，删除对应的cpp实现 - HTTP路由注册改为路由表+循环注册，消除复制粘贴的URI注册代码 - OtaRelay事件分发中提取通用拒绝逻辑到commonReject helper函数 - SpiMaster中折叠加锁/无锁镜像函数，通过内部Impl实现统一路径 - HealthMonitor使用RAII LockGuard替代重复的mutex操作代码 - 修复BLE OTA中ESP32路径的虚假ACK问题，窗口边界ACK仅在实际写入时触发 - 修复BLE OTA中GD32路径的重复包ACK问题，重复包静默跳过不发送ACK - 调整发送端首轮ACK超时从3000ms提升至5000ms，适配设备端flash写入速度 - 清理临时文件和无用的配置宏定义 - 在main.cpp中添加GD32版本探测逻辑
1340 lines
52 KiB
C++
1340 lines
52 KiB
C++
/*
|
||
* http_handlers.cpp - HTTP 请求处理器实现
|
||
* 从 wifi_ota.cpp 提取的 HTTP handler 函数
|
||
*/
|
||
#include <string.h>
|
||
#include <stdarg.h>
|
||
#include <inttypes.h>
|
||
#include <algorithm>
|
||
#include "freertos/FreeRTOS.h"
|
||
#include "freertos/task.h"
|
||
#include "freertos/semphr.h"
|
||
#include "esp_http_server.h"
|
||
#include "esp_wifi.h"
|
||
#include "esp_netif.h"
|
||
#include "esp_system.h"
|
||
#include "esp_timer.h"
|
||
#include "esp_ota_ops.h"
|
||
#include "esp_task_wdt.h"
|
||
#include "esp_heap_caps.h"
|
||
#include "cJSON.h"
|
||
|
||
#include "app_config.h"
|
||
#include "http_handlers.h"
|
||
#include "wifi_ota.h"
|
||
#include "esp32_ota_core.h"
|
||
#include "ota_coordinator.h"
|
||
#include "ota_relay.h"
|
||
#include "storage/gd32_flash_store.h"
|
||
#include "health_monitor.h"
|
||
#include "monitor/debug_log.h"
|
||
#include "spi_master.h"
|
||
#include "canfd_bridge.h"
|
||
#include "monitor/can_feedback_task.h"
|
||
#include "monitor/task_stack_check.h"
|
||
#include "ble_ota.h"
|
||
|
||
static size_t parseHexToBytes(const char *hex, uint8_t *out, size_t max_out)
|
||
{
|
||
size_t hex_len = strlen(hex);
|
||
size_t n = 0;
|
||
for (size_t i = 0; i + 1 < hex_len && n < max_out; i += 2) {
|
||
char byte_str[3] = { hex[i], hex[i + 1], 0 };
|
||
out[n++] = (uint8_t)strtol(byte_str, NULL, 16);
|
||
}
|
||
return n;
|
||
}
|
||
|
||
static void bytesToHexUpper(const uint8_t *in, size_t n, char *out)
|
||
{
|
||
for (size_t i = 0; i < n; ++i) {
|
||
snprintf(out + i * 2, 3, "%02X", in[i]);
|
||
}
|
||
out[n * 2] = '\0';
|
||
}
|
||
|
||
void http_set_cors_headers(httpd_req_t *req)
|
||
{
|
||
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
|
||
httpd_resp_set_hdr(req, "Access-Control-Allow-Methods", "GET, POST, OPTIONS");
|
||
httpd_resp_set_hdr(req, "Access-Control-Allow-Headers", "Content-Type");
|
||
httpd_resp_set_hdr(req, "Access-Control-Max-Age", "600");
|
||
}
|
||
|
||
esp_err_t http_options_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
httpd_resp_set_status(req, "204 No Content");
|
||
httpd_resp_send(req, NULL, 0);
|
||
return ESP_OK;
|
||
}
|
||
|
||
esp_err_t esp32_ota_update_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
Esp32OtaCore &core = Esp32OtaCore::instance();
|
||
if (!core.isActive()) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "OTA not started");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
char frontend_sha_hex[65] = {0};
|
||
bool has_frontend_sha = false;
|
||
bool verify_only = false;
|
||
if (req->content_len > 0 && req->content_len < 256) {
|
||
char buf[256] = {0};
|
||
int ret = httpd_req_recv(req, buf, req->content_len);
|
||
if (ret > 0) {
|
||
buf[ret] = '\0';
|
||
cJSON *root = cJSON_Parse(buf);
|
||
if (root) {
|
||
cJSON *sha_item = cJSON_GetObjectItem(root, "sha256");
|
||
if (sha_item && cJSON_IsString(sha_item)) {
|
||
const char *sha_str = cJSON_GetStringValue(sha_item);
|
||
if (sha_str && strlen(sha_str) == 64) {
|
||
strncpy(frontend_sha_hex, sha_str, 64);
|
||
frontend_sha_hex[64] = '\0';
|
||
has_frontend_sha = true;
|
||
DEBUG_INFO("OTA", "Frontend SHA-256: %s", frontend_sha_hex);
|
||
}
|
||
}
|
||
cJSON *verify_item = cJSON_GetObjectItem(root, "verify_only");
|
||
if (verify_item && cJSON_IsBool(verify_item)) {
|
||
verify_only = cJSON_IsTrue(verify_item);
|
||
}
|
||
cJSON_Delete(root);
|
||
}
|
||
}
|
||
}
|
||
|
||
char device_sha_hex[65] = {0};
|
||
|
||
if (verify_only) {
|
||
DEBUG_INFO("OTA", "ESP32 OTA verify-only mode, %u bytes", (unsigned)core.getReceived());
|
||
esp_err_t sha_err = core.computeDeviceSha(device_sha_hex);
|
||
if (sha_err != ESP_OK) {
|
||
DEBUG_ERR("OTA", "verify-only: SHA 计算失败: %s", esp_err_to_name(sha_err));
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, esp_err_to_name(sha_err));
|
||
return ESP_FAIL;
|
||
}
|
||
char ok_resp[256] = {0};
|
||
snprintf(ok_resp, sizeof(ok_resp),
|
||
"{\"status\": \"ok\", \"message\": \"SHA-256 computed\", \"sha256\": \"%s\"}",
|
||
device_sha_hex);
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, ok_resp, strlen(ok_resp));
|
||
return ESP_OK;
|
||
}
|
||
|
||
DEBUG_INFO("OTA", "ESP32 OTA finalize, %u bytes...", (unsigned)core.getReceived());
|
||
Esp32FinalizeResult fr = OtaCoordinator::instance().finalizeForReboot(
|
||
has_frontend_sha ? frontend_sha_hex : nullptr);
|
||
|
||
if (fr.err == ESP_OK) {
|
||
char resp[320] = {0};
|
||
snprintf(resp, sizeof(resp),
|
||
"{\"status\": \"ok\", \"message\": \"OTA finished, rebooting\", "
|
||
"\"sha256\": \"%s\"}",
|
||
fr.device_sha_hex);
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, strlen(resp));
|
||
|
||
DEBUG_INFO("OTA", "响应已发送，等待 TCP 刷新...");
|
||
vTaskDelay(pdMS_TO_TICKS(100));
|
||
OtaCoordinator::instance().restartEsp32();
|
||
return ESP_OK;
|
||
}
|
||
|
||
if (fr.err == ESP_ERR_INVALID_VERSION) {
|
||
char err_resp[256] = {0};
|
||
snprintf(err_resp, sizeof(err_resp),
|
||
"{\"status\": \"error\", \"message\": \"SHA-256 mismatch\", \"frontend\": \"%s\", \"device\": \"%s\"}",
|
||
frontend_sha_hex, fr.device_sha_hex);
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, err_resp, strlen(err_resp));
|
||
} else {
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, esp_err_to_name(fr.err));
|
||
}
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
esp_err_t restart_handler(httpd_req_t *req)
|
||
{
|
||
(void)req;
|
||
http_set_cors_headers(req);
|
||
|
||
DEBUG_INFO("OTA", "收到重启请求，重启...");
|
||
|
||
const char resp[] = "{\"status\": \"ok\", \"message\": \"rebooting\"}";
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, strlen(resp));
|
||
|
||
OtaCoordinator::instance().restartEsp32();
|
||
return ESP_OK;
|
||
}
|
||
|
||
static int recv_json_header(httpd_req_t *req, char *buf, int buf_size)
|
||
{
|
||
int total = 0;
|
||
int depth = 1;
|
||
while (total < buf_size - 1) {
|
||
int ret = httpd_req_recv(req, buf + total, 1);
|
||
if (ret <= 0) return total;
|
||
total += ret;
|
||
buf[total] = '\0';
|
||
if (buf[total - 1] == '{') depth++;
|
||
else if (buf[total - 1] == '}') {
|
||
depth--;
|
||
if (depth == 0) return total;
|
||
}
|
||
}
|
||
return total;
|
||
}
|
||
|
||
/* OTA 上传静态收块：避免 OTA 中途再 malloc(2KB) 与 TCP 窗口抢堆。 */
|
||
static uint8_t s_ota_upload_recv[OTA_BLOCK_SIZE];
|
||
static uint8_t s_ota_json_scratch[256];
|
||
static uint8_t s_ota_preread[256];
|
||
|
||
esp_err_t ota_upload_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
|
||
uint8_t *recv_buf = s_ota_upload_recv;
|
||
DEBUG_WARN("WIFI", "=== HTTP: POST /ota/upload === content_len=%d free=%lu largest=%lu",
|
||
req->content_len,
|
||
(unsigned long)esp_get_free_heap_size(),
|
||
(unsigned long)heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT));
|
||
DEBUG_INFO("WIFI", "收到固件上传请求, 内容长度: %d 字节", req->content_len);
|
||
|
||
esp_wifi_set_ps(WIFI_PS_NONE);
|
||
// ★ L1: WiFi OTA 开始时恢复 BLE 共存状态（通过协调器）
|
||
OtaCoordinator::instance().notifyBleCoexEnd();
|
||
|
||
char peek;
|
||
int peek_ret = httpd_req_recv(req, &peek, 1);
|
||
if (peek_ret <= 0) {
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "接收失败");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
bool is_esp32_ota = false;
|
||
uint32_t total_size = 0;
|
||
int json_header_len = 0;
|
||
/* 静态 scratch：OTA 期间少两次 256B heap 分配 */
|
||
uint8_t *pre_read_buf = s_ota_preread;
|
||
memset(pre_read_buf, 0, 256);
|
||
int pre_read_len = 1;
|
||
pre_read_buf[0] = (uint8_t)peek;
|
||
|
||
if (peek == '{') {
|
||
char *json_buf = (char *)s_ota_json_scratch;
|
||
memset(json_buf, 0, 256);
|
||
json_buf[0] = peek;
|
||
json_header_len = recv_json_header(req, json_buf + 1, 255);
|
||
if (json_header_len > 0) {
|
||
json_header_len++;
|
||
json_buf[json_header_len] = '\0';
|
||
pre_read_len = json_header_len;
|
||
if (pre_read_len > 256) pre_read_len = 256;
|
||
memcpy(pre_read_buf, json_buf, pre_read_len);
|
||
|
||
cJSON *root = cJSON_Parse(json_buf);
|
||
if (root) {
|
||
cJSON *type_item = cJSON_GetObjectItem(root, "type");
|
||
if (type_item && cJSON_IsString(type_item) &&
|
||
strcmp(cJSON_GetStringValue(type_item), "esp32") == 0) {
|
||
is_esp32_ota = true;
|
||
}
|
||
cJSON *size_item = cJSON_GetObjectItem(root, "total_size");
|
||
if (size_item) {
|
||
total_size = (uint32_t)cJSON_GetNumberValue(size_item);
|
||
}
|
||
cJSON_Delete(root);
|
||
}
|
||
}
|
||
}
|
||
|
||
if (is_esp32_ota) {
|
||
if (total_size == 0) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "missing total_size");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
/* ESP32 路径不再需要 pre_read（JSON 已消费，固件从流继续读） */
|
||
pre_read_len = 0;
|
||
|
||
esp_err_t err = OtaCoordinator::instance().beginEsp32OtaWithRetry(total_size, OTA_CHANNEL_WIFI);
|
||
if (err != ESP_OK) {
|
||
if (err == ESP_ERR_INVALID_STATE) {
|
||
httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "ESP32 OTA occupied by another channel");
|
||
} else {
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "OTA begin failed");
|
||
}
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
Esp32OtaCore &core = Esp32OtaCore::instance();
|
||
uint8_t *fw_buf = recv_buf;
|
||
|
||
// ★ 捕获当前 epoch，用于失败清理时检查会话是否仍属于本 handler
|
||
// 若同类型重启已发生（新请求接管），旧 handler 的 abortCurrentIfEpoch 不会中止新会话
|
||
uint32_t my_epoch = OtaCoordinator::instance().getOtaEpoch();
|
||
|
||
size_t total_firmware_written = 0;
|
||
size_t total_received = json_header_len;
|
||
|
||
DEBUG_INFO("WIFI", "ESP32 OTA 开始收流: content_len=%d json_hdr=%d fw_expect=%d",
|
||
req->content_len, json_header_len,
|
||
(req->content_len > json_header_len)
|
||
? (req->content_len - json_header_len) : 0);
|
||
|
||
/* 浏览器 upload 进度到 100% 只表示 TCP 发完；设备仍在 recv+Flash。
|
||
* Flash 扇区擦除期间 cache 暂停，必须让 WiFi/LWIP 有机会跑，否则 TCP 卡死。
|
||
* C3 上 WiFi+BLE 双栈堆极紧：free 过低时 pbuf 申请失败 → 半路卡住/超时。
|
||
* 因此 pacing 按 free heap 自适应，而不是固定每 N 块 delay。 */
|
||
const int64_t t_recv0 = esp_timer_get_time();
|
||
uint32_t write_chunks = 0U;
|
||
|
||
while (total_received < (size_t)req->content_len) {
|
||
size_t to_read = (size_t)req->content_len - total_received;
|
||
if (to_read > OTA_BLOCK_SIZE) {
|
||
to_read = OTA_BLOCK_SIZE;
|
||
}
|
||
|
||
/* 堆过紧时先让 LWIP 回收 TCP 窗口，再 recv，避免 pbuf 分配失败 */
|
||
{
|
||
const uint32_t free_pre = esp_get_free_heap_size();
|
||
if (free_pre < 8192U) {
|
||
(void)esp_task_wdt_reset();
|
||
vTaskDelay(pdMS_TO_TICKS(free_pre < 4096U ? 5U : 2U));
|
||
}
|
||
}
|
||
|
||
int ret = httpd_req_recv(req, (char *)fw_buf, to_read);
|
||
if (ret <= 0) {
|
||
DEBUG_ERR("WIFI", "HTTP recv failed (ret=%d), aborting OTA recv=%u/%d free=%lu",
|
||
ret, (unsigned)total_received, req->content_len,
|
||
(unsigned long)esp_get_free_heap_size());
|
||
OtaCoordinator::instance().abortCurrentIfEpoch(my_epoch);
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "HTTP recv failed");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
err = core.write(fw_buf, (size_t)ret);
|
||
if (err != ESP_OK) {
|
||
DEBUG_ERR("WIFI", "OTA write failed: %s @%u free=%lu",
|
||
esp_err_to_name(err), (unsigned)total_firmware_written,
|
||
(unsigned long)esp_get_free_heap_size());
|
||
OtaCoordinator::instance().abortCurrentIfEpoch(my_epoch);
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "OTA write failed");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
total_firmware_written += (size_t)ret;
|
||
total_received += (size_t)ret;
|
||
++write_chunks;
|
||
|
||
(void)esp_task_wdt_reset();
|
||
|
||
}
|
||
|
||
/* 回包前不打 INFO：堆紧时 DEBUG_INFO→UDP 会与 httpd_resp_send 抢 TX pbuf。
|
||
* 先让 LWIP 回收，成功后再记一条。 */
|
||
vTaskDelay(pdMS_TO_TICKS(10));
|
||
(void)esp_task_wdt_reset();
|
||
taskYIELD();
|
||
|
||
const char resp[] =
|
||
"{\"status\": \"ok\", \"message\": \"stored, call POST /ota/update to finish\", "
|
||
"\"target\": \"esp32\"}";
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_set_hdr(req, "Connection", "close");
|
||
esp_err_t send_err = httpd_resp_send(req, resp, HTTPD_RESP_USE_STRLEN);
|
||
if (send_err != ESP_OK) {
|
||
DEBUG_ERR("WIFI", "ESP32 OTA 响应发送失败: %s (free=%lu largest=%lu)",
|
||
esp_err_to_name(send_err),
|
||
(unsigned long)esp_get_free_heap_size(),
|
||
(unsigned long)heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT));
|
||
/* 再试一次极简回包 */
|
||
send_err = httpd_resp_send(req, "{\"status\":\"ok\",\"target\":\"esp32\"}",
|
||
HTTPD_RESP_USE_STRLEN);
|
||
if (send_err != ESP_OK) {
|
||
DEBUG_ERR("WIFI", "ESP32 OTA 简短响应仍失败: %s", esp_err_to_name(send_err));
|
||
}
|
||
} else {
|
||
DEBUG_INFO("WIFI",
|
||
"ESP32 OTA 存储+响应完成: %u B elapsed=%lld ms free=%lu",
|
||
(unsigned int)core.getReceived(),
|
||
(long long)((esp_timer_get_time() - t_recv0) / 1000),
|
||
(unsigned long)esp_get_free_heap_size());
|
||
}
|
||
return (send_err == ESP_OK) ? ESP_OK : ESP_FAIL;
|
||
}
|
||
|
||
const uint32_t gd32_fw_size = (uint32_t)req->content_len;
|
||
uint32_t gd32_valid_size;
|
||
if (json_header_len > 0 && (uint32_t)json_header_len < gd32_fw_size) {
|
||
gd32_valid_size = (total_size > 0 && total_size < gd32_fw_size) ? total_size : (gd32_fw_size - (uint32_t)json_header_len);
|
||
} else {
|
||
gd32_valid_size = gd32_fw_size;
|
||
}
|
||
if (OtaRelay::getState() != RELAY_IDLE) {
|
||
DEBUG_WARN("WIFI", "GD32 OTA 开始前复位中继状态: %d", OtaRelay::getState());
|
||
OtaRelay::instance().reset();
|
||
}
|
||
|
||
// 与 BLE 共用 prepareGd32Storage（内含 validateGd32Size + begin + erase + meta）
|
||
esp_err_t prep_err = OtaCoordinator::instance().prepareGd32Storage(gd32_valid_size, OTA_CHANNEL_WIFI);
|
||
if (prep_err == ESP_ERR_INVALID_SIZE) {
|
||
DEBUG_ERR("WIFI", "firmware size invalid: valid=%u max=%u",
|
||
(unsigned)gd32_valid_size, (unsigned)OTA_MAX_FIRMWARE_SIZE);
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "firmware too large or alignment overflow");
|
||
return ESP_FAIL;
|
||
} else if (prep_err == ESP_ERR_INVALID_STATE) {
|
||
DEBUG_ERR("WIFI", "GD32 OTA 协调器拒绝存储（系统忙）");
|
||
httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "system busy with another OTA operation");
|
||
return ESP_FAIL;
|
||
} else if (prep_err != ESP_OK) {
|
||
DEBUG_ERR("WIFI", "GD32 OTA 准备失败: %s", esp_err_to_name(prep_err));
|
||
char err_msg[96];
|
||
snprintf(err_msg, sizeof(err_msg), "prepare gd32_ota failed: %s", esp_err_to_name(prep_err));
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, err_msg);
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
// ★ 捕获当前 epoch，用于失败清理时检查会话是否仍属于本 handler
|
||
uint32_t my_epoch = OtaCoordinator::instance().getOtaEpoch();
|
||
|
||
uint8_t *buf = recv_buf;
|
||
|
||
int received = 0;
|
||
|
||
// expected_fw_size_raw 仅用于后续日志；meta 已由 prepareGd32Storage 写入
|
||
uint32_t expected_fw_size_raw = gd32_valid_size;
|
||
uint32_t gd32_offset = 0;
|
||
|
||
DEBUG_INFO("WIFI", "GD32 raw upload start: %u bytes", expected_fw_size_raw);
|
||
|
||
|
||
if (json_header_len == 0 && pre_read_len > 0) {
|
||
int first_chunk_len = pre_read_len;
|
||
if (first_chunk_len > req->content_len) first_chunk_len = req->content_len;
|
||
if (first_chunk_len > 0) {
|
||
gd32_offset = 0;
|
||
esp_err_t err = OtaCoordinator::instance().writeGd32Chunk(gd32_offset, pre_read_buf, (size_t)first_chunk_len);
|
||
if (err != ESP_OK) {
|
||
DEBUG_ERR("WIFI", "GD32 first chunk write failed: len=%d err=%s",
|
||
first_chunk_len, esp_err_to_name(err));
|
||
// ★ 首块写入失败：用 abortCurrentIfEpoch 避免误中止新会话
|
||
OtaCoordinator::instance().abortCurrentIfEpoch(my_epoch);
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "write gd32_ota failed");
|
||
return ESP_FAIL;
|
||
}
|
||
received = first_chunk_len;
|
||
gd32_offset += (uint32_t)first_chunk_len;
|
||
OtaCoordinator::instance().updateGd32Meta(gd32_offset, (uint32_t)(gd32_offset / OTA_BLOCK_SIZE));
|
||
}
|
||
} else {
|
||
received = pre_read_len;
|
||
}
|
||
|
||
while (received < req->content_len) {
|
||
size_t to_read = req->content_len - received;
|
||
if (to_read > OTA_BLOCK_SIZE) to_read = OTA_BLOCK_SIZE;
|
||
|
||
int ret = httpd_req_recv(req, (char *)buf, to_read);
|
||
if (ret <= 0) {
|
||
DEBUG_ERR("WIFI", "GD32 upload interrupted: received=%d expected=%d",
|
||
received, req->content_len);
|
||
// ★ 客户端断开（刷新网页/关浏览器/网络掉）：用 abortCurrentIfEpoch 避免误中止新会话
|
||
OtaCoordinator::instance().abortCurrentIfEpoch(my_epoch);
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "upload interrupted");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
esp_err_t err = OtaCoordinator::instance().writeGd32Chunk(gd32_offset, buf, (size_t)ret);
|
||
if (err != ESP_OK) {
|
||
DEBUG_ERR("WIFI", "GD32 write failed: offset=%u len=%d err=%s",
|
||
(unsigned)gd32_offset, ret, esp_err_to_name(err));
|
||
// ★ 写入失败：同上，用 abortCurrentIfEpoch
|
||
OtaCoordinator::instance().abortCurrentIfEpoch(my_epoch);
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "write gd32_ota failed");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
received += ret;
|
||
gd32_offset += (uint32_t)ret;
|
||
|
||
(void)esp_task_wdt_reset();
|
||
}
|
||
|
||
OtaCoordinator::instance().updateGd32Meta(gd32_offset, (uint32_t)(gd32_offset / OTA_BLOCK_SIZE));
|
||
|
||
ota_meta_t final_meta;
|
||
OtaCoordinator::instance().loadGd32Meta(&final_meta);
|
||
if (final_meta.total_size > 0 && final_meta.stored_size >= final_meta.total_size) {
|
||
/* 先让出再算 SHA；回包前不打 INFO，避免与 httpd_resp_send 抢堆 */
|
||
vTaskDelay(pdMS_TO_TICKS(10));
|
||
(void)esp_task_wdt_reset();
|
||
|
||
// 与 BLE 共用 finishGd32StorageAfterReceive：complete + SHA
|
||
esp_err_t sha_err = OtaCoordinator::instance().finishGd32StorageAfterReceive();
|
||
if (sha_err != ESP_OK) {
|
||
DEBUG_ERR("WIFI", "GD32 固件 SHA-256 计算失败: %s", esp_err_to_name(sha_err));
|
||
}
|
||
}
|
||
|
||
const char resp[] = "{\"status\": \"ok\", \"progress\": 100, \"target\": \"gd32\", "
|
||
"\"message\": \"stored, call POST /ota/relay with sha256 to trigger\"}";
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_set_hdr(req, "Connection", "close");
|
||
esp_err_t send_err = httpd_resp_send(req, resp, strlen(resp));
|
||
if (send_err != ESP_OK) {
|
||
DEBUG_ERR("WIFI", "GD32 OTA 响应发送失败: %s (free=%lu largest=%lu)",
|
||
esp_err_to_name(send_err),
|
||
(unsigned long)esp_get_free_heap_size(),
|
||
(unsigned long)heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT));
|
||
} else {
|
||
DEBUG_INFO("WIFI", "GD32 OTA 存储+响应完成: %u / %u free=%lu",
|
||
(unsigned)gd32_offset, expected_fw_size_raw,
|
||
(unsigned long)esp_get_free_heap_size());
|
||
}
|
||
return (send_err == ESP_OK) ? ESP_OK : ESP_FAIL;
|
||
}
|
||
|
||
esp_err_t ota_relay_trigger_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
DEBUG_INFO("WIFI", "=== HTTP: POST /ota/relay ===");
|
||
DEBUG_INFO("WIFI", "收到触发 OTA 中继请求");
|
||
|
||
ota_meta_t meta;
|
||
memset(&meta, 0, sizeof(meta));
|
||
if (OtaCoordinator::instance().loadGd32Meta(&meta) != ESP_OK || meta.total_size == 0 || meta.stored_size < meta.total_size) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "firmware not fully stored");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
char frontend_sha_hex[65] = {0};
|
||
if (req->content_len > 0 && req->content_len < 512) {
|
||
char buf[512] = {0};
|
||
int ret = httpd_req_recv(req, buf, req->content_len);
|
||
if (ret > 0) {
|
||
buf[ret] = '\0';
|
||
cJSON *root = cJSON_Parse(buf);
|
||
if (root) {
|
||
cJSON *sha_item = cJSON_GetObjectItem(root, "sha256");
|
||
if (sha_item && cJSON_IsString(sha_item) &&
|
||
strlen(cJSON_GetStringValue(sha_item)) == 64) {
|
||
strncpy(frontend_sha_hex, cJSON_GetStringValue(sha_item), 64);
|
||
frontend_sha_hex[64] = '\0';
|
||
}
|
||
cJSON_Delete(root);
|
||
}
|
||
}
|
||
}
|
||
if (frontend_sha_hex[0] == '\0') {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST,
|
||
"missing sha256 in body (frontend SHA-256 required)");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
uint8_t frontend_sha[32] = {0};
|
||
for (int i = 0; i < 32; ++i) {
|
||
char hex[3] = { frontend_sha_hex[i*2], frontend_sha_hex[i*2+1], 0 };
|
||
frontend_sha[i] = (uint8_t)strtoul(hex, nullptr, 16);
|
||
}
|
||
|
||
uint8_t device_sha[32] = {0};
|
||
char device_sha_hex[65] = {0};
|
||
esp_err_t verify_err = OtaCoordinator::instance().verifyGd32Firmware(frontend_sha, device_sha);
|
||
for (int i = 0; i < 32; ++i) {
|
||
snprintf(&device_sha_hex[i*2], 3, "%02X", device_sha[i]);
|
||
}
|
||
|
||
if (verify_err == ESP_ERR_INVALID_CRC) {
|
||
char err_resp[256];
|
||
snprintf(err_resp, sizeof(err_resp),
|
||
"{\"status\": \"error\", \"message\": \"SHA-256 mismatch\", "
|
||
"\"device\": \"%s\"}", device_sha_hex);
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, err_resp, strlen(err_resp));
|
||
return ESP_FAIL;
|
||
} else if (verify_err != ESP_OK) {
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "SHA compute failed");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
esp_err_t trigger_err = OtaCoordinator::instance().triggerGd32Relay();
|
||
if (trigger_err != ESP_OK) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST,
|
||
"relay trigger failed - system busy or firmware not ready");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
char resp[256];
|
||
snprintf(resp, sizeof(resp),
|
||
"{\"status\": \"ok\", \"message\": \"OTA relay triggered\", "
|
||
"\"sha256\": \"%s\"}", device_sha_hex);
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, strlen(resp));
|
||
|
||
return ESP_OK;
|
||
}
|
||
|
||
esp_err_t logs_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
|
||
int json_len = 0;
|
||
char *json = DebugLog::instance().ringDrainJson(&json_len);
|
||
|
||
if (json && json_len > 0) {
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, json, json_len);
|
||
free(json);
|
||
} else {
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, "[]", 2);
|
||
}
|
||
return ESP_OK;
|
||
}
|
||
|
||
|
||
// ============================================================
|
||
// GET /can/feedback — 三路 CAN 1Hz 反馈快照
|
||
// ============================================================
|
||
esp_err_t can_feedback_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
|
||
can_feedback_result_t results[CAN_CHANNEL_MAX] = {};
|
||
bool valid[CAN_CHANNEL_MAX] = {};
|
||
for (uint8_t i = 0; i < CAN_CHANNEL_MAX; ++i) {
|
||
valid[i] = getLatestCanFeedback(i, &results[i]);
|
||
}
|
||
|
||
/* 估算缓冲大小：每通道 ~2KB (统计+ID条目) */
|
||
char *resp = (char *)calloc(1, 8192);
|
||
if (!resp) {
|
||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "no memory");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
char *p = resp;
|
||
p += sprintf(p, "{\"channels\":[");
|
||
for (uint8_t i = 0; i < CAN_CHANNEL_MAX; ++i) {
|
||
const can_feedback_result_t &r = results[i];
|
||
if (i > 0) p += sprintf(p, ",");
|
||
p += sprintf(p, "{\"ch\":%u,\"valid\":%s", (unsigned)i,
|
||
valid[i] ? "true" : "false");
|
||
if (valid[i]) {
|
||
p += sprintf(p,
|
||
",\"mode\":%u,\"seq\":%lu,\"rx\":%lu,\"tx\":%lu,"
|
||
"\"drop\":%lu,\"err\":%lu,\"tec\":%u,\"rec\":%u,"
|
||
"\"bus_state\":%u,\"count\":%u,\"entries\":[",
|
||
(unsigned)r.stats.mode,
|
||
(unsigned long)r.stats.snapshot_seq,
|
||
(unsigned long)r.stats.rx_count,
|
||
(unsigned long)r.stats.tx_count,
|
||
(unsigned long)r.stats.rx_drop_count,
|
||
(unsigned long)r.stats.error_count,
|
||
(unsigned)r.stats.tec,
|
||
(unsigned)r.stats.rec,
|
||
(unsigned)r.stats.bus_state,
|
||
(unsigned)r.total_count);
|
||
for (uint8_t j = 0; j < r.total_count && j < CANFD_ID_SNAPSHOT_MAX; ++j) {
|
||
const id_snapshot_entry_t &e = r.entries[j];
|
||
if (j > 0) p += sprintf(p, ",");
|
||
p += sprintf(p,
|
||
"{\"id\":\"0x%08lX\",\"dlc\":%u,\"fd\":%u,"
|
||
"\"brs\":%u,\"esi\":%u,\"data\":\"",
|
||
(unsigned long)e.id,
|
||
(unsigned)e.dlc,
|
||
(unsigned)e.fd_flag,
|
||
(unsigned)e.brs,
|
||
(unsigned)e.esi);
|
||
const uint8_t dataLen = (e.dlc < CANFD_ID_SNAPSHOT_DATA_MAX)
|
||
? e.dlc : CANFD_ID_SNAPSHOT_DATA_MAX;
|
||
for (uint8_t d = 0; d < dataLen; ++d) {
|
||
p += sprintf(p, "%02X", e.data[d]);
|
||
}
|
||
p += sprintf(p, "\"}");
|
||
}
|
||
p += sprintf(p, "]");
|
||
}
|
||
p += sprintf(p, "}");
|
||
}
|
||
p += sprintf(p, "]}");
|
||
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, (int)(p - resp));
|
||
free(resp);
|
||
return ESP_OK;
|
||
}
|
||
|
||
// ============================================================
|
||
// GET/POST /can/mode — 查询或切换三路 CAN 接收模式
|
||
// ============================================================
|
||
esp_err_t can_mode_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
|
||
if (req->method == HTTP_GET) {
|
||
can_feedback_result_t fb{};
|
||
if (getLatestCanFeedback(0, &fb)) {
|
||
char resp[64];
|
||
int len = snprintf(resp, sizeof(resp),
|
||
"{\"mode\":%u}", (unsigned)fb.stats.mode);
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, len);
|
||
} else {
|
||
can_rx_mode_t actual = CAN_RX_MODE_ALL_PASS;
|
||
int rc = canFdSetRxMode(CAN_RX_MODE_ALL_PASS, &actual, 2000);
|
||
char resp[64];
|
||
int len = snprintf(resp, sizeof(resp),
|
||
"{\"mode\":%u,\"source\":\"spi\",\"ok\":%s}",
|
||
(unsigned)actual, rc == 0 ? "true" : "false");
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, len);
|
||
}
|
||
return ESP_OK;
|
||
}
|
||
|
||
char buf[128] = {0};
|
||
int ret = httpd_req_recv(req, buf, sizeof(buf) - 1);
|
||
if (ret <= 0) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "接收数据失败");
|
||
return ESP_FAIL;
|
||
}
|
||
buf[ret] = '\0';
|
||
|
||
cJSON *root = cJSON_Parse(buf);
|
||
if (!root) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "JSON 解析失败");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
cJSON *mode_item = cJSON_GetObjectItem(root, "mode");
|
||
if (!mode_item || !cJSON_IsNumber(mode_item)) {
|
||
cJSON_Delete(root);
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "缺少 mode 字段");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
int requested = (int)cJSON_GetNumberValue(mode_item);
|
||
cJSON_Delete(root);
|
||
|
||
can_rx_mode_t target = CAN_RX_MODE_ALL_PASS;
|
||
if (requested == 1) {
|
||
target = CAN_RX_MODE_FILTER_ID;
|
||
} else if (requested == 2) {
|
||
target = CAN_RX_MODE_BRIDGE_0_TO_12;
|
||
}
|
||
can_rx_mode_t actual = CAN_RX_MODE_ALL_PASS;
|
||
int rc = canFdSetRxMode(target, &actual, 2000);
|
||
|
||
char resp[96];
|
||
int len = snprintf(resp, sizeof(resp),
|
||
"{\"ok\":%s,\"requested\":%d,\"actual\":%u}",
|
||
rc == 0 ? "true" : "false", requested, (unsigned)actual);
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, len);
|
||
return ESP_OK;
|
||
}
|
||
esp_err_t can_send_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
char buf[256] = {0};
|
||
int ret = httpd_req_recv(req, buf, sizeof(buf) - 1);
|
||
if (ret <= 0) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "接收数据失败");
|
||
return ESP_FAIL;
|
||
}
|
||
buf[ret] = '\0';
|
||
|
||
cJSON *root = cJSON_Parse(buf);
|
||
if (!root) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "JSON 解析失败");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
cJSON *ch_item = cJSON_GetObjectItem(root, "ch");
|
||
cJSON *id_item = cJSON_GetObjectItem(root, "id");
|
||
cJSON *data_item = cJSON_GetObjectItem(root, "data");
|
||
cJSON *dlc_item = cJSON_GetObjectItem(root, "dlc");
|
||
|
||
if (!ch_item || !id_item) {
|
||
cJSON_Delete(root);
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "缺少 ch 或 id 字段");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
can_channel_t ch = (can_channel_t)cJSON_GetNumberValue(ch_item);
|
||
uint32_t ext_id = (uint32_t)cJSON_GetNumberValue(id_item);
|
||
uint8_t dlc = dlc_item ? (uint8_t)cJSON_GetNumberValue(dlc_item) : 0;
|
||
|
||
uint8_t tx_data[CAN_MAX_DLC] = {0};
|
||
uint8_t tx_dlc = 0;
|
||
|
||
if (data_item && cJSON_IsString(data_item)) {
|
||
tx_dlc = (uint8_t)parseHexToBytes(cJSON_GetStringValue(data_item), tx_data, CAN_MAX_DLC);
|
||
}
|
||
|
||
if (tx_dlc == 0 && dlc > 0) {
|
||
tx_dlc = (dlc > CAN_MAX_DLC) ? CAN_MAX_DLC : dlc;
|
||
}
|
||
cJSON_Delete(root);
|
||
|
||
uint8_t resp_data[CAN_MAX_DLC] = {0};
|
||
uint8_t gd32_err = 0U;
|
||
int resp_len = canFdSend(ch, ext_id, tx_data, tx_dlc,
|
||
resp_data, sizeof(resp_data), 2000, &gd32_err);
|
||
|
||
char resp[512];
|
||
if (resp_len >= 0) {
|
||
char resp_hex[CAN_MAX_DLC * 2 + 1] = {0};
|
||
bytesToHexUpper(resp_data, (size_t)resp_len, resp_hex);
|
||
snprintf(resp, sizeof(resp),
|
||
"{\"status\": \"ok\", \"ch\": %d, \"id\": %lu, \"sent\": %d, \"recv_len\": %d, \"recv\": \"%s\"}",
|
||
ch, (unsigned long)ext_id, tx_dlc, resp_len, resp_hex);
|
||
} else {
|
||
snprintf(resp, sizeof(resp),
|
||
"{\"status\": \"error\", \"code\": %d, \"gd32_err\": %u}",
|
||
resp_len, (unsigned)gd32_err);
|
||
}
|
||
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, strlen(resp));
|
||
return ESP_OK;
|
||
}
|
||
|
||
esp_err_t spi_send_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
char buf[512] = {0};
|
||
int ret = httpd_req_recv(req, buf, sizeof(buf) - 1);
|
||
if (ret <= 0) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "接收数据失败");
|
||
return ESP_FAIL;
|
||
}
|
||
buf[ret] = '\0';
|
||
|
||
cJSON *root = cJSON_Parse(buf);
|
||
if (!root) {
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "JSON 解析失败");
|
||
return ESP_FAIL;
|
||
}
|
||
|
||
cJSON *type_item = cJSON_GetObjectItem(root, "type");
|
||
cJSON *data_item = cJSON_GetObjectItem(root, "data");
|
||
cJSON *timeout_item = cJSON_GetObjectItem(root, "timeout_ms");
|
||
|
||
if (!type_item || !cJSON_IsString(type_item)) {
|
||
cJSON_Delete(root);
|
||
httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "缺少 type 字段");
|
||
return ESP_FAIL;
|
||
}
|
||
const char *type_hex = cJSON_GetStringValue(type_item);
|
||
uint8_t frame_type = (uint8_t)strtol(type_hex, NULL, 16);
|
||
|
||
uint32_t timeout_ms = timeout_item ? (uint32_t)cJSON_GetNumberValue(timeout_item) : 1000;
|
||
|
||
uint8_t payload_data[SPI_OTA_FRAME_MAX] = {0};
|
||
size_t payload_len = 0;
|
||
if (data_item && cJSON_IsString(data_item)) {
|
||
payload_len = parseHexToBytes(cJSON_GetStringValue(data_item), payload_data, SPI_OTA_FRAME_MAX);
|
||
}
|
||
|
||
DEBUG_INFO("SPI", "WEB SPI: type=0x%02X, payload=%zu 字节",
|
||
frame_type, payload_len);
|
||
cJSON_Delete(root);
|
||
|
||
char resp[1024];
|
||
uint8_t resp_type = 0;
|
||
uint8_t resp_payload[SPI_OTA_FRAME_MAX] = {0};
|
||
size_t resp_len = 0;
|
||
esp_err_t spi_err = SpiMaster::instance().transact(frame_type, payload_data, payload_len,
|
||
&resp_type, resp_payload, sizeof(resp_payload), &resp_len,
|
||
timeout_ms);
|
||
|
||
if (spi_err == ESP_OK) {
|
||
char resp_hex[SPI_OTA_FRAME_MAX * 2 + 1] = {0};
|
||
bytesToHexUpper(resp_payload, resp_len, resp_hex);
|
||
snprintf(resp, sizeof(resp),
|
||
"{\"status\": \"ok\", \"type\": \"%02X\", \"payload_len\": %zu, \"resp_type\": \"%02X\", \"resp_len\": %zu, \"recv\": \"%s\"}",
|
||
frame_type, payload_len, resp_type, resp_len, resp_hex);
|
||
DEBUG_INFO("SPI", "WEB SPI 响应: type=0x%02X len=%zu payload=%s",
|
||
resp_type, resp_len, resp_hex);
|
||
} else {
|
||
snprintf(resp, sizeof(resp),
|
||
"{\"status\": \"error\", \"code\": %d, \"message\": \"%s\"}",
|
||
spi_err, esp_err_to_name(spi_err));
|
||
DEBUG_ERR("SPI", "WEB SPI 失败: %s", esp_err_to_name(spi_err));
|
||
}
|
||
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, strlen(resp));
|
||
return ESP_OK;
|
||
}
|
||
|
||
static constexpr uint32_t INTERNAL_HEAP_CAPS = MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT;
|
||
/* 状态 JSON 用静态缓冲：OTA 后 largest free 常 <2KB，calloc(8KB) 会 500 "no memory"。 */
|
||
static constexpr size_t SYSTEM_STATUS_JSON_CAP = 6144;
|
||
static constexpr size_t CPU_TASK_SNAPSHOT_MAX = 32;
|
||
static char s_status_json[SYSTEM_STATUS_JSON_CAP];
|
||
static SemaphoreHandle_t s_status_json_mux = nullptr;
|
||
static portMUX_TYPE s_status_json_init_mux = portMUX_INITIALIZER_UNLOCKED;
|
||
|
||
static SemaphoreHandle_t statusJsonMutex(void)
|
||
{
|
||
if (s_status_json_mux == nullptr) {
|
||
portENTER_CRITICAL(&s_status_json_init_mux);
|
||
if (s_status_json_mux == nullptr) {
|
||
s_status_json_mux = xSemaphoreCreateMutex();
|
||
}
|
||
portEXIT_CRITICAL(&s_status_json_init_mux);
|
||
}
|
||
return s_status_json_mux;
|
||
}
|
||
|
||
struct CpuTaskSample {
|
||
UBaseType_t task_number;
|
||
configRUN_TIME_COUNTER_TYPE runtime;
|
||
};
|
||
|
||
struct CpuTaskMetric {
|
||
const char* name;
|
||
UBaseType_t task_number;
|
||
uint64_t runtime_delta;
|
||
double usage_pct;
|
||
};
|
||
|
||
struct CpuUsageSnapshot {
|
||
bool available;
|
||
bool valid;
|
||
uint32_t sample_ms;
|
||
double usage_pct;
|
||
double idle_pct;
|
||
CpuTaskMetric tasks[CPU_TASK_SNAPSHOT_MAX];
|
||
size_t task_count;
|
||
};
|
||
|
||
static portMUX_TYPE s_cpu_stats_mux = portMUX_INITIALIZER_UNLOCKED;
|
||
static CpuTaskSample s_cpu_last_samples[CPU_TASK_SNAPSHOT_MAX];
|
||
static size_t s_cpu_last_count = 0;
|
||
static configRUN_TIME_COUNTER_TYPE s_cpu_last_total = 0;
|
||
static int64_t s_cpu_last_time_us = 0;
|
||
static bool s_cpu_has_last = false;
|
||
|
||
static uint64_t runtime_delta(configRUN_TIME_COUNTER_TYPE current, configRUN_TIME_COUNTER_TYPE previous)
|
||
{
|
||
return current >= previous ? (uint64_t)(current - previous) : 0U;
|
||
}
|
||
|
||
static bool task_name_is_idle(const char* name)
|
||
{
|
||
return name && strncmp(name, "IDLE", 4) == 0;
|
||
}
|
||
|
||
static void reset_cpu_usage_baseline_locked(const TaskStatus_t* tasks, size_t task_count,
|
||
configRUN_TIME_COUNTER_TYPE total_runtime,
|
||
int64_t now_us)
|
||
{
|
||
size_t copy_count = std::min(task_count, CPU_TASK_SNAPSHOT_MAX);
|
||
for (size_t i = 0; i < copy_count; ++i) {
|
||
s_cpu_last_samples[i].task_number = tasks[i].xTaskNumber;
|
||
s_cpu_last_samples[i].runtime = tasks[i].ulRunTimeCounter;
|
||
}
|
||
s_cpu_last_count = copy_count;
|
||
s_cpu_last_total = total_runtime;
|
||
s_cpu_last_time_us = now_us;
|
||
s_cpu_has_last = true;
|
||
}
|
||
|
||
// ★ 改为输出参数模式：CpuUsageSnapshot 608B + CpuTaskSample[24] 192B = 800B
|
||
// 之前全在栈上，system_status_handler 又拷一份 608B → 叠加 1.4KB，
|
||
// 加上 OtaSnapshot/TaskStackMetric/wifi_ap_record_t 约 2.3KB 栈消耗。
|
||
// HTTP 主线程上传 100% 后调用此 handler 时极易栈溢出。改堆分配。
|
||
static void sample_cpu_usage(CpuUsageSnapshot& result)
|
||
{
|
||
result = {};
|
||
#if defined(CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS)
|
||
result.available = true;
|
||
|
||
UBaseType_t task_count = uxTaskGetNumberOfTasks();
|
||
if (task_count == 0) {
|
||
return;
|
||
}
|
||
task_count = std::min<UBaseType_t>(task_count + 2U, CPU_TASK_SNAPSHOT_MAX);
|
||
|
||
TaskStatus_t* tasks = (TaskStatus_t*)calloc(task_count, sizeof(TaskStatus_t));
|
||
if (!tasks) {
|
||
return;
|
||
}
|
||
|
||
configRUN_TIME_COUNTER_TYPE total_runtime = 0;
|
||
UBaseType_t captured_count = uxTaskGetSystemState(tasks, task_count, &total_runtime);
|
||
int64_t now_us = esp_timer_get_time();
|
||
if (captured_count == 0 || captured_count > task_count) {
|
||
DEBUG_WARN("STATUS", "CPU stats: uxTaskGetSystemState 返回 0 (actual_tasks=%lu, buf_slots=%lu)",
|
||
(unsigned long)uxTaskGetNumberOfTasks(), (unsigned long)task_count);
|
||
free(tasks);
|
||
return;
|
||
}
|
||
|
||
// ★ previous_samples[24] = 192B，改堆分配减少栈压力
|
||
CpuTaskSample* previous_samples = (CpuTaskSample*)calloc(CPU_TASK_SNAPSHOT_MAX, sizeof(CpuTaskSample));
|
||
if (!previous_samples) {
|
||
free(tasks);
|
||
return;
|
||
}
|
||
|
||
size_t previous_count = 0;
|
||
configRUN_TIME_COUNTER_TYPE previous_total = 0;
|
||
int64_t previous_time_us = 0;
|
||
bool had_previous = false;
|
||
|
||
portENTER_CRITICAL(&s_cpu_stats_mux);
|
||
previous_count = s_cpu_last_count;
|
||
previous_total = s_cpu_last_total;
|
||
previous_time_us = s_cpu_last_time_us;
|
||
had_previous = s_cpu_has_last;
|
||
for (size_t i = 0; i < previous_count; ++i) {
|
||
previous_samples[i] = s_cpu_last_samples[i];
|
||
}
|
||
reset_cpu_usage_baseline_locked(tasks, captured_count, total_runtime, now_us);
|
||
portEXIT_CRITICAL(&s_cpu_stats_mux);
|
||
|
||
bool can_compute = had_previous && total_runtime >= previous_total && now_us > previous_time_us;
|
||
uint64_t total_delta = can_compute ? runtime_delta(total_runtime, previous_total) : 0U;
|
||
uint64_t idle_delta = 0U;
|
||
if (can_compute && total_delta > 0U) {
|
||
for (UBaseType_t i = 0; i < captured_count; ++i) {
|
||
configRUN_TIME_COUNTER_TYPE last_runtime = 0;
|
||
bool found_previous = false;
|
||
for (size_t j = 0; j < previous_count; ++j) {
|
||
if (previous_samples[j].task_number == tasks[i].xTaskNumber) {
|
||
last_runtime = previous_samples[j].runtime;
|
||
found_previous = true;
|
||
break;
|
||
}
|
||
}
|
||
if (!found_previous) {
|
||
continue;
|
||
}
|
||
uint64_t delta = runtime_delta(tasks[i].ulRunTimeCounter, last_runtime);
|
||
double pct = (double)delta * 100.0 / (double)total_delta;
|
||
if (task_name_is_idle(tasks[i].pcTaskName)) {
|
||
idle_delta += delta;
|
||
}
|
||
if (result.task_count < CPU_TASK_SNAPSHOT_MAX) {
|
||
CpuTaskMetric& metric = result.tasks[result.task_count++];
|
||
metric.name = tasks[i].pcTaskName ? tasks[i].pcTaskName : "";
|
||
metric.task_number = tasks[i].xTaskNumber;
|
||
metric.runtime_delta = delta;
|
||
metric.usage_pct = pct;
|
||
}
|
||
}
|
||
|
||
result.valid = true;
|
||
result.sample_ms = (uint32_t)((now_us - previous_time_us) / 1000);
|
||
result.idle_pct = std::min(100.0, (double)idle_delta * 100.0 / (double)total_delta);
|
||
result.usage_pct = std::max(0.0, 100.0 - result.idle_pct);
|
||
}
|
||
|
||
if (!result.valid) {
|
||
DEBUG_DBG("STATUS", "CPU stats: valid=false had_prev=%d total=%lu prev_total=%lu "
|
||
"can_compute=%d delta=%lu captured=%lu",
|
||
(int)had_previous,
|
||
(unsigned long)total_runtime, (unsigned long)previous_total,
|
||
(int)can_compute, (unsigned long)total_delta,
|
||
(unsigned long)captured_count);
|
||
}
|
||
|
||
free(previous_samples);
|
||
free(tasks);
|
||
#else
|
||
result.available = false;
|
||
#endif
|
||
}
|
||
|
||
static size_t get_task_stack_high_watermark_bytes(TaskHandle_t handle)
|
||
{
|
||
if (handle == NULL) return 0;
|
||
UBaseType_t highWaterMark = uxTaskGetStackHighWaterMark(handle);
|
||
return (size_t)highWaterMark;
|
||
}
|
||
|
||
static size_t get_task_stack_peak_used_bytes(TaskHandle_t handle, size_t stack_size_bytes)
|
||
{
|
||
size_t high_watermark = get_task_stack_high_watermark_bytes(handle);
|
||
return (stack_size_bytes >= high_watermark) ? (stack_size_bytes - high_watermark) : 0;
|
||
}
|
||
|
||
static int append_jsonf(char* buf, size_t cap, int offset, const char* fmt, ...)
|
||
{
|
||
if (!buf || cap == 0 || offset < 0 || (size_t)offset >= cap) return offset;
|
||
va_list args;
|
||
va_start(args, fmt);
|
||
int n = vsnprintf(buf + offset, cap - (size_t)offset, fmt, args);
|
||
va_end(args);
|
||
if (n < 0) return offset;
|
||
size_t written = (size_t)n;
|
||
if (offset + (int)written >= (int)cap) {
|
||
buf[cap - 1] = '\0';
|
||
return (int)(cap - 1);
|
||
}
|
||
return offset + (int)written;
|
||
}
|
||
|
||
static int append_cpu_status_json(char* buf, size_t cap, int offset, const CpuUsageSnapshot& cpu)
|
||
{
|
||
offset = append_jsonf(buf, cap, offset,
|
||
"\"cpu\":{\"available\":%s,\"valid\":%s,\"usage_pct\":%.2f,\"idle_pct\":%.2f,\"sample_ms\":%lu,\"tasks\":[",
|
||
cpu.available ? "true" : "false",
|
||
cpu.valid ? "true" : "false",
|
||
cpu.valid ? cpu.usage_pct : 0.0,
|
||
cpu.valid ? cpu.idle_pct : 0.0,
|
||
(unsigned long)(cpu.valid ? cpu.sample_ms : 0U));
|
||
|
||
for (size_t i = 0; i < cpu.task_count; ++i) {
|
||
const CpuTaskMetric& task = cpu.tasks[i];
|
||
offset = append_jsonf(buf, cap, offset,
|
||
"%s{\"name\":\"%s\",\"task_number\":%lu,\"runtime_delta\":%" PRIu64 ",\"usage_pct\":%.2f}",
|
||
i == 0 ? "" : ",",
|
||
task.name,
|
||
(unsigned long)task.task_number,
|
||
task.runtime_delta,
|
||
task.usage_pct);
|
||
}
|
||
|
||
// 不带尾随逗号；由后续拼接块自行添加前导逗号，避免双重逗号
|
||
return append_jsonf(buf, cap, offset, "]}");
|
||
}
|
||
|
||
esp_err_t system_status_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
|
||
/* 堆极紧时仍返回精简 JSON，禁止 500（前端轮询会刷红）。 */
|
||
const size_t largest_now = heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT);
|
||
if (largest_now < 512U) {
|
||
char tiny[192];
|
||
int n = snprintf(tiny, sizeof(tiny),
|
||
"{\"version\":\"%s\",\"free_heap\":%lu,\"largest_free_block\":%lu,"
|
||
"\"wifi\":{\"connected\":%s},\"ota\":{\"sys_state\":\"degraded\"},"
|
||
"\"cpu\":{\"available\":false,\"valid\":false}}",
|
||
FW_VERSION,
|
||
(unsigned long)esp_get_free_heap_size(),
|
||
(unsigned long)largest_now,
|
||
(WifiOta::instance().m_wifiMode == OTA_WIFI_MODE_STA &&
|
||
WifiOta::instance().getStaConnected()) ? "true" : "false");
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, tiny, n > 0 ? n : 0);
|
||
return ESP_OK;
|
||
}
|
||
|
||
SemaphoreHandle_t mux = statusJsonMutex();
|
||
if (mux) {
|
||
if (xSemaphoreTake(mux, pdMS_TO_TICKS(200)) != pdTRUE) {
|
||
/* 并发 status 冲突：仍回简包，避免 200 */
|
||
char busy[160];
|
||
snprintf(busy, sizeof(busy),
|
||
"{\"version\":\"%s\",\"ota\":{\"sys_state\":\"busy\"},"
|
||
"\"cpu\":{\"available\":false,\"valid\":false}}",
|
||
FW_VERSION);
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, busy, HTTPD_RESP_USE_STRLEN);
|
||
return ESP_OK;
|
||
}
|
||
}
|
||
|
||
char ip_str[16] = "0.0.0.0";
|
||
int8_t rssi = -127;
|
||
bool connected = false;
|
||
|
||
if (WifiOta::instance().m_wifiMode == OTA_WIFI_MODE_STA && WifiOta::instance().getStaConnected()) {
|
||
esp_netif_ip_info_t ip_info;
|
||
esp_netif_t *sta_netif = esp_netif_get_handle_from_ifkey("WIFI_STA_DEF");
|
||
if (sta_netif && esp_netif_get_ip_info(sta_netif, &ip_info) == ESP_OK) {
|
||
snprintf(ip_str, sizeof(ip_str), IPSTR, IP2STR(&ip_info.ip));
|
||
}
|
||
wifi_ap_record_t ap_info;
|
||
if (esp_wifi_sta_get_ap_info(&ap_info) == ESP_OK) {
|
||
rssi = ap_info.rssi;
|
||
}
|
||
connected = true;
|
||
}
|
||
|
||
// ★ PR1: 一次性快照，替代散读 OtaCoordinator / OtaRelay 多个 getter
|
||
OtaSnapshot snap = OtaCoordinator::instance().getSnapshot();
|
||
|
||
size_t free_heap = esp_get_free_heap_size();
|
||
size_t min_free_heap = esp_get_minimum_free_heap_size();
|
||
size_t largest_free_block = heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT);
|
||
size_t internal_free_heap = heap_caps_get_free_size(INTERNAL_HEAP_CAPS);
|
||
size_t internal_min_free_heap = heap_caps_get_minimum_free_size(INTERNAL_HEAP_CAPS);
|
||
size_t internal_largest_free_block = heap_caps_get_largest_free_block(INTERNAL_HEAP_CAPS);
|
||
size_t internal_heap_total = heap_caps_get_total_size(INTERNAL_HEAP_CAPS);
|
||
size_t default_heap_total = heap_caps_get_total_size(MALLOC_CAP_DEFAULT);
|
||
// 任务栈指标复用 health_monitor 共享的任务表（collectTaskStackMetrics），
|
||
// 避免与巡检逻辑两地维护；http_server 在本 handler 上下文中，句柄即当前任务。
|
||
TaskStackMetric task_metrics[8];
|
||
size_t task_metrics_count = collectTaskStackMetrics(task_metrics, 8);
|
||
// http_server 行的句柄在 httpd 线程中取当前任务更准确
|
||
for (size_t i = 0; i < task_metrics_count; ++i) {
|
||
if (strcmp(task_metrics[i].name, "http_server") == 0) {
|
||
task_metrics[i].handle = xTaskGetCurrentTaskHandle();
|
||
}
|
||
}
|
||
|
||
/* CPU 采样在堆上；失败则跳过（available=false），不再 500 */
|
||
CpuUsageSnapshot cpu_local = {};
|
||
CpuUsageSnapshot *cpu = &cpu_local;
|
||
CpuUsageSnapshot *cpu_heap = nullptr;
|
||
if (largest_free_block >= (sizeof(CpuUsageSnapshot) + 1024U)) {
|
||
cpu_heap = (CpuUsageSnapshot *)calloc(1, sizeof(CpuUsageSnapshot));
|
||
if (cpu_heap) {
|
||
cpu = cpu_heap;
|
||
sample_cpu_usage(*cpu);
|
||
}
|
||
} else {
|
||
cpu_local.available = false;
|
||
cpu_local.valid = false;
|
||
}
|
||
|
||
char *resp = s_status_json;
|
||
memset(resp, 0, SYSTEM_STATUS_JSON_CAP);
|
||
|
||
int len = snprintf(resp, SYSTEM_STATUS_JSON_CAP,
|
||
"{\"version\": \"%s\", \"build_time\": \"%s\", \"git_hash\": \"%s\", \"health\": %d, "
|
||
"\"free_heap\": %lu, \"min_free_heap\": %lu, \"largest_free_block\": %lu, "
|
||
"\"internal_free_heap\": %lu, \"internal_min_free_heap\": %lu, \"internal_largest_free_block\": %lu, "
|
||
"\"internal_heap_total\": %lu, \"default_heap_total\": %lu, "
|
||
"\"temperature\": %.1f, \"uptime_sec\": %lu, "
|
||
"\"wifi\": {\"mode\": \"%s\", \"ip\": \"%s\", \"rssi\": %d, \"connected\": %s}, "
|
||
"\"ota\": {\"sys_state\": \"%s\", \"sys_state_code\": %d, \"channel\": %d, \"channel_name\": \"%s\", \"total_size\": %lu, \"stored_size\": %lu, \"storage_done\": %s, "
|
||
"\"relay_state\": %d, \"relay_seq\": %lu, \"relay_total_packets\": %lu, \"gd32_app_alive\": %s, "
|
||
"\"gd32_app\": \"v%d.%d.%d.%d\", \"gd32_boot\": \"v%d.%d.%d.%d\"}, ",
|
||
FW_VERSION, FW_BUILD_TIME, FW_GIT_HASH, HealthMonitor::instance().getCurrent(),
|
||
(unsigned long)free_heap,
|
||
(unsigned long)min_free_heap,
|
||
(unsigned long)largest_free_block,
|
||
(unsigned long)internal_free_heap,
|
||
(unsigned long)internal_min_free_heap,
|
||
(unsigned long)internal_largest_free_block,
|
||
(unsigned long)internal_heap_total,
|
||
(unsigned long)default_heap_total,
|
||
(double)HealthMonitor::instance().getLastTemperature(),
|
||
(unsigned long)(esp_timer_get_time() / 1000000),
|
||
WifiOta::instance().m_wifiMode == OTA_WIFI_MODE_AP ? "AP" : "STA",
|
||
ip_str,
|
||
rssi,
|
||
connected ? "true" : "false",
|
||
snap.sys_state_str,
|
||
(int)snap.sys_state,
|
||
(int)snap.channel,
|
||
snap.channel == OTA_CHANNEL_BLE ? "BLE" : "WIFI",
|
||
(unsigned long)snap.meta.total_size,
|
||
(unsigned long)snap.meta.stored_size,
|
||
snap.storage_done ? "true" : "false",
|
||
snap.relay.state,
|
||
(unsigned long)snap.relay.seq,
|
||
(unsigned long)snap.relay.total_packets,
|
||
snap.relay.gd32_app_alive ? "true" : "false",
|
||
snap.relay.version.app_major, snap.relay.version.app_minor,
|
||
snap.relay.version.app_patch, snap.relay.version.app_build,
|
||
snap.relay.version.boot_major, snap.relay.version.boot_minor,
|
||
snap.relay.version.boot_patch, snap.relay.version.boot_build);
|
||
|
||
len = append_cpu_status_json(resp, SYSTEM_STATUS_JSON_CAP, len, *cpu);
|
||
|
||
/* SPI Link v2 统计（SPEC §12.1）— linkStatus 内部用 5ms 有界超时取 SPI 锁，
|
||
* OTA 中继期间拿不到锁时返回零值统计，绝不阻塞 /system/status 响应。 */
|
||
{
|
||
SpiMaster::SpiLinkStatus ls = SpiMaster::instance().linkStatus();
|
||
const char *role_str = "unknown";
|
||
switch (ls.gd32_role) {
|
||
case 1: role_str = "app"; break;
|
||
case 2: role_str = "boot"; break;
|
||
default: break;
|
||
}
|
||
len = append_jsonf(resp, SYSTEM_STATUS_JSON_CAP, len,
|
||
",\"spi_link\":{\"version\":%u,\"gd32_role\":\"%s\",\"session_id\":\"0x%08lX\","
|
||
"\"v2_active\":%s,\"local_credit\":%u,\"remote_credit\":%u,"
|
||
"\"crc_errors\":%lu,\"duplicate_requests\":%lu,\"seq_errors\":%lu,"
|
||
"\"retries\":%lu,\"ready_timeouts\":%lu,\"rx_overruns\":%lu,"
|
||
"\"resyncs\":%lu,\"max_resp_latency_us\":%lu}",
|
||
(unsigned)ls.version,
|
||
role_str,
|
||
(unsigned long)ls.session_id,
|
||
SpiMaster::instance().v2Active() ? "true" : "false",
|
||
(unsigned)ls.local_credit,
|
||
(unsigned)ls.remote_credit,
|
||
(unsigned long)ls.stats.crc_errors,
|
||
(unsigned long)ls.stats.duplicate_requests,
|
||
(unsigned long)ls.stats.seq_errors,
|
||
(unsigned long)ls.stats.retries,
|
||
(unsigned long)ls.stats.ready_timeouts,
|
||
(unsigned long)ls.stats.rx_overruns,
|
||
(unsigned long)ls.stats.resyncs,
|
||
(unsigned long)ls.stats.max_resp_latency_us);
|
||
}
|
||
|
||
// 前导逗号与前一块分隔；之前因 append_cpu_status_json 尾随逗号叠加
|
||
// 形成 "],," 导致前端 JSON.parse 报 "Expected double-quoted property name"
|
||
len = append_jsonf(resp, SYSTEM_STATUS_JSON_CAP, len, ",\"task_stack\": {");
|
||
for (size_t i = 0; i < task_metrics_count; ++i) {
|
||
len = append_jsonf(resp, SYSTEM_STATUS_JSON_CAP, len,
|
||
"%s\"%s\":{\"stack_size_bytes\":%lu,\"high_watermark_bytes\":%lu,\"peak_used_bytes\":%lu}",
|
||
i == 0 ? "" : ",",
|
||
task_metrics[i].name,
|
||
(unsigned long)task_metrics[i].stack_size_bytes,
|
||
(unsigned long)get_task_stack_high_watermark_bytes(task_metrics[i].handle),
|
||
(unsigned long)get_task_stack_peak_used_bytes(task_metrics[i].handle, task_metrics[i].stack_size_bytes));
|
||
}
|
||
len = append_jsonf(resp, SYSTEM_STATUS_JSON_CAP, len, "}}");
|
||
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, len > 0 ? len : 0);
|
||
if (cpu_heap) {
|
||
free(cpu_heap);
|
||
}
|
||
if (mux) {
|
||
xSemaphoreGive(mux);
|
||
}
|
||
return ESP_OK;
|
||
}
|
||
|
||
// ============================================================
|
||
// GET /system/probe — GD32 APP 单次 SPI 探测（PR2）
|
||
// ============================================================
|
||
/**
|
||
* @brief 显式触发一次 GD32 APP 存活探测。
|
||
* 从 system_status_handler 移出的副作用，改为独立端点。
|
||
* 成功时更新 OtaRelay 缓存的 alive/version 并返回版本信息。
|
||
*/
|
||
esp_err_t system_probe_handler(httpd_req_t *req)
|
||
{
|
||
http_set_cors_headers(req);
|
||
|
||
gd32_version_t ver = {};
|
||
uint32_t uptime = 0;
|
||
esp_err_t err = OtaCoordinator::instance().probeGd32AppOnce(&ver, &uptime);
|
||
|
||
char resp[256];
|
||
int len = snprintf(resp, sizeof(resp),
|
||
"{\"alive\": %s, \"uptime_sec\": %" PRIu32 ", "
|
||
"\"gd32_app\": \"v%d.%d.%d.%d\", \"gd32_boot\": \"v%d.%d.%d.%d\"}",
|
||
(err == ESP_OK) ? "true" : "false",
|
||
uptime,
|
||
ver.app_major, ver.app_minor, ver.app_patch, ver.app_build,
|
||
ver.boot_major, ver.boot_minor, ver.boot_patch, ver.boot_build);
|
||
|
||
httpd_resp_set_type(req, "application/json");
|
||
httpd_resp_send(req, resp, len);
|
||
return ESP_OK;
|
||
}
|