Three independent improvements to the WiFi/webserver stability: 1. /api/register called registerDevice() directly inside the AsyncWebServer body handler. That function does a blocking HTTPClient POST with a 5s timeout, freezing the AsyncTCP task and tearing down every in-flight HTTP and WebSocket connection. It now goes through the existing apiQueue / filamanApiTask machinery: the endpoint answers 202 immediately (or 503 if the queue is full, which would otherwise leave the UI waiting forever) and the outcome is pushed to the browser as a "registerResult" WebSocket message. setup.html waits for that message instead of the HTTP response. 2. TX power raised from 17dBm to the 19.5dBm maximum. The reduced setting was a compromise against heat, but at marginal signal levels it invites AP-side auth/assoc kicks (reason=2/4/9/202). 3. Disconnect/GOT_IP logging now includes BSSID, RSSI and channel, so a device bouncing between two APs (mesh/repeater with separate DHCP scopes) can be told apart from webserver-induced drops. Both build environments verified.
318 lines
13 KiB
C++
318 lines
13 KiB
C++
#include "website.h"
|
|
#include "commonFS.h"
|
|
#include "api.h"
|
|
#include <ArduinoJson.h>
|
|
#include <ESPAsyncWebServer.h>
|
|
#include "nfc.h"
|
|
#include "scale.h"
|
|
#include "esp_task_wdt.h"
|
|
#include <Update.h>
|
|
#include "display.h"
|
|
#include "ota.h"
|
|
#include "config.h"
|
|
#include "debug.h"
|
|
#include "lang.h"
|
|
|
|
#ifndef VERSION
|
|
#define VERSION "1.2.0"
|
|
#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");
|
|
|
|
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){
|
|
case NFC_IDLE: client->text("{\"type\":\"nfcData\", \"payload\":{}}"); break;
|
|
case NFC_READ_SUCCESS: client->text("{\"type\":\"nfcData\", \"payload\":" + nfcJsonData + "}"); break;
|
|
case NFC_READ_ERROR: client->text("{\"type\":\"nfcData\", \"payload\":{\"error\":\"Read Error\"}}"); break;
|
|
case NFC_WRITING: client->text("{\"type\":\"nfcData\", \"payload\":{\"info\":\"Writing...\"}}"); break;
|
|
case NFC_WRITE_SUCCESS: client->text("{\"type\":\"nfcData\", \"payload\":{\"info\":\"Success\"}}"); break;
|
|
case NFC_WRITE_ERROR: client->text("{\"type\":\"nfcData\", \"payload\":{\"error\":\"Write Error\"}}"); break;
|
|
default: break;
|
|
}
|
|
}
|
|
|
|
void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
|
|
if (type == WS_EVT_CONNECT) {
|
|
Serial.printf("WS Client #%u connected from %s\n", client->id(), client->remoteIP().toString().c_str());
|
|
sendNfcDataToClient(client);
|
|
client->text("{\"type\":\"nfcTag\", \"payload\":{\"found\": " + String(lastSuccess) + "}}");
|
|
} else if (type == WS_EVT_DISCONNECT) {
|
|
Serial.printf("WS Client #%u disconnected\n", client->id());
|
|
} else if (type == WS_EVT_ERROR) {
|
|
Serial.printf("WS Client #%u error: %u\n", client->id(), *((uint16_t*)arg));
|
|
} else if (type == WS_EVT_DATA) {
|
|
JsonDocument doc;
|
|
DeserializationError error = deserializeJson(doc, (char*)data, len);
|
|
if (error) return;
|
|
|
|
if (doc["type"] == "heartbeat") {
|
|
ws.text(client->id(), "{"
|
|
"\"type\":\"heartbeat\","
|
|
"\"freeHeap\":" + String(ESP.getFreeHeap()/1024) + ","
|
|
"\"filaman_connected\":" + String(filamanConnected) + ","
|
|
"\"registered\":" + String(filamanRegistered) + ","
|
|
"\"autoTare\":" + String(autoTare ? "true" : "false") + ""
|
|
"}");
|
|
}
|
|
else if (doc["type"] == "writeNfcTag") {
|
|
if (doc["payload"].is<JsonObject>()) {
|
|
String payloadString;
|
|
serializeJson(doc["payload"], payloadString);
|
|
startWriteJsonToTag((doc["tagType"] == "spool") ? true : false, payloadString.c_str());
|
|
}
|
|
}
|
|
else if (doc["type"] == "scale") {
|
|
if (doc["payload"] == "tare") {
|
|
scaleTareRequest = true;
|
|
ws.textAll("{\"type\":\"scale\",\"payload\":\"success\"}");
|
|
}
|
|
else if (doc["payload"] == "calibrate") {
|
|
scaleCalibrationRequest = true;
|
|
ws.textAll("{\"type\":\"scale\",\"payload\":\"success\"}");
|
|
}
|
|
else if (doc["payload"] == "setAutoTare") {
|
|
setAutoTare(doc["enabled"].as<bool>());
|
|
ws.textAll("{\"type\":\"scale\",\"payload\":\"success\"}");
|
|
}
|
|
}
|
|
else if (doc["type"] == "reconnect") {
|
|
if (doc["payload"] == "filaman") {
|
|
sendHeartbeatAsync();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void sendWriteResult(AsyncWebSocketClient *client, uint8_t success) {
|
|
String response = "{\"type\":\"writeNfcTag\",\"success\":" + String(success ? "1" : "0") + "}";
|
|
if (client) client->text(response); else ws.textAll(response);
|
|
}
|
|
|
|
// Ergebnis der asynchronen Geräte-Registrierung. Der HTTP-Request ist zu diesem
|
|
// Zeitpunkt längst beantwortet (202), das Frontend wartet auf diese WS-Nachricht.
|
|
void sendRegisterResult(bool success) {
|
|
ws.textAll("{\"type\":\"registerResult\",\"success\":" + String(success ? "true" : "false") + "}");
|
|
}
|
|
|
|
void foundNfcTag(AsyncWebSocketClient *client, uint8_t success) {
|
|
if (success == lastSuccess && client == nullptr) return;
|
|
ws.textAll("{\"type\":\"nfcTag\", \"payload\":{\"found\": " + String(success) + "}}");
|
|
lastSuccess = success;
|
|
}
|
|
|
|
void sendNfcData() {
|
|
switch(nfcReaderState){
|
|
case NFC_IDLE: ws.textAll("{\"type\":\"nfcData\", \"payload\":{}}"); break;
|
|
case NFC_READ_SUCCESS: ws.textAll("{\"type\":\"nfcData\", \"payload\":" + nfcJsonData + "}"); break;
|
|
case NFC_READ_ERROR: ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"error\":\"Read Error\"}}"); break;
|
|
case NFC_WRITING: ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"info\":\"Writing...\"}}"); break;
|
|
case NFC_WRITE_SUCCESS: ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"info\":\"Success\"}}"); break;
|
|
case NFC_WRITE_ERROR: ws.textAll("{\"type\":\"nfcData\", \"payload\":{\"error\":\"Write Error\"}}"); break;
|
|
default: break;
|
|
}
|
|
}
|
|
|
|
void setupWebserver(AsyncWebServer &server) {
|
|
oledShowProgressBar(2, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WEBSERVER_INIT));
|
|
|
|
ws.onEvent(onWsEvent);
|
|
server.addHandler(&ws);
|
|
|
|
// ===== 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 /");
|
|
request->send(LittleFS, "/index.html", "text/html");
|
|
});
|
|
|
|
server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
Serial.println("Web: Request /wifi");
|
|
request->send(LittleFS, "/wifi.html", "text/html");
|
|
});
|
|
|
|
server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) {
|
|
Serial.println("Web: Request /upgrade");
|
|
request->send(LittleFS, "/upgrade.html", "text/html");
|
|
});
|
|
|
|
server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
request->send(LittleFS, "/version.txt", "text/plain");
|
|
});
|
|
|
|
// ===== 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("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
Serial.println("Web: Request /setup");
|
|
request->send(LittleFS, "/setup.html", "text/html", false, templateProcessor);
|
|
});
|
|
|
|
// API Routes
|
|
server.on("/api/config", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
JsonDocument doc;
|
|
doc["url"] = filamanUrl;
|
|
doc["registered"] = filamanRegistered;
|
|
String response;
|
|
serializeJson(doc, response);
|
|
request->send(200, "application/json", response);
|
|
});
|
|
|
|
server.on("/api/register", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
|
|
JsonDocument doc;
|
|
DeserializationError error = deserializeJson(doc, (const uint8_t*)data, len);
|
|
if (error) {
|
|
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}");
|
|
return;
|
|
}
|
|
// WICHTIG: registerDevice() macht einen blockierenden HTTPClient-Call
|
|
// (5s Timeout). Direkt hier aufgerufen friert das den AsyncTCP-Task ein
|
|
// und reisst alle laufenden HTTP-/WebSocket-Verbindungen ab. Daher nur
|
|
// einreihen und sofort antworten; das Ergebnis kommt per WebSocket
|
|
// ("registerResult") vom filamanApiTask.
|
|
String url = doc["url"].is<String>() ? doc["url"].as<String>() : String("");
|
|
if (registerDeviceAsync(url, doc["code"].as<String>())) {
|
|
request->send(202, "application/json", "{\"success\": true, \"pending\": true}");
|
|
} else {
|
|
request->send(503, "application/json", "{\"success\": false, \"error\": \"API queue full\"}");
|
|
}
|
|
});
|
|
|
|
server.on("/api/v1/rfid/write", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
|
|
JsonDocument doc;
|
|
DeserializationError error = deserializeJson(doc, (const uint8_t*)data, len);
|
|
if (error) {
|
|
request->send(400, "application/json", "{\"error\": \"Invalid JSON\"}");
|
|
return;
|
|
}
|
|
|
|
// Check if NFC is busy
|
|
if (nfcWriteInProgress) {
|
|
request->send(503, "application/json", "{\"error\": \"NFC busy\"}");
|
|
return;
|
|
}
|
|
|
|
String payloadString;
|
|
serializeJson(doc, payloadString);
|
|
|
|
bool hasSpoolId = !doc["spool_id"].isNull() || !doc["sm_id"].isNull();
|
|
int spoolId = doc["spool_id"] | 0;
|
|
if (spoolId == 0 && doc["sm_id"].is<String>()) {
|
|
spoolId = doc["sm_id"].as<String>().toInt();
|
|
}
|
|
int locationId = doc["location_id"] | 0;
|
|
|
|
startWriteJsonToTag(hasSpoolId, payloadString.c_str(), spoolId, locationId);
|
|
|
|
// Respond immediately
|
|
request->send(200, "application/json", "{\"success\": true, \"message\": \"Schreibvorgang wurde gestartet. Bitte Tag bereit halten...\"}");
|
|
});
|
|
|
|
server.on("/api/version", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
request->send(200, "application/json", "{\"version\": \"" VERSION "\"}");
|
|
});
|
|
|
|
// Language API
|
|
server.on("/api/language", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
JsonDocument doc;
|
|
doc["lang"] = getLangCode();
|
|
String response;
|
|
serializeJson(doc, response);
|
|
request->send(200, "application/json", response);
|
|
});
|
|
|
|
server.on("/api/language", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
|
|
JsonDocument doc;
|
|
DeserializationError error = deserializeJson(doc, (const uint8_t*)data, len);
|
|
if (error) {
|
|
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}");
|
|
return;
|
|
}
|
|
String lang = doc["lang"] | "";
|
|
if (lang == "de") {
|
|
saveLanguage(LANG_DE);
|
|
} else if (lang == "en") {
|
|
saveLanguage(LANG_EN);
|
|
} else {
|
|
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid language\"}");
|
|
return;
|
|
}
|
|
request->send(200, "application/json", "{\"success\": true}");
|
|
});
|
|
|
|
// Display Settings API
|
|
server.on("/api/display", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
JsonDocument doc;
|
|
doc["sleepTimeout"] = oledSleepTimeout;
|
|
String response;
|
|
serializeJson(doc, response);
|
|
request->send(200, "application/json", response);
|
|
});
|
|
|
|
server.on("/api/display", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
|
|
JsonDocument doc;
|
|
DeserializationError error = deserializeJson(doc, (const uint8_t*)data, len);
|
|
if (error) {
|
|
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}");
|
|
return;
|
|
}
|
|
if (!doc["sleepTimeout"].is<int>()) {
|
|
request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing sleepTimeout\"}");
|
|
return;
|
|
}
|
|
uint16_t timeout = (uint16_t)constrain((int)doc["sleepTimeout"], 0, 3600);
|
|
saveOledSleepTimeout(timeout);
|
|
request->send(200, "application/json", "{\"success\": true}");
|
|
});
|
|
|
|
server.on("/api/v1/rfid/scan-request", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
|
|
setScanRequest(true);
|
|
request->send(200, "application/json", "{\"success\": true}");
|
|
});
|
|
|
|
server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
request->send(200, "text/plain", "Rebooting...");
|
|
delay(500);
|
|
ESP.restart();
|
|
});
|
|
|
|
handleUpdate(server);
|
|
|
|
server.onNotFound([](AsyncWebServerRequest *request){
|
|
request->send(404, "text/plain", "Not found");
|
|
});
|
|
|
|
server.begin();
|
|
Serial.println("Webserver gestartet");
|
|
}
|