diff --git a/data/setup.html b/data/setup.html index 80d091c..75616c1 100644 --- a/data/setup.html +++ b/data/setup.html @@ -41,11 +41,11 @@

System Registration

-

Current Status: {{registered}}

+

Current Status: %registered%

- +
diff --git a/data/waage.html b/data/waage.html index addd5ee..0b89a40 100644 --- a/data/waage.html +++ b/data/waage.html @@ -46,7 +46,7 @@
diff --git a/src/commonFS.cpp b/src/commonFS.cpp index b14736f..71aec12 100644 --- a/src/commonFS.cpp +++ b/src/commonFS.cpp @@ -57,10 +57,20 @@ String readFile(const char* filename) { Serial.println(filename); return ""; } - String content = ""; + + // Effizient: Speicher vorab allokieren und in Blöcken lesen + // Alte Implementierung war O(n²) wegen Byte-für-Byte String-Konkatenation + size_t fileSize = file.size(); + String content; + content.reserve(fileSize + 1); // Speicher vorab allokieren + + // Lese in 512-Byte Blöcken statt Byte für Byte + char buffer[512]; while (file.available()) { - content += (char)file.read(); + size_t bytesRead = file.readBytes(buffer, sizeof(buffer)); + content.concat(buffer, bytesRead); } + file.close(); return content; } diff --git a/src/website.cpp b/src/website.cpp index 551499b..bda4534 100644 --- a/src/website.cpp +++ b/src/website.cpp @@ -18,6 +18,7 @@ #endif #define NO_CACHE "no-cache, no-store, must-revalidate" +#define CACHE_ASSETS "max-age=86400" // 24h Cache für statische Assets AsyncWebServer server(webserverPort); AsyncWebSocket ws("/ws"); @@ -25,6 +26,15 @@ AsyncWebSocket ws("/ws"); uint8_t lastSuccess = 0; nfcReaderStateType lastnfcReaderState = NFC_IDLE; +// Template-Processor für dynamische Seiten (ESPAsyncWebServer built-in) +// Ersetzt %variable% Platzhalter in HTML-Dateien +String templateProcessor(const String& var) { + if (var == "registered") return filamanRegistered ? "Registered" : "Not Registered"; + if (var == "filamanUrl") return filamanUrl; + if (var == "autoTare") return autoTare ? "checked" : ""; + return String(); // Unbekannte Variable - leer zurückgeben +} + void sendNfcDataToClient(AsyncWebSocketClient *client) { if(!client) return; switch(nfcReaderState){ @@ -119,69 +129,47 @@ void setupWebserver(AsyncWebServer &server) { ws.onEvent(onWsEvent); server.addHandler(&ws); - // Static Routes + // ===== STATISCHE ASSETS mit serveStatic() ===== + // Optimiert für concurrent Requests, mit 24h Browser-Cache + // serveStatic() ist nicht-blockierend und handhabt parallele Requests besser + server.serveStatic("/style.css", LittleFS, "/style.css") + .setCacheControl(CACHE_ASSETS); + server.serveStatic("/logo.png", LittleFS, "/logo.png") + .setCacheControl(CACHE_ASSETS); + server.serveStatic("/favicon.ico", LittleFS, "/favicon.ico") + .setCacheControl(CACHE_ASSETS); + + // ===== STATISCHE HTML-SEITEN (ohne Template-Ersetzung) ===== server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){ Serial.println("Web: Request /"); - AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/index.html", "text/html"); - response->addHeader("Cache-Control", NO_CACHE); - request->send(response); - }); - - server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){ - Serial.println("Web: Request /waage"); - String html = readFile("/waage.html"); - html.replace("{{autoTare}}", autoTare ? "checked" : ""); - auto response = request->beginResponse(200, "text/html", html); - response->addHeader("Cache-Control", NO_CACHE); - request->send(response); - }); - - server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){ - Serial.println("Web: Request /setup"); - String html = readFile("/setup.html"); - html.replace("{{registered}}", filamanRegistered ? "Registered" : "Not Registered"); - html.replace("{{filamanUrl}}", filamanUrl); - auto response = request->beginResponse(200, "text/html", html); - response->addHeader("Cache-Control", NO_CACHE); - request->send(response); + request->send(LittleFS, "/index.html", "text/html"); }); server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){ Serial.println("Web: Request /wifi"); - AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/wifi.html", "text/html"); - response->addHeader("Cache-Control", NO_CACHE); - request->send(response); + request->send(LittleFS, "/wifi.html", "text/html"); }); server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) { Serial.println("Web: Request /upgrade"); - AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/upgrade.html", "text/html"); - response->addHeader("Cache-Control", NO_CACHE); - request->send(response); + request->send(LittleFS, "/upgrade.html", "text/html"); }); server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){ - AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/version.txt", "text/plain"); - response->addHeader("Cache-Control", NO_CACHE); - request->send(response); + request->send(LittleFS, "/version.txt", "text/plain"); }); - server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){ - AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css"); - response->addHeader("Cache-Control", NO_CACHE); - request->send(response); + // ===== DYNAMISCHE HTML-SEITEN (mit Template-Processor) ===== + // Nutzt den eingebauten Template-Processor für %variable% Ersetzung + // Nicht-blockierend: Datei wird gestreamt und Variablen on-the-fly ersetzt + server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){ + Serial.println("Web: Request /waage"); + request->send(LittleFS, "/waage.html", "text/html", false, templateProcessor); }); - server.on("/logo.png", HTTP_GET, [](AsyncWebServerRequest *request){ - AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/logo.png", "image/png"); - response->addHeader("Cache-Control", NO_CACHE); - request->send(response); - }); - - server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request){ - AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/favicon.ico", "image/x-icon"); - response->addHeader("Cache-Control", NO_CACHE); - request->send(response); + server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){ + Serial.println("Web: Request /setup"); + request->send(LittleFS, "/setup.html", "text/html", false, templateProcessor); }); // API Routes