Draft: AsyncWebServer queue support

platformio.ini

@@ -140,7 +140,7 @@ lib_deps =
  IRremoteESP8266 @ 2.8.2
  makuna/NeoPixelBus @ 2.8.0
  #https://github.com/makuna/NeoPixelBus.git#CoreShaderBeta
- https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.2.1
+ https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.3.0
  # for I2C interface
  ;Wire
  # ESP-NOW library
@@ -234,7 +234,7 @@ lib_deps_compat =
  IRremoteESP8266 @ 2.8.2
  makuna/NeoPixelBus @ 2.7.9
  https://github.com/blazoncek/QuickESPNow.git#optional-debug
- https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.2.1
+ https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.3.0 
 
 
 [esp32]
@@ -256,7 +256,7 @@ large_partitions = tools/WLED_ESP32_8MB.csv
 extreme_partitions = tools/WLED_ESP32_16MB_9MB_FS.csv
 lib_deps =
  https://github.com/lorol/LITTLEFS.git
- https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
+ willmmiles/AsyncTCP @ 1.3.0
  ${env.lib_deps}
 # additional build flags for audioreactive
 AR_build_flags = -D USERMOD_AUDIOREACTIVE
@@ -276,7 +276,7 @@ build_flags = -g
  -D CONFIG_ASYNC_TCP_USE_WDT=0
  -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
 lib_deps =
- https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
+ willmmiles/AsyncTCP @ 1.3.0
  ${env.lib_deps}
 
 [esp32s2]
@@ -294,7 +294,7 @@ build_flags = -g
  ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
  ;; ARDUINO_USB_CDC_ON_BOOT
 lib_deps =
- https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
+ willmmiles/AsyncTCP @ 1.3.0
  ${env.lib_deps}
 
 [esp32c3]
@@ -311,7 +311,7 @@ build_flags = -g
  ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
  ;; ARDUINO_USB_CDC_ON_BOOT
 lib_deps =
- https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
+ willmmiles/AsyncTCP @ 1.3.0
  ${env.lib_deps}
 
 [esp32s3]
@@ -329,7 +329,7 @@ build_flags = -g
  ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
  ;; ARDUINO_USB_MODE, ARDUINO_USB_CDC_ON_BOOT
 lib_deps =
- https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
+ willmmiles/AsyncTCP @ 1.3.0
  ${env.lib_deps}
 
 

tools/stress_test.sh

@@ -27,6 +27,7 @@ read -a JSON_TINY_TARGETS <<< $(replicate "json/nodes")
 read -a JSON_SMALL_TARGETS <<< $(replicate "json/info")
 read -a JSON_LARGE_TARGETS <<< $(replicate "json/si")
 read -a JSON_LARGER_TARGETS <<< $(replicate "json/fxdata")
+read -a INDEX_TARGETS <<< $(replicate "")
 
 # Expand target URLS to full arguments for curl
 TARGETS=(${TARGET_STR[@]})

wled00/const.h

@@ -557,8 +557,25 @@
  #endif
 #endif
 
-//#define MIN_HEAP_SIZE (8k for AsyncWebServer)
-#define MIN_HEAP_SIZE 8192
+//#define MIN_HEAP_SIZE
+#define MIN_HEAP_SIZE 2048
+
+// Web server limits
+#ifdef ESP8266
+// Minimum heap to consider handling a request
+#define WLED_REQUEST_MIN_HEAP (8*1024)
+// Estimated maximum heap required by any one request
+#define WLED_REQUEST_HEAP_USAGE (6*1024)
+#else
+// ESP32 TCP stack needs much more RAM than ESP8266
+// Minimum heap remaining before queuing a request
+#define WLED_REQUEST_MIN_HEAP (12*1024)
+// Estimated maximum heap required by any one request
+#define WLED_REQUEST_HEAP_USAGE (12*1024)
+#endif
+// Maximum number of requests in queue; absolute cap on web server resource usage.
+// Websockets do not count against this limit.
+#define WLED_REQUEST_MAX_QUEUE 6
 
 // Maximum size of node map (list of other WLED instances)
 #ifdef ESP8266

wled00/json.cpp

@@ -1103,7 +1103,7 @@ void serveJson(AsyncWebServerRequest* request)
  }
 
  if (!requestJSONBufferLock(17)) {
- serveJsonError(request, 503, ERR_NOBUF);
+ request->deferResponse(); 
  return;
  }
  // releaseJSONBufferLock() will be called when "response" is destroyed (from AsyncWebServer)

wled00/set.cpp

@@ -622,7 +622,10 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
  //USERMODS
  if (subPage == SUBPAGE_UM)
  {
- if (!requestJSONBufferLock(5)) return;
+ if (!requestJSONBufferLock(5)) {
+ request->deferResponse();
+ return;
+ }
 
  // global I2C & SPI pins
  int8_t hw_sda_pin = !request->arg(F("SDA")).length() ? -1 : (int)request->arg(F("SDA")).toInt();

wled00/wled.cpp

@@ -293,6 +293,7 @@ void WLED::loop()
  DEBUG_PRINTF_P(PSTR("Strip time[ms]:%u/%lu\n"), avgStripMillis/loops, maxStripMillis);
  }
  strip.printSize();
+ server.printStatus(DEBUGOUT);
  loops = 0;
  maxLoopMillis = 0;
  maxUsermodMillis = 0;

wled00/wled.h

@@ -864,7 +864,7 @@ WLED_GLOBAL bool ledStatusState _INIT(false); // the current LED state
 #endif
 
 // server library objects
-WLED_GLOBAL AsyncWebServer server _INIT_N(((80)));
+WLED_GLOBAL AsyncWebServer server _INIT_N(((80, {0, WLED_REQUEST_MAX_QUEUE, WLED_REQUEST_MIN_HEAP, WLED_REQUEST_HEAP_USAGE})));
 #ifdef WLED_ENABLE_WEBSOCKETS
 WLED_GLOBAL AsyncWebSocket ws _INIT_N((("/ws")));
 #endif

wled00/wled_server.cpp

@@ -283,7 +283,7 @@ void initServer()
  bool isConfig = false;
 
  if (!requestJSONBufferLock(14)) {
- serveJsonError(request, 503, ERR_NOBUF);
+ request->deferResponse();
  return;
  }