.devcontainer/devcontainer.json

@@ -31,7 +31,7 @@
         "ms-python.python",
         "ms-python.pylint",
         "ms-python.flake8",
-        "charliermarsh.ruff",
+        "ms-python.black-formatter",
         "visualstudioexptteam.vscodeintellicode",
         // yaml
         "redhat.vscode-yaml",
@@ -49,11 +49,14 @@
         "flake8.args": [
           "--config=${workspaceFolder}/.flake8"
         ],
-        "ruff.configuration": "${workspaceFolder}/pyproject.toml",
+        "black-formatter.args": [
+          "--config",
+          "${workspaceFolder}/pyproject.toml"
+        ],
         "[python]": {
           // VS will say "Value is not accepted" before building the devcontainer, but the warning
           // should go away after build is completed.
-          "editor.defaultFormatter": "charliermarsh.ruff"
+          "editor.defaultFormatter": "ms-python.black-formatter"
         },
         "editor.formatOnPaste": false,
         "editor.formatOnSave": true,

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+---
+# These are supported funding model platforms
+
+custom: https://www.nabucasa.com

.github/actions/build-image/action.yaml

@@ -46,7 +46,7 @@ runs:
 
     - name: Build and push to ghcr by digest
       id: build-ghcr
-      uses: docker/build-push-action@v6.15.0
+      uses: docker/build-push-action@v6.13.0
       env:
         DOCKER_BUILD_SUMMARY: false
         DOCKER_BUILD_RECORD_UPLOAD: false
@@ -72,7 +72,7 @@ runs:
 
     - name: Build and push to dockerhub by digest
       id: build-dockerhub
-      uses: docker/build-push-action@v6.15.0
+      uses: docker/build-push-action@v6.13.0
       env:
         DOCKER_BUILD_SUMMARY: false
         DOCKER_BUILD_RECORD_UPLOAD: false

.github/actions/restore-python/action.yml

@@ -17,12 +17,12 @@ runs:
   steps:
     - name: Set up Python ${{ inputs.python-version }}
       id: python
-      uses: actions/setup-python@v5.5.0
+      uses: actions/setup-python@v5.4.0
       with:
         python-version: ${{ inputs.python-version }}
     - name: Restore Python virtual environment
       id: cache-venv
-      uses: actions/cache/restore@v4.2.3
+      uses: actions/cache/restore@v4.2.0
       with:
         path: venv
         # yamllint disable-line rule:line-length

.github/workflows/ci-api-proto.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: "3.11"
 

.github/workflows/ci-docker.yml

@@ -33,20 +33,22 @@ concurrency:
 jobs:
   check-docker:
     name: Build docker containers
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest", "ubuntu-24.04-arm"]
+        arch: [amd64, aarch64]
         build_type: ["ha-addon", "docker", "lint"]
     steps:
       - uses: actions/checkout@v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: "3.9"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.9.0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.4.0
 
       - name: Set TAG
         run: |
@@ -56,6 +58,6 @@ jobs:
         run: |
           docker/build.py \
             --tag "${TAG}" \
-            --arch "${{ matrix.os == 'ubuntu-24.04-arm' && 'aarch64' || 'amd64' }}" \
+            --arch "${{ matrix.arch }}" \
             --build-type "${{ matrix.build_type }}" \
             build

.github/workflows/ci.yml

@@ -42,12 +42,12 @@ jobs:
         run: echo key="${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}" >> $GITHUB_OUTPUT
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.0
         with:
           path: venv
           # yamllint disable-line rule:line-length
@@ -61,8 +61,8 @@ jobs:
           pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
           pip install -e .
 
-  ruff:
-    name: Check ruff
+  black:
+    name: Check black
     runs-on: ubuntu-24.04
     needs:
       - common
@@ -74,10 +74,10 @@ jobs:
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Run Ruff
+      - name: Run black
         run: |
           . venv/bin/activate
-          ruff format esphome tests
+          black --verbose esphome tests
       - name: Suggested changes
         run: script/ci-suggest-changes
         if: always()
@@ -220,7 +220,7 @@ jobs:
           . venv/bin/activate
           pytest -vv --cov-report=xml --tb=native tests
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.4.2
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -255,7 +255,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs:
       - common
-      - ruff
+      - black
       - ci-custom
       - clang-format
       - flake8
@@ -303,14 +303,14 @@ jobs:
 
       - name: Cache platformio
         if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.0
         with:
           path: ~/.platformio
           key: platformio-${{ matrix.pio_cache_key }}
 
       - name: Cache platformio
         if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.0
         with:
           path: ~/.platformio
           key: platformio-${{ matrix.pio_cache_key }}
@@ -482,7 +482,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs:
       - common
-      - ruff
+      - black
       - ci-custom
       - clang-format
       - flake8

.github/workflows/matchers/lint-python.json

