Merge pull request #3030 from proddy/dev

build_webUI -> build-webUI

.github/workflows/dev_release.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |

.github/workflows/stable_release.yml

@@ -39,7 +39,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |

.github/workflows/test_release.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Build webUI
         run: |
-          platformio run -e build_webUI
+          platformio run -e build-webUI
 
       - name: Build modbus
         run: |

CHANGELOG_LATEST.md

@@ -32,3 +32,4 @@ For more details go to [emsesp.org](https://emsesp.org/).
 - device class for % values [#2980](https://github.com/emsesp/EMS-ESP32/issues/2980)
 - fetch telegrams: set length to fetch [#3017](https://github.com/emsesp/EMS-ESP32/issues/3017)
 - move http client from stack to heap
+- heap optimizations [#3021](https://github.com/emsesp/EMS-ESP32/discussions/3021)

Makefile

@@ -47,8 +47,8 @@ MAKEFLAGS += -j$(JOBS) -l$(shell echo $$(($(JOBS) * 2)))
 #----------------------------------------------------------------------
 TARGET    := emsesp
 BUILD     := build
-SOURCES   := src/core src/devices src/web src/test lib_standalone lib/semver lib/espMqttClient/src lib/espMqttClient/src/*         lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/PButton 
-INCLUDES  := src/core src/devices src/web src/test lib_standalone lib/* lib/semver lib/espMqttClient/src lib/espMqttClient/src/Transport lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/uuid-telnet/src lib/uuid-syslog/src
+SOURCES   := src/core src/devices src/web src/test lib_standalone lib/espMqttClient/src lib/espMqttClient/src/*         lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/PButton 
+INCLUDES  := src/core src/devices src/web src/test lib_standalone lib/* lib/espMqttClient/src lib/espMqttClient/src/Transport lib/ArduinoJson/src lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src   lib/uuid-telnet/src lib/uuid-syslog/src
 LIBRARIES :=
 
 CPPCHECK = cppcheck

cspell.json

@@ -38,6 +38,7 @@
     "vite.config.ts",
     "lib/esp32-psram/**",
     "test/test_api/test_api.h",
-    "lib_standalone/**"
+    "lib_standalone/**",
+    "**/*.js"
   ]
   }

interface/package.json

@@ -17,7 +17,7 @@
     "preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"pnpm:mock-rest\" \"vite preview\"",
     "standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite dev\"",
     "typesafe-i18n": "typesafe-i18n --no-watch",
-    "build_webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js",
+    "build-webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js",
     "format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'",
     "lint": "eslint . --fix",
     "standalone-devcontainer": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite --host\""
@@ -57,7 +57,7 @@
     "@types/react-dom": "^19.2.3",
     "axe-core": "^4.11.3",
     "concurrently": "^9.2.1",
-    "eslint": "^10.2.0",
+    "eslint": "^10.2.1",
     "eslint-config-prettier": "^10.1.8",
     "prettier": "^3.8.3",
     "rollup-plugin-visualizer": "^7.0.1",

interface/pnpm-lock.yaml

@@ -80,7 +80,7 @@ importers:
         version: 7.29.0
       '@eslint/js':
         specifier: ^10.0.1
-        version: 10.0.1(eslint@10.2.0)
+        version: 10.0.1(eslint@10.2.1)
       '@preact/preset-vite':
         specifier: ^2.10.5
         version: 2.10.5(@babel/core@7.29.0)(preact@10.29.1)(rollup@4.59.0)(vite@8.0.8(@types/node@25.6.0)(esbuild@0.27.4)(terser@5.46.1))
@@ -103,11 +103,11 @@ importers:
         specifier: ^9.2.1
         version: 9.2.1
       eslint:
-        specifier: ^10.2.0
-        version: 10.2.0
+        specifier: ^10.2.1
+        version: 10.2.1
       eslint-config-prettier:
         specifier: ^10.1.8
-        version: 10.1.8(eslint@10.2.0)
+        version: 10.1.8(eslint@10.2.1)
       prettier:
         specifier: ^3.8.3
         version: 3.8.3
@@ -119,7 +119,7 @@ importers:
         version: 5.46.1
       typescript-eslint:
         specifier: ^8.58.2
-        version: 8.58.2(eslint@10.2.0)(typescript@6.0.3)
+        version: 8.58.2(eslint@10.2.1)(typescript@6.0.3)
       vite:
         specifier: ^8.0.8
         version: 8.0.8(@types/node@25.6.0)(esbuild@0.27.4)(terser@5.46.1)
@@ -501,12 +501,16 @@ packages:
     resolution: {integrity: sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@humanfs/core@0.19.1':
-    resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
+  '@humanfs/core@0.19.2':
+    resolution: {integrity: sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==}
     engines: {node: '>=18.18.0'}
 
-  '@humanfs/node@0.16.7':
-    resolution: {integrity: sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==}
+  '@humanfs/node@0.16.8':
+    resolution: {integrity: sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanfs/types@0.15.0':
+    resolution: {integrity: sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==}
     engines: {node: '>=18.18.0'}
 
   '@humanwhocodes/module-importer@1.0.1':
@@ -1184,8 +1188,8 @@ packages:
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.10.19:
-    resolution: {integrity: sha512-qCkNLi2sfBOn8XhZQ0FXsT1Ki/Yo5P90hrkRamVFRS7/KV9hpfA4HkoWNU152+8w0zPjnxo5psx5NL3PSGgv5g==}
+  baseline-browser-mapping@2.10.20:
+    resolution: {integrity: sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -1713,8 +1717,8 @@ packages:
     resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  eslint@10.2.0:
-    resolution: {integrity: sha512-+L0vBFYGIpSNIt/KWTpFonPrqYvgKw1eUI5Vn7mEogrQcWtWYtNQ7dNqC+px/J0idT3BAkiWrhfS7k+Tum8TUA==}
+  eslint@10.2.1:
+    resolution: {integrity: sha512-wiyGaKsDgqXvF40P8mDwiUp/KQjE1FdrIEJsM8PZ3XCiniTMXS3OHWWUe5FI5agoCnr8x4xPrTDZuxsBlNHl+Q==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
     hasBin: true
     peerDependencies:
@@ -2025,8 +2029,8 @@ packages:
     resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
     engines: {node: '>= 0.4'}
 
-  hasown@2.0.2:
-    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+  hasown@2.0.3:
+    resolution: {integrity: sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==}
     engines: {node: '>= 0.4'}
 
   he@1.2.0:
@@ -3714,9 +3718,9 @@ snapshots:
   '@esbuild/win32-x64@0.27.4':
     optional: true
 
-  '@eslint-community/eslint-utils@4.9.1(eslint@10.2.0)':
+  '@eslint-community/eslint-utils@4.9.1(eslint@10.2.1)':
     dependencies:
-      eslint: 10.2.0
+      eslint: 10.2.1
       eslint-visitor-keys: 3.4.3
 
   '@eslint-community/regexpp@4.12.2': {}
@@ -3737,9 +3741,9 @@ snapshots:
     dependencies:
       '@types/json-schema': 7.0.15
 
-  '@eslint/js@10.0.1(eslint@10.2.0)':
+  '@eslint/js@10.0.1(eslint@10.2.1)':
     optionalDependencies:
-      eslint: 10.2.0
+      eslint: 10.2.1
 
   '@eslint/object-schema@3.0.5': {}
 
@@ -3748,13 +3752,18 @@ snapshots:
       '@eslint/core': 1.2.1
       levn: 0.4.1
 
-  '@humanfs/core@0.19.1': {}
-
-  '@humanfs/node@0.16.7':
+  '@humanfs/core@0.19.2':
     dependencies:
-      '@humanfs/core': 0.19.1
+      '@humanfs/types': 0.15.0
+
+  '@humanfs/node@0.16.8':
+    dependencies:
+      '@humanfs/core': 0.19.2
+      '@humanfs/types': 0.15.0
       '@humanwhocodes/retry': 0.4.3
 
+  '@humanfs/types@0.15.0': {}
+
   '@humanwhocodes/module-importer@1.0.1': {}
 
   '@humanwhocodes/retry@0.4.3': {}
@@ -4187,15 +4196,15 @@ snapshots:
     dependencies:
       '@types/node': 25.6.0
 
-  '@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.3))(eslint@10.2.0)(typescript@6.0.3)':
+  '@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1)(typescript@6.0.3))(eslint@10.2.1)(typescript@6.0.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.58.2(eslint@10.2.0)(typescript@6.0.3)
+      '@typescript-eslint/parser': 8.58.2(eslint@10.2.1)(typescript@6.0.3)
       '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/type-utils': 8.58.2(eslint@10.2.0)(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.0)(typescript@6.0.3)
+      '@typescript-eslint/type-utils': 8.58.2(eslint@10.2.1)(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1)(typescript@6.0.3)
       '@typescript-eslint/visitor-keys': 8.58.2
-      eslint: 10.2.0
+      eslint: 10.2.1
       ignore: 7.0.5
       natural-compare: 1.4.0
       ts-api-utils: 2.5.0(typescript@6.0.3)
@@ -4203,14 +4212,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.3)':
+  '@typescript-eslint/parser@8.58.2(eslint@10.2.1)(typescript@6.0.3)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.58.2
       '@typescript-eslint/types': 8.58.2
       '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
       '@typescript-eslint/visitor-keys': 8.58.2
       debug: 4.4.3
-      eslint: 10.2.0
+      eslint: 10.2.1
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
@@ -4233,13 +4242,13 @@ snapshots:
     dependencies:
       typescript: 6.0.3
 
-  '@typescript-eslint/type-utils@8.58.2(eslint@10.2.0)(typescript@6.0.3)':
+  '@typescript-eslint/type-utils@8.58.2(eslint@10.2.1)(typescript@6.0.3)':
     dependencies:
       '@typescript-eslint/types': 8.58.2
       '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.0)(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1)(typescript@6.0.3)
       debug: 4.4.3
-      eslint: 10.2.0
+      eslint: 10.2.1
       ts-api-utils: 2.5.0(typescript@6.0.3)
       typescript: 6.0.3
     transitivePeerDependencies:
@@ -4262,13 +4271,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.58.2(eslint@10.2.0)(typescript@6.0.3)':
+  '@typescript-eslint/utils@8.58.2(eslint@10.2.1)(typescript@6.0.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.0)
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1)
       '@typescript-eslint/scope-manager': 8.58.2
       '@typescript-eslint/types': 8.58.2
       '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
-      eslint: 10.2.0
+      eslint: 10.2.1
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
@@ -4346,7 +4355,7 @@ snapshots:
 
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.10.19: {}
+  baseline-browser-mapping@2.10.20: {}
 
   bin-build@3.0.0:
     dependencies:
@@ -4407,7 +4416,7 @@ snapshots:
 
   browserslist@4.28.2:
     dependencies:
-      baseline-browser-mapping: 2.10.19
+      baseline-browser-mapping: 2.10.20
       caniuse-lite: 1.0.30001788
       electron-to-chromium: 1.5.340
       node-releases: 2.0.37
@@ -4919,9 +4928,9 @@ snapshots:
 
   escape-string-regexp@4.0.0: {}
 
-  eslint-config-prettier@10.1.8(eslint@10.2.0):
+  eslint-config-prettier@10.1.8(eslint@10.2.1):
     dependencies:
-      eslint: 10.2.0
+      eslint: 10.2.1
 
   eslint-scope@9.1.2:
     dependencies:
@@ -4934,15 +4943,15 @@ snapshots:
 
   eslint-visitor-keys@5.0.1: {}
 
-  eslint@10.2.0:
+  eslint@10.2.1:
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.0)
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1)
       '@eslint-community/regexpp': 4.12.2
       '@eslint/config-array': 0.23.5
       '@eslint/config-helpers': 0.5.5
       '@eslint/core': 1.2.1
       '@eslint/plugin-kit': 0.7.1
-      '@humanfs/node': 0.16.7
+      '@humanfs/node': 0.16.8
       '@humanwhocodes/module-importer': 1.0.1
       '@humanwhocodes/retry': 0.4.3
       '@types/estree': 1.0.8
@@ -5190,7 +5199,7 @@ snapshots:
       get-proto: 1.0.1
       gopd: 1.2.0
       has-symbols: 1.1.0
-      hasown: 2.0.2
+      hasown: 2.0.3
       math-intrinsics: 1.1.0
 
   get-proto@1.0.1:
@@ -5325,7 +5334,7 @@ snapshots:
     dependencies:
       has-symbols: 1.1.0
 
-  hasown@2.0.2:
+  hasown@2.0.3:
     dependencies:
       function-bind: 1.1.2
 
@@ -5435,7 +5444,7 @@ snapshots:
 
   is-core-module@2.16.1:
     dependencies:
-      hasown: 2.0.2
+      hasown: 2.0.3
 
   is-cwebp-readable@3.0.0:
     dependencies:
@@ -6417,13 +6426,13 @@ snapshots:
     dependencies:
       typescript: 6.0.3
 
-  typescript-eslint@8.58.2(eslint@10.2.0)(typescript@6.0.3):
+  typescript-eslint@8.58.2(eslint@10.2.1)(typescript@6.0.3):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.0)(typescript@6.0.3))(eslint@10.2.0)(typescript@6.0.3)
-      '@typescript-eslint/parser': 8.58.2(eslint@10.2.0)(typescript@6.0.3)
+      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1)(typescript@6.0.3))(eslint@10.2.1)(typescript@6.0.3)
+      '@typescript-eslint/parser': 8.58.2(eslint@10.2.1)(typescript@6.0.3)
       '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.0)(typescript@6.0.3)
