mirror of
https://github.com/daveallie/crosspoint-reader.git
synced 2026-02-06 23:57:39 +03:00
Migrate to ESPAsyncWebServer for ~3-5x faster uploads
Replace synchronous WebServer with ESPAsyncWebServer: - Fully callback-based, no polling loop needed - Handles HTTP parsing asynchronously in background - Larger chunk sizes from async TCP handling - Known to achieve 500KB-1MB/s vs 200KB/s with sync WebServer Key changes: - platformio.ini: Add ESP Async WebServer dependency - CrossPointWebServer: Rewrite for async API - CrossPointWebServerActivity: Remove handleClient loop The sync WebServer was capped at ~200KB/s due to its synchronous design and small chunk sizes.
This commit is contained in:
Claude
parent
865ee21b64
commit
c75cc5cd31
@ -52,6 +52,7 @@ lib_deps =
|
||||
SDCardManager=symlink://open-x4-sdk/libs/hardware/SDCardManager
|
||||
ArduinoJson @ 7.4.2
|
||||
QRCode @ 0.0.1
|
||||
ESP Async WebServer @ ^3.4.5
|
||||
|
||||
[env:default]
|
||||
extends = base
|
||||
|
||||
@ -26,14 +26,9 @@ constexpr uint8_t AP_MAX_CONNECTIONS = 4;
|
||||
DNSServer* dnsServer = nullptr;
|
||||
constexpr uint16_t DNS_PORT = 53;
|
||||
|
||||
// Task configuration for high-performance uploads
|
||||
constexpr uint32_t WEBSERVER_TASK_STACK_SIZE = 6144; // 6KB stack for upload handling
|
||||
constexpr UBaseType_t WEBSERVER_TASK_PRIORITY = 5; // Higher priority for responsiveness
|
||||
|
||||
// WiFi performance: handleClient iterations per loop
|
||||
// Higher values improve upload throughput by processing more data per frame
|
||||
// With 200 iterations we can process ~300KB per loop at 1.5KB/chunk
|
||||
constexpr int HANDLE_CLIENT_ITERATIONS = 200;
|
||||
// Task configuration for display updates
|
||||
constexpr uint32_t WEBSERVER_TASK_STACK_SIZE = 4096; // 4KB stack for display task
|
||||
constexpr UBaseType_t WEBSERVER_TASK_PRIORITY = 1; // Low priority - display updates only
|
||||
} // namespace
|
||||
|
||||
// Apply WiFi performance optimizations for maximum upload throughput
|
||||
@ -333,25 +328,8 @@ void CrossPointWebServerActivity::loop() {
|
||||
dnsServer->processNextRequest();
|
||||
}
|
||||
|
||||
// Handle web server requests - call handleClient multiple times per loop
|
||||
// to improve responsiveness and upload throughput
|
||||
if (webServer && webServer->isRunning()) {
|
||||
const unsigned long timeSinceLastHandleClient = millis() - lastHandleClientTime;
|
||||
|
||||
// Log if there's a significant gap between handleClient calls (>100ms)
|
||||
if (lastHandleClientTime > 0 && timeSinceLastHandleClient > 100) {
|
||||
Serial.printf("[%lu] [WEBACT] WARNING: %lu ms gap since last handleClient\n", millis(),
|
||||
timeSinceLastHandleClient);
|
||||
}
|
||||
|
||||
// Call handleClient multiple times to process pending requests faster
|
||||
// This is critical for upload performance - HTTP file uploads send data
|
||||
// in chunks and each handleClient() call processes incoming data
|
||||
for (int i = 0; i < HANDLE_CLIENT_ITERATIONS && webServer->isRunning(); i++) {
|
||||
webServer->handleClient();
|
||||
}
|
||||
lastHandleClientTime = millis();
|
||||
}
|
||||
// AsyncWebServer is fully callback-based - no polling needed
|
||||
// The server handles requests automatically in the background
|
||||
|
||||
// Handle exit on Back button
|
||||
if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
|
||||
|
||||
@ -16,10 +16,6 @@ namespace {
|
||||
const char* HIDDEN_ITEMS[] = {"System Volume Information", "XTCache"};
|
||||
constexpr size_t HIDDEN_ITEMS_COUNT = sizeof(HIDDEN_ITEMS) / sizeof(HIDDEN_ITEMS[0]);
|
||||
|
||||
// CPU frequency for upload boost (240MHz for maximum performance)
|
||||
constexpr uint32_t UPLOAD_CPU_FREQ_MHZ = 240;
|
||||
constexpr uint32_t NORMAL_CPU_FREQ_MHZ = 160;
|
||||
|
||||
// Speed calculation interval
|
||||
constexpr unsigned long SPEED_CALC_INTERVAL_MS = 500;
|
||||
} // namespace
|
||||
@ -37,25 +33,6 @@ CrossPointWebServer::~CrossPointWebServer() {
|
||||
}
|
||||
}
|
||||
|
||||
// CPU frequency management
|
||||
void CrossPointWebServer::boostCPU() const {
|
||||
if (cpuBoosted) return;
|
||||
|
||||
if (setCpuFrequencyMhz(UPLOAD_CPU_FREQ_MHZ)) {
|
||||
cpuBoosted = true;
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] CPU boosted to %dMHz\n", millis(), UPLOAD_CPU_FREQ_MHZ);
|
||||
}
|
||||
}
|
||||
|
||||
void CrossPointWebServer::restoreCPU() const {
|
||||
if (!cpuBoosted) return;
|
||||
|
||||
if (setCpuFrequencyMhz(NORMAL_CPU_FREQ_MHZ)) {
|
||||
cpuBoosted = false;
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] CPU restored to %dMHz\n", millis(), NORMAL_CPU_FREQ_MHZ);
|
||||
}
|
||||
}
|
||||
|
||||
// Thread-safe upload status getters
|
||||
bool CrossPointWebServer::isUploading() const {
|
||||
if (!uploadMutex) return false;
|
||||
@ -115,44 +92,48 @@ void CrossPointWebServer::begin() {
|
||||
Serial.printf("[%lu] [WEB] [MEM] Free heap before begin: %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
Serial.printf("[%lu] [WEB] Network mode: %s\n", millis(), apMode ? "AP" : "STA");
|
||||
|
||||
Serial.printf("[%lu] [WEB] Creating web server on port %d...\n", millis(), port);
|
||||
server.reset(new WebServer(port));
|
||||
Serial.printf("[%lu] [WEB] Creating AsyncWebServer on port %d...\n", millis(), port);
|
||||
server.reset(new AsyncWebServer(port));
|
||||
|
||||
// Disable WiFi sleep to improve responsiveness and prevent 'unreachable' errors.
|
||||
// This is critical for reliable web server operation on ESP32.
|
||||
// Disable WiFi sleep to improve responsiveness
|
||||
WiFi.setSleep(false);
|
||||
|
||||
Serial.printf("[%lu] [WEB] [MEM] Free heap after WebServer allocation: %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
Serial.printf("[%lu] [WEB] [MEM] Free heap after AsyncWebServer allocation: %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
|
||||
if (!server) {
|
||||
Serial.printf("[%lu] [WEB] Failed to create WebServer!\n", millis());
|
||||
Serial.printf("[%lu] [WEB] Failed to create AsyncWebServer!\n", millis());
|
||||
return;
|
||||
}
|
||||
|
||||
// Setup routes
|
||||
Serial.printf("[%lu] [WEB] Setting up routes...\n", millis());
|
||||
server->on("/", HTTP_GET, [this] { handleRoot(); });
|
||||
server->on("/files", HTTP_GET, [this] { handleFileList(); });
|
||||
|
||||
server->on("/api/status", HTTP_GET, [this] { handleStatus(); });
|
||||
server->on("/api/files", HTTP_GET, [this] { handleFileListData(); });
|
||||
server->on("/", HTTP_GET, [this](AsyncWebServerRequest* request) { handleRoot(request); });
|
||||
|
||||
// Upload endpoint with special handling for multipart form data
|
||||
server->on("/upload", HTTP_POST, [this] { handleUploadPost(); }, [this] { handleUpload(); });
|
||||
server->on("/files", HTTP_GET, [this](AsyncWebServerRequest* request) { handleFileList(request); });
|
||||
|
||||
// Create folder endpoint
|
||||
server->on("/mkdir", HTTP_POST, [this] { handleCreateFolder(); });
|
||||
server->on("/api/status", HTTP_GET, [this](AsyncWebServerRequest* request) { handleStatus(request); });
|
||||
|
||||
// Delete file/folder endpoint
|
||||
server->on("/delete", HTTP_POST, [this] { handleDelete(); });
|
||||
server->on("/api/files", HTTP_GET, [this](AsyncWebServerRequest* request) { handleFileListData(request); });
|
||||
|
||||
// Upload endpoint - AsyncWebServer handles multipart parsing automatically
|
||||
server->on(
|
||||
"/upload", HTTP_POST, [this](AsyncWebServerRequest* request) { handleUploadRequest(request); },
|
||||
[this](AsyncWebServerRequest* request, const String& filename, size_t index, uint8_t* data, size_t len,
|
||||
bool final) { handleUpload(request, filename, index, data, len, final); });
|
||||
|
||||
server->on("/mkdir", HTTP_POST, [this](AsyncWebServerRequest* request) { handleCreateFolder(request); });
|
||||
|
||||
server->on("/delete", HTTP_POST, [this](AsyncWebServerRequest* request) { handleDelete(request); });
|
||||
|
||||
server->onNotFound([this](AsyncWebServerRequest* request) { handleNotFound(request); });
|
||||
|
||||
server->onNotFound([this] { handleNotFound(); });
|
||||
Serial.printf("[%lu] [WEB] [MEM] Free heap after route setup: %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
|
||||
server->begin();
|
||||
running = true;
|
||||
|
||||
Serial.printf("[%lu] [WEB] Web server started on port %d\n", millis(), port);
|
||||
Serial.printf("[%lu] [WEB] AsyncWebServer started on port %d\n", millis(), port);
|
||||
// Show the correct IP based on network mode
|
||||
const String ipAddr = apMode ? WiFi.softAPIP().toString() : WiFi.localIP().toString();
|
||||
Serial.printf("[%lu] [WEB] Access at http://%s/\n", millis(), ipAddr.c_str());
|
||||
@ -166,64 +147,31 @@ void CrossPointWebServer::stop() {
|
||||
return;
|
||||
}
|
||||
|
||||
Serial.printf("[%lu] [WEB] STOP INITIATED - setting running=false first\n", millis());
|
||||
running = false; // Set this FIRST to prevent handleClient from using server
|
||||
Serial.printf("[%lu] [WEB] STOP INITIATED\n", millis());
|
||||
running = false;
|
||||
|
||||
Serial.printf("[%lu] [WEB] [MEM] Free heap before stop: %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
|
||||
// Add delay to allow any in-flight handleClient() calls to complete
|
||||
delay(100);
|
||||
Serial.printf("[%lu] [WEB] Waited 100ms for handleClient to finish\n", millis());
|
||||
|
||||
server->stop();
|
||||
Serial.printf("[%lu] [WEB] [MEM] Free heap after server->stop(): %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
|
||||
// Add another delay before deletion to ensure server->stop() completes
|
||||
delay(50);
|
||||
Serial.printf("[%lu] [WEB] Waited 50ms before deleting server\n", millis());
|
||||
server->end();
|
||||
Serial.printf("[%lu] [WEB] [MEM] Free heap after server->end(): %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
|
||||
server.reset();
|
||||
Serial.printf("[%lu] [WEB] Web server stopped and deleted\n", millis());
|
||||
Serial.printf("[%lu] [WEB] [MEM] Free heap after delete server: %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
|
||||
Serial.printf("[%lu] [WEB] AsyncWebServer stopped and deleted\n", millis());
|
||||
Serial.printf("[%lu] [WEB] [MEM] Free heap final: %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleClient() const {
|
||||
static unsigned long lastDebugPrint = 0;
|
||||
|
||||
// Check running flag FIRST before accessing server
|
||||
if (!running) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Double-check server pointer is valid
|
||||
if (!server) {
|
||||
Serial.printf("[%lu] [WEB] WARNING: handleClient called with null server!\n", millis());
|
||||
return;
|
||||
}
|
||||
|
||||
// Print debug every 10 seconds to confirm handleClient is being called
|
||||
if (millis() - lastDebugPrint > 10000) {
|
||||
Serial.printf("[%lu] [WEB] handleClient active, server running on port %d\n", millis(), port);
|
||||
lastDebugPrint = millis();
|
||||
}
|
||||
|
||||
server->handleClient();
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleRoot() const {
|
||||
server->send(200, "text/html", HomePageHtml);
|
||||
void CrossPointWebServer::handleRoot(AsyncWebServerRequest* request) const {
|
||||
request->send(200, "text/html", HomePageHtml);
|
||||
Serial.printf("[%lu] [WEB] Served root page\n", millis());
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleNotFound() const {
|
||||
void CrossPointWebServer::handleNotFound(AsyncWebServerRequest* request) const {
|
||||
String message = "404 Not Found\n\n";
|
||||
message += "URI: " + server->uri() + "\n";
|
||||
server->send(404, "text/plain", message);
|
||||
message += "URI: " + request->url() + "\n";
|
||||
request->send(404, "text/plain", message);
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleStatus() const {
|
||||
void CrossPointWebServer::handleStatus(AsyncWebServerRequest* request) const {
|
||||
// Get correct IP based on AP vs STA mode
|
||||
const String ipAddr = apMode ? WiFi.softAPIP().toString() : WiFi.localIP().toString();
|
||||
|
||||
@ -237,7 +185,7 @@ void CrossPointWebServer::handleStatus() const {
|
||||
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
server->send(200, "application/json", json);
|
||||
request->send(200, "application/json", json);
|
||||
}
|
||||
|
||||
void CrossPointWebServer::scanFiles(const char* path, const std::function<void(FileInfo)>& callback) const {
|
||||
@ -291,7 +239,6 @@ void CrossPointWebServer::scanFiles(const char* path, const std::function<void(F
|
||||
}
|
||||
|
||||
file.close();
|
||||
yield(); // Yield to allow WiFi and other tasks to process during long scans
|
||||
file = root.openNextFile();
|
||||
}
|
||||
root.close();
|
||||
@ -303,13 +250,15 @@ bool CrossPointWebServer::isEpubFile(const String& filename) const {
|
||||
return lower.endsWith(".epub");
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleFileList() const { server->send(200, "text/html", FilesPageHtml); }
|
||||
void CrossPointWebServer::handleFileList(AsyncWebServerRequest* request) const {
|
||||
request->send(200, "text/html", FilesPageHtml);
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleFileListData() const {
|
||||
void CrossPointWebServer::handleFileListData(AsyncWebServerRequest* request) const {
|
||||
// Get current path from query string (default to root)
|
||||
String currentPath = "/";
|
||||
if (server->hasArg("path")) {
|
||||
currentPath = server->arg("path");
|
||||
if (request->hasParam("path")) {
|
||||
currentPath = request->getParam("path")->value();
|
||||
// Ensure path starts with /
|
||||
if (!currentPath.startsWith("/")) {
|
||||
currentPath = "/" + currentPath;
|
||||
@ -320,56 +269,42 @@ void CrossPointWebServer::handleFileListData() const {
|
||||
}
|
||||
}
|
||||
|
||||
server->setContentLength(CONTENT_LENGTH_UNKNOWN);
|
||||
server->send(200, "application/json", "");
|
||||
server->sendContent("[");
|
||||
char output[512];
|
||||
constexpr size_t outputSize = sizeof(output);
|
||||
// Build JSON response
|
||||
String json = "[";
|
||||
bool seenFirst = false;
|
||||
JsonDocument doc;
|
||||
|
||||
scanFiles(currentPath.c_str(), [this, &output, &doc, seenFirst](const FileInfo& info) mutable {
|
||||
doc.clear();
|
||||
scanFiles(currentPath.c_str(), [&json, &seenFirst](const FileInfo& info) {
|
||||
JsonDocument doc;
|
||||
doc["name"] = info.name;
|
||||
doc["size"] = info.size;
|
||||
doc["isDirectory"] = info.isDirectory;
|
||||
doc["isEpub"] = info.isEpub;
|
||||
|
||||
const size_t written = serializeJson(doc, output, outputSize);
|
||||
if (written >= outputSize) {
|
||||
// JSON output truncated; skip this entry to avoid sending malformed JSON
|
||||
Serial.printf("[%lu] [WEB] Skipping file entry with oversized JSON for name: %s\n", millis(), info.name.c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
if (seenFirst) {
|
||||
server->sendContent(",");
|
||||
json += ",";
|
||||
} else {
|
||||
seenFirst = true;
|
||||
}
|
||||
server->sendContent(output);
|
||||
|
||||
String entry;
|
||||
serializeJson(doc, entry);
|
||||
json += entry;
|
||||
});
|
||||
server->sendContent("]");
|
||||
// End of streamed response, empty chunk to signal client
|
||||
server->sendContent("");
|
||||
|
||||
json += "]";
|
||||
request->send(200, "application/json", json);
|
||||
Serial.printf("[%lu] [WEB] Served file listing page for path: %s\n", millis(), currentPath.c_str());
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleUpload() const {
|
||||
// Safety check: ensure server is still valid
|
||||
if (!running || !server) {
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] ERROR: handleUpload called but server not running!\n", millis());
|
||||
return;
|
||||
}
|
||||
|
||||
const HTTPUpload& upload = server->upload();
|
||||
|
||||
if (upload.status == UPLOAD_FILE_START) {
|
||||
void CrossPointWebServer::handleUpload(AsyncWebServerRequest* request, const String& filename, size_t index,
|
||||
uint8_t* data, size_t len, bool final) {
|
||||
if (index == 0) {
|
||||
// First chunk - initialize upload
|
||||
xSemaphoreTake(uploadMutex, portMAX_DELAY);
|
||||
|
||||
uploadFileName = upload.filename;
|
||||
uploadFileName = filename;
|
||||
uploadSize = 0;
|
||||
uploadTotalExpected = upload.totalSize; // May be 0 if unknown
|
||||
uploadTotalExpected = request->contentLength();
|
||||
uploadSuccess = false;
|
||||
uploadError = "";
|
||||
uploadStartTime = millis();
|
||||
@ -381,8 +316,8 @@ void CrossPointWebServer::handleUpload() const {
|
||||
writeCount = 0;
|
||||
|
||||
// Get upload path from query parameter
|
||||
if (server->hasArg("path")) {
|
||||
uploadPath = server->arg("path");
|
||||
if (request->hasParam("path")) {
|
||||
uploadPath = request->getParam("path")->value();
|
||||
if (!uploadPath.startsWith("/")) {
|
||||
uploadPath = "/" + uploadPath;
|
||||
}
|
||||
@ -395,11 +330,10 @@ void CrossPointWebServer::handleUpload() const {
|
||||
|
||||
xSemaphoreGive(uploadMutex);
|
||||
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] START: %s to path: %s\n", millis(), uploadFileName.c_str(), uploadPath.c_str());
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] START: %s to path: %s (total: %d bytes)\n", millis(), uploadFileName.c_str(),
|
||||
uploadPath.c_str(), uploadTotalExpected);
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] Free heap: %d bytes\n", millis(), ESP.getFreeHeap());
|
||||
|
||||
boostCPU();
|
||||
|
||||
// Create file path
|
||||
String filePath = uploadPath;
|
||||
if (!filePath.endsWith("/")) filePath += "/";
|
||||
@ -417,58 +351,57 @@ void CrossPointWebServer::handleUpload() const {
|
||||
uploadError = "Failed to create file on SD card";
|
||||
uploadInProgress = false;
|
||||
xSemaphoreGive(uploadMutex);
|
||||
restoreCPU();
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] FAILED to create file: %s\n", millis(), filePath.c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] File created successfully: %s\n", millis(), filePath.c_str());
|
||||
}
|
||||
|
||||
} else if (upload.status == UPLOAD_FILE_WRITE) {
|
||||
if (uploadFile && uploadError.isEmpty()) {
|
||||
// Direct write to SD - simple and fast
|
||||
const unsigned long writeStart = millis();
|
||||
const size_t written = uploadFile.write(upload.buf, upload.currentSize);
|
||||
const unsigned long writeTime = millis() - writeStart;
|
||||
// Write data chunk
|
||||
if (uploadFile && uploadError.isEmpty() && len > 0) {
|
||||
const unsigned long writeStart = millis();
|
||||
const size_t written = uploadFile.write(data, len);
|
||||
const unsigned long writeTime = millis() - writeStart;
|
||||
|
||||
totalWriteTimeMs += writeTime;
|
||||
writeCount++;
|
||||
totalWriteTimeMs += writeTime;
|
||||
writeCount++;
|
||||
|
||||
if (written != upload.currentSize) {
|
||||
xSemaphoreTake(uploadMutex, portMAX_DELAY);
|
||||
uploadError = "Failed to write to SD card - disk may be full";
|
||||
xSemaphoreGive(uploadMutex);
|
||||
uploadFile.close();
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] WRITE ERROR - expected %d, wrote %d\n", millis(), upload.currentSize,
|
||||
written);
|
||||
return;
|
||||
}
|
||||
|
||||
uploadSize += written;
|
||||
|
||||
// Calculate speed every 500ms
|
||||
const unsigned long now = millis();
|
||||
if (now - lastSpeedCalcTime >= SPEED_CALC_INTERVAL_MS) {
|
||||
xSemaphoreTake(uploadMutex, portMAX_DELAY);
|
||||
const size_t bytesSinceLastCalc = uploadSize - lastSpeedCalcSize;
|
||||
const float secondsElapsed = (now - lastSpeedCalcTime) / 1000.0f;
|
||||
if (secondsElapsed > 0) {
|
||||
uploadSpeedKBps = (bytesSinceLastCalc / 1024.0f) / secondsElapsed;
|
||||
}
|
||||
lastSpeedCalcTime = now;
|
||||
lastSpeedCalcSize = uploadSize;
|
||||
|
||||
// Log progress with diagnostics
|
||||
const float avgSpeed = (uploadSize / 1024.0f) / ((now - uploadStartTime) / 1000.0f);
|
||||
const float avgWriteMs = writeCount > 0 ? (float)totalWriteTimeMs / writeCount : 0;
|
||||
Serial.printf(
|
||||
"[%lu] [WEB] [UPLOAD] %d bytes (%.1f KB), cur: %.1f KB/s, avg: %.1f KB/s, writes: %d, avgWrite: %.1fms\n",
|
||||
millis(), uploadSize, uploadSize / 1024.0f, uploadSpeedKBps, avgSpeed, writeCount, avgWriteMs);
|
||||
xSemaphoreGive(uploadMutex);
|
||||
}
|
||||
if (written != len) {
|
||||
xSemaphoreTake(uploadMutex, portMAX_DELAY);
|
||||
uploadError = "Failed to write to SD card - disk may be full";
|
||||
xSemaphoreGive(uploadMutex);
|
||||
uploadFile.close();
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] WRITE ERROR - expected %d, wrote %d\n", millis(), len, written);
|
||||
return;
|
||||
}
|
||||
|
||||
} else if (upload.status == UPLOAD_FILE_END) {
|
||||
uploadSize += written;
|
||||
|
||||
// Calculate speed every 500ms
|
||||
const unsigned long now = millis();
|
||||
if (now - lastSpeedCalcTime >= SPEED_CALC_INTERVAL_MS) {
|
||||
xSemaphoreTake(uploadMutex, portMAX_DELAY);
|
||||
const size_t bytesSinceLastCalc = uploadSize - lastSpeedCalcSize;
|
||||
const float secondsElapsed = (now - lastSpeedCalcTime) / 1000.0f;
|
||||
if (secondsElapsed > 0) {
|
||||
uploadSpeedKBps = (bytesSinceLastCalc / 1024.0f) / secondsElapsed;
|
||||
}
|
||||
lastSpeedCalcTime = now;
|
||||
lastSpeedCalcSize = uploadSize;
|
||||
|
||||
// Log progress with diagnostics
|
||||
const float avgSpeed = (uploadSize / 1024.0f) / ((now - uploadStartTime) / 1000.0f);
|
||||
const float avgWriteMs = writeCount > 0 ? (float)totalWriteTimeMs / writeCount : 0;
|
||||
Serial.printf(
|
||||
"[%lu] [WEB] [UPLOAD] %d bytes (%.1f KB), cur: %.1f KB/s, avg: %.1f KB/s, writes: %d, avgWrite: %.1fms\n",
|
||||
millis(), uploadSize, uploadSize / 1024.0f, uploadSpeedKBps, avgSpeed, writeCount, avgWriteMs);
|
||||
xSemaphoreGive(uploadMutex);
|
||||
}
|
||||
}
|
||||
|
||||
// Final chunk
|
||||
if (final) {
|
||||
if (uploadFile) {
|
||||
uploadFile.close();
|
||||
|
||||
@ -476,7 +409,7 @@ void CrossPointWebServer::handleUpload() const {
|
||||
if (uploadError.isEmpty()) {
|
||||
uploadSuccess = true;
|
||||
const unsigned long duration = millis() - uploadStartTime;
|
||||
const float avgSpeed = (uploadSize / 1024.0f) / (duration / 1000.0f);
|
||||
const float avgSpeed = duration > 0 ? (uploadSize / 1024.0f) / (duration / 1000.0f) : 0;
|
||||
const float avgWriteMs = writeCount > 0 ? (float)totalWriteTimeMs / writeCount : 0;
|
||||
const float writePercent = duration > 0 ? (totalWriteTimeMs * 100.0f / duration) : 0;
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] Complete: %s (%d bytes in %lu ms, avg %.1f KB/s)\n", millis(),
|
||||
@ -487,56 +420,37 @@ void CrossPointWebServer::handleUpload() const {
|
||||
uploadInProgress = false;
|
||||
xSemaphoreGive(uploadMutex);
|
||||
}
|
||||
|
||||
restoreCPU();
|
||||
|
||||
} else if (upload.status == UPLOAD_FILE_ABORTED) {
|
||||
if (uploadFile) {
|
||||
uploadFile.close();
|
||||
String filePath = uploadPath;
|
||||
if (!filePath.endsWith("/")) filePath += "/";
|
||||
filePath += uploadFileName;
|
||||
SdMan.remove(filePath.c_str());
|
||||
}
|
||||
|
||||
xSemaphoreTake(uploadMutex, portMAX_DELAY);
|
||||
uploadError = "Upload aborted";
|
||||
uploadInProgress = false;
|
||||
xSemaphoreGive(uploadMutex);
|
||||
|
||||
restoreCPU();
|
||||
Serial.printf("[%lu] [WEB] [UPLOAD] Aborted\n", millis());
|
||||
}
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleUploadPost() const {
|
||||
void CrossPointWebServer::handleUploadRequest(AsyncWebServerRequest* request) {
|
||||
if (uploadSuccess) {
|
||||
server->send(200, "text/plain", "File uploaded successfully: " + uploadFileName);
|
||||
request->send(200, "text/plain", "File uploaded successfully: " + uploadFileName);
|
||||
} else {
|
||||
const String error = uploadError.isEmpty() ? "Unknown error during upload" : uploadError;
|
||||
server->send(400, "text/plain", error);
|
||||
request->send(400, "text/plain", error);
|
||||
}
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleCreateFolder() const {
|
||||
void CrossPointWebServer::handleCreateFolder(AsyncWebServerRequest* request) const {
|
||||
// Get folder name from form data
|
||||
if (!server->hasArg("name")) {
|
||||
server->send(400, "text/plain", "Missing folder name");
|
||||
if (!request->hasParam("name", true)) {
|
||||
request->send(400, "text/plain", "Missing folder name");
|
||||
return;
|
||||
}
|
||||
|
||||
const String folderName = server->arg("name");
|
||||
const String folderName = request->getParam("name", true)->value();
|
||||
|
||||
// Validate folder name
|
||||
if (folderName.isEmpty()) {
|
||||
server->send(400, "text/plain", "Folder name cannot be empty");
|
||||
request->send(400, "text/plain", "Folder name cannot be empty");
|
||||
return;
|
||||
}
|
||||
|
||||
// Get parent path
|
||||
String parentPath = "/";
|
||||
if (server->hasArg("path")) {
|
||||
parentPath = server->arg("path");
|
||||
if (request->hasParam("path", true)) {
|
||||
parentPath = request->getParam("path", true)->value();
|
||||
if (!parentPath.startsWith("/")) {
|
||||
parentPath = "/" + parentPath;
|
||||
}
|
||||
@ -554,33 +468,33 @@ void CrossPointWebServer::handleCreateFolder() const {
|
||||
|
||||
// Check if already exists
|
||||
if (SdMan.exists(folderPath.c_str())) {
|
||||
server->send(400, "text/plain", "Folder already exists");
|
||||
request->send(400, "text/plain", "Folder already exists");
|
||||
return;
|
||||
}
|
||||
|
||||
// Create the folder
|
||||
if (SdMan.mkdir(folderPath.c_str())) {
|
||||
Serial.printf("[%lu] [WEB] Folder created successfully: %s\n", millis(), folderPath.c_str());
|
||||
server->send(200, "text/plain", "Folder created: " + folderName);
|
||||
request->send(200, "text/plain", "Folder created: " + folderName);
|
||||
} else {
|
||||
Serial.printf("[%lu] [WEB] Failed to create folder: %s\n", millis(), folderPath.c_str());
|
||||
server->send(500, "text/plain", "Failed to create folder");
|
||||
request->send(500, "text/plain", "Failed to create folder");
|
||||
}
|
||||
}
|
||||
|
||||
void CrossPointWebServer::handleDelete() const {
|
||||
void CrossPointWebServer::handleDelete(AsyncWebServerRequest* request) const {
|
||||
// Get path from form data
|
||||
if (!server->hasArg("path")) {
|
||||
server->send(400, "text/plain", "Missing path");
|
||||
if (!request->hasParam("path", true)) {
|
||||
request->send(400, "text/plain", "Missing path");
|
||||
return;
|
||||
}
|
||||
|
||||
String itemPath = server->arg("path");
|
||||
const String itemType = server->hasArg("type") ? server->arg("type") : "file";
|
||||
String itemPath = request->getParam("path", true)->value();
|
||||
const String itemType = request->hasParam("type", true) ? request->getParam("type", true)->value() : "file";
|
||||
|
||||
// Validate path
|
||||
if (itemPath.isEmpty() || itemPath == "/") {
|
||||
server->send(400, "text/plain", "Cannot delete root directory");
|
||||
request->send(400, "text/plain", "Cannot delete root directory");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -595,7 +509,7 @@ void CrossPointWebServer::handleDelete() const {
|
||||
// Check if item starts with a dot (hidden/system file)
|
||||
if (itemName.startsWith(".")) {
|
||||
Serial.printf("[%lu] [WEB] Delete rejected - hidden/system item: %s\n", millis(), itemPath.c_str());
|
||||
server->send(403, "text/plain", "Cannot delete system files");
|
||||
request->send(403, "text/plain", "Cannot delete system files");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -603,7 +517,7 @@ void CrossPointWebServer::handleDelete() const {
|
||||
for (size_t i = 0; i < HIDDEN_ITEMS_COUNT; i++) {
|
||||
if (itemName.equals(HIDDEN_ITEMS[i])) {
|
||||
Serial.printf("[%lu] [WEB] Delete rejected - protected item: %s\n", millis(), itemPath.c_str());
|
||||
server->send(403, "text/plain", "Cannot delete protected items");
|
||||
request->send(403, "text/plain", "Cannot delete protected items");
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -611,7 +525,7 @@ void CrossPointWebServer::handleDelete() const {
|
||||
// Check if item exists
|
||||
if (!SdMan.exists(itemPath.c_str())) {
|
||||
Serial.printf("[%lu] [WEB] Delete failed - item not found: %s\n", millis(), itemPath.c_str());
|
||||
server->send(404, "text/plain", "Item not found");
|
||||
request->send(404, "text/plain", "Item not found");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -630,7 +544,7 @@ void CrossPointWebServer::handleDelete() const {
|
||||
entry.close();
|
||||
dir.close();
|
||||
Serial.printf("[%lu] [WEB] Delete failed - folder not empty: %s\n", millis(), itemPath.c_str());
|
||||
server->send(400, "text/plain", "Folder is not empty. Delete contents first.");
|
||||
request->send(400, "text/plain", "Folder is not empty. Delete contents first.");
|
||||
return;
|
||||
}
|
||||
dir.close();
|
||||
@ -643,9 +557,9 @@ void CrossPointWebServer::handleDelete() const {
|
||||
|
||||
if (success) {
|
||||
Serial.printf("[%lu] [WEB] Successfully deleted: %s\n", millis(), itemPath.c_str());
|
||||
server->send(200, "text/plain", "Deleted successfully");
|
||||
request->send(200, "text/plain", "Deleted successfully");
|
||||
} else {
|
||||
Serial.printf("[%lu] [WEB] Failed to delete: %s\n", millis(), itemPath.c_str());
|
||||
server->send(500, "text/plain", "Failed to delete item");
|
||||
request->send(500, "text/plain", "Failed to delete item");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <ESPAsyncWebServer.h>
|
||||
#include <SDCardManager.h>
|
||||
#include <WebServer.h>
|
||||
#include <freertos/FreeRTOS.h>
|
||||
#include <freertos/semphr.h>
|
||||
|
||||
@ -26,9 +26,6 @@ class CrossPointWebServer {
|
||||
// Stop the web server
|
||||
void stop();
|
||||
|
||||
// Call this periodically to handle client requests
|
||||
void handleClient() const;
|
||||
|
||||
// Check if server is running
|
||||
bool isRunning() const { return running; }
|
||||
|
||||
@ -42,7 +39,7 @@ class CrossPointWebServer {
|
||||
uint8_t getUploadProgress() const; // 0-100%
|
||||
|
||||
private:
|
||||
std::unique_ptr<WebServer> server = nullptr;
|
||||
std::unique_ptr<AsyncWebServer> server = nullptr;
|
||||
bool running = false;
|
||||
bool apMode = false; // true when running in AP mode, false for STA mode
|
||||
uint16_t port = 80;
|
||||
@ -61,29 +58,25 @@ class CrossPointWebServer {
|
||||
mutable unsigned long uploadStartTime = 0;
|
||||
mutable unsigned long lastSpeedCalcTime = 0;
|
||||
mutable size_t lastSpeedCalcSize = 0;
|
||||
mutable bool cpuBoosted = false;
|
||||
|
||||
// Diagnostic counters
|
||||
mutable unsigned long totalWriteTimeMs = 0;
|
||||
mutable size_t writeCount = 0;
|
||||
|
||||
// CPU frequency management for upload performance
|
||||
void boostCPU() const;
|
||||
void restoreCPU() const;
|
||||
|
||||
// File scanning
|
||||
void scanFiles(const char* path, const std::function<void(FileInfo)>& callback) const;
|
||||
String formatFileSize(size_t bytes) const;
|
||||
bool isEpubFile(const String& filename) const;
|
||||
|
||||
// Request handlers
|
||||
void handleRoot() const;
|
||||
void handleNotFound() const;
|
||||
void handleStatus() const;
|
||||
void handleFileList() const;
|
||||
void handleFileListData() const;
|
||||
void handleUpload() const;
|
||||
void handleUploadPost() const;
|
||||
void handleCreateFolder() const;
|
||||
void handleDelete() const;
|
||||
void handleRoot(AsyncWebServerRequest* request) const;
|
||||
void handleNotFound(AsyncWebServerRequest* request) const;
|
||||
void handleStatus(AsyncWebServerRequest* request) const;
|
||||
void handleFileList(AsyncWebServerRequest* request) const;
|
||||
void handleFileListData(AsyncWebServerRequest* request) const;
|
||||
void handleUploadRequest(AsyncWebServerRequest* request);
|
||||
void handleUpload(AsyncWebServerRequest* request, const String& filename, size_t index, uint8_t* data, size_t len,
|
||||
bool final);
|
||||
void handleCreateFolder(AsyncWebServerRequest* request) const;
|
||||
void handleDelete(AsyncWebServerRequest* request) const;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user