Try to fix #24 and https://t.me/XZG_FW/17/804

xyzroe · May 27, 2024 · b980a62 · b980a62
1 parent 2499e1b
commit b980a62
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git 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
@@ -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();
     }
 }