OTA: use OtaFlags to enable Chunked download mode

Author: pennam

src/ArduinoIoTCloudTCP.h

@@ -105,9 +105,9 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     /* Slower but more reliable in some corner cases */
     void setOTAChunkMode(bool enable = true) {
       if(enable) {
-        _ota.setFetchMode(OTADefaultCloudProcessInterface::OtaFetchChunk);
+        _ota.enableOtaPolicy(OTADefaultCloudProcessInterface::ChunkDownload);
       } else {
-        _ota.setFetchMode(OTADefaultCloudProcessInterface::OtaFetchTime);
+        _ota.disableOtaPolicy(OTADefaultCloudProcessInterface::ChunkDownload);
       }
     }
 #endif

src/ota/interface/OTAInterface.h

@@ -80,7 +80,8 @@ class OTACloudProcessInterface: public CloudProcess {
   enum OtaFlags: uint16_t {
     None              = 0,
     ApprovalRequired  = 1,
-    Approved          = 1<<1
+    Approved          = 1<<1,
+    ChunkDownload     = 1<<2
   };
 
   virtual void handleMessage(Message*);

src/ota/interface/OTAInterfaceDefault.cpp

@@ -20,7 +20,6 @@ OTADefaultCloudProcessInterface::OTADefaultCloudProcessInterface(MessageStream *
 , client(client)
 , http_client(nullptr)
 , username(nullptr), password(nullptr)
-, fetchMode(OtaFetchTime)
 , context(nullptr) {
 }
 
@@ -50,7 +49,7 @@ OTACloudProcessInterface::State OTADefaultCloudProcessInterface::startOTA() {
   }
 
   // make the http get request
-  OTACloudProcessInterface::State res = requestOta(OtaFetchTime);
+  OTACloudProcessInterface::State res = requestOta();
   if(res != Fetch) {
     return res;
   }
@@ -70,8 +69,8 @@ OTACloudProcessInterface::State OTADefaultCloudProcessInterface::startOTA() {
 OTACloudProcessInterface::State OTADefaultCloudProcessInterface::fetch() {
   OTACloudProcessInterface::State res = Fetch;
 
-  if(fetchMode == OtaFetchChunk) {
-    res = requestOta(OtaFetchChunk);
+  if(getOtaPolicy(ChunkDownload)) {
+    res = requestOta(ChunkDownload);
   }
 
   context->downloadedChunkSize = 0;
@@ -145,7 +144,7 @@ OTACloudProcessInterface::State OTADefaultCloudProcessInterface::fetch() {
   return res;
 }
 
-OTACloudProcessInterface::State OTADefaultCloudProcessInterface::requestOta(OTAFetchMode mode) {
+OTACloudProcessInterface::State OTADefaultCloudProcessInterface::requestOta(OtaFlags mode) {
   int http_res = 0;
 
   /* stop connected client */
@@ -159,7 +158,7 @@ OTACloudProcessInterface::State OTADefaultCloudProcessInterface::requestOta(OTAF
     http_client->sendBasicAuth(username, password);
   }
 
-  if(mode == OtaFetchChunk) {
+  if((mode & ChunkDownload) == ChunkDownload) {
     char range[128] = {0};
     size_t rangeSize = context->downloadedSize + maxChunkSize > context->contentLength ? context->contentLength - context->downloadedSize : maxChunkSize;
     sprintf(range, "bytes=%d-%d", context->downloadedSize, context->downloadedSize + rangeSize);
@@ -183,18 +182,18 @@ OTACloudProcessInterface::State OTADefaultCloudProcessInterface::requestOta(OTAF
 
   int statusCode = http_client->responseStatusCode();
 
-  if(((mode == OtaFetchChunk) && (statusCode != 206)) || ((mode == OtaFetchTime) && (statusCode != 200))) {
+  if((((mode & ChunkDownload) == ChunkDownload) && (statusCode != 206)) ||
+     (((mode & ChunkDownload) != ChunkDownload) && (statusCode != 200))) {
     DEBUG_VERBOSE("OTA ERROR: get response on \"%s\" returned status %d", OTACloudProcessInterface::context->url, statusCode);
     return HttpResponseFail;
   }
 
   http_client->skipResponseHeaders();
-
   return Fetch;
 }
 
 bool OTADefaultCloudProcessInterface::fetchMore() {
-  if (fetchMode == OtaFetchChunk) {
+  if (getOtaPolicy(ChunkDownload)) {
     return context->downloadedChunkSize < maxChunkSize;
   } else {
     return (millis() - context->downloadedChunkStartTime) < downloadTime;

src/ota/interface/OTAInterfaceDefault.h

@@ -35,13 +35,6 @@ class OTADefaultCloudProcessInterface: public OTACloudProcessInterface {
     this->password = password;
   }
 
-  enum OTAFetchMode: uint8_t {
-    OtaFetchTime,
-    OtaFetchChunk
-  };
-
-  inline virtual void setFetchMode(OTAFetchMode mode) { this->fetchMode = mode; }
-
 protected:
   State startOTA();
   State fetch();
@@ -50,19 +43,20 @@ class OTADefaultCloudProcessInterface: public OTACloudProcessInterface {
 
 private:
   void parseOta(uint8_t* buffer, size_t bufLen);
-  State requestOta(OTAFetchMode mode);
+  State requestOta(OtaFlags mode = None);
   bool fetchMore();
 
   Client*     client;
   HttpClient* http_client;
 
   const char *username, *password;
-  OTAFetchMode fetchMode;
 
   // The amount of time that each iteration of Fetch has to take at least
   // This mitigate the issues arising from tasks run in main loop that are using all the computing time
   static constexpr uint32_t downloadTime = 2000;
 
+  // The amount of data that each iteration of Fetch has to take at least
+  // This should be enabled setting ChunkDownload OtaFlag to 1 and mitigate some Ota corner cases
   static constexpr size_t maxChunkSize = 1024 * 10;
 
   enum OTADownloadState: uint8_t {