-      eslint: 10.2.0
+      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1)(typescript@6.0.3)
+      eslint: 10.2.1
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color

interface/progmem-generator.js

@@ -24,20 +24,26 @@ let bundleStats = {
   other: { count: 0, uncompressed: 0, compressed: 0 }
 };
 
-const generateWWWClass =
-  () => `typedef std::function<void(const char * uri, const String & contentType, const uint8_t * content, size_t len, const String & hash)> RouteRegistrationHandler;
-// Bundle Statistics:
+// AsyncWebHandler that performs the lookup.
+const generateWWWClass = () => `// Bundle Statistics:
 // - Total compressed size: ${(totalSize / 1000).toFixed(1)} KB
 // - Total uncompressed size: ${(Object.values(bundleStats).reduce((sum, stat) => sum + stat.uncompressed, 0) / 1000).toFixed(1)} KB
 // - Compression ratio: ${(((Object.values(bundleStats).reduce((sum, stat) => sum + stat.uncompressed, 0) - totalSize) / Object.values(bundleStats).reduce((sum, stat) => sum + stat.uncompressed, 0)) * 100).toFixed(1)}%
 // - Generated on: ${new Date().toISOString()}
 
-class WWWData {
-${INDENT}public:
-${INDENT.repeat(2)}static void registerRoutes(RouteRegistrationHandler handler) {
-${fileInfo.map((f) => `${INDENT.repeat(3)}handler("${f.uri}", "${f.mimeType}", ${f.variable}, ${f.size}, ${f.hash});`).join('\n')}
-${INDENT.repeat(2)}}
+struct WWWAsset {
+${INDENT}const char *    uri;
+${INDENT}const char *    contentType;
+${INDENT}const uint8_t * content;
+${INDENT}size_t          len;
+${INDENT}const char *    etag; // already includes enclosing double quotes
 };
+
+static const WWWAsset WWW_ASSETS[] = {
+${fileInfo.map((f) => `${INDENT}{"${f.uri}", "${f.mimeType}", ${f.variable}, ${f.size}, "\\"${f.rawHash}\\""},`).join('\n')}
+};
+
+static constexpr size_t WWW_ASSETS_COUNT = sizeof(WWW_ASSETS) / sizeof(WWW_ASSETS[0]);
 `;
 
 const getFilesSync = (dir, files = []) => {
@@ -72,6 +78,7 @@ const writeFile = (relativeFilePath, buffer) => {
   const zipBuffer = zlib.gzipSync(buffer, { level: 9 });
   // const hash = crypto.createHash('sha256').update(zipBuffer).digest('hex');
   const hash = etag(zipBuffer); // use smaller md5 instead of sha256
+  const rawHash = hash.replace(/^"|"$/g, '');
 
   zipBuffer.forEach((b) => {
     if (!(size % bytesPerLine)) {
@@ -94,7 +101,8 @@ const writeFile = (relativeFilePath, buffer) => {
     mimeType,
     variable,
     size,
-    hash
+    hash,
+    rawHash
   });
 
   totalSize += size;

interface/src/AppRouting.tsx

@@ -1,19 +1,13 @@
-import { type FC, Suspense, lazy, memo, useContext, useEffect, useRef } from 'react';
+import { type FC, memo, useContext, useEffect, useRef } from 'react';
 import { Navigate, Route, Routes } from 'react-router';
 import { toast } from 'react-toastify';
 
-import {
-  LoadingSpinner,
-  RequireAuthenticated,
-  RequireUnauthenticated
-} from 'components';
+import AuthenticatedRouting from 'AuthenticatedRouting';
+import SignIn from 'SignIn';
+import { RequireAuthenticated, RequireUnauthenticated } from 'components';
 import { Authentication, AuthenticationContext } from 'contexts/authentication';
 import { useI18nContext } from 'i18n/i18n-react';
 
-// Lazy load route components for better code splitting
-const SignIn = lazy(() => import('SignIn'));
-const AuthenticatedRouting = lazy(() => import('AuthenticatedRouting'));
-
 interface SecurityRedirectProps {
   readonly message: string;
   readonly signOut?: boolean;
@@ -45,34 +39,32 @@ const AppRouting: FC = memo(() => {
 
   return (
     <Authentication>
-      <Suspense fallback={<LoadingSpinner />}>
-        <Routes>
-          <Route
-            path="/unauthorized"
-            element={<RootRedirect message={LL.PLEASE_SIGNIN()} signOut />}
-          />
-          <Route
-            path="/fileUpdated"
-            element={<RootRedirect message={LL.UPLOAD_SUCCESSFUL()} />}
-          />
-          <Route
-            path="/"
-            element={
-              <RequireUnauthenticated>
-                <SignIn />
-              </RequireUnauthenticated>
-            }
-          />
-          <Route
-            path="/*"
-            element={
-              <RequireAuthenticated>
-                <AuthenticatedRouting />
-              </RequireAuthenticated>
-            }
-          />
-        </Routes>
-      </Suspense>
+      <Routes>
+        <Route
+          path="/unauthorized"
+          element={<RootRedirect message={LL.PLEASE_SIGNIN()} signOut />}
+        />
+        <Route
+          path="/fileUpdated"
+          element={<RootRedirect message={LL.UPLOAD_SUCCESSFUL()} />}
+        />
+        <Route
+          path="/"
+          element={
+            <RequireUnauthenticated>
+              <SignIn />
+            </RequireUnauthenticated>
+          }
+        />
+        <Route
+          path="/*"
+          element={
+            <RequireAuthenticated>
+              <AuthenticatedRouting />
+            </RequireAuthenticated>
+          }
+        />
+      </Routes>
     </Authentication>
   );
 });

interface/src/AuthenticatedRouting.tsx

@@ -1,86 +1,77 @@
-import { Suspense, lazy, memo, useContext } from 'react';
+import { memo, useContext } from 'react';
 import { Navigate, Route, Routes } from 'react-router';
 
-import { Layout, LoadingSpinner } from 'components';
+import CustomEntities from 'app/main/CustomEntities';
+import Customizations from 'app/main/Customizations';
+import Dashboard from 'app/main/Dashboard';
+import Devices from 'app/main/Devices';
+import Help from 'app/main/Help';
+import Modules from 'app/main/Modules';
+import Scheduler from 'app/main/Scheduler';
+import Sensors from 'app/main/Sensors';
+import UserProfile from 'app/main/UserProfile';
+import APSettings from 'app/settings/APSettings';
+import ApplicationSettings from 'app/settings/ApplicationSettings';
+import DownloadUpload from 'app/settings/DownloadUpload';
+import MqttSettings from 'app/settings/MqttSettings';
+import NTPSettings from 'app/settings/NTPSettings';
+import Settings from 'app/settings/Settings';
+import Network from 'app/settings/network/Network';
+import Security from 'app/settings/security/Security';
+import APStatus from 'app/status/APStatus';
+import Activity from 'app/status/Activity';
+import HardwareStatus from 'app/status/HardwareStatus';
+import MqttStatus from 'app/status/MqttStatus';
+import NTPStatus from 'app/status/NTPStatus';
+import NetworkStatus from 'app/status/NetworkStatus';
+import Status from 'app/status/Status';
+import SystemLog from 'app/status/SystemLog';
+import Version from 'app/status/Version';
+import { Layout } from 'components';
 import { AuthenticatedContext } from 'contexts/authentication';
 
-// Lazy load all route components for better code splitting
-const Dashboard = lazy(() => import('app/main/Dashboard'));
-const Devices = lazy(() => import('app/main/Devices'));
-const Sensors = lazy(() => import('app/main/Sensors'));
-const Help = lazy(() => import('app/main/Help'));
-const Customizations = lazy(() => import('app/main/Customizations'));
-const Scheduler = lazy(() => import('app/main/Scheduler'));
-const CustomEntities = lazy(() => import('app/main/CustomEntities'));
-const Modules = lazy(() => import('app/main/Modules'));
-const UserProfile = lazy(() => import('app/main/UserProfile'));
-
-const Status = lazy(() => import('app/status/Status'));
-const HardwareStatus = lazy(() => import('app/status/HardwareStatus'));
-const Activity = lazy(() => import('app/status/Activity'));
-const SystemLog = lazy(() => import('app/status/SystemLog'));
-const MqttStatus = lazy(() => import('app/status/MqttStatus'));
-const NTPStatus = lazy(() => import('app/status/NTPStatus'));
-const APStatus = lazy(() => import('app/status/APStatus'));
-const NetworkStatus = lazy(() => import('app/status/NetworkStatus'));
-const Version = lazy(() => import('app/status/Version'));
-
-const Settings = lazy(() => import('app/settings/Settings'));
-const ApplicationSettings = lazy(() => import('app/settings/ApplicationSettings'));
-const MqttSettings = lazy(() => import('app/settings/MqttSettings'));
-const NTPSettings = lazy(() => import('app/settings/NTPSettings'));
-const APSettings = lazy(() => import('app/settings/APSettings'));
-const DownloadUpload = lazy(() => import('app/settings/DownloadUpload'));
-const Network = lazy(() => import('app/settings/network/Network'));
-const Security = lazy(() => import('app/settings/security/Security'));
-
 const AuthenticatedRouting = memo(() => {
   const { me } = useContext(AuthenticatedContext);
   return (
     <Layout>
-      <Suspense fallback={<LoadingSpinner />}>
-        <Routes>
-          <Route path="/dashboard/*" element={<Dashboard />} />
-          <Route path="/devices/*" element={<Devices />} />
-          <Route path="/sensors/*" element={<Sensors />} />
-          <Route path="/help/*" element={<Help />} />
-          <Route path="/user/*" element={<UserProfile />} />
+      <Routes>
+        <Route path="/dashboard/*" element={<Dashboard />} />
+        <Route path="/devices/*" element={<Devices />} />
+        <Route path="/sensors/*" element={<Sensors />} />
+        <Route path="/help/*" element={<Help />} />
+        <Route path="/user/*" element={<UserProfile />} />
 
-          <Route path="/status/*" element={<Status />} />
-          <Route path="/status/hardwarestatus/*" element={<HardwareStatus />} />
-          <Route path="/status/activity" element={<Activity />} />
-          <Route path="/status/log" element={<SystemLog />} />
-          <Route path="/status/mqtt" element={<MqttStatus />} />
-          <Route path="/status/ntp" element={<NTPStatus />} />
-          <Route path="/status/ap" element={<APStatus />} />
-          <Route path="/status/network" element={<NetworkStatus />} />
-          <Route path="/status/version" element={<Version />} />
+        <Route path="/status/*" element={<Status />} />
+        <Route path="/status/hardwarestatus/*" element={<HardwareStatus />} />
+        <Route path="/status/activity" element={<Activity />} />
+        <Route path="/status/log" element={<SystemLog />} />
+        <Route path="/status/mqtt" element={<MqttStatus />} />
+        <Route path="/status/ntp" element={<NTPStatus />} />
+        <Route path="/status/ap" element={<APStatus />} />
+        <Route path="/status/network" element={<NetworkStatus />} />
+        <Route path="/status/version" element={<Version />} />
 
-          {me.admin && (
-            <>
-              <Route path="/settings" element={<Settings />} />
-              <Route
-                path="/settings/application"
-                element={<ApplicationSettings />}
-              />
-              <Route path="/settings/mqtt" element={<MqttSettings />} />
-              <Route path="/settings/ntp" element={<NTPSettings />} />
-              <Route path="/settings/ap" element={<APSettings />} />
-              <Route path="/settings/modules" element={<Modules />} />
-              <Route path="/settings/downloadUpload" element={<DownloadUpload />} />
+        {me.admin && (
+          <>
+            <Route path="/settings" element={<Settings />} />
+            <Route path="/settings/application" element={<ApplicationSettings />} />
+            <Route path="/settings/mqtt" element={<MqttSettings />} />
+            <Route path="/settings/ntp" element={<NTPSettings />} />
+            <Route path="/settings/ap" element={<APSettings />} />
+            <Route path="/settings/modules" element={<Modules />} />
+            <Route path="/settings/downloadUpload" element={<DownloadUpload />} />
 
-              <Route path="/settings/network/*" element={<Network />} />
-              <Route path="/settings/security/*" element={<Security />} />
+            <Route path="/settings/network/*" element={<Network />} />
+            <Route path="/settings/security/*" element={<Security />} />
 
-              <Route path="/customizations" element={<Customizations />} />
-              <Route path="/scheduler" element={<Scheduler />} />
-              <Route path="/customentities" element={<CustomEntities />} />
-            </>
-          )}
+            <Route path="/customizations" element={<Customizations />} />
+            <Route path="/scheduler" element={<Scheduler />} />
+            <Route path="/customentities" element={<CustomEntities />} />
+          </>
+        )}
 
-          <Route path="/*" element={<Navigate to="/" />} />
-        </Routes>
-      </Suspense>
+        <Route path="/*" element={<Navigate to="/" />} />
+      </Routes>
     </Layout>
   );
 });

interface/src/app/settings/DownloadUpload.tsx

@@ -112,6 +112,7 @@ const DownloadUpload = () => {
   const handleDownload = useCallback(
     (type: string) => () => {
       void sendExportData(type);
+      setConfirmBackup(false);
     },
     [sendExportData]
   );

interface/src/components/upload/DragNdrop.tsx

@@ -213,19 +213,8 @@ const DragNdrop = ({ text, onFileSelected }: DragNdropProps) => {
               <DialogContent dividers>
                 {upgradeImportantMessageType === 2 &&
                   LL.UPGRADE_IMPORTANT_MESSAGES_2()}
-                {upgradeImportantMessageType === 1 && (
-                  <>
-                    {LL.UPGRADE_IMPORTANT_MESSAGES_1()}
-                    <Typography sx={{ mt: 2 }}>
-                      <Link
-                        to="/settings/downloadUpload"
-                        style={{ color: 'lightblue' }}
-                      >
-                        {LL.DOWNLOAD_SYSTEM_BACKUP()}
-                      </Link>
-                    </Typography>
-                  </>
-                )}{' '}
+                {upgradeImportantMessageType === 1 &&
+                  LL.UPGRADE_IMPORTANT_MESSAGES_1()}
                 <Typography sx={{ mt: 2 }}>
                   <Link
                     to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"

interface/src/i18n/cz/index.ts

@@ -350,7 +350,7 @@ const cz: Translation = {
   NO_DATA_1: 'Nebyly nalezeny žádné oblíbené entity. Použijte modul',
   NO_DATA_2: 'pro jejich výběr.',
   NO_DATA_3: 'Pro zobrazení všech dostupných entit navštivte stránku',
-  NO_GPIO:'Nebylo nalezeno žádné volné GPIO',
+  NO_GPIO: 'Nebylo nalezeno žádné volné GPIO',
   THIS_VERSION: 'Tato verze',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Typ sestavení',
@@ -362,7 +362,7 @@ const cz: Translation = {
   STORED_VERSIONS: 'Uložené verze',
   ONLINE_HELP: 'online nápověda',
   UPGRADE_IMPORTANT_MESSAGES: 'Aktualizovat důležité zprávy',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Tato aktualizace vyžaduje obnovení továrního nastavení. Ujistěte se, že jste vytvořili zálohu své konfigurace a nastavení před pokračováním a nahrajte ji po instalaci nové verze.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Tato aktualizace vyžaduje obnovení továrního nastavení. Ujistěte se, že nejprve stáhnete systémovou zálohu před pokračováním a poté nahrajte tento soubor po instalaci nové verze.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete se na novou hlavní verzi. Ujistěte se, že jste přečetli ChangeLog pro jakékoliv závažné změny.',
   WARNING_SYSTEM_BACKUP: 'Toto vytvoří zálohu vašich celých systémových konfigurací a nastavení. Všechna hesla budou v zálohovém souboru čitelná. Buďte opatrní při sdílení! Opravdu chcete pokračovat?'
 

interface/src/i18n/de/index.ts

@@ -350,7 +350,7 @@ const de: Translation = {
   NO_DATA_1: 'Keine favorisierten EMS-Entitäten gefunden! Verwenden Sie das Modul',
   NO_DATA_2: ', um sie zu markieren.',
   NO_DATA_3: 'Um alle verfügbaren Entitäten anzuzeigen, gehen Sie zu',
-  NO_GPIO:'Keine freien GPIO gefunden',
+  NO_GPIO: 'Keine freien GPIO gefunden',
   THIS_VERSION: 'Diese Version',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Release Typ',
@@ -362,7 +362,7 @@ const de: Translation = {
   STORED_VERSIONS: 'Gespeicherte Versionen',
   ONLINE_HELP: 'Online-Hilfe',
   UPGRADE_IMPORTANT_MESSAGES: 'Wichtige Nachrichten aktualisieren',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Diese Aktualisierung erfordert eine Werkseinstellung. Stellen Sie sicher, dass Sie eine Sicherung Ihrer Konfiguration und Einstellungen vor dem Fortfahren erstellt haben und diese nach der Installation der neuen Version hochladen.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Diese Aktualisierung erfordert eine Werkseinstellung. Stellen Sie sicher, dass Sie zuerst eine Systemsicherung herunterladen, bevor Sie fortfahren, und laden Sie diese Datei dann nach der Installation der neuen Version hoch.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'Sie aktualisieren auf eine neue Hauptversion. Stellen Sie sicher, dass Sie den ChangeLog für alle wichtigen Änderungen gelesen haben.',
   WARNING_SYSTEM_BACKUP: 'Dies wird eine Sicherung Ihrer vollständigen Systemkonfiguration und -einstellungen erstellen. Alle Passwörter werden im Sicherungsdatei lesbar sein. Seien Sie vorsichtig beim Teilen! Möchten Sie fortfahren?'
 

interface/src/i18n/en/index.ts

@@ -350,7 +350,7 @@ const en: Translation = {
   NO_DATA_1: 'No favorite EMS entities found yet. Use the',
   NO_DATA_2: 'module to mark them.',
   NO_DATA_3: 'To see all available entities go to',
-  NO_GPIO:'No available GPIO found',
+  NO_GPIO: 'No available GPIO found',
   THIS_VERSION: 'This Version',
   PLATFORM: 'Platform',
   RELEASE_TYPE: 'Release Type',
@@ -362,7 +362,7 @@ const en: Translation = {
   STORED_VERSIONS: 'Stored Versions',
   ONLINE_HELP: 'online help',
   UPGRADE_IMPORTANT_MESSAGES: 'Upgrade Important Messages',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'This upgrade requires a factory reset. Make sure you have made a backup of your configuration and settings before continuing, and upload this after the new version is installed.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'This upgrade requires a factory reset. Make sure you first download a System Backup before continuing, and then upload this file after the new version is installed.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'You are upgrading to a new major version. Make sure you have read the ChangeLog for any breaking changes.',
   WARNING_SYSTEM_BACKUP: 'This will create a backup of your full system configuration and settings. All passwords will be readable in the backup file. Be careful with sharing! Do you want to continue?'
 

interface/src/i18n/fr/index.ts

@@ -350,7 +350,7 @@ const fr: Translation = {
   NO_DATA_1: 'Aucune entité EMS favorite trouvée. Utilisez le',
   NO_DATA_2: 'module pour les marquer.',
   NO_DATA_3: 'Pour voir toutes les entités disponibles, aller à',
-  NO_GPIO:"Aucun GPIO disponible n'a été détecté",
+  NO_GPIO: "Aucun GPIO disponible n'a été détecté",
   THIS_VERSION: 'Cette version',
   PLATFORM: 'Plateforme',
   RELEASE_TYPE: 'Type de version',
@@ -362,7 +362,7 @@ const fr: Translation = {
   STORED_VERSIONS: 'Versions stockées',
   ONLINE_HELP: 'aide en ligne',
   UPGRADE_IMPORTANT_MESSAGES: 'Mettre à jour les messages importants',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Cette mise à jour nécessite une réinitialisation de fabrique. Assurez-vous d\'avoir créé une sauvegarde de vos configurations et paramètres avant de continuer et de la charger après l\'installation de la nouvelle version.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Cette mise à jour nécessite une réinitialisation de fabrique. Assurez-vous de télécharger une sauvegarde système avant de continuer, et de la charger après l\'installation de la nouvelle version.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'Vous mettez à jour vers une nouvelle version majeure. Assurez-vous de lire le ChangeLog pour tout changement important.',
   WARNING_SYSTEM_BACKUP: 'Cela créera une sauvegarde de votre configuration et paramètres complets. Tous les mots de passe seront lisibles dans le fichier de sauvegarde. Soyez prudent avec le partage ! Voulez-vous continuer ?'
 

interface/src/i18n/it/index.ts

@@ -350,7 +350,7 @@ const it: Translation = {
   NO_DATA_1: 'Nessuna entità EMS preferita trovata. Usa il',
   NO_DATA_2: 'modulo per marcarle.',
   NO_DATA_3: 'Per vedere tutte le entità disponibili vai a',
-  NO_GPIO:'Non è stato trovato alcun GPIO disponibile',
+  NO_GPIO: 'Non è stato trovato alcun GPIO disponibile',
   THIS_VERSION: 'Questa versione',
   PLATFORM: 'Piattaforma',
   RELEASE_TYPE: 'Tipo di rilascio',
@@ -362,7 +362,7 @@ const it: Translation = {
   STORED_VERSIONS: 'Versioni memorizzate',
   ONLINE_HELP: 'aiuto online',
   UPGRADE_IMPORTANT_MESSAGES: 'Aggiorna Messaggi Importanti',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Questa aggiornamento richiede un ripristino di fabbrica. Assicurati di aver creato un backup delle tue configurazioni e impostazioni prima di continuare e di caricarlo dopo l\'installazione della nuova versione.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Questa aggiornamento richiede un ripristino di fabbrica. Assicurati di prima scaricare un backup del sistema prima di continuare, e poi caricare questo file dopo l\'installazione della nuova versione.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'Stai aggiornando a una nuova versione principale. Assicurati di aver letto il ChangeLog per qualsiasi cambiamento importante.',
   WARNING_SYSTEM_BACKUP: 'Questo creerà un backup delle tue configurazioni e impostazioni complete. Tutte le password saranno leggibili nel file di backup. Sei sicuro di voler continuare?'
 

interface/src/i18n/nl/index.ts

@@ -350,7 +350,7 @@ const nl: Translation = {
   NO_DATA_1: 'Er zijn nog geen favoriete EMS-entiteiten gevonden. Gebruik de',
   NO_DATA_2: 'module om ze te markeren.',
   NO_DATA_3: 'Om alle beschikbare entiteiten te zien, ga naar',
-  NO_GPIO:'Er is geen beschikbare GPIO gevonden',
+  NO_GPIO: 'Er is geen beschikbare GPIO gevonden',
   THIS_VERSION: 'Deze Versie',
   PLATFORM: 'Platform',
   RELEASE_TYPE: 'Release Typ',
@@ -362,7 +362,7 @@ const nl: Translation = {
   STORED_VERSIONS: 'Opgeslagen versies',
   ONLINE_HELP: 'online help',
   UPGRADE_IMPORTANT_MESSAGES: 'Upgrade Belangrijke Berichten',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Deze upgrade vereist een fabrieksinstelling. Zorg ervoor dat u een back-up van uw configuratie en instellingen hebt gemaakt voordat u doorgaat en upload deze na de installatie van de nieuwe versie.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Deze upgrade vereist een fabrieksinstelling. Zorg ervoor dat u eerst een Systeem Backup download voordat u doorgaat, en upload deze file na de installatie van de nieuwe versie.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'U updatet naar een nieuwe grote versie. Zorg ervoor dat u de ChangeLog hebt gelezen voor alle brekende wijzigingen.',
   WARNING_SYSTEM_BACKUP: 'Dit zal een back-up van uw volledige systeemconfiguratie en instellingen maken. Alle wachtwoorden zijn leesbaar in het back-upbestand. Wees voorzichtig bij delen! Wilt u doorgaan?'
 

interface/src/i18n/no/index.ts

@@ -350,7 +350,7 @@ const no: Translation = {
   NO_DATA_1: 'Ingen favoritte EMS enheter funnet enda. Bruk',
   NO_DATA_2: 'modul for å markere dem.',
   NO_DATA_3: 'For å se alle tilgjengelige enheter, gå til',
-  NO_GPIO:'Det ble ikke funnet noen tilgjengelige GPIO-porter',
+  NO_GPIO: 'Det ble ikke funnet noen tilgjengelige GPIO-porter',
   THIS_VERSION: 'Denne versjonen',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Utgivelses type',
@@ -362,7 +362,7 @@ const no: Translation = {
   STORED_VERSIONS: 'Lagret versjoner',
   ONLINE_HELP: 'online hjelp',
   UPGRADE_IMPORTANT_MESSAGES: 'Oppdater viktige meldinger',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Denne oppdateringen krever en fabriksinstilling. Sørg for at du har laget en sikkerhetskopi av din konfigurasjon og innstillinger før du fortsetter, og last denne opp etter at den nye versjonen er installert.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Denne oppdateringen krever en fabriksinstilling. Sørg for at du først lastet ned en System Backup før du fortsetter, og last denne filen etter at den nye versjonen er installert.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'Du oppdaterer til en ny hovedversjon. Sørg for at du har lest ChangeLog for eventuelle bruddende endringer.',
   WARNING_SYSTEM_BACKUP: 'Dette vil lage en sikkerhetskopi av din fullstendige systemkonfigurasjon og innstillinger. Alle passord vil være lesbare i sikkerhetskopien. Vær forsiktig med deling! Vil du fortsette?'
 

interface/src/i18n/pl/index.ts

@@ -350,7 +350,7 @@ const pl: BaseTranslation = {
   NO_DATA_1: 'Brak ulubionych encji EMS. Użyj',
   NO_DATA_2: 'moduł do ich oznaczenia.',
   NO_DATA_3: 'Aby zobaczyć wszystkie dostępne encje przejdź do',
-  NO_GPIO:'Nie znaleziono dostępnych pinów GPIO',
+  NO_GPIO: 'Nie znaleziono dostępnych pinów GPIO',
   THIS_VERSION: 'Ta wersja',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Typ wydania',
@@ -362,7 +362,7 @@ const pl: BaseTranslation = {
   STORED_VERSIONS: 'Zapisane wersje',
   ONLINE_HELP: 'pomoc online',
   UPGRADE_IMPORTANT_MESSAGES: 'Aktualizuj ważne wiadomości',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Ta aktualizacja wymaga resetu fabrycznego. Upewnij się, że masz utworzoną kopię swoich ustawień i konfiguracji przed kontynuowaniem i przesuń ją po zainstalowaniu nowej wersji.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Ta aktualizacja wymaga resetu fabrycznego. Upewnij się, że najpierw pobierzesz kopię zapasową systemu przed kontynuowaniem, a następnie przesuń tę plik po zainstalowaniu nowej wersji.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujesz się do nowej głównej wersji. Upewnij się, że przeczytałeś ChangeLog dla wszelkich istotnych zmian.',
   WARNING_SYSTEM_BACKUP: 'To spowoduje utworzenie kopii zapasowej całej konfiguracji i ustawień systemu. Wszystkie hasła będą widoczne w pliku kopii zapasowej. Bądź ostrożny przy udostępnianiu! Chcesz kontynuować?'
 

interface/src/i18n/sk/index.ts

@@ -350,7 +350,7 @@ const sk: Translation = {
   NO_DATA_1: 'Nenašli sa žiadne obľúbené entity EMS. Použite',
   NO_DATA_2: 'modul na ich označenie.',
   NO_DATA_3: 'Ak chcete zobraziť všetky dostupné entity, prejdite na',
-  NO_GPIO:'Nebol nájdený žiadny dostupný GPIO',
+  NO_GPIO: 'Nebol nájdený žiadny dostupný GPIO',
   THIS_VERSION: 'Táto verzia',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Typ vydania',
@@ -362,7 +362,7 @@ const sk: Translation = {
   STORED_VERSIONS: 'Uložené verzie',
   ONLINE_HELP: 'online pomoc',
   UPGRADE_IMPORTANT_MESSAGES: 'Aktualizovať dôležité správy',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Táto aktualizácia vyžaduje reštart základných nastavení. Uistite sa, že ste vytvorili zálohu svojich konfigurácií a nastavení pred pokračovaním a nahrajte ju po instalácii novej verzie.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Táto aktualizácia vyžaduje reštart základných nastavení. Uistite sa, že najprv stiahnete systémovú zálohu pred pokračovaním, a potom nahrajte tento súbor po instalácii novej verzie.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete sa na novú hlavnú verziu. Uistite sa, že ste prečítali ChangeLog pre akékoľvek dôležité zmeny.',
   WARNING_SYSTEM_BACKUP: 'Toto vytvorí zálohu všetkých vašich celých systémových konfigurácií a nastavení. Všetky hesla budú čitateľné v zálohovom súbore. Buďte opatrní pri zdieľaní! Chcete pokračovať?'
 

interface/src/i18n/sv/index.ts

@@ -350,7 +350,7 @@ const sv: Translation = {
   NO_DATA_1: 'Inga favorit EMS enheter hittade än. Använd',
   NO_DATA_2: 'modul för att markera dem.',
   NO_DATA_3: 'För att se alla tillgängliga enheter, gå till',
-  NO_GPIO:'Inga tillgängliga GPIO-portar hittades',
+  NO_GPIO: 'Inga tillgängliga GPIO-portar hittades',
   THIS_VERSION: 'Denna version',
   PLATFORM: 'Plattform',
   RELEASE_TYPE: 'Utgivelsestyp',
@@ -362,7 +362,7 @@ const sv: Translation = {
   STORED_VERSIONS: 'Lagrad versioner',
   ONLINE_HELP: 'online hjälp',
   UPGRADE_IMPORTANT_MESSAGES: 'Uppdatera viktiga meddelanden',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Denna uppdatering kräver en fabriksåterställning. Se till att du har gjort en säkerhetskopia av din konfiguration och inställningar innan du fortsätter och ladda upp denna efter att den nya versionen är installerad.',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Denna uppdatering kräver en fabriksåterställning. Se till att du först laddar ned en System Backup innan du fortsätter, och ladda upp denna fil efter att den nya versionen är installerad.',
   UPGRADE_IMPORTANT_MESSAGES_2: 'Du uppdaterar till en ny huvudversion. Se till att du har läst ChangeLog för eventuella brkande ändringar.',
   WARNING_SYSTEM_BACKUP: 'Detta kommer att skapa en säkerhetskopia av din fullständiga systemkonfiguration och inställningar. Alla lösenord kommer att vara läsbara i säkerhetskopien. Var försiktig med att dela! Vill du fortsätta?'
 

interface/src/i18n/tr/index.ts

@@ -350,7 +350,7 @@ const tr: Translation = {
   NO_DATA_1: 'Henüz bir favori EMS varlığı bulunamadı. Kullanın',
   NO_DATA_2: 'modülünü kullanın.',
   NO_DATA_3: 'Tüm kullanılabilir varlıkları görmek için git',
-  NO_GPIO:'Kullanılabilir GPIO bulunamadı',
+  NO_GPIO: 'Kullanılabilir GPIO bulunamadı',
   THIS_VERSION: 'Bu Sürüm',
   PLATFORM: 'Platforma',
   RELEASE_TYPE: 'Sürüm Tipi',

interface/vite.config.ts

@@ -15,7 +15,7 @@ const REPEAT_CHAR = '=';
 const REPEAT_COUNT = 50;
 const DEFAULT_OUT_DIR = 'dist';
 const ES_TARGET = 'es2020';
-const CHUNK_SIZE_WARNING_LIMIT = 512;
+const CHUNK_SIZE_WARNING_LIMIT = 1024;
 const ASSETS_INLINE_LIMIT = 4096;
 
 // Common resolve aliases
@@ -130,40 +130,9 @@ const createBasePlugins = (
   return plugins;
 };
 
-// Manual chunk splitting strategy
-const createManualChunks = (detailed = false) => {
-  return (id: string): string | undefined => {
-    if (id.includes('node_modules')) {
-      if (id.includes('preact')) return '@preact';
-      if (detailed) {
-        if (id.includes('react-router')) return '@react-router';
-        if (id.includes('@mui/material')) return '@mui-material';
-        if (id.includes('@mui/icons-material')) return '@mui-icons';
-        if (id.includes('alova')) return '@alova';
-        if (id.includes('typesafe-i18n')) return '@i18n';
-        if (id.includes('react-toastify')) return '@toastify';
-        if (id.includes('@table-library')) return '@table-library';
-        if (id.includes('uuid')) return '@uuid';
-        if (id.includes('axios') || id.includes('fetch')) return '@http';
-        if (id.includes('lodash') || id.includes('ramda')) return '@utils';
-      }
-      return 'vendor';
-    }
-    if (detailed) {
-      // Group circularly dependent modules together to avoid circular chunk warnings
-      // components, app, and utils are tightly coupled, so combine them
-      if (
-        id.includes('components/') ||
-        id.includes('app/') ||
-        id.includes('utils/')
-      ) {
-        return 'app';
-      }
-      // Keep api separate as it's typically more independent
-      if (id.includes('api/')) return 'api';
-    }
-    return undefined;
-  };
+const manualChunks = (id: string): string | undefined => {
+  if (id.includes('node_modules')) return 'vendor';
+  return undefined;
 };
 
 // Common build base configuration
@@ -290,7 +259,7 @@ export default defineConfig(
               moduleSideEffects: false
             },
             output: {
-              manualChunks: createManualChunks(false)
+              manualChunks
             }
           }
         }
@@ -330,7 +299,7 @@ export default defineConfig(
             chunkFileNames: 'assets/[name]-[hash].js',
             entryFileNames: 'assets/[name]-[hash].js',
             assetFileNames: 'assets/[name]-[hash].[ext]',
-            manualChunks: createManualChunks(true),
+            manualChunks,
             sourcemap: false
           }
         }

lib/semver/LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Živanović
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-

lib/semver/README.md

@@ -1,7 +0,0 @@
-# About
-
-This project is MIT-licensed, C++14 implementation of [semantic versioning](http://semver.org) parser and comparator with support for modifying parsed version strings. Semantic versioning 2.0.0 specification is supported out-of-the-box and the code should be flexible-enough to support future revisions or other similar versioning schemes.
-
-Copyright (c) 2015 Marko Zivanovic
-
-Based on https://github.com/zmarko/semver

lib/semver/Semver200_comparator.cpp

@@ -1,121 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include <algorithm>
-#include <functional>
-#include <map>
-#include "semver200.h"
-
-using namespace std;
-
-namespace version {
-
-namespace {
-
-// Compare normal version identifiers.
-int compare_normal(const Version_data & l, const Version_data & r) {
-    if (l.major > r.major)
-        return 1;
-    if (l.major < r.major)
-        return -1;
-    if (l.minor > r.minor)
-        return 1;
-    if (l.minor < r.minor)
-        return -1;
-    if (l.patch > r.patch)
-        return 1;
-    if (l.patch < r.patch)
-        return -1;
-    return 0;
-}
-
-// Compare alphanumeric prerelease identifiers.
-inline int cmp_alnum_prerel_ids(const string & l, const string & r) {
-    auto cmp = l.compare(r);
-    if (cmp == 0) {
-        return cmp;
-    } else {
-        return cmp > 0 ? 1 : -1;
-    }
-}
-
-// Compare numeric prerelease identifiers.
-inline int cmp_num_prerel_ids(const string & l, const string & r) {
-    long long li = stoll(l);
-    long long ri = stoll(r);
-    if (li == ri)
-        return 0;
-    return li > ri ? 1 : -1;
-}
-
-using Prerel_type_pair                                        = pair<Id_type, Id_type>;
-using Prerel_id_comparator                                    = function<int(const string &, const string &)>;
-const map<Prerel_type_pair, Prerel_id_comparator> comparators = {{{Id_type::alnum, Id_type::alnum}, cmp_alnum_prerel_ids},
-                                                                 {{Id_type::alnum, Id_type::num}, [](const string &, const string &) { return 1; }},
-                                                                 {{Id_type::num, Id_type::alnum}, [](const string &, const string &) { return -1; }},
-                                                                 {{Id_type::num, Id_type::num}, cmp_num_prerel_ids}};
-
-// Compare prerelease identifiers based on their types.
-inline int compare_prerel_identifiers(const Prerelease_identifier & l, const Prerelease_identifier & r) {
-    auto cmp = comparators.at({l.second, r.second});
-    return cmp(l.first, r.first);
-}
-
-inline int cmp_rel_prerel(const Prerelease_identifiers & l, const Prerelease_identifiers & r) {
-    if (l.empty() && !r.empty())
-        return 1;
-    if (r.empty() && !l.empty())
-        return -1;
-    return 0;
-}
-} // namespace
-
-int Semver200_comparator::compare(const Version_data & l, const Version_data & r) const {
-    // Compare normal version components.
-    int cmp = compare_normal(l, r);
-    if (cmp != 0)
-        return cmp;
-
-    // Compare if one version is release and the other prerelease - release is always higher.
-    cmp = cmp_rel_prerel(l.prerelease_ids, r.prerelease_ids);
-    if (cmp != 0)
-        return cmp;
-
-    // Compare prerelease by looking at each identifier: numeric ones are compared as numbers,
-    // alphanum as ASCII strings.
-    auto shorter = min(l.prerelease_ids.size(), r.prerelease_ids.size());
-    for (size_t i = 0; i < shorter; i++) {
-        cmp = compare_prerel_identifiers(l.prerelease_ids[i], r.prerelease_ids[i]);
-        if (cmp != 0)
-            return cmp;
-    }
-
-    // Prerelease identifiers are the same, to the length of the shorter version string;
-    // if they are the same length, then versions are equal, otherwise, longer one wins.
-    if (l.prerelease_ids.size() == r.prerelease_ids.size())
-        return 0;
-    return l.prerelease_ids.size() > r.prerelease_ids.size() ? 1 : -1;
-}
-
-} // namespace version

lib/semver/Semver200_parser.cpp

@@ -1,187 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include <functional>
-#include <map>
-#include "semver200.h"
-
-using namespace std;
-
-namespace version {
-
-namespace {
-enum class Parser_state { major, minor, patch, prerelease, build };
-
-using Validator             = function<void(const string &, const char)>;
-using State_transition_hook = function<void(string &)>;
-/// State transition is described by a character that triggers it, a state to transition to and
-/// optional hook to be invoked on transition.
-using Transition    = tuple<const char, Parser_state, State_transition_hook>;
-using Transitions   = vector<Transition>;
-using State         = tuple<Transitions, string &, Validator>;
-using State_machine = std::map<Parser_state, State>;
-
-// Ranges of characters allowed in prerelease and build identifiers.
-const vector<pair<char, char>> allowed_prerel_id_chars = {{'0', '9'}, {'A', 'Z'}, {'a', 'z'}, {'-', '-'}};
-
-inline Transition mkx(const char c, Parser_state p, State_transition_hook pth) {
-    return make_tuple(c, p, pth);
-}
-
-inline void Parse_error(const std::string & s) {
-    // EMSESP::logger().err("parse error: %s", s.c_str());
-}
-
-/// Advance parser state machine by a single step.
-/**
-		Perform single step of parser state machine: if character matches one from transition tables -
-		trigger transition to next state; otherwise, validate if current token is in legal state
-		(throw Parse_error if not) and then add character to current token; State transition includes
-		preparing various vars for next state and invoking state transition hook (if specified) which is
-		where whole tokens are validated.
-		*/
-inline void process_char(const char c, Parser_state & cstate, Parser_state & pstate, const Transitions & transitions, string & target, Validator validate) {
-    for (const auto & transition : transitions) {
-        if (c == get<0>(transition)) {
-            if (get<2>(transition))
-                get<2>(transition)(target);
-            pstate = cstate;
-            cstate = get<1>(transition);
-            return;
-        }
-    }
-    validate(target, c);
-    target.push_back(c);
-}
-
-/// Validate normal (major, minor, patch) version components.
-inline void normal_version_validator(const string & tgt, const char c) {
-    if (c < '0' || c > '9')
-        Parse_error("invalid character encountered: " + string(1, c));
-    if (tgt.compare(0, 1, "0") == 0)
-        Parse_error("leading 0 not allowed");
-}
-
-/// Validate that prerelease and build version identifiers are comprised of allowed chars only.
-inline void prerelease_version_validator(const string &, const char c) {
-    bool res = false;
-    for (const auto & r : allowed_prerel_id_chars) {
-        res |= (c >= r.first && c <= r.second);
-    }
-    if (!res)
-        Parse_error("invalid character encountered: " + string(1, c));
-}
-
-inline bool is_identifier_numeric(const string & id) {
-    return id.find_first_not_of("0123456789") == string::npos;
-}
-
-inline bool check_for_leading_0(const string & str) {
-    return str.length() > 1 && str[0] == '0';
-}
-
-/// Validate every individual prerelease identifier, determine it's type and add it to collection.
-void prerelease_hook_impl(string & id, Prerelease_identifiers & prerelease) {
-    if (id.empty())
-        Parse_error("version identifier cannot be empty");
-    Id_type t = Id_type::alnum;
-    if (is_identifier_numeric(id)) {
-        t = Id_type::num;
-        if (check_for_leading_0(id)) {
-            Parse_error("numeric identifiers cannot have leading 0");
-        }
-    }
-    prerelease.push_back(Prerelease_identifier(id, t));
-    id.clear();
-}
-
-/// Validate every individual build identifier and add it to collection.
-void build_hook_impl(string & id, Parser_state & pstate, Build_identifiers & build, std::string & prerelease_id, Prerelease_identifiers & prerelease) {
-    // process last token left from parsing prerelease data
-    if (pstate == Parser_state::prerelease)
-        prerelease_hook_impl(prerelease_id, prerelease);
-    if (id.empty())
-        Parse_error("version identifier cannot be empty");
-    build.push_back(id);
-    id.clear();
-}
-
-} // namespace
-
-/// Parse semver 2.0.0-compatible string to Version_data structure.
-/**
-	Version text parser is implemented as a state machine. In each step one successive character from version
-	string is consumed and is either added to current token or triggers state transition. Hooks can be
-	injected into state transitions for validation/customization purposes.
-	*/
-Version_data Semver200_parser::parse(const string & s) const {
-    string                 major;
-    string                 minor;
-    string                 patch;
-    string                 prerelease_id;
-    string                 build_id;
-    Prerelease_identifiers prerelease;
-    Build_identifiers      build;
-    Parser_state           cstate{Parser_state::major};
-    Parser_state           pstate;
-
-    auto prerelease_hook = [&](string & id) { prerelease_hook_impl(id, prerelease); };
-
-    auto build_hook = [&](string & id) { build_hook_impl(id, pstate, build, prerelease_id, prerelease); };
-
-    // State transition tables
-    auto major_trans      = {mkx('.', Parser_state::minor, {})};
-    auto minor_trans      = {mkx('.', Parser_state::patch, {})};
-    auto patch_trans      = {mkx('-', Parser_state::prerelease, {}), mkx('+', Parser_state::build, {})};
-    auto prerelease_trans = {// When identifier separator (.) is found, stay in the same state but invoke hook
-                             // in order to process each individual identifier separately.
-                             mkx('.', Parser_state::prerelease, prerelease_hook),
-                             mkx('+', Parser_state::build, {})};
-    auto build_trans = {// Same stay-in-the-same-state-but-invoke-hook trick from above.
-                        mkx('.', Parser_state::build, build_hook)};
-
-    State_machine state_machine = {{Parser_state::major, State{major_trans, major, normal_version_validator}},
-                                   {Parser_state::minor, State{minor_trans, minor, normal_version_validator}},
-                                   {Parser_state::patch, State{patch_trans, patch, normal_version_validator}},
-                                   {Parser_state::prerelease, State{prerelease_trans, prerelease_id, prerelease_version_validator}},
-                                   {Parser_state::build, State{build_trans, build_id, prerelease_version_validator}}};
-
-    // Main loop.
-    for (const auto & c : s) {
-        auto state = state_machine.at(cstate);
-        process_char(c, cstate, pstate, get<0>(state), get<1>(state), get<2>(state));
-    }
-
-    // Trigger appropriate hooks in order to process last token, because no state transition was
-    // triggered for it.
-    if (cstate == Parser_state::prerelease) {
-        prerelease_hook(prerelease_id);
-    } else if (cstate == Parser_state::build) {
-        build_hook(build_id);
-    }
-
-    return Version_data{stoi(major), stoi(minor), stoi(patch), prerelease, build};
-}
-
-} // namespace version

lib/semver/semver200.h

@@ -1,53 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-
-#include "version.h"
-
-namespace version {
-
-/// Parse string into Version_data structure according to semantic versioning 2.0.0 rules.
-struct Semver200_parser {
-    Version_data parse(const std::string &) const;
-};
-
-/// Compare Version_data to another using semantic versioning 2.0.0 rules.
-struct Semver200_comparator {
-    int compare(const Version_data &, const Version_data &) const;
-};
-
-/// Concrete version class that binds all semver 2.0.0 functionality together.
-class Semver200_version : public Basic_version<Semver200_parser, Semver200_comparator> {
-  public:
-    Semver200_version()
-        : Basic_version{Semver200_parser(), Semver200_comparator()} {
-    }
-
-    Semver200_version(const std::string & v)
-        : Basic_version{v, Semver200_parser(), Semver200_comparator()} {
-    }
-};
-
-} // namespace version

lib/semver/version.h

@@ -1,149 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-
-#include <string>
-#include <vector>
-
-namespace version {
-
-/// Type of prerelease identifier: alphanumeric or numeric.
-/**
-	Type of identifier affects comparison: alphanumeric identifiers are compared as ASCII strings, while
-	numeric identifiers are compared as numbers.
-	*/
-enum class Id_type {
-    alnum, ///< Identifier is alphanumerical
-    num    ///< Identifier is numeric
-};
-
-/// Container for prerelease identifier value and it's type.
-/**
-	Prerelease version string consist of an optional series of dot-separated identifiers.
-	These identifiers can be either numerical or alphanumerical.
-	This structure describes one such identifier.
-	*/
-using Prerelease_identifier = std::pair<std::string, Id_type>;
-
-/// Container for all prerelease identifiers for a given version string.
-using Prerelease_identifiers = std::vector<Prerelease_identifier>;
-
-/// Build identifier is arbitrary string with no special meaning with regards to version precedence.
-using Build_identifier = std::string;
-
-/// Container for all build identifiers of a given version string.
-using Build_identifiers = std::vector<Build_identifier>;
-
-/// Description of version broken into parts, as per semantic versioning specification.
-struct Version_data {
-    Version_data(const int M, const int m, const int p, const Prerelease_identifiers & pr, const Build_identifiers & b)
-        : major{M}
-        , minor{m}
-        , patch{p}
-        , prerelease_ids{pr}
-        , build_ids{b} {
-    }
-
-    int major; ///< Major version, change only on incompatible API modifications.
-    int minor; ///< Minor version, change on backwards-compatible API modifications.
-    int patch; ///< Patch version, change only on bugfixes.
-
-    /// Optional series of prerelease identifiers.
-    Prerelease_identifiers prerelease_ids;
-
-    /// Optional series of build identifiers.
-    Build_identifiers build_ids;
-};
-
-// Forward declaration required for operators' template declarations.
-template <typename Parser, typename Comparator>
-class Basic_version;
-
-/// Test if left-hand version operand is of lower precedence than the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator<(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version operand if of equal precedence as the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator==(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version and right-hand version are of different precedence.
-template <typename Parser, typename Comparator>
-bool operator!=(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version operand is of higher precedence than the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator>(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version operand is of higher or equal precedence as the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator>=(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Test if left-hand version operand is of lower or equal precedence as the right-hand version.
-template <typename Parser, typename Comparator>
-bool operator<=(const Basic_version<Parser, Comparator> &, const Basic_version<Parser, Comparator> &);
-
-/// Base class for various version parsing, precedence ordering and data manipulation schemes.
-/**
-	Basic_version class describes general version object without prescribing parsing,
-	validation, comparison and modification rules. These rules are implemented by supplied Parser, Comparator
-	and Modifier objects.
-	*/
-template <typename Parser, typename Comparator>
-class Basic_version {
-  public:
-    /// Construct Basic_version object using Parser object to parse default ("0.0.0") version string, Comparator for comparison and Modifier for modification.
-    Basic_version(Parser, Comparator);
-
-    /// Construct Basic_version object using Parser to parse supplied version string, Comparator for comparison and Modifier for modification.
-    Basic_version(const std::string &, Parser, Comparator);
-
-    /// Construct Basic_version object using supplied Version_data, Parser, Comparator and Modifier objects.
-    Basic_version(const Version_data &, Parser, Comparator);
-
-    /// Construct Basic_version by copying data from another one.
-    Basic_version(const Basic_version &);
-
-    /// Copy version data from another Basic_version to this one.
-    Basic_version & operator=(const Basic_version &);
-
-    int               major() const;      ///< Get major version.
-    int               minor() const;      ///< Get minor version.
-    int               patch() const;      ///< Get patch version.
-    const std::string prerelease() const; ///< Get prerelease version string.
-    const std::string build() const;      ///< Get build version string.
-
-    friend bool operator< <>(const Basic_version &, const Basic_version &);
-    friend bool operator==<>(const Basic_version &, const Basic_version &);
-
-  private:
-    Parser       parser_;
-    Comparator   comparator_;
-    Version_data ver_;
-};
-
-} // namespace version
-
-#include "version.inl"

lib/semver/version.inl

@@ -1,132 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2015 Marko Zivanovic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-
-#include "version.h"
-
-namespace version {
-
-namespace {
-
-/// Utility function to splice all vector elements to output stream, using designated separator
-/// between elements and function object for getting values from vector elements.
-template <typename T, typename F>
-std::string & splice(std::string & ss, const std::vector<T> & vec, const std::string & sep, F read) {
-    if (!vec.empty()) {
-        for (auto it = vec.cbegin(); it < vec.cend() - 1; ++it) {
-            ss += read(*it) + sep;
-        }
-        ss += read(*vec.crbegin());
-    }
-    return ss;
-}
-
-} // namespace
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator>::Basic_version(Parser p, Comparator c)
-    : parser_(p)
-    , comparator_(c)
-    , ver_(parser_.parse("0.0.0")) {
-}
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator>::Basic_version(const std::string & v, Parser p, Comparator c)
-    : parser_(p)
-    , comparator_(c)
-    , ver_(parser_.parse(v)) {
-}
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator>::Basic_version(const Version_data & v, Parser p, Comparator c)
-    : parser_(p)
-    , comparator_(c)
-    , ver_(v) {
-}
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator>::Basic_version(const Basic_version<Parser, Comparator> &) = default;
-
-template <typename Parser, typename Comparator>
-Basic_version<Parser, Comparator> & Basic_version<Parser, Comparator>::operator=(const Basic_version<Parser, Comparator> &) = default;
-
-template <typename Parser, typename Comparator>
-int Basic_version<Parser, Comparator>::major() const {
-    return ver_.major;
-}
-
-template <typename Parser, typename Comparator>
-int Basic_version<Parser, Comparator>::minor() const {
-    return ver_.minor;
-}
-
-template <typename Parser, typename Comparator>
-int Basic_version<Parser, Comparator>::patch() const {
-    return ver_.patch;
-}
-
-template <typename Parser, typename Comparator>
-const std::string Basic_version<Parser, Comparator>::prerelease() const {
-    std::string ss;
-    return splice(ss, ver_.prerelease_ids, ".", [](const Prerelease_identifier & id) { return id.first; });
-}
-
-template <typename Parser, typename Comparator>
-const std::string Basic_version<Parser, Comparator>::build() const {
-    std::string ss;
-    return splice(ss, ver_.build_ids, ".", [](const std::string & id) { return id; });
-}
-
-template <typename Parser, typename Comparator>
-bool operator<(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return l.comparator_.compare(l.ver_, r.ver_) == -1;
-}
-
-template <typename Parser, typename Comparator>
-bool operator==(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return l.comparator_.compare(l.ver_, r.ver_) == 0;
-}
-
-template <typename Parser, typename Comparator>
-inline bool operator!=(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return !(l == r);
-}
-
-template <typename Parser, typename Comparator>
-inline bool operator>(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return r < l;
-}
-
-template <typename Parser, typename Comparator>
-inline bool operator>=(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return !(l < r);
-}
-
-template <typename Parser, typename Comparator>
-inline bool operator<=(const Basic_version<Parser, Comparator> & l, const Basic_version<Parser, Comparator> & r) {
-    return !(l > r);
-}
-
-} // namespace version

pio_local.ini_example

@@ -20,7 +20,7 @@ my_build_flags =
 
 [platformio]
 default_envs = s_16M_P ; BBQKees E32V2
-; default_envs = build_webUI ; build the web interface only
+; default_envs = build-webUI ; build the web interface only
 ; default_envs = s3_16M_P ; BBQKees S3
 ; default_envs = s_4M ; BBQKees older S32, 4MB no psram
 ; default_envs = s_16M ; BBQKees newer S32 V2, 16MB no psram

platformio.ini

@@ -21,8 +21,8 @@ extra_configs =
   pio_local.ini
 
 [common]
-core_build_flags = -std=c++17 -std=gnu++17 -O3 -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format -Wno-missing-field-initializers
-core_unbuild_flags = -std=gnu++11
+core_build_flags = -std=gnu++2a -O3 -flto=auto -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format -Wno-missing-field-initializers
+core_unbuild_flags = -std=gnu++11 -std=gnu++14 -std=gnu++17 -fno-lto
 
 my_build_flags =
 
@@ -109,7 +109,7 @@ lib_deps =
   ; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8
 
 ; builds the web interface only, not the firmware
-[env:build_webUI]
+[env:build-webUI]
 platform = native
 targets = build
 extra_scripts = pre:scripts/build_interface.py
@@ -175,7 +175,7 @@ build_flags =
 build_src_flags =
   -DEMSESP_STANDALONE -DEMSESP_TEST
   -DARDUINOJSON_ENABLE_ARDUINO_STRING=1
-  -std=gnu++17 -Og -ggdb
+  -std=gnu++2a -Og -ggdb
   -Wall -Wextra
   -Wno-unused-parameter -Wno-sign-compare -Wno-missing-braces
   -Wno-vla-cxx-extension -Wno-tautological-constant-out-of-range-compare
@@ -184,7 +184,6 @@ build_src_flags =
   -I./lib/uuid-common/src
   -I./lib/uuid-console/src
   -I./lib/uuid-log/src
-  -I./lib/semver
   -I./lib/PButton
   -I./lib/espMqttClient/src
   -I./lib/espMqttClient/src/Transport
@@ -215,7 +214,7 @@ build_src_flags =
   -DEMSESP_UNITY
   -DARDUINOJSON_ENABLE_ARDUINO_STRING=1
   -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
-  -std=gnu++17 -Og -ggdb
+  -std=gnu++2a -Og -ggdb
   -Wall -Wextra
   -Wno-unused-parameter -Wno-sign-compare -Wno-missing-braces
   -Wno-vla-cxx-extension -Wno-tautological-constant-out-of-range-compare
@@ -224,7 +223,6 @@ build_src_flags =
   -I./lib/uuid-common/src
   -I./lib/uuid-console/src
   -I./lib/uuid-log/src
-  -I./lib/semver
   -I./lib/PButton
   -I./lib/espMqttClient/src
   -I./lib/espMqttClient/src/Transport

scripts/build_interface.py

@@ -74,7 +74,7 @@ def buildWeb():
         # Run pnpm commands in the interface directory
         commands = [
             f"{pnpm_exe} install",
-            f"{pnpm_exe} build_webUI"
+            f"{pnpm_exe} build-webUI"
         ]
 
         for command in commands:
@@ -102,7 +102,7 @@ def buildWeb():
         return False
 
 
-def build_webUI(*args, **kwargs):
+def build-webUI(*args, **kwargs):
     success = buildWeb()
     if not success:
         print("Web interface build failed!")
@@ -114,7 +114,7 @@ def build_webUI(*args, **kwargs):
 env.AddCustomTarget(
     name="build",
     dependencies=None,
-    actions=[build_webUI],
+    actions=[build-webUI],
     title="build web interface",
     description="installs pnpm packages, updates libraries and builds web UI",
     always_build=True

scripts/update_all.sh

@@ -20,7 +20,7 @@ pnpm format
 
 cd ..
 cd interface
-pnpm build_webUI
+pnpm build-webUI
 
 cd ..
 npx cspell "**"

src/ESP32React/ESP32React.cpp

@@ -2,10 +2,75 @@
 
 #include "WWWData.h" // include auto-generated static web resources
 
+#include <string.h>
+
 static constexpr const char CACHE_CONTROL[] = "public,max-age=60";
 
+// Single static-content handler serving all assets embedded in WWWData.h.
+class StaticContentHandler : public AsyncWebHandler {
+  public:
+    bool canHandle(AsyncWebServerRequest * request) const override {
+        const auto method = request->method();
+        return method == HTTP_GET || method == HTTP_HEAD || method == HTTP_OPTIONS;
+    }
+
+    void handleRequest(AsyncWebServerRequest * request) override {
+        // OPTIONS is handled generically - the server-level CORS headers are
+        // attached via DefaultHeaders in ESP32React::begin().
+        if (request->method() == HTTP_OPTIONS) {
+            request->send(200);
+            return;
+        }
+
+        const char *     url   = request->url().c_str();
+        const WWWAsset * found = lookup(url);
+        const WWWAsset * asset = found ? found : index_asset();
+
+        if (asset == nullptr) {
+            request->send(404);
+            return;
+        }
+
+        // If the client already has this exact ETag, respond 304 Not Modified without sending the body.
+        const String & inm = request->header(asyncsrv::T_INM);
+        if (inm.length() != 0 && strcmp(inm.c_str(), asset->etag) == 0) {
+            request->send(304);
+            return;
+        }
+
+        AsyncWebServerResponse * response = request->beginResponse(200, asset->contentType, asset->content, asset->len);
+        response->addHeader(asyncsrv::T_Content_Encoding, asyncsrv::T_gzip, false);
+        response->addHeader(asyncsrv::T_ETag, asset->etag, false);
+        response->addHeader(asyncsrv::T_Cache_Control, CACHE_CONTROL, false);
+        request->send(response);
+    }
+
+  private:
+    // Exact-match lookup in the asset table
+    static const WWWAsset * lookup(const char * url) {
+        for (size_t i = 0; i < WWW_ASSETS_COUNT; i++) {
+            if (strcmp(WWW_ASSETS[i].uri, url) == 0) {
+                return &WWW_ASSETS[i];
+            }
+        }
+        return nullptr;
+    }
+
+    // Returns the /index.html asset, used as the SPA fallback for any GET
+    // that didn't match an embedded asset (React Router handles routing on
+    // the client side).
+    static const WWWAsset * index_asset() {
+        static const WWWAsset * cached = nullptr;
+        if (cached == nullptr) {
+            cached = lookup("/index.html");
+        }
+        return cached;
+    }
+};
+
 ESP32React::ESP32React(AsyncWebServer * server, FS * fs)
-    : _securitySettingsService(server, fs)
+    : _server(server)
+    , _securitySettingsService(server, fs)
     , _networkSettingsService(server, fs, &_securitySettingsService)
     , _wifiScanner(server, &_securitySettingsService)
     , _networkStatus(server, &_securitySettingsService)
@@ -17,50 +82,6 @@ ESP32React::ESP32React(AsyncWebServer * server, FS * fs)
     , _mqttSettingsService(server, fs, &_securitySettingsService)
     , _mqttStatus(server, &_mqttSettingsService, &_securitySettingsService)
     , _authenticationService(server, &_securitySettingsService) {
-    //
-    // Serve static web resources
-    //
-
-    ArRequestHandlerFunction indexHtmlHandler = nullptr;
-
-    WWWData::registerRoutes([server, &indexHtmlHandler](const char * uri, const String & contentType, const uint8_t * content, size_t len, const String & hash) {
-        String etag = "\"" + hash + "\""; // RFC9110: ETag must be enclosed in double quotes
-
-        ArRequestHandlerFunction requestHandler = [contentType, content, len, etag](AsyncWebServerRequest * request) {
-            if (request->header(asyncsrv::T_INM) == etag) {
-                request->send(304);
-                return;
-            }
-
-            AsyncWebServerResponse * response = request->beginResponse(200, contentType, content, len);
-            response->addHeader(asyncsrv::T_Content_Encoding, asyncsrv::T_gzip, false);
-            response->addHeader(asyncsrv::T_ETag, etag, false);
-            response->addHeader(asyncsrv::T_Cache_Control, CACHE_CONTROL, false);
-            request->send(response);
-        };
-
-        server->on(uri, HTTP_GET, requestHandler);
-
-        // Capture index.html handler to set onNotFound once after all routes are registered
-        if (strcmp(uri, "/index.html") == 0) {
-            indexHtmlHandler = requestHandler;
-        }
-    });
-
-    // Set onNotFound handler once after all routes are registered
-    // Serving non matching get requests with "/index.html"
-    // OPTIONS get a straight up 200 response
-    if (indexHtmlHandler != nullptr) {
-        server->onNotFound([indexHtmlHandler](AsyncWebServerRequest * request) {
-            if (request->method() == HTTP_GET) {
-                indexHtmlHandler(request);
-            } else if (request->method() == HTTP_OPTIONS) {
-                request->send(200);
-            } else {
-                request->send(404); // not found
-            }
-        });
-    }
 }
 
 void ESP32React::begin() {
@@ -78,6 +99,7 @@ void ESP32React::begin() {
     _ntpSettingsService.begin();
     _mqttSettingsService.begin();
     _securitySettingsService.begin();
+    _server->addHandler(new StaticContentHandler());
 }
 
 void ESP32React::loop() {

src/ESP32React/ESP32React.h

@@ -68,6 +68,7 @@ class ESP32React {
     }
 
   private:
+    AsyncWebServer *        _server;
     SecuritySettingsService _securitySettingsService;
     NetworkSettingsService  _networkSettingsService;
     WiFiScanner             _wifiScanner;

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"
@@ -289,11 +288,11 @@ void System::get_partition_info() {
     partition_info_.clear(); // clear existing data
 
 #ifdef EMSESP_STANDALONE
-    // dummy data for standalone mode - version, size, install_date
-    partition_info_["app0"]    = {EMSESP_APP_VERSION, 0, ""};
-    partition_info_["app1"]    = {"", 0, ""};
-    partition_info_["factory"] = {"", 0, ""};
-    partition_info_["boot"]    = {"", 0, ""};
+    // dummy data for standalone mode - version, size, install_date in UTC epoch
+    partition_info_["app0"]    = {EMSESP_APP_VERSION, 0, 0};
+    partition_info_["app1"]    = {"", 0, 0};
+    partition_info_["factory"] = {"", 0, 0};
+    partition_info_["boot"]    = {"", 0, 0};
 #else
 
     auto current_partition = (const char *)esp_ota_get_running_partition()->label;
@@ -333,20 +332,19 @@ void System::get_partition_info() {
             p_info.version = EMSESP::nvs_.getString(part->label, "").c_str();
             char c[20];
             snprintf(c, sizeof(c), "d_%s", (const char *)part->label);
-            time_t d = EMSESP::nvs_.getULong(c, 0);
-            char   time_string[25];
-            strftime(time_string, sizeof(time_string), "%FT%T", localtime(&d));
-            p_info.install_date = d > 1500000000L ? time_string : "";
+            time_t d            = EMSESP::nvs_.getULong(c, 0);
+            p_info.install_date = d > 1500000000L ? d : 0; // store UTC epoch; formatted to local time at render
 
-            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
@@ -355,7 +353,7 @@ void System::get_partition_info() {
 #endif
 }
 
-// set NTP install time/date for the current partition
+// set install time/date for the current partition, in UTC
 // assumes NTP is connected and working
 void System::set_partition_install_date() {
 #ifndef EMSESP_STANDALONE
@@ -1240,11 +1238,18 @@ void System::show_system(uuid::console::Shell & shell) {
         if (partition.second.version.empty()) {
             continue; // no version, empty string
         }
+        std::string installed;
+        if (partition.second.install_date > 0) {
+            char   time_string[25];
+            time_t d = partition.second.install_date;
+            strftime(time_string, sizeof(time_string), "%FT%T", localtime(&d));
+            installed = std::string(", installed on ") + time_string;
+        }
         shell.printfln("  %s: v%s (%d KB%s) %s",
                        partition.first.c_str(),
                        partition.second.version.c_str(),
                        partition.second.size,
-                       partition.second.install_date.empty() ? "" : (std::string(", installed on ") + partition.second.install_date).c_str(),
+                       installed.c_str(),
                        (strcmp(esp_ota_get_running_partition()->label, partition.first.c_str()) == 0) ? "** active **" : "");
     }
 
@@ -1533,8 +1538,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());
@@ -1685,18 +1690,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);
     }
@@ -1748,20 +1752,22 @@ 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
     node         = nodes.add<JsonObject>();
     node["type"] = "nvs";
 
-    const char *   nvs_part = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_NVS, "nvs1") ? "nvs1" : "nvs"; // nvs1 is on 16MBs
+    const char *   nvs_part = "nvs";
     nvs_iterator_t it       = nullptr;
 #if ESP_IDF_VERSION_MAJOR < 5
     it = nvs_entry_find(nvs_part, "ems-esp", NVS_TYPE_ANY);

src/core/system.h

@@ -83,7 +83,7 @@ enum FUSE_VALUE : uint8_t { ALL = 0, MFG = 1, MODEL = 2, BOARD = 3, REV = 4, BAT
 struct PartitionInfo {
     std::string version;
     size_t      size;
-    std::string install_date; // optional, only available if NTP is connected
+    time_t      install_date; // UTC epoch seconds; 0 if unknown. Format with localtime() at render time so it honors the current TZ.
 };
 
 class System {

src/emsesp_version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.8.2-dev.15"
+#define EMSESP_APP_VERSION "3.8.2-dev.16"

src/web/WebStatusService.cpp

@@ -146,18 +146,27 @@ void WebStatusService::systemStatus(AsyncWebServerRequest * request) {
     }
 
     // get the partition info for each partition, including the running one
-    // the partition data is done once in System::start() and stored in partition_info_
+    // the partition data is gathered once in System::start() and stored in partition_info_
+    // install_date is stored as a UTC epoch and formatted to local time here so it honors
+    // the current TZ (which may not have been set yet when System::start() ran).
     JsonArray partitions = root["partitions"].to<JsonArray>();
     for (const auto & partition : EMSESP::system_.partition_info_) {
         // Skip partition if it has no version, or it's size is 0
         if (partition.second.version.empty() || partition.second.size == 0) {
             continue;
         }
-        JsonObject part      = partitions.add<JsonObject>();
-        part["partition"]    = partition.first;
-        part["version"]      = partition.second.version;
-        part["size"]         = partition.second.size;
-        part["install_date"] = partition.second.install_date;
+        JsonObject part   = partitions.add<JsonObject>();
+        part["partition"] = partition.first;
+        part["version"]   = partition.second.version;
+        part["size"]      = partition.second.size;
+        if (partition.second.install_date > 0) {
+            char   time_string[25];
+            time_t d = partition.second.install_date;
+            strftime(time_string, sizeof(time_string), "%FT%T", localtime(&d));
+            part["install_date"] = time_string;
+        } else {
+            part["install_date"] = "";
+        }
     }
 
     root["developer_mode"] = EMSESP::system_.developer_mode();
@@ -253,7 +262,7 @@ uint8_t WebStatusService::upgradeImportantMessages(std::string & version) {
 
     // it's a filename with a .bin or .md extension, try and extract the version from it
     // e.g. EMS-ESP-3_8_2-dev_13-ESP32-16MB+.bin -> major=3 minor=8 patch=2
-    version::Semver200_version latest_version;
+    version::EMSESP_Version latest_version;
     if ((version.find(".bin") != std::string::npos) || (version.find(".md") != std::string::npos)) {
         std::string filename = version;
         auto        pos      = filename.find("EMS-ESP-");
@@ -274,18 +283,18 @@ uint8_t WebStatusService::upgradeImportantMessages(std::string & version) {
         std::string major_version = filename.substr(pos, underscore1 - pos);
         std::string minor_version = filename.substr(underscore1 + 1, underscore2 - underscore1 - 1);
         std::string patch_version = filename.substr(underscore2 + 1, dash - underscore2 - 1);
-        latest_version            = version::Semver200_version(major_version + "." + minor_version + "." + patch_version);
+        latest_version            = version::EMSESP_Version(major_version + "." + minor_version + "." + patch_version);
     } else {
         // if it's .json file exit
         if (version.find(".json") != std::string::npos) {
             return 0;
         } else {
             // treat it like a version string like "3.9.0"
-            latest_version = version::Semver200_version(version);
+            latest_version = version::EMSESP_Version(version);
         }
     }
 
-    version::Semver200_version current_version(current_version_s); // get current version
+    version::EMSESP_Version current_version(current_version_s); // get current version
 
     if (latest_version > current_version && current_version.minor() < latest_version.minor()) {
         return 0; // if it's just a minor version upgrade return 0
@@ -306,9 +315,9 @@ uint8_t WebStatusService::upgradeImportantMessages(std::string & version) {
 // versions holds the latest development version and stable version in one string, comma separated
 bool WebStatusService::checkUpgrade(JsonObject root, std::string & version) {
     if (!version.empty()) {
-        version::Semver200_version current_version(current_version_s);
-        version::Semver200_version latest_dev_version(version.substr(0, version.find(',')));
-        version::Semver200_version latest_stable_version(version.substr(version.find(',') + 1));
+        version::EMSESP_Version current_version(current_version_s);
+        version::EMSESP_Version latest_dev_version(version.substr(0, version.find(',')));
+        version::EMSESP_Version latest_stable_version(version.substr(version.find(',') + 1));
 
         bool dev_upgradeable    = latest_dev_version > current_version;
         bool stable_upgradeable = latest_stable_version > current_version;

src/web/WebStatusService.h

@@ -4,7 +4,7 @@
 #define EMSESP_SYSTEM_STATUS_SERVICE_PATH "/rest/systemStatus"
 #define EMSESP_ACTION_SERVICE_PATH "/rest/action"
 
-#include <semver200.h> // for version checking
+#include "../core/EMSESP_Version.h"
 #include "../emsesp_version.h"
 
 namespace emsesp {