sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 15:12:06 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into reduce_main_loop

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-04 11:20:27 -05:00
committed by GitHub
parent 49bc767bf4 d686257cff
commit 0efb6d55c8
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
esphome/components/web_server/web_server.cpp
View File

@@ -125,7 +125,16 @@ void DeferredUpdateEventSource::process_deferred_queue_() {
if (this->send(message.c_str(), "state") != DISCARDED) { if (this->send(message.c_str(), "state") != DISCARDED) {
// O(n) but memory efficiency is more important than speed here which is why std::vector was chosen // O(n) but memory efficiency is more important than speed here which is why std::vector was chosen
deferred_queue_.erase(deferred_queue_.begin()); deferred_queue_.erase(deferred_queue_.begin());
this->consecutive_send_failures_ = 0; // Reset failure count on successful send
} else { } else {
this->consecutive_send_failures_++;
if (this->consecutive_send_failures_ >= MAX_CONSECUTIVE_SEND_FAILURES) {
// Too many failures, connection is likely dead
ESP_LOGW(TAG, "Closing stuck EventSource connection after %" PRIu16 " failed sends",
this->consecutive_send_failures_);
this->close();
this->deferred_queue_.clear();
}
break; break;
} }
} }
@@ -164,6 +173,8 @@ void DeferredUpdateEventSource::deferrable_send_state(void *source, const char *
std::string message = message_generator(web_server_, source); std::string message = message_generator(web_server_, source);
if (this->send(message.c_str(), "state") == DISCARDED) { if (this->send(message.c_str(), "state") == DISCARDED) {
deq_push_back_with_dedup_(source, message_generator); deq_push_back_with_dedup_(source, message_generator);
} else {
this->consecutive_send_failures_ = 0; // Reset failure count on successful send
} }
} }
} }

2
esphome/components/web_server/web_server.h
View File

@@ -121,6 +121,8 @@ class DeferredUpdateEventSource : public AsyncEventSource {
// footprint is more important than speed here) // footprint is more important than speed here)
std::vector<DeferredEvent> deferred_queue_; std::vector<DeferredEvent> deferred_queue_;
WebServer *web_server_; WebServer *web_server_;
uint16_t consecutive_send_failures_{0};
static constexpr uint16_t MAX_CONSECUTIVE_SEND_FAILURES = 2500; // ~20 seconds at 125Hz loop rate
// helper for allowing only unique entries in the queue // helper for allowing only unique entries in the queue
void deq_push_back_with_dedup_(void *source, message_generator_t *message_generator); void deq_push_back_with_dedup_(void *source, message_generator_t *message_generator);