@@ -1,11 +1,11 @@
 {
   "problemMatcher": [
     {
-      "owner": "ruff",
+      "owner": "black",
       "severity": "error",
       "pattern": [
         {
-          "regexp": "^(.*): (Please format this file with the ruff formatter)",
+          "regexp": "^(.*): (Please format this file with the black formatter)",
           "file": 1,
           "message": 2
         }

.github/workflows/release.yml

@@ -53,7 +53,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: "3.x"
       - name: Set up python environment
@@ -84,23 +84,23 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: "3.9"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.9.0
       - name: Set up QEMU
         if: matrix.platform != 'linux/amd64'
-        uses: docker/setup-qemu-action@v3.6.0
+        uses: docker/setup-qemu-action@v3.4.0
 
       - name: Log in to docker hub
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -140,7 +140,7 @@ jobs:
           echo name=$(cat /tmp/platform) >> $GITHUB_OUTPUT
 
       - name: Upload digests
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: digests-${{ steps.sanitize.outputs.name }}
           path: /tmp/digests
@@ -176,24 +176,24 @@ jobs:
       - uses: actions/checkout@v4.1.7
 
       - name: Download digests
-        uses: actions/download-artifact@v4.2.1
+        uses: actions/download-artifact@v4.1.8
         with:
           pattern: digests-*
           path: /tmp/digests
           merge-multiple: true
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.9.0
 
       - name: Log in to docker hub
         if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the GitHub container registry
         if: matrix.registry == 'ghcr'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/sync-device-classes.yml

@@ -22,7 +22,7 @@ jobs:
           path: lib/home-assistant
 
       - name: Setup Python
-        uses: actions/setup-python@v5.5.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: 3.12
 
@@ -36,11 +36,11 @@ jobs:
           python ./script/sync-device_class.py
 
       - name: Commit changes
-        uses: peter-evans/create-pull-request@v7.0.8
+        uses: peter-evans/create-pull-request@v7.0.6
         with:
           commit-message: "Synchronise Device Classes from Home Assistant"
-          committer: esphomebot <esphome@openhomefoundation.org>
-          author: esphomebot <esphome@openhomefoundation.org>
+          committer: esphomebot <esphome@nabucasa.com>
+          author: esphomebot <esphome@nabucasa.com>
           branch: sync/device-classes
           delete-branch: true
           title: "Synchronise Device Classes from Home Assistant"

.pre-commit-config.yaml

@@ -4,7 +4,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.11.0
+    rev: v0.5.4
     hooks:
       # Run the linter.
       - id: ruff
@@ -12,11 +12,11 @@ repos:
       # Run the formatter.
       - id: ruff-format
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.2.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         additional_dependencies:
-          - flake8-docstrings==1.7.0
+          - flake8-docstrings==1.5.0
           - pydocstyle==5.1.1
         files: ^(esphome|tests)/.+\.py$
   - repo: https://github.com/pre-commit/pre-commit-hooks

CODEOWNERS

@@ -93,7 +93,6 @@ esphome/components/captive_portal/* @OttoWinter
 esphome/components/ccs811/* @habbie
 esphome/components/cd74hc4067/* @asoehlke
 esphome/components/ch422g/* @clydebarrow @jesterret
-esphome/components/chsc6x/* @kkosik20
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
@@ -235,7 +234,6 @@ esphome/components/kuntze/* @ssieb
 esphome/components/lcd_menu/* @numo68
 esphome/components/ld2410/* @regevbr @sebcaps
 esphome/components/ld2420/* @descipher
-esphome/components/ld2450/* @hareeshmu
 esphome/components/ledc/* @OttoWinter
 esphome/components/libretiny/* @kuba2k2
 esphome/components/libretiny_pwm/* @kuba2k2
@@ -250,7 +248,6 @@ esphome/components/ltr501/* @latonita
 esphome/components/ltr_als_ps/* @latonita
 esphome/components/lvgl/* @clydebarrow
 esphome/components/m5stack_8angle/* @rnauber
-esphome/components/mapping/* @clydebarrow
 esphome/components/matrix_keypad/* @ssieb
 esphome/components/max17043/* @blacknell
 esphome/components/max31865/* @DAVe3283
@@ -267,7 +264,6 @@ esphome/components/mcp23x17_base/* @jesserockz
 esphome/components/mcp23xxx_base/* @jesserockz
 esphome/components/mcp2515/* @danielschramm @mvturnho
 esphome/components/mcp3204/* @rsumner
-esphome/components/mcp4461/* @p1ngb4ck
 esphome/components/mcp4728/* @berfenger
 esphome/components/mcp47a1/* @jesserockz
 esphome/components/mcp9600/* @mreditor97
@@ -301,7 +297,6 @@ esphome/components/mopeka_std_check/* @Fabian-Schmidt
 esphome/components/mpl3115a2/* @kbickar
 esphome/components/mpu6886/* @fabaff
 esphome/components/ms8607/* @e28eta
-esphome/components/msa3xx/* @latonita
 esphome/components/nau7802/* @cujomalainey
 esphome/components/network/* @esphome/core
 esphome/components/nextion/* @edwardtfn @senexcrenshaw
@@ -325,7 +320,6 @@ esphome/components/pcf8563/* @KoenBreeman
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
 esphome/components/pm1006/* @habbie
-esphome/components/pm2005/* @andrewjswan
 esphome/components/pmsa003i/* @sjtrny
 esphome/components/pmwcs3/* @SeByDocKy
 esphome/components/pn532/* @OttoWinter @jesserockz
@@ -451,7 +445,6 @@ esphome/components/tmp102/* @timsavage
 esphome/components/tmp1075/* @sybrenstuvel
 esphome/components/tmp117/* @Azimath
 esphome/components/tof10120/* @wstrzalka
-esphome/components/tormatic/* @ti-mo
 esphome/components/toshiba/* @kbx81
 esphome/components/touchscreen/* @jesserockz @nielsnl68
 esphome/components/tsl2591/* @wjcarpenter

CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at esphome@openhomefoundation.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at esphome@nabucasa.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

docker/Dockerfile

@@ -33,9 +33,9 @@ RUN \
         python3-venv=3.11.2-1+b1 \
         python3-wheel=0.38.4-2 \
         iputils-ping=3:20221126-1+deb12u1 \
-        git=1:2.39.5-0+deb12u2 \
-        curl=7.88.1-10+deb12u12 \
-        openssh-client=1:9.2p1-2+deb12u5 \
+        git=1:2.39.5-0+deb12u1 \
+        curl=7.88.1-10+deb12u8 \
+        openssh-client=1:9.2p1-2+deb12u3 \
         python3-cffi=1.15.1-5 \
         libcairo2=1.16.0-7 \
         libmagic1=1:5.44-3 \
@@ -55,7 +55,7 @@ RUN \
     pip3 install \
     --break-system-packages --no-cache-dir \
     # Keep platformio version in sync with requirements.txt
-    platformio==6.1.18 \
+    platformio==6.1.16 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
@@ -76,7 +76,7 @@ BUILD_DEPS="
     python3-dev=3.11.2-1+b1
     zlib1g-dev=1:1.2.13.dfsg-1
     libjpeg-dev=1:2.1.5-2
-    libfreetype-dev=2.12.1+dfsg-5+deb12u4
+    libfreetype-dev=2.12.1+dfsg-5+deb12u3
     libssl-dev=3.0.15-1~deb12u1
     libffi-dev=3.4.4-1
     cargo=0.66.0+ds1-1
@@ -84,7 +84,7 @@ BUILD_DEPS="
 "
 LIB_DEPS="
     libtiff6=4.5.0-6+deb12u1
-    libopenjp2-7=2.5.0-2+deb12u1
+    libopenjp2-7=2.5.0-2
 "
 if [ "$TARGETARCH$TARGETVARIANT" = "arm64" ]
 then
@@ -160,7 +160,7 @@ RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        nginx-light=1.22.1-9+deb12u1 \
+        nginx-light=1.22.1-9 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \

docker/generate_tags.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
-import argparse
 import re
+import argparse
 
 CHANNEL_DEV = "dev"
 CHANNEL_BETA = "beta"

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run

@@ -23,6 +23,10 @@ if bashio::config.true 'streamer_mode'; then
     export ESPHOME_STREAMER_MODE=true
 fi
 
+if bashio::config.true 'status_use_ping'; then
+    export ESPHOME_DASHBOARD_USE_PING=true
+fi
+
 if bashio::config.has_value 'relative_url'; then
     export ESPHOME_DASHBOARD_RELATIVE_URL=$(bashio::config 'relative_url')
 fi

esphome/__main__.py

@@ -2,7 +2,6 @@
 import argparse
 from datetime import datetime
 import functools
-import importlib
 import logging
 import os
 import re
@@ -67,7 +66,7 @@ def choose_prompt(options, purpose: str = None):
         return options[0][1]
 
     safe_print(
-        f"Found multiple options{f' for {purpose}' if purpose else ''}, please choose one:"
+        f'Found multiple options{f" for {purpose}" if purpose else ""}, please choose one:'
     )
     for i, (desc, _) in enumerate(options):
         safe_print(f"  [{i + 1}] {desc}")
@@ -133,7 +132,7 @@ def get_port_type(port):
     return "NETWORK"
 
 
-def run_miniterm(config, port, args):
+def run_miniterm(config, port):
     import serial
 
     from esphome import platformio_api
@@ -154,7 +153,7 @@ def run_miniterm(config, port, args):
 
     # We can't set to False by default since it leads to toggling and hence
     # ESP32 resets on some platforms.
-    if config["logger"][CONF_DEASSERT_RTS_DTR] or args.reset:
+    if config["logger"][CONF_DEASSERT_RTS_DTR]:
         ser.dtr = False
         ser.rts = False
 
@@ -244,11 +243,11 @@ def compile_program(args, config):
     return 0 if idedata is not None else 1
 
 
-def upload_using_esptool(config, port, file, speed):
+def upload_using_esptool(config, port, file):
     from esphome import platformio_api
 
-    first_baudrate = speed or config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get(
-        "upload_speed", os.getenv("ESPHOME_UPLOAD_SPEED", "460800")
+    first_baudrate = config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get(
+        "upload_speed", 460800
     )
 
     if file is not None:
@@ -337,18 +336,11 @@ def check_permissions(port):
 
 
 def upload_program(config, args, host):
-    try:
-        module = importlib.import_module("esphome.components." + CORE.target_platform)
-        if getattr(module, "upload_program")(config, args, host):
-            return 0
-    except AttributeError:
-        pass
-
     if get_port_type(host) == "SERIAL":
         check_permissions(host)
         if CORE.target_platform in (PLATFORM_ESP32, PLATFORM_ESP8266):
             file = getattr(args, "file", None)
-            return upload_using_esptool(config, host, file, args.upload_speed)
+            return upload_using_esptool(config, host, file)
 
         if CORE.target_platform in (PLATFORM_RP2040):
             return upload_using_platformio(config, args.device)
@@ -375,12 +367,10 @@ def upload_program(config, args, host):
     password = ota_conf.get(CONF_PASSWORD, "")
 
     if (
-        CONF_MQTT in config  # pylint: disable=too-many-boolean-expressions
+        not is_ip_address(CORE.address)  # pylint: disable=too-many-boolean-expressions
+        and (get_port_type(host) == "MQTT" or config[CONF_MDNS][CONF_DISABLED])
+        and CONF_MQTT in config
         and (not args.device or args.device in ("MQTT", "OTA"))
-        and (
-            ((config[CONF_MDNS][CONF_DISABLED]) and not is_ip_address(CORE.address))
-            or get_port_type(host) == "MQTT"
-        )
     ):
         from esphome import mqtt
 
@@ -399,7 +389,7 @@ def show_logs(config, args, port):
         raise EsphomeError("Logger is not configured!")
     if get_port_type(port) == "SERIAL":
         check_permissions(port)
-        return run_miniterm(config, port, args)
+        return run_miniterm(config, port)
     if get_port_type(port) == "NETWORK" and "api" in config:
         if config[CONF_MDNS][CONF_DISABLED] and CONF_MQTT in config:
             from esphome import mqtt
@@ -844,10 +834,6 @@ def parse_args(argv):
         "--device",
         help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
     )
-    parser_upload.add_argument(
-        "--upload_speed",
-        help="Override the default or configured upload speed.",
-    )
     parser_upload.add_argument(
         "--file",
         help="Manually specify the binary file to upload.",
@@ -866,13 +852,6 @@ def parse_args(argv):
         "--device",
         help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
     )
-    parser_logs.add_argument(
-        "--reset",
-        "-r",
-        action="store_true",
-        help="Reset the device before starting serial logs.",
-        default=os.getenv("ESPHOME_SERIAL_LOGGING_RESET"),
-    )
 
     parser_discover = subparsers.add_parser(
         "discover",
@@ -895,20 +874,9 @@ def parse_args(argv):
         "--device",
         help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
     )
-    parser_run.add_argument(
-        "--upload_speed",
-        help="Override the default or configured upload speed.",
-    )
     parser_run.add_argument(
         "--no-logs", help="Disable starting logs.", action="store_true"
     )
-    parser_run.add_argument(
-        "--reset",
-        "-r",
-        action="store_true",
-        help="Reset the device before starting serial logs.",
-        default=os.getenv("ESPHOME_SERIAL_LOGGING_RESET"),
-    )
 
     parser_clean = subparsers.add_parser(
         "clean-mqtt",

esphome/components/a01nyub/sensor.py

@@ -1,10 +1,10 @@
 import esphome.codegen as cg
 from esphome.components import sensor, uart
 from esphome.const import (
-    DEVICE_CLASS_DISTANCE,
-    ICON_ARROW_EXPAND_VERTICAL,
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
+    ICON_ARROW_EXPAND_VERTICAL,
+    DEVICE_CLASS_DISTANCE,
 )
 
 CODEOWNERS = ["@MrSuicideParrot"]

esphome/components/a02yyuw/sensor.py

@@ -1,9 +1,9 @@
 import esphome.codegen as cg
 from esphome.components import sensor, uart
 from esphome.const import (
-    DEVICE_CLASS_DISTANCE,
-    ICON_ARROW_EXPAND_VERTICAL,
     STATE_CLASS_MEASUREMENT,
+    ICON_ARROW_EXPAND_VERTICAL,
+    DEVICE_CLASS_DISTANCE,
     UNIT_MILLIMETER,
 )
 

esphome/components/a4988/stepper.py

@@ -1,9 +1,10 @@
 from esphome import pins
-import esphome.codegen as cg
 from esphome.components import stepper
 import esphome.config_validation as cv
+import esphome.codegen as cg
 from esphome.const import CONF_DIR_PIN, CONF_ID, CONF_SLEEP_PIN, CONF_STEP_PIN
 
+
 a4988_ns = cg.esphome_ns.namespace("a4988")
 A4988 = a4988_ns.class_("A4988", stepper.Stepper, cg.Component)
 

esphome/components/absolute_humidity/sensor.py

@@ -1,12 +1,12 @@
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
 from esphome.const import (
-    CONF_EQUATION,
     CONF_HUMIDITY,
     CONF_TEMPERATURE,
-    ICON_WATER,
     STATE_CLASS_MEASUREMENT,
+    CONF_EQUATION,
+    ICON_WATER,
     UNIT_GRAMS_PER_CUBIC_METER,
 )
 

esphome/components/ac_dimmer/output.py

@@ -1,8 +1,8 @@
-from esphome import pins
 import esphome.codegen as cg
-from esphome.components import output
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_METHOD, CONF_MIN_POWER
+from esphome import pins
+from esphome.components import output
+from esphome.const import CONF_ID, CONF_MIN_POWER, CONF_METHOD
 
 CODEOWNERS = ["@glmnet"]
 

esphome/components/adalight/__init__.py

@@ -1,8 +1,8 @@
 import esphome.codegen as cg
-from esphome.components import uart
-from esphome.components.light.effects import register_addressable_effect
-from esphome.components.light.types import AddressableLightEffect
 import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.components.light.types import AddressableLightEffect
+from esphome.components.light.effects import register_addressable_effect
 from esphome.const import CONF_NAME, CONF_UART_ID
 
 DEPENDENCIES = ["uart"]

esphome/components/adc128s102/__init__.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import spi
 import esphome.config_validation as cv
+from esphome.components import spi
 from esphome.const import CONF_ID
 
 DEPENDENCIES = ["spi"]

esphome/components/adc128s102/sensor/__init__.py

@@ -1,9 +1,9 @@
 import esphome.codegen as cg
-from esphome.components import sensor, voltage_sampler
 import esphome.config_validation as cv
-from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.components import sensor, voltage_sampler
+from esphome.const import CONF_ID, CONF_CHANNEL
 
-from .. import ADC128S102, adc128s102_ns
+from .. import adc128s102_ns, ADC128S102
 
 AUTO_LOAD = ["voltage_sampler"]
 DEPENDENCIES = ["adc128s102"]

esphome/components/addressable_light/display.py

@@ -1,15 +1,15 @@
 import esphome.codegen as cg
-from esphome.components import display, light
 import esphome.config_validation as cv
+from esphome.components import display, light
 from esphome.const import (
-    CONF_ADDRESSABLE_LIGHT_ID,
-    CONF_HEIGHT,
     CONF_ID,
     CONF_LAMBDA,
     CONF_PAGES,
-    CONF_PIXEL_MAPPER,
-    CONF_UPDATE_INTERVAL,
+    CONF_ADDRESSABLE_LIGHT_ID,
+    CONF_HEIGHT,
     CONF_WIDTH,
+    CONF_UPDATE_INTERVAL,
+    CONF_PIXEL_MAPPER,
 )
 
 CODEOWNERS = ["@justfalter"]

esphome/components/ade7880/sensor.py

@@ -1,7 +1,7 @@
-from esphome import pins
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, i2c
+from esphome import pins
 from esphome.const import (
     CONF_ACTIVE_POWER,
     CONF_APPARENT_POWER,

esphome/components/ade7953_base/__init__.py

@@ -1,27 +1,27 @@
-from esphome import pins
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome import pins
 from esphome.const import (
-    CONF_FREQUENCY,
     CONF_IRQ_PIN,
     CONF_VOLTAGE,
+    CONF_FREQUENCY,
     CONF_VOLTAGE_GAIN,
-    DEVICE_CLASS_APPARENT_POWER,
     DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_FREQUENCY,
+    DEVICE_CLASS_APPARENT_POWER,
     DEVICE_CLASS_POWER,
-    DEVICE_CLASS_POWER_FACTOR,
     DEVICE_CLASS_REACTIVE_POWER,
+    DEVICE_CLASS_POWER_FACTOR,
     DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_FREQUENCY,
     STATE_CLASS_MEASUREMENT,
-    UNIT_AMPERE,
-    UNIT_HERTZ,
-    UNIT_PERCENT,
     UNIT_VOLT,
+    UNIT_HERTZ,
+    UNIT_AMPERE,
     UNIT_VOLT_AMPS,
-    UNIT_VOLT_AMPS_REACTIVE,
     UNIT_WATT,
+    UNIT_VOLT_AMPS_REACTIVE,
+    UNIT_PERCENT,
 )
 
 CONF_CURRENT_A = "current_a"

esphome/components/ade7953_i2c/sensor.py

@@ -1,8 +1,9 @@
 import esphome.codegen as cg
-from esphome.components import ade7953_base, i2c
 import esphome.config_validation as cv
+from esphome.components import i2c, ade7953_base
 from esphome.const import CONF_ID
 
+
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["ade7953_base"]
 

esphome/components/ade7953_spi/sensor.py

@@ -1,8 +1,9 @@
 import esphome.codegen as cg
-from esphome.components import ade7953_base, spi
 import esphome.config_validation as cv
+from esphome.components import spi, ade7953_base
 from esphome.const import CONF_ID
 
+
 DEPENDENCIES = ["spi"]
 AUTO_LOAD = ["ade7953_base"]
 

esphome/components/ads1115/__init__.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.components import i2c
 from esphome.const import CONF_ID
 
 DEPENDENCIES = ["i2c"]

esphome/components/ads1115/sensor/__init__.py

@@ -1,18 +1,17 @@
 import esphome.codegen as cg
-from esphome.components import sensor, voltage_sampler
 import esphome.config_validation as cv
+from esphome.components import sensor, voltage_sampler
 from esphome.const import (
     CONF_GAIN,
-    CONF_ID,
     CONF_MULTIPLEXER,
     CONF_RESOLUTION,
     CONF_SAMPLE_RATE,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
+    CONF_ID,
 )
-
-from .. import CONF_ADS1115_ID, ADS1115Component, ads1115_ns
+from .. import ads1115_ns, ADS1115Component, CONF_ADS1115_ID
 
 AUTO_LOAD = ["voltage_sampler"]
 DEPENDENCIES = ["ads1115"]

esphome/components/ads1118/__init__.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import spi
 import esphome.config_validation as cv
+from esphome.components import spi
 from esphome.const import CONF_ID
 
 CODEOWNERS = ["@solomondg1"]

esphome/components/ads1118/sensor/__init__.py

@@ -1,18 +1,17 @@
 import esphome.codegen as cg
-from esphome.components import sensor, voltage_sampler
 import esphome.config_validation as cv
+from esphome.components import sensor, voltage_sampler
 from esphome.const import (
     CONF_GAIN,
     CONF_MULTIPLEXER,
-    CONF_TYPE,
-    DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
     UNIT_VOLT,
+    CONF_TYPE,
 )
-
-from .. import ADS1118, CONF_ADS1118_ID, ads1118_ns
+from .. import ads1118_ns, ADS1118, CONF_ADS1118_ID
 
 AUTO_LOAD = ["voltage_sampler"]
 DEPENDENCIES = ["ads1118"]

esphome/components/ags10/sensor.py

@@ -1,21 +1,21 @@
-from esphome import automation
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
+from esphome import automation
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
-    CONF_ADDRESS,
     CONF_ID,
-    CONF_MODE,
-    CONF_TVOC,
-    CONF_VALUE,
-    CONF_VERSION,
-    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-    ENTITY_CATEGORY_DIAGNOSTIC,
     ICON_RADIATOR,
     ICON_RESTART,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+    ENTITY_CATEGORY_DIAGNOSTIC,
     STATE_CLASS_MEASUREMENT,
     UNIT_OHM,
     UNIT_PARTS_PER_BILLION,
+    CONF_ADDRESS,
+    CONF_TVOC,
+    CONF_VERSION,
+    CONF_MODE,
+    CONF_VALUE,
 )
 
 CONF_RESISTANCE = "resistance"

esphome/components/aht10/sensor.py

@@ -1,16 +1,16 @@
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
     CONF_HUMIDITY,
     CONF_ID,
     CONF_TEMPERATURE,
-    CONF_VARIANT,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
     UNIT_PERCENT,
+    CONF_VARIANT,
 )
 
 DEPENDENCIES = ["i2c"]

esphome/components/airthings_ble/__init__.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import esp32_ble_tracker
 import esphome.config_validation as cv
+from esphome.components import esp32_ble_tracker
 from esphome.const import CONF_ID
 
 DEPENDENCIES = ["esp32_ble_tracker"]

esphome/components/airthings_wave_base/__init__.py

@@ -1,17 +1,18 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, ble_client
+
 from esphome.const import (
     CONF_BATTERY_VOLTAGE,
     CONF_HUMIDITY,
     CONF_PRESSURE,
     CONF_TEMPERATURE,
     CONF_TVOC,
+    DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-    DEVICE_CLASS_VOLTAGE,
     ENTITY_CATEGORY_DIAGNOSTIC,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,

esphome/components/airthings_wave_mini/sensor.py

@@ -1,7 +1,10 @@
 import esphome.codegen as cg
-from esphome.components import airthings_wave_base
 import esphome.config_validation as cv
-from esphome.const import CONF_ID
+from esphome.components import airthings_wave_base
+
+from esphome.const import (
+    CONF_ID,
+)
 
 DEPENDENCIES = airthings_wave_base.DEPENDENCIES
 

esphome/components/airthings_wave_plus/sensor.py

@@ -1,19 +1,20 @@
 import esphome.codegen as cg
-from esphome.components import airthings_wave_base, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, airthings_wave_base
+
 from esphome.const import (
-    CONF_CO2,
+    DEVICE_CLASS_CARBON_DIOXIDE,
+    STATE_CLASS_MEASUREMENT,
+    ICON_RADIOACTIVE,
     CONF_ID,
-    CONF_ILLUMINANCE,
     CONF_RADON,
     CONF_RADON_LONG_TERM,
-    DEVICE_CLASS_CARBON_DIOXIDE,
-    DEVICE_CLASS_ILLUMINANCE,
-    ICON_RADIOACTIVE,
-    STATE_CLASS_MEASUREMENT,
+    CONF_CO2,
     UNIT_BECQUEREL_PER_CUBIC_METER,
-    UNIT_LUX,
     UNIT_PARTS_PER_MILLION,
+    CONF_ILLUMINANCE,
+    UNIT_LUX,
+    DEVICE_CLASS_ILLUMINANCE,
 )
 
 DEPENDENCIES = airthings_wave_base.DEPENDENCIES

esphome/components/alpha3/sensor.py

@@ -1,20 +1,20 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, ble_client
 from esphome.const import (
+    CONF_ID,
     CONF_CURRENT,
     CONF_FLOW,
     CONF_HEAD,
-    CONF_ID,
     CONF_POWER,
     CONF_SPEED,
     CONF_VOLTAGE,
     UNIT_AMPERE,
-    UNIT_CUBIC_METER_PER_HOUR,
-    UNIT_METER,
-    UNIT_REVOLUTIONS_PER_MINUTE,
     UNIT_VOLT,
     UNIT_WATT,
+    UNIT_METER,
+    UNIT_CUBIC_METER_PER_HOUR,
+    UNIT_REVOLUTIONS_PER_MINUTE,
 )
 
 alpha3_ns = cg.esphome_ns.namespace("alpha3")

esphome/components/am2315c/am2315c.cpp

@@ -128,7 +128,7 @@ void AM2315C::update() {
   data[2] = 0x00;
   if (this->write(data, 3) != i2c::ERROR_OK) {
     ESP_LOGE(TAG, "Write failed!");
-    this->status_set_warning();
+    this->mark_failed();
     return;
   }
 
@@ -138,12 +138,12 @@ void AM2315C::update() {
     uint8_t status = 0;
     if (this->read(&status, 1) != i2c::ERROR_OK) {
       ESP_LOGE(TAG, "Read failed!");
-      this->status_set_warning();
+      this->mark_failed();
       return;
     }
     if ((status & 0x80) == 0x80) {
       ESP_LOGE(TAG, "HW still busy!");
-      this->status_set_warning();
+      this->mark_failed();
       return;
     }
 
@@ -151,7 +151,7 @@ void AM2315C::update() {
     uint8_t data[7];
     if (this->read(data, 7) != i2c::ERROR_OK) {
       ESP_LOGE(TAG, "Read failed!");
-      this->status_set_warning();
+      this->mark_failed();
       return;
     }
 

esphome/components/am2315c/sensor.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
     CONF_HUMIDITY,
     CONF_ID,

esphome/components/am2320/sensor.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
     CONF_HUMIDITY,
     CONF_ID,

esphome/components/am43/cover/__init__.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, cover
 import esphome.config_validation as cv
+from esphome.components import cover, ble_client
 from esphome.const import CONF_ID, CONF_PIN
 
 CODEOWNERS = ["@buxtronix"]

esphome/components/am43/sensor/__init__.py

@@ -1,12 +1,12 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, ble_client
 from esphome.const import (
-    CONF_BATTERY_LEVEL,
     CONF_ID,
-    CONF_ILLUMINANCE,
+    CONF_BATTERY_LEVEL,
     DEVICE_CLASS_BATTERY,
     ENTITY_CATEGORY_DIAGNOSTIC,
+    CONF_ILLUMINANCE,
     ICON_BRIGHTNESS_5,
     UNIT_PERCENT,
 )

esphome/components/analog_threshold/analog_threshold_binary_sensor.cpp

@@ -14,8 +14,7 @@ void AnalogThresholdBinarySensor::setup() {
   if (std::isnan(sensor_value)) {
     this->publish_initial_state(false);
   } else {
-    this->publish_initial_state(sensor_value >=
-                                (this->lower_threshold_.value() + this->upper_threshold_.value()) / 2.0f);
+    this->publish_initial_state(sensor_value >= (this->lower_threshold_ + this->upper_threshold_) / 2.0f);
   }
 }
 
@@ -25,8 +24,7 @@ void AnalogThresholdBinarySensor::set_sensor(sensor::Sensor *analog_sensor) {
   this->sensor_->add_on_state_callback([this](float sensor_value) {
     // if there is an invalid sensor reading, ignore the change and keep the current state
     if (!std::isnan(sensor_value)) {
-      this->publish_state(sensor_value >=
-                          (this->state ? this->lower_threshold_.value() : this->upper_threshold_.value()));
+      this->publish_state(sensor_value >= (this->state ? this->lower_threshold_ : this->upper_threshold_));
     }
   });
 }
@@ -34,8 +32,8 @@ void AnalogThresholdBinarySensor::set_sensor(sensor::Sensor *analog_sensor) {
 void AnalogThresholdBinarySensor::dump_config() {
   LOG_BINARY_SENSOR("", "Analog Threshold Binary Sensor", this);
   LOG_SENSOR("  ", "Sensor", this->sensor_);
-  ESP_LOGCONFIG(TAG, "  Upper threshold: %.11f", this->upper_threshold_.value());
-  ESP_LOGCONFIG(TAG, "  Lower threshold: %.11f", this->lower_threshold_.value());
+  ESP_LOGCONFIG(TAG, "  Upper threshold: %.11f", this->upper_threshold_);
+  ESP_LOGCONFIG(TAG, "  Lower threshold: %.11f", this->lower_threshold_);
 }
 
 }  // namespace analog_threshold

esphome/components/analog_threshold/analog_threshold_binary_sensor.h

@@ -15,13 +15,14 @@ class AnalogThresholdBinarySensor : public Component, public binary_sensor::Bina
   float get_setup_priority() const override { return setup_priority::DATA; }
 
   void set_sensor(sensor::Sensor *analog_sensor);
-  template<typename T> void set_upper_threshold(T upper_threshold) { this->upper_threshold_ = upper_threshold; }
-  template<typename T> void set_lower_threshold(T lower_threshold) { this->lower_threshold_ = lower_threshold; }
+  void set_upper_threshold(float threshold) { this->upper_threshold_ = threshold; }
+  void set_lower_threshold(float threshold) { this->lower_threshold_ = threshold; }
 
  protected:
   sensor::Sensor *sensor_{nullptr};
-  TemplatableValue<float> upper_threshold_{};
-  TemplatableValue<float> lower_threshold_{};
+
+  float upper_threshold_;
+  float lower_threshold_;
 };
 
 }  // namespace analog_threshold

esphome/components/analog_threshold/binary_sensor.py

@@ -1,7 +1,10 @@
 import esphome.codegen as cg
-from esphome.components import binary_sensor, sensor
 import esphome.config_validation as cv
-from esphome.const import CONF_SENSOR_ID, CONF_THRESHOLD
+from esphome.components import binary_sensor, sensor
+from esphome.const import (
+    CONF_SENSOR_ID,
+    CONF_THRESHOLD,
+)
 
 analog_threshold_ns = cg.esphome_ns.namespace("analog_threshold")
 
@@ -18,11 +21,11 @@ CONFIG_SCHEMA = (
         {
             cv.Required(CONF_SENSOR_ID): cv.use_id(sensor.Sensor),
             cv.Required(CONF_THRESHOLD): cv.Any(
-                cv.templatable(cv.float_),
+                cv.float_,
                 cv.Schema(
                     {
-                        cv.Required(CONF_UPPER): cv.templatable(cv.float_),
-                        cv.Required(CONF_LOWER): cv.templatable(cv.float_),
+                        cv.Required(CONF_UPPER): cv.float_,
+                        cv.Required(CONF_LOWER): cv.float_,
                     }
                 ),
             ),
@@ -39,11 +42,9 @@ async def to_code(config):
     sens = await cg.get_variable(config[CONF_SENSOR_ID])
     cg.add(var.set_sensor(sens))
 
-    if isinstance(config[CONF_THRESHOLD], dict):
-        lower = await cg.templatable(config[CONF_THRESHOLD][CONF_LOWER], [], float)
-        upper = await cg.templatable(config[CONF_THRESHOLD][CONF_UPPER], [], float)
+    if isinstance(config[CONF_THRESHOLD], float):
+        cg.add(var.set_upper_threshold(config[CONF_THRESHOLD]))
+        cg.add(var.set_lower_threshold(config[CONF_THRESHOLD]))
     else:
-        lower = await cg.templatable(config[CONF_THRESHOLD], [], float)
-        upper = lower
-    cg.add(var.set_upper_threshold(upper))
-    cg.add(var.set_lower_threshold(lower))
+        cg.add(var.set_upper_threshold(config[CONF_THRESHOLD][CONF_UPPER]))
+        cg.add(var.set_lower_threshold(config[CONF_THRESHOLD][CONF_LOWER]))

esphome/components/anova/climate.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, climate
 import esphome.config_validation as cv
+from esphome.components import climate, ble_client
 from esphome.const import CONF_ID, CONF_UNIT_OF_MEASUREMENT
 
 UNITS = {

esphome/components/apds9306/sensor.py

@@ -2,8 +2,8 @@
 # https://www.mouser.ca/datasheet/2/678/AVGO_S_A0002854364_1-2574547.pdf
 
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
     CONF_GAIN,
     DEVICE_CLASS_ILLUMINANCE,

esphome/components/apds9960/__init__.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.components import i2c
 from esphome.const import CONF_ID
 
 DEPENDENCIES = ["i2c"]

esphome/components/apds9960/binary_sensor.py

@@ -1,8 +1,7 @@
 import esphome.codegen as cg
-from esphome.components import binary_sensor
 import esphome.config_validation as cv
+from esphome.components import binary_sensor
 from esphome.const import CONF_DIRECTION, DEVICE_CLASS_MOVING
-
 from . import APDS9960, CONF_APDS9960_ID
 
 DEPENDENCIES = ["apds9960"]

esphome/components/apds9960/sensor.py

@@ -1,13 +1,12 @@
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
 from esphome.const import (
     CONF_TYPE,
-    ICON_LIGHTBULB,
     STATE_CLASS_MEASUREMENT,
     UNIT_PERCENT,
+    ICON_LIGHTBULB,
 )
-
 from . import APDS9960, CONF_APDS9960_ID
 
 DEPENDENCIES = ["apds9960"]

esphome/components/api/__init__.py

@@ -82,19 +82,6 @@ ACTIONS_SCHEMA = automation.validate_automation(
     ),
 )
 
-ENCRYPTION_SCHEMA = cv.Schema(
-    {
-        cv.Optional(CONF_KEY): validate_encryption_key,
-    }
-)
-
-
-def _encryption_schema(config):
-    if config is None:
-        config = {}
-    return ENCRYPTION_SCHEMA(config)
-
-
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
@@ -108,7 +95,11 @@ CONFIG_SCHEMA = cv.All(
                 CONF_SERVICES, group_of_exclusion=CONF_ACTIONS
             ): ACTIONS_SCHEMA,
             cv.Exclusive(CONF_ACTIONS, group_of_exclusion=CONF_ACTIONS): ACTIONS_SCHEMA,
-            cv.Optional(CONF_ENCRYPTION): _encryption_schema,
+            cv.Optional(CONF_ENCRYPTION): cv.Schema(
+                {
+                    cv.Required(CONF_KEY): validate_encryption_key,
+                }
+            ),
             cv.Optional(CONF_ON_CLIENT_CONNECTED): automation.validate_automation(
                 single=True
             ),
@@ -160,17 +151,9 @@ async def to_code(config):
             config[CONF_ON_CLIENT_DISCONNECTED],
         )
 
-    if (encryption_config := config.get(CONF_ENCRYPTION, None)) is not None:
-        if key := encryption_config.get(CONF_KEY):
-            decoded = base64.b64decode(key)
-            cg.add(var.set_noise_psk(list(decoded)))
-        else:
-            # No key provided, but encryption desired
-            # This will allow a plaintext client to provide a noise key,
-            # send it to the device, and then switch to noise.
-            # The key will be saved in flash and used for future connections
-            # and plaintext disabled. Only a factory reset can remove it.
-            cg.add_define("USE_API_PLAINTEXT")
+    if encryption_config := config.get(CONF_ENCRYPTION):
+        decoded = base64.b64decode(encryption_config[CONF_KEY])
+        cg.add(var.set_noise_psk(list(decoded)))
         cg.add_define("USE_API_NOISE")
         cg.add_library("esphome/noise-c", "0.1.6")
     else:

esphome/components/api/api.proto

@@ -31,7 +31,6 @@ service APIConnection {
     option (needs_authentication) = false;
   }
   rpc execute_service (ExecuteServiceRequest) returns (void) {}
-  rpc noise_encryption_set_key (NoiseEncryptionSetKeyRequest) returns (NoiseEncryptionSetKeyResponse) {}
 
   rpc cover_command (CoverCommandRequest) returns (void) {}
   rpc fan_command (FanCommandRequest) returns (void) {}
@@ -228,12 +227,6 @@ message DeviceInfoResponse {
   uint32 voice_assistant_feature_flags = 17;
 
   string suggested_area = 16;
-
-  // The Bluetooth mac address of the device. For example "AC:BC:32:89:0E:AA"
-  string bluetooth_mac_address = 18;
-
-  // Supports receiving and saving api encryption key
-  bool api_encryption_supported = 19;
 }
 
 message ListEntitiesRequest {
@@ -658,23 +651,6 @@ message SubscribeLogsResponse {
   bool send_failed = 4;
 }
 
-// ==================== NOISE ENCRYPTION ====================
-message NoiseEncryptionSetKeyRequest {
-  option (id) = 124;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_API_NOISE";
-
-  bytes key = 1;
-}
-
-message NoiseEncryptionSetKeyResponse {
-  option (id) = 125;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_API_NOISE";
-
-  bool success = 1;
-}
-
 // ==================== HOMEASSISTANT.SERVICE ====================
 message SubscribeHomeassistantServicesRequest {
   option (id) = 34;
@@ -1588,8 +1564,6 @@ message VoiceAssistantAnnounceRequest {
 
   string media_id = 1;
   string text = 2;
-  string preannounce_media_id = 3;
-  bool start_conversation = 4;
 }
 
 message VoiceAssistantAnnounceFinished {

esphome/components/api/api_connection.cpp

@@ -28,48 +28,11 @@ namespace api {
 static const char *const TAG = "api.connection";
 static const int ESP32_CAMERA_STOP_STREAM = 5000;
 
-// helper for allowing only unique entries in the queue
-void DeferredMessageQueue::dmq_push_back_with_dedup_(void *source, send_message_t *send_message) {
-  DeferredMessage item(source, send_message);
-
-  auto iter = std::find_if(this->deferred_queue_.begin(), this->deferred_queue_.end(),
-                           [&item](const DeferredMessage &test) -> bool { return test == item; });
-
-  if (iter != this->deferred_queue_.end()) {
-    (*iter) = item;
-  } else {
-    this->deferred_queue_.push_back(item);
-  }
-}
-
-void DeferredMessageQueue::process_queue() {
-  while (!deferred_queue_.empty()) {
-    DeferredMessage &de = deferred_queue_.front();
-    if (de.send_message_(this->api_connection_, de.source_)) {
-      // O(n) but memory efficiency is more important than speed here which is why std::vector was chosen
-      deferred_queue_.erase(deferred_queue_.begin());
-    } else {
-      break;
-    }
-  }
-}
-
-void DeferredMessageQueue::defer(void *source, send_message_t *send_message) {
-  this->dmq_push_back_with_dedup_(source, send_message);
-}
-
 APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *parent)
-    : parent_(parent), deferred_message_queue_(this), initial_state_iterator_(this), list_entities_iterator_(this) {
+    : parent_(parent), initial_state_iterator_(this), list_entities_iterator_(this) {
   this->proto_write_buffer_.reserve(64);
 
-#if defined(USE_API_PLAINTEXT) && defined(USE_API_NOISE)
-  auto noise_ctx = parent->get_noise_ctx();
-  if (noise_ctx->has_psk()) {
-    this->helper_ = std::unique_ptr<APIFrameHelper>{new APINoiseFrameHelper(std::move(sock), noise_ctx)};
-  } else {
-    this->helper_ = std::unique_ptr<APIFrameHelper>{new APIPlaintextFrameHelper(std::move(sock))};
-  }
-#elif defined(USE_API_PLAINTEXT)
+#if defined(USE_API_PLAINTEXT)
   this->helper_ = std::unique_ptr<APIFrameHelper>{new APIPlaintextFrameHelper(std::move(sock))};
 #elif defined(USE_API_NOISE)
   this->helper_ = std::unique_ptr<APIFrameHelper>{new APINoiseFrameHelper(std::move(sock), parent->get_noise_ctx())};
@@ -153,12 +116,8 @@ void APIConnection::loop() {
       return;
   }
 
-  this->deferred_message_queue_.process_queue();
-
-  if (!this->list_entities_iterator_.completed())
-    this->list_entities_iterator_.advance();
-  if (!this->initial_state_iterator_.completed() && this->list_entities_iterator_.completed())
-    this->initial_state_iterator_.advance();
+  this->list_entities_iterator_.advance();
+  this->initial_state_iterator_.advance();
 
   static uint32_t keepalive = 60000;
   static uint8_t max_ping_retries = 60;
@@ -251,31 +210,13 @@ bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_binary_sensor_state(this, binary_sensor, state)) {
-    this->deferred_message_queue_.defer(binary_sensor, try_send_binary_sensor_state);
-  }
-
-  return true;
-}
-void APIConnection::send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor) {
-  if (!APIConnection::try_send_binary_sensor_info(this, binary_sensor)) {
-    this->deferred_message_queue_.defer(binary_sensor, try_send_binary_sensor_info);
-  }
-}
-bool APIConnection::try_send_binary_sensor_state(APIConnection *api, void *v_binary_sensor) {
-  binary_sensor::BinarySensor *binary_sensor = reinterpret_cast<binary_sensor::BinarySensor *>(v_binary_sensor);
-  return APIConnection::try_send_binary_sensor_state(api, binary_sensor, binary_sensor->state);
-}
-bool APIConnection::try_send_binary_sensor_state(APIConnection *api, binary_sensor::BinarySensor *binary_sensor,
-                                                 bool state) {
   BinarySensorStateResponse resp;
   resp.key = binary_sensor->get_object_id_hash();
   resp.state = state;
   resp.missing_state = !binary_sensor->has_state();
-  return api->send_binary_sensor_state_response(resp);
+  return this->send_binary_sensor_state_response(resp);
 }
-bool APIConnection::try_send_binary_sensor_info(APIConnection *api, void *v_binary_sensor) {
-  binary_sensor::BinarySensor *binary_sensor = reinterpret_cast<binary_sensor::BinarySensor *>(v_binary_sensor);
+bool APIConnection::send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor) {
   ListEntitiesBinarySensorResponse msg;
   msg.object_id = binary_sensor->get_object_id();
   msg.key = binary_sensor->get_object_id_hash();
@@ -287,7 +228,7 @@ bool APIConnection::try_send_binary_sensor_info(APIConnection *api, void *v_bina
   msg.disabled_by_default = binary_sensor->is_disabled_by_default();
   msg.icon = binary_sensor->get_icon();
   msg.entity_category = static_cast<enums::EntityCategory>(binary_sensor->get_entity_category());
-  return api->send_list_entities_binary_sensor_response(msg);
+  return this->send_list_entities_binary_sensor_response(msg);
 }
 #endif
 
@@ -296,19 +237,6 @@ bool APIConnection::send_cover_state(cover::Cover *cover) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_cover_state(this, cover)) {
-    this->deferred_message_queue_.defer(cover, try_send_cover_state);
-  }
-
-  return true;
-}
-void APIConnection::send_cover_info(cover::Cover *cover) {
-  if (!APIConnection::try_send_cover_info(this, cover)) {
-    this->deferred_message_queue_.defer(cover, try_send_cover_info);
-  }
-}
-bool APIConnection::try_send_cover_state(APIConnection *api, void *v_cover) {
-  cover::Cover *cover = reinterpret_cast<cover::Cover *>(v_cover);
   auto traits = cover->get_traits();
   CoverStateResponse resp{};
   resp.key = cover->get_object_id_hash();
@@ -318,10 +246,9 @@ bool APIConnection::try_send_cover_state(APIConnection *api, void *v_cover) {
   if (traits.get_supports_tilt())
     resp.tilt = cover->tilt;
   resp.current_operation = static_cast<enums::CoverOperation>(cover->current_operation);
-  return api->send_cover_state_response(resp);
+  return this->send_cover_state_response(resp);
 }
-bool APIConnection::try_send_cover_info(APIConnection *api, void *v_cover) {
-  cover::Cover *cover = reinterpret_cast<cover::Cover *>(v_cover);
+bool APIConnection::send_cover_info(cover::Cover *cover) {
   auto traits = cover->get_traits();
   ListEntitiesCoverResponse msg;
   msg.key = cover->get_object_id_hash();
@@ -337,7 +264,7 @@ bool APIConnection::try_send_cover_info(APIConnection *api, void *v_cover) {
   msg.disabled_by_default = cover->is_disabled_by_default();
   msg.icon = cover->get_icon();
   msg.entity_category = static_cast<enums::EntityCategory>(cover->get_entity_category());
-  return api->send_list_entities_cover_response(msg);
+  return this->send_list_entities_cover_response(msg);
 }
 void APIConnection::cover_command(const CoverCommandRequest &msg) {
   cover::Cover *cover = App.get_cover_by_key(msg.key);
@@ -373,19 +300,6 @@ bool APIConnection::send_fan_state(fan::Fan *fan) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_fan_state(this, fan)) {
-    this->deferred_message_queue_.defer(fan, try_send_fan_state);
-  }
-
-  return true;
-}
-void APIConnection::send_fan_info(fan::Fan *fan) {
-  if (!APIConnection::try_send_fan_info(this, fan)) {
-    this->deferred_message_queue_.defer(fan, try_send_fan_info);
-  }
-}
-bool APIConnection::try_send_fan_state(APIConnection *api, void *v_fan) {
-  fan::Fan *fan = reinterpret_cast<fan::Fan *>(v_fan);
   auto traits = fan->get_traits();
   FanStateResponse resp{};
   resp.key = fan->get_object_id_hash();
@@ -399,10 +313,9 @@ bool APIConnection::try_send_fan_state(APIConnection *api, void *v_fan) {
     resp.direction = static_cast<enums::FanDirection>(fan->direction);
   if (traits.supports_preset_modes())
     resp.preset_mode = fan->preset_mode;
-  return api->send_fan_state_response(resp);
+  return this->send_fan_state_response(resp);
 }
-bool APIConnection::try_send_fan_info(APIConnection *api, void *v_fan) {
-  fan::Fan *fan = reinterpret_cast<fan::Fan *>(v_fan);
+bool APIConnection::send_fan_info(fan::Fan *fan) {
   auto traits = fan->get_traits();
   ListEntitiesFanResponse msg;
   msg.key = fan->get_object_id_hash();
@@ -419,7 +332,7 @@ bool APIConnection::try_send_fan_info(APIConnection *api, void *v_fan) {
   msg.disabled_by_default = fan->is_disabled_by_default();
   msg.icon = fan->get_icon();
   msg.entity_category = static_cast<enums::EntityCategory>(fan->get_entity_category());
-  return api->send_list_entities_fan_response(msg);
+  return this->send_list_entities_fan_response(msg);
 }
 void APIConnection::fan_command(const FanCommandRequest &msg) {
   fan::Fan *fan = App.get_fan_by_key(msg.key);
@@ -448,19 +361,6 @@ bool APIConnection::send_light_state(light::LightState *light) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_light_state(this, light)) {
-    this->deferred_message_queue_.defer(light, try_send_light_state);
-  }
-
-  return true;
-}
-void APIConnection::send_light_info(light::LightState *light) {
-  if (!APIConnection::try_send_light_info(this, light)) {
-    this->deferred_message_queue_.defer(light, try_send_light_info);
-  }
-}
-bool APIConnection::try_send_light_state(APIConnection *api, void *v_light) {
-  light::LightState *light = reinterpret_cast<light::LightState *>(v_light);
   auto traits = light->get_traits();
   auto values = light->remote_values;
   auto color_mode = values.get_color_mode();
@@ -480,10 +380,9 @@ bool APIConnection::try_send_light_state(APIConnection *api, void *v_light) {
   resp.warm_white = values.get_warm_white();
   if (light->supports_effects())
     resp.effect = light->get_effect_name();
-  return api->send_light_state_response(resp);
+  return this->send_light_state_response(resp);
 }
-bool APIConnection::try_send_light_info(APIConnection *api, void *v_light) {
-  light::LightState *light = reinterpret_cast<light::LightState *>(v_light);
+bool APIConnection::send_light_info(light::LightState *light) {
   auto traits = light->get_traits();
   ListEntitiesLightResponse msg;
   msg.key = light->get_object_id_hash();
@@ -516,7 +415,7 @@ bool APIConnection::try_send_light_info(APIConnection *api, void *v_light) {
     for (auto *effect : light->get_effects())
       msg.effects.push_back(effect->get_name());
   }
-  return api->send_list_entities_light_response(msg);
+  return this->send_list_entities_light_response(msg);
 }
 void APIConnection::light_command(const LightCommandRequest &msg) {
   light::LightState *light = App.get_light_by_key(msg.key);
@@ -560,30 +459,13 @@ bool APIConnection::send_sensor_state(sensor::Sensor *sensor, float state) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_sensor_state(this, sensor, state)) {
-    this->deferred_message_queue_.defer(sensor, try_send_sensor_state);
-  }
-
-  return true;
-}
-void APIConnection::send_sensor_info(sensor::Sensor *sensor) {
-  if (!APIConnection::try_send_sensor_info(this, sensor)) {
-    this->deferred_message_queue_.defer(sensor, try_send_sensor_info);
-  }
-}
-bool APIConnection::try_send_sensor_state(APIConnection *api, void *v_sensor) {
-  sensor::Sensor *sensor = reinterpret_cast<sensor::Sensor *>(v_sensor);
-  return APIConnection::try_send_sensor_state(api, sensor, sensor->state);
-}
-bool APIConnection::try_send_sensor_state(APIConnection *api, sensor::Sensor *sensor, float state) {
   SensorStateResponse resp{};
   resp.key = sensor->get_object_id_hash();
   resp.state = state;
   resp.missing_state = !sensor->has_state();
-  return api->send_sensor_state_response(resp);
+  return this->send_sensor_state_response(resp);
 }
-bool APIConnection::try_send_sensor_info(APIConnection *api, void *v_sensor) {
-  sensor::Sensor *sensor = reinterpret_cast<sensor::Sensor *>(v_sensor);
+bool APIConnection::send_sensor_info(sensor::Sensor *sensor) {
   ListEntitiesSensorResponse msg;
   msg.key = sensor->get_object_id_hash();
   msg.object_id = sensor->get_object_id();
@@ -600,7 +482,7 @@ bool APIConnection::try_send_sensor_info(APIConnection *api, void *v_sensor) {
   msg.state_class = static_cast<enums::SensorStateClass>(sensor->get_state_class());
   msg.disabled_by_default = sensor->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(sensor->get_entity_category());
-  return api->send_list_entities_sensor_response(msg);
+  return this->send_list_entities_sensor_response(msg);
 }
 #endif
 
@@ -609,29 +491,12 @@ bool APIConnection::send_switch_state(switch_::Switch *a_switch, bool state) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_switch_state(this, a_switch, state)) {
-    this->deferred_message_queue_.defer(a_switch, try_send_switch_state);
-  }
-
-  return true;
-}
-void APIConnection::send_switch_info(switch_::Switch *a_switch) {
-  if (!APIConnection::try_send_switch_info(this, a_switch)) {
-    this->deferred_message_queue_.defer(a_switch, try_send_switch_info);
-  }
-}
-bool APIConnection::try_send_switch_state(APIConnection *api, void *v_a_switch) {
-  switch_::Switch *a_switch = reinterpret_cast<switch_::Switch *>(v_a_switch);
-  return APIConnection::try_send_switch_state(api, a_switch, a_switch->state);
-}
-bool APIConnection::try_send_switch_state(APIConnection *api, switch_::Switch *a_switch, bool state) {
   SwitchStateResponse resp{};
   resp.key = a_switch->get_object_id_hash();
   resp.state = state;
-  return api->send_switch_state_response(resp);
+  return this->send_switch_state_response(resp);
 }
-bool APIConnection::try_send_switch_info(APIConnection *api, void *v_a_switch) {
-  switch_::Switch *a_switch = reinterpret_cast<switch_::Switch *>(v_a_switch);
+bool APIConnection::send_switch_info(switch_::Switch *a_switch) {
   ListEntitiesSwitchResponse msg;
   msg.key = a_switch->get_object_id_hash();
   msg.object_id = a_switch->get_object_id();
@@ -643,7 +508,7 @@ bool APIConnection::try_send_switch_info(APIConnection *api, void *v_a_switch) {
   msg.disabled_by_default = a_switch->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(a_switch->get_entity_category());
   msg.device_class = a_switch->get_device_class();
-  return api->send_list_entities_switch_response(msg);
+  return this->send_list_entities_switch_response(msg);
 }
 void APIConnection::switch_command(const SwitchCommandRequest &msg) {
   switch_::Switch *a_switch = App.get_switch_by_key(msg.key);
@@ -663,31 +528,13 @@ bool APIConnection::send_text_sensor_state(text_sensor::TextSensor *text_sensor,
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_text_sensor_state(this, text_sensor, std::move(state))) {
-    this->deferred_message_queue_.defer(text_sensor, try_send_text_sensor_state);
-  }
-
-  return true;
-}
-void APIConnection::send_text_sensor_info(text_sensor::TextSensor *text_sensor) {
-  if (!APIConnection::try_send_text_sensor_info(this, text_sensor)) {
-    this->deferred_message_queue_.defer(text_sensor, try_send_text_sensor_info);
-  }
-}
-bool APIConnection::try_send_text_sensor_state(APIConnection *api, void *v_text_sensor) {
-  text_sensor::TextSensor *text_sensor = reinterpret_cast<text_sensor::TextSensor *>(v_text_sensor);
-  return APIConnection::try_send_text_sensor_state(api, text_sensor, text_sensor->state);
-}
-bool APIConnection::try_send_text_sensor_state(APIConnection *api, text_sensor::TextSensor *text_sensor,
-                                               std::string state) {
   TextSensorStateResponse resp{};
   resp.key = text_sensor->get_object_id_hash();
   resp.state = std::move(state);
   resp.missing_state = !text_sensor->has_state();
-  return api->send_text_sensor_state_response(resp);
+  return this->send_text_sensor_state_response(resp);
 }
-bool APIConnection::try_send_text_sensor_info(APIConnection *api, void *v_text_sensor) {
-  text_sensor::TextSensor *text_sensor = reinterpret_cast<text_sensor::TextSensor *>(v_text_sensor);
+bool APIConnection::send_text_sensor_info(text_sensor::TextSensor *text_sensor) {
   ListEntitiesTextSensorResponse msg;
   msg.key = text_sensor->get_object_id_hash();
   msg.object_id = text_sensor->get_object_id();
@@ -699,7 +546,7 @@ bool APIConnection::try_send_text_sensor_info(APIConnection *api, void *v_text_s
   msg.disabled_by_default = text_sensor->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(text_sensor->get_entity_category());
   msg.device_class = text_sensor->get_device_class();
-  return api->send_list_entities_text_sensor_response(msg);
+  return this->send_list_entities_text_sensor_response(msg);
 }
 #endif
 
@@ -708,19 +555,6 @@ bool APIConnection::send_climate_state(climate::Climate *climate) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_climate_state(this, climate)) {
-    this->deferred_message_queue_.defer(climate, try_send_climate_state);
-  }
-
-  return true;
-}
-void APIConnection::send_climate_info(climate::Climate *climate) {
-  if (!APIConnection::try_send_climate_info(this, climate)) {
-    this->deferred_message_queue_.defer(climate, try_send_climate_info);
-  }
-}
-bool APIConnection::try_send_climate_state(APIConnection *api, void *v_climate) {
-  climate::Climate *climate = reinterpret_cast<climate::Climate *>(v_climate);
   auto traits = climate->get_traits();
   ClimateStateResponse resp{};
   resp.key = climate->get_object_id_hash();
@@ -749,10 +583,9 @@ bool APIConnection::try_send_climate_state(APIConnection *api, void *v_climate)
     resp.current_humidity = climate->current_humidity;
   if (traits.get_supports_target_humidity())
     resp.target_humidity = climate->target_humidity;
-  return api->send_climate_state_response(resp);
+  return this->send_climate_state_response(resp);
 }
-bool APIConnection::try_send_climate_info(APIConnection *api, void *v_climate) {
-  climate::Climate *climate = reinterpret_cast<climate::Climate *>(v_climate);
+bool APIConnection::send_climate_info(climate::Climate *climate) {
   auto traits = climate->get_traits();
   ListEntitiesClimateResponse msg;
   msg.key = climate->get_object_id_hash();
@@ -793,7 +626,7 @@ bool APIConnection::try_send_climate_info(APIConnection *api, void *v_climate) {
     msg.supported_custom_presets.push_back(custom_preset);
   for (auto swing_mode : traits.get_supported_swing_modes())
     msg.supported_swing_modes.push_back(static_cast<enums::ClimateSwingMode>(swing_mode));
-  return api->send_list_entities_climate_response(msg);
+  return this->send_list_entities_climate_response(msg);
 }
 void APIConnection::climate_command(const ClimateCommandRequest &msg) {
   climate::Climate *climate = App.get_climate_by_key(msg.key);
@@ -830,30 +663,13 @@ bool APIConnection::send_number_state(number::Number *number, float state) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_number_state(this, number, state)) {
-    this->deferred_message_queue_.defer(number, try_send_number_state);
-  }
-
-  return true;
-}
-void APIConnection::send_number_info(number::Number *number) {
-  if (!APIConnection::try_send_number_info(this, number)) {
-    this->deferred_message_queue_.defer(number, try_send_number_info);
-  }
-}
-bool APIConnection::try_send_number_state(APIConnection *api, void *v_number) {
-  number::Number *number = reinterpret_cast<number::Number *>(v_number);
-  return APIConnection::try_send_number_state(api, number, number->state);
-}
-bool APIConnection::try_send_number_state(APIConnection *api, number::Number *number, float state) {
   NumberStateResponse resp{};
   resp.key = number->get_object_id_hash();
   resp.state = state;
   resp.missing_state = !number->has_state();
-  return api->send_number_state_response(resp);
+  return this->send_number_state_response(resp);
 }
-bool APIConnection::try_send_number_info(APIConnection *api, void *v_number) {
-  number::Number *number = reinterpret_cast<number::Number *>(v_number);
+bool APIConnection::send_number_info(number::Number *number) {
   ListEntitiesNumberResponse msg;
   msg.key = number->get_object_id_hash();
   msg.object_id = number->get_object_id();
@@ -871,7 +687,7 @@ bool APIConnection::try_send_number_info(APIConnection *api, void *v_number) {
   msg.max_value = number->traits.get_max_value();
   msg.step = number->traits.get_step();
 
-  return api->send_list_entities_number_response(msg);
+  return this->send_list_entities_number_response(msg);
 }
 void APIConnection::number_command(const NumberCommandRequest &msg) {
   number::Number *number = App.get_number_by_key(msg.key);
@@ -889,29 +705,15 @@ bool APIConnection::send_date_state(datetime::DateEntity *date) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_date_state(this, date)) {
-    this->deferred_message_queue_.defer(date, try_send_date_state);
-  }
-
-  return true;
-}
-void APIConnection::send_date_info(datetime::DateEntity *date) {
-  if (!APIConnection::try_send_date_info(this, date)) {
-    this->deferred_message_queue_.defer(date, try_send_date_info);
-  }
-}
-bool APIConnection::try_send_date_state(APIConnection *api, void *v_date) {
-  datetime::DateEntity *date = reinterpret_cast<datetime::DateEntity *>(v_date);
   DateStateResponse resp{};
   resp.key = date->get_object_id_hash();
   resp.missing_state = !date->has_state();
   resp.year = date->year;
   resp.month = date->month;
   resp.day = date->day;
-  return api->send_date_state_response(resp);
+  return this->send_date_state_response(resp);
 }
-bool APIConnection::try_send_date_info(APIConnection *api, void *v_date) {
-  datetime::DateEntity *date = reinterpret_cast<datetime::DateEntity *>(v_date);
+bool APIConnection::send_date_info(datetime::DateEntity *date) {
   ListEntitiesDateResponse msg;
   msg.key = date->get_object_id_hash();
   msg.object_id = date->get_object_id();
@@ -922,7 +724,7 @@ bool APIConnection::try_send_date_info(APIConnection *api, void *v_date) {
   msg.disabled_by_default = date->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(date->get_entity_category());
 
-  return api->send_list_entities_date_response(msg);
+  return this->send_list_entities_date_response(msg);
 }
 void APIConnection::date_command(const DateCommandRequest &msg) {
   datetime::DateEntity *date = App.get_date_by_key(msg.key);
@@ -940,29 +742,15 @@ bool APIConnection::send_time_state(datetime::TimeEntity *time) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_time_state(this, time)) {
-    this->deferred_message_queue_.defer(time, try_send_time_state);
-  }
-
-  return true;
-}
-void APIConnection::send_time_info(datetime::TimeEntity *time) {
-  if (!APIConnection::try_send_time_info(this, time)) {
-    this->deferred_message_queue_.defer(time, try_send_time_info);
-  }
-}
-bool APIConnection::try_send_time_state(APIConnection *api, void *v_time) {
-  datetime::TimeEntity *time = reinterpret_cast<datetime::TimeEntity *>(v_time);
   TimeStateResponse resp{};
   resp.key = time->get_object_id_hash();
   resp.missing_state = !time->has_state();
   resp.hour = time->hour;
   resp.minute = time->minute;
   resp.second = time->second;
-  return api->send_time_state_response(resp);
+  return this->send_time_state_response(resp);
 }
-bool APIConnection::try_send_time_info(APIConnection *api, void *v_time) {
-  datetime::TimeEntity *time = reinterpret_cast<datetime::TimeEntity *>(v_time);
+bool APIConnection::send_time_info(datetime::TimeEntity *time) {
   ListEntitiesTimeResponse msg;
   msg.key = time->get_object_id_hash();
   msg.object_id = time->get_object_id();
@@ -973,7 +761,7 @@ bool APIConnection::try_send_time_info(APIConnection *api, void *v_time) {
   msg.disabled_by_default = time->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(time->get_entity_category());
 
-  return api->send_list_entities_time_response(msg);
+  return this->send_list_entities_time_response(msg);
 }
 void APIConnection::time_command(const TimeCommandRequest &msg) {
   datetime::TimeEntity *time = App.get_time_by_key(msg.key);
@@ -991,19 +779,6 @@ bool APIConnection::send_datetime_state(datetime::DateTimeEntity *datetime) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_datetime_state(this, datetime)) {
-    this->deferred_message_queue_.defer(datetime, try_send_datetime_state);
-  }
-
-  return true;
-}
-void APIConnection::send_datetime_info(datetime::DateTimeEntity *datetime) {
-  if (!APIConnection::try_send_datetime_info(this, datetime)) {
-    this->deferred_message_queue_.defer(datetime, try_send_datetime_info);
-  }
-}
-bool APIConnection::try_send_datetime_state(APIConnection *api, void *v_datetime) {
-  datetime::DateTimeEntity *datetime = reinterpret_cast<datetime::DateTimeEntity *>(v_datetime);
   DateTimeStateResponse resp{};
   resp.key = datetime->get_object_id_hash();
   resp.missing_state = !datetime->has_state();
@@ -1011,10 +786,9 @@ bool APIConnection::try_send_datetime_state(APIConnection *api, void *v_datetime
     ESPTime state = datetime->state_as_esptime();
     resp.epoch_seconds = state.timestamp;
   }
-  return api->send_date_time_state_response(resp);
+  return this->send_date_time_state_response(resp);
 }
-bool APIConnection::try_send_datetime_info(APIConnection *api, void *v_datetime) {
-  datetime::DateTimeEntity *datetime = reinterpret_cast<datetime::DateTimeEntity *>(v_datetime);
+bool APIConnection::send_datetime_info(datetime::DateTimeEntity *datetime) {
   ListEntitiesDateTimeResponse msg;
   msg.key = datetime->get_object_id_hash();
   msg.object_id = datetime->get_object_id();
@@ -1025,7 +799,7 @@ bool APIConnection::try_send_datetime_info(APIConnection *api, void *v_datetime)
   msg.disabled_by_default = datetime->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(datetime->get_entity_category());
 
-  return api->send_list_entities_date_time_response(msg);
+  return this->send_list_entities_date_time_response(msg);
 }
 void APIConnection::datetime_command(const DateTimeCommandRequest &msg) {
   datetime::DateTimeEntity *datetime = App.get_datetime_by_key(msg.key);
@@ -1043,30 +817,13 @@ bool APIConnection::send_text_state(text::Text *text, std::string state) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_text_state(this, text, std::move(state))) {
-    this->deferred_message_queue_.defer(text, try_send_text_state);
-  }
-
-  return true;
-}
-void APIConnection::send_text_info(text::Text *text) {
-  if (!APIConnection::try_send_text_info(this, text)) {
-    this->deferred_message_queue_.defer(text, try_send_text_info);
-  }
-}
-bool APIConnection::try_send_text_state(APIConnection *api, void *v_text) {
-  text::Text *text = reinterpret_cast<text::Text *>(v_text);
-  return APIConnection::try_send_text_state(api, text, text->state);
-}
-bool APIConnection::try_send_text_state(APIConnection *api, text::Text *text, std::string state) {
   TextStateResponse resp{};
   resp.key = text->get_object_id_hash();
   resp.state = std::move(state);
   resp.missing_state = !text->has_state();
-  return api->send_text_state_response(resp);
+  return this->send_text_state_response(resp);
 }
-bool APIConnection::try_send_text_info(APIConnection *api, void *v_text) {
-  text::Text *text = reinterpret_cast<text::Text *>(v_text);
+bool APIConnection::send_text_info(text::Text *text) {
   ListEntitiesTextResponse msg;
   msg.key = text->get_object_id_hash();
   msg.object_id = text->get_object_id();
@@ -1080,7 +837,7 @@ bool APIConnection::try_send_text_info(APIConnection *api, void *v_text) {
   msg.max_length = text->traits.get_max_length();
   msg.pattern = text->traits.get_pattern();
 
-  return api->send_list_entities_text_response(msg);
+  return this->send_list_entities_text_response(msg);
 }
 void APIConnection::text_command(const TextCommandRequest &msg) {
   text::Text *text = App.get_text_by_key(msg.key);
@@ -1098,30 +855,13 @@ bool APIConnection::send_select_state(select::Select *select, std::string state)
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_select_state(this, select, std::move(state))) {
-    this->deferred_message_queue_.defer(select, try_send_select_state);
-  }
-
-  return true;
-}
-void APIConnection::send_select_info(select::Select *select) {
-  if (!APIConnection::try_send_select_info(this, select)) {
-    this->deferred_message_queue_.defer(select, try_send_select_info);
-  }
-}
-bool APIConnection::try_send_select_state(APIConnection *api, void *v_select) {
-  select::Select *select = reinterpret_cast<select::Select *>(v_select);
-  return APIConnection::try_send_select_state(api, select, select->state);
-}
-bool APIConnection::try_send_select_state(APIConnection *api, select::Select *select, std::string state) {
   SelectStateResponse resp{};
   resp.key = select->get_object_id_hash();
   resp.state = std::move(state);
   resp.missing_state = !select->has_state();
-  return api->send_select_state_response(resp);
+  return this->send_select_state_response(resp);
 }
-bool APIConnection::try_send_select_info(APIConnection *api, void *v_select) {
-  select::Select *select = reinterpret_cast<select::Select *>(v_select);
+bool APIConnection::send_select_info(select::Select *select) {
   ListEntitiesSelectResponse msg;
   msg.key = select->get_object_id_hash();
   msg.object_id = select->get_object_id();
@@ -1135,7 +875,7 @@ bool APIConnection::try_send_select_info(APIConnection *api, void *v_select) {
   for (const auto &option : select->traits.get_options())
     msg.options.push_back(option);
 
-  return api->send_list_entities_select_response(msg);
+  return this->send_list_entities_select_response(msg);
 }
 void APIConnection::select_command(const SelectCommandRequest &msg) {
   select::Select *select = App.get_select_by_key(msg.key);
@@ -1149,13 +889,7 @@ void APIConnection::select_command(const SelectCommandRequest &msg) {
 #endif
 
 #ifdef USE_BUTTON
-void APIConnection::send_button_info(button::Button *button) {
-  if (!APIConnection::try_send_button_info(this, button)) {
-    this->deferred_message_queue_.defer(button, try_send_button_info);
-  }
-}
-bool APIConnection::try_send_button_info(APIConnection *api, void *v_button) {
-  button::Button *button = reinterpret_cast<button::Button *>(v_button);
+bool APIConnection::send_button_info(button::Button *button) {
   ListEntitiesButtonResponse msg;
   msg.key = button->get_object_id_hash();
   msg.object_id = button->get_object_id();
@@ -1166,7 +900,7 @@ bool APIConnection::try_send_button_info(APIConnection *api, void *v_button) {
   msg.disabled_by_default = button->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(button->get_entity_category());
   msg.device_class = button->get_device_class();
-  return api->send_list_entities_button_response(msg);
+  return this->send_list_entities_button_response(msg);
 }
 void APIConnection::button_command(const ButtonCommandRequest &msg) {
   button::Button *button = App.get_button_by_key(msg.key);
@@ -1182,29 +916,12 @@ bool APIConnection::send_lock_state(lock::Lock *a_lock, lock::LockState state) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_lock_state(this, a_lock, state)) {
-    this->deferred_message_queue_.defer(a_lock, try_send_lock_state);
-  }
-
-  return true;
-}
-void APIConnection::send_lock_info(lock::Lock *a_lock) {
-  if (!APIConnection::try_send_lock_info(this, a_lock)) {
-    this->deferred_message_queue_.defer(a_lock, try_send_lock_info);
-  }
-}
-bool APIConnection::try_send_lock_state(APIConnection *api, void *v_a_lock) {
-  lock::Lock *a_lock = reinterpret_cast<lock::Lock *>(v_a_lock);
-  return APIConnection::try_send_lock_state(api, a_lock, a_lock->state);
-}
-bool APIConnection::try_send_lock_state(APIConnection *api, lock::Lock *a_lock, lock::LockState state) {
   LockStateResponse resp{};
   resp.key = a_lock->get_object_id_hash();
   resp.state = static_cast<enums::LockState>(state);
-  return api->send_lock_state_response(resp);
+  return this->send_lock_state_response(resp);
 }
-bool APIConnection::try_send_lock_info(APIConnection *api, void *v_a_lock) {
-  lock::Lock *a_lock = reinterpret_cast<lock::Lock *>(v_a_lock);
+bool APIConnection::send_lock_info(lock::Lock *a_lock) {
   ListEntitiesLockResponse msg;
   msg.key = a_lock->get_object_id_hash();
   msg.object_id = a_lock->get_object_id();
@@ -1217,7 +934,7 @@ bool APIConnection::try_send_lock_info(APIConnection *api, void *v_a_lock) {
   msg.entity_category = static_cast<enums::EntityCategory>(a_lock->get_entity_category());
   msg.supports_open = a_lock->traits.get_supports_open();
   msg.requires_code = a_lock->traits.get_requires_code();
-  return api->send_list_entities_lock_response(msg);
+  return this->send_list_entities_lock_response(msg);
 }
 void APIConnection::lock_command(const LockCommandRequest &msg) {
   lock::Lock *a_lock = App.get_lock_by_key(msg.key);
@@ -1243,27 +960,13 @@ bool APIConnection::send_valve_state(valve::Valve *valve) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_valve_state(this, valve)) {
-    this->deferred_message_queue_.defer(valve, try_send_valve_state);
-  }
-
-  return true;
-}
-void APIConnection::send_valve_info(valve::Valve *valve) {
-  if (!APIConnection::try_send_valve_info(this, valve)) {
-    this->deferred_message_queue_.defer(valve, try_send_valve_info);
-  }
-}
-bool APIConnection::try_send_valve_state(APIConnection *api, void *v_valve) {
-  valve::Valve *valve = reinterpret_cast<valve::Valve *>(v_valve);
   ValveStateResponse resp{};
   resp.key = valve->get_object_id_hash();
   resp.position = valve->position;
   resp.current_operation = static_cast<enums::ValveOperation>(valve->current_operation);
-  return api->send_valve_state_response(resp);
+  return this->send_valve_state_response(resp);
 }
-bool APIConnection::try_send_valve_info(APIConnection *api, void *v_valve) {
-  valve::Valve *valve = reinterpret_cast<valve::Valve *>(v_valve);
+bool APIConnection::send_valve_info(valve::Valve *valve) {
   auto traits = valve->get_traits();
   ListEntitiesValveResponse msg;
   msg.key = valve->get_object_id_hash();
@@ -1278,7 +981,7 @@ bool APIConnection::try_send_valve_info(APIConnection *api, void *v_valve) {
   msg.assumed_state = traits.get_is_assumed_state();
   msg.supports_position = traits.get_supports_position();
   msg.supports_stop = traits.get_supports_stop();
-  return api->send_list_entities_valve_response(msg);
+  return this->send_list_entities_valve_response(msg);
 }
 void APIConnection::valve_command(const ValveCommandRequest &msg) {
   valve::Valve *valve = App.get_valve_by_key(msg.key);
@@ -1299,19 +1002,6 @@ bool APIConnection::send_media_player_state(media_player::MediaPlayer *media_pla
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_media_player_state(this, media_player)) {
-    this->deferred_message_queue_.defer(media_player, try_send_media_player_state);
-  }
-
-  return true;
-}
-void APIConnection::send_media_player_info(media_player::MediaPlayer *media_player) {
-  if (!APIConnection::try_send_media_player_info(this, media_player)) {
-    this->deferred_message_queue_.defer(media_player, try_send_media_player_info);
-  }
-}
-bool APIConnection::try_send_media_player_state(APIConnection *api, void *v_media_player) {
-  media_player::MediaPlayer *media_player = reinterpret_cast<media_player::MediaPlayer *>(v_media_player);
   MediaPlayerStateResponse resp{};
   resp.key = media_player->get_object_id_hash();
 
@@ -1321,10 +1011,9 @@ bool APIConnection::try_send_media_player_state(APIConnection *api, void *v_medi
   resp.state = static_cast<enums::MediaPlayerState>(report_state);
   resp.volume = media_player->volume;
   resp.muted = media_player->is_muted();
-  return api->send_media_player_state_response(resp);
+  return this->send_media_player_state_response(resp);
 }
-bool APIConnection::try_send_media_player_info(APIConnection *api, void *v_media_player) {
-  media_player::MediaPlayer *media_player = reinterpret_cast<media_player::MediaPlayer *>(v_media_player);
+bool APIConnection::send_media_player_info(media_player::MediaPlayer *media_player) {
   ListEntitiesMediaPlayerResponse msg;
   msg.key = media_player->get_object_id_hash();
   msg.object_id = media_player->get_object_id();
@@ -1348,7 +1037,7 @@ bool APIConnection::try_send_media_player_info(APIConnection *api, void *v_media
     msg.supported_formats.push_back(media_format);
   }
 
-  return api->send_list_entities_media_player_response(msg);
+  return this->send_list_entities_media_player_response(msg);
 }
 void APIConnection::media_player_command(const MediaPlayerCommandRequest &msg) {
   media_player::MediaPlayer *media_player = App.get_media_player_by_key(msg.key);
@@ -1373,7 +1062,7 @@ void APIConnection::media_player_command(const MediaPlayerCommandRequest &msg) {
 #endif
 
 #ifdef USE_ESP32_CAMERA
-void APIConnection::set_camera_state(std::shared_ptr<esp32_camera::CameraImage> image) {
+void APIConnection::send_camera_state(std::shared_ptr<esp32_camera::CameraImage> image) {
   if (!this->state_subscription_)
     return;
   if (this->image_reader_.available())
@@ -1382,13 +1071,7 @@ void APIConnection::set_camera_state(std::shared_ptr<esp32_camera::CameraImage>
       image->was_requested_by(esphome::esp32_camera::IDLE))
     this->image_reader_.set_image(std::move(image));
 }
-void APIConnection::send_camera_info(esp32_camera::ESP32Camera *camera) {
-  if (!APIConnection::try_send_camera_info(this, camera)) {
-    this->deferred_message_queue_.defer(camera, try_send_camera_info);
-  }
-}
-bool APIConnection::try_send_camera_info(APIConnection *api, void *v_camera) {
-  esp32_camera::ESP32Camera *camera = reinterpret_cast<esp32_camera::ESP32Camera *>(v_camera);
+bool APIConnection::send_camera_info(esp32_camera::ESP32Camera *camera) {
   ListEntitiesCameraResponse msg;
   msg.key = camera->get_object_id_hash();
   msg.object_id = camera->get_object_id();
@@ -1398,7 +1081,7 @@ bool APIConnection::try_send_camera_info(APIConnection *api, void *v_camera) {
   msg.disabled_by_default = camera->is_disabled_by_default();
   msg.icon = camera->get_icon();
   msg.entity_category = static_cast<enums::EntityCategory>(camera->get_entity_category());
-  return api->send_list_entities_camera_response(msg);
+  return this->send_list_entities_camera_response(msg);
 }
 void APIConnection::camera_image(const CameraImageRequest &msg) {
   if (esp32_camera::global_esp32_camera == nullptr)
@@ -1585,28 +1268,12 @@ bool APIConnection::send_alarm_control_panel_state(alarm_control_panel::AlarmCon
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_alarm_control_panel_state(this, a_alarm_control_panel)) {
-    this->deferred_message_queue_.defer(a_alarm_control_panel, try_send_alarm_control_panel_state);
-  }
-
-  return true;
-}
-void APIConnection::send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
-  if (!APIConnection::try_send_alarm_control_panel_info(this, a_alarm_control_panel)) {
-    this->deferred_message_queue_.defer(a_alarm_control_panel, try_send_alarm_control_panel_info);
-  }
-}
-bool APIConnection::try_send_alarm_control_panel_state(APIConnection *api, void *v_a_alarm_control_panel) {
-  alarm_control_panel::AlarmControlPanel *a_alarm_control_panel =
-      reinterpret_cast<alarm_control_panel::AlarmControlPanel *>(v_a_alarm_control_panel);
   AlarmControlPanelStateResponse resp{};
   resp.key = a_alarm_control_panel->get_object_id_hash();
   resp.state = static_cast<enums::AlarmControlPanelState>(a_alarm_control_panel->get_state());
-  return api->send_alarm_control_panel_state_response(resp);
+  return this->send_alarm_control_panel_state_response(resp);
 }
-bool APIConnection::try_send_alarm_control_panel_info(APIConnection *api, void *v_a_alarm_control_panel) {
-  alarm_control_panel::AlarmControlPanel *a_alarm_control_panel =
-      reinterpret_cast<alarm_control_panel::AlarmControlPanel *>(v_a_alarm_control_panel);
+bool APIConnection::send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
   ListEntitiesAlarmControlPanelResponse msg;
   msg.key = a_alarm_control_panel->get_object_id_hash();
   msg.object_id = a_alarm_control_panel->get_object_id();
@@ -1618,7 +1285,7 @@ bool APIConnection::try_send_alarm_control_panel_info(APIConnection *api, void *
   msg.supported_features = a_alarm_control_panel->get_supported_features();
   msg.requires_code = a_alarm_control_panel->get_requires_code();
   msg.requires_code_to_arm = a_alarm_control_panel->get_requires_code_to_arm();
-  return api->send_list_entities_alarm_control_panel_response(msg);
+  return this->send_list_entities_alarm_control_panel_response(msg);
 }
 void APIConnection::alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) {
   alarm_control_panel::AlarmControlPanel *a_alarm_control_panel = App.get_alarm_control_panel_by_key(msg.key);
@@ -1655,28 +1322,13 @@ void APIConnection::alarm_control_panel_command(const AlarmControlPanelCommandRe
 #endif
 
 #ifdef USE_EVENT
-void APIConnection::send_event(event::Event *event, std::string event_type) {
-  if (!APIConnection::try_send_event(this, event, std::move(event_type))) {
-    this->deferred_message_queue_.defer(event, try_send_event);
-  }
-}
-void APIConnection::send_event_info(event::Event *event) {
-  if (!APIConnection::try_send_event_info(this, event)) {
-    this->deferred_message_queue_.defer(event, try_send_event_info);
-  }
-}
-bool APIConnection::try_send_event(APIConnection *api, void *v_event) {
-  event::Event *event = reinterpret_cast<event::Event *>(v_event);
-  return APIConnection::try_send_event(api, event, *(event->last_event_type));
-}
-bool APIConnection::try_send_event(APIConnection *api, event::Event *event, std::string event_type) {
+bool APIConnection::send_event(event::Event *event, std::string event_type) {
   EventResponse resp{};
   resp.key = event->get_object_id_hash();
   resp.event_type = std::move(event_type);
-  return api->send_event_response(resp);
+  return this->send_event_response(resp);
 }
-bool APIConnection::try_send_event_info(APIConnection *api, void *v_event) {
-  event::Event *event = reinterpret_cast<event::Event *>(v_event);
+bool APIConnection::send_event_info(event::Event *event) {
   ListEntitiesEventResponse msg;
   msg.key = event->get_object_id_hash();
   msg.object_id = event->get_object_id();
@@ -1689,7 +1341,7 @@ bool APIConnection::try_send_event_info(APIConnection *api, void *v_event) {
   msg.device_class = event->get_device_class();
   for (const auto &event_type : event->get_event_types())
     msg.event_types.push_back(event_type);
-  return api->send_list_entities_event_response(msg);
+  return this->send_list_entities_event_response(msg);
 }
 #endif
 
@@ -1698,19 +1350,6 @@ bool APIConnection::send_update_state(update::UpdateEntity *update) {
   if (!this->state_subscription_)
     return false;
 
-  if (!APIConnection::try_send_update_state(this, update)) {
-    this->deferred_message_queue_.defer(update, try_send_update_state);
-  }
-
-  return true;
-}
-void APIConnection::send_update_info(update::UpdateEntity *update) {
-  if (!APIConnection::try_send_update_info(this, update)) {
-    this->deferred_message_queue_.defer(update, try_send_update_info);
-  }
-}
-bool APIConnection::try_send_update_state(APIConnection *api, void *v_update) {
-  update::UpdateEntity *update = reinterpret_cast<update::UpdateEntity *>(v_update);
   UpdateStateResponse resp{};
   resp.key = update->get_object_id_hash();
   resp.missing_state = !update->has_state();
@@ -1727,10 +1366,9 @@ bool APIConnection::try_send_update_state(APIConnection *api, void *v_update) {
     resp.release_url = update->update_info.release_url;
   }
 
-  return api->send_update_state_response(resp);
+  return this->send_update_state_response(resp);
 }
-bool APIConnection::try_send_update_info(APIConnection *api, void *v_update) {
-  update::UpdateEntity *update = reinterpret_cast<update::UpdateEntity *>(v_update);
+bool APIConnection::send_update_info(update::UpdateEntity *update) {
   ListEntitiesUpdateResponse msg;
   msg.key = update->get_object_id_hash();
   msg.object_id = update->get_object_id();
@@ -1741,7 +1379,7 @@ bool APIConnection::try_send_update_info(APIConnection *api, void *v_update) {
   msg.disabled_by_default = update->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(update->get_entity_category());
   msg.device_class = update->get_device_class();
-  return api->send_list_entities_update_response(msg);
+  return this->send_list_entities_update_response(msg);
 }
 void APIConnection::update_command(const UpdateCommandRequest &msg) {
   update::UpdateEntity *update = App.get_update_by_key(msg.key);
@@ -1765,7 +1403,7 @@ void APIConnection::update_command(const UpdateCommandRequest &msg) {
 }
 #endif
 
-bool APIConnection::try_send_log_message(int level, const char *tag, const char *line) {
+bool APIConnection::send_log_message(int level, const char *tag, const char *line) {
   if (this->log_subscription_ < level)
     return false;
 
@@ -1850,14 +1488,10 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
 #ifdef USE_BLUETOOTH_PROXY
   resp.legacy_bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->get_legacy_version();
   resp.bluetooth_proxy_feature_flags = bluetooth_proxy::global_bluetooth_proxy->get_feature_flags();
-  resp.bluetooth_mac_address = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_mac_address_pretty();
 #endif
 #ifdef USE_VOICE_ASSISTANT
   resp.legacy_voice_assistant_version = voice_assistant::global_voice_assistant->get_legacy_version();
   resp.voice_assistant_feature_flags = voice_assistant::global_voice_assistant->get_feature_flags();
-#endif
-#ifdef USE_API_NOISE
-  resp.api_encryption_supported = true;
 #endif
   return resp;
 }
@@ -1879,26 +1513,6 @@ void APIConnection::execute_service(const ExecuteServiceRequest &msg) {
     ESP_LOGV(TAG, "Could not find matching service!");
   }
 }
-#ifdef USE_API_NOISE
-NoiseEncryptionSetKeyResponse APIConnection::noise_encryption_set_key(const NoiseEncryptionSetKeyRequest &msg) {
-  psk_t psk{};
-  NoiseEncryptionSetKeyResponse resp;
-  if (base64_decode(msg.key, psk.data(), msg.key.size()) != psk.size()) {
-    ESP_LOGW(TAG, "Invalid encryption key length");
-    resp.success = false;
-    return resp;
-  }
-
-  if (!this->parent_->save_noise_psk(psk, true)) {
-    ESP_LOGW(TAG, "Failed to save encryption key");
-    resp.success = false;
-    return resp;
-  }
-
-  resp.success = true;
-  return resp;
-}
-#endif
 void APIConnection::subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) {
   state_subs_at_ = 0;
 }

esphome/components/api/api_connection.h

@@ -14,46 +14,6 @@
 namespace esphome {
 namespace api {
 
-using send_message_t = bool(APIConnection *, void *);
-
-/*
-  This class holds a pointer to the source component that wants to publish a message, and a pointer to a function that
-  will lazily publish that message.  The two pointers allow dedup in the deferred queue if multiple publishes for the
-  same component are backed up, and take up only 8 bytes of memory.  The entry in the deferred queue (a std::vector) is
-  the DeferredMessage instance itself (not a pointer to one elsewhere in heap) so still only 8 bytes per entry.  Even
-  100 backed up messages (you'd have to have at least 100 sensors publishing because of dedup) would take up only 0.8
-  kB.
-*/
-class DeferredMessageQueue {
-  struct DeferredMessage {
-    friend class DeferredMessageQueue;
-
-   protected:
-    void *source_;
-    send_message_t *send_message_;
-
-   public:
-    DeferredMessage(void *source, send_message_t *send_message) : source_(source), send_message_(send_message) {}
-    bool operator==(const DeferredMessage &test) const {
-      return (source_ == test.source_ && send_message_ == test.send_message_);
-    }
-  } __attribute__((packed));
-
- protected:
-  // vector is used very specifically for its zero memory overhead even though items are popped from the front (memory
-  // footprint is more important than speed here)
-  std::vector<DeferredMessage> deferred_queue_;
-  APIConnection *api_connection_;
-
-  // helper for allowing only unique entries in the queue
-  void dmq_push_back_with_dedup_(void *source, send_message_t *send_message);
-
- public:
-  DeferredMessageQueue(APIConnection *api_connection) : api_connection_(api_connection) {}
-  void process_queue();
-  void defer(void *source, send_message_t *send_message);
-};
-
 class APIConnection : public APIServerConnection {
  public:
   APIConnection(std::unique_ptr<socket::Socket> socket, APIServer *parent);
@@ -68,140 +28,96 @@ class APIConnection : public APIServerConnection {
   }
 #ifdef USE_BINARY_SENSOR
   bool send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor, bool state);
-  void send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor);
-  static bool try_send_binary_sensor_state(APIConnection *api, void *v_binary_sensor);
-  static bool try_send_binary_sensor_state(APIConnection *api, binary_sensor::BinarySensor *binary_sensor, bool state);
-  static bool try_send_binary_sensor_info(APIConnection *api, void *v_binary_sensor);
+  bool send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor);
 #endif
 #ifdef USE_COVER
   bool send_cover_state(cover::Cover *cover);
-  void send_cover_info(cover::Cover *cover);
-  static bool try_send_cover_state(APIConnection *api, void *v_cover);
-  static bool try_send_cover_info(APIConnection *api, void *v_cover);
+  bool send_cover_info(cover::Cover *cover);
   void cover_command(const CoverCommandRequest &msg) override;
 #endif
 #ifdef USE_FAN
   bool send_fan_state(fan::Fan *fan);
-  void send_fan_info(fan::Fan *fan);
-  static bool try_send_fan_state(APIConnection *api, void *v_fan);
-  static bool try_send_fan_info(APIConnection *api, void *v_fan);
+  bool send_fan_info(fan::Fan *fan);
   void fan_command(const FanCommandRequest &msg) override;
 #endif
 #ifdef USE_LIGHT
   bool send_light_state(light::LightState *light);
-  void send_light_info(light::LightState *light);
-  static bool try_send_light_state(APIConnection *api, void *v_light);
-  static bool try_send_light_info(APIConnection *api, void *v_light);
+  bool send_light_info(light::LightState *light);
   void light_command(const LightCommandRequest &msg) override;
 #endif
 #ifdef USE_SENSOR
   bool send_sensor_state(sensor::Sensor *sensor, float state);
-  void send_sensor_info(sensor::Sensor *sensor);
-  static bool try_send_sensor_state(APIConnection *api, void *v_sensor);
-  static bool try_send_sensor_state(APIConnection *api, sensor::Sensor *sensor, float state);
-  static bool try_send_sensor_info(APIConnection *api, void *v_sensor);
+  bool send_sensor_info(sensor::Sensor *sensor);
 #endif
 #ifdef USE_SWITCH
   bool send_switch_state(switch_::Switch *a_switch, bool state);
-  void send_switch_info(switch_::Switch *a_switch);
-  static bool try_send_switch_state(APIConnection *api, void *v_a_switch);
-  static bool try_send_switch_state(APIConnection *api, switch_::Switch *a_switch, bool state);
-  static bool try_send_switch_info(APIConnection *api, void *v_a_switch);
+  bool send_switch_info(switch_::Switch *a_switch);
   void switch_command(const SwitchCommandRequest &msg) override;
 #endif
 #ifdef USE_TEXT_SENSOR
   bool send_text_sensor_state(text_sensor::TextSensor *text_sensor, std::string state);
-  void send_text_sensor_info(text_sensor::TextSensor *text_sensor);
-  static bool try_send_text_sensor_state(APIConnection *api, void *v_text_sensor);
-  static bool try_send_text_sensor_state(APIConnection *api, text_sensor::TextSensor *text_sensor, std::string state);
-  static bool try_send_text_sensor_info(APIConnection *api, void *v_text_sensor);
+  bool send_text_sensor_info(text_sensor::TextSensor *text_sensor);
 #endif
 #ifdef USE_ESP32_CAMERA
-  void set_camera_state(std::shared_ptr<esp32_camera::CameraImage> image);
-  void send_camera_info(esp32_camera::ESP32Camera *camera);
-  static bool try_send_camera_info(APIConnection *api, void *v_camera);
+  void send_camera_state(std::shared_ptr<esp32_camera::CameraImage> image);
+  bool send_camera_info(esp32_camera::ESP32Camera *camera);
   void camera_image(const CameraImageRequest &msg) override;
 #endif
 #ifdef USE_CLIMATE
   bool send_climate_state(climate::Climate *climate);
-  void send_climate_info(climate::Climate *climate);
-  static bool try_send_climate_state(APIConnection *api, void *v_climate);
-  static bool try_send_climate_info(APIConnection *api, void *v_climate);
+  bool send_climate_info(climate::Climate *climate);
   void climate_command(const ClimateCommandRequest &msg) override;
 #endif
 #ifdef USE_NUMBER
   bool send_number_state(number::Number *number, float state);
-  void send_number_info(number::Number *number);
-  static bool try_send_number_state(APIConnection *api, void *v_number);
-  static bool try_send_number_state(APIConnection *api, number::Number *number, float state);
-  static bool try_send_number_info(APIConnection *api, void *v_number);
+  bool send_number_info(number::Number *number);
   void number_command(const NumberCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_DATE
   bool send_date_state(datetime::DateEntity *date);
-  void send_date_info(datetime::DateEntity *date);
-  static bool try_send_date_state(APIConnection *api, void *v_date);
-  static bool try_send_date_info(APIConnection *api, void *v_date);
+  bool send_date_info(datetime::DateEntity *date);
   void date_command(const DateCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_TIME
   bool send_time_state(datetime::TimeEntity *time);
-  void send_time_info(datetime::TimeEntity *time);
-  static bool try_send_time_state(APIConnection *api, void *v_time);
-  static bool try_send_time_info(APIConnection *api, void *v_time);
+  bool send_time_info(datetime::TimeEntity *time);
   void time_command(const TimeCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_DATETIME
   bool send_datetime_state(datetime::DateTimeEntity *datetime);
-  void send_datetime_info(datetime::DateTimeEntity *datetime);
-  static bool try_send_datetime_state(APIConnection *api, void *v_datetime);
-  static bool try_send_datetime_info(APIConnection *api, void *v_datetime);
+  bool send_datetime_info(datetime::DateTimeEntity *datetime);
   void datetime_command(const DateTimeCommandRequest &msg) override;
 #endif
 #ifdef USE_TEXT
   bool send_text_state(text::Text *text, std::string state);
-  void send_text_info(text::Text *text);
-  static bool try_send_text_state(APIConnection *api, void *v_text);
-  static bool try_send_text_state(APIConnection *api, text::Text *text, std::string state);
-  static bool try_send_text_info(APIConnection *api, void *v_text);
+  bool send_text_info(text::Text *text);
   void text_command(const TextCommandRequest &msg) override;
 #endif
 #ifdef USE_SELECT
   bool send_select_state(select::Select *select, std::string state);
-  void send_select_info(select::Select *select);
-  static bool try_send_select_state(APIConnection *api, void *v_select);
-  static bool try_send_select_state(APIConnection *api, select::Select *select, std::string state);
-  static bool try_send_select_info(APIConnection *api, void *v_select);
+  bool send_select_info(select::Select *select);
   void select_command(const SelectCommandRequest &msg) override;
 #endif
 #ifdef USE_BUTTON
-  void send_button_info(button::Button *button);
-  static bool try_send_button_info(APIConnection *api, void *v_button);
+  bool send_button_info(button::Button *button);
   void button_command(const ButtonCommandRequest &msg) override;
 #endif
 #ifdef USE_LOCK
   bool send_lock_state(lock::Lock *a_lock, lock::LockState state);
-  void send_lock_info(lock::Lock *a_lock);
-  static bool try_send_lock_state(APIConnection *api, void *v_a_lock);
-  static bool try_send_lock_state(APIConnection *api, lock::Lock *a_lock, lock::LockState state);
-  static bool try_send_lock_info(APIConnection *api, void *v_a_lock);
+  bool send_lock_info(lock::Lock *a_lock);
   void lock_command(const LockCommandRequest &msg) override;
 #endif
 #ifdef USE_VALVE
   bool send_valve_state(valve::Valve *valve);
-  void send_valve_info(valve::Valve *valve);
-  static bool try_send_valve_state(APIConnection *api, void *v_valve);
-  static bool try_send_valve_info(APIConnection *api, void *v_valve);
+  bool send_valve_info(valve::Valve *valve);
   void valve_command(const ValveCommandRequest &msg) override;
 #endif
 #ifdef USE_MEDIA_PLAYER
   bool send_media_player_state(media_player::MediaPlayer *media_player);
-  void send_media_player_info(media_player::MediaPlayer *media_player);
-  static bool try_send_media_player_state(APIConnection *api, void *v_media_player);
-  static bool try_send_media_player_info(APIConnection *api, void *v_media_player);
+  bool send_media_player_info(media_player::MediaPlayer *media_player);
   void media_player_command(const MediaPlayerCommandRequest &msg) override;
 #endif
-  bool try_send_log_message(int level, const char *tag, const char *line);
+  bool send_log_message(int level, const char *tag, const char *line);
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
     if (!this->service_call_subscription_)
       return;
@@ -244,25 +160,18 @@ class APIConnection : public APIServerConnection {
 
 #ifdef USE_ALARM_CONTROL_PANEL
   bool send_alarm_control_panel_state(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
-  void send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
-  static bool try_send_alarm_control_panel_state(APIConnection *api, void *v_a_alarm_control_panel);
-  static bool try_send_alarm_control_panel_info(APIConnection *api, void *v_a_alarm_control_panel);
+  bool send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
   void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) override;
 #endif
 
 #ifdef USE_EVENT
-  void send_event(event::Event *event, std::string event_type);
-  void send_event_info(event::Event *event);
-  static bool try_send_event(APIConnection *api, void *v_event);
-  static bool try_send_event(APIConnection *api, event::Event *event, std::string event_type);
-  static bool try_send_event_info(APIConnection *api, void *v_event);
+  bool send_event(event::Event *event, std::string event_type);
+  bool send_event_info(event::Event *event);
 #endif
 
 #ifdef USE_UPDATE
   bool send_update_state(update::UpdateEntity *update);
-  void send_update_info(update::UpdateEntity *update);
-  static bool try_send_update_state(APIConnection *api, void *v_update);
-  static bool try_send_update_info(APIConnection *api, void *v_update);
+  bool send_update_info(update::UpdateEntity *update);
   void update_command(const UpdateCommandRequest &msg) override;
 #endif
 
@@ -300,9 +209,6 @@ class APIConnection : public APIServerConnection {
     return {};
   }
   void execute_service(const ExecuteServiceRequest &msg) override;
-#ifdef USE_API_NOISE
-  NoiseEncryptionSetKeyResponse noise_encryption_set_key(const NoiseEncryptionSetKeyRequest &msg) override;
-#endif
 
   bool is_authenticated() override { return this->connection_state_ == ConnectionState::AUTHENTICATED; }
   bool is_connection_setup() override {
@@ -356,7 +262,6 @@ class APIConnection : public APIServerConnection {
   bool service_call_subscription_{false};
   bool next_close_ = false;
   APIServer *parent_;
-  DeferredMessageQueue deferred_message_queue_;
   InitialStateIterator initial_state_iterator_;
   ListEntitiesIterator list_entities_iterator_;
   int state_subs_at_ = -1;

esphome/components/api/api_frame_helper.cpp

@@ -311,10 +311,6 @@ APIError APINoiseFrameHelper::state_action_() {
     const std::string &name = App.get_name();
     const uint8_t *name_ptr = reinterpret_cast<const uint8_t *>(name.c_str());
     msg.insert(msg.end(), name_ptr, name_ptr + name.size() + 1);
-    // node mac, terminated by null byte
-    const std::string &mac = get_mac_address();
-    const uint8_t *mac_ptr = reinterpret_cast<const uint8_t *>(mac.c_str());
-    msg.insert(msg.end(), mac_ptr, mac_ptr + mac.size() + 1);
 
     aerr = write_frame_(msg.data(), msg.size());
     if (aerr != APIError::OK)
@@ -897,28 +893,8 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
 
   ParsedFrame frame;
   aerr = try_read_frame_(&frame);
-  if (aerr != APIError::OK) {
-    if (aerr == APIError::BAD_INDICATOR) {
-      // Make sure to tell the remote that we don't
-      // understand the indicator byte so it knows
-      // we do not support it.
-      struct iovec iov[1];
-      // The \x00 first byte is the marker for plaintext.
-      //
-      // The remote will know how to handle the indicator byte,
-      // but it likely won't understand the rest of the message.
-      //
-      // We must send at least 3 bytes to be read, so we add
-      // a message after the indicator byte to ensures its long
-      // enough and can aid in debugging.
-      const char msg[] = "\x00"
-                         "Bad indicator byte";
-      iov[0].iov_base = (void *) msg;
-      iov[0].iov_len = 19;
-      write_raw_(iov, 1);
-    }
+  if (aerr != APIError::OK)
     return aerr;
-  }
 
   buffer->container = std::move(frame.msg);
   buffer->data_offset = 0;

esphome/components/api/api_noise_context.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <array>
 #include <cstdint>
+#include <array>
 #include "esphome/core/defines.h"
 
 namespace esphome {
@@ -11,20 +11,11 @@ using psk_t = std::array<uint8_t, 32>;
 
 class APINoiseContext {
  public:
-  void set_psk(psk_t psk) {
-    this->psk_ = psk;
-    bool has_psk = false;
-    for (auto i : psk) {
-      has_psk |= i;
-    }
-    this->has_psk_ = has_psk;
-  }
-  const psk_t &get_psk() const { return this->psk_; }
-  bool has_psk() const { return this->has_psk_; }
+  void set_psk(psk_t psk) { psk_ = psk; }
+  const psk_t &get_psk() const { return psk_; }
 
  protected:
-  psk_t psk_{};
-  bool has_psk_{false};
+  psk_t psk_;
 };
 #endif  // USE_API_NOISE
 

esphome/components/api/api_pb2.cpp

@@ -792,10 +792,6 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       this->voice_assistant_feature_flags = value.as_uint32();
       return true;
     }
-    case 19: {
-      this->api_encryption_supported = value.as_bool();
-      return true;
-    }
     default:
       return false;
   }
@@ -842,10 +838,6 @@ bool DeviceInfoResponse::decode_length(uint32_t field_id, ProtoLengthDelimited v
       this->suggested_area = value.as_string();
       return true;
     }
-    case 18: {
-      this->bluetooth_mac_address = value.as_string();
-      return true;
-    }
     default:
       return false;
   }
@@ -868,8 +860,6 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(14, this->legacy_voice_assistant_version);
   buffer.encode_uint32(17, this->voice_assistant_feature_flags);
   buffer.encode_string(16, this->suggested_area);
-  buffer.encode_string(18, this->bluetooth_mac_address);
-  buffer.encode_bool(19, this->api_encryption_supported);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -947,14 +937,6 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("  suggested_area: ");
   out.append("'").append(this->suggested_area).append("'");
   out.append("\n");
-
-  out.append("  bluetooth_mac_address: ");
-  out.append("'").append(this->bluetooth_mac_address).append("'");
-  out.append("\n");
-
-  out.append("  api_encryption_supported: ");
-  out.append(YESNO(this->api_encryption_supported));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3018,48 +3000,6 @@ void SubscribeLogsResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
-bool NoiseEncryptionSetKeyRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->key = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void NoiseEncryptionSetKeyRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_string(1, this->key); }
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void NoiseEncryptionSetKeyRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("NoiseEncryptionSetKeyRequest {\n");
-  out.append("  key: ");
-  out.append("'").append(this->key).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool NoiseEncryptionSetKeyResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1: {
-      this->success = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void NoiseEncryptionSetKeyResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->success); }
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void NoiseEncryptionSetKeyResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("NoiseEncryptionSetKeyResponse {\n");
-  out.append("  success: ");
-  out.append(YESNO(this->success));
-  out.append("\n");
-  out.append("}");
-}
-#endif
 void SubscribeHomeassistantServicesRequest::encode(ProtoWriteBuffer buffer) const {}
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeHomeassistantServicesRequest::dump_to(std::string &out) const {
@@ -7145,16 +7085,6 @@ void VoiceAssistantTimerEventResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
-bool VoiceAssistantAnnounceRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 4: {
-      this->start_conversation = value.as_bool();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
 bool VoiceAssistantAnnounceRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
     case 1: {
@@ -7165,10 +7095,6 @@ bool VoiceAssistantAnnounceRequest::decode_length(uint32_t field_id, ProtoLength
       this->text = value.as_string();
       return true;
     }
-    case 3: {
-      this->preannounce_media_id = value.as_string();
-      return true;
-    }
     default:
       return false;
   }
@@ -7176,8 +7102,6 @@ bool VoiceAssistantAnnounceRequest::decode_length(uint32_t field_id, ProtoLength
 void VoiceAssistantAnnounceRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->media_id);
   buffer.encode_string(2, this->text);
-  buffer.encode_string(3, this->preannounce_media_id);
-  buffer.encode_bool(4, this->start_conversation);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void VoiceAssistantAnnounceRequest::dump_to(std::string &out) const {
@@ -7190,14 +7114,6 @@ void VoiceAssistantAnnounceRequest::dump_to(std::string &out) const {
   out.append("  text: ");
   out.append("'").append(this->text).append("'");
   out.append("\n");
-
-  out.append("  preannounce_media_id: ");
-  out.append("'").append(this->preannounce_media_id).append("'");
-  out.append("\n");
-
-  out.append("  start_conversation: ");
-  out.append(YESNO(this->start_conversation));
-  out.append("\n");
   out.append("}");
 }
 #endif

esphome/components/api/api_pb2.h

@@ -354,8 +354,6 @@ class DeviceInfoResponse : public ProtoMessage {
   uint32_t legacy_voice_assistant_version{0};
   uint32_t voice_assistant_feature_flags{0};
   std::string suggested_area{};
-  std::string bluetooth_mac_address{};
-  bool api_encryption_supported{false};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -792,28 +790,6 @@ class SubscribeLogsResponse : public ProtoMessage {
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class NoiseEncryptionSetKeyRequest : public ProtoMessage {
- public:
-  std::string key{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-};
-class NoiseEncryptionSetKeyResponse : public ProtoMessage {
- public:
-  bool success{false};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
 class SubscribeHomeassistantServicesRequest : public ProtoMessage {
  public:
   void encode(ProtoWriteBuffer buffer) const override;
@@ -1855,8 +1831,6 @@ class VoiceAssistantAnnounceRequest : public ProtoMessage {
  public:
   std::string media_id{};
   std::string text{};
-  std::string preannounce_media_id{};
-  bool start_conversation{false};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1864,7 +1838,6 @@ class VoiceAssistantAnnounceRequest : public ProtoMessage {
 
  protected:
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 class VoiceAssistantAnnounceFinished : public ProtoMessage {
  public:

esphome/components/api/api_pb2_service.cpp

@@ -179,16 +179,6 @@ bool APIServerConnectionBase::send_text_sensor_state_response(const TextSensorSt
 bool APIServerConnectionBase::send_subscribe_logs_response(const SubscribeLogsResponse &msg) {
   return this->send_message_<SubscribeLogsResponse>(msg, 29);
 }
-#ifdef USE_API_NOISE
-#endif
-#ifdef USE_API_NOISE
-bool APIServerConnectionBase::send_noise_encryption_set_key_response(const NoiseEncryptionSetKeyResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_noise_encryption_set_key_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<NoiseEncryptionSetKeyResponse>(msg, 125);
-}
-#endif
 bool APIServerConnectionBase::send_homeassistant_service_response(const HomeassistantServiceResponse &msg) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
   ESP_LOGVV(TAG, "send_homeassistant_service_response: %s", msg.dump().c_str());
@@ -1201,17 +1191,6 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_voice_assistant_set_configuration: %s", msg.dump().c_str());
 #endif
       this->on_voice_assistant_set_configuration(msg);
-#endif
-      break;
-    }
-    case 124: {
-#ifdef USE_API_NOISE
-      NoiseEncryptionSetKeyRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_noise_encryption_set_key_request: %s", msg.dump().c_str());
-#endif
-      this->on_noise_encryption_set_key_request(msg);
 #endif
       break;
     }
@@ -1332,22 +1311,6 @@ void APIServerConnection::on_execute_service_request(const ExecuteServiceRequest
   }
   this->execute_service(msg);
 }
-#ifdef USE_API_NOISE
-void APIServerConnection::on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  NoiseEncryptionSetKeyResponse ret = this->noise_encryption_set_key(msg);
-  if (!this->send_noise_encryption_set_key_response(ret)) {
-    this->on_fatal_error();
-  }
-}
-#endif
 #ifdef USE_COVER
 void APIServerConnection::on_cover_command_request(const CoverCommandRequest &msg) {
   if (!this->is_connection_setup()) {

esphome/components/api/api_pb2_service.h

@@ -83,12 +83,6 @@ class APIServerConnectionBase : public ProtoService {
 #endif
   virtual void on_subscribe_logs_request(const SubscribeLogsRequest &value){};
   bool send_subscribe_logs_response(const SubscribeLogsResponse &msg);
-#ifdef USE_API_NOISE
-  virtual void on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &value){};
-#endif
-#ifdef USE_API_NOISE
-  bool send_noise_encryption_set_key_response(const NoiseEncryptionSetKeyResponse &msg);
-#endif
   virtual void on_subscribe_homeassistant_services_request(const SubscribeHomeassistantServicesRequest &value){};
   bool send_homeassistant_service_response(const HomeassistantServiceResponse &msg);
   virtual void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &value){};
@@ -355,9 +349,6 @@ class APIServerConnection : public APIServerConnectionBase {
   virtual void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) = 0;
   virtual GetTimeResponse get_time(const GetTimeRequest &msg) = 0;
   virtual void execute_service(const ExecuteServiceRequest &msg) = 0;
-#ifdef USE_API_NOISE
-  virtual NoiseEncryptionSetKeyResponse noise_encryption_set_key(const NoiseEncryptionSetKeyRequest &msg) = 0;
-#endif
 #ifdef USE_COVER
   virtual void cover_command(const CoverCommandRequest &msg) = 0;
 #endif
@@ -466,9 +457,6 @@ class APIServerConnection : public APIServerConnectionBase {
   void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &msg) override;
   void on_get_time_request(const GetTimeRequest &msg) override;
   void on_execute_service_request(const ExecuteServiceRequest &msg) override;
-#ifdef USE_API_NOISE
-  void on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &msg) override;
-#endif
 #ifdef USE_COVER
   void on_cover_command_request(const CoverCommandRequest &msg) override;
 #endif

esphome/components/api/api_server.cpp

@@ -22,40 +22,22 @@ namespace api {
 static const char *const TAG = "api";
 
 // APIServer
-APIServer *global_api_server = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
-APIServer::APIServer() { global_api_server = this; }
-
 void APIServer::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Home Assistant API server...");
   this->setup_controller();
-
-#ifdef USE_API_NOISE
-  uint32_t hash = 88491486UL;
-
-  this->noise_pref_ = global_preferences->make_preference<SavedNoisePsk>(hash, true);
-
-  SavedNoisePsk noise_pref_saved{};
-  if (this->noise_pref_.load(&noise_pref_saved)) {
-    ESP_LOGD(TAG, "Loaded saved Noise PSK");
-
-    this->set_noise_psk(noise_pref_saved.psk);
-  }
-#endif
-
-  this->socket_ = socket::socket_ip(SOCK_STREAM, 0);
-  if (this->socket_ == nullptr) {
-    ESP_LOGW(TAG, "Could not create socket");
+  socket_ = socket::socket_ip(SOCK_STREAM, 0);
+  if (socket_ == nullptr) {
+    ESP_LOGW(TAG, "Could not create socket.");
     this->mark_failed();
     return;
   }
   int enable = 1;
-  int err = this->socket_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
+  int err = socket_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
   if (err != 0) {
     ESP_LOGW(TAG, "Socket unable to set reuseaddr: errno %d", err);
     // we can still continue
   }
-  err = this->socket_->setblocking(false);
+  err = socket_->setblocking(false);
   if (err != 0) {
     ESP_LOGW(TAG, "Socket unable to set nonblocking mode: errno %d", err);
     this->mark_failed();
@@ -71,14 +53,14 @@ void APIServer::setup() {
     return;
   }
 
-  err = this->socket_->bind((struct sockaddr *) &server, sl);
+  err = socket_->bind((struct sockaddr *) &server, sl);
   if (err != 0) {
     ESP_LOGW(TAG, "Socket unable to bind: errno %d", errno);
     this->mark_failed();
     return;
   }
 
-  err = this->socket_->listen(4);
+  err = socket_->listen(4);
   if (err != 0) {
     ESP_LOGW(TAG, "Socket unable to listen: errno %d", errno);
     this->mark_failed();
@@ -90,7 +72,7 @@ void APIServer::setup() {
     logger::global_logger->add_on_log_callback([this](int level, const char *tag, const char *message) {
       for (auto &c : this->clients_) {
         if (!c->remove_)
-          c->try_send_log_message(level, tag, message);
+          c->send_log_message(level, tag, message);
       }
     });
   }
@@ -104,25 +86,24 @@ void APIServer::setup() {
         [this](const std::shared_ptr<esp32_camera::CameraImage> &image) {
           for (auto &c : this->clients_) {
             if (!c->remove_)
-              c->set_camera_state(image);
+              c->send_camera_state(image);
           }
         });
   }
 #endif
 }
-
 void APIServer::loop() {
   // Accept new clients
   while (true) {
     struct sockaddr_storage source_addr;
     socklen_t addr_len = sizeof(source_addr);
-    auto sock = this->socket_->accept((struct sockaddr *) &source_addr, &addr_len);
+    auto sock = socket_->accept((struct sockaddr *) &source_addr, &addr_len);
     if (!sock)
       break;
     ESP_LOGD(TAG, "Accepted %s", sock->getpeername().c_str());
 
     auto *conn = new APIConnection(std::move(sock), this);
-    this->clients_.emplace_back(conn);
+    clients_.emplace_back(conn);
     conn->start();
   }
 
@@ -155,22 +136,16 @@ void APIServer::loop() {
     }
   }
 }
-
 void APIServer::dump_config() {
   ESP_LOGCONFIG(TAG, "API Server:");
   ESP_LOGCONFIG(TAG, "  Address: %s:%u", network::get_use_address().c_str(), this->port_);
 #ifdef USE_API_NOISE
-  ESP_LOGCONFIG(TAG, "  Using noise encryption: %s", YESNO(this->noise_ctx_->has_psk()));
-  if (!this->noise_ctx_->has_psk()) {
-    ESP_LOGCONFIG(TAG, "  Supports noise encryption: YES");
-  }
+  ESP_LOGCONFIG(TAG, "  Using noise encryption: YES");
 #else
   ESP_LOGCONFIG(TAG, "  Using noise encryption: NO");
 #endif
 }
-
 bool APIServer::uses_password() const { return !this->password_.empty(); }
-
 bool APIServer::check_password(const std::string &password) const {
   // depend only on input password length
   const char *a = this->password_.c_str();
@@ -199,9 +174,7 @@ bool APIServer::check_password(const std::string &password) const {
 
   return result == 0;
 }
-
 void APIServer::handle_disconnect(APIConnection *conn) {}
-
 #ifdef USE_BINARY_SENSOR
 void APIServer::on_binary_sensor_update(binary_sensor::BinarySensor *obj, bool state) {
   if (obj->is_internal())
@@ -369,27 +342,18 @@ void APIServer::on_update(update::UpdateEntity *obj) {
 }
 #endif
 
-#ifdef USE_ALARM_CONTROL_PANEL
-void APIServer::on_alarm_control_panel_update(alarm_control_panel::AlarmControlPanel *obj) {
-  if (obj->is_internal())
-    return;
-  for (auto &c : this->clients_)
-    c->send_alarm_control_panel_state(obj);
-}
-#endif
-
 float APIServer::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
-
 void APIServer::set_port(uint16_t port) { this->port_ = port; }
+APIServer *global_api_server = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
 void APIServer::set_password(const std::string &password) { this->password_ = password; }
-
 void APIServer::send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
   for (auto &client : this->clients_) {
     client->send_homeassistant_service_call(call);
   }
 }
 
+APIServer::APIServer() { global_api_server = this; }
 void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                                std::function<void(std::string)> f) {
   this->state_subs_.push_back(HomeAssistantStateSubscription{
@@ -399,7 +363,6 @@ void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<s
       .once = false,
   });
 }
-
 void APIServer::get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                          std::function<void(std::string)> f) {
   this->state_subs_.push_back(HomeAssistantStateSubscription{
@@ -409,47 +372,11 @@ void APIServer::get_home_assistant_state(std::string entity_id, optional<std::st
       .once = true,
   });
 };
-
 const std::vector<APIServer::HomeAssistantStateSubscription> &APIServer::get_state_subs() const {
   return this->state_subs_;
 }
-
 uint16_t APIServer::get_port() const { return this->port_; }
-
 void APIServer::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }
-
-#ifdef USE_API_NOISE
-bool APIServer::save_noise_psk(psk_t psk, bool make_active) {
-  auto &old_psk = this->noise_ctx_->get_psk();
-  if (std::equal(old_psk.begin(), old_psk.end(), psk.begin())) {
-    ESP_LOGW(TAG, "New PSK matches old");
-    return true;
-  }
-
-  SavedNoisePsk new_saved_psk{psk};
-  if (!this->noise_pref_.save(&new_saved_psk)) {
-    ESP_LOGW(TAG, "Failed to save Noise PSK");
-    return false;
-  }
-  // ensure it's written immediately
-  if (!global_preferences->sync()) {
-    ESP_LOGW(TAG, "Failed to sync preferences");
-    return false;
-  }
-  ESP_LOGD(TAG, "Noise PSK saved");
-  if (make_active) {
-    this->set_timeout(100, [this, psk]() {
-      ESP_LOGW(TAG, "Disconnecting all clients to reset connections");
-      this->set_noise_psk(psk);
-      for (auto &c : this->clients_) {
-        c->send_disconnect_request(DisconnectRequest());
-      }
-    });
-  }
-  return true;
-}
-#endif
-
 #ifdef USE_HOMEASSISTANT_TIME
 void APIServer::request_time() {
   for (auto &client : this->clients_) {
@@ -458,9 +385,7 @@ void APIServer::request_time() {
   }
 }
 #endif
-
 bool APIServer::is_connected() const { return !this->clients_.empty(); }
-
 void APIServer::on_shutdown() {
   for (auto &c : this->clients_) {
     c->send_disconnect_request(DisconnectRequest());
@@ -468,6 +393,15 @@ void APIServer::on_shutdown() {
   delay(10);
 }
 
+#ifdef USE_ALARM_CONTROL_PANEL
+void APIServer::on_alarm_control_panel_update(alarm_control_panel::AlarmControlPanel *obj) {
+  if (obj->is_internal())
+    return;
+  for (auto &c : this->clients_)
+    c->send_alarm_control_panel_state(obj);
+}
+#endif
+
 }  // namespace api
 }  // namespace esphome
 #endif

esphome/components/api/api_server.h

@@ -19,12 +19,6 @@
 namespace esphome {
 namespace api {
 
-#ifdef USE_API_NOISE
-struct SavedNoisePsk {
-  psk_t psk;
-} PACKED;  // NOLINT
-#endif
-
 class APIServer : public Component, public Controller {
  public:
   APIServer();
@@ -41,7 +35,6 @@ class APIServer : public Component, public Controller {
   void set_reboot_timeout(uint32_t reboot_timeout);
 
 #ifdef USE_API_NOISE
-  bool save_noise_psk(psk_t psk, bool make_active = true);
   void set_noise_psk(psk_t psk) { noise_ctx_->set_psk(psk); }
   std::shared_ptr<APINoiseContext> get_noise_ctx() { return noise_ctx_; }
 #endif  // USE_API_NOISE
@@ -149,7 +142,6 @@ class APIServer : public Component, public Controller {
 
 #ifdef USE_API_NOISE
   std::shared_ptr<APINoiseContext> noise_ctx_ = std::make_shared<APINoiseContext>();
-  ESPPreferenceObject noise_pref_;
 #endif  // USE_API_NOISE
 };
 

esphome/components/api/client.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
 import asyncio
-from datetime import datetime
 import logging
-from typing import TYPE_CHECKING, Any
+from datetime import datetime
+from typing import Any
 
 from aioesphomeapi import APIClient
+from aioesphomeapi.api_pb2 import SubscribeLogsResponse
 from aioesphomeapi.log_runner import async_run
 
 from esphome.const import CONF_KEY, CONF_PASSWORD, CONF_PORT, __version__
@@ -13,12 +14,6 @@ from esphome.core import CORE
 
 from . import CONF_ENCRYPTION
 
-if TYPE_CHECKING:
-    from aioesphomeapi.api_pb2 import (
-        SubscribeLogsResponse,  # pylint: disable=no-name-in-module
-    )
-
-
 _LOGGER = logging.getLogger(__name__)
 
 

esphome/components/api/list_entities.cpp

@@ -10,63 +10,37 @@ namespace api {
 
 #ifdef USE_BINARY_SENSOR
 bool ListEntitiesIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) {
-  this->client_->send_binary_sensor_info(binary_sensor);
-  return true;
+  return this->client_->send_binary_sensor_info(binary_sensor);
 }
 #endif
 #ifdef USE_COVER
-bool ListEntitiesIterator::on_cover(cover::Cover *cover) {
-  this->client_->send_cover_info(cover);
-  return true;
-}
+bool ListEntitiesIterator::on_cover(cover::Cover *cover) { return this->client_->send_cover_info(cover); }
 #endif
 #ifdef USE_FAN
-bool ListEntitiesIterator::on_fan(fan::Fan *fan) {
-  this->client_->send_fan_info(fan);
-  return true;
-}
+bool ListEntitiesIterator::on_fan(fan::Fan *fan) { return this->client_->send_fan_info(fan); }
 #endif
 #ifdef USE_LIGHT
-bool ListEntitiesIterator::on_light(light::LightState *light) {
-  this->client_->send_light_info(light);
-  return true;
-}
+bool ListEntitiesIterator::on_light(light::LightState *light) { return this->client_->send_light_info(light); }
 #endif
 #ifdef USE_SENSOR
-bool ListEntitiesIterator::on_sensor(sensor::Sensor *sensor) {
-  this->client_->send_sensor_info(sensor);
-  return true;
-}
+bool ListEntitiesIterator::on_sensor(sensor::Sensor *sensor) { return this->client_->send_sensor_info(sensor); }
 #endif
 #ifdef USE_SWITCH
-bool ListEntitiesIterator::on_switch(switch_::Switch *a_switch) {
-  this->client_->send_switch_info(a_switch);
-  return true;
-}
+bool ListEntitiesIterator::on_switch(switch_::Switch *a_switch) { return this->client_->send_switch_info(a_switch); }
 #endif
 #ifdef USE_BUTTON
-bool ListEntitiesIterator::on_button(button::Button *button) {
-  this->client_->send_button_info(button);
-  return true;
-}
+bool ListEntitiesIterator::on_button(button::Button *button) { return this->client_->send_button_info(button); }
 #endif
 #ifdef USE_TEXT_SENSOR
 bool ListEntitiesIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
-  this->client_->send_text_sensor_info(text_sensor);
-  return true;
+  return this->client_->send_text_sensor_info(text_sensor);
 }
 #endif
 #ifdef USE_LOCK
-bool ListEntitiesIterator::on_lock(lock::Lock *a_lock) {
-  this->client_->send_lock_info(a_lock);
-  return true;
-}
+bool ListEntitiesIterator::on_lock(lock::Lock *a_lock) { return this->client_->send_lock_info(a_lock); }
 #endif
 #ifdef USE_VALVE
-bool ListEntitiesIterator::on_valve(valve::Valve *valve) {
-  this->client_->send_valve_info(valve);
-  return true;
-}
+bool ListEntitiesIterator::on_valve(valve::Valve *valve) { return this->client_->send_valve_info(valve); }
 #endif
 
 bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(); }
@@ -78,83 +52,55 @@ bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
 
 #ifdef USE_ESP32_CAMERA
 bool ListEntitiesIterator::on_camera(esp32_camera::ESP32Camera *camera) {
-  this->client_->send_camera_info(camera);
-  return true;
+  return this->client_->send_camera_info(camera);
 }
 #endif
 
 #ifdef USE_CLIMATE
-bool ListEntitiesIterator::on_climate(climate::Climate *climate) {
-  this->client_->send_climate_info(climate);
-  return true;
-}
+bool ListEntitiesIterator::on_climate(climate::Climate *climate) { return this->client_->send_climate_info(climate); }
 #endif
 
 #ifdef USE_NUMBER
-bool ListEntitiesIterator::on_number(number::Number *number) {
-  this->client_->send_number_info(number);
-  return true;
-}
+bool ListEntitiesIterator::on_number(number::Number *number) { return this->client_->send_number_info(number); }
 #endif
 
 #ifdef USE_DATETIME_DATE
-bool ListEntitiesIterator::on_date(datetime::DateEntity *date) {
-  this->client_->send_date_info(date);
-  return true;
-}
+bool ListEntitiesIterator::on_date(datetime::DateEntity *date) { return this->client_->send_date_info(date); }
 #endif
 
 #ifdef USE_DATETIME_TIME
-bool ListEntitiesIterator::on_time(datetime::TimeEntity *time) {
-  this->client_->send_time_info(time);
-  return true;
-}
+bool ListEntitiesIterator::on_time(datetime::TimeEntity *time) { return this->client_->send_time_info(time); }
 #endif
 
 #ifdef USE_DATETIME_DATETIME
 bool ListEntitiesIterator::on_datetime(datetime::DateTimeEntity *datetime) {
-  this->client_->send_datetime_info(datetime);
-  return true;
+  return this->client_->send_datetime_info(datetime);
 }
 #endif
 
 #ifdef USE_TEXT
-bool ListEntitiesIterator::on_text(text::Text *text) {
-  this->client_->send_text_info(text);
-  return true;
-}
+bool ListEntitiesIterator::on_text(text::Text *text) { return this->client_->send_text_info(text); }
 #endif
 
 #ifdef USE_SELECT
-bool ListEntitiesIterator::on_select(select::Select *select) {
-  this->client_->send_select_info(select);
-  return true;
-}
+bool ListEntitiesIterator::on_select(select::Select *select) { return this->client_->send_select_info(select); }
 #endif
 
 #ifdef USE_MEDIA_PLAYER
 bool ListEntitiesIterator::on_media_player(media_player::MediaPlayer *media_player) {
-  this->client_->send_media_player_info(media_player);
-  return true;
+  return this->client_->send_media_player_info(media_player);
 }
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
 bool ListEntitiesIterator::on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
-  this->client_->send_alarm_control_panel_info(a_alarm_control_panel);
-  return true;
+  return this->client_->send_alarm_control_panel_info(a_alarm_control_panel);
 }
 #endif
 #ifdef USE_EVENT
-bool ListEntitiesIterator::on_event(event::Event *event) {
-  this->client_->send_event_info(event);
-  return true;
-}
+bool ListEntitiesIterator::on_event(event::Event *event) { return this->client_->send_event_info(event); }
 #endif
 #ifdef USE_UPDATE
-bool ListEntitiesIterator::on_update(update::UpdateEntity *update) {
-  this->client_->send_update_info(update);
-  return true;
-}
+bool ListEntitiesIterator::on_update(update::UpdateEntity *update) { return this->client_->send_update_info(update); }
 #endif
 
 }  // namespace api

esphome/components/api/list_entities.h

@@ -80,7 +80,6 @@ class ListEntitiesIterator : public ComponentIterator {
   bool on_update(update::UpdateEntity *update) override;
 #endif
   bool on_end() override;
-  bool completed() { return this->state_ == IteratorState::NONE; }
 
  protected:
   APIConnection *client_;

esphome/components/api/subscribe_state.h

@@ -76,8 +76,6 @@ class InitialStateIterator : public ComponentIterator {
 #ifdef USE_UPDATE
   bool on_update(update::UpdateEntity *update) override;
 #endif
-  bool completed() { return this->state_ == IteratorState::NONE; }
-
  protected:
   APIConnection *client_;
 };

esphome/components/as3935/__init__.py

@@ -1,17 +1,17 @@
-from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import pins
 from esphome.const import (
-    CONF_CALIBRATION,
     CONF_CAPACITANCE,
     CONF_DIV_RATIO,
     CONF_INDOOR,
     CONF_IRQ_PIN,
     CONF_LIGHTNING_THRESHOLD,
     CONF_MASK_DISTURBER,
+    CONF_CALIBRATION,
+    CONF_TUNE_ANTENNA,
     CONF_NOISE_LEVEL,
     CONF_SPIKE_REJECTION,
-    CONF_TUNE_ANTENNA,
     CONF_WATCHDOG_THRESHOLD,
 )
 

esphome/components/as3935/binary_sensor.py

@@ -1,7 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import binary_sensor
 import esphome.config_validation as cv
-
+from esphome.components import binary_sensor
 from . import AS3935, CONF_AS3935_ID
 
 DEPENDENCIES = ["as3935"]

esphome/components/as3935/sensor.py

@@ -1,14 +1,13 @@
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
 from esphome.const import (
     CONF_DISTANCE,
     CONF_LIGHTNING_ENERGY,
-    ICON_FLASH,
-    ICON_SIGNAL_DISTANCE_VARIANT,
     UNIT_KILOMETER,
+    ICON_SIGNAL_DISTANCE_VARIANT,
+    ICON_FLASH,
 )
-
 from . import AS3935, CONF_AS3935_ID
 
 DEPENDENCIES = ["as3935"]

esphome/components/as3935_i2c/__init__.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import as3935, i2c
 import esphome.config_validation as cv
+from esphome.components import as3935, i2c
 from esphome.const import CONF_ID
 
 AUTO_LOAD = ["as3935"]

esphome/components/as3935_spi/__init__.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import as3935, spi
 import esphome.config_validation as cv
+from esphome.components import as3935, spi
 from esphome.const import CONF_ID
 
 AUTO_LOAD = ["as3935"]

esphome/components/as5600/__init__.py

@@ -1,12 +1,12 @@
 from esphome import pins
 import esphome.codegen as cg
-from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.components import i2c
 from esphome.const import (
+    CONF_ID,
     CONF_DIR_PIN,
     CONF_DIRECTION,
     CONF_HYSTERESIS,
-    CONF_ID,
     CONF_RANGE,
 )
 

esphome/components/as5600/sensor/__init__.py

@@ -1,20 +1,19 @@
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
 from esphome.const import (
-    CONF_ANGLE,
-    CONF_GAIN,
     CONF_ID,
-    CONF_MAGNITUDE,
-    CONF_POSITION,
-    CONF_STATUS,
-    ENTITY_CATEGORY_DIAGNOSTIC,
+    STATE_CLASS_MEASUREMENT,
     ICON_MAGNET,
     ICON_ROTATE_RIGHT,
-    STATE_CLASS_MEASUREMENT,
+    CONF_GAIN,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    CONF_MAGNITUDE,
+    CONF_STATUS,
+    CONF_POSITION,
+    CONF_ANGLE,
 )
-
-from .. import AS5600Component, as5600_ns
+from .. import as5600_ns, AS5600Component
 
 CODEOWNERS = ["@ammmze"]
 DEPENDENCIES = ["as5600"]

esphome/components/as7341/sensor.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
+from esphome.components import i2c, sensor
 from esphome.const import (
     CONF_GAIN,
     CONF_ID,
@@ -9,6 +9,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
 )
 
+
 CODEOWNERS = ["@mrgnr"]
 DEPENDENCIES = ["i2c"]
 

esphome/components/at581x/__init__.py

@@ -1,9 +1,13 @@
-from esphome import automation, core
-from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
-from esphome.components import i2c
 import esphome.config_validation as cv
-from esphome.const import CONF_FREQUENCY, CONF_ID
+from esphome import automation, core
+from esphome.components import i2c
+from esphome.automation import maybe_simple_id
+from esphome.const import (
+    CONF_ID,
+    CONF_FREQUENCY,
+)
+
 
 CODEOWNERS = ["@X-Ryl669"]
 DEPENDENCIES = ["i2c"]

esphome/components/at581x/switch/__init__.py

@@ -1,8 +1,10 @@
 import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
-from esphome.const import DEVICE_CLASS_SWITCH, ICON_WIFI
-
+from esphome.const import (
+    DEVICE_CLASS_SWITCH,
+    ICON_WIFI,
+)
 from .. import CONF_AT581X_ID, AT581XComponent, at581x_ns
 
 DEPENDENCIES = ["at581x"]

esphome/components/atc_mithermometer/sensor.py

@@ -1,14 +1,14 @@
 import esphome.codegen as cg
-from esphome.components import esp32_ble_tracker, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
 from esphome.const import (
     CONF_BATTERY_LEVEL,
     CONF_BATTERY_VOLTAGE,
-    CONF_HUMIDITY,
-    CONF_ID,
     CONF_MAC_ADDRESS,
+    CONF_HUMIDITY,
     CONF_SIGNAL_STRENGTH,
     CONF_TEMPERATURE,
+    CONF_ID,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_SIGNAL_STRENGTH,

esphome/components/audio/__init__.py

@@ -118,4 +118,4 @@ def final_validate_audio_schema(
 
 
 async def to_code(config):
-    cg.add_library("esphome/esp-audio-libs", "1.1.3")
+    cg.add_library("esphome/esp-audio-libs", "1.1.1")

esphome/components/audio/audio_decoder.cpp

@@ -66,30 +66,19 @@ esp_err_t AudioDecoder::start(AudioFileType audio_file_type) {
     case AudioFileType::FLAC:
       this->flac_decoder_ = make_unique<esp_audio_libs::flac::FLACDecoder>();
       this->free_buffer_required_ =
-          this->output_transfer_buffer_->capacity();  // Adjusted and reallocated after reading the header
+          this->output_transfer_buffer_->capacity();  // We'll revise this after reading the header
       break;
 #endif
 #ifdef USE_AUDIO_MP3_SUPPORT
     case AudioFileType::MP3:
       this->mp3_decoder_ = esp_audio_libs::helix_decoder::MP3InitDecoder();
-
-      // MP3 always has 1152 samples per chunk
       this->free_buffer_required_ = 1152 * sizeof(int16_t) * 2;  // samples * size per sample * channels
-
-      // Always reallocate the output transfer buffer to the smallest necessary size
-      this->output_transfer_buffer_->reallocate(this->free_buffer_required_);
       break;
 #endif
     case AudioFileType::WAV:
       this->wav_decoder_ = make_unique<esp_audio_libs::wav_decoder::WAVDecoder>();
       this->wav_decoder_->reset();
-
-      // Processing WAVs doesn't actually require a specific amount of buffer size, as it is already in PCM format.
-      // Thus, we don't reallocate to a minimum size.
       this->free_buffer_required_ = 1024;
-      if (this->output_transfer_buffer_->capacity() < this->free_buffer_required_) {
-        this->output_transfer_buffer_->reallocate(this->free_buffer_required_);
-      }
       break;
     case AudioFileType::NONE:
     default:
@@ -127,18 +116,10 @@ AudioDecoderState AudioDecoder::decode(bool stop_gracefully) {
 
   uint32_t decoding_start = millis();
 
-  bool first_loop_iteration = true;
-
-  size_t bytes_processed = 0;
-  size_t bytes_available_before_processing = 0;
-
   while (state == FileDecoderState::MORE_TO_PROCESS) {
     // Transfer decoded out
     if (!this->pause_output_) {
-      // Never shift the data in the output transfer buffer to avoid unnecessary, slow data moves
-      size_t bytes_written =
-          this->output_transfer_buffer_->transfer_data_to_sink(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS), false);
-
+      size_t bytes_written = this->output_transfer_buffer_->transfer_data_to_sink(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS));
       if (this->audio_stream_info_.has_value()) {
         this->accumulated_frames_written_ += this->audio_stream_info_.value().bytes_to_frames(bytes_written);
         this->playback_ms_ +=
@@ -157,24 +138,12 @@ AudioDecoderState AudioDecoder::decode(bool stop_gracefully) {
 
     // Decode more audio
 
-    // Only shift data on the first loop iteration to avoid unnecessary, slow moves
-    size_t bytes_read = this->input_transfer_buffer_->transfer_data_from_source(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS),
-                                                                                first_loop_iteration);
+    size_t bytes_read = this->input_transfer_buffer_->transfer_data_from_source(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS));
 
-    if (!first_loop_iteration && (this->input_transfer_buffer_->available() < bytes_processed)) {
-      // Less data is available than what was processed in last iteration, so don't attempt to decode.
-      // This attempts to avoid the decoder from consistently trying to decode an incomplete frame. The transfer buffer
-      // will shift the remaining data to the start and copy more from the source the next time the decode function is
-      // called
-      break;
-    }
-
-    bytes_available_before_processing = this->input_transfer_buffer_->available();
-
-    if ((this->potentially_failed_count_ > 10) && (bytes_read == 0)) {
+    if ((this->potentially_failed_count_ > 0) && (bytes_read == 0)) {
       // Failed to decode in last attempt and there is no new data
 
-      if ((this->input_transfer_buffer_->free() == 0) && first_loop_iteration) {
+      if (this->input_transfer_buffer_->free() == 0) {
         // The input buffer is full. Since it previously failed on the exact same data, we can never recover
         state = FileDecoderState::FAILED;
       } else {
@@ -206,9 +175,6 @@ AudioDecoderState AudioDecoder::decode(bool stop_gracefully) {
       }
     }
 
-    first_loop_iteration = false;
-    bytes_processed = bytes_available_before_processing - this->input_transfer_buffer_->available();
-
     if (state == FileDecoderState::POTENTIALLY_FAILED) {
       ++this->potentially_failed_count_;
     } else if (state == FileDecoderState::END_OF_FILE) {
@@ -241,11 +207,13 @@ FileDecoderState AudioDecoder::decode_flac_() {
     size_t bytes_consumed = this->flac_decoder_->get_bytes_index();
     this->input_transfer_buffer_->decrease_buffer_length(bytes_consumed);
 
-    // Reallocate the output transfer buffer to the smallest necessary size
     this->free_buffer_required_ = flac_decoder_->get_output_buffer_size_bytes();
-    if (!this->output_transfer_buffer_->reallocate(this->free_buffer_required_)) {
-      // Couldn't reallocate output buffer
-      return FileDecoderState::FAILED;
+    if (this->output_transfer_buffer_->capacity() < this->free_buffer_required_) {
+      // Output buffer is not big enough
+      if (!this->output_transfer_buffer_->reallocate(this->free_buffer_required_)) {
+        // Couldn't reallocate output buffer
+        return FileDecoderState::FAILED;
+      }
     }
 
     this->audio_stream_info_ =

esphome/components/audio/audio_reader.cpp

@@ -15,8 +15,6 @@ namespace audio {
 
 static const uint32_t READ_WRITE_TIMEOUT_MS = 20;
 
-static const uint32_t CONNECTION_TIMEOUT_MS = 5000;
-
 // The number of times the http read times out with no data before throwing an error
 static const uint32_t ERROR_COUNT_NO_DATA_READ_TIMEOUT = 100;
 
@@ -99,7 +97,7 @@ esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {
   client_config.user_data = this;
   client_config.buffer_size = HTTP_STREAM_BUFFER_SIZE;
   client_config.keep_alive_enable = true;
-  client_config.timeout_ms = CONNECTION_TIMEOUT_MS;  // Shouldn't trigger watchdog resets if caller runs in a task
+  client_config.timeout_ms = 5000;  // Shouldn't trigger watchdog resets if caller runs in a task
 
 #if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
   if (uri.find("https:") != std::string::npos) {
@@ -191,7 +189,7 @@ esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {
     file_type = this->audio_file_type_;
   }
 
-  this->last_data_read_ms_ = millis();
+  this->no_data_read_count_ = 0;
 
   this->output_transfer_buffer_ = AudioSinkTransferBuffer::create(this->buffer_size_);
   if (this->output_transfer_buffer_ == nullptr) {
@@ -259,21 +257,22 @@ AudioReaderState AudioReader::file_read_() {
 }
 
 AudioReaderState AudioReader::http_read_() {
-  this->output_transfer_buffer_->transfer_data_to_sink(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS), false);
+  this->output_transfer_buffer_->transfer_data_to_sink(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS));
 
   if (esp_http_client_is_complete_data_received(this->client_)) {
     if (this->output_transfer_buffer_->available() == 0) {
       this->cleanup_connection_();
       return AudioReaderState::FINISHED;
     }
-  } else if (this->output_transfer_buffer_->free() > 0) {
+  } else {
     size_t bytes_to_read = this->output_transfer_buffer_->free();
     int received_len =
         esp_http_client_read(this->client_, (char *) this->output_transfer_buffer_->get_buffer_end(), bytes_to_read);
 
     if (received_len > 0) {
       this->output_transfer_buffer_->increase_buffer_length(received_len);
-      this->last_data_read_ms_ = millis();
+
+      this->no_data_read_count_ = 0;
     } else if (received_len < 0) {
       // HTTP read error
       this->cleanup_connection_();
@@ -281,11 +280,12 @@ AudioReaderState AudioReader::http_read_() {
     } else {
       if (bytes_to_read > 0) {
         // Read timed out
-        if ((millis() - this->last_data_read_ms_) > CONNECTION_TIMEOUT_MS) {
+        ++this->no_data_read_count_;
+        if (this->no_data_read_count_ >= ERROR_COUNT_NO_DATA_READ_TIMEOUT) {
+          // Timed out with no data read too many times, so the http read has failed
           this->cleanup_connection_();
           return AudioReaderState::FAILED;
         }
-
         delay(READ_WRITE_TIMEOUT_MS);
       }
     }

esphome/components/audio/audio_reader.h

@@ -71,7 +71,7 @@ class AudioReader {
   void cleanup_connection_();
 
   size_t buffer_size_;
-  uint32_t last_data_read_ms_;
+  uint32_t no_data_read_count_;
 
   esp_http_client_handle_t client_{nullptr};
 

esphome/components/audio/audio_resampler.cpp

@@ -93,9 +93,8 @@ AudioResamplerState AudioResampler::resample(bool stop_gracefully, int32_t *ms_d
   }
 
   if (!this->pause_output_) {
-    // Move audio data to the sink without shifting the data in the output transfer buffer to avoid unnecessary, slow
-    // data moves
-    this->output_transfer_buffer_->transfer_data_to_sink(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS), false);
+    // Move audio data to the sink
+    this->output_transfer_buffer_->transfer_data_to_sink(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS));
   } else {
     // If paused, block to avoid wasting CPU resources
     delay(READ_WRITE_TIMEOUT_MS);
@@ -116,7 +115,6 @@ AudioResamplerState AudioResampler::resample(bool stop_gracefully, int32_t *ms_d
 
   if ((this->input_stream_info_.get_sample_rate() != this->output_stream_info_.get_sample_rate()) ||
       (this->input_stream_info_.get_bits_per_sample() != this->output_stream_info_.get_bits_per_sample())) {
-    // Adjust gain by -3 dB to avoid clipping due to the resampling process
     esp_audio_libs::resampler::ResamplerResults results =
         this->resampler_->resample(this->input_transfer_buffer_->get_buffer_start(),
                                    this->output_transfer_buffer_->get_buffer_end(), frames_available, frames_free, -3);

esphome/components/audio/audio_transfer_buffer.cpp

@@ -33,17 +33,12 @@ size_t AudioTransferBuffer::free() const {
   if (this->buffer_size_ == 0) {
     return 0;
   }
-  return this->buffer_size_ - (this->buffer_length_ + (this->data_start_ - this->buffer_));
+  return this->buffer_size_ - (this->buffer_length_ - (this->data_start_ - this->buffer_));
 }
 
 void AudioTransferBuffer::decrease_buffer_length(size_t bytes) {
   this->buffer_length_ -= bytes;
-  if (this->buffer_length_ > 0) {
-    this->data_start_ += bytes;
-  } else {
-    // All the data in the buffer has been consumed, reset the start pointer
-    this->data_start_ = this->buffer_;
-  }
+  this->data_start_ += bytes;
 }
 
 void AudioTransferBuffer::increase_buffer_length(size_t bytes) { this->buffer_length_ += bytes; }
@@ -76,7 +71,7 @@ bool AudioTransferBuffer::has_buffered_data() const {
 
 bool AudioTransferBuffer::reallocate(size_t new_buffer_size) {
   if (this->buffer_length_ > 0) {
-    // Buffer currently has data, so reallocation is impossible
+    // Already has data in the buffer, fail
     return false;
   }
   this->deallocate_buffer_();
@@ -111,14 +106,12 @@ void AudioTransferBuffer::deallocate_buffer_() {
   this->buffer_length_ = 0;
 }
 
-size_t AudioSourceTransferBuffer::transfer_data_from_source(TickType_t ticks_to_wait, bool pre_shift) {
-  if (pre_shift) {
-    // Shift data in buffer to start
-    if (this->buffer_length_ > 0) {
-      memmove(this->buffer_, this->data_start_, this->buffer_length_);
-    }
-    this->data_start_ = this->buffer_;
+size_t AudioSourceTransferBuffer::transfer_data_from_source(TickType_t ticks_to_wait) {
+  // Shift data in buffer to start
+  if (this->buffer_length_ > 0) {
+    memmove(this->buffer_, this->data_start_, this->buffer_length_);
   }
+  this->data_start_ = this->buffer_;
 
   size_t bytes_to_read = this->free();
   size_t bytes_read = 0;
@@ -132,7 +125,7 @@ size_t AudioSourceTransferBuffer::transfer_data_from_source(TickType_t ticks_to_
   return bytes_read;
 }
 
-size_t AudioSinkTransferBuffer::transfer_data_to_sink(TickType_t ticks_to_wait, bool post_shift) {
+size_t AudioSinkTransferBuffer::transfer_data_to_sink(TickType_t ticks_to_wait) {
   size_t bytes_written = 0;
   if (this->available()) {
 #ifdef USE_SPEAKER
@@ -146,14 +139,11 @@ size_t AudioSinkTransferBuffer::transfer_data_to_sink(TickType_t ticks_to_wait,
     }
 
     this->decrease_buffer_length(bytes_written);
-  }
 
-  if (post_shift) {
     // Shift unwritten data to the start of the buffer
     memmove(this->buffer_, this->data_start_, this->buffer_length_);
     this->data_start_ = this->buffer_;
   }
-
   return bytes_written;
 }
 

esphome/components/audio/audio_transfer_buffer.h

@@ -60,7 +60,6 @@ class AudioTransferBuffer {
 
  protected:
   /// @brief Allocates the transfer buffer in external memory, if available.
-  /// @param buffer_size The number of bytes to allocate
   /// @return True is successful, false otherwise.
   bool allocate_buffer_(size_t buffer_size);
 
@@ -90,10 +89,8 @@ class AudioSinkTransferBuffer : public AudioTransferBuffer {
 
   /// @brief Writes any available data in the transfer buffer to the sink.
   /// @param ticks_to_wait FreeRTOS ticks to block while waiting for the sink to have enough space
-  /// @param post_shift If true, all remaining data is moved to the start of the buffer after transferring to the sink.
-  ///                   Defaults to true.
   /// @return Number of bytes written
-  size_t transfer_data_to_sink(TickType_t ticks_to_wait, bool post_shift = true);
+  size_t transfer_data_to_sink(TickType_t ticks_to_wait);
 
   /// @brief Adds a ring buffer as the transfer buffer's sink.
   /// @param ring_buffer weak_ptr to the allocated ring buffer
@@ -128,10 +125,8 @@ class AudioSourceTransferBuffer : public AudioTransferBuffer {
 
   /// @brief Reads any available data from the sink into the transfer buffer.
   /// @param ticks_to_wait FreeRTOS ticks to block while waiting for the source to have enough data
-  /// @param pre_shift If true, any unwritten data is moved to the start of the buffer before transferring from the
-  ///                  source. Defaults to true.
   /// @return Number of bytes read
-  size_t transfer_data_from_source(TickType_t ticks_to_wait, bool pre_shift = true);
+  size_t transfer_data_from_source(TickType_t ticks_to_wait);
 
   /// @brief Adds a ring buffer as the transfer buffer's source.
   /// @param ring_buffer weak_ptr to the allocated ring buffer

esphome/components/axs15231/touchscreen/axs15231_touchscreen.cpp

@@ -30,12 +30,8 @@ void AXS15231Touchscreen::setup() {
     this->interrupt_pin_->setup();
     this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_FALLING_EDGE);
   }
-  if (this->x_raw_max_ == 0) {
-    this->x_raw_max_ = this->display_->get_native_width();
-  }
-  if (this->y_raw_max_ == 0) {
-    this->y_raw_max_ = this->display_->get_native_height();
-  }
+  this->x_raw_max_ = this->display_->get_native_width();
+  this->y_raw_max_ = this->display_->get_native_height();
   ESP_LOGCONFIG(TAG, "AXS15231 Touchscreen setup complete");
 }
 
@@ -48,7 +44,7 @@ void AXS15231Touchscreen::update_touches() {
   err = this->read(data, sizeof(data));
   ERROR_CHECK(err);
   this->status_clear_warning();
-  if (data[0] != 0 || data[1] == 0)  // no touches
+  if (data[0] != 0)  // no touches
     return;
   uint16_t x = encode_uint16(data[2] & 0xF, data[3]);
   uint16_t y = encode_uint16(data[4] & 0xF, data[5]);

esphome/components/b_parasite/sensor.py

@@ -1,13 +1,13 @@
 import esphome.codegen as cg
-from esphome.components import esp32_ble_tracker, sensor
 import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
 from esphome.const import (
     CONF_BATTERY_VOLTAGE,
     CONF_HUMIDITY,
     CONF_ID,
     CONF_ILLUMINANCE,
-    CONF_MAC_ADDRESS,
     CONF_MOISTURE,
+    CONF_MAC_ADDRESS,
     CONF_TEMPERATURE,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_ILLUMINANCE,

esphome/components/ballu/climate.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import climate_ir
 import esphome.config_validation as cv
+from esphome.components import climate_ir
 from esphome.const import CONF_ID
 
 AUTO_LOAD = ["climate_ir"]

esphome/components/bang_bang/climate.py

@@ -1,7 +1,7 @@
-from esphome import automation
 import esphome.codegen as cg
-from esphome.components import climate, sensor
 import esphome.config_validation as cv
+from esphome import automation
+from esphome.components import climate, sensor
 from esphome.const import (
     CONF_AWAY_CONFIG,
     CONF_COOL_ACTION,

esphome/components/bedjet/__init__.py

@@ -1,7 +1,11 @@
 import esphome.codegen as cg
-from esphome.components import ble_client, time
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_RECEIVE_TIMEOUT, CONF_TIME_ID
+from esphome.components import ble_client, time
+from esphome.const import (
+    CONF_ID,
+    CONF_RECEIVE_TIMEOUT,
+    CONF_TIME_ID,
+)
 
 CODEOWNERS = ["@jhansche"]
 DEPENDENCIES = ["ble_client"]

esphome/components/bedjet/climate/__init__.py

@@ -1,8 +1,8 @@
 import logging
 
 import esphome.codegen as cg
-from esphome.components import ble_client, climate
 import esphome.config_validation as cv
+from esphome.components import climate, ble_client
 from esphome.const import (
     CONF_HEAT_MODE,
     CONF_ID,
@@ -10,8 +10,11 @@ from esphome.const import (
     CONF_TEMPERATURE_SOURCE,
     CONF_TIME_ID,
 )
-
-from .. import BEDJET_CLIENT_SCHEMA, bedjet_ns, register_bedjet_child
+from .. import (
+    BEDJET_CLIENT_SCHEMA,
+    bedjet_ns,
+    register_bedjet_child,
+)
 
 _LOGGER = logging.getLogger(__name__)
 CODEOWNERS = ["@jhansche"]

esphome/components/bedjet/fan/__init__.py

@@ -1,11 +1,16 @@
 import logging
 
 import esphome.codegen as cg
-from esphome.components import fan
 import esphome.config_validation as cv
-from esphome.const import CONF_ID
-
-from .. import BEDJET_CLIENT_SCHEMA, bedjet_ns, register_bedjet_child
+from esphome.components import fan
+from esphome.const import (
+    CONF_ID,
+)
+from .. import (
+    BEDJET_CLIENT_SCHEMA,
+    bedjet_ns,
+    register_bedjet_child,
+)
 
 _LOGGER = logging.getLogger(__name__)
 CODEOWNERS = ["@jhansche"]

esphome/components/bedjet/sensor/__init__.py

@@ -1,16 +1,19 @@
 import logging
 
 import esphome.codegen as cg
-from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.components import sensor
 from esphome.const import (
     CONF_ID,
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
-
-from .. import BEDJET_CLIENT_SCHEMA, bedjet_ns, register_bedjet_child
+from .. import (
+    BEDJET_CLIENT_SCHEMA,
+    bedjet_ns,
+    register_bedjet_child,
+)
 
 _LOGGER = logging.getLogger(__name__)
 CODEOWNERS = ["@jhansche", "@javawizard"]

esphome/components/beken_spi_led_strip/light.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 
-from esphome import pins
 import esphome.codegen as cg
-from esphome.components import libretiny, light
 import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import libretiny, light
 from esphome.const import (
     CONF_CHIPSET,
     CONF_IS_RGBW,

esphome/components/bh1750/sensor.py

@@ -1,7 +1,11 @@
 import esphome.codegen as cg
-from esphome.components import i2c, sensor
 import esphome.config_validation as cv
-from esphome.const import DEVICE_CLASS_ILLUMINANCE, STATE_CLASS_MEASUREMENT, UNIT_LUX
+from esphome.components import i2c, sensor
+from esphome.const import (
+    DEVICE_CLASS_ILLUMINANCE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_LUX,
+)
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@OttoWinter"]

esphome/components/binary/fan/__init__.py

@@ -1,13 +1,12 @@
 import esphome.codegen as cg
-from esphome.components import fan, output
 import esphome.config_validation as cv
+from esphome.components import fan, output
 from esphome.const import (
     CONF_DIRECTION_OUTPUT,
     CONF_OSCILLATION_OUTPUT,
     CONF_OUTPUT,
     CONF_OUTPUT_ID,
 )
-
 from .. import binary_ns
 
 BinaryFan = binary_ns.class_("BinaryFan", fan.Fan, cg.Component)

esphome/components/binary/light/__init__.py

@@ -1,8 +1,7 @@
 import esphome.codegen as cg
-from esphome.components import light, output
 import esphome.config_validation as cv
-from esphome.const import CONF_OUTPUT, CONF_OUTPUT_ID
-
+from esphome.components import light, output
+from esphome.const import CONF_OUTPUT_ID, CONF_OUTPUT
 from .. import binary_ns
 
 BinaryLightOutput = binary_ns.class_("BinaryLightOutput", light.LightOutput)