Added support for downloading updates from a URL

Author: jeremypoulter

platformio.ini

@@ -33,7 +33,7 @@ version = -D BUILD_TAG=4.1.0
 monitor_speed = 115200
 lib_deps =
   bblanchon/[email protected]
-  jeremypoulter/[email protected].16
+  jeremypoulter/[email protected].17
   jeremypoulter/Micro [email protected]
   jeremypoulter/[email protected]
   jeremypoulter/[email protected]
@@ -141,6 +141,7 @@ build_flags =
   -D TX1=27
   -ggdb
 #upload_port = openevse.local
+#upload_protocol = espota
 upload_speed = 2000000
 #upload_protocol = ftdi
 monitor_speed = 115200

src/emoncms.cpp

@@ -26,7 +26,7 @@ static MongooseHttpClient client;
 static void emoncms_result(bool success, String message)
 {
   StaticJsonDocument<128> event;
-  
+
   emoncms_connected = success;
   event["emoncms_connected"] = (int)emoncms_connected;
   event["emoncms_message"] = message.substring(0, 64);
@@ -77,12 +77,12 @@ void emoncms_publish(JsonDocument &data)
         DEBUG.printf("%.*s\n", result.length(), (const char *)result);
         emoncms_result(false, result.toString());
       }
-    }, [](MongooseHttpClientResponse *response)
+    }, []()
     {
-      DBUGF("onClose %p", response);
-      if(NULL == response) {
-        emoncms_result(false, String("Failed to connect"));
-      }
+      //DBUGF("onClose %p", response);
+      //if(NULL == response) {
+      //  emoncms_result(false, String("Failed to connect"));
+      //}
     });
   } else {
     if(false != emoncms_connected) {

src/http_update.cpp

@@ -1,6 +1,11 @@
+#if defined(ENABLE_DEBUG) && !defined(ENABLE_DEBUG_HTTP_UPATE)
+#undef ENABLE_DEBUG
+#endif
+
 #include "http_update.h"
 #include "lcd.h"
 #include "debug.h"
+#include "emonesp.h"
 
 #include <MongooseHttpClient.h>
 #include <Update.h>
@@ -15,46 +20,62 @@ bool http_update_from_url(String url,
   std::function<void(int)> success,
   std::function<void(int)> error)
 {
-  MongooseHttpClientRequest *request =
-    client.beginRequest(url.c_str())
-    ->setMethod(HTTP_GET)
-//    ->onBody([progress, error](const uint8_t *data, size_t len) {
-//      if(http_update_write(data, len)) {
-//        progress(len, update_total_size);
-//      } else {
-//        error(HTTP_UPDATE_ERROR_WRITE_FAILED);
-//      }
-//    }
-    ->onResponse([url,error](MongooseHttpClientResponse *response)
+  MongooseHttpClientRequest *request = client.beginRequest(url.c_str());
+  if(request)
+  {
+    request->setMethod(HTTP_GET);
+
+    request->onBody([url,progress,error,request](MongooseHttpClientResponse *response)
     {
       if(response->respCode() == 200)
       {
         size_t total = response->contentLength();
-        if(!http_update_start(url, total)) {
+        DBUGVAR(total);
+        if(Update.isRunning() || http_update_start(url, total))
+        {
+          uint8_t *data = (uint8_t *)response->body().c_str();
+          size_t len = response->body().length();
+          if(http_update_write(data, len))
+          {
+            progress(len, total);
+            return;
+          } else {
+            error(HTTP_UPDATE_ERROR_WRITE_FAILED);
+          }
+        } else {
           error(HTTP_UPDATE_ERROR_FAILED_TO_START_UPDATE);
         }
       } else {
         error(response->respCode());
       }
-    })
-    ->onClose([success, error](MongooseHttpClientResponse *response) {
-      if(http_update_end()) {
+      request->abort();
+    });
+
+    request->onClose([success, error]()
+    {
+      if(http_update_end())
+      {
         success(HTTP_UPDATE_OK);
+        restart_system();
       } else {
         error(HTTP_UPDATE_ERROR_FAILED_TO_END_UPDATE);
       }
     });
-  client.send(request);
+    client.send(request);
 
-  return true;
+    return true;
+  }
+
+  return false;
 }
 
 bool http_update_start(String source, size_t total)
 {
+  update_position = 0;
   update_total_size = total;
   if(Update.begin())
   {
-    DEBUG_PORT.printf("Update Start: %s\n", source.c_str());
+    DEBUG_PORT.printf("Update Start: %s %zu\n", source.c_str(), total);
 
     lcd.display(F("Updating WiFi"), 0, 0, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
     lcd.display(F(""), 0, 1, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
@@ -67,8 +88,10 @@ bool http_update_start(String source, size_t total)
 
 bool http_update_write(uint8_t *data, size_t len)
 {
-  DBUGF("Update Writing %u", update_position);
-  if(Update.write(data, len) == len)
+  DBUGF("Update Writing %u, %u", update_position, len);
+  size_t written = Update.write(data, len);
+  DBUGVAR(written);
+  if(written == len)
   {
     update_position += len;
     if(update_total_size > 0)
@@ -80,6 +103,7 @@ bool http_update_write(uint8_t *data, size_t len)
       {
         String text = String(percent) + F("%");
         lcd.display(text, 0, 1, 10 * 1000, LCD_DISPLAY_NOW);
+
         DEBUG_PORT.printf("Update: %d%%\n", percent);
         lastPercent = percent;
       }
@@ -96,8 +120,9 @@ bool http_update_end()
   DBUGLN("Upload finished");
   if(Update.end(true))
   {
-    DBUGF("Update Success: %uB", update_position);
+    DBUGF("Update Success: %u", update_position);
     lcd.display(F("Complete"), 0, 1, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);
+    return true;
   } else {
     DBUGF("Update failed: %d", Update.getError());
     lcd.display(F("Error"), 0, 1, 10 * 1000, LCD_CLEAR_LINE | LCD_DISPLAY_NOW);

test/update.http

@@ -53,3 +53,12 @@ Content-Type: application/javascript
 {
   "url": "{{latest.response.body.assets[1].browser_download_url}}"
 }
+
+###
+
+POST {{baseUrl}}/update
+Content-Type: application/javascript
+
+{
+  "url": "http://frenzy.lan:8000/.pio/build/{{config.response.body.buildenv}}/firmware.bin"
+}