Update with upstream #50

bdraco · 2025-07-14T01:28:15Z

Update from upstream. This is a merge from https://github.com/ESP32Async/ESPAsyncWebServer latest with preserving the ESPHome fork message in README.md and library.json changes

Tested on Arduino and bk7200

diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py
index 29097ce1b..4a469fa0e 100644
--- a/esphome/components/async_tcp/__init__.py
+++ b/esphome/components/async_tcp/__init__.py
@@ -31,7 +31,7 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
     if CORE.is_esp32 or CORE.is_libretiny:
         # https://github.com/ESP32Async/AsyncTCP
-        cg.add_library("ESP32Async/AsyncTCP", "3.4.4")
+        cg.add_library("ESP32Async/AsyncTCP", "3.4.5")
     elif CORE.is_esp8266:
         # https://github.com/ESP32Async/ESPAsyncTCP
         cg.add_library("ESP32Async/ESPAsyncTCP", "2.0.0")
diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index b43fadefb..0981337bd 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -42,5 +42,5 @@ async def to_code(config):
         # https://github.com/ESP32Async/ESPAsyncWebServer/blob/main/library.json
         # Use fork with libretiny compatibility fix
         cg.add_library(
-            "https://github.com/bdraco/ESPAsyncWebServer.git#libretiny_Fix", None
+            "https://github.com/esphome/ESPAsyncWebServer.git#update_with_upstream", None
         )

…e 3.1.1 which now has Middleware support

Prepare move to https://github.com/ESP32Async/ESPAsyncWebServer

Fix typo in example

…light in chunk

Introduce -D ASYNCWEBSERVER_USE_CHUNK_INFLIGHT=0|1 to be able to enabled/disable inflight in chunk response

bblanchon/ArduinoJson @ 7.4.2

Fix compile on libretiny due to round macro conflict

- Now obey the spec - Uses a static parse method - Support move semantic

Fixed Header parsing

Arduino Core 3.2.1

ESP32Async/AsyncTCP @ 3.4.5

* ETag and caching for serving pre‐compressed files This PR introduces ETag handling and caching improvements for serving pre‐compressed .gz files, enabling conditional GET responses to optimize bandwidth and server resource usage. Adds ETag header generation based on the CRC32 checksum from the gzip trailer. Implements conditional 304 responses in the send() method when the client's ETag matches the server's. Enhances both asynchronous file response handling and web server request processing for .gz files. * Add files via upload * ci(pre-commit): Apply automatic fixes * Make _getEtag a private method Make private: static void _getEtag(uint8_t trailer[4], char *serverETag) --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

* set default value for '_onDisconnectfn' * ci(pre-commit): Apply automatic fixes --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

* Support for pre-compressed and ETag in download When downloading file request: 1. **Gzipped file serving**: - Automatically detects and serves pre-compressed `.gz` files when uncompressed originals are missing - Properly sets `Content-Encoding: gzip` headers - Implements `If-None-Match` header comparison for 304 (Not Modified) responses (RFC 7232) - Implements `ETag` header using CRC-32 from gzip trailer (bytes 4-7 from end) - Optimize for speed Changes affect: void AsyncWebServerRequest::send(FS &fs, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback) AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(FS &fs, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback) AsyncFileResponse::AsyncFileResponse(FS &fs, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback) : AsyncAbstractResponse(callback) * ci(pre-commit): Apply automatic fixes * Update src/AsyncWebServerRequest.cpp Co-authored-by: Copilot <[email protected]> * Add files via upload --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: Copilot <[email protected]>

Optimize _setContentTypeFromPath method with a more efficient version (_setContentTypeFromPath_v3) that uses C-string comparison (strcmp) instead of String::endsWith. This change improves performance and reduces memory usage, Common web extensions are checked first to speed up typical lookups. Version 1 (original): 16.9789 μs per call Version 2 (strcmp): 6.7527 μs per call

…pe-detection Optimize content type detection using C-strings

Merged latest changes from ESP32Async/ESPAsyncWebServer while preserving ESPHome-specific metadata in library.json and README.md

ESPHome is no longer using forked versions of AsyncTCP and ESPAsyncTCP, so update to use the official ESP32Async versions.

mathieucarbou · 2025-07-14T08:56:04Z

why not directly make use of https://github.com/ESP32Async/ESPAsyncWebServer ? That would be less confusing for users and would be easier for them to point to new versions or dev branches

bdraco · 2025-07-14T09:05:55Z

We switched from this fork to going directly with released version of https://github.com/ESP32Async/ESPAsyncWebServer just recently in ESPHome. We are only considering to switch back to the fork because we need the libretiny fix for the ESPHome release coming in ~48 hours so we don't ship with esphome/issues#7230 broken. Than the plan is to switch back to the released version of https://github.com/ESP32Async/ESPAsyncWebServer in the future when the libretiny fix is generally available in a release and let the fork go dormant again.

mathieucarbou · 2025-07-14T09:17:49Z

We switched from this fork to going directly with released version of https://github.com/ESP32Async/ESPAsyncWebServer just recently in ESPHome. We are only considering to switch back to the fork because we need the libretiny fix for the ESPHome release coming in ~48 hours so we don't ship with esphome/issues#7230 broken. Than the plan is to switch back to the released version of https://github.com/ESP32Async/ESPAsyncWebServer in the future when the libretiny fix is generally available in a release and let the fork go dormant again.

Ok if you had told me I would have issued a release immediately. I will do it now.

mathieucarbou · 2025-07-14T09:24:23Z

v3.7.10 released, publish will be done in a few minutes for pio registry and esp-idf registry

