Merge branch 'main' into main

ayushsharma82 · web-flow · commit c442a9cd782a · 2025-03-01T22:26:21.000+05:30
diff --git a/.github/workflows/build-arduino.yml b/.github/workflows/build-arduino.yml
@@ -32,7 +32,7 @@ jobs:
         run: arduino-cli lib install ArduinoJson
 
       - name: Install AsyncTCP (ESP32)
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/AsyncTCP#v3.3.5
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/AsyncTCP#v3.3.6
 
       - name: Checkout
         uses: actions/checkout@v4
@@ -63,7 +63,7 @@ jobs:
         run: arduino-cli lib install ArduinoJson
 
       - name: Install AsyncTCP (ESP32)
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/AsyncTCP#v3.3.5
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/AsyncTCP#v3.3.6
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/data/README.md b/data/README.md
@@ -0,0 +1,48 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin euismod, purus a euismod
+rhoncus, urna ipsum cursus massa, eu dictum tellus justo ac justo. Quisque ullamcorper
+arcu nec tortor ullamcorper, vel fermentum justo fermentum. Vivamus sed velit ut elit
+accumsan congue ut ut enim. Ut eu justo eu lacus varius gravida ut a tellus. Nulla facilisi.
+Integer auctor consectetur ultricies. Fusce feugiat, mi sit amet bibendum viverra, orci leo
+dapibus elit, id varius sem dui id lacus.</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin euismod, purus a euismod
+rhoncus, urna ipsum cursus massa, eu dictum tellus justo ac justo. Quisque ullamcorper
+arcu nec tortor ullamcorper, vel fermentum justo fermentum. Vivamus sed velit ut elit
+accumsan congue ut ut enim. Ut eu justo eu lacus varius gravida ut a tellus. Nulla facilisi.
+Integer auctor consectetur ultricies. Fusce feugiat, mi sit amet bibendum viverra, orci leo
+dapibus elit, id varius sem dui id lacus.</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin euismod, purus a euismod
+rhoncus, urna ipsum cursus massa, eu dictum tellus justo ac justo. Quisque ullamcorper
+arcu nec tortor ullamcorper, vel fermentum justo fermentum. Vivamus sed velit ut elit
+accumsan congue ut ut enim. Ut eu justo eu lacus varius gravida ut a tellus. Nulla facilisi.
+Integer auctor consectetur ultricies. Fusce feugiat, mi sit amet bibendum viverra, orci leo
+dapibus elit, id varius sem dui id lacus.</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin euismod, purus a euismod
+rhoncus, urna ipsum cursus massa, eu dictum tellus justo ac justo. Quisque ullamcorper
+arcu nec tortor ullamcorper, vel fermentum justo fermentum. Vivamus sed velit ut elit
+accumsan congue ut ut enim. Ut eu justo eu lacus varius gravida ut a tellus. Nulla facilisi.
+Integer auctor consectetur ultricies. Fusce feugiat, mi sit amet bibendum viverra, orci leo
+dapibus elit, id varius sem dui id lacus.</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin euismod, purus a euismod
+rhoncus, urna ipsum cursus massa, eu dictum tellus justo ac justo. Quisque ullamcorper
+arcu nec tortor ullamcorper, vel fermentum justo fermentum. Vivamus sed velit ut elit
+accumsan congue ut ut enim. Ut eu justo eu lacus varius gravida ut a tellus. Nulla facilisi.
+Integer auctor consectetur ultricies. Fusce feugiat, mi sit amet bibendum viverra, orci leo
+dapibus elit, id varius sem dui id lacus.</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin euismod, purus a euismod
+rhoncus, urna ipsum cursus massa, eu dictum tellus justo ac justo. Quisque ullamcorper
+arcu nec tortor ullamcorper, vel fermentum justo fermentum. Vivamus sed velit ut elit
+accumsan congue ut ut enim. Ut eu justo eu lacus varius gravida ut a tellus. Nulla facilisi.
+Integer auctor consectetur ultricies. Fusce feugiat, mi sit amet bibendum viverra, orci leo
+dapibus elit, id varius sem dui id lacus.</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin euismod, purus a euismod
+rhoncus, urna ipsum cursus massa, eu dictum tellus justo ac justo. Quisque ullamcorper
+arcu nec tortor ullamcorper, vel fermentum justo fermentum. Vivamus sed velit ut elit
+accumsan congue ut ut enim. Ut eu justo eu lacus varius gravida ut a tellus. Nulla facilisi.
+Integer auctor consectetur ultricies. Fusce feugiat, mi sit amet bibendum viverra, orci leo
+dapibus elit, id varius sem dui id lacus.</p>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin euismod, purus a euismod
+rhoncus, urna ipsum cursus massa, eu dictum tellus justo ac justo. Quisque ullamcorper
+arcu nec tortor ullamcorper, vel fermentum justo fermentum. Vivamus sed velit ut elit
+accumsan congue ut ut enim. Ut eu justo eu lacus varius gravida ut a tellus. Nulla facilisi.
+Integer auctor consectetur ultricies. Fusce feugiat, mi sit amet bibendum viverra, orci leo
+dapibus elit, id varius sem dui id lacus.
diff --git a/examples/PartitionDownloader/PartitionDownloader.ino b/examples/PartitionDownloader/PartitionDownloader.ino
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// - Download ESP32 partition by name and/or type and/or subtype
+// - Support encrypted and non-encrypted partitions
+//
+
+#include <Arduino.h>
+#ifdef ESP32
+#include <AsyncTCP.h>
+#include <WiFi.h>
+#elif defined(ESP8266)
+#include <ESP8266WiFi.h>
+#include <ESPAsyncTCP.h>
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include <RPAsyncTCP.h>
+#include <WiFi.h>
+#endif
+
+#include <ESPAsyncWebServer.h>
+#include <LittleFS.h>
+
+#ifndef ESP32
+// this example is only for the ESP32
+void setup() {}
+void loop() {}
+#else
+
+#include <esp_partition.h>
+
+static AsyncWebServer server(80);
+
+void setup() {
+  Serial.begin(115200);
+
+#ifndef CONFIG_IDF_TARGET_ESP32H2
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  LittleFS.begin(true);
+
+  // To upload the FS partition, run:
+  // > pio run -e arduino-3 -t buildfs
+  // > pio run -e arduino-3 -t uploadfs
+  //
+  // Examples:
+  //
+  // - Download the partition named "spiffs": http://192.168.4.1/partition?label=spiffs
+  // - Download the partition named "spiffs" with type "data": http://192.168.4.1/partition?label=spiffs&type=1
+  // - Download the partition named "spiffs" with type "data" and subtype "spiffs": http://192.168.4.1/partition?label=spiffs&type=1&subtype=130
+  // - Download the partition with subtype "nvs": http://192.168.4.1/partition?type=1&subtype=2
+  //
+  // "type" and "subtype" IDs can be found in esp_partition.h header file.
+  //
+  // Add "&raw=false" parameter to download the partition unencrypted (for encrypted partitions).
+  // By default, the raw partition is downloaded, so if a partition is encrypted, the encrypted data will be downloaded.
+  //
+  // To browse a downloaded LittleFS partition, you can use https://tniessen.github.io/littlefs-disk-img-viewer/ (block size is 4096)
+  //
+  server.on("/partition", HTTP_GET, [](AsyncWebServerRequest *request) {
+    const AsyncWebParameter *pLabel = request->getParam("label");
+    const AsyncWebParameter *pType = request->getParam("type");
+    const AsyncWebParameter *pSubtype = request->getParam("subtype");
+    const AsyncWebParameter *pRaw = request->getParam("raw");
+
+    if (!pLabel && !pType && !pSubtype) {
+      request->send(400, "text/plain", "Bad request: missing parameter");
+      return;
+    }
+
+    esp_partition_type_t type = ESP_PARTITION_TYPE_ANY;
+    esp_partition_subtype_t subtype = ESP_PARTITION_SUBTYPE_ANY;
+    const char *label = nullptr;
+    bool raw = true;
+
+    if (pLabel) {
+      label = pLabel->value().c_str();
+    }
+
+    if (pType) {
+      type = (esp_partition_type_t)pType->value().toInt();
+    }
+
+    if (pSubtype) {
+      subtype = (esp_partition_subtype_t)pSubtype->value().toInt();
+    }
+
+    if (pRaw && pRaw->value() == "false") {
+      raw = false;
+    }
+
+    const esp_partition_t *partition = esp_partition_find_first(type, subtype, label);
+
+    if (!partition) {
+      request->send(404, "text/plain", "Partition not found");
+      return;
+    }
+
+    AsyncWebServerResponse *response =
+      request->beginChunkedResponse("application/octet-stream", [partition, raw](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+        const size_t remaining = partition->size - index;
+        if (!remaining) {
+          return 0;
+        }
+        const size_t len = std::min(maxLen, remaining);
+        if (raw && esp_partition_read_raw(partition, index, buffer, len) == ESP_OK) {
+          return len;
+        }
+        if (!raw && esp_partition_read(partition, index, buffer, len) == ESP_OK) {
+          return len;
+        }
+        return 0;
+      });
+
+    response->addHeader("Content-Disposition", "attachment; filename=" + String(partition->label) + ".bin");
+    response->setContentLength(partition->size);
+
+    request->send(response);
+  });
+
+  server.begin();
+}
+
+void loop() {
+  delay(100);
+}
+
+#endif
diff --git a/idf_component.yml b/idf_component.yml
@@ -26,10 +26,10 @@ files:
     - "pre-commit.requirements.txt"
 dependencies:
   esp32async/asynctcp:
