Merge pull request #935 from gabsuren/refactor/websocket_timeout_check_remove

gabsuren · web-flow · commit 4d7c6848b2b3 · 2025-11-13T15:59:45.000+04:00
fix(websocket): remove redundant timeout check in client task loop
diff --git a/components/esp_websocket_client/esp_websocket_client.c b/components/esp_websocket_client/esp_websocket_client.c
@@ -1168,12 +1168,6 @@ static void esp_websocket_client_task(void *pv)
                     }
                 }
             }
-
-
-            if (read_select == 0) {
-                ESP_LOGV(TAG, "Read poll timeout: skipping esp_transport_read()...");
-                break;
-            }
             break;
         case WEBSOCKET_STATE_WAIT_TIMEOUT:
 
@@ -1226,6 +1220,8 @@ static void esp_websocket_client_task(void *pv)
                     esp_websocket_client_abort_connection(client, WEBSOCKET_ERROR_TYPE_TCP_TRANSPORT);
                     xSemaphoreGiveRecursive(client->lock);
                 }
+            } else {
+                ESP_LOGV(TAG, "Read poll timeout: skipping esp_transport_poll_read().");
             }
         } else if (WEBSOCKET_STATE_WAIT_TIMEOUT == client->state) {
             // waiting for reconnection or a request to stop the client...

Original file line number	Diff line number	Diff line change
`@@ -1168,12 +1168,6 @@ static void esp_websocket_client_task(void *pv)`
`1168`	`1168`	`}`
`1169`	`1169`	`}`
`1170`	`1170`	`}`
`1171`		`-`
`1172`		`-`
`1173`		`- if (read_select == 0) {`
`1174`		`- ESP_LOGV(TAG, "Read poll timeout: skipping esp_transport_read()...");`
`1175`		`- break;`
`1176`		`- }`
`1177`	`1171`	`break;`
`1178`	`1172`	`case WEBSOCKET_STATE_WAIT_TIMEOUT:`
`1179`	`1173`
`@@ -1226,6 +1220,8 @@ static void esp_websocket_client_task(void *pv)`
`1226`	`1220`	`esp_websocket_client_abort_connection(client, WEBSOCKET_ERROR_TYPE_TCP_TRANSPORT);`
`1227`	`1221`	`xSemaphoreGiveRecursive(client->lock);`
`1228`	`1222`	`}`
	`1223`	`+ } else {`
	`1224`	`+ ESP_LOGV(TAG, "Read poll timeout: skipping esp_transport_poll_read().");`
`1229`	`1225`	`}`
`1230`	`1226`	`} else if (WEBSOCKET_STATE_WAIT_TIMEOUT == client->state) {`
`1231`	`1227`	`// waiting for reconnection or a request to stop the client...`