[http_request] Add esp-idf and rp2040 support (#3256)

* Implement http_request component for esp-idf * Fix ifdefs * Lint * clang * Set else to fail with error message * Use unique_ptr * Fix * Tidy up casting, explicit HttpResponse lifetime (#3265) Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com> * Remove unique_ptr wrapper * Fix * Use reference * Add duration code into new split files * Add config for tx/rx buffer on idf * Fix * Try reserve response data with rx buffer size * Update http_request.h * Move client cleanup to be earlier * Move capture_response to bool on struct and remove global * Fix returns * Change quotes to brackets * Rework http request * Remove http request from old test yamls * Update component tests * Validate md5 length when hardcoded string * Linting * Add duration_ms to container * More lint * const * Remove default arguments and add helper functions for get and post * Add virtual destructor to HttpContainer * Undo const HEADER_KEYS * 🤦 * Update esphome/components/http_request/ota/ota_http_request.cpp Co-authored-by: Keith Burzinski <kbx81x@gmail.com> * Update esphome/components/http_request/ota/ota_http_request.cpp Co-authored-by: Keith Burzinski <kbx81x@gmail.com> * lint * Move header keys inline * Add missing WatchdogManagers * CAPS * Fix "follow redirects" string in config dump * IDF 5+ fix --------- Co-authored-by: Daniel Cousens <413395+dcousens@users.noreply.github.com> Co-authored-by: Daniel Cousens <dcousens@users.noreply.github.com> Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
2026-06-13 08:03:32 +02:00 · 2024-06-10 08:15:29 +12:00
parent 618102fe8c
commit 7b45498de6
31 changed files with 748 additions and 882 deletions
@@ -2,92 +2,35 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.const import (
-    CONF_ESP8266_DISABLE_SSL_SUPPORT,
    CONF_ID,
    CONF_PASSWORD,
-    CONF_TIMEOUT,
    CONF_URL,
    CONF_USERNAME,
 )
-from esphome.components import esp32
 from esphome.components.ota import BASE_OTA_SCHEMA, ota_to_code, OTAComponent
-from esphome.core import CORE, coroutine_with_priority
-from .. import http_request_ns
+from esphome.core import coroutine_with_priority
+from .. import CONF_HTTP_REQUEST_ID, http_request_ns, HttpRequestComponent

 CODEOWNERS = ["@oarcher"]

 AUTO_LOAD = ["md5"]
-DEPENDENCIES = ["network"]
+DEPENDENCIES = ["network", "http_request"]

 CONF_MD5 = "md5"
 CONF_MD5_URL = "md5_url"
-CONF_VERIFY_SSL = "verify_ssl"
-CONF_WATCHDOG_TIMEOUT = "watchdog_timeout"

 OtaHttpRequestComponent = http_request_ns.class_(
    "OtaHttpRequestComponent", OTAComponent
 )
-OtaHttpRequestComponentArduino = http_request_ns.class_(
-    "OtaHttpRequestComponentArduino", OtaHttpRequestComponent
-)
-OtaHttpRequestComponentIDF = http_request_ns.class_(
-    "OtaHttpRequestComponentIDF", OtaHttpRequestComponent
-)
 OtaHttpRequestComponentFlashAction = http_request_ns.class_(
    "OtaHttpRequestComponentFlashAction", automation.Action
 )

-
-def validate_ssl_verification(config):
-    error_message = ""
-
-    if CORE.is_esp32:
-        if not CORE.using_esp_idf and config[CONF_VERIFY_SSL]:
-            error_message = "ESPHome supports certificate verification only via ESP-IDF"
-
-    if CORE.is_rp2040 and config[CONF_VERIFY_SSL]:
-        error_message = "ESPHome does not support certificate verification in Arduino"
-
-    if (
-        CORE.is_esp8266
-        and not config[CONF_ESP8266_DISABLE_SSL_SUPPORT]
-        and config[CONF_VERIFY_SSL]
-    ):
-        error_message = "ESPHome does not support certificate verification in Arduino"
-
-    if len(error_message) > 0:
-        raise cv.Invalid(
-            f"{error_message}. Set '{CONF_VERIFY_SSL}: false' to skip certificate validation and allow less secure HTTPS connections."
-        )
-
-    return config
-
-
-def _declare_request_class(value):
-    if CORE.using_esp_idf:
-        return cv.declare_id(OtaHttpRequestComponentIDF)(value)
-
-    if CORE.is_esp8266 or CORE.is_esp32 or CORE.is_rp2040:
-        return cv.declare_id(OtaHttpRequestComponentArduino)(value)
-    return NotImplementedError
-
-
 CONFIG_SCHEMA = cv.All(
    cv.Schema(
        {
-            cv.GenerateID(): _declare_request_class,
-            cv.SplitDefault(CONF_ESP8266_DISABLE_SSL_SUPPORT, esp8266=False): cv.All(
-                cv.only_on_esp8266, cv.boolean
-            ),
-            cv.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
-            cv.Optional(
-                CONF_TIMEOUT, default="5min"
-            ): cv.positive_time_period_milliseconds,
-            cv.Optional(CONF_WATCHDOG_TIMEOUT): cv.All(
-                cv.Any(cv.only_on_esp32, cv.only_on_rp2040),
-                cv.positive_not_null_time_period,
-                cv.positive_time_period_milliseconds,
-            ),
+            cv.GenerateID(): cv.declare_id(OtaHttpRequestComponent),
+            cv.GenerateID(CONF_HTTP_REQUEST_ID): cv.use_id(HttpRequestComponent),
        }
    )
    .extend(BASE_OTA_SCHEMA)
@@ -98,7 +41,6 @@ CONFIG_SCHEMA = cv.All(
        esp_idf=cv.Version(0, 0, 0),
        rp2040_arduino=cv.Version(0, 0, 0),
    ),
-    validate_ssl_verification,
 )


@@ -106,41 +48,8 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await ota_to_code(var, config)
-
-    cg.add(var.set_timeout(config[CONF_TIMEOUT]))
-
-    if timeout_ms := config.get(CONF_WATCHDOG_TIMEOUT):
-        cg.add_define(
-            "USE_HTTP_REQUEST_OTA_WATCHDOG_TIMEOUT",
-            timeout_ms,
-        )
-
-    if CORE.is_esp8266 and not config[CONF_ESP8266_DISABLE_SSL_SUPPORT]:
-        cg.add_define("USE_HTTP_REQUEST_ESP8266_HTTPS")
-
-    if CORE.is_esp32:
-        if CORE.using_esp_idf:
-            esp32.add_idf_sdkconfig_option(
-                "CONFIG_MBEDTLS_CERTIFICATE_BUNDLE",
-                config.get(CONF_VERIFY_SSL),
-            )
-            esp32.add_idf_sdkconfig_option(
-                "CONFIG_ESP_TLS_INSECURE",
-                not config.get(CONF_VERIFY_SSL),
-            )
-            esp32.add_idf_sdkconfig_option(
-                "CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY",
-                not config.get(CONF_VERIFY_SSL),
-            )
-        else:
-            cg.add_library("WiFiClientSecure", None)
-            cg.add_library("HTTPClient", None)
-    if CORE.is_esp8266:
-        cg.add_library("ESP8266HTTPClient", None)
-    if CORE.is_rp2040 and CORE.using_arduino:
-        cg.add_library("HTTPClient", None)
-
    await cg.register_component(var, config)
+    await cg.register_parented(var, config[CONF_HTTP_REQUEST_ID])


 OTA_HTTP_REQUEST_FLASH_ACTION_SCHEMA = cv.All(
@@ -148,7 +57,9 @@ OTA_HTTP_REQUEST_FLASH_ACTION_SCHEMA = cv.All(
        {
            cv.GenerateID(): cv.use_id(OtaHttpRequestComponent),
            cv.Optional(CONF_MD5_URL): cv.templatable(cv.url),
-            cv.Optional(CONF_MD5): cv.templatable(cv.string),
+            cv.Optional(CONF_MD5): cv.templatable(
+                cv.All(cv.string, cv.Length(min=32, max=32))
+            ),
            cv.Optional(CONF_PASSWORD): cv.templatable(cv.string),
            cv.Optional(CONF_USERNAME): cv.templatable(cv.string),
            cv.Required(CONF_URL): cv.templatable(cv.url),
@@ -159,7 +70,7 @@ OTA_HTTP_REQUEST_FLASH_ACTION_SCHEMA = cv.All(


@automation.register_action(
-    "ota_http_request.flash",
+    "ota.http_request.flash",
    OtaHttpRequestComponentFlashAction,
    OTA_HTTP_REQUEST_FLASH_ACTION_SCHEMA,
 )
@@ -1,16 +1,16 @@
 #include "ota_http_request.h"
-#include "watchdog.h"
+#include "../watchdog.h"

 #include "esphome/core/application.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/log.h"

 #include "esphome/components/md5/md5.h"
+#include "esphome/components/ota/ota_backend.h"
 #include "esphome/components/ota/ota_backend_arduino_esp32.h"
 #include "esphome/components/ota/ota_backend_arduino_esp8266.h"
 #include "esphome/components/ota/ota_backend_arduino_rp2040.h"
 #include "esphome/components/ota/ota_backend_esp_idf.h"
-#include "esphome/components/ota/ota_backend.h"

 namespace esphome {
 namespace http_request {
@@ -21,25 +21,7 @@ void OtaHttpRequestComponent::setup() {
 #endif
 }

-void OtaHttpRequestComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "Over-The-Air updates via HTTP request:");
-  ESP_LOGCONFIG(TAG, "  Timeout: %llus", this->timeout_ / 1000);
-#ifdef USE_ESP8266
-#ifdef USE_HTTP_REQUEST_ESP8266_HTTPS
-  ESP_LOGCONFIG(TAG, "  ESP8266 SSL support: No");
-#else
-  ESP_LOGCONFIG(TAG, "  ESP8266 SSL support: Yes");
-#endif
-#endif
-#ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
-  ESP_LOGCONFIG(TAG, "  TLS server verification: Yes");
-#else
-  ESP_LOGCONFIG(TAG, "  TLS server verification: No");
-#endif
-#ifdef USE_HTTP_REQUEST_OTA_WATCHDOG_TIMEOUT
-  ESP_LOGCONFIG(TAG, "  Watchdog timeout: %ds", USE_HTTP_REQUEST_OTA_WATCHDOG_TIMEOUT / 1000);
-#endif
-};
+void OtaHttpRequestComponent::dump_config() { ESP_LOGCONFIG(TAG, "Over-The-Air updates via HTTP request"); };

 void OtaHttpRequestComponent::set_md5_url(const std::string &url) {
  if (!this->validate_url_(url)) {
@@ -58,20 +40,6 @@ void OtaHttpRequestComponent::set_url(const std::string &url) {
  this->url_ = url;
 }

-bool OtaHttpRequestComponent::check_status() {
-  // status can be -1, or HTTP status code
-  if (this->status_ < 100) {
-    ESP_LOGE(TAG, "HTTP server did not respond (error %d)", this->status_);
-    return false;
-  }
-  if (this->status_ >= 310) {
-    ESP_LOGE(TAG, "HTTP error %d", this->status_);
-    return false;
-  }
-  ESP_LOGV(TAG, "HTTP status %d", this->status_);
-  return true;
-}
-
 void OtaHttpRequestComponent::flash() {
  if (this->url_.empty()) {
    ESP_LOGE(TAG, "URL not set; cannot start update");
@@ -104,17 +72,18 @@ void OtaHttpRequestComponent::flash() {
  }
 }

-void OtaHttpRequestComponent::cleanup_(std::unique_ptr<ota::OTABackend> backend) {
+void OtaHttpRequestComponent::cleanup_(std::unique_ptr<ota::OTABackend> backend,
+                                       const std::shared_ptr<HttpContainer> &container) {
  if (this->update_started_) {
    ESP_LOGV(TAG, "Aborting OTA backend");
    backend->abort();
  }
  ESP_LOGV(TAG, "Aborting HTTP connection");
-  this->http_end();
+  container->end();
 };

 uint8_t OtaHttpRequestComponent::do_ota_() {
-  uint8_t buf[this->http_recv_buffer_ + 1];
+  uint8_t buf[OtaHttpRequestComponent::HTTP_RECV_BUFFER + 1];
  uint32_t last_progress = 0;
  uint32_t update_start_time = millis();
  md5::MD5Digest md5_receive;
@@ -132,9 +101,10 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
  }
  ESP_LOGVV(TAG, "url_with_auth: %s", url_with_auth.c_str());
  ESP_LOGI(TAG, "Connecting to: %s", this->url_.c_str());
-  this->http_init(url_with_auth);
-  if (!this->check_status()) {
-    this->http_end();
+
+  auto container = this->parent_->get(url_with_auth);
+
+  if (container == nullptr) {
    return OTA_CONNECTION_ERROR;
  }

@@ -144,18 +114,18 @@ uint8_t OtaHttpRequestComponent::do_ota_() {

  ESP_LOGV(TAG, "OTA backend begin");
  auto backend = ota::make_ota_backend();
-  auto error_code = backend->begin(this->body_length_);
+  auto error_code = backend->begin(container->content_length);
  if (error_code != ota::OTA_RESPONSE_OK) {
    ESP_LOGW(TAG, "backend->begin error: %d", error_code);
-    this->cleanup_(std::move(backend));
+    this->cleanup_(std::move(backend), container);
    return error_code;
  }

-  this->bytes_read_ = 0;
-  while (this->bytes_read_ < this->body_length_) {
+  while (container->get_bytes_read() < container->content_length) {
    // read a maximum of chunk_size bytes into buf. (real read size returned)
-    int bufsize = this->http_read(buf, this->http_recv_buffer_);
-    ESP_LOGVV(TAG, "bytes_read_ = %u, body_length_ = %u, bufsize = %i", this->bytes_read_, this->body_length_, bufsize);
+    int bufsize = container->read(buf, OtaHttpRequestComponent::HTTP_RECV_BUFFER);
+    ESP_LOGVV(TAG, "bytes_read_ = %u, body_length_ = %u, bufsize = %i", container->get_bytes_read(),
+              container->content_length, bufsize);

    // feed watchdog and give other tasks a chance to run
    App.feed_wdt();
@@ -163,9 +133,9 @@ uint8_t OtaHttpRequestComponent::do_ota_() {

    if (bufsize < 0) {
      ESP_LOGE(TAG, "Stream closed");
-      this->cleanup_(std::move(backend));
+      this->cleanup_(std::move(backend), container);
      return OTA_CONNECTION_ERROR;
-    } else if (bufsize > 0 && bufsize <= this->http_recv_buffer_) {
+    } else if (bufsize > 0 && bufsize <= OtaHttpRequestComponent::HTTP_RECV_BUFFER) {
      // add read bytes to MD5
      md5_receive.add(buf, bufsize);

@@ -176,16 +146,16 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
        // error code explanation available at
        // https://github.com/esphome/esphome/blob/dev/esphome/components/ota/ota_backend.h
        ESP_LOGE(TAG, "Error code (%02X) writing binary data to flash at offset %d and size %d", error_code,
-                 this->bytes_read_ - bufsize, this->body_length_);
-        this->cleanup_(std::move(backend));
+                 container->get_bytes_read() - bufsize, container->content_length);
+        this->cleanup_(std::move(backend), container);
        return error_code;
      }
    }

    uint32_t now = millis();
-    if ((now - last_progress > 1000) or (this->bytes_read_ == this->body_length_)) {
+    if ((now - last_progress > 1000) or (container->get_bytes_read() == container->content_length)) {
      last_progress = now;
-      float percentage = this->bytes_read_ * 100.0f / this->body_length_;
+      float percentage = container->get_bytes_read() * 100.0f / container->content_length;
      ESP_LOGD(TAG, "Progress: %0.1f%%", percentage);
 #ifdef USE_OTA_STATE_CALLBACK
      this->state_callback_.call(ota::OTA_IN_PROGRESS, percentage, 0);
@@ -201,13 +171,13 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
  this->md5_computed_ = md5_receive_str.get();
  if (strncmp(this->md5_computed_.c_str(), this->md5_expected_.c_str(), MD5_SIZE) != 0) {
    ESP_LOGE(TAG, "MD5 computed: %s - Aborting due to MD5 mismatch", this->md5_computed_.c_str());
-    this->cleanup_(std::move(backend));
+    this->cleanup_(std::move(backend), container);
    return ota::OTA_RESPONSE_ERROR_MD5_MISMATCH;
  } else {
    backend->set_update_md5(md5_receive_str.get());
  }

-  this->http_end();
+  container->end();

  // feed watchdog and give other tasks a chance to run
  App.feed_wdt();
@@ -217,7 +187,7 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
  error_code = backend->end();
  if (error_code != ota::OTA_RESPONSE_OK) {
    ESP_LOGW(TAG, "Error ending update! error_code: %d", error_code);
-    this->cleanup_(std::move(backend));
+    this->cleanup_(std::move(backend), container);
    return error_code;
  }

@@ -256,28 +226,32 @@ bool OtaHttpRequestComponent::http_get_md5_() {

  ESP_LOGVV(TAG, "url_with_auth: %s", url_with_auth.c_str());
  ESP_LOGI(TAG, "Connecting to: %s", this->md5_url_.c_str());
-  this->http_init(url_with_auth);
-  if (!this->check_status()) {
-    this->http_end();
+  auto container = this->parent_->get(url_with_auth);
+  if (container == nullptr) {
+    ESP_LOGE(TAG, "Failed to connect to MD5 URL");
    return false;
  }
-  int length = this->body_length_;
-  if (length < 0) {
-    this->http_end();
+  size_t length = container->content_length;
+  if (length == 0) {
+    container->end();
    return false;
  }
  if (length < MD5_SIZE) {
-    ESP_LOGE(TAG, "MD5 file must be %u bytes; %u bytes reported by HTTP server. Aborting", MD5_SIZE,
-             this->body_length_);
-    this->http_end();
+    ESP_LOGE(TAG, "MD5 file must be %u bytes; %u bytes reported by HTTP server. Aborting", MD5_SIZE, length);
+    container->end();
    return false;
  }

-  this->bytes_read_ = 0;
  this->md5_expected_.resize(MD5_SIZE);
-  auto read_len = this->http_read((uint8_t *) this->md5_expected_.data(), MD5_SIZE);
-  this->http_end();
+  int read_len = 0;
+  while (container->get_bytes_read() < MD5_SIZE) {
+    read_len = container->read((uint8_t *) this->md5_expected_.data(), MD5_SIZE);
+    App.feed_wdt();
+    yield();
+  }
+  container->end();

+  ESP_LOGV(TAG, "Read len: %u, MD5 expected: %u", read_len, MD5_SIZE);
  return read_len == MD5_SIZE;
 }

@@ -1,13 +1,16 @@
 #pragma once

+#include "esphome/components/ota/ota_backend.h"
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
-#include "esphome/components/ota/ota_backend.h"
+#include "esphome/core/helpers.h"

 #include <memory>
 #include <string>
 #include <utility>

+#include "../http_request.h"
+
 namespace esphome {
 namespace http_request {

@@ -20,7 +23,7 @@ enum OtaHttpRequestError : uint8_t {
  OTA_CONNECTION_ERROR = 0x12,
 };

-class OtaHttpRequestComponent : public ota::OTAComponent {
+class OtaHttpRequestComponent : public ota::OTAComponent, public Parented<HttpRequestComponent> {
 public:
  void setup() override;
  void dump_config() override;
@@ -29,27 +32,19 @@ class OtaHttpRequestComponent : public ota::OTAComponent {
  void set_md5_url(const std::string &md5_url);
  void set_md5(const std::string &md5) { this->md5_expected_ = md5; }
  void set_password(const std::string &password) { this->password_ = password; }
-  void set_timeout(const uint64_t timeout) { this->timeout_ = timeout; }
  void set_url(const std::string &url);
  void set_username(const std::string &username) { this->username_ = username; }

  std::string md5_computed() { return this->md5_computed_; }
  std::string md5_expected() { return this->md5_expected_; }

-  bool check_status();
-
  void flash();

-  virtual void http_init(const std::string &url){};
-  virtual int http_read(uint8_t *buf, size_t len) { return 0; };
-  virtual void http_end(){};
-
 protected:
-  void cleanup_(std::unique_ptr<ota::OTABackend> backend);
+  void cleanup_(std::unique_ptr<ota::OTABackend> backend, const std::shared_ptr<HttpContainer> &container);
  uint8_t do_ota_();
  std::string get_url_with_auth_(const std::string &url);
  bool http_get_md5_();
-  bool secure_() { return this->url_.find("https:") != std::string::npos; };
  bool validate_url_(const std::string &url);

  std::string md5_computed_{};
@@ -58,14 +53,9 @@ class OtaHttpRequestComponent : public ota::OTAComponent {
  std::string password_{};
  std::string username_{};
  std::string url_{};
-  size_t body_length_ = 0;
-  size_t bytes_read_ = 0;
  int status_ = -1;
-  uint64_t timeout_ = 0;
  bool update_started_ = false;
-  const uint16_t http_recv_buffer_ = 256;      // the firmware GET chunk size
-  const uint16_t max_http_recv_buffer_ = 512;  // internal max http buffer size must be > HTTP_RECV_BUFFER_ (TLS
-                                               // overhead) and must be a power of two from 512 to 4096
+  static const uint16_t HTTP_RECV_BUFFER = 256;  // the firmware GET chunk size
 };

 }  // namespace http_request
@@ -1,134 +0,0 @@
-#include "ota_http_request.h"
-#include "watchdog.h"
-
-#ifdef USE_ARDUINO
-#include "ota_http_request_arduino.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/log.h"
-#include "esphome/core/application.h"
-#include "esphome/components/network/util.h"
-#include "esphome/components/md5/md5.h"
-
-namespace esphome {
-namespace http_request {
-
-struct Header {
-  const char *name;
-  const char *value;
-};
-
-void OtaHttpRequestComponentArduino::http_init(const std::string &url) {
-  const char *header_keys[] = {"Content-Length", "Content-Type"};
-  const size_t header_count = sizeof(header_keys) / sizeof(header_keys[0]);
-  watchdog::WatchdogManager wdts;
-
-#ifdef USE_ESP8266
-  if (this->stream_ptr_ == nullptr && this->set_stream_ptr_()) {
-    ESP_LOGE(TAG, "Unable to set client");
-    return;
-  }
-#endif  // USE_ESP8266
-
-#ifdef USE_RP2040
-  this->client_.setInsecure();
-#endif
-
-  App.feed_wdt();
-
-#if defined(USE_ESP32) || defined(USE_RP2040)
-  this->status_ = this->client_.begin(url.c_str());
-#endif
-#ifdef USE_ESP8266
-  this->client_.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-  this->status_ = this->client_.begin(*this->stream_ptr_, url.c_str());
-#endif
-
-  if (!this->status_) {
-    this->client_.end();
-    return;
-  }
-
-  this->client_.setReuse(true);
-
-  // returned needed headers must be collected before the requests
-  this->client_.collectHeaders(header_keys, header_count);
-
-  // HTTP GET
-  this->status_ = this->client_.GET();
-
-  this->body_length_ = (size_t) this->client_.getSize();
-
-#if defined(USE_ESP32) || defined(USE_RP2040)
-  if (this->stream_ptr_ == nullptr) {
-    this->set_stream_ptr_();
-  }
-#endif
-}
-
-int OtaHttpRequestComponentArduino::http_read(uint8_t *buf, const size_t max_len) {
-#ifdef USE_ESP8266
-#if USE_ARDUINO_VERSION_CODE >= VERSION_CODE(3, 1, 0)  // && USE_ARDUINO_VERSION_CODE < VERSION_CODE(?, ?, ?)
-  if (!this->secure_()) {
-    ESP_LOGW(TAG, "Using HTTP on Arduino version >= 3.1 is **very** slow. Consider setting framework version to 3.0.2 "
-                  "in your YAML, or use HTTPS");
-  }
-#endif  // USE_ARDUINO_VERSION_CODE
-#endif  // USE_ESP8266
-
-  watchdog::WatchdogManager wdts;
-
-  // Since arduino8266 >= 3.1 using this->stream_ptr_ is broken (https://github.com/esp8266/Arduino/issues/9035)
-  WiFiClient *stream_ptr = this->client_.getStreamPtr();
-  if (stream_ptr == nullptr) {
-    ESP_LOGE(TAG, "Stream pointer vanished!");
-    return -1;
-  }
-
-  int available_data = stream_ptr->available();
-  int bufsize = std::min((int) max_len, available_data);
-  if (bufsize > 0) {
-    stream_ptr->readBytes(buf, bufsize);
-    this->bytes_read_ += bufsize;
-    buf[bufsize] = '\0';  // not fed to ota
-  }
-
-  return bufsize;
-}
-
-void OtaHttpRequestComponentArduino::http_end() {
-  watchdog::WatchdogManager wdts;
-  this->client_.end();
-}
-
-int OtaHttpRequestComponentArduino::set_stream_ptr_() {
-#ifdef USE_ESP8266
-#ifdef USE_HTTP_REQUEST_ESP8266_HTTPS
-  if (this->secure_()) {
-    ESP_LOGV(TAG, "ESP8266 HTTPS connection with WiFiClientSecure");
-    this->stream_ptr_ = std::make_unique<WiFiClientSecure>();
-    WiFiClientSecure *secure_client = static_cast<WiFiClientSecure *>(this->stream_ptr_.get());
-    secure_client->setBufferSizes(this->max_http_recv_buffer_, 512);
-    secure_client->setInsecure();
-  } else {
-    this->stream_ptr_ = std::make_unique<WiFiClient>();
-  }
-#else
-  ESP_LOGV(TAG, "ESP8266 HTTP connection with WiFiClient");
-  if (this->secure_()) {
-    ESP_LOGE(TAG, "Can't use HTTPS connection with esp8266_disable_ssl_support");
-    return -1;
-  }
-  this->stream_ptr_ = std::make_unique<WiFiClient>();
-#endif  // USE_HTTP_REQUEST_ESP8266_HTTPS
-#endif  // USE_ESP8266
-
-#if defined(USE_ESP32) || defined(USE_RP2040)
-  this->stream_ptr_ = std::unique_ptr<WiFiClient>(this->client_.getStreamPtr());
-#endif
-  return 0;
-}
-
-}  // namespace http_request
-}  // namespace esphome
-
-#endif  // USE_ARDUINO
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "ota_http_request.h"
-
-#ifdef USE_ARDUINO
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#if defined(USE_ESP32) || defined(USE_RP2040)
-#include <HTTPClient.h>
-#endif
-#ifdef USE_ESP8266
-#include <ESP8266HTTPClient.h>
-#ifdef USE_HTTP_REQUEST_ESP8266_HTTPS
-#include <WiFiClientSecure.h>
-#endif
-#endif
-
-namespace esphome {
-namespace http_request {
-
-class OtaHttpRequestComponentArduino : public OtaHttpRequestComponent {
- public:
-  void http_init(const std::string &url) override;
-  int http_read(uint8_t *buf, size_t len) override;
-  void http_end() override;
-
- protected:
-  int set_stream_ptr_();
-  HTTPClient client_{};
-  std::unique_ptr<WiFiClient> stream_ptr_;
-};
-
-}  // namespace http_request
-}  // namespace esphome
-
-#endif  // USE_ARDUINO
@@ -1,86 +0,0 @@
-#include "ota_http_request_idf.h"
-#include "watchdog.h"
-
-#ifdef USE_ESP_IDF
-#include "esphome/core/application.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/log.h"
-#include "esphome/components/md5/md5.h"
-#include "esphome/components/network/util.h"
-
-#include "esp_event.h"
-#include "esp_http_client.h"
-#include "esp_idf_version.h"
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "esp_system.h"
-#include "esp_task_wdt.h"
-#include "esp_tls.h"
-
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "nvs_flash.h"
-
-#include <cctype>
-#include <cinttypes>
-#include <cstdlib>
-#include <cstring>
-#include <sys/param.h>
-#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
-#include "esp_crt_bundle.h"
-#endif
-
-namespace esphome {
-namespace http_request {
-
-void OtaHttpRequestComponentIDF::http_init(const std::string &url) {
-  App.feed_wdt();
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-  esp_http_client_config_t config = {nullptr};
-  config.url = url.c_str();
-  config.method = HTTP_METHOD_GET;
-  config.timeout_ms = (int) this->timeout_;
-  config.buffer_size = this->max_http_recv_buffer_;
-  config.auth_type = HTTP_AUTH_TYPE_BASIC;
-  config.max_authorization_retries = -1;
-#if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
-  if (this->secure_()) {
-    config.crt_bundle_attach = esp_crt_bundle_attach;
-  }
-#endif
-#pragma GCC diagnostic pop
-
-  watchdog::WatchdogManager wdts;
-  this->client_ = esp_http_client_init(&config);
-  if ((this->status_ = esp_http_client_open(this->client_, 0)) == ESP_OK) {
-    this->body_length_ = esp_http_client_fetch_headers(this->client_);
-    this->status_ = esp_http_client_get_status_code(this->client_);
-  }
-}
-
-int OtaHttpRequestComponentIDF::http_read(uint8_t *buf, const size_t max_len) {
-  watchdog::WatchdogManager wdts;
-  int bufsize = std::min(max_len, this->body_length_ - this->bytes_read_);
-
-  App.feed_wdt();
-  int read_len = esp_http_client_read(this->client_, (char *) buf, bufsize);
-  if (read_len > 0) {
-    this->bytes_read_ += bufsize;
-    buf[bufsize] = '\0';  // not fed to ota
-  }
-
-  return read_len;
-}
-
-void OtaHttpRequestComponentIDF::http_end() {
-  watchdog::WatchdogManager wdts;
-
-  esp_http_client_close(this->client_);
-  esp_http_client_cleanup(this->client_);
-}
-
-}  // namespace http_request
-}  // namespace esphome
-
-#endif  // USE_ESP_IDF
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "ota_http_request.h"
-
-#ifdef USE_ESP_IDF
-#include "esp_http_client.h"
-
-namespace esphome {
-namespace http_request {
-
-class OtaHttpRequestComponentIDF : public OtaHttpRequestComponent {
- public:
-  void http_init(const std::string &url) override;
-  int http_read(uint8_t *buf, size_t len) override;
-  void http_end() override;
-
- protected:
-  esp_http_client_handle_t client_{};
-};
-
-}  // namespace http_request
-}  // namespace esphome
-
-#endif  // USE_ESP_IDF
@@ -1,71 +0,0 @@
-#include "watchdog.h"
-
-#ifdef USE_HTTP_REQUEST_OTA_WATCHDOG_TIMEOUT
-
-#include "esphome/core/application.h"
-#include "esphome/core/log.h"
-
-#include <cinttypes>
-#include <cstdint>
-#ifdef USE_ESP32
-#include "esp_idf_version.h"
-#include "esp_task_wdt.h"
-#endif
-#ifdef USE_RP2040
-#include "hardware/watchdog.h"
-#include "pico/stdlib.h"
-#endif
-
-namespace esphome {
-namespace http_request {
-namespace watchdog {
-
-static const char *const TAG = "watchdog.http_request.ota";
-
-WatchdogManager::WatchdogManager() {
-  this->saved_timeout_ms_ = this->get_timeout_();
-  this->set_timeout_(USE_HTTP_REQUEST_OTA_WATCHDOG_TIMEOUT);
-}
-
-WatchdogManager::~WatchdogManager() { this->set_timeout_(this->saved_timeout_ms_); }
-
-void WatchdogManager::set_timeout_(uint32_t timeout_ms) {
-  ESP_LOGV(TAG, "Adjusting WDT to %" PRIu32 "ms", timeout_ms);
-#ifdef USE_ESP32
-#if ESP_IDF_VERSION_MAJOR >= 5
-  esp_task_wdt_config_t wdt_config = {
-      .timeout_ms = timeout_ms,
-      .idle_core_mask = 0x03,
-      .trigger_panic = true,
-  };
-  esp_task_wdt_reconfigure(&wdt_config);
-#else
-  esp_task_wdt_init(timeout_ms, true);
-#endif  // ESP_IDF_VERSION_MAJOR
-#endif  // USE_ESP32
-
-#ifdef USE_RP2040
-  watchdog_enable(timeout_ms, true);
-#endif
-}
-
-uint32_t WatchdogManager::get_timeout_() {
-  uint32_t timeout_ms = 0;
-
-#ifdef USE_ESP32
-  timeout_ms = (uint32_t) CONFIG_ESP_TASK_WDT_TIMEOUT_S * 1000;
-#endif  // USE_ESP32
-
-#ifdef USE_RP2040
-  timeout_ms = watchdog_get_count() / 1000;
-#endif
-
-  ESP_LOGVV(TAG, "get_timeout: %" PRIu32 "ms", timeout_ms);
-
-  return timeout_ms;
-}
-
-}  // namespace watchdog
-}  // namespace http_request
-}  // namespace esphome
-#endif
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-
-#include <cstdint>
-
-namespace esphome {
-namespace http_request {
-namespace watchdog {
-
-class WatchdogManager {
-#ifdef USE_HTTP_REQUEST_OTA_WATCHDOG_TIMEOUT
- public:
-  WatchdogManager();
-  ~WatchdogManager();
-
- private:
-  uint32_t get_timeout_();
-  void set_timeout_(uint32_t timeout_ms);
-
-  uint32_t saved_timeout_ms_{0};
-#endif
-};
-
-}  // namespace watchdog
-}  // namespace http_request
-}  // namespace esphome