sync with dev-16

src/core/EMSESP_Version.h

@@ -0,0 +1,124 @@
+/*
+ * EMS-ESP - https://github.com/emsesp/EMS-ESP
+ * Copyright 2020-2026  emsesp.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EMSESP_Version_H
+#define EMSESP_Version_H
+
+#include <cstdio>
+#include <cstring>
+#include <string>
+
+// Drop-in lightweight replacement for the subset of the semver library actually used by EMS-ESP.
+// The previous semver library (lib/semver) builds a std::map + std::function-based state machine on
+// every parse, which fragments the internal heap on the ESP32. This replacement does no heap
+// allocation beyond the std::string member for the prerelease tag, and matches the API surface
+// we consume: construction from string, major()/minor()/patch()/prerelease(), and operator>/</==.
+//
+// Only strict numeric precedence (major.minor.patch) is used for comparison in EMS-ESP, so we
+// intentionally ignore prerelease tags during comparison rather than implement the full semver
+// ordering rules. This is consistent with how the old code was used (callers only check major/
+// minor/patch numerically; prerelease() is only read for logging).
+
+namespace version {
+
+class EMSESP_Version {
+  public:
+    EMSESP_Version() = default;
+
+    // Construct from a version string like "3.9.0-dev.14" or "3.9.0".
+    // Anything past a '-' or '+' is kept as the prerelease string and not interpreted.
+    explicit EMSESP_Version(const std::string & s) {
+        parse(s.c_str());
+    }
+
+    explicit EMSESP_Version(const char * s) {
+        parse(s ? s : "");
+    }
+
+    int major() const {
+        return major_;
+    }
+    int minor() const {
+        return minor_;
+    }
+    int patch() const {
+        return patch_;
+    }
+    const std::string & prerelease() const {
+        return prerelease_;
+    }
+
+    // Numeric-only comparison (major.minor.patch). Prerelease tags are ignored on purpose.
+    friend bool operator<(const EMSESP_Version & a, const EMSESP_Version & b) {
+        if (a.major_ != b.major_)
+            return a.major_ < b.major_;
+        if (a.minor_ != b.minor_)
+            return a.minor_ < b.minor_;
+        return a.patch_ < b.patch_;
+    }
+
+    friend bool operator>(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return b < a;
+    }
+
+    friend bool operator==(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return a.major_ == b.major_ && a.minor_ == b.minor_ && a.patch_ == b.patch_;
+    }
+
+    friend bool operator!=(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return !(a == b);
+    }
+
+    friend bool operator>=(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return !(a < b);
+    }
+
+    friend bool operator<=(const EMSESP_Version & a, const EMSESP_Version & b) {
+        return !(b < a);
+    }
+
+  private:
+    int         major_ = 0;
+    int         minor_ = 0;
+    int         patch_ = 0;
+    std::string prerelease_;
+
+    void parse(const char * s) {
+        major_ = minor_ = patch_ = 0;
+        prerelease_.clear();
+        if (s == nullptr || *s == '\0') {
+            return;
+        }
+        // parse numeric major.minor.patch; accept partial ("3", "3.9", "3.9.0")
+        sscanf(s, "%d.%d.%d", &major_, &minor_, &patch_);
+        // capture prerelease tag after '-' if present (stop at '+' which is build metadata)
+        const char * dash = strchr(s, '-');
+        if (dash != nullptr) {
+            const char * plus = strchr(dash, '+');
+            if (plus != nullptr) {
+                prerelease_.assign(dash + 1, plus - dash - 1);
+            } else {
+                prerelease_.assign(dash + 1);
+            }
+        }
+    }
+};
+
+} // namespace version
+
+#endif

src/core/emsfactory.h

@@ -19,6 +19,7 @@
 #ifndef EMSESP_EMSFACTORY_H_
 #define EMSESP_EMSFACTORY_H_
 
+#include <cstdint>
 #include <memory> // for unique_ptr
 #include <map>
 

src/core/system.cpp

@@ -26,13 +26,12 @@
 #include <esp_mac.h>
 #include "esp_efuse.h"
 #include <nvs.h>
-#include <mbedtls/base64.h>
 #endif
 
 #include <HTTPClient.h>
 #include <map>
 
-#include <semver200.h>
+#include "EMSESP_Version.h"
 
 #if defined(EMSESP_TEST)
 #include "../test/test.h"
@@ -457,15 +456,16 @@ void System::get_partition_info() {
             strftime(time_string, sizeof(time_string), "%FT%T", localtime(&d));
             p_info.install_date = d > 1500000000L ? time_string : "";
 
-            esp_image_metadata_t meta     = {};
-            esp_partition_pos_t  part_pos = {.offset = part->address, .size = part->size};
-            if (esp_image_verify(ESP_IMAGE_VERIFY_SILENT, &part_pos, &meta) == ESP_OK) {
-                p_info.size = meta.image_len / 1024; // actual firmware size in KB
-            } else {
-                p_info.size = 0;
+            if (!p_info.version.empty()) {
+                esp_image_metadata_t meta     = {};
+                esp_partition_pos_t  part_pos = {.offset = part->address, .size = part->size};
+                if (esp_image_verify(ESP_IMAGE_VERIFY_SILENT, &part_pos, &meta) == ESP_OK) {
+                    p_info.size = meta.image_len / 1024; // actual firmware size in KB
+                } else {
+                    p_info.size = 0;
+                }
+                partition_info_[part->label] = p_info;
             }
-
-            partition_info_[part->label] = p_info;
         }
 
         it = esp_partition_next(it); // loop to next partition
@@ -1613,8 +1613,8 @@ bool System::check_upgrade() {
         settingsVersion = "3.5.0"; // this was the last stable version without version info
     }
 
-    version::Semver200_version settings_version(settingsVersion);
-    version::Semver200_version this_version(EMSESP_APP_VERSION);
+    version::EMSESP_Version settings_version(settingsVersion);
+    version::EMSESP_Version this_version(EMSESP_APP_VERSION);
 
     std::string settings_version_type = settings_version.prerelease().empty() ? "" : ("-" + settings_version.prerelease());
     std::string this_version_type     = this_version.prerelease().empty() ? "" : ("-" + this_version.prerelease());
@@ -1765,18 +1765,17 @@ void System::exportSettings(const std::string & type, const char * filename, Jso
 
     File settingsFile = LittleFS.open(filename);
     if (settingsFile) {
-        JsonDocument         jsonDocument;
-        DeserializationError error = deserializeJson(jsonDocument, settingsFile);
-        if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
-            JsonObject node = output[section].to<JsonObject>();
-            for (JsonPair kvp : jsonDocument.as<JsonObject>()) {
-                node[kvp.key()] = kvp.value();
+        {
+            JsonDocument         jsonDocument;
+            DeserializationError error = deserializeJson(jsonDocument, settingsFile);
+            settingsFile.close(); // close early, we no longer need the file
+            if (error || !jsonDocument.is<JsonObject>()) {
+                LOG_ERROR("Failed to deserialize settings file %s", filename);
+                return;
             }
-        } else {
-            LOG_ERROR("Failed to deserialize settings file %s", filename);
+            output[section].set(jsonDocument.as<JsonObject>());
         }
         LOG_DEBUG("Exported %s settings from file %s", section, filename);
-        settingsFile.close();
     } else {
         LOG_ERROR("No settings file for %s found", filename);
     }
@@ -1828,13 +1827,15 @@ void System::exportSystemBackup(JsonObject output) {
     if (file) {
         JsonDocument         jsonDocument;
         DeserializationError error = deserializeJson(jsonDocument, file);
-        if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
-            JsonObject node = nodes.add<JsonObject>();
-            node["type"]    = "customSupport";
-            node["data"]    = jsonDocument.as<JsonObject>();
+        file.close(); // close early, we no longer need the file
+        if (!error && jsonDocument.is<JsonObject>()) {
+            JsonObject support_node = nodes.add<JsonObject>();
+            support_node["type"]    = "customSupport";
+            support_node["data"].set(jsonDocument.as<JsonObject>());
+            LOG_DEBUG("Exported custom support file %s", EMSESP_CUSTOMSUPPORT_FILE);
+        } else {
+            LOG_ERROR("Failed to deserialize custom support file");
         }
-        file.close();
-        LOG_DEBUG("Exported custom support file %s", EMSESP_CUSTOMSUPPORT_FILE);
     }
 
     // Backup NVS values