Merge pull request letscontrolit#5181 from TD-er/bugfix/stalled_webpa…

…ge_loading [Webserver] Fix stalled web requests and not saving rules via Ethernet
Micha-he · Dec 16, 2024 · 2a91472 · 2a91472
2 parents 13555c1 + ff979d3
commit 2a91472
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini
@@ -169,7 +169,7 @@ extra_scripts             = ${esp82xx_common.extra_scripts}
 ; For MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS See: https://github.com/espressif/arduino-esp32/pull/6676
 [core_esp32_IDF5_1_4__3_0_5_SPIFFS]
 platform                    = https://github.com/tasmota/platform-espressif32/releases/download/2024.09.10/platform-espressif32.zip
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3110/framework-arduinoespressif32-all-release_v5.1-632e0c2.zip
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3202/framework-arduinoespressif32-all-release_v5.1-41a885b.zip
 build_flags                 = -DESP32_STAGE
                               -DESP_IDF_VERSION_MAJOR=5
                               -DLIBRARIES_NO_LOG=1
@@ -197,8 +197,9 @@ lib_extra_dirs            =
 
 ; ESP_IDF 5.3.1
 [core_esp32_IDF5_3_1__3_0_5_LittleFS]
-platform                  = https://github.com/tasmota/platform-espressif32/releases/download/2024.10.31/platform-espressif32.zip
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3112/framework-arduinoespressif32-all-release_v5.3-1c74f314.zip
+platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF53
+;platform                  = https://github.com/tasmota/platform-espressif32/releases/download/2024.10.31/platform-espressif32.zip
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3203/framework-arduinoespressif32-all-release_v5.3-ddc10306.zip
 build_flags                 = -DESP32_STAGE
                               -DESP_IDF_VERSION_MAJOR=5
                               -DLIBRARIES_NO_LOG=1

diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini
@@ -2,8 +2,9 @@
 ; IDF 5.3.1
 [esp32_solo1_common_LittleFS]
 extends                   = esp32_base_idf5
-platform                  = https://github.com/tasmota/platform-espressif32/releases/download/2024.10.31/platform-espressif32.zip
-platform_packages         = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3113/framework-arduinoespressif32-solo1-release_v5.3-1c74f314.zip
+platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF53
+;platform                  = https://github.com/tasmota/platform-espressif32/releases/download/2024.12.30/platform-espressif32.zip
+platform_packages = framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3204/framework-arduinoespressif32-solo1-release_v5.3-ddc10306.zip
 build_flags               = ${esp32_base_idf5.build_flags}
                             -DFEATURE_ARDUINO_OTA=1
                             -DUSE_LITTLEFS

diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp
@@ -221,6 +221,10 @@ void Web_StreamingBuffer::startStream(bool allowOriginAll,
   sentBytes    = 0;
   buf.clear();
   buf.reserve(CHUNKED_BUFFER_SIZE);
+  web_server.client().setNoDelay(true);
+#ifdef ESP32
+  web_server.client().setSSE(false);
+#endif
 
   if (beforeTXRam < 3000) {
     lowMemorySkip = true;
@@ -290,6 +294,7 @@ void Web_StreamingBuffer::endStream() {
     lowMemorySkip = false;
   }
   delay(5);
+//  web_server.client().stop();
 }
 
 
@@ -402,7 +407,7 @@ void Web_StreamingBuffer::sendHeaderBlocking(bool allowOriginAll,
     web_server.sendHeader(F("Access-Control-Allow-Origin"), origin);
   }
   web_server.send(httpCode, content_type, EMPTY_STRING);
-
+#ifdef ESP8266
   // dont wait on 2.3.0. Memory returns just too slow.
   while ((ESP.getFreeHeap() < freeBeforeSend) &&
          !timeOutReached(beginWait + timeout)) {
@@ -411,6 +416,7 @@ void Web_StreamingBuffer::sendHeaderBlocking(bool allowOriginAll,
     #endif
     delay(1);
   }
+#endif
 #endif // if defined(ESP8266) && defined(ARDUINO_ESP8266_RELEASE_2_3_0)
   delay(0);
 }
diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp
@@ -204,9 +204,10 @@ bool MQTTConnect(controllerIndex_t controller_idx)
 
   //  mqtt = WiFiClient(); // workaround see: https://github.com/esp8266/Arduino/issues/4497#issuecomment-373023864
   delay(0);
+# if FEATURE_MQTT_TLS
+
   uint16_t mqttPort = ControllerSettings->Port;
 
-# if FEATURE_MQTT_TLS
   mqtt_tls_last_errorstr.clear();
   mqtt_tls_last_error = 0;
   const TLS_types TLS_type = ControllerSettings->TLStype();

diff --git a/src/src/WebServer/Rules.cpp b/src/src/WebServer/Rules.cpp
@@ -549,7 +549,9 @@ void Rule_showRuleTextArea(const String& fileName) {
   addHtml(F("<textarea id='rules' name='rules' rows='30' wrap='off'>"));
   size = streamFromFS(fileName, true);
   addHtml(F("</textarea>"));
+  #if FEATURE_RULES_EASY_COLOR_CODE
   addHtml(F("<script>initCM();</script>"));
+  #endif
 
   html_TR_TD();
   addHtml(F("Current size: <span id='size'>"));