sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-14 01:02:19 +01:00
Code Issues Releases Wiki Activity

preen

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-23 11:36:54 +02:00
parent 6a22ea1c7d
commit 93245a24b5
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
esphome/components/api/api_server.cpp
View File

@@ -158,43 +158,45 @@ void APIServer::loop() {
} }
// Process clients and remove disconnected ones in a single pass // Process clients and remove disconnected ones in a single pass
if (!this->clients_.empty()) { if (this->clients_.empty()) {
// Check network connectivity once for all clients return;
if (!network::is_connected()) { }
// Network is down - disconnect all clients
for (auto &client : this->clients_) { // Check network connectivity once for all clients
client->on_fatal_error(); if (!network::is_connected()) {
ESP_LOGW(TAG, "%s: Network unavailable; disconnecting", client->get_client_combined_info().c_str()); // Network is down - disconnect all clients
} for (auto &client : this->clients_) {
// Continue to process and clean up the clients below client->on_fatal_error();
ESP_LOGW(TAG, "%s: Network unavailable; disconnecting", client->get_client_combined_info().c_str());
} }
// Continue to process and clean up the clients below
}
size_t client_index = 0; size_t client_index = 0;
while (client_index < this->clients_.size()) { while (client_index < this->clients_.size()) {
auto &client = this->clients_[client_index]; auto &client = this->clients_[client_index];
if (client->remove_) { if (client->remove_) {
// Handle disconnection // Handle disconnection
this->client_disconnected_trigger_->trigger(client->client_info_, client->client_peername_); this->client_disconnected_trigger_->trigger(client->client_info_, client->client_peername_);
ESP_LOGV(TAG, "Removing connection to %s", client->client_info_.c_str()); ESP_LOGV(TAG, "Removing connection to %s", client->client_info_.c_str());
// Swap with the last element and pop (avoids expensive vector shifts) // Swap with the last element and pop (avoids expensive vector shifts)
if (client_index < this->clients_.size() - 1) { if (client_index < this->clients_.size() - 1) {
std::swap(this->clients_[client_index], this->clients_.back()); std::swap(this->clients_[client_index], this->clients_.back());
}
this->clients_.pop_back();
// Schedule reboot when last client disconnects
if (this->clients_.empty() && this->reboot_timeout_ != 0) {
this->schedule_reboot_timeout_();
}
// Don't increment client_index since we need to process the swapped element
} else {
// Network is connected, process the client
client->loop();
client_index++; // Move to next client
} }
this->clients_.pop_back();
// Schedule reboot when last client disconnects
if (this->clients_.empty() && this->reboot_timeout_ != 0) {
this->schedule_reboot_timeout_();
}
// Don't increment client_index since we need to process the swapped element
} else {
// Network is connected, process the client
client->loop();
client_index++; // Move to next client
} }
} }
} }