feat: implement template processor for dynamic HTML variable replacement and optimize static asset serving with caching
This commit is contained in:
1 parent
0f8d3d470d
commit
a3dd4b164e
4 files changed
+49
-51
No files matched your search
+2
-2
@@ -41,11 +41,11 @@
|
||||
|
||||
<div class="fm-card">
|
||||
<h2>System Registration</h2>
|
||||
<p>Current Status: <strong style="color: var(--accent);">{{registered}}</strong></p>
|
||||
<p>Current Status: <strong style="color: var(--accent);">%registered%</strong></p>
|
||||
|
||||
<div class="fm-form-group" style="margin-top: 2rem;">
|
||||
<label class="fm-label" for="filamanUrl">FilaMan API URL</label>
|
||||
<input type="text" id="filamanUrl" class="fm-input" value="{{filamanUrl}}" placeholder="e.g. http://192.168.1.10:8000">
|
||||
<input type="text" id="filamanUrl" class="fm-input" value="%filamanUrl%" placeholder="e.g. http://192.168.1.10:8000">
|
||||
</div>
|
||||
|
||||
<div class="fm-form-group">
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@
|
||||
<button id="tareBtn" class="fm-btn fm-btn-outline">Tare Scale</button>
|
||||
|
||||
<label class="status-pill" style="display: flex; align-items: center; gap: 0.5rem; cursor: pointer;">
|
||||
<input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);" {{autoTare}}>
|
||||
<input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);" %autoTare%>
|
||||
<span>Enable Auto-TARE</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
+12
-2
@@ -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;
|
||||
}
|
||||
|
||||
+34
-46
@@ -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
|
||||
|
||||
Reference in new issue
Block a user