Fix HTTPUpdate flash size check and add SPIFFS size check (#2161)

* Fix error in PR #2048: if ::available() is called before ::connect() _rxBuffer is not initialised * Fixed flash size check and added SPIFFS size check * Rewriting ESP.getFreeSketchSpace(), moving code from HTTPUpdate.cpp

Author: Jeroen88

cores/esp32/Esp.cpp

@@ -169,7 +169,12 @@ uint32_t EspClass::getSketchSize () {
 }
 
 uint32_tEspClass::getFreeSketchSpace () {
-returnsketchSize(SKETCH_SIZE_FREE);
+constesp_partition_t* _partition = esp_ota_get_next_update_partition(NULL);
+if(!_partition){
+return0;
+ }
+
+return _partition->size;
 }
 
 uint8_tEspClass::getChipRevision(void)

libraries/HTTPUpdate/src/HTTPUpdate.cpp

@@ -127,6 +127,8 @@ String HTTPUpdate::getLastErrorString(void)
 return"Verify Bin Header Failed";
 case HTTP_UE_BIN_FOR_WRONG_FLASH:
 return"New Binary Does Not Fit Flash Size";
+case HTTP_UE_NO_PARTITION:
+return"Partition Could Not be Found";
  }
 
 returnString();
@@ -238,14 +240,25 @@ HTTPUpdateResult HTTPUpdate::handleUpdate(HTTPClient& http, const String& curren
 if(len > 0) {
 bool startUpdate = true;
 if(spiffs) {
-// To do size_t spiffsSize = ((size_t) &_SPIFFS_end - (size_t) &_SPIFFS_start);
-// To do if(len > (int) spiffsSize) {
-// To do log_e("spiffsSize to low (%d) needed: %d\n", spiffsSize, len);
-// To do startUpdate = false;
-// To do }
+constesp_partition_t* _partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
+if(!_partition){
+ _lastError = HTTP_UE_NO_PARTITION;
+return HTTP_UPDATE_FAILED;
+ }
+
+if(len > _partition->size) {
+log_e("spiffsSize to low (%d) needed: %d\n", _partition->size, len);
+ startUpdate = false;
+ }
  } else {
-if(len > (int) ESP.getFreeSketchSpace()) {
-log_e("FreeSketchSpace to low (%d) needed: %d\n", ESP.getFreeSketchSpace(), len);
+int sketchFreeSpace = ESP.getFreeSketchSpace();
+if(!sketchFreeSpace){
+ _lastError = HTTP_UE_NO_PARTITION;
+return HTTP_UPDATE_FAILED;
+ }
+
+if(len > sketchFreeSpace) {
+log_e("FreeSketchSpace to low (%d) needed: %d\n", sketchFreeSpace, len);
  startUpdate = false;
  }
  }
@@ -375,6 +388,8 @@ bool HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int command)
  }
  }
 
+// To do: the SHA256 could be checked if the server sends it
+
 if(Update.writeStream(in) != size) {
  _lastError = Update.getError();
  Update.printError(error);

libraries/HTTPUpdate/src/HTTPUpdate.h

@@ -42,6 +42,7 @@
 #defineHTTP_UE_SERVER_FAULTY_MD5 (-105)
 #defineHTTP_UE_BIN_VERIFY_HEADER_FAILED (-106)
 #defineHTTP_UE_BIN_FOR_WRONG_FLASH (-107)
+#defineHTTP_UE_NO_PARTITION (-108)
 
 enum HTTPUpdateResult {
  HTTP_UPDATE_FAILED,