Code refactoring

Author: mathieucarbou

data/.keep

@@ -0,0 +1 @@
+This folder is left empty to be able to generate an FS image with: pio run -e esp32dev -t buildfs

embed/website.html

@@ -403,7 +403,7 @@ <h6 id="clickable_file_input">or<br />click to select (.bin) file</h6>
             <div class="info_text_value" id="info_text_build">Unknown</div>
           </div>
         </div>
-        <button id="restart_button">Cancel SafeBoot</button>
+        <button id="restart_button">Restart</button>
       </div>
     </div>
     <script>

src/HTTPUpdateServer.h

@@ -4,9 +4,10 @@
  */
 
 #include <ArduinoOTA.h>
-#include <HTTPUpdateServer.h>
 #include <HardwareSerial.h>
 #include <MycilaESPConnect.h>
+#include <StreamString.h>
+#include <WebServer.h>
 
 #include <esp_ota_ops.h>
 #include <esp_partition.h>
@@ -21,10 +22,16 @@
   #define LOG(format, ...)
 #endif
 
+extern const char* __COMPILED_APP_VERSION__;
+extern const uint8_t update_html_start[] asm("_binary__pio_embed_website_html_gz_start");
+extern const uint8_t update_html_end[] asm("_binary__pio_embed_website_html_gz_end");
+static const char* successResponse = "Update Success! Rebooting...";
+static const char* cancelResponse = "Rebooting...";
+
 static WebServer webServer(80);
-static HTTPUpdateServer httpUpdater;
 static Mycila::ESPConnect espConnect;
 static Mycila::ESPConnect::Config espConnectConfig;
+static StreamString updaterError;
 
 static String getChipIDStr() {
   uint32_t chipId = 0;
@@ -36,33 +43,87 @@ static String getChipIDStr() {
   return espId;
 }
 
-void setup() {
-#ifdef SAFEBOOT_LOGGING
-  Serial.begin(115200);
-  #if ARDUINO_USB_CDC_ON_BOOT
-  Serial.setTxTimeoutMs(0);
-  delay(100);
-  #else
-  while (!Serial)
-    yield();
-  #endif
-#endif
+static void start_web_server() {
+  webServer.on("/cancel", HTTP_POST, [&]() {
+      webServer.send(200, "text/plain", cancelResponse);
+      webServer.client().stop();
+      delay(500);
+      ESP.restart(); }, [&]() {});
 
-  LOG("Version: %s\n", __COMPILED_APP_VERSION__);
+  webServer.on("/", HTTP_GET, [&]() {
+    webServer.sendHeader("Content-Encoding", "gzip");
+    webServer.send_P(200, "text/html", reinterpret_cast<const char*>(update_html_start), update_html_end - update_html_start);
+  });
 
-  // Set next boot partition
-  const esp_partition_t* partition = esp_partition_find_first(esp_partition_type_t::ESP_PARTITION_TYPE_APP, esp_partition_subtype_t::ESP_PARTITION_SUBTYPE_APP_OTA_0, nullptr);
-  if (partition) {
-    esp_ota_set_boot_partition(partition);
-  }
+  webServer.on("/", HTTP_POST, [&]() {
+      if (Update.hasError()) {
+        webServer.send(500, "text/plain", "Update error: " + updaterError);
+      } else {
+        webServer.client().setNoDelay(true);
+        webServer.send(200, "text/plain", successResponse);
+        webServer.client().stop();
+        delay(500);
+        ESP.restart();
+      } }, [&]() {
+      // handler for the file upload, gets the sketch bytes, and writes
+      // them through the Update object
+      HTTPUpload& upload = webServer.upload();
+
+      if (upload.status == UPLOAD_FILE_START) {
+        updaterError.clear();
+        int otaMode = U_FLASH;
+        if (webServer.hasArg("mode") && webServer.arg("mode") == "1") {
+          otaMode = U_SPIFFS;
+        }
+        LOG("Mode: %d\n", otaMode);
+        if (!Update.begin(UPDATE_SIZE_UNKNOWN, otaMode)) { // start with max available size
+          Update.printError(updaterError);
+        }
+      } else if (upload.status == UPLOAD_FILE_WRITE && !updaterError.length()) {
+        if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
+          Update.printError(updaterError);
+        }
+      } else if (upload.status == UPLOAD_FILE_END && !updaterError.length()) {
+        if (!Update.end(true)) { // true to set the size to the current progress
+          Update.printError(updaterError);
+        }
+      } else if (upload.status == UPLOAD_FILE_ABORTED) {
+        Update.end();
+      }
+      delay(0); });
+
+  webServer.on("/chipspecs", HTTP_GET, [&]() {
+    String chipSpecs = ESP.getChipModel();
+    chipSpecs += " (" + String(ESP.getFlashChipSize() >> 20) + " MB)";
+    webServer.send(200, "text/plain", chipSpecs.c_str());
+  });
+
+  webServer.on("/sbversion", HTTP_GET, [&]() {
+    webServer.send(200, "text/plain", __COMPILED_APP_VERSION__);
+  });
 
-  // setup routes
-  httpUpdater.setup(&webServer, "/");
   webServer.onNotFound([]() {
     webServer.sendHeader("Location", "/");
     webServer.send(302, "text/plain", "");
   });
 
+  webServer.begin();
+
+#ifndef MYCILA_SAFEBOOT_NO_MDNS
+  MDNS.addService("http", "tcp", 80);
+#endif
+
+  LOG("Web Server started\n");
+}
+
+static void set_next_partition_to_boot() {
+  const esp_partition_t* partition = esp_partition_find_first(esp_partition_type_t::ESP_PARTITION_TYPE_APP, esp_partition_subtype_t::ESP_PARTITION_SUBTYPE_APP_OTA_0, nullptr);
+  if (partition) {
+    esp_ota_set_boot_partition(partition);
+  }
+}
+
+static void start_network_manager() {
   // load ESPConnect configuration
   espConnect.loadConfiguration(espConnectConfig);
   espConnect.setBlocking(true);
@@ -105,25 +166,43 @@ void setup() {
   }
   LOG("IP: %s\n", espConnect.getIPAddress().toString().c_str());
   LOG("Hostname: %s\n", espConnect.getHostname().c_str());
+}
 
-  // start http
-  webServer.begin();
-  LOG("Web Server started\n");
-
+static void start_mdns() {
 #ifndef MYCILA_SAFEBOOT_NO_MDNS
-  // Start mDNS
   MDNS.begin(espConnectConfig.hostname.c_str());
-  MDNS.addService("http", "tcp", 80);
+  LOG("mDNS started\n");
 #endif
+}
 
-  // Start OTA
+static void start_arduino_ota() {
   ArduinoOTA.setHostname(espConnectConfig.hostname.c_str());
   ArduinoOTA.setRebootOnSuccess(true);
   ArduinoOTA.setMdnsEnabled(true);
   ArduinoOTA.begin();
   LOG("OTA Server started on port 3232\n");
 }
 
+void setup() {
+#ifdef SAFEBOOT_LOGGING
+  Serial.begin(115200);
+  #if ARDUINO_USB_CDC_ON_BOOT
+  Serial.setTxTimeoutMs(0);
+  delay(100);
+  #else
+  while (!Serial)
+    yield();
+  #endif
+#endif
+
+  LOG("Version: %s\n", __COMPILED_APP_VERSION__);
+  set_next_partition_to_boot();
+  start_network_manager();
+  start_mdns();
+  start_web_server();
+  start_arduino_ota();
+}
+
 void loop() {
   webServer.handleClient();
   ArduinoOTA.handle();