-    version: "^3.3.5"
+    version: "^3.3.6"
     require: public
   bblanchon/arduinojson:
-    version: "^7.3.0"
+    version: "^7.3.1"
     require: public
 examples:
   - path: ./idf_component_examples/catchall
diff --git a/library.json b/library.json
@@ -24,7 +24,7 @@
     {
       "owner": "ESP32Async",
       "name": "AsyncTCP",
-      "version": "^3.3.5",
+      "version": "^3.3.6",
       "platforms": "espressif32"
     },
     {
diff --git a/pioarduino_examples/IncreaseMaxSockets/platformio.ini b/pioarduino_examples/IncreaseMaxSockets/platformio.ini
@@ -17,7 +17,7 @@ monitor_filters = esp32_exception_decoder, log2file
 lib_compat_mode = strict
 lib_ldf_mode = chain
 lib_deps =
-  ESP32Async/AsyncTCP @ 3.3.5
+  ESP32Async/AsyncTCP @ 3.3.6
   ESP32Async/ESpAsyncWebServer @ 3.7.0
 
 custom_sdkconfig = CONFIG_LWIP_MAX_ACTIVE_TCP=32
diff --git a/platformio.ini b/platformio.ini
@@ -16,6 +16,7 @@ lib_dir = .
 ; src_dir = examples/MessagePack
 ; src_dir = examples/Middleware
 ; src_dir = examples/Params
+; src_dir = examples/PartitionDownloader
 src_dir = examples/PerfTests
 ; src_dir = examples/RateLimit
 ; src_dir = examples/Redirect
@@ -53,8 +54,8 @@ monitor_filters = esp32_exception_decoder, log2file
 lib_compat_mode = strict
 lib_ldf_mode = chain
 lib_deps =
-  bblanchon/ArduinoJson @ 7.3.0
-  ESP32Async/AsyncTCP @ 3.3.5
+  bblanchon/ArduinoJson @ 7.3.1
+  ESP32Async/AsyncTCP @ 3.3.6
 board_build.partitions = partitions-4MB.csv
 board_build.filesystem = littlefs
 
@@ -68,7 +69,7 @@ platform = https://github.com/pioarduino/platform-espressif32/releases/download/
 
 [env:arduino-3-no-json]
 lib_deps =
-  ESP32Async/AsyncTCP @ 3.3.5
+  ESP32Async/AsyncTCP @ 3.3.6
 
 [env:arduino-3-latest-asynctcp]
 lib_deps =
@@ -88,7 +89,7 @@ platform = espressif8266
 ; board = huzzah
 board = d1_mini
 lib_deps =
-  bblanchon/ArduinoJson @ 7.3.0
+  bblanchon/ArduinoJson @ 7.3.1
   ESP32Async/ESPAsyncTCP @ 2.0.0
 
 [env:raspberrypi]
@@ -119,7 +120,7 @@ board = ${sysenv.PIO_BOARD}
 [env:ci-arduino-3-no-json]
 board = ${sysenv.PIO_BOARD}
 lib_deps =
-  ESP32Async/AsyncTCP @ 3.3.5
+  ESP32Async/AsyncTCP @ 3.3.6
 
 [env:ci-arduino-3-latest-asynctcp]
 lib_deps =
@@ -134,7 +135,7 @@ build_flags = ${env.build_flags}
 platform = espressif8266
 board = ${sysenv.PIO_BOARD}
 lib_deps =
-  bblanchon/ArduinoJson @ 7.3.0
+  bblanchon/ArduinoJson @ 7.3.1
   ESP32Async/ESPAsyncTCP @ 2.0.0
 
 [env:ci-raspberrypi]
diff --git a/src/WebRequest.cpp b/src/WebRequest.cpp
@@ -167,6 +167,8 @@ void AsyncWebServerRequest::_onData(void *buf, size_t len) {
       // A handler should be already attached at this point in _parseLine function.
       // If handler does nothing (_onRequest is NULL), we don't need to really parse the body.
       const bool needParse = _handler && !_handler->isRequestHandlerTrivial();
+      // Discard any bytes after content length; handlers may overrun their buffers
+      len = std::min(len, _contentLength - _parsedLength);
       if (_isMultipart) {
         if (needParse) {
           size_t i;

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`{`
`25`	`25`	`"owner": "ESP32Async",`
`26`	`26`	`"name": "AsyncTCP",`
`27`		`- "version": "^3.3.5",`
	`27`	`+ "version": "^3.3.6",`
`28`	`28`	`"platforms": "espressif32"`
`29`	`29`	`},`
`30`	`30`	`{`