2025.08.20

Author: darkpoet78

README.md

@@ -17,6 +17,7 @@ Documentation will be slowly improved.
 
 
 ### 2025.08.20
+  - Fixes to Online updater
   - WebUI fixed for mobile displays
   - MQTT added to WebUI options / defaults set by adding defines to `myoptions.h`
     - `#define MQTT_ENABLE` to enable (will not be available otherwise)

builds/trip5/platformio.ini

@@ -7,7 +7,7 @@ platform = espressif32
 framework = arduino
 monitor_speed = 115200
 build_flags =
-	-DCORE_DEBUG_LEVEL=1	; Set to 0 for no debug; saves memory / 5 for full debug
+	-DCORE_DEBUG_LEVEL=0	; Set to 0 for no debug; saves memory / 5 for full debug
 ; required libraries - universal libs here and build-dependent libs with the board definitions
 lib_deps =
   bblanchon/ArduinoJson@^6.21.3

data/www/script.js

@@ -93,8 +93,8 @@ function onMessage(event) {
         const status = getId('uploadstatus');
         if(status) status.innerHTML = "OTA Update: " + data.onlineupdateprogress +  "%  downloaded  |  please wait...";
         if (data.onlineupdateprogress >= 100) {
-          getId("uploadstatus").innerHTML = "OTA Update Complete. Radio will reboot, update files, and reboot again. Please be patient.";
-          rebootingProgress(80);
+          getId("uploadstatus").innerHTML = "OTA Update Complete. Radio will reboot, update files, and reboot again. This will take 1 or 2 minutes.";
+          rebootingProgress(60);
         }
       }
     }
@@ -744,8 +744,7 @@ function rebootingProgress(waitSeconds) {
     if (elapsed < waitSeconds * 1000) {
       rebootTimer = setTimeout(update, 200);
     } else {
-      location.href = `http://${hostname}/`;
-      window.location.reload(true);
+      window.location.replace(`http://${hostname}/`);
     }
   };
   update();

src/core/commandhandler.cpp

