ServerSideEvents

Author: SciLor

Hackiebox.cpp

@@ -5,8 +5,8 @@ BoxConfig Config;
 BoxEvents Events;
 Hackiebox Box;
 
-void crash(crashSource source, uint32_t sp) {
-    Log.info("crashSource=%i, sp=%X", source, sp);
+void crash(crashSource source, uint32_t* sp) {
+    Log.info("crashSource=%i, sp=%X, sp=%X", source, sp, (uint32_t)sp-0x20004000);
 
     if (source == CRASH_TEST)
       return;
@@ -138,6 +138,8 @@ void Hackiebox::setup() {
     //Dont refactor, otherwise box may crash
     boxBattery._batteryTestThread = EnhancedThread(ThreadCallbackHandler([&]() { boxBattery._doBatteryTestStep(); }), 10*60*1000);
     boxBattery._batteryTestThread.enabled = false;
+
+    logStreamSse.setSsePaused(false);
 
     boxLEDs.defaultIdleAnimation();
     Log.info("Hackiebox started!");

LogStreamMulti.cpp

@@ -35,7 +35,7 @@ size_t LogStreamMulti::println() {
     for (uint8_t i = 0; i < LOG_STREAM_MULTI_MAX_SIZE; i++) {
         if (_streams[i] == 0)
             continue;
-        result = _streams[i]->print("\r\n");
+        result = _streams[i]->println();//("\r\n");
     }
     flush();
     return 2;
@@ -46,6 +46,7 @@ void LogStreamMulti::flush() {
         if (_streams[i] == 0)
             continue;
         _streams[i]->write((const uint8_t*)&_buffer, _getBufferPosition());
+        _streams[i]->flush();
     }
     memset(_buffer, '\0', LOG_STREAM_MULTI_BUFFER_SIZE);
 }

LogStreamSse.cpp

@@ -6,20 +6,44 @@
 size_t LogStreamSse::write(uint8_t character)  {
     if (Box.webServer.subscriptionCount == 0 || _ssePaused)
         return 0;
-        
+    
     for (uint8_t i = 0; i < SSE_MAX_CHANNELS; i++) {
         WrapperWebServer::SSESubscription* subscription = &Box.webServer.subscription[i];
         WiFiClient* client = &(subscription->client);
         if (!(subscription->clientIP) || !client->connected()) 
             continue;
 
-        if (_lineFinished) {
-            client->print("data: { \"type\":\"");
-            client->print("log");
-            client->print("\", \"data\":\"");
-            _lineFinished = false;
+        bool tagIsOpen = _tagIsOpen;
+        if (character == '\n') {
+            if (_tagIsOpen) {
+                client->print("\" }\n\n"); // Extra newline required by SSE standard
+                tagIsOpen = false;
+            } 
+            client->flush();
+        } else {
+            if (!_tagIsOpen) {
+                client->print("data: { \"type\":\"");
+                client->print("log");
+                client->print("\", \"data\":\"");
+                tagIsOpen = true;
+            }
+            switch (character) {
+            case '\r':
+            case '\b':
+            case '\f':
+                break;
+            case '\t':
+                break;
+                client->print("\\t");
+            case '\"':
+                break;
+                client->print("\\\"");
+            default:
+                client->print((char)character);
+                break;
+            }
         }
-        client->print(character); //TODO escape ";
+        _tagIsOpen = tagIsOpen;
     }
     return 1;
 }
@@ -28,12 +52,7 @@ size_t LogStreamSse::println() {
     if (Box.webServer.subscriptionCount == 0 || _ssePaused)
         return 0;
 
-    size_t result = print("\" }\n\n"); // Extra newline required by SSE standard
-    _lineFinished = true;
-    return result;
-}
-bool LogStreamSse::isLineFinished() {
-    return _lineFinished;
+    return print("\n");
 }
 void LogStreamSse::setSsePaused(bool paused) {
     _ssePaused = paused;

LogStreamSse.h

@@ -13,12 +13,11 @@ class LogStreamSse : public Stream {
         int peek() { return 0; };
         void flush() { };
 
-        bool isLineFinished();
         void setSsePaused(bool paused);
 
     private:
-        bool _lineFinished = true;
         bool _ssePaused = true;
+        bool _tagIsOpen = false;
 };
 
 #endif

web/hackiebox.html

@@ -410,7 +410,7 @@ <h2>Credits</h2>
           this._contentPage = new ContentPage();
           this._server = this._params.get("server");
           this._console = new WebConsole(this);
-          //this._initSse();
+          this._initSse();
 
           $("input[type='checkbox']").bootstrapSwitch();
 
@@ -703,4 +703,4 @@ <h2>Credits</h2>
       }
     </script>
   </body>
-</html>
+</html>