diff --git a/src/network/CrossPointWebServer.cpp b/src/network/CrossPointWebServer.cpp index a135c9f0..97a4979f 100644 --- a/src/network/CrossPointWebServer.cpp +++ b/src/network/CrossPointWebServer.cpp @@ -11,6 +11,7 @@ #include "html/FilesPageHtml.generated.h" #include "html/HomePageHtml.generated.h" +#include "html/AppsPageHtml.generated.h" #include "util/StringUtils.h" namespace { @@ -98,6 +99,7 @@ void CrossPointWebServer::begin() { Serial.printf("[%lu] [WEB] Setting up routes...\n", millis()); server->on("/", HTTP_GET, [this] { handleRoot(); }); server->on("/files", HTTP_GET, [this] { handleFileList(); }); + server->on("/apps", HTTP_GET, [this] { handleAppsPage(); }); server->on("/api/status", HTTP_GET, [this] { handleStatus(); }); server->on("/api/files", HTTP_GET, [this] { handleFileListData(); }); @@ -106,6 +108,9 @@ void CrossPointWebServer::begin() { // Upload endpoint with special handling for multipart form data server->on("/upload", HTTP_POST, [this] { handleUploadPost(); }, [this] { handleUpload(); }); + // App upload endpoint (developer feature) + server->on("/upload-app", HTTP_POST, [this] { handleUploadAppPost(); }, [this] { handleUploadApp(); }); + // Create folder endpoint server->on("/mkdir", HTTP_POST, [this] { handleCreateFolder(); }); @@ -256,6 +261,11 @@ void CrossPointWebServer::handleRoot() const { Serial.printf("[%lu] [WEB] Served root page\n", millis()); } +void CrossPointWebServer::handleAppsPage() const { + server->send(200, "text/html", AppsPageHtml); + Serial.printf("[%lu] [WEB] Served apps page\n", millis()); +} + void CrossPointWebServer::handleNotFound() const { String message = "404 Not Found\n\n"; message += "URI: " + server->uri() + "\n"; @@ -466,6 +476,118 @@ static size_t uploadSize = 0; static bool uploadSuccess = false; static String uploadError = ""; +// Static variables for app upload handling (developer feature) +static FsFile appUploadFile; +static String appUploadAppId; +static String appUploadName; +static String appUploadVersion; +static String appUploadAuthor; +static String appUploadDescription; +static String appUploadMinFirmware; +static String appUploadTempPath; +static String appUploadFinalPath; +static String appUploadManifestPath; +static size_t appUploadSize = 0; +static bool appUploadSuccess = false; +static String appUploadError = ""; + +constexpr size_t APP_UPLOAD_BUFFER_SIZE = 4096; +static uint8_t appUploadBuffer[APP_UPLOAD_BUFFER_SIZE]; +static size_t appUploadBufferPos = 0; + +static bool flushAppUploadBuffer() { + if (appUploadBufferPos > 0 && appUploadFile) { + esp_task_wdt_reset(); + const size_t written = appUploadFile.write(appUploadBuffer, appUploadBufferPos); + esp_task_wdt_reset(); + + if (written != appUploadBufferPos) { + appUploadBufferPos = 0; + return false; + } + appUploadBufferPos = 0; + } + return true; +} + +static bool isValidAppId(const String& appId) { + if (appId.isEmpty() || appId.length() > 64) { + return false; + } + if (appId.startsWith(".")) { + return false; + } + if (appId.indexOf("..") >= 0) { + return false; + } + if (appId.indexOf('/') >= 0 || appId.indexOf('\\') >= 0) { + return false; + } + for (size_t i = 0; i < appId.length(); i++) { + const char c = appId.charAt(i); + const bool ok = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || + c == '_' || c == '-'; + if (!ok) { + return false; + } + } + return true; +} + +static bool renameFileAtomic(const String& from, const String& to) { + if (!SdMan.exists(from.c_str())) { + return false; + } + if (SdMan.exists(to.c_str())) { + SdMan.remove(to.c_str()); + } + + FsFile src = SdMan.open(from.c_str(), O_RDONLY); + if (!src) { + return false; + } + + // Try SdFat rename first. + if (src.rename(to.c_str())) { + src.close(); + return true; + } + src.close(); + + // Fallback: copy + delete. + FsFile in = SdMan.open(from.c_str(), O_RDONLY); + if (!in) { + return false; + } + + FsFile out; + if (!SdMan.openFileForWrite("WEB", to, out)) { + in.close(); + return false; + } + + static uint8_t copyBuf[2048]; + while (true) { + const int n = in.read(copyBuf, sizeof(copyBuf)); + if (n <= 0) { + break; + } + if (out.write(copyBuf, n) != static_cast(n)) { + out.close(); + in.close(); + SdMan.remove(to.c_str()); + return false; + } + yield(); + esp_task_wdt_reset(); + } + + out.close(); + in.close(); + SdMan.remove(from.c_str()); + return true; +} + // 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 @@ -655,6 +777,186 @@ void CrossPointWebServer::handleUploadPost() const { } } +void CrossPointWebServer::handleUploadApp() const { + // Reset watchdog at start of every upload callback + esp_task_wdt_reset(); + + if (!running || !server) { + Serial.printf("[%lu] [WEB] [APPUPLOAD] ERROR: handleUploadApp called but server not running!\n", millis()); + return; + } + + const HTTPUpload& upload = server->upload(); + + if (upload.status == UPLOAD_FILE_START) { + appUploadSuccess = false; + appUploadError = ""; + appUploadSize = 0; + appUploadBufferPos = 0; + + // NOTE: we use query args (not multipart fields) because multipart fields + // aren't reliably available until after upload completes. + if (!server->hasArg("appId") || !server->hasArg("name") || !server->hasArg("version")) { + appUploadError = "Missing required fields: appId, name, version"; + return; + } + + appUploadAppId = server->arg("appId"); + appUploadName = server->arg("name"); + appUploadVersion = server->arg("version"); + appUploadAuthor = server->hasArg("author") ? server->arg("author") : ""; + appUploadDescription = server->hasArg("description") ? server->arg("description") : ""; + appUploadMinFirmware = server->hasArg("minFirmware") ? server->arg("minFirmware") : ""; + + if (!isValidAppId(appUploadAppId)) { + appUploadError = "Invalid appId"; + return; + } + + if (!SdMan.ready()) { + appUploadError = "SD card not ready"; + return; + } + + const String appDir = String("/.crosspoint/apps/") + appUploadAppId; + if (!SdMan.ensureDirectoryExists("/.crosspoint") || !SdMan.ensureDirectoryExists("/.crosspoint/apps") || + !SdMan.ensureDirectoryExists(appDir.c_str())) { + appUploadError = "Failed to create app directory"; + return; + } + + appUploadTempPath = appDir + "/app.bin.tmp"; + appUploadFinalPath = appDir + "/app.bin"; + appUploadManifestPath = appDir + "/app.json"; + + if (SdMan.exists(appUploadTempPath.c_str())) { + SdMan.remove(appUploadTempPath.c_str()); + } + + if (!SdMan.openFileForWrite("APPUPLOAD", appUploadTempPath, appUploadFile)) { + appUploadError = "Failed to create app.bin.tmp"; + return; + } + + Serial.printf("[%lu] [WEB] [APPUPLOAD] START: %s (%s v%s)\n", millis(), appUploadAppId.c_str(), + appUploadName.c_str(), appUploadVersion.c_str()); + } else if (upload.status == UPLOAD_FILE_WRITE) { + if (appUploadFile && appUploadError.isEmpty()) { + const uint8_t* data = upload.buf; + size_t remaining = upload.currentSize; + + while (remaining > 0) { + const size_t space = APP_UPLOAD_BUFFER_SIZE - appUploadBufferPos; + const size_t toCopy = (remaining < space) ? remaining : space; + memcpy(appUploadBuffer + appUploadBufferPos, data, toCopy); + appUploadBufferPos += toCopy; + data += toCopy; + remaining -= toCopy; + + if (appUploadBufferPos >= APP_UPLOAD_BUFFER_SIZE) { + if (!flushAppUploadBuffer()) { + appUploadError = "Failed writing app.bin.tmp (disk full?)"; + appUploadFile.close(); + SdMan.remove(appUploadTempPath.c_str()); + return; + } + } + } + + appUploadSize += upload.currentSize; + } + } else if (upload.status == UPLOAD_FILE_END) { + if (appUploadFile) { + if (!flushAppUploadBuffer()) { + appUploadError = "Failed writing final app.bin.tmp data"; + } + appUploadFile.close(); + + if (!appUploadError.isEmpty()) { + SdMan.remove(appUploadTempPath.c_str()); + return; + } + + if (appUploadSize == 0) { + appUploadError = "Uploaded file is empty"; + SdMan.remove(appUploadTempPath.c_str()); + return; + } + + // Quick firmware sanity check: first byte should be 0xE9. + FsFile checkFile = SdMan.open(appUploadTempPath.c_str(), O_RDONLY); + if (!checkFile) { + appUploadError = "Failed to reopen uploaded file"; + SdMan.remove(appUploadTempPath.c_str()); + return; + } + uint8_t magic = 0; + if (checkFile.read(&magic, 1) != 1 || magic != 0xE9) { + checkFile.close(); + appUploadError = "Invalid firmware image (bad magic byte)"; + SdMan.remove(appUploadTempPath.c_str()); + return; + } + checkFile.close(); + + if (!renameFileAtomic(appUploadTempPath, appUploadFinalPath)) { + appUploadError = "Failed to finalize app.bin"; + SdMan.remove(appUploadTempPath.c_str()); + return; + } + + // Write manifest JSON (atomic). + JsonDocument doc; + doc["name"] = appUploadName; + doc["version"] = appUploadVersion; + doc["description"] = appUploadDescription; + doc["author"] = appUploadAuthor; + doc["minFirmware"] = appUploadMinFirmware; + doc["id"] = appUploadAppId; + doc["uploadMs"] = millis(); + + String manifestJson; + serializeJson(doc, manifestJson); + + const String manifestTmp = appUploadManifestPath + ".tmp"; + if (!SdMan.writeFile(manifestTmp.c_str(), manifestJson)) { + appUploadError = "Failed to write app.json"; + return; + } + if (!renameFileAtomic(manifestTmp, appUploadManifestPath)) { + SdMan.remove(manifestTmp.c_str()); + appUploadError = "Failed to finalize app.json"; + return; + } + + appUploadSuccess = true; + Serial.printf("[%lu] [WEB] [APPUPLOAD] Complete: %s (%u bytes)\n", millis(), appUploadAppId.c_str(), + static_cast(appUploadSize)); + } + } else if (upload.status == UPLOAD_FILE_ABORTED) { + appUploadBufferPos = 0; + if (appUploadFile) { + appUploadFile.close(); + } + if (!appUploadTempPath.isEmpty()) { + SdMan.remove(appUploadTempPath.c_str()); + } + appUploadError = "Upload aborted"; + Serial.printf("[%lu] [WEB] [APPUPLOAD] Upload aborted\n", millis()); + } +} + +void CrossPointWebServer::handleUploadAppPost() const { + if (appUploadSuccess) { + server->send(200, "text/plain", + "App uploaded. Install on device: Home -> Apps -> " + appUploadName + " v" + appUploadVersion); + } else { + const String error = appUploadError.isEmpty() ? "Unknown error during app upload" : appUploadError; + const int code = (error.startsWith("Missing") || error.startsWith("Invalid")) ? 400 : 500; + server->send(code, "text/plain", error); + } +} + void CrossPointWebServer::handleCreateFolder() const { // Get folder name from form data if (!server->hasArg("name")) { diff --git a/src/network/CrossPointWebServer.h b/src/network/CrossPointWebServer.h index 36030292..cac92eec 100644 --- a/src/network/CrossPointWebServer.h +++ b/src/network/CrossPointWebServer.h @@ -69,6 +69,7 @@ class CrossPointWebServer { // Request handlers void handleRoot() const; + void handleAppsPage() const; void handleNotFound() const; void handleStatus() const; void handleFileList() const; @@ -76,6 +77,8 @@ class CrossPointWebServer { void handleDownload() const; void handleUpload() const; void handleUploadPost() const; + void handleUploadApp() const; + void handleUploadAppPost() const; void handleCreateFolder() const; void handleDelete() const; }; diff --git a/src/network/html/AppsPage.html b/src/network/html/AppsPage.html new file mode 100644 index 00000000..8f7bd3cb --- /dev/null +++ b/src/network/html/AppsPage.html @@ -0,0 +1,355 @@ + + + + + + CrossPoint Reader - Apps (Developer) + + + +
+ Home + File Manager + Apps (Developer) +
+ +

Apps (Developer)

+

Upload an app binary to the device SD card for installation via the on-device Apps menu.

+ +
+
+ This is a developer feature. It only uploads files to the SD card. + To install/run an app, use the device UI: Home → Apps → select app → Install. +
+ +
+ + +
Allowed: letters, numbers, dot, underscore, dash. No slashes. Max 64 chars.
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ +
+
+
+
+ +
+
+ +
+

+ CrossPoint E-Reader • Open Source +

+
+ + + + diff --git a/src/network/html/FilesPage.html b/src/network/html/FilesPage.html index bfdbe3cc..4bb6b3d3 100644 --- a/src/network/html/FilesPage.html +++ b/src/network/html/FilesPage.html @@ -575,6 +575,7 @@
Home File Manager + Apps (Developer)
diff --git a/src/network/html/HomePage.html b/src/network/html/HomePage.html index b464cf34..0dcc01e0 100644 --- a/src/network/html/HomePage.html +++ b/src/network/html/HomePage.html @@ -77,6 +77,7 @@
Home File Manager + Apps (Developer)