bdraco · 2025-07-14T17:07:15Z

Many thanks mathieucarbou 🙇

mathieucarbou and others added 30 commits January 9, 2025 15:20

Arduino core 3.1.1 based on IDF 5.3.2.241224

fd7dbdd

Breaking: Renamed Middleware classes to not conflict with Arduino Cor…

21323aa

…e 3.1.1 which now has Middleware support

v3.6.0

7cee8a5

Added back rpipicow to CI

b81e398

update doc

ad8b0e7

add logos

d9a7755

remove website

48a6820

Update README.md

2e461f6

Prepare move to https://github.com/ESP32Async/ESPAsyncWebServer

7f35106

Merge remote-tracking branch 'me-no-dev/master' into move

48bd417

update readme

a8fff58

Merge pull request me-no-dev#1464 from mathieucarbou/move

ad3741d

Prepare move to https://github.com/ESP32Async/ESPAsyncWebServer

update readme

c188892

Fix link which was not publicly accessible

9b96e74

fix typo

4cb06e4

Merge pull request #2 from thijstriemstra/patch-1

826fcb3

Fix typo in example

Adding PIO publish workflow

afa36a2

Try make PlatformIO publication work...

872ee1c

Try make PlatformIO publication work...

5d879f8

Try make PlatformIO publication work...

cea17d2

update issue template

910f1af

update issue template

69843d8

CI update for Arduino 3

1c80c7c

Fix CI

a31973f

Simplify pio file

8183c6d

Introduce ASYNCWEBSERVER_USE_CHUNK_INFLIGHT to be able to disable inf…

fca0939

…light in chunk

Disable ASYNCWEBSERVER_USE_CHUNK_INFLIGHT by default and updated doc

1d154df

Merge pull request #7 from ESP32Async/issue-4

cc6da5e

Introduce -D ASYNCWEBSERVER_USE_CHUNK_INFLIGHT=0|1 to be able to enabled/disable inflight in chunk response

Add release note generation to CI

22fdad1

doc: Update example for issue #6

65e9177

mathieucarbou and others added 23 commits June 13, 2025 21:29

v3.7.8

f06bca1

bblanchon/ArduinoJson @ 7.4.2

9c6d6c3

Merge pull request me-no-dev#206 from ESP32Async/json

1095dfd

bblanchon/ArduinoJson @ 7.4.2

Fix CRLF Injection in AsyncWebHeader.cpp

4821424

Merge pull request me-no-dev#211 from ESP32Async/secfix

afb9522

v3.7.9

7ebeb45

Fix compile on libretiny due to round macro conflict

83ac5a2

LIBRETINY check inside the ifdef

c9b70bd

Merge pull request me-no-dev#214 from bdraco/libretiny_Fix

029b057

Fix compile on libretiny due to round macro conflict

Fixed Header parsing

c5fa501

- Now obey the spec - Uses a static parse method - Support move semantic

Merge pull request me-no-dev#215 from ESP32Async/fix/AsyncWebHeader

bb6309a

Fixed Header parsing

Arduino Core 3.2.1

0d6046f

Merge pull request me-no-dev#217 from ESP32Async/arduino-321

fb6bc86

Arduino Core 3.2.1

ESP32Async/AsyncTCP @ 3.4.5

4ce3876

Merge pull request me-no-dev#218 from ESP32Async/asynctcp-345

4b14b0a

ESP32Async/AsyncTCP @ 3.4.5

set default value for '_onDisconnectfn' (me-no-dev#221)

049a659

* set default value for '_onDisconnectfn' * ci(pre-commit): Apply automatic fixes --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

ci(pre-commit): Apply automatic fixes

b55f2df

Merge pull request me-no-dev#225 from JosePineiro/optimize-content-ty…

615cff7

…pe-detection Optimize content type detection using C-strings

Merge upstream/main into update_with_upstream

a6db335

Merged latest changes from ESP32Async/ESPAsyncWebServer while preserving ESPHome-specific metadata in library.json and README.md

Update dependencies to use non-forked versions

ed2cbd3

ESPHome is no longer using forked versions of AsyncTCP and ESPAsyncTCP, so update to use the official ESP32Async versions.

bdraco marked this pull request as ready for review July 14, 2025 03:19

bdraco mentioned this pull request Jul 14, 2025

Fix compile on libretiny due to round macro conflict ESP32Async/ESPAsyncWebServer#214

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Update with upstream #50

Update with upstream #50

Uh oh!

bdraco commented Jul 14, 2025 •

edited

Loading

Uh oh!

mathieucarbou commented Jul 14, 2025

Uh oh!

bdraco commented Jul 14, 2025 •

edited

Loading

Uh oh!

mathieucarbou commented Jul 14, 2025 •

edited

Loading

Uh oh!

mathieucarbou commented Jul 14, 2025 •

edited

Loading

Uh oh!

bdraco commented Jul 14, 2025

Uh oh!

Uh oh!

Uh oh!

Update with upstream #50

Are you sure you want to change the base?

Update with upstream #50

Uh oh!

Conversation

bdraco commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mathieucarbou commented Jul 14, 2025

Uh oh!

bdraco commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mathieucarbou commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mathieucarbou commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bdraco commented Jul 14, 2025

Uh oh!

Uh oh!

bdraco commented Jul 14, 2025 •

edited

Loading

bdraco commented Jul 14, 2025 •

edited

Loading

mathieucarbou commented Jul 14, 2025 •

edited

Loading

mathieucarbou commented Jul 14, 2025 •

edited

Loading