@@ -100,13 +100,7 @@ bool CommandHandler::exec(const char *command, const char *value, uint8_t cid) {
   if (strEquals(command, "snuffle")) { config.setSnuffle(strcmp(value, "true") == 0); return true; }
   if (strEquals(command, "balance")) { config.setBalance(static_cast<uint8_t>(atoi(value))); return true; }
   if (strEquals(command, "reboot"))  { ESP.restart(); return true; }
-  if (strEquals(command, "format"))  { player.sendCommand({PR_STOP, 0}); SPIFFS.format();
-    #ifdef UPDATEURL
-      delay(250);
-      File markerFile = SPIFFS.open(ONLINEUPDATE_MARKERFILE, "w"); if (markerFile) markerFile.close();
-      delay(250);
-    #endif
-    ESP.restart(); return true; }
+  if (strEquals(command, "format"))  { player.sendCommand({PR_STOP, 0}); SPIFFS.format(); ESP.restart(); return true; }
   if (strEquals(command, "submitplaylist"))  { player.sendCommand({PR_STOP, 0}); return true; }
 
 #if IR_PIN!=255

src/core/config.cpp

@@ -82,13 +82,14 @@ void Config::init() {
   BOOTLOG("SPIFFS mounted");
   emptyFS = _isFSempty();
   if(emptyFS) {
-    #ifndef FILESURL
+    #ifndef UPDATEURL
       BOOTLOG("SPIFFS is empty!");
     #else
-      BOOTLOG("SPIFFS is empty.  Will attempt to get files from online...");
-      File markerFile = SPIFFS.open(ONLINEUPDATE_MARKERFILE, "w");
-      if (markerFile) markerFile.close();
-      display.putRequest(NEWMODE, UPDATING);
+      BOOTLOG("SPIFFS is missing files.  Will attempt to get files from online...");
+      config.deleteMainDatawwwFile();
+      getRequiredFiles();
+      delay(200);
+      ESP.restart();
     #endif
   }
   ssidsCount = 0;
@@ -1169,6 +1170,23 @@ void Config::sleepForAfter(uint16_t sf, uint16_t sa){
   else doSleep();
 }
 
+void Config::deleteMainDatawwwFile() {
+  if (requiredFilesCount > 0) {
+    const char* lastFile = requiredFiles[requiredFilesCount - 1];
+    char mainfile[64];
+    snprintf(mainfile, sizeof(mainfile), "www/%s", lastFile);
+    if (SPIFFS.exists(mainfile)) {
+      SPIFFS.remove(mainfile);
+      Serial.printf("[Config] Deleted main www file: %s\n", mainfile);
+    }
+    snprintf(mainfile, sizeof(mainfile), "www/%s.gz", lastFile);
+    if (SPIFFS.exists(mainfile)) {
+      SPIFFS.remove(mainfile);
+      Serial.printf("[Config] Deleted main www file: %s\n", mainfile);
+    }
+  }
+}
+
 void cleanStaleSearchResults() {
   const char* metaPath = "/data/searchresults.json.meta";
   if (SPIFFS.exists(metaPath)) {
@@ -1206,41 +1224,45 @@ void fixPlaylistFileEnding() {
   playlistfile.close();
 }
 
-void updateFile(void* param, const char* localFile, const char* onlineFile, const char* updatePeriod, const char* simpleName) {
-  char startMsg[128];
-  snprintf(startMsg, sizeof(startMsg), "[ESPFileUpdater: %s] Started update.", simpleName);
-  Serial.println(startMsg);
-  ESPFileUpdater* updater = (ESPFileUpdater*)param;
-  ESPFileUpdater::UpdateStatus result = updater->checkAndUpdate(
-      localFile,
-      onlineFile,
-      updatePeriod,
-      ESPFILEUPDATER_VERBOSE
-  );
-  if (result == ESPFileUpdater::UPDATED) {
-    Serial.printf("[ESPFileUpdater: %s] Update completed.\n", simpleName);
-  } else if (result == ESPFileUpdater::NOT_MODIFIED||result == ESPFileUpdater::MAX_AGE_NOT_REACHED) {
-    Serial.printf("[ESPFileUpdater: %s] No update needed.\n", simpleName);
-  } else {
-    Serial.printf("[ESPFileUpdater: %s] Update failed.\n", simpleName);
-  }
-}
-
 #ifdef UPDATEURL
-  void getRequiredFiles(void* param) {
+  void Config::getRequiredFiles() {
+    player.sendCommand({PR_STOP, 0});
+    display.putRequest(NEWMODE, UPDATING);
+    char localFileGz[64];
+    char localFile[64];
+    char tryFile[64];
+    char tryUrl[128];
     for (size_t i = 0; i < requiredFilesCount; i++) {
-      player.sendCommand({PR_STOP, 0});
-      display.putRequest(NEWMODE, UPDATING);
       const char* fname = requiredFiles[i];
-      char localPath[64];
-      char remoteUrl[128];
-      snprintf(localPath, sizeof(localPath), "/www/%s", fname);
-      if (strlen(fname) > 3 && strcmp(fname + strlen(fname) - 3, ".gz") == 0) {
-        snprintf(remoteUrl, sizeof(remoteUrl), "%s%s", UPDATEURL, fname);
-      } else {
-        snprintf(remoteUrl, sizeof(remoteUrl), "%s%s.gz", UPDATEURL, fname);
+      snprintf(localFileGz, sizeof(localFileGz), "/www/%s.gz", fname);
+      snprintf(localFile, sizeof(localFile), "/www/%s", fname);
+      if (SPIFFS.exists(localFileGz)) SPIFFS.remove(localFileGz);
+      if (SPIFFS.exists(localFile)) SPIFFS.remove(localFile);
+      for (size_t j = 0; j < 2; j++) {
+        if (j == 0) { // Try compressed first
+          snprintf(tryFile, sizeof(tryFile), "%s", localFileGz);
+          snprintf(tryUrl, sizeof(tryUrl), "%s%s.gz", UPDATEURL, fname);
+        } else { // Fallback to uncompressed
+          snprintf(tryFile, sizeof(tryFile), "%s", localFile);
+          snprintf(tryUrl, sizeof(tryUrl), "%s%s", UPDATEURL, fname);
+        }
+        Serial.printf("[ESPFileUpdater: %s] Updating required file.\n", tryFile);
+        ESPFileUpdater updater(SPIFFS);
+        updater.setTimeout(5000);
+        ESPFileUpdater::UpdateStatus result = updater.checkAndUpdate(
+            tryFile,
+            tryUrl,
+            "",
+            ESPFILEUPDATER_VERBOSE
+        );
+        if (result == ESPFileUpdater::UPDATED) {
+          Serial.printf("[ESPFileUpdater: %s] Download completed.\n", tryFile);
+          break; // Exit inner loop on success
+        } else {
+          if (j == 0) Serial.printf("[ESPFileUpdater: %s] Download failed. Will retry for uncompressed file.\n", tryFile);
+          if (j == 1) Serial.printf("[ESPFileUpdater: %s] Download failed. Moving onto next file anyways.\n", tryFile);
+        }
       }
-      updateFile(param, localPath, remoteUrl, "", fname);
     }
     // Delete any files in /www that are not in the requiredFiles list
     File root = SPIFFS.open("/www");
@@ -1254,7 +1276,10 @@ void updateFile(void* param, const char* localFile, const char* onlineFile, cons
         if (slash) name = slash + 1;
         bool found = false;
         for (size_t j = 0; j < requiredFilesCount; j++) {
-          if (strcmp(name, requiredFiles[j]) == 0) {
+          // Check against both compressed and uncompressed names
+          char requiredNameGz[64];
+          snprintf(requiredNameGz, sizeof(requiredNameGz), "%s.gz", requiredFiles[j]);
+          if (strcmp(name, requiredFiles[j]) == 0 || strcmp(name, requiredNameGz) == 0) {
             found = true;
             break;
           }
@@ -1269,19 +1294,30 @@ void updateFile(void* param, const char* localFile, const char* onlineFile, cons
   }
 #endif //#ifdef UPDATEURL
 
+void Config::updateFile(void* param, const char* localFile, const char* onlineFile, const char* updatePeriod, const char* simpleName) {
+  char startMsg[128];
+  snprintf(startMsg, sizeof(startMsg), "[ESPFileUpdater: %s] Started update.", simpleName);
+  Serial.println(startMsg);
+  ESPFileUpdater* updater = (ESPFileUpdater*)param;
+  ESPFileUpdater::UpdateStatus result = updater->checkAndUpdate(
+      localFile,
+      onlineFile,
+      updatePeriod,
+      ESPFILEUPDATER_VERBOSE
+  );
+  if (result == ESPFileUpdater::UPDATED) {
+    Serial.printf("[ESPFileUpdater: %s] Update completed.\n", simpleName);
+  } else if (result == ESPFileUpdater::NOT_MODIFIED||result == ESPFileUpdater::MAX_AGE_NOT_REACHED) {
+    Serial.printf("[ESPFileUpdater: %s] No update needed.\n", simpleName);
+  } else {
+    Serial.printf("[ESPFileUpdater: %s] Update failed.\n", simpleName);
+  }
+}
+
 void startAsyncServices(void* param){
   fixPlaylistFileEnding();
-  // if the OTA marker file exists, fetch all web assets immediately, clean up, restart
- #ifdef UPDATEURL
-    if (SPIFFS.exists(ONLINEUPDATE_MARKERFILE)) {
-      getRequiredFiles(param);
-      SPIFFS.remove(ONLINEUPDATE_MARKERFILE);
-      delay(200);
-      ESP.restart();
-    }
-  #endif
-  updateFile(param, "/www/timezones.json.gz", TIMEZONES_JSON_URL, "1 week", "Timezones database file");
-  updateFile(param, "/www/rb_srvrs.json", RADIO_BROWSER_SERVERS_URL, "4 weeks", "Radio Browser Servers list");
+  config.updateFile(param, "/www/timezones.json.gz", TIMEZONES_JSON_URL, "1 week", "Timezones database file");
+  config.updateFile(param, "/www/rb_srvrs.json", RADIO_BROWSER_SERVERS_URL, "4 weeks", "Radio Browser Servers list");
   cleanStaleSearchResults();
   vTaskDelete(NULL);
 }

src/core/config.h

@@ -22,10 +22,6 @@
   #define ESPFILEUPDATER_VERBOSE false
 #endif
 
-#ifdef UPDATEURL
-  #define ONLINEUPDATE_MARKERFILE "/data/otaupdate.meta"
-#endif
-
 #define PLAYLIST_PATH     "/data/playlist.csv"
 #define SSIDS_PATH        "/data/wifi.csv"
 #define TMP_PATH          "/data/tmpfile.txt"
@@ -204,11 +200,6 @@ class Config {
     bool     isScreensaver;
     int      newConfigMode;
   public:
-    Config() {};
-    //void save();
-#if IR_PIN!=255
-    void saveIR();
-#endif
     void init();
     void loadPreferences();
     void deleteOldKeys();
@@ -236,10 +227,10 @@ class Config {
     void setBitrateFormat(BitrateFormat fmt) { configFmt = fmt; }
     void initPlaylist();
     void indexPlaylist();
-    void updateTZjson(void* param);
-    void getRequiredFiles(void* param);
+    void deleteMainDatawwwFile();
+    void getRequiredFiles();
     void startAsyncServicesButWait();
-    void updateRadioBrowserServersjson();
+    void updateFile(void* param, const char* localFile, const char* onlineFile, const char* updatePeriod, const char* simpleName);
     #ifdef USE_SD
       void initSDPlaylist();
       void changeMode(int newmode=-1);
@@ -269,11 +260,11 @@ class Config {
     void setScreensaverPlayingEnabled(bool val);
     void setScreensaverPlayingTimeout(uint16_t val);
     void setScreensaverPlayingBlank(bool val);
-    void setSntpOne(const char *val);
     void setShowweather(bool val);
     void setWeatherKey(const char *val);
     void setSDpos(uint32_t val);
 #if IR_PIN!=255
+    void saveIR();
     void setIrBtn(int val);
 #endif
     void resetSystem(const char *val, uint8_t clientId);

src/core/netserver.cpp

@@ -1044,8 +1044,7 @@ void launchPlaybackTask(const String& url, const String& name) {
           bool ended = Update.end();
           Serial.printf("[Online Update] Written %u bytes, expected %d, end() returned %s\n", written, contentLength, ended?"true":"false");
           if (written == contentLength && ended) {
-            File markerFile = SPIFFS.open(ONLINEUPDATE_MARKERFILE, "w");
-            if (markerFile) markerFile.close();
+            config.deleteMainDatawwwFile();
             websocket.textAll("{\"onlineupdatestatus\": \"Update successful, rebooting...\"}");
             delay(1000);
             ESP.restart();