From b980a62ce819c598b9e2e633c089ce68392f5e47 Mon Sep 17 00:00:00 2001 From: xyzroe Date: Tue, 28 May 2024 00:29:31 +0200 Subject: [PATCH] Try to fix #24 and https://t.me/XZG_FW/17/804 --- src/version.h | 2 +- src/web.cpp | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/version.h b/src/version.h index aa76c0f..94baff3 100644 --- a/src/version.h +++ b/src/version.h @@ -1,4 +1,4 @@ // AUTO GENERATED FILE #ifndef VERSION - #define VERSION "20240526" + #define VERSION "20240528" #endif diff --git a/src/web.cpp b/src/web.cpp index 56d51c1..425d47b 100644 --- a/src/web.cpp +++ b/src/web.cpp @@ -351,13 +351,13 @@ void handleEspUpdateUpload() } } -void handleEvents() -{ - if (is_authenticated()) - { +void handleEvents() { + if (is_authenticated()) { + if (eventsClient) { + eventsClient.stop(); + } eventsClient = serverWeb.client(); - if (eventsClient) - { // send events header + if (eventsClient) { eventsClient.println("HTTP/1.1 200 OK"); eventsClient.println("Content-Type: text/event-stream;"); eventsClient.println("Connection: close"); @@ -369,15 +369,12 @@ void handleEvents() } } -void sendEvent(const char *event, const uint8_t evsz, const String data) -{ - if (eventsClient) - { +void sendEvent(const char *event, const uint8_t evsz, const String data) { + if (eventsClient) { char evnmArr[10 + evsz]; - sprintf(evnmArr, "event: %s\n", event); + snprintf(evnmArr, sizeof(evnmArr), "event: %s\n", event); eventsClient.print(evnmArr); eventsClient.print(String("data: ") + data + "\n\n"); - // eventsClient.println(); eventsClient.flush(); } }