From 7e3027d9bdf9dd0aaac1f6d038763f372834a233 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 19 Jul 2025 15:05:26 -1000
Subject: [PATCH] wip

---
 esphome/components/api/api_frame_helper.cpp | 33 +++++++++++----------
 esphome/components/api/api_frame_helper.h   |  3 ++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/esphome/components/api/api_frame_helper.cpp b/esphome/components/api/api_frame_helper.cpp
index afd64e8981..b7c34bc44f 100644
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -76,6 +76,16 @@ APIError APIFrameHelper::loop() {
   return APIError::OK;  // Convert WOULD_BLOCK to OK to avoid connection termination
 }
 
+// Common socket write error handling
+APIError APIFrameHelper::handle_socket_write_error_() {
+  if (errno == EWOULDBLOCK || errno == EAGAIN) {
+    return APIError::WOULD_BLOCK;
+  }
+  ESP_LOGVV(TAG, "%s: Socket write failed with errno %d", this->info_.c_str(), errno);
+  this->state_ = State::FAILED;
+  return APIError::SOCKET_WRITE_FAILED;
+}
+
 // Helper method to buffer data from IOVs
 void APIFrameHelper::buffer_data_from_iov_(const struct iovec *iov, int iovcnt, uint16_t total_write_len) {
   SendBuffer buffer;
@@ -124,15 +134,13 @@ APIError APIFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
   ssize_t sent = this->socket_->writev(iov, iovcnt);
 
   if (sent == -1) {
-    if (errno == EWOULDBLOCK || errno == EAGAIN) {
+    APIError err = this->handle_socket_write_error_();
+    if (err == APIError::WOULD_BLOCK) {
       // Socket would block, buffer the data
       this->buffer_data_from_iov_(iov, iovcnt, total_write_len);
       return APIError::OK;  // Success, data buffered
     }
-    // Socket error
-    ESP_LOGVV(TAG, "%s: Socket write failed with errno %d", this->info_.c_str(), errno);
-    this->state_ = State::FAILED;
-    return APIError::SOCKET_WRITE_FAILED;  // Socket write failed
+    return err;  // Socket write failed
   } else if (static_cast<uint16_t>(sent) < total_write_len) {
     // Partially sent, buffer the remaining data
     SendBuffer buffer;
@@ -173,14 +181,7 @@ APIError APIFrameHelper::try_send_tx_buf_() {
     ssize_t sent = this->socket_->write(front_buffer.current_data(), front_buffer.remaining());
 
     if (sent == -1) {
-      if (errno != EWOULDBLOCK && errno != EAGAIN) {
-        // Real socket error (not just would block)
-        ESP_LOGVV(TAG, "%s: Socket write failed with errno %d", this->info_.c_str(), errno);
-        this->state_ = State::FAILED;
-        return APIError::SOCKET_WRITE_FAILED;  // Socket write failed
-      }
-      // Socket would block, we'll try again later
-      return APIError::WOULD_BLOCK;
+      return this->handle_socket_write_error_();
     } else if (sent == 0) {
       // Nothing sent but not an error
       return APIError::WOULD_BLOCK;
@@ -305,12 +306,12 @@ APIError APINoiseFrameHelper::loop() {
   // WOULD_BLOCK when no more data is available to read
   while (state_ != State::DATA && this->socket_->ready()) {
     APIError err = state_action_();
-    if (err != APIError::OK && err != APIError::WOULD_BLOCK) {
-      return err;
-    }
     if (err == APIError::WOULD_BLOCK) {
       break;
     }
+    if (err != APIError::OK) {
+      return err;
+    }
   }
 
   // Use base class implementation for buffer sending
diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h
index 4bcc4acd61..9488468ba0 100644
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -132,6 +132,9 @@ class APIFrameHelper {
 
   // Helper method to buffer data from IOVs
   void buffer_data_from_iov_(const struct iovec *iov, int iovcnt, uint16_t total_write_len);
+
+  // Common socket write error handling
+  APIError handle_socket_write_error_();
   template<typename StateEnum>
   APIError write_raw_(const struct iovec *iov, int iovcnt, socket::Socket *socket, std::vector<uint8_t> &tx_buf,
                       const std::string &info, StateEnum &state, StateEnum failed_state);