diff --git a/.clang-format b/.clang-format new file mode 100644 index 000000000..8f4734879 --- /dev/null +++ b/.clang-format @@ -0,0 +1,246 @@ +# Clang format version: 18.1.3 +--- +BasedOnStyle: LLVM +AccessModifierOffset: -2 +AlignAfterOpenBracket: BlockIndent +AlignArrayOfStructures: None +AlignConsecutiveAssignments: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: true +AlignConsecutiveBitFields: + Enabled: true + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveDeclarations: + Enabled: false + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveMacros: + Enabled: true + AcrossEmptyLines: false + AcrossComments: false + AlignCompound: false + AlignFunctionPointers: false + PadOperators: false +AlignConsecutiveShortCaseStatements: + Enabled: true + AcrossEmptyLines: false + AcrossComments: false + AlignCaseColons: false +AlignEscapedNewlines: Left +AlignOperands: Align +AlignTrailingComments: + Kind: Always + OverEmptyLines: 0 +AllowAllArgumentsOnNextLine: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowBreakBeforeNoexceptSpecifier: Never +AllowShortBlocksOnASingleLine: Empty +AllowShortCaseLabelsOnASingleLine: true +AllowShortCompoundRequirementOnASingleLine: true +AllowShortEnumsOnASingleLine: false +AllowShortFunctionsOnASingleLine: Empty +AllowShortIfStatementsOnASingleLine: Never +AllowShortLambdasOnASingleLine: Empty +AllowShortLoopsOnASingleLine: true +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: MultiLine +AttributeMacros: + - __capability +BinPackArguments: true +BinPackParameters: true +BitFieldColonSpacing: Both +BraceWrapping: + AfterCaseLabel: true + AfterClass: false + AfterControlStatement: Never + AfterEnum: false + AfterFunction: false + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + AfterExternBlock: false + BeforeCatch: false + BeforeElse: false + BeforeLambdaBody: false + BeforeWhile: false + IndentBraces: false + SplitEmptyFunction: false + SplitEmptyRecord: true + SplitEmptyNamespace: true +BreakAdjacentStringLiterals: true +BreakAfterAttributes: Always +BreakAfterJavaFieldAnnotations: false +BreakArrays: false +BreakBeforeBinaryOperators: NonAssignment +BreakBeforeBraces: Custom +BreakBeforeConceptDeclarations: Always +BreakBeforeInlineASMColon: OnlyMultiline +BreakBeforeTernaryOperators: true +BreakConstructorInitializers: BeforeColon +BreakInheritanceList: BeforeColon +BreakStringLiterals: true +ColumnLimit: 160 +CommentPragmas: "" +CompactNamespaces: false +ConstructorInitializerIndentWidth: 2 +ContinuationIndentWidth: 2 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +EmptyLineAfterAccessModifier: Never +EmptyLineBeforeAccessModifier: LogicalBlock +ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: true +ForEachMacros: + - foreach + - Q_FOREACH + - BOOST_FOREACH +IfMacros: + - KJ_IF_MAYBE +IncludeBlocks: Preserve +IncludeCategories: + - Regex: ^"(llvm|llvm-c|clang|clang-c)/ + Priority: 2 + SortPriority: 0 + CaseSensitive: false + - Regex: ^(<|"(gtest|gmock|isl|json)/) + Priority: 3 + SortPriority: 0 + CaseSensitive: false + - Regex: .* + Priority: 1 + SortPriority: 0 + CaseSensitive: false +IncludeIsMainRegex: "" +IncludeIsMainSourceRegex: "" +IndentAccessModifiers: false +IndentCaseBlocks: false +IndentCaseLabels: true +IndentExternBlock: NoIndent +IndentGotoLabels: false +IndentPPDirectives: None +IndentRequiresClause: false +IndentWidth: 2 +IndentWrappedFunctionNames: true +InsertBraces: true +InsertNewlineAtEOF: true +InsertTrailingCommas: None +IntegerLiteralSeparator: + Binary: 0 + BinaryMinDigits: 0 + Decimal: 0 + DecimalMinDigits: 0 + Hex: 0 + HexMinDigits: 0 +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtEOF: false +KeepEmptyLinesAtTheStartOfBlocks: true +LambdaBodyIndentation: Signature +Language: Cpp +LineEnding: LF +MacroBlockBegin: "" +MacroBlockEnd: "" +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +ObjCBinPackProtocolList: Auto +ObjCBlockIndentWidth: 2 +ObjCBreakBeforeNestedBlockParam: true +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PPIndentWidth: -1 +PackConstructorInitializers: BinPack +PenaltyBreakAssignment: 2 +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakOpenParenthesis: 0 +PenaltyBreakScopeResolution: 500 +PenaltyBreakString: 1000 +PenaltyBreakTemplateDeclaration: 10 +PenaltyExcessCharacter: 1000000 +PenaltyIndentedWhitespace: 0 +PenaltyReturnTypeOnItsOwnLine: 60 +PointerAlignment: Right +QualifierAlignment: Leave +ReferenceAlignment: Pointer +ReflowComments: false +RemoveBracesLLVM: false +RemoveParentheses: Leave +RemoveSemicolon: false +RequiresClausePosition: OwnLine +RequiresExpressionIndentation: OuterScope +SeparateDefinitionBlocks: Leave +ShortNamespaceLines: 1 +SkipMacroDefinitionBody: false +SortIncludes: Never +SortJavaStaticImport: Before +SortUsingDeclarations: LexicographicNumeric +SpaceAfterCStyleCast: false +SpaceAfterLogicalNot: false +SpaceAfterTemplateKeyword: false +SpaceAroundPointerQualifiers: Default +SpaceBeforeAssignmentOperators: true +SpaceBeforeCaseColon: false +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true +SpaceBeforeJsonColon: false +SpaceBeforeParens: ControlStatements +SpaceBeforeParensOptions: + AfterControlStatements: true + AfterForeachMacros: true + AfterFunctionDeclarationName: false + AfterFunctionDefinitionName: false + AfterIfMacros: true + AfterOverloadedOperator: true + AfterPlacementOperator: true + AfterRequiresInClause: false + AfterRequiresInExpression: false + BeforeNonEmptyParentheses: false +SpaceBeforeRangeBasedForLoopColon: true +SpaceBeforeSquareBrackets: false +SpaceInEmptyBlock: false +SpacesBeforeTrailingComments: 2 +SpacesInAngles: Never +SpacesInContainerLiterals: false +SpacesInLineCommentPrefix: + Minimum: 1 + Maximum: -1 +SpacesInParens: Never +SpacesInParensOptions: + InConditionalStatements: false + InCStyleCasts: false + InEmptyParentheses: false + Other: false +SpacesInSquareBrackets: false +Standard: Auto +StatementAttributeLikeMacros: + - Q_EMIT +StatementMacros: + - Q_UNUSED + - QT_REQUIRE_VERSION +TabWidth: 2 +UseTab: Never +VerilogBreakBetweenInstancePorts: true +WhitespaceSensitiveMacros: + - BOOST_PP_STRINGIZE + - CF_SWIFT_NAME + - NS_SWIFT_NAME + - PP_STRINGIZE + - STRINGIZE +BracedInitializerIndentWidth: 2 diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 000000000..d26ee41f2 --- /dev/null +++ b/.codespellrc @@ -0,0 +1,8 @@ +[codespell] +# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/spell-check/.codespellrc +# In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here: +ignore-words-list = ba,licence,varius +skip = ./.git,./.licenses,__pycache__,.clang-format,.codespellrc,.editorconfig,.flake8,.prettierignore,.yamllint.yml,.gitignore +builtin = clear,informal,en-GB_to_en-US +check-filenames = +check-hidden = diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..e22936cb1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,60 @@ +# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/general/.editorconfig +# See: https://editorconfig.org/ +# The formatting style defined in this file is the official standardized style to be used in all Arduino Tooling +# projects and should not be modified. +# Note: indent style for each file type is defined even when it matches the universal config in order to make it clear +# that this type has an official style. + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{adoc,asc,asciidoc}] +indent_size = 2 +indent_style = space + +[*.{bash,sh}] +indent_size = 4 +indent_style = space + +[*.{c,cc,cp,cpp,cxx,h,hh,hpp,hxx,ii,inl,ino,ixx,pde,tpl,tpp,txx}] +indent_size = 2 +indent_style = space + +[*.{go,mod}] +indent_style = tab + +[*.java] +indent_size = 2 +indent_style = space + +[*.{js,jsx,json,jsonc,json5,ts,tsx}] +indent_size = 2 +indent_style = space + +[*.{md,mdx,mkdn,mdown,markdown}] +indent_size = unset +indent_style = space + +[*.proto] +indent_size = 2 +indent_style = space + +[*.py] +indent_size = 4 +indent_style = space + +[*.svg] +indent_size = 2 +indent_style = space + +[*.{yaml,yml}] +indent_size = 2 +indent_style = space + +[{.gitconfig,.gitmodules}] +indent_style = tab diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..02f38c336 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,2 @@ +# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository +blank_issues_enabled: false diff --git a/.github/ISSUE_TEMPLATE/issue-report.yml b/.github/ISSUE_TEMPLATE/issue-report.yml new file mode 100644 index 000000000..d48e5ba4f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue-report.yml @@ -0,0 +1,91 @@ +name: 🐛 Bug Report +description: File a bug report +labels: ["Status: Awaiting triage"] +body: + - type: markdown + attributes: + value: > + ### ⚠️ Please remember: issues are for *bugs* only! + + - type: markdown + attributes: + value: | + #### Unsure? Have a questions? 👉 [Start a new discussion](https://github.com/ESP32Async/ESPAsyncWebServer/discussions/new) + + #### Before opening a new issue, please make sure you have searched: + + - In the [documentation](https://github.com/ESP32Async/ESPAsyncWebServer) + - In the [discussions](https://github.com/ESP32Async/ESPAsyncWebServer/discussions) + - In the [issues](https://github.com/ESP32Async/ESPAsyncWebServer/issues) + - In the [examples](https://github.com/ESP32Async/ESPAsyncWebServer/tree/main/examples) + + #### Make sure you are using: + + - The [latest version of ESPAsyncWebServer](https://github.com/ESP32Async/ESPAsyncWebServer/releases) + - The [latest version of AsyncTCP](https://github.com/ESP32Async/AsyncTCP/releases) (for ESP32) + + - type: dropdown + id: platform + attributes: + label: Platform + options: + - ESP32 + - ESP8266 + - RP2040 + validations: + required: true + + - type: dropdown + id: tooling + attributes: + label: IDE / Tooling + options: + - Arduino (IDE/CLI) + - pioarduino + - ESP-IDF + - PlatformIO + validations: + required: true + + - type: textarea + id: what-happened + attributes: + label: What happened? + description: A clear and concise description of the issue. + placeholder: A clear and concise description of the issue. + validations: + required: true + + - type: textarea + id: stack-trace + attributes: + label: Stack Trace + description: Please provide a debug message or error message. If you have a Guru Meditation Error or Backtrace, [please decode it](https://maximeborges.github.io/esp-stacktrace-decoder/). + placeholder: For Arduino IDE, Enable Core debug level - Debug on tools menu, then put the serial output here. + validations: + required: true + + - type: textarea + id: how-to-reproduce + attributes: + label: Minimal Reproductible Example (MRE) + description: Post the code or the steps to reproduce the issue. + placeholder: Post the code or the steps to reproduce the issue. + validations: + required: true + + - type: checkboxes + id: confirmation + attributes: + label: "I confirm that:" + options: + - label: I have read the documentation. + required: true + - label: I have searched for similar discussions. + required: true + - label: I have searched for similar issues. + required: true + - label: I have looked at the examples. + required: true + - label: I have upgraded to the lasted version of ESPAsyncWebServer (and AsyncTCP for ESP32). + required: true diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..dfd0e3086 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +# Set update schedule for GitHub Actions + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every week + interval: "weekly" diff --git a/.github/scripts/install-arduino-core-esp32.sh b/.github/scripts/install-arduino-core-esp32.sh deleted file mode 100755 index 3fb4203c5..000000000 --- a/.github/scripts/install-arduino-core-esp32.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -export ARDUINO_ESP32_PATH="$ARDUINO_USR_PATH/hardware/espressif/esp32" -if [ ! -d "$ARDUINO_ESP32_PATH" ]; then - echo "Installing ESP32 Arduino Core ..." - script_init_path="$PWD" - mkdir -p "$ARDUINO_USR_PATH/hardware/espressif" - cd "$ARDUINO_USR_PATH/hardware/espressif" - - echo "Installing Python Serial ..." - pip3 install pyserial > /dev/null - - if [ "$OS_IS_WINDOWS" == "1" ]; then - echo "Installing Python Requests ..." - pip3 install requests > /dev/null - fi - - if [ "$GITHUB_REPOSITORY" == "espressif/arduino-esp32" ]; then - echo "Linking Core..." - ln -s $GITHUB_WORKSPACE esp32 - else - echo "Cloning Core Repository..." - git clone https://github.com/espressif/arduino-esp32.git esp32 > /dev/null 2>&1 - fi - - echo "Updating Submodules ..." - cd esp32 - git submodule update --init --recursive > /dev/null 2>&1 - - echo "Installing Platform Tools ..." - cd tools && python3 get.py - cd $script_init_path - - echo "ESP32 Arduino has been installed in '$ARDUINO_ESP32_PATH'" - echo "" -fi diff --git a/.github/scripts/install-arduino-core-esp8266.sh b/.github/scripts/install-arduino-core-esp8266.sh deleted file mode 100644 index db9d56ca7..000000000 --- a/.github/scripts/install-arduino-core-esp8266.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -echo "Installing ESP8266 Arduino Core ..." -script_init_path="$PWD" -mkdir -p "$ARDUINO_USR_PATH/hardware/esp8266com" -cd "$ARDUINO_USR_PATH/hardware/esp8266com" - -echo "Installing Python Serial ..." -pip3 install pyserial > /dev/null - -if [ "$OS_IS_WINDOWS" == "1" ]; then - echo "Installing Python Requests ..." - pip3 install requests > /dev/null -fi - -echo "Cloning Core Repository ..." -git clone https://github.com/esp8266/Arduino.git esp8266 > /dev/null 2>&1 - -echo "Updating submodules ..." -cd esp8266 -git submodule update --init --recursive > /dev/null 2>&1 - -echo "Installing Platform Tools ..." -cd tools -python3 get.py > /dev/null -cd $script_init_path - -echo "ESP8266 Arduino has been installed in '$ARDUINO_USR_PATH/hardware/esp8266com'" -echo "" diff --git a/.github/scripts/install-arduino-ide.sh b/.github/scripts/install-arduino-ide.sh deleted file mode 100755 index 584cc68dc..000000000 --- a/.github/scripts/install-arduino-ide.sh +++ /dev/null @@ -1,228 +0,0 @@ -#!/bin/bash - -#OSTYPE: 'linux-gnu', ARCH: 'x86_64' => linux64 -#OSTYPE: 'msys', ARCH: 'x86_64' => win32 -#OSTYPE: 'darwin18', ARCH: 'i386' => macos - -OSBITS=`arch` -if [[ "$OSTYPE" == "linux"* ]]; then - export OS_IS_LINUX="1" - ARCHIVE_FORMAT="tar.xz" - if [[ "$OSBITS" == "i686" ]]; then - OS_NAME="linux32" - elif [[ "$OSBITS" == "x86_64" ]]; then - OS_NAME="linux64" - elif [[ "$OSBITS" == "armv7l" || "$OSBITS" == "aarch64" ]]; then - OS_NAME="linuxarm" - else - OS_NAME="$OSTYPE-$OSBITS" - echo "Unknown OS '$OS_NAME'" - exit 1 - fi -elif [[ "$OSTYPE" == "darwin"* ]]; then - export OS_IS_MACOS="1" - ARCHIVE_FORMAT="zip" - OS_NAME="macosx" -elif [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then - export OS_IS_WINDOWS="1" - ARCHIVE_FORMAT="zip" - OS_NAME="windows" -else - OS_NAME="$OSTYPE-$OSBITS" - echo "Unknown OS '$OS_NAME'" - exit 1 -fi -export OS_NAME - -ARDUINO_BUILD_DIR="$HOME/.arduino/build.tmp" -ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp" - -if [ "$OS_IS_MACOS" == "1" ]; then - export ARDUINO_IDE_PATH="/Applications/Arduino.app/Contents/Java" - export ARDUINO_USR_PATH="$HOME/Documents/Arduino" -elif [ "$OS_IS_WINDOWS" == "1" ]; then - export ARDUINO_IDE_PATH="$HOME/arduino_ide" - export ARDUINO_USR_PATH="$HOME/Documents/Arduino" -else - export ARDUINO_IDE_PATH="$HOME/arduino_ide" - export ARDUINO_USR_PATH="$HOME/Arduino" -fi - -if [ ! -d "$ARDUINO_IDE_PATH" ]; then - echo "Installing Arduino IDE on $OS_NAME ..." - echo "Downloading 'arduino-nightly-$OS_NAME.$ARCHIVE_FORMAT' to 'arduino.$ARCHIVE_FORMAT' ..." - if [ "$OS_IS_LINUX" == "1" ]; then - wget -O "arduino.$ARCHIVE_FORMAT" "https://downloads.arduino.cc/arduino-nightly-$OS_NAME.$ARCHIVE_FORMAT" > /dev/null 2>&1 - echo "Extracting 'arduino.$ARCHIVE_FORMAT' ..." - tar xf "arduino.$ARCHIVE_FORMAT" > /dev/null - mv arduino-nightly "$ARDUINO_IDE_PATH" - else - curl -o "arduino.$ARCHIVE_FORMAT" -L "https://downloads.arduino.cc/arduino-nightly-$OS_NAME.$ARCHIVE_FORMAT" > /dev/null 2>&1 - echo "Extracting 'arduino.$ARCHIVE_FORMAT' ..." - unzip "arduino.$ARCHIVE_FORMAT" > /dev/null - if [ "$OS_IS_MACOS" == "1" ]; then - mv "Arduino.app" "/Applications/Arduino.app" - else - mv arduino-nightly "$ARDUINO_IDE_PATH" - fi - fi - rm -rf "arduino.$ARCHIVE_FORMAT" - - mkdir -p "$ARDUINO_USR_PATH/libraries" - mkdir -p "$ARDUINO_USR_PATH/hardware" - - echo "Arduino IDE Installed in '$ARDUINO_IDE_PATH'" - echo "" -fi - -function build_sketch(){ # build_sketch [extra-options] - if [ "$#" -lt 2 ]; then - echo "ERROR: Illegal number of parameters" - echo "USAGE: build_sketch [extra-options]" - return 1 - fi - - local fqbn="$1" - local sketch="$2" - local build_flags="$3" - local xtra_opts="$4" - local win_opts="" - if [ "$OS_IS_WINDOWS" == "1" ]; then - local ctags_version=`ls "$ARDUINO_IDE_PATH/tools-builder/ctags/"` - local preprocessor_version=`ls "$ARDUINO_IDE_PATH/tools-builder/arduino-preprocessor/"` - win_opts="-prefs=runtime.tools.ctags.path=$ARDUINO_IDE_PATH/tools-builder/ctags/$ctags_version -prefs=runtime.tools.arduino-preprocessor.path=$ARDUINO_IDE_PATH/tools-builder/arduino-preprocessor/$preprocessor_version" - fi - - echo "" - echo "Compiling '"$(basename "$sketch")"' ..." - mkdir -p "$ARDUINO_BUILD_DIR" - mkdir -p "$ARDUINO_CACHE_DIR" - $ARDUINO_IDE_PATH/arduino-builder -compile -logger=human -core-api-version=10810 \ - -fqbn=$fqbn \ - -warnings="all" \ - -tools "$ARDUINO_IDE_PATH/tools-builder" \ - -tools "$ARDUINO_IDE_PATH/tools" \ - -built-in-libraries "$ARDUINO_IDE_PATH/libraries" \ - -hardware "$ARDUINO_IDE_PATH/hardware" \ - -hardware "$ARDUINO_USR_PATH/hardware" \ - -libraries "$ARDUINO_USR_PATH/libraries" \ - -build-cache "$ARDUINO_CACHE_DIR" \ - -build-path "$ARDUINO_BUILD_DIR" \ - -prefs=compiler.cpp.extra_flags="$build_flags" \ - $win_opts $xtra_opts "$sketch" -} - -function count_sketches() # count_sketches -{ - local examples="$1" - rm -rf sketches.txt - if [ ! -d "$examples" ]; then - touch sketches.txt - return 0 - fi - local sketches=$(find $examples -name *.ino) - local sketchnum=0 - for sketch in $sketches; do - local sketchdir=$(dirname $sketch) - local sketchdirname=$(basename $sketchdir) - local sketchname=$(basename $sketch) - if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then - continue - fi; - if [[ -f "$sketchdir/.test.skip" ]]; then - continue - fi - echo $sketch >> sketches.txt - sketchnum=$(($sketchnum + 1)) - done - return $sketchnum -} - -function build_sketches() # build_sketches [extra-options] -{ - local fqbn=$1 - local examples=$2 - local chunk_idex=$3 - local chunks_num=$4 - local xtra_opts=$5 - - if [ "$#" -lt 2 ]; then - echo "ERROR: Illegal number of parameters" - echo "USAGE: build_sketches [ ] [extra-options]" - return 1 - fi - - if [ "$#" -lt 4 ]; then - chunk_idex="0" - chunks_num="1" - xtra_opts=$3 - fi - - if [ "$chunks_num" -le 0 ]; then - echo "ERROR: Chunks count must be positive number" - return 1 - fi - if [ "$chunk_idex" -ge "$chunks_num" ]; then - echo "ERROR: Chunk index must be less than chunks count" - return 1 - fi - - set +e - count_sketches "$examples" - local sketchcount=$? - set -e - local sketches=$(cat sketches.txt) - rm -rf sketches.txt - - local chunk_size=$(( $sketchcount / $chunks_num )) - local all_chunks=$(( $chunks_num * $chunk_size )) - if [ "$all_chunks" -lt "$sketchcount" ]; then - chunk_size=$(( $chunk_size + 1 )) - fi - - local start_index=$(( $chunk_idex * $chunk_size )) - if [ "$sketchcount" -le "$start_index" ]; then - echo "Skipping job" - return 0 - fi - - local end_index=$(( $(( $chunk_idex + 1 )) * $chunk_size )) - if [ "$end_index" -gt "$sketchcount" ]; then - end_index=$sketchcount - fi - - local start_num=$(( $start_index + 1 )) - echo "Found $sketchcount Sketches"; - echo "Chunk Count : $chunks_num" - echo "Chunk Size : $chunk_size" - echo "Start Sketch: $start_num" - echo "End Sketch : $end_index" - - local sketchnum=0 - for sketch in $sketches; do - local sketchdir=$(dirname $sketch) - local sketchdirname=$(basename $sketchdir) - local sketchname=$(basename $sketch) - if [ "${sketchdirname}.ino" != "$sketchname" ] \ - || [ -f "$sketchdir/.test.skip" ]; then - continue - fi - sketchnum=$(($sketchnum + 1)) - if [ "$sketchnum" -le "$start_index" ] \ - || [ "$sketchnum" -gt "$end_index" ]; then - continue - fi - local sketchBuildFlags="" - if [ -f "$sketchdir/.test.build_flags" ]; then - while read line; do - sketchBuildFlags="$sketchBuildFlags $line" - done < "$sketchdir/.test.build_flags" - fi - build_sketch "$fqbn" "$sketch" "$sketchBuildFlags" "$xtra_opts" - local result=$? - if [ $result -ne 0 ]; then - return $result - fi - done - return 0 -} diff --git a/.github/scripts/install-platformio.sh b/.github/scripts/install-platformio.sh deleted file mode 100644 index 35b5f2de1..000000000 --- a/.github/scripts/install-platformio.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/bash - -echo "Installing Python Wheel ..." -pip3 install wheel > /dev/null 2>&1 - -echo "Installing PlatformIO ..." -pip3 install -U platformio > /dev/null 2>&1 - -echo "PlatformIO has been installed" -echo "" - - -function build_pio_sketch(){ # build_pio_sketch - if [ "$#" -lt 3 ]; then - echo "ERROR: Illegal number of parameters" - echo "USAGE: build_pio_sketch " - return 1 - fi - - local board="$1" - local sketch="$2" - local buildFlags="$3" - local sketch_dir=$(dirname "$sketch") - echo "" - echo "Compiling '"$(basename "$sketch")"' ..." - python3 -m platformio ci -l '.' --board "$board" "$sketch_dir" --project-option="board_build.partitions = huge_app.csv" --project-option="build_flags=$buildFlags" -} - -function count_sketches() # count_sketches -{ - local examples="$1" - rm -rf sketches.txt - if [ ! -d "$examples" ]; then - touch sketches.txt - return 0 - fi - local sketches=$(find $examples -name *.ino) - local sketchnum=0 - for sketch in $sketches; do - local sketchdir=$(dirname $sketch) - local sketchdirname=$(basename $sketchdir) - local sketchname=$(basename $sketch) - if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then - continue - fi; - if [[ -f "$sketchdir/.test.skip" ]]; then - continue - fi - echo $sketch >> sketches.txt - sketchnum=$(($sketchnum + 1)) - done - return $sketchnum -} - -function build_pio_sketches() # build_pio_sketches -{ - if [ "$#" -lt 2 ]; then - echo "ERROR: Illegal number of parameters" - echo "USAGE: build_pio_sketches [ ]" - return 1 - fi - - local board=$1 - local examples=$2 - local chunk_idex=$3 - local chunks_num=$4 - - if [ "$#" -lt 4 ]; then - chunk_idex="0" - chunks_num="1" - fi - - if [ "$chunks_num" -le 0 ]; then - echo "ERROR: Chunks count must be positive number" - return 1 - fi - if [ "$chunk_idex" -ge "$chunks_num" ]; then - echo "ERROR: Chunk index must be less than chunks count" - return 1 - fi - - set +e - count_sketches "$examples" - local sketchcount=$? - set -e - local sketches=$(cat sketches.txt) - rm -rf sketches.txt - - local chunk_size=$(( $sketchcount / $chunks_num )) - local all_chunks=$(( $chunks_num * $chunk_size )) - if [ "$all_chunks" -lt "$sketchcount" ]; then - chunk_size=$(( $chunk_size + 1 )) - fi - - local start_index=$(( $chunk_idex * $chunk_size )) - if [ "$sketchcount" -le "$start_index" ]; then - echo "Skipping job" - return 0 - fi - - local end_index=$(( $(( $chunk_idex + 1 )) * $chunk_size )) - if [ "$end_index" -gt "$sketchcount" ]; then - end_index=$sketchcount - fi - - local start_num=$(( $start_index + 1 )) - echo "Found $sketchcount Sketches"; - echo "Chunk Count : $chunks_num" - echo "Chunk Size : $chunk_size" - echo "Start Sketch: $start_num" - echo "End Sketch : $end_index" - - local sketchnum=0 - for sketch in $sketches; do - local sketchdir=$(dirname $sketch) - local sketchdirname=$(basename $sketchdir) - local sketchname=$(basename $sketch) - if [ "${sketchdirname}.ino" != "$sketchname" ] \ - || [ -f "$sketchdir/.test.skip" ]; then - continue - fi - local sketchBuildFlags="" - if [ -f "$sketchdir/.test.build_flags" ]; then - while read line; do - sketchBuildFlags="$sketchBuildFlags $line" - done < "$sketchdir/.test.build_flags" - fi - sketchnum=$(($sketchnum + 1)) - if [ "$sketchnum" -le "$start_index" ] \ - || [ "$sketchnum" -gt "$end_index" ]; then - continue - fi - build_pio_sketch "$board" "$sketch" "$sketchBuildFlags" - local result=$? - if [ $result -ne 0 ]; then - return $result - fi - done - return 0 -} diff --git a/.github/scripts/on-push.sh b/.github/scripts/on-push.sh deleted file mode 100755 index 12a73a289..000000000 --- a/.github/scripts/on-push.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -set -e - -if [ ! -z "$TRAVIS_BUILD_DIR" ]; then - export GITHUB_WORKSPACE="$TRAVIS_BUILD_DIR" - export GITHUB_REPOSITORY="$TRAVIS_REPO_SLUG" -elif [ -z "$GITHUB_WORKSPACE" ]; then - export GITHUB_WORKSPACE="$PWD" - export GITHUB_REPOSITORY="me-no-dev/ESPAsyncWebServer" -fi - -TARGET_PLATFORM="$1" -CHUNK_INDEX=$2 -CHUNKS_CNT=$3 -BUILD_PIO=0 -if [ "$#" -lt 1 ]; then - TARGET_PLATFORM="esp32" -fi -if [ "$#" -lt 3 ] || [ "$CHUNKS_CNT" -le 0 ]; then - CHUNK_INDEX=0 - CHUNKS_CNT=1 -elif [ "$CHUNK_INDEX" -gt "$CHUNKS_CNT" ]; then - CHUNK_INDEX=$CHUNKS_CNT -elif [ "$CHUNK_INDEX" -eq "$CHUNKS_CNT" ]; then - BUILD_PIO=1 -fi - -if [ "$BUILD_PIO" -eq 0 ]; then - # ArduinoIDE Test - source ./.github/scripts/install-arduino-ide.sh - - echo "Installing ESPAsyncWebServer ..." - cp -af "$GITHUB_WORKSPACE/src" "$ARDUINO_USR_PATH/libraries/ESPAsyncWebServer" - echo "Installing ArduinoJson ..." - git clone https://github.com/bblanchon/ArduinoJson "$ARDUINO_USR_PATH/libraries/ArduinoJson" > /dev/null 2>&1 - - if [[ "$TARGET_PLATFORM" == "esp32" ]]; then - echo "Installing AsyncTCP ..." - git clone https://github.com/me-no-dev/AsyncTCP "$ARDUINO_USR_PATH/libraries/AsyncTCP" > /dev/null 2>&1 - FQBN="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app" - source ./.github/scripts/install-arduino-core-esp32.sh - echo "BUILDING ESP32 EXAMPLES" - else - echo "Installing ESPAsyncTCP ..." - git clone https://github.com/me-no-dev/ESPAsyncTCP "$ARDUINO_USR_PATH/libraries/ESPAsyncTCP" > /dev/null 2>&1 - FQBN="esp8266com:esp8266:generic:eesz=4M1M,ip=lm2f" - source ./.github/scripts/install-arduino-core-esp8266.sh - echo "BUILDING ESP8266 EXAMPLES" - fi - build_sketches "$FQBN" "$GITHUB_WORKSPACE/examples" "$CHUNK_INDEX" "$CHUNKS_CNT" -else - # PlatformIO Test - source ./.github/scripts/install-platformio.sh - - python3 -m platformio lib --storage-dir "$GITHUB_WORKSPACE" install - echo "Installing ArduinoJson ..." - python3 -m platformio lib -g install https://github.com/bblanchon/ArduinoJson.git > /dev/null 2>&1 - if [[ "$TARGET_PLATFORM" == "esp32" ]]; then - BOARD="esp32dev" - echo "Installing AsyncTCP ..." - python3 -m platformio lib -g install https://github.com/me-no-dev/AsyncTCP.git > /dev/null 2>&1 - echo "BUILDING ESP32 EXAMPLES" - else - BOARD="esp12e" - echo "Installing ESPAsyncTCP ..." - python3 -m platformio lib -g install https://github.com/me-no-dev/ESPAsyncTCP.git > /dev/null 2>&1 - echo "BUILDING ESP8266 EXAMPLES" - fi - build_pio_sketches "$BOARD" "$GITHUB_WORKSPACE/examples" -fi diff --git a/.github/scripts/update-version.sh b/.github/scripts/update-version.sh new file mode 100755 index 000000000..de8de77bc --- /dev/null +++ b/.github/scripts/update-version.sh @@ -0,0 +1,40 @@ + +#!/bin/bash +# shellcheck disable=SC2002 + +# fail the script if any command unexpectedly fails +set -e + +if [ ! $# -eq 3 ]; then + echo "Bad number of arguments: $#" >&2 + echo "usage: $0 " >&2 + exit 1 +fi + +re='^[0-9]+$' +if [[ ! $1 =~ $re ]] || [[ ! $2 =~ $re ]] || [[ ! $3 =~ $re ]] ; then + echo "error: Not a valid version: $1.$2.$3" >&2 + echo "usage: $0 " >&2 + exit 1 +fi + +ASYNCWEBSERVER_VERSION_MAJOR="$1" +ASYNCWEBSERVER_VERSION_MINOR="$2" +ASYNCWEBSERVER_VERSION_PATCH="$3" +ASYNCWEBSERVER_VERSION="$ASYNCWEBSERVER_VERSION_MAJOR.$ASYNCWEBSERVER_VERSION_MINOR.$ASYNCWEBSERVER_VERSION_PATCH" + +echo "New AsyncTCP version: $ASYNCWEBSERVER_VERSION" + +echo "Updating library.properties..." +cat library.properties | sed "s/version=.*/version=$ASYNCWEBSERVER_VERSION/g" > __library.properties && mv __library.properties library.properties + +echo "Updating library.json..." +cat library.json | sed "s/^ \"version\":.*/ \"version\": \"$ASYNCWEBSERVER_VERSION\",/g" > __library.json && mv __library.json library.json + +echo "Updating src/AsyncWebServerVersion.h..." +cat src/AsyncWebServerVersion.h | \ +sed "s/#define ASYNCWEBSERVER_VERSION_MAJOR.*/#define ASYNCWEBSERVER_VERSION_MAJOR $ASYNCWEBSERVER_VERSION_MAJOR/g" | \ +sed "s/#define ASYNCWEBSERVER_VERSION_MINOR.*/#define ASYNCWEBSERVER_VERSION_MINOR $ASYNCWEBSERVER_VERSION_MINOR/g" | \ +sed "s/#define ASYNCWEBSERVER_VERSION_PATCH.*/#define ASYNCWEBSERVER_VERSION_PATCH $ASYNCWEBSERVER_VERSION_PATCH/g" > src/__AsyncWebServerVersion.h && mv src/__AsyncWebServerVersion.h src/AsyncWebServerVersion.h + +exit 0 \ No newline at end of file diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index ce7a8e3f7..000000000 --- a/.github/stale.yml +++ /dev/null @@ -1,31 +0,0 @@ -# Configuration for probot-stale - https://github.com/probot/stale - -daysUntilStale: 60 -daysUntilClose: 14 -limitPerRun: 30 -staleLabel: stale -exemptLabels: - - pinned - - security - - "to be implemented" - - "for reference" - - "move to PR" - - "enhancement" - -only: issues -onlyLabels: [] -exemptProjects: false -exemptMilestones: false -exemptAssignees: false - -markComment: > - [STALE_SET] This issue has been automatically marked as stale because it has not had - recent activity. It will be closed in 14 days if no further activity occurs. Thank you - for your contributions. - -unmarkComment: > - [STALE_CLR] This issue has been removed from the stale queue. Please ensure activity to keep it openin the future. - -closeComment: > - [STALE_DEL] This stale issue has been automatically closed. Thank you for your contributions. - diff --git a/.github/workflows/arduino-lint.yml b/.github/workflows/arduino-lint.yml new file mode 100644 index 000000000..1abf11038 --- /dev/null +++ b/.github/workflows/arduino-lint.yml @@ -0,0 +1,25 @@ +# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json + +name: Arduino Lint + +on: + workflow_dispatch: + push: + branches: + - main + - release/* + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + arduino-lint: + name: Arduino Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: arduino/arduino-lint-action@v2 + with: + library-manager: update diff --git a/.github/workflows/build-esp32.yml b/.github/workflows/build-esp32.yml new file mode 100644 index 000000000..159e170a4 --- /dev/null +++ b/.github/workflows/build-esp32.yml @@ -0,0 +1,253 @@ +# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json + +name: Build (ESP32) + +on: + workflow_dispatch: + push: + branches: + - main + - release/* + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + arduino-esp32: + name: ESP32 (arduino-cli) - Release + runs-on: ubuntu-latest + steps: + - name: Install arduino-cli + run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh + + - name: Update core index + run: arduino-cli core update-index --additional-urls https://espressif.github.io/arduino-esp32/package_esp32_index.json + + - name: Install core + run: arduino-cli core install --additional-urls https://espressif.github.io/arduino-esp32/package_esp32_index.json esp32:esp32 + + - name: Install ArduinoJson + 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.4.5 + + - name: Checkout + uses: actions/checkout@v4 + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + arduino-cli compile --library . --warnings none -b esp32:esp32:esp32 "examples/$i/$i.ino" + done + + arduino-esp32-dev: + name: ESP32 (arduino-cli) - Dev + runs-on: ubuntu-latest + steps: + - name: Install arduino-cli + run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh + + - name: Update core index + run: arduino-cli core update-index --additional-urls https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json + + - name: Install core + run: arduino-cli core install --additional-urls https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json esp32:esp32 + + - name: Install ArduinoJson + 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.4.5 + + - name: Checkout + uses: actions/checkout@v4 + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + arduino-cli compile --library . --warnings none -b esp32:esp32:esp32 "examples/$i/$i.ino" + done + + platformio-esp32-arduino2: + name: ESP32 (pio) - Arduino 2 + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + board: + - esp32dev + - esp32-s2-saola-1 + - esp32-s3-devkitc-1 + - esp32-c3-devkitc-02 + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache PlatformIO + uses: actions/cache@v4 + with: + key: ${{ runner.os }}-pio + path: | + ~/.cache/pip + ~/.platformio + + - name: Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + + - name: Install PIO + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + PLATFORMIO_SRC_DIR=examples/$i PIO_BOARD=${{ matrix.board }} pio run -e ci-arduino-2 + done + + platformio-esp32-arduino-3: + name: ESP32 (pio) - Arduino 3 + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + board: + - esp32dev + - esp32-s2-saola-1 + - esp32-s3-devkitc-1 + - esp32-c3-devkitc-02 + - esp32-c6-devkitc-1 + - esp32-h2-devkitm-1 + - esp32-p4 + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache PlatformIO + uses: actions/cache@v4 + with: + key: ${{ runner.os }}-pio + path: | + ~/.cache/pip + ~/.platformio + + - name: Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + + - name: Install PIO + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + PLATFORMIO_SRC_DIR=examples/$i PIO_BOARD=${{ matrix.board }} pio run -e ci-arduino-3 + done + + platformio-esp32-arduino-latest: + name: ESP32 (pio) - Arduino Latest + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + board: + - esp32dev + - esp32-s2-saola-1 + - esp32-s3-devkitc-1 + - esp32-c3-devkitc-02 + - esp32-c6-devkitc-1 + - esp32-h2-devkitm-1 + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache PlatformIO + uses: actions/cache@v4 + with: + key: ${{ runner.os }}-pio + path: | + ~/.cache/pip + ~/.platformio + + - name: Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + + - name: Install PIO + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + PLATFORMIO_SRC_DIR=examples/$i PIO_BOARD=${{ matrix.board }} pio run -e ci-arduino-3-latest + done + + platformio-specific-envs: + name: ESP32 (pio) - Specific Envs + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + env: + - ci-arduino-3-latest-asynctcp + - ci-arduino-3-no-json + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache PlatformIO + uses: actions/cache@v4 + with: + key: ${{ runner.os }}-pio + path: | + ~/.cache/pip + ~/.platformio + + - name: Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + + - name: Install PIO + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + PLATFORMIO_SRC_DIR=examples/$i PIO_BOARD=esp32dev pio run -e ${{ matrix.env }} + done diff --git a/.github/workflows/build-esp8266.yml b/.github/workflows/build-esp8266.yml new file mode 100644 index 000000000..1033769b7 --- /dev/null +++ b/.github/workflows/build-esp8266.yml @@ -0,0 +1,88 @@ +# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json + +name: Build (8266) + +on: + workflow_dispatch: + push: + branches: + - main + - release/* + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + arduino-esp8266: + name: ESP8266 (arduino-cli) + runs-on: ubuntu-latest + steps: + - name: Install arduino-cli + run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh + + - name: Update core index + run: arduino-cli core update-index --additional-urls https://arduino.esp8266.com/stable/package_esp8266com_index.json + + - name: Install core + run: arduino-cli core install --additional-urls https://arduino.esp8266.com/stable/package_esp8266com_index.json esp8266:esp8266 + + - name: Install ArduinoJson + run: arduino-cli lib install ArduinoJson + + - name: Install ESPAsyncTCP (ESP8266) + run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ESP32Async/ESPAsyncTCP#v2.0.0 + + - name: Checkout + uses: actions/checkout@v4 + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + arduino-cli compile --library . --warnings none -b esp8266:esp8266:huzzah "examples/$i/$i.ino" + done + + platformio-esp8266: + name: ESP8266 (pio) + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + board: + - huzzah + - d1_mini + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache PlatformIO + uses: actions/cache@v4 + with: + key: ${{ runner.os }}-pio + path: | + ~/.cache/pip + ~/.platformio + + - name: Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + + - name: Install PIO + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + PLATFORMIO_SRC_DIR=examples/$i PIO_BOARD=${{ matrix.board }} pio run -e ci-esp8266 + done diff --git a/.github/workflows/build-libretiny.yml b/.github/workflows/build-libretiny.yml new file mode 100644 index 000000000..5e09bacbe --- /dev/null +++ b/.github/workflows/build-libretiny.yml @@ -0,0 +1,57 @@ +# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json + +name: Build (LibreTiny) + +on: + workflow_dispatch: + push: + branches: + - main + - release/* + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + platformio-libretiny: + name: LibreTiny (pio) + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + board: + - generic-bk7231n-qfn32-tuya + - generic-rtl8710bn-2mb-788k + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache PlatformIO + uses: actions/cache@v4 + with: + key: ${{ runner.os }}-pio + path: | + ~/.cache/pip + ~/.platformio + + - name: Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + + - name: Install PIO + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio + + - name: Build Examples + run: | + for i in AsyncResponseStream Auth Headers; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + PLATFORMIO_SRC_DIR=examples/$i PIO_BOARD=${{ matrix.board }} pio run -e ci-libretiny + done diff --git a/.github/workflows/build-rpi.yml b/.github/workflows/build-rpi.yml new file mode 100644 index 000000000..1efc4e501 --- /dev/null +++ b/.github/workflows/build-rpi.yml @@ -0,0 +1,95 @@ +# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json + +name: Build (RPI) + +on: + workflow_dispatch: + push: + branches: + - main + - release/* + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + arduino-rpi: + name: RPI (arduino-cli) + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + board: + - rpipicow + - rpipico2w + + steps: + - name: Install arduino-cli + run: curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=/usr/local/bin sh + + - name: Update core index + run: arduino-cli core update-index --additional-urls https://github.com/earlephilhower/arduino-pico/releases/download/4.4.4/package_rp2040_index.json + + - name: Install core + run: arduino-cli core install --additional-urls https://github.com/earlephilhower/arduino-pico/releases/download/4.4.4/package_rp2040_index.json rp2040:rp2040 + + - name: Install ArduinoJson + run: arduino-cli lib install ArduinoJson + + - name: Install RPAsyncTCP + run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/ayushsharma82/RPAsyncTCP#v1.3.2 + + - name: Checkout + uses: actions/checkout@v4 + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + arduino-cli compile --library . --warnings none -b rp2040:rp2040:${{ matrix.board }} "examples/$i/$i.ino" + done + + platformio-rpi: + name: RPI (pio) + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + board: + - rpipicow + - rpipico2w + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache PlatformIO + uses: actions/cache@v4 + with: + key: ${{ runner.os }}-pio + path: | + ~/.cache/pip + ~/.platformio + + - name: Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + + - name: Install PIO + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio + + - name: Build Examples + run: | + for i in `ls examples`; do + echo "=============================================================" + echo "Building examples/$i..." + echo "=============================================================" + PLATFORMIO_SRC_DIR=examples/$i PIO_BOARD=${{ matrix.board }} pio run -e ci-raspberrypi + done diff --git a/.github/workflows/pre-commit-status.yml b/.github/workflows/pre-commit-status.yml new file mode 100644 index 000000000..d00606684 --- /dev/null +++ b/.github/workflows/pre-commit-status.yml @@ -0,0 +1,64 @@ +# This needs to be in a separate workflow because it requires higher permissions than the calling workflow +name: Report Pre-commit Check Status + +on: + workflow_run: + workflows: [Pre-commit hooks] + types: + - completed + +permissions: + statuses: write + +jobs: + report-success: + name: Report pre-commit success + if: github.event.workflow_run.conclusion == 'success' + runs-on: ubuntu-latest + steps: + - name: Report success + uses: actions/github-script@v7 + with: + script: | + const owner = '${{ github.repository_owner }}'; + const repo = '${{ github.repository }}'.split('/')[1]; + const sha = '${{ github.event.workflow_run.head_sha }}'; + core.debug(`owner: ${owner}`); + core.debug(`repo: ${repo}`); + core.debug(`sha: ${sha}`); + const { context: name, state } = (await github.rest.repos.createCommitStatus({ + context: 'Pre-commit checks', + description: 'Pre-commit checks successful', + owner: owner, + repo: repo, + sha: sha, + state: 'success', + target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}' + })).data; + core.info(`${name} is ${state}`); + + report-pending: + name: Report pre-commit pending + if: github.event.workflow_run.conclusion != 'success' + runs-on: ubuntu-latest + steps: + - name: Report pending + uses: actions/github-script@v7 + with: + script: | + const owner = '${{ github.repository_owner }}'; + const repo = '${{ github.repository }}'.split('/')[1]; + const sha = '${{ github.event.workflow_run.head_sha }}'; + core.debug(`owner: ${owner}`); + core.debug(`repo: ${repo}`); + core.debug(`sha: ${sha}`); + const { context: name, state } = (await github.rest.repos.createCommitStatus({ + context: 'Pre-commit checks', + description: 'The pre-commit checks need to be successful before merging', + owner: owner, + repo: repo, + sha: sha, + state: 'pending', + target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}' + })).data; + core.info(`${name} is ${state}`); diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml new file mode 100644 index 000000000..b92f283d1 --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,80 @@ +name: Pre-commit hooks + +on: + workflow_dispatch: + push: + branches: + - main + pull_request: + types: [opened, reopened, synchronize, labeled] + +concurrency: + group: pre-commit-${{github.event.pull_request.number || github.ref}} + cancel-in-progress: true + +jobs: + lint: + if: | + github.event_name != 'pull_request' || + contains(github.event.pull_request.labels.*.name, 'Status: Pending Merge') || + contains(github.event.pull_request.labels.*.name, 'Re-trigger Pre-commit') + + name: Check if fixes are needed + runs-on: ubuntu-latest + steps: + - name: Checkout latest commit + uses: actions/checkout@v4 + with: + fetch-depth: 2 + + - name: Remove Label + if: contains(github.event.pull_request.labels.*.name, 'Re-trigger Pre-commit') + run: gh pr edit ${{ github.event.number }} --remove-label 'Re-trigger Pre-commit' + env: + GH_TOKEN: ${{ github.token }} + + - name: Set up Python 3 + uses: actions/setup-python@v5 + with: + cache-dependency-path: pre-commit.requirements.txt + cache: "pip" + python-version: "3.x" + + - name: Get Python version hash + run: | + echo "Using $(python -VV)" + echo "PY_HASH=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV + + - name: Restore pre-commit cache + uses: actions/cache/restore@v4 + id: restore-cache + with: + path: | + ~/.cache/pre-commit + key: pre-commit-${{ env.PY_HASH }}-${{ hashFiles('.pre-commit-config.yaml', '.github/workflows/pre-commit.yml', 'pre-commit.requirements.txt') }} + + - name: Install python dependencies + run: python -m pip install -r pre-commit.requirements.txt + + - name: Get changed files + id: changed-files + uses: tj-actions/changed-files@v42.0.2 + + - name: Run pre-commit hooks in changed files + run: pre-commit run --color=always --show-diff-on-failure --files ${{ steps.changed-files.outputs.all_changed_files }} + + - name: Save pre-commit cache + uses: actions/cache/save@v4 + if: ${{ always() && steps.restore-cache.outputs.cache-hit != 'true' }} + continue-on-error: true + with: + path: | + ~/.cache/pre-commit + key: ${{ steps.restore-cache.outputs.cache-primary-key }} + + - name: Push changes using pre-commit-ci-lite + uses: pre-commit-ci/lite-action@v1.1.0 + # Only push changes in PRs + if: ${{ always() && github.event_name == 'pull_request' }} + with: + msg: "ci(pre-commit): Apply automatic fixes" diff --git a/.github/workflows/publish-pio-registry.yml b/.github/workflows/publish-pio-registry.yml new file mode 100644 index 000000000..2961c7b1f --- /dev/null +++ b/.github/workflows/publish-pio-registry.yml @@ -0,0 +1,62 @@ +# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json + +name: Publish to PlatformIO + +on: + workflow_dispatch: + inputs: + tag_name: + description: "Tag name of the release to publish (use 'latest' for the most recent tag)" + required: true + default: "latest" + +jobs: + publish: + name: Publish + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-tags: true + fetch-depth: 0 # Ensure all commits and tags are fetched + + - name: Show latest tag + run: git tag --sort=-creatordate | head -n 1 + + - name: Download release zip + run: | + if [ "${{ inputs.tag_name }}" == "latest" ]; then + TAG_NAME=$(git tag --sort=-creatordate | head -n 1) + if [ -z "$TAG_NAME" ]; then + echo "Error: No tags found in the repository." + exit 1 + fi + else + TAG_NAME="${{ inputs.tag_name }}" + fi + echo "Downloading tag: $TAG_NAME" + curl -L -o project.zip "https://github.com/${{ github.repository }}/archive/refs/tags/$TAG_NAME.zip" + + - name: Cache PlatformIO + uses: actions/cache@v4 + with: + key: ${{ runner.os }}-pio + path: | + ~/.cache/pip + ~/.platformio + + - name: Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + + - name: Install PlatformIO CLI + run: | + python -m pip install --upgrade pip + pip install --upgrade platformio + + - name: Publish to PlatformIO + run: pio pkg publish --no-interactive --owner ${{ github.repository_owner }} project.zip + env: + PLATFORMIO_AUTH_TOKEN: ${{ secrets.PLATFORMIO_AUTH_TOKEN }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml deleted file mode 100644 index 50d62e167..000000000 --- a/.github/workflows/push.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: ESP Async Web Server CI - -on: - push: - branches: - - master - - release/* - pull_request: - -jobs: - - build-arduino: - name: Arduino for ${{ matrix.board }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] - board: [esp32, esp8266] - steps: - - uses: actions/checkout@v3.0.2 - - name: Build Tests - run: bash ./.github/scripts/on-push.sh ${{ matrix.board }} 0 1 - - build-pio: - name: PlatformIO for ${{ matrix.board }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] - board: [esp32, esp8266] - steps: - - uses: actions/checkout@v3.0.2 - - name: Build Tests - run: bash ./.github/scripts/on-push.sh ${{ matrix.board }} 1 1 diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml new file mode 100644 index 000000000..14ceb43c2 --- /dev/null +++ b/.github/workflows/stale.yaml @@ -0,0 +1,24 @@ +name: "Close stale issues and PRs" +on: + schedule: + - cron: "30 1 * * *" + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v9 + with: + stale-issue-message: "This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days." + stale-pr-message: "This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days." + close-issue-message: "This issue was closed because it has been stalled for 7 days with no activity." + close-pr-message: "This PR was closed because it has been stalled for 7 days with no activity." + days-before-issue-stale: 30 + days-before-pr-stale: 30 + days-before-issue-close: 7 + days-before-pr-close: 7 + +permissions: + # contents: write # only for delete-branch option + issues: write + pull-requests: write diff --git a/.github/workflows/upload-idf-component.yml b/.github/workflows/upload-idf-component.yml new file mode 100644 index 000000000..e68384b83 --- /dev/null +++ b/.github/workflows/upload-idf-component.yml @@ -0,0 +1,50 @@ +name: Publish ESP-IDF Component + +on: + workflow_dispatch: + inputs: + tag: + description: 'Component version (1.2.3, 1.2.3-rc1 or 1.2.3.4)' + required: true + git_ref: + description: 'Git ref with the source (branch, tag or commit)' + required: true + +permissions: + contents: read + +jobs: + upload_components: + runs-on: ubuntu-latest + steps: + - name: Get the release tag + env: + head_branch: ${{ inputs.tag || github.event.workflow_run.head_branch }} + run: | + # Read and sanitize the branch/tag name + branch=$(echo "$head_branch" | tr -cd '[:alnum:]/_.-') + + if [[ $branch == refs/tags/* ]]; then + tag="${branch#refs/tags/}" + elif [[ $branch =~ ^[v]*[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then + tag=$branch + else + echo "Tag not found in $branch. Exiting..." + exit 1 + fi + + echo "Tag: $tag" + echo "RELEASE_TAG=$tag" >> $GITHUB_ENV + + - uses: actions/checkout@v4 + with: + ref: ${{ inputs.git_ref || env.RELEASE_TAG }} + submodules: "recursive" + + - name: Upload components to the component registry + uses: espressif/upload-components-ci-action@v1 + with: + name: espasyncwebserver + version: ${{ env.RELEASE_TAG }} + namespace: esp32async + api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }} diff --git a/.gitignore b/.gitignore index 25abe6e5b..7713f05ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -.vscode .DS_Store /dist/ - +.lh +/.pio +/.vscode +/logs diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 000000000..29eeb4357 --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,2 @@ +FROM gitpod/workspace-python-3.11 +USER gitpod diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 000000000..2f8a4431c --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,9 @@ +tasks: + - command: pip install --upgrade pip && pip install -U platformio && platformio run + +image: + file: .gitpod.Dockerfile + +vscode: + extensions: + - shardulm94.trailing-spaces diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 000000000..eb2d62e9f --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,42 @@ +exclude: | + (?x)( + ^\.github\/| + LICENSE$ + ) + +default_language_version: + # force all unspecified python hooks to run python3 + python: python3 + +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: "v5.0.0" + hooks: + # Generic checks + - id: check-case-conflict + - id: check-symlinks + - id: debug-statements + - id: destroyed-symlinks + - id: detect-private-key + - id: end-of-file-fixer + exclude: ^.*\.(bin|BIN)$ + - id: mixed-line-ending + args: [--fix=lf] + - id: trailing-whitespace + args: [--markdown-linebreak-ext=md] + exclude: ^platformio\.ini$ + + - repo: https://github.com/codespell-project/codespell + rev: "v2.3.0" + hooks: + # Spell checking + - id: codespell + exclude: ^.*\.(svd|SVD)$ + + - repo: https://github.com/pre-commit/mirrors-clang-format + rev: "v18.1.3" + hooks: + # C/C++ formatting + - id: clang-format + types_or: [c, c++] + exclude: ^.*\/build_opt\.h$ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e1b703527..000000000 --- a/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -sudo: false - -language: python - -os: - - linux - -git: - depth: false - -stages: - - build - -jobs: - include: - - - name: "Build Arduino ESP32" - if: tag IS blank AND (type = pull_request OR (type = push AND branch = master)) - stage: build - script: bash $TRAVIS_BUILD_DIR/.github/scripts/on-push.sh esp32 - - - name: "Build Arduino ESP8266" - if: tag IS blank AND (type = pull_request OR (type = push AND branch = master)) - stage: build - script: bash $TRAVIS_BUILD_DIR/.github/scripts/on-push.sh esp8266 - - - name: "Build Platformio ESP32" - if: tag IS blank AND (type = pull_request OR (type = push AND branch = master)) - stage: build - script: bash $TRAVIS_BUILD_DIR/.github/scripts/on-push.sh esp32 1 1 - - - name: "Build Platformio ESP8266" - if: tag IS blank AND (type = pull_request OR (type = push AND branch = master)) - stage: build - script: bash $TRAVIS_BUILD_DIR/.github/scripts/on-push.sh esp8266 1 1 - -notifications: - email: - on_success: change - on_failure: change - webhooks: - urls: - - https://webhooks.gitter.im/e/60e65d0c78ea0a920347 - on_success: change # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: never # options: [always|never|change] default: always diff --git a/CMakeLists.txt b/CMakeLists.txt index 64292eca4..ea7be0862 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,12 +6,4 @@ set(COMPONENT_ADD_INCLUDEDIRS "src" ) -set(COMPONENT_REQUIRES - "arduino-esp32" - "AsyncTCP" -) - register_component() - -target_compile_definitions(${COMPONENT_TARGET} PUBLIC -DESP32) -target_compile_options(${COMPONENT_TARGET} PRIVATE -fno-rtti) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..4fcdc2f52 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,129 @@ + +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socioeconomic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +https://sidweb.nl/cms3/en/contact. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available at +https://www.contributor-covenant.org/translations. diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..153d416dc --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file diff --git a/README.md b/README.md index 0b512b86a..96eb85f3b 100644 --- a/README.md +++ b/README.md @@ -1,1418 +1,154 @@ # ESPAsyncWebServer -[![Build Status](https://travis-ci.org/me-no-dev/ESPAsyncWebServer.svg?branch=master)](https://travis-ci.org/me-no-dev/ESPAsyncWebServer) ![](https://github.com/me-no-dev/ESPAsyncWebServer/workflows/ESP%20Async%20Web%20Server%20CI/badge.svg) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/395dd42cfc674e6ca2e326af3af80ffc)](https://www.codacy.com/manual/me-no-dev/ESPAsyncWebServer?utm_source=github.com&utm_medium=referral&utm_content=me-no-dev/ESPAsyncWebServer&utm_campaign=Badge_Grade) -A fork of the [ESPAsyncWebServer](https://github.com/me-no-dev/ESPAsyncWebServer) library by [@me-no-dev](https://github.com/me-no-dev) for [ESPHome](https://esphome.io). +A fork of the [ESPAsyncWebServer](https://github.com/ESP32Async/ESPAsyncWebServer) library by [@me-no-dev](https://github.com/me-no-dev) for [ESPHome](https://esphome.io). -For help and support [![Join the chat at https://gitter.im/me-no-dev/ESPAsyncWebServer](https://badges.gitter.im/me-no-dev/ESPAsyncWebServer.svg)](https://gitter.im/me-no-dev/ESPAsyncWebServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Latest Release](https://img.shields.io/github/release/ESP32Async/ESPAsyncWebServer.svg)](https://GitHub.com/ESP32Async/ESPAsyncWebServer/releases/) +[![PlatformIO Registry](https://badges.registry.platformio.org/packages/ESP32Async/library/ESPAsyncWebServer.svg)](https://registry.platformio.org/libraries/ESP32Async/ESPAsyncWebServer) -Async HTTP and WebSocket Server for ESP8266 Arduino +[![License: LGPL 3.0](https://img.shields.io/badge/License-LGPL%203.0-yellow.svg)](https://opensource.org/license/lgpl-3-0/) +[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md) -For ESP8266 it requires [ESPAsyncTCP](https://github.com/me-no-dev/ESPAsyncTCP) -To use this library you might need to have the latest git versions of [ESP8266](https://github.com/esp8266/Arduino) Arduino Core +[![GitHub latest commit](https://badgen.net/github/last-commit/ESP32Async/ESPAsyncWebServer)](https://GitHub.com/ESP32Async/ESPAsyncWebServer/commit/) +[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ESP32Async/ESPAsyncWebServer) -For ESP32 it requires [AsyncTCP](https://github.com/me-no-dev/AsyncTCP) to work -To use this library you might need to have the latest git versions of [ESP32](https://github.com/espressif/arduino-esp32) Arduino Core +[![ESP32Async Discord Server](https://img.shields.io/badge/Discord-ESP32Async-blue?logo=discord)](https://discord.gg/X7zpGdyUcY) -## Table of contents -- [ESPAsyncWebServer](#espasyncwebserver) - - [Table of contents](#table-of-contents) - - [Installation](#installation) - - [Using PlatformIO](#using-platformio) - - [Why should you care](#why-should-you-care) - - [Important things to remember](#important-things-to-remember) - - [Principles of operation](#principles-of-operation) - - [The Async Web server](#the-async-web-server) - - [Request Life Cycle](#request-life-cycle) - - [Rewrites and how do they work](#rewrites-and-how-do-they-work) - - [Handlers and how do they work](#handlers-and-how-do-they-work) - - [Responses and how do they work](#responses-and-how-do-they-work) - - [Template processing](#template-processing) - - [Libraries and projects that use AsyncWebServer](#libraries-and-projects-that-use-asyncwebserver) - - [Request Variables](#request-variables) - - [Common Variables](#common-variables) - - [Headers](#headers) - - [GET, POST and FILE parameters](#get-post-and-file-parameters) - - [FILE Upload handling](#file-upload-handling) - - [Body data handling](#body-data-handling) - - [JSON body handling with ArduinoJson](#json-body-handling-with-arduinojson) - - [Responses](#responses) - - [Redirect to another URL](#redirect-to-another-url) - - [Basic response with HTTP Code](#basic-response-with-http-code) - - [Basic response with HTTP Code and extra headers](#basic-response-with-http-code-and-extra-headers) - - [Basic response with string content](#basic-response-with-string-content) - - [Basic response with string content and extra headers](#basic-response-with-string-content-and-extra-headers) - - [Send large webpage from PROGMEM](#send-large-webpage-from-progmem) - - [Send large webpage from PROGMEM and extra headers](#send-large-webpage-from-progmem-and-extra-headers) - - [Send large webpage from PROGMEM containing templates](#send-large-webpage-from-progmem-containing-templates) - - [Send large webpage from PROGMEM containing templates and extra headers](#send-large-webpage-from-progmem-containing-templates-and-extra-headers) - - [Send binary content from PROGMEM](#send-binary-content-from-progmem) - - [Respond with content coming from a Stream](#respond-with-content-coming-from-a-stream) - - [Respond with content coming from a Stream and extra headers](#respond-with-content-coming-from-a-stream-and-extra-headers) - - [Respond with content coming from a Stream containing templates](#respond-with-content-coming-from-a-stream-containing-templates) - - [Respond with content coming from a Stream containing templates and extra headers](#respond-with-content-coming-from-a-stream-containing-templates-and-extra-headers) - - [Respond with content coming from a File](#respond-with-content-coming-from-a-file) - - [Respond with content coming from a File and extra headers](#respond-with-content-coming-from-a-file-and-extra-headers) - - [Respond with content coming from a File containing templates](#respond-with-content-coming-from-a-file-containing-templates) - - [Respond with content using a callback](#respond-with-content-using-a-callback) - - [Respond with content using a callback and extra headers](#respond-with-content-using-a-callback-and-extra-headers) - - [Respond with content using a callback containing templates](#respond-with-content-using-a-callback-containing-templates) - - [Respond with content using a callback containing templates and extra headers](#respond-with-content-using-a-callback-containing-templates-and-extra-headers) - - [Chunked Response](#chunked-response) - - [Chunked Response containing templates](#chunked-response-containing-templates) - - [Print to response](#print-to-response) - - [ArduinoJson Basic Response](#arduinojson-basic-response) - - [ArduinoJson Advanced Response](#arduinojson-advanced-response) - - [Serving static files](#serving-static-files) - - [Serving specific file by name](#serving-specific-file-by-name) - - [Serving files in directory](#serving-files-in-directory) - - [Serving static files with authentication](#serving-static-files-with-authentication) - - [Specifying Cache-Control header](#specifying-cache-control-header) - - [Specifying Date-Modified header](#specifying-date-modified-header) - - [Specifying Template Processor callback](#specifying-template-processor-callback) - - [Param Rewrite With Matching](#param-rewrite-with-matching) - - [Using filters](#using-filters) - - [Serve different site files in AP mode](#serve-different-site-files-in-ap-mode) - - [Rewrite to different index on AP](#rewrite-to-different-index-on-ap) - - [Serving different hosts](#serving-different-hosts) - - [Determine interface inside callbacks](#determine-interface-inside-callbacks) - - [Bad Responses](#bad-responses) - - [Respond with content using a callback without content length to HTTP/1.0 clients](#respond-with-content-using-a-callback-without-content-length-to-http10-clients) - - [Async WebSocket Plugin](#async-websocket-plugin) - - [Async WebSocket Event](#async-websocket-event) - - [Methods for sending data to a socket client](#methods-for-sending-data-to-a-socket-client) - - [Direct access to web socket message buffer](#direct-access-to-web-socket-message-buffer) - - [Limiting the number of web socket clients](#limiting-the-number-of-web-socket-clients) - - [Async Event Source Plugin](#async-event-source-plugin) - - [Setup Event Source on the server](#setup-event-source-on-the-server) - - [Setup Event Source in the browser](#setup-event-source-in-the-browser) - - [Scanning for available WiFi Networks](#scanning-for-available-wifi-networks) - - [Remove handlers and rewrites](#remove-handlers-and-rewrites) - - [Setting up the server](#setting-up-the-server) - - [Setup global and class functions as request handlers](#setup-global-and-class-functions-as-request-handlers) - - [Methods for controlling websocket connections](#methods-for-controlling-websocket-connections) - - [Adding Default Headers](#adding-default-headers) - - [Path variable](#path-variable) +[![Documentation](https://img.shields.io/badge/Wiki-ESPAsyncWebServer-blue?logo=github)](https://github.com/ESP32Async/ESPAsyncWebServer/wiki) -## Installation +## Asynchronous HTTP and WebSocket Server Library for ESP32, ESP8266, RP2040 and RP2350 -### Using PlatformIO +Supports: WebSocket, SSE, Authentication, Arduino Json 7, File Upload, Static File serving, URL Rewrite, URL Redirect, etc. -[PlatformIO](http://platformio.org) is an open source ecosystem for IoT development with cross platform build system, library manager and full support for Espressif ESP8266/ESP32 development. It works on the popular host OS: Mac OS X, Windows, Linux 32/64, Linux ARM (like Raspberry Pi, BeagleBone, CubieBoard). +- [Documentation](#documentation) +- [How to install](#how-to-install) +- [Dependencies](#dependencies) + - [ESP32 / pioarduino](#esp32--pioarduino) + - [ESP8266 / pioarduino](#esp8266--pioarduino) + - [Unofficial dependencies](#unofficial-dependencies) -1. Install [PlatformIO IDE](http://platformio.org/platformio-ide) -2. Create new project using "PlatformIO Home > New Project" -3. Update dev/platform to staging version: - - [Instruction for Espressif 8266](http://docs.platformio.org/en/latest/platforms/espressif8266.html#using-arduino-framework-with-staging-version) - - [Instruction for Espressif 32](http://docs.platformio.org/en/latest/platforms/espressif32.html#using-arduino-framework-with-staging-version) - 4. Add "ESP Async WebServer" to project using [Project Configuration File `platformio.ini`](http://docs.platformio.org/page/projectconf.html) and [lib_deps](http://docs.platformio.org/page/projectconf/section_env_library.html#lib-deps) option: +## Documentation -```ini -[env:myboard] -platform = espressif... -board = ... -framework = arduino - -# using the latest stable version -lib_deps = ESP Async WebServer - -# or using GIT Url (the latest development version) -lib_deps = https://github.com/me-no-dev/ESPAsyncWebServer.git -``` - 5. Happy coding with PlatformIO! - -## Why should you care -- Using asynchronous network means that you can handle more than one connection at the same time -- You are called once the request is ready and parsed -- When you send the response, you are immediately ready to handle other connections - while the server is taking care of sending the response in the background -- Speed is OMG -- Easy to use API, HTTP Basic and Digest MD5 Authentication (default), ChunkedResponse -- Easily extendible to handle any type of content -- Supports Continue 100 -- Async WebSocket plugin offering different locations without extra servers or ports -- Async EventSource (Server-Sent Events) plugin to send events to the browser -- URL Rewrite plugin for conditional and permanent url rewrites -- ServeStatic plugin that supports cache, Last-Modified, default index and more -- Simple template processing engine to handle templates - -## Important things to remember -- This is fully asynchronous server and as such does not run on the loop thread. -- You can not use yield or delay or any function that uses them inside the callbacks -- The server is smart enough to know when to close the connection and free resources -- You can not send more than one response to a single request - -## Principles of operation - -### The Async Web server -- Listens for connections -- Wraps the new clients into ```Request``` -- Keeps track of clients and cleans memory -- Manages ```Rewrites``` and apply them on the request url -- Manages ```Handlers``` and attaches them to Requests - -### Request Life Cycle -- TCP connection is received by the server -- The connection is wrapped inside ```Request``` object -- When the request head is received (type, url, get params, http version and host), - the server goes through all ```Rewrites``` (in the order they were added) to rewrite the url and inject query parameters, - next, it goes through all attached ```Handlers```(in the order they were added) trying to find one - that ```canHandle``` the given request. If none are found, the default(catch-all) handler is attached. -- The rest of the request is received, calling the ```handleUpload``` or ```handleBody``` methods of the ```Handler``` if they are needed (POST+File/Body) -- When the whole request is parsed, the result is given to the ```handleRequest``` method of the ```Handler``` and is ready to be responded to -- In the ```handleRequest``` method, to the ```Request``` is attached a ```Response``` object (see below) that will serve the response data back to the client -- When the ```Response``` is sent, the client is closed and freed from the memory - -### Rewrites and how do they work -- The ```Rewrites``` are used to rewrite the request url and/or inject get parameters for a specific request url path. -- All ```Rewrites``` are evaluated on the request in the order they have been added to the server. -- The ```Rewrite``` will change the request url only if the request url (excluding get parameters) is fully match - the rewrite url, and when the optional ```Filter``` callback return true. -- Setting a ```Filter``` to the ```Rewrite``` enables to control when to apply the rewrite, decision can be based on - request url, http version, request host/port/target host, get parameters or the request client's localIP or remoteIP. -- Two filter callbacks are provided: ```ON_AP_FILTER``` to execute the rewrite when request is made to the AP interface, - ```ON_STA_FILTER``` to execute the rewrite when request is made to the STA interface. -- The ```Rewrite``` can specify a target url with optional get parameters, e.g. ```/to-url?with=params``` - -### Handlers and how do they work -- The ```Handlers``` are used for executing specific actions to particular requests -- One ```Handler``` instance can be attached to any request and lives together with the server -- Setting a ```Filter``` to the ```Handler``` enables to control when to apply the handler, decision can be based on - request url, http version, request host/port/target host, get parameters or the request client's localIP or remoteIP. -- Two filter callbacks are provided: ```ON_AP_FILTER``` to execute the rewrite when request is made to the AP interface, - ```ON_STA_FILTER``` to execute the rewrite when request is made to the STA interface. -- The ```canHandle``` method is used for handler specific control on whether the requests can be handled - and for declaring any interesting headers that the ```Request``` should parse. Decision can be based on request - method, request url, http version, request host/port/target host and get parameters -- Once a ```Handler``` is attached to given ```Request``` (```canHandle``` returned true) - that ```Handler``` takes care to receive any file/data upload and attach a ```Response``` - once the ```Request``` has been fully parsed -- ```Handlers``` are evaluated in the order they are attached to the server. The ```canHandle``` is called only - if the ```Filter``` that was set to the ```Handler``` return true. -- The first ```Handler``` that can handle the request is selected, not further ```Filter``` and ```canHandle``` are called. - -### Responses and how do they work -- The ```Response``` objects are used to send the response data back to the client -- The ```Response``` object lives with the ```Request``` and is freed on end or disconnect -- Different techniques are used depending on the response type to send the data in packets - returning back almost immediately and sending the next packet when this one is received. - Any time in between is spent to run the user loop and handle other network packets -- Responding asynchronously is probably the most difficult thing for most to understand -- Many different options exist for the user to make responding a background task - -### Template processing -- ESPAsyncWebserver contains simple template processing engine. -- Template processing can be added to most response types. -- Currently it supports only replacing template placeholders with actual values. No conditional processing, cycles, etc. -- Placeholders are delimited with ```%``` symbols. Like this: ```%TEMPLATE_PLACEHOLDER%```. -- It works by extracting placeholder name from response text and passing it to user provided function which should return actual value to be used instead of placeholder. -- Since it's user provided function, it is possible for library users to implement conditional processing and cycles themselves. -- Since it's impossible to know the actual response size after template processing step in advance (and, therefore, to include it in response headers), the response becomes [chunked](#chunked-response). - -## Libraries and projects that use AsyncWebServer -- [WebSocketToSerial](https://github.com/hallard/WebSocketToSerial) - Debug serial devices through the web browser -- [Sattrack](https://github.com/Hopperpop/Sattrack) - Track the ISS with ESP8266 -- [ESP Radio](https://github.com/Edzelf/Esp-radio) - Icecast radio based on ESP8266 and VS1053 -- [VZero](https://github.com/andig/vzero) - the Wireless zero-config controller for volkszaehler.org -- [ESPurna](https://bitbucket.org/xoseperez/espurna) - ESPurna ("spark" in Catalan) is a custom C firmware for ESP8266 based smart switches. It was originally developed with the ITead Sonoff in mind. -- [fauxmoESP](https://bitbucket.org/xoseperez/fauxmoesp) - Belkin WeMo emulator library for ESP8266. -- [ESP-RFID](https://github.com/omersiar/esp-rfid) - MFRC522 RFID Access Control Management project for ESP8266. +The complete [project documentation](https://github.com/ESP32Async/ESPAsyncWebServer/wiki) is available in the Wiki section. -## Request Variables +## How to install -### Common Variables -```cpp -request->version(); // uint8_t: 0 = HTTP/1.0, 1 = HTTP/1.1 -request->method(); // enum: HTTP_GET, HTTP_POST, HTTP_DELETE, HTTP_PUT, HTTP_PATCH, HTTP_HEAD, HTTP_OPTIONS -request->url(); // String: URL of the request (not including host, port or GET parameters) -request->host(); // String: The requested host (can be used for virtual hosting) -request->contentType(); // String: ContentType of the request (not avaiable in Handler::canHandle) -request->contentLength(); // size_t: ContentLength of the request (not avaiable in Handler::canHandle) -request->multipart(); // bool: True if the request has content type "multipart" -``` - -### Headers -```cpp -//List all collected headers -int headers = request->headers(); -int i; -for(i=0;igetHeader(i); - Serial.printf("HEADER[%s]: %s\n", h->name().c_str(), h->value().c_str()); -} - -//get specific header by name -if(request->hasHeader("MyHeader")){ - AsyncWebHeader* h = request->getHeader("MyHeader"); - Serial.printf("MyHeader: %s\n", h->value().c_str()); -} - -//List all collected headers (Compatibility) -int headers = request->headers(); -int i; -for(i=0;iheaderName(i).c_str(), request->header(i).c_str()); -} - -//get specific header by name (Compatibility) -if(request->hasHeader("MyHeader")){ - Serial.printf("MyHeader: %s\n", request->header("MyHeader").c_str()); -} -``` - -### GET, POST and FILE parameters -```cpp -//List all parameters -int params = request->params(); -for(int i=0;igetParam(i); - if(p->isFile()){ //p->isPost() is also true - Serial.printf("FILE[%s]: %s, size: %u\n", p->name().c_str(), p->value().c_str(), p->size()); - } else if(p->isPost()){ - Serial.printf("POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); - } else { - Serial.printf("GET[%s]: %s\n", p->name().c_str(), p->value().c_str()); - } -} +The library can be downloaded from the releases page at [https://github.com/ESP32Async/ESPAsyncWebServer/releases](https://github.com/ESP32Async/ESPAsyncWebServer/releases). -//Check if GET parameter exists -if(request->hasParam("download")) - AsyncWebParameter* p = request->getParam("download"); +It is also deployed in these registries: -//Check if POST (but not File) parameter exists -if(request->hasParam("download", true)) - AsyncWebParameter* p = request->getParam("download", true); +- Arduino Library Registry: [https://github.com/arduino/library-registry](https://github.com/arduino/library-registry) -//Check if FILE was uploaded -if(request->hasParam("download", true, true)) - AsyncWebParameter* p = request->getParam("download", true, true); +- ESP Component Registry [https://components.espressif.com/components/esp32async/espasyncwebserver](https://components.espressif.com/components/esp32async/espasyncwebserver) -//List all parameters (Compatibility) -int args = request->args(); -for(int i=0;iargName(i).c_str(), request->arg(i).c_str()); -} +- PlatformIO Registry: [https://registry.platformio.org/libraries/esp32async/ESPAsyncWebServer](https://registry.platformio.org/libraries/esp32async/ESPAsyncWebServer) -//Check if parameter exists (Compatibility) -if(request->hasArg("download")) - String arg = request->arg("download"); -``` - -### FILE Upload handling -```cpp -void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){ - if(!index){ - Serial.printf("UploadStart: %s\n", filename.c_str()); - } - for(size_t i=0; i` to point to latest version with the same major version + - Use: `lib_deps=ESP32Async/ESPAsyncWebServer @ ` to always point to the same version (reproductible build) -### Body data handling -```cpp -void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){ - if(!index){ - Serial.printf("BodyStart: %u B\n", total); - } - for(size_t i=0; i(); - // ... -}); -server.addHandler(handler); -``` - -## Responses -### Redirect to another URL -```cpp -//to local url -request->redirect("/login"); - -//to external url -request->redirect("http://esp8266.com"); -``` - -### Basic response with HTTP Code -```cpp -request->send(404); //Sends 404 File Not Found -``` - -### Basic response with HTTP Code and extra headers -```cpp -AsyncWebServerResponse *response = request->beginResponse(404); //Sends 404 File Not Found -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Basic response with string content -```cpp -request->send(200, "text/plain", "Hello World!"); -``` - -### Basic response with string content and extra headers -```cpp -AsyncWebServerResponse *response = request->beginResponse(200, "text/plain", "Hello World!"); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Send large webpage from PROGMEM -```cpp -const char index_html[] PROGMEM = "..."; // large char array, tested with 14k -request->send_P(200, "text/html", index_html); -``` - -### Send large webpage from PROGMEM and extra headers -```cpp -const char index_html[] PROGMEM = "..."; // large char array, tested with 14k -AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", index_html); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Send large webpage from PROGMEM containing templates -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -const char index_html[] PROGMEM = "..."; // large char array, tested with 14k -request->send_P(200, "text/html", index_html, processor); -``` - -### Send large webpage from PROGMEM containing templates and extra headers -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -const char index_html[] PROGMEM = "..."; // large char array, tested with 14k -AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", index_html, processor); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Send binary content from PROGMEM -```cpp - -//File: favicon.ico.gz, Size: 726 -#define favicon_ico_gz_len 726 -const uint8_t favicon_ico_gz[] PROGMEM = { - 0x1F, 0x8B, 0x08, 0x08, 0x0B, 0x87, 0x90, 0x57, 0x00, 0x03, 0x66, 0x61, 0x76, 0x69, 0x63, 0x6F, - 0x6E, 0x2E, 0x69, 0x63, 0x6F, 0x00, 0xCD, 0x53, 0x5F, 0x48, 0x9A, 0x51, 0x14, 0xBF, 0x62, 0x6D, - 0x86, 0x96, 0xA9, 0x64, 0xD3, 0xFE, 0xA8, 0x99, 0x65, 0x1A, 0xB4, 0x8A, 0xA8, 0x51, 0x54, 0x23, - 0xA8, 0x11, 0x49, 0x51, 0x8A, 0x34, 0x62, 0x93, 0x85, 0x31, 0x58, 0x44, 0x12, 0x45, 0x2D, 0x58, - 0xF5, 0x52, 0x41, 0x10, 0x23, 0x82, 0xA0, 0x20, 0x98, 0x2F, 0xC1, 0x26, 0xED, 0xA1, 0x20, 0x89, - 0x04, 0xD7, 0x83, 0x58, 0x20, 0x28, 0x04, 0xAB, 0xD1, 0x9B, 0x8C, 0xE5, 0xC3, 0x60, 0x32, 0x64, - 0x0E, 0x56, 0xBF, 0x9D, 0xEF, 0xF6, 0x30, 0x82, 0xED, 0xAD, 0x87, 0xDD, 0x8F, 0xF3, 0xDD, 0x8F, - 0x73, 0xCF, 0xEF, 0x9C, 0xDF, 0x39, 0xBF, 0xFB, 0x31, 0x26, 0xA2, 0x27, 0x37, 0x97, 0xD1, 0x5B, - 0xCF, 0x9E, 0x67, 0x30, 0xA6, 0x66, 0x8C, 0x99, 0xC9, 0xC8, 0x45, 0x9E, 0x6B, 0x3F, 0x5F, 0x74, - 0xA6, 0x94, 0x5E, 0xDB, 0xFF, 0xB2, 0xE6, 0xE7, 0xE7, 0xF9, 0xDE, 0xD6, 0xD6, 0x96, 0xDB, 0xD8, - 0xD8, 0x78, 0xBF, 0xA1, 0xA1, 0xC1, 0xDA, 0xDC, 0xDC, 0x2C, 0xEB, 0xED, 0xED, 0x15, 0x9B, 0xCD, - 0xE6, 0x4A, 0x83, 0xC1, 0xE0, 0x2E, 0x29, 0x29, 0x99, 0xD6, 0x6A, 0xB5, 0x4F, 0x75, 0x3A, 0x9D, - 0x61, 0x75, 0x75, 0x95, 0xB5, 0xB7, 0xB7, 0xDF, 0xC8, 0xD1, 0xD4, 0xD4, 0xF4, 0xB0, 0xBA, 0xBA, - 0xFA, 0x83, 0xD5, 0x6A, 0xFD, 0x5A, 0x5E, 0x5E, 0x9E, 0x28, 0x2D, 0x2D, 0x0D, 0x10, 0xC6, 0x4B, - 0x98, 0x78, 0x5E, 0x5E, 0xDE, 0x95, 0x42, 0xA1, 0x40, 0x4E, 0x4E, 0xCE, 0x65, 0x76, 0x76, 0xF6, - 0x47, 0xB5, 0x5A, 0x6D, 0x4F, 0x26, 0x93, 0xA2, 0xD6, 0xD6, 0x56, 0x8E, 0x6D, 0x69, 0x69, 0xD1, - 0x11, 0x36, 0x62, 0xB1, 0x58, 0x60, 0x32, 0x99, 0xA0, 0xD7, 0xEB, 0x51, 0x58, 0x58, 0x88, 0xFC, - 0xFC, 0x7C, 0x10, 0x16, 0x02, 0x56, 0x2E, 0x97, 0x43, 0x2A, 0x95, 0x42, 0x2C, 0x16, 0x23, 0x33, - 0x33, 0x33, 0xAE, 0x52, 0xA9, 0x1E, 0x64, 0x65, 0x65, 0x71, 0x7C, 0x7D, 0x7D, 0xBD, 0x93, 0xEA, - 0xFE, 0x30, 0x1A, 0x8D, 0xE8, 0xEC, 0xEC, 0xC4, 0xE2, 0xE2, 0x22, 0x6A, 0x6A, 0x6A, 0x40, 0x39, - 0x41, 0xB5, 0x38, 0x4E, 0xC8, 0x33, 0x3C, 0x3C, 0x0C, 0x87, 0xC3, 0xC1, 0x6B, 0x54, 0x54, 0x54, - 0xBC, 0xE9, 0xEB, 0xEB, 0x93, 0x5F, 0x5C, 0x5C, 0x30, 0x8A, 0x9D, 0x2E, 0x2B, 0x2B, 0xBB, 0xA2, - 0x3E, 0x41, 0xBD, 0x21, 0x1E, 0x8F, 0x63, 0x6A, 0x6A, 0x0A, 0x81, 0x40, 0x00, 0x94, 0x1B, 0x3D, - 0x3D, 0x3D, 0x42, 0x3C, 0x96, 0x96, 0x96, 0x70, 0x7E, 0x7E, 0x8E, 0xE3, 0xE3, 0x63, 0xF8, 0xFD, - 0xFE, 0xB4, 0xD7, 0xEB, 0xF5, 0x8F, 0x8F, 0x8F, 0x5B, 0x68, 0x5E, 0x6F, 0x05, 0xCE, 0xB4, 0xE3, - 0xE8, 0xE8, 0x08, 0x27, 0x27, 0x27, 0xD8, 0xDF, 0xDF, 0xC7, 0xD9, 0xD9, 0x19, 0x6C, 0x36, 0x1B, - 0x36, 0x36, 0x36, 0x38, 0x9F, 0x85, 0x85, 0x05, 0xAC, 0xAF, 0xAF, 0x23, 0x1A, 0x8D, 0x22, 0x91, - 0x48, 0x20, 0x16, 0x8B, 0xFD, 0xDA, 0xDA, 0xDA, 0x7A, 0x41, 0x33, 0x7E, 0x57, 0x50, 0x50, 0x80, - 0x89, 0x89, 0x09, 0x84, 0xC3, 0x61, 0x6C, 0x6F, 0x6F, 0x23, 0x12, 0x89, 0xE0, 0xE0, 0xE0, 0x00, - 0x43, 0x43, 0x43, 0x58, 0x5E, 0x5E, 0xE6, 0x9C, 0x7D, 0x3E, 0x1F, 0x46, 0x47, 0x47, 0x79, 0xBE, - 0xBD, 0xBD, 0x3D, 0xE1, 0x3C, 0x1D, 0x0C, 0x06, 0x9F, 0x10, 0xB7, 0xC7, 0x84, 0x4F, 0xF6, 0xF7, - 0xF7, 0x63, 0x60, 0x60, 0x00, 0x83, 0x83, 0x83, 0x18, 0x19, 0x19, 0xC1, 0xDC, 0xDC, 0x1C, 0x8F, - 0x17, 0x7C, 0xA4, 0x27, 0xE7, 0x34, 0x39, 0x39, 0x89, 0x9D, 0x9D, 0x1D, 0x6E, 0x54, 0xE3, 0x13, - 0xE5, 0x34, 0x11, 0x37, 0x49, 0x51, 0x51, 0xD1, 0x4B, 0xA5, 0x52, 0xF9, 0x45, 0x26, 0x93, 0x5D, - 0x0A, 0xF3, 0x92, 0x48, 0x24, 0xA0, 0x6F, 0x14, 0x17, 0x17, 0xA3, 0xB6, 0xB6, 0x16, 0x5D, 0x5D, - 0x5D, 0x7C, 0x1E, 0xBB, 0xBB, 0xBB, 0x9C, 0xD7, 0xE1, 0xE1, 0x21, 0x42, 0xA1, 0xD0, 0x6B, 0xD2, - 0x45, 0x4C, 0x33, 0x12, 0x34, 0xCC, 0xA0, 0x19, 0x54, 0x92, 0x56, 0x0E, 0xD2, 0xD9, 0x43, 0xF8, - 0xCF, 0x82, 0x56, 0xC2, 0xDC, 0xEB, 0xEA, 0xEA, 0x38, 0x7E, 0x6C, 0x6C, 0x4C, 0xE0, 0xFE, 0x9D, - 0xB8, 0xBF, 0xA7, 0xFA, 0xAF, 0x56, 0x56, 0x56, 0xEE, 0x6D, 0x6E, 0x6E, 0xDE, 0xB8, 0x47, 0x55, - 0x55, 0x55, 0x6C, 0x66, 0x66, 0x46, 0x44, 0xDA, 0x3B, 0x34, 0x1A, 0x4D, 0x94, 0xB0, 0x3F, 0x09, - 0x7B, 0x45, 0xBD, 0xA5, 0x5D, 0x2E, 0x57, 0x8C, 0x7A, 0x73, 0xD9, 0xED, 0xF6, 0x3B, 0x84, 0xFF, - 0xE7, 0x7D, 0xA6, 0x3A, 0x2C, 0x95, 0x4A, 0xB1, 0x8E, 0x8E, 0x0E, 0x6D, 0x77, 0x77, 0xB7, 0xCD, - 0xE9, 0x74, 0x3E, 0x73, 0xBB, 0xDD, 0x8F, 0x3C, 0x1E, 0x8F, 0xE6, 0xF4, 0xF4, 0x94, 0xAD, 0xAD, - 0xAD, 0xDD, 0xDE, 0xCF, 0x73, 0x0B, 0x0B, 0xB8, 0xB6, 0xE0, 0x5D, 0xC6, 0x66, 0xC5, 0xE4, 0x10, - 0x4C, 0xF4, 0xF7, 0xD8, 0x59, 0xF2, 0x7F, 0xA3, 0xB8, 0xB4, 0xFC, 0x0F, 0xEE, 0x37, 0x70, 0xEC, - 0x16, 0x4A, 0x7E, 0x04, 0x00, 0x00 -}; - -AsyncWebServerResponse *response = request->beginResponse_P(200, "image/x-icon", favicon_ico_gz, favicon_ico_gz_len); -response->addHeader("Content-Encoding", "gzip"); -request->send(response); -``` +## Dependencies -### Respond with content coming from a Stream -```cpp -//read 12 bytes from Serial and send them as Content Type text/plain -request->send(Serial, "text/plain", 12); -``` - -### Respond with content coming from a Stream and extra headers -```cpp -//read 12 bytes from Serial and send them as Content Type text/plain -AsyncWebServerResponse *response = request->beginResponse(Serial, "text/plain", 12); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Respond with content coming from a Stream containing templates -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -//read 12 bytes from Serial and send them as Content Type text/plain -request->send(Serial, "text/plain", 12, processor); -``` - -### Respond with content coming from a Stream containing templates and extra headers -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -//read 12 bytes from Serial and send them as Content Type text/plain -AsyncWebServerResponse *response = request->beginResponse(Serial, "text/plain", 12, processor); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Respond with content using a callback -```cpp -//send 128 bytes as plain text -request->send("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will not be asked for more bytes once the content length has been reached. - //Keep in mind that you can not delay or yield waiting for more data! - //Send what you currently have and you will be asked for more again - return mySource.read(buffer, maxLen); -}); -``` - -### Respond with content using a callback and extra headers -```cpp -//send 128 bytes as plain text -AsyncWebServerResponse *response = request->beginResponse("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will not be asked for more bytes once the content length has been reached. - //Keep in mind that you can not delay or yield waiting for more data! - //Send what you currently have and you will be asked for more again - return mySource.read(buffer, maxLen); -}); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Respond with content using a callback containing templates -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -//send 128 bytes as plain text -request->send("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will not be asked for more bytes once the content length has been reached. - //Keep in mind that you can not delay or yield waiting for more data! - //Send what you currently have and you will be asked for more again - return mySource.read(buffer, maxLen); -}, processor); -``` - -### Respond with content using a callback containing templates and extra headers -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -//send 128 bytes as plain text -AsyncWebServerResponse *response = request->beginResponse("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will not be asked for more bytes once the content length has been reached. - //Keep in mind that you can not delay or yield waiting for more data! - //Send what you currently have and you will be asked for more again - return mySource.read(buffer, maxLen); -}, processor); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Chunked Response -Used when content length is unknown. Works best if the client supports HTTP/1.1 -```cpp -AsyncWebServerResponse *response = request->beginChunkedResponse("text/plain", [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will be asked for more data until 0 is returned - //Keep in mind that you can not delay or yield waiting for more data! - return mySource.read(buffer, maxLen); -}); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Chunked Response containing templates -Used when content length is unknown. Works best if the client supports HTTP/1.1 -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -AsyncWebServerResponse *response = request->beginChunkedResponse("text/plain", [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //index equals the amount of bytes that have been already sent - //You will be asked for more data until 0 is returned - //Keep in mind that you can not delay or yield waiting for more data! - return mySource.read(buffer, maxLen); -}, processor); -response->addHeader("Server","ESP Async Web Server"); -request->send(response); -``` - -### Print to response -```cpp -AsyncResponseStream *response = request->beginResponseStream("text/html"); -response->addHeader("Server","ESP Async Web Server"); -response->printf("Webpage at %s", request->url().c_str()); - -response->print("

Hello "); -response->print(request->client()->remoteIP()); -response->print("

"); - -response->print("

General

"); -response->print("
    "); -response->printf("
  • Version: HTTP/1.%u
    • ", request->version()); -response->printf("
  • Method: %s
    • ", request->methodToString()); -response->printf("
  • URL: %s
    • ", request->url().c_str()); -response->printf("
  • Host: %s
    • ", request->host().c_str()); -response->printf("
  • ContentType: %s
    • ", request->contentType().c_str()); -response->printf("
  • ContentLength: %u
    • ", request->contentLength()); -response->printf("
  • Multipart: %s
    • ", request->multipart()?"true":"false"); -response->print("
"); - -response->print("

Headers

"); -response->print("
    "); -int headers = request->headers(); -for(int i=0;igetHeader(i); - response->printf("
  • %s: %s
    • ", h->name().c_str(), h->value().c_str()); -} -response->print("
"); - -response->print("

Parameters

"); -response->print("
    "); -int params = request->params(); -for(int i=0;igetParam(i); - if(p->isFile()){ - response->printf("
  • FILE[%s]: %s, size: %u
    • ", p->name().c_str(), p->value().c_str(), p->size()); - } else if(p->isPost()){ - response->printf("
  • POST[%s]: %s
    • ", p->name().c_str(), p->value().c_str()); - } else { - response->printf("
  • GET[%s]: %s
    • ", p->name().c_str(), p->value().c_str()); - } -} -response->print("
"); - -response->print(""); -//send the response last -request->send(response); -``` - -### ArduinoJson Basic Response -This way of sending Json is great for when the result is below 4KB -```cpp -#include "AsyncJson.h" -#include "ArduinoJson.h" - - -AsyncResponseStream *response = request->beginResponseStream("application/json"); -DynamicJsonBuffer jsonBuffer; -JsonObject &root = jsonBuffer.createObject(); -root["heap"] = ESP.getFreeHeap(); -root["ssid"] = WiFi.SSID(); -root.printTo(*response); -request->send(response); -``` - -### ArduinoJson Advanced Response -This response can handle really large Json objects (tested to 40KB) -There isn't any noticeable speed decrease for small results with the method above -Since ArduinoJson does not allow reading parts of the string, the whole Json has to -be passed every time a chunks needs to be sent, which shows speed decrease proportional -to the resulting json packets -```cpp -#include "AsyncJson.h" -#include "ArduinoJson.h" - - -AsyncJsonResponse * response = new AsyncJsonResponse(); -response->addHeader("Server","ESP Async Web Server"); -JsonObject& root = response->getRoot(); -root["heap"] = ESP.getFreeHeap(); -root["ssid"] = WiFi.SSID(); -response->setLength(); -request->send(response); -``` - -### Specifying Cache-Control header -It is possible to specify Cache-Control header value to reduce the number of calls to the server once the client loaded -the files. For more information on Cache-Control values see [Cache-Control](https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9) -```cpp -// Cache responses for 10 minutes (600 seconds) -server.serveStatic("/", SPIFFS, "/www/").setCacheControl("max-age=600"); - -//*** Change Cache-Control after server setup *** - -// During setup - keep a pointer to the handler -AsyncStaticWebHandler* handler = &server.serveStatic("/", SPIFFS, "/www/").setCacheControl("max-age=600"); - -// At a later event - change Cache-Control -handler->setCacheControl("max-age=30"); -``` - -### Specifying Date-Modified header -It is possible to specify Date-Modified header to enable the server to return Not-Modified (304) response for requests -with "If-Modified-Since" header with the same value, instead of responding with the actual file content. -```cpp -// Update the date modified string every time files are updated -server.serveStatic("/", SPIFFS, "/www/").setLastModified("Mon, 20 Jun 2016 14:00:00 GMT"); - -//*** Chage last modified value at a later stage *** - -// During setup - read last modified value from config or EEPROM -String date_modified = loadDateModified(); -AsyncStaticWebHandler* handler = &server.serveStatic("/", SPIFFS, "/www/"); -handler->setLastModified(date_modified); - -// At a later event when files are updated -String date_modified = getNewDateModfied(); -saveDateModified(date_modified); // Save for next reset -handler->setLastModified(date_modified); -``` +### ESP32 / pioarduino -### Specifying Template Processor callback -It is possible to specify template processor for static files. For information on template processor see -[Respond with content coming from a File containing templates](#respond-with-content-coming-from-a-file-containing-templates). -```cpp -String processor(const String& var) -{ - if(var == "HELLO_FROM_TEMPLATE") - return F("Hello world!"); - return String(); -} - -// ... - -server.serveStatic("/", SPIFFS, "/www/").setTemplateProcessor(processor); -``` - -## Param Rewrite With Matching -It is possible to rewrite the request url with parameter matchg. Here is an example with one parameter: -Rewrite for example "/radio/{frequence}" -> "/radio?f={frequence}" - -```cpp -class OneParamRewrite : public AsyncWebRewrite -{ - protected: - String _urlPrefix; - int _paramIndex; - String _paramsBackup; - - public: - OneParamRewrite(const char* from, const char* to) - : AsyncWebRewrite(from, to) { - - _paramIndex = _from.indexOf('{'); - - if( _paramIndex >=0 && _from.endsWith("}")) { - _urlPrefix = _from.substring(0, _paramIndex); - int index = _params.indexOf('{'); - if(index >= 0) { - _params = _params.substring(0, index); - } - } else { - _urlPrefix = _from; - } - _paramsBackup = _params; - } - - bool match(AsyncWebServerRequest *request) override { - if(request->url().startsWith(_urlPrefix)) { - if(_paramIndex >= 0) { - _params = _paramsBackup + request->url().substring(_paramIndex); - } else { - _params = _paramsBackup; - } - return true; - - } else { - return false; - } - } -}; -``` - -Usage: - -```cpp - server.addRewrite( new OneParamRewrite("/radio/{frequence}", "/radio?f={frequence}") ); -``` - -## Using filters -Filters can be set to `Rewrite` or `Handler` in order to control when to apply the rewrite and consider the handler. -A filter is a callback function that evaluates the request and return a boolean `true` to include the item -or `false` to exclude it. -Two filter callback are provided for convince: -* `ON_STA_FILTER` - return true when requests are made to the STA (station mode) interface. -* `ON_AP_FILTER` - return true when requests are made to the AP (access point) interface. - -### Serving different hosts -```cpp -// Filter callback using request host -bool filterOnHost1(AsyncWebServerRequest *request) { return request->host() == "host1"; } - -// Server setup: server files in "/host1/" to requests for "host1", and files in "/www/" otherwise. -server.serveStatic("/", SPIFFS, "/host1/").setFilter(filterOnHost1); -server.serveStatic("/", SPIFFS, "/www/"); -``` - -### Determine interface inside callbacks -```cpp - String RedirectUrl = "http://"; - if (ON_STA_FILTER(request)) { - RedirectUrl += WiFi.localIP().toString(); - } else { - RedirectUrl += WiFi.softAPIP().toString(); - } - RedirectUrl += "/index.htm"; - request->redirect(RedirectUrl); -``` - -## Bad Responses -Some responses are implemented, but you should not use them, because they do not conform to HTTP. -The following example will lead to unclean close of the connection and more time wasted -than providing the length of the content - -### Respond with content using a callback without content length to HTTP/1.0 clients -```cpp -//This is used as fallback for chunked responses to HTTP/1.0 Clients -request->send("text/plain", 0, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t { - //Write up to "maxLen" bytes into "buffer" and return the amount written. - //You will be asked for more data until 0 is returned - //Keep in mind that you can not delay or yield waiting for more data! - return mySource.read(buffer, maxLen); -}); -``` - -## Async WebSocket Plugin -The server includes a web socket plugin which lets you define different WebSocket locations to connect to -without starting another listening service or using different port - -### Async WebSocket Event -```cpp - -void onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){ - if(type == WS_EVT_CONNECT){ - //client connected - os_printf("ws[%s][%u] connect\n", server->url(), client->id()); - client->printf("Hello Client %u :)", client->id()); - client->ping(); - } else if(type == WS_EVT_DISCONNECT){ - //client disconnected - os_printf("ws[%s][%u] disconnect: %u\n", server->url(), client->id()); - } else if(type == WS_EVT_ERROR){ - //error was received from the other end - os_printf("ws[%s][%u] error(%u): %s\n", server->url(), client->id(), *((uint16_t*)arg), (char*)data); - } else if(type == WS_EVT_PONG){ - //pong message was received (in response to a ping request maybe) - os_printf("ws[%s][%u] pong[%u]: %s\n", server->url(), client->id(), len, (len)?(char*)data:""); - } else if(type == WS_EVT_DATA){ - //data packet - AwsFrameInfo * info = (AwsFrameInfo*)arg; - if(info->final && info->index == 0 && info->len == len){ - //the whole message is in a single frame and we got all of it's data - os_printf("ws[%s][%u] %s-message[%llu]: ", server->url(), client->id(), (info->opcode == WS_TEXT)?"text":"binary", info->len); - if(info->opcode == WS_TEXT){ - data[len] = 0; - os_printf("%s\n", (char*)data); - } else { - for(size_t i=0; i < info->len; i++){ - os_printf("%02x ", data[i]); - } - os_printf("\n"); - } - if(info->opcode == WS_TEXT) - client->text("I got your text message"); - else - client->binary("I got your binary message"); - } else { - //message is comprised of multiple frames or the frame is split into multiple packets - if(info->index == 0){ - if(info->num == 0) - os_printf("ws[%s][%u] %s-message start\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary"); - os_printf("ws[%s][%u] frame[%u] start[%llu]\n", server->url(), client->id(), info->num, info->len); - } - - os_printf("ws[%s][%u] frame[%u] %s[%llu - %llu]: ", server->url(), client->id(), info->num, (info->message_opcode == WS_TEXT)?"text":"binary", info->index, info->index + len); - if(info->message_opcode == WS_TEXT){ - data[len] = 0; - os_printf("%s\n", (char*)data); - } else { - for(size_t i=0; i < len; i++){ - os_printf("%02x ", data[i]); - } - os_printf("\n"); - } - - if((info->index + len) == info->len){ - os_printf("ws[%s][%u] frame[%u] end[%llu]\n", server->url(), client->id(), info->num, info->len); - if(info->final){ - os_printf("ws[%s][%u] %s-message end\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary"); - if(info->message_opcode == WS_TEXT) - client->text("I got your text message"); - else - client->binary("I got your binary message"); - } - } - } - } -} -``` - -### Methods for sending data to a socket client -```cpp - - - -//Server methods -AsyncWebSocket ws("/ws"); -//printf to a client -ws.printf((uint32_t)client_id, arguments...); -//printf to all clients -ws.printfAll(arguments...); -//printf_P to a client -ws.printf_P((uint32_t)client_id, PSTR(format), arguments...); -//printfAll_P to all clients -ws.printfAll_P(PSTR(format), arguments...); -//send text to a client -ws.text((uint32_t)client_id, (char*)text); -ws.text((uint32_t)client_id, (uint8_t*)text, (size_t)len); -//send text from PROGMEM to a client -ws.text((uint32_t)client_id, PSTR("text")); -const char flash_text[] PROGMEM = "Text to send" -ws.text((uint32_t)client_id, FPSTR(flash_text)); -//send text to all clients -ws.textAll((char*)text); -ws.textAll((uint8_t*)text, (size_t)len); -//send binary to a client -ws.binary((uint32_t)client_id, (char*)binary); -ws.binary((uint32_t)client_id, (uint8_t*)binary, (size_t)len); -//send binary from PROGMEM to a client -const uint8_t flash_binary[] PROGMEM = { 0x01, 0x02, 0x03, 0x04 }; -ws.binary((uint32_t)client_id, flash_binary, 4); -//send binary to all clients -ws.binaryAll((char*)binary); -ws.binaryAll((uint8_t*)binary, (size_t)len); -//HTTP Authenticate before switch to Websocket protocol -ws.setAuthentication("user", "pass"); - -//client methods -AsyncWebSocketClient * client; -//printf -client->printf(arguments...); -//printf_P -client->printf_P(PSTR(format), arguments...); -//send text -client->text((char*)text); -client->text((uint8_t*)text, (size_t)len); -//send text from PROGMEM -client->text(PSTR("text")); -const char flash_text[] PROGMEM = "Text to send"; -client->text(FPSTR(flash_text)); -//send binary -client->binary((char*)binary); -client->binary((uint8_t*)binary, (size_t)len); -//send binary from PROGMEM -const uint8_t flash_binary[] PROGMEM = { 0x01, 0x02, 0x03, 0x04 }; -client->binary(flash_binary, 4); -``` - -### Direct access to web socket message buffer -When sending a web socket message using the above methods a buffer is created. Under certain circumstances you might want to manipulate or populate this buffer directly from your application, for example to prevent unnecessary duplications of the data. This example below shows how to create a buffer and print data to it from an ArduinoJson object then send it. - -```cpp -void sendDataWs(AsyncWebSocketClient * client) -{ - DynamicJsonBuffer jsonBuffer; - JsonObject& root = jsonBuffer.createObject(); - root["a"] = "abc"; - root["b"] = "abcd"; - root["c"] = "abcde"; - root["d"] = "abcdef"; - root["e"] = "abcdefg"; - size_t len = root.measureLength(); - AsyncWebSocketMessageBuffer * buffer = ws.makeBuffer(len); // creates a buffer (len + 1) for you. - if (buffer) { - root.printTo((char *)buffer->get(), len + 1); - if (client) { - client->text(buffer); - } else { - ws.textAll(buffer); - } - } -} -``` - -### Limiting the number of web socket clients -Browsers sometimes do not correctly close the websocket connection, even when the close() function is called in javascript. This will eventually exhaust the web server's resources and will cause the server to crash. Periodically calling the cleanClients() function from the main loop() function limits the number of clients by closing the oldest client when the maximum number of clients has been exceeded. This can called be every cycle, however, if you wish to use less power, then calling as infrequently as once per second is sufficient. - -```cpp -void loop(){ - ws.cleanupClients(); -} -``` - - -## Async Event Source Plugin -The server includes EventSource (Server-Sent Events) plugin which can be used to send short text events to the browser. -Difference between EventSource and WebSockets is that EventSource is single direction, text-only protocol. - -### Setup Event Source on the server -```cpp -AsyncWebServer server(80); -AsyncEventSource events("/events"); - -void setup(){ - // setup ...... - events.onConnect([](AsyncEventSourceClient *client){ - if(client->lastId()){ - Serial.printf("Client reconnected! Last message ID that it gat is: %u\n", client->lastId()); - } - //send event with message "hello!", id current millis - // and set reconnect delay to 1 second - client->send("hello!",NULL,millis(),1000); - }); - //HTTP Basic authentication - events.setAuthentication("user", "pass"); - server.addHandler(&events); - // setup ...... -} - -void loop(){ - if(eventTriggered){ // your logic here - //send event "myevent" - events.send("my event content","myevent",millis()); - } -} -``` - -### Setup Event Source in the browser -```javascript -if (!!window.EventSource) { - var source = new EventSource('/events'); - - source.addEventListener('open', function(e) { - console.log("Events Connected"); - }, false); - - source.addEventListener('error', function(e) { - if (e.target.readyState != EventSource.OPEN) { - console.log("Events Disconnected"); - } - }, false); - - source.addEventListener('message', function(e) { - console.log("message", e.data); - }, false); - - source.addEventListener('myevent', function(e) { - console.log("myevent", e.data); - }, false); -} -``` - -## Scanning for available WiFi Networks -```cpp -//First request will return 0 results unless you start scan from somewhere else (loop/setup) -//Do not request more often than 3-5 seconds -server.on("/scan", HTTP_GET, [](AsyncWebServerRequest *request){ - String json = "["; - int n = WiFi.scanComplete(); - if(n == -2){ - WiFi.scanNetworks(true); - } else if(n){ - for (int i = 0; i < n; ++i){ - if(i) json += ","; - json += "{"; - json += "\"rssi\":"+String(WiFi.RSSI(i)); - json += ",\"ssid\":\""+WiFi.SSID(i)+"\""; - json += ",\"bssid\":\""+WiFi.BSSIDstr(i)+"\""; - json += ",\"channel\":"+String(WiFi.channel(i)); - json += ",\"secure\":"+String(WiFi.encryptionType(i)); - json += ",\"hidden\":"+String(WiFi.isHidden(i)?"true":"false"); - json += "}"; - } - WiFi.scanDelete(); - if(WiFi.scanComplete() == -2){ - WiFi.scanNetworks(true); - } - } - json += "]"; - request->send(200, "application/json", json); - json = String(); -}); -``` - -## Remove handlers and rewrites - -Server goes through handlers in same order as they were added. You can't simple add handler with same path to override them. -To remove handler: -```arduino -// save callback for particular URL path -auto handler = server.on("/some/path", [](AsyncWebServerRequest *request){ - //do something useful -}); -// when you don't need handler anymore remove it -server.removeHandler(&handler); - -// same with rewrites -server.removeRewrite(&someRewrite); - -server.onNotFound([](AsyncWebServerRequest *request){ - request->send(404); -}); - -// remove server.onNotFound handler -server.onNotFound(NULL); - -// remove all rewrites, handlers and onNotFound/onFileUpload/onRequestBody callbacks -server.reset(); -``` - -## Setting up the server -```cpp -#include "ESPAsyncTCP.h" -#include "ESPAsyncWebServer.h" - -AsyncWebServer server(80); -AsyncWebSocket ws("/ws"); // access at ws://[esp ip]/ws -AsyncEventSource events("/events"); // event source (Server-Sent events) - -const char* ssid = "your-ssid"; -const char* password = "your-pass"; -const char* http_username = "admin"; -const char* http_password = "admin"; - -//flag to use from web update to reboot the ESP -bool shouldReboot = false; - -void onRequest(AsyncWebServerRequest *request){ - //Handle Unknown Request - request->send(404); -} - -void onBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){ - //Handle body -} - -void onUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){ - //Handle upload -} - -void onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){ - //Handle WebSocket event -} - -void setup(){ - Serial.begin(115200); - WiFi.mode(WIFI_STA); - WiFi.begin(ssid, password); - if (WiFi.waitForConnectResult() != WL_CONNECTED) { - Serial.printf("WiFi Failed!\n"); - return; - } - - // attach AsyncWebSocket - ws.onEvent(onEvent); - server.addHandler(&ws); - - // attach AsyncEventSource - server.addHandler(&events); - - // respond to GET requests on URL /heap - server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){ - request->send(200, "text/plain", String(ESP.getFreeHeap())); - }); - - // upload a file to /upload - server.on("/upload", HTTP_POST, [](AsyncWebServerRequest *request){ - request->send(200); - }, onUpload); - - // send a file when /index is requested - server.on("/index", HTTP_ANY, [](AsyncWebServerRequest *request){ - request->send(SPIFFS, "/index.htm"); - }); - - // HTTP basic authentication - server.on("/login", HTTP_GET, [](AsyncWebServerRequest *request){ - if(!request->authenticate(http_username, http_password)) - return request->requestAuthentication(); - request->send(200, "text/plain", "Login Success!"); - }); - - // Simple Firmware Update Form - server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){ - request->send(200, "text/html", "
"); - }); - server.on("/update", HTTP_POST, [](AsyncWebServerRequest *request){ - shouldReboot = !Update.hasError(); - AsyncWebServerResponse *response = request->beginResponse(200, "text/plain", shouldReboot?"OK":"FAIL"); - response->addHeader("Connection", "close"); - request->send(response); - },[](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){ - if(!index){ - Serial.printf("Update Start: %s\n", filename.c_str()); - Update.runAsync(true); - if(!Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000)){ - Update.printError(Serial); - } - } - if(!Update.hasError()){ - if(Update.write(data, len) != len){ - Update.printError(Serial); - } - } - if(final){ - if(Update.end(true)){ - Serial.printf("Update Success: %uB\n", index+len); - } else { - Update.printError(Serial); - } - } - }); - - // Catch-All Handlers - // Any request that can not find a Handler that canHandle it - // ends in the callbacks below. - server.onNotFound(onRequest); - server.onFileUpload(onUpload); - server.onRequestBody(onBody); - - server.begin(); -} - -void loop(){ - if(shouldReboot){ - Serial.println("Rebooting..."); - delay(100); - ESP.restart(); - } - static char temp[128]; - sprintf(temp, "Seconds since boot: %u", millis()/1000); - events.send(temp, "time"); //send event "time" -} -``` - -### Setup global and class functions as request handlers - -```cpp -#include -#include -#include -#include - -void handleRequest(AsyncWebServerRequest *request){} - -class WebClass { -public : - AsyncWebServer classWebServer = AsyncWebServer(81); - - WebClass(){}; - - void classRequest (AsyncWebServerRequest *request){} - - void begin(){ - // attach global request handler - classWebServer.on("/example", HTTP_ANY, handleRequest); - - // attach class request handler - classWebServer.on("/example", HTTP_ANY, std::bind(&WebClass::classRequest, this, std::placeholders::_1)); - } -}; - -AsyncWebServer globalWebServer(80); -WebClass webClassInstance; - -void setup() { - // attach global request handler - globalWebServer.on("/example", HTTP_ANY, handleRequest); - - // attach class request handler - globalWebServer.on("/example", HTTP_ANY, std::bind(&WebClass::classRequest, webClassInstance, std::placeholders::_1)); -} - -void loop() { - -} +```ini +[env:stable] +platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip +lib_compat_mode = strict +lib_ldf_mode = chain +lib_deps = + ESP32Async/AsyncTCP + ESP32Async/ESPAsyncWebServer ``` -### Methods for controlling websocket connections - -```cpp - // Disable client connections if it was activated - if ( ws.enabled() ) - ws.enable(false); +### ESP8266 / pioarduino - // enable client connections if it was disabled - if ( !ws.enabled() ) - ws.enable(true); +```ini +[env:stable] +platform = espressif8266 +lib_compat_mode = strict +lib_ldf_mode = chain +lib_deps = + ESP32Async/ESPAsyncTCP + ESP32Async/ESPAsyncWebServer ``` -Example of OTA code - -```cpp - // OTA callbacks - ArduinoOTA.onStart([]() { - // Disable client connections - ws.enable(false); +### LibreTiny (BK7231N/T, RTL8710B, etc.) - // Advertise connected clients what's going on - ws.textAll("OTA Update Started"); - - // Close them - ws.closeAll(); - - }); +Version 1.9.1 or newer is required. +```ini +[env:stable] +platform = libretiny @ ^1.9.1 +lib_ldf_mode = chain +lib_deps = + ESP32Async/AsyncTCP + ESP32Async/ESPAsyncWebServer ``` -### Adding Default Headers +### Unofficial dependencies -In some cases, such as when working with CORS, or with some sort of custom authentication system, -you might need to define a header that should get added to all responses (including static, websocket and EventSource). -The DefaultHeaders singleton allows you to do this. +**AsyncTCPSock** -Example: +AsyncTCPSock can be used instead of AsyncTCP by excluding AsyncTCP from the library dependencies and adding AsyncTCPSock instead: -```cpp -DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin", "*"); -webServer.begin(); +```ini +lib_compat_mode = strict +lib_ldf_mode = chain +lib_deps = + https://github.com/ESP32Async/AsyncTCPSock/archive/refs/tags/v1.0.3-dev.zip + ESP32Async/ESPAsyncWebServer +lib_ignore = + AsyncTCP + ESP32Async/AsyncTCP ``` -*NOTE*: You will still need to respond to the OPTIONS method for CORS pre-flight in most cases. (unless you are only using GET) +**RPAsyncTCP** -This is one option: +RPAsyncTCP replaces AsyncTCP to provide support for RP2040(+WiFi) and RP2350(+WiFi) boards. For example - Raspberry Pi Pico W and Raspberry Pi Pico 2W. -```cpp -webServer.onNotFound([](AsyncWebServerRequest *request) { - if (request->method() == HTTP_OPTIONS) { - request->send(200); - } else { - request->send(404); - } -}); +```ini +lib_compat_mode = strict +lib_ldf_mode = chain +platform = https://github.com/maxgerhardt/platform-raspberrypi.git +board = rpipicow +board_build.core = earlephilhower +lib_deps = + ayushsharma82/RPAsyncTCP@^1.3.2 + ESP32Async/ESPAsyncWebServer +lib_ignore = + lwIP_ESPHost +build_flags = ${env.build_flags} + -Wno-missing-field-initializers ``` -### Path variable +## Important recommendations for build options -With path variable you can create a custom regex rule for a specific parameter in a route. -For example we want a `sensorId` parameter in a route rule to match only a integer. +Most of the crashes are caused by improper use or configuration of the AsyncTCP library used for the project. +Here are some recommendations to avoid them and build-time flags you can change. -```cpp - server.on("^\\/sensor\\/([0-9]+)$", HTTP_GET, [] (AsyncWebServerRequest *request) { - String sensorId = request->pathArg(0); - }); -``` -*NOTE*: All regex patterns starts with `^` and ends with `$` +`CONFIG_ASYNC_TCP_MAX_ACK_TIME` - defines a timeout for TCP connection to be considered alive when waiting for data. +In some bad network conditions you might consider increasing it. -To enable the `Path variable` support, you have to define the buildflag `-DASYNCWEBSERVER_REGEX`. +`CONFIG_ASYNC_TCP_QUEUE_SIZE` - defines the length of the queue for events related to connections handling. +Both the server and AsyncTCP library were optimized to control the queue automatically. Do NOT try blindly increasing the queue size, it does not help you in a way you might think it is. If you receive debug messages about queue throttling, try to optimize your server callbacks code to execute as fast as possible. +Read #165 thread, it might give you some hints. +`CONFIG_ASYNC_TCP_RUNNING_CORE` - CPU core thread affinity that runs the queue events handling and executes server callbacks. Default is ANY core, so it means that for dualcore SoCs both cores could handle server activities. If your server's code is too heavy and unoptimized or you see that sometimes +server might affect other network activities, you might consider to bind it to the same core that runs Arduino code (1) to minimize affect on radio part. Otherwise you can leave the default to let RTOS decide where to run the thread based on priority -For Arduino IDE create/update `platform.local.txt`: +`CONFIG_ASYNC_TCP_STACK_SIZE` - stack size for the thread that runs sever events and callbacks. Default is 16k that is a way too much waste for well-defined short async code or simple static file handling. You might want to cosider reducing it to 4-8k to same RAM usage. If you do not know what this is or not sure about your callback code demands - leave it as default, should be enough even for very hungry callbacks in most cases. -`Windows`: C:\Users\(username)\AppData\Local\Arduino15\packages\\`{espxxxx}`\hardware\\`espxxxx`\\`{version}`\platform.local.txt +> [!NOTE] +> This relates to ESP32 only, ESP8266 uses different ESPAsyncTCP lib that does not has this build options -`Linux`: ~/.arduino15/packages/`{espxxxx}`/hardware/`{espxxxx}`/`{version}`/platform.local.txt +I personally use the following configuration in my projects: -Add/Update the following line: -``` - compiler.cpp.extra_flags=-DDASYNCWEBSERVER_REGEX +```c++ + -D CONFIG_ASYNC_TCP_MAX_ACK_TIME=5000 // (keep default) + -D CONFIG_ASYNC_TCP_PRIORITY=10 // (keep default) + -D CONFIG_ASYNC_TCP_QUEUE_SIZE=64 // (keep default) + -D CONFIG_ASYNC_TCP_RUNNING_CORE=1 // force async_tcp task to be on same core as Arduino app (default is any core) + -D CONFIG_ASYNC_TCP_STACK_SIZE=4096 // reduce the stack size (default is 16K) ``` -For platformio modify `platformio.ini`: -```ini -[env:myboard] -build_flags = - -DASYNCWEBSERVER_REGEX -``` -*NOTE*: By enabling `ASYNCWEBSERVER_REGEX`, `` will be included. This will add an 100k to your binary. +If you need to serve chunk requests with a really low buffer (which should be avoided), you can set `-D ASYNCWEBSERVER_USE_CHUNK_INFLIGHT=0` to disable the in-flight control. diff --git a/_config.yml b/_config.yml deleted file mode 100644 index c4192631f..000000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-cayman \ No newline at end of file diff --git a/component.mk b/component.mk deleted file mode 100644 index bb5bb1614..000000000 --- a/component.mk +++ /dev/null @@ -1,3 +0,0 @@ -COMPONENT_ADD_INCLUDEDIRS := src -COMPONENT_SRCDIRS := src -CXXFLAGS += -fno-rtti diff --git a/data/README.md b/data/README.md new file mode 100644 index 000000000..96a2ee4f8 --- /dev/null +++ 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.

+

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.

+

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.

+

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.

+

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.

+

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.

+

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.

+

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/docs/logo.png b/docs/logo.png new file mode 100644 index 000000000..1995c88b9 Binary files /dev/null and b/docs/logo.png differ diff --git a/docs/logo.webp b/docs/logo.webp new file mode 100644 index 000000000..c70b84209 Binary files /dev/null and b/docs/logo.webp differ diff --git a/docs/perf-c10-asynctcpsock.png b/docs/perf-c10-asynctcpsock.png new file mode 100644 index 000000000..b1d4d7aa6 Binary files /dev/null and b/docs/perf-c10-asynctcpsock.png differ diff --git a/docs/perf-c10.png b/docs/perf-c10.png new file mode 100644 index 000000000..e63e71a88 Binary files /dev/null and b/docs/perf-c10.png differ diff --git a/examples/AsyncResponseStream/AsyncResponseStream.ino b/examples/AsyncResponseStream/AsyncResponseStream.ino new file mode 100644 index 000000000..451bb1a11 --- /dev/null +++ b/examples/AsyncResponseStream/AsyncResponseStream.ino @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov + +#include +#if defined(ESP32) || defined(LIBRETINY) +#include +#include +#elif defined(ESP8266) +#include +#include +#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350) +#include +#include +#endif + +#include + +static AsyncWebServer server(80); + +void setup() { + Serial.begin(115200); + +#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI + WiFi.mode(WIFI_AP); + WiFi.softAP("esp-captive"); +#endif + + // Shows how to use AsyncResponseStream. + // The internal buffer will be allocated and data appended to it, + // until the response is sent, then this buffer is read and committed on the network. + // + // curl -v http://192.168.4.1/ + // + server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) { + AsyncResponseStream *response = request->beginResponseStream("plain/text", 40 * 1024); + for (int i = 0; i < 32 * 1024; i++) { + response->write('a'); + } + request->send(response); + }); + + server.begin(); +} + +void loop() { + delay(100); +} diff --git a/examples/AsyncTunnel/AsyncTunnel.ino b/examples/AsyncTunnel/AsyncTunnel.ino new file mode 100644 index 000000000..b63c056a9 --- /dev/null +++ b/examples/AsyncTunnel/AsyncTunnel.ino @@ -0,0 +1,210 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov + +// +// Shows how to trigger an async client request from a browser request and send the client response back to the browser through websocket +// + +#include +#if defined(ESP32) || defined(LIBRETINY) +#include +#include +#elif defined(ESP8266) +#include +#include +#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350) +#include +#include +#endif + +#include + +#define WIFI_SSID "IoT" +#define WIFI_PASSWORD "" + +static AsyncWebServer server(80); +static AsyncWebSocketMessageHandler wsHandler; +static AsyncWebSocket ws("/ws", wsHandler.eventHandler()); + +static const char *htmlContent PROGMEM = R"( + + + + WebSocket Tunnel Example + + +

WebSocket Tunnel Example

+
+
+ 

+    
+  
+  
+    )";
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+  }
+  Serial.println("Connected to WiFi!");
+  Serial.println(WiFi.localIP());
+#endif
+
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/html", (const uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  wsHandler.onMessage([](AsyncWebSocket *server, AsyncWebSocketClient *wsClient, const uint8_t *data, size_t len) {
+    String url;
+    String host;
+    String port;
+    String path;
+
+    url.concat((const char *)data, len);
+
+    if (!url.startsWith("http://")) {
+      return;
+    }
+
+    if (!url.endsWith("/")) {
+      url += "/";
+    }
+
+    // Parse the URL to extract the host and port
+    int start = url.indexOf("://") + 3;
+    int end = url.indexOf("/", start);
+    if (end == -1) {
+      end = url.length();
+    }
+    String hostPort = url.substring(start, end);
+    int colonIndex = hostPort.indexOf(":");
+    if (colonIndex != -1) {
+      host = hostPort.substring(0, colonIndex);
+      port = hostPort.substring(colonIndex + 1);
+    } else {
+      host = hostPort;
+      port = "80";  // Default HTTP port
+    }
+    path = url.substring(end);
+
+    Serial.printf("Host: %s\n", host.c_str());
+    Serial.printf("Port: %s\n", port.c_str());
+    Serial.printf("Path: %s\n", path.c_str());
+
+    // Ensure client does not get deleted while the websocket holds a reference to it
+    std::shared_ptr *safeAsyncClient = new std::shared_ptr(std::make_shared());
+    AsyncClient *asyncClient = safeAsyncClient->get();
+
+    asyncClient->onDisconnect([safeAsyncClient](void *arg, AsyncClient *client) {
+      Serial.printf("Tunnel disconnected!\n");
+      delete safeAsyncClient;
+    });
+
+    // register a callback when an error occurs
+    // note: onDisconnect also called on error
+    asyncClient->onError([](void *arg, AsyncClient *client, int8_t error) {
+      Serial.printf("Tunnel error: %s\n", client->errorToString(error));
+    });
+
+    // register a callback when data arrives, to accumulate it
+    asyncClient->onPacket(
+      [safeAsyncClient](void *arg, AsyncClient *, struct pbuf *pb) {
+        std::shared_ptr safeAsyncClientRef = *safeAsyncClient;  // add a reference
+        AsyncWebSocketClient *wsClient = (AsyncWebSocketClient *)arg;
+        Serial.printf("Tunnel received %u bytes\n", pb->len);
+        AsyncWebSocketSharedBuffer wsBuffer =
+          AsyncWebSocketSharedBuffer(new std::vector((uint8_t *)pb->payload, (uint8_t *)pb->payload + pb->len), [=](std::vector *bufptr) {
+            delete bufptr;
+            Serial.printf("ACK %u bytes\n", pb->len);
+            safeAsyncClientRef->ackPacket(pb);
+          });
+        Serial.printf("Tunnel sending %u bytes\n", wsBuffer->size());
+        Serial.printf("%.*s\n", (int)wsBuffer->size(), wsBuffer->data());
+        wsClient->binary(std::move(wsBuffer));
+      },
+      wsClient
+    );
+
+    asyncClient->onConnect([=](void *arg, AsyncClient *client) {
+      Serial.printf("Tunnel connected!\n");
+
+      client->write("GET ");
+      client->write(path.c_str());
+      client->write(" HTTP/1.1\r\n");
+      client->write("Host: ");
+      client->write(host.c_str());
+      client->write(":");
+      client->write(port.c_str());
+      client->write("\r\n");
+      client->write("User-Agent: ESP32\r\n");
+      client->write("Accept: */*\r\n");
+      client->write("Connection: close\r\n");
+      client->write("\r\n");
+    });
+
+    Serial.printf("Fetching: http://%s:%s%s\n", host.c_str(), port.c_str(), path.c_str());
+
+    if (!asyncClient->connect(host.c_str(), port.toInt())) {
+      Serial.printf("Failed to open tunnel!\n");
+      delete safeAsyncClient;
+    }
+  });
+
+  wsHandler.onConnect([](AsyncWebSocket *server, AsyncWebSocketClient *client) {
+    Serial.printf("Client %" PRIu32 " connected\n", client->id());
+    client->binary("WebSocket connected!");
+  });
+
+  wsHandler.onDisconnect([](AsyncWebSocket *server, uint32_t clientId) {
+    Serial.printf("Client %" PRIu32 " disconnected\n", clientId);
+  });
+
+  server.addHandler(&ws);
+  server.begin();
+  Serial.println("Server started!");
+}
+
+static uint32_t lastHeap = 0;
+
+void loop() {
+  ws.cleanupClients(2);
+
+#ifdef ESP32
+  uint32_t now = millis();
+  if (now - lastHeap >= 2000) {
+    Serial.printf("Uptime: %3lu s, Free heap: %" PRIu32 "\n", millis() / 1000, ESP.getFreeHeap());
+    lastHeap = now;
+  }
+#endif
+
+  delay(500);
+}
diff --git a/examples/Auth/Auth.ino b/examples/Auth/Auth.ino
new file mode 100644
index 000000000..8f5b535b7
--- /dev/null
+++ b/examples/Auth/Auth.ino
@@ -0,0 +1,157 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Authentication and authorization middlewares
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+// basicAuth
+static AsyncAuthenticationMiddleware basicAuth;
+static AsyncAuthenticationMiddleware basicAuthHash;
+
+// simple digest authentication
+static AsyncAuthenticationMiddleware digestAuth;
+static AsyncAuthenticationMiddleware digestAuthHash;
+
+// complex authentication which adds request attributes for the next middlewares and handler
+static AsyncMiddlewareFunction complexAuth([](AsyncWebServerRequest *request, ArMiddlewareNext next) {
+  if (!request->authenticate("user", "password")) {
+    return request->requestAuthentication();
+  }
+
+  // add attributes to the request for the next middlewares and handler
+  request->setAttribute("user", "Mathieu");
+  request->setAttribute("role", "staff");
+  if (request->hasParam("token")) {
+    request->setAttribute("token", request->getParam("token")->value().c_str());
+  }
+
+  next();
+});
+
+static AsyncAuthorizationMiddleware authz([](AsyncWebServerRequest *request) {
+  return request->getAttribute("token") == "123";
+});
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // basic authentication
+  basicAuth.setUsername("admin");
+  basicAuth.setPassword("admin");
+  basicAuth.setRealm("MyApp");
+  basicAuth.setAuthFailureMessage("Authentication failed");
+  basicAuth.setAuthType(AsyncAuthType::AUTH_BASIC);
+  basicAuth.generateHash();  // precompute hash (optional but recommended)
+
+  // basic authentication with hash
+  basicAuthHash.setUsername("admin");
+  basicAuthHash.setPasswordHash("YWRtaW46YWRtaW4=");  // BASE64(admin:admin)
+  basicAuthHash.setRealm("MyApp");
+  basicAuthHash.setAuthFailureMessage("Authentication failed");
+  basicAuthHash.setAuthType(AsyncAuthType::AUTH_BASIC);
+
+  // digest authentication
+  digestAuth.setUsername("admin");
+  digestAuth.setPassword("admin");
+  digestAuth.setRealm("MyApp");
+  digestAuth.setAuthFailureMessage("Authentication failed");
+  digestAuth.setAuthType(AsyncAuthType::AUTH_DIGEST);
+  digestAuth.generateHash();  // precompute hash (optional but recommended)
+
+  // digest authentication with hash
+  digestAuthHash.setUsername("admin");
+  digestAuthHash.setPasswordHash("f499b71f9a36d838b79268e145e132f7");  // MD5(user:realm:pass)
+  digestAuthHash.setRealm("MyApp");
+  digestAuthHash.setAuthFailureMessage("Authentication failed");
+  digestAuthHash.setAuthType(AsyncAuthType::AUTH_DIGEST);
+
+  // basic authentication method
+  // curl -v -u admin:admin  http://192.168.4.1/auth-basic
+  server
+    .on(
+      "/auth-basic", HTTP_GET,
+      [](AsyncWebServerRequest *request) {
+        request->send(200, "text/plain", "Hello, world!");
+      }
+    )
+    .addMiddleware(&basicAuth);
+
+  // basic authentication method with hash
+  // curl -v -u admin:admin  http://192.168.4.1/auth-basic-hash
+  server
+    .on(
+      "/auth-basic-hash", HTTP_GET,
+      [](AsyncWebServerRequest *request) {
+        request->send(200, "text/plain", "Hello, world!");
+      }
+    )
+    .addMiddleware(&basicAuthHash);
+
+  // digest authentication
+  // curl -v -u admin:admin --digest  http://192.168.4.1/auth-digest
+  server
+    .on(
+      "/auth-digest", HTTP_GET,
+      [](AsyncWebServerRequest *request) {
+        request->send(200, "text/plain", "Hello, world!");
+      }
+    )
+    .addMiddleware(&digestAuth);
+
+  // digest authentication with hash
+  // curl -v -u admin:admin --digest  http://192.168.4.1/auth-digest-hash
+  server
+    .on(
+      "/auth-digest-hash", HTTP_GET,
+      [](AsyncWebServerRequest *request) {
+        request->send(200, "text/plain", "Hello, world!");
+      }
+    )
+    .addMiddleware(&digestAuthHash);
+
+  // test digest auth custom authorization middleware
+  // curl -v --digest -u user:password  http://192.168.4.1/auth-custom?token=123 => OK
+  // curl -v --digest -u user:password  http://192.168.4.1/auth-custom?token=456 => 403
+  // curl -v --digest -u user:FAILED  http://192.168.4.1/auth-custom?token=456 => 401
+  server
+    .on(
+      "/auth-custom", HTTP_GET,
+      [](AsyncWebServerRequest *request) {
+        String buffer = "Hello ";
+        buffer.concat(request->getAttribute("user"));
+        buffer.concat(" with role: ");
+        buffer.concat(request->getAttribute("role"));
+        request->send(200, "text/plain", buffer);
+      }
+    )
+    .addMiddlewares({&complexAuth, &authz});
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/CORS/CORS.ino b/examples/CORS/CORS.ino
new file mode 100644
index 000000000..647d55578
--- /dev/null
+++ b/examples/CORS/CORS.ino
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// How to use CORS middleware
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+static AsyncCorsMiddleware cors;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  cors.setOrigin("http://192.168.4.1");
+  cors.setMethods("POST, GET, OPTIONS, DELETE");
+  cors.setHeaders("X-Custom-Header");
+  cors.setAllowCredentials(false);
+  cors.setMaxAge(600);
+
+  server.addMiddleware(&cors);
+
+  // Test CORS preflight request
+  // curl -v -X OPTIONS -H "origin: http://192.168.4.1" http://192.168.4.1/cors
+  //
+  // Test CORS request
+  // curl -v -H "origin: http://192.168.4.1" http://192.168.4.1/cors
+  //
+  // Test non-CORS request
+  // curl -v http://192.168.4.1/cors
+  //
+  server.on("/cors", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/plain", "Hello, world!");
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/CaptivePortal/CaptivePortal.ino b/examples/CaptivePortal/CaptivePortal.ino
index f97f142a6..0b8c317ed 100644
--- a/examples/CaptivePortal/CaptivePortal.ino
+++ b/examples/CaptivePortal/CaptivePortal.ino
@@ -1,47 +1,60 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
 #include 
-#ifdef ESP32
-#include 
+#if defined(ESP32) || defined(LIBRETINY)
 #include 
+#include 
 #elif defined(ESP8266)
 #include 
 #include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
 #endif
 #include "ESPAsyncWebServer.h"
 
-DNSServer dnsServer;
-AsyncWebServer server(80);
+static DNSServer dnsServer;
+static AsyncWebServer server(80);
 
 class CaptiveRequestHandler : public AsyncWebHandler {
 public:
-  CaptiveRequestHandler() {}
-  virtual ~CaptiveRequestHandler() {}
-
-  bool canHandle(AsyncWebServerRequest *request){
-    //request->addInterestingHeader("ANY");
+  bool canHandle(__unused AsyncWebServerRequest *request) const override {
     return true;
   }
 
   void handleRequest(AsyncWebServerRequest *request) {
     AsyncResponseStream *response = request->beginResponseStream("text/html");
     response->print("Captive Portal");
-    response->print("
This is out captive portal front page.
");
+    response->print("
This is our captive portal front page.
");
     response->printf("
You were trying to reach: http://%s%s
", request->host().c_str(), request->url().c_str());
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
     response->printf("
Try opening this link instead
", WiFi.softAPIP().toString().c_str());
+#endif
     response->print("");
     request->send(response);
   }
 };
 
+void setup() {
+  Serial.begin(115200);
+  Serial.println();
+  Serial.println("Configuring access point...");
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  if (!WiFi.softAP("esp-captive")) {
+    Serial.println("Soft AP creation failed.");
+    while (1);
+  }
 
-void setup(){
-  //your other setup stuff...
-  WiFi.softAP("esp-captive");
   dnsServer.start(53, "*", WiFi.softAPIP());
-  server.addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER);//only when requested from AP
-  //more handlers...
+#endif
+
+  server.addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER);  // only when requested from AP
+  // more handlers...
   server.begin();
 }
 
-void loop(){
+void loop() {
   dnsServer.processNextRequest();
 }
diff --git a/examples/CatchAllHandler/CatchAllHandler.ino b/examples/CatchAllHandler/CatchAllHandler.ino
new file mode 100644
index 000000000..fb0141031
--- /dev/null
+++ b/examples/CatchAllHandler/CatchAllHandler.ino
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to catch all requests and send a 404 Not Found response
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    Sample HTML
+
+
+    
Hello, World!

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // need to cast to uint8_t*
+    // if you do not, the const char* will be copied in a temporary String buffer
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  // catch any request, and send a 404 Not Found response
+  // except for /game_log which is handled by onRequestBody
+  //
+  // curl -v http://192.168.4.1/foo
+  //
+  server.onNotFound([](AsyncWebServerRequest *request) {
+    if (request->url() == "/game_log") {
+      return;  // response object already created by onRequestBody
+    }
+
+    request->send(404, "text/plain", "Not found");
+  });
+
+  // See: https://github.com/ESP32Async/ESPAsyncWebServer/issues/6
+  // catch any POST request and send a 200 OK response
+  //
+  // curl -v -X POST http://192.168.4.1/game_log -H "Content-Type: application/json" -d '{"game": "test"}'
+  //
+  server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {
+    if (request->url() == "/game_log") {
+      request->send(200, "application/json", "{\"status\":\"OK\"}");
+    }
+    // note that there is no else here: the goal is only to prepare a response based on some body content
+    // onNotFound will always be called after this, and will not override the response object if `/game_log` is requested
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/ChunkResponse/ChunkResponse.ino b/examples/ChunkResponse/ChunkResponse.ino
new file mode 100644
index 000000000..52c31c0cd
--- /dev/null
+++ b/examples/ChunkResponse/ChunkResponse.ino
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Chunk response with caching example
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    Sample HTML
+
+
+    
Hello, World!

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // first time: serves the file and cache headers
+  // curl -N -v http://192.168.4.1/ --output -
+  //
+  // secodn time: serves 304
+  // curl -N -v -H "if-none-match: 4272" http://192.168.4.1/ --output -
+  //
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    String etag = String(htmlContentLength);
+
+    if (request->header(asyncsrv::T_INM) == etag) {
+      request->send(304);
+      return;
+    }
+
+    AsyncWebServerResponse *response = request->beginChunkedResponse("text/html", [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+      Serial.printf("%u / %u\n", index, htmlContentLength);
+
+      // finished ?
+      if (htmlContentLength <= index) {
+        Serial.println("finished");
+        return 0;
+      }
+
+      // serve a maximum of 256 or maxLen bytes of the remaining content
+      // this small number is specifically chosen to demonstrate the chunking
+      // DO NOT USE SUCH SMALL NUMBER IN PRODUCTION
+      // Reducing the chunk size will increase the response time, thus reducing the server's capacity in processing concurrent requests
+      const int chunkSize = min((size_t)256, min(maxLen, htmlContentLength - index));
+      Serial.printf("sending: %u\n", chunkSize);
+
+      memcpy(buffer, htmlContent + index, chunkSize);
+
+      return chunkSize;
+    });
+
+    response->addHeader(asyncsrv::T_Cache_Control, "public,max-age=60");
+    response->addHeader(asyncsrv::T_ETag, etag);
+
+    request->send(response);
+  });
+
+  server.begin();
+}
+
+void loop() {
+  delay(100);
+}
diff --git a/examples/ChunkRetryResponse/ChunkRetryResponse.ino b/examples/ChunkRetryResponse/ChunkRetryResponse.ino
new file mode 100644
index 000000000..4e67edb30
--- /dev/null
+++ b/examples/ChunkRetryResponse/ChunkRetryResponse.ino
@@ -0,0 +1,229 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to wait in a chunk response for incoming data
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+#if __has_include("ArduinoJson.h")
+#include 
+#include 
+#include 
+#endif
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    Sample HTML
+
+
+    
Hello, World!

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+static AsyncWebServer server(80);
+static AsyncLoggingMiddleware requestLogger;
+
+static String triggerUART;
+static int key = -1;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // adds some internal request logging for debugging
+  requestLogger.setEnabled(true);
+  requestLogger.setOutput(Serial);
+
+  server.addMiddleware(&requestLogger);
+
+#if __has_include("ArduinoJson.h")
+
+  //
+  // HOW TO RUN THIS EXAMPLE:
+  //
+  // 1. Trigger a request that will be blocked for a long time:
+  //    > time curl -v -X POST http://192.168.4.1/api -H "Content-Type: application/json" -d '{"input": "Please type a key to continue in Serial console..."}' --output -
+  //
+  // 2. While waiting, in another terminal, run some concurrent requests:
+  //    > time curl -v http://192.168.4.1/
+  //
+  // 3. Type a key in the Serial console to continue the processing within 30 seconds.
+  //    This should unblock the first request.
+  //
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // need to cast to uint8_t*
+    // if you do not, the const char* will be copied in a temporary String buffer
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  server.on(
+    "/api", HTTP_POST,
+    [](AsyncWebServerRequest *request) {
+      // request parsing has finished
+      String *data = (String *)request->_tempObject;
+
+      if (!data) {
+        request->send(400);
+        return;
+      }
+
+      // no data ?
+      if (!data->length()) {
+        delete data;
+        request->_tempObject = nullptr;
+        request->send(400);
+        return;
+      }
+
+      JsonDocument doc;
+
+      // deserialize and check for errors
+      if (deserializeJson(doc, *data)) {
+        delete data;
+        request->_tempObject = nullptr;
+        request->send(400);
+        return;
+      }
+
+      delete data;
+      request->_tempObject = nullptr;
+
+      // start UART com: UART will send the data to the Serial console and wait for the key press
+      triggerUART = doc["input"].as();
+      key = -1;
+
+      AsyncWebServerResponse *response = request->beginChunkedResponse("text/plain", [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+        // still waiting for UARY ?
+        if (triggerUART.length() && key == -1) {
+          return RESPONSE_TRY_AGAIN;
+        }
+
+        // finished ?
+        if (!triggerUART.length() && key == -1) {
+          return 0;  // 0 means we are done
+        }
+
+        // log_d("UART answered!");
+
+        String answer = "You typed: ";
+        answer.concat((char)key);
+
+        // note: I did not check for maxLen, but you should (see ChunkResponse.ino)
+        memcpy(buffer, answer.c_str(), answer.length());
+
+        // finish!
+        triggerUART = emptyString;
+        key = -1;
+
+        return answer.length();
+      });
+
+      request->send(response);
+    },
+    NULL,  // upload handler is not used so it should be NULL
+    [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {
+      // log_d("Body: index: %u, len: %u, total: %u", index, len, total);
+
+      if (!index) {
+        // log_d("Start body parsing");
+        request->_tempObject = new String();
+        // cast request->_tempObject pointer to String and reserve total size
+        ((String *)request->_tempObject)->reserve(total);
+        // set timeout 30s
+        request->client()->setRxTimeout(30);
+      }
+
+      // log_d("Append body data");
+      ((String *)request->_tempObject)->concat((const char *)data, len);
+    }
+  );
+
+#endif
+
+  server.begin();
+}
+
+void loop() {
+  if (triggerUART.length() && key == -1) {
+    Serial.println(triggerUART);
+    // log_d("Waiting for UART input...");
+    while (!Serial.available()) {
+      delay(100);
+    }
+    key = Serial.read();
+    Serial.flush();
+    // log_d("UART input: %c", key);
+    triggerUART = emptyString;
+  }
+}
diff --git a/examples/EndBegin/EndBegin.ino b/examples/EndBegin/EndBegin.ino
new file mode 100644
index 000000000..8e91fcf41
--- /dev/null
+++ b/examples/EndBegin/EndBegin.ino
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// https://github.com/ESP32Async/ESPAsyncWebServer/discussions/23
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/plain", "Hello, world");
+  });
+
+  server.begin();
+  Serial.println("begin() - run: curl -v http://192.168.4.1/ => should succeed");
+  delay(10000);
+
+  Serial.println("end()");
+  server.end();
+  server.begin();
+  Serial.println("begin() - run: curl -v http://192.168.4.1/ => should succeed");
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/Filters/Filters.ino b/examples/Filters/Filters.ino
new file mode 100644
index 000000000..bcdb5b3c5
--- /dev/null
+++ b/examples/Filters/Filters.ino
@@ -0,0 +1,136 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to use setFilter to route requests to different handlers based on WiFi mode
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+#include "ESPAsyncWebServer.h"
+
+static DNSServer dnsServer;
+static AsyncWebServer server(80);
+
+class CaptiveRequestHandler : public AsyncWebHandler {
+public:
+  bool canHandle(__unused AsyncWebServerRequest *request) const override {
+    return true;
+  }
+
+  void handleRequest(AsyncWebServerRequest *request) override {
+    AsyncResponseStream *response = request->beginResponseStream("text/html");
+    response->print("Captive Portal");
+    response->print("
This is out captive portal front page.
");
+    response->printf("
You were trying to reach: http://%s%s
", request->host().c_str(), request->url().c_str());
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+    response->printf("
Try opening this link instead
", WiFi.softAPIP().toString().c_str());
+#endif
+    response->print("");
+    request->send(response);
+  }
+};
+
+bool hit1 = false;
+bool hit2 = false;
+
+void setup() {
+  Serial.begin(115200);
+
+  server
+    .on(
+      "/", HTTP_GET,
+      [](AsyncWebServerRequest *request) {
+        Serial.println("Captive portal request...");
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+        Serial.println("WiFi.localIP(): " + WiFi.localIP().toString());
+#endif
+        Serial.println("request->client()->localIP(): " + request->client()->localIP().toString());
+#if ESP_IDF_VERSION_MAJOR >= 5
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+        Serial.println("WiFi.type(): " + String((int)WiFi.localIP().type()));
+#endif
+        Serial.println("request->client()->type(): " + String((int)request->client()->localIP().type()));
+#endif
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+        Serial.println(WiFi.localIP() == request->client()->localIP() ? "should be: ON_STA_FILTER" : "should be: ON_AP_FILTER");
+        Serial.println(WiFi.localIP() == request->client()->localIP());
+        Serial.println(WiFi.localIP().toString() == request->client()->localIP().toString());
+#endif
+        request->send(200, "text/plain", "This is the captive portal");
+        hit1 = true;
+      }
+    )
+    .setFilter(ON_AP_FILTER);
+
+  server
+    .on(
+      "/", HTTP_GET,
+      [](AsyncWebServerRequest *request) {
+        Serial.println("Website request...");
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+        Serial.println("WiFi.localIP(): " + WiFi.localIP().toString());
+#endif
+        Serial.println("request->client()->localIP(): " + request->client()->localIP().toString());
+#if ESP_IDF_VERSION_MAJOR >= 5
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+        Serial.println("WiFi.type(): " + String((int)WiFi.localIP().type()));
+#endif
+        Serial.println("request->client()->type(): " + String((int)request->client()->localIP().type()));
+#endif
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+        Serial.println(WiFi.localIP() == request->client()->localIP() ? "should be: ON_STA_FILTER" : "should be: ON_AP_FILTER");
+        Serial.println(WiFi.localIP() == request->client()->localIP());
+        Serial.println(WiFi.localIP().toString() == request->client()->localIP().toString());
+#endif
+        request->send(200, "text/plain", "This is the website");
+        hit2 = true;
+      }
+    )
+    .setFilter(ON_STA_FILTER);
+
+  // assert(WiFi.softAP("esp-captive-portal"));
+  // dnsServer.start(53, "*", WiFi.softAPIP());
+  // server.begin();
+  // Serial.println("Captive portal started!");
+
+  // while (!hit1) {
+  //   dnsServer.processNextRequest();
+  //   yield();
+  // }
+  // delay(1000); // Wait for the client to process the response
+
+  // Serial.println("Captive portal opened, stopping it and connecting to WiFi...");
+  // dnsServer.stop();
+  // WiFi.softAPdisconnect();
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.persistent(false);
+  WiFi.begin("IoT");
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+  }
+  Serial.println("Connected to WiFi with IP address: " + WiFi.localIP().toString());
+#endif
+
+  server.begin();
+
+  // while (!hit2) {
+  //   delay(10);
+  // }
+  // delay(1000); // Wait for the client to process the response
+  // ESP.restart();
+}
+
+void loop() {
+  delay(100);
+}
diff --git a/examples/FlashResponse/FlashResponse.ino b/examples/FlashResponse/FlashResponse.ino
new file mode 100644
index 000000000..5763f2286
--- /dev/null
+++ b/examples/FlashResponse/FlashResponse.ino
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to serve a large HTML page from flash memory without copying it to heap in a temporary buffer
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    Sample HTML
+
+
+    
Hello, World!

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // need to cast to uint8_t*
+    // if you do not, the const char* will be copied in a temporary String buffer
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/HeaderManipulation/HeaderManipulation.ino b/examples/HeaderManipulation/HeaderManipulation.ino
new file mode 100644
index 000000000..5b4c9f7b3
--- /dev/null
+++ b/examples/HeaderManipulation/HeaderManipulation.ino
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Show how to manipulate headers in the request / response
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+// request logger
+static AsyncLoggingMiddleware requestLogger;
+
+// filter out specific headers from the incoming request
+static AsyncHeaderFilterMiddleware headerFilter;
+
+// remove all headers from the incoming request except the ones provided in the constructor
+AsyncHeaderFreeMiddleware headerFree;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  requestLogger.setEnabled(true);
+  requestLogger.setOutput(Serial);
+
+  headerFilter.filter("X-Remove-Me");
+
+  headerFree.keep("X-Keep-Me");
+  headerFree.keep("host");
+
+  server.addMiddlewares({&requestLogger, &headerFilter});
+
+  // x-remove-me header will be removed
+  //
+  // curl -v -H "X-Header: Foo" -H "x-remove-me: value" http://192.168.4.1/remove
+  //
+  server.on("/remove", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // print all headers
+    for (size_t i = 0; i < request->headers(); i++) {
+      const AsyncWebHeader *h = request->getHeader(i);
+      Serial.printf("Header[%s]: %s\n", h->name().c_str(), h->value().c_str());
+    }
+    request->send(200, "text/plain", "Hello, world!");
+  });
+
+  // Only headers x-keep-me and host will be kept
+  //
+  // curl -v -H "x-keep-me: value" -H "x-remove-me: value" http://192.168.4.1/keep
+  //
+  server
+    .on(
+      "/keep", HTTP_GET,
+      [](AsyncWebServerRequest *request) {
+        // print all headers
+        for (size_t i = 0; i < request->headers(); i++) {
+          const AsyncWebHeader *h = request->getHeader(i);
+          Serial.printf("Header[%s]: %s\n", h->name().c_str(), h->value().c_str());
+        }
+        request->send(200, "text/plain", "Hello, world!");
+      }
+    )
+    .addMiddleware(&headerFree);
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    AsyncWebServerResponse *response = request->beginResponse(200, "text/plain", "Hello, world!");
+    response->addHeader(AsyncWebHeader::parse("X-Test-1: value1"));
+    response->addHeader(AsyncWebHeader::parse("X-Test-2:value2"));
+    response->addHeader(AsyncWebHeader::parse("X-Test-3:"));
+    response->addHeader(AsyncWebHeader::parse("X-Test-4: "));
+    response->addHeader(AsyncWebHeader::parse(""));
+    response->addHeader(AsyncWebHeader::parse(":"));
+    request->send(response);
+    /**
+< HTTP/1.1 200 OK
+< connection: close
+< X-Test-1: value1
+< X-Test-2: value2
+< X-Test-3:
+< X-Test-4:
+< accept-ranges: none
+< content-length: 13
+< content-type: text/plain
+     */
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/Headers/Headers.ino b/examples/Headers/Headers.ino
new file mode 100644
index 000000000..eee87ac14
--- /dev/null
+++ b/examples/Headers/Headers.ino
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Query and send headers
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  //
+  // curl -v http://192.168.4.1
+  //
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    //List all collected headers
+    int headers = request->headers();
+    int i;
+    for (i = 0; i < headers; i++) {
+      const AsyncWebHeader *h = request->getHeader(i);
+      Serial.printf("HEADER[%s]: %s\n", h->name().c_str(), h->value().c_str());
+    }
+
+    AsyncWebServerResponse *response = request->beginResponse(200, "text/plain", "Hello World!");
+
+    //Add header to the response
+    response->addHeader("Server", "ESP Async Web Server");
+
+    //Add multiple headers with the same name
+    response->addHeader("Set-Cookie", "sessionId=38afes7a8", false);
+    response->addHeader("Set-Cookie", "id=a3fWa; Max-Age=2592000", false);
+    response->addHeader("Set-Cookie", "qwerty=219ffwef9w0f; Domain=example.com", false);
+
+    //Remove specific header
+    response->removeHeader("Set-Cookie", "sessionId=38afes7a8");
+
+    //Remove all headers with the same name
+    response->removeHeader("Set-Cookie");
+
+    request->send(response);
+  });
+
+  server.begin();
+}
+
+void loop() {
+  //Sleep in the loop task to not keep the CPU busy
+  delay(1000);
+}
diff --git a/examples/Json/Json.ino b/examples/Json/Json.ino
new file mode 100644
index 000000000..a29fec1b2
--- /dev/null
+++ b/examples/Json/Json.ino
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to send and receive Json data
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+#if __has_include("ArduinoJson.h")
+#include 
+#include 
+#include 
+#endif
+
+static AsyncWebServer server(80);
+
+#if __has_include("ArduinoJson.h")
+static AsyncCallbackJsonWebHandler *handler = new AsyncCallbackJsonWebHandler("/json2");
+#endif
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+#if __has_include("ArduinoJson.h")
+  //
+  // sends JSON using AsyncJsonResponse
+  //
+  // curl -v http://192.168.4.1/json1
+  //
+  server.on("/json1", HTTP_GET, [](AsyncWebServerRequest *request) {
+    AsyncJsonResponse *response = new AsyncJsonResponse();
+    JsonObject root = response->getRoot().to();
+    root["hello"] = "world";
+    response->setLength();
+    request->send(response);
+  });
+
+  // Send JSON using AsyncResponseStream
+  //
+  // curl -v http://192.168.4.1/json2
+  //
+  server.on("/json2", HTTP_GET, [](AsyncWebServerRequest *request) {
+    AsyncResponseStream *response = request->beginResponseStream("application/json");
+    JsonDocument doc;
+    JsonObject root = doc.to();
+    root["foo"] = "bar";
+    serializeJson(root, *response);
+    Serial.println();
+    request->send(response);
+  });
+
+  // curl -v -X POST -H 'Content-Type: application/json' -d '{"name":"You"}' http://192.168.4.1/json2
+  // curl -v -X PUT -H 'Content-Type: application/json' -d '{"name":"You"}' http://192.168.4.1/json2
+  //
+  // edge cases:
+  //
+  // curl -v -X POST -H "Content-Type: application/json" -d "1234" -H "Content-Length: 5" http://192.168.4.1/json2 => rx timeout
+  // curl -v -X POST -H "Content-Type: application/json" -d "1234" -H "Content-Length: 2" http://192.168.4.1/json2 => 12
+  // curl -v -X POST -H "Content-Type: application/json" -d "1234" -H "Content-Length: 4" http://192.168.4.1/json2 => 1234
+  // curl -v -X POST -H "Content-Type: application/json" -d "1234" -H "Content-Length: 10" http://192.168.4.1/json2 => rx timeout
+  // curl -v -X POST -H "Content-Type: application/json" -d "12345678" -H "Content-Length: 8" http://192.168.4.1/json2 => 12345678
+  // curl -v -X POST -H "Content-Type: application/json" -d "123456789" -H "Content-Length: 8" http://192.168.4.1/json2 => 12345678
+  // curl -v -X POST -H "Content-Type: application/json" -d "123456789" -H "Content-Length: 9" http://192.168.4.1/json2 => 413: Content length exceeds maximum allowed
+  handler->setMaxContentLength(8);
+  handler->setMethod(HTTP_POST | HTTP_PUT);
+  handler->onRequest([](AsyncWebServerRequest *request, JsonVariant &json) {
+    serializeJson(json, Serial);
+    Serial.println();
+    AsyncJsonResponse *response = new AsyncJsonResponse();
+    JsonObject root = response->getRoot().to();
+    root["hello"] = json.as()["name"];
+    response->setLength();
+    request->send(response);
+  });
+
+  server.addHandler(handler);
+#endif
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/Logging/Logging.ino b/examples/Logging/Logging.ino
new file mode 100644
index 000000000..ae504b222
--- /dev/null
+++ b/examples/Logging/Logging.ino
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Show how to log the incoming request and response as a curl-like syntax
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+static AsyncLoggingMiddleware requestLogger;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  requestLogger.setEnabled(true);
+  requestLogger.setOutput(Serial);
+
+  server.addMiddleware(&requestLogger);
+
+  // curl -v -H "X-Header:Foo" http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/plain", "Hello, world!");
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/MessagePack/MessagePack.ino b/examples/MessagePack/MessagePack.ino
new file mode 100644
index 000000000..e038d03ce
--- /dev/null
+++ b/examples/MessagePack/MessagePack.ino
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to send and receive Message Pack data
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+#if __has_include("ArduinoJson.h")
+#include 
+#include 
+#include 
+#endif
+
+static AsyncWebServer server(80);
+
+#if __has_include("ArduinoJson.h")
+static AsyncCallbackMessagePackWebHandler *handler = new AsyncCallbackMessagePackWebHandler("/msgpack2");
+#endif
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+#if __has_include("ArduinoJson.h")
+  //
+  // sends MessagePack using AsyncMessagePackResponse
+  //
+  // curl -v http://192.168.4.1/msgpack1
+  //
+  server.on("/msgpack1", HTTP_GET, [](AsyncWebServerRequest *request) {
+    AsyncMessagePackResponse *response = new AsyncMessagePackResponse();
+    JsonObject root = response->getRoot().to();
+    root["hello"] = "world";
+    response->setLength();
+    request->send(response);
+  });
+
+  // Send MessagePack using AsyncResponseStream
+  //
+  // curl -v http://192.168.4.1/msgpack2
+  //
+  server.on("/msgpack2", HTTP_GET, [](AsyncWebServerRequest *request) {
+    AsyncResponseStream *response = request->beginResponseStream("application/msgpack");
+    JsonDocument doc;
+    JsonObject root = doc.to();
+    root["foo"] = "bar";
+    serializeMsgPack(root, *response);
+    request->send(response);
+  });
+
+  handler->setMethod(HTTP_POST | HTTP_PUT);
+  handler->onRequest([](AsyncWebServerRequest *request, JsonVariant &json) {
+    serializeJson(json, Serial);
+    AsyncMessagePackResponse *response = new AsyncMessagePackResponse();
+    JsonObject root = response->getRoot().to();
+    root["hello"] = json.as()["name"];
+    response->setLength();
+    request->send(response);
+  });
+
+  server.addHandler(handler);
+#endif
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/Middleware/Middleware.ino b/examples/Middleware/Middleware.ino
new file mode 100644
index 000000000..992a0a26b
--- /dev/null
+++ b/examples/Middleware/Middleware.ino
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Show how to sue Middleware
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+// New middleware classes can be created!
+class MyMiddleware : public AsyncMiddleware {
+public:
+  void run(AsyncWebServerRequest *request, ArMiddlewareNext next) override {
+    Serial.printf("Before handler: %s %s\n", request->methodToString(), request->url().c_str());
+    next();  // continue middleware chain
+    Serial.printf("After handler: response code=%d\n", request->getResponse()->code());
+  }
+};
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // add a global middleware to the server
+  server.addMiddleware(new MyMiddleware());
+
+  // Test with:
+  //
+  // - curl -v http://192.168.4.1/            => 200 OK
+  // - curl -v http://192.168.4.1/?user=anon  => 403 Forbidden
+  // - curl -v http://192.168.4.1/?user=foo   => 200 OK
+  // - curl -v http://192.168.4.1/?user=error => 400 ERROR
+  //
+  AsyncCallbackWebHandler &handler = server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    Serial.printf("In Handler: %s %s\n", request->methodToString(), request->url().c_str());
+    request->send(200, "text/plain", "Hello, world!");
+  });
+
+  // add a middleware to this handler only to send 403 if the user is anon
+  handler.addMiddleware([](AsyncWebServerRequest *request, ArMiddlewareNext next) {
+    Serial.println("Checking user=anon");
+    if (request->hasParam("user") && request->getParam("user")->value() == "anon") {
+      request->send(403, "text/plain", "Forbidden");
+    } else {
+      next();
+    }
+  });
+
+  // add a middleware to this handler that will replace the previously created response by another one
+  handler.addMiddleware([](AsyncWebServerRequest *request, ArMiddlewareNext next) {
+    next();
+    Serial.println("Checking user=error");
+    if (request->hasParam("user") && request->getParam("user")->value() == "error") {
+      request->send(400, "text/plain", "ERROR");
+    }
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/Params/Params.ino b/examples/Params/Params.ino
new file mode 100644
index 000000000..416218c1c
--- /dev/null
+++ b/examples/Params/Params.ino
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Query parameters and body parameters
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    POST Request with Multiple Parameters
+
+
+    

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+        

+        
+    

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // Get query parameters
+  //
+  // curl -v http://192.168.4.1/?who=Bob
+  //
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (request->hasParam("who")) {
+      Serial.printf("Who? %s\n", request->getParam("who")->value().c_str());
+    }
+
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  // Get form body parameters
+  //
+  // curl -v -H "Content-Type: application/x-www-form-urlencoded" -d "who=Carl" -d "param=value" http://192.168.4.1/
+  //
+  server.on("/", HTTP_POST, [](AsyncWebServerRequest *request) {
+    // display params
+    size_t count = request->params();
+    for (size_t i = 0; i < count; i++) {
+      const AsyncWebParameter *p = request->getParam(i);
+      Serial.printf("PARAM[%u]: %s = %s\n", i, p->name().c_str(), p->value().c_str());
+    }
+
+    // get who param
+    String who;
+    if (request->hasParam("who", true)) {
+      who = request->getParam("who", true)->value();
+    } else {
+      who = "No message sent";
+    }
+    request->send(200, "text/plain", "Hello " + who + "!");
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/PartitionDownloader/PartitionDownloader.ino b/examples/PartitionDownloader/PartitionDownloader.ino
new file mode 100644
index 000000000..1174640d9
--- /dev/null
+++ 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 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+#include 
+
+#ifndef ESP32
+// this example is only for the ESP32
+void setup() {}
+void loop() {}
+#else
+
+#include 
+
+static AsyncWebServer server(80);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  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/examples/PerfTests/PerfTests.ino b/examples/PerfTests/PerfTests.ino
new file mode 100644
index 000000000..001512cd1
--- /dev/null
+++ b/examples/PerfTests/PerfTests.ino
@@ -0,0 +1,243 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Perf tests
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    Sample HTML
+
+
+    
Hello, World!

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+static constexpr char characters[] = "0123456789ABCDEF";
+static size_t charactersIndex = 0;
+
+static AsyncWebServer server(80);
+static AsyncEventSource events("/events");
+
+static volatile size_t requests = 0;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // Pauses in the request parsing phase
+  //
+  // autocannon -c 32 -w 32 -a 96 -t 30 --renderStatusCodes -m POST -H "Content-Type: application/json" -b '{"foo": "bar"}' http://192.168.4.1/delay
+  //
+  // curl -v -X POST -H "Content-Type: application/json" -d '{"game": "test"}' http://192.168.4.1/delay
+  //
+  server.onNotFound([](AsyncWebServerRequest *request) {
+    requests = requests + 1;
+    if (request->url() == "/delay") {
+      request->send(200, "application/json", "{\"status\":\"OK\"}");
+    } else {
+      request->send(404, "text/plain", "Not found");
+    }
+  });
+  server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {
+    if (request->url() == "/delay") {
+      delay(3000);
+    }
+  });
+
+  // HTTP endpoint
+  //
+  // > brew install autocannon
+  // > autocannon -c 10 -w 10 -d 20 http://192.168.4.1
+  // > autocannon -c 16 -w 16 -d 20 http://192.168.4.1
+  //
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // need to cast to uint8_t*
+    // if you do not, the const char* will be copied in a temporary String buffer
+    requests = requests + 1;
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  // IMPORTANT - DO NOT WRITE SUCH CODE IN PRODUCTON !
+  //
+  // This example simulates the slowdown that can happen when:
+  // - downloading a huge file from sdcard
+  // - doing some file listing on SDCard because it is horribly slow to get a file listing with file stats on SDCard.
+  // So in both cases, ESP would deadlock or TWDT would trigger.
+  //
+  // This example simulats that by slowing down the chunk callback:
+  // - d=2000 is the delay in ms in the callback
+  // - l=10000 is the length of the response
+  //
+  // time curl -N -v -G -d 'd=2000' -d 'l=10000'  http://192.168.4.1/slow.html --output -
+  //
+  server.on("/slow.html", HTTP_GET, [](AsyncWebServerRequest *request) {
+    requests = requests + 1;
+    uint32_t d = request->getParam("d")->value().toInt();
+    uint32_t l = request->getParam("l")->value().toInt();
+    Serial.printf("d = %" PRIu32 ", l = %" PRIu32 "\n", d, l);
+    AsyncWebServerResponse *response = request->beginChunkedResponse("text/html", [d, l](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+      Serial.printf("%u\n", index);
+      // finished ?
+      if (index >= l) {
+        return 0;
+      }
+
+      // slow down the task to simulate some heavy processing, like SD card reading
+      delay(d);
+
+      memset(buffer, characters[charactersIndex], 256);
+      charactersIndex = (charactersIndex + 1) % sizeof(characters);
+      return 256;
+    });
+
+    request->send(response);
+  });
+
+  // SSS endpoint
+  //
+  // launch 16 concurrent workers for 30 seconds
+  // > for i in {1..10}; do ( count=$(gtimeout 30 curl -s -N -H "Accept: text/event-stream" http://192.168.4.1/events 2>&1 | grep -c "^data:"); echo "Total: $count events, $(echo "$count / 4" | bc -l) events / second" ) & done;
+  // > for i in {1..16}; do ( count=$(gtimeout 30 curl -s -N -H "Accept: text/event-stream" http://192.168.4.1/events 2>&1 | grep -c "^data:"); echo "Total: $count events, $(echo "$count / 4" | bc -l) events / second" ) & done;
+  //
+  // With AsyncTCP, with 16 workers: a lot of "Event message queue overflow: discard message", no crash
+  //
+  // Total: 1711 events, 427.75 events / second
+  // Total: 1711 events, 427.75 events / second
+  // Total: 1626 events, 406.50 events / second
+  // Total: 1562 events, 390.50 events / second
+  // Total: 1706 events, 426.50 events / second
+  // Total: 1659 events, 414.75 events / second
+  // Total: 1624 events, 406.00 events / second
+  // Total: 1706 events, 426.50 events / second
+  // Total: 1487 events, 371.75 events / second
+  // Total: 1573 events, 393.25 events / second
+  // Total: 1569 events, 392.25 events / second
+  // Total: 1559 events, 389.75 events / second
+  // Total: 1560 events, 390.00 events / second
+  // Total: 1562 events, 390.50 events / second
+  // Total: 1626 events, 406.50 events / second
+  //
+  // With AsyncTCP, with 10 workers:
+  //
+  // Total: 2038 events, 509.50 events / second
+  // Total: 2120 events, 530.00 events / second
+  // Total: 2119 events, 529.75 events / second
+  // Total: 2038 events, 509.50 events / second
+  // Total: 2037 events, 509.25 events / second
+  // Total: 2119 events, 529.75 events / second
+  // Total: 2119 events, 529.75 events / second
+  // Total: 2120 events, 530.00 events / second
+  // Total: 2038 events, 509.50 events / second
+  // Total: 2038 events, 509.50 events / second
+  //
+  // With AsyncTCPSock, with 16 workers: ESP32 CRASH !!!
+  //
+  // With AsyncTCPSock, with 10 workers:
+  //
+  // Total: 1242 events, 310.50 events / second
+  // Total: 1242 events, 310.50 events / second
+  // Total: 1242 events, 310.50 events / second
+  // Total: 1242 events, 310.50 events / second
+  // Total: 1181 events, 295.25 events / second
+  // Total: 1182 events, 295.50 events / second
+  // Total: 1240 events, 310.00 events / second
+  // Total: 1181 events, 295.25 events / second
+  // Total: 1181 events, 295.25 events / second
+  // Total: 1183 events, 295.75 events / second
+  //
+  server.addHandler(&events);
+
+  server.begin();
+}
+
+static uint32_t lastSSE = 0;
+static uint32_t deltaSSE = 10;
+
+static uint32_t lastHeap = 0;
+
+void loop() {
+  uint32_t now = millis();
+  if (now - lastSSE >= deltaSSE) {
+    events.send(String("ping-") + now, "heartbeat", now);
+    lastSSE = millis();
+  }
+
+#ifdef ESP32
+  if (now - lastHeap >= 2000) {
+    Serial.printf("Uptime: %3lu s, requests: %3u, Free heap: %" PRIu32 "\n", millis() / 1000, requests, ESP.getFreeHeap());
+    lastHeap = now;
+  }
+#endif
+}
diff --git a/examples/RateLimit/RateLimit.ino b/examples/RateLimit/RateLimit.ino
new file mode 100644
index 000000000..5ae93e784
--- /dev/null
+++ b/examples/RateLimit/RateLimit.ino
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Show how to rate limit the server or some endpoints
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+static AsyncRateLimitMiddleware rateLimit;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // maximum 5 requests per 10 seconds
+  rateLimit.setMaxRequests(5);
+  rateLimit.setWindowSize(10);
+
+  // run quickly several times:
+  //
+  // curl -v http://192.168.4.1/
+  //
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/plain", "Hello, world!");
+  });
+
+  // run quickly several times:
+  //
+  // curl -v http://192.168.4.1/rate-limited
+  //
+  server
+    .on(
+      "/rate-limited", HTTP_GET,
+      [](AsyncWebServerRequest *request) {
+        request->send(200, "text/plain", "Hello, world!");
+      }
+    )
+    .addMiddleware(&rateLimit);  // only rate limit this endpoint, but could be applied globally to the server
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/Redirect/Redirect.ino b/examples/Redirect/Redirect.ino
new file mode 100644
index 000000000..8f105573c
--- /dev/null
+++ b/examples/Redirect/Redirect.ino
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to redirect
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->redirect("/index.txt");
+  });
+
+  // curl -v http://192.168.4.1/index.txt
+  server.on("/index.txt", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/plain", "Hello, world!");
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/RequestContinuation/RequestContinuation.ino b/examples/RequestContinuation/RequestContinuation.ino
new file mode 100644
index 000000000..f59322e5d
--- /dev/null
+++ b/examples/RequestContinuation/RequestContinuation.ino
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to use request continuation to pause a request for a long processing task, and be able to resume it later.
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+#include 
+#include 
+
+static AsyncWebServer server(80);
+
+// request handler that is saved from the paused request to communicate with Serial
+static String message;
+static AsyncWebServerRequestPtr serialRequest;
+
+// request handler that is saved from the paused request to communicate with GPIO
+static uint8_t pin = 35;
+static AsyncWebServerRequestPtr gpioRequest;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // Post a message that will be sent to the Serial console, and pause the request until the user types a key
+  //
+  // curl -v -X POST -H "Content-Type: application/x-www-form-urlencoded" -d "question=Name%3F%20" http://192.168.4.1/serial
+  //
+  // curl output should show "Answer: [y/n]" as the response
+  server.on("/serial", HTTP_POST, [](AsyncWebServerRequest *request) {
+    message = request->getParam("question", true)->value();
+    serialRequest = request->pause();
+  });
+
+  // Wait for a GPIO to be high
+  //
+  // curl -v http://192.168.4.1/gpio
+  //
+  // curl output should show "GPIO is high!" as the response
+  server.on("/gpio", HTTP_GET, [](AsyncWebServerRequest *request) {
+    gpioRequest = request->pause();
+  });
+
+  pinMode(pin, INPUT);
+
+  server.begin();
+}
+
+void loop() {
+  delay(500);
+
+  // Check for a high voltage on the RX1 pin
+  if (digitalRead(pin) == HIGH) {
+    if (auto request = gpioRequest.lock()) {
+      request->send(200, "text/plain", "GPIO is high!");
+    }
+  }
+
+  // check for an incoming message from the Serial console
+  if (message.length()) {
+    Serial.printf("%s", message.c_str());
+    // drops buffer
+    while (Serial.available()) {
+      Serial.read();
+    }
+    Serial.setTimeout(10000);
+    String response = Serial.readStringUntil('\n');  // waits for a key to be pressed
+    Serial.println();
+    message = emptyString;
+    if (auto request = serialRequest.lock()) {
+      request->send(200, "text/plain", "Answer: " + response);
+    }
+  }
+}
diff --git a/examples/RequestContinuationComplete/RequestContinuationComplete.ino b/examples/RequestContinuationComplete/RequestContinuationComplete.ino
new file mode 100644
index 000000000..cb4a53fa4
--- /dev/null
+++ b/examples/RequestContinuationComplete/RequestContinuationComplete.ino
@@ -0,0 +1,165 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to use request continuation to pause a request for a long processing task, and be able to resume it later.
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+#include 
+#include 
+#include 
+
+static AsyncWebServer server(80);
+
+// ===============================================================
+// The code below is used to simulate some long running operations
+// ===============================================================
+
+typedef struct {
+  size_t id;
+  AsyncWebServerRequestPtr requestPtr;
+  uint8_t data;
+} LongRunningOperation;
+
+static std::list> longRunningOperations;
+static size_t longRunningOperationsCount = 0;
+#ifdef ESP32
+static std::mutex longRunningOperationsMutex;
+#endif
+
+static void startLongRunningOperation(AsyncWebServerRequestPtr &&requestPtr) {
+#ifdef ESP32
+  std::lock_guard lock(longRunningOperationsMutex);
+#endif
+
+  // LongRunningOperation *op = new LongRunningOperation();
+  std::unique_ptr op(new LongRunningOperation());
+  op->id = ++longRunningOperationsCount;
+  op->data = 10;
+
+  // you need to hold the AsyncWebServerRequestPtr returned by pause();
+  // This object is authorized to leave the scope of the request handler.
+  op->requestPtr = std::move(requestPtr);
+
+  Serial.printf("[%u] Start long running operation for %" PRIu8 " seconds...\n", op->id, op->data);
+  longRunningOperations.push_back(std::move(op));
+}
+
+static bool processLongRunningOperation(LongRunningOperation *op) {
+  // request was deleted ?
+  if (op->requestPtr.expired()) {
+    Serial.printf("[%u] Request was deleted - stopping long running operation\n", op->id);
+    return true;  // operation finished
+  }
+
+  // processing the operation
+  Serial.printf("[%u] Long running operation processing... %" PRIu8 " seconds left\n", op->id, op->data);
+
+  // check if we have finished ?
+  op->data--;
+  if (op->data) {
+    // not finished yet
+    return false;
+  }
+
+  // Try to get access to the request pointer if it is still exist.
+  // If there has been a disconnection during that time, the pointer won't be valid anymore
+  if (auto request = op->requestPtr.lock()) {
+    Serial.printf("[%u] Long running operation finished! Sending back response...\n", op->id);
+    request->send(200, "text/plain", String(op->id) + " ");
+
+  } else {
+    Serial.printf("[%u] Long running operation finished, but request was deleted!\n", op->id);
+  }
+
+  return true;  // operation finished
+}
+
+/// ==========================================================
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // Add a middleware to see how pausing a request affects the middleware chain
+  server.addMiddleware([](AsyncWebServerRequest *request, ArMiddlewareNext next) {
+    Serial.printf("Middleware chain start\n");
+
+    // continue to the next middleware, and at the end the request handler
+    next();
+
+    // we can check the request pause state after the handler was executed
+    if (request->isPaused()) {
+      Serial.printf("Request was paused!\n");
+    }
+
+    Serial.printf("Middleware chain ends\n");
+  });
+
+  // HOW TO RUN THIS EXAMPLE:
+  //
+  // 1. Open several terminals to trigger some requests concurrently that will be paused with:
+  //    > time curl -v http://192.168.4.1/
+  //
+  // 2. Look at the output of the Serial console to see how the middleware chain is executed
+  //    and to see the long running operations being processed and resume the requests.
+  //
+  // 3. You can try close your curl command to cancel the request and check that the request is deleted.
+  //    Note: in case the network is disconnected, the request will be deleted.
+  //
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // Print a message in case the request is disconnected (network disconnection, client close, etc.)
+    request->onDisconnect([]() {
+      Serial.printf("Request was disconnected!\n");
+    });
+
+    // Instruct ESPAsyncWebServer to pause the request and get a AsyncWebServerRequestPtr to be able to access the request later.
+    // The AsyncWebServerRequestPtr is the ONLY object authorized to leave the scope of the request handler.
+    // The Middleware chain will continue to run until the end after this handler exit, but the request will be paused and will not
+    // be sent to the client until send() is called later.
+    Serial.printf("Pausing request...\n");
+    AsyncWebServerRequestPtr requestPtr = request->pause();
+
+    // start our long operation...
+    startLongRunningOperation(std::move(requestPtr));
+  });
+
+  server.begin();
+}
+
+static uint32_t lastTime = 0;
+
+void loop() {
+  if (millis() - lastTime >= 1000) {
+
+#ifdef ESP32
+    Serial.printf("Free heap: %" PRIu32 "\n", ESP.getFreeHeap());
+    std::lock_guard lock(longRunningOperationsMutex);
+#endif
+
+    // process all long running operations
+    longRunningOperations.remove_if([](const std::unique_ptr &op) {
+      return processLongRunningOperation(op.get());
+    });
+
+    lastTime = millis();
+  }
+}
diff --git a/examples/ResumableDownload/ResumableDownload.ino b/examples/ResumableDownload/ResumableDownload.ino
new file mode 100644
index 000000000..68646e724
--- /dev/null
+++ b/examples/ResumableDownload/ResumableDownload.ino
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Make sure resumable downloads can be implemented (HEAD request / response and Range header)
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  /*
+    ❯ curl -I -X HEAD http://192.168.4.1/download
+    HTTP/1.1 200 OK
+    Content-Length: 1024
+    Content-Type: application/octet-stream
+    Connection: close
+    Accept-Ranges: bytes
+  */
+  // Ref: https://github.com/mathieucarbou/ESPAsyncWebServer/pull/80
+  server.on("/download", HTTP_HEAD | HTTP_GET, [](AsyncWebServerRequest *request) {
+    if (request->method() == HTTP_HEAD) {
+      AsyncWebServerResponse *response = request->beginResponse(200, "application/octet-stream");
+      response->addHeader(asyncsrv::T_Accept_Ranges, "bytes");
+      response->addHeader(asyncsrv::T_Content_Length, 10);
+      response->setContentLength(1024);  // make sure we can overrides previously set content length
+      response->addHeader(asyncsrv::T_Content_Type, "foo");
+      response->setContentType("application/octet-stream");  // make sure we can overrides previously set content type
+      // ...
+      request->send(response);
+    } else {
+      // ...
+    }
+  });
+
+  server.begin();
+}
+
+void loop() {
+  delay(100);
+}
diff --git a/examples/Rewrite/Rewrite.ino b/examples/Rewrite/Rewrite.ino
new file mode 100644
index 000000000..8dfeedc67
--- /dev/null
+++ b/examples/Rewrite/Rewrite.ino
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to rewrite URLs
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // curl -v http://192.168.4.1/index.txt
+  server.on("/index.txt", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/plain", "Hello, world!");
+  });
+
+  // curl -v http://192.168.4.1/index.txt
+  server.on("/index.html", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/html", "
Hello, world!
");
+  });
+
+  // curl -v http://192.168.4.1/
+  server.rewrite("/", "/index.html");
+  server.rewrite("/index.txt", "/index.html");  // will hide the .txt file
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/ServerSentEvents/ServerSentEvents.ino b/examples/ServerSentEvents/ServerSentEvents.ino
new file mode 100644
index 000000000..5567ec6db
--- /dev/null
+++ b/examples/ServerSentEvents/ServerSentEvents.ino
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// SSE example
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+  Server-Sent Events
+  
+
+
+  
Open your browser console!

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+static AsyncWebServer server(80);
+static AsyncEventSource events("/events");
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // need to cast to uint8_t*
+    // if you do not, the const char* will be copied in a temporary String buffer
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  events.onConnect([](AsyncEventSourceClient *client) {
+    Serial.printf("SSE Client connected! ID: %" PRIu32 "\n", client->lastId());
+    client->send("hello!", NULL, millis(), 1000);
+  });
+
+  events.onDisconnect([](AsyncEventSourceClient *client) {
+    Serial.printf("SSE Client disconnected! ID: %" PRIu32 "\n", client->lastId());
+  });
+
+  server.addHandler(&events);
+
+  server.begin();
+}
+
+static uint32_t lastSSE = 0;
+static uint32_t deltaSSE = 3000;
+
+static uint32_t lastHeap = 0;
+
+void loop() {
+  uint32_t now = millis();
+  if (now - lastSSE >= deltaSSE) {
+    events.send(String("ping-") + now, "heartbeat", now);
+    lastSSE = millis();
+  }
+
+#ifdef ESP32
+  if (now - lastHeap >= 2000) {
+    Serial.printf("Free heap: %" PRIu32 "\n", ESP.getFreeHeap());
+    lastHeap = now;
+  }
+#endif
+}
diff --git a/examples/ServerSentEvents_PR156/ServerSentEvents_PR156.ino b/examples/ServerSentEvents_PR156/ServerSentEvents_PR156.ino
new file mode 100644
index 000000000..cced7151d
--- /dev/null
+++ b/examples/ServerSentEvents_PR156/ServerSentEvents_PR156.ino
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// SSE example
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+  Server-Sent Events
+  
+
+
+  
Open your browser console!

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+static AsyncWebServer server(80);
+static AsyncEventSource events("/events");
+
+static volatile size_t connectionCount = 0;
+static volatile uint32_t timestampConnected = 0;
+static constexpr uint32_t timeoutClose = 15000;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // need to cast to uint8_t*
+    // if you do not, the const char* will be copied in a temporary String buffer
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  events.onConnect([](AsyncEventSourceClient *client) {
+    /**
+     * @brief: Purpose for a test case: count() function
+     * Task watchdog shall be triggered due to a self-deadlock by mutex handling of the AsyncEventSource.
+     *
+     * E (61642) task_wdt: Task watchdog got triggered. The following tasks did not reset the watchdog in time:
+     * E (61642) task_wdt:  - async_tcp (CPU 0/1)
+     *
+     * Resolve: using recursive_mutex insteads of mutex.
+    */
+    connectionCount = events.count();
+
+    timestampConnected = millis();
+    Serial.printf("SSE Client connected! ID: %" PRIu32 "\n", client->lastId());
+    client->send("hello!", NULL, millis(), 1000);
+    Serial.printf("Number of connected clients: %u\n", connectionCount);
+  });
+
+  events.onDisconnect([](AsyncEventSourceClient *client) {
+    connectionCount = events.count();
+    Serial.printf("SSE Client disconnected! ID: %" PRIu32 "\n", client->lastId());
+    Serial.printf("Number of connected clients: %u\n", connectionCount);
+  });
+
+  server.addHandler(&events);
+
+  server.begin();
+}
+
+static constexpr uint32_t deltaSSE = 3000;
+static uint32_t lastSSE = 0;
+static uint32_t lastHeap = 0;
+
+void loop() {
+  uint32_t now = millis();
+  if (connectionCount > 0) {
+    if (now - lastSSE >= deltaSSE) {
+      events.send(String("ping-") + now, "heartbeat", now);
+      lastSSE = millis();
+    }
+
+    /**
+     * @brief: Purpose for a test case: close() function
+     * Task watchdog shall be triggered due to a self-deadlock by mutex handling of the AsyncEventSource.
+     *
+     * E (61642) task_wdt: Task watchdog got triggered. The following tasks did not reset the watchdog in time:
+     * E (61642) task_wdt:  - async_tcp (CPU 0/1)
+     *
+     * Resolve: using recursive_mutex insteads of mutex.
+    */
+    if (now - timestampConnected >= timeoutClose) {
+      Serial.printf("SSE Clients close\n");
+      events.close();
+    }
+  }
+
+#ifdef ESP32
+  if (now - lastHeap >= 2000) {
+    Serial.printf("Free heap: %" PRIu32 "\n", ESP.getFreeHeap());
+    lastHeap = now;
+  }
+#endif
+}
diff --git a/examples/ServerState/ServerState.ino b/examples/ServerState/ServerState.ino
new file mode 100644
index 000000000..4ceddbcb1
--- /dev/null
+++ b/examples/ServerState/ServerState.ino
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Server state example
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server1(80);
+static AsyncWebServer server2(80);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // server state returns one of the tcp_state enum values:
+  // enum tcp_state {
+  //   CLOSED      = 0,
+  //   LISTEN      = 1,
+  //   SYN_SENT    = 2,
+  //   SYN_RCVD    = 3,
+  //   ESTABLISHED = 4,
+  //   FIN_WAIT_1  = 5,
+  //   FIN_WAIT_2  = 6,
+  //   CLOSE_WAIT  = 7,
+  //   CLOSING     = 8,
+  //   LAST_ACK    = 9,
+  //   TIME_WAIT   = 10
+  // };
+
+  assert(server1.state() == tcp_state::CLOSED);
+  assert(server2.state() == tcp_state::CLOSED);
+
+  server1.begin();
+
+  assert(server1.state() == tcp_state::LISTEN);
+  assert(server2.state() == tcp_state::CLOSED);
+
+  server2.begin();
+
+  assert(server1.state() == tcp_state::LISTEN);
+  assert(server2.state() == tcp_state::CLOSED);
+
+  Serial.println("Done!");
+}
+
+void loop() {
+  delay(100);
+}
diff --git a/examples/SkipServerMiddleware/SkipServerMiddleware.ino b/examples/SkipServerMiddleware/SkipServerMiddleware.ino
new file mode 100644
index 000000000..0e7f172bf
--- /dev/null
+++ b/examples/SkipServerMiddleware/SkipServerMiddleware.ino
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Authentication and authorization middlewares
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+static AsyncAuthenticationMiddleware basicAuth;
+static AsyncLoggingMiddleware logging;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // basic authentication
+  basicAuth.setUsername("admin");
+  basicAuth.setPassword("admin");
+  basicAuth.setRealm("MyApp");
+  basicAuth.setAuthFailureMessage("Authentication failed");
+  basicAuth.setAuthType(AsyncAuthType::AUTH_BASIC);
+  basicAuth.generateHash();  // precompute hash (optional but recommended)
+
+  // logging middleware
+  logging.setEnabled(true);
+  logging.setOutput(Serial);
+
+  // we apply auth middleware to the server globally
+  server.addMiddleware(&basicAuth);
+
+  // protected endpoint: requires basic authentication
+  // curl -v -u admin:admin  http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/plain", "Hello, world!");
+  });
+
+  // we skip all global middleware from the catchall handler
+  server.catchAllHandler().skipServerMiddlewares();
+  // we apply a specific middleware to the catchall handler only to log requests without a handler defined
+  server.catchAllHandler().addMiddleware(&logging);
+
+  // standard 404 handler: will display the request in the console i na curl-like style
+  // curl -v -H "Foo: Bar"  http://192.168.4.1/foo
+  server.onNotFound([](AsyncWebServerRequest *request) {
+    request->send(404, "text/plain", "Not found");
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/SlowChunkResponse/SlowChunkResponse.ino b/examples/SlowChunkResponse/SlowChunkResponse.ino
new file mode 100644
index 000000000..7844ad6e6
--- /dev/null
+++ b/examples/SlowChunkResponse/SlowChunkResponse.ino
@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Simulate a slow response in a chunk response (like file download from SD Card)
+// poll events will be throttled.
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    Sample HTML
+
+
+    
Hello, World!

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+static constexpr char characters[] = "0123456789ABCDEF";
+static size_t charactersIndex = 0;
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // need to cast to uint8_t*
+    // if you do not, the const char* will be copied in a temporary String buffer
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  // IMPORTANT - DO NOT WRITE SUCH CODE IN PRODUCTON !
+  //
+  // This example simulates the slowdown that can happen when:
+  // - downloading a huge file from sdcard
+  // - doing some file listing on SDCard because it is horribly slow to get a file listing with file stats on SDCard.
+  // So in both cases, ESP would deadlock or TWDT would trigger.
+  //
+  // This example simulats that by slowing down the chunk callback:
+  // - d=2000 is the delay in ms in the callback
+  // - l=10000 is the length of the response
+  //
+  // time curl -N -v -G -d 'd=2000' -d 'l=10000'  http://192.168.4.1/slow.html --output -
+  //
+  server.on("/slow.html", HTTP_GET, [](AsyncWebServerRequest *request) {
+    uint32_t d = request->getParam("d")->value().toInt();
+    uint32_t l = request->getParam("l")->value().toInt();
+    Serial.printf("d = %" PRIu32 ", l = %" PRIu32 "\n", d, l);
+    AsyncWebServerResponse *response = request->beginChunkedResponse("text/html", [d, l](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+      Serial.printf("%u\n", index);
+      // finished ?
+      if (index >= l) {
+        return 0;
+      }
+
+      // slow down the task to simulate some heavy processing, like SD card reading
+      delay(d);
+
+      memset(buffer, characters[charactersIndex], 256);
+      charactersIndex = (charactersIndex + 1) % sizeof(characters);
+      return 256;
+    });
+
+    request->send(response);
+  });
+
+  server.begin();
+}
+
+static uint32_t lastHeap = 0;
+
+void loop() {
+#ifdef ESP32
+  uint32_t now = millis();
+  if (now - lastHeap >= 2000) {
+    Serial.printf("Free heap: %" PRIu32 "\n", ESP.getFreeHeap());
+    lastHeap = now;
+  }
+#endif
+}
diff --git a/examples/StaticFile/StaticFile.ino b/examples/StaticFile/StaticFile.ino
new file mode 100644
index 000000000..3074aed51
--- /dev/null
+++ b/examples/StaticFile/StaticFile.ino
@@ -0,0 +1,144 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to serve a static file
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+#include 
+
+static AsyncWebServer server(80);
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    Sample HTML
+
+
+    
Hello, World!

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+#ifdef ESP32
+  LittleFS.begin(true);
+#else
+  LittleFS.begin();
+#endif
+
+  {
+    File f = LittleFS.open("/index.html", "w");
+    assert(f);
+    f.print(htmlContent);
+    f.close();
+  }
+
+  LittleFS.mkdir("/files");
+
+  {
+    File f = LittleFS.open("/files/a.txt", "w");
+    assert(f);
+    f.print("Hello from a.txt");
+    f.close();
+  }
+
+  {
+    File f = LittleFS.open("/files/b.txt", "w");
+    assert(f);
+    f.print("Hello from b.txt");
+    f.close();
+  }
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->redirect("/index.html");
+  });
+
+  // curl -v http://192.168.4.1/index.html
+  server.serveStatic("/index.html", LittleFS, "/index.html");
+
+  // Example to serve a directory content
+  // curl -v http://192.168.4.1/base/ => serves a.txt
+  // curl -v http://192.168.4.1/base/a.txt => serves a.txt
+  // curl -v http://192.168.4.1/base/b.txt => serves b.txt
+  server.serveStatic("/base", LittleFS, "/files").setDefaultFile("a.txt");
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/Templates/Templates.ino b/examples/Templates/Templates.ino
new file mode 100644
index 000000000..fdf4eb6f3
--- /dev/null
+++ b/examples/Templates/Templates.ino
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to serve a static and dynamic template
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+#include 
+
+static AsyncWebServer server(80);
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    
Hello, %USER%

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+#ifdef ESP32
+  LittleFS.begin(true);
+#else
+  LittleFS.begin();
+#endif
+
+  {
+    File f = LittleFS.open("/template.html", "w");
+    assert(f);
+    f.print(htmlContent);
+    f.close();
+  }
+
+  // Serve the static template file
+  //
+  // curl -v http://192.168.4.1/template.html
+  server.serveStatic("/template.html", LittleFS, "/template.html");
+
+  // Serve the static template with a template processor
+  //
+  // ServeStatic static is used to serve static output which never changes over time.
+  // This special endpoints automatically adds caching headers.
+  // If a template processor is used, it must ensure that the outputted content will always be the same over time and never changes.
+  // Otherwise, do not use serveStatic.
+  // Example below: IP never changes.
+  //
+  // curl -v http://192.168.4.1/index.html
+  server.serveStatic("/index.html", LittleFS, "/template.html").setTemplateProcessor([](const String &var) -> String {
+    if (var == "USER") {
+      return "Bob";
+    }
+    return emptyString;
+  });
+
+  // Serve a template with dynamic content
+  //
+  // to serve a template with dynamic content (output changes over time), use normal
+  // Example below: content changes over tinme do not use serveStatic.
+  //
+  // curl -v http://192.168.4.1/dynamic.html
+  server.on("/dynamic.html", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(LittleFS, "/template.html", "text/html", false, [](const String &var) -> String {
+      if (var == "USER") {
+        return String("Bob ") + millis();
+      }
+      return emptyString;
+    });
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/Upload/Upload.ino b/examples/Upload/Upload.ino
new file mode 100644
index 000000000..fd80bd721
--- /dev/null
+++ b/examples/Upload/Upload.ino
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Demo text, binary and file upload
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+#include 
+#include 
+
+static AsyncWebServer server(80);
+
+void setup() {
+  Serial.begin(115200);
+
+  if (!LittleFS.begin()) {
+    LittleFS.format();
+    LittleFS.begin();
+  }
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // 1. Generate a Lorem_ipsum.txt file of about 20KB of text
+  //
+  // 3. Run: curl -v -F "data=@Lorem_ipsum.txt" http://192.168.4.1/upload/text
+  //
+  server.on(
+    "/upload/text", HTTP_POST,
+    [](AsyncWebServerRequest *request) {
+      if (!request->_tempObject) {
+        return request->send(400, "text/plain", "Nothing uploaded");
+      }
+      StreamString *buffer = reinterpret_cast(request->_tempObject);
+      Serial.printf("Text uploaded:\n%s\n", buffer->c_str());
+      delete buffer;
+      request->_tempObject = nullptr;
+      request->send(200, "text/plain", "OK");
+    },
+    [](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+      Serial.printf("Upload[%s]: start=%u, len=%u, final=%d\n", filename.c_str(), index, len, final);
+
+      if (!index) {
+        // first pass
+        StreamString *buffer = new StreamString();
+        size_t size = std::max(4094l, request->header("Content-Length").toInt());
+        Serial.printf("Allocating string buffer of %u bytes\n", size);
+        if (!buffer->reserve(size)) {
+          delete buffer;
+          request->abort();
+        }
+        request->_tempObject = buffer;
+      }
+
+      if (len) {
+        reinterpret_cast(request->_tempObject)->write(data, len);
+      }
+    }
+  );
+
+  // 1. Generate a Lorem_ipsum.txt file of about 20KB of text
+  //
+  // 3. Run: curl -v -F "data=@Lorem_ipsum.txt" http://192.168.4.1/upload/file
+  //
+  server.on(
+    "/upload/file", HTTP_POST,
+    [](AsyncWebServerRequest *request) {
+      if (request->getResponse()) {
+        // 400 File not available for writing
+        return;
+      }
+
+      if (!LittleFS.exists("/my_file.txt")) {
+        return request->send(400, "text/plain", "Nothing uploaded");
+      }
+
+      // sends back the uploaded file
+      request->send(LittleFS, "/my_file.txt", "text/plain");
+    },
+    [](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+      Serial.printf("Upload[%s]: start=%u, len=%u, final=%d\n", filename.c_str(), index, len, final);
+
+      if (!index) {
+        request->_tempFile = LittleFS.open("/my_file.txt", "w");
+
+        if (!request->_tempFile) {
+          request->send(400, "text/plain", "File not available for writing");
+        }
+      }
+      if (len) {
+        request->_tempFile.write(data, len);
+      }
+      if (final) {
+        request->_tempFile.close();
+      }
+    }
+  );
+
+  //
+  // Upload a binary file: curl -v -F "data=@file.mp3" http://192.168.4.1/upload/binary
+  //
+  server.on(
+    "/upload/binary", HTTP_POST,
+    [](AsyncWebServerRequest *request) {
+      // response already set ?
+      if (request->getResponse()) {
+        // 400 No Content-Length
+        return;
+      }
+
+      // nothing uploaded ?
+      if (!request->_tempObject) {
+        return request->send(400, "text/plain", "Nothing uploaded");
+      }
+
+      uint8_t *buffer = reinterpret_cast(request->_tempObject);
+      // process the buffer
+
+      delete buffer;
+      request->_tempObject = nullptr;
+
+      request->send(200, "text/plain", "OK");
+    },
+    [](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
+      Serial.printf("Upload[%s]: start=%u, len=%u, final=%d\n", filename.c_str(), index, len, final);
+
+      // first pass ?
+      if (!index) {
+        size_t size = request->header("Content-Length").toInt();
+        if (!size) {
+          request->send(400, "text/plain", "No Content-Length");
+        } else {
+          Serial.printf("Allocating buffer of %u bytes\n", size);
+          uint8_t *buffer = new (std::nothrow) uint8_t[size];
+          if (!buffer) {
+            // not enough memory
+            request->abort();
+          } else {
+            request->_tempObject = buffer;
+          }
+        }
+      }
+
+      if (len) {
+        memcpy(reinterpret_cast(request->_tempObject) + index, data, len);
+      }
+    }
+  );
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/examples/WebSocket/WebSocket.ino b/examples/WebSocket/WebSocket.ino
new file mode 100644
index 000000000..c8d372795
--- /dev/null
+++ b/examples/WebSocket/WebSocket.ino
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// WebSocket example
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+static AsyncWebSocket ws("/ws");
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  //
+  // Run in terminal 1: websocat ws://192.168.4.1/ws => should stream data
+  // Run in terminal 2: websocat ws://192.168.4.1/ws => should stream data
+  // Run in terminal 3: websocat ws://192.168.4.1/ws => should fail:
+  //
+  // To send a message to the WebSocket server:
+  //
+  // echo "Hello!" | websocat ws://192.168.4.1/ws
+  //
+  ws.onEvent([](AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
+    (void)len;
+
+    if (type == WS_EVT_CONNECT) {
+      ws.textAll("new client connected");
+      Serial.println("ws connect");
+      client->setCloseClientOnQueueFull(false);
+      client->ping();
+
+    } else if (type == WS_EVT_DISCONNECT) {
+      ws.textAll("client disconnected");
+      Serial.println("ws disconnect");
+
+    } else if (type == WS_EVT_ERROR) {
+      Serial.println("ws error");
+
+    } else if (type == WS_EVT_PONG) {
+      Serial.println("ws pong");
+
+    } else if (type == WS_EVT_DATA) {
+      AwsFrameInfo *info = (AwsFrameInfo *)arg;
+      Serial.printf("index: %" PRIu64 ", len: %" PRIu64 ", final: %" PRIu8 ", opcode: %" PRIu8 "\n", info->index, info->len, info->final, info->opcode);
+      String msg = "";
+      if (info->final && info->index == 0 && info->len == len) {
+        if (info->opcode == WS_TEXT) {
+          data[len] = 0;
+          Serial.printf("ws text: %s\n", (char *)data);
+        }
+      }
+    }
+  });
+
+  // shows how to prevent a third WS client to connect
+  server.addHandler(&ws).addMiddleware([](AsyncWebServerRequest *request, ArMiddlewareNext next) {
+    // ws.count() is the current count of WS clients: this one is trying to upgrade its HTTP connection
+    if (ws.count() > 1) {
+      // if we have 2 clients or more, prevent the next one to connect
+      request->send(503, "text/plain", "Server is busy");
+    } else {
+      // process next middleware and at the end the handler
+      next();
+    }
+  });
+
+  server.addHandler(&ws);
+
+  server.begin();
+}
+
+static uint32_t lastWS = 0;
+static uint32_t deltaWS = 100;
+
+static uint32_t lastHeap = 0;
+
+void loop() {
+  uint32_t now = millis();
+
+  if (now - lastWS >= deltaWS) {
+    ws.printfAll("kp%.4f", (10.0 / 3.0));
+    lastWS = millis();
+  }
+
+  if (now - lastHeap >= 2000) {
+    Serial.printf("Connected clients: %u / %u total\n", ws.count(), ws.getClients().size());
+
+    // this can be called to also set a soft limit on the number of connected clients
+    ws.cleanupClients(2);  // no more than 2 clients
+
+#ifdef ESP32
+    Serial.printf("Free heap: %" PRIu32 "\n", ESP.getFreeHeap());
+#endif
+    lastHeap = now;
+  }
+}
diff --git a/examples/WebSocketEasy/WebSocketEasy.ino b/examples/WebSocketEasy/WebSocketEasy.ino
new file mode 100644
index 000000000..5229910cb
--- /dev/null
+++ b/examples/WebSocketEasy/WebSocketEasy.ino
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// WebSocket example using the easy to use AsyncWebSocketMessageHandler handler that only supports unfragmented messages
+//
+
+#include 
+#if defined(ESP32) || defined(LIBRETINY)
+#include 
+#include 
+#elif defined(ESP8266)
+#include 
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#endif
+
+#include 
+
+static AsyncWebServer server(80);
+
+// create an easy-to-use handler
+static AsyncWebSocketMessageHandler wsHandler;
+
+// add it to the websocket server
+static AsyncWebSocket ws("/ws", wsHandler.eventHandler());
+
+// alternatively you can do as usual:
+//
+// static AsyncWebSocket ws("/ws");
+// ws.onEvent(wsHandler.eventHandler());
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+  WebSocket
+
+
+  
WebSocket Example

+  <>Open your browser console!

+  
+  
+  
+
+
+  )";
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // serves root html page
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    request->send(200, "text/html", (const uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  wsHandler.onConnect([](AsyncWebSocket *server, AsyncWebSocketClient *client) {
+    Serial.printf("Client %" PRIu32 " connected\n", client->id());
+    server->textAll("New client: " + String(client->id()));
+  });
+
+  wsHandler.onDisconnect([](AsyncWebSocket *server, uint32_t clientId) {
+    Serial.printf("Client %" PRIu32 " disconnected\n", clientId);
+    server->textAll("Client " + String(clientId) + " disconnected");
+  });
+
+  wsHandler.onError([](AsyncWebSocket *server, AsyncWebSocketClient *client, uint16_t errorCode, const char *reason, size_t len) {
+    Serial.printf("Client %" PRIu32 " error: %" PRIu16 ": %s\n", client->id(), errorCode, reason);
+  });
+
+  wsHandler.onMessage([](AsyncWebSocket *server, AsyncWebSocketClient *client, const uint8_t *data, size_t len) {
+    Serial.printf("Client %" PRIu32 " data: %s\n", client->id(), (const char *)data);
+  });
+
+  wsHandler.onFragment([](AsyncWebSocket *server, AsyncWebSocketClient *client, const AwsFrameInfo *frameInfo, const uint8_t *data, size_t len) {
+    Serial.printf("Client %" PRIu32 " fragment %" PRIu32 ": %s\n", client->id(), frameInfo->num, (const char *)data);
+  });
+
+  server.addHandler(&ws);
+  server.begin();
+}
+
+static uint32_t lastWS = 0;
+static uint32_t deltaWS = 2000;
+
+void loop() {
+  uint32_t now = millis();
+
+  if (now - lastWS >= deltaWS) {
+    ws.cleanupClients();
+    ws.printfAll("now: %" PRIu32 "\n", now);
+    lastWS = millis();
+#ifdef ESP32
+    Serial.printf("Free heap: %" PRIu32 "\n", ESP.getFreeHeap());
+#endif
+  }
+}
diff --git a/examples/regex_patterns/.test.build_flags b/examples/regex_patterns/.test.build_flags
deleted file mode 100644
index 9ea3bb74a..000000000
--- a/examples/regex_patterns/.test.build_flags
+++ /dev/null
@@ -1 +0,0 @@
--DASYNCWEBSERVER_REGEX=1
diff --git a/examples/regex_patterns/regex_patterns.ino b/examples/regex_patterns/regex_patterns.ino
deleted file mode 100644
index fb013063e..000000000
--- a/examples/regex_patterns/regex_patterns.ino
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// A simple server implementation with regex routes:
-//  * serve static messages
-//  * read GET and POST parameters
-//  * handle missing pages / 404s
-//
-
-// Add buildflag ASYNCWEBSERVER_REGEX to enable the regex support
-
-// For platformio: platformio.ini:
-//  build_flags = 
-//      -DASYNCWEBSERVER_REGEX
-
-// For arduino IDE: create/update platform.local.txt
-// Windows: C:\Users\(username)\AppData\Local\Arduino15\packages\espxxxx\hardware\espxxxx\{version}\platform.local.txt
-// Linux: ~/.arduino15/packages/espxxxx/hardware/espxxxx/{version}/platform.local.txt
-//
-// compiler.cpp.extra_flags=-DASYNCWEBSERVER_REGEX=1
-
-#include 
-#ifdef ESP32
-#include 
-#include 
-#elif defined(ESP8266)
-#include 
-#include 
-#endif
-#include 
-
-AsyncWebServer server(80);
-
-const char* ssid = "YOUR_SSID";
-const char* password = "YOUR_PASSWORD";
-
-const char* PARAM_MESSAGE = "message";
-
-void notFound(AsyncWebServerRequest *request) {
-    request->send(404, "text/plain", "Not found");
-}
-
-void setup() {
-
-    Serial.begin(115200);
-    WiFi.mode(WIFI_STA);
-    WiFi.begin(ssid, password);
-    if (WiFi.waitForConnectResult() != WL_CONNECTED) {
-        Serial.printf("WiFi Failed!\n");
-        return;
-    }
-
-    Serial.print("IP Address: ");
-    Serial.println(WiFi.localIP());
-
-    server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
-        request->send(200, "text/plain", "Hello, world");
-    });
-
-    // Send a GET request to /sensor/
-    server.on("^\\/sensor\\/([0-9]+)$", HTTP_GET, [] (AsyncWebServerRequest *request) {
-        String sensorNumber = request->pathArg(0);
-        request->send(200, "text/plain", "Hello, sensor: " + sensorNumber);
-    });
-	
-	// Send a GET request to /sensor//action/
-    server.on("^\\/sensor\\/([0-9]+)\\/action\\/([a-zA-Z0-9]+)$", HTTP_GET, [] (AsyncWebServerRequest *request) {
-        String sensorNumber = request->pathArg(0);
-        String action = request->pathArg(1);
-        request->send(200, "text/plain", "Hello, sensor: " + sensorNumber + ", with action: " + action);
-    });
-
-    server.onNotFound(notFound);
-
-    server.begin();
-}
-
-void loop() {
-}
diff --git a/examples/simple_server/simple_server.ino b/examples/simple_server/simple_server.ino
deleted file mode 100644
index bdbcf60dc..000000000
--- a/examples/simple_server/simple_server.ino
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// A simple server implementation showing how to:
-//  * serve static messages
-//  * read GET and POST parameters
-//  * handle missing pages / 404s
-//
-
-#include 
-#ifdef ESP32
-#include 
-#include 
-#elif defined(ESP8266)
-#include 
-#include 
-#endif
-#include 
-
-AsyncWebServer server(80);
-
-const char* ssid = "YOUR_SSID";
-const char* password = "YOUR_PASSWORD";
-
-const char* PARAM_MESSAGE = "message";
-
-void notFound(AsyncWebServerRequest *request) {
-    request->send(404, "text/plain", "Not found");
-}
-
-void setup() {
-
-    Serial.begin(115200);
-    WiFi.mode(WIFI_STA);
-    WiFi.begin(ssid, password);
-    if (WiFi.waitForConnectResult() != WL_CONNECTED) {
-        Serial.printf("WiFi Failed!\n");
-        return;
-    }
-
-    Serial.print("IP Address: ");
-    Serial.println(WiFi.localIP());
-
-    server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
-        request->send(200, "text/plain", "Hello, world");
-    });
-
-    // Send a GET request to /get?message=
-    server.on("/get", HTTP_GET, [] (AsyncWebServerRequest *request) {
-        String message;
-        if (request->hasParam(PARAM_MESSAGE)) {
-            message = request->getParam(PARAM_MESSAGE)->value();
-        } else {
-            message = "No message sent";
-        }
-        request->send(200, "text/plain", "Hello, GET: " + message);
-    });
-
-    // Send a POST request to /post with a form field message set to 
-    server.on("/post", HTTP_POST, [](AsyncWebServerRequest *request){
-        String message;
-        if (request->hasParam(PARAM_MESSAGE, true)) {
-            message = request->getParam(PARAM_MESSAGE, true)->value();
-        } else {
-            message = "No message sent";
-        }
-        request->send(200, "text/plain", "Hello, POST: " + message);
-    });
-
-    server.onNotFound(notFound);
-
-    server.begin();
-}
-
-void loop() {
-}
\ No newline at end of file
diff --git a/idf_component.yml b/idf_component.yml
new file mode 100644
index 000000000..844ba794f
--- /dev/null
+++ b/idf_component.yml
@@ -0,0 +1,40 @@
+description: "Async Web Server for ESP32 Arduino"
+url: "https://github.com/ESP32Async/ESPAsyncWebServer"
+license: "LGPL-3.0-or-later"
+tags:
+  - arduino
+files:
+  exclude:
+    - "idf_component_examples/"
+    - "idf_component_examples/**/*"
+    - "docs/"
+    - "docs/*"
+    - "examples/"
+    - "examples/**/*"
+    - ".gitignore"
+    - ".clang-format"
+    - ".gitpod.Dockerfile"
+    - ".gitpod.yml"
+    - ".codespellrc"
+    - ".editorconfig"
+    - ".pre-commit-config.yaml"
+    - "CODE_OF_CONDUCT.md"
+    - "library.json"
+    - "library.properties"
+    - "partitions-4MB.csv"
+    - "platformio.ini"
+    - "pre-commit.requirements.txt"
+dependencies:
+  espressif/arduino-esp32:
+    version: "^3.1.1"
+    require: public
+  esp32async/asynctcp:
+    version: "^3.4.5"
+    require: public
+  bblanchon/arduinojson:
+    version: "^7.4.2"
+    require: public
+examples:
+  - path: ./idf_component_examples/catchall
+  - path: ./idf_component_examples/serversentevents
+  - path: ./idf_component_examples/websocket
diff --git a/idf_component_examples/catchall/CMakeLists.txt b/idf_component_examples/catchall/CMakeLists.txt
new file mode 100644
index 000000000..664d45871
--- /dev/null
+++ b/idf_component_examples/catchall/CMakeLists.txt
@@ -0,0 +1,8 @@
+# For more information about build system see
+# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
+# The following five lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.16)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(main)
diff --git a/idf_component_examples/catchall/README.md b/idf_component_examples/catchall/README.md
new file mode 100644
index 000000000..1e09f91bb
--- /dev/null
+++ b/idf_component_examples/catchall/README.md
@@ -0,0 +1 @@
+### Basic example to show how to catch all requests and send a 404 Not Found response
diff --git a/idf_component_examples/catchall/main/CMakeLists.txt b/idf_component_examples/catchall/main/CMakeLists.txt
new file mode 100644
index 000000000..9eb7ec47a
--- /dev/null
+++ b/idf_component_examples/catchall/main/CMakeLists.txt
@@ -0,0 +1,2 @@
+idf_component_register(SRCS "main.cpp"
+                    INCLUDE_DIRS ".")
diff --git a/idf_component_examples/catchall/main/idf_component.yml b/idf_component_examples/catchall/main/idf_component.yml
new file mode 100644
index 000000000..e2d1c657e
--- /dev/null
+++ b/idf_component_examples/catchall/main/idf_component.yml
@@ -0,0 +1,6 @@
+## IDF Component Manager Manifest File
+dependencies:
+  esp32async/espasyncwebserver:
+    version: "*"
+    override_path: "../../../"
+    pre_release: true
diff --git a/idf_component_examples/catchall/main/main.cpp b/idf_component_examples/catchall/main/main.cpp
new file mode 100644
index 000000000..0ba61ecdd
--- /dev/null
+++ b/idf_component_examples/catchall/main/main.cpp
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// Shows how to catch all requests and send a 404 Not Found response
+//
+
+#include 
+#include 
+#include 
+
+#include 
+
+static AsyncWebServer server(80);
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    Sample HTML
+
+
+    
Hello, World!

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // need to cast to uint8_t*
+    // if you do not, the const char* will be copied in a temporary String buffer
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  // catch any request, and send a 404 Not Found response
+  // except for /game_log which is handled by onRequestBody
+  //
+  // curl -v http://192.168.4.1/foo
+  //
+  server.onNotFound([](AsyncWebServerRequest *request) {
+    if (request->url() == "/game_log") {
+      return;  // response object already created by onRequestBody
+    }
+
+    request->send(404, "text/plain", "Not found");
+  });
+
+  // See: https://github.com/ESP32Async/ESPAsyncWebServer/issues/6
+  // catch any POST request and send a 200 OK response
+  //
+  // curl -v -X POST http://192.168.4.1/game_log -H "Content-Type: application/json" -d '{"game": "test"}'
+  //
+  server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {
+    if (request->url() == "/game_log") {
+      request->send(200, "application/json", "{\"status\":\"OK\"}");
+    }
+    // note that there is no else here: the goal is only to prepare a response based on some body content
+    // onNotFound will always be called after this, and will not override the response object if `/game_log` is requested
+  });
+
+  server.begin();
+}
+
+// not needed
+void loop() {
+  delay(100);
+}
diff --git a/idf_component_examples/catchall/sdkconfig.defaults b/idf_component_examples/catchall/sdkconfig.defaults
new file mode 100644
index 000000000..bb723653f
--- /dev/null
+++ b/idf_component_examples/catchall/sdkconfig.defaults
@@ -0,0 +1,12 @@
+#
+# Arduino ESP32
+#
+CONFIG_AUTOSTART_ARDUINO=y
+# end of Arduino ESP32
+
+#
+# FREERTOS
+#
+CONFIG_FREERTOS_HZ=1000
+# end of FREERTOS
+# end of Component config
diff --git a/idf_component_examples/serversentevents/CMakeLists.txt b/idf_component_examples/serversentevents/CMakeLists.txt
new file mode 100644
index 000000000..664d45871
--- /dev/null
+++ b/idf_component_examples/serversentevents/CMakeLists.txt
@@ -0,0 +1,8 @@
+# For more information about build system see
+# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
+# The following five lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.16)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(main)
diff --git a/idf_component_examples/serversentevents/README.md b/idf_component_examples/serversentevents/README.md
new file mode 100644
index 000000000..ea21ac97e
--- /dev/null
+++ b/idf_component_examples/serversentevents/README.md
@@ -0,0 +1 @@
+### Basic example to show how to use ServerSentEvents
diff --git a/idf_component_examples/serversentevents/main/CMakeLists.txt b/idf_component_examples/serversentevents/main/CMakeLists.txt
new file mode 100644
index 000000000..9eb7ec47a
--- /dev/null
+++ b/idf_component_examples/serversentevents/main/CMakeLists.txt
@@ -0,0 +1,2 @@
+idf_component_register(SRCS "main.cpp"
+                    INCLUDE_DIRS ".")
diff --git a/idf_component_examples/serversentevents/main/idf_component.yml b/idf_component_examples/serversentevents/main/idf_component.yml
new file mode 100644
index 000000000..e2d1c657e
--- /dev/null
+++ b/idf_component_examples/serversentevents/main/idf_component.yml
@@ -0,0 +1,6 @@
+## IDF Component Manager Manifest File
+dependencies:
+  esp32async/espasyncwebserver:
+    version: "*"
+    override_path: "../../../"
+    pre_release: true
diff --git a/idf_component_examples/serversentevents/main/main.cpp b/idf_component_examples/serversentevents/main/main.cpp
new file mode 100644
index 000000000..b877f54a9
--- /dev/null
+++ b/idf_component_examples/serversentevents/main/main.cpp
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// SSE example
+//
+
+#include 
+#include 
+#include 
+
+#include 
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+  Server-Sent Events
+  
+
+
+  
Open your browser console!

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+static AsyncWebServer server(80);
+static AsyncEventSource events("/events");
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  // curl -v http://192.168.4.1/
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    // need to cast to uint8_t*
+    // if you do not, the const char* will be copied in a temporary String buffer
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  events.onConnect([](AsyncEventSourceClient *client) {
+    Serial.printf("SSE Client connected! ID: %" PRIu32 "\n", client->lastId());
+    client->send("hello!", NULL, millis(), 1000);
+  });
+
+  events.onDisconnect([](AsyncEventSourceClient *client) {
+    Serial.printf("SSE Client disconnected! ID: %" PRIu32 "\n", client->lastId());
+  });
+
+  server.addHandler(&events);
+
+  server.begin();
+}
+
+static uint32_t lastSSE = 0;
+static uint32_t deltaSSE = 3000;
+
+static uint32_t lastHeap = 0;
+
+void loop() {
+  uint32_t now = millis();
+  if (now - lastSSE >= deltaSSE) {
+    events.send(String("ping-") + now, "heartbeat", now);
+    lastSSE = millis();
+  }
+
+  if (now - lastHeap >= 2000) {
+    Serial.printf("Free heap: %" PRIu32 "\n", ESP.getFreeHeap());
+    lastHeap = now;
+  }
+}
diff --git a/idf_component_examples/serversentevents/sdkconfig.defaults b/idf_component_examples/serversentevents/sdkconfig.defaults
new file mode 100644
index 000000000..bb723653f
--- /dev/null
+++ b/idf_component_examples/serversentevents/sdkconfig.defaults
@@ -0,0 +1,12 @@
+#
+# Arduino ESP32
+#
+CONFIG_AUTOSTART_ARDUINO=y
+# end of Arduino ESP32
+
+#
+# FREERTOS
+#
+CONFIG_FREERTOS_HZ=1000
+# end of FREERTOS
+# end of Component config
diff --git a/idf_component_examples/websocket/CMakeLists.txt b/idf_component_examples/websocket/CMakeLists.txt
new file mode 100644
index 000000000..664d45871
--- /dev/null
+++ b/idf_component_examples/websocket/CMakeLists.txt
@@ -0,0 +1,8 @@
+# For more information about build system see
+# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
+# The following five lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.16)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(main)
diff --git a/idf_component_examples/websocket/README.md b/idf_component_examples/websocket/README.md
new file mode 100644
index 000000000..3741fc3cd
--- /dev/null
+++ b/idf_component_examples/websocket/README.md
@@ -0,0 +1 @@
+### Basic example to show how to use WebSockets
diff --git a/idf_component_examples/websocket/main/CMakeLists.txt b/idf_component_examples/websocket/main/CMakeLists.txt
new file mode 100644
index 000000000..9eb7ec47a
--- /dev/null
+++ b/idf_component_examples/websocket/main/CMakeLists.txt
@@ -0,0 +1,2 @@
+idf_component_register(SRCS "main.cpp"
+                    INCLUDE_DIRS ".")
diff --git a/idf_component_examples/websocket/main/idf_component.yml b/idf_component_examples/websocket/main/idf_component.yml
new file mode 100644
index 000000000..e2d1c657e
--- /dev/null
+++ b/idf_component_examples/websocket/main/idf_component.yml
@@ -0,0 +1,6 @@
+## IDF Component Manager Manifest File
+dependencies:
+  esp32async/espasyncwebserver:
+    version: "*"
+    override_path: "../../../"
+    pre_release: true
diff --git a/idf_component_examples/websocket/main/main.cpp b/idf_component_examples/websocket/main/main.cpp
new file mode 100644
index 000000000..9d4e46aac
--- /dev/null
+++ b/idf_component_examples/websocket/main/main.cpp
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// WebSocket example
+//
+
+#include 
+#include 
+#include 
+
+#include 
+
+static AsyncWebServer server(80);
+static AsyncWebSocket ws("/ws");
+
+void setup() {
+  Serial.begin(115200);
+
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
+  WiFi.mode(WIFI_AP);
+  WiFi.softAP("esp-captive");
+#endif
+
+  //
+  // Run in terminal 1: websocat ws://192.168.4.1/ws => should stream data
+  // Run in terminal 2: websocat ws://192.168.4.1/ws => should stream data
+  // Run in terminal 3: websocat ws://192.168.4.1/ws => should fail:
+  //
+  // To send a message to the WebSocket server:
+  //
+  // echo "Hello!" | websocat ws://192.168.4.1/ws
+  //
+  ws.onEvent([](AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
+    (void)len;
+
+    if (type == WS_EVT_CONNECT) {
+      ws.textAll("new client connected");
+      Serial.println("ws connect");
+      client->setCloseClientOnQueueFull(false);
+      client->ping();
+
+    } else if (type == WS_EVT_DISCONNECT) {
+      ws.textAll("client disconnected");
+      Serial.println("ws disconnect");
+
+    } else if (type == WS_EVT_ERROR) {
+      Serial.println("ws error");
+
+    } else if (type == WS_EVT_PONG) {
+      Serial.println("ws pong");
+
+    } else if (type == WS_EVT_DATA) {
+      AwsFrameInfo *info = (AwsFrameInfo *)arg;
+      String msg = "";
+      if (info->final && info->index == 0 && info->len == len) {
+        if (info->opcode == WS_TEXT) {
+          data[len] = 0;
+          Serial.printf("ws text: %s\n", (char *)data);
+        }
+      }
+    }
+  });
+
+  // shows how to prevent a third WS client to connect
+  server.addHandler(&ws).addMiddleware([](AsyncWebServerRequest *request, ArMiddlewareNext next) {
+    // ws.count() is the current count of WS clients: this one is trying to upgrade its HTTP connection
+    if (ws.count() > 1) {
+      // if we have 2 clients or more, prevent the next one to connect
+      request->send(503, "text/plain", "Server is busy");
+    } else {
+      // process next middleware and at the end the handler
+      next();
+    }
+  });
+
+  server.addHandler(&ws);
+
+  server.begin();
+}
+
+static uint32_t lastWS = 0;
+static uint32_t deltaWS = 100;
+
+static uint32_t lastHeap = 0;
+
+void loop() {
+  uint32_t now = millis();
+
+  if (now - lastWS >= deltaWS) {
+    ws.printfAll("kp%.4f", (10.0 / 3.0));
+    lastWS = millis();
+  }
+
+  if (now - lastHeap >= 2000) {
+    // cleanup disconnected clients or too many clients
+    ws.cleanupClients();
+
+    Serial.printf("Free heap: %" PRIu32 "\n", ESP.getFreeHeap());
+    lastHeap = now;
+  }
+}
diff --git a/idf_component_examples/websocket/sdkconfig.defaults b/idf_component_examples/websocket/sdkconfig.defaults
new file mode 100644
index 000000000..bb723653f
--- /dev/null
+++ b/idf_component_examples/websocket/sdkconfig.defaults
@@ -0,0 +1,12 @@
+#
+# Arduino ESP32
+#
+CONFIG_AUTOSTART_ARDUINO=y
+# end of Arduino ESP32
+
+#
+# FREERTOS
+#
+CONFIG_FREERTOS_HZ=1000
+# end of FREERTOS
+# end of Component config
diff --git a/keywords.txt b/keywords.txt
deleted file mode 100755
index c391e6c43..000000000
--- a/keywords.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-JsonArray	KEYWORD1
-add	KEYWORD2
-createArray	KEYWORD3
diff --git a/library.json b/library.json
index 0632efab4..44707785d 100644
--- a/library.json
+++ b/library.json
@@ -1,39 +1,61 @@
 {
-  "name":"ESPAsyncWebServer-esphome",
-  "description":"Asynchronous HTTP and WebSocket Server Library for ESP8266 and ESP32",
-  "keywords":"http,async,websocket,webserver",
+  "name": "ESPAsyncWebServer-esphome",
+  "version": "3.7.9",
+  "description": "Asynchronous HTTP and WebSocket Server Library for ESP32, ESP8266 and RP2040. Supports: WebSocket, SSE, Authentication, Arduino Json 7, File Upload, Static File serving, URL Rewrite, URL Redirect, etc.",
+  "keywords": "http,async,websocket,webserver",
+  "homepage": "https://github.com/esphome/ESPAsyncWebServer",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/esphome/ESPAsyncWebServer.git"
+  },
   "authors":
   {
     "name": "ESPHome Team",
     "maintainer": true
   },
-  "repository":
-  {
-    "type": "git",
-    "url": "https://github.com/esphome/ESPAsyncWebServer.git"
-  },
-  "version": "3.4.0",
   "license": "LGPL-3.0",
   "frameworks": "arduino",
-  "platforms": ["espressif8266", "espressif32", "libretiny"],
+  "platforms": [
+    "espressif32",
+    "espressif8266",
+    "raspberrypi",
+    "libretiny"
+  ],
   "dependencies": [
     {
-      "owner": "esphome",
-      "name": "ESPAsyncTCP-esphome",
-      "platforms": "espressif8266"
+      "owner": "ESP32Async",
+      "name": "AsyncTCP",
+      "version": "^3.4.5",
+      "platforms": [
+        "espressif32",
+        "libretiny"
+      ]
     },
     {
-      "owner": "esphome",
-      "name": "AsyncTCP-esphome",
-      "platforms": ["espressif32", "libretiny"]
+      "owner": "ESP32Async",
+      "name": "ESPAsyncTCP",
+      "version": "^2.0.0",
+      "platforms": "espressif8266"
     },
     {
       "name": "Hash",
       "platforms": "espressif8266"
     },
     {
-      "name": "ESP8266WiFi",
-      "platforms": "espressif8266"
+      "owner": "ayushsharma82",
+      "name": "RPAsyncTCP",
+      "version": "^1.3.2",
+      "platforms": "raspberrypi"
     }
-  ]
+  ],
+  "export": {
+    "include": [
+      "examples",
+      "src",
+      "library.json",
+      "library.properties",
+      "LICENSE",
+      "README.md"
+    ]
+  }
 }
diff --git a/library.properties b/library.properties
new file mode 100644
index 000000000..453ace57b
--- /dev/null
+++ b/library.properties
@@ -0,0 +1,11 @@
+name=ESP Async WebServer
+includes=ESPAsyncWebServer.h
+version=3.7.9
+author=ESP32Async
+maintainer=ESP32Async
+sentence=Asynchronous HTTP and WebSocket Server Library for ESP32, ESP8266 and RP2040
+paragraph=Supports: WebSocket, SSE, Authentication, Arduino Json 7, File Upload, Static File serving, URL Rewrite, URL Redirect, etc
+category=Other
+url=https://github.com/ESP32Async/ESPAsyncWebServer
+architectures=*
+license=LGPL-3.0
diff --git a/partitions-4MB.csv b/partitions-4MB.csv
new file mode 100644
index 000000000..75efc35ce
--- /dev/null
+++ b/partitions-4MB.csv
@@ -0,0 +1,7 @@
+# Name   ,Type ,SubType  ,Offset ,Size  ,Flags
+nvs      ,data ,nvs      ,36K    ,20K   ,
+otadata  ,data ,ota      ,56K    ,8K    ,
+app0     ,app  ,ota_0    ,64K    ,1856K  ,
+app1     ,app  ,ota_1    ,1920K  ,1856K ,
+spiffs   ,data ,spiffs   ,3776K  ,256K   ,
+coredump ,data ,coredump ,4032K  ,64K   ,
diff --git a/pioarduino_examples/IncreaseMaxSockets/.gitignore b/pioarduino_examples/IncreaseMaxSockets/.gitignore
new file mode 100644
index 000000000..6c42fe09c
--- /dev/null
+++ b/pioarduino_examples/IncreaseMaxSockets/.gitignore
@@ -0,0 +1,11 @@
+.DS_Store
+.lh
+/.pio
+/.vscode
+/logs
+
+/sdkconfig.*
+/CMakeLists.txt
+/dependencies.lock
+/.dummy
+/managed_components
diff --git a/pioarduino_examples/IncreaseMaxSockets/platformio.ini b/pioarduino_examples/IncreaseMaxSockets/platformio.ini
new file mode 100644
index 000000000..d2f27c258
--- /dev/null
+++ b/pioarduino_examples/IncreaseMaxSockets/platformio.ini
@@ -0,0 +1,26 @@
+[env]
+framework = arduino
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21/platform-espressif32.zip
+build_flags =
+  -Og
+  -Wall -Wextra
+  -Wno-unused-parameter
+  -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
+  ; -D CONFIG_ASYNC_TCP_MAX_ACK_TIME=5000
+  ; -D CONFIG_ASYNC_TCP_PRIORITY=10
+  -D CONFIG_ASYNC_TCP_QUEUE_SIZE=128
+  -D CONFIG_ASYNC_TCP_RUNNING_CORE=1
+  -D CONFIG_ASYNC_TCP_STACK_SIZE=4096
+upload_protocol = esptool
+monitor_speed = 115200
+monitor_filters = esp32_exception_decoder, log2file
+lib_compat_mode = strict
+lib_ldf_mode = chain
+lib_deps =
+  ESP32Async/AsyncTCP @ 3.4.5
+  ESP32Async/ESpAsyncWebServer @ 3.7.0
+
+custom_sdkconfig = CONFIG_LWIP_MAX_ACTIVE_TCP=32
+
+[env:esp32dev]
+board = esp32dev
diff --git a/pioarduino_examples/IncreaseMaxSockets/src/main.cpp b/pioarduino_examples/IncreaseMaxSockets/src/main.cpp
new file mode 100644
index 000000000..752c40277
--- /dev/null
+++ b/pioarduino_examples/IncreaseMaxSockets/src/main.cpp
@@ -0,0 +1,142 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+//
+// This example demonstrates how to increase the maximum number of active TCP connections
+//
+// in platformo.ini:
+//
+// Use hybrid compilation to set the maximum number of active TCP connections
+//
+// custom_sdkconfig = CONFIG_LWIP_MAX_ACTIVE_TCP=32
+//
+// and increase the queue stack size
+//
+// -D CONFIG_ASYNC_TCP_QUEUE_SIZE=128
+//
+
+#include 
+#include 
+#include 
+#include 
+
+static const char *htmlContent PROGMEM = R"(
+
+
+
+    Sample HTML
+
+
+    
Hello, World!

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+    
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.

+
+
+)";
+
+static const size_t htmlContentLength = strlen_P(htmlContent);
+
+static AsyncWebServer server(80);
+static AsyncEventSource events("/events");
+
+static volatile size_t requests = 0;
+
+void setup() {
+  Serial.begin(115200);
+
+  Serial.println("============================");
+  Serial.printf("CONFIG_LWIP_MAX_ACTIVE_TCP %d\n", CONFIG_LWIP_MAX_ACTIVE_TCP);
+  Serial.println("============================");
+
+  WiFi.mode(WIFI_STA);
+  WiFi.begin("IoT", "");
+
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    Serial.println("Connecting to WiFi...");
+  }
+
+  // HTTP endpoint
+  //
+  // > autocannon -c 32 -d 20 -t 30 --renderStatusCodes http://192.168.125.146/
+  //
+  server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
+    requests++;
+    request->send(200, "text/html", (uint8_t *)htmlContent, htmlContentLength);
+  });
+
+  // SSS endpoint
+  //
+  // launch 32 concurrent workers for 30 seconds
+  // > for i in {1..32}; do ( count=$(gtimeout 30 curl -s -N -H "Accept: text/event-stream" http://192.168.125.146/events 2>&1 | grep -c "^data:"); echo "Total: $count events, $(echo "$count / 4" | bc -l) events / second" ) & done;
+  //
+  server.addHandler(&events);
+
+  server.begin();
+}
+
+static uint32_t lastSSE = 0;
+static uint32_t deltaSSE = 10;
+
+static uint32_t lastHeap = 0;
+
+void loop() {
+  uint32_t now = millis();
+  if (now - lastSSE >= deltaSSE) {
+    events.send(String("ping-") + now, "heartbeat", now);
+    lastSSE = millis();
+  }
+
+#ifdef ESP32
+  if (now - lastHeap >= 2000) {
+    Serial.printf("Uptime: %3lu s, requests: %3u, Free heap: %" PRIu32 "\n", millis() / 1000, requests, ESP.getFreeHeap());
+    lastHeap = now;
+  }
+#endif
+}
diff --git a/platformio.ini b/platformio.ini
new file mode 100644
index 000000000..8b16cea96
--- /dev/null
+++ b/platformio.ini
@@ -0,0 +1,179 @@
+[platformio]
+default_envs = arduino-2, arduino-3, esp8266, raspberrypi
+lib_dir = .
+; src_dir = examples/AsyncResponseStream
+; src_dir = examples/AsyncTunnel
+; src_dir = examples/Auth
+; src_dir = examples/CaptivePortal
+; src_dir = examples/CatchAllHandler
+; src_dir = examples/ChunkResponse
+; src_dir = examples/ChunkRetryResponse
+; src_dir = examples/CORS
+; src_dir = examples/EndBegin
+; src_dir = examples/Filters
+; src_dir = examples/FlashResponse
+; src_dir = examples/HeaderManipulation
+; src_dir = examples/Json
+; src_dir = examples/Logging
+; 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
+; src_dir = examples/RequestContinuation
+; src_dir = examples/RequestContinuationComplete
+; src_dir = examples/ResumableDownload
+; src_dir = examples/Rewrite
+; src_dir = examples/ServerSentEvents
+; src_dir = examples/ServerState
+; src_dir = examples/SkipServerMiddleware
+; src_dir = examples/SlowChunkResponse
+; src_dir = examples/StaticFile
+; src_dir = examples/Templates
+; src_dir = examples/Upload
+; src_dir = examples/WebSocket
+; src_dir = examples/WebSocketEasy
+
+[env]
+framework = arduino
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21/platform-espressif32.zip
+board = esp32dev
+build_flags =
+  -Og
+  -Wall -Wextra
+  -Wno-unused-parameter
+  ; -D CONFIG_ARDUHAL_LOG_COLORS
+  -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
+  -D CONFIG_ASYNC_TCP_MAX_ACK_TIME=5000
+  -D CONFIG_ASYNC_TCP_PRIORITY=10
+  -D CONFIG_ASYNC_TCP_QUEUE_SIZE=64
+  -D CONFIG_ASYNC_TCP_RUNNING_CORE=1
+  -D CONFIG_ASYNC_TCP_STACK_SIZE=4096
+  ; -D CONFIG_ASYNC_TCP_USE_WDT=0
+upload_protocol = esptool
+monitor_speed = 115200
+monitor_filters = esp32_exception_decoder, log2file
+; monitor_filters = esp8266_exception_decoder, log2file
+lib_compat_mode = strict
+lib_ldf_mode = chain
+lib_deps =
+  bblanchon/ArduinoJson @ 7.4.2
+  ESP32Async/AsyncTCP @ 3.4.5
+board_build.partitions = partitions-4MB.csv
+board_build.filesystem = littlefs
+
+[env:arduino-2]
+platform = espressif32@6.10.0
+
+[env:arduino-3]
+; board = esp32-p4
+; board = esp32-h2-devkitm-1
+
+[env:arduino-3-latest]
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.20-rc2/platform-espressif32.zip
+
+[env:arduino-3-no-json]
+lib_deps =
+  ESP32Async/AsyncTCP @ 3.4.5
+
+[env:arduino-3-latest-asynctcp]
+lib_deps =
+  https://github.com/ESP32Async/AsyncTCP
+
+[env:arduino-3-no-chunk-inflight]
+build_flags = ${env.build_flags}
+  -D ASYNCWEBSERVER_USE_CHUNK_INFLIGHT=0
+
+[env:AsyncTCPSock]
+lib_deps =
+  https://github.com/ESP32Async/AsyncTCPSock/archive/refs/tags/v1.0.3-dev.zip
+build_flags = ${env.build_flags}
+
+[env:esp8266]
+platform = espressif8266
+; board = huzzah
+board = d1_mini
+lib_deps =
+  bblanchon/ArduinoJson @ 7.4.2
+  ESP32Async/ESPAsyncTCP @ 2.0.0
+
+[env:raspberrypi]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#c7502925e3b08af70e9f924d54ab9d00a7e64781
+board = rpipicow
+board_build.core = earlephilhower
+lib_deps =
+  bblanchon/ArduinoJson @ 7.3.0
+  ayushsharma82/RPAsyncTCP@^1.3.2
+lib_ignore =
+  lwIP_ESPHost
+build_flags = ${env.build_flags}
+  -Wno-missing-field-initializers
+
+[env:libretiny]
+platform = libretiny @ ^1.9.1
+board = generic-bk7231n-qfn32-tuya
+; board = generic-rtl8710bn-2mb-788k
+lib_compat_mode = off
+lib_deps =
+  ESP32Async/AsyncTCP @ 3.4.3
+; use FreeRTOS v9.0.0 for RTL8710BN
+; (BK7231 already uses it)
+custom_versions.freertos = 9.0.0
+
+;  CI
+
+[env:ci-arduino-2]
+platform = espressif32@6.10.0
+board = ${sysenv.PIO_BOARD}
+
+[env:ci-arduino-3]
+board = ${sysenv.PIO_BOARD}
+
+[env:ci-arduino-3-latest]
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.20-rc2/platform-espressif32.zip
+board = ${sysenv.PIO_BOARD}
+
+[env:ci-arduino-3-no-json]
+board = ${sysenv.PIO_BOARD}
+lib_deps =
+  ESP32Async/AsyncTCP @ 3.4.5
+
+[env:ci-arduino-3-latest-asynctcp]
+lib_deps =
+  https://github.com/ESP32Async/AsyncTCP
+
+[env:ci-arduino-3-no-chunk-inflight]
+board = ${sysenv.PIO_BOARD}
+build_flags = ${env.build_flags}
+  -D ASYNCWEBSERVER_USE_CHUNK_INFLIGHT=1
+
+[env:ci-esp8266]
+platform = espressif8266
+board = ${sysenv.PIO_BOARD}
+lib_deps =
+  bblanchon/ArduinoJson @ 7.4.2
+  ESP32Async/ESPAsyncTCP @ 2.0.0
+
+[env:ci-raspberrypi]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#c7502925e3b08af70e9f924d54ab9d00a7e64781
+board = ${sysenv.PIO_BOARD}
+board_build.core = earlephilhower
+lib_deps =
+  bblanchon/ArduinoJson @ 7.3.0
+  ayushsharma82/RPAsyncTCP@^1.3.2
+lib_ignore =
+  lwIP_ESPHost
+build_flags = ${env.build_flags}
+  -Wno-missing-field-initializers
+
+[env:ci-libretiny]
+platform = libretiny @ ^1.9.1
+board = ${sysenv.PIO_BOARD}
+lib_compat_mode = off
+lib_deps =
+; add DNS server library for LibreTiny
+  DNSServer
+  ESP32Async/AsyncTCP @ 3.4.3
+custom_versions.freertos = 9.0.0
diff --git a/pre-commit.requirements.txt b/pre-commit.requirements.txt
new file mode 100644
index 000000000..40a16fa94
--- /dev/null
+++ b/pre-commit.requirements.txt
@@ -0,0 +1 @@
+pre-commit==4.1.0
diff --git a/src/AsyncEventSource.cpp b/src/AsyncEventSource.cpp
index 4275f503f..2ebfa2d30 100644
--- a/src/AsyncEventSource.cpp
+++ b/src/AsyncEventSource.cpp
@@ -1,182 +1,189 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+#include "Arduino.h"
+#if defined(ESP32)
+#include 
+#endif
+#include "AsyncEventSource.h"
 
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+#define ASYNC_SSE_NEW_LINE_CHAR (char)0xa
 
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
+using namespace asyncsrv;
 
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#include "Arduino.h"
-#include "AsyncEventSource.h"
+static String generateEventMessage(const char *message, const char *event, uint32_t id, uint32_t reconnect) {
+  String str;
+  size_t len{0};
+  if (message) {
+    len += strlen(message);
+  }
 
-static String generateEventMessage(const char *message, const char *event, uint32_t id, uint32_t reconnect){
-  String ev = "";
-
-  if(reconnect){
-    ev += "retry: ";
-    ev += String(reconnect);
-    ev += "\r\n";
-  }
-
-  if(id){
-    ev += "id: ";
-    ev += String(id);
-    ev += "\r\n";
-  }
-
-  if(event != NULL){
-    ev += "event: ";
-    ev += String(event);
-    ev += "\r\n";
-  }
-
-  if(message != NULL){
-    size_t messageLen = strlen(message);
-    char * lineStart = (char *)message;
-    char * lineEnd;
-    do {
-      char * nextN = strchr(lineStart, '\n');
-      char * nextR = strchr(lineStart, '\r');
-      if(nextN == NULL && nextR == NULL){
-        size_t llen = ((char *)message + messageLen) - lineStart;
-        char * ldata = (char *)malloc(llen+1);
-        if(ldata != NULL){
-          memcpy(ldata, lineStart, llen);
-          ldata[llen] = 0;
-          ev += "data: ";
-          ev += ldata;
-          ev += "\r\n\r\n";
-          free(ldata);
-        }
-        lineStart = (char *)message + messageLen;
-      } else {
-        char * nextLine = NULL;
-        if(nextN != NULL && nextR != NULL){
-          if(nextR < nextN){
-            lineEnd = nextR;
-            if(nextN == (nextR + 1))
-              nextLine = nextN + 1;
-            else
-              nextLine = nextR + 1;
-          } else {
-            lineEnd = nextN;
-            if(nextR == (nextN + 1))
-              nextLine = nextR + 1;
-            else
-              nextLine = nextN + 1;
-          }
-        } else if(nextN != NULL){
-          lineEnd = nextN;
-          nextLine = nextN + 1;
-        } else {
-          lineEnd = nextR;
-          nextLine = nextR + 1;
-        }
-
-        size_t llen = lineEnd - lineStart;
-        char * ldata = (char *)malloc(llen+1);
-        if(ldata != NULL){
-          memcpy(ldata, lineStart, llen);
-          ldata[llen] = 0;
-          ev += "data: ";
-          ev += ldata;
-          ev += "\r\n";
-          free(ldata);
-        }
-        lineStart = nextLine;
-        if(lineStart == ((char *)message + messageLen))
-          ev += "\r\n";
-      }
-    } while(lineStart < ((char *)message + messageLen));
+  if (event) {
+    len += strlen(event);
   }
 
-  return ev;
-}
+  len += 42;  // give it some overhead
 
-// Message
+  if (!str.reserve(len)) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    return emptyString;
+  }
 
-AsyncEventSourceMessage::AsyncEventSourceMessage(const char * data, size_t len)
-: _data(nullptr), _len(len), _sent(0), _acked(0)
-{
-  _data = (uint8_t*)malloc(_len+1);
-  if(_data == nullptr){
-    _len = 0;
-  } else {
-    memcpy(_data, data, len);
-    _data[_len] = 0;
+  if (reconnect) {
+    str += T_retry_;
+    str += reconnect;
+    str += ASYNC_SSE_NEW_LINE_CHAR;  // '\n'
   }
-}
 
-AsyncEventSourceMessage::~AsyncEventSourceMessage() {
-     if(_data != NULL)
-        free(_data);
-}
+  if (id) {
+    str += T_id__;
+    str += id;
+    str += ASYNC_SSE_NEW_LINE_CHAR;  // '\n'
+  }
 
-size_t AsyncEventSourceMessage::ack(size_t len, uint32_t time) {
-    (void)time;
-    return ack(len);
+  if (event != NULL) {
+    str += T_event_;
+    str += event;
+    str += ASYNC_SSE_NEW_LINE_CHAR;  // '\n'
+  }
+
+  if (!message) {
+    return str;
+  }
+
+  size_t messageLen = strlen(message);
+  char *lineStart = (char *)message;
+  char *lineEnd;
+  do {
+    char *nextN = strchr(lineStart, '\n');
+    char *nextR = strchr(lineStart, '\r');
+    if (nextN == NULL && nextR == NULL) {
+      // a message is a single-line string
+      str += T_data_;
+      str += message;
+      str += T_nn;
+      return str;
+    }
+
+    // a message is a multi-line string
+    char *nextLine = NULL;
+    if (nextN != NULL && nextR != NULL) {  // windows line-ending \r\n
+      if (nextR + 1 == nextN) {
+        // normal \r\n sequence
+        lineEnd = nextR;
+        nextLine = nextN + 1;
+      } else {
+        // some abnormal \n \r mixed sequence
+        lineEnd = std::min(nextR, nextN);
+        nextLine = lineEnd + 1;
+      }
+    } else if (nextN != NULL) {  // Unix/Mac OS X LF
+      lineEnd = nextN;
+      nextLine = nextN + 1;
+    } else {  // some ancient garbage
+      lineEnd = nextR;
+      nextLine = nextR + 1;
+    }
+
+    str += T_data_;
+    str.concat(lineStart, lineEnd - lineStart);
+    str += ASYNC_SSE_NEW_LINE_CHAR;  // \n
+
+    lineStart = nextLine;
+  } while (lineStart < ((char *)message + messageLen));
+
+  // append another \n to terminate message
+  str += ASYNC_SSE_NEW_LINE_CHAR;  // '\n'
+
+  return str;
 }
 
-size_t AsyncEventSourceMessage::ack(size_t len) {
+// Message
+
+size_t AsyncEventSourceMessage::ack(size_t len, __attribute__((unused)) uint32_t time) {
   // If the whole message is now acked...
-  if(_acked + len > _len){
-     // Return the number of extra bytes acked (they will be carried on to the next message)
-     const size_t extra = _acked + len - _len;
-     _acked = _len;
-     return extra;
+  if (_acked + len > _data->length()) {
+    // Return the number of extra bytes acked (they will be carried on to the next message)
+    const size_t extra = _acked + len - _data->length();
+    _acked = _data->length();
+    return extra;
   }
   // Return that no extra bytes left.
   _acked += len;
   return 0;
 }
 
-size_t AsyncEventSourceMessage::write_buffer(AsyncClient *client) {
-  if (!client->canSend() || client->space() <= 0)
+size_t AsyncEventSourceMessage::write(AsyncClient *client) {
+  if (!client) {
+    return 0;
+  }
+
+  if (_sent >= _data->length() || !client->canSend()) {
     return 0;
-  size_t len = _len - _sent;
-  if(client->space() < len){
-    len = client->space();
   }
-  size_t sent = client->add((const char *)_data + _sent, len);
-  _sent += sent;
-  return sent;
+
+  size_t len = std::min(_data->length() - _sent, client->space());
+  /*
+    add() would call lwip's tcp_write() under the AsyncTCP hood with apiflags argument.
+    By default apiflags=ASYNC_WRITE_FLAG_COPY
+    we could have used apiflags with this flag unset to pass data by reference and avoid copy to socket buffer,
+    but looks like it does not work for Arduino's lwip in ESP32/IDF
+    it is enforced in https://github.com/espressif/esp-lwip/blob/0606eed9d8b98a797514fdf6eabb4daf1c8c8cd9/src/core/tcp_out.c#L422C5-L422C30
+    if LWIP_NETIF_TX_SINGLE_PBUF is set, and it is set indeed in IDF
+    https://github.com/espressif/esp-idf/blob/a0f798cfc4bbd624aab52b2c194d219e242d80c1/components/lwip/port/include/lwipopts.h#L744
+
+    So let's just keep it enforced ASYNC_WRITE_FLAG_COPY and keep in mind that there is no zero-copy
+  */
+  size_t written = client->add(_data->c_str() + _sent, len, ASYNC_WRITE_FLAG_COPY);  //  ASYNC_WRITE_FLAG_MORE
+  _sent += written;
+  return written;
 }
 
 size_t AsyncEventSourceMessage::send(AsyncClient *client) {
-  size_t sent = write_buffer(client);
-  client->send();
-  return sent;
+  size_t sent = write(client);
+  return sent && client->send() ? sent : 0;
 }
 
 // Client
 
-AsyncEventSourceClient::AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server)
-: _messageQueue(LinkedList([](AsyncEventSourceMessage *m){ delete  m; }))
-{
-  _client = request->client();
-  _server = server;
-  _lastId = 0;
-  if(request->hasHeader("Last-Event-ID"))
-    _lastId = atoi(request->getHeader("Last-Event-ID")->value().c_str());
+AsyncEventSourceClient::AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server) : _client(request->client()), _server(server) {
+
+  if (request->hasHeader(T_Last_Event_ID)) {
+    _lastId = atoi(request->getHeader(T_Last_Event_ID)->value().c_str());
+  }
 
   _client->setRxTimeout(0);
   _client->onError(NULL, NULL);
-  _client->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ (void)c; ((AsyncEventSourceClient*)(r))->_onAck(len, time); }, this);
-  _client->onPoll([](void *r, AsyncClient* c){ (void)c; ((AsyncEventSourceClient*)(r))->_onPoll(); }, this);
+  _client->onAck(
+    [](void *r, AsyncClient *c, size_t len, uint32_t time) {
+      (void)c;
+      static_cast(r)->_onAck(len, time);
+    },
+    this
+  );
+  _client->onPoll(
+    [](void *r, AsyncClient *c) {
+      (void)c;
+      static_cast(r)->_onPoll();
+    },
+    this
+  );
   _client->onData(NULL, NULL);
-  _client->onTimeout([this](void *r, AsyncClient* c __attribute__((unused)), uint32_t time){ ((AsyncEventSourceClient*)(r))->_onTimeout(time); }, this);
-  _client->onDisconnect([this](void *r, AsyncClient* c){ ((AsyncEventSourceClient*)(r))->_onDisconnect(); delete c; }, this);
+  _client->onTimeout(
+    [this](void *r, AsyncClient *c __attribute__((unused)), uint32_t time) {
+      static_cast(r)->_onTimeout(time);
+    },
+    this
+  );
+  _client->onDisconnect(
+    [this](void *r, AsyncClient *c) {
+      static_cast(r)->_onDisconnect();
+      delete c;
+    },
+    this
+  );
 
   _server->_addClient(this);
   delete request;
@@ -184,250 +191,317 @@ AsyncEventSourceClient::AsyncEventSourceClient(AsyncWebServerRequest *request, A
   _client->setNoDelay(true);
 }
 
-AsyncEventSourceClient::~AsyncEventSourceClient(){
-   _messageQueue.free();
+AsyncEventSourceClient::~AsyncEventSourceClient() {
+#ifdef ESP32
+  std::lock_guard lock(_lockmq);
+#endif
+  _messageQueue.clear();
   close();
 }
 
-void AsyncEventSourceClient::_queueMessage(AsyncEventSourceMessage *dataMessage){
-  if(!_tryQueueMessage(dataMessage)){
-      ets_printf("AsyncEventSourceClient: ERROR: Queue is full, communications too slow, dropping event");
+bool AsyncEventSourceClient::_queueMessage(const char *message, size_t len) {
+  if (_messageQueue.size() >= SSE_MAX_QUEUED_MESSAGES) {
+#ifdef ESP8266
+    ets_printf(String(F("ERROR: Too many messages queued\n")).c_str());
+#elif defined(ESP32)
+    log_e("Event message queue overflow: discard message");
+#endif
+    return false;
   }
-}
 
-bool AsyncEventSourceClient::_tryQueueMessage(AsyncEventSourceMessage *dataMessage){
-  if(dataMessage == NULL)
-    return true;
-  if(!connected()){
-    delete dataMessage;
-    return true;
-  }
-  bool ret = true;
-  if(_messageQueue.length() >= SSE_MAX_QUEUED_MESSAGES){
-      delete dataMessage;
-      ret = false;
-  } else {
-      _messageQueue.add(dataMessage);
-  }
-  if(_client->canSend())
+#ifdef ESP32
+  // length() is not thread-safe, thus acquiring the lock before this call..
+  std::lock_guard lock(_lockmq);
+#endif
+
+  _messageQueue.emplace_back(message, len);
+
+  /*
+    throttle queue run
+    if Q is filled for >25% then network/CPU is congested, since there is no zero-copy mode for socket buff
+    forcing Q run will only eat more heap ram and blow the buffer, let's just keep data in our own queue
+    the queue will be processed at least on each onAck()/onPoll() call from AsyncTCP
+  */
+  if (_messageQueue.size() < SSE_MAX_QUEUED_MESSAGES >> 2 && _client->canSend()) {
     _runQueue();
-  return ret;
-}
+  }
 
-void AsyncEventSourceClient::_onAck(size_t len, uint32_t time){
-  _runQueue();
+  return true;
 }
 
-void AsyncEventSourceClient::_onPoll(){
-  if(!_messageQueue.isEmpty()){
+bool AsyncEventSourceClient::_queueMessage(AsyncEvent_SharedData_t &&msg) {
+  if (_messageQueue.size() >= SSE_MAX_QUEUED_MESSAGES) {
+#ifdef ESP8266
+    ets_printf(String(F("ERROR: Too many messages queued\n")).c_str());
+#elif defined(ESP32)
+    log_e("Event message queue overflow: discard message");
+#endif
+    return false;
+  }
+
+#ifdef ESP32
+  // length() is not thread-safe, thus acquiring the lock before this call..
+  std::lock_guard lock(_lockmq);
+#endif
+
+  _messageQueue.emplace_back(std::move(msg));
+
+  /*
+    throttle queue run
+    if Q is filled for >25% then network/CPU is congested, since there is no zero-copy mode for socket buff
+    forcing Q run will only eat more heap ram and blow the buffer, let's just keep data in our own queue
+    the queue will be processed at least on each onAck()/onPoll() call from AsyncTCP
+  */
+  if (_messageQueue.size() < SSE_MAX_QUEUED_MESSAGES >> 2 && _client->canSend()) {
     _runQueue();
   }
+  return true;
 }
 
+void AsyncEventSourceClient::_onAck(size_t len __attribute__((unused)), uint32_t time __attribute__((unused))) {
+#ifdef ESP32
+  // Same here, acquiring the lock early
+  std::lock_guard lock(_lockmq);
+#endif
 
-void AsyncEventSourceClient::_onTimeout(uint32_t time __attribute__((unused))){
-  _client->close(true);
-}
+  // adjust in-flight len
+  if (len < _inflight) {
+    _inflight -= len;
+  } else {
+    _inflight = 0;
+  }
 
-void AsyncEventSourceClient::_onDisconnect(){
-  _client = NULL;
-  _server->_handleDisconnect(this);
+  // acknowledge as much messages's data as we got confirmed len from a AsyncTCP
+  while (len && _messageQueue.size()) {
+    len = _messageQueue.front().ack(len);
+    if (_messageQueue.front().finished()) {
+      // now we could release full ack'ed messages, we were keeping it unless send confirmed from AsyncTCP
+      _messageQueue.pop_front();
+    }
+  }
+
+  // try to send another batch of data
+  if (_messageQueue.size()) {
+    _runQueue();
+  }
 }
 
-void AsyncEventSourceClient::close(){
-  if(_client != NULL)
-    _client->close();
+void AsyncEventSourceClient::_onPoll() {
+  if (_messageQueue.size()) {
+#ifdef ESP32
+    // Same here, acquiring the lock early
+    std::lock_guard lock(_lockmq);
+#endif
+    _runQueue();
+  }
 }
 
-void AsyncEventSourceClient::write(const char * message, size_t len){
-  try_write(message, len);
+void AsyncEventSourceClient::_onTimeout(uint32_t time __attribute__((unused))) {
+  if (_client) {
+    _client->close(true);
+  }
 }
 
-bool AsyncEventSourceClient::try_write(const char * message, size_t len){
-  return _tryQueueMessage(new AsyncEventSourceMessage(message, len));
+void AsyncEventSourceClient::_onDisconnect() {
+  if (!_client) {
+    return;
+  }
+  _client = nullptr;
+  _server->_handleDisconnect(this);
 }
 
-void AsyncEventSourceClient::send(const char *message, const char *event, uint32_t id, uint32_t reconnect){
-  String ev = generateEventMessage(message, event, id, reconnect);
-  _queueMessage(new AsyncEventSourceMessage(ev.c_str(), ev.length()));
+void AsyncEventSourceClient::close() {
+  if (_client) {
+    _client->close();
+  }
 }
 
-void AsyncEventSourceClient::_runQueue(){
-#if defined(ESP32)
-  if(!this->_messageQueue_mutex.try_lock()) {
-    return;
+bool AsyncEventSourceClient::send(const char *message, const char *event, uint32_t id, uint32_t reconnect) {
+  if (!connected()) {
+    return false;
   }
-#else
-  if(this->_messageQueue_processing){
+  return _queueMessage(std::make_shared(generateEventMessage(message, event, id, reconnect)));
+}
+
+void AsyncEventSourceClient::_runQueue() {
+  if (!_client) {
     return;
   }
-  this->_messageQueue_processing = true;
-#endif // ESP32
 
+  // there is no need to lock the mutex here, 'cause all the calls to this method must be already lock'ed
   size_t total_bytes_written = 0;
-  for(auto i = _messageQueue.begin(); i != _messageQueue.end(); ++i)
-  {
-    if(!(*i)->sent()) {
-      size_t bytes_written = (*i)->write_buffer(_client);
+  for (auto i = _messageQueue.begin(); i != _messageQueue.end(); ++i) {
+    if (!i->sent()) {
+      const size_t bytes_written = i->write(_client);
       total_bytes_written += bytes_written;
-      if(bytes_written == 0)
+      _inflight += bytes_written;
+      if (bytes_written == 0 || _inflight > _max_inflight) {
+        // Serial.print("_");
         break;
+      }
     }
   }
-  if(total_bytes_written > 0)
-    _client->send();
 
-  size_t len = total_bytes_written;
-  while(len && !_messageQueue.isEmpty()){
-    len = _messageQueue.front()->ack(len);
-    if(_messageQueue.front()->finished()){
-      _messageQueue.remove(_messageQueue.front());
-    }
+  // flush socket
+  if (total_bytes_written) {
+    _client->send();
   }
-
-#if defined(ESP32)
-  this->_messageQueue_mutex.unlock();
-#else
-  this->_messageQueue_processing = false;
-#endif // ESP32
 }
 
-
-// Handler
-
-AsyncEventSource::AsyncEventSource(const String& url)
-  : _url(url)
-  , _clients(LinkedList([](AsyncEventSourceClient *c){ delete c; }))
-  , _connectcb(NULL)
-  , _connectcb2(NULL)
-  , _disconnectcb(NULL)
-{}
-
-AsyncEventSource::~AsyncEventSource(){
-  close();
-}
-
-void AsyncEventSource::onConnect(ArEventHandlerFunction cb){
-  _connectcb = cb;
+void AsyncEventSourceClient::set_max_inflight_bytes(size_t value) {
+  if (value >= SSE_MIN_INFLIGH && value <= SSE_MAX_INFLIGH) {
+    _max_inflight = value;
+  }
 }
 
-void AsyncEventSource::onConnect(ArEventHandlerFunction2 cb){
-  _connectcb2 = cb;
-}
+/*  AsyncEventSource  */
 
-void AsyncEventSource::onDisconnect(ArEventHandlerFunction2 cb){
-  _disconnectcb = cb;
+void AsyncEventSource::authorizeConnect(ArAuthorizeConnectHandler cb) {
+  AsyncAuthorizationMiddleware *m = new AsyncAuthorizationMiddleware(401, cb);
+  m->_freeOnRemoval = true;
+  addMiddleware(m);
 }
 
-void AsyncEventSource::_addClient(AsyncEventSourceClient * client){
-  /*char * temp = (char *)malloc(2054);
-  if(temp != NULL){
-    memset(temp+1,' ',2048);
-    temp[0] = ':';
-    temp[2049] = '\r';
-    temp[2050] = '\n';
-    temp[2051] = '\r';
-    temp[2052] = '\n';
-    temp[2053] = 0;
-    client->write((const char *)temp, 2053);
-    free(temp);
-  }*/
-
-  _clients.add(client);
-  if(_connectcb)
+void AsyncEventSource::_addClient(AsyncEventSourceClient *client) {
+  if (!client) {
+    return;
+  }
+#ifdef ESP32
+  std::lock_guard lock(_client_queue_lock);
+#endif
+  _clients.emplace_back(client);
+  if (_connectcb) {
     _connectcb(client);
-  if(_connectcb2)
-    _connectcb2(this, client);
-}
+  }
 
-void AsyncEventSource::_handleDisconnect(AsyncEventSourceClient * client){
-  _clients.remove(client);
-  if(_disconnectcb)
-    _disconnectcb(this, client);
+  _adjust_inflight_window();
 }
 
-void AsyncEventSource::close(){
-  for(const auto &c: _clients){
-    if(c->connected())
+void AsyncEventSource::_handleDisconnect(AsyncEventSourceClient *client) {
+  if (_disconnectcb) {
+    _disconnectcb(client);
+  }
+#ifdef ESP32
+  std::lock_guard lock(_client_queue_lock);
+#endif
+  for (auto i = _clients.begin(); i != _clients.end(); ++i) {
+    if (i->get() == client) {
+      _clients.erase(i);
+      break;
+    }
+  }
+  _adjust_inflight_window();
+}
+
+void AsyncEventSource::close() {
+  // While the whole loop is not done, the linked list is locked and so the
+  // iterator should remain valid even when AsyncEventSource::_handleDisconnect()
+  // is called very early
+#ifdef ESP32
+  std::lock_guard lock(_client_queue_lock);
+#endif
+  for (const auto &c : _clients) {
+    if (c->connected()) {
+      /**
+       * @brief: Fix self-deadlock by using recursive_mutex instead.
+       * Due to c->close() shall call the callback function _onDisconnect()
+       * The calling flow _onDisconnect() --> _handleDisconnect() --> deadlock
+      */
       c->close();
+    }
   }
 }
 
 // pmb fix
 size_t AsyncEventSource::avgPacketsWaiting() const {
-  if(_clients.isEmpty())
+  size_t aql = 0;
+  uint32_t nConnectedClients = 0;
+#ifdef ESP32
+  std::lock_guard lock(_client_queue_lock);
+#endif
+  if (!_clients.size()) {
     return 0;
+  }
 
-  size_t    aql=0;
-  uint32_t  nConnectedClients=0;
-
-  for(const auto &c: _clients){
-    if(c->connected()) {
-      aql+=c->packetsWaiting();
+  for (const auto &c : _clients) {
+    if (c->connected()) {
+      aql += c->packetsWaiting();
       ++nConnectedClients;
     }
   }
-//  return aql / nConnectedClients;
-  return ((aql) + (nConnectedClients/2))/(nConnectedClients); // round up
-}
-
-void AsyncEventSource::send(const char *message, const char *event, uint32_t id, uint32_t reconnect){
-  try_send(message, event, id, reconnect);
-}
-
-bool AsyncEventSource::try_send(const char *message, const char *event, uint32_t id, uint32_t reconnect){
-  String ev = generateEventMessage(message, event, id, reconnect);
-  bool succeeded = false;
-  for(const auto &c: _clients){
-    if(c->connected()) {
-      if(c->try_write(ev.c_str(), ev.length()))
-        succeeded = true;
+  return ((aql) + (nConnectedClients / 2)) / (nConnectedClients);  // round up
+}
+
+AsyncEventSource::SendStatus AsyncEventSource::send(const char *message, const char *event, uint32_t id, uint32_t reconnect) {
+  AsyncEvent_SharedData_t shared_msg = std::make_shared(generateEventMessage(message, event, id, reconnect));
+#ifdef ESP32
+  std::lock_guard lock(_client_queue_lock);
+#endif
+  size_t hits = 0;
+  size_t miss = 0;
+  for (const auto &c : _clients) {
+    if (c->write(shared_msg)) {
+      ++hits;
+    } else {
+      ++miss;
     }
   }
-  return succeeded;
+  return hits == 0 ? DISCARDED : (miss == 0 ? ENQUEUED : PARTIALLY_ENQUEUED);
 }
 
 size_t AsyncEventSource::count() const {
-  return _clients.count_if([](AsyncEventSourceClient *c){
-    return c->connected();
-  });
+#ifdef ESP32
+  std::lock_guard lock(_client_queue_lock);
+#endif
+  size_t n_clients{0};
+  for (const auto &i : _clients) {
+    if (i->connected()) {
+      ++n_clients;
+    }
+  }
+
+  return n_clients;
 }
 
-bool AsyncEventSource::canHandle(AsyncWebServerRequest *request){
-  if(request->method() != HTTP_GET || !request->url().equals(_url)) {
-    return false;
-  }
-  request->addInterestingHeader("Last-Event-ID");
-  return true;
+bool AsyncEventSource::canHandle(AsyncWebServerRequest *request) const {
+  return request->isSSE() && request->url().equals(_url);
 }
 
-void AsyncEventSource::handleRequest(AsyncWebServerRequest *request){
-  if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
-    return request->requestAuthentication();
+void AsyncEventSource::handleRequest(AsyncWebServerRequest *request) {
   request->send(new AsyncEventSourceResponse(this));
 }
 
-// Response
+void AsyncEventSource::_adjust_inflight_window() {
+  if (_clients.size()) {
+    size_t inflight = SSE_MAX_INFLIGH / _clients.size();
+    for (const auto &c : _clients) {
+      c->set_max_inflight_bytes(inflight);
+    }
+    // Serial.printf("adjusted inflight to: %u\n", inflight);
+  }
+}
+
+/*  Response  */
 
-AsyncEventSourceResponse::AsyncEventSourceResponse(AsyncEventSource *server){
+AsyncEventSourceResponse::AsyncEventSourceResponse(AsyncEventSource *server) {
   _server = server;
   _code = 200;
-  _contentType = "text/event-stream";
+  _contentType = T_text_event_stream;
   _sendContentLength = false;
-  addHeader("Cache-Control", "no-cache");
-  addHeader("Connection","keep-alive");
+  addHeader(T_Cache_Control, T_no_cache);
+  addHeader(T_Connection, T_keep_alive);
 }
 
-void AsyncEventSourceResponse::_respond(AsyncWebServerRequest *request){
-  String out = _assembleHead(request->version());
+void AsyncEventSourceResponse::_respond(AsyncWebServerRequest *request) {
+  String out;
+  _assembleHead(out, request->version());
   request->client()->write(out.c_str(), _headLength);
   _state = RESPONSE_WAIT_ACK;
 }
 
-size_t AsyncEventSourceResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time __attribute__((unused))){
-  if(len){
+size_t AsyncEventSourceResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time __attribute__((unused))) {
+  if (len) {
     new AsyncEventSourceClient(request, _server);
   }
   return 0;
 }
-
diff --git a/src/AsyncEventSource.h b/src/AsyncEventSource.h
index d9ac4078c..ccfda95e5 100644
--- a/src/AsyncEventSource.h
+++ b/src/AsyncEventSource.h
@@ -1,156 +1,325 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
 #ifndef ASYNCEVENTSOURCE_H_
 #define ASYNCEVENTSOURCE_H_
 
 #include 
-#include 
+
 #if defined(ESP32) || defined(LIBRETINY)
 #include 
-#else
-#include 
+#ifdef LIBRETINY
+#ifdef round
+#undef round
+#endif
 #endif
-
-#if defined(ESP32)
 #include 
-#endif // ESP32
-
 #ifndef SSE_MAX_QUEUED_MESSAGES
 #define SSE_MAX_QUEUED_MESSAGES 32
 #endif
+#define SSE_MIN_INFLIGH 2 * 1460   // allow 2 MSS packets
+#define SSE_MAX_INFLIGH 16 * 1024  // but no more than 16k, no need to blow it, since same data is kept in local Q
+#elif defined(ESP8266)
+#include 
+#ifndef SSE_MAX_QUEUED_MESSAGES
+#define SSE_MAX_QUEUED_MESSAGES 8
+#endif
+#define SSE_MIN_INFLIGH 2 * 1460  // allow 2 MSS packets
+#define SSE_MAX_INFLIGH 8 * 1024  // but no more than 8k, no need to blow it, since same data is kept in local Q
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#ifndef SSE_MAX_QUEUED_MESSAGES
+#define SSE_MAX_QUEUED_MESSAGES 32
+#endif
+#define SSE_MIN_INFLIGH 2 * 1460   // allow 2 MSS packets
+#define SSE_MAX_INFLIGH 16 * 1024  // but no more than 16k, no need to blow it, since same data is kept in local Q
+#endif
 
 #include 
 
-#include "AsyncWebSynchronization.h"
-
 #ifdef ESP8266
 #include 
-#ifdef CRYPTO_HASH_h // include Hash.h from espressif framework if the first include was from the crypto library
+#ifdef CRYPTO_HASH_h  // include Hash.h from espressif framework if the first include was from the crypto library
 #include <../src/Hash.h>
 #endif
 #endif
 
-#if defined(ESP32) || defined(LIBRETINY)
-#define DEFAULT_MAX_SSE_CLIENTS 8
-#else
-#define DEFAULT_MAX_SSE_CLIENTS 4
-#endif
-
 class AsyncEventSource;
 class AsyncEventSourceResponse;
 class AsyncEventSourceClient;
-typedef std::function ArEventHandlerFunction;
-typedef std::function ArEventHandlerFunction2;
+using ArEventHandlerFunction = std::function;
+using ArAuthorizeConnectHandler = ArAuthorizeFunction;
+// shared message object container
+using AsyncEvent_SharedData_t = std::shared_ptr;
 
+/**
+ * @brief Async Event Message container with shared message content data
+ *
+ */
 class AsyncEventSourceMessage {
-  private:
-    uint8_t * _data;
-    size_t _len;
-    size_t _sent;
-    //size_t _ack;
-    size_t _acked;
-  public:
-    AsyncEventSourceMessage(const char * data, size_t len);
-    ~AsyncEventSourceMessage();
-    size_t ack(size_t len, uint32_t time __attribute__((unused)));
-    size_t ack(size_t len);
-    size_t write_buffer(AsyncClient *client);
-    size_t send(AsyncClient *client);
-    bool finished(){ return _acked == _len; }
-    bool sent() { return _sent == _len; }
-};
 
-class AsyncEventSourceClient {
-  private:
-    AsyncClient *_client;
-    AsyncEventSource *_server;
-    uint32_t _lastId;
+private:
+  const AsyncEvent_SharedData_t _data;
+  size_t _sent{0};   // num of bytes already sent
+  size_t _acked{0};  // num of bytes acked
+
+public:
+  AsyncEventSourceMessage(AsyncEvent_SharedData_t data) : _data(data){};
 #if defined(ESP32)
-    std::mutex _messageQueue_mutex;
+  AsyncEventSourceMessage(const char *data, size_t len) : _data(std::make_shared(data, len)){};
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+  AsyncEventSourceMessage(const char *data, size_t len) : _data(std::make_shared()) {
+    if (data && len > 0) {
+      _data->concat(data, len);
+    }
+  };
 #else
-    bool _messageQueue_processing{false};
-#endif // ESP32
-    LinkedList _messageQueue;
-    void _queueMessage(AsyncEventSourceMessage *dataMessage);
-    bool _tryQueueMessage(AsyncEventSourceMessage *dataMessage);
-    void _runQueue();
-
-  public:
-
-    AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server);
-    ~AsyncEventSourceClient();
-
-    AsyncClient* client(){ return _client; }
-    void close();
-    void write(const char * message, size_t len);
-    bool try_write(const char * message, size_t len);
-    void send(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
-    bool connected() const { return (_client != NULL) && _client->connected(); }
-    uint32_t lastId() const { return _lastId; }
-    size_t  packetsWaiting() const { return _messageQueue.length(); }
-
-    //system callbacks (do not call)
-    void _onAck(size_t len, uint32_t time);
-    void _onPoll();
-    void _onTimeout(uint32_t time);
-    void _onDisconnect();
+  // esp8266's String does not have constructor with data/length arguments. Use a concat method here
+  AsyncEventSourceMessage(const char *data, size_t len) {
+    _data->concat(data, len);
+  };
+#endif
+
+  /**
+     * @brief acknowledge sending len bytes of data
+     * @note if num of bytes to ack is larger then the unacknowledged message length the number of carried over bytes are returned
+     *
+     * @param len bytes to acknowledge
+     * @param time
+     * @return size_t number of extra bytes carried over
+     */
+  size_t ack(size_t len, uint32_t time = 0);
+
+  /**
+     * @brief write message data to client's buffer
+     * @note this method does NOT call client's send
+     *
+     * @param client
+     * @return size_t number of bytes written
+     */
+  size_t write(AsyncClient *client);
+
+  /**
+     * @brief writes message data to client's buffer and calls client's send method
+     *
+     * @param client
+     * @return size_t returns num of bytes the clien was able to send()
+     */
+  size_t send(AsyncClient *client);
+
+  // returns true if full message's length were acked
+  bool finished() {
+    return _acked == _data->length();
+  }
+
+  /**
+     * @brief returns true if all data has been sent already
+     *
+     */
+  bool sent() {
+    return _sent == _data->length();
+  }
 };
 
-class AsyncEventSource: public AsyncWebHandler {
-  private:
-    String _url;
-    LinkedList _clients;
-    ArEventHandlerFunction _connectcb;
-    ArEventHandlerFunction2 _connectcb2;
-    ArEventHandlerFunction2 _disconnectcb;
-  public:
-    AsyncEventSource(const String& url);
-    ~AsyncEventSource();
-
-    const char * url() const { return _url.c_str(); }
-    void close();
-    void onConnect(ArEventHandlerFunction cb);
-    void onConnect(ArEventHandlerFunction2 cb);
-    void onDisconnect(ArEventHandlerFunction2 cb);
-    void send(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
-    bool try_send(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
-    size_t count() const; //number clinets connected
-    size_t  avgPacketsWaiting() const;
-
-    //system callbacks (do not call)
-    void _addClient(AsyncEventSourceClient * client);
-    void _handleDisconnect(AsyncEventSourceClient * client);
-    virtual bool canHandle(AsyncWebServerRequest *request) override final;
-    virtual void handleRequest(AsyncWebServerRequest *request) override final;
+/**
+ * @brief class holds a sse messages queue for a particular client's connection
+ *
+ */
+class AsyncEventSourceClient {
+private:
+  AsyncClient *_client;
+  AsyncEventSource *_server;
+  uint32_t _lastId{0};
+  size_t _inflight{0};                    // num of unacknowledged bytes that has been written to socket buffer
+  size_t _max_inflight{SSE_MAX_INFLIGH};  // max num of unacknowledged bytes that could be written to socket buffer
+  std::list _messageQueue;
+#ifdef ESP32
+  mutable std::recursive_mutex _lockmq;
+#endif
+  bool _queueMessage(const char *message, size_t len);
+  bool _queueMessage(AsyncEvent_SharedData_t &&msg);
+  void _runQueue();
+
+public:
+  AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server);
+  ~AsyncEventSourceClient();
+
+  /**
+     * @brief Send an SSE message to client
+     * it will craft an SSE message and place it to client's message queue
+     *
+     * @param message body string, could be single or multi-line string sepprated by \n, \r, \r\n
+     * @param event body string, a sinle line string
+     * @param id sequence id
+     * @param reconnect client's reconnect timeout
+     * @return true if message was placed in a queue
+     * @return false if queue is full
+     */
+  bool send(const char *message, const char *event = NULL, uint32_t id = 0, uint32_t reconnect = 0);
+  bool send(const String &message, const String &event, uint32_t id = 0, uint32_t reconnect = 0) {
+    return send(message.c_str(), event.c_str(), id, reconnect);
+  }
+  bool send(const String &message, const char *event, uint32_t id = 0, uint32_t reconnect = 0) {
+    return send(message.c_str(), event, id, reconnect);
+  }
+
+  /**
+     * @brief place supplied preformatted SSE message to the message queue
+     * @note message must a properly formatted SSE string according to https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events
+     *
+     * @param message data
+     * @return true on success
+     * @return false on queue overflow or no client connected
+     */
+  bool write(AsyncEvent_SharedData_t message) {
+    return connected() && _queueMessage(std::move(message));
+  };
+
+  [[deprecated("Use _write(AsyncEvent_SharedData_t message) instead to share same data with multiple SSE clients")]]
+  bool write(const char *message, size_t len) {
+    return connected() && _queueMessage(message, len);
+  };
+
+  // close client's connection
+  void close();
+
+  // getters
+
+  AsyncClient *client() {
+    return _client;
+  }
+  bool connected() const {
+    return _client && _client->connected();
+  }
+  uint32_t lastId() const {
+    return _lastId;
+  }
+  size_t packetsWaiting() const {
+    return _messageQueue.size();
+  };
+
+  /**
+     * @brief Sets max amount of bytes that could be written to client's socket while awaiting delivery acknowledge
+     * used to throttle message delivery length to tradeoff memory consumption
+     * @note actual amount of data written could possible be a bit larger but no more than available socket buff space
+     *
+     * @param value
+     */
+  void set_max_inflight_bytes(size_t value);
+
+  /**
+     * @brief Get current max inflight bytes value
+     *
+     * @return size_t
+     */
+  size_t get_max_inflight_bytes() const {
+    return _max_inflight;
+  }
+
+  // system callbacks (do not call if from user code!)
+  void _onAck(size_t len, uint32_t time);
+  void _onPoll();
+  void _onTimeout(uint32_t time);
+  void _onDisconnect();
 };
 
-class AsyncEventSourceResponse: public AsyncWebServerResponse {
-  private:
-    String _content;
-    AsyncEventSource *_server;
-  public:
-    AsyncEventSourceResponse(AsyncEventSource *server);
-    void _respond(AsyncWebServerRequest *request);
-    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
-    bool _sourceValid() const { return true; }
+/**
+ * @brief a class that maintains all connected HTTP clients subscribed to SSE delivery
+ * dispatches supplied messages to the client's queues
+ *
+ */
+class AsyncEventSource : public AsyncWebHandler {
+private:
+  String _url;
+  std::list> _clients;
+#ifdef ESP32
+  // Same as for individual messages, protect mutations of _clients list
+  // since simultaneous access from different tasks is possible
+  mutable std::recursive_mutex _client_queue_lock;
+#endif
+  ArEventHandlerFunction _connectcb = nullptr;
+  ArEventHandlerFunction _disconnectcb = nullptr;
+
+  // this method manipulates in-fligh data size for connected client depending on number of active connections
+  void _adjust_inflight_window();
+
+public:
+  typedef enum {
+    DISCARDED = 0,
+    ENQUEUED = 1,
+    PARTIALLY_ENQUEUED = 2,
+  } SendStatus;
+
+  AsyncEventSource(const char *url) : _url(url){};
+  AsyncEventSource(const String &url) : _url(url){};
+  ~AsyncEventSource() {
+    close();
+  };
+
+  const char *url() const {
+    return _url.c_str();
+  }
+  // close all connected clients
+  void close();
+
+  /**
+     * @brief set on-connect callback for the client
+     * used to deliver messages to client on first connect
+     *
+     * @param cb
+     */
+  void onConnect(ArEventHandlerFunction cb) {
+    _connectcb = cb;
+  }
+
+  /**
+     * @brief Send an SSE message to client
+     * it will craft an SSE message and place it to all connected client's message queues
+     *
+     * @param message body string, could be single or multi-line string sepprated by \n, \r, \r\n
+     * @param event body string, a sinle line string
+     * @param id sequence id
+     * @param reconnect client's reconnect timeout
+     * @return SendStatus if message was placed in any/all/part of the client's queues
+     */
+  SendStatus send(const char *message, const char *event = NULL, uint32_t id = 0, uint32_t reconnect = 0);
+  SendStatus send(const String &message, const String &event, uint32_t id = 0, uint32_t reconnect = 0) {
+    return send(message.c_str(), event.c_str(), id, reconnect);
+  }
+  SendStatus send(const String &message, const char *event, uint32_t id = 0, uint32_t reconnect = 0) {
+    return send(message.c_str(), event, id, reconnect);
+  }
+
+  // The client pointer sent to the callback is only for reference purposes. DO NOT CALL ANY METHOD ON IT !
+  void onDisconnect(ArEventHandlerFunction cb) {
+    _disconnectcb = cb;
+  }
+  void authorizeConnect(ArAuthorizeConnectHandler cb);
+
+  // returns number of connected clients
+  size_t count() const;
+
+  // returns average number of messages pending in all client's queues
+  size_t avgPacketsWaiting() const;
+
+  // system callbacks (do not call from user code!)
+  void _addClient(AsyncEventSourceClient *client);
+  void _handleDisconnect(AsyncEventSourceClient *client);
+  bool canHandle(AsyncWebServerRequest *request) const override final;
+  void handleRequest(AsyncWebServerRequest *request) override final;
 };
 
+class AsyncEventSourceResponse : public AsyncWebServerResponse {
+private:
+  AsyncEventSource *_server;
+
+public:
+  AsyncEventSourceResponse(AsyncEventSource *server);
+  void _respond(AsyncWebServerRequest *request);
+  size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
+  bool _sourceValid() const {
+    return true;
+  }
+};
 
 #endif /* ASYNCEVENTSOURCE_H_ */
diff --git a/src/AsyncJson.cpp b/src/AsyncJson.cpp
new file mode 100644
index 000000000..8381f75ed
--- /dev/null
+++ b/src/AsyncJson.cpp
@@ -0,0 +1,191 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+#include "AsyncJson.h"
+
+#if ASYNC_JSON_SUPPORT == 1
+
+#if ARDUINOJSON_VERSION_MAJOR == 5
+AsyncJsonResponse::AsyncJsonResponse(bool isArray) : _isValid{false} {
+  _code = 200;
+  _contentType = asyncsrv::T_application_json;
+  if (isArray) {
+    _root = _jsonBuffer.createArray();
+  } else {
+    _root = _jsonBuffer.createObject();
+  }
+}
+#elif ARDUINOJSON_VERSION_MAJOR == 6
+AsyncJsonResponse::AsyncJsonResponse(bool isArray, size_t maxJsonBufferSize) : _jsonBuffer(maxJsonBufferSize), _isValid{false} {
+  _code = 200;
+  _contentType = asyncsrv::T_application_json;
+  if (isArray) {
+    _root = _jsonBuffer.createNestedArray();
+  } else {
+    _root = _jsonBuffer.createNestedObject();
+  }
+}
+#else
+AsyncJsonResponse::AsyncJsonResponse(bool isArray) : _isValid{false} {
+  _code = 200;
+  _contentType = asyncsrv::T_application_json;
+  if (isArray) {
+    _root = _jsonBuffer.add();
+  } else {
+    _root = _jsonBuffer.add();
+  }
+}
+#endif
+
+size_t AsyncJsonResponse::setLength() {
+#if ARDUINOJSON_VERSION_MAJOR == 5
+  _contentLength = _root.measureLength();
+#else
+  _contentLength = measureJson(_root);
+#endif
+  if (_contentLength) {
+    _isValid = true;
+  }
+  return _contentLength;
+}
+
+size_t AsyncJsonResponse::_fillBuffer(uint8_t *data, size_t len) {
+  ChunkPrint dest(data, _sentLength, len);
+#if ARDUINOJSON_VERSION_MAJOR == 5
+  _root.printTo(dest);
+#else
+  serializeJson(_root, dest);
+#endif
+  return len;
+}
+
+#if ARDUINOJSON_VERSION_MAJOR == 6
+PrettyAsyncJsonResponse::PrettyAsyncJsonResponse(bool isArray, size_t maxJsonBufferSize) : AsyncJsonResponse{isArray, maxJsonBufferSize} {}
+#else
+PrettyAsyncJsonResponse::PrettyAsyncJsonResponse(bool isArray) : AsyncJsonResponse{isArray} {}
+#endif
+
+size_t PrettyAsyncJsonResponse::setLength() {
+#if ARDUINOJSON_VERSION_MAJOR == 5
+  _contentLength = _root.measurePrettyLength();
+#else
+  _contentLength = measureJsonPretty(_root);
+#endif
+  if (_contentLength) {
+    _isValid = true;
+  }
+  return _contentLength;
+}
+
+size_t PrettyAsyncJsonResponse::_fillBuffer(uint8_t *data, size_t len) {
+  ChunkPrint dest(data, _sentLength, len);
+#if ARDUINOJSON_VERSION_MAJOR == 5
+  _root.prettyPrintTo(dest);
+#else
+  serializeJsonPretty(_root, dest);
+#endif
+  return len;
+}
+
+#if ARDUINOJSON_VERSION_MAJOR == 6
+AsyncCallbackJsonWebHandler::AsyncCallbackJsonWebHandler(const String &uri, ArJsonRequestHandlerFunction onRequest, size_t maxJsonBufferSize)
+  : _uri(uri), _method(HTTP_GET | HTTP_POST | HTTP_PUT | HTTP_PATCH), _onRequest(onRequest), maxJsonBufferSize(maxJsonBufferSize), _maxContentLength(16384) {}
+#else
+AsyncCallbackJsonWebHandler::AsyncCallbackJsonWebHandler(const String &uri, ArJsonRequestHandlerFunction onRequest)
+  : _uri(uri), _method(HTTP_GET | HTTP_POST | HTTP_PUT | HTTP_PATCH), _onRequest(onRequest), _maxContentLength(16384) {}
+#endif
+
+bool AsyncCallbackJsonWebHandler::canHandle(AsyncWebServerRequest *request) const {
+  if (!_onRequest || !request->isHTTP() || !(_method & request->method())) {
+    return false;
+  }
+
+  if (_uri.length() && (_uri != request->url() && !request->url().startsWith(_uri + "/"))) {
+    return false;
+  }
+
+  if (request->method() != HTTP_GET && !request->contentType().equalsIgnoreCase(asyncsrv::T_application_json)) {
+    return false;
+  }
+
+  return true;
+}
+
+void AsyncCallbackJsonWebHandler::handleRequest(AsyncWebServerRequest *request) {
+  if (_onRequest) {
+    // GET request:
+    if (request->method() == HTTP_GET) {
+      JsonVariant json;
+      _onRequest(request, json);
+      return;
+    }
+
+    // POST / PUT / ... requests:
+    // check if JSON body is too large, if it is, don't deserialize
+    if (request->contentLength() > _maxContentLength) {
+#ifdef ESP32
+      log_e("Content length exceeds maximum allowed");
+#endif
+      request->send(413);
+      return;
+    }
+
+    if (request->_tempObject == NULL) {
+      // there is no body
+      request->send(400);
+      return;
+    }
+
+#if ARDUINOJSON_VERSION_MAJOR == 5
+    DynamicJsonBuffer jsonBuffer;
+    JsonVariant json = jsonBuffer.parse((const char *)request->_tempObject);
+    if (json.success()) {
+#elif ARDUINOJSON_VERSION_MAJOR == 6
+    DynamicJsonDocument jsonBuffer(this->maxJsonBufferSize);
+    DeserializationError error = deserializeJson(jsonBuffer, (const char *)request->_tempObject);
+    if (!error) {
+      JsonVariant json = jsonBuffer.as();
+#else
+    JsonDocument jsonBuffer;
+    DeserializationError error = deserializeJson(jsonBuffer, (const char *)request->_tempObject);
+    if (!error) {
+      JsonVariant json = jsonBuffer.as();
+#endif
+
+      _onRequest(request, json);
+    } else {
+      // error parsing the body
+      request->send(400);
+    }
+  }
+}
+
+void AsyncCallbackJsonWebHandler::handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {
+  if (_onRequest) {
+    // ignore callback if size is larger than maxContentLength
+    if (total > _maxContentLength) {
+      return;
+    }
+
+    if (index == 0) {
+      // this check allows request->_tempObject to be initialized from a middleware
+      if (request->_tempObject == NULL) {
+        request->_tempObject = calloc(total + 1, sizeof(uint8_t));  // null-terminated string
+        if (request->_tempObject == NULL) {
+#ifdef ESP32
+          log_e("Failed to allocate");
+#endif
+          request->abort();
+          return;
+        }
+      }
+    }
+
+    if (request->_tempObject != NULL) {
+      uint8_t *buffer = (uint8_t *)request->_tempObject;
+      memcpy(buffer + index, data, len);
+    }
+  }
+}
+
+#endif  // ASYNC_JSON_SUPPORT
diff --git a/src/AsyncJson.h b/src/AsyncJson.h
index 2fa6a2d26..2194069d1 100644
--- a/src/AsyncJson.h
+++ b/src/AsyncJson.h
@@ -1,254 +1,118 @@
-// AsyncJson.h
-/*
-  Async Response to use with ArduinoJson and AsyncWebServer
-  Written by Andrew Melvin (SticilFace) with help from me-no-dev and BBlanchon.
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
-  Example of callback in use
-
-   server.on("/json", HTTP_ANY, [](AsyncWebServerRequest * request) {
-
-    AsyncJsonResponse * response = new AsyncJsonResponse();
-    JsonObject& root = response->getRoot();
-    root["key1"] = "key number one";
-    JsonObject& nested = root.createNestedObject("nested");
-    nested["key1"] = "key number one";
-
-    response->setLength();
-    request->send(response);
-  });
-
-  --------------------
-
-  Async Request to use with ArduinoJson and AsyncWebServer
-  Written by Arsène von Wyss (avonwyss)
-
-  Example
-
-  AsyncCallbackJsonWebHandler* handler = new AsyncCallbackJsonWebHandler("/rest/endpoint");
-  handler->onRequest([](AsyncWebServerRequest *request, JsonVariant &json) {
-    JsonObject& jsonObj = json.as();
-    // ...
-  });
-  server.addHandler(handler);
-  
-*/
 #ifndef ASYNC_JSON_H_
 #define ASYNC_JSON_H_
-#include 
-#include 
-#include 
 
-#if ARDUINOJSON_VERSION_MAJOR == 5
-  #define ARDUINOJSON_5_COMPATIBILITY
+#if __has_include("ArduinoJson.h")
+#include 
+#if ARDUINOJSON_VERSION_MAJOR >= 5
+#define ASYNC_JSON_SUPPORT 1
 #else
-  #ifndef DYNAMIC_JSON_DOCUMENT_SIZE
-    #define DYNAMIC_JSON_DOCUMENT_SIZE  1024
-  #endif
-#endif
+#define ASYNC_JSON_SUPPORT 0
+#endif  // ARDUINOJSON_VERSION_MAJOR >= 5
+#endif  // __has_include("ArduinoJson.h")
 
-constexpr const char* JSON_MIMETYPE = "application/json";
-
-/*
- * Json Response
- * */
-
-class ChunkPrint : public Print {
-  private:
-    uint8_t* _destination;
-    size_t _to_skip;
-    size_t _to_write;
-    size_t _pos;
-  public:
-    ChunkPrint(uint8_t* destination, size_t from, size_t len)
-      : _destination(destination), _to_skip(from), _to_write(len), _pos{0} {}
-    virtual ~ChunkPrint(){}
-    size_t write(uint8_t c){
-      if (_to_skip > 0) {
-        _to_skip--;
-        return 1;
-      } else if (_to_write > 0) {
-        _to_write--;
-        _destination[_pos++] = c;
-        return 1;
-      }
-      return 0;
-    }
-    size_t write(const uint8_t *buffer, size_t size)
-    {
-      return this->Print::write(buffer, size);
-    }
-};
+#if ASYNC_JSON_SUPPORT == 1
+#include 
 
-class AsyncJsonResponse: public AsyncAbstractResponse {
-  protected:
+#include "ChunkPrint.h"
 
-#ifdef ARDUINOJSON_5_COMPATIBILITY
-    DynamicJsonBuffer _jsonBuffer;
-#else
-    DynamicJsonDocument _jsonBuffer;
+#if ARDUINOJSON_VERSION_MAJOR == 6
+#ifndef DYNAMIC_JSON_DOCUMENT_SIZE
+#define DYNAMIC_JSON_DOCUMENT_SIZE 1024
 #endif
-
-    JsonVariant _root;
-    bool _isValid;
-
-  public:    
-
-#ifdef ARDUINOJSON_5_COMPATIBILITY
-    AsyncJsonResponse(bool isArray=false): _isValid{false} {
-      _code = 200;
-      _contentType = JSON_MIMETYPE;
-      if(isArray)
-        _root = _jsonBuffer.createArray();
-      else
-        _root = _jsonBuffer.createObject();
-    }
-#else
-    AsyncJsonResponse(bool isArray=false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE) : _jsonBuffer(maxJsonBufferSize), _isValid{false} {
-      _code = 200;
-      _contentType = JSON_MIMETYPE;
-      if(isArray)
-        _root = _jsonBuffer.createNestedArray();
-      else
-        _root = _jsonBuffer.createNestedObject();
-    }
 #endif
 
-    ~AsyncJsonResponse() {}
-    JsonVariant & getRoot() { return _root; }
-    bool _sourceValid() const { return _isValid; }
-    size_t setLength() {
-
-#ifdef ARDUINOJSON_5_COMPATIBILITY      
-      _contentLength = _root.measureLength();
+class AsyncJsonResponse : public AsyncAbstractResponse {
+protected:
+#if ARDUINOJSON_VERSION_MAJOR == 5
+  DynamicJsonBuffer _jsonBuffer;
+#elif ARDUINOJSON_VERSION_MAJOR == 6
+  DynamicJsonDocument _jsonBuffer;
 #else
-      _contentLength = measureJson(_root);
+  JsonDocument _jsonBuffer;
 #endif
 
-      if (_contentLength) { _isValid = true; }
-      return _contentLength;
-    }
-
-   size_t getSize() { return _jsonBuffer.size(); }
-
-    size_t _fillBuffer(uint8_t *data, size_t len){
-      ChunkPrint dest(data, _sentLength, len);
+  JsonVariant _root;
+  bool _isValid;
 
-#ifdef ARDUINOJSON_5_COMPATIBILITY      
-      _root.printTo( dest ) ;
+public:
+#if ARDUINOJSON_VERSION_MAJOR == 6
+  AsyncJsonResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE);
 #else
-      serializeJson(_root, dest);
+  AsyncJsonResponse(bool isArray = false);
+#endif
+  JsonVariant &getRoot() {
+    return _root;
+  }
+  bool _sourceValid() const {
+    return _isValid;
+  }
+  size_t setLength();
+  size_t getSize() const {
+    return _jsonBuffer.size();
+  }
+  size_t _fillBuffer(uint8_t *data, size_t len);
+#if ARDUINOJSON_VERSION_MAJOR >= 6
+  bool overflowed() const {
+    return _jsonBuffer.overflowed();
+  }
 #endif
-      return len;
-    }
 };
 
-class PrettyAsyncJsonResponse: public AsyncJsonResponse {	
+class PrettyAsyncJsonResponse : public AsyncJsonResponse {
 public:
-#ifdef ARDUINOJSON_5_COMPATIBILITY
-	PrettyAsyncJsonResponse (bool isArray=false) : AsyncJsonResponse{isArray} {}
+#if ARDUINOJSON_VERSION_MAJOR == 6
+  PrettyAsyncJsonResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE);
 #else
-	PrettyAsyncJsonResponse (bool isArray=false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE) : AsyncJsonResponse{isArray, maxJsonBufferSize} {}
+  PrettyAsyncJsonResponse(bool isArray = false);
 #endif
-	size_t setLength () {
-#ifdef ARDUINOJSON_5_COMPATIBILITY
-		_contentLength = _root.measurePrettyLength ();
-#else
-		_contentLength = measureJsonPretty(_root);
-#endif
-		if (_contentLength) {_isValid = true;}
-		return _contentLength;
-	}
-	size_t _fillBuffer (uint8_t *data, size_t len) {
-		ChunkPrint dest (data, _sentLength, len);
-#ifdef ARDUINOJSON_5_COMPATIBILITY
-		_root.prettyPrintTo (dest);
-#else
-		serializeJsonPretty(_root, dest);
-#endif
-		return len;
-	}
+  size_t setLength();
+  size_t _fillBuffer(uint8_t *data, size_t len);
 };
 
 typedef std::function ArJsonRequestHandlerFunction;
 
-class AsyncCallbackJsonWebHandler: public AsyncWebHandler {
-private:
+class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
 protected:
-  const String _uri;
+  String _uri;
   WebRequestMethodComposite _method;
   ArJsonRequestHandlerFunction _onRequest;
-  size_t _contentLength;
-#ifndef ARDUINOJSON_5_COMPATIBILITY   
-  const size_t maxJsonBufferSize;
+#if ARDUINOJSON_VERSION_MAJOR == 6
+  size_t maxJsonBufferSize;
 #endif
   size_t _maxContentLength;
+
 public:
-#ifdef ARDUINOJSON_5_COMPATIBILITY      
-  AsyncCallbackJsonWebHandler(const String& uri, ArJsonRequestHandlerFunction onRequest) 
-  : _uri(uri), _method(HTTP_POST|HTTP_PUT|HTTP_PATCH), _onRequest(onRequest), _maxContentLength(16384) {}
+#if ARDUINOJSON_VERSION_MAJOR == 6
+  AsyncCallbackJsonWebHandler(const String &uri, ArJsonRequestHandlerFunction onRequest = nullptr, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE);
 #else
-  AsyncCallbackJsonWebHandler(const String& uri, ArJsonRequestHandlerFunction onRequest, size_t maxJsonBufferSize=DYNAMIC_JSON_DOCUMENT_SIZE) 
-  : _uri(uri), _method(HTTP_POST|HTTP_PUT|HTTP_PATCH), _onRequest(onRequest), maxJsonBufferSize(maxJsonBufferSize), _maxContentLength(16384) {}
+  AsyncCallbackJsonWebHandler(const String &uri, ArJsonRequestHandlerFunction onRequest = nullptr);
 #endif
-  
-  void setMethod(WebRequestMethodComposite method){ _method = method; }
-  void setMaxContentLength(int maxContentLength){ _maxContentLength = maxContentLength; }
-  void onRequest(ArJsonRequestHandlerFunction fn){ _onRequest = fn; }
-
-  virtual bool canHandle(AsyncWebServerRequest *request) override final{
-    if(!_onRequest)
-      return false;
 
-    if(!(_method & request->method()))
-      return false;
-
-    if(_uri.length() && (_uri != request->url() && !request->url().startsWith(_uri+"/")))
-      return false;
-
-    if ( !request->contentType().equalsIgnoreCase(JSON_MIMETYPE) )
-      return false;
-
-    request->addInterestingHeader("ANY");
-    return true;
+  void setMethod(WebRequestMethodComposite method) {
+    _method = method;
   }
-
-  virtual void handleRequest(AsyncWebServerRequest *request) override final {
-    if(_onRequest) {
-      if (request->_tempObject != NULL) {
-
-#ifdef ARDUINOJSON_5_COMPATIBILITY    
-        DynamicJsonBuffer jsonBuffer;
-        JsonVariant json = jsonBuffer.parse((uint8_t*)(request->_tempObject));
-        if (json.success()) {
-#else
-        DynamicJsonDocument jsonBuffer(this->maxJsonBufferSize);
-        DeserializationError error = deserializeJson(jsonBuffer, (uint8_t*)(request->_tempObject));
-        if(!error) {
-          JsonVariant json = jsonBuffer.as();
-#endif
-
-          _onRequest(request, json);
-          return;
-        }
-      }
-      request->send(_contentLength > _maxContentLength ? 413 : 400);
-    } else {
-      request->send(500);
-    }
+  void setMaxContentLength(int maxContentLength) {
+    _maxContentLength = maxContentLength;
   }
-  virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) override final {
+  void onRequest(ArJsonRequestHandlerFunction fn) {
+    _onRequest = fn;
   }
-  virtual void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) override final {
-    if (_onRequest) {
-      _contentLength = total;
-      if (total > 0 && request->_tempObject == NULL && total < _maxContentLength) {
-        request->_tempObject = malloc(total);
-      }
-      if (request->_tempObject != NULL) {
-        memcpy((uint8_t*)(request->_tempObject) + index, data, len);
-      }
-    }
+
+  bool canHandle(AsyncWebServerRequest *request) const override final;
+  void handleRequest(AsyncWebServerRequest *request) override final;
+  void handleUpload(
+    __unused AsyncWebServerRequest *request, __unused const String &filename, __unused size_t index, __unused uint8_t *data, __unused size_t len,
+    __unused bool final
+  ) override final {}
+  void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) override final;
+  bool isRequestHandlerTrivial() const override final {
+    return !_onRequest;
   }
-  virtual bool isRequestHandlerTrivial() override final {return _onRequest ? false : true;}
 };
-#endif
+
+#endif  // ASYNC_JSON_SUPPORT == 1
+
+#endif  // ASYNC_JSON_H_
diff --git a/src/AsyncMessagePack.cpp b/src/AsyncMessagePack.cpp
new file mode 100644
index 000000000..0c6faa107
--- /dev/null
+++ b/src/AsyncMessagePack.cpp
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+#include "AsyncMessagePack.h"
+
+#if ASYNC_MSG_PACK_SUPPORT == 1
+
+#if ARDUINOJSON_VERSION_MAJOR == 6
+AsyncMessagePackResponse::AsyncMessagePackResponse(bool isArray, size_t maxJsonBufferSize) : _jsonBuffer(maxJsonBufferSize), _isValid{false} {
+  _code = 200;
+  _contentType = asyncsrv::T_application_msgpack;
+  if (isArray) {
+    _root = _jsonBuffer.createNestedArray();
+  } else {
+    _root = _jsonBuffer.createNestedObject();
+  }
+}
+#else
+AsyncMessagePackResponse::AsyncMessagePackResponse(bool isArray) : _isValid{false} {
+  _code = 200;
+  _contentType = asyncsrv::T_application_msgpack;
+  if (isArray) {
+    _root = _jsonBuffer.add();
+  } else {
+    _root = _jsonBuffer.add();
+  }
+}
+#endif
+
+size_t AsyncMessagePackResponse::setLength() {
+  _contentLength = measureMsgPack(_root);
+  if (_contentLength) {
+    _isValid = true;
+  }
+  return _contentLength;
+}
+
+size_t AsyncMessagePackResponse::_fillBuffer(uint8_t *data, size_t len) {
+  ChunkPrint dest(data, _sentLength, len);
+  serializeMsgPack(_root, dest);
+  return len;
+}
+
+#if ARDUINOJSON_VERSION_MAJOR == 6
+AsyncCallbackMessagePackWebHandler::AsyncCallbackMessagePackWebHandler(
+  const String &uri, ArMessagePackRequestHandlerFunction onRequest, size_t maxJsonBufferSize
+)
+  : _uri(uri), _method(HTTP_GET | HTTP_POST | HTTP_PUT | HTTP_PATCH), _onRequest(onRequest), maxJsonBufferSize(maxJsonBufferSize), _maxContentLength(16384) {}
+#else
+AsyncCallbackMessagePackWebHandler::AsyncCallbackMessagePackWebHandler(const String &uri, ArMessagePackRequestHandlerFunction onRequest)
+  : _uri(uri), _method(HTTP_GET | HTTP_POST | HTTP_PUT | HTTP_PATCH), _onRequest(onRequest), _maxContentLength(16384) {}
+#endif
+
+bool AsyncCallbackMessagePackWebHandler::canHandle(AsyncWebServerRequest *request) const {
+  if (!_onRequest || !request->isHTTP() || !(_method & request->method())) {
+    return false;
+  }
+
+  if (_uri.length() && (_uri != request->url() && !request->url().startsWith(_uri + "/"))) {
+    return false;
+  }
+
+  if (request->method() != HTTP_GET && !request->contentType().equalsIgnoreCase(asyncsrv::T_application_msgpack)) {
+    return false;
+  }
+
+  return true;
+}
+
+void AsyncCallbackMessagePackWebHandler::handleRequest(AsyncWebServerRequest *request) {
+  if (_onRequest) {
+    if (request->method() == HTTP_GET) {
+      JsonVariant json;
+      _onRequest(request, json);
+      return;
+    } else if (request->_tempObject != NULL) {
+
+#if ARDUINOJSON_VERSION_MAJOR == 6
+      DynamicJsonDocument jsonBuffer(this->maxJsonBufferSize);
+      DeserializationError error = deserializeMsgPack(jsonBuffer, (uint8_t *)(request->_tempObject));
+      if (!error) {
+        JsonVariant json = jsonBuffer.as();
+#else
+      JsonDocument jsonBuffer;
+      DeserializationError error = deserializeMsgPack(jsonBuffer, (uint8_t *)(request->_tempObject));
+      if (!error) {
+        JsonVariant json = jsonBuffer.as();
+#endif
+
+        _onRequest(request, json);
+        return;
+      }
+    }
+    request->send(_contentLength > _maxContentLength ? 413 : 400);
+  } else {
+    request->send(500);
+  }
+}
+
+void AsyncCallbackMessagePackWebHandler::handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {
+  if (_onRequest) {
+    _contentLength = total;
+    if (total > 0 && request->_tempObject == NULL && total < _maxContentLength) {
+      request->_tempObject = malloc(total);
+      if (request->_tempObject == NULL) {
+#ifdef ESP32
+        log_e("Failed to allocate");
+#endif
+        request->abort();
+        return;
+      }
+    }
+    if (request->_tempObject != NULL) {
+      memcpy((uint8_t *)(request->_tempObject) + index, data, len);
+    }
+  }
+}
+
+#endif  // ASYNC_MSG_PACK_SUPPORT
diff --git a/src/AsyncMessagePack.h b/src/AsyncMessagePack.h
new file mode 100644
index 000000000..7488b5cba
--- /dev/null
+++ b/src/AsyncMessagePack.h
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+#pragma once
+
+/*
+   server.on("/msg_pack", HTTP_ANY, [](AsyncWebServerRequest * request) {
+    AsyncMessagePackResponse * response = new AsyncMessagePackResponse();
+    JsonObject& root = response->getRoot();
+    root["key1"] = "key number one";
+    JsonObject& nested = root.createNestedObject("nested");
+    nested["key1"] = "key number one";
+    response->setLength();
+    request->send(response);
+  });
+
+  --------------------
+
+  AsyncCallbackMessagePackWebHandler* handler = new AsyncCallbackMessagePackWebHandler("/msg_pack/endpoint");
+  handler->onRequest([](AsyncWebServerRequest *request, JsonVariant &json) {
+    JsonObject jsonObj = json.as();
+    // ...
+  });
+  server.addHandler(handler);
+*/
+
+#if __has_include("ArduinoJson.h")
+#include 
+#if ARDUINOJSON_VERSION_MAJOR >= 6
+#define ASYNC_MSG_PACK_SUPPORT 1
+#else
+#define ASYNC_MSG_PACK_SUPPORT 0
+#endif  // ARDUINOJSON_VERSION_MAJOR >= 6
+#endif  // __has_include("ArduinoJson.h")
+
+#if ASYNC_MSG_PACK_SUPPORT == 1
+#include 
+
+#include "ChunkPrint.h"
+
+#if ARDUINOJSON_VERSION_MAJOR == 6
+#ifndef DYNAMIC_JSON_DOCUMENT_SIZE
+#define DYNAMIC_JSON_DOCUMENT_SIZE 1024
+#endif
+#endif
+
+class AsyncMessagePackResponse : public AsyncAbstractResponse {
+protected:
+#if ARDUINOJSON_VERSION_MAJOR == 6
+  DynamicJsonDocument _jsonBuffer;
+#else
+  JsonDocument _jsonBuffer;
+#endif
+
+  JsonVariant _root;
+  bool _isValid;
+
+public:
+#if ARDUINOJSON_VERSION_MAJOR == 6
+  AsyncMessagePackResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE);
+#else
+  AsyncMessagePackResponse(bool isArray = false);
+#endif
+  JsonVariant &getRoot() {
+    return _root;
+  }
+  bool _sourceValid() const {
+    return _isValid;
+  }
+  size_t setLength();
+  size_t getSize() const {
+    return _jsonBuffer.size();
+  }
+  size_t _fillBuffer(uint8_t *data, size_t len);
+#if ARDUINOJSON_VERSION_MAJOR >= 6
+  bool overflowed() const {
+    return _jsonBuffer.overflowed();
+  }
+#endif
+};
+
+typedef std::function ArMessagePackRequestHandlerFunction;
+
+class AsyncCallbackMessagePackWebHandler : public AsyncWebHandler {
+protected:
+  String _uri;
+  WebRequestMethodComposite _method;
+  ArMessagePackRequestHandlerFunction _onRequest;
+  size_t _contentLength;
+#if ARDUINOJSON_VERSION_MAJOR == 6
+  size_t maxJsonBufferSize;
+#endif
+  size_t _maxContentLength;
+
+public:
+#if ARDUINOJSON_VERSION_MAJOR == 6
+  AsyncCallbackMessagePackWebHandler(
+    const String &uri, ArMessagePackRequestHandlerFunction onRequest = nullptr, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE
+  );
+#else
+  AsyncCallbackMessagePackWebHandler(const String &uri, ArMessagePackRequestHandlerFunction onRequest = nullptr);
+#endif
+
+  void setMethod(WebRequestMethodComposite method) {
+    _method = method;
+  }
+  void setMaxContentLength(int maxContentLength) {
+    _maxContentLength = maxContentLength;
+  }
+  void onRequest(ArMessagePackRequestHandlerFunction fn) {
+    _onRequest = fn;
+  }
+
+  bool canHandle(AsyncWebServerRequest *request) const override final;
+  void handleRequest(AsyncWebServerRequest *request) override final;
+  void handleUpload(
+    __unused AsyncWebServerRequest *request, __unused const String &filename, __unused size_t index, __unused uint8_t *data, __unused size_t len,
+    __unused bool final
+  ) override final {}
+  void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) override final;
+  bool isRequestHandlerTrivial() const override final {
+    return !_onRequest;
+  }
+};
+
+#endif  // ASYNC_MSG_PACK_SUPPORT == 1
diff --git a/src/AsyncWebHeader.cpp b/src/AsyncWebHeader.cpp
new file mode 100644
index 000000000..6e659e96b
--- /dev/null
+++ b/src/AsyncWebHeader.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+#include 
+
+const AsyncWebHeader AsyncWebHeader::parse(const char *data) {
+  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers
+  // In HTTP/1.X, a header is a case-insensitive name followed by a colon, then optional whitespace which will be ignored, and finally by its value
+  if (!data) {
+    return AsyncWebHeader();  // nullptr
+  }
+  if (data[0] == '\0') {
+    return AsyncWebHeader();  // empty string
+  }
+  if (strchr(data, '\n') || strchr(data, '\r')) {
+    return AsyncWebHeader();  // Invalid header format
+  }
+  char *colon = strchr(data, ':');
+  if (!colon) {
+    return AsyncWebHeader();  // separator not found
+  }
+  if (colon == data) {
+    return AsyncWebHeader();  // Header name cannot be empty
+  }
+  char *startOfValue = colon + 1;  // Skip the colon
+  // skip one optional whitespace after the colon
+  if (*startOfValue == ' ') {
+    startOfValue++;
+  }
+  String name;
+  name.reserve(colon - data);
+  name.concat(data, colon - data);
+  return AsyncWebHeader(name, String(startOfValue));
+}
diff --git a/src/AsyncWebServerRequest.cpp b/src/AsyncWebServerRequest.cpp
new file mode 100644
index 000000000..fbe662f72
--- /dev/null
+++ b/src/AsyncWebServerRequest.cpp
@@ -0,0 +1,85 @@
+#include 
+
+/**
+ * @brief Sends a file from the filesystem to the client, with optional gzip compression and ETag-based caching.
+ *
+ * This method serves files over HTTP from the provided filesystem. If a compressed version of the file
+ * (with a `.gz` extension) exists and uncompressed version does not exist, it serves the compressed file.
+ * It also handles ETag caching using the CRC32 value from the gzip trailer, responding with `304 Not Modified`
+ * if the client's `If-None-Match` header matches the generated ETag.
+ *
+ * @param fs Reference to the filesystem (SPIFFS, LittleFS, etc.).
+ * @param path Path to the file to be served.
+ * @param contentType Optional MIME type of the file to be sent.
+ *                    If contentType is "" it will be obtained from the file extension
+ * @param download If true, forces the file to be sent as a download.
+ * @param callback Optional template processor for dynamic content generation.
+ *                 Templates will not be processed in compressed files.
+ *
+ * @note If neither the file nor its compressed version exists, responds with `404 Not Found`.
+ */
+void AsyncWebServerRequest::send(FS &fs, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback) {
+  // Check uncompressed file first
+  if (fs.exists(path)) {
+    send(beginResponse(fs, path, contentType, download, callback));
+    return;
+  }
+
+  // Handle compressed version
+  const String gzPath = path + asyncsrv::T__gz;
+  File gzFile = fs.open(gzPath, "r");
+
+  // Compressed file not found or invalid
+  if (!gzFile.seek(gzFile.size() - 8)) {
+    send(404);
+    gzFile.close();
+    return;
+  }
+
+  // ETag validation
+  if (this->hasHeader(asyncsrv::T_INM)) {
+    // Generate server ETag from CRC in gzip trailer
+    uint8_t crcInTrailer[4];
+    gzFile.read(crcInTrailer, 4);
+    char serverETag[9];
+    _getEtag(crcInTrailer, serverETag);
+
+    // Compare with client's ETag
+    const AsyncWebHeader *inmHeader = this->getHeader(asyncsrv::T_INM);
+    if (inmHeader && inmHeader->value() == serverETag) {
+      gzFile.close();
+      this->send(304);  // Not Modified
+      return;
+    }
+  }
+
+  // Send compressed file response
+  gzFile.close();
+  send(beginResponse(fs, path, contentType, download, callback));
+}
+
+/**
+ * @brief Generates an ETag string from a 4-byte trailer
+ *
+ * This function converts a 4-byte array into a hexadecimal ETag string enclosed in quotes.
+ *
+ * @param trailer[4] Input array of 4 bytes to convert to hexadecimal
+ * @param serverETag Output buffer to store the ETag
+ *                   Must be pre-allocated with minimum 9 bytes (8 hex + 1 null terminator)
+ */
+void AsyncWebServerRequest::_getEtag(uint8_t trailer[4], char *serverETag) {
+  static constexpr char hexChars[] = "0123456789ABCDEF";
+
+  uint32_t data;
+  memcpy(&data, trailer, 4);
+
+  serverETag[0] = hexChars[(data >> 4) & 0x0F];
+  serverETag[1] = hexChars[data & 0x0F];
+  serverETag[2] = hexChars[(data >> 12) & 0x0F];
+  serverETag[3] = hexChars[(data >> 8) & 0x0F];
+  serverETag[4] = hexChars[(data >> 20) & 0x0F];
+  serverETag[5] = hexChars[(data >> 16) & 0x0F];
+  serverETag[6] = hexChars[(data >> 28)];
+  serverETag[7] = hexChars[(data >> 24) & 0x0F];
+  serverETag[8] = '\0';
+}
diff --git a/src/AsyncWebServerVersion.h b/src/AsyncWebServerVersion.h
new file mode 100644
index 000000000..5a0bfe23e
--- /dev/null
+++ b/src/AsyncWebServerVersion.h
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Major version number (X.x.x) */
+#define ASYNCWEBSERVER_VERSION_MAJOR 3
+/** Minor version number (x.X.x) */
+#define ASYNCWEBSERVER_VERSION_MINOR 7
+/** Patch version number (x.x.X) */
+#define ASYNCWEBSERVER_VERSION_PATCH 9
+
+/**
+ * Macro to convert version number into an integer
+ *
+ * To be used in comparisons, such as ASYNCWEBSERVER_VERSION >= ASYNCWEBSERVER_VERSION_VAL(2, 0, 0)
+ */
+#define ASYNCWEBSERVER_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch))
+
+/**
+ * Current version, as an integer
+ *
+ * To be used in comparisons, such as ASYNCWEBSERVER_VERSION_NUM >= ASYNCWEBSERVER_VERSION_VAL(2, 0, 0)
+ */
+#define ASYNCWEBSERVER_VERSION_NUM ASYNCWEBSERVER_VERSION_VAL(ASYNCWEBSERVER_VERSION_MAJOR, ASYNCWEBSERVER_VERSION_MINOR, ASYNCWEBSERVER_VERSION_PATCH)
+
+/**
+ * Current version, as string
+ */
+#define df2xstr(s)             #s
+#define df2str(s)              df2xstr(s)
+#define ASYNCWEBSERVER_VERSION df2str(ASYNCWEBSERVER_VERSION_MAJOR) "." df2str(ASYNCWEBSERVER_VERSION_MINOR) "." df2str(ASYNCWEBSERVER_VERSION_PATCH)
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/AsyncWebSocket.cpp b/src/AsyncWebSocket.cpp
index 6e88da94f..bc093b961 100644
--- a/src/AsyncWebSocket.cpp
+++ b/src/AsyncWebSocket.cpp
@@ -1,471 +1,283 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#include "Arduino.h"
 #include "AsyncWebSocket.h"
+#include "Arduino.h"
+
+#include 
 
 #include 
 
-#ifndef ESP8266
-#include "mbedtls/sha1.h"
-#include "mbedtls/version.h"
+#if defined(ESP32)
+#if ESP_IDF_VERSION_MAJOR < 5
+#include "BackPort_SHA1Builder.h"
 #else
+#include 
+#endif
+#include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350) || defined(ESP8266)
 #include 
+#elif defined(LIBRETINY)
+#include 
 #endif
 
-#define MAX_PRINTF_LEN 64
+using namespace asyncsrv;
 
-size_t webSocketSendFrameWindow(AsyncClient *client){
-  if(!client->canSend())
+size_t webSocketSendFrameWindow(AsyncClient *client) {
+  if (!client || !client->canSend()) {
     return 0;
+  }
   size_t space = client->space();
-  if(space < 9)
+  if (space < 9) {
     return 0;
+  }
   return space - 8;
 }
 
-size_t webSocketSendFrame(AsyncClient *client, bool final, uint8_t opcode, bool mask, uint8_t *data, size_t len){
-  if(!client->canSend())
+size_t webSocketSendFrame(AsyncClient *client, bool final, uint8_t opcode, bool mask, uint8_t *data, size_t len) {
+  if (!client || !client->canSend()) {
+    // Serial.println("SF 1");
     return 0;
+  }
   size_t space = client->space();
-  if(space < 2)
+  if (space < 2) {
+    // Serial.println("SF 2");
     return 0;
-  uint8_t mbuf[4] = {0,0,0,0};
+  }
+  uint8_t mbuf[4] = {0, 0, 0, 0};
   uint8_t headLen = 2;
-  if(len && mask){
+  if (len && mask) {
     headLen += 4;
     mbuf[0] = rand() % 0xFF;
     mbuf[1] = rand() % 0xFF;
     mbuf[2] = rand() % 0xFF;
     mbuf[3] = rand() % 0xFF;
   }
-  if(len > 125)
+  if (len > 125) {
     headLen += 2;
-  if(space < headLen)
+  }
+  if (space < headLen) {
+    // Serial.println("SF 2");
     return 0;
+  }
   space -= headLen;
 
-  if(len > space) len = space;
+  if (len > space) {
+    len = space;
+  }
 
-  uint8_t *buf = (uint8_t*)malloc(headLen);
-  if(buf == NULL){
-    //os_printf("could not malloc %u bytes for frame header\n", headLen);
+  uint8_t *buf = (uint8_t *)malloc(headLen);
+  if (buf == NULL) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    client->abort();
     return 0;
   }
 
   buf[0] = opcode & 0x0F;
-  if(final)
+  if (final) {
     buf[0] |= 0x80;
-  if(len < 126)
+  }
+  if (len < 126) {
     buf[1] = len & 0x7F;
-  else {
+  } else {
     buf[1] = 126;
     buf[2] = (uint8_t)((len >> 8) & 0xFF);
     buf[3] = (uint8_t)(len & 0xFF);
   }
-  if(len && mask){
+  if (len && mask) {
     buf[1] |= 0x80;
     memcpy(buf + (headLen - 4), mbuf, 4);
   }
-  if(client->add((const char *)buf, headLen) != headLen){
-    //os_printf("error adding %lu header bytes\n", headLen);
+  if (client->add((const char *)buf, headLen) != headLen) {
+    // os_printf("error adding %lu header bytes\n", headLen);
     free(buf);
+    // Serial.println("SF 4");
     return 0;
   }
   free(buf);
 
-  if(len){
-    if(len && mask){
+  if (len) {
+    if (len && mask) {
       size_t i;
-      for(i=0;iadd((const char *)data, len) != len){
-      //os_printf("error adding %lu data bytes\n", len);
+    if (client->add((const char *)data, len) != len) {
+      // os_printf("error adding %lu data bytes\n", len);
+      //  Serial.println("SF 5");
       return 0;
     }
   }
-  if (!client->send()) return 0;
+  if (!client->send()) {
+    // os_printf("error sending frame: %lu\n", headLen+len);
+    //  Serial.println("SF 6");
+    return 0;
+  }
+  // Serial.println("SF");
   return len;
 }
 
-
 /*
  *    AsyncWebSocketMessageBuffer
  */
 
-
-
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer()
-  :_data(nullptr)
-  ,_len(0)
-  ,_lock(false)
-  ,_count(0)
-{
-
-}
-
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(uint8_t * data, size_t size)
-  :_data(nullptr)
-  ,_len(size)
-  ,_lock(false)
-  ,_count(0)
-{
-
-  if (!data) {
-    return;
-  }
-
-  _data = new uint8_t[_len + 1];
-
-  if (_data) {
-    memcpy(_data, data, _len);
-    _data[_len] = 0;
-  }
-}
-
-
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(size_t size)
-  :_data(nullptr)
-  ,_len(size)
-  ,_lock(false)
-  ,_count(0)
-{
-  _data = new uint8_t[_len + 1];
-
-  if (_data) {
-    _data[_len] = 0;
-  }
-
-}
-
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(const AsyncWebSocketMessageBuffer & copy)
-  :_data(nullptr)
-  ,_len(0)
-  ,_lock(false)
-  ,_count(0)
-{
-  _len = copy._len;
-  _lock = copy._lock;
-  _count = 0;
-
-  if (_len) {
-    _data = new uint8_t[_len + 1];
-    _data[_len] = 0;
-  }
-
-  if (_data) {
-    memcpy(_data, copy._data, _len);
-    _data[_len] = 0;
+AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(const uint8_t *data, size_t size) : _buffer(std::make_shared>(size)) {
+  if (_buffer->capacity() < size) {
+    _buffer->reserve(size);
+  } else {
+    std::memcpy(_buffer->data(), data, size);
   }
-
 }
 
-AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(AsyncWebSocketMessageBuffer && copy)
-  :_data(nullptr)
-  ,_len(0)
-  ,_lock(false)
-  ,_count(0)
-{
-  _len = copy._len;
-  _lock = copy._lock;
-  _count = 0;
-
-  if (copy._data) {
-    _data = copy._data;
-    copy._data = nullptr;
+AsyncWebSocketMessageBuffer::AsyncWebSocketMessageBuffer(size_t size) : _buffer(std::make_shared>(size)) {
+  if (_buffer->capacity() < size) {
+    _buffer->reserve(size);
   }
-
-}
-
-AsyncWebSocketMessageBuffer::~AsyncWebSocketMessageBuffer()
-{
-    if (_data) {
-      delete[] _data;
-    }
 }
 
-bool AsyncWebSocketMessageBuffer::reserve(size_t size)
-{
-  _len = size;
-
-  if (_data) {
-    delete[] _data;
-    _data = nullptr;
-  }
-
-  _data = new uint8_t[_len + 1];
-
-  if (_data) {
-    _data[_len] = 0;
+bool AsyncWebSocketMessageBuffer::reserve(size_t size) {
+  if (_buffer->capacity() >= size) {
     return true;
-  } else {
-    return false;
   }
-
+  _buffer->reserve(size);
+  return _buffer->capacity() >= size;
 }
 
-
-
 /*
  * Control Frame
  */
 
 class AsyncWebSocketControl {
-  private:
-    uint8_t _opcode;
-    uint8_t *_data;
-    size_t _len;
-    bool _mask;
-    bool _finished;
-  public:
-    AsyncWebSocketControl(uint8_t opcode, uint8_t *data=NULL, size_t len=0, bool mask=false)
-      :_opcode(opcode)
-      ,_len(len)
-      ,_mask(len && mask)
-      ,_finished(false)
-  {
-      if(data == NULL)
-        _len = 0;
-      if(_len){
-        if(_len > 125)
-          _len = 125;
-        _data = (uint8_t*)malloc(_len);
-        if(_data == NULL)
-          _len = 0;
-        else memcpy(_data, data, len);
-      } else _data = NULL;
+private:
+  uint8_t _opcode;
+  uint8_t *_data;
+  size_t _len;
+  bool _mask;
+  bool _finished;
+
+public:
+  AsyncWebSocketControl(uint8_t opcode, const uint8_t *data = NULL, size_t len = 0, bool mask = false)
+    : _opcode(opcode), _len(len), _mask(len && mask), _finished(false) {
+    if (data == NULL) {
+      _len = 0;
     }
-    virtual ~AsyncWebSocketControl(){
-      if(_data != NULL)
-        free(_data);
-    }
-    virtual bool finished() const { return _finished; }
-    uint8_t opcode(){ return _opcode; }
-    uint8_t len(){ return _len + 2; }
-    size_t send(AsyncClient *client){
-      _finished = true;
-      return webSocketSendFrame(client, true, _opcode & 0x0F, _mask, _data, _len);
-    }
-};
-
-/*
- * Basic Buffered Message
- */
+    if (_len) {
+      if (_len > 125) {
+        _len = 125;
+      }
 
+      _data = (uint8_t *)malloc(_len);
 
-AsyncWebSocketBasicMessage::AsyncWebSocketBasicMessage(const char * data, size_t len, uint8_t opcode, bool mask)
-  :_len(len)
-  ,_sent(0)
-  ,_ack(0)
-  ,_acked(0)
-{
-  _opcode = opcode & 0x07;
-  _mask = mask;
-  _data = (uint8_t*)malloc(_len+1);
-  if(_data == NULL){
-    _len = 0;
-    _status = WS_MSG_ERROR;
-  } else {
-    _status = WS_MSG_SENDING;
-    memcpy(_data, data, _len);
-    _data[_len] = 0;
+      if (_data == NULL) {
+#ifdef ESP32
+        log_e("Failed to allocate");
+#endif
+        _len = 0;
+      } else {
+        memcpy(_data, data, len);
+      }
+    } else {
+      _data = NULL;
+    }
   }
-}
-AsyncWebSocketBasicMessage::AsyncWebSocketBasicMessage(uint8_t opcode, bool mask)
-  :_len(0)
-  ,_sent(0)
-  ,_ack(0)
-  ,_acked(0)
-  ,_data(NULL)
-{
-  _opcode = opcode & 0x07;
-  _mask = mask;
-
-}
-
 
-AsyncWebSocketBasicMessage::~AsyncWebSocketBasicMessage() {
-  if(_data != NULL)
-    free(_data);
-}
-
- void AsyncWebSocketBasicMessage::ack(size_t len, uint32_t time)  {
-   (void)time;
-  _acked += len;
-  if(_sent == _len && _acked == _ack){
-    _status = WS_MSG_SENT;
-  }
-}
- size_t AsyncWebSocketBasicMessage::send(AsyncClient *client)  {
-  if(_status != WS_MSG_SENDING)
-    return 0;
-  if(_acked < _ack){
-    return 0;
+  ~AsyncWebSocketControl() {
+    if (_data != NULL) {
+      free(_data);
+    }
   }
-  if(_sent == _len){
-    if(_acked == _ack)
-      _status = WS_MSG_SENT;
-    return 0;
+
+  bool finished() const {
+    return _finished;
   }
-  if(_sent > _len){
-      _status = WS_MSG_ERROR;
-      return 0;
+  uint8_t opcode() {
+    return _opcode;
   }
-
-  size_t toSend = _len - _sent;
-  size_t window = webSocketSendFrameWindow(client);
-
-  if(window < toSend) {
-      toSend = window;
+  uint8_t len() {
+    return _len + 2;
   }
-
-  _sent += toSend;
-  _ack += toSend + ((toSend < 126)?2:4) + (_mask * 4);
-
-  bool final = (_sent == _len);
-  uint8_t* dPtr = (uint8_t*)(_data + (_sent - toSend));
-  uint8_t opCode = (toSend && _sent == toSend)?_opcode:(uint8_t)WS_CONTINUATION;
-
-  size_t sent = webSocketSendFrame(client, final, opCode, _mask, dPtr, toSend);
-  _status = WS_MSG_SENDING;
-  if(toSend && sent != toSend){
-      _sent -= (toSend - sent);
-      _ack -= (toSend - sent);
+  size_t send(AsyncClient *client) {
+    _finished = true;
+    return webSocketSendFrame(client, true, _opcode & 0x0F, _mask, _data, _len);
   }
-  return sent;
-}
-
-// bool AsyncWebSocketBasicMessage::reserve(size_t size) {
-//   if (size) {
-//     _data = (uint8_t*)malloc(size +1);
-//     if (_data) {
-//       memset(_data, 0, size);
-//       _len = size;
-//       _status = WS_MSG_SENDING;
-//       return true;
-//     }
-//   }
-//   return false;
-//  }
-
+};
 
 /*
- * AsyncWebSocketMultiMessage Message
+ * AsyncWebSocketMessage Message
  */
 
+AsyncWebSocketMessage::AsyncWebSocketMessage(AsyncWebSocketSharedBuffer buffer, uint8_t opcode, bool mask)
+  : _WSbuffer{buffer}, _opcode(opcode & 0x07), _mask{mask}, _status{_WSbuffer ? WS_MSG_SENDING : WS_MSG_ERROR} {}
 
-AsyncWebSocketMultiMessage::AsyncWebSocketMultiMessage(AsyncWebSocketMessageBuffer * buffer, uint8_t opcode, bool mask)
-  :_len(0)
-  ,_sent(0)
-  ,_ack(0)
-  ,_acked(0)
-  ,_WSbuffer(nullptr)
-{
-
-  _opcode = opcode & 0x07;
-  _mask = mask;
-
-  if (buffer) {
-    _WSbuffer = buffer;
-    (*_WSbuffer)++;
-    _data = buffer->get();
-    _len = buffer->length();
-    _status = WS_MSG_SENDING;
-    //ets_printf("M: %u\n", _len);
-  } else {
-    _status = WS_MSG_ERROR;
+void AsyncWebSocketMessage::ack(size_t len, uint32_t time) {
+  (void)time;
+  _acked += len;
+  if (_sent >= _WSbuffer->size() && _acked >= _ack) {
+    _status = WS_MSG_SENT;
   }
-
+  // ets_printf("A: %u\n", len);
 }
 
-
-AsyncWebSocketMultiMessage::~AsyncWebSocketMultiMessage() {
-  if (_WSbuffer) {
-    (*_WSbuffer)--; // decreases the counter.
+size_t AsyncWebSocketMessage::send(AsyncClient *client) {
+  if (!client) {
+    return 0;
   }
-}
 
- void AsyncWebSocketMultiMessage::ack(size_t len, uint32_t time)  {
-   (void)time;
-  _acked += len;
-  if(_sent >= _len && _acked >= _ack){
-    _status = WS_MSG_SENT;
-  }
-  //ets_printf("A: %u\n", len);
-}
- size_t AsyncWebSocketMultiMessage::send(AsyncClient *client)  {
-  if(_status != WS_MSG_SENDING)
+  if (_status != WS_MSG_SENDING) {
     return 0;
-  if(_acked < _ack){
+  }
+  if (_acked < _ack) {
     return 0;
   }
-  if(_sent == _len){
-    _status = WS_MSG_SENT;
+  if (_sent == _WSbuffer->size()) {
+    if (_acked == _ack) {
+      _status = WS_MSG_SENT;
+    }
     return 0;
   }
-  if(_sent > _len){
-      _status = WS_MSG_ERROR;
-      //ets_printf("E: %u > %u\n", _sent, _len);
-      return 0;
+  if (_sent > _WSbuffer->size()) {
+    _status = WS_MSG_ERROR;
+    // ets_printf("E: %u > %u\n", _sent, _WSbuffer->length());
+    return 0;
   }
 
-  size_t toSend = _len - _sent;
+  size_t toSend = _WSbuffer->size() - _sent;
   size_t window = webSocketSendFrameWindow(client);
 
-  if(window < toSend) {
-      toSend = window;
+  if (window < toSend) {
+    toSend = window;
   }
 
   _sent += toSend;
-  _ack += toSend + ((toSend < 126)?2:4) + (_mask * 4);
+  _ack += toSend + ((toSend < 126) ? 2 : 4) + (_mask * 4);
 
-  //ets_printf("W: %u %u\n", _sent - toSend, toSend);
+  // ets_printf("W: %u %u\n", _sent - toSend, toSend);
 
-  bool final = (_sent == _len);
-  uint8_t* dPtr = (uint8_t*)(_data + (_sent - toSend));
-  uint8_t opCode = (toSend && _sent == toSend)?_opcode:(uint8_t)WS_CONTINUATION;
+  bool final = (_sent == _WSbuffer->size());
+  uint8_t *dPtr = (uint8_t *)(_WSbuffer->data() + (_sent - toSend));
+  uint8_t opCode = (toSend && _sent == toSend) ? _opcode : (uint8_t)WS_CONTINUATION;
 
   size_t sent = webSocketSendFrame(client, final, opCode, _mask, dPtr, toSend);
   _status = WS_MSG_SENDING;
-  if(toSend && sent != toSend){
-      //ets_printf("E: %u != %u\n", toSend, sent);
-      _sent -= (toSend - sent);
-      _ack -= (toSend - sent);
+  if (toSend && sent != toSend) {
+    // ets_printf("E: %u != %u\n", toSend, sent);
+    _sent -= (toSend - sent);
+    _ack -= (toSend - sent);
   }
-  //ets_printf("S: %u %u\n", _sent, sent);
+  // ets_printf("S: %u %u\n", _sent, sent);
   return sent;
 }
 
-
 /*
  * Async WebSocket Client
  */
- const char * AWSC_PING_PAYLOAD = "ESPAsyncWebServer-PING";
- const size_t AWSC_PING_PAYLOAD_LEN = 22;
-
-AsyncWebSocketClient::AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server)
-  : _controlQueue(LinkedList([](AsyncWebSocketControl *c){ delete  c; }))
-  , _messageQueue(LinkedList([](AsyncWebSocketMessage *m){ delete  m; }))
-  , _tempObject(NULL)
-{
+const char *AWSC_PING_PAYLOAD = "ESPAsyncWebServer-PING";
+const size_t AWSC_PING_PAYLOAD_LEN = 22;
+
+AsyncWebSocketClient::AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server) : _tempObject(NULL) {
   _client = request->client();
   _server = server;
   _clientId = _server->_getNextId();
@@ -474,161 +286,326 @@ AsyncWebSocketClient::AsyncWebSocketClient(AsyncWebServerRequest *request, Async
   _lastMessageTime = millis();
   _keepAlivePeriod = 0;
   _client->setRxTimeout(0);
-  _client->onError([](void *r, AsyncClient* c, int8_t error){ (void)c; ((AsyncWebSocketClient*)(r))->_onError(error); }, this);
-  _client->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ (void)c; ((AsyncWebSocketClient*)(r))->_onAck(len, time); }, this);
-  _client->onDisconnect([](void *r, AsyncClient* c){ ((AsyncWebSocketClient*)(r))->_onDisconnect(); delete c; }, this);
-  _client->onTimeout([](void *r, AsyncClient* c, uint32_t time){ (void)c; ((AsyncWebSocketClient*)(r))->_onTimeout(time); }, this);
-  _client->onData([](void *r, AsyncClient* c, void *buf, size_t len){ (void)c; ((AsyncWebSocketClient*)(r))->_onData(buf, len); }, this);
-  _client->onPoll([](void *r, AsyncClient* c){ (void)c; ((AsyncWebSocketClient*)(r))->_onPoll(); }, this);
-  _server->_addClient(this);
-  _server->_handleEvent(this, WS_EVT_CONNECT, request, NULL, 0);
+  _client->onError(
+    [](void *r, AsyncClient *c, int8_t error) {
+      (void)c;
+      ((AsyncWebSocketClient *)(r))->_onError(error);
+    },
+    this
+  );
+  _client->onAck(
+    [](void *r, AsyncClient *c, size_t len, uint32_t time) {
+      (void)c;
+      ((AsyncWebSocketClient *)(r))->_onAck(len, time);
+    },
+    this
+  );
+  _client->onDisconnect(
+    [](void *r, AsyncClient *c) {
+      ((AsyncWebSocketClient *)(r))->_onDisconnect();
+      delete c;
+    },
+    this
+  );
+  _client->onTimeout(
+    [](void *r, AsyncClient *c, uint32_t time) {
+      (void)c;
+      ((AsyncWebSocketClient *)(r))->_onTimeout(time);
+    },
+    this
+  );
+  _client->onData(
+    [](void *r, AsyncClient *c, void *buf, size_t len) {
+      (void)c;
+      ((AsyncWebSocketClient *)(r))->_onData(buf, len);
+    },
+    this
+  );
+  _client->onPoll(
+    [](void *r, AsyncClient *c) {
+      (void)c;
+      ((AsyncWebSocketClient *)(r))->_onPoll();
+    },
+    this
+  );
   delete request;
+  memset(&_pinfo, 0, sizeof(_pinfo));
 }
 
-AsyncWebSocketClient::~AsyncWebSocketClient(){
-  _messageQueue.free();
-  _controlQueue.free();
+AsyncWebSocketClient::~AsyncWebSocketClient() {
+  {
+#ifdef ESP32
+    std::lock_guard lock(_lock);
+#endif
+    _messageQueue.clear();
+    _controlQueue.clear();
+  }
   _server->_handleEvent(this, WS_EVT_DISCONNECT, NULL, NULL, 0);
 }
 
-void AsyncWebSocketClient::_onAck(size_t len, uint32_t time){
+void AsyncWebSocketClient::_clearQueue() {
+  while (!_messageQueue.empty() && _messageQueue.front().finished()) {
+    _messageQueue.pop_front();
+  }
+}
+
+void AsyncWebSocketClient::_onAck(size_t len, uint32_t time) {
   _lastMessageTime = millis();
-  if(!_controlQueue.isEmpty()){
-    auto head = _controlQueue.front();
-    if(head->finished()){
-      len -= head->len();
-      if(_status == WS_DISCONNECTING && head->opcode() == WS_DISCONNECT){
-        _controlQueue.remove(head);
+
+#ifdef ESP32
+  std::unique_lock lock(_lock);
+#endif
+
+  if (!_controlQueue.empty()) {
+    auto &head = _controlQueue.front();
+    if (head.finished()) {
+      len -= head.len();
+      if (_status == WS_DISCONNECTING && head.opcode() == WS_DISCONNECT) {
+        _controlQueue.pop_front();
         _status = WS_DISCONNECTED;
-        _client->close(true);
+        if (_client) {
+#ifdef ESP32
+          /*
+            Unlocking has to be called before return execution otherwise std::unique_lock ::~unique_lock() will get an exception pthread_mutex_unlock.
+            Due to _client->close(true) shall call the callback function _onDisconnect()
+            The calling flow _onDisconnect() --> _handleDisconnect() --> ~AsyncWebSocketClient()
+          */
+          lock.unlock();
+#endif
+          _client->close(true);
+        }
         return;
       }
-      _controlQueue.remove(head);
+      _controlQueue.pop_front();
     }
   }
-  if(len && !_messageQueue.isEmpty()){
-    _messageQueue.front()->ack(len, time);
+
+  if (len && !_messageQueue.empty()) {
+    _messageQueue.front().ack(len, time);
   }
-  _server->_cleanBuffers();
+
+  _clearQueue();
+
   _runQueue();
 }
 
-void AsyncWebSocketClient::_onPoll(){
-  if(_client->canSend() && (!_controlQueue.isEmpty() || !_messageQueue.isEmpty())){
+void AsyncWebSocketClient::_onPoll() {
+  if (!_client) {
+    return;
+  }
+
+#ifdef ESP32
+  std::unique_lock lock(_lock);
+#endif
+  if (_client && _client->canSend() && (!_controlQueue.empty() || !_messageQueue.empty())) {
     _runQueue();
-  } else if(_keepAlivePeriod > 0 && _controlQueue.isEmpty() && _messageQueue.isEmpty() && (millis() - _lastMessageTime) >= _keepAlivePeriod){
+  } else if (_keepAlivePeriod > 0 && (millis() - _lastMessageTime) >= _keepAlivePeriod && (_controlQueue.empty() && _messageQueue.empty())) {
+#ifdef ESP32
+    lock.unlock();
+#endif
     ping((uint8_t *)AWSC_PING_PAYLOAD, AWSC_PING_PAYLOAD_LEN);
   }
 }
 
-void AsyncWebSocketClient::_runQueue(){
-  while(!_messageQueue.isEmpty() && _messageQueue.front()->finished()){
-    _messageQueue.remove(_messageQueue.front());
+void AsyncWebSocketClient::_runQueue() {
+  // all calls to this method MUST be protected by a mutex lock!
+  if (!_client) {
+    return;
   }
 
-  if(!_controlQueue.isEmpty() && (_messageQueue.isEmpty() || _messageQueue.front()->betweenFrames()) && webSocketSendFrameWindow(_client) > (size_t)(_controlQueue.front()->len() - 1)){
-    _controlQueue.front()->send(_client);
-  } else if(!_messageQueue.isEmpty() && _messageQueue.front()->betweenFrames() && webSocketSendFrameWindow(_client)){
-    _messageQueue.front()->send(_client);
+  _clearQueue();
+
+  if (!_controlQueue.empty() && (_messageQueue.empty() || _messageQueue.front().betweenFrames())
+      && webSocketSendFrameWindow(_client) > (size_t)(_controlQueue.front().len() - 1)) {
+    _controlQueue.front().send(_client);
+  } else if (!_messageQueue.empty() && _messageQueue.front().betweenFrames() && webSocketSendFrameWindow(_client)) {
+    _messageQueue.front().send(_client);
   }
 }
 
-bool AsyncWebSocketClient::queueIsFull(){
-  if((_messageQueue.length() >= WS_MAX_QUEUED_MESSAGES) || (_status != WS_CONNECTED) ) return true;
-  return false;
+bool AsyncWebSocketClient::queueIsFull() const {
+#ifdef ESP32
+  std::lock_guard lock(_lock);
+#endif
+  return (_messageQueue.size() >= WS_MAX_QUEUED_MESSAGES) || (_status != WS_CONNECTED);
 }
 
-void AsyncWebSocketClient::_queueMessage(AsyncWebSocketMessage *dataMessage){
-  if(dataMessage == NULL)
-    return;
-  if(_status != WS_CONNECTED){
-    delete dataMessage;
-    return;
-  }
-  if(_messageQueue.length() >= WS_MAX_QUEUED_MESSAGES){
-      ets_printf("ERROR: Too many messages queued\n");
-      delete dataMessage;
-  } else {
-      _messageQueue.add(dataMessage);
+size_t AsyncWebSocketClient::queueLen() const {
+#ifdef ESP32
+  std::lock_guard lock(_lock);
+#endif
+  return _messageQueue.size();
+}
+
+bool AsyncWebSocketClient::canSend() const {
+#ifdef ESP32
+  std::lock_guard lock(_lock);
+#endif
+  return _messageQueue.size() < WS_MAX_QUEUED_MESSAGES;
+}
+
+bool AsyncWebSocketClient::_queueControl(uint8_t opcode, const uint8_t *data, size_t len, bool mask) {
+  if (!_client) {
+    return false;
   }
-  if(_client->canSend())
+
+#ifdef ESP32
+  std::lock_guard lock(_lock);
+#endif
+
+  _controlQueue.emplace_back(opcode, data, len, mask);
+
+  if (_client && _client->canSend()) {
     _runQueue();
+  }
+
+  return true;
 }
 
-void AsyncWebSocketClient::_queueControl(AsyncWebSocketControl *controlMessage){
-  if(controlMessage == NULL)
-    return;
-  _controlQueue.add(controlMessage);
-  if(_client->canSend())
+bool AsyncWebSocketClient::_queueMessage(AsyncWebSocketSharedBuffer buffer, uint8_t opcode, bool mask) {
+  if (!_client || buffer->size() == 0 || _status != WS_CONNECTED) {
+    return false;
+  }
+
+#ifdef ESP32
+  std::unique_lock lock(_lock);
+#endif
+
+  if (_messageQueue.size() >= WS_MAX_QUEUED_MESSAGES) {
+    if (closeWhenFull) {
+      _status = WS_DISCONNECTED;
+
+      if (_client) {
+#ifdef ESP32
+        /*
+          Unlocking has to be called before return execution otherwise std::unique_lock ::~unique_lock() will get an exception pthread_mutex_unlock.
+          Due to _client->close(true) shall call the callback function _onDisconnect()
+          The calling flow _onDisconnect() --> _handleDisconnect() --> ~AsyncWebSocketClient()
+        */
+        lock.unlock();
+#endif
+        _client->close(true);
+      }
+
+#ifdef ESP8266
+      ets_printf("AsyncWebSocketClient::_queueMessage: Too many messages queued: closing connection\n");
+#elif defined(ESP32)
+      log_e("Too many messages queued: closing connection");
+#endif
+
+    } else {
+#ifdef ESP8266
+      ets_printf("AsyncWebSocketClient::_queueMessage: Too many messages queued: discarding new message\n");
+#elif defined(ESP32)
+      log_e("Too many messages queued: discarding new message");
+#endif
+    }
+
+    return false;
+  }
+
+  _messageQueue.emplace_back(buffer, opcode, mask);
+
+  if (_client && _client->canSend()) {
     _runQueue();
+  }
+
+  return true;
 }
 
-void AsyncWebSocketClient::close(uint16_t code, const char * message){
-  if(_status != WS_CONNECTED)
+void AsyncWebSocketClient::close(uint16_t code, const char *message) {
+  if (_status != WS_CONNECTED) {
     return;
-  if(code){
+  }
+
+  _status = WS_DISCONNECTING;
+
+  if (code) {
     uint8_t packetLen = 2;
-    if(message != NULL){
+    if (message != NULL) {
       size_t mlen = strlen(message);
-      if(mlen > 123) mlen = 123;
+      if (mlen > 123) {
+        mlen = 123;
+      }
       packetLen += mlen;
     }
-    char * buf = (char*)malloc(packetLen);
-    if(buf != NULL){
+    char *buf = (char *)malloc(packetLen);
+    if (buf != NULL) {
       buf[0] = (uint8_t)(code >> 8);
       buf[1] = (uint8_t)(code & 0xFF);
-      if(message != NULL){
-        memcpy(buf+2, message, packetLen -2);
+      if (message != NULL) {
+        memcpy(buf + 2, message, packetLen - 2);
       }
-      _queueControl(new AsyncWebSocketControl(WS_DISCONNECT,(uint8_t*)buf,packetLen));
+      _queueControl(WS_DISCONNECT, (uint8_t *)buf, packetLen);
       free(buf);
       return;
+    } else {
+#ifdef ESP32
+      log_e("Failed to allocate");
+      _client->abort();
+#endif
     }
   }
-  _queueControl(new AsyncWebSocketControl(WS_DISCONNECT));
+  _queueControl(WS_DISCONNECT);
 }
 
-void AsyncWebSocketClient::ping(uint8_t *data, size_t len){
-  if(_status == WS_CONNECTED)
-    _queueControl(new AsyncWebSocketControl(WS_PING, data, len));
+bool AsyncWebSocketClient::ping(const uint8_t *data, size_t len) {
+  return _status == WS_CONNECTED && _queueControl(WS_PING, data, len);
 }
 
-void AsyncWebSocketClient::_onError(int8_t){}
+void AsyncWebSocketClient::_onError(int8_t) {
+  // Serial.println("onErr");
+}
 
-void AsyncWebSocketClient::_onTimeout(uint32_t time){
+void AsyncWebSocketClient::_onTimeout(uint32_t time) {
+  if (!_client) {
+    return;
+  }
+  // Serial.println("onTime");
   (void)time;
   _client->close(true);
 }
 
-void AsyncWebSocketClient::_onDisconnect(){
-  _client = NULL;
+void AsyncWebSocketClient::_onDisconnect() {
+  // Serial.println("onDis");
+  _client = nullptr;
   _server->_handleDisconnect(this);
 }
 
-void AsyncWebSocketClient::_onData(void *pbuf, size_t plen){
+void AsyncWebSocketClient::_onData(void *pbuf, size_t plen) {
   _lastMessageTime = millis();
-  uint8_t *data = (uint8_t*)pbuf;
-  while(plen > 0){
-    if(!_pstate){
+  uint8_t *data = (uint8_t *)pbuf;
+  while (plen > 0) {
+    if (!_pstate) {
       const uint8_t *fdata = data;
+
       _pinfo.index = 0;
       _pinfo.final = (fdata[0] & 0x80) != 0;
       _pinfo.opcode = fdata[0] & 0x0F;
       _pinfo.masked = (fdata[1] & 0x80) != 0;
       _pinfo.len = fdata[1] & 0x7F;
+
+      // log_d("WS[%" PRIu32 "]: _onData: %" PRIu32, _clientId, plen);
+      // log_d("WS[%" PRIu32 "]: _status = %" PRIu32, _clientId, _status);
+      // log_d("WS[%" PRIu32 "]: _pinfo: index: %" PRIu64 ", final: %" PRIu8 ", opcode: %" PRIu8 ", masked: %" PRIu8 ", len: %" PRIu64, _clientId, _pinfo.index, _pinfo.final, _pinfo.opcode, _pinfo.masked, _pinfo.len);
+
       data += 2;
       plen -= 2;
-      if(_pinfo.len == 126){
+
+      if (_pinfo.len == 126 && plen >= 2) {
         _pinfo.len = fdata[3] | (uint16_t)(fdata[2]) << 8;
         data += 2;
         plen -= 2;
-      } else if(_pinfo.len == 127){
-        _pinfo.len = fdata[9] | (uint16_t)(fdata[8]) << 8 | (uint32_t)(fdata[7]) << 16 | (uint32_t)(fdata[6]) << 24 | (uint64_t)(fdata[5]) << 32 | (uint64_t)(fdata[4]) << 40 | (uint64_t)(fdata[3]) << 48 | (uint64_t)(fdata[2]) << 56;
+
+      } else if (_pinfo.len == 127 && plen >= 8) {
+        _pinfo.len = fdata[9] | (uint16_t)(fdata[8]) << 8 | (uint32_t)(fdata[7]) << 16 | (uint32_t)(fdata[6]) << 24 | (uint64_t)(fdata[5]) << 32
+                     | (uint64_t)(fdata[4]) << 40 | (uint64_t)(fdata[3]) << 48 | (uint64_t)(fdata[2]) << 56;
         data += 8;
         plen -= 8;
       }
 
-      if(_pinfo.masked){
+      if (_pinfo.masked
+          && plen >= 4) {  // if ws.close() is called, Safari sends a close frame with plen 2 and masked bit set. We must not decrement plen which is already 0.
         memcpy(_pinfo.mask, data, 4);
         data += 4;
         plen -= 4;
@@ -638,58 +615,73 @@ void AsyncWebSocketClient::_onData(void *pbuf, size_t plen){
     const size_t datalen = std::min((size_t)(_pinfo.len - _pinfo.index), plen);
     const auto datalast = data[datalen];
 
-    if(_pinfo.masked){
-      for(size_t i=0;i 0) {
+        _server->_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, data, datalen);
       }
-      _server->_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, (uint8_t*)data, datalen);
 
       _pinfo.index += datalen;
-    } else if((datalen + _pinfo.index) == _pinfo.len){
+    } else if ((datalen + _pinfo.index) == _pinfo.len) {
       _pstate = 0;
-      if(_pinfo.opcode == WS_DISCONNECT){
-        if(datalen){
+      if (_pinfo.opcode == WS_DISCONNECT) {
+        if (datalen) {
           uint16_t reasonCode = (uint16_t)(data[0] << 8) + data[1];
-          char * reasonString = (char*)(data+2);
-          if(reasonCode > 1001){
-            _server->_handleEvent(this, WS_EVT_ERROR, (void *)&reasonCode, (uint8_t*)reasonString, strlen(reasonString));
+          char *reasonString = (char *)(data + 2);
+          if (reasonCode > 1001) {
+            _server->_handleEvent(this, WS_EVT_ERROR, (void *)&reasonCode, (uint8_t *)reasonString, strlen(reasonString));
           }
         }
-        if(_status == WS_DISCONNECTING){
+        if (_status == WS_DISCONNECTING) {
           _status = WS_DISCONNECTED;
-          _client->close(true);
+          if (_client) {
+            _client->close(true);
+          }
         } else {
           _status = WS_DISCONNECTING;
-          _client->ackLater();
-          _queueControl(new AsyncWebSocketControl(WS_DISCONNECT, data, datalen));
+          if (_client) {
+            _client->ackLater();
+          }
+          _queueControl(WS_DISCONNECT, data, datalen);
+        }
+      } else if (_pinfo.opcode == WS_PING) {
+        _server->_handleEvent(this, WS_EVT_PING, NULL, NULL, 0);
+        _queueControl(WS_PONG, data, datalen);
+      } else if (_pinfo.opcode == WS_PONG) {
+        if (datalen != AWSC_PING_PAYLOAD_LEN || memcmp(AWSC_PING_PAYLOAD, data, AWSC_PING_PAYLOAD_LEN) != 0) {
+          _server->_handleEvent(this, WS_EVT_PONG, NULL, NULL, 0);
         }
-      } else if(_pinfo.opcode == WS_PING){
-        _queueControl(new AsyncWebSocketControl(WS_PONG, data, datalen));
-      } else if(_pinfo.opcode == WS_PONG){
-        if(datalen != AWSC_PING_PAYLOAD_LEN || memcmp(AWSC_PING_PAYLOAD, data, AWSC_PING_PAYLOAD_LEN) != 0)
-          _server->_handleEvent(this, WS_EVT_PONG, NULL, data, datalen);
-      } else if(_pinfo.opcode < 8){//continuation or text/binary frame
+      } else if (_pinfo.opcode < WS_DISCONNECT) {  // continuation or text/binary frame
         _server->_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, data, datalen);
+        if (_pinfo.final) {
+          _pinfo.num = 0;
+        } else {
+          _pinfo.num += 1;
+        }
       }
     } else {
-      //os_printf("frame error: len: %u, index: %llu, total: %llu\n", datalen, _pinfo.index, _pinfo.len);
-      //what should we do?
+      // os_printf("frame error: len: %u, index: %llu, total: %llu\n", datalen, _pinfo.index, _pinfo.len);
+      // what should we do?
       break;
     }
 
     // restore byte as _handleEvent may have added a null terminator i.e., data[len] = 0;
-    if (datalen > 0)
+    if (datalen) {
       data[datalen] = datalast;
+    }
 
     data += datalen;
     plen -= datalen;
@@ -699,308 +691,479 @@ void AsyncWebSocketClient::_onData(void *pbuf, size_t plen){
 size_t AsyncWebSocketClient::printf(const char *format, ...) {
   va_list arg;
   va_start(arg, format);
-  char* temp = new char[MAX_PRINTF_LEN];
-  if(!temp){
-    va_end(arg);
-    return 0;
-  }
-  char* buffer = temp;
-  size_t len = vsnprintf(temp, MAX_PRINTF_LEN, format, arg);
+  size_t len = vsnprintf(nullptr, 0, format, arg);
   va_end(arg);
 
-  if (len > (MAX_PRINTF_LEN - 1)) {
-    buffer = new char[len + 1];
-    if (!buffer) {
-   	  delete[] temp;
-      return 0;
-    }
-    va_start(arg, format);
-    vsnprintf(buffer, len + 1, format, arg);
-    va_end(arg);
+  if (len == 0) {
+    return 0;
   }
-  text(buffer, len);
-  if (buffer != temp) {
-    delete[] buffer;
+
+  char *buffer = new char[len + 1];
+
+  if (!buffer) {
+    return 0;
   }
-  delete[] temp;
-  return len;
+
+  va_start(arg, format);
+  len = vsnprintf(buffer, len + 1, format, arg);
+  va_end(arg);
+
+  bool enqueued = text(buffer, len);
+  delete[] buffer;
+  return enqueued ? len : 0;
 }
 
-#ifndef ESP32
+#ifdef ESP8266
 size_t AsyncWebSocketClient::printf_P(PGM_P formatP, ...) {
   va_list arg;
   va_start(arg, formatP);
-  char* temp = new char[MAX_PRINTF_LEN];
-  if(!temp){
-    va_end(arg);
-    return 0;
-  }
-  char* buffer = temp;
-  size_t len = vsnprintf_P(temp, MAX_PRINTF_LEN, formatP, arg);
+  size_t len = vsnprintf_P(nullptr, 0, formatP, arg);
   va_end(arg);
 
-  if (len > (MAX_PRINTF_LEN - 1)) {
-    buffer = new char[len + 1];
-    if (!buffer) {
-   	  delete[] temp;
-      return 0;
-    }
-    va_start(arg, formatP);
-    vsnprintf_P(buffer, len + 1, formatP, arg);
-    va_end(arg);
+  if (len == 0) {
+    return 0;
   }
-  text(buffer, len);
-  if (buffer != temp) {
-    delete[] buffer;
+
+  char *buffer = new char[len + 1];
+
+  if (!buffer) {
+    return 0;
   }
-  delete[] temp;
-  return len;
+
+  va_start(arg, formatP);
+  len = vsnprintf_P(buffer, len + 1, formatP, arg);
+  va_end(arg);
+
+  bool enqueued = text(buffer, len);
+  delete[] buffer;
+  return enqueued ? len : 0;
 }
 #endif
 
-void AsyncWebSocketClient::text(const char * message, size_t len){
-  _queueMessage(new AsyncWebSocketBasicMessage(message, len));
+namespace {
+AsyncWebSocketSharedBuffer makeSharedBuffer(const uint8_t *message, size_t len) {
+  auto buffer = std::make_shared>(len);
+  std::memcpy(buffer->data(), message, len);
+  return buffer;
 }
-void AsyncWebSocketClient::text(const char * message){
-  text(message, strlen(message));
+}  // namespace
+
+bool AsyncWebSocketClient::text(AsyncWebSocketMessageBuffer *buffer) {
+  bool enqueued = false;
+  if (buffer) {
+    enqueued = text(std::move(buffer->_buffer));
+    delete buffer;
+  }
+  return enqueued;
 }
-void AsyncWebSocketClient::text(uint8_t * message, size_t len){
-  text((const char *)message, len);
+
+bool AsyncWebSocketClient::text(AsyncWebSocketSharedBuffer buffer) {
+  return _queueMessage(buffer);
 }
-void AsyncWebSocketClient::text(char * message){
-  text(message, strlen(message));
+
+bool AsyncWebSocketClient::text(const uint8_t *message, size_t len) {
+  return text(makeSharedBuffer(message, len));
 }
-void AsyncWebSocketClient::text(const String &message){
-  text(message.c_str(), message.length());
+
+bool AsyncWebSocketClient::text(const char *message, size_t len) {
+  return text((const uint8_t *)message, len);
 }
-void AsyncWebSocketClient::text(const __FlashStringHelper *data){
+
+bool AsyncWebSocketClient::text(const char *message) {
+  return text(message, strlen(message));
+}
+
+bool AsyncWebSocketClient::text(const String &message) {
+  return text(message.c_str(), message.length());
+}
+
+#ifdef ESP8266
+bool AsyncWebSocketClient::text(const __FlashStringHelper *data) {
   PGM_P p = reinterpret_cast(data);
+
   size_t n = 0;
   while (1) {
-    if (pgm_read_byte(p+n) == 0) break;
-      n += 1;
+    if (pgm_read_byte(p + n) == 0) {
+      break;
+    }
+    n += 1;
   }
-  char * message = (char*) malloc(n+1);
-  if(message){
-    for(size_t b=0; b_buffer));
+    delete buffer;
+  }
+  return enqueued;
 }
 
-void AsyncWebSocketClient::binary(const char * message, size_t len){
-  _queueMessage(new AsyncWebSocketBasicMessage(message, len, WS_BINARY));
+bool AsyncWebSocketClient::binary(AsyncWebSocketSharedBuffer buffer) {
+  return _queueMessage(buffer, WS_BINARY);
 }
-void AsyncWebSocketClient::binary(const char * message){
-  binary(message, strlen(message));
+
+bool AsyncWebSocketClient::binary(const uint8_t *message, size_t len) {
+  return binary(makeSharedBuffer(message, len));
 }
-void AsyncWebSocketClient::binary(uint8_t * message, size_t len){
-  binary((const char *)message, len);
+
+bool AsyncWebSocketClient::binary(const char *message, size_t len) {
+  return binary((const uint8_t *)message, len);
 }
-void AsyncWebSocketClient::binary(char * message){
-  binary(message, strlen(message));
+
+bool AsyncWebSocketClient::binary(const char *message) {
+  return binary(message, strlen(message));
 }
-void AsyncWebSocketClient::binary(const String &message){
-  binary(message.c_str(), message.length());
+
+bool AsyncWebSocketClient::binary(const String &message) {
+  return binary(message.c_str(), message.length());
 }
-void AsyncWebSocketClient::binary(const __FlashStringHelper *data, size_t len){
+
+#ifdef ESP8266
+bool AsyncWebSocketClient::binary(const __FlashStringHelper *data, size_t len) {
   PGM_P p = reinterpret_cast(data);
-  char * message = (char*) malloc(len);
-  if(message){
-    for(size_t b=0; bremoteIP();
-}
+IPAddress AsyncWebSocketClient::remoteIP() const {
+  if (!_client) {
+    return IPAddress((uint32_t)0U);
+  }
 
-uint16_t AsyncWebSocketClient::remotePort() {
-    if(!_client) {
-        return 0;
-    }
-    return _client->remotePort();
+  return _client->remoteIP();
 }
 
+uint16_t AsyncWebSocketClient::remotePort() const {
+  if (!_client) {
+    return 0;
+  }
 
+  return _client->remotePort();
+}
 
 /*
  * Async Web Socket - Each separate socket location
  */
 
-AsyncWebSocket::AsyncWebSocket(const String& url)
-  :_url(url)
-  ,_clients(LinkedList([](AsyncWebSocketClient *c){ delete c; }))
-  ,_cNextId(1)
-  ,_enabled(true)
-  ,_buffers(LinkedList([](AsyncWebSocketMessageBuffer *b){ delete b; }))
-{
-  _eventHandler = NULL;
+void AsyncWebSocket::_handleEvent(AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
+  if (_eventHandler != NULL) {
+    _eventHandler(this, client, type, arg, data, len);
+  }
 }
 
-AsyncWebSocket::~AsyncWebSocket(){}
+AsyncWebSocketClient *AsyncWebSocket::_newClient(AsyncWebServerRequest *request) {
+  _clients.emplace_back(request, this);
+  _handleEvent(&_clients.back(), WS_EVT_CONNECT, request, NULL, 0);
+  return &_clients.back();
+}
 
-void AsyncWebSocket::_handleEvent(AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){
-  if(_eventHandler != NULL){
-    _eventHandler(this, client, type, arg, data, len);
+void AsyncWebSocket::_handleDisconnect(AsyncWebSocketClient *client) {
+  const auto client_id = client->id();
+  const auto iter = std::find_if(std::begin(_clients), std::end(_clients), [client_id](const AsyncWebSocketClient &c) {
+    return c.id() == client_id;
+  });
+  if (iter != std::end(_clients)) {
+    _clients.erase(iter);
   }
 }
 
-void AsyncWebSocket::_addClient(AsyncWebSocketClient * client){
-  _clients.add(client);
+bool AsyncWebSocket::availableForWriteAll() {
+  return std::none_of(std::begin(_clients), std::end(_clients), [](const AsyncWebSocketClient &c) {
+    return c.queueIsFull();
+  });
 }
 
-void AsyncWebSocket::_handleDisconnect(AsyncWebSocketClient * client){
+bool AsyncWebSocket::availableForWrite(uint32_t id) {
+  const auto iter = std::find_if(std::begin(_clients), std::end(_clients), [id](const AsyncWebSocketClient &c) {
+    return c.id() == id;
+  });
+  if (iter == std::end(_clients)) {
+    return true;
+  }
+  return !iter->queueIsFull();
+}
 
-  _clients.remove_first([=](AsyncWebSocketClient * c){
-    return c->id() == client->id();
+size_t AsyncWebSocket::count() const {
+  return std::count_if(std::begin(_clients), std::end(_clients), [](const AsyncWebSocketClient &c) {
+    return c.status() == WS_CONNECTED;
   });
 }
 
-bool AsyncWebSocket::availableForWriteAll(){
-  for(const auto& c: _clients){
-    if(c->queueIsFull()) return false;
+AsyncWebSocketClient *AsyncWebSocket::client(uint32_t id) {
+  const auto iter = std::find_if(_clients.begin(), _clients.end(), [id](const AsyncWebSocketClient &c) {
+    return c.id() == id && c.status() == WS_CONNECTED;
+  });
+  if (iter == std::end(_clients)) {
+    return nullptr;
   }
-  return true;
+
+  return &(*iter);
 }
 
-bool AsyncWebSocket::availableForWrite(uint32_t id){
-  for(const auto& c: _clients){
-    if(c->queueIsFull() && (c->id() == id )) return false;
+void AsyncWebSocket::close(uint32_t id, uint16_t code, const char *message) {
+  if (AsyncWebSocketClient *c = client(id)) {
+    c->close(code, message);
   }
-  return true;
 }
 
-size_t AsyncWebSocket::count() const {
-  return _clients.count_if([](AsyncWebSocketClient * c){
-    return c->status() == WS_CONNECTED;
-  });
+void AsyncWebSocket::closeAll(uint16_t code, const char *message) {
+  for (auto &c : _clients) {
+    if (c.status() == WS_CONNECTED) {
+      c.close(code, message);
+    }
+  }
 }
 
-AsyncWebSocketClient * AsyncWebSocket::client(uint32_t id){
-  for(const auto &c: _clients){
-    if(c->id() == id && c->status() == WS_CONNECTED){
-      return c;
+void AsyncWebSocket::cleanupClients(uint16_t maxClients) {
+  if (count() > maxClients) {
+    _clients.front().close();
+  }
+
+  for (auto i = _clients.begin(); i != _clients.end(); ++i) {
+    if (i->shouldBeDeleted()) {
+      _clients.erase(i);
+      break;
     }
   }
-  return nullptr;
 }
 
+bool AsyncWebSocket::ping(uint32_t id, const uint8_t *data, size_t len) {
+  AsyncWebSocketClient *c = client(id);
+  return c && c->ping(data, len);
+}
 
-void AsyncWebSocket::close(uint32_t id, uint16_t code, const char * message){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->close(code, message);
+AsyncWebSocket::SendStatus AsyncWebSocket::pingAll(const uint8_t *data, size_t len) {
+  size_t hit = 0;
+  size_t miss = 0;
+  for (auto &c : _clients) {
+    if (c.status() == WS_CONNECTED && c.ping(data, len)) {
+      hit++;
+    } else {
+      miss++;
+    }
+  }
+  return hit == 0 ? DISCARDED : (miss == 0 ? ENQUEUED : PARTIALLY_ENQUEUED);
+}
+
+bool AsyncWebSocket::text(uint32_t id, const uint8_t *message, size_t len) {
+  AsyncWebSocketClient *c = client(id);
+  return c && c->text(makeSharedBuffer(message, len));
+}
+bool AsyncWebSocket::text(uint32_t id, const char *message, size_t len) {
+  return text(id, (const uint8_t *)message, len);
+}
+bool AsyncWebSocket::text(uint32_t id, const char *message) {
+  return text(id, message, strlen(message));
+}
+bool AsyncWebSocket::text(uint32_t id, const String &message) {
+  return text(id, message.c_str(), message.length());
 }
 
-void AsyncWebSocket::closeAll(uint16_t code, const char * message){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->close(code, message);
+#ifdef ESP8266
+bool AsyncWebSocket::text(uint32_t id, const __FlashStringHelper *data) {
+  PGM_P p = reinterpret_cast(data);
+
+  size_t n = 0;
+  while (true) {
+    if (pgm_read_byte(p + n) == 0) {
+      break;
+    }
+    n += 1;
+  }
+
+  char *message = (char *)malloc(n + 1);
+  bool enqueued = false;
+  if (message) {
+    memcpy_P(message, p, n);
+    message[n] = 0;
+    enqueued = text(id, message, n);
+    free(message);
   }
+  return enqueued;
 }
+#endif  // ESP8266
 
-void AsyncWebSocket::cleanupClients(uint16_t maxClients)
-{
-  if (count() > maxClients){
-    _clients.front()->close();
+bool AsyncWebSocket::text(uint32_t id, AsyncWebSocketMessageBuffer *buffer) {
+  bool enqueued = false;
+  if (buffer) {
+    enqueued = text(id, std::move(buffer->_buffer));
+    delete buffer;
   }
+  return enqueued;
+}
+bool AsyncWebSocket::text(uint32_t id, AsyncWebSocketSharedBuffer buffer) {
+  AsyncWebSocketClient *c = client(id);
+  return c && c->text(buffer);
 }
 
-void AsyncWebSocket::ping(uint32_t id, uint8_t *data, size_t len){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->ping(data, len);
+AsyncWebSocket::SendStatus AsyncWebSocket::textAll(const uint8_t *message, size_t len) {
+  return textAll(makeSharedBuffer(message, len));
+}
+AsyncWebSocket::SendStatus AsyncWebSocket::textAll(const char *message, size_t len) {
+  return textAll((const uint8_t *)message, len);
+}
+AsyncWebSocket::SendStatus AsyncWebSocket::textAll(const char *message) {
+  return textAll(message, strlen(message));
 }
+AsyncWebSocket::SendStatus AsyncWebSocket::textAll(const String &message) {
+  return textAll(message.c_str(), message.length());
+}
+#ifdef ESP8266
+AsyncWebSocket::SendStatus AsyncWebSocket::textAll(const __FlashStringHelper *data) {
+  PGM_P p = reinterpret_cast(data);
 
-void AsyncWebSocket::pingAll(uint8_t *data, size_t len){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->ping(data, len);
+  size_t n = 0;
+  while (1) {
+    if (pgm_read_byte(p + n) == 0) {
+      break;
+    }
+    n += 1;
   }
-}
 
-void AsyncWebSocket::text(uint32_t id, const char * message, size_t len){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->text(message, len);
+  char *message = (char *)malloc(n + 1);
+  AsyncWebSocket::SendStatus status = DISCARDED;
+  if (message) {
+    memcpy_P(message, p, n);
+    message[n] = 0;
+    status = textAll(message, n);
+    free(message);
+  }
+  return status;
+}
+#endif  // ESP8266
+AsyncWebSocket::SendStatus AsyncWebSocket::textAll(AsyncWebSocketMessageBuffer *buffer) {
+  AsyncWebSocket::SendStatus status = DISCARDED;
+  if (buffer) {
+    status = textAll(std::move(buffer->_buffer));
+    delete buffer;
+  }
+  return status;
 }
 
-void AsyncWebSocket::textAll(AsyncWebSocketMessageBuffer * buffer){
-  if (!buffer) return;
-  buffer->lock();
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED){
-        c->text(buffer);
+AsyncWebSocket::SendStatus AsyncWebSocket::textAll(AsyncWebSocketSharedBuffer buffer) {
+  size_t hit = 0;
+  size_t miss = 0;
+  for (auto &c : _clients) {
+    if (c.status() == WS_CONNECTED && c.text(buffer)) {
+      hit++;
+    } else {
+      miss++;
     }
   }
-  buffer->unlock();
-  _cleanBuffers();
+  return hit == 0 ? DISCARDED : (miss == 0 ? ENQUEUED : PARTIALLY_ENQUEUED);
 }
 
+bool AsyncWebSocket::binary(uint32_t id, const uint8_t *message, size_t len) {
+  AsyncWebSocketClient *c = client(id);
+  return c && c->binary(makeSharedBuffer(message, len));
+}
+bool AsyncWebSocket::binary(uint32_t id, const char *message, size_t len) {
+  return binary(id, (const uint8_t *)message, len);
+}
+bool AsyncWebSocket::binary(uint32_t id, const char *message) {
+  return binary(id, message, strlen(message));
+}
+bool AsyncWebSocket::binary(uint32_t id, const String &message) {
+  return binary(id, message.c_str(), message.length());
+}
 
-void AsyncWebSocket::textAll(const char * message, size_t len){
-  AsyncWebSocketMessageBuffer * WSBuffer = makeBuffer((uint8_t *)message, len);
-    textAll(WSBuffer);
+#ifdef ESP8266
+bool AsyncWebSocket::binary(uint32_t id, const __FlashStringHelper *data, size_t len) {
+  PGM_P p = reinterpret_cast(data);
+  char *message = (char *)malloc(len);
+  bool enqueued = false;
+  if (message) {
+    memcpy_P(message, p, len);
+    enqueued = binary(id, message, len);
+    free(message);
+  }
+  return enqueued;
 }
+#endif  // ESP8266
 
-void AsyncWebSocket::binary(uint32_t id, const char * message, size_t len){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->binary(message, len);
+bool AsyncWebSocket::binary(uint32_t id, AsyncWebSocketMessageBuffer *buffer) {
+  bool enqueued = false;
+  if (buffer) {
+    enqueued = binary(id, std::move(buffer->_buffer));
+    delete buffer;
+  }
+  return enqueued;
+}
+bool AsyncWebSocket::binary(uint32_t id, AsyncWebSocketSharedBuffer buffer) {
+  AsyncWebSocketClient *c = client(id);
+  return c && c->binary(buffer);
 }
 
-void AsyncWebSocket::binaryAll(const char * message, size_t len){
-  AsyncWebSocketMessageBuffer * buffer = makeBuffer((uint8_t *)message, len);
-  binaryAll(buffer);
+AsyncWebSocket::SendStatus AsyncWebSocket::binaryAll(const uint8_t *message, size_t len) {
+  return binaryAll(makeSharedBuffer(message, len));
+}
+AsyncWebSocket::SendStatus AsyncWebSocket::binaryAll(const char *message, size_t len) {
+  return binaryAll((const uint8_t *)message, len);
+}
+AsyncWebSocket::SendStatus AsyncWebSocket::binaryAll(const char *message) {
+  return binaryAll(message, strlen(message));
+}
+AsyncWebSocket::SendStatus AsyncWebSocket::binaryAll(const String &message) {
+  return binaryAll(message.c_str(), message.length());
 }
 
-void AsyncWebSocket::binaryAll(AsyncWebSocketMessageBuffer * buffer)
-{
-  if (!buffer) return;
-  buffer->lock();
-    for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->binary(buffer);
+#ifdef ESP8266
+AsyncWebSocket::SendStatus AsyncWebSocket::binaryAll(const __FlashStringHelper *data, size_t len) {
+  PGM_P p = reinterpret_cast(data);
+  char *message = (char *)malloc(len);
+  AsyncWebSocket::SendStatus status = DISCARDED;
+  if (message) {
+    memcpy_P(message, p, len);
+    status = binaryAll(message, len);
+    free(message);
   }
-  buffer->unlock();
-  _cleanBuffers();
+  return status;
 }
+#endif  // ESP8266
 
-void AsyncWebSocket::message(uint32_t id, AsyncWebSocketMessage *message){
-  AsyncWebSocketClient * c = client(id);
-  if(c)
-    c->message(message);
+AsyncWebSocket::SendStatus AsyncWebSocket::binaryAll(AsyncWebSocketMessageBuffer *buffer) {
+  AsyncWebSocket::SendStatus status = DISCARDED;
+  if (buffer) {
+    status = binaryAll(std::move(buffer->_buffer));
+    delete buffer;
+  }
+  return status;
 }
-
-void AsyncWebSocket::messageAll(AsyncWebSocketMultiMessage *message){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->message(message);
+AsyncWebSocket::SendStatus AsyncWebSocket::binaryAll(AsyncWebSocketSharedBuffer buffer) {
+  size_t hit = 0;
+  size_t miss = 0;
+  for (auto &c : _clients) {
+    if (c.status() == WS_CONNECTED && c.binary(buffer)) {
+      hit++;
+    } else {
+      miss++;
+    }
   }
-  _cleanBuffers();
+  return hit == 0 ? DISCARDED : (miss == 0 ? ENQUEUED : PARTIALLY_ENQUEUED);
 }
 
-size_t AsyncWebSocket::printf(uint32_t id, const char *format, ...){
-  AsyncWebSocketClient * c = client(id);
-  if(c){
+size_t AsyncWebSocket::printf(uint32_t id, const char *format, ...) {
+  AsyncWebSocketClient *c = client(id);
+  if (c) {
     va_list arg;
     va_start(arg, format);
     size_t len = c->printf(format, arg);
@@ -1012,32 +1175,33 @@ size_t AsyncWebSocket::printf(uint32_t id, const char *format, ...){
 
 size_t AsyncWebSocket::printfAll(const char *format, ...) {
   va_list arg;
-  char* temp = new char[MAX_PRINTF_LEN];
-  if(!temp){
-    return 0;
-  }
   va_start(arg, format);
-  size_t len = vsnprintf(temp, MAX_PRINTF_LEN, format, arg);
+  size_t len = vsnprintf(nullptr, 0, format, arg);
   va_end(arg);
-  delete[] temp;
 
-  AsyncWebSocketMessageBuffer * buffer = makeBuffer(len);
+  if (len == 0) {
+    return 0;
+  }
+
+  char *buffer = new char[len + 1];
+
   if (!buffer) {
     return 0;
   }
 
   va_start(arg, format);
-  vsnprintf( (char *)buffer->get(), len + 1, format, arg);
+  len = vsnprintf(buffer, len + 1, format, arg);
   va_end(arg);
 
-  textAll(buffer);
-  return len;
+  AsyncWebSocket::SendStatus status = textAll(buffer, len);
+  delete[] buffer;
+  return status == DISCARDED ? 0 : len;
 }
 
-#ifndef ESP32
-size_t AsyncWebSocket::printf_P(uint32_t id, PGM_P formatP, ...){
-  AsyncWebSocketClient * c = client(id);
-  if(c != NULL){
+#ifdef ESP8266
+size_t AsyncWebSocket::printf_P(uint32_t id, PGM_P formatP, ...) {
+  AsyncWebSocketClient *c = client(id);
+  if (c != NULL) {
     va_list arg;
     va_start(arg, formatP);
     size_t len = c->printf_P(formatP, arg);
@@ -1046,188 +1210,100 @@ size_t AsyncWebSocket::printf_P(uint32_t id, PGM_P formatP, ...){
   }
   return 0;
 }
-#endif
 
 size_t AsyncWebSocket::printfAll_P(PGM_P formatP, ...) {
   va_list arg;
-  char* temp = new char[MAX_PRINTF_LEN];
-  if(!temp){
-    return 0;
-  }
   va_start(arg, formatP);
-  size_t len = vsnprintf_P(temp, MAX_PRINTF_LEN, formatP, arg);
+  size_t len = vsnprintf_P(nullptr, 0, formatP, arg);
   va_end(arg);
-  delete[] temp;
 
-  AsyncWebSocketMessageBuffer * buffer = makeBuffer(len + 1);
-  if (!buffer) {
+  if (len == 0) {
     return 0;
   }
 
-  va_start(arg, formatP);
-  vsnprintf_P((char *)buffer->get(), len + 1, formatP, arg);
-  va_end(arg);
-
-  textAll(buffer);
-  return len;
-}
+  char *buffer = new char[len + 1];
 
-void AsyncWebSocket::text(uint32_t id, const char * message){
-  text(id, message, strlen(message));
-}
-void AsyncWebSocket::text(uint32_t id, uint8_t * message, size_t len){
-  text(id, (const char *)message, len);
-}
-void AsyncWebSocket::text(uint32_t id, char * message){
-  text(id, message, strlen(message));
-}
-void AsyncWebSocket::text(uint32_t id, const String &message){
-  text(id, message.c_str(), message.length());
-}
-void AsyncWebSocket::text(uint32_t id, const __FlashStringHelper *message){
-  AsyncWebSocketClient * c = client(id);
-  if(c != NULL)
-    c->text(message);
-}
-void AsyncWebSocket::textAll(const char * message){
-  textAll(message, strlen(message));
-}
-void AsyncWebSocket::textAll(uint8_t * message, size_t len){
-  textAll((const char *)message, len);
-}
-void AsyncWebSocket::textAll(char * message){
-  textAll(message, strlen(message));
-}
-void AsyncWebSocket::textAll(const String &message){
-  textAll(message.c_str(), message.length());
-}
-void AsyncWebSocket::textAll(const __FlashStringHelper *message){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c->text(message);
-  }
-}
-void AsyncWebSocket::binary(uint32_t id, const char * message){
-  binary(id, message, strlen(message));
-}
-void AsyncWebSocket::binary(uint32_t id, uint8_t * message, size_t len){
-  binary(id, (const char *)message, len);
-}
-void AsyncWebSocket::binary(uint32_t id, char * message){
-  binary(id, message, strlen(message));
-}
-void AsyncWebSocket::binary(uint32_t id, const String &message){
-  binary(id, message.c_str(), message.length());
-}
-void AsyncWebSocket::binary(uint32_t id, const __FlashStringHelper *message, size_t len){
-  AsyncWebSocketClient * c = client(id);
-  if(c != NULL)
-    c-> binary(message, len);
-}
-void AsyncWebSocket::binaryAll(const char * message){
-  binaryAll(message, strlen(message));
-}
-void AsyncWebSocket::binaryAll(uint8_t * message, size_t len){
-  binaryAll((const char *)message, len);
-}
-void AsyncWebSocket::binaryAll(char * message){
-  binaryAll(message, strlen(message));
-}
-void AsyncWebSocket::binaryAll(const String &message){
-  binaryAll(message.c_str(), message.length());
-}
-void AsyncWebSocket::binaryAll(const __FlashStringHelper *message, size_t len){
-  for(const auto& c: _clients){
-    if(c->status() == WS_CONNECTED)
-      c-> binary(message, len);
+  if (!buffer) {
+    return 0;
   }
- }
 
-const char * WS_STR_CONNECTION = "Connection";
-const char * WS_STR_UPGRADE = "Upgrade";
-const char * WS_STR_ORIGIN = "Origin";
-const char * WS_STR_VERSION = "Sec-WebSocket-Version";
-const char * WS_STR_KEY = "Sec-WebSocket-Key";
-const char * WS_STR_PROTOCOL = "Sec-WebSocket-Protocol";
-const char * WS_STR_ACCEPT = "Sec-WebSocket-Accept";
-const char * WS_STR_UUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-
-bool AsyncWebSocket::canHandle(AsyncWebServerRequest *request){
-  if(!_enabled)
-    return false;
-
-  if(request->method() != HTTP_GET || !request->url().equals(_url) || !request->isExpectedRequestedConnType(RCT_WS))
-    return false;
+  va_start(arg, formatP);
+  len = vsnprintf_P(buffer, len + 1, formatP, arg);
+  va_end(arg);
 
-  request->addInterestingHeader(WS_STR_CONNECTION);
-  request->addInterestingHeader(WS_STR_UPGRADE);
-  request->addInterestingHeader(WS_STR_ORIGIN);
-  request->addInterestingHeader(WS_STR_VERSION);
-  request->addInterestingHeader(WS_STR_KEY);
-  request->addInterestingHeader(WS_STR_PROTOCOL);
-  return true;
+  AsyncWebSocket::SendStatus status = textAll(buffer, len);
+  delete[] buffer;
+  return status == DISCARDED ? 0 : len;
 }
+#endif
 
-void AsyncWebSocket::handleRequest(AsyncWebServerRequest *request){
-  if(!request->hasHeader(WS_STR_VERSION) || !request->hasHeader(WS_STR_KEY)){
+const char __WS_STR_CONNECTION[] PROGMEM = {"Connection"};
+const char __WS_STR_UPGRADE[] PROGMEM = {"Upgrade"};
+const char __WS_STR_ORIGIN[] PROGMEM = {"Origin"};
+const char __WS_STR_COOKIE[] PROGMEM = {"Cookie"};
+const char __WS_STR_VERSION[] PROGMEM = {"Sec-WebSocket-Version"};
+const char __WS_STR_KEY[] PROGMEM = {"Sec-WebSocket-Key"};
+const char __WS_STR_PROTOCOL[] PROGMEM = {"Sec-WebSocket-Protocol"};
+const char __WS_STR_ACCEPT[] PROGMEM = {"Sec-WebSocket-Accept"};
+const char __WS_STR_UUID[] PROGMEM = {"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"};
+
+#define WS_STR_UUID_LEN 36
+
+#define WS_STR_CONNECTION FPSTR(__WS_STR_CONNECTION)
+#define WS_STR_UPGRADE    FPSTR(__WS_STR_UPGRADE)
+#define WS_STR_ORIGIN     FPSTR(__WS_STR_ORIGIN)
+#define WS_STR_COOKIE     FPSTR(__WS_STR_COOKIE)
+#define WS_STR_VERSION    FPSTR(__WS_STR_VERSION)
+#define WS_STR_KEY        FPSTR(__WS_STR_KEY)
+#define WS_STR_PROTOCOL   FPSTR(__WS_STR_PROTOCOL)
+#define WS_STR_ACCEPT     FPSTR(__WS_STR_ACCEPT)
+#define WS_STR_UUID       FPSTR(__WS_STR_UUID)
+
+bool AsyncWebSocket::canHandle(AsyncWebServerRequest *request) const {
+  return _enabled && request->isWebSocketUpgrade() && request->url().equals(_url);
+}
+
+void AsyncWebSocket::handleRequest(AsyncWebServerRequest *request) {
+  if (!request->hasHeader(WS_STR_VERSION) || !request->hasHeader(WS_STR_KEY)) {
     request->send(400);
     return;
   }
-  if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str())){
-    return request->requestAuthentication();
+  if (_handshakeHandler != nullptr) {
+    if (!_handshakeHandler(request)) {
+      request->send(401);
+      return;
+    }
   }
-  AsyncWebHeader* version = request->getHeader(WS_STR_VERSION);
-  if(version->value().toInt() != 13){
+  const AsyncWebHeader *version = request->getHeader(WS_STR_VERSION);
+  if (version->value().toInt() != 13) {
     AsyncWebServerResponse *response = request->beginResponse(400);
-    response->addHeader(WS_STR_VERSION,"13");
+    response->addHeader(WS_STR_VERSION, T_13);
     request->send(response);
     return;
   }
-  AsyncWebHeader* key = request->getHeader(WS_STR_KEY);
+  const AsyncWebHeader *key = request->getHeader(WS_STR_KEY);
   AsyncWebServerResponse *response = new AsyncWebSocketResponse(key->value(), this);
-  if(request->hasHeader(WS_STR_PROTOCOL)){
-    AsyncWebHeader* protocol = request->getHeader(WS_STR_PROTOCOL);
-    //ToDo: check protocol
+  if (response == NULL) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    request->abort();
+    return;
+  }
+  if (request->hasHeader(WS_STR_PROTOCOL)) {
+    const AsyncWebHeader *protocol = request->getHeader(WS_STR_PROTOCOL);
+    // ToDo: check protocol
     response->addHeader(WS_STR_PROTOCOL, protocol->value());
   }
   request->send(response);
 }
 
-AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(size_t size)
-{
-  AsyncWebSocketMessageBuffer * buffer = new AsyncWebSocketMessageBuffer(size);
-  if (buffer) {
-    AsyncWebLockGuard l(_lock);
-    _buffers.add(buffer);
-  }
-  return buffer;
-}
-
-AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(uint8_t * data, size_t size)
-{
-  AsyncWebSocketMessageBuffer * buffer = new AsyncWebSocketMessageBuffer(data, size);
-
-  if (buffer) {
-    AsyncWebLockGuard l(_lock);
-    _buffers.add(buffer);
-  }
-
-  return buffer;
-}
-
-void AsyncWebSocket::_cleanBuffers()
-{
-  AsyncWebLockGuard l(_lock);
-
-  for(AsyncWebSocketMessageBuffer * c: _buffers){
-    if(c && c->canDelete()){
-        _buffers.remove(c);
-    }
-  }
+AsyncWebSocketMessageBuffer *AsyncWebSocket::makeBuffer(size_t size) {
+  return new AsyncWebSocketMessageBuffer(size);
 }
 
-AsyncWebSocket::AsyncWebSocketClientLinkedList AsyncWebSocket::getClients() const {
-  return _clients;
+AsyncWebSocketMessageBuffer *AsyncWebSocket::makeBuffer(const uint8_t *data, size_t size) {
+  return new AsyncWebSocketMessageBuffer(data, size);
 }
 
 /*
@@ -1235,64 +1311,65 @@ AsyncWebSocket::AsyncWebSocketClientLinkedList AsyncWebSocket::getClients() cons
  * Authentication code from https://github.com/Links2004/arduinoWebSockets/blob/master/src/WebSockets.cpp#L480
  */
 
-AsyncWebSocketResponse::AsyncWebSocketResponse(const String& key, AsyncWebSocket *server){
+AsyncWebSocketResponse::AsyncWebSocketResponse(const String &key, AsyncWebSocket *server) {
   _server = server;
   _code = 101;
   _sendContentLength = false;
 
-  uint8_t * hash = (uint8_t*)malloc(20);
-  if(hash == NULL){
-    _state = RESPONSE_FAILED;
-    return;
-  }
-  char * buffer = (char *) malloc(33);
-  if(buffer == NULL){
-    free(hash);
-    _state = RESPONSE_FAILED;
-    return;
-  }
-#ifdef ESP8266
+  uint8_t hash[20];
+  char buffer[33];
+
+#if defined(ESP8266) || defined(TARGET_RP2040) || defined(PICO_RP2040) || defined(PICO_RP2350) || defined(TARGET_RP2350)
   sha1(key + WS_STR_UUID, hash);
 #else
-  (String&)key += WS_STR_UUID;
+  String k;
+  if (!k.reserve(key.length() + WS_STR_UUID_LEN)) {
+    log_e("Failed to allocate");
+    return;
+  }
+  k.concat(key);
+  k.concat(WS_STR_UUID);
+#ifdef LIBRETINY
   mbedtls_sha1_context ctx;
   mbedtls_sha1_init(&ctx);
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
-  mbedtls_sha1_starts_ret(&ctx);
-  mbedtls_sha1_update_ret(&ctx, (const unsigned char*)key.c_str(), key.length());
-  mbedtls_sha1_finish_ret(&ctx, hash);
-#else
   mbedtls_sha1_starts(&ctx);
-  mbedtls_sha1_update(&ctx, (const unsigned char*)key.c_str(), key.length());
+  mbedtls_sha1_update(&ctx, (const uint8_t *)k.c_str(), k.length());
   mbedtls_sha1_finish(&ctx, hash);
-#endif
   mbedtls_sha1_free(&ctx);
+#else
+  SHA1Builder sha1;
+  sha1.begin();
+  sha1.add((const uint8_t *)k.c_str(), k.length());
+  sha1.calculate();
+  sha1.getBytes(hash);
+#endif
 #endif
   base64_encodestate _state;
   base64_init_encodestate(&_state);
-  int len = base64_encode_block((const char *) hash, 20, buffer, &_state);
+  int len = base64_encode_block((const char *)hash, 20, buffer, &_state);
   len = base64_encode_blockend((buffer + len), &_state);
   addHeader(WS_STR_CONNECTION, WS_STR_UPGRADE);
-  addHeader(WS_STR_UPGRADE, "websocket");
-  addHeader(WS_STR_ACCEPT,buffer);
-  free(buffer);
-  free(hash);
+  addHeader(WS_STR_UPGRADE, T_WS);
+  addHeader(WS_STR_ACCEPT, buffer);
 }
 
-void AsyncWebSocketResponse::_respond(AsyncWebServerRequest *request){
-  if(_state == RESPONSE_FAILED){
+void AsyncWebSocketResponse::_respond(AsyncWebServerRequest *request) {
+  if (_state == RESPONSE_FAILED) {
     request->client()->close(true);
     return;
   }
-  String out = _assembleHead(request->version());
+  String out;
+  _assembleHead(out, request->version());
   request->client()->write(out.c_str(), _headLength);
   _state = RESPONSE_WAIT_ACK;
 }
 
-size_t AsyncWebSocketResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
+size_t AsyncWebSocketResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time) {
   (void)time;
-  if(len){
-    new AsyncWebSocketClient(request, _server);
+
+  if (len) {
+    _server->_newClient(request);
   }
+
   return 0;
 }
diff --git a/src/AsyncWebSocket.h b/src/AsyncWebSocket.h
index d84879334..f93b0387a 100644
--- a/src/AsyncWebSocket.h
+++ b/src/AsyncWebSocket.h
@@ -1,54 +1,54 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
 #ifndef ASYNCWEBSOCKET_H_
 #define ASYNCWEBSOCKET_H_
 
 #include 
+
 #if defined(ESP32) || defined(LIBRETINY)
 #include 
+#ifdef LIBRETINY
+#ifdef round
+#undef round
+#endif
+#endif
+#include 
 #ifndef WS_MAX_QUEUED_MESSAGES
 #define WS_MAX_QUEUED_MESSAGES 32
 #endif
-#else
+#elif defined(ESP8266)
 #include 
 #ifndef WS_MAX_QUEUED_MESSAGES
 #define WS_MAX_QUEUED_MESSAGES 8
 #endif
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#ifndef WS_MAX_QUEUED_MESSAGES
+#define WS_MAX_QUEUED_MESSAGES 32
+#endif
 #endif
+
 #include 
 
-#include "AsyncWebSynchronization.h"
+#include 
 
 #ifdef ESP8266
 #include 
-#ifdef CRYPTO_HASH_h // include Hash.h from espressif framework if the first include was from the crypto library
+#ifdef CRYPTO_HASH_h  // include Hash.h from espressif framework if the first include was from the crypto library
 #include <../src/Hash.h>
 #endif
 #endif
 
-#if defined(ESP32) || defined(LIBRETINY)
+#ifndef DEFAULT_MAX_WS_CLIENTS
+#ifdef ESP32
 #define DEFAULT_MAX_WS_CLIENTS 8
 #else
 #define DEFAULT_MAX_WS_CLIENTS 4
 #endif
+#endif
+
+using AsyncWebSocketSharedBuffer = std::shared_ptr>;
 
 class AsyncWebSocket;
 class AsyncWebSocketResponse;
@@ -56,299 +56,450 @@ class AsyncWebSocketClient;
 class AsyncWebSocketControl;
 
 typedef struct {
-    /** Message type as defined by enum AwsFrameType.
+  /** Message type as defined by enum AwsFrameType.
      * Note: Applications will only see WS_TEXT and WS_BINARY.
      * All other types are handled by the library. */
-    uint8_t message_opcode;
-    /** Frame number of a fragmented message. */
-    uint32_t num;
-    /** Is this the last frame in a fragmented message ?*/
-    uint8_t final;
-    /** Is this frame masked? */
-    uint8_t masked;
-    /** Message type as defined by enum AwsFrameType.
+  uint8_t message_opcode;
+  /** Frame number of a fragmented message. */
+  uint32_t num;
+  /** Is this the last frame in a fragmented message ?*/
+  uint8_t final;
+  /** Is this frame masked? */
+  uint8_t masked;
+  /** Message type as defined by enum AwsFrameType.
      * This value is the same as message_opcode for non-fragmented
      * messages, but may also be WS_CONTINUATION in a fragmented message. */
-    uint8_t opcode;
-    /** Length of the current frame.
+  uint8_t opcode;
+  /** Length of the current frame.
      * This equals the total length of the message if num == 0 && final == true */
-    uint64_t len;
-    /** Mask key */
-    uint8_t mask[4];
-    /** Offset of the data inside the current frame. */
-    uint64_t index;
+  uint64_t len;
+  /** Mask key */
+  uint8_t mask[4];
+  /** Offset of the data inside the current frame. */
+  uint64_t index;
 } AwsFrameInfo;
 
-typedef enum { WS_DISCONNECTED, WS_CONNECTED, WS_DISCONNECTING } AwsClientStatus;
-typedef enum { WS_CONTINUATION, WS_TEXT, WS_BINARY, WS_DISCONNECT = 0x08, WS_PING, WS_PONG } AwsFrameType;
-typedef enum { WS_MSG_SENDING, WS_MSG_SENT, WS_MSG_ERROR } AwsMessageStatus;
-typedef enum { WS_EVT_CONNECT, WS_EVT_DISCONNECT, WS_EVT_PONG, WS_EVT_ERROR, WS_EVT_DATA } AwsEventType;
+typedef enum {
+  WS_DISCONNECTED,
+  WS_CONNECTED,
+  WS_DISCONNECTING
+} AwsClientStatus;
+typedef enum {
+  WS_CONTINUATION,
+  WS_TEXT,
+  WS_BINARY,
+  WS_DISCONNECT = 0x08,
+  WS_PING,
+  WS_PONG
+} AwsFrameType;
+typedef enum {
+  WS_MSG_SENDING,
+  WS_MSG_SENT,
+  WS_MSG_ERROR
+} AwsMessageStatus;
+typedef enum {
+  WS_EVT_CONNECT,
+  WS_EVT_DISCONNECT,
+  WS_EVT_PING,
+  WS_EVT_PONG,
+  WS_EVT_ERROR,
+  WS_EVT_DATA
+} AwsEventType;
 
 class AsyncWebSocketMessageBuffer {
-  private:
-    uint8_t * _data;
-    size_t _len;
-    bool _lock; 
-    uint32_t _count;  
-
-  public:
-    AsyncWebSocketMessageBuffer();
-    AsyncWebSocketMessageBuffer(size_t size);
-    AsyncWebSocketMessageBuffer(uint8_t * data, size_t size); 
-    AsyncWebSocketMessageBuffer(const AsyncWebSocketMessageBuffer &); 
-    AsyncWebSocketMessageBuffer(AsyncWebSocketMessageBuffer &&); 
-    ~AsyncWebSocketMessageBuffer(); 
-    void operator ++(int i) { (void)i; _count++; }
-    void operator --(int i) { (void)i; if (_count > 0) { _count--; } ;  }
-    bool reserve(size_t size);
-    void lock() { _lock = true; }
-    void unlock() { _lock = false; }
-    uint8_t * get() { return _data; }
-    size_t length() { return _len; }
-    uint32_t count() { return _count; }
-    bool canDelete() { return (!_count && !_lock); } 
-
-    friend AsyncWebSocket; 
+  friend AsyncWebSocket;
+  friend AsyncWebSocketClient;
+
+private:
+  AsyncWebSocketSharedBuffer _buffer;
 
+public:
+  AsyncWebSocketMessageBuffer() {}
+  explicit AsyncWebSocketMessageBuffer(size_t size);
+  AsyncWebSocketMessageBuffer(const uint8_t *data, size_t size);
+  //~AsyncWebSocketMessageBuffer();
+  bool reserve(size_t size);
+  uint8_t *get() {
+    return _buffer->data();
+  }
+  size_t length() const {
+    return _buffer->size();
+  }
 };
 
 class AsyncWebSocketMessage {
-  protected:
-    uint8_t _opcode;
-    bool _mask;
-    AwsMessageStatus _status;
-  public:
-    AsyncWebSocketMessage():_opcode(WS_TEXT),_mask(false),_status(WS_MSG_ERROR){}
-    virtual ~AsyncWebSocketMessage(){}
-    virtual void ack(size_t len __attribute__((unused)), uint32_t time __attribute__((unused))){}
-    virtual size_t send(AsyncClient *client __attribute__((unused))){ return 0; }
-    virtual bool finished(){ return _status != WS_MSG_SENDING; }
-    virtual bool betweenFrames() const { return false; }
-};
+private:
+  AsyncWebSocketSharedBuffer _WSbuffer;
+  uint8_t _opcode{WS_TEXT};
+  bool _mask{false};
+  AwsMessageStatus _status{WS_MSG_ERROR};
+  size_t _sent{};
+  size_t _ack{};
+  size_t _acked{};
 
-class AsyncWebSocketBasicMessage: public AsyncWebSocketMessage {
-  private:
-    size_t _len;
-    size_t _sent;
-    size_t _ack;
-    size_t _acked;
-    uint8_t * _data;
 public:
-    AsyncWebSocketBasicMessage(const char * data, size_t len, uint8_t opcode=WS_TEXT, bool mask=false);
-    AsyncWebSocketBasicMessage(uint8_t opcode=WS_TEXT, bool mask=false);
-    virtual ~AsyncWebSocketBasicMessage() override;
-    virtual bool betweenFrames() const override { return _acked == _ack; }
-    virtual void ack(size_t len, uint32_t time) override ;
-    virtual size_t send(AsyncClient *client) override ;
-};
+  AsyncWebSocketMessage(AsyncWebSocketSharedBuffer buffer, uint8_t opcode = WS_TEXT, bool mask = false);
 
-class AsyncWebSocketMultiMessage: public AsyncWebSocketMessage {
-  private:
-    uint8_t * _data;
-    size_t _len;
-    size_t _sent;
-    size_t _ack;
-    size_t _acked;
-    AsyncWebSocketMessageBuffer * _WSbuffer; 
-public:
-    AsyncWebSocketMultiMessage(AsyncWebSocketMessageBuffer * buffer, uint8_t opcode=WS_TEXT, bool mask=false); 
-    virtual ~AsyncWebSocketMultiMessage() override;
-    virtual bool betweenFrames() const override { return _acked == _ack; }
-    virtual void ack(size_t len, uint32_t time) override ;
-    virtual size_t send(AsyncClient *client) override ;
+  bool finished() const {
+    return _status != WS_MSG_SENDING;
+  }
+  bool betweenFrames() const {
+    return _acked == _ack;
+  }
+
+  void ack(size_t len, uint32_t time);
+  size_t send(AsyncClient *client);
 };
 
 class AsyncWebSocketClient {
-  private:
-    AsyncClient *_client;
-    AsyncWebSocket *_server;
-    uint32_t _clientId;
-    AwsClientStatus _status;
-
-    LinkedList _controlQueue;
-    LinkedList _messageQueue;
-
-    uint8_t _pstate;
-    AwsFrameInfo _pinfo;
-
-    uint32_t _lastMessageTime;
-    uint32_t _keepAlivePeriod;
-
-    void _queueMessage(AsyncWebSocketMessage *dataMessage);
-    void _queueControl(AsyncWebSocketControl *controlMessage);
-    void _runQueue();
-
-  public:
-    void *_tempObject;
-
-    AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server);
-    ~AsyncWebSocketClient();
-
-    //client id increments for the given server
-    uint32_t id(){ return _clientId; }
-    AwsClientStatus status(){ return _status; }
-    AsyncClient* client(){ return _client; }
-    AsyncWebSocket *server(){ return _server; }
-    AwsFrameInfo const &pinfo() const { return _pinfo; }
+private:
+  AsyncClient *_client;
+  AsyncWebSocket *_server;
+  uint32_t _clientId;
+  AwsClientStatus _status;
+#ifdef ESP32
+  mutable std::recursive_mutex _lock;
+#endif
+  std::deque _controlQueue;
+  std::deque _messageQueue;
+  bool closeWhenFull = true;
 
-    IPAddress remoteIP();
-    uint16_t  remotePort();
+  uint8_t _pstate;
+  AwsFrameInfo _pinfo;
 
-    //control frames
-    void close(uint16_t code=0, const char * message=NULL);
-    void ping(uint8_t *data=NULL, size_t len=0);
+  uint32_t _lastMessageTime;
+  uint32_t _keepAlivePeriod;
 
-    //set auto-ping period in seconds. disabled if zero (default)
-    void keepAlivePeriod(uint16_t seconds){
-      _keepAlivePeriod = seconds * 1000;
-    }
-    uint16_t keepAlivePeriod(){
-      return (uint16_t)(_keepAlivePeriod / 1000);
-    }
+  bool _queueControl(uint8_t opcode, const uint8_t *data = NULL, size_t len = 0, bool mask = false);
+  bool _queueMessage(AsyncWebSocketSharedBuffer buffer, uint8_t opcode = WS_TEXT, bool mask = false);
+  void _runQueue();
+  void _clearQueue();
 
-    //data packets
-    void message(AsyncWebSocketMessage *message){ _queueMessage(message); }
-    bool queueIsFull();
+public:
+  void *_tempObject;
+
+  AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server);
+  ~AsyncWebSocketClient();
+
+  // client id increments for the given server
+  uint32_t id() const {
+    return _clientId;
+  }
+  AwsClientStatus status() const {
+    return _status;
+  }
+  AsyncClient *client() {
+    return _client;
+  }
+  const AsyncClient *client() const {
+    return _client;
+  }
+  AsyncWebSocket *server() {
+    return _server;
+  }
+  const AsyncWebSocket *server() const {
+    return _server;
+  }
+  AwsFrameInfo const &pinfo() const {
+    return _pinfo;
+  }
+
+  //  - If "true" (default), the connection will be closed if the message queue is full.
+  // This is the default behavior in yubox-node-org, which is not silently discarding messages but instead closes the connection.
+  // The big issue with this behavior is  that is can cause the UI to automatically re-create a new WS connection, which can be filled again,
+  // and so on, causing a resource exhaustion.
+  //
+  // - If "false", the incoming message will be discarded if the queue is full.
+  // This is the default behavior in the original ESPAsyncWebServer library from me-no-dev.
+  // This behavior allows the best performance at the expense of unreliable message delivery in case the queue is full (some messages may be lost).
+  //
+  // - In any case, when the queue is full, a message is logged.
+  // - IT is recommended to use the methods queueIsFull(), availableForWriteAll(), availableForWrite(clientId) to check if the queue is full before sending a message.
+  //
+  // Usage:
+  //  - can be set in the onEvent listener when connecting (event type is: WS_EVT_CONNECT)
+  //
+  // Use cases:,
+  // - if using websocket to send logging messages, maybe some loss is acceptable.
+  // - But if using websocket to send UI update messages, maybe the connection should be closed and the UI redrawn.
+  void setCloseClientOnQueueFull(bool close) {
+    closeWhenFull = close;
+  }
+  bool willCloseClientOnQueueFull() const {
+    return closeWhenFull;
+  }
+
+  IPAddress remoteIP() const;
+  uint16_t remotePort() const;
+
+  bool shouldBeDeleted() const {
+    return !_client;
+  }
+
+  // control frames
+  void close(uint16_t code = 0, const char *message = NULL);
+  bool ping(const uint8_t *data = NULL, size_t len = 0);
+
+  // set auto-ping period in seconds. disabled if zero (default)
+  void keepAlivePeriod(uint16_t seconds) {
+    _keepAlivePeriod = seconds * 1000;
+  }
+  uint16_t keepAlivePeriod() {
+    return (uint16_t)(_keepAlivePeriod / 1000);
+  }
+
+  // data packets
+  void message(AsyncWebSocketSharedBuffer buffer, uint8_t opcode = WS_TEXT, bool mask = false) {
+    _queueMessage(buffer, opcode, mask);
+  }
+  bool queueIsFull() const;
+  size_t queueLen() const;
+
+  size_t printf(const char *format, ...) __attribute__((format(printf, 2, 3)));
+
+  bool text(AsyncWebSocketSharedBuffer buffer);
+  bool text(const uint8_t *message, size_t len);
+  bool text(const char *message, size_t len);
+  bool text(const char *message);
+  bool text(const String &message);
+  bool text(AsyncWebSocketMessageBuffer *buffer);
+
+  bool binary(AsyncWebSocketSharedBuffer buffer);
+  bool binary(const uint8_t *message, size_t len);
+  bool binary(const char *message, size_t len);
+  bool binary(const char *message);
+  bool binary(const String &message);
+  bool binary(AsyncWebSocketMessageBuffer *buffer);
+
+  bool canSend() const;
+
+  // system callbacks (do not call)
+  void _onAck(size_t len, uint32_t time);
+  void _onError(int8_t);
+  void _onPoll();
+  void _onTimeout(uint32_t time);
+  void _onDisconnect();
+  void _onData(void *pbuf, size_t plen);
 
-    size_t printf(const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
-#ifndef ESP32
-    size_t printf_P(PGM_P formatP, ...)  __attribute__ ((format (printf, 2, 3)));
+#ifdef ESP8266
+  size_t printf_P(PGM_P formatP, ...) __attribute__((format(printf, 2, 3)));
+  bool text(const __FlashStringHelper *message);
+  bool binary(const __FlashStringHelper *message, size_t len);
 #endif
-    void text(const char * message, size_t len);
-    void text(const char * message);
-    void text(uint8_t * message, size_t len);
-    void text(char * message);
-    void text(const String &message);
-    void text(const __FlashStringHelper *data);
-    void text(AsyncWebSocketMessageBuffer *buffer); 
-
-    void binary(const char * message, size_t len);
-    void binary(const char * message);
-    void binary(uint8_t * message, size_t len);
-    void binary(char * message);
-    void binary(const String &message);
-    void binary(const __FlashStringHelper *data, size_t len);
-    void binary(AsyncWebSocketMessageBuffer *buffer); 
-
-    bool canSend() { return _messageQueue.length() < WS_MAX_QUEUED_MESSAGES; }
-
-    //system callbacks (do not call)
-    void _onAck(size_t len, uint32_t time);
-    void _onError(int8_t);
-    void _onPoll();
-    void _onTimeout(uint32_t time);
-    void _onDisconnect();
-    void _onData(void *pbuf, size_t plen);
 };
 
-typedef std::function AwsEventHandler;
-
-//WebServer Handler implementation that plays the role of a socket server
-class AsyncWebSocket: public AsyncWebHandler {
-  public:
-    typedef LinkedList AsyncWebSocketClientLinkedList;
-  private:
-    String _url;
-    AsyncWebSocketClientLinkedList _clients;
-    uint32_t _cNextId;
-    AwsEventHandler _eventHandler;
-    bool _enabled;
-    AsyncWebLock _lock;
-
-  public:
-    AsyncWebSocket(const String& url);
-    ~AsyncWebSocket();
-    const char * url() const { return _url.c_str(); }
-    void enable(bool e){ _enabled = e; }
-    bool enabled() const { return _enabled; }
-    bool availableForWriteAll();
-    bool availableForWrite(uint32_t id);
-
-    size_t count() const;
-    AsyncWebSocketClient * client(uint32_t id);
-    bool hasClient(uint32_t id){ return client(id) != NULL; }
-
-    void close(uint32_t id, uint16_t code=0, const char * message=NULL);
-    void closeAll(uint16_t code=0, const char * message=NULL);
-    void cleanupClients(uint16_t maxClients = DEFAULT_MAX_WS_CLIENTS);
-
-    void ping(uint32_t id, uint8_t *data=NULL, size_t len=0);
-    void pingAll(uint8_t *data=NULL, size_t len=0); //  done
-
-    void text(uint32_t id, const char * message, size_t len);
-    void text(uint32_t id, const char * message);
-    void text(uint32_t id, uint8_t * message, size_t len);
-    void text(uint32_t id, char * message);
-    void text(uint32_t id, const String &message);
-    void text(uint32_t id, const __FlashStringHelper *message);
-
-    void textAll(const char * message, size_t len);
-    void textAll(const char * message);
-    void textAll(uint8_t * message, size_t len);
-    void textAll(char * message);
-    void textAll(const String &message);
-    void textAll(const __FlashStringHelper *message); //  need to convert
-    void textAll(AsyncWebSocketMessageBuffer * buffer); 
-
-    void binary(uint32_t id, const char * message, size_t len);
-    void binary(uint32_t id, const char * message);
-    void binary(uint32_t id, uint8_t * message, size_t len);
-    void binary(uint32_t id, char * message);
-    void binary(uint32_t id, const String &message);
-    void binary(uint32_t id, const __FlashStringHelper *message, size_t len);
-
-    void binaryAll(const char * message, size_t len);
-    void binaryAll(const char * message);
-    void binaryAll(uint8_t * message, size_t len);
-    void binaryAll(char * message);
-    void binaryAll(const String &message);
-    void binaryAll(const __FlashStringHelper *message, size_t len);
-    void binaryAll(AsyncWebSocketMessageBuffer * buffer); 
-
-    void message(uint32_t id, AsyncWebSocketMessage *message);
-    void messageAll(AsyncWebSocketMultiMessage *message);
-
-    size_t printf(uint32_t id, const char *format, ...)  __attribute__ ((format (printf, 3, 4)));
-    size_t printfAll(const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
-#ifndef ESP32
-    size_t printf_P(uint32_t id, PGM_P formatP, ...)  __attribute__ ((format (printf, 3, 4)));
+using AwsHandshakeHandler = std::function;
+using AwsEventHandler = std::function;
+
+// WebServer Handler implementation that plays the role of a socket server
+class AsyncWebSocket : public AsyncWebHandler {
+private:
+  String _url;
+  std::list _clients;
+  uint32_t _cNextId;
+  AwsEventHandler _eventHandler;
+  AwsHandshakeHandler _handshakeHandler;
+  bool _enabled;
+#ifdef ESP32
+  mutable std::mutex _lock;
 #endif
-    size_t printfAll_P(PGM_P formatP, ...)  __attribute__ ((format (printf, 2, 3)));
 
-    //event listener
-    void onEvent(AwsEventHandler handler){
-      _eventHandler = handler;
-    }
+public:
+  typedef enum {
+    DISCARDED = 0,
+    ENQUEUED = 1,
+    PARTIALLY_ENQUEUED = 2,
+  } SendStatus;
+
+  explicit AsyncWebSocket(const char *url, AwsEventHandler handler = nullptr) : _url(url), _cNextId(1), _eventHandler(handler), _enabled(true) {}
+  AsyncWebSocket(const String &url, AwsEventHandler handler = nullptr) : _url(url), _cNextId(1), _eventHandler(handler), _enabled(true) {}
+  ~AsyncWebSocket(){};
+  const char *url() const {
+    return _url.c_str();
+  }
+  void enable(bool e) {
+    _enabled = e;
+  }
+  bool enabled() const {
+    return _enabled;
+  }
+  bool availableForWriteAll();
+  bool availableForWrite(uint32_t id);
+
+  size_t count() const;
+  AsyncWebSocketClient *client(uint32_t id);
+  bool hasClient(uint32_t id) {
+    return client(id) != nullptr;
+  }
+
+  void close(uint32_t id, uint16_t code = 0, const char *message = NULL);
+  void closeAll(uint16_t code = 0, const char *message = NULL);
+  void cleanupClients(uint16_t maxClients = DEFAULT_MAX_WS_CLIENTS);
+
+  bool ping(uint32_t id, const uint8_t *data = NULL, size_t len = 0);
+  SendStatus pingAll(const uint8_t *data = NULL, size_t len = 0);  //  done
+
+  bool text(uint32_t id, const uint8_t *message, size_t len);
+  bool text(uint32_t id, const char *message, size_t len);
+  bool text(uint32_t id, const char *message);
+  bool text(uint32_t id, const String &message);
+  bool text(uint32_t id, AsyncWebSocketMessageBuffer *buffer);
+  bool text(uint32_t id, AsyncWebSocketSharedBuffer buffer);
+
+  SendStatus textAll(const uint8_t *message, size_t len);
+  SendStatus textAll(const char *message, size_t len);
+  SendStatus textAll(const char *message);
+  SendStatus textAll(const String &message);
+  SendStatus textAll(AsyncWebSocketMessageBuffer *buffer);
+  SendStatus textAll(AsyncWebSocketSharedBuffer buffer);
+
+  bool binary(uint32_t id, const uint8_t *message, size_t len);
+  bool binary(uint32_t id, const char *message, size_t len);
+  bool binary(uint32_t id, const char *message);
+  bool binary(uint32_t id, const String &message);
+  bool binary(uint32_t id, AsyncWebSocketMessageBuffer *buffer);
+  bool binary(uint32_t id, AsyncWebSocketSharedBuffer buffer);
+
+  SendStatus binaryAll(const uint8_t *message, size_t len);
+  SendStatus binaryAll(const char *message, size_t len);
+  SendStatus binaryAll(const char *message);
+  SendStatus binaryAll(const String &message);
+  SendStatus binaryAll(AsyncWebSocketMessageBuffer *buffer);
+  SendStatus binaryAll(AsyncWebSocketSharedBuffer buffer);
+
+  size_t printf(uint32_t id, const char *format, ...) __attribute__((format(printf, 3, 4)));
+  size_t printfAll(const char *format, ...) __attribute__((format(printf, 2, 3)));
 
-    //system callbacks (do not call)
-    uint32_t _getNextId(){ return _cNextId++; }
-    void _addClient(AsyncWebSocketClient * client);
-    void _handleDisconnect(AsyncWebSocketClient * client);
-    void _handleEvent(AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
-    virtual bool canHandle(AsyncWebServerRequest *request) override final;
-    virtual void handleRequest(AsyncWebServerRequest *request) override final;
+#ifdef ESP8266
+  bool text(uint32_t id, const __FlashStringHelper *message);
+  SendStatus textAll(const __FlashStringHelper *message);
+  bool binary(uint32_t id, const __FlashStringHelper *message, size_t len);
+  SendStatus binaryAll(const __FlashStringHelper *message, size_t len);
+  size_t printf_P(uint32_t id, PGM_P formatP, ...) __attribute__((format(printf, 3, 4)));
+  size_t printfAll_P(PGM_P formatP, ...) __attribute__((format(printf, 2, 3)));
+#endif
 
+  void onEvent(AwsEventHandler handler) {
+    _eventHandler = handler;
+  }
+  void handleHandshake(AwsHandshakeHandler handler) {
+    _handshakeHandler = handler;
+  }
+
+  // system callbacks (do not call)
+  uint32_t _getNextId() {
+    return _cNextId++;
+  }
+  AsyncWebSocketClient *_newClient(AsyncWebServerRequest *request);
+  void _handleDisconnect(AsyncWebSocketClient *client);
+  void _handleEvent(AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len);
+  bool canHandle(AsyncWebServerRequest *request) const override final;
+  void handleRequest(AsyncWebServerRequest *request) override final;
+
+  //  messagebuffer functions/objects.
+  AsyncWebSocketMessageBuffer *makeBuffer(size_t size = 0);
+  AsyncWebSocketMessageBuffer *makeBuffer(const uint8_t *data, size_t size);
+
+  std::list &getClients() {
+    return _clients;
+  }
+};
 
-    //  messagebuffer functions/objects. 
-    AsyncWebSocketMessageBuffer * makeBuffer(size_t size = 0); 
-    AsyncWebSocketMessageBuffer * makeBuffer(uint8_t * data, size_t size); 
-    LinkedList _buffers;
-    void _cleanBuffers(); 
+// WebServer response to authenticate the socket and detach the tcp client from the web server request
+class AsyncWebSocketResponse : public AsyncWebServerResponse {
+private:
+  String _content;
+  AsyncWebSocket *_server;
 
-    AsyncWebSocketClientLinkedList getClients() const;
+public:
+  AsyncWebSocketResponse(const String &key, AsyncWebSocket *server);
+  void _respond(AsyncWebServerRequest *request);
+  size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
+  bool _sourceValid() const {
+    return true;
+  }
 };
 
-//WebServer response to authenticate the socket and detach the tcp client from the web server request
-class AsyncWebSocketResponse: public AsyncWebServerResponse {
-  private:
-    String _content;
-    AsyncWebSocket *_server;
-  public:
-    AsyncWebSocketResponse(const String& key, AsyncWebSocket *server);
-    void _respond(AsyncWebServerRequest *request);
-    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
-    bool _sourceValid() const { return true; }
+class AsyncWebSocketMessageHandler {
+public:
+  AwsEventHandler eventHandler() const {
+    return _handler;
+  }
+
+  void onConnect(std::function onConnect) {
+    _onConnect = onConnect;
+  }
+
+  void onDisconnect(std::function onDisconnect) {
+    _onDisconnect = onDisconnect;
+  }
+
+  /**
+   * Error callback
+   * @param reason null-terminated string
+   * @param len length of the string
+   */
+  void onError(std::function onError) {
+    _onError = onError;
+  }
+
+  /**
+   * Complete message callback
+   * @param data pointer to the data (binary or null-terminated string). This handler expects the user to know which data type he uses.
+   */
+  void onMessage(std::function onMessage) {
+    _onMessage = onMessage;
+  }
+
+  /**
+   * Fragmented message callback
+   * @param data pointer to the data (binary or null-terminated string), will be null-terminated. This handler expects the user to know which data type he uses.
+   */
+  // clang-format off
+  void onFragment(std::function onFragment) {
+    _onFragment = onFragment;
+  }
+  // clang-format on
+
+private:
+  // clang-format off
+  std::function _onConnect;
+  std::function _onError;
+  std::function _onMessage;
+  std::function _onFragment;
+  std::function _onDisconnect;
+  // clang-format on
+
+  // this handler is meant to only support 1-frame messages (== unfragmented messages)
+  AwsEventHandler _handler = [this](AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len) {
+    if (type == WS_EVT_CONNECT) {
+      if (_onConnect) {
+        _onConnect(server, client);
+      }
+    } else if (type == WS_EVT_DISCONNECT) {
+      if (_onDisconnect) {
+        _onDisconnect(server, client->id());
+      }
+    } else if (type == WS_EVT_ERROR) {
+      if (_onError) {
+        _onError(server, client, *((uint16_t *)arg), (const char *)data, len);
+      }
+    } else if (type == WS_EVT_DATA) {
+      AwsFrameInfo *info = (AwsFrameInfo *)arg;
+      if (info->opcode == WS_TEXT) {
+        data[len] = 0;
+      }
+      if (info->final && info->index == 0 && info->len == len) {
+        if (_onMessage) {
+          _onMessage(server, client, data, len);
+        }
+      } else {
+        if (_onFragment) {
+          _onFragment(server, client, info, data, len);
+        }
+      }
+    }
+  };
 };
 
-
 #endif /* ASYNCWEBSOCKET_H_ */
diff --git a/src/AsyncWebSynchronization.h b/src/AsyncWebSynchronization.h
deleted file mode 100644
index 5e45d4d57..000000000
--- a/src/AsyncWebSynchronization.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef ASYNCWEBSYNCHRONIZATION_H_
-#define ASYNCWEBSYNCHRONIZATION_H_
-
-// Synchronisation is only available on ESP32, as the ESP8266 isn't using FreeRTOS by default
-
-#include 
-
-#if defined(ESP32) || (defined(LIBRETINY) && LT_HAS_FREERTOS)
-
-// This is the ESP32 version of the Sync Lock, using the FreeRTOS Semaphore
-class AsyncWebLock
-{
-private:
-  SemaphoreHandle_t _lock;
-  mutable void *_lockedBy;
-
-public:
-  AsyncWebLock() {
-    _lock = xSemaphoreCreateBinary();
-    _lockedBy = NULL;
-    xSemaphoreGive(_lock);
-  }
-
-  ~AsyncWebLock() {
-    vSemaphoreDelete(_lock);
-  }
-
-  bool lock() const {
-    extern void *pxCurrentTCB;
-    if (_lockedBy != pxCurrentTCB) {
-      xSemaphoreTake(_lock, portMAX_DELAY);
-      _lockedBy = pxCurrentTCB;
-      return true;
-    }
-    return false;
-  }
-
-  void unlock() const {
-    _lockedBy = NULL;
-    xSemaphoreGive(_lock);
-  }
-};
-
-#else
-
-// This is the 8266 version of the Sync Lock which is currently unimplemented
-class AsyncWebLock
-{
-
-public:
-  AsyncWebLock() {
-  }
-
-  ~AsyncWebLock() {
-  }
-
-  bool lock() const {
-    return false;
-  }
-
-  void unlock() const {
-  }
-};
-#endif
-
-class AsyncWebLockGuard
-{
-private:
-  const AsyncWebLock *_lock;
-
-public:
-  AsyncWebLockGuard(const AsyncWebLock &l) {
-    if (l.lock()) {
-      _lock = &l;
-    } else {
-      _lock = NULL;
-    }
-  }
-
-  ~AsyncWebLockGuard() {
-    if (_lock) {
-      _lock->unlock();
-    }
-  }
-};
-
-#endif // ASYNCWEBSYNCHRONIZATION_H_
diff --git a/src/BackPort_SHA1Builder.cpp b/src/BackPort_SHA1Builder.cpp
new file mode 100644
index 000000000..06a73a5b8
--- /dev/null
+++ b/src/BackPort_SHA1Builder.cpp
@@ -0,0 +1,284 @@
+/*
+ *  FIPS-180-1 compliant SHA-1 implementation
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ *  Modified for esp32 by Lucas Saavedra Vaz on 11 Jan 2024
+ */
+
+#include 
+#if ESP_IDF_VERSION_MAJOR < 5
+
+#include "BackPort_SHA1Builder.h"
+
+// 32-bit integer manipulation macros (big endian)
+
+#ifndef GET_UINT32_BE
+#define GET_UINT32_BE(n, b, i) \
+  { (n) = ((uint32_t)(b)[(i)] << 24) | ((uint32_t)(b)[(i) + 1] << 16) | ((uint32_t)(b)[(i) + 2] << 8) | ((uint32_t)(b)[(i) + 3]); }
+#endif
+
+#ifndef PUT_UINT32_BE
+#define PUT_UINT32_BE(n, b, i)           \
+  {                                      \
+    (b)[(i)] = (uint8_t)((n) >> 24);     \
+    (b)[(i) + 1] = (uint8_t)((n) >> 16); \
+    (b)[(i) + 2] = (uint8_t)((n) >> 8);  \
+    (b)[(i) + 3] = (uint8_t)((n));       \
+  }
+#endif
+
+// Constants
+
+static const uint8_t sha1_padding[64] = {0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                         0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+// Private methods
+
+void SHA1Builder::process(const uint8_t *data) {
+  uint32_t temp, W[16], A, B, C, D, E;
+
+  GET_UINT32_BE(W[0], data, 0);
+  GET_UINT32_BE(W[1], data, 4);
+  GET_UINT32_BE(W[2], data, 8);
+  GET_UINT32_BE(W[3], data, 12);
+  GET_UINT32_BE(W[4], data, 16);
+  GET_UINT32_BE(W[5], data, 20);
+  GET_UINT32_BE(W[6], data, 24);
+  GET_UINT32_BE(W[7], data, 28);
+  GET_UINT32_BE(W[8], data, 32);
+  GET_UINT32_BE(W[9], data, 36);
+  GET_UINT32_BE(W[10], data, 40);
+  GET_UINT32_BE(W[11], data, 44);
+  GET_UINT32_BE(W[12], data, 48);
+  GET_UINT32_BE(W[13], data, 52);
+  GET_UINT32_BE(W[14], data, 56);
+  GET_UINT32_BE(W[15], data, 60);
+
+#define sha1_S(x, n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
+
+#define sha1_R(t) (temp = W[(t - 3) & 0x0F] ^ W[(t - 8) & 0x0F] ^ W[(t - 14) & 0x0F] ^ W[t & 0x0F], (W[t & 0x0F] = sha1_S(temp, 1)))
+
+#define sha1_P(a, b, c, d, e, x)                      \
+  {                                                   \
+    e += sha1_S(a, 5) + sha1_F(b, c, d) + sha1_K + x; \
+    b = sha1_S(b, 30);                                \
+  }
+
+  A = state[0];
+  B = state[1];
+  C = state[2];
+  D = state[3];
+  E = state[4];
+
+#define sha1_F(x, y, z) (z ^ (x & (y ^ z)))
+#define sha1_K          0x5A827999
+
+  sha1_P(A, B, C, D, E, W[0]);
+  sha1_P(E, A, B, C, D, W[1]);
+  sha1_P(D, E, A, B, C, W[2]);
+  sha1_P(C, D, E, A, B, W[3]);
+  sha1_P(B, C, D, E, A, W[4]);
+  sha1_P(A, B, C, D, E, W[5]);
+  sha1_P(E, A, B, C, D, W[6]);
+  sha1_P(D, E, A, B, C, W[7]);
+  sha1_P(C, D, E, A, B, W[8]);
+  sha1_P(B, C, D, E, A, W[9]);
+  sha1_P(A, B, C, D, E, W[10]);
+  sha1_P(E, A, B, C, D, W[11]);
+  sha1_P(D, E, A, B, C, W[12]);
+  sha1_P(C, D, E, A, B, W[13]);
+  sha1_P(B, C, D, E, A, W[14]);
+  sha1_P(A, B, C, D, E, W[15]);
+  sha1_P(E, A, B, C, D, sha1_R(16));
+  sha1_P(D, E, A, B, C, sha1_R(17));
+  sha1_P(C, D, E, A, B, sha1_R(18));
+  sha1_P(B, C, D, E, A, sha1_R(19));
+
+#undef sha1_K
+#undef sha1_F
+
+#define sha1_F(x, y, z) (x ^ y ^ z)
+#define sha1_K          0x6ED9EBA1
+
+  sha1_P(A, B, C, D, E, sha1_R(20));
+  sha1_P(E, A, B, C, D, sha1_R(21));
+  sha1_P(D, E, A, B, C, sha1_R(22));
+  sha1_P(C, D, E, A, B, sha1_R(23));
+  sha1_P(B, C, D, E, A, sha1_R(24));
+  sha1_P(A, B, C, D, E, sha1_R(25));
+  sha1_P(E, A, B, C, D, sha1_R(26));
+  sha1_P(D, E, A, B, C, sha1_R(27));
+  sha1_P(C, D, E, A, B, sha1_R(28));
+  sha1_P(B, C, D, E, A, sha1_R(29));
+  sha1_P(A, B, C, D, E, sha1_R(30));
+  sha1_P(E, A, B, C, D, sha1_R(31));
+  sha1_P(D, E, A, B, C, sha1_R(32));
+  sha1_P(C, D, E, A, B, sha1_R(33));
+  sha1_P(B, C, D, E, A, sha1_R(34));
+  sha1_P(A, B, C, D, E, sha1_R(35));
+  sha1_P(E, A, B, C, D, sha1_R(36));
+  sha1_P(D, E, A, B, C, sha1_R(37));
+  sha1_P(C, D, E, A, B, sha1_R(38));
+  sha1_P(B, C, D, E, A, sha1_R(39));
+
+#undef sha1_K
+#undef sha1_F
+
+#define sha1_F(x, y, z) ((x & y) | (z & (x | y)))
+#define sha1_K          0x8F1BBCDC
+
+  sha1_P(A, B, C, D, E, sha1_R(40));
+  sha1_P(E, A, B, C, D, sha1_R(41));
+  sha1_P(D, E, A, B, C, sha1_R(42));
+  sha1_P(C, D, E, A, B, sha1_R(43));
+  sha1_P(B, C, D, E, A, sha1_R(44));
+  sha1_P(A, B, C, D, E, sha1_R(45));
+  sha1_P(E, A, B, C, D, sha1_R(46));
+  sha1_P(D, E, A, B, C, sha1_R(47));
+  sha1_P(C, D, E, A, B, sha1_R(48));
+  sha1_P(B, C, D, E, A, sha1_R(49));
+  sha1_P(A, B, C, D, E, sha1_R(50));
+  sha1_P(E, A, B, C, D, sha1_R(51));
+  sha1_P(D, E, A, B, C, sha1_R(52));
+  sha1_P(C, D, E, A, B, sha1_R(53));
+  sha1_P(B, C, D, E, A, sha1_R(54));
+  sha1_P(A, B, C, D, E, sha1_R(55));
+  sha1_P(E, A, B, C, D, sha1_R(56));
+  sha1_P(D, E, A, B, C, sha1_R(57));
+  sha1_P(C, D, E, A, B, sha1_R(58));
+  sha1_P(B, C, D, E, A, sha1_R(59));
+
+#undef sha1_K
+#undef sha1_F
+
+#define sha1_F(x, y, z) (x ^ y ^ z)
+#define sha1_K          0xCA62C1D6
+
+  sha1_P(A, B, C, D, E, sha1_R(60));
+  sha1_P(E, A, B, C, D, sha1_R(61));
+  sha1_P(D, E, A, B, C, sha1_R(62));
+  sha1_P(C, D, E, A, B, sha1_R(63));
+  sha1_P(B, C, D, E, A, sha1_R(64));
+  sha1_P(A, B, C, D, E, sha1_R(65));
+  sha1_P(E, A, B, C, D, sha1_R(66));
+  sha1_P(D, E, A, B, C, sha1_R(67));
+  sha1_P(C, D, E, A, B, sha1_R(68));
+  sha1_P(B, C, D, E, A, sha1_R(69));
+  sha1_P(A, B, C, D, E, sha1_R(70));
+  sha1_P(E, A, B, C, D, sha1_R(71));
+  sha1_P(D, E, A, B, C, sha1_R(72));
+  sha1_P(C, D, E, A, B, sha1_R(73));
+  sha1_P(B, C, D, E, A, sha1_R(74));
+  sha1_P(A, B, C, D, E, sha1_R(75));
+  sha1_P(E, A, B, C, D, sha1_R(76));
+  sha1_P(D, E, A, B, C, sha1_R(77));
+  sha1_P(C, D, E, A, B, sha1_R(78));
+  sha1_P(B, C, D, E, A, sha1_R(79));
+
+#undef sha1_K
+#undef sha1_F
+
+  state[0] += A;
+  state[1] += B;
+  state[2] += C;
+  state[3] += D;
+  state[4] += E;
+}
+
+// Public methods
+
+void SHA1Builder::begin() {
+  total[0] = 0;
+  total[1] = 0;
+
+  state[0] = 0x67452301;
+  state[1] = 0xEFCDAB89;
+  state[2] = 0x98BADCFE;
+  state[3] = 0x10325476;
+  state[4] = 0xC3D2E1F0;
+
+  memset(buffer, 0x00, sizeof(buffer));
+  memset(hash, 0x00, sizeof(hash));
+}
+
+void SHA1Builder::add(const uint8_t *data, size_t len) {
+  size_t fill;
+  uint32_t left;
+
+  if (len == 0) {
+    return;
+  }
+
+  left = total[0] & 0x3F;
+  fill = 64 - left;
+
+  total[0] += (uint32_t)len;
+  total[0] &= 0xFFFFFFFF;
+
+  if (total[0] < (uint32_t)len) {
+    total[1]++;
+  }
+
+  if (left && len >= fill) {
+    memcpy((void *)(buffer + left), data, fill);
+    process(buffer);
+    data += fill;
+    len -= fill;
+    left = 0;
+  }
+
+  while (len >= 64) {
+    process(data);
+    data += 64;
+    len -= 64;
+  }
+
+  if (len > 0) {
+    memcpy((void *)(buffer + left), data, len);
+  }
+}
+
+void SHA1Builder::calculate(void) {
+  uint32_t last, padn;
+  uint32_t high, low;
+  uint8_t msglen[8];
+
+  high = (total[0] >> 29) | (total[1] << 3);
+  low = (total[0] << 3);
+
+  PUT_UINT32_BE(high, msglen, 0);
+  PUT_UINT32_BE(low, msglen, 4);
+
+  last = total[0] & 0x3F;
+  padn = (last < 56) ? (56 - last) : (120 - last);
+
+  add((uint8_t *)sha1_padding, padn);
+  add(msglen, 8);
+
+  PUT_UINT32_BE(state[0], hash, 0);
+  PUT_UINT32_BE(state[1], hash, 4);
+  PUT_UINT32_BE(state[2], hash, 8);
+  PUT_UINT32_BE(state[3], hash, 12);
+  PUT_UINT32_BE(state[4], hash, 16);
+}
+
+void SHA1Builder::getBytes(uint8_t *output) {
+  memcpy(output, hash, SHA1_HASH_SIZE);
+}
+
+#endif  // ESP_IDF_VERSION_MAJOR < 5
diff --git a/src/BackPort_SHA1Builder.h b/src/BackPort_SHA1Builder.h
new file mode 100644
index 000000000..e7eafbef9
--- /dev/null
+++ b/src/BackPort_SHA1Builder.h
@@ -0,0 +1,44 @@
+// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include 
+#if ESP_IDF_VERSION_MAJOR < 5
+
+#ifndef SHA1Builder_h
+#define SHA1Builder_h
+
+#include 
+#include 
+
+#define SHA1_HASH_SIZE 20
+
+class SHA1Builder {
+private:
+  uint32_t total[2];            /* number of bytes processed  */
+  uint32_t state[5];            /* intermediate digest state  */
+  unsigned char buffer[64];     /* data block being processed */
+  uint8_t hash[SHA1_HASH_SIZE]; /* SHA-1 result               */
+
+  void process(const uint8_t *data);
+
+public:
+  void begin();
+  void add(const uint8_t *data, size_t len);
+  void calculate();
+  void getBytes(uint8_t *output);
+};
+
+#endif  // SHA1Builder_h
+
+#endif  // ESP_IDF_VERSION_MAJOR < 5
diff --git a/src/ChunkPrint.cpp b/src/ChunkPrint.cpp
new file mode 100644
index 000000000..4617d34a0
--- /dev/null
+++ b/src/ChunkPrint.cpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+#include 
+
+ChunkPrint::ChunkPrint(uint8_t *destination, size_t from, size_t len) : _destination(destination), _to_skip(from), _to_write(len), _pos{0} {}
+
+size_t ChunkPrint::write(uint8_t c) {
+  if (_to_skip > 0) {
+    _to_skip--;
+    return 1;
+  } else if (_to_write > 0) {
+    _to_write--;
+    _destination[_pos++] = c;
+    return 1;
+  }
+  return 0;
+}
diff --git a/src/ChunkPrint.h b/src/ChunkPrint.h
new file mode 100644
index 000000000..04938b3f2
--- /dev/null
+++ b/src/ChunkPrint.h
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+#ifndef CHUNKPRINT_H
+#define CHUNKPRINT_H
+
+#include 
+
+class ChunkPrint : public Print {
+private:
+  uint8_t *_destination;
+  size_t _to_skip;
+  size_t _to_write;
+  size_t _pos;
+
+public:
+  ChunkPrint(uint8_t *destination, size_t from, size_t len);
+  size_t write(uint8_t c);
+  size_t write(const uint8_t *buffer, size_t size) {
+    return this->Print::write(buffer, size);
+  }
+};
+#endif
diff --git a/src/ESPAsyncWebServer.h b/src/ESPAsyncWebServer.h
index 933091562..0cf132380 100644
--- a/src/ESPAsyncWebServer.h
+++ b/src/ESPAsyncWebServer.h
@@ -1,50 +1,48 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
 #ifndef _ESPAsyncWebServer_H_
 #define _ESPAsyncWebServer_H_
 
-#include "Arduino.h"
+#include 
+#include 
+#include 
 
+#include 
+#include 
 #include 
-#include "FS.h"
-
-#include "StringArray.h"
+#include 
+#include 
+#include 
 
 #if defined(ESP32) || defined(LIBRETINY)
-#include 
 #include 
 #elif defined(ESP8266)
-#include 
 #include 
+#elif defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
+#include 
+#include 
 #else
 #error Platform not supported
 #endif
 
+#include "literals.h"
+
+#include "AsyncWebServerVersion.h"
+#define ASYNCWEBSERVER_FORK_ESP32Async
+
 #ifdef ASYNCWEBSERVER_REGEX
 #define ASYNCWEBSERVER_REGEX_ATTRIBUTE
 #else
 #define ASYNCWEBSERVER_REGEX_ATTRIBUTE __attribute__((warning("ASYNCWEBSERVER_REGEX not defined")))
 #endif
 
-#define DEBUGF(...) //Serial.printf(__VA_ARGS__)
+// See https://github.com/ESP32Async/ESPAsyncWebServer/commit/3d3456e9e81502a477f6498c44d0691499dda8f9#diff-646b25b11691c11dce25529e3abce843f0ba4bd07ab75ec9eee7e72b06dbf13fR388-R392
+// This setting slowdown chunk serving but avoids crashing or deadlocks in the case where slow chunk responses are created, like file serving form SD Card
+#ifndef ASYNCWEBSERVER_USE_CHUNK_INFLIGHT
+#define ASYNCWEBSERVER_USE_CHUNK_INFLIGHT 1
+#endif
 
 class AsyncWebServer;
 class AsyncWebServerRequest;
@@ -56,22 +54,41 @@ class AsyncWebHandler;
 class AsyncStaticWebHandler;
 class AsyncCallbackWebHandler;
 class AsyncResponseStream;
+class AsyncMiddlewareChain;
 
+#if defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+typedef enum http_method WebRequestMethod;
+#else
 #ifndef WEBSERVER_H
 typedef enum {
-  HTTP_GET     = 0b00000001,
-  HTTP_POST    = 0b00000010,
-  HTTP_DELETE  = 0b00000100,
-  HTTP_PUT     = 0b00001000,
-  HTTP_PATCH   = 0b00010000,
-  HTTP_HEAD    = 0b00100000,
+  HTTP_GET = 0b00000001,
+  HTTP_POST = 0b00000010,
+  HTTP_DELETE = 0b00000100,
+  HTTP_PUT = 0b00001000,
+  HTTP_PATCH = 0b00010000,
+  HTTP_HEAD = 0b00100000,
   HTTP_OPTIONS = 0b01000000,
-  HTTP_ANY     = 0b01111111,
+  HTTP_ANY = 0b01111111,
 } WebRequestMethod;
 #endif
+#endif
 
-//if this value is returned when asked for data, packet will not be sent and you will be asked for data again
-#define RESPONSE_TRY_AGAIN 0xFFFFFFFF
+#ifndef HAVE_FS_FILE_OPEN_MODE
+namespace fs {
+class FileOpenMode {
+public:
+  static const char *read;
+  static const char *write;
+  static const char *append;
+};
+};  // namespace fs
+#else
+#include "FileOpenMode.h"
+#endif
+
+// if this value is returned when asked for data, packet will not be sent and you will be asked for data again
+#define RESPONSE_TRY_AGAIN          0xFFFFFFFF
+#define RESPONSE_STREAM_BUFFER_SIZE 1460
 
 typedef uint8_t WebRequestMethodComposite;
 typedef std::function ArDisconnectHandler;
@@ -81,21 +98,31 @@ typedef std::function ArDisconnectHandler;
  * */
 
 class AsyncWebParameter {
-  private:
-    String _name;
-    String _value;
-    size_t _size;
-    bool _isForm;
-    bool _isFile;
-
-  public:
-
-    AsyncWebParameter(const String& name, const String& value, bool form=false, bool file=false, size_t size=0): _name(name), _value(value), _size(size), _isForm(form), _isFile(file){}
-    const String& name() const { return _name; }
-    const String& value() const { return _value; }
-    size_t size() const { return _size; }
-    bool isPost() const { return _isForm; }
-    bool isFile() const { return _isFile; }
+private:
+  String _name;
+  String _value;
+  size_t _size;
+  bool _isForm;
+  bool _isFile;
+
+public:
+  AsyncWebParameter(const String &name, const String &value, bool form = false, bool file = false, size_t size = 0)
+    : _name(name), _value(value), _size(size), _isForm(form), _isFile(file) {}
+  const String &name() const {
+    return _name;
+  }
+  const String &value() const {
+    return _value;
+  }
+  size_t size() const {
+    return _size;
+  }
+  bool isPost() const {
+    return _isForm;
+  }
+  bool isFile() const {
+    return _isFile;
+  }
 };
 
 /*
@@ -103,248 +130,884 @@ class AsyncWebParameter {
  * */
 
 class AsyncWebHeader {
-  private:
-    String _name;
-    String _value;
-
-  public:
-    AsyncWebHeader(const String& name, const String& value): _name(name), _value(value){}
-    AsyncWebHeader(const String& data): _name(), _value(){
-      if(!data) return;
-      int index = data.indexOf(':');
-      if (index < 0) return;
-      _name = data.substring(0, index);
-      _value = data.substring(index + 2);
-    }
-    ~AsyncWebHeader(){}
-    const String& name() const { return _name; }
-    const String& value() const { return _value; }
-    String toString() const { return String(_name+": "+_value+"\r\n"); }
+private:
+  String _name;
+  String _value;
+
+public:
+  AsyncWebHeader() {}
+  AsyncWebHeader(const AsyncWebHeader &) = default;
+  AsyncWebHeader(AsyncWebHeader &&) = default;
+  AsyncWebHeader(const char *name, const char *value) : _name(name), _value(value) {}
+  AsyncWebHeader(const String &name, const String &value) : _name(name), _value(value) {}
+
+#ifndef ESP8266
+  [[deprecated("Use AsyncWebHeader::parse(data) instead")]]
+#endif
+  AsyncWebHeader(const String &data)
+    : AsyncWebHeader(parse(data)){};
+
+  AsyncWebHeader &operator=(const AsyncWebHeader &) = default;
+  AsyncWebHeader &operator=(AsyncWebHeader &&other) = default;
+
+  const String &name() const {
+    return _name;
+  }
+  const String &value() const {
+    return _value;
+  }
+
+  String toString() const;
+
+  // returns true if the header is valid
+  operator bool() const {
+    return _name.length();
+  }
+
+  static const AsyncWebHeader parse(const String &data) {
+    return parse(data.c_str());
+  }
+  static const AsyncWebHeader parse(const char *data);
 };
 
 /*
  * REQUEST :: Each incoming Client is wrapped inside a Request and both live together until disconnect
  * */
 
-typedef enum { RCT_NOT_USED = -1, RCT_DEFAULT = 0, RCT_HTTP, RCT_WS, RCT_EVENT, RCT_MAX } RequestedConnectionType;
+typedef enum {
+  RCT_NOT_USED = -1,
+  RCT_DEFAULT = 0,
+  RCT_HTTP,
+  RCT_WS,
+  RCT_EVENT,
+  RCT_MAX
+} RequestedConnectionType;
+
+// this enum is similar to Arduino WebServer's AsyncAuthType and PsychicHttp
+typedef enum {
+  AUTH_NONE = 0,  // always allow
+  AUTH_BASIC = 1,
+  AUTH_DIGEST = 2,
+  AUTH_BEARER = 3,
+  AUTH_OTHER = 4,
+  AUTH_DENIED = 255,  // always returns 401
+} AsyncAuthType;
 
-typedef std::function AwsResponseFiller;
-typedef std::function AwsTemplateProcessor;
+typedef std::function AwsResponseFiller;
+typedef std::function AwsTemplateProcessor;
+
+using AsyncWebServerRequestPtr = std::weak_ptr;
 
 class AsyncWebServerRequest {
   using File = fs::File;
   using FS = fs::FS;
   friend class AsyncWebServer;
   friend class AsyncCallbackWebHandler;
-  private:
-    AsyncClient* _client;
-    AsyncWebServer* _server;
-    AsyncWebHandler* _handler;
-    AsyncWebServerResponse* _response;
-    StringArray _interestingHeaders;
-    ArDisconnectHandler _onDisconnectfn;
-
-    String _temp;
-    uint8_t _parseState;
-
-    uint8_t _version;
-    WebRequestMethodComposite _method;
-    String _url;
-    String _host;
-    String _contentType;
-    String _boundary;
-    String _authorization;
-    RequestedConnectionType _reqconntype;
-    void _removeNotInterestingHeaders();
-    bool _isDigest;
-    bool _isMultipart;
-    bool _isPlainPost;
-    bool _expectingContinue;
-    size_t _contentLength;
-    size_t _parsedLength;
-
-    LinkedList _headers;
-    LinkedList _params;
-    LinkedList _pathParams;
-
-    uint8_t _multiParseState;
-    uint8_t _boundaryPosition;
-    size_t _itemStartIndex;
-    size_t _itemSize;
-    String _itemName;
-    String _itemFilename;
-    String _itemType;
-    String _itemValue;
-    uint8_t *_itemBuffer;
-    size_t _itemBufferIndex;
-    bool _itemIsFile;
-
-    void _onPoll();
-    void _onAck(size_t len, uint32_t time);
-    void _onError(int8_t error);
-    void _onTimeout(uint32_t time);
-    void _onDisconnect();
-    void _onData(void *buf, size_t len);
-
-    void _addParam(AsyncWebParameter*);
-    void _addPathParam(const char *param);
-
-    bool _parseReqHead();
-    bool _parseReqHeader();
-    void _parseLine();
-    void _parsePlainPostChar(uint8_t data);
-    void _parseMultipartPostByte(uint8_t data, bool last);
-    void _addGetParams(const String& params);
-
-    void _handleUploadStart();
-    void _handleUploadByte(uint8_t data, bool last);
-    void _handleUploadEnd();
-
-  public:
-    File _tempFile;
-    void *_tempObject;
-
-    AsyncWebServerRequest(AsyncWebServer*, AsyncClient*);
-    ~AsyncWebServerRequest();
-
-    AsyncClient* client(){ return _client; }
-    uint8_t version() const { return _version; }
-    WebRequestMethodComposite method() const { return _method; }
-    const String& url() const { return _url; }
-    const String& host() const { return _host; }
-    const String& contentType() const { return _contentType; }
-    size_t contentLength() const { return _contentLength; }
-    bool multipart() const { return _isMultipart; }
-    const char * methodToString() const;
-    const char * requestedConnTypeToString() const;
-    RequestedConnectionType requestedConnType() const { return _reqconntype; }
-    bool isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2 = RCT_NOT_USED, RequestedConnectionType erct3 = RCT_NOT_USED);
-    void onDisconnect (ArDisconnectHandler fn);
-
-    //hash is the string representation of:
-    // base64(user:pass) for basic or
-    // user:realm:md5(user:realm:pass) for digest
-    bool authenticate(const char * hash);
-    bool authenticate(const char * username, const char * password, const char * realm = NULL, bool passwordIsHash = false);
-    void requestAuthentication(const char * realm = NULL, bool isDigest = true);
-
-    void setHandler(AsyncWebHandler *handler){ _handler = handler; }
-    void addInterestingHeader(const String& name);
-
-    void redirect(const String& url);
-
-    void send(AsyncWebServerResponse *response);
-    void send(int code, const String& contentType=String(), const String& content=String());
-    void send(FS &fs, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    void send(File content, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    void send(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback=nullptr);
-    void send(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    void sendChunked(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    void send_P(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback=nullptr);
-    void send_P(int code, const String& contentType, PGM_P content, AwsTemplateProcessor callback=nullptr);
-
-    AsyncWebServerResponse *beginResponse(int code, const String& contentType=String(), const String& content=String());
-    AsyncWebServerResponse *beginResponse(FS &fs, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    AsyncWebServerResponse *beginResponse(File content, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    AsyncWebServerResponse *beginResponse(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback=nullptr);
-    AsyncWebServerResponse *beginResponse(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    AsyncWebServerResponse *beginChunkedResponse(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    AsyncResponseStream *beginResponseStream(const String& contentType, size_t bufferSize=1460);
-    AsyncWebServerResponse *beginResponse_P(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback=nullptr);
-    AsyncWebServerResponse *beginResponse_P(int code, const String& contentType, PGM_P content, AwsTemplateProcessor callback=nullptr);
-
-    size_t headers() const;                     // get header count
-    bool hasHeader(const String& name) const;   // check if header exists
-    bool hasHeader(const __FlashStringHelper * data) const;   // check if header exists
-
-    AsyncWebHeader* getHeader(const String& name) const;
-    AsyncWebHeader* getHeader(const __FlashStringHelper * data) const;
-    AsyncWebHeader* getHeader(size_t num) const;
-
-    size_t params() const;                      // get arguments count
-    bool hasParam(const String& name, bool post=false, bool file=false) const;
-    bool hasParam(const __FlashStringHelper * data, bool post=false, bool file=false) const;
-
-    AsyncWebParameter* getParam(const String& name, bool post=false, bool file=false) const;
-    AsyncWebParameter* getParam(const __FlashStringHelper * data, bool post, bool file) const; 
-    AsyncWebParameter* getParam(size_t num) const;
-
-    size_t args() const { return params(); }     // get arguments count
-    const String& arg(const String& name) const; // get request argument value by name
-    const String& arg(const __FlashStringHelper * data) const; // get request argument value by F(name)    
-    const String& arg(size_t i) const;           // get request argument value by number
-    const String& argName(size_t i) const;       // get request argument name by number
-    bool hasArg(const char* name) const;         // check if argument exists
-    bool hasArg(const __FlashStringHelper * data) const;         // check if F(argument) exists
-
-    const String& ASYNCWEBSERVER_REGEX_ATTRIBUTE pathArg(size_t i) const;
-
-    const String& header(const char* name) const;// get request header value by name
-    const String& header(const __FlashStringHelper * data) const;// get request header value by F(name)    
-    const String& header(size_t i) const;        // get request header value by number
-    const String& headerName(size_t i) const;    // get request header name by number
-    String urlDecode(const String& text) const;
+  friend class AsyncFileResponse;
+
+private:
+  AsyncClient *_client;
+  AsyncWebServer *_server;
+  AsyncWebHandler *_handler;
+  AsyncWebServerResponse *_response;
+  ArDisconnectHandler _onDisconnectfn;
+
+  bool _sent = false;                            // response is sent
+  bool _paused = false;                          // request is paused (request continuation)
+  std::shared_ptr _this;  // shared pointer to this request
+
+  String _temp;
+  uint8_t _parseState;
+
+  uint8_t _version;
+  WebRequestMethodComposite _method;
+  String _url;
+  String _host;
+  String _contentType;
+  String _boundary;
+  String _authorization;
+  RequestedConnectionType _reqconntype;
+  AsyncAuthType _authMethod = AsyncAuthType::AUTH_NONE;
+  bool _isMultipart;
+  bool _isPlainPost;
+  bool _expectingContinue;
+  size_t _contentLength;
+  size_t _parsedLength;
+
+  std::list _headers;
+  std::list _params;
+  std::list _pathParams;
+
+  std::unordered_map, std::equal_to> _attributes;
+
+  uint8_t _multiParseState;
+  uint8_t _boundaryPosition;
+  size_t _itemStartIndex;
+  size_t _itemSize;
+  String _itemName;
+  String _itemFilename;
+  String _itemType;
+  String _itemValue;
+  uint8_t *_itemBuffer;
+  size_t _itemBufferIndex;
+  bool _itemIsFile;
+
+  void _onPoll();
+  void _onAck(size_t len, uint32_t time);
+  void _onError(int8_t error);
+  void _onTimeout(uint32_t time);
+  void _onDisconnect();
+  void _onData(void *buf, size_t len);
+
+  void _addPathParam(const char *param);
+
+  bool _parseReqHead();
+  bool _parseReqHeader();
+  void _parseLine();
+  void _parsePlainPostChar(uint8_t data);
+  void _parseMultipartPostByte(uint8_t data, bool last);
+  void _addGetParams(const String ¶ms);
+
+  void _handleUploadStart();
+  void _handleUploadByte(uint8_t data, bool last);
+  void _handleUploadEnd();
+
+  void _send();
+  void _runMiddlewareChain();
+
+  static void _getEtag(uint8_t trailer[4], char *serverETag);
+
+public:
+  File _tempFile;
+  void *_tempObject;
+
+  AsyncWebServerRequest(AsyncWebServer *, AsyncClient *);
+  ~AsyncWebServerRequest();
+
+  AsyncClient *client() {
+    return _client;
+  }
+  uint8_t version() const {
+    return _version;
+  }
+  WebRequestMethodComposite method() const {
+    return _method;
+  }
+  const String &url() const {
+    return _url;
+  }
+  const String &host() const {
+    return _host;
+  }
+  const String &contentType() const {
+    return _contentType;
+  }
+  size_t contentLength() const {
+    return _contentLength;
+  }
+  bool multipart() const {
+    return _isMultipart;
+  }
+
+  const char *methodToString() const;
+  const char *requestedConnTypeToString() const;
+
+  RequestedConnectionType requestedConnType() const {
+    return _reqconntype;
+  }
+  bool isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2 = RCT_NOT_USED, RequestedConnectionType erct3 = RCT_NOT_USED)
+    const;
+  bool isWebSocketUpgrade() const {
+    return _method == HTTP_GET && isExpectedRequestedConnType(RCT_WS);
+  }
+  bool isSSE() const {
+    return _method == HTTP_GET && isExpectedRequestedConnType(RCT_EVENT);
+  }
+  bool isHTTP() const {
+    return isExpectedRequestedConnType(RCT_DEFAULT, RCT_HTTP);
+  }
+  void onDisconnect(ArDisconnectHandler fn);
+
+  // hash is the string representation of:
+  //  base64(user:pass) for basic or
+  //  user:realm:md5(user:realm:pass) for digest
+  bool authenticate(const char *hash) const;
+  bool authenticate(const char *username, const char *credentials, const char *realm = NULL, bool isHash = false) const;
+  void requestAuthentication(const char *realm = nullptr, bool isDigest = true) {
+    requestAuthentication(isDigest ? AsyncAuthType::AUTH_DIGEST : AsyncAuthType::AUTH_BASIC, realm);
+  }
+  void requestAuthentication(AsyncAuthType method, const char *realm = nullptr, const char *_authFailMsg = nullptr);
+
+  // IMPORTANT: this method is for internal use ONLY
+  // Please do not use it!
+  // It can be removed or modified at any time without notice
+  void setHandler(AsyncWebHandler *handler) {
+    _handler = handler;
+  }
+
+#ifndef ESP8266
+  [[deprecated("All headers are now collected. Use removeHeader(name) or AsyncHeaderFreeMiddleware if you really need to free some headers.")]]
+#endif
+  void addInterestingHeader(__unused const char *name) {
+  }
+#ifndef ESP8266
+  [[deprecated("All headers are now collected. Use removeHeader(name) or AsyncHeaderFreeMiddleware if you really need to free some headers.")]]
+#endif
+  void addInterestingHeader(__unused const String &name) {
+  }
+
+  /**
+     * @brief issue HTTP redirect response with Location header
+     *
+     * @param url - url to redirect to
+     * @param code - response code, default is 302 : temporary redirect
+     */
+  void redirect(const char *url, int code = 302);
+  void redirect(const String &url, int code = 302) {
+    return redirect(url.c_str(), code);
+  };
+
+  void send(AsyncWebServerResponse *response);
+  AsyncWebServerResponse *getResponse() const {
+    return _response;
+  }
+
+  void send(int code, const char *contentType = asyncsrv::empty, const char *content = asyncsrv::empty, AwsTemplateProcessor callback = nullptr) {
+    send(beginResponse(code, contentType, content, callback));
+  }
+  void send(int code, const String &contentType, const char *content = asyncsrv::empty, AwsTemplateProcessor callback = nullptr) {
+    send(beginResponse(code, contentType.c_str(), content, callback));
+  }
+  void send(int code, const String &contentType, const String &content, AwsTemplateProcessor callback = nullptr) {
+    send(beginResponse(code, contentType.c_str(), content.c_str(), callback));
+  }
+
+  void send(int code, const char *contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr) {
+    send(beginResponse(code, contentType, content, len, callback));
+  }
+  void send(int code, const String &contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr) {
+    send(beginResponse(code, contentType, content, len, callback));
+  }
+
+  void send(FS &fs, const String &path, const char *contentType = asyncsrv::empty, bool download = false, AwsTemplateProcessor callback = nullptr);
+  void send(FS &fs, const String &path, const String &contentType, bool download = false, AwsTemplateProcessor callback = nullptr) {
+    send(fs, path, contentType.c_str(), download, callback);
+  }
+
+  void send(File content, const String &path, const char *contentType = asyncsrv::empty, bool download = false, AwsTemplateProcessor callback = nullptr) {
+    if (content) {
+      send(beginResponse(content, path, contentType, download, callback));
+    } else {
+      send(404);
+    }
+  }
+  void send(File content, const String &path, const String &contentType, bool download = false, AwsTemplateProcessor callback = nullptr) {
+    send(content, path, contentType.c_str(), download, callback);
+  }
+
+  void send(Stream &stream, const char *contentType, size_t len, AwsTemplateProcessor callback = nullptr) {
+    send(beginResponse(stream, contentType, len, callback));
+  }
+  void send(Stream &stream, const String &contentType, size_t len, AwsTemplateProcessor callback = nullptr) {
+    send(beginResponse(stream, contentType, len, callback));
+  }
+
+  void send(const char *contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr) {
+    send(beginResponse(contentType, len, callback, templateCallback));
+  }
+  void send(const String &contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr) {
+    send(beginResponse(contentType, len, callback, templateCallback));
+  }
+
+  void sendChunked(const char *contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr) {
+    send(beginChunkedResponse(contentType, callback, templateCallback));
+  }
+  void sendChunked(const String &contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr) {
+    send(beginChunkedResponse(contentType, callback, templateCallback));
+  }
+
+#ifndef ESP8266
+  [[deprecated("Replaced by send(int code, const String& contentType, const uint8_t* content, size_t len, AwsTemplateProcessor callback = nullptr)")]]
+#endif
+  void send_P(int code, const String &contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr) {
+    send(code, contentType, content, len, callback);
+  }
+#ifndef ESP8266
+  [[deprecated("Replaced by send(int code, const String& contentType, const char* content = asyncsrv::empty, AwsTemplateProcessor callback = nullptr)")]]
+  void send_P(int code, const String &contentType, PGM_P content, AwsTemplateProcessor callback = nullptr) {
+    send(code, contentType, content, callback);
+  }
+#else
+  void send_P(int code, const String &contentType, PGM_P content, AwsTemplateProcessor callback = nullptr) {
+    send(beginResponse_P(code, contentType, content, callback));
+  }
+#endif
+
+  AsyncWebServerResponse *
+    beginResponse(int code, const char *contentType = asyncsrv::empty, const char *content = asyncsrv::empty, AwsTemplateProcessor callback = nullptr);
+  AsyncWebServerResponse *beginResponse(int code, const String &contentType, const char *content = asyncsrv::empty, AwsTemplateProcessor callback = nullptr) {
+    return beginResponse(code, contentType.c_str(), content, callback);
+  }
+  AsyncWebServerResponse *beginResponse(int code, const String &contentType, const String &content, AwsTemplateProcessor callback = nullptr) {
+    return beginResponse(code, contentType.c_str(), content.c_str(), callback);
+  }
+
+  AsyncWebServerResponse *beginResponse(int code, const char *contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr);
+  AsyncWebServerResponse *beginResponse(int code, const String &contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr) {
+    return beginResponse(code, contentType.c_str(), content, len, callback);
+  }
+
+  AsyncWebServerResponse *
+    beginResponse(FS &fs, const String &path, const char *contentType = asyncsrv::empty, bool download = false, AwsTemplateProcessor callback = nullptr);
+  AsyncWebServerResponse *
+    beginResponse(FS &fs, const String &path, const String &contentType = emptyString, bool download = false, AwsTemplateProcessor callback = nullptr) {
+    return beginResponse(fs, path, contentType.c_str(), download, callback);
+  }
+
+  AsyncWebServerResponse *
+    beginResponse(File content, const String &path, const char *contentType = asyncsrv::empty, bool download = false, AwsTemplateProcessor callback = nullptr);
+  AsyncWebServerResponse *
+    beginResponse(File content, const String &path, const String &contentType = emptyString, bool download = false, AwsTemplateProcessor callback = nullptr) {
+    return beginResponse(content, path, contentType.c_str(), download, callback);
+  }
+
+  AsyncWebServerResponse *beginResponse(Stream &stream, const char *contentType, size_t len, AwsTemplateProcessor callback = nullptr);
+  AsyncWebServerResponse *beginResponse(Stream &stream, const String &contentType, size_t len, AwsTemplateProcessor callback = nullptr) {
+    return beginResponse(stream, contentType.c_str(), len, callback);
+  }
+
+  AsyncWebServerResponse *beginResponse(const char *contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr);
+  AsyncWebServerResponse *beginResponse(const String &contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr) {
+    return beginResponse(contentType.c_str(), len, callback, templateCallback);
+  }
+
+  AsyncWebServerResponse *beginChunkedResponse(const char *contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr);
+  AsyncWebServerResponse *beginChunkedResponse(const String &contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr) {
+    return beginChunkedResponse(contentType.c_str(), callback, templateCallback);
+  }
+
+  AsyncResponseStream *beginResponseStream(const char *contentType, size_t bufferSize = RESPONSE_STREAM_BUFFER_SIZE);
+  AsyncResponseStream *beginResponseStream(const String &contentType, size_t bufferSize = RESPONSE_STREAM_BUFFER_SIZE) {
+    return beginResponseStream(contentType.c_str(), bufferSize);
+  }
+
+#ifndef ESP8266
+  [[deprecated("Replaced by beginResponse(int code, const String& contentType, const uint8_t* content, size_t len, AwsTemplateProcessor callback = nullptr)")]]
+#endif
+  AsyncWebServerResponse *beginResponse_P(int code, const String &contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr) {
+    return beginResponse(code, contentType.c_str(), content, len, callback);
+  }
+#ifndef ESP8266
+  [[deprecated("Replaced by beginResponse(int code, const String& contentType, const char* content = asyncsrv::empty, AwsTemplateProcessor callback = nullptr)"
+  )]]
+#endif
+  AsyncWebServerResponse *beginResponse_P(int code, const String &contentType, PGM_P content, AwsTemplateProcessor callback = nullptr);
+
+  /**
+   * @brief Request Continuation: this function pauses the current request and returns a weak pointer (AsyncWebServerRequestPtr is a std::weak_ptr) to the request in order to reuse it later on.
+   * The middelware chain will continue to be processed until the end, but no response will be sent.
+   * To resume operations (send the request), the request must be retrieved from the weak pointer and a send() function must be called.
+   * AsyncWebServerRequestPtr is the only object allowed to exist the scope of the request handler.
+   * @warning This function should be called from within the context of a request (in a handler or middleware for example).
+   * @warning While the request is paused, if the client aborts the request, the latter will be disconnected and deleted.
+   * So it is the responsibility of the user to check the validity of the request pointer (AsyncWebServerRequestPtr) before using it by calling lock() and/or expired().
+   */
+  AsyncWebServerRequestPtr pause();
+
+  bool isPaused() const {
+    return _paused;
+  }
+
+  /**
+   * @brief Aborts the request and close the client (RST).
+   * Mark the request as sent.
+   * If it was paused, it will be unpaused and it won't be possible to resume it.
+   */
+  void abort();
+
+  bool isSent() const {
+    return _sent;
+  }
+
+  /**
+     * @brief Get the Request parameter by name
+     *
+     * @param name
+     * @param post
+     * @param file
+     * @return const AsyncWebParameter*
+     */
+  const AsyncWebParameter *getParam(const char *name, bool post = false, bool file = false) const;
+
+  const AsyncWebParameter *getParam(const String &name, bool post = false, bool file = false) const {
+    return getParam(name.c_str(), post, file);
+  };
+#ifdef ESP8266
+  const AsyncWebParameter *getParam(const __FlashStringHelper *data, bool post, bool file) const;
+#endif
+
+  /**
+     * @brief Get request parameter by number
+     * i.e., n-th parameter
+     * @param num
+     * @return const AsyncWebParameter*
+     */
+  const AsyncWebParameter *getParam(size_t num) const;
+  const AsyncWebParameter *getParam(int num) const {
+    return num < 0 ? nullptr : getParam((size_t)num);
+  }
+
+  size_t args() const {
+    return params();
+  }  // get arguments count
+
+  // get request argument value by name
+  const String &arg(const char *name) const;
+  // get request argument value by name
+  const String &arg(const String &name) const {
+    return arg(name.c_str());
+  };
+#ifdef ESP8266
+  const String &arg(const __FlashStringHelper *data) const;  // get request argument value by F(name)
+#endif
+  const String &arg(size_t i) const;  // get request argument value by number
+  const String &arg(int i) const {
+    return i < 0 ? emptyString : arg((size_t)i);
+  };
+  const String &argName(size_t i) const;  // get request argument name by number
+  const String &argName(int i) const {
+    return i < 0 ? emptyString : argName((size_t)i);
+  };
+  bool hasArg(const char *name) const;  // check if argument exists
+  bool hasArg(const String &name) const {
+    return hasArg(name.c_str());
+  };
+#ifdef ESP8266
+  bool hasArg(const __FlashStringHelper *data) const;  // check if F(argument) exists
+#endif
+
+  const String &ASYNCWEBSERVER_REGEX_ATTRIBUTE pathArg(size_t i) const;
+  const String &ASYNCWEBSERVER_REGEX_ATTRIBUTE pathArg(int i) const {
+    return i < 0 ? emptyString : pathArg((size_t)i);
+  }
+
+  // get request header value by name
+  const String &header(const char *name) const;
+  const String &header(const String &name) const {
+    return header(name.c_str());
+  };
+
+#ifdef ESP8266
+  const String &header(const __FlashStringHelper *data) const;  // get request header value by F(name)
+#endif
+
+  const String &header(size_t i) const;  // get request header value by number
+  const String &header(int i) const {
+    return i < 0 ? emptyString : header((size_t)i);
+  };
+  const String &headerName(size_t i) const;  // get request header name by number
+  const String &headerName(int i) const {
+    return i < 0 ? emptyString : headerName((size_t)i);
+  };
+
+  size_t headers() const;  // get header count
+
+  // check if header exists
+  bool hasHeader(const char *name) const;
+  bool hasHeader(const String &name) const {
+    return hasHeader(name.c_str());
+  };
+#ifdef ESP8266
+  bool hasHeader(const __FlashStringHelper *data) const;  // check if header exists
+#endif
+
+  const AsyncWebHeader *getHeader(const char *name) const;
+  const AsyncWebHeader *getHeader(const String &name) const {
+    return getHeader(name.c_str());
+  };
+#ifdef ESP8266
+  const AsyncWebHeader *getHeader(const __FlashStringHelper *data) const;
+#endif
+
+  const AsyncWebHeader *getHeader(size_t num) const;
+  const AsyncWebHeader *getHeader(int num) const {
+    return num < 0 ? nullptr : getHeader((size_t)num);
+  };
+
+  const std::list &getHeaders() const {
+    return _headers;
+  }
+
+  size_t getHeaderNames(std::vector &names) const;
+
+  // Remove a header from the request.
+  // It will free the memory and prevent the header to be seen during request processing.
+  bool removeHeader(const char *name);
+  // Remove all request headers.
+  void removeHeaders() {
+    _headers.clear();
+  }
+
+  size_t params() const;  // get arguments count
+  bool hasParam(const char *name, bool post = false, bool file = false) const;
+  bool hasParam(const String &name, bool post = false, bool file = false) const {
+    return hasParam(name.c_str(), post, file);
+  };
+#ifdef ESP8266
+  bool hasParam(const __FlashStringHelper *data, bool post = false, bool file = false) const {
+    return hasParam(String(data).c_str(), post, file);
+  };
+#endif
+
+  // REQUEST ATTRIBUTES
+
+  void setAttribute(const char *name, const char *value) {
+    _attributes[name] = value;
+  }
+  void setAttribute(const char *name, bool value) {
+    _attributes[name] = value ? "1" : emptyString;
+  }
+  void setAttribute(const char *name, long value) {
+    _attributes[name] = String(value);
+  }
+  void setAttribute(const char *name, float value, unsigned int decimalPlaces = 2) {
+    _attributes[name] = String(value, decimalPlaces);
+  }
+  void setAttribute(const char *name, double value, unsigned int decimalPlaces = 2) {
+    _attributes[name] = String(value, decimalPlaces);
+  }
+
+  bool hasAttribute(const char *name) const {
+    return _attributes.find(name) != _attributes.end();
+  }
+
+  const String &getAttribute(const char *name, const String &defaultValue = emptyString) const;
+  bool getAttribute(const char *name, bool defaultValue) const;
+  long getAttribute(const char *name, long defaultValue) const;
+  float getAttribute(const char *name, float defaultValue) const;
+  double getAttribute(const char *name, double defaultValue) const;
+
+  String urlDecode(const String &text) const;
 };
 
 /*
  * FILTER :: Callback to filter AsyncWebRewrite and AsyncWebHandler (done by the Server)
  * */
 
-typedef std::function ArRequestFilterFunction;
+using ArRequestFilterFunction = std::function;
 
 bool ON_STA_FILTER(AsyncWebServerRequest *request);
 
 bool ON_AP_FILTER(AsyncWebServerRequest *request);
 
+/*
+ * MIDDLEWARE :: Request interceptor, assigned to a AsyncWebHandler (or the server), which can be used:
+ * 1. to run some code before the final handler is executed (e.g. check authentication)
+ * 2. decide whether to proceed or not with the next handler
+ * */
+
+using ArMiddlewareNext = std::function;
+using ArMiddlewareCallback = std::function;
+
+// Middleware is a base class for all middleware
+class AsyncMiddleware {
+public:
+  virtual ~AsyncMiddleware() {}
+  virtual void run(__unused AsyncWebServerRequest *request, __unused ArMiddlewareNext next) {
+    return next();
+  };
+
+private:
+  friend class AsyncWebHandler;
+  friend class AsyncEventSource;
+  friend class AsyncMiddlewareChain;
+  bool _freeOnRemoval = false;
+};
+
+// Create a custom middleware by providing an anonymous callback function
+class AsyncMiddlewareFunction : public AsyncMiddleware {
+public:
+  AsyncMiddlewareFunction(ArMiddlewareCallback fn) : _fn(fn) {}
+  void run(AsyncWebServerRequest *request, ArMiddlewareNext next) override {
+    return _fn(request, next);
+  };
+
+private:
+  ArMiddlewareCallback _fn;
+};
+
+// For internal use only: super class to add/remove middleware to server or handlers
+class AsyncMiddlewareChain {
+public:
+  ~AsyncMiddlewareChain();
+
+  void addMiddleware(ArMiddlewareCallback fn);
+  void addMiddleware(AsyncMiddleware *middleware);
+  void addMiddlewares(std::vector middlewares);
+  bool removeMiddleware(AsyncMiddleware *middleware);
+
+  // For internal use only
+  void _runChain(AsyncWebServerRequest *request, ArMiddlewareNext finalizer);
+
+protected:
+  std::list _middlewares;
+};
+
+// AsyncAuthenticationMiddleware is a middleware that checks if the request is authenticated
+class AsyncAuthenticationMiddleware : public AsyncMiddleware {
+public:
+  void setUsername(const char *username);
+  void setPassword(const char *password);
+  void setPasswordHash(const char *hash);
+
+  void setRealm(const char *realm) {
+    _realm = realm;
+  }
+  void setAuthFailureMessage(const char *message) {
+    _authFailMsg = message;
+  }
+
+  // set the authentication method to use
+  // default is AUTH_NONE: no authentication required
+  // AUTH_BASIC: basic authentication
+  // AUTH_DIGEST: digest authentication
+  // AUTH_BEARER: bearer token authentication
+  // AUTH_OTHER: other authentication method
+  // AUTH_DENIED: always return 401 Unauthorized
+  // if a method is set but no username or password is set, authentication will be ignored
+  void setAuthType(AsyncAuthType authMethod) {
+    _authMethod = authMethod;
+  }
+
+  // precompute and store the hash value based on the username, password, realm.
+  // can be used for DIGEST and BASIC to avoid recomputing the hash for each request.
+  // returns true if the hash was successfully generated and replaced
+  bool generateHash();
+
+  // returns true if the username and password (or hash) are set
+  bool hasCredentials() const {
+    return _hasCreds;
+  }
+
+  bool allowed(AsyncWebServerRequest *request) const;
+
+  void run(AsyncWebServerRequest *request, ArMiddlewareNext next);
+
+private:
+  String _username;
+  String _credentials;
+  bool _hash = false;
+
+  String _realm = asyncsrv::T_LOGIN_REQ;
+  AsyncAuthType _authMethod = AsyncAuthType::AUTH_NONE;
+  String _authFailMsg;
+  bool _hasCreds = false;
+};
+
+using ArAuthorizeFunction = std::function;
+// AsyncAuthorizationMiddleware is a middleware that checks if the request is authorized
+class AsyncAuthorizationMiddleware : public AsyncMiddleware {
+public:
+  AsyncAuthorizationMiddleware(ArAuthorizeFunction authorizeConnectHandler) : _code(403), _authz(authorizeConnectHandler) {}
+  AsyncAuthorizationMiddleware(int code, ArAuthorizeFunction authorizeConnectHandler) : _code(code), _authz(authorizeConnectHandler) {}
+
+  void run(AsyncWebServerRequest *request, ArMiddlewareNext next) {
+    return _authz && !_authz(request) ? request->send(_code) : next();
+  }
+
+private:
+  int _code;
+  ArAuthorizeFunction _authz;
+};
+
+// remove all headers from the incoming request except the ones provided in the constructor
+class AsyncHeaderFreeMiddleware : public AsyncMiddleware {
+public:
+  void keep(const char *name) {
+    _toKeep.push_back(name);
+  }
+  void unKeep(const char *name) {
+    _toKeep.remove(name);
+  }
+
+  void run(AsyncWebServerRequest *request, ArMiddlewareNext next);
+
+private:
+  std::list _toKeep;
+};
+
+// filter out specific headers from the incoming request
+class AsyncHeaderFilterMiddleware : public AsyncMiddleware {
+public:
+  void filter(const char *name) {
+    _toRemove.push_back(name);
+  }
+  void unFilter(const char *name) {
+    _toRemove.remove(name);
+  }
+
+  void run(AsyncWebServerRequest *request, ArMiddlewareNext next);
+
+private:
+  std::list _toRemove;
+};
+
+// curl-like logging of incoming requests
+class AsyncLoggingMiddleware : public AsyncMiddleware {
+public:
+  void setOutput(Print &output) {
+    _out = &output;
+  }
+  void setEnabled(bool enabled) {
+    _enabled = enabled;
+  }
+  bool isEnabled() const {
+    return _enabled && _out;
+  }
+
+  void run(AsyncWebServerRequest *request, ArMiddlewareNext next);
+
+private:
+  Print *_out = nullptr;
+  bool _enabled = true;
+};
+
+// CORS Middleware
+class AsyncCorsMiddleware : public AsyncMiddleware {
+public:
+  void setOrigin(const char *origin) {
+    _origin = origin;
+  }
+  void setMethods(const char *methods) {
+    _methods = methods;
+  }
+  void setHeaders(const char *headers) {
+    _headers = headers;
+  }
+  void setAllowCredentials(bool credentials) {
+    _credentials = credentials;
+  }
+  void setMaxAge(uint32_t seconds) {
+    _maxAge = seconds;
+  }
+
+  void addCORSHeaders(AsyncWebServerResponse *response);
+
+  void run(AsyncWebServerRequest *request, ArMiddlewareNext next);
+
+private:
+  String _origin = "*";
+  String _methods = "*";
+  String _headers = "*";
+  bool _credentials = true;
+  uint32_t _maxAge = 86400;
+};
+
+// Rate limit Middleware
+class AsyncRateLimitMiddleware : public AsyncMiddleware {
+public:
+  void setMaxRequests(size_t maxRequests) {
+    _maxRequests = maxRequests;
+  }
+  void setWindowSize(uint32_t seconds) {
+    _windowSizeMillis = seconds * 1000;
+  }
+
+  bool isRequestAllowed(uint32_t &retryAfterSeconds);
+
+  void run(AsyncWebServerRequest *request, ArMiddlewareNext next);
+
+private:
+  size_t _maxRequests = 0;
+  uint32_t _windowSizeMillis = 0;
+  std::list _requestTimes;
+};
+
 /*
  * REWRITE :: One instance can be handle any Request (done by the Server)
  * */
 
 class AsyncWebRewrite {
-  protected:
-    String _from;
-    String _toUrl;
-    String _params;
-    ArRequestFilterFunction _filter;
-  public:
-    AsyncWebRewrite(const char* from, const char* to): _from(from), _toUrl(to), _params(String()), _filter(NULL){
-      int index = _toUrl.indexOf('?');
-      if (index > 0) {
-        _params = _toUrl.substring(index +1);
-        _toUrl = _toUrl.substring(0, index);
-      }
+protected:
+  String _from;
+  String _toUrl;
+  String _params;
+  ArRequestFilterFunction _filter{nullptr};
+
+public:
+  AsyncWebRewrite(const char *from, const char *to) : _from(from), _toUrl(to) {
+    int index = _toUrl.indexOf('?');
+    if (index > 0) {
+      _params = _toUrl.substring(index + 1);
+      _toUrl = _toUrl.substring(0, index);
     }
-    virtual ~AsyncWebRewrite(){}
-    AsyncWebRewrite& setFilter(ArRequestFilterFunction fn) { _filter = fn; return *this; }
-    bool filter(AsyncWebServerRequest *request) const { return _filter == NULL || _filter(request); }
-    const String& from(void) const { return _from; }
-    const String& toUrl(void) const { return _toUrl; }
-    const String& params(void) const { return _params; }
-    virtual bool match(AsyncWebServerRequest *request) { return from() == request->url() && filter(request); }
+  }
+  virtual ~AsyncWebRewrite() {}
+  AsyncWebRewrite &setFilter(ArRequestFilterFunction fn) {
+    _filter = fn;
+    return *this;
+  }
+  bool filter(AsyncWebServerRequest *request) const {
+    return _filter == NULL || _filter(request);
+  }
+  const String &from(void) const {
+    return _from;
+  }
+  const String &toUrl(void) const {
+    return _toUrl;
+  }
+  const String ¶ms(void) const {
+    return _params;
+  }
+  virtual bool match(AsyncWebServerRequest *request) {
+    return from() == request->url() && filter(request);
+  }
 };
 
 /*
  * HANDLER :: One instance can be attached to any Request (done by the Server)
  * */
 
-class AsyncWebHandler {
-  protected:
-    ArRequestFilterFunction _filter;
-    String _username;
-    String _password;
-  public:
-    AsyncWebHandler():_username(""), _password(""){}
-    AsyncWebHandler& setFilter(ArRequestFilterFunction fn) { _filter = fn; return *this; }
-    AsyncWebHandler& setAuthentication(const char *username, const char *password){  _username = String(username);_password = String(password); return *this; };
-    bool filter(AsyncWebServerRequest *request){ return _filter == NULL || _filter(request); }
-    virtual ~AsyncWebHandler(){}
-    virtual bool canHandle(AsyncWebServerRequest *request __attribute__((unused))){
-      return false;
-    }
-    virtual void handleRequest(AsyncWebServerRequest *request __attribute__((unused))){}
-    virtual void handleUpload(AsyncWebServerRequest *request  __attribute__((unused)), const String& filename __attribute__((unused)), size_t index __attribute__((unused)), uint8_t *data __attribute__((unused)), size_t len __attribute__((unused)), bool final  __attribute__((unused))){}
-    virtual void handleBody(AsyncWebServerRequest *request __attribute__((unused)), uint8_t *data __attribute__((unused)), size_t len __attribute__((unused)), size_t index __attribute__((unused)), size_t total __attribute__((unused))){}
-    virtual bool isRequestHandlerTrivial(){return true;}
+class AsyncWebHandler : public AsyncMiddlewareChain {
+protected:
+  ArRequestFilterFunction _filter = nullptr;
+  AsyncAuthenticationMiddleware *_authMiddleware = nullptr;
+  bool _skipServerMiddlewares = false;
+
+public:
+  AsyncWebHandler() {}
+  virtual ~AsyncWebHandler() {}
+  AsyncWebHandler &setFilter(ArRequestFilterFunction fn);
+  AsyncWebHandler &setAuthentication(const char *username, const char *password, AsyncAuthType authMethod = AsyncAuthType::AUTH_DIGEST);
+  AsyncWebHandler &setAuthentication(const String &username, const String &password, AsyncAuthType authMethod = AsyncAuthType::AUTH_DIGEST) {
+    return setAuthentication(username.c_str(), password.c_str(), authMethod);
+  };
+  AsyncWebHandler &setSkipServerMiddlewares(bool state) {
+    _skipServerMiddlewares = state;
+    return *this;
+  }
+  // skip all globally defined server middlewares for this handler and only execute those defined for this handler specifically
+  AsyncWebHandler &skipServerMiddlewares() {
+    return setSkipServerMiddlewares(true);
+  }
+  bool mustSkipServerMiddlewares() const {
+    return _skipServerMiddlewares;
+  }
+  bool filter(AsyncWebServerRequest *request) {
+    return _filter == NULL || _filter(request);
+  }
+  virtual bool canHandle(AsyncWebServerRequest *request __attribute__((unused))) const {
+    return false;
+  }
+  virtual void handleRequest(__unused AsyncWebServerRequest *request) {}
+  virtual void handleUpload(
+    __unused AsyncWebServerRequest *request, __unused const String &filename, __unused size_t index, __unused uint8_t *data, __unused size_t len,
+    __unused bool final
+  ) {}
+  virtual void handleBody(__unused AsyncWebServerRequest *request, __unused uint8_t *data, __unused size_t len, __unused size_t index, __unused size_t total) {}
+  virtual bool isRequestHandlerTrivial() const {
+    return true;
+  }
 };
 
 /*
@@ -352,38 +1015,82 @@ class AsyncWebHandler {
  * */
 
 typedef enum {
-  RESPONSE_SETUP, RESPONSE_HEADERS, RESPONSE_CONTENT, RESPONSE_WAIT_ACK, RESPONSE_END, RESPONSE_FAILED
+  RESPONSE_SETUP,
+  RESPONSE_HEADERS,
+  RESPONSE_CONTENT,
+  RESPONSE_WAIT_ACK,
+  RESPONSE_END,
+  RESPONSE_FAILED
 } WebResponseState;
 
 class AsyncWebServerResponse {
-  protected:
-    int _code;
-    LinkedList _headers;
-    String _contentType;
-    size_t _contentLength;
-    bool _sendContentLength;
-    bool _chunked;
-    size_t _headLength;
-    size_t _sentLength;
-    size_t _ackedLength;
-    size_t _writtenLength;
-    WebResponseState _state;
-    const char* _responseCodeToString(int code);
-
-  public:
-    AsyncWebServerResponse();
-    virtual ~AsyncWebServerResponse();
-    virtual void setCode(int code);
-    virtual void setContentLength(size_t len);
-    virtual void setContentType(const String& type);
-    virtual void addHeader(const String& name, const String& value);
-    virtual String _assembleHead(uint8_t version);
-    virtual bool _started() const;
-    virtual bool _finished() const;
-    virtual bool _failed() const;
-    virtual bool _sourceValid() const;
-    virtual void _respond(AsyncWebServerRequest *request);
-    virtual size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
+protected:
+  int _code;
+  std::list _headers;
+  String _contentType;
+  size_t _contentLength;
+  bool _sendContentLength;
+  bool _chunked;
+  size_t _headLength;
+  size_t _sentLength;
+  size_t _ackedLength;
+  size_t _writtenLength;
+  WebResponseState _state;
+
+  static bool headerMustBePresentOnce(const String &name);
+
+public:
+  static const char *responseCodeToString(int code);
+
+public:
+  AsyncWebServerResponse();
+  virtual ~AsyncWebServerResponse() {}
+  void setCode(int code);
+  int code() const {
+    return _code;
+  }
+  void setContentLength(size_t len);
+  void setContentType(const String &type) {
+    setContentType(type.c_str());
+  }
+  void setContentType(const char *type);
+  bool addHeader(AsyncWebHeader &&header, bool replaceExisting = true);
+  bool addHeader(const AsyncWebHeader &header, bool replaceExisting = true) {
+    return header && addHeader(header.name(), header.value(), replaceExisting);
+  }
+  bool addHeader(const char *name, const char *value, bool replaceExisting = true);
+  bool addHeader(const String &name, const String &value, bool replaceExisting = true) {
+    return addHeader(name.c_str(), value.c_str(), replaceExisting);
+  }
+  bool addHeader(const char *name, long value, bool replaceExisting = true) {
+    return addHeader(name, String(value), replaceExisting);
+  }
+  bool addHeader(const String &name, long value, bool replaceExisting = true) {
+    return addHeader(name.c_str(), value, replaceExisting);
+  }
+  bool removeHeader(const char *name);
+  bool removeHeader(const char *name, const char *value);
+  const AsyncWebHeader *getHeader(const char *name) const;
+  const std::list &getHeaders() const {
+    return _headers;
+  }
+
+#ifndef ESP8266
+  [[deprecated("Use instead: _assembleHead(String& buffer, uint8_t version)")]]
+#endif
+  String _assembleHead(uint8_t version) {
+    String buffer;
+    _assembleHead(buffer, version);
+    return buffer;
+  }
+  void _assembleHead(String &buffer, uint8_t version);
+
+  virtual bool _started() const;
+  virtual bool _finished() const;
+  virtual bool _failed() const;
+  virtual bool _sourceValid() const;
+  virtual void _respond(AsyncWebServerRequest *request);
+  virtual size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
 };
 
 /*
@@ -391,81 +1098,137 @@ class AsyncWebServerResponse {
  * */
 
 typedef std::function ArRequestHandlerFunction;
-typedef std::function ArUploadHandlerFunction;
+typedef std::function
+  ArUploadHandlerFunction;
 typedef std::function ArBodyHandlerFunction;
 
-class AsyncWebServer {
-  protected:
-    AsyncServer _server;
-    LinkedList _rewrites;
-    LinkedList _handlers;
-    AsyncCallbackWebHandler* _catchAllHandler;
+class AsyncWebServer : public AsyncMiddlewareChain {
+protected:
+  AsyncServer _server;
+  std::list> _rewrites;
+  std::list> _handlers;
+  AsyncCallbackWebHandler *_catchAllHandler;
 
-  public:
-    AsyncWebServer(uint16_t port);
-    ~AsyncWebServer();
+public:
+  AsyncWebServer(uint16_t port);
+  ~AsyncWebServer();
 
-    void begin();
-    void end();
+  void begin();
+  void end();
+
+  tcp_state state() const {
+#ifdef ESP8266
+    // ESPAsyncTCP and RPAsyncTCP methods are not corrected declared with const for immutable ones.
+    return static_cast(const_cast(this)->_server.status());
+#else
+    return static_cast(_server.status());
+#endif
+  }
 
 #if ASYNC_TCP_SSL_ENABLED
-    void onSslFileRequest(AcSSlFileHandler cb, void* arg);
-    void beginSecure(const char *cert, const char *private_key_file, const char *password);
+  void onSslFileRequest(AcSSlFileHandler cb, void *arg);
+  void beginSecure(const char *cert, const char *private_key_file, const char *password);
 #endif
 
-    AsyncWebRewrite& addRewrite(AsyncWebRewrite* rewrite);
-    bool removeRewrite(AsyncWebRewrite* rewrite);
-    AsyncWebRewrite& rewrite(const char* from, const char* to);
-
-    AsyncWebHandler& addHandler(AsyncWebHandler* handler);
-    bool removeHandler(AsyncWebHandler* handler);
-  
-    AsyncCallbackWebHandler& on(const char* uri, ArRequestHandlerFunction onRequest);
-    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest);
-    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload);
-    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody);
-
-    AsyncStaticWebHandler& serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_control = NULL);
-
-    void onNotFound(ArRequestHandlerFunction fn);  //called when handler is not assigned
-    void onFileUpload(ArUploadHandlerFunction fn); //handle file uploads
-    void onRequestBody(ArBodyHandlerFunction fn); //handle posts with plain body content (JSON often transmitted this way as a request)
-
-    void reset(); //remove all writers and handlers, with onNotFound/onFileUpload/onRequestBody 
-  
-    void _handleDisconnect(AsyncWebServerRequest *request);
-    void _attachHandler(AsyncWebServerRequest *request);
-    void _rewriteRequest(AsyncWebServerRequest *request);
+  AsyncWebRewrite &addRewrite(AsyncWebRewrite *rewrite);
+
+  /**
+     * @brief (compat) Add url rewrite rule by pointer
+     * a deep copy of the pointer object will be created,
+     * it is up to user to manage further lifetime of the object in argument
+     *
+     * @param rewrite pointer to rewrite object to copy setting from
+     * @return AsyncWebRewrite& reference to a newly created rewrite rule
+     */
+  AsyncWebRewrite &addRewrite(std::shared_ptr rewrite);
+
+  /**
+     * @brief add url rewrite rule
+     *
+     * @param from
+     * @param to
+     * @return AsyncWebRewrite&
+     */
+  AsyncWebRewrite &rewrite(const char *from, const char *to);
+
+  /**
+     * @brief (compat) remove rewrite rule via referenced object
+     * this will NOT deallocate pointed object itself, internal rule with same from/to urls will be removed if any
+     * it's a compat method, better use `removeRewrite(const char* from, const char* to)`
+     * @param rewrite
+     * @return true
+     * @return false
+     */
+  bool removeRewrite(AsyncWebRewrite *rewrite);
+
+  /**
+     * @brief remove rewrite rule
+     *
+     * @param from
+     * @param to
+     * @return true
+     * @return false
+     */
+  bool removeRewrite(const char *from, const char *to);
+
+  AsyncWebHandler &addHandler(AsyncWebHandler *handler);
+  bool removeHandler(AsyncWebHandler *handler);
+
+  AsyncCallbackWebHandler &on(const char *uri, ArRequestHandlerFunction onRequest) {
+    return on(uri, HTTP_ANY, onRequest);
+  }
+  AsyncCallbackWebHandler &on(
+    const char *uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload = nullptr,
+    ArBodyHandlerFunction onBody = nullptr
+  );
+
+  AsyncStaticWebHandler &serveStatic(const char *uri, fs::FS &fs, const char *path, const char *cache_control = NULL);
+
+  void onNotFound(ArRequestHandlerFunction fn);   // called when handler is not assigned
+  void onFileUpload(ArUploadHandlerFunction fn);  // handle file uploads
+  void onRequestBody(ArBodyHandlerFunction fn);   // handle posts with plain body content (JSON often transmitted this way as a request)
+  // give access to the handler used to catch all requests, so that middleware can be added to it
+  AsyncWebHandler &catchAllHandler() const;
+
+  void reset();  // remove all writers and handlers, with onNotFound/onFileUpload/onRequestBody
+
+  void _handleDisconnect(AsyncWebServerRequest *request);
+  void _attachHandler(AsyncWebServerRequest *request);
+  void _rewriteRequest(AsyncWebServerRequest *request);
 };
 
 class DefaultHeaders {
-  using headers_t = LinkedList;
+  using headers_t = std::list;
   headers_t _headers;
-  
-  DefaultHeaders()
-  :_headers(headers_t([](AsyncWebHeader *h){ delete h; }))
-  {}
+
 public:
-  using ConstIterator = headers_t::ConstIterator;
+  DefaultHeaders() = default;
+
+  using ConstIterator = headers_t::const_iterator;
+
+  void addHeader(const String &name, const String &value) {
+    _headers.emplace_back(name, value);
+  }
 
-  void addHeader(const String& name, const String& value){
-    _headers.add(new AsyncWebHeader(name, value));
-  }  
-  
-  ConstIterator begin() const { return _headers.begin(); }
-  ConstIterator end() const { return _headers.end(); }
+  ConstIterator begin() const {
+    return _headers.begin();
+  }
+  ConstIterator end() const {
+    return _headers.end();
+  }
 
   DefaultHeaders(DefaultHeaders const &) = delete;
   DefaultHeaders &operator=(DefaultHeaders const &) = delete;
+
   static DefaultHeaders &Instance() {
     static DefaultHeaders instance;
     return instance;
   }
 };
 
-#include "WebResponseImpl.h"
-#include "WebHandlerImpl.h"
-#include "AsyncWebSocket.h"
 #include "AsyncEventSource.h"
+#include "AsyncWebSocket.h"
+#include "WebHandlerImpl.h"
+#include "WebResponseImpl.h"
 
 #endif /* _AsyncWebServer_H_ */
diff --git a/src/Middleware.cpp b/src/Middleware.cpp
new file mode 100644
index 000000000..5e9c3c274
--- /dev/null
+++ b/src/Middleware.cpp
@@ -0,0 +1,291 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+#include "WebAuthentication.h"
+#include 
+
+AsyncMiddlewareChain::~AsyncMiddlewareChain() {
+  for (AsyncMiddleware *m : _middlewares) {
+    if (m->_freeOnRemoval) {
+      delete m;
+    }
+  }
+}
+
+void AsyncMiddlewareChain::addMiddleware(ArMiddlewareCallback fn) {
+  AsyncMiddlewareFunction *m = new AsyncMiddlewareFunction(fn);
+  m->_freeOnRemoval = true;
+  _middlewares.emplace_back(m);
+}
+
+void AsyncMiddlewareChain::addMiddleware(AsyncMiddleware *middleware) {
+  if (middleware) {
+    _middlewares.emplace_back(middleware);
+  }
+}
+
+void AsyncMiddlewareChain::addMiddlewares(std::vector middlewares) {
+  for (AsyncMiddleware *m : middlewares) {
+    addMiddleware(m);
+  }
+}
+
+bool AsyncMiddlewareChain::removeMiddleware(AsyncMiddleware *middleware) {
+  // remove all middlewares from _middlewares vector being equal to middleware, delete them having _freeOnRemoval flag to true and resize the vector.
+  const size_t size = _middlewares.size();
+  _middlewares.erase(
+    std::remove_if(
+      _middlewares.begin(), _middlewares.end(),
+      [middleware](AsyncMiddleware *m) {
+        if (m == middleware) {
+          if (m->_freeOnRemoval) {
+            delete m;
+          }
+          return true;
+        }
+        return false;
+      }
+    ),
+    _middlewares.end()
+  );
+  return size != _middlewares.size();
+}
+
+void AsyncMiddlewareChain::_runChain(AsyncWebServerRequest *request, ArMiddlewareNext finalizer) {
+  if (!_middlewares.size()) {
+    return finalizer();
+  }
+  ArMiddlewareNext next;
+  std::list::iterator it = _middlewares.begin();
+  next = [this, &next, &it, request, finalizer]() {
+    if (it == _middlewares.end()) {
+      return finalizer();
+    }
+    AsyncMiddleware *m = *it;
+    it++;
+    return m->run(request, next);
+  };
+  return next();
+}
+
+void AsyncAuthenticationMiddleware::setUsername(const char *username) {
+  _username = username;
+  _hasCreds = _username.length() && _credentials.length();
+}
+
+void AsyncAuthenticationMiddleware::setPassword(const char *password) {
+  _credentials = password;
+  _hash = false;
+  _hasCreds = _username.length() && _credentials.length();
+}
+
+void AsyncAuthenticationMiddleware::setPasswordHash(const char *hash) {
+  _credentials = hash;
+  _hash = _credentials.length();
+  _hasCreds = _username.length() && _credentials.length();
+}
+
+bool AsyncAuthenticationMiddleware::generateHash() {
+  // ensure we have all the necessary data
+  if (!_hasCreds) {
+    return false;
+  }
+
+  // if we already have a hash, do nothing
+  if (_hash) {
+    return false;
+  }
+
+  switch (_authMethod) {
+    case AsyncAuthType::AUTH_DIGEST:
+      _credentials = generateDigestHash(_username.c_str(), _credentials.c_str(), _realm.c_str());
+      if (_credentials.length()) {
+        _hash = true;
+        return true;
+      } else {
+        return false;
+      }
+
+    case AsyncAuthType::AUTH_BASIC:
+      _credentials = generateBasicHash(_username.c_str(), _credentials.c_str());
+      if (_credentials.length()) {
+        _hash = true;
+        return true;
+      } else {
+        return false;
+      }
+
+    default: return false;
+  }
+}
+
+bool AsyncAuthenticationMiddleware::allowed(AsyncWebServerRequest *request) const {
+  if (_authMethod == AsyncAuthType::AUTH_NONE) {
+    return true;
+  }
+
+  if (_authMethod == AsyncAuthType::AUTH_DENIED) {
+    return false;
+  }
+
+  if (!_hasCreds) {
+    return true;
+  }
+
+  return request->authenticate(_username.c_str(), _credentials.c_str(), _realm.c_str(), _hash);
+}
+
+void AsyncAuthenticationMiddleware::run(AsyncWebServerRequest *request, ArMiddlewareNext next) {
+  return allowed(request) ? next() : request->requestAuthentication(_authMethod, _realm.c_str(), _authFailMsg.c_str());
+}
+
+void AsyncHeaderFreeMiddleware::run(AsyncWebServerRequest *request, ArMiddlewareNext next) {
+  std::list toRemove;
+  for (auto &h : request->getHeaders()) {
+    bool keep = false;
+    for (const char *k : _toKeep) {
+      if (strcasecmp(h.name().c_str(), k) == 0) {
+        keep = true;
+        break;
+      }
+    }
+    if (!keep) {
+      toRemove.push_back(h.name().c_str());
+    }
+  }
+  for (const char *h : toRemove) {
+    request->removeHeader(h);
+  }
+  next();
+}
+
+void AsyncHeaderFilterMiddleware::run(AsyncWebServerRequest *request, ArMiddlewareNext next) {
+  for (auto it = _toRemove.begin(); it != _toRemove.end(); ++it) {
+    request->removeHeader(*it);
+  }
+  next();
+}
+
+void AsyncLoggingMiddleware::run(AsyncWebServerRequest *request, ArMiddlewareNext next) {
+  if (!isEnabled()) {
+    next();
+    return;
+  }
+  _out->print(F("* Connection from "));
+#ifndef LIBRETINY
+  _out->print(request->client()->remoteIP().toString());
+#else
+  _out->print(request->client()->remoteIP());
+#endif
+  _out->print(':');
+  _out->println(request->client()->remotePort());
+  _out->print('>');
+  _out->print(' ');
+  _out->print(request->methodToString());
+  _out->print(' ');
+  _out->print(request->url().c_str());
+  _out->print(F(" HTTP/1."));
+  _out->println(request->version());
+  for (auto &h : request->getHeaders()) {
+    if (h.value().length()) {
+      _out->print('>');
+      _out->print(' ');
+      _out->print(h.name());
+      _out->print(':');
+      _out->print(' ');
+      _out->println(h.value());
+    }
+  }
+  _out->println(F(">"));
+  uint32_t elapsed = millis();
+  next();
+  elapsed = millis() - elapsed;
+  AsyncWebServerResponse *response = request->getResponse();
+  if (response) {
+    _out->print(F("* Processed in "));
+    _out->print(elapsed);
+    _out->println(F(" ms"));
+    _out->print('<');
+    _out->print(F(" HTTP/1."));
+    _out->print(request->version());
+    _out->print(' ');
+    _out->print(response->code());
+    _out->print(' ');
+    _out->println(AsyncWebServerResponse::responseCodeToString(response->code()));
+    for (auto &h : response->getHeaders()) {
+      if (h.value().length()) {
+        _out->print('<');
+        _out->print(' ');
+        _out->print(h.name());
+        _out->print(':');
+        _out->print(' ');
+        _out->println(h.value());
+      }
+    }
+    _out->println('<');
+  } else {
+    _out->println(F("* Connection closed!"));
+  }
+}
+
+void AsyncCorsMiddleware::addCORSHeaders(AsyncWebServerResponse *response) {
+  response->addHeader(asyncsrv::T_CORS_ACAO, _origin.c_str());
+  response->addHeader(asyncsrv::T_CORS_ACAM, _methods.c_str());
+  response->addHeader(asyncsrv::T_CORS_ACAH, _headers.c_str());
+  response->addHeader(asyncsrv::T_CORS_ACAC, _credentials ? asyncsrv::T_TRUE : asyncsrv::T_FALSE);
+  response->addHeader(asyncsrv::T_CORS_ACMA, String(_maxAge).c_str());
+}
+
+void AsyncCorsMiddleware::run(AsyncWebServerRequest *request, ArMiddlewareNext next) {
+  // Origin header ? => CORS handling
+  if (request->hasHeader(asyncsrv::T_CORS_O)) {
+    // check if this is a preflight request => handle it and return
+    if (request->method() == HTTP_OPTIONS) {
+      AsyncWebServerResponse *response = request->beginResponse(200);
+      addCORSHeaders(response);
+      request->send(response);
+      return;
+    }
+
+    // CORS request, no options => let the request pass and add CORS headers after
+    next();
+    AsyncWebServerResponse *response = request->getResponse();
+    if (response) {
+      addCORSHeaders(response);
+    }
+
+  } else {
+    // NO Origin header => no CORS handling
+    next();
+  }
+}
+
+bool AsyncRateLimitMiddleware::isRequestAllowed(uint32_t &retryAfterSeconds) {
+  uint32_t now = millis();
+
+  while (!_requestTimes.empty() && _requestTimes.front() <= now - _windowSizeMillis) {
+    _requestTimes.pop_front();
+  }
+
+  _requestTimes.push_back(now);
+
+  if (_requestTimes.size() > _maxRequests) {
+    _requestTimes.pop_front();
+    retryAfterSeconds = (_windowSizeMillis - (now - _requestTimes.front())) / 1000 + 1;
+    return false;
+  }
+
+  retryAfterSeconds = 0;
+  return true;
+}
+
+void AsyncRateLimitMiddleware::run(AsyncWebServerRequest *request, ArMiddlewareNext next) {
+  uint32_t retryAfterSeconds;
+  if (isRequestAllowed(retryAfterSeconds)) {
+    next();
+  } else {
+    AsyncWebServerResponse *response = request->beginResponse(429);
+    response->addHeader(asyncsrv::T_retry_after, retryAfterSeconds);
+    request->send(response);
+  }
+}
diff --git a/src/StringArray.h b/src/StringArray.h
deleted file mode 100644
index 266bd9def..000000000
--- a/src/StringArray.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#ifndef STRINGARRAY_H_
-#define STRINGARRAY_H_
-
-#include "stddef.h"
-#include "WString.h"
-
-template 
-class LinkedListNode {
-    T _value;
-  public:
-    LinkedListNode* next;
-    LinkedListNode(const T val): _value(val), next(nullptr) {}
-    ~LinkedListNode(){}
-    const T& value() const { return _value; };
-    T& value(){ return _value; }
-};
-
-template  class Item = LinkedListNode>
-class LinkedList {
-  public:
-    typedef Item ItemType;
-    typedef std::function OnRemove;
-    typedef std::function Predicate;
-  private:
-    ItemType* _root;
-    OnRemove _onRemove;
-
-    class Iterator {
-      ItemType* _node;
-      ItemType* _nextNode = nullptr;
-    public:
-      Iterator(ItemType* current = nullptr) : _node(current) {
-          if (_node != nullptr) {
-              _nextNode = current->next;
-          }
-      }
-      Iterator(const Iterator& i) : _node(i._node) {}
-      Iterator& operator ++() {
-          _node = _nextNode;
-          _nextNode = _node != nullptr ? _node->next : nullptr;
-          return *this;
-      }
-      bool operator != (const Iterator& i) const { return _node != i._node; }
-      const T& operator * () const { return _node->value(); }
-      const T* operator -> () const { return &_node->value(); }
-    };
-    
-  public:
-    typedef const Iterator ConstIterator;
-    ConstIterator begin() const { return ConstIterator(_root); }
-    ConstIterator end() const { return ConstIterator(nullptr); }
-
-    LinkedList(OnRemove onRemove) : _root(nullptr), _onRemove(onRemove) {}
-    ~LinkedList(){}
-    void add(const T& t){
-      auto it = new ItemType(t);
-      if(!_root){
-        _root = it;
-      } else {
-        auto i = _root;
-        while(i->next) i = i->next;
-        i->next = it;
-      }
-    }
-    T& front() const {
-      return _root->value();
-    }
-    
-    bool isEmpty() const {
-      return _root == nullptr;
-    }
-    size_t length() const {
-      size_t i = 0;
-      auto it = _root;
-      while(it){
-        i++;
-        it = it->next;
-      }
-      return i;
-    }
-    size_t count_if(Predicate predicate) const {
-      size_t i = 0;
-      auto it = _root;
-      while(it){
-        if (!predicate){
-          i++;
-        }
-        else if (predicate(it->value())) {
-          i++;
-        }
-        it = it->next;
-      }
-      return i;
-    }
-    const T* nth(size_t N) const {
-      size_t i = 0;
-      auto it = _root;
-      while(it){
-        if(i++ == N)
-          return &(it->value());
-        it = it->next;
-      }
-      return nullptr;
-    }
-    bool remove(const T& t){
-      auto it = _root;
-      auto pit = _root;
-      while(it){
-        if(it->value() == t){
-          if(it == _root){
-            _root = _root->next;
-          } else {
-            pit->next = it->next;
-          }
-          
-          if (_onRemove) {
-            _onRemove(it->value());
-          }
-          
-          delete it;
-          return true;
-        }
-        pit = it;
-        it = it->next;
-      }
-      return false;
-    }
-    bool remove_first(Predicate predicate){
-      auto it = _root;
-      auto pit = _root;
-      while(it){
-        if(predicate(it->value())){
-          if(it == _root){
-            _root = _root->next;
-          } else {
-            pit->next = it->next;
-          }
-          if (_onRemove) {
-            _onRemove(it->value());
-          }
-          delete it;
-          return true;
-        }
-        pit = it;
-        it = it->next;
-      }
-      return false;
-    }
-    
-    void free(){
-      while(_root != nullptr){
-        auto it = _root;
-        _root = _root->next;
-        if (_onRemove) {
-          _onRemove(it->value());
-        }
-        delete it;
-      }
-      _root = nullptr;
-    }
-};
-
-
-class StringArray : public LinkedList {
-public:
-  
-  StringArray() : LinkedList(nullptr) {}
-  
-  bool containsIgnoreCase(const String& str){
-    for (const auto& s : *this) {
-      if (str.equalsIgnoreCase(s)) {
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-
-
-
-#endif /* STRINGARRAY_H_ */
diff --git a/src/WebAuthentication.cpp b/src/WebAuthentication.cpp
index 3ab4cb76e..7ed78142f 100644
--- a/src/WebAuthentication.cpp
+++ b/src/WebAuthentication.cpp
@@ -1,242 +1,247 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
 #include "WebAuthentication.h"
 #include 
-#ifdef ESP32
-#include "mbedtls/md5.h"
+#if defined(ESP32) || defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+#include 
 #else
 #include "md5.h"
 #endif
+#include "literals.h"
 
+using namespace asyncsrv;
 
 // Basic Auth hash = base64("username:password")
 
-bool checkBasicAuthentication(const char * hash, const char * username, const char * password){
-  if(username == NULL || password == NULL || hash == NULL)
+bool checkBasicAuthentication(const char *hash, const char *username, const char *password) {
+  if (username == NULL || password == NULL || hash == NULL) {
     return false;
+  }
+  return generateBasicHash(username, password).equalsIgnoreCase(hash);
+}
 
-  size_t toencodeLen = strlen(username)+strlen(password)+1;
-  size_t encodedLen = base64_encode_expected_len(toencodeLen);
-  if(strlen(hash) != encodedLen)
-    return false;
+String generateBasicHash(const char *username, const char *password) {
+  if (username == NULL || password == NULL) {
+    return emptyString;
+  }
 
-  char *toencode = new char[toencodeLen+1];
-  if(toencode == NULL){
-    return false;
+  size_t toencodeLen = strlen(username) + strlen(password) + 1;
+
+  char *toencode = new char[toencodeLen + 1];
+  if (toencode == NULL) {
+    return emptyString;
   }
-  char *encoded = new char[base64_encode_expected_len(toencodeLen)+1];
-  if(encoded == NULL){
+  char *encoded = new char[base64_encode_expected_len(toencodeLen) + 1];
+  if (encoded == NULL) {
     delete[] toencode;
-    return false;
+    return emptyString;
   }
-  sprintf(toencode, "%s:%s", username, password);
-  if(base64_encode_chars(toencode, toencodeLen, encoded) > 0 && memcmp(hash, encoded, encodedLen) == 0){
+  sprintf_P(toencode, PSTR("%s:%s"), username, password);
+  if (base64_encode_chars(toencode, toencodeLen, encoded) > 0) {
+    String res = String(encoded);
     delete[] toencode;
     delete[] encoded;
-    return true;
+    return res;
   }
   delete[] toencode;
   delete[] encoded;
-  return false;
+  return emptyString;
 }
 
-static bool getMD5(uint8_t * data, uint16_t len, char * output){//33 bytes or more
-#ifdef ESP32
-    mbedtls_md5_context _ctx;
+static bool getMD5(uint8_t *data, uint16_t len, char *output) {  // 33 bytes or more
+#if defined(ESP32) || defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+  MD5Builder md5;
+  md5.begin();
+  md5.add(data, len);
+  md5.calculate();
+  md5.getChars(output);
 #else
-    md5_context_t _ctx;
-#endif
-  uint8_t i;
-  uint8_t * _buf = (uint8_t*)malloc(16);
-  if(_buf == NULL)
+  md5_context_t _ctx;
+
+  uint8_t *_buf = (uint8_t *)malloc(16);
+  if (_buf == NULL) {
     return false;
+  }
   memset(_buf, 0x00, 16);
-#ifdef ESP32
-#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
-  mbedtls_md5_init(&_ctx);
-  mbedtls_md5_starts(&_ctx);
-  mbedtls_md5_update(&_ctx, data, len);
-  mbedtls_md5_finish(&_ctx, _buf);
-#else
-  mbedtls_md5_init(&_ctx);
-  mbedtls_md5_starts_ret(&_ctx);
-  mbedtls_md5_update_ret(&_ctx, data, len);
-  mbedtls_md5_finish_ret(&_ctx, _buf);
-#endif
-#else
+
   MD5Init(&_ctx);
   MD5Update(&_ctx, data, len);
   MD5Final(_buf, &_ctx);
-#endif
-  for(i = 0; i < 16; i++) {
-    sprintf(output + (i * 2), "%02x", _buf[i]);
+
+  for (uint8_t i = 0; i < 16; i++) {
+    sprintf_P(output + (i * 2), PSTR("%02x"), _buf[i]);
   }
+
   free(_buf);
+#endif
   return true;
 }
 
-static String genRandomMD5(){
+String genRandomMD5() {
 #ifdef ESP8266
   uint32_t r = RANDOM_REG32;
 #else
   uint32_t r = rand();
 #endif
-  char * out = (char*)malloc(33);
-  if(out == NULL || !getMD5((uint8_t*)(&r), 4, out))
-    return "";
+  char *out = (char *)malloc(33);
+  if (out == NULL || !getMD5((uint8_t *)(&r), 4, out)) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    return emptyString;
+  }
   String res = String(out);
   free(out);
   return res;
 }
 
-static String stringMD5(const String& in){
-  char * out = (char*)malloc(33);
-  if(out == NULL || !getMD5((uint8_t*)(in.c_str()), in.length(), out))
-    return "";
+static String stringMD5(const String &in) {
+  char *out = (char *)malloc(33);
+  if (out == NULL || !getMD5((uint8_t *)(in.c_str()), in.length(), out)) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    return emptyString;
+  }
   String res = String(out);
   free(out);
   return res;
 }
 
-String generateDigestHash(const char * username, const char * password, const char * realm){
-  if(username == NULL || password == NULL || realm == NULL){
-    return "";
+String generateDigestHash(const char *username, const char *password, const char *realm) {
+  if (username == NULL || password == NULL || realm == NULL) {
+    return emptyString;
   }
-  char * out = (char*)malloc(33);
-  String res = String(username);
-  res.concat(":");
-  res.concat(realm);
-  res.concat(":");
-  String in = res;
+  char *out = (char *)malloc(33);
+  if (out == NULL) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    return emptyString;
+  }
+
+  String in;
+  if (!in.reserve(strlen(username) + strlen(realm) + strlen(password) + 2)) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    free(out);
+    return emptyString;
+  }
+
+  in.concat(username);
+  in.concat(':');
+  in.concat(realm);
+  in.concat(':');
   in.concat(password);
-  if(out == NULL || !getMD5((uint8_t*)(in.c_str()), in.length(), out))
-    return "";
-  res.concat(out);
-  free(out);
-  return res;
-}
 
-String requestDigestAuthentication(const char * realm){
-  String header = "realm=\"";
-  if(realm == NULL)
-    header.concat("asyncesp");
-  else
-    header.concat(realm);
-  header.concat( "\", qop=\"auth\", nonce=\"");
-  header.concat(genRandomMD5());
-  header.concat("\", opaque=\"");
-  header.concat(genRandomMD5());
-  header.concat("\"");
-  return header;
+  if (!getMD5((uint8_t *)(in.c_str()), in.length(), out)) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    free(out);
+    return emptyString;
+  }
+
+  in = String(out);
+  free(out);
+  return in;
 }
 
-bool checkDigestAuthentication(const char * header, const char * method, const char * username, const char * password, const char * realm, bool passwordIsHash, const char * nonce, const char * opaque, const char * uri){
-  if(username == NULL || password == NULL || header == NULL || method == NULL){
-    //os_printf("AUTH FAIL: missing requred fields\n");
+bool checkDigestAuthentication(
+  const char *header, const char *method, const char *username, const char *password, const char *realm, bool passwordIsHash, const char *nonce,
+  const char *opaque, const char *uri
+) {
+  if (username == NULL || password == NULL || header == NULL || method == NULL) {
+    // os_printf("AUTH FAIL: missing required fields\n");
     return false;
   }
 
-  String myHeader = String(header);
-  int nextBreak = myHeader.indexOf(",");
-  if(nextBreak < 0){
-    //os_printf("AUTH FAIL: no variables\n");
+  String myHeader(header);
+  int nextBreak = myHeader.indexOf(',');
+  if (nextBreak < 0) {
+    // os_printf("AUTH FAIL: no variables\n");
     return false;
   }
 
-  String myUsername = String();
-  String myRealm = String();
-  String myNonce = String();
-  String myUri = String();
-  String myResponse = String();
-  String myQop = String();
-  String myNc = String();
-  String myCnonce = String();
-
-  myHeader += ", ";
+  String myUsername;
+  String myRealm;
+  String myNonce;
+  String myUri;
+  String myResponse;
+  String myQop;
+  String myNc;
+  String myCnonce;
+
+  myHeader += (char)0x2c;  // ','
+  myHeader += (char)0x20;  // ' '
   do {
-    String avLine = myHeader.substring(0, nextBreak);
+    String avLine(myHeader.substring(0, nextBreak));
     avLine.trim();
-    myHeader = myHeader.substring(nextBreak+1);
-    nextBreak = myHeader.indexOf(",");
+    myHeader = myHeader.substring(nextBreak + 1);
+    nextBreak = myHeader.indexOf(',');
 
-    int eqSign = avLine.indexOf("=");
-    if(eqSign < 0){
-      //os_printf("AUTH FAIL: no = sign\n");
+    int eqSign = avLine.indexOf('=');
+    if (eqSign < 0) {
+      // os_printf("AUTH FAIL: no = sign\n");
       return false;
     }
-    String varName = avLine.substring(0, eqSign);
+    String varName(avLine.substring(0, eqSign));
     avLine = avLine.substring(eqSign + 1);
-    if(avLine.startsWith("\"")){
+    if (avLine.startsWith(String('"'))) {
       avLine = avLine.substring(1, avLine.length() - 1);
     }
 
-    if(varName.equals("username")){
-      if(!avLine.equals(username)){
-        //os_printf("AUTH FAIL: username\n");
+    if (varName.equals(T_username)) {
+      if (!avLine.equals(username)) {
+        // os_printf("AUTH FAIL: username\n");
         return false;
       }
       myUsername = avLine;
-    } else if(varName.equals("realm")){
-      if(realm != NULL && !avLine.equals(realm)){
-        //os_printf("AUTH FAIL: realm\n");
+    } else if (varName.equals(T_realm)) {
+      if (realm != NULL && !avLine.equals(realm)) {
+        // os_printf("AUTH FAIL: realm\n");
         return false;
       }
       myRealm = avLine;
-    } else if(varName.equals("nonce")){
-      if(nonce != NULL && !avLine.equals(nonce)){
-        //os_printf("AUTH FAIL: nonce\n");
+    } else if (varName.equals(T_nonce)) {
+      if (nonce != NULL && !avLine.equals(nonce)) {
+        // os_printf("AUTH FAIL: nonce\n");
         return false;
       }
       myNonce = avLine;
-    } else if(varName.equals("opaque")){
-      if(opaque != NULL && !avLine.equals(opaque)){
-        //os_printf("AUTH FAIL: opaque\n");
+    } else if (varName.equals(T_opaque)) {
+      if (opaque != NULL && !avLine.equals(opaque)) {
+        // os_printf("AUTH FAIL: opaque\n");
         return false;
       }
-    } else if(varName.equals("uri")){
-      if(uri != NULL && !avLine.equals(uri)){
-        //os_printf("AUTH FAIL: uri\n");
+    } else if (varName.equals(T_uri)) {
+      if (uri != NULL && !avLine.equals(uri)) {
+        // os_printf("AUTH FAIL: uri\n");
         return false;
       }
       myUri = avLine;
-    } else if(varName.equals("response")){
+    } else if (varName.equals(T_response)) {
       myResponse = avLine;
-    } else if(varName.equals("qop")){
+    } else if (varName.equals(T_qop)) {
       myQop = avLine;
-    } else if(varName.equals("nc")){
+    } else if (varName.equals(T_nc)) {
       myNc = avLine;
-    } else if(varName.equals("cnonce")){
+    } else if (varName.equals(T_cnonce)) {
       myCnonce = avLine;
     }
-  } while(nextBreak > 0);
+  } while (nextBreak > 0);
 
-  String ha1 = (passwordIsHash) ? String(password) : stringMD5(myUsername + ":" + myRealm + ":" + String(password));
-  String ha2 = String(method) + ":" + myUri;
-  String response = ha1 + ":" + myNonce + ":" + myNc + ":" + myCnonce + ":" + myQop + ":" + stringMD5(ha2);
+  String ha1 = passwordIsHash ? password : stringMD5(myUsername + ':' + myRealm + ':' + password).c_str();
+  String ha2 = stringMD5(String(method) + ':' + myUri);
+  String response = ha1 + ':' + myNonce + ':' + myNc + ':' + myCnonce + ':' + myQop + ':' + ha2;
 
-  if(myResponse.equals(stringMD5(response))){
-    //os_printf("AUTH SUCCESS\n");
+  if (myResponse.equals(stringMD5(response))) {
+    // os_printf("AUTH SUCCESS\n");
     return true;
   }
 
-  //os_printf("AUTH FAIL: password\n");
+  // os_printf("AUTH FAIL: password\n");
   return false;
 }
diff --git a/src/WebAuthentication.h b/src/WebAuthentication.h
index ff68265d9..1711821f9 100644
--- a/src/WebAuthentication.h
+++ b/src/WebAuthentication.h
@@ -1,34 +1,23 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
 #ifndef WEB_AUTHENTICATION_H_
 #define WEB_AUTHENTICATION_H_
 
 #include "Arduino.h"
 
-bool checkBasicAuthentication(const char * header, const char * username, const char * password);
-String requestDigestAuthentication(const char * realm);
-bool checkDigestAuthentication(const char * header, const char * method, const char * username, const char * password, const char * realm, bool passwordIsHash, const char * nonce, const char * opaque, const char * uri);
+bool checkBasicAuthentication(const char *header, const char *username, const char *password);
+
+bool checkDigestAuthentication(
+  const char *header, const char *method, const char *username, const char *password, const char *realm, bool passwordIsHash, const char *nonce,
+  const char *opaque, const char *uri
+);
+
+// for storing hashed versions on the device that can be authenticated against
+String generateDigestHash(const char *username, const char *password, const char *realm);
+
+String generateBasicHash(const char *username, const char *password);
 
-//for storing hashed versions on the device that can be authenticated against
-String generateDigestHash(const char * username, const char * password, const char * realm);
+String genRandomMD5();
 
 #endif
diff --git a/src/WebHandlerImpl.h b/src/WebHandlerImpl.h
index 9b7ba1b04..1f68d6273 100644
--- a/src/WebHandlerImpl.h
+++ b/src/WebHandlerImpl.h
@@ -1,23 +1,6 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
 #ifndef ASYNCWEBSERVERHANDLERIMPL_H_
 #define ASYNCWEBSERVERHANDLERIMPL_H_
 
@@ -29,123 +12,82 @@
 #include "stddef.h"
 #include 
 
-class AsyncStaticWebHandler: public AsyncWebHandler {
-   using File = fs::File;
-   using FS = fs::FS;
-  private:
-    bool _getFile(AsyncWebServerRequest *request);
-    bool _fileExists(AsyncWebServerRequest *request, const String& path);
-    uint8_t _countBits(const uint8_t value) const;
-  protected:
-    FS _fs;
-    String _uri;
-    String _path;
-    String _default_file;
-    String _cache_control;
-    String _last_modified;
-    AwsTemplateProcessor _callback;
-    bool _isDir;
-    bool _gzipFirst;
-    uint8_t _gzipStats;
-  public:
-    AsyncStaticWebHandler(const char* uri, FS& fs, const char* path, const char* cache_control);
-    virtual bool canHandle(AsyncWebServerRequest *request) override final;
-    virtual void handleRequest(AsyncWebServerRequest *request) override final;
-    AsyncStaticWebHandler& setIsDir(bool isDir);
-    AsyncStaticWebHandler& setDefaultFile(const char* filename);
-    AsyncStaticWebHandler& setCacheControl(const char* cache_control);
-    AsyncStaticWebHandler& setLastModified(const char* last_modified);
-    AsyncStaticWebHandler& setLastModified(struct tm* last_modified);
-  #ifdef ESP8266
-    AsyncStaticWebHandler& setLastModified(time_t last_modified);
-    AsyncStaticWebHandler& setLastModified(); //sets to current time. Make sure sntp is runing and time is updated
-  #endif
-    AsyncStaticWebHandler& setTemplateProcessor(AwsTemplateProcessor newCallback) {_callback = newCallback; return *this;}
-};
+class AsyncStaticWebHandler : public AsyncWebHandler {
+  using File = fs::File;
+  using FS = fs::FS;
 
-class AsyncCallbackWebHandler: public AsyncWebHandler {
-  private:
-  protected:
-    String _uri;
-    WebRequestMethodComposite _method;
-    ArRequestHandlerFunction _onRequest;
-    ArUploadHandlerFunction _onUpload;
-    ArBodyHandlerFunction _onBody;
-    bool _isRegex;
-  public:
-    AsyncCallbackWebHandler() : _uri(), _method(HTTP_ANY), _onRequest(NULL), _onUpload(NULL), _onBody(NULL), _isRegex(false) {}
-    void setUri(const String& uri){ 
-      _uri = uri; 
-      _isRegex = uri.startsWith("^") && uri.endsWith("$");
-    }
-    void setMethod(WebRequestMethodComposite method){ _method = method; }
-    void onRequest(ArRequestHandlerFunction fn){ _onRequest = fn; }
-    void onUpload(ArUploadHandlerFunction fn){ _onUpload = fn; }
-    void onBody(ArBodyHandlerFunction fn){ _onBody = fn; }
+private:
+  bool _getFile(AsyncWebServerRequest *request) const;
+  bool _searchFile(AsyncWebServerRequest *request, const String &path);
 
-    virtual bool canHandle(AsyncWebServerRequest *request) override final{
+protected:
+  FS _fs;
+  String _uri;
+  String _path;
+  String _default_file;
+  String _cache_control;
+  String _last_modified;
+  AwsTemplateProcessor _callback;
+  bool _isDir;
+  bool _tryGzipFirst = true;
 
-      if(!_onRequest)
-        return false;
+public:
+  AsyncStaticWebHandler(const char *uri, FS &fs, const char *path, const char *cache_control);
+  bool canHandle(AsyncWebServerRequest *request) const override final;
+  void handleRequest(AsyncWebServerRequest *request) override final;
+  AsyncStaticWebHandler &setTryGzipFirst(bool value);
+  AsyncStaticWebHandler &setIsDir(bool isDir);
+  AsyncStaticWebHandler &setDefaultFile(const char *filename);
+  AsyncStaticWebHandler &setCacheControl(const char *cache_control);
 
-      if(!(_method & request->method()))
-        return false;
+  /**
+     * @brief Set the Last-Modified time for the object
+     *
+     * @param last_modified
+     * @return AsyncStaticWebHandler&
+     */
+  AsyncStaticWebHandler &setLastModified(const char *last_modified);
+  AsyncStaticWebHandler &setLastModified(struct tm *last_modified);
+  AsyncStaticWebHandler &setLastModified(time_t last_modified);
+  // sets to current time. Make sure sntp is running and time is updated
+  AsyncStaticWebHandler &setLastModified();
 
-#ifdef ASYNCWEBSERVER_REGEX
-      if (_isRegex) {
-        std::regex pattern(_uri.c_str());
-        std::smatch matches;
-        std::string s(request->url().c_str());
-        if(std::regex_search(s, matches, pattern)) {
-          for (size_t i = 1; i < matches.size(); ++i) { // start from 1
-            request->_addPathParam(matches[i].str().c_str());
-          }
-        } else {
-          return false;
-        }
-      } else 
-#endif
-      if (_uri.length() && _uri.startsWith("/*.")) {
-         String uriTemplate = String (_uri);
-         uriTemplate = uriTemplate.substring(uriTemplate.lastIndexOf("."));
-         if (!request->url().endsWith(uriTemplate))
-           return false;
-      }
-      else
-      if (_uri.length() && _uri.endsWith("*")) {
-        String uriTemplate = String(_uri);
-	uriTemplate = uriTemplate.substring(0, uriTemplate.length() - 1);
-        if (!request->url().startsWith(uriTemplate))
-          return false;
-      }
-      else if(_uri.length() && (_uri != request->url() && !request->url().startsWith(_uri+"/")))
-        return false;
+  AsyncStaticWebHandler &setTemplateProcessor(AwsTemplateProcessor newCallback);
+};
+
+class AsyncCallbackWebHandler : public AsyncWebHandler {
+private:
+protected:
+  String _uri;
+  WebRequestMethodComposite _method;
+  ArRequestHandlerFunction _onRequest;
+  ArUploadHandlerFunction _onUpload;
+  ArBodyHandlerFunction _onBody;
+  bool _isRegex;
+
+public:
+  AsyncCallbackWebHandler() : _uri(), _method(HTTP_ANY), _onRequest(NULL), _onUpload(NULL), _onBody(NULL), _isRegex(false) {}
+  void setUri(const String &uri);
+  void setMethod(WebRequestMethodComposite method) {
+    _method = method;
+  }
+  void onRequest(ArRequestHandlerFunction fn) {
+    _onRequest = fn;
+  }
+  void onUpload(ArUploadHandlerFunction fn) {
+    _onUpload = fn;
+  }
+  void onBody(ArBodyHandlerFunction fn) {
+    _onBody = fn;
+  }
 
-      request->addInterestingHeader("ANY");
-      return true;
-    }
-  
-    virtual void handleRequest(AsyncWebServerRequest *request) override final {
-      if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
-        return request->requestAuthentication();
-      if(_onRequest)
-        _onRequest(request);
-      else
-        request->send(500);
-    }
-    virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) override final {
-      if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
-        return request->requestAuthentication();
-      if(_onUpload)
-        _onUpload(request, filename, index, data, len, final);
-    }
-    virtual void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) override final {
-      if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
-        return request->requestAuthentication();
-      if(_onBody)
-        _onBody(request, data, len, index, total);
-    }
-    virtual bool isRequestHandlerTrivial() override final {return _onRequest ? false : true;}
+  bool canHandle(AsyncWebServerRequest *request) const override final;
+  void handleRequest(AsyncWebServerRequest *request) override final;
+  void handleUpload(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final) override final;
+  void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) override final;
+  bool isRequestHandlerTrivial() const override final {
+    return !_onRequest;
+  }
 };
 
 #endif /* ASYNCWEBSERVERHANDLERIMPL_H_ */
diff --git a/src/WebHandlers.cpp b/src/WebHandlers.cpp
index 1f435e68a..21dba006c 100644
--- a/src/WebHandlers.cpp
+++ b/src/WebHandlers.cpp
@@ -1,131 +1,133 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
 #include "ESPAsyncWebServer.h"
 #include "WebHandlerImpl.h"
 
-AsyncStaticWebHandler::AsyncStaticWebHandler(const char* uri, FS& fs, const char* path, const char* cache_control)
-  : _fs(fs), _uri(uri), _path(path), _default_file("index.htm"), _cache_control(cache_control), _last_modified(""), _callback(nullptr)
-{
+using namespace asyncsrv;
+
+AsyncWebHandler &AsyncWebHandler::setFilter(ArRequestFilterFunction fn) {
+  _filter = fn;
+  return *this;
+}
+AsyncWebHandler &AsyncWebHandler::setAuthentication(const char *username, const char *password, AsyncAuthType authMethod) {
+  if (!_authMiddleware) {
+    _authMiddleware = new AsyncAuthenticationMiddleware();
+    _authMiddleware->_freeOnRemoval = true;
+    addMiddleware(_authMiddleware);
+  }
+  _authMiddleware->setUsername(username);
+  _authMiddleware->setPassword(password);
+  _authMiddleware->setAuthType(authMethod);
+  return *this;
+};
+
+AsyncStaticWebHandler::AsyncStaticWebHandler(const char *uri, FS &fs, const char *path, const char *cache_control)
+  : _fs(fs), _uri(uri), _path(path), _default_file(F("index.htm")), _cache_control(cache_control), _last_modified(), _callback(nullptr) {
   // Ensure leading '/'
-  if (_uri.length() == 0 || _uri[0] != '/') _uri = "/" + _uri;
-  if (_path.length() == 0 || _path[0] != '/') _path = "/" + _path;
+  if (_uri.length() == 0 || _uri[0] != '/') {
+    _uri = String('/') + _uri;
+  }
+  if (_path.length() == 0 || _path[0] != '/') {
+    _path = String('/') + _path;
+  }
 
   // If path ends with '/' we assume a hint that this is a directory to improve performance.
   // However - if it does not end with '/' we, can't assume a file, path can still be a directory.
-  _isDir = _path[_path.length()-1] == '/';
+  _isDir = _path[_path.length() - 1] == '/';
 
   // Remove the trailing '/' so we can handle default file
   // Notice that root will be "" not "/"
-  if (_uri[_uri.length()-1] == '/') _uri = _uri.substring(0, _uri.length()-1);
-  if (_path[_path.length()-1] == '/') _path = _path.substring(0, _path.length()-1);
+  if (_uri[_uri.length() - 1] == '/') {
+    _uri = _uri.substring(0, _uri.length() - 1);
+  }
+  if (_path[_path.length() - 1] == '/') {
+    _path = _path.substring(0, _path.length() - 1);
+  }
+}
 
-  // Reset stats
-  _gzipFirst = false;
-  _gzipStats = 0xF8;
+AsyncStaticWebHandler &AsyncStaticWebHandler::setTryGzipFirst(bool value) {
+  _tryGzipFirst = value;
+  return *this;
 }
 
-AsyncStaticWebHandler& AsyncStaticWebHandler::setIsDir(bool isDir){
+AsyncStaticWebHandler &AsyncStaticWebHandler::setIsDir(bool isDir) {
   _isDir = isDir;
   return *this;
 }
 
-AsyncStaticWebHandler& AsyncStaticWebHandler::setDefaultFile(const char* filename){
-  _default_file = String(filename);
+AsyncStaticWebHandler &AsyncStaticWebHandler::setDefaultFile(const char *filename) {
+  _default_file = filename;
   return *this;
 }
 
-AsyncStaticWebHandler& AsyncStaticWebHandler::setCacheControl(const char* cache_control){
-  _cache_control = String(cache_control);
+AsyncStaticWebHandler &AsyncStaticWebHandler::setCacheControl(const char *cache_control) {
+  _cache_control = cache_control;
   return *this;
 }
 
-AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(const char* last_modified){
-  _last_modified = String(last_modified);
+AsyncStaticWebHandler &AsyncStaticWebHandler::setLastModified(const char *last_modified) {
+  _last_modified = last_modified;
   return *this;
 }
 
-AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(struct tm* last_modified){
+AsyncStaticWebHandler &AsyncStaticWebHandler::setLastModified(struct tm *last_modified) {
   char result[30];
-  strftime (result,30,"%a, %d %b %Y %H:%M:%S %Z", last_modified);
-  return setLastModified((const char *)result);
+#ifdef ESP8266
+  auto formatP = PSTR("%a, %d %b %Y %H:%M:%S GMT");
+  char format[strlen_P(formatP) + 1];
+  strcpy_P(format, formatP);
+#else
+  static constexpr const char *format = "%a, %d %b %Y %H:%M:%S GMT";
+#endif
+
+  strftime(result, sizeof(result), format, last_modified);
+  _last_modified = result;
+  return *this;
 }
 
-#ifdef ESP8266
-AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(time_t last_modified){
+AsyncStaticWebHandler &AsyncStaticWebHandler::setLastModified(time_t last_modified) {
   return setLastModified((struct tm *)gmtime(&last_modified));
 }
 
-AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(){
+AsyncStaticWebHandler &AsyncStaticWebHandler::setLastModified() {
   time_t last_modified;
-  if(time(&last_modified) == 0) //time is not yet set
+  if (time(&last_modified) == 0) {  // time is not yet set
     return *this;
+  }
   return setLastModified(last_modified);
 }
-#endif
-bool AsyncStaticWebHandler::canHandle(AsyncWebServerRequest *request){
-  if(request->method() != HTTP_GET 
-    || !request->url().startsWith(_uri) 
-    || !request->isExpectedRequestedConnType(RCT_DEFAULT, RCT_HTTP)
-  ){
-    return false;
-  }
-  if (_getFile(request)) {
-    // We interested in "If-Modified-Since" header to check if file was modified
-    if (_last_modified.length())
-      request->addInterestingHeader("If-Modified-Since");
-
-    if(_cache_control.length())
-      request->addInterestingHeader("If-None-Match");
 
-    DEBUGF("[AsyncStaticWebHandler::canHandle] TRUE\n");
-    return true;
-  }
-
-  return false;
+bool AsyncStaticWebHandler::canHandle(AsyncWebServerRequest *request) const {
+  return request->isHTTP() && request->method() == HTTP_GET && request->url().startsWith(_uri) && _getFile(request);
 }
 
-bool AsyncStaticWebHandler::_getFile(AsyncWebServerRequest *request)
-{
+bool AsyncStaticWebHandler::_getFile(AsyncWebServerRequest *request) const {
   // Remove the found uri
   String path = request->url().substring(_uri.length());
 
   // We can skip the file check and look for default if request is to the root of a directory or that request path ends with '/'
-  bool canSkipFileCheck = (_isDir && path.length() == 0) || (path.length() && path[path.length()-1] == '/');
+  bool canSkipFileCheck = (_isDir && path.length() == 0) || (path.length() && path[path.length() - 1] == '/');
 
   path = _path + path;
 
   // Do we have a file or .gz file
-  if (!canSkipFileCheck && _fileExists(request, path))
+  if (!canSkipFileCheck && const_cast(this)->_searchFile(request, path)) {
     return true;
+  }
 
   // Can't handle if not default file
-  if (_default_file.length() == 0)
+  if (_default_file.length() == 0) {
     return false;
+  }
 
-  // Try to add default file, ensure there is a trailing '/' ot the path.
-  if (path.length() == 0 || path[path.length()-1] != '/')
-    path += "/";
+  // Try to add default file, ensure there is a trailing '/' to the path.
+  if (path.length() == 0 || path[path.length() - 1] != '/') {
+    path += String('/');
+  }
   path += _default_file;
 
-  return _fileExists(request, path);
+  return const_cast(this)->_searchFile(request, path);
 }
 
 #ifdef ESP32
@@ -134,26 +136,33 @@ bool AsyncStaticWebHandler::_getFile(AsyncWebServerRequest *request)
 #define FILE_IS_REAL(f) (f == true)
 #endif
 
-bool AsyncStaticWebHandler::_fileExists(AsyncWebServerRequest *request, const String& path)
-{
+bool AsyncStaticWebHandler::_searchFile(AsyncWebServerRequest *request, const String &path) {
   bool fileFound = false;
   bool gzipFound = false;
 
-  String gzip = path + ".gz";
+  String gzip = path + T__gz;
 
-  if (_gzipFirst) {
-    request->_tempFile = _fs.open(gzip, "r");
-    gzipFound = FILE_IS_REAL(request->_tempFile);
-    if (!gzipFound){
-      request->_tempFile = _fs.open(path, "r");
-      fileFound = FILE_IS_REAL(request->_tempFile);
+  if (_tryGzipFirst) {
+    if (_fs.exists(gzip)) {
+      request->_tempFile = _fs.open(gzip, fs::FileOpenMode::read);
+      gzipFound = FILE_IS_REAL(request->_tempFile);
+    }
+    if (!gzipFound) {
+      if (_fs.exists(path)) {
+        request->_tempFile = _fs.open(path, fs::FileOpenMode::read);
+        fileFound = FILE_IS_REAL(request->_tempFile);
+      }
     }
   } else {
-    request->_tempFile = _fs.open(path, "r");
-    fileFound = FILE_IS_REAL(request->_tempFile);
-    if (!fileFound){
-      request->_tempFile = _fs.open(gzip, "r");
-      gzipFound = FILE_IS_REAL(request->_tempFile);
+    if (_fs.exists(path)) {
+      request->_tempFile = _fs.open(path, fs::FileOpenMode::read);
+      fileFound = FILE_IS_REAL(request->_tempFile);
+    }
+    if (!fileFound) {
+      if (_fs.exists(gzip)) {
+        request->_tempFile = _fs.open(gzip, fs::FileOpenMode::read);
+        gzipFound = FILE_IS_REAL(request->_tempFile);
+      }
     }
   }
 
@@ -162,59 +171,159 @@ bool AsyncStaticWebHandler::_fileExists(AsyncWebServerRequest *request, const St
   if (found) {
     // Extract the file name from the path and keep it in _tempObject
     size_t pathLen = path.length();
-    char * _tempPath = (char*)malloc(pathLen+1);
-    snprintf(_tempPath, pathLen+1, "%s", path.c_str());
-    request->_tempObject = (void*)_tempPath;
-
-    // Calculate gzip statistic
-    _gzipStats = (_gzipStats << 1) + (gzipFound ? 1 : 0);
-    if (_gzipStats == 0x00) _gzipFirst = false; // All files are not gzip
-    else if (_gzipStats == 0xFF) _gzipFirst = true; // All files are gzip
-    else _gzipFirst = _countBits(_gzipStats) > 4; // IF we have more gzip files - try gzip first
+    char *_tempPath = (char *)malloc(pathLen + 1);
+    if (_tempPath == NULL) {
+#ifdef ESP32
+      log_e("Failed to allocate");
+#endif
+      request->abort();
+      request->_tempFile.close();
+      return false;
+    }
+    snprintf_P(_tempPath, pathLen + 1, PSTR("%s"), path.c_str());
+    request->_tempObject = (void *)_tempPath;
   }
 
   return found;
 }
 
-uint8_t AsyncStaticWebHandler::_countBits(const uint8_t value) const
-{
-  uint8_t w = value;
-  uint8_t n;
-  for (n=0; w!=0; n++) w&=w-1;
-  return n;
-}
-
-void AsyncStaticWebHandler::handleRequest(AsyncWebServerRequest *request)
-{
+void AsyncStaticWebHandler::handleRequest(AsyncWebServerRequest *request) {
   // Get the filename from request->_tempObject and free it
-  String filename = String((char*)request->_tempObject);
+  String filename((char *)request->_tempObject);
   free(request->_tempObject);
   request->_tempObject = NULL;
-  if((_username != "" && _password != "") && !request->authenticate(_username.c_str(), _password.c_str()))
-      return request->requestAuthentication();
 
-  if (request->_tempFile == true) {
-    String etag = String(request->_tempFile.size());
-    if (_last_modified.length() && _last_modified == request->header("If-Modified-Since")) {
-      request->_tempFile.close();
-      request->send(304); // Not modified
-    } else if (_cache_control.length() && request->hasHeader("If-None-Match") && request->header("If-None-Match").equals(etag)) {
-      request->_tempFile.close();
-      AsyncWebServerResponse * response = new AsyncBasicResponse(304); // Not modified
-      response->addHeader("Cache-Control", _cache_control);
-      response->addHeader("ETag", etag);
-      request->send(response);
-    } else {
-      AsyncWebServerResponse * response = new AsyncFileResponse(request->_tempFile, filename, String(), false, _callback);
-      if (_last_modified.length())
-        response->addHeader("Last-Modified", _last_modified);
-      if (_cache_control.length()){
-        response->addHeader("Cache-Control", _cache_control);
-        response->addHeader("ETag", etag);
+  if (request->_tempFile != true) {
+    request->send(404);
+    return;
+  }
+
+  time_t lw = request->_tempFile.getLastWrite();  // get last file mod time (if supported by FS)
+  // set etag to lastmod timestamp if available, otherwise to size
+  String etag;
+  if (lw) {
+    setLastModified(lw);
+#if defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350)
+    // time_t == long long int
+    constexpr size_t len = 1 + 8 * sizeof(time_t);
+    char buf[len];
+    char *ret = lltoa(lw ^ request->_tempFile.size(), buf, len, 10);
+    etag = ret ? String(ret) : String(request->_tempFile.size());
+#elif defined(LIBRETINY)
+    long val = lw ^ request->_tempFile.size();
+    etag = String(val);
+#else
+    etag = lw ^ request->_tempFile.size();  // etag combines file size and lastmod timestamp
+#endif
+  } else {
+#if defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350) || defined(LIBRETINY)
+    etag = String(request->_tempFile.size());
+#else
+    etag = request->_tempFile.size();
+#endif
+  }
+
+  bool not_modified = false;
+
+  // if-none-match has precedence over if-modified-since
+  if (request->hasHeader(T_INM)) {
+    not_modified = request->header(T_INM).equals(etag);
+  } else if (_last_modified.length()) {
+    not_modified = request->header(T_IMS).equals(_last_modified);
+  }
+
+  AsyncWebServerResponse *response;
+
+  if (not_modified) {
+    request->_tempFile.close();
+    response = new AsyncBasicResponse(304);  // Not modified
+  } else {
+    response = new AsyncFileResponse(request->_tempFile, filename, emptyString, false, _callback);
+  }
+
+  if (!response) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    request->abort();
+    return;
+  }
+
+  response->addHeader(T_ETag, etag.c_str());
+
+  if (_last_modified.length()) {
+    response->addHeader(T_Last_Modified, _last_modified.c_str());
+  }
+  if (_cache_control.length()) {
+    response->addHeader(T_Cache_Control, _cache_control.c_str());
+  }
+
+  request->send(response);
+}
+
+AsyncStaticWebHandler &AsyncStaticWebHandler::setTemplateProcessor(AwsTemplateProcessor newCallback) {
+  _callback = newCallback;
+  return *this;
+}
+
+void AsyncCallbackWebHandler::setUri(const String &uri) {
+  _uri = uri;
+  _isRegex = uri.startsWith("^") && uri.endsWith("$");
+}
+
+bool AsyncCallbackWebHandler::canHandle(AsyncWebServerRequest *request) const {
+  if (!_onRequest || !request->isHTTP() || !(_method & request->method())) {
+    return false;
+  }
+
+#ifdef ASYNCWEBSERVER_REGEX
+  if (_isRegex) {
+    std::regex pattern(_uri.c_str());
+    std::smatch matches;
+    std::string s(request->url().c_str());
+    if (std::regex_search(s, matches, pattern)) {
+      for (size_t i = 1; i < matches.size(); ++i) {  // start from 1
+        request->_addPathParam(matches[i].str().c_str());
       }
-      request->send(response);
+    } else {
+      return false;
+    }
+  } else
+#endif
+    if (_uri.length() && _uri.startsWith("/*.")) {
+    String uriTemplate = String(_uri);
+    uriTemplate = uriTemplate.substring(uriTemplate.lastIndexOf("."));
+    if (!request->url().endsWith(uriTemplate)) {
+      return false;
+    }
+  } else if (_uri.length() && _uri.endsWith("*")) {
+    String uriTemplate = String(_uri);
+    uriTemplate = uriTemplate.substring(0, uriTemplate.length() - 1);
+    if (!request->url().startsWith(uriTemplate)) {
+      return false;
     }
+  } else if (_uri.length() && (_uri != request->url() && !request->url().startsWith(_uri + "/"))) {
+    return false;
+  }
+
+  return true;
+}
+
+void AsyncCallbackWebHandler::handleRequest(AsyncWebServerRequest *request) {
+  if (_onRequest) {
+    _onRequest(request);
   } else {
-    request->send(404);
+    request->send(404, T_text_plain, "Not found");
+  }
+}
+void AsyncCallbackWebHandler::handleUpload(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final) {
+  if (_onUpload) {
+    _onUpload(request, filename, index, data, len, final);
+  }
+}
+void AsyncCallbackWebHandler::handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) {
+  // ESP_LOGD("AsyncWebServer", "AsyncCallbackWebHandler::handleBody");
+  if (_onBody) {
+    _onBody(request, data, len, index, total);
   }
 }
diff --git a/src/WebRequest.cpp b/src/WebRequest.cpp
index bbce5ca4c..ff4cf4cb7 100644
--- a/src/WebRequest.cpp
+++ b/src/WebRequest.cpp
@@ -1,378 +1,441 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
 #include "ESPAsyncWebServer.h"
-#include "WebResponseImpl.h"
 #include "WebAuthentication.h"
+#include "WebResponseImpl.h"
+#include "literals.h"
+#include 
 
-#ifndef ESP8266
-#define os_strlen strlen
-#endif
+#define __is_param_char(c) ((c) && ((c) != '{') && ((c) != '[') && ((c) != '&') && ((c) != '='))
 
-static const String SharedEmptyString = String();
+static void doNotDelete(AsyncWebServerRequest *) {}
 
-#define __is_param_char(c) ((c) && ((c) != '{') && ((c) != '[') && ((c) != '&') && ((c) != '='))
+using namespace asyncsrv;
 
-enum { PARSE_REQ_START, PARSE_REQ_HEADERS, PARSE_REQ_BODY, PARSE_REQ_END, PARSE_REQ_FAIL };
-
-AsyncWebServerRequest::AsyncWebServerRequest(AsyncWebServer* s, AsyncClient* c)
-  : _client(c)
-  , _server(s)
-  , _handler(NULL)
-  , _response(NULL)
-  , _temp()
-  , _parseState(0)
-  , _version(0)
-  , _method(HTTP_ANY)
-  , _url()
-  , _host()
-  , _contentType()
-  , _boundary()
-  , _authorization()
-  , _reqconntype(RCT_HTTP)
-  , _isDigest(false)
-  , _isMultipart(false)
-  , _isPlainPost(false)
-  , _expectingContinue(false)
-  , _contentLength(0)
-  , _parsedLength(0)
-  , _headers(LinkedList([](AsyncWebHeader *h){ delete h; }))
-  , _params(LinkedList([](AsyncWebParameter *p){ delete p; }))
-  , _pathParams(LinkedList([](String *p){ delete p; }))
-  , _multiParseState(0)
-  , _boundaryPosition(0)
-  , _itemStartIndex(0)
-  , _itemSize(0)
-  , _itemName()
-  , _itemFilename()
-  , _itemType()
-  , _itemValue()
-  , _itemBuffer(0)
-  , _itemBufferIndex(0)
-  , _itemIsFile(false)
-  , _tempObject(NULL)
-{
-  c->onError([](void *r, AsyncClient* c, int8_t error){ (void)c; AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onError(error); }, this);
-  c->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ (void)c; AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onAck(len, time); }, this);
-  c->onDisconnect([](void *r, AsyncClient* c){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onDisconnect(); delete c; }, this);
-  c->onTimeout([](void *r, AsyncClient* c, uint32_t time){ (void)c; AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onTimeout(time); }, this);
-  c->onData([](void *r, AsyncClient* c, void *buf, size_t len){ (void)c; AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onData(buf, len); }, this);
-  c->onPoll([](void *r, AsyncClient* c){ (void)c; AsyncWebServerRequest *req = ( AsyncWebServerRequest*)r; req->_onPoll(); }, this);
-}
-
-AsyncWebServerRequest::~AsyncWebServerRequest(){
-  _headers.free();
-
-  _params.free();
-  _pathParams.free();
-
-  _interestingHeaders.free();
-
-  if(_response != NULL){
-    delete _response;
-  }
+enum {
+  PARSE_REQ_START = 0,
+  PARSE_REQ_HEADERS = 1,
+  PARSE_REQ_BODY = 2,
+  PARSE_REQ_END = 3,
+  PARSE_REQ_FAIL = 4
+};
 
-  if(_tempObject != NULL){
+AsyncWebServerRequest::AsyncWebServerRequest(AsyncWebServer *s, AsyncClient *c)
+  : _client(c), _server(s), _handler(NULL), _response(NULL), _onDisconnectfn(NULL), _temp(), _parseState(PARSE_REQ_START), _version(0), _method(HTTP_ANY),
+    _url(), _host(), _contentType(), _boundary(), _authorization(), _reqconntype(RCT_HTTP), _authMethod(AsyncAuthType::AUTH_NONE), _isMultipart(false),
+    _isPlainPost(false), _expectingContinue(false), _contentLength(0), _parsedLength(0), _multiParseState(0), _boundaryPosition(0), _itemStartIndex(0),
+    _itemSize(0), _itemName(), _itemFilename(), _itemType(), _itemValue(), _itemBuffer(0), _itemBufferIndex(0), _itemIsFile(false), _tempObject(NULL) {
+  c->onError(
+    [](void *r, AsyncClient *c, int8_t error) {
+      (void)c;
+      // log_e("AsyncWebServerRequest::_onError");
+      AsyncWebServerRequest *req = (AsyncWebServerRequest *)r;
+      req->_onError(error);
+    },
+    this
+  );
+  c->onAck(
+    [](void *r, AsyncClient *c, size_t len, uint32_t time) {
+      (void)c;
+      // log_e("AsyncWebServerRequest::_onAck");
+      AsyncWebServerRequest *req = (AsyncWebServerRequest *)r;
+      req->_onAck(len, time);
+    },
+    this
+  );
+  c->onDisconnect(
+    [](void *r, AsyncClient *c) {
+      // log_e("AsyncWebServerRequest::_onDisconnect");
+      AsyncWebServerRequest *req = (AsyncWebServerRequest *)r;
+      req->_onDisconnect();
+      delete c;
+    },
+    this
+  );
+  c->onTimeout(
+    [](void *r, AsyncClient *c, uint32_t time) {
+      (void)c;
+      // log_e("AsyncWebServerRequest::_onTimeout");
+      AsyncWebServerRequest *req = (AsyncWebServerRequest *)r;
+      req->_onTimeout(time);
+    },
+    this
+  );
+  c->onData(
+    [](void *r, AsyncClient *c, void *buf, size_t len) {
+      (void)c;
+      // log_e("AsyncWebServerRequest::_onData");
+      AsyncWebServerRequest *req = (AsyncWebServerRequest *)r;
+      req->_onData(buf, len);
+    },
+    this
+  );
+  c->onPoll(
+    [](void *r, AsyncClient *c) {
+      (void)c;
+      // log_e("AsyncWebServerRequest::_onPoll");
+      AsyncWebServerRequest *req = (AsyncWebServerRequest *)r;
+      req->_onPoll();
+    },
+    this
+  );
+}
+
+AsyncWebServerRequest::~AsyncWebServerRequest() {
+  // log_e("AsyncWebServerRequest::~AsyncWebServerRequest");
+
+  _this.reset();
+
+  _headers.clear();
+
+  _pathParams.clear();
+
+  AsyncWebServerResponse *r = _response;
+  _response = NULL;
+  delete r;
+
+  if (_tempObject != NULL) {
     free(_tempObject);
   }
 
-  if(_tempFile){
+  if (_tempFile) {
     _tempFile.close();
   }
+
+  if (_itemBuffer) {
+    free(_itemBuffer);
+  }
 }
 
-void AsyncWebServerRequest::_onData(void *buf, size_t len){
+void AsyncWebServerRequest::_onData(void *buf, size_t len) {
+  // SSL/TLS handshake detection
+#ifndef ASYNC_TCP_SSL_ENABLED
+  if (_parseState == PARSE_REQ_START && len && ((uint8_t *)buf)[0] == 0x16) {  // 0x16 indicates a Handshake message (SSL/TLS).
+#ifdef ESP32
+    log_d("SSL/TLS handshake detected: resetting connection");
+#endif
+    _parseState = PARSE_REQ_FAIL;
+    abort();
+    return;
+  }
+#endif
+
   size_t i = 0;
   while (true) {
 
-  if(_parseState < PARSE_REQ_BODY){
-    // Find new line in buf
-    char *str = (char*)buf;
-    for (i = 0; i < len; i++) {
-      if (str[i] == '\n') {
-        break;
-      }
-    }
-    if (i == len) { // No new line, just add the buffer in _temp
-      char ch = str[len-1];
-      str[len-1] = 0;
-      _temp.reserve(_temp.length()+len);
-      _temp.concat(str);
-      _temp.concat(ch);
-    } else { // Found new line - extract it and parse
-      str[i] = 0; // Terminate the string at the end of the line.
-      _temp.concat(str);
-      _temp.trim();
-      _parseLine();
-      if (++i < len) {
-        // Still have more buffer to process
-        buf = str+i;
-        len-= i;
-        continue;
+    if (_parseState < PARSE_REQ_BODY) {
+      // Find new line in buf
+      char *str = (char *)buf;
+      for (i = 0; i < len; i++) {
+        // Check for null characters in header
+        if (!str[i]) {
+          _parseState = PARSE_REQ_FAIL;
+          abort();
+          return;
+        }
+        if (str[i] == '\n') {
+          break;
+        }
       }
-    }
-  } else if(_parseState == PARSE_REQ_BODY){
-    // 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();
-    if(_isMultipart){
-      if(needParse){
-        size_t i;
-        for(i=0; iisRequestHandlerTrivial();
+      // Discard any bytes after content length; handlers may overrun their buffers
+      len = std::min(len, _contentLength - _parsedLength);
+      if (_isMultipart) {
+        if (needParse) {
+          size_t i;
+          for (i = 0; i < len; i++) {
+            _parseMultipartPostByte(((uint8_t *)buf)[i], i == len - 1);
+            _parsedLength++;
+          }
+        } else {
           _parsedLength += len;
-    } else {
-      if(_parsedLength == 0){
-        if(_contentType.startsWith("application/x-www-form-urlencoded")){
-          _isPlainPost = true;
-        } else if(_contentType == "text/plain" && __is_param_char(((char*)buf)[0])){
-          size_t i = 0;
-          while (ihandleBody(this, (uint8_t*)buf, len, _parsedLength, _contentLength);
-        _parsedLength += len;
-      } else if(needParse) {
-        size_t i;
-        for(i=0; ihandleBody(this, (uint8_t *)buf, len, _parsedLength, _contentLength);
+          }
+          _parsedLength += len;
+        } else if (needParse) {
+          size_t i;
+          for (i = 0; i < len; i++) {
+            _parsedLength++;
+            _parsePlainPostChar(((uint8_t *)buf)[i]);
+          }
+        } else {
+          _parsedLength += len;
         }
-      } else {
-        _parsedLength += len;
+      }
+      if (_parsedLength == _contentLength) {
+        _parseState = PARSE_REQ_END;
+        _runMiddlewareChain();
+        _send();
       }
     }
-    if(_parsedLength == _contentLength){
-      _parseState = PARSE_REQ_END;
-      //check if authenticated before calling handleRequest and request auth instead
-      if(_handler) _handler->handleRequest(this);
-      else send(501);
-    }
-  }
-  break;
+    break;
   }
 }
 
-void AsyncWebServerRequest::_removeNotInterestingHeaders(){
-  if (_interestingHeaders.containsIgnoreCase("ANY")) return; // nothing to do
-  for(const auto& header: _headers){
-      if(!_interestingHeaders.containsIgnoreCase(header->name().c_str())){
-        _headers.remove(header);
-      }
-  }
-}
+void AsyncWebServerRequest::_onPoll() {
+  // os_printf("p\n");
+  if (_response != NULL && _client != NULL && _client->canSend()) {
+    if (!_response->_finished()) {
+      _response->_ack(this, 0, 0);
+    } else {
+      AsyncWebServerResponse *r = _response;
+      _response = NULL;
+      delete r;
 
-void AsyncWebServerRequest::_onPoll(){
-  //os_printf("p\n");
-  if(_response != NULL && _client != NULL && _client->canSend() && !_response->_finished()){
-    _response->_ack(this, 0, 0);
+      _client->close();
+    }
   }
 }
 
-void AsyncWebServerRequest::_onAck(size_t len, uint32_t time){
-  //os_printf("a:%u:%u\n", len, time);
-  if(_response != NULL){
-    if(!_response->_finished()){
+void AsyncWebServerRequest::_onAck(size_t len, uint32_t time) {
+  // os_printf("a:%u:%u\n", len, time);
+  if (_response != NULL) {
+    if (!_response->_finished()) {
       _response->_ack(this, len, time);
-    } else {
-      AsyncWebServerResponse* r = _response;
+    } else if (_response->_finished()) {
+      AsyncWebServerResponse *r = _response;
       _response = NULL;
       delete r;
+
+      _client->close();
     }
   }
 }
 
-void AsyncWebServerRequest::_onError(int8_t error){
+void AsyncWebServerRequest::_onError(int8_t error) {
   (void)error;
 }
 
-void AsyncWebServerRequest::_onTimeout(uint32_t time){
+void AsyncWebServerRequest::_onTimeout(uint32_t time) {
   (void)time;
-  //os_printf("TIMEOUT: %u, state: %s\n", time, _client->stateToString());
+  // os_printf("TIMEOUT: %u, state: %s\n", time, _client->stateToString());
   _client->close();
 }
 
-void AsyncWebServerRequest::onDisconnect (ArDisconnectHandler fn){
-    _onDisconnectfn=fn;
+void AsyncWebServerRequest::onDisconnect(ArDisconnectHandler fn) {
+  _onDisconnectfn = fn;
 }
 
-void AsyncWebServerRequest::_onDisconnect(){
-  //os_printf("d\n");
-  if(_onDisconnectfn) {
-      _onDisconnectfn();
-    }
+void AsyncWebServerRequest::_onDisconnect() {
+  // os_printf("d\n");
+  if (_onDisconnectfn) {
+    _onDisconnectfn();
+  }
   _server->_handleDisconnect(this);
 }
 
-void AsyncWebServerRequest::_addParam(AsyncWebParameter *p){
-  _params.add(p);
-}
-
-void AsyncWebServerRequest::_addPathParam(const char *p){
-  _pathParams.add(new String(p));
+void AsyncWebServerRequest::_addPathParam(const char *p) {
+  _pathParams.emplace_back(p);
 }
 
-void AsyncWebServerRequest::_addGetParams(const String& params){
+void AsyncWebServerRequest::_addGetParams(const String ¶ms) {
   size_t start = 0;
-  while (start < params.length()){
+  while (start < params.length()) {
     int end = params.indexOf('&', start);
-    if (end < 0) end = params.length();
+    if (end < 0) {
+      end = params.length();
+    }
     int equal = params.indexOf('=', start);
-    if (equal < 0 || equal > end) equal = end;
-    String name = params.substring(start, equal);
-    String value = equal + 1 < end ? params.substring(equal + 1, end) : String();
-    _addParam(new AsyncWebParameter(urlDecode(name), urlDecode(value)));
+    if (equal < 0 || equal > end) {
+      equal = end;
+    }
+    String name = urlDecode(params.substring(start, equal));
+    String value = urlDecode(equal + 1 < end ? params.substring(equal + 1, end) : emptyString);
+    if (name.length()) {
+      _params.emplace_back(name, value);
+    }
     start = end + 1;
   }
 }
 
-bool AsyncWebServerRequest::_parseReqHead(){
+bool AsyncWebServerRequest::_parseReqHead() {
   // Split the head into method, url and version
   int index = _temp.indexOf(' ');
   String m = _temp.substring(0, index);
-  index = _temp.indexOf(' ', index+1);
-  String u = _temp.substring(m.length()+1, index);
-  _temp = _temp.substring(index+1);
+  index = _temp.indexOf(' ', index + 1);
+  String u = _temp.substring(m.length() + 1, index);
+  _temp = _temp.substring(index + 1);
 
-  if(m == "GET"){
+  if (m == T_GET) {
     _method = HTTP_GET;
-  } else if(m == "POST"){
+  } else if (m == T_POST) {
     _method = HTTP_POST;
-  } else if(m == "DELETE"){
+  } else if (m == T_DELETE) {
     _method = HTTP_DELETE;
-  } else if(m == "PUT"){
+  } else if (m == T_PUT) {
     _method = HTTP_PUT;
-  } else if(m == "PATCH"){
+  } else if (m == T_PATCH) {
     _method = HTTP_PATCH;
-  } else if(m == "HEAD"){
+  } else if (m == T_HEAD) {
     _method = HTTP_HEAD;
-  } else if(m == "OPTIONS"){
+  } else if (m == T_OPTIONS) {
     _method = HTTP_OPTIONS;
+  } else {
+    return false;
   }
 
-  String g = String();
+  String g;
   index = u.indexOf('?');
-  if(index > 0){
-    g = u.substring(index +1);
+  if (index > 0) {
+    g = u.substring(index + 1);
     u = u.substring(0, index);
   }
   _url = urlDecode(u);
   _addGetParams(g);
 
-  if(!_temp.startsWith("HTTP/1.0"))
+  if (!_url.length()) {
+    return false;
+  }
+
+  if (!_temp.startsWith(T_HTTP_1_0)) {
     _version = 1;
+  }
 
-  _temp = String();
+  _temp = emptyString;
   return true;
 }
 
-bool strContains(String src, String find, bool mindcase = true) {
-  int pos=0, i=0;
-  const int slen = src.length();
-  const int flen = find.length();
-
-  if (slen < flen) return false;
-  while (pos <= (slen - flen)) {
-    for (i=0; i < flen; i++) {
-      if (mindcase) {
-        if (src[pos+i] != find[i]) i = flen + 1; // no match
-      } else if (tolower(src[pos+i]) != tolower(find[i])) i = flen + 1; // no match
-    }
-    if (i == flen) return true;
-    pos++;
-  }
-  return false;
-}
-
-bool AsyncWebServerRequest::_parseReqHeader(){
-  int index = _temp.indexOf(':');
-  if(index){
-    String name = _temp.substring(0, index);
-    String value = _temp.substring(index + 2);
-    if(name.equalsIgnoreCase("Host")){
+bool AsyncWebServerRequest::_parseReqHeader() {
+  AsyncWebHeader header = AsyncWebHeader::parse(_temp);
+  if (header) {
+    const String &name = header.name();
+    const String &value = header.value();
+    if (name.equalsIgnoreCase(T_Host)) {
       _host = value;
-    } else if(name.equalsIgnoreCase("Content-Type")){
-	  _contentType = value.substring(0, value.indexOf(';'));
-      if (value.startsWith("multipart/")){
-        _boundary = value.substring(value.indexOf('=')+1);
-        _boundary.replace("\"","");
+    } else if (name.equalsIgnoreCase(T_Content_Type)) {
+      _contentType = value.substring(0, value.indexOf(';'));
+      if (value.startsWith(T_MULTIPART_)) {
+        _boundary = value.substring(value.indexOf('=') + 1);
+        _boundary.replace(String('"'), String());
         _isMultipart = true;
       }
-    } else if(name.equalsIgnoreCase("Content-Length")){
+    } else if (name.equalsIgnoreCase(T_Content_Length)) {
       _contentLength = atoi(value.c_str());
-    } else if(name.equalsIgnoreCase("Expect") && value == "100-continue"){
+    } else if (name.equalsIgnoreCase(T_EXPECT) && value.equalsIgnoreCase(T_100_CONTINUE)) {
       _expectingContinue = true;
-    } else if(name.equalsIgnoreCase("Authorization")){
-      if(value.length() > 5 && value.substring(0,5).equalsIgnoreCase("Basic")){
-        _authorization = value.substring(6);
-      } else if(value.length() > 6 && value.substring(0,6).equalsIgnoreCase("Digest")){
-        _isDigest = true;
-        _authorization = value.substring(7);
-      }
-    } else {
-      if(name.equalsIgnoreCase("Upgrade") && value.equalsIgnoreCase("websocket")){
-        // WebSocket request can be uniquely identified by header: [Upgrade: websocket]
-        _reqconntype = RCT_WS;
+    } else if (name.equalsIgnoreCase(T_AUTH)) {
+      int space = value.indexOf(' ');
+      if (space == -1) {
+        _authorization = value;
+        _authMethod = AsyncAuthType::AUTH_OTHER;
       } else {
-        if(name.equalsIgnoreCase("Accept") && strContains(value, "text/event-stream", false)){
-          // WebEvent request can be uniquely identified by header:  [Accept: text/event-stream]
-          _reqconntype = RCT_EVENT;
+        String method = value.substring(0, space);
+        if (method.equalsIgnoreCase(T_BASIC)) {
+          _authMethod = AsyncAuthType::AUTH_BASIC;
+        } else if (method.equalsIgnoreCase(T_DIGEST)) {
+          _authMethod = AsyncAuthType::AUTH_DIGEST;
+        } else if (method.equalsIgnoreCase(T_BEARER)) {
+          _authMethod = AsyncAuthType::AUTH_BEARER;
+        } else {
+          _authMethod = AsyncAuthType::AUTH_OTHER;
         }
+        _authorization = value.substring(space + 1);
+      }
+    } else if (name.equalsIgnoreCase(T_UPGRADE) && value.equalsIgnoreCase(T_WS)) {
+      // WebSocket request can be uniquely identified by header: [Upgrade: websocket]
+      _reqconntype = RCT_WS;
+    } else if (name.equalsIgnoreCase(T_ACCEPT)) {
+      String lowcase(value);
+      lowcase.toLowerCase();
+#ifndef ESP8266
+      const char *substr = std::strstr(lowcase.c_str(), T_text_event_stream);
+#else
+      const char *substr = std::strstr(lowcase.c_str(), String(T_text_event_stream).c_str());
+#endif
+      if (substr != NULL) {
+        // WebEvent request can be uniquely identified by header:  [Accept: text/event-stream]
+        _reqconntype = RCT_EVENT;
       }
     }
-    _headers.add(new AsyncWebHeader(name, value));
+    _headers.emplace_back(std::move(header));
   }
-  _temp = String();
+#if defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350) || defined(LIBRETINY)
+  // Ancient PRI core does not have String::clear() method 8-()
+  _temp = emptyString;
+#else
+  _temp.clear();
+#endif
   return true;
 }
 
-void AsyncWebServerRequest::_parsePlainPostChar(uint8_t data){
-  if(data && (char)data != '&')
+void AsyncWebServerRequest::_parsePlainPostChar(uint8_t data) {
+  if (data && (char)data != '&') {
     _temp += (char)data;
-  if(!data || (char)data == '&' || _parsedLength == _contentLength){
-    String name = "body";
-    String value = _temp;
-    if(!_temp.startsWith("{") && !_temp.startsWith("[") && _temp.indexOf('=') > 0){
+  }
+  if (!data || (char)data == '&' || _parsedLength == _contentLength) {
+    String name(T_BODY);
+    String value(_temp);
+    if (!(_temp.charAt(0) == '{') && !(_temp.charAt(0) == '[') && _temp.indexOf('=') > 0) {
       name = _temp.substring(0, _temp.indexOf('='));
       value = _temp.substring(_temp.indexOf('=') + 1);
     }
-    _addParam(new AsyncWebParameter(urlDecode(name), urlDecode(value), true));
-    _temp = String();
+    name = urlDecode(name);
+    if (name.length()) {
+      _params.emplace_back(name, urlDecode(value), true);
+    }
+
+#if defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350) || defined(LIBRETINY)
+    // Ancient PRI core does not have String::clear() method 8-()
+    _temp = emptyString;
+#else
+    _temp.clear();
+#endif
   }
 }
 
-void AsyncWebServerRequest::_handleUploadByte(uint8_t data, bool last){
+void AsyncWebServerRequest::_handleUploadByte(uint8_t data, bool last) {
   _itemBuffer[_itemBufferIndex++] = data;
 
-  if(last || _itemBufferIndex == 1460){
-    //check if authenticated before calling the upload
-    if(_handler)
+  if (last || _itemBufferIndex == RESPONSE_STREAM_BUFFER_SIZE) {
+    // check if authenticated before calling the upload
+    if (_handler) {
       _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, false);
+    }
     _itemBufferIndex = 0;
   }
 }
@@ -391,57 +454,65 @@ enum {
   PARSE_ERROR
 };
 
-void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
-#define itemWriteByte(b) do { _itemSize++; if(_itemIsFile) _handleUploadByte(b, last); else _itemValue+=(char)(b); } while(0)
-
-  if(!_parsedLength){
+void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last) {
+#define itemWriteByte(b)          \
+  do {                            \
+    _itemSize++;                  \
+    if (_itemIsFile)              \
+      _handleUploadByte(b, last); \
+    else                          \
+      _itemValue += (char)(b);    \
+  } while (0)
+
+  if (!_parsedLength) {
     _multiParseState = EXPECT_BOUNDARY;
-    _temp = String();
-    _itemName = String();
-    _itemFilename = String();
-    _itemType = String();
+    _temp = emptyString;
+    _itemName = emptyString;
+    _itemFilename = emptyString;
+    _itemType = emptyString;
   }
 
-  if(_multiParseState == WAIT_FOR_RETURN1){
-    if(data != '\r'){
+  if (_multiParseState == WAIT_FOR_RETURN1) {
+    if (data != '\r') {
       itemWriteByte(data);
     } else {
       _multiParseState = EXPECT_FEED1;
     }
-  } else if(_multiParseState == EXPECT_BOUNDARY){
-    if(_parsedLength < 2 && data != '-'){
+  } else if (_multiParseState == EXPECT_BOUNDARY) {
+    if (_parsedLength < 2 && data != '-') {
       _multiParseState = PARSE_ERROR;
       return;
-    } else if(_parsedLength - 2 < _boundary.length() && _boundary.c_str()[_parsedLength - 2] != data){
+    } else if (_parsedLength - 2 < _boundary.length() && _boundary.c_str()[_parsedLength - 2] != data) {
       _multiParseState = PARSE_ERROR;
       return;
-    } else if(_parsedLength - 2 == _boundary.length() && data != '\r'){
+    } else if (_parsedLength - 2 == _boundary.length() && data != '\r') {
       _multiParseState = PARSE_ERROR;
       return;
-    } else if(_parsedLength - 3 == _boundary.length()){
-      if(data != '\n'){
+    } else if (_parsedLength - 3 == _boundary.length()) {
+      if (data != '\n') {
         _multiParseState = PARSE_ERROR;
         return;
       }
       _multiParseState = PARSE_HEADERS;
       _itemIsFile = false;
     }
-  } else if(_multiParseState == PARSE_HEADERS){
-    if((char)data != '\r' && (char)data != '\n')
-       _temp += (char)data;
-    if((char)data == '\n'){
-      if(_temp.length()){
-        if(_temp.length() > 12 && _temp.substring(0, 12).equalsIgnoreCase("Content-Type")){
+  } else if (_multiParseState == PARSE_HEADERS) {
+    if ((char)data != '\r' && (char)data != '\n') {
+      _temp += (char)data;
+    }
+    if ((char)data == '\n') {
+      if (_temp.length()) {
+        if (_temp.length() > 12 && _temp.substring(0, 12).equalsIgnoreCase(T_Content_Type)) {
           _itemType = _temp.substring(14);
           _itemIsFile = true;
-        } else if(_temp.length() > 19 && _temp.substring(0, 19).equalsIgnoreCase("Content-Disposition")){
+        } else if (_temp.length() > 19 && _temp.substring(0, 19).equalsIgnoreCase(T_Content_Disposition)) {
           _temp = _temp.substring(_temp.indexOf(';') + 2);
-          while(_temp.indexOf(';') > 0){
+          while (_temp.indexOf(';') > 0) {
             String name = _temp.substring(0, _temp.indexOf('='));
             String nameVal = _temp.substring(_temp.indexOf('=') + 2, _temp.indexOf(';') - 1);
-            if(name == "name"){
+            if (name == T_name) {
               _itemName = nameVal;
-            } else if(name == "filename"){
+            } else if (name == T_filename) {
               _itemFilename = nameVal;
               _itemIsFile = true;
             }
@@ -449,72 +520,88 @@ void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
           }
           String name = _temp.substring(0, _temp.indexOf('='));
           String nameVal = _temp.substring(_temp.indexOf('=') + 2, _temp.length() - 1);
-          if(name == "name"){
+          if (name == T_name) {
             _itemName = nameVal;
-          } else if(name == "filename"){
+          } else if (name == T_filename) {
             _itemFilename = nameVal;
             _itemIsFile = true;
           }
         }
-        _temp = String();
+        _temp = emptyString;
       } else {
         _multiParseState = WAIT_FOR_RETURN1;
-        //value starts from here
+        // value starts from here
         _itemSize = 0;
         _itemStartIndex = _parsedLength;
-        _itemValue = String();
-        if(_itemIsFile){
-          if(_itemBuffer)
+        _itemValue = emptyString;
+        if (_itemIsFile) {
+          if (_itemBuffer) {
             free(_itemBuffer);
-          _itemBuffer = (uint8_t*)malloc(1460);
-          if(_itemBuffer == NULL){
+          }
+          _itemBuffer = (uint8_t *)malloc(RESPONSE_STREAM_BUFFER_SIZE);
+          if (_itemBuffer == NULL) {
+#ifdef ESP32
+            log_e("Failed to allocate");
+#endif
             _multiParseState = PARSE_ERROR;
+            abort();
             return;
           }
           _itemBufferIndex = 0;
         }
       }
     }
-  } else if(_multiParseState == EXPECT_FEED1){
-    if(data != '\n'){
+  } else if (_multiParseState == EXPECT_FEED1) {
+    if (data != '\n') {
       _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); _parseMultipartPostByte(data, last);
+      itemWriteByte('\r');
+      _parseMultipartPostByte(data, last);
     } else {
       _multiParseState = EXPECT_DASH1;
     }
-  } else if(_multiParseState == EXPECT_DASH1){
-    if(data != '-'){
+  } else if (_multiParseState == EXPECT_DASH1) {
+    if (data != '-') {
       _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n');  _parseMultipartPostByte(data, last);
+      itemWriteByte('\r');
+      itemWriteByte('\n');
+      _parseMultipartPostByte(data, last);
     } else {
       _multiParseState = EXPECT_DASH2;
     }
-  } else if(_multiParseState == EXPECT_DASH2){
-    if(data != '-'){
+  } else if (_multiParseState == EXPECT_DASH2) {
+    if (data != '-') {
       _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  _parseMultipartPostByte(data, last);
+      itemWriteByte('\r');
+      itemWriteByte('\n');
+      itemWriteByte('-');
+      _parseMultipartPostByte(data, last);
     } else {
       _multiParseState = BOUNDARY_OR_DATA;
       _boundaryPosition = 0;
     }
-  } else if(_multiParseState == BOUNDARY_OR_DATA){
-    if(_boundaryPosition < _boundary.length() && _boundary.c_str()[_boundaryPosition] != data){
+  } else if (_multiParseState == BOUNDARY_OR_DATA) {
+    if (_boundaryPosition < _boundary.length() && _boundary.c_str()[_boundaryPosition] != data) {
       _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  itemWriteByte('-');
+      itemWriteByte('\r');
+      itemWriteByte('\n');
+      itemWriteByte('-');
+      itemWriteByte('-');
       uint8_t i;
-      for(i=0; i<_boundaryPosition; i++)
+      for (i = 0; i < _boundaryPosition; i++) {
         itemWriteByte(_boundary.c_str()[i]);
+      }
       _parseMultipartPostByte(data, last);
-    } else if(_boundaryPosition == _boundary.length() - 1){
+    } else if (_boundaryPosition == _boundary.length() - 1) {
       _multiParseState = DASH3_OR_RETURN2;
-      if(!_itemIsFile){
-        _addParam(new AsyncWebParameter(_itemName, _itemValue, true));
+      if (!_itemIsFile) {
+        _params.emplace_back(_itemName, _itemValue, true);
       } else {
-        if(_itemSize){
-          //check if authenticated before calling the upload
-          if(_handler) _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, true);
+        if (_itemSize) {
+          if (_handler) {
+            _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, true);
+          }
           _itemBufferIndex = 0;
-          _addParam(new AsyncWebParameter(_itemName, _itemFilename, true, true, _itemSize));
+          _params.emplace_back(_itemName, _itemFilename, true, true, _itemSize);
         }
         free(_itemBuffer);
         _itemBuffer = NULL;
@@ -523,445 +610,523 @@ void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
     } else {
       _boundaryPosition++;
     }
-  } else if(_multiParseState == DASH3_OR_RETURN2){
-    if(data == '-' && (_contentLength - _parsedLength - 4) != 0){
-      //os_printf("ERROR: The parser got to the end of the POST but is expecting %u bytes more!\nDrop an issue so we can have more info on the matter!\n", _contentLength - _parsedLength - 4);
-      _contentLength = _parsedLength + 4;//lets close the request gracefully
+  } else if (_multiParseState == DASH3_OR_RETURN2) {
+    if (data == '-' && (_contentLength - _parsedLength - 4) != 0) {
+      // os_printf("ERROR: The parser got to the end of the POST but is expecting %u bytes more!\nDrop an issue so we can have more info on the matter!\n", _contentLength - _parsedLength - 4);
+      _contentLength = _parsedLength + 4;  // lets close the request gracefully
     }
-    if(data == '\r'){
+    if (data == '\r') {
       _multiParseState = EXPECT_FEED2;
-    } else if(data == '-' && _contentLength == (_parsedLength + 4)){
+    } else if (data == '-' && _contentLength == (_parsedLength + 4)) {
       _multiParseState = PARSING_FINISHED;
     } else {
       _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  itemWriteByte('-');
-      uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]);
+      itemWriteByte('\r');
+      itemWriteByte('\n');
+      itemWriteByte('-');
+      itemWriteByte('-');
+      uint8_t i;
+      for (i = 0; i < _boundary.length(); i++) {
+        itemWriteByte(_boundary.c_str()[i]);
+      }
       _parseMultipartPostByte(data, last);
     }
-  } else if(_multiParseState == EXPECT_FEED2){
-    if(data == '\n'){
+  } else if (_multiParseState == EXPECT_FEED2) {
+    if (data == '\n') {
       _multiParseState = PARSE_HEADERS;
       _itemIsFile = false;
     } else {
       _multiParseState = WAIT_FOR_RETURN1;
-      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  itemWriteByte('-');
-      uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]);
-      itemWriteByte('\r'); _parseMultipartPostByte(data, last);
+      itemWriteByte('\r');
+      itemWriteByte('\n');
+      itemWriteByte('-');
+      itemWriteByte('-');
+      uint8_t i;
+      for (i = 0; i < _boundary.length(); i++) {
+        itemWriteByte(_boundary.c_str()[i]);
+      }
+      itemWriteByte('\r');
+      _parseMultipartPostByte(data, last);
     }
   }
 }
 
-void AsyncWebServerRequest::_parseLine(){
-  if(_parseState == PARSE_REQ_START){
-    if(!_temp.length()){
+void AsyncWebServerRequest::_parseLine() {
+  if (_parseState == PARSE_REQ_START) {
+    if (!_temp.length()) {
       _parseState = PARSE_REQ_FAIL;
-      _client->close();
+      abort();
     } else {
-      _parseReqHead();
-      _parseState = PARSE_REQ_HEADERS;
+      if (_parseReqHead()) {
+        _parseState = PARSE_REQ_HEADERS;
+      } else {
+        _parseState = PARSE_REQ_FAIL;
+        abort();
+      }
     }
     return;
   }
 
-  if(_parseState == PARSE_REQ_HEADERS){
-    if(!_temp.length()){
-      //end of headers
+  if (_parseState == PARSE_REQ_HEADERS) {
+    if (!_temp.length()) {
+      // end of headers
       _server->_rewriteRequest(this);
       _server->_attachHandler(this);
-      _removeNotInterestingHeaders();
-      if(_expectingContinue){
-        const char * response = "HTTP/1.1 100 Continue\r\n\r\n";
-        _client->write(response, os_strlen(response));
+      if (_expectingContinue) {
+        String response(T_HTTP_100_CONT);
+        _client->write(response.c_str(), response.length());
       }
-      //check handler for authentication
-      if(_contentLength){
+      if (_contentLength) {
         _parseState = PARSE_REQ_BODY;
       } else {
         _parseState = PARSE_REQ_END;
-        if(_handler) _handler->handleRequest(this);
-        else send(501);
+        _runMiddlewareChain();
+        _send();
       }
-    } else _parseReqHeader();
+    } else {
+      _parseReqHeader();
+    }
   }
 }
 
-size_t AsyncWebServerRequest::headers() const{
-  return _headers.length();
+void AsyncWebServerRequest::_runMiddlewareChain() {
+  if (_handler && _handler->mustSkipServerMiddlewares()) {
+    _handler->_runChain(this, [this]() {
+      _handler->handleRequest(this);
+    });
+  } else {
+    _server->_runChain(this, [this]() {
+      if (_handler) {
+        _handler->_runChain(this, [this]() {
+          _handler->handleRequest(this);
+        });
+      }
+    });
+  }
 }
 
-bool AsyncWebServerRequest::hasHeader(const String& name) const {
-  for(const auto& h: _headers){
-    if(h->name().equalsIgnoreCase(name)){
-      return true;
+void AsyncWebServerRequest::_send() {
+  if (!_sent && !_paused) {
+    // log_d("AsyncWebServerRequest::_send()");
+
+    // user did not create a response ?
+    if (!_response) {
+      send(501, T_text_plain, "Handler did not handle the request");
+    }
+
+    // response is not valid ?
+    if (!_response->_sourceValid()) {
+      send(500, T_text_plain, "Invalid data in handler");
     }
+
+    // here, we either have a response give nfrom user or one of the two above
+    _client->setRxTimeout(0);
+    _response->_respond(this);
+    _sent = true;
   }
-  return false;
 }
 
-bool AsyncWebServerRequest::hasHeader(const __FlashStringHelper * data) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = 0;
-  while (1) {
-    if (pgm_read_byte(p+n) == 0) break;
-      n += 1;
+AsyncWebServerRequestPtr AsyncWebServerRequest::pause() {
+  if (_paused) {
+    return _this;
   }
-  char * name = (char*) malloc(n+1);
-  name[n] = 0; 
-  if (name) {
-    for(size_t b=0; bsetRxTimeout(0);
+  // this shared ptr will hold the request pointer until it gets destroyed following a disconnect.
+  // this is just used as a holder providing weak observers, so the deleter is a no-op.
+  _this = std::shared_ptr(this, doNotDelete);
+  _paused = true;
+  return _this;
+}
+
+void AsyncWebServerRequest::abort() {
+  if (!_sent) {
+    _sent = true;
+    _paused = false;
+    _this.reset();
+    // log_e("AsyncWebServerRequest::abort");
+    _client->abort();
   }
 }
 
-AsyncWebHeader* AsyncWebServerRequest::getHeader(const String& name) const {
-  for(const auto& h: _headers){
-    if(h->name().equalsIgnoreCase(name)){
-      return h;
+size_t AsyncWebServerRequest::headers() const {
+  return _headers.size();
+}
+
+bool AsyncWebServerRequest::hasHeader(const char *name) const {
+  for (const auto &h : _headers) {
+    if (h.name().equalsIgnoreCase(name)) {
+      return true;
     }
   }
-  return nullptr;
+  return false;
+}
+
+#ifdef ESP8266
+bool AsyncWebServerRequest::hasHeader(const __FlashStringHelper *data) const {
+  return hasHeader(String(data));
+}
+#endif
+
+const AsyncWebHeader *AsyncWebServerRequest::getHeader(const char *name) const {
+  auto iter = std::find_if(std::begin(_headers), std::end(_headers), [&name](const AsyncWebHeader &header) {
+    return header.name().equalsIgnoreCase(name);
+  });
+  return (iter == std::end(_headers)) ? nullptr : &(*iter);
 }
 
-AsyncWebHeader* AsyncWebServerRequest::getHeader(const __FlashStringHelper * data) const {
+#ifdef ESP8266
+const AsyncWebHeader *AsyncWebServerRequest::getHeader(const __FlashStringHelper *data) const {
   PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p); 
-  char * name = (char*) malloc(n+1);
+  size_t n = strlen_P(p);
+  char *name = (char *)malloc(n + 1);
   if (name) {
-    strcpy_P(name, p); 
-    AsyncWebHeader* result = getHeader( String(name)); 
-    free(name); 
-    return result; 
+    strcpy_P(name, p);
+    const AsyncWebHeader *result = getHeader(String(name));
+    free(name);
+    return result;
   } else {
-    return nullptr; 
+    return nullptr;
+  }
+}
+#endif
+
+const AsyncWebHeader *AsyncWebServerRequest::getHeader(size_t num) const {
+  if (num >= _headers.size()) {
+    return nullptr;
+  }
+  return &(*std::next(_headers.cbegin(), num));
+}
+
+size_t AsyncWebServerRequest::getHeaderNames(std::vector &names) const {
+  const size_t size = names.size();
+  for (const auto &h : _headers) {
+    names.push_back(h.name().c_str());
   }
+  return names.size() - size;
 }
 
-AsyncWebHeader* AsyncWebServerRequest::getHeader(size_t num) const {
-  auto header = _headers.nth(num);
-  return header ? *header : nullptr;
+bool AsyncWebServerRequest::removeHeader(const char *name) {
+  const size_t size = _headers.size();
+  _headers.remove_if([name](const AsyncWebHeader &header) {
+    return header.name().equalsIgnoreCase(name);
+  });
+  return size != _headers.size();
 }
 
 size_t AsyncWebServerRequest::params() const {
-  return _params.length();
+  return _params.size();
 }
 
-bool AsyncWebServerRequest::hasParam(const String& name, bool post, bool file) const {
-  for(const auto& p: _params){
-    if(p->name() == name && p->isPost() == post && p->isFile() == file){
+bool AsyncWebServerRequest::hasParam(const char *name, bool post, bool file) const {
+  for (const auto &p : _params) {
+    if (p.name().equals(name) && p.isPost() == post && p.isFile() == file) {
       return true;
     }
   }
   return false;
 }
 
-bool AsyncWebServerRequest::hasParam(const __FlashStringHelper * data, bool post, bool file) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p);
-
-  char * name = (char*) malloc(n+1);
-  name[n] = 0; 
-  if (name) {
-    strcpy_P(name,p);    
-    bool result = hasParam( name, post, file); 
-    free(name); 
-    return result; 
-  } else {
-    return false; 
-  }
-}
-
-AsyncWebParameter* AsyncWebServerRequest::getParam(const String& name, bool post, bool file) const {
-  for(const auto& p: _params){
-    if(p->name() == name && p->isPost() == post && p->isFile() == file){
-      return p;
+const AsyncWebParameter *AsyncWebServerRequest::getParam(const char *name, bool post, bool file) const {
+  for (const auto &p : _params) {
+    if (p.name() == name && p.isPost() == post && p.isFile() == file) {
+      return &p;
     }
   }
   return nullptr;
 }
 
-AsyncWebParameter* AsyncWebServerRequest::getParam(const __FlashStringHelper * data, bool post, bool file) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p);
-  char * name = (char*) malloc(n+1);
-  if (name) {
-    strcpy_P(name, p);   
-    AsyncWebParameter* result = getParam(name, post, file); 
-    free(name); 
-    return result; 
-  } else {
-    return nullptr; 
-  }
+#ifdef ESP8266
+const AsyncWebParameter *AsyncWebServerRequest::getParam(const __FlashStringHelper *data, bool post, bool file) const {
+  return getParam(String(data), post, file);
 }
+#endif
 
-AsyncWebParameter* AsyncWebServerRequest::getParam(size_t num) const {
-  auto param = _params.nth(num);
-  return param ? *param : nullptr;
+const AsyncWebParameter *AsyncWebServerRequest::getParam(size_t num) const {
+  if (num >= _params.size()) {
+    return nullptr;
+  }
+  return &(*std::next(_params.cbegin(), num));
 }
 
-void AsyncWebServerRequest::addInterestingHeader(const String& name){
-  if(!_interestingHeaders.containsIgnoreCase(name))
-    _interestingHeaders.add(name);
+const String &AsyncWebServerRequest::getAttribute(const char *name, const String &defaultValue) const {
+  auto it = _attributes.find(name);
+  return it != _attributes.end() ? it->second : defaultValue;
+}
+bool AsyncWebServerRequest::getAttribute(const char *name, bool defaultValue) const {
+  auto it = _attributes.find(name);
+  return it != _attributes.end() ? it->second == "1" : defaultValue;
+}
+long AsyncWebServerRequest::getAttribute(const char *name, long defaultValue) const {
+  auto it = _attributes.find(name);
+  return it != _attributes.end() ? it->second.toInt() : defaultValue;
+}
+float AsyncWebServerRequest::getAttribute(const char *name, float defaultValue) const {
+  auto it = _attributes.find(name);
+  return it != _attributes.end() ? it->second.toFloat() : defaultValue;
+}
+double AsyncWebServerRequest::getAttribute(const char *name, double defaultValue) const {
+  auto it = _attributes.find(name);
+  return it != _attributes.end() ? it->second.toDouble() : defaultValue;
 }
 
-void AsyncWebServerRequest::send(AsyncWebServerResponse *response){
-  _response = response;
-  if(_response == NULL){
-    _client->close(true);
-    _onDisconnect();
-    return;
-  }
-  if(!_response->_sourceValid()){
-    delete response;
-    _response = NULL;
-    send(500);
-  }
-  else {
-    _client->setRxTimeout(0);
-    _response->_respond(this);
+AsyncWebServerResponse *AsyncWebServerRequest::beginResponse(int code, const char *contentType, const char *content, AwsTemplateProcessor callback) {
+  if (callback) {
+    return new AsyncProgmemResponse(code, contentType, (const uint8_t *)content, strlen(content), callback);
   }
+  return new AsyncBasicResponse(code, contentType, content);
 }
 
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(int code, const String& contentType, const String& content){
-  return new AsyncBasicResponse(code, contentType, content);
+AsyncWebServerResponse *
+  AsyncWebServerRequest::beginResponse(int code, const char *contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback) {
+  return new AsyncProgmemResponse(code, contentType, content, len, callback);
 }
 
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(FS &fs, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback){
-  if(fs.exists(path) || (!download && fs.exists(path+".gz")))
+AsyncWebServerResponse *
+  AsyncWebServerRequest::beginResponse(FS &fs, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback) {
+  if (fs.exists(path) || (!download && fs.exists(path + T__gz))) {
     return new AsyncFileResponse(fs, path, contentType, download, callback);
+  }
   return NULL;
 }
 
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(File content, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback){
-  if(content == true)
+AsyncWebServerResponse *
+  AsyncWebServerRequest::beginResponse(File content, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback) {
+  if (content == true) {
     return new AsyncFileResponse(content, path, contentType, download, callback);
+  }
   return NULL;
 }
 
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback){
+AsyncWebServerResponse *AsyncWebServerRequest::beginResponse(Stream &stream, const char *contentType, size_t len, AwsTemplateProcessor callback) {
   return new AsyncStreamResponse(stream, contentType, len, callback);
 }
 
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback){
+AsyncWebServerResponse *
+  AsyncWebServerRequest::beginResponse(const char *contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback) {
   return new AsyncCallbackResponse(contentType, len, callback, templateCallback);
 }
 
-AsyncWebServerResponse * AsyncWebServerRequest::beginChunkedResponse(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback){
-  if(_version)
+AsyncWebServerResponse *
+  AsyncWebServerRequest::beginChunkedResponse(const char *contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback) {
+  if (_version) {
     return new AsyncChunkedResponse(contentType, callback, templateCallback);
+  }
   return new AsyncCallbackResponse(contentType, 0, callback, templateCallback);
 }
 
-AsyncResponseStream * AsyncWebServerRequest::beginResponseStream(const String& contentType, size_t bufferSize){
+AsyncResponseStream *AsyncWebServerRequest::beginResponseStream(const char *contentType, size_t bufferSize) {
   return new AsyncResponseStream(contentType, bufferSize);
 }
 
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse_P(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback){
-  return new AsyncProgmemResponse(code, contentType, content, len, callback);
-}
-
-AsyncWebServerResponse * AsyncWebServerRequest::beginResponse_P(int code, const String& contentType, PGM_P content, AwsTemplateProcessor callback){
-  return beginResponse_P(code, contentType, (const uint8_t *)content, strlen_P(content), callback);
-}
-
-void AsyncWebServerRequest::send(int code, const String& contentType, const String& content){
-  send(beginResponse(code, contentType, content));
-}
-
-void AsyncWebServerRequest::send(FS &fs, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback){
-  if(fs.exists(path) || (!download && fs.exists(path+".gz"))){
-    send(beginResponse(fs, path, contentType, download, callback));
-  } else send(404);
-}
-
-void AsyncWebServerRequest::send(File content, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback){
-  if(content == true){
-    send(beginResponse(content, path, contentType, download, callback));
-  } else send(404);
-}
-
-void AsyncWebServerRequest::send(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback){
-  send(beginResponse(stream, contentType, len, callback));
-}
-
-void AsyncWebServerRequest::send(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback){
-  send(beginResponse(contentType, len, callback, templateCallback));
+AsyncWebServerResponse *AsyncWebServerRequest::beginResponse_P(int code, const String &contentType, PGM_P content, AwsTemplateProcessor callback) {
+  return new AsyncProgmemResponse(code, contentType, (const uint8_t *)content, strlen_P(content), callback);
 }
 
-void AsyncWebServerRequest::sendChunked(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback){
-  send(beginChunkedResponse(contentType, callback, templateCallback));
-}
+void AsyncWebServerRequest::send(AsyncWebServerResponse *response) {
+  // request is already sent on the wire ?
+  if (_sent) {
+    return;
+  }
 
-void AsyncWebServerRequest::send_P(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback){
-  send(beginResponse_P(code, contentType, content, len, callback));
-}
+  // if we already had a response, delete it and replace it with the new one
+  if (_response) {
+    delete _response;
+  }
+  _response = response;
 
-void AsyncWebServerRequest::send_P(int code, const String& contentType, PGM_P content, AwsTemplateProcessor callback){
-  send(beginResponse_P(code, contentType, content, callback));
+  // if request was paused, we need to send the response now
+  if (_paused) {
+    _paused = false;
+    _send();
+  }
 }
 
-void AsyncWebServerRequest::redirect(const String& url){
-  AsyncWebServerResponse * response = beginResponse(302);
-  response->addHeader("Location",url);
+void AsyncWebServerRequest::redirect(const char *url, int code) {
+  AsyncWebServerResponse *response = beginResponse(code);
+  response->addHeader(T_LOCATION, url);
   send(response);
 }
 
-bool AsyncWebServerRequest::authenticate(const char * username, const char * password, const char * realm, bool passwordIsHash){
-  if(_authorization.length()){
-    if(_isDigest)
+bool AsyncWebServerRequest::authenticate(const char *username, const char *password, const char *realm, bool passwordIsHash) const {
+  if (_authorization.length()) {
+    if (_authMethod == AsyncAuthType::AUTH_DIGEST) {
       return checkDigestAuthentication(_authorization.c_str(), methodToString(), username, password, realm, passwordIsHash, NULL, NULL, NULL);
-    else if(!passwordIsHash)
+    } else if (!passwordIsHash) {
       return checkBasicAuthentication(_authorization.c_str(), username, password);
-    else
+    } else {
       return _authorization.equals(password);
+    }
   }
   return false;
 }
 
-bool AsyncWebServerRequest::authenticate(const char * hash){
-  if(!_authorization.length() || hash == NULL)
+bool AsyncWebServerRequest::authenticate(const char *hash) const {
+  if (!_authorization.length() || hash == NULL) {
     return false;
+  }
 
-  if(_isDigest){
+  if (_authMethod == AsyncAuthType::AUTH_DIGEST) {
     String hStr = String(hash);
-    int separator = hStr.indexOf(":");
-    if(separator <= 0)
+    int separator = hStr.indexOf(':');
+    if (separator <= 0) {
       return false;
+    }
     String username = hStr.substring(0, separator);
     hStr = hStr.substring(separator + 1);
-    separator = hStr.indexOf(":");
-    if(separator <= 0)
+    separator = hStr.indexOf(':');
+    if (separator <= 0) {
       return false;
+    }
     String realm = hStr.substring(0, separator);
     hStr = hStr.substring(separator + 1);
     return checkDigestAuthentication(_authorization.c_str(), methodToString(), username.c_str(), hStr.c_str(), realm.c_str(), true, NULL, NULL, NULL);
   }
 
+  // Basic Auth, Bearer Auth, or other
   return (_authorization.equals(hash));
 }
 
-void AsyncWebServerRequest::requestAuthentication(const char * realm, bool isDigest){
-  AsyncWebServerResponse * r = beginResponse(401);
-  if(!isDigest && realm == NULL){
-    r->addHeader("WWW-Authenticate", "Basic realm=\"Login Required\"");
-  } else if(!isDigest){
-    String header = "Basic realm=\"";
-    header.concat(realm);
-    header.concat("\"");
-    r->addHeader("WWW-Authenticate", header);
-  } else {
-    String header = "Digest ";
-    header.concat(requestDigestAuthentication(realm));
-    r->addHeader("WWW-Authenticate", header);
+void AsyncWebServerRequest::requestAuthentication(AsyncAuthType method, const char *realm, const char *_authFailMsg) {
+  if (!realm) {
+    realm = T_LOGIN_REQ;
+  }
+
+  AsyncWebServerResponse *r = _authFailMsg ? beginResponse(401, T_text_html, _authFailMsg) : beginResponse(401);
+
+  switch (method) {
+    case AsyncAuthType::AUTH_BASIC:
+    {
+      String header;
+      if (header.reserve(strlen(T_BASIC_REALM) + strlen(realm) + 1)) {
+        header.concat(T_BASIC_REALM);
+        header.concat(realm);
+        header.concat('"');
+        r->addHeader(T_WWW_AUTH, header.c_str());
+      } else {
+#ifdef ESP32
+        log_e("Failed to allocate");
+#endif
+        abort();
+      }
+
+      break;
+    }
+    case AsyncAuthType::AUTH_DIGEST:
+    {
+      size_t len = strlen(T_DIGEST_) + strlen(T_realm__) + strlen(T_auth_nonce) + 32 + strlen(T__opaque) + 32 + 1;
+      String header;
+      if (header.reserve(len + strlen(realm))) {
+        const String nonce = genRandomMD5();
+        const String opaque = genRandomMD5();
+        if (nonce.length() && opaque.length()) {
+          header.concat(T_DIGEST_);
+          header.concat(T_realm__);
+          header.concat(realm);
+          header.concat(T_auth_nonce);
+          header.concat(nonce);
+          header.concat(T__opaque);
+          header.concat(opaque);
+          header.concat((char)0x22);  // '"'
+          r->addHeader(T_WWW_AUTH, header.c_str());
+        } else {
+#ifdef ESP32
+          log_e("Failed to allocate");
+#endif
+          abort();
+        }
+      }
+      break;
+    }
+    default: break;
   }
+
   send(r);
 }
 
-bool AsyncWebServerRequest::hasArg(const char* name) const {
-  for(const auto& arg: _params){
-    if(arg->name() == name){
+bool AsyncWebServerRequest::hasArg(const char *name) const {
+  for (const auto &arg : _params) {
+    if (arg.name() == name) {
       return true;
     }
   }
   return false;
 }
 
-bool AsyncWebServerRequest::hasArg(const __FlashStringHelper * data) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p); 
-  char * name = (char*) malloc(n+1);
-  if (name) {
-    strcpy_P(name, p);    
-    bool result = hasArg( name ); 
-    free(name); 
-    return result; 
-  } else {
-    return false; 
-  }
+#ifdef ESP8266
+bool AsyncWebServerRequest::hasArg(const __FlashStringHelper *data) const {
+  return hasArg(String(data).c_str());
 }
+#endif
 
-
-const String& AsyncWebServerRequest::arg(const String& name) const {
-  for(const auto& arg: _params){
-    if(arg->name() == name){
-      return arg->value();
+const String &AsyncWebServerRequest::arg(const char *name) const {
+  for (const auto &arg : _params) {
+    if (arg.name() == name) {
+      return arg.value();
     }
   }
-  return SharedEmptyString;
+  return emptyString;
 }
 
-const String& AsyncWebServerRequest::arg(const __FlashStringHelper * data) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p);
-  char * name = (char*) malloc(n+1);
-  if (name) {
-    strcpy_P(name, p);
-    const String & result = arg( String(name) ); 
-    free(name); 
-    return result; 
-  } else {
-    return SharedEmptyString;
-  }
-
+#ifdef ESP8266
+const String &AsyncWebServerRequest::arg(const __FlashStringHelper *data) const {
+  return arg(String(data).c_str());
 }
+#endif
 
-const String& AsyncWebServerRequest::arg(size_t i) const {
+const String &AsyncWebServerRequest::arg(size_t i) const {
   return getParam(i)->value();
 }
 
-const String& AsyncWebServerRequest::argName(size_t i) const {
+const String &AsyncWebServerRequest::argName(size_t i) const {
   return getParam(i)->name();
 }
 
-const String& AsyncWebServerRequest::pathArg(size_t i) const {
-  auto param = _pathParams.nth(i);
-  return param ? **param : SharedEmptyString;
+const String &AsyncWebServerRequest::pathArg(size_t i) const {
+  if (i >= _pathParams.size()) {
+    return emptyString;
+  }
+  auto it = _pathParams.begin();
+  std::advance(it, i);
+  return *it;
 }
 
-const String& AsyncWebServerRequest::header(const char* name) const {
-  AsyncWebHeader* h = getHeader(String(name));
-  return h ? h->value() : SharedEmptyString;
+const String &AsyncWebServerRequest::header(const char *name) const {
+  const AsyncWebHeader *h = getHeader(name);
+  return h ? h->value() : emptyString;
 }
 
-const String& AsyncWebServerRequest::header(const __FlashStringHelper * data) const {
-  PGM_P p = reinterpret_cast(data);
-  size_t n = strlen_P(p); 
-  char * name = (char*) malloc(n+1);
-  if (name) {
-    strcpy_P(name, p);  
-    const String & result = header( (const char *)name ); 
-    free(name); 
-    return result; 
-  } else {
-    return SharedEmptyString; 
-  }
-};  
-
+#ifdef ESP8266
+const String &AsyncWebServerRequest::header(const __FlashStringHelper *data) const {
+  return header(String(data).c_str());
+};
+#endif
 
-const String& AsyncWebServerRequest::header(size_t i) const {
-  AsyncWebHeader* h = getHeader(i);
-  return h ?  h->value() : SharedEmptyString;
+const String &AsyncWebServerRequest::header(size_t i) const {
+  const AsyncWebHeader *h = getHeader(i);
+  return h ? h->value() : emptyString;
 }
 
-const String& AsyncWebServerRequest::headerName(size_t i) const {
-  AsyncWebHeader* h = getHeader(i);
-  return h ? h->name() : SharedEmptyString;
+const String &AsyncWebServerRequest::headerName(size_t i) const {
+  const AsyncWebHeader *h = getHeader(i);
+  return h ? h->name() : emptyString;
 }
 
-String AsyncWebServerRequest::urlDecode(const String& text) const {
+String AsyncWebServerRequest::urlDecode(const String &text) const {
   char temp[] = "0x00";
   unsigned int len = text.length();
   unsigned int i = 0;
-  String decoded = String();
-  decoded.reserve(len); // Allocate the string internal buffer - never longer from source text
-  while (i < len){
+  String decoded;
+  // Allocate the string internal buffer - never longer from source text
+  if (!decoded.reserve(len)) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+    return emptyString;
+  }
+  while (i < len) {
     char decodedChar;
     char encodedChar = text.charAt(i++);
-    if ((encodedChar == '%') && (i + 1 < len)){
+    if ((encodedChar == '%') && (i + 1 < len)) {
       temp[2] = text.charAt(i++);
       temp[3] = text.charAt(i++);
       decodedChar = strtol(temp, NULL, 16);
@@ -975,34 +1140,46 @@ String AsyncWebServerRequest::urlDecode(const String& text) const {
   return decoded;
 }
 
-
-const char * AsyncWebServerRequest::methodToString() const {
-  if(_method == HTTP_ANY) return "ANY";
-  else if(_method & HTTP_GET) return "GET";
-  else if(_method & HTTP_POST) return "POST";
-  else if(_method & HTTP_DELETE) return "DELETE";
-  else if(_method & HTTP_PUT) return "PUT";
-  else if(_method & HTTP_PATCH) return "PATCH";
-  else if(_method & HTTP_HEAD) return "HEAD";
-  else if(_method & HTTP_OPTIONS) return "OPTIONS";
-  return "UNKNOWN";
+const char *AsyncWebServerRequest::methodToString() const {
+  if (_method == HTTP_ANY) {
+    return T_ANY;
+  }
+  if (_method & HTTP_GET) {
+    return T_GET;
+  }
+  if (_method & HTTP_POST) {
+    return T_POST;
+  }
+  if (_method & HTTP_DELETE) {
+    return T_DELETE;
+  }
+  if (_method & HTTP_PUT) {
+    return T_PUT;
+  }
+  if (_method & HTTP_PATCH) {
+    return T_PATCH;
+  }
+  if (_method & HTTP_HEAD) {
+    return T_HEAD;
+  }
+  if (_method & HTTP_OPTIONS) {
+    return T_OPTIONS;
+  }
+  return T_UNKNOWN;
 }
 
 const char *AsyncWebServerRequest::requestedConnTypeToString() const {
   switch (_reqconntype) {
-    case RCT_NOT_USED: return "RCT_NOT_USED";
-    case RCT_DEFAULT:  return "RCT_DEFAULT";
-    case RCT_HTTP:     return "RCT_HTTP";
-    case RCT_WS:       return "RCT_WS";
-    case RCT_EVENT:    return "RCT_EVENT";
-    default:           return "ERROR";
+    case RCT_NOT_USED: return T_RCT_NOT_USED;
+    case RCT_DEFAULT:  return T_RCT_DEFAULT;
+    case RCT_HTTP:     return T_RCT_HTTP;
+    case RCT_WS:       return T_RCT_WS;
+    case RCT_EVENT:    return T_RCT_EVENT;
+    default:           return T_ERROR;
   }
 }
 
-bool AsyncWebServerRequest::isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2, RequestedConnectionType erct3) {
-    bool res = false;
-    if ((erct1 != RCT_NOT_USED) && (erct1 == _reqconntype)) res = true;
-    if ((erct2 != RCT_NOT_USED) && (erct2 == _reqconntype)) res = true;
-    if ((erct3 != RCT_NOT_USED) && (erct3 == _reqconntype)) res = true;
-    return res;
+bool AsyncWebServerRequest::isExpectedRequestedConnType(RequestedConnectionType erct1, RequestedConnectionType erct2, RequestedConnectionType erct3) const {
+  return ((erct1 != RCT_NOT_USED) && (erct1 == _reqconntype)) || ((erct2 != RCT_NOT_USED) && (erct2 == _reqconntype))
+         || ((erct3 != RCT_NOT_USED) && (erct3 == _reqconntype));
 }
diff --git a/src/WebResponseImpl.h b/src/WebResponseImpl.h
index 9a64e3a52..640862580 100644
--- a/src/WebResponseImpl.h
+++ b/src/WebResponseImpl.h
@@ -1,23 +1,6 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
 #ifndef ASYNCWEBSERVERRESPONSEIMPL_H_
 #define ASYNCWEBSERVERRESPONSEIMPL_H_
 
@@ -26,37 +9,59 @@
 #undef min
 #undef max
 #endif
+#include "literals.h"
+#include 
+#include 
 #include 
+
 // It is possible to restore these defines, but one can use _min and _max instead. Or std::min, std::max.
 
-class AsyncBasicResponse: public AsyncWebServerResponse {
-  private:
-    String _content;
-  public:
-    AsyncBasicResponse(int code, const String& contentType=String(), const String& content=String());
-    void _respond(AsyncWebServerRequest *request);
-    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
-    bool _sourceValid() const { return true; }
+class AsyncBasicResponse : public AsyncWebServerResponse {
+private:
+  String _content;
+
+public:
+  explicit AsyncBasicResponse(int code, const char *contentType = asyncsrv::empty, const char *content = asyncsrv::empty);
+  AsyncBasicResponse(int code, const String &contentType, const String &content = emptyString)
+    : AsyncBasicResponse(code, contentType.c_str(), content.c_str()) {}
+  void _respond(AsyncWebServerRequest *request) override final;
+  size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time) override final;
+  bool _sourceValid() const override final {
+    return true;
+  }
 };
 
-class AsyncAbstractResponse: public AsyncWebServerResponse {
-  private:
-    String _head;
-    // Data is inserted into cache at begin(). 
-    // This is inefficient with vector, but if we use some other container, 
-    // we won't be able to access it as contiguous array of bytes when reading from it,
-    // so by gaining performance in one place, we'll lose it in another.
-    std::vector _cache;
-    size_t _readDataFromCacheOrContent(uint8_t* data, const size_t len);
-    size_t _fillBufferAndProcessTemplates(uint8_t* buf, size_t maxLen);
-  protected:
-    AwsTemplateProcessor _callback;
-  public:
-    AsyncAbstractResponse(AwsTemplateProcessor callback=nullptr);
-    void _respond(AsyncWebServerRequest *request);
-    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
-    bool _sourceValid() const { return false; }
-    virtual size_t _fillBuffer(uint8_t *buf __attribute__((unused)), size_t maxLen __attribute__((unused))) { return 0; }
+class AsyncAbstractResponse : public AsyncWebServerResponse {
+private:
+#if ASYNCWEBSERVER_USE_CHUNK_INFLIGHT
+  // amount of response data in-flight, i.e. sent, but not acked yet
+  size_t _in_flight{0};
+  // in-flight queue credits
+  size_t _in_flight_credit{2};
+#endif
+  String _head;
+  // Data is inserted into cache at begin().
+  // This is inefficient with vector, but if we use some other container,
+  // we won't be able to access it as contiguous array of bytes when reading from it,
+  // so by gaining performance in one place, we'll lose it in another.
+  std::vector _cache;
+  size_t _readDataFromCacheOrContent(uint8_t *data, const size_t len);
+  size_t _fillBufferAndProcessTemplates(uint8_t *buf, size_t maxLen);
+
+protected:
+  AwsTemplateProcessor _callback;
+
+public:
+  AsyncAbstractResponse(AwsTemplateProcessor callback = nullptr);
+  virtual ~AsyncAbstractResponse() {}
+  void _respond(AsyncWebServerRequest *request) override final;
+  size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time) override final;
+  virtual bool _sourceValid() const {
+    return false;
+  }
+  virtual size_t _fillBuffer(uint8_t *buf __attribute__((unused)), size_t maxLen __attribute__((unused))) {
+    return 0;
+  }
 };
 
 #ifndef TEMPLATE_PLACEHOLDER
@@ -64,73 +69,112 @@ class AsyncAbstractResponse: public AsyncWebServerResponse {
 #endif
 
 #define TEMPLATE_PARAM_NAME_LENGTH 32
-class AsyncFileResponse: public AsyncAbstractResponse {
+class AsyncFileResponse : public AsyncAbstractResponse {
   using File = fs::File;
   using FS = fs::FS;
-  private:
-    File _content;
-    String _path;
-    void _setContentType(const String& path);
-  public:
-    AsyncFileResponse(FS &fs, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    AsyncFileResponse(File content, const String& path, const String& contentType=String(), bool download=false, AwsTemplateProcessor callback=nullptr);
-    ~AsyncFileResponse();
-    bool _sourceValid() const { return !!(_content); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
+
+private:
+  File _content;
+  String _path;
+  void _setContentTypeFromPath(const String &path);
+
+public:
+  AsyncFileResponse(FS &fs, const String &path, const char *contentType = asyncsrv::empty, bool download = false, AwsTemplateProcessor callback = nullptr);
+  AsyncFileResponse(FS &fs, const String &path, const String &contentType, bool download = false, AwsTemplateProcessor callback = nullptr)
+    : AsyncFileResponse(fs, path, contentType.c_str(), download, callback) {}
+  AsyncFileResponse(
+    File content, const String &path, const char *contentType = asyncsrv::empty, bool download = false, AwsTemplateProcessor callback = nullptr
+  );
+  AsyncFileResponse(File content, const String &path, const String &contentType, bool download = false, AwsTemplateProcessor callback = nullptr)
+    : AsyncFileResponse(content, path, contentType.c_str(), download, callback) {}
+  ~AsyncFileResponse() {
+    _content.close();
+  }
+  bool _sourceValid() const override final {
+    return !!(_content);
+  }
+  size_t _fillBuffer(uint8_t *buf, size_t maxLen) override final;
 };
 
-class AsyncStreamResponse: public AsyncAbstractResponse {
-  private:
-    Stream *_content;
-  public:
-    AsyncStreamResponse(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback=nullptr);
-    bool _sourceValid() const { return !!(_content); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
+class AsyncStreamResponse : public AsyncAbstractResponse {
+private:
+  Stream *_content;
+
+public:
+  AsyncStreamResponse(Stream &stream, const char *contentType, size_t len, AwsTemplateProcessor callback = nullptr);
+  AsyncStreamResponse(Stream &stream, const String &contentType, size_t len, AwsTemplateProcessor callback = nullptr)
+    : AsyncStreamResponse(stream, contentType.c_str(), len, callback) {}
+  bool _sourceValid() const override final {
+    return !!(_content);
+  }
+  size_t _fillBuffer(uint8_t *buf, size_t maxLen) override final;
 };
 
-class AsyncCallbackResponse: public AsyncAbstractResponse {
-  private:
-    AwsResponseFiller _content;
-    size_t _filledLength;
-  public:
-    AsyncCallbackResponse(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    bool _sourceValid() const { return !!(_content); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
+class AsyncCallbackResponse : public AsyncAbstractResponse {
+private:
+  AwsResponseFiller _content;
+  size_t _filledLength;
+
+public:
+  AsyncCallbackResponse(const char *contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr);
+  AsyncCallbackResponse(const String &contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr)
+    : AsyncCallbackResponse(contentType.c_str(), len, callback, templateCallback) {}
+  bool _sourceValid() const override final {
+    return !!(_content);
+  }
+  size_t _fillBuffer(uint8_t *buf, size_t maxLen) override final;
 };
 
-class AsyncChunkedResponse: public AsyncAbstractResponse {
-  private:
-    AwsResponseFiller _content;
-    size_t _filledLength;
-  public:
-    AsyncChunkedResponse(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback=nullptr);
-    bool _sourceValid() const { return !!(_content); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
+class AsyncChunkedResponse : public AsyncAbstractResponse {
+private:
+  AwsResponseFiller _content;
+  size_t _filledLength;
+
+public:
+  AsyncChunkedResponse(const char *contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr);
+  AsyncChunkedResponse(const String &contentType, AwsResponseFiller callback, AwsTemplateProcessor templateCallback = nullptr)
+    : AsyncChunkedResponse(contentType.c_str(), callback, templateCallback) {}
+  bool _sourceValid() const override final {
+    return !!(_content);
+  }
+  size_t _fillBuffer(uint8_t *buf, size_t maxLen) override final;
 };
 
-class AsyncProgmemResponse: public AsyncAbstractResponse {
-  private:
-    const uint8_t * _content;
-    size_t _readLength;
-  public:
-    AsyncProgmemResponse(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback=nullptr);
-    bool _sourceValid() const { return true; }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
+class AsyncProgmemResponse : public AsyncAbstractResponse {
+private:
+  const uint8_t *_content;
+  size_t _readLength;
+
+public:
+  AsyncProgmemResponse(int code, const char *contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr);
+  AsyncProgmemResponse(int code, const String &contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback = nullptr)
+    : AsyncProgmemResponse(code, contentType.c_str(), content, len, callback) {}
+  bool _sourceValid() const override final {
+    return true;
+  }
+  size_t _fillBuffer(uint8_t *buf, size_t maxLen) override final;
 };
 
-class cbuf;
-
-class AsyncResponseStream: public AsyncAbstractResponse, public Print {
-  private:
-    cbuf *_content;
-  public:
-    AsyncResponseStream(const String& contentType, size_t bufferSize);
-    ~AsyncResponseStream();
-    bool _sourceValid() const { return (_state < RESPONSE_END); }
-    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen) override;
-    size_t write(const uint8_t *data, size_t len);
-    size_t write(uint8_t data);
-    using Print::write;
+class AsyncResponseStream : public AsyncAbstractResponse, public Print {
+private:
+  std::unique_ptr _content;
+
+public:
+  AsyncResponseStream(const char *contentType, size_t bufferSize);
+  AsyncResponseStream(const String &contentType, size_t bufferSize) : AsyncResponseStream(contentType.c_str(), bufferSize) {}
+  bool _sourceValid() const override final {
+    return (_state < RESPONSE_END);
+  }
+  size_t _fillBuffer(uint8_t *buf, size_t maxLen) override final;
+  size_t write(const uint8_t *data, size_t len);
+  size_t write(uint8_t data);
+  /**
+   * @brief Returns the number of bytes available in the stream.
+   */
+  size_t available() const {
+    return _content->available();
+  }
+  using Print::write;
 };
 
 #endif /* ASYNCWEBSERVERRESPONSEIMPL_H_ */
diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp
index a22e991aa..3b3fb6ceb 100644
--- a/src/WebResponses.cpp
+++ b/src/WebResponses.cpp
@@ -1,203 +1,299 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
 
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
 #include "ESPAsyncWebServer.h"
 #include "WebResponseImpl.h"
-#include "cbuf.h"
+
+using namespace asyncsrv;
 
 // Since ESP8266 does not link memchr by default, here's its implementation.
-void* memchr(void* ptr, int ch, size_t count)
-{
-  unsigned char* p = static_cast(ptr);
-  while(count--)
-    if(*p++ == static_cast(ch))
+void *memchr(void *ptr, int ch, size_t count) {
+  unsigned char *p = static_cast(ptr);
+  while (count--) {
+    if (*p++ == static_cast(ch)) {
       return --p;
+    }
+  }
   return nullptr;
 }
 
-
 /*
  * Abstract Response
- * */
-const char* AsyncWebServerResponse::_responseCodeToString(int code) {
+ *
+ */
+
+const char *AsyncWebServerResponse::responseCodeToString(int code) {
   switch (code) {
-    case 100: return "Continue";
-    case 101: return "Switching Protocols";
-    case 200: return "OK";
-    case 201: return "Created";
-    case 202: return "Accepted";
-    case 203: return "Non-Authoritative Information";
-    case 204: return "No Content";
-    case 205: return "Reset Content";
-    case 206: return "Partial Content";
-    case 300: return "Multiple Choices";
-    case 301: return "Moved Permanently";
-    case 302: return "Found";
-    case 303: return "See Other";
-    case 304: return "Not Modified";
-    case 305: return "Use Proxy";
-    case 307: return "Temporary Redirect";
-    case 400: return "Bad Request";
-    case 401: return "Unauthorized";
-    case 402: return "Payment Required";
-    case 403: return "Forbidden";
-    case 404: return "Not Found";
-    case 405: return "Method Not Allowed";
-    case 406: return "Not Acceptable";
-    case 407: return "Proxy Authentication Required";
-    case 408: return "Request Time-out";
-    case 409: return "Conflict";
-    case 410: return "Gone";
-    case 411: return "Length Required";
-    case 412: return "Precondition Failed";
-    case 413: return "Request Entity Too Large";
-    case 414: return "Request-URI Too Large";
-    case 415: return "Unsupported Media Type";
-    case 416: return "Requested range not satisfiable";
-    case 417: return "Expectation Failed";
-    case 500: return "Internal Server Error";
-    case 501: return "Not Implemented";
-    case 502: return "Bad Gateway";
-    case 503: return "Service Unavailable";
-    case 504: return "Gateway Time-out";
-    case 505: return "HTTP Version not supported";
-    default:  return "";
+    case 100: return T_HTTP_CODE_100;
+    case 101: return T_HTTP_CODE_101;
+    case 200: return T_HTTP_CODE_200;
+    case 201: return T_HTTP_CODE_201;
+    case 202: return T_HTTP_CODE_202;
+    case 203: return T_HTTP_CODE_203;
+    case 204: return T_HTTP_CODE_204;
+    case 205: return T_HTTP_CODE_205;
+    case 206: return T_HTTP_CODE_206;
+    case 300: return T_HTTP_CODE_300;
+    case 301: return T_HTTP_CODE_301;
+    case 302: return T_HTTP_CODE_302;
+    case 303: return T_HTTP_CODE_303;
+    case 304: return T_HTTP_CODE_304;
+    case 305: return T_HTTP_CODE_305;
+    case 307: return T_HTTP_CODE_307;
+    case 400: return T_HTTP_CODE_400;
+    case 401: return T_HTTP_CODE_401;
+    case 402: return T_HTTP_CODE_402;
+    case 403: return T_HTTP_CODE_403;
+    case 404: return T_HTTP_CODE_404;
+    case 405: return T_HTTP_CODE_405;
+    case 406: return T_HTTP_CODE_406;
+    case 407: return T_HTTP_CODE_407;
+    case 408: return T_HTTP_CODE_408;
+    case 409: return T_HTTP_CODE_409;
+    case 410: return T_HTTP_CODE_410;
+    case 411: return T_HTTP_CODE_411;
+    case 412: return T_HTTP_CODE_412;
+    case 413: return T_HTTP_CODE_413;
+    case 414: return T_HTTP_CODE_414;
+    case 415: return T_HTTP_CODE_415;
+    case 416: return T_HTTP_CODE_416;
+    case 417: return T_HTTP_CODE_417;
+    case 429: return T_HTTP_CODE_429;
+    case 500: return T_HTTP_CODE_500;
+    case 501: return T_HTTP_CODE_501;
+    case 502: return T_HTTP_CODE_502;
+    case 503: return T_HTTP_CODE_503;
+    case 504: return T_HTTP_CODE_504;
+    case 505: return T_HTTP_CODE_505;
+    default:  return T_HTTP_CODE_ANY;
   }
 }
 
 AsyncWebServerResponse::AsyncWebServerResponse()
-  : _code(0)
-  , _headers(LinkedList([](AsyncWebHeader *h){ delete h; }))
-  , _contentType()
-  , _contentLength(0)
-  , _sendContentLength(true)
-  , _chunked(false)
-  , _headLength(0)
-  , _sentLength(0)
-  , _ackedLength(0)
-  , _writtenLength(0)
-  , _state(RESPONSE_SETUP)
-{
-  for(auto header: DefaultHeaders::Instance()) {
-    _headers.add(new AsyncWebHeader(header->name(), header->value()));
+  : _code(0), _contentType(), _contentLength(0), _sendContentLength(true), _chunked(false), _headLength(0), _sentLength(0), _ackedLength(0), _writtenLength(0),
+    _state(RESPONSE_SETUP) {
+  for (const auto &header : DefaultHeaders::Instance()) {
+    _headers.emplace_back(header);
   }
 }
 
-AsyncWebServerResponse::~AsyncWebServerResponse(){
-  _headers.free();
-}
-
-void AsyncWebServerResponse::setCode(int code){
-  if(_state == RESPONSE_SETUP)
+void AsyncWebServerResponse::setCode(int code) {
+  if (_state == RESPONSE_SETUP) {
     _code = code;
+  }
 }
 
-void AsyncWebServerResponse::setContentLength(size_t len){
-  if(_state == RESPONSE_SETUP)
+void AsyncWebServerResponse::setContentLength(size_t len) {
+  if (_state == RESPONSE_SETUP && addHeader(T_Content_Length, len, true)) {
     _contentLength = len;
+  }
 }
 
-void AsyncWebServerResponse::setContentType(const String& type){
-  if(_state == RESPONSE_SETUP)
+void AsyncWebServerResponse::setContentType(const char *type) {
+  if (_state == RESPONSE_SETUP && addHeader(T_Content_Type, type, true)) {
     _contentType = type;
+  }
+}
+
+bool AsyncWebServerResponse::removeHeader(const char *name) {
+  bool h_erased = false;
+  for (auto i = _headers.begin(); i != _headers.end();) {
+    if (i->name().equalsIgnoreCase(name)) {
+      _headers.erase(i);
+      h_erased = true;
+    } else {
+      ++i;
+    }
+  }
+  return h_erased;
+}
+
+bool AsyncWebServerResponse::removeHeader(const char *name, const char *value) {
+  for (auto i = _headers.begin(); i != _headers.end(); ++i) {
+    if (i->name().equalsIgnoreCase(name) && i->value().equalsIgnoreCase(value)) {
+      _headers.erase(i);
+      return true;
+    }
+  }
+  return false;
+}
+
+const AsyncWebHeader *AsyncWebServerResponse::getHeader(const char *name) const {
+  auto iter = std::find_if(std::begin(_headers), std::end(_headers), [&name](const AsyncWebHeader &header) {
+    return header.name().equalsIgnoreCase(name);
+  });
+  return (iter == std::end(_headers)) ? nullptr : &(*iter);
 }
 
-void AsyncWebServerResponse::addHeader(const String& name, const String& value){
-  _headers.add(new AsyncWebHeader(name, value));
+bool AsyncWebServerResponse::headerMustBePresentOnce(const String &name) {
+  for (uint8_t i = 0; i < T_only_once_headers_len; i++) {
+    if (name.equalsIgnoreCase(T_only_once_headers[i])) {
+      return true;
+    }
+  }
+  return false;
 }
 
-String AsyncWebServerResponse::_assembleHead(uint8_t version){
-  if(version){
-    addHeader("Accept-Ranges","none");
-    if(_chunked)
-      addHeader("Transfer-Encoding","chunked");
+bool AsyncWebServerResponse::addHeader(AsyncWebHeader &&header, bool replaceExisting) {
+  if (!header) {
+    return false;  // invalid header
+  }
+  for (auto i = _headers.begin(); i != _headers.end(); ++i) {
+    if (i->name().equalsIgnoreCase(header.name())) {
+      // header already set
+      if (replaceExisting) {
+        // remove, break and add the new one
+        _headers.erase(i);
+        break;
+      } else if (headerMustBePresentOnce(i->name())) {  // we can have only one header with that name
+        // do not update
+        return false;
+      } else {
+        break;  // accept multiple headers with the same name
+      }
+    }
+  }
+  // header was not found found, or existing one was removed
+  _headers.emplace_back(std::move(header));
+  return true;
+}
+
+bool AsyncWebServerResponse::addHeader(const char *name, const char *value, bool replaceExisting) {
+  for (auto i = _headers.begin(); i != _headers.end(); ++i) {
+    if (i->name().equalsIgnoreCase(name)) {
+      // header already set
+      if (replaceExisting) {
+        // remove, break and add the new one
+        _headers.erase(i);
+        break;
+      } else if (headerMustBePresentOnce(i->name())) {  // we can have only one header with that name
+        // do not update
+        return false;
+      } else {
+        break;  // accept multiple headers with the same name
+      }
+    }
+  }
+  // header was not found found, or existing one was removed
+  _headers.emplace_back(name, value);
+  return true;
+}
+
+void AsyncWebServerResponse::_assembleHead(String &buffer, uint8_t version) {
+  if (version) {
+    addHeader(T_Accept_Ranges, T_none, false);
+    if (_chunked) {
+      addHeader(T_Transfer_Encoding, T_chunked, false);
+    }
   }
-  String out = String();
-  int bufSize = 300;
-  char buf[bufSize];
 
-  snprintf(buf, bufSize, "HTTP/1.%d %d %s\r\n", version, _code, _responseCodeToString(_code));
-  out.concat(buf);
+  if (_sendContentLength) {
+    addHeader(T_Content_Length, String(_contentLength), false);
+  }
 
-  if(_sendContentLength) {
-    snprintf(buf, bufSize, "Content-Length: %d\r\n", _contentLength);
-    out.concat(buf);
+  if (_contentType.length()) {
+    addHeader(T_Content_Type, _contentType.c_str(), false);
   }
-  if(_contentType.length()) {
-    snprintf(buf, bufSize, "Content-Type: %s\r\n", _contentType.c_str());
-    out.concat(buf);
+
+  // precompute buffer size to avoid reallocations by String class
+  size_t len = 0;
+  len += 50;  // HTTP/1.1 200 \r\n
+  for (const auto &header : _headers) {
+    len += header.name().length() + header.value().length() + 4;
   }
 
-  for(const auto& header: _headers){
-    snprintf(buf, bufSize, "%s: %s\r\n", header->name().c_str(), header->value().c_str());
-    out.concat(buf);
+  // prepare buffer
+  buffer.reserve(len);
+
+  // HTTP header
+#ifdef ESP8266
+  buffer.concat(PSTR("HTTP/1."));
+#else
+  buffer.concat("HTTP/1.");
+#endif
+  buffer.concat(version);
+  buffer.concat(' ');
+  buffer.concat(_code);
+  buffer.concat(' ');
+  buffer.concat(responseCodeToString(_code));
+  buffer.concat(T_rn);
+
+  // Add headers
+  for (const auto &header : _headers) {
+    buffer.concat(header.name());
+#ifdef ESP8266
+    buffer.concat(PSTR(": "));
+#else
+    buffer.concat(": ");
+#endif
+    buffer.concat(header.value());
+    buffer.concat(T_rn);
   }
-  _headers.free();
 
-  out.concat("\r\n");
-  _headLength = out.length();
-  return out;
+  buffer.concat(T_rn);
+  _headLength = buffer.length();
 }
 
-bool AsyncWebServerResponse::_started() const { return _state > RESPONSE_SETUP; }
-bool AsyncWebServerResponse::_finished() const { return _state > RESPONSE_WAIT_ACK; }
-bool AsyncWebServerResponse::_failed() const { return _state == RESPONSE_FAILED; }
-bool AsyncWebServerResponse::_sourceValid() const { return false; }
-void AsyncWebServerResponse::_respond(AsyncWebServerRequest *request){ _state = RESPONSE_END; request->client()->close(); }
-size_t AsyncWebServerResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){ (void)request; (void)len; (void)time; return 0; }
+bool AsyncWebServerResponse::_started() const {
+  return _state > RESPONSE_SETUP;
+}
+bool AsyncWebServerResponse::_finished() const {
+  return _state > RESPONSE_WAIT_ACK;
+}
+bool AsyncWebServerResponse::_failed() const {
+  return _state == RESPONSE_FAILED;
+}
+bool AsyncWebServerResponse::_sourceValid() const {
+  return false;
+}
+void AsyncWebServerResponse::_respond(AsyncWebServerRequest *request) {
+  _state = RESPONSE_END;
+  request->client()->close();
+}
+size_t AsyncWebServerResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time) {
+  (void)request;
+  (void)len;
+  (void)time;
+  return 0;
+}
 
 /*
  * String/Code Response
  * */
-AsyncBasicResponse::AsyncBasicResponse(int code, const String& contentType, const String& content){
+AsyncBasicResponse::AsyncBasicResponse(int code, const char *contentType, const char *content) {
   _code = code;
   _content = content;
   _contentType = contentType;
-  if(_content.length()){
+  if (_content.length()) {
     _contentLength = _content.length();
-    if(!_contentType.length())
-      _contentType = "text/plain";
+    if (!_contentType.length()) {
+      _contentType = T_text_plain;
+    }
   }
-  addHeader("Connection","close");
+  addHeader(T_Connection, T_close, false);
 }
 
-void AsyncBasicResponse::_respond(AsyncWebServerRequest *request){
+void AsyncBasicResponse::_respond(AsyncWebServerRequest *request) {
   _state = RESPONSE_HEADERS;
-  String out = _assembleHead(request->version());
+  String out;
+  _assembleHead(out, request->version());
   size_t outLen = out.length();
   size_t space = request->client()->space();
-  if(!_contentLength && space >= outLen){
+  if (!_contentLength && space >= outLen) {
     _writtenLength += request->client()->write(out.c_str(), outLen);
     _state = RESPONSE_WAIT_ACK;
-  } else if(_contentLength && space >= outLen + _contentLength){
+  } else if (_contentLength && space >= outLen + _contentLength) {
     out += _content;
     outLen += _contentLength;
     _writtenLength += request->client()->write(out.c_str(), outLen);
     _state = RESPONSE_WAIT_ACK;
-  } else if(space && space < outLen){
+  } else if (space && space < outLen) {
     String partial = out.substring(0, space);
     _content = out.substring(space) + _content;
     _contentLength += outLen - space;
     _writtenLength += request->client()->write(partial.c_str(), partial.length());
     _state = RESPONSE_CONTENT;
-  } else if(space > outLen && space < (outLen + _contentLength)){
+  } else if (space > outLen && space < (outLen + _contentLength)) {
     size_t shift = space - outLen;
     outLen += shift;
     _sentLength += shift;
@@ -212,339 +308,461 @@ void AsyncBasicResponse::_respond(AsyncWebServerRequest *request){
   }
 }
 
-size_t AsyncBasicResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
+size_t AsyncBasicResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time) {
   (void)time;
   _ackedLength += len;
-  if(_state == RESPONSE_CONTENT){
+  if (_state == RESPONSE_CONTENT) {
     size_t available = _contentLength - _sentLength;
     size_t space = request->client()->space();
-    //we can fit in this packet
-    if(space > available){
+    // we can fit in this packet
+    if (space > available) {
       _writtenLength += request->client()->write(_content.c_str(), available);
-      _content = String();
+      _content = emptyString;
       _state = RESPONSE_WAIT_ACK;
       return available;
     }
-    //send some data, the rest on ack
+    // send some data, the rest on ack
     String out = _content.substring(0, space);
     _content = _content.substring(space);
     _sentLength += space;
     _writtenLength += request->client()->write(out.c_str(), space);
     return space;
-  } else if(_state == RESPONSE_WAIT_ACK){
-    if(_ackedLength >= _writtenLength){
+  } else if (_state == RESPONSE_WAIT_ACK) {
+    if (_ackedLength >= _writtenLength) {
       _state = RESPONSE_END;
     }
   }
   return 0;
 }
 
-
 /*
  * Abstract Response
  * */
 
-AsyncAbstractResponse::AsyncAbstractResponse(AwsTemplateProcessor callback): _callback(callback)
-{
+AsyncAbstractResponse::AsyncAbstractResponse(AwsTemplateProcessor callback) : _callback(callback) {
   // In case of template processing, we're unable to determine real response size
-  if(callback) {
+  if (callback) {
     _contentLength = 0;
     _sendContentLength = false;
     _chunked = true;
   }
 }
 
-void AsyncAbstractResponse::_respond(AsyncWebServerRequest *request){
-  addHeader("Connection","close");
-  _head = _assembleHead(request->version());
+void AsyncAbstractResponse::_respond(AsyncWebServerRequest *request) {
+  addHeader(T_Connection, T_close, false);
+  _assembleHead(_head, request->version());
   _state = RESPONSE_HEADERS;
   _ack(request, 0, 0);
 }
 
-size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
+size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time) {
   (void)time;
-  if(!_sourceValid()){
+  if (!_sourceValid()) {
     _state = RESPONSE_FAILED;
     request->client()->close();
     return 0;
   }
+
+#if ASYNCWEBSERVER_USE_CHUNK_INFLIGHT
+  // return a credit for each chunk of acked data (polls does not give any credits)
+  if (len) {
+    ++_in_flight_credit;
+  }
+
+  // for chunked responses ignore acks if there are no _in_flight_credits left
+  if (_chunked && !_in_flight_credit) {
+#ifdef ESP32
+    log_d("(chunk) out of in-flight credits");
+#endif
+    return 0;
+  }
+
+  _in_flight -= (_in_flight > len) ? len : _in_flight;
+  // get the size of available sock space
+#endif
+
   _ackedLength += len;
   size_t space = request->client()->space();
 
   size_t headLen = _head.length();
-  if(_state == RESPONSE_HEADERS){
-    if(space >= headLen){
+  if (_state == RESPONSE_HEADERS) {
+    if (space >= headLen) {
       _state = RESPONSE_CONTENT;
       space -= headLen;
     } else {
       String out = _head.substring(0, space);
       _head = _head.substring(space);
       _writtenLength += request->client()->write(out.c_str(), out.length());
+#if ASYNCWEBSERVER_USE_CHUNK_INFLIGHT
+      _in_flight += out.length();
+      --_in_flight_credit;  // take a credit
+#endif
       return out.length();
     }
   }
 
-  if(_state == RESPONSE_CONTENT){
+  if (_state == RESPONSE_CONTENT) {
+#if ASYNCWEBSERVER_USE_CHUNK_INFLIGHT
+    // for response data we need to control the queue and in-flight fragmentation. Sending small chunks could give low latency,
+    // but flood asynctcp's queue and fragment socket buffer space for large responses.
+    // Let's ignore polled acks and acks in case when we have more in-flight data then the available socket buff space.
+    // That way we could balance on having half the buffer in-flight while another half is filling up, while minimizing events in asynctcp q
+    if (_in_flight > space) {
+      // log_d("defer user call %u/%u", _in_flight, space);
+      //  take the credit back since we are ignoring this ack and rely on other inflight data
+      if (len) {
+        --_in_flight_credit;
+      }
+      return 0;
+    }
+#endif
+
     size_t outLen;
-    if(_chunked){
-      if(space <= 8){
+    if (_chunked) {
+      if (space <= 8) {
         return 0;
       }
+
       outLen = space;
-    } else if(!_sendContentLength){
+    } else if (!_sendContentLength) {
       outLen = space;
     } else {
-      outLen = ((_contentLength - _sentLength) > space)?space:(_contentLength - _sentLength);
+      outLen = ((_contentLength - _sentLength) > space) ? space : (_contentLength - _sentLength);
     }
 
-    uint8_t *buf = (uint8_t *)malloc(outLen+headLen);
+    uint8_t *buf = (uint8_t *)malloc(outLen + headLen);
     if (!buf) {
-      // os_printf("_ack malloc %d failed\n", outLen+headLen);
+#ifdef ESP32
+      log_e("Failed to allocate");
+#endif
+      request->abort();
       return 0;
     }
 
-    if(headLen){
+    if (headLen) {
       memcpy(buf, _head.c_str(), _head.length());
     }
 
     size_t readLen = 0;
 
-    if(_chunked){
+    if (_chunked) {
       // HTTP 1.1 allows leading zeros in chunk length. Or spaces may be added.
       // See RFC2616 sections 2, 3.6.1.
-      readLen = _fillBufferAndProcessTemplates(buf+headLen+6, outLen - 8);
-      if(readLen == RESPONSE_TRY_AGAIN){
-          free(buf);
-          return 0;
+      readLen = _fillBufferAndProcessTemplates(buf + headLen + 6, outLen - 8);
+      if (readLen == RESPONSE_TRY_AGAIN) {
+        free(buf);
+        return 0;
       }
-      outLen = sprintf((char*)buf+headLen, "%x", readLen) + headLen;
-      while(outLen < headLen + 4) buf[outLen++] = ' ';
+      outLen = sprintf((char *)buf + headLen, "%04x", readLen) + headLen;
       buf[outLen++] = '\r';
       buf[outLen++] = '\n';
       outLen += readLen;
       buf[outLen++] = '\r';
       buf[outLen++] = '\n';
     } else {
-      readLen = _fillBufferAndProcessTemplates(buf+headLen, outLen);
-      if(readLen == RESPONSE_TRY_AGAIN){
-          free(buf);
-          return 0;
+      readLen = _fillBufferAndProcessTemplates(buf + headLen, outLen);
+      if (readLen == RESPONSE_TRY_AGAIN) {
+        free(buf);
+        return 0;
       }
       outLen = readLen + headLen;
     }
 
-    if(headLen){
-        _head = String();
+    if (headLen) {
+      _head = emptyString;
     }
 
-    if(outLen){
-        _writtenLength += request->client()->write((const char*)buf, outLen);
+    if (outLen) {
+      _writtenLength += request->client()->write((const char *)buf, outLen);
+#if ASYNCWEBSERVER_USE_CHUNK_INFLIGHT
+      _in_flight += outLen;
+      --_in_flight_credit;  // take a credit
+#endif
     }
 
-    if(_chunked){
-        _sentLength += readLen;
+    if (_chunked) {
+      _sentLength += readLen;
     } else {
-        _sentLength += outLen - headLen;
+      _sentLength += outLen - headLen;
     }
 
     free(buf);
 
-    if((_chunked && readLen == 0) || (!_sendContentLength && outLen == 0) || (!_chunked && _sentLength == _contentLength)){
+    if ((_chunked && readLen == 0) || (!_sendContentLength && outLen == 0) || (!_chunked && _sentLength == _contentLength)) {
       _state = RESPONSE_WAIT_ACK;
     }
     return outLen;
 
-  } else if(_state == RESPONSE_WAIT_ACK){
-    if(!_sendContentLength || _ackedLength >= _writtenLength){
+  } else if (_state == RESPONSE_WAIT_ACK) {
+    if (!_sendContentLength || _ackedLength >= _writtenLength) {
       _state = RESPONSE_END;
-      if(!_chunked && !_sendContentLength)
+      if (!_chunked && !_sendContentLength) {
         request->client()->close(true);
+      }
     }
   }
   return 0;
 }
 
-size_t AsyncAbstractResponse::_readDataFromCacheOrContent(uint8_t* data, const size_t len)
-{
-    // If we have something in cache, copy it to buffer
-    const size_t readFromCache = std::min(len, _cache.size());
-    if(readFromCache) {
-      memcpy(data, _cache.data(), readFromCache);
-      _cache.erase(_cache.begin(), _cache.begin() + readFromCache);
-    }
-    // If we need to read more...
-    const size_t needFromFile = len - readFromCache;
-    const size_t readFromContent = _fillBuffer(data + readFromCache, needFromFile);
-    return readFromCache + readFromContent;
+size_t AsyncAbstractResponse::_readDataFromCacheOrContent(uint8_t *data, const size_t len) {
+  // If we have something in cache, copy it to buffer
+  const size_t readFromCache = std::min(len, _cache.size());
+  if (readFromCache) {
+    memcpy(data, _cache.data(), readFromCache);
+    _cache.erase(_cache.begin(), _cache.begin() + readFromCache);
+  }
+  // If we need to read more...
+  const size_t needFromFile = len - readFromCache;
+  const size_t readFromContent = _fillBuffer(data + readFromCache, needFromFile);
+  return readFromCache + readFromContent;
 }
 
-size_t AsyncAbstractResponse::_fillBufferAndProcessTemplates(uint8_t* data, size_t len)
-{
-  if(!_callback)
+size_t AsyncAbstractResponse::_fillBufferAndProcessTemplates(uint8_t *data, size_t len) {
+  if (!_callback) {
     return _fillBuffer(data, len);
+  }
 
   const size_t originalLen = len;
   len = _readDataFromCacheOrContent(data, len);
   // Now we've read 'len' bytes, either from cache or from file
   // Search for template placeholders
-  uint8_t* pTemplateStart = data;
-  while((pTemplateStart < &data[len]) && (pTemplateStart = (uint8_t*)memchr(pTemplateStart, TEMPLATE_PLACEHOLDER, &data[len - 1] - pTemplateStart + 1))) { // data[0] ... data[len - 1]
-    uint8_t* pTemplateEnd = (pTemplateStart < &data[len - 1]) ? (uint8_t*)memchr(pTemplateStart + 1, TEMPLATE_PLACEHOLDER, &data[len - 1] - pTemplateStart) : nullptr;
+  uint8_t *pTemplateStart = data;
+  while ((pTemplateStart < &data[len]) && (pTemplateStart = (uint8_t *)memchr(pTemplateStart, TEMPLATE_PLACEHOLDER, &data[len - 1] - pTemplateStart + 1))
+  ) {  // data[0] ... data[len - 1]
+    uint8_t *pTemplateEnd =
+      (pTemplateStart < &data[len - 1]) ? (uint8_t *)memchr(pTemplateStart + 1, TEMPLATE_PLACEHOLDER, &data[len - 1] - pTemplateStart) : nullptr;
     // temporary buffer to hold parameter name
     uint8_t buf[TEMPLATE_PARAM_NAME_LENGTH + 1];
     String paramName;
     // If closing placeholder is found:
-    if(pTemplateEnd) {
+    if (pTemplateEnd) {
       // prepare argument to callback
-      const size_t paramNameLength = std::min(sizeof(buf) - 1, (unsigned int)(pTemplateEnd - pTemplateStart - 1));
-      if(paramNameLength) {
+      const size_t paramNameLength = std::min((size_t)sizeof(buf) - 1, (size_t)(pTemplateEnd - pTemplateStart - 1));
+      if (paramNameLength) {
         memcpy(buf, pTemplateStart + 1, paramNameLength);
         buf[paramNameLength] = 0;
-        paramName = String(reinterpret_cast(buf));
-      } else { // double percent sign encountered, this is single percent sign escaped.
+        paramName = String(reinterpret_cast(buf));
+      } else {  // double percent sign encountered, this is single percent sign escaped.
         // remove the 2nd percent sign
         memmove(pTemplateEnd, pTemplateEnd + 1, &data[len] - pTemplateEnd - 1);
         len += _readDataFromCacheOrContent(&data[len - 1], 1) - 1;
         ++pTemplateStart;
       }
-    } else if(&data[len - 1] - pTemplateStart + 1 < TEMPLATE_PARAM_NAME_LENGTH + 2) { // closing placeholder not found, check if it's in the remaining file data
+    } else if (&data[len - 1] - pTemplateStart + 1
+               < TEMPLATE_PARAM_NAME_LENGTH + 2) {  // closing placeholder not found, check if it's in the remaining file data
       memcpy(buf, pTemplateStart + 1, &data[len - 1] - pTemplateStart);
-      const size_t readFromCacheOrContent = _readDataFromCacheOrContent(buf + (&data[len - 1] - pTemplateStart), TEMPLATE_PARAM_NAME_LENGTH + 2 - (&data[len - 1] - pTemplateStart + 1));
-      if(readFromCacheOrContent) {
-        pTemplateEnd = (uint8_t*)memchr(buf + (&data[len - 1] - pTemplateStart), TEMPLATE_PLACEHOLDER, readFromCacheOrContent);
-        if(pTemplateEnd) {
+      const size_t readFromCacheOrContent =
+        _readDataFromCacheOrContent(buf + (&data[len - 1] - pTemplateStart), TEMPLATE_PARAM_NAME_LENGTH + 2 - (&data[len - 1] - pTemplateStart + 1));
+      if (readFromCacheOrContent) {
+        pTemplateEnd = (uint8_t *)memchr(buf + (&data[len - 1] - pTemplateStart), TEMPLATE_PLACEHOLDER, readFromCacheOrContent);
+        if (pTemplateEnd) {
           // prepare argument to callback
           *pTemplateEnd = 0;
-          paramName = String(reinterpret_cast(buf));
+          paramName = String(reinterpret_cast(buf));
           // Copy remaining read-ahead data into cache
           _cache.insert(_cache.begin(), pTemplateEnd + 1, buf + (&data[len - 1] - pTemplateStart) + readFromCacheOrContent);
           pTemplateEnd = &data[len - 1];
-        }
-        else // closing placeholder not found in file data, store found percent symbol as is and advance to the next position
+        } else  // closing placeholder not found in file data, store found percent symbol as is and advance to the next position
         {
           // but first, store read file data in cache
           _cache.insert(_cache.begin(), buf + (&data[len - 1] - pTemplateStart), buf + (&data[len - 1] - pTemplateStart) + readFromCacheOrContent);
           ++pTemplateStart;
         }
-      }
-      else // closing placeholder not found in content data, store found percent symbol as is and advance to the next position
+      } else {  // closing placeholder not found in content data, store found percent symbol as is and advance to the next position
         ++pTemplateStart;
-    }
-    else // closing placeholder not found in content data, store found percent symbol as is and advance to the next position
+      }
+    } else {  // closing placeholder not found in content data, store found percent symbol as is and advance to the next position
       ++pTemplateStart;
-    if(paramName.length()) {
+    }
+    if (paramName.length()) {
       // call callback and replace with result.
       // Everything in range [pTemplateStart, pTemplateEnd] can be safely replaced with parameter value.
       // Data after pTemplateEnd may need to be moved.
       // The first byte of data after placeholder is located at pTemplateEnd + 1.
       // It should be located at pTemplateStart + numBytesCopied (to begin right after inserted parameter value).
       const String paramValue(_callback(paramName));
-      const char* pvstr = paramValue.c_str();
+      const char *pvstr = paramValue.c_str();
       const unsigned int pvlen = paramValue.length();
       const size_t numBytesCopied = std::min(pvlen, static_cast(&data[originalLen - 1] - pTemplateStart + 1));
       // make room for param value
       // 1. move extra data to cache if parameter value is longer than placeholder AND if there is no room to store
-      if((pTemplateEnd + 1 < pTemplateStart + numBytesCopied) && (originalLen - (pTemplateStart + numBytesCopied - pTemplateEnd - 1) < len)) {
+      if ((pTemplateEnd + 1 < pTemplateStart + numBytesCopied) && (originalLen - (pTemplateStart + numBytesCopied - pTemplateEnd - 1) < len)) {
         _cache.insert(_cache.begin(), &data[originalLen - (pTemplateStart + numBytesCopied - pTemplateEnd - 1)], &data[len]);
-        //2. parameter value is longer than placeholder text, push the data after placeholder which not saved into cache further to the end
+        // 2. parameter value is longer than placeholder text, push the data after placeholder which not saved into cache further to the end
         memmove(pTemplateStart + numBytesCopied, pTemplateEnd + 1, &data[originalLen] - pTemplateStart - numBytesCopied);
-        len = originalLen; // fix issue with truncated data, not sure if it has any side effects
-      } else if(pTemplateEnd + 1 != pTemplateStart + numBytesCopied)
-        //2. Either parameter value is shorter than placeholder text OR there is enough free space in buffer to fit.
-        //   Move the entire data after the placeholder
+        len = originalLen;  // fix issue with truncated data, not sure if it has any side effects
+      } else if (pTemplateEnd + 1 != pTemplateStart + numBytesCopied) {
+        // 2. Either parameter value is shorter than placeholder text OR there is enough free space in buffer to fit.
+        //    Move the entire data after the placeholder
         memmove(pTemplateStart + numBytesCopied, pTemplateEnd + 1, &data[len] - pTemplateEnd - 1);
+      }
       // 3. replace placeholder with actual value
       memcpy(pTemplateStart, pvstr, numBytesCopied);
       // If result is longer than buffer, copy the remainder into cache (this could happen only if placeholder text itself did not fit entirely in buffer)
-      if(numBytesCopied < pvlen) {
+      if (numBytesCopied < pvlen) {
         _cache.insert(_cache.begin(), pvstr + numBytesCopied, pvstr + pvlen);
-      } else if(pTemplateStart + numBytesCopied < pTemplateEnd + 1) { // result is copied fully; if result is shorter than placeholder text...
+      } else if (pTemplateStart + numBytesCopied < pTemplateEnd + 1) {  // result is copied fully; if result is shorter than placeholder text...
         // there is some free room, fill it from cache
         const size_t roomFreed = pTemplateEnd + 1 - pTemplateStart - numBytesCopied;
         const size_t totalFreeRoom = originalLen - len + roomFreed;
         len += _readDataFromCacheOrContent(&data[len - roomFreed], totalFreeRoom) - roomFreed;
-      } else { // result is copied fully; it is longer than placeholder text
+      } else {  // result is copied fully; it is longer than placeholder text
         const size_t roomTaken = pTemplateStart + numBytesCopied - pTemplateEnd - 1;
         len = std::min(len + roomTaken, originalLen);
       }
     }
-  } // while(pTemplateStart)
+  }  // while(pTemplateStart)
   return len;
 }
 
-
 /*
  * File Response
  * */
 
-AsyncFileResponse::~AsyncFileResponse(){
-  if(_content)
-    _content.close();
-}
-
-void AsyncFileResponse::_setContentType(const String& path){
-  if (path.endsWith(".html")) _contentType = "text/html";
-  else if (path.endsWith(".htm")) _contentType = "text/html";
-  else if (path.endsWith(".css")) _contentType = "text/css";
-  else if (path.endsWith(".json")) _contentType = "application/json";
-  else if (path.endsWith(".js")) _contentType = "application/javascript";
-  else if (path.endsWith(".png")) _contentType = "image/png";
-  else if (path.endsWith(".gif")) _contentType = "image/gif";
-  else if (path.endsWith(".jpg")) _contentType = "image/jpeg";
-  else if (path.endsWith(".ico")) _contentType = "image/x-icon";
-  else if (path.endsWith(".svg")) _contentType = "image/svg+xml";
-  else if (path.endsWith(".eot")) _contentType = "font/eot";
-  else if (path.endsWith(".woff")) _contentType = "font/woff";
-  else if (path.endsWith(".woff2")) _contentType = "font/woff2";
-  else if (path.endsWith(".ttf")) _contentType = "font/ttf";
-  else if (path.endsWith(".xml")) _contentType = "text/xml";
-  else if (path.endsWith(".pdf")) _contentType = "application/pdf";
-  else if (path.endsWith(".zip")) _contentType = "application/zip";
-  else if(path.endsWith(".gz")) _contentType = "application/x-gzip";
-  else _contentType = "text/plain";
-}
-
-AsyncFileResponse::AsyncFileResponse(FS &fs, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback): AsyncAbstractResponse(callback){
-  _code = 200;
-  _path = path;
-
-  if(!download && !fs.exists(_path) && fs.exists(_path+".gz")){
-    _path = _path+".gz";
-    addHeader("Content-Encoding", "gzip");
-    _callback = nullptr; // Unable to process zipped templates
-    _sendContentLength = true;
-    _chunked = false;
+/**
+ * @brief Sets the content type based on the file path extension
+ *
+ * This method determines the appropriate MIME content type for a file based on its
+ * file extension. It supports both external content type functions (if available)
+ * and an internal mapping of common file extensions to their corresponding MIME types.
+ *
+ * @param path The file path string from which to extract the extension
+ * @note The method modifies the internal _contentType member variable
+ */
+void AsyncFileResponse::_setContentTypeFromPath(const String &path) {
+#if HAVE_EXTERN_GET_Content_Type_FUNCTION
+#ifndef ESP8266
+  extern const char *getContentType(const String &path);
+#else
+  extern const __FlashStringHelper *getContentType(const String &path);
+#endif
+  _contentType = getContentType(path);
+#else
+  const char *cpath = path.c_str();
+  const char *dot = strrchr(cpath, '.');
+
+  if (!dot) {
+    _contentType = T_text_plain;
+    return;
   }
 
-  _content = fs.open(_path, "r");
-  _contentLength = _content.size();
+  if (strcmp(dot, T__html) == 0 || strcmp(dot, T__htm) == 0) {
+    _contentType = T_text_html;
+  } else if (strcmp(dot, T__css) == 0) {
+    _contentType = T_text_css;
+  } else if (strcmp(dot, T__js) == 0) {
+    _contentType = T_application_javascript;
+  } else if (strcmp(dot, T__json) == 0) {
+    _contentType = T_application_json;
+  } else if (strcmp(dot, T__png) == 0) {
+    _contentType = T_image_png;
+  } else if (strcmp(dot, T__ico) == 0) {
+    _contentType = T_image_x_icon;
+  } else if (strcmp(dot, T__svg) == 0) {
+    _contentType = T_image_svg_xml;
+  } else if (strcmp(dot, T__jpg) == 0) {
+    _contentType = T_image_jpeg;
+  } else if (strcmp(dot, T__gif) == 0) {
+    _contentType = T_image_gif;
+  } else if (strcmp(dot, T__woff2) == 0) {
+    _contentType = T_font_woff2;
+  } else if (strcmp(dot, T__woff) == 0) {
+    _contentType = T_font_woff;
+  } else if (strcmp(dot, T__ttf) == 0) {
+    _contentType = T_font_ttf;
+  } else if (strcmp(dot, T__eot) == 0) {
+    _contentType = T_font_eot;
+  } else if (strcmp(dot, T__xml) == 0) {
+    _contentType = T_text_xml;
+  } else if (strcmp(dot, T__pdf) == 0) {
+    _contentType = T_application_pdf;
+  } else if (strcmp(dot, T__zip) == 0) {
+    _contentType = T_application_zip;
+  } else if (strcmp(dot, T__gz) == 0) {
+    _contentType = T_application_x_gzip;
+  } else {
+    _contentType = T_text_plain;
+  }
+#endif
+}
+
+/**
+ * @brief Constructor for AsyncFileResponse that handles file serving with compression support
+ *
+ * This constructor creates an AsyncFileResponse object that can serve files from a filesystem,
+ * with automatic fallback to gzip-compressed versions if the original file is not found.
+ * It also handles ETag generation for caching and supports both inline and download modes.
+ *
+ * @param fs Reference to the filesystem object used to open files
+ * @param path Path to the file to be served (without compression extension)
+ * @param contentType MIME type of the file content (empty string for auto-detection)
+ * @param download If true, file will be served as download attachment; if false, as inline content
+ * @param callback Template processor callback for dynamic content processing
+ */
+AsyncFileResponse::AsyncFileResponse(FS &fs, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback)
+  : AsyncAbstractResponse(callback) {
+  // Try to open the uncompressed version first
+  _content = fs.open(path, fs::FileOpenMode::read);
+  if (_content.available()) {
+    _path = path;
+    _contentLength = _content.size();
+  } else {
+    // Try to open the compressed version (.gz)
+    _path = path + asyncsrv::T__gz;
+    _content = fs.open(_path, fs::FileOpenMode::read);
+    _contentLength = _content.size();
+
+    if (_content.seek(_contentLength - 8)) {
+      addHeader(T_Content_Encoding, T_gzip, false);
+      _callback = nullptr;  // Unable to process zipped templates
+      _sendContentLength = true;
+      _chunked = false;
+
+      // Add ETag and cache headers
+      uint8_t crcInTrailer[4];
+      _content.read(crcInTrailer, sizeof(crcInTrailer));
+      char serverETag[9];
+      AsyncWebServerRequest::_getEtag(crcInTrailer, serverETag);
+      addHeader(T_ETag, serverETag, true);
+      addHeader(T_Cache_Control, T_no_cache, true);
+
+      _content.seek(0);
+    } else {
+      // File is corrupted or invalid
+      _code = 404;
+      return;
+    }
+  }
 
-  if(contentType == "")
-    _setContentType(path);
-  else
+  if (*contentType != '\0') {
+    _setContentTypeFromPath(path);
+  } else {
     _contentType = contentType;
+  }
 
-  int filenameStart = path.lastIndexOf('/') + 1;
-  char buf[26+path.length()-filenameStart];
-  char* filename = (char*)path.c_str() + filenameStart;
-
-  if(download) {
-    // set filename and force download
-    snprintf(buf, sizeof (buf), "attachment; filename=\"%s\"", filename);
+  if (download) {
+    // Extract filename from path and set as download attachment
+    int filenameStart = path.lastIndexOf('/') + 1;
+    char buf[26 + path.length() - filenameStart];
+    char *filename = (char *)path.c_str() + filenameStart;
+    snprintf_P(buf, sizeof(buf), PSTR("attachment; filename=\"%s\""), filename);
+    addHeader(T_Content_Disposition, buf, false);
   } else {
-    // set filename and force rendering
-    snprintf(buf, sizeof (buf), "inline; filename=\"%s\"", filename);
+    // Serve file inline (display in browser)
+    addHeader(T_Content_Disposition, PSTR("inline"), false);
   }
-  addHeader("Content-Disposition", buf);
+
+  _code = 200;
 }
 
-AsyncFileResponse::AsyncFileResponse(File content, const String& path, const String& contentType, bool download, AwsTemplateProcessor callback): AsyncAbstractResponse(callback){
+AsyncFileResponse::AsyncFileResponse(File content, const String &path, const char *contentType, bool download, AwsTemplateProcessor callback)
+  : AsyncAbstractResponse(callback) {
   _code = 200;
   _path = path;
 
-  if(!download && String(content.name()).endsWith(".gz") && !path.endsWith(".gz")){
-    addHeader("Content-Encoding", "gzip");
-    _callback = nullptr; // Unable to process gzipped templates
+  if (!download && String(content.name()).endsWith(T__gz) && !path.endsWith(T__gz)) {
+    addHeader(T_Content_Encoding, T_gzip, false);
+    _callback = nullptr;  // Unable to process gzipped templates
     _sendContentLength = true;
     _chunked = false;
   }
@@ -552,24 +770,25 @@ AsyncFileResponse::AsyncFileResponse(File content, const String& path, const Str
   _content = content;
   _contentLength = _content.size();
 
-  if(contentType == "")
-    _setContentType(path);
-  else
+  if (strlen(contentType) == 0) {
+    _setContentTypeFromPath(path);
+  } else {
     _contentType = contentType;
+  }
 
   int filenameStart = path.lastIndexOf('/') + 1;
-  char buf[26+path.length()-filenameStart];
-  char* filename = (char*)path.c_str() + filenameStart;
+  char buf[26 + path.length() - filenameStart];
+  char *filename = (char *)path.c_str() + filenameStart;
 
-  if(download) {
-    snprintf(buf, sizeof (buf), "attachment; filename=\"%s\"", filename);
+  if (download) {
+    snprintf_P(buf, sizeof(buf), PSTR("attachment; filename=\"%s\""), filename);
   } else {
-    snprintf(buf, sizeof (buf), "inline; filename=\"%s\"", filename);
+    snprintf_P(buf, sizeof(buf), PSTR("inline"));
   }
-  addHeader("Content-Disposition", buf);
+  addHeader(T_Content_Disposition, buf, false);
 }
 
-size_t AsyncFileResponse::_fillBuffer(uint8_t *data, size_t len){
+size_t AsyncFileResponse::_fillBuffer(uint8_t *data, size_t len) {
   return _content.read(data, len);
 }
 
@@ -577,19 +796,20 @@ size_t AsyncFileResponse::_fillBuffer(uint8_t *data, size_t len){
  * Stream Response
  * */
 
-AsyncStreamResponse::AsyncStreamResponse(Stream &stream, const String& contentType, size_t len, AwsTemplateProcessor callback): AsyncAbstractResponse(callback) {
+AsyncStreamResponse::AsyncStreamResponse(Stream &stream, const char *contentType, size_t len, AwsTemplateProcessor callback) : AsyncAbstractResponse(callback) {
   _code = 200;
   _content = &stream;
   _contentLength = len;
   _contentType = contentType;
 }
 
-size_t AsyncStreamResponse::_fillBuffer(uint8_t *data, size_t len){
+size_t AsyncStreamResponse::_fillBuffer(uint8_t *data, size_t len) {
   size_t available = _content->available();
-  size_t outLen = (available > len)?len:available;
+  size_t outLen = (available > len) ? len : available;
   size_t i;
-  for(i=0;iread();
+  }
   return outLen;
 }
 
@@ -597,20 +817,22 @@ size_t AsyncStreamResponse::_fillBuffer(uint8_t *data, size_t len){
  * Callback Response
  * */
 
-AsyncCallbackResponse::AsyncCallbackResponse(const String& contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback): AsyncAbstractResponse(templateCallback) {
+AsyncCallbackResponse::AsyncCallbackResponse(const char *contentType, size_t len, AwsResponseFiller callback, AwsTemplateProcessor templateCallback)
+  : AsyncAbstractResponse(templateCallback) {
   _code = 200;
   _content = callback;
   _contentLength = len;
-  if(!len)
+  if (!len) {
     _sendContentLength = false;
+  }
   _contentType = contentType;
   _filledLength = 0;
 }
 
-size_t AsyncCallbackResponse::_fillBuffer(uint8_t *data, size_t len){
+size_t AsyncCallbackResponse::_fillBuffer(uint8_t *data, size_t len) {
   size_t ret = _content(data, len, _filledLength);
-  if(ret != RESPONSE_TRY_AGAIN){
-      _filledLength += ret;
+  if (ret != RESPONSE_TRY_AGAIN) {
+    _filledLength += ret;
   }
   return ret;
 }
@@ -619,7 +841,8 @@ size_t AsyncCallbackResponse::_fillBuffer(uint8_t *data, size_t len){
  * Chunked Response
  * */
 
-AsyncChunkedResponse::AsyncChunkedResponse(const String& contentType, AwsResponseFiller callback, AwsTemplateProcessor processorCallback): AsyncAbstractResponse(processorCallback) {
+AsyncChunkedResponse::AsyncChunkedResponse(const char *contentType, AwsResponseFiller callback, AwsTemplateProcessor processorCallback)
+  : AsyncAbstractResponse(processorCallback) {
   _code = 200;
   _content = callback;
   _contentLength = 0;
@@ -629,10 +852,10 @@ AsyncChunkedResponse::AsyncChunkedResponse(const String& contentType, AwsRespons
   _filledLength = 0;
 }
 
-size_t AsyncChunkedResponse::_fillBuffer(uint8_t *data, size_t len){
+size_t AsyncChunkedResponse::_fillBuffer(uint8_t *data, size_t len) {
   size_t ret = _content(data, len, _filledLength);
-  if(ret != RESPONSE_TRY_AGAIN){
-      _filledLength += ret;
+  if (ret != RESPONSE_TRY_AGAIN) {
+    _filledLength += ret;
   }
   return ret;
 }
@@ -641,7 +864,8 @@ size_t AsyncChunkedResponse::_fillBuffer(uint8_t *data, size_t len){
  * Progmem Response
  * */
 
-AsyncProgmemResponse::AsyncProgmemResponse(int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback): AsyncAbstractResponse(callback) {
+AsyncProgmemResponse::AsyncProgmemResponse(int code, const char *contentType, const uint8_t *content, size_t len, AwsTemplateProcessor callback)
+  : AsyncAbstractResponse(callback) {
   _code = code;
   _content = content;
   _contentType = contentType;
@@ -649,7 +873,7 @@ AsyncProgmemResponse::AsyncProgmemResponse(int code, const String& contentType,
   _readLength = 0;
 }
 
-size_t AsyncProgmemResponse::_fillBuffer(uint8_t *data, size_t len){
+size_t AsyncProgmemResponse::_fillBuffer(uint8_t *data, size_t len) {
   size_t left = _contentLength - _readLength;
   if (left > len) {
     memcpy_P(data, _content + _readLength, len);
@@ -661,39 +885,48 @@ size_t AsyncProgmemResponse::_fillBuffer(uint8_t *data, size_t len){
   return left;
 }
 
-
 /*
  * Response Stream (You can print/write/printf to it, up to the contentLen bytes)
  * */
 
-AsyncResponseStream::AsyncResponseStream(const String& contentType, size_t bufferSize){
+AsyncResponseStream::AsyncResponseStream(const char *contentType, size_t bufferSize) {
   _code = 200;
   _contentLength = 0;
   _contentType = contentType;
-  _content = new cbuf(bufferSize);
-}
-
-AsyncResponseStream::~AsyncResponseStream(){
-  delete _content;
+  // internal buffer will be null on allocation failure
+  _content = std::unique_ptr(new cbuf(bufferSize));
+  if (bufferSize && _content->size() < bufferSize) {
+#ifdef ESP32
+    log_e("Failed to allocate");
+#endif
+  }
 }
 
-size_t AsyncResponseStream::_fillBuffer(uint8_t *buf, size_t maxLen){
-  return _content->read((char*)buf, maxLen);
+size_t AsyncResponseStream::_fillBuffer(uint8_t *buf, size_t maxLen) {
+  return _content->read((char *)buf, maxLen);
 }
 
-size_t AsyncResponseStream::write(const uint8_t *data, size_t len){
-  if(_started())
+size_t AsyncResponseStream::write(const uint8_t *data, size_t len) {
+  if (_started()) {
     return 0;
-
-  if(len > _content->room()){
+  }
+  if (len > _content->room()) {
     size_t needed = len - _content->room();
     _content->resizeAdd(needed);
+    // log a warning if allocation failed, but do not return: keep writing the bytes we can
+    // with _content->write: if len is more than the available size in the buffer, only
+    // the available size will be written
+    if (len > _content->room()) {
+#ifdef ESP32
+      log_e("Failed to allocate");
+#endif
+    }
   }
-  size_t written = _content->write((const char*)data, len);
+  size_t written = _content->write((const char *)data, len);
   _contentLength += written;
   return written;
 }
 
-size_t AsyncResponseStream::write(uint8_t data){
+size_t AsyncResponseStream::write(uint8_t data) {
   return write(&data, 1);
 }
diff --git a/src/WebServer.cpp b/src/WebServer.cpp
index e72e55e13..c3c3ee73f 100644
--- a/src/WebServer.cpp
+++ b/src/WebServer.cpp
@@ -1,131 +1,159 @@
-/*
-  Asynchronous WebServer library for Espressif MCUs
-
-  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
 #include "ESPAsyncWebServer.h"
 #include "WebHandlerImpl.h"
 
+#if defined(ESP32) || defined(TARGET_RP2040) || defined(TARGET_RP2350) || defined(PICO_RP2040) || defined(PICO_RP2350) || defined(LIBRETINY)
+#include 
+#elif defined(ESP8266)
+#include 
+#else
+#error Platform not supported
+#endif
+
+using namespace asyncsrv;
+
 bool ON_STA_FILTER(AsyncWebServerRequest *request) {
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
   return WiFi.localIP() == request->client()->localIP();
+#else
+  return false;
+#endif
 }
 
 bool ON_AP_FILTER(AsyncWebServerRequest *request) {
+#if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED || LT_ARD_HAS_WIFI
   return WiFi.localIP() != request->client()->localIP();
+#else
+  return false;
+#endif
 }
 
+#ifndef HAVE_FS_FILE_OPEN_MODE
+const char *fs::FileOpenMode::read = "r";
+const char *fs::FileOpenMode::write = "w";
+const char *fs::FileOpenMode::append = "a";
+#endif
 
-AsyncWebServer::AsyncWebServer(uint16_t port)
-  : _server(port)
-  , _rewrites(LinkedList(nullptr))
-  , _handlers(LinkedList(nullptr))
-{
+AsyncWebServer::AsyncWebServer(uint16_t port) : _server(port) {
   _catchAllHandler = new AsyncCallbackWebHandler();
-  if(_catchAllHandler == NULL)
-    return;
-  _server.onClient([](void *s, AsyncClient* c){
-    if(c == NULL)
-      return;
-    c->setRxTimeout(3);
-    AsyncWebServerRequest *r = new AsyncWebServerRequest((AsyncWebServer*)s, c);
-    if(r == NULL){
-      c->close(true);
-      c->free();
-      delete c;
-    }
-  }, this);
+  _server.onClient(
+    [](void *s, AsyncClient *c) {
+      if (c == NULL) {
+        return;
+      }
+      c->setRxTimeout(3);
+      AsyncWebServerRequest *r = new AsyncWebServerRequest((AsyncWebServer *)s, c);
+      if (r == NULL) {
+        c->abort();
+        delete c;
+      }
+    },
+    this
+  );
+}
+
+AsyncWebServer::~AsyncWebServer() {
+  reset();
+  end();
+  delete _catchAllHandler;
+  _catchAllHandler = nullptr;  // Prevent potential use-after-free
 }
 
-AsyncWebServer::~AsyncWebServer(){
-  reset();  
-  end();
-  if(_catchAllHandler) delete _catchAllHandler;
+AsyncWebRewrite &AsyncWebServer::addRewrite(std::shared_ptr rewrite) {
+  _rewrites.emplace_back(rewrite);
+  return *_rewrites.back().get();
 }
 
-AsyncWebRewrite& AsyncWebServer::addRewrite(AsyncWebRewrite* rewrite){
-  _rewrites.add(rewrite);
-  return *rewrite;
+AsyncWebRewrite &AsyncWebServer::addRewrite(AsyncWebRewrite *rewrite) {
+  _rewrites.emplace_back(rewrite);
+  return *_rewrites.back().get();
 }
 
-bool AsyncWebServer::removeRewrite(AsyncWebRewrite *rewrite){
-  return _rewrites.remove(rewrite);
+bool AsyncWebServer::removeRewrite(AsyncWebRewrite *rewrite) {
+  return removeRewrite(rewrite->from().c_str(), rewrite->toUrl().c_str());
 }
 
-AsyncWebRewrite& AsyncWebServer::rewrite(const char* from, const char* to){
-  return addRewrite(new AsyncWebRewrite(from, to));
+bool AsyncWebServer::removeRewrite(const char *from, const char *to) {
+  for (auto r = _rewrites.begin(); r != _rewrites.end(); ++r) {
+    if (r->get()->from() == from && r->get()->toUrl() == to) {
+      _rewrites.erase(r);
+      return true;
+    }
+  }
+  return false;
 }
 
-AsyncWebHandler& AsyncWebServer::addHandler(AsyncWebHandler* handler){
-  _handlers.add(handler);
-  return *handler;
+AsyncWebRewrite &AsyncWebServer::rewrite(const char *from, const char *to) {
+  _rewrites.emplace_back(std::make_shared(from, to));
+  return *_rewrites.back().get();
 }
 
-bool AsyncWebServer::removeHandler(AsyncWebHandler *handler){
-  return _handlers.remove(handler);
+AsyncWebHandler &AsyncWebServer::addHandler(AsyncWebHandler *handler) {
+  _handlers.emplace_back(handler);
+  return *(_handlers.back().get());
 }
 
-void AsyncWebServer::begin(){
+bool AsyncWebServer::removeHandler(AsyncWebHandler *handler) {
+  for (auto i = _handlers.begin(); i != _handlers.end(); ++i) {
+    if (i->get() == handler) {
+      _handlers.erase(i);
+      return true;
+    }
+  }
+  return false;
+}
+
+void AsyncWebServer::begin() {
   _server.setNoDelay(true);
   _server.begin();
 }
 
-void AsyncWebServer::end(){
+void AsyncWebServer::end() {
   _server.end();
 }
 
 #if ASYNC_TCP_SSL_ENABLED
-void AsyncWebServer::onSslFileRequest(AcSSlFileHandler cb, void* arg){
+void AsyncWebServer::onSslFileRequest(AcSSlFileHandler cb, void *arg) {
   _server.onSslFileRequest(cb, arg);
 }
 
-void AsyncWebServer::beginSecure(const char *cert, const char *key, const char *password){
+void AsyncWebServer::beginSecure(const char *cert, const char *key, const char *password) {
   _server.beginSecure(cert, key, password);
 }
 #endif
 
-void AsyncWebServer::_handleDisconnect(AsyncWebServerRequest *request){
+void AsyncWebServer::_handleDisconnect(AsyncWebServerRequest *request) {
   delete request;
 }
 
-void AsyncWebServer::_rewriteRequest(AsyncWebServerRequest *request){
-  for(const auto& r: _rewrites){
-    if (r->match(request)){
+void AsyncWebServer::_rewriteRequest(AsyncWebServerRequest *request) {
+  // the last rewrite that matches the request will be used
+  // we do not break the loop to allow for multiple rewrites to be applied and only the last one to be used (allows overriding)
+  for (const auto &r : _rewrites) {
+    if (r->match(request)) {
       request->_url = r->toUrl();
       request->_addGetParams(r->params());
     }
   }
 }
 
-void AsyncWebServer::_attachHandler(AsyncWebServerRequest *request){
-  for(const auto& h: _handlers){
-    if (h->filter(request) && h->canHandle(request)){
-      request->setHandler(h);
+void AsyncWebServer::_attachHandler(AsyncWebServerRequest *request) {
+  for (auto &h : _handlers) {
+    if (h->filter(request) && h->canHandle(request)) {
+      request->setHandler(h.get());
       return;
     }
   }
-  
-  request->addInterestingHeader("ANY");
+  // ESP_LOGD("AsyncWebServer", "No handler found for %s, using _catchAllHandler pointer: %p", request->url().c_str(), _catchAllHandler);
   request->setHandler(_catchAllHandler);
 }
 
-
-AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody){
-  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
+AsyncCallbackWebHandler &AsyncWebServer::on(
+  const char *uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody
+) {
+  AsyncCallbackWebHandler *handler = new AsyncCallbackWebHandler();
   handler->setUri(uri);
   handler->setMethod(method);
   handler->onRequest(onRequest);
@@ -135,59 +163,33 @@ AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodCom
   return *handler;
 }
 
-AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload){
-  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
-  handler->setUri(uri);
-  handler->setMethod(method);
-  handler->onRequest(onRequest);
-  handler->onUpload(onUpload);
+AsyncStaticWebHandler &AsyncWebServer::serveStatic(const char *uri, fs::FS &fs, const char *path, const char *cache_control) {
+  AsyncStaticWebHandler *handler = new AsyncStaticWebHandler(uri, fs, path, cache_control);
   addHandler(handler);
   return *handler;
 }
 
-AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest){
-  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
-  handler->setUri(uri);
-  handler->setMethod(method);
-  handler->onRequest(onRequest);
-  addHandler(handler);
-  return *handler;
-}
-
-AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, ArRequestHandlerFunction onRequest){
-  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
-  handler->setUri(uri);
-  handler->onRequest(onRequest);
-  addHandler(handler);
-  return *handler;
-}
-
-AsyncStaticWebHandler& AsyncWebServer::serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_control){
-  AsyncStaticWebHandler* handler = new AsyncStaticWebHandler(uri, fs, path, cache_control);
-  addHandler(handler);
-  return *handler;
-}
-
-void AsyncWebServer::onNotFound(ArRequestHandlerFunction fn){
+void AsyncWebServer::onNotFound(ArRequestHandlerFunction fn) {
   _catchAllHandler->onRequest(fn);
 }
 
-void AsyncWebServer::onFileUpload(ArUploadHandlerFunction fn){
+void AsyncWebServer::onFileUpload(ArUploadHandlerFunction fn) {
   _catchAllHandler->onUpload(fn);
 }
 
-void AsyncWebServer::onRequestBody(ArBodyHandlerFunction fn){
+void AsyncWebServer::onRequestBody(ArBodyHandlerFunction fn) {
   _catchAllHandler->onBody(fn);
 }
 
-void AsyncWebServer::reset(){
-  _rewrites.free();
-  _handlers.free();
-  
-  if (_catchAllHandler != NULL){
-    _catchAllHandler->onRequest(NULL);
-    _catchAllHandler->onUpload(NULL);
-    _catchAllHandler->onBody(NULL);
-  }
+AsyncWebHandler &AsyncWebServer::catchAllHandler() const {
+  return *_catchAllHandler;
 }
 
+void AsyncWebServer::reset() {
+  _rewrites.clear();
+  _handlers.clear();
+
+  _catchAllHandler->onRequest(NULL);
+  _catchAllHandler->onUpload(NULL);
+  _catchAllHandler->onBody(NULL);
+}
diff --git a/src/literals.h b/src/literals.h
new file mode 100644
index 000000000..a69f78b47
--- /dev/null
+++ b/src/literals.h
@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// Copyright 2016-2025 Hristo Gochkov, Mathieu Carbou, Emil Muratov
+
+#pragma once
+
+namespace asyncsrv {
+
+static constexpr const char *empty = "";
+
+static constexpr const char *T__opaque = "\", opaque=\"";
+static constexpr const char *T_100_CONTINUE = "100-continue";
+static constexpr const char *T_13 = "13";
+static constexpr const char *T_ACCEPT = "accept";
+static constexpr const char *T_Accept_Ranges = "accept-ranges";
+static constexpr const char *T_app_xform_urlencoded = "application/x-www-form-urlencoded";
+static constexpr const char *T_AUTH = "authorization";
+static constexpr const char *T_auth_nonce = "\", qop=\"auth\", nonce=\"";
+static constexpr const char *T_BASIC = "basic";
+static constexpr const char *T_BASIC_REALM = "basic realm=\"";
+static constexpr const char *T_BEARER = "bearer";
+static constexpr const char *T_BODY = "body";
+static constexpr const char *T_Cache_Control = "cache-control";
+static constexpr const char *T_chunked = "chunked";
+static constexpr const char *T_close = "close";
+static constexpr const char *T_cnonce = "cnonce";
+static constexpr const char *T_Connection = "connection";
+static constexpr const char *T_Content_Disposition = "content-disposition";
+static constexpr const char *T_Content_Encoding = "content-encoding";
+static constexpr const char *T_Content_Length = "content-length";
+static constexpr const char *T_Content_Type = "content-type";
+static constexpr const char *T_Content_Location = "content-location";
+static constexpr const char *T_Cookie = "cookie";
+static constexpr const char *T_CORS_ACAC = "access-control-allow-credentials";
+static constexpr const char *T_CORS_ACAH = "access-control-allow-headers";
+static constexpr const char *T_CORS_ACAM = "access-control-allow-methods";
+static constexpr const char *T_CORS_ACAO = "access-control-allow-origin";
+static constexpr const char *T_CORS_ACMA = "access-control-max-age";
+static constexpr const char *T_CORS_O = "origin";
+static constexpr const char *T_data_ = "data: ";
+static constexpr const char *T_Date = "date";
+static constexpr const char *T_DIGEST = "digest";
+static constexpr const char *T_DIGEST_ = "digest ";
+static constexpr const char *T_ETag = "etag";
+static constexpr const char *T_event_ = "event: ";
+static constexpr const char *T_EXPECT = "expect";
+static constexpr const char *T_FALSE = "false";
+static constexpr const char *T_filename = "filename";
+static constexpr const char *T_gzip = "gzip";
+static constexpr const char *T_Host = "host";
+static constexpr const char *T_HTTP_1_0 = "HTTP/1.0";
+static constexpr const char *T_HTTP_100_CONT = "HTTP/1.1 100 Continue\r\n\r\n";
+static constexpr const char *T_id__ = "id: ";
+static constexpr const char *T_IMS = "if-modified-since";
+static constexpr const char *T_INM = "if-none-match";
+static constexpr const char *T_keep_alive = "keep-alive";
+static constexpr const char *T_Last_Event_ID = "last-event-id";
+static constexpr const char *T_Last_Modified = "last-modified";
+static constexpr const char *T_LOCATION = "location";
+static constexpr const char *T_LOGIN_REQ = "Login Required";
+static constexpr const char *T_MULTIPART_ = "multipart/";
+static constexpr const char *T_name = "name";
+static constexpr const char *T_nc = "nc";
+static constexpr const char *T_no_cache = "no-cache";
+static constexpr const char *T_nonce = "nonce";
+static constexpr const char *T_none = "none";
+static constexpr const char *T_opaque = "opaque";
+static constexpr const char *T_qop = "qop";
+static constexpr const char *T_realm = "realm";
+static constexpr const char *T_realm__ = "realm=\"";
+static constexpr const char *T_response = "response";
+static constexpr const char *T_retry_ = "retry: ";
+static constexpr const char *T_retry_after = "retry-after";
+static constexpr const char *T_nn = "\n\n";
+static constexpr const char *T_rn = "\r\n";
+static constexpr const char *T_rnrn = "\r\n\r\n";
+static constexpr const char *T_Server = "server";
+static constexpr const char *T_Transfer_Encoding = "transfer-encoding";
+static constexpr const char *T_TRUE = "true";
+static constexpr const char *T_UPGRADE = "upgrade";
+static constexpr const char *T_uri = "uri";
+static constexpr const char *T_username = "username";
+static constexpr const char *T_WS = "websocket";
+static constexpr const char *T_WWW_AUTH = "www-authenticate";
+
+// HTTP Methods
+
+static constexpr const char *T_ANY = "ANY";
+static constexpr const char *T_GET = "GET";
+static constexpr const char *T_POST = "POST";
+static constexpr const char *T_PUT = "PUT";
+static constexpr const char *T_DELETE = "DELETE";
+static constexpr const char *T_PATCH = "PATCH";
+static constexpr const char *T_HEAD = "HEAD";
+static constexpr const char *T_OPTIONS = "OPTIONS";
+static constexpr const char *T_UNKNOWN = "UNKNOWN";
+
+// Req content types
+static constexpr const char *T_RCT_NOT_USED = "RCT_NOT_USED";
+static constexpr const char *T_RCT_DEFAULT = "RCT_DEFAULT";
+static constexpr const char *T_RCT_HTTP = "RCT_HTTP";
+static constexpr const char *T_RCT_WS = "RCT_WS";
+static constexpr const char *T_RCT_EVENT = "RCT_EVENT";
+static constexpr const char *T_ERROR = "ERROR";
+
+// extensions & MIME-Types
+static constexpr const char *T__css = ".css";
+static constexpr const char *T__eot = ".eot";
+static constexpr const char *T__gif = ".gif";
+static constexpr const char *T__gz = ".gz";
+static constexpr const char *T__htm = ".htm";
+static constexpr const char *T__html = ".html";
+static constexpr const char *T__ico = ".ico";
+static constexpr const char *T__jpg = ".jpg";
+static constexpr const char *T__js = ".js";
+static constexpr const char *T__json = ".json";
+static constexpr const char *T__pdf = ".pdf";
+static constexpr const char *T__png = ".png";
+static constexpr const char *T__svg = ".svg";
+static constexpr const char *T__ttf = ".ttf";
+static constexpr const char *T__woff = ".woff";
+static constexpr const char *T__woff2 = ".woff2";
+static constexpr const char *T__xml = ".xml";
+static constexpr const char *T__zip = ".zip";
+static constexpr const char *T_application_javascript = "application/javascript";
+static constexpr const char *T_application_json = "application/json";
+static constexpr const char *T_application_msgpack = "application/msgpack";
+static constexpr const char *T_application_pdf = "application/pdf";
+static constexpr const char *T_application_x_gzip = "application/x-gzip";
+static constexpr const char *T_application_zip = "application/zip";
+static constexpr const char *T_font_eot = "font/eot";
+static constexpr const char *T_font_ttf = "font/ttf";
+static constexpr const char *T_font_woff = "font/woff";
+static constexpr const char *T_font_woff2 = "font/woff2";
+static constexpr const char *T_image_gif = "image/gif";
+static constexpr const char *T_image_jpeg = "image/jpeg";
+static constexpr const char *T_image_png = "image/png";
+static constexpr const char *T_image_svg_xml = "image/svg+xml";
+static constexpr const char *T_image_x_icon = "image/x-icon";
+static constexpr const char *T_text_css = "text/css";
+static constexpr const char *T_text_event_stream = "text/event-stream";
+static constexpr const char *T_text_html = "text/html";
+static constexpr const char *T_text_plain = "text/plain";
+static constexpr const char *T_text_xml = "text/xml";
+
+// Response codes
+static constexpr const char *T_HTTP_CODE_100 = "Continue";
+static constexpr const char *T_HTTP_CODE_101 = "Switching Protocols";
+static constexpr const char *T_HTTP_CODE_200 = "OK";
+static constexpr const char *T_HTTP_CODE_201 = "Created";
+static constexpr const char *T_HTTP_CODE_202 = "Accepted";
+static constexpr const char *T_HTTP_CODE_203 = "Non-Authoritative Information";
+static constexpr const char *T_HTTP_CODE_204 = "No Content";
+static constexpr const char *T_HTTP_CODE_205 = "Reset Content";
+static constexpr const char *T_HTTP_CODE_206 = "Partial Content";
+static constexpr const char *T_HTTP_CODE_300 = "Multiple Choices";
+static constexpr const char *T_HTTP_CODE_301 = "Moved Permanently";
+static constexpr const char *T_HTTP_CODE_302 = "Found";
+static constexpr const char *T_HTTP_CODE_303 = "See Other";
+static constexpr const char *T_HTTP_CODE_304 = "Not Modified";
+static constexpr const char *T_HTTP_CODE_305 = "Use Proxy";
+static constexpr const char *T_HTTP_CODE_307 = "Temporary Redirect";
+static constexpr const char *T_HTTP_CODE_400 = "Bad Request";
+static constexpr const char *T_HTTP_CODE_401 = "Unauthorized";
+static constexpr const char *T_HTTP_CODE_402 = "Payment Required";
+static constexpr const char *T_HTTP_CODE_403 = "Forbidden";
+static constexpr const char *T_HTTP_CODE_404 = "Not Found";
+static constexpr const char *T_HTTP_CODE_405 = "Method Not Allowed";
+static constexpr const char *T_HTTP_CODE_406 = "Not Acceptable";
+static constexpr const char *T_HTTP_CODE_407 = "Proxy Authentication Required";
+static constexpr const char *T_HTTP_CODE_408 = "Request Time-out";
+static constexpr const char *T_HTTP_CODE_409 = "Conflict";
+static constexpr const char *T_HTTP_CODE_410 = "Gone";
+static constexpr const char *T_HTTP_CODE_411 = "Length Required";
+static constexpr const char *T_HTTP_CODE_412 = "Precondition Failed";
+static constexpr const char *T_HTTP_CODE_413 = "Request Entity Too Large";
+static constexpr const char *T_HTTP_CODE_414 = "Request-URI Too Large";
+static constexpr const char *T_HTTP_CODE_415 = "Unsupported Media Type";
+static constexpr const char *T_HTTP_CODE_416 = "Requested range not satisfiable";
+static constexpr const char *T_HTTP_CODE_417 = "Expectation Failed";
+static constexpr const char *T_HTTP_CODE_429 = "Too Many Requests";
+static constexpr const char *T_HTTP_CODE_500 = "Internal Server Error";
+static constexpr const char *T_HTTP_CODE_501 = "Not Implemented";
+static constexpr const char *T_HTTP_CODE_502 = "Bad Gateway";
+static constexpr const char *T_HTTP_CODE_503 = "Service Unavailable";
+static constexpr const char *T_HTTP_CODE_504 = "Gateway Time-out";
+static constexpr const char *T_HTTP_CODE_505 = "HTTP Version not supported";
+static constexpr const char *T_HTTP_CODE_ANY = "Unknown code";
+
+static constexpr const uint8_t T_only_once_headers_len = 11;
+static constexpr const char *T_only_once_headers[] = {T_Content_Length,    T_Content_Type,     T_Date,   T_ETag,    T_Last_Modified, T_LOCATION, T_retry_after,
+                                                      T_Transfer_Encoding, T_Content_Location, T_Server, T_WWW_AUTH};
+
+}  // namespace asyncsrv