snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-04 06:37:38 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge bb96e31381 into 78d6e5931c

Browse Source
This commit is contained in:
Xuan-Son Nguyen 2026-02-04 09:18:12 +11:00 committed by GitHub
commit d8933ed566
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/network/CrossPointWebServer.cpp
View File

@ -104,7 +104,7 @@ void CrossPointWebServer::begin() {
server->on("/download", HTTP_GET, [this] { handleDownload(); }); server->on("/download", HTTP_GET, [this] { handleDownload(); });
// Upload endpoint with special handling for multipart form data // Upload endpoint with special handling for multipart form data
server->on("/upload", HTTP_POST, [this] { handleUploadPost(); }, [this] { handleUpload(); }); server->on("/upload", HTTP_POST, [this] { handleUploadPost(upload); }, [this] { handleUpload(upload); });
// Create folder endpoint // Create folder endpoint
server->on("/mkdir", HTTP_POST, [this] { handleCreateFolder(); }); server->on("/mkdir", HTTP_POST, [this] { handleCreateFolder(); });
@ -458,47 +458,32 @@ void CrossPointWebServer::handleDownload() const {
file.close(); file.close();
} }
// Static variables for upload handling
static FsFile uploadFile;
static String uploadFileName;
static String uploadPath = "/";
static size_t uploadSize = 0;
static bool uploadSuccess = false;
static String uploadError = "";
// Upload write buffer - batches small writes into larger SD card operations
// 4KB is a good balance: large enough to reduce syscall overhead, small enough
// to keep individual write times short and avoid watchdog issues
constexpr size_t UPLOAD_BUFFER_SIZE = 4096; // 4KB buffer
static uint8_t uploadBuffer[UPLOAD_BUFFER_SIZE];
static size_t uploadBufferPos = 0;
// Diagnostic counters for upload performance analysis // Diagnostic counters for upload performance analysis
static unsigned long uploadStartTime = 0; static unsigned long uploadStartTime = 0;
static unsigned long totalWriteTime = 0; static unsigned long totalWriteTime = 0;
static size_t writeCount = 0; static size_t writeCount = 0;
static bool flushUploadBuffer() { static bool flushUploadBuffer(CrossPointWebServer::UploadState& state) {
if (uploadBufferPos > 0 && uploadFile) { if (state.bufferPos > 0 && state.file) {
esp_task_wdt_reset(); // Reset watchdog before potentially slow SD write esp_task_wdt_reset(); // Reset watchdog before potentially slow SD write
const unsigned long writeStart = millis(); const unsigned long writeStart = millis();
const size_t written = uploadFile.write(uploadBuffer, uploadBufferPos); const size_t written = state.file.write(state.buffer.data(), state.bufferPos);
totalWriteTime += millis() - writeStart; totalWriteTime += millis() - writeStart;
writeCount++; writeCount++;
esp_task_wdt_reset(); // Reset watchdog after SD write esp_task_wdt_reset(); // Reset watchdog after SD write
if (written != uploadBufferPos) { if (written != state.bufferPos) {
Serial.printf("[%lu] [WEB] [UPLOAD] Buffer flush failed: expected %d, wrote %d\n", millis(), uploadBufferPos, Serial.printf("[%lu] [WEB] [UPLOAD] Buffer flush failed: expected %d, wrote %d\n", millis(), state.bufferPos,
written); written);
uploadBufferPos = 0; state.bufferPos = 0;
return false; return false;
} }
uploadBufferPos = 0; state.bufferPos = 0;
} }
return true; return true;
} }
void CrossPointWebServer::handleUpload() const { void CrossPointWebServer::handleUpload(UploadState& state) const {
static size_t lastLoggedSize = 0; static size_t lastLoggedSize = 0;
// Reset watchdog at start of every upload callback - HTTP parsing can be slow // Reset watchdog at start of every upload callback - HTTP parsing can be slow
@ -516,13 +501,13 @@ void CrossPointWebServer::handleUpload() const {
// Reset watchdog - this is the critical 1% crash point // Reset watchdog - this is the critical 1% crash point
esp_task_wdt_reset(); esp_task_wdt_reset();
uploadFileName = upload.filename; state.fileName = upload.filename;
uploadSize = 0; state.size = 0;
uploadSuccess = false; state.success = false;
uploadError = ""; state.error = "";
uploadStartTime = millis(); uploadStartTime = millis();
lastLoggedSize = 0; lastLoggedSize = 0;
uploadBufferPos = 0; state.bufferPos = 0;
totalWriteTime = 0; totalWriteTime = 0;
writeCount = 0; writeCount = 0;
@ -530,26 +515,26 @@ void CrossPointWebServer::handleUpload() const {
// Note: We use query parameter instead of form data because multipart form // Note: We use query parameter instead of form data because multipart form
// fields aren't available until after file upload completes // fields aren't available until after file upload completes
if (server->hasArg("path")) { if (server->hasArg("path")) {
uploadPath = server->arg("path"); state.path = server->arg("path");
// Ensure path starts with / // Ensure path starts with /
if (!uploadPath.startsWith("/")) { if (!state.path.startsWith("/")) {
uploadPath = "/" + uploadPath; state.path = "/" + state.path;
} }
// Remove trailing slash unless it's root // Remove trailing slash unless it's root
if (uploadPath.length() > 1 && uploadPath.endsWith("/")) { if (state.path.length() > 1 && state.path.endsWith("/")) {
uploadPath = uploadPath.substring(0, uploadPath.length() - 1); state.path = state.path.substring(0, state.path.length() - 1);
} }
} else { } else {
uploadPath = "/"; state.path = "/";
} }
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\n", millis(), state.fileName.c_str(), state.path.c_str());
Serial.printf("[%lu] [WEB] [UPLOAD] Free heap: %d bytes\n", millis(), ESP.getFreeHeap()); Serial.printf("[%lu] [WEB] [UPLOAD] Free heap: %d bytes\n", millis(), ESP.getFreeHeap());
// Create file path // Create file path
String filePath = uploadPath; String filePath = state.path;
if (!filePath.endsWith("/")) filePath += "/"; if (!filePath.endsWith("/")) filePath += "/";
filePath += uploadFileName; filePath += state.fileName;
// Check if file already exists - SD operations can be slow // Check if file already exists - SD operations can be slow
esp_task_wdt_reset(); esp_task_wdt_reset();
@ -561,8 +546,8 @@ void CrossPointWebServer::handleUpload() const {
// Open file for writing - this can be slow due to FAT cluster allocation // Open file for writing - this can be slow due to FAT cluster allocation
esp_task_wdt_reset(); esp_task_wdt_reset();
if (!SdMan.openFileForWrite("WEB", filePath, uploadFile)) { if (!SdMan.openFileForWrite("WEB", filePath, state.file)) {
uploadError = "Failed to create file on SD card"; state.error = "Failed to create file on SD card";
Serial.printf("[%lu] [WEB] [UPLOAD] FAILED to create file: %s\n", millis(), filePath.c_str()); Serial.printf("[%lu] [WEB] [UPLOAD] FAILED to create file: %s\n", millis(), filePath.c_str());
return; return;
} }
@ -570,87 +555,87 @@ void CrossPointWebServer::handleUpload() const {
Serial.printf("[%lu] [WEB] [UPLOAD] File created successfully: %s\n", millis(), filePath.c_str()); Serial.printf("[%lu] [WEB] [UPLOAD] File created successfully: %s\n", millis(), filePath.c_str());
} else if (upload.status == UPLOAD_FILE_WRITE) { } else if (upload.status == UPLOAD_FILE_WRITE) {
if (uploadFile && uploadError.isEmpty()) { if (state.file && state.error.isEmpty()) {
// Buffer incoming data and flush when buffer is full // Buffer incoming data and flush when buffer is full
// This reduces SD card write operations and improves throughput // This reduces SD card write operations and improves throughput
const uint8_t* data = upload.buf; const uint8_t* data = upload.buf;
size_t remaining = upload.currentSize; size_t remaining = upload.currentSize;
while (remaining > 0) { while (remaining > 0) {
const size_t space = UPLOAD_BUFFER_SIZE - uploadBufferPos; const size_t space = UploadState::UPLOAD_BUFFER_SIZE - state.bufferPos;
const size_t toCopy = (remaining < space) ? remaining : space; const size_t toCopy = (remaining < space) ? remaining : space;
memcpy(uploadBuffer + uploadBufferPos, data, toCopy); memcpy(state.buffer.data() + state.bufferPos, data, toCopy);
uploadBufferPos += toCopy; state.bufferPos += toCopy;
data += toCopy; data += toCopy;
remaining -= toCopy; remaining -= toCopy;
// Flush buffer when full // Flush buffer when full
if (uploadBufferPos >= UPLOAD_BUFFER_SIZE) { if (state.bufferPos >= UploadState::UPLOAD_BUFFER_SIZE) {
if (!flushUploadBuffer()) { if (!flushUploadBuffer(state)) {
uploadError = "Failed to write to SD card - disk may be full"; state.error = "Failed to write to SD card - disk may be full";
uploadFile.close(); state.file.close();
return; return;
} }
} }
} }
uploadSize += upload.currentSize; state.size += upload.currentSize;
// Log progress every 100KB // Log progress every 100KB
if (uploadSize - lastLoggedSize >= 102400) { if (state.size - lastLoggedSize >= 102400) {
const unsigned long elapsed = millis() - uploadStartTime; const unsigned long elapsed = millis() - uploadStartTime;
const float kbps = (elapsed > 0) ? (uploadSize / 1024.0) / (elapsed / 1000.0) : 0; const float kbps = (elapsed > 0) ? (state.size / 1024.0) / (elapsed / 1000.0) : 0;
Serial.printf("[%lu] [WEB] [UPLOAD] %d bytes (%.1f KB), %.1f KB/s, %d writes\n", millis(), uploadSize, Serial.printf("[%lu] [WEB] [UPLOAD] %d bytes (%.1f KB), %.1f KB/s, %d writes\n", millis(), state.size,
uploadSize / 1024.0, kbps, writeCount); state.size / 1024.0, kbps, writeCount);
lastLoggedSize = uploadSize; lastLoggedSize = state.size;
} }
} }
} else if (upload.status == UPLOAD_FILE_END) { } else if (upload.status == UPLOAD_FILE_END) {
if (uploadFile) { if (state.file) {
// Flush any remaining buffered data // Flush any remaining buffered data
if (!flushUploadBuffer()) { if (!flushUploadBuffer(state)) {
uploadError = "Failed to write final data to SD card"; state.error = "Failed to write final data to SD card";
} }
uploadFile.close(); state.file.close();
if (uploadError.isEmpty()) { if (state.error.isEmpty()) {
uploadSuccess = true; state.success = true;
const unsigned long elapsed = millis() - uploadStartTime; const unsigned long elapsed = millis() - uploadStartTime;
const float avgKbps = (elapsed > 0) ? (uploadSize / 1024.0) / (elapsed / 1000.0) : 0; const float avgKbps = (elapsed > 0) ? (state.size / 1024.0) / (elapsed / 1000.0) : 0;
const float writePercent = (elapsed > 0) ? (totalWriteTime * 100.0 / elapsed) : 0; const float writePercent = (elapsed > 0) ? (totalWriteTime * 100.0 / elapsed) : 0;
Serial.printf("[%lu] [WEB] [UPLOAD] Complete: %s (%d bytes in %lu ms, avg %.1f KB/s)\n", millis(), Serial.printf("[%lu] [WEB] [UPLOAD] Complete: %s (%d bytes in %lu ms, avg %.1f KB/s)\n", millis(),
uploadFileName.c_str(), uploadSize, elapsed, avgKbps); state.fileName.c_str(), state.size, elapsed, avgKbps);
Serial.printf("[%lu] [WEB] [UPLOAD] Diagnostics: %d writes, total write time: %lu ms (%.1f%%)\n", millis(), Serial.printf("[%lu] [WEB] [UPLOAD] Diagnostics: %d writes, total write time: %lu ms (%.1f%%)\n", millis(),
writeCount, totalWriteTime, writePercent); writeCount, totalWriteTime, writePercent);
// Clear epub cache to prevent stale metadata issues when overwriting files // Clear epub cache to prevent stale metadata issues when overwriting files
String filePath = uploadPath; String filePath = state.path;
if (!filePath.endsWith("/")) filePath += "/"; if (!filePath.endsWith("/")) filePath += "/";
filePath += uploadFileName; filePath += state.fileName;
clearEpubCacheIfNeeded(filePath); clearEpubCacheIfNeeded(filePath);
} }
} }
} else if (upload.status == UPLOAD_FILE_ABORTED) { } else if (upload.status == UPLOAD_FILE_ABORTED) {
uploadBufferPos = 0; // Discard buffered data state.bufferPos = 0; // Discard buffered data
if (uploadFile) { if (state.file) {
uploadFile.close(); state.file.close();
// Try to delete the incomplete file // Try to delete the incomplete file
String filePath = uploadPath; String filePath = state.path;
if (!filePath.endsWith("/")) filePath += "/"; if (!filePath.endsWith("/")) filePath += "/";
filePath += uploadFileName; filePath += state.fileName;
SdMan.remove(filePath.c_str()); SdMan.remove(filePath.c_str());
} }
uploadError = "Upload aborted"; state.error = "Upload aborted";
Serial.printf("[%lu] [WEB] Upload aborted\n", millis()); Serial.printf("[%lu] [WEB] Upload aborted\n", millis());
} }
} }
void CrossPointWebServer::handleUploadPost() const { void CrossPointWebServer::handleUploadPost(UploadState& state) const {
if (uploadSuccess) { if (state.success) {
server->send(200, "text/plain", "File uploaded successfully: " + uploadFileName); server->send(200, "text/plain", "File uploaded successfully: " + state.fileName);
} else { } else {
const String error = uploadError.isEmpty() ? "Unknown error during upload" : uploadError; const String error = state.error.isEmpty() ? "Unknown error during upload" : state.error;
server->send(400, "text/plain", error); server->send(400, "text/plain", error);
} }
} }

24
src/network/CrossPointWebServer.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <SDCardManager.h>
#include <WebServer.h> #include <WebServer.h>
#include <WebSocketsServer.h> #include <WebSocketsServer.h>
#include <WiFiUdp.h> #include <WiFiUdp.h>
@ -28,6 +29,25 @@ class CrossPointWebServer {
unsigned long lastCompleteAt = 0; unsigned long lastCompleteAt = 0;
}; };
// Used by POST upload handler
struct UploadState {
FsFile file;
String fileName;
String path = "/";
size_t size = 0;
bool success = false;
String error = "";
// Upload write buffer - batches small writes into larger SD card operations
// 4KB is a good balance: large enough to reduce syscall overhead, small enough
// to keep individual write times short and avoid watchdog issues
static constexpr size_t UPLOAD_BUFFER_SIZE = 4096; // 4KB buffer
std::vector<uint8_t> buffer;
size_t bufferPos = 0;
UploadState() { buffer.resize(UPLOAD_BUFFER_SIZE); }
} upload;
CrossPointWebServer(); CrossPointWebServer();
~CrossPointWebServer(); ~CrossPointWebServer();
@ -74,8 +94,8 @@ class CrossPointWebServer {
void handleFileList() const; void handleFileList() const;
void handleFileListData() const; void handleFileListData() const;
void handleDownload() const; void handleDownload() const;
void handleUpload() const; void handleUpload(UploadState& state) const;
void handleUploadPost() const; void handleUploadPost(UploadState& state) const;
void handleCreateFolder() const; void handleCreateFolder() const;
void handleDelete() const; void handleDelete() const;
}; };