jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle stream timeouts properly, for slow HTTP/HTTPS links (#3752)

Browse Source 
This patch fixes update timeouts (error #6) on slow HTTP/HTTPS links.
This commit is contained in:
Denys Fedoryshchenko 2020-11-02 22:01:27 +02:00 committed by GitHub
parent 76afaf2d6b
commit e4b008e712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/Update/src/Updater.cpp
View File

@ -323,6 +323,8 @@ size_t UpdateClass::write(uint8_t *data, size_t len) {
size_t UpdateClass::writeStream(Stream &data) { size_t UpdateClass::writeStream(Stream &data) {
size_t written = 0; size_t written = 0;
size_t toRead = 0; size_t toRead = 0;
int timeout_failures = 0;
if(hasError() || !isRunning()) if(hasError() || !isRunning())
return 0; return 0;
@ -344,15 +346,24 @@ size_t UpdateClass::writeStream(Stream &data) {
bytesToRead = remaining(); bytesToRead = remaining();
} }
/*
Init read&timeout counters and try to read, if read failed, increase counter,
wait 100ms and try to read again. If counter > 300 (30 sec), give up/abort
*/
toRead = 0;
timeout_failures = 0;
while(!toRead) {
toRead = data.readBytes(_buffer + _bufferLen, bytesToRead); toRead = data.readBytes(_buffer + _bufferLen, bytesToRead);
if(toRead == 0) { //Timeout if(toRead == 0) {
delay(100); timeout_failures++;
toRead = data.readBytes(_buffer + _bufferLen, bytesToRead); if (timeout_failures >= 300) {
if(toRead == 0) { //Timeout
_abort(UPDATE_ERROR_STREAM); _abort(UPDATE_ERROR_STREAM);
return written; return written;
} }
delay(100);
} }
}
if(_ledPin != -1) { if(_ledPin != -1) {
digitalWrite(_ledPin, !_ledOn); // Switch LED off digitalWrite(_ledPin, !_ledOn); // Switch LED off
} }