github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-24 14:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[store_yaml] Streaming: advance pos only on successful send

Browse Source 
Drop the pre-advance + rewind-on-failure dance in try_send_store_yaml_; match
the camera streaming pattern (advance after send_message succeeds, retry the
same chunk on WOULD_BLOCK). Also remove the unreachable `|| pos == 0` branch
in the while condition — on_get_yaml_request short-circuits the zero-size
path before this function is ever called.
This commit is contained in:
J. Nick Koston
2026-05-15 01:21:20 -07:00
parent 59e8242756
commit 783afaeaf2
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
esphome/components/api/api_connection.cpp
View File

@@ -1195,43 +1195,42 @@ void APIConnection::try_send_store_yaml_() {
if (this->store_yaml_pos_ == std::numeric_limits<size_t>::max())
return;
auto *comp = store_yaml::global_store_yaml;
if (comp == nullptr)
if (comp == nullptr) {
this->store_yaml_pos_ = std::numeric_limits<size_t>::max();
return;
}
const size_t total = comp->get_size();
while (this->store_yaml_pos_ < total || this->store_yaml_pos_ == 0) {
// Camera-style streaming: advance the position only after a successful send,
// so a WOULD_BLOCK simply retries the same chunk on the next loop iteration.
while (this->store_yaml_pos_ < total) {
if (!this->helper_->can_write_without_blocking())
return;
const size_t remaining = total - this->store_yaml_pos_;
const size_t to_send = remaining < STORE_YAML_CHUNK_SIZE ? remaining : STORE_YAML_CHUNK_SIZE;
// Pulls a chunk out of PROGMEM into a stack buffer; on ESP8266 this routes
// Copy a chunk out of PROGMEM into a stack buffer; on ESP8266 this routes
// through progmem_read_byte, on every other platform it's a plain byte copy.
comp->read_chunk(this->store_yaml_pos_, store_yaml_chunk_buf, to_send);
GetYamlResponse resp;
resp.set_data(store_yaml_chunk_buf, to_send);
const bool first = this->store_yaml_pos_ == 0;
if (first) {
if (this->store_yaml_pos_ == 0) {
resp.total_size = static_cast<uint32_t>(total);
resp.encoding = StringRef(store_yaml::ENCODING);
}
this->store_yaml_pos_ += to_send;
const bool done = this->store_yaml_pos_ >= total;
resp.done = done;
resp.done = (this->store_yaml_pos_ + to_send) >= total;
if (!this->send_message(resp)) {
// Send failed; rewind so we retry this chunk next loop.
this->store_yaml_pos_ -= to_send;
return;
}
if (done) {
this->store_yaml_pos_ = std::numeric_limits<size_t>::max();
return;
}
if (!this->send_message(resp))
return; // retry on next loop, pos unchanged
this->store_yaml_pos_ += to_send;
}
// Reached end successfully — final response (with done=true) already sent above.
this->store_yaml_pos_ = std::numeric_limits<size_t>::max();
}
#endif