Merge branch 'origin/dev'

#1280 sample value is a string for enums

.clang-tidy

@@ -0,0 +1,152 @@
+---
+Checks: >-
+  *,
+  -abseil-*,
+  -android-*,
+  -boost-*,
+  -bugprone-branch-clone,
+  -bugprone-narrowing-conversions,
+  -bugprone-signed-char-misuse,
+  -bugprone-too-small-loop-variable,
+  -cert-dcl50-cpp,
+  -cert-err58-cpp,
+  -cert-oop57-cpp,
+  -cert-str34-c,
+  -clang-analyzer-optin.cplusplus.UninitializedObject,
+  -clang-analyzer-osx.*,
+  -clang-diagnostic-delete-abstract-non-virtual-dtor,
+  -clang-diagnostic-delete-non-abstract-non-virtual-dtor,
+  -clang-diagnostic-shadow-field,
+  -clang-diagnostic-sign-compare,
+  -clang-diagnostic-unused-variable,
+  -clang-diagnostic-unused-const-variable,
+  -cppcoreguidelines-avoid-c-arrays,
+  -cppcoreguidelines-avoid-goto,
+  -cppcoreguidelines-avoid-magic-numbers,
+  -cppcoreguidelines-init-variables,
+  -cppcoreguidelines-macro-usage,
+  -cppcoreguidelines-narrowing-conversions,
+  -cppcoreguidelines-non-private-member-variables-in-classes,
+  -cppcoreguidelines-owning-memory,
+  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+  -cppcoreguidelines-pro-bounds-constant-array-index,
+  -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+  -cppcoreguidelines-pro-type-const-cast,
+  -cppcoreguidelines-pro-type-cstyle-cast,
+  -cppcoreguidelines-pro-type-member-init,
+  -cppcoreguidelines-pro-type-reinterpret-cast,
+  -cppcoreguidelines-pro-type-static-cast-downcast,
+  -cppcoreguidelines-pro-type-union-access,
+  -cppcoreguidelines-pro-type-vararg,
+  -cppcoreguidelines-special-member-functions,
+  -fuchsia-default-arguments,
+  -fuchsia-multiple-inheritance,
+  -fuchsia-overloaded-operator,
+  -fuchsia-statically-constructed-objects,
+  -fuchsia-default-arguments-declarations,
+  -fuchsia-default-arguments-calls,
+  -google-build-using-namespace,
+  -google-explicit-constructor,
+  -google-readability-braces-around-statements,
+  -google-readability-casting,
+  -google-readability-todo,
+  -google-runtime-references,
+  -hicpp-*,
+  -llvm-else-after-return,
+  -llvm-header-guard,
+  -llvm-include-order,
+  -llvm-qualified-auto,
+  -llvmlibc-*,
+  -misc-non-private-member-variables-in-classes,
+  -misc-no-recursion,
+  -misc-unused-parameters,
+  -modernize-avoid-c-arrays,
+  -modernize-return-braced-init-list,
+  -modernize-use-auto,
+  -modernize-use-default-member-init,
+  -modernize-use-equals-default,
+  -modernize-use-trailing-return-type,
+  -mpi-*,
+  -objc-*,
+  -readability-braces-around-statements,
+  -readability-const-return-type,
+  -readability-convert-member-functions-to-static,
+  -readability-else-after-return,
+  -readability-implicit-bool-conversion,
+  -readability-isolate-declaration,
+  -readability-magic-numbers,
+  -readability-make-member-function-const,
+  -readability-named-parameter,
+  -readability-qualified-auto,
+  -readability-redundant-access-specifiers,
+  -readability-redundant-member-init,
+  -readability-redundant-string-init,
+  -readability-uppercase-literal-suffix,
+  -readability-use-anyofallof,
+  -warnings-as-errors
+WarningsAsErrors: '*'
+AnalyzeTemporaryDtors: false
+FormatStyle:     google
+CheckOptions:
+  - key:             google-readability-braces-around-statements.ShortStatementLines
+    value:           '1'
+  - key:             google-readability-function-size.StatementThreshold
+    value:           '800'
+  - key:             google-readability-namespace-comments.ShortNamespaceLines
+    value:           '10'
+  - key:             google-readability-namespace-comments.SpacesBeforeComments
+    value:           '2'
+  - key:             modernize-loop-convert.MaxCopySize
+    value:           '16'
+  - key:             modernize-loop-convert.MinConfidence
+    value:           reasonable
+  - key:             modernize-loop-convert.NamingStyle
+    value:           CamelCase
+  - key:             modernize-pass-by-value.IncludeStyle
+    value:           llvm
+  - key:             modernize-replace-auto-ptr.IncludeStyle
+    value:           llvm
+  - key:             modernize-use-nullptr.NullMacros
+    value:           'NULL'
+  - key:             readability-identifier-naming.LocalVariableCase
+    value:           'lower_case'
+  - key:             readability-identifier-naming.ClassCase
+    value:           'CamelCase'
+  - key:             readability-identifier-naming.StructCase
+    value:           'CamelCase'
+  - key:             readability-identifier-naming.EnumCase
+    value:           'CamelCase'
+  - key:             readability-identifier-naming.EnumConstantCase
+    value:           'UPPER_CASE'
+  - key:             readability-identifier-naming.StaticConstantCase
+    value:           'UPPER_CASE'
+  - key:             readability-identifier-naming.StaticVariableCase
+    value:           'UPPER_CASE'
+  - key:             readability-identifier-naming.GlobalConstantCase
+    value:           'UPPER_CASE'
+  - key:             readability-identifier-naming.ParameterCase
+    value:           'lower_case'
+  - key:             readability-identifier-naming.PrivateMemberPrefix
+    value:           'NO_PRIVATE_MEMBERS_ALWAYS_USE_PROTECTED'
+  - key:             readability-identifier-naming.PrivateMethodPrefix
+    value:           'NO_PRIVATE_METHODS_ALWAYS_USE_PROTECTED'
+  - key:             readability-identifier-naming.ClassMemberCase
+    value:           'lower_case'
+  - key:             readability-identifier-naming.ClassMemberCase
+    value:           'lower_case'
+  - key:             readability-identifier-naming.ProtectedMemberCase
+    value:           'lower_case'
+  - key:             readability-identifier-naming.ProtectedMemberSuffix
+    value:           '_'
+  - key:             readability-identifier-naming.FunctionCase
+    value:           'lower_case'
+  - key:             readability-identifier-naming.ClassMethodCase
+    value:           'lower_case'
+  - key:             readability-identifier-naming.ProtectedMethodCase
+    value:           'lower_case'
+  - key:             readability-identifier-naming.ProtectedMethodSuffix
+    value:           '_'
+  - key:             readability-identifier-naming.VirtualMethodCase
+    value:           'lower_case'
+  - key:             readability-identifier-naming.VirtualMethodSuffix
+    value:           ''

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,35 +1,50 @@
 ---
-name: Bug report
+name: Problem Report
-about: Create a report to help us improve
+about: Create a Report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
 ---
 
-*Before creating a new issue please check that you have:*
+<!-- Thanks for reporting a problem for this project. READ THIS FIRST:
 
-* *searched the existing [issues](https://github.com/emsesp/EMS-ESP32/issues) (both open and closed)*
+Please DO NOT OPEN AN ISSUE if your EMS-ESP version is not the latest from the dev branch, please update your device before submitting your issue. Your problem might already be solved. The latest precompiled binaries of EMS-ESP can be downloaded from https://github.com/emsesp/EMS-ESP32/releases/tag/latest
-* *searched the [documentation help section](https://emsesp.github.io/docs)*
 
-*Completing this template will help developers and contributors to address the issue. Try to be as specific and extensive as possible. If the information provided is not enough the issue will likely be closed.*
+Please take a few minutes to complete the requested information below.
 
-*You can now remove this line and the above ones. Text in italic is meant to be replaced by your own words. If any of the sections below are not relevant to the issue (for instance, the screenshots) then you can delete them.*
+-->
 
-**Bug description**
+### PROBLEM DESCRIPTION
-*A clear and concise description of what the bug is. Mention which EMS-ESP version you're using.*
 
-**Steps to reproduce**
+_A clear and concise description of what the problem is._
-*Steps to reproduce the behavior.*
 
-**Expected behavior**
+### REQUESTED INFORMATION
-*A clear and concise description of what you expected to happen.*
 
-**Screenshots**
+_Make sure your have performed every step and checked the applicable boxes before submitting your issue. Thank you!_
-*If applicable, add screenshots to help explain your problem.*
 
-**Device information**
+- [ ] Searched the problem in [issues](https://github.com/emsesp/EMS-ESP32/issues)
-*Copy-paste here the information as it is outputted by the device. You can get this information by from http://ems-esp.local/api?device=system&cmd=info*
+- [ ] Searched the problem in [discussions](https://github.com/emsesp/EMS-ESP32/discussions)
+- [ ] Searched the problem in the [docs](https://emsesp.github.io/docs/Troubleshooting/)
+- [ ] Searched the problem in the [chat](https://discord.gg/3J3GgnzpyT)
+- [ ] Provide the output of http://ems-esp.local/api/system :
 
-**Additional context**
+```lua
-*Add any other context about the problem here.*
+  System information output here:
+
+
+```
+
+### TO REPRODUCE
+
+_Steps to reproduce the behavior:_
+
+### EXPECTED BEHAVIOUR
+
+_A clear and concise description of what you expected to happen._
+
+### SCREENSHOTS
+
+_If applicable, add screenshots to help explain your problem._
+
+### ADDITIONAL CONTEXT
+
+_Add any other context about the problem here._
+
+**(Please, remember to close the issue when the problem has been addressed)**

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: EMS-ESP Docs
+    url: https://emsesp.github.io/docs/
+    about: All the information related to EMS-ESP.
+  - name: EMS-ESP Discussions and Support
+    url: https://github.com/emsesp/EMS-ESP32/discussions
+    about: EMS-ESP usage Questions, Feature Requests and Projects.
+  - name: EMS-ESP Users Chat
+    url: https://discord.gg/3J3GgnzpyT
+    about: Chat for feedback, questions and troubleshooting.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,26 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-*Before creating a new feature request please check that you have searched the existing [issues](https://github.com/emsesp/EMS-ESP32/issues) (both open and closed)*
-
-*Completing this template will help developers and contributors evaluating the feature. If the information provided is not enough the issue will likely be closed.*
-
-*You can now remove this line and the above ones. Text in italic is meant to be replaced by your own words. If any of the sections below are not relevant to the request then you can delete them.*
-
-**Is your feature request related to a problem? Please describe.**
-*A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]*
-
-**Describe the solution you'd like**
-*A clear and concise description of what you want to happen.*
-
-**Describe alternatives you've considered**
-*A clear and concise description of any alternative solutions or features you've considered.*
-
-**Additional context**
-*Add any other context or screenshots about the feature request here.*

.github/ISSUE_TEMPLATE/questions---troubleshooting.md

@@ -1,29 +0,0 @@
----
-name: Questions & Troubleshooting
-about: Anything not a bug or feature request
-title: ''
-labels: question
-assignees: ''
-
----
-
-*Before creating a new issue please check that you have:*
-
-* *searched the existing [issues](https://github.com/emsesp/EMS-ESP32/issues) (both open and closed)*
-* *searched the [documentation help section](https://emsesp.github.io/docs)*
-
-*Completing this template will help developers and contributors help you. Try to be as specific and extensive as possible. If the information provided is not enough the issue will likely be closed.*
-
-*You can now remove this line and the above ones. Text in italic is meant to be replaced by your own words. If any of the sections below are not relevant to the issue (for instance, the screenshots) then you can delete them.*
-
-**Question**
-*A clear and concise description of what the problem/doubt is.*
-
-**Screenshots**
-*If applicable, add screenshots to help explain your problem.*
-
-**Device information**
-*Copy-paste here the information as it is outputted by the device. You can get this information from http://ems-esp.local/api?device=system&cmd=info*
-
-**Additional context**
-*Add any other context about the problem here.*

.github/workflows/pre_release.yml

@@ -1,57 +1,58 @@
-name: "pre-release"
+name: 'pre-release'
 
 on:
   workflow_dispatch:
   push:
     branches:
-      - "dev"
+      - 'dev'
 
 jobs:
   pre-release:
-
+    name: 'Automatic pre-release build'
-    name: "Automatic pre-release build"
     runs-on: ubuntu-latest
 
     steps:
-    
+      - uses: actions/checkout@v3
-      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v4
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-node@v3
-      - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Get EMS-ESP source code and version
         id: build_info
         run: |
           version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'`
-          echo "::set-output name=version::$version"
+          echo "VERSION=$version" >> $GITHUB_OUTPUT
 
       - name: Install PlatformIO
         run: |
           python -m pip install --upgrade pip
           pip install -U platformio
-          platformio upgrade
-          platformio update
 
       - name: Build WebUI
         run: |
           cd interface
-          npm ci
+          yarn install
-          npm run build
+          yarn run typesafe-i18n --no-watch
+          sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
+          yarn run build
 
       - name: Build firmware
         run: |
           platformio run -e ci
 
+      - name: Build S3 firmware
+        run: |
+          platformio run -e ci_s3
+
       - name: Create a GH Release
-        id: "automatic_releases"
+        id: 'automatic_releases'
-        uses: "marvinpinto/action-automatic-releases@latest"
+        uses: 'marvinpinto/action-automatic-releases@latest'
         with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          repo_token: '${{ secrets.GITHUB_TOKEN }}'
-          title: ESP32 Development Build v${{steps.build_info.outputs.version}}
+          title: Development Build v${{steps.build_info.outputs.VERSION}}
-          automatic_release_tag: "latest"
+          automatic_release_tag: 'latest'
           prerelease: true
           files: |
             CHANGELOG_LATEST.md
             ./build/firmware/*.*
-            

.github/workflows/sonar_check.yml

@@ -0,0 +1,30 @@
+name: Sonar Check
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build and analyze
+    runs-on: ubuntu-latest
+    # if: github.repository_owner == 'emsesp'
+    # if: github.repository == 'emsesp/EMS-ESP32'
+    env:
+      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Install sonar-scanner and build-wrapper
+        uses: SonarSource/sonarcloud-github-c-cpp@v2
+      - name: Run build-wrapper
+        run: |
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make all
+      - name: Run sonar-scanner
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"

.github/workflows/tagged_release.yml

@@ -1,45 +1,49 @@
-name: "tagged-release"
+name: 'tagged-release'
 
 on:
   push:
     tags:
-      - "v*"
+      - 'v*'
 
 jobs:
   tagged-release:
-
+    name: 'Tagged Release'
-    name: "Tagged Release"
     runs-on: ubuntu-latest
 
     steps:
-
+      - uses: actions/checkout@v3
-      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v4
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-node@v3
-      - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Install PlatformIO
         run: |
           python -m pip install --upgrade pip
           pip install -U platformio
           platformio upgrade
-          platformio update
+          pio pkg update
 
       - name: Build WebUI
         run: |
           cd interface
-          npm ci
+          yarn install
-          npm run build
+          yarn run typesafe-i18n --no-watch
+          sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
+          yarn run build
 
       - name: Build firmware
         run: |
           platformio run -e ci
 
+      - name: Build S3 firmware
+        run: |
+          platformio run -e ci_s3
+
       - name: Release
-        uses: "marvinpinto/action-automatic-releases@latest"
+        uses: 'marvinpinto/action-automatic-releases@latest'
         with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          repo_token: '${{ secrets.GITHUB_TOKEN }}'
           prerelease: false
           files: |
             CHANGELOG.md

.github/workflows/test_release.yml

@@ -0,0 +1,58 @@
+name: 'test-release'
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'dev2'
+
+jobs:
+  pre-release:
+    name: 'Automatic test-release build'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+
+      - name: Get EMS-ESP source code and version
+        id: build_info
+        run: |
+          version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'`
+          echo "VERSION=$version" >> $GITHUB_OUTPUT
+
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio
+
+      - name: Build WebUI
+        run: |
+          cd interface
+          yarn install
+          yarn run typesafe-i18n --no-watch
+          sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
+          yarn run build
+
+      - name: Build firmware
+        run: |
+          platformio run -e ci
+
+      - name: Build S3 firmware
+        run: |
+          platformio run -e ci_s3
+
+      - name: Create a GH Release
+        id: 'automatic_releases'
+        uses: 'marvinpinto/action-automatic-releases@latest'
+        with:
+          repo_token: '${{ secrets.GITHUB_TOKEN }}'
+          title: Test Build v${{steps.build_info.outputs.VERSION}}
+          automatic_release_tag: 'test'
+          prerelease: true
+          files: |
+            CHANGELOG_LATEST.md
+            ./build/firmware/*.*

.gitignore

@@ -1,30 +1,60 @@
 # vscode
-.vscode
+.vscode/c_cpp_properties.json
-.directory
+.vscode/extensions.json
-workspace.code-workspace
+.vscode/launch.json
+# .vscode/settings.json
 
-# build
+# c++ compiling
-build/
 .clang_complete
 .gcc-flags.json
 cppcheck.out.xml
-debug.log
 
 # platformio
 .pio
 pio_local.ini
-/.VSCodeCounter
 
 # OS specific
 .DS_Store
 *Thumbs.db
-
-# project specfic
-/scripts/stackdmp.txt
 emsesp
+
+# web specfic
+build/
+dist/
 /data/www
 /lib/framework/WWWData.h
 /interface/build
 node_modules
 /interface/.eslintcache
-test.sh
+stats.html
+*.sln
+*.sw?
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# scripts
+test.sh
+scripts/run.sh
+scripts/__pycache__
+/scripts/stackdmp.txt
+
+# i18n generated files
+interface/src/i18n/i18n-react.tsx
+interface/src/i18n/i18n-types.ts
+interface/src/i18n/i18n-util.ts
+interface/src/i18n/i18n-util.sync.ts
+interface/src/i18n/i18n-util.async.ts
+
+# sonar
+.scannerwork/
+sonar/
+build_wrapper_output_directory/
+
+# entity dump results
+# dump_entities.csv
+# dump_entities.xls*

.prettierrc

@@ -1,6 +1,8 @@
 {
-  "singleQuote": true,
-  "semi": true,
   "trailingComma": "none",
-  "printWidth": 80
+  "tabWidth": 2,
-}
+  "semi": true,
+  "singleQuote": true,
+  "printWidth": 120,
+  "bracketSpacing": true
+}

.vscode/extensions.json

@@ -0,0 +1,12 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,46 @@
+{
+  "search.exclude": {
+    "**/.yarn": true,
+    "**/.pnp.*": true
+  },
+  "editor.codeActionsOnSave": {
+    "source.fixAll": true
+    // "source.organizeImports": true
+  },
+  "eslint.nodePath": "interface/.yarn/sdks",
+  "eslint.workingDirectories": ["interface"],
+  "prettier.prettierPath": "",
+  "typescript.tsdk": "interface/.yarn/sdks/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true,
+  "files.associations": {
+    "*.tsx": "typescriptreact",
+    "*.tcc": "cpp",
+    "optional": "cpp",
+    "istream": "cpp",
+    "ostream": "cpp",
+    "ratio": "cpp",
+    "system_error": "cpp",
+    "array": "cpp",
+    "functional": "cpp",
+    "regex": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "utility": "cpp",
+    "string": "cpp",
+    "string_view": "cpp"
+  },
+  "todo-tree.filtering.excludeGlobs": [
+    "**/vendor/**",
+    "**/node_modules/**",
+    "**/dist/**",
+    "**/bower_components/**",
+    "**/build/**",
+    "**/.vscode/**",
+    "**/.github/**",
+    "**/_output/**",
+    "**/*.min.*",
+    "**/*.map",
+    "**/ArduinoJson/**"
+  ],
+  "cSpell.enableFiletypes": ["!cpp"]
+}

.vscode/tasks.json

@@ -0,0 +1,18 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "shell",
+      "label": "build standalone emsesp",
+      "command": "make",
+      "args": [],
+      "problemMatcher": ["$gcc"],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    }
+  ]
+}

CHANGELOG.md

@@ -5,6 +5,376 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [3.6.1] September 9 2023
+
+## **IMPORTANT! BREAKING CHANGES**
+
+- `shower_data` MQTT topic shows duration is seconds (was previously a full english sentence)
+
+## Added
+
+- show WiFi rssi in Network Status Page, show quality as color
+
+## Fixed
+
+- Issue in espMqttClient causing a memory leak when MQTT broker is disconnected due to network unavailability [#1264](https://github.com/emsesp/EMS-ESP32/issues/1264)
+- Using MQTT enum values correctly formatted in MQTT Discovery [#1280](https://github.com/emsesp/EMS-ESP32/issues/1280)
+
+## Changed
+
+- mqtt free mem check set to 60 kb
+- small cosmetic changes to Searching in Customization web page
+- updated to espressif32@6.4.0
+
+# [3.6.0] August 13 2023
+
+## **IMPORTANT! BREAKING CHANGES**
+
+There are breaking changes between 3.5.x and earlier versions of 3.6.0. Please read carefully before applying the update.
+
+- The sensors have been renamed. `dallassensor` is now `temperaturesensor` in the MQTT topic and named `ts` in the Customizations file. Likewise `analogs` is now `analogsensor` in MQTT and called `as` in the Customizations file. If you have previous customizations you will need to manually update by downloading, changing the JSON file and uploading. It's also recommended cleaning up any old MQTT topics from your broker using an application like MQTTExplorer.
+
+## Added
+
+- Workaround for better Domoticz MQTT intergration? [#904](https://github.com/emsesp/EMS-ESP32/issues/904)
+- Show MAC address without connecting to network enhancement [#933](https://github.com/emsesp/EMS-ESP32/issues/933)
+- Warn user in WebUI of unsaved changes [#911](https://github.com/emsesp/EMS-ESP32/issues/911)
+- Detect old Tado thermostat, device-id 0x19, no entities
+- Some more HM200 entities [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
+- Added Scheduler [#701](https://github.com/emsesp/EMS-ESP32/issues/701)
+- Added Custom Entities read/write from EMS bus
+- Build S3 binary with github actions
+- Greenstar HIU [#1158](https://github.com/emsesp/EMS-ESP32/issues/1158)
+- AM200 code 10 [#1161](https://github.com/emsesp/EMS-ESP32/issues/1161)
+- Ventilation device (Logavent HRV176) [#1172](https://github.com/emsesp/EMS-ESP32/issues/1172)
+- Turn ETH off on wifi connect [#1167](https://github.com/emsesp/EMS-ESP32/issues/1167)
+- Support for multiple EMS-ESPs with HA [#1196](https://github.com/emsesp/EMS-ESP32/issues/1196)
+- Italian translation [#1199](https://github.com/emsesp/EMS-ESP32/issues/1199)
+- Turkish language support [#1076](https://github.com/emsesp/EMS-ESP32/issues/1076)
+- Buderus GB182 - HC1 mode change not work bug [#1193](https://github.com/emsesp/EMS-ESP32/issues/1193)
+- Minimal flow temperature enhancement [#1192](https://github.com/emsesp/EMS-ESP32/issues/1192)
+- Roomtemperature Switching Difference enhancement [#1191](https://github.com/emsesp/EMS-ESP32/issues/1191)
+- Dew Point Temperature Difference enhancement [#1190](https://github.com/emsesp/EMS-ESP32/issues/1190)
+- Control of heating circuit mode enhancement [#1187](https://github.com/emsesp/EMS-ESP32/issues/1187)
+- Warn user in WebUI of unsaved changes enhancement [#911](https://github.com/emsesp/EMS-ESP32/issues/911)
+- Create safebuild app to fit into factory partition to give ESP32 more flash memory enhancement [#608](https://github.com/emsesp/EMS-ESP32/issues/608)
+- Support ESP32 S2, C3 mini and S3 [#605](https://github.com/emsesp/EMS-ESP32/issues/605)
+- Support Buderus AM200 [#1161](https://github.com/emsesp/EMS-ESP32/issues/1161)
+- Custom telegram handler [#1155](https://github.com/emsesp/EMS-ESP32/issues/1155)
+- Added support for TLS in MQTT (ESP32-S3 only) [#1178](https://github.com/emsesp/EMS-ESP32/issues/1178)
+- Boardprofile BBQKees Gateway S3
+- Custom entity type RAW [#1212](https://github.com/emsesp/EMS-ESP32/discussions/1212)
+- API command response [#1212](https://github.com/emsesp/EMS-ESP32/discussions/1212)
+
+## Fixed
+
+- HA-discovery for analog sensor commands [#1035](https://github.com/emsesp/EMS-ESP32/issues/1035)
+- Enum order of RC3x nofrost mode
+- Heartbeat interval
+- Exhaust temperature always zero on GB125/MC110/RC310 bug [#1147](https://github.com/emsesp/EMS-ESP32/issues/1147)
+- thermostat modetype is not changing when mode changes (e.g. to night) bugSomething isn't working [#1098](https://github.com/emsesp/EMS-ESP32/issues/1098)
+- NTP: cant apply changed timezone [#1182](https://github.com/emsesp/EMS-ESP32/issues/1182)
+- Missing Status of VS1 for Buderus SM200 enhancement [#1034](https://github.com/emsesp/EMS-ESP32/issues/1034)
+- Allowed gpios for S3
+
+## Changed
+
+- Optional upgrade to platform-espressif32 6.3.0 (after 5.3.0) [#862](https://github.com/emsesp/EMS-ESP32/issues/862)
+- Use byte 3 for detection RC30 active heatingcircuit [#786](https://github.com/emsesp/EMS-ESP32/issues/786)
+- Write repeated selflowtemp if tx-queue is empty without verify [#954](https://github.com/emsesp/EMS-ESP32/issues/954)
+- HA discovery recreate after disconnect by device [#1067](https://github.com/emsesp/EMS-ESP32/issues/1067)
+- File upload: check flash size (overflow) instead of filesize
+- Improved HA Discovery so previous configs no longer need to be removed when starting [#1077](https://github.com/emsesp/EMS-ESP32/pull/1077) (thanks @pswid)
+- Enlarge UART-Stack to 2,5k
+- Retry timeout for Mqtt-QOS1/2 10seconds
+- Optimize WebUI rendering when using Dialog Boxes [#1116](https://github.com/emsesp/EMS-ESP32/issues/1116)
+- Optimize Web libraries to reduce bundle size (3.6.x) [#1112](https://github.com/emsesp/EMS-ESP32/issues/1112)
+- Use [espMqttClient](https://github.com/bertmelis/espMqttClient) with integrated queue [#1178](https://github.com/emsesp/EMS-ESP32/issues/1178)
+- Move Sensors from Web dashboard to it's own tab enhancement [#1170](https://github.com/emsesp/EMS-ESP32/issues/1170)
+- Optimize WebUI dashboard data [#1169](https://github.com/emsesp/EMS-ESP32/issues/1169)
+- Replace React core library with Preact to save on memory footprint
+- Response to `system/send` raw reads gives combined data for telegrams with more parts
+
+# [3.5.0] February 6 2023
+
+## **IMPORTANT! BREAKING CHANGES**
+
+- When upgrading to v3.5 for the first time from v3.4 on a BBQKees Gateway board you will need to use the [EMS-EPS Flasher](https://github.com/emsesp/EMS-ESP-Flasher/releases) to correctly re-partition the flash. Make sure you backup the settings and customizations from the WebUI (System->Upload/Download) and restore after the upgrade.
+
+## Added
+
+- Translations in Web UI and all device entity names (DE, NL, SV, PL, NO, FR) [#22](https://github.com/emsesp/EMS-ESP32/issues/22)
+- Add support for Lolin C3 mini [#620](https://github.com/emsesp/EMS-ESP32/pull/620)
+- Add support for ESP32-S2 [#667](https://github.com/emsesp/EMS-ESP32/pull/667)
+- Add devices: Greenstar 30Ri boiler, Junkers FW500 thermostat, Buderus BC30 controller
+- Add program memory info
+- Add mqtt queue and connection infos
+- Adapt min/max if ems-value is not in this range
+- Add heat pump settings for inputs and limits [#600](https://github.com/emsesp/EMS-ESP32/issues/600)
+- Add hybrid heatpump [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
+- Add translated tags
+- Add min/max to customization table [#686](https://github.com/emsesp/EMS-ESP32/issues/686)
+- Add MD5 check [#637](https://github.com/emsesp/EMS-ESP32/issues/637)
+- Add more bus-ids [#673](https://github.com/emsesp/EMS-ESP32/issues/673)
+- Use HA connectivity device class for Status, added boot time [#751](https://github.com/emsesp/EMS-ESP32/issues/751)
+- Add commands for analog sensors outputs
+- Support for multiple EMS-ESPs with MQTT and HA [[#759](https://github.com/emsesp/EMS-ESP32/issues/759)]
+- Settings for heatpump silent mode and additional heater [[#802](https://github.com/emsesp/EMS-ESP32/issues/802)] [[#803](https://github.com/emsesp/EMS-ESP32/issues/803)]
+- Zone module MZ100 [#826](https://github.com/emsesp/EMS-ESP32/issues/826)
+- Default MQTT hostname is blank [#829](https://github.com/emsesp/EMS-ESP32/issues/829)
+- wwCurFlow for ems+ devices [#829](https://github.com/emsesp/EMS-ESP32/issues/829)
+- Add Rego 3000, TR120RF thermostats [#917](https://github.com/emsesp/EMS-ESP32/issues/917)
+- Add config for ESP32-S3
+- Add heatpump silent mode and other entities [#896](https://github.com/emsesp/EMS-ESP32/issues/896)
+- Allow reboot to other partition (factory or asymetric OTA)
+- Blacklist entities to remove from memory [#891](https://github.com/emsesp/EMS-ESP32/issues/891)
+- Add boiler pump operating mode [#944](https://github.com/emsesp/EMS-ESP32/issues/944)
+
+## Fixed
+
+- Factory Reset not working [#628](https://github.com/emsesp/EMS-ESP32/issues/628)
+- Valid 4 byte values [#820](https://github.com/emsesp/EMS-ESP32/issues/820)
+- Commands for multiple thermostats [#826](https://github.com/emsesp/EMS-ESP32/issues/826)
+- API queries for multiple devices [#865](https://github.com/emsesp/EMS-ESP32/issues/865)
+- Console crash when using call with command `hcx` only. [#841](https://github.com/emsesp/EMS-ESP32/issues/841)
+- `heatingPump2Mod` was wrong, changed to absBurnPow [[#908](https://github.com/emsesp/EMS-ESP32/issues/908)
+- Rounding of web input values
+- Analog sensor with single gpio number [#915](https://github.com/emsesp/EMS-ESP32/issues/915)
+- HA dallas and analog configs: remove/rebuild on change [#888](https://github.com/emsesp/EMS-ESP32/issues/888)
+- Modes and set seltemp for RC30 and RC20 [#932](https://github.com/emsesp/EMS-ESP32/issues/932)
+
+## Changed
+
+- Discovery in HomeAssistant don't work with custom base topic. [#596](https://github.com/emsesp/EMS-ESP32/issues/596) Base topic containing `/` are changed to `_`
+- RF room temperature sensor are shown as thermostat
+- Render mqtt float json values with trailing zero
+- Removed flash strings, to increase available heap memory
+- Reload page after restart button is pressed
+- Analog/dallas values command as list like ems-devices
+- Analog/dallas HA-entities based on id
+- MQTT Base is a mandatory field. Removed MQTT topic length from settings
+- HA duration class for time entities [[#822](https://github.com/emsesp/EMS-ESP32/issues/822)
+- AM200 alternative heatsource as class heatsource [[#857](https://github.com/emsesp/EMS-ESP32/issues/857)
+
+# [3.4.2] September 18 2022
+
+## Added
+
+- RC310 additions [#520](https://github.com/emsesp/EMS-ESP32/pull/520)
+  - damping
+  - wwprio for RC310 heating circuits
+  - switchonoptimization for RC310 heating circuits
+  - enum_controlmode for RC310 (new enum list)
+  - nofrostmode, reducemode, reducetemp & noreducetemp for RC310
+  - emergencyops and emergencytemp, wwmaxtemp, wwflowtempoffset and wwcomfort1 for RC310
+  - HM200 hybrid module [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
+  - AM200 alternative heatsource module [#573](https://github.com/emsesp/EMS-ESP32/issues/573)
+  - EM10 error module as gateway [#575](https://github.com/emsesp/EMS-ESP32/issues/575)
+
+## Fixed
+
+- fix Table resizing in WebUI [#519](https://github.com/emsesp/EMS-ESP32/issues/519)
+- allow larger customization files [#570](https://github.com/emsesp/EMS-ESP32/issues/570)
+- losing entitiy wwcomfort [#581](https://github.com/emsesp/EMS-ESP32/issues/581)
+
+## Changed
+
+- Shorten "friendly names" in Home Assistant [#555](https://github.com/emsesp/EMS-ESP32/issues/555)
+- platformio 2.3.0 (IDF 4, Arduino 2)
+- remove master-thermostat, support multiple thermostats
+- merge up- and download in webui [#577](https://github.com/emsesp/EMS-ESP32/issues/577)
+
+# [3.4.1] May 29 2022
+
+## Fixed
+
+- Fix memory leak in api [#524](https://github.com/emsesp/EMS-ESP32/issues/524)
+
+## Changed
+
+- Controller data in web-ui only for IVT [#522](https://github.com/emsesp/EMS-ESP32/issues/522)
+- Rename hidden `climate` to a more explaining name [#523](https://github.com/emsesp/EMS-ESP32/issues/523)
+- Minor changes to the Customizations web page [#527](https://github.com/emsesp/EMS-ESP32/pull/527)
+
+# [3.4.0] May 23 2022
+
+## Added
+
+- WebUI optimizations, updated look&feel and better performance [#124](https://github.com/emsesp/EMS-ESP32/issues/124)
+- Auto refresh of WebUI after successful firmware upload [#178](https://github.com/emsesp/EMS-ESP32/issues/178)
+- New Customization Service in WebUI. First feature is the ability to enable/disabled Enitites (device values) from EMS devices [#206](https://github.com/emsesp/EMS-ESP32/issues/206)
+- Option to disable Telnet Console [#209](https://github.com/emsesp/EMS-ESP32/issues/209)
+- Added Hide SSID, Max Clients and Preferred Channel to Access Point
+- Merged in MichaelDvP's changes like Fahrenheit conversion, publish single (for IOBroker) and a few other critical optimizations
+- Enabled bi-directional read/write with Home Assistant, so values can be changed automatically from the UI without scripting [#265](https://github.com/emsesp/EMS-ESP32/issues/265)
+- Added GC7000F Boiler [#270](https://github.com/emsesp/EMS-ESP32/issues/270)
+- Revised LED flash sequence on boot up to show system health (1 flash=no ems, 2 flashes=no wifi) [#224](https://github.com/emsesp/EMS-ESP32/issues/224)
+- Analog Sensor support [#271](https://github.com/emsesp/EMS-ESP32/issues/271)
+- Solar cylinder priority [#247](https://github.com/emsesp/EMS-ESP32/issues/247)
+- Read only mode in Settings, where EMS Tx/Write commands are blocked [#286](https://github.com/emsesp/EMS-ESP32/issues/286)
+- Added 8700i Boiler device
+- Added Cascade CM10 Controller device
+- Add Olimex ESP32-POE-ISO to board profiles plus settings to customize Ethernet modules [#301](https://github.com/emsesp/EMS-ESP32/issues/301)
+- Help text for string commands in WebUI [#320](https://github.com/emsesp/EMS-ESP32/issues/320)
+- Germany translations (at compile time)
+- #entities added to system/info` endpoint [#322](https://github.com/emsesp/EMS-ESP32/issues/322)
+- analog outputs digital/pwm/dac
+- remove MQTT retained configs if discovery is disabled
+- timeout 10 min for MQTT-QoS wait
+- Moduline 300 auto-temperatures T1-T4, RC300 romminfluencefactor
+- RC35 parameters [#392](https://github.com/emsesp/EMS-ESP32/issues/392), [#398](https://github.com/emsesp/EMS-ESP32/issues/398)
+- sync time with thermostat [#386](https://github.com/emsesp/EMS-ESP32/issues/386), [#408](https://github.com/emsesp/EMS-ESP32/issues/408)
+- set mode has immediate effect [#395](https://github.com/emsesp/EMS-ESP32/issues/395)
+- min/max in web value setting
+- Extend customization to select if an entity is to be shown in the WebUI or forced as read-only [#317](https://github.com/emsesp/EMS-ESP32/issues/317)
+- Added Moduline 400 installation parameters [PR #449 by @kwertie01](https://github.com/emsesp/EMS-ESP32/pull/449)
+- Read time from IVT-controller [#439](https://github.com/emsesp/EMS-ESP32/issues/439)
+- Hybrid Heatpump product-id 168 [#459](https://github.com/emsesp/EMS-ESP32/issues/459), thermostat settings
+- Junkers ISM2 and IPM in warm water mode [#437](https://github.com/emsesp/EMS-ESP32/issues/437)
+- Added Shower Alert trigger time and cold shot time [#436](https://github.com/emsesp/EMS-ESP32/issues/436)
+- Improved Table layout in Web UI (searching, filtering, sorting, exporting to CSV)
+- API fetch individual attributes from an entity [#462](https://github.com/emsesp/EMS-ESP32/issues/462)
+- Option to disable mDNS
+- Option for rendering booleans on dashboard [#456](https://github.com/emsesp/EMS-ESP32/issues/456)
+- Upload customization settings from a file [#256](https://github.com/emsesp/EMS-ESP32/issues/256)
+
+## Fixed
+
+- lastcode broke MQTT JSON structure [#228](https://github.com/emsesp/EMS-ESP32/issues/228)
+- fixed issue with overlapping while reading sequence of EMS1.0 telegrams
+- fixed redundant telegram readings (because of offset overflow)
+- added missing RC30/Moduline 400 [#243](https://github.com/emsesp/EMS-ESP32/issues/243)
+- Correct modes for RC25 [#106](https://github.com/emsesp/EMS-ESP32/issues/106)
+- Clean up old HA config's in MQTT before publishing data. This will prevent HA giving the 'dict' warnings [#229](https://github.com/emsesp/EMS-ESP32/issues/229)
+- RC25 temperature setting [#272](https://github.com/emsesp/EMS-ESP32/issues/272)
+- Buderus RC25 - "hc1 mode type" incorrect value [#273](https://github.com/emsesp/EMS-ESP32/issues/273)
+- Increased number of Mixers and Heating Circuits [#294](https://github.com/emsesp/EMS-ESP32/issues/294)
+- Check receive status before removing a telegram fetch [#268](https://github.com/emsesp/EMS-ESP32/issues/268), [#282](https://github.com/emsesp/EMS-ESP32/issues/282)
+- Fix uploading firmware on OSX [#345](https://github.com/emsesp/EMS-ESP32/issues/345)
+- Non-nested MQTT would corrupt the json [#354](https://github.com/emsesp/EMS-ESP32/issues/354)
+- Burner selected max power can have a value higher than 100% [#314](https://github.com/emsesp/EMS-ESP32/issues/314)
+- some missing fahrenheit calculations
+- limited number of exclusions [#339](https://github.com/emsesp/EMS-ESP32/issues/339)
+- MQTT sometimes would not reconnect after a WiFi outage
+
+## Changed
+
+- Use flash system to show system health (1 flash=no ems, 2 flashes=no wifi) [#224](https://github.com/emsesp/EMS-ESP32/issues/224)
+- Renamed Dallas Sensor to Temperature Sensor in UI
+- Dallas Format removed. Use the name to give each sensor an alias
+- No longer MQTT subscribes to topic `/thermostat_hc<n>` as it supports a path similar to the API endpoint construct
+- Show Sensors quality in WebUI
+- Controller not shown in WebUI dashboard
+- renamed "Home Assistant Integration" to "MQTT Discovery" in MQTT Settings [#290](https://github.com/emsesp/EMS-ESP32/issues/290)
+- Show ems tx reads and writes separately
+- Show ems device handlers separated for received, fetched and pending handlers.
+- Wired renamed to Ethernet
+- removed system/pin command, new commands in analogsensors
+- system/info device-info split to name/version/brand
+- exclude list uses short-names, possible flags for web/api/mqtt excludes, readonly and favorite (selection not yet implemented)
+- thermostat clock formate date-time: dd.mm.yyyy hh:mm
+- RC300 summermode as other thermostats `winter/summer` instead of `off/on`
+
+## **BREAKING CHANGES:**
+
+- Settings:
+  - order of Boolean Format has changed in Application Settings - check your settings
+  - Dallas Format setting removed. Now customize name of each Dallas sensor via the UI
+- MQTT/API
+  - Boiler `wwheat` renamed to `ww3wayon` [#211](https://github.com/emsesp/EMS-ESP32/issues/211)
+  - Boiler `ww` tag renamed to `dhw`. Any custom Home Assistant lovelace dashboards will need updating.
+  - Renamed description of `wwtapactivated` to "turn on/off DHW". Otherwise would have looked like "boiler_dhw_turn_on_off_dhw" in HA.
+  - `/api/system/info` endpoint has updated keys. Now lowercase, no underscores and not capitalized. Replace "handlers" with "handlers received", "handlers fetched" and "handlers pending".
+
+# [3.3.1] January 20 2022
+
+- lastcode broke MQTT JSON structure [#228](https://github.com/emsesp/EMS-ESP32/issues/228)
+- overlapping while reading sequence of EMS1.0 telegrams
+- redundant telegram readings (because of offset overflow)
+- added missing RC30/Moduline400 [#243](https://github.com/emsesp/EMS-ESP32/issues/243)
+- check received status before toggling fetch on empty telegram [#268][#282]
+
+# [3.3.0] November 28 2021
+
+## Added
+
+- Add system commands for syslog level and watch [#98](https://github.com/emsesp/EMS-ESP32/issues/98)
+- Added pool data to telegrams 0x494 & 0x495 [#102](https://github.com/emsesp/EMS-ESP32/issues/102)
+- Add RC300 second summermode telegram [#108](https://github.com/emsesp/EMS-ESP32/issues/108)
+- Add support for the RC25 thermostat [#106](https://github.com/emsesp/EMS-ESP32/issues/106)
+- Add new command 'entities' for a device, e.g. <http://ems-esp/api/boiler/entities> to show the shortname, description and HA Entity name (if HA enabled) [#116](https://github.com/emsesp/EMS-ESP32/issues/116)
+- Support for Junkers program and remote (fb10/fb110) temperature
+- Home Assistant `state_class` attribute for Wh, kWh, W and KW [#129](https://github.com/emsesp/EMS-ESP32/issues/129)
+- Add current room influence for RC300 [#136](https://github.com/emsesp/EMS-ESP32/issues/136)
+- Added Home Assistant device_class to sensor entities
+- Added another Buderus RC10 thermostat with Product ID 65 [#160](https://github.com/emsesp/EMS-ESP32/issues/160)
+- Added support for mDNS [#161](https://github.com/emsesp/EMS-ESP32/issues/161)
+- Added last system ESP32 reset code to log (and `system info` output)
+- Firmware Checker in WebUI [#168](https://github.com/emsesp/EMS-ESP32/issues/168)
+- Added new MQTT setting for enabling 'response' topic
+- Support for non-standard Thermostats like Tado [#174](https://github.com/emsesp/EMS-ESP32/issues/174)
+- Include MQTT connection status in 'api/system/info'
+- Include Network status in 'api/system/info' and also the MQTT topic `info` [#202](https://github.com/emsesp/EMS-ESP32/issues/202)
+- Added Ethernet PHY module as an option in the Board Profile [#210](https://github.com/emsesp/EMS-ESP32/issues/210)
+
+## Fixed
+
+- MQTT reconnecting after WiFi reconnect [#99](https://github.com/emsesp/EMS-ESP32/issues/99)
+- Manually Controlling Solar Circuit [#107](https://github.com/emsesp/EMS-ESP32/issues/107)
+- Fix thermostat commands not defaulting to the master thermostat [#110](https://github.com/emsesp/EMS-ESP32/issues/110)
+- Enlarge parse-buffer for long names like `cylinderpumpmodulation`
+- MQTT not subscribing to all device entities [#166](https://github.com/emsesp/EMS-ESP32/issues/166)
+- Help fix issues with WebUI unable to fully load UI over Ethernet [#177](https://github.com/emsesp/EMS-ESP32/issues/177)
+- Shower alert never reset after limit reached when enabled [(PR #185)]
+- Remove HA entity entries when a device value goes dormant [#196](https://github.com/emsesp/EMS-ESP32/issues/196)
+- deciphering last error code dates on 0xC2 telegram [#204](https://github.com/emsesp/EMS-ESP32/issues/204)
+
+## Changed
+
+- Syslog BOM only for utf-8 messages [#91](https://github.com/emsesp/EMS-ESP32/issues/91)
+- Check for KM200 by device-id 0x48, remove tx-delay [#90](https://github.com/emsesp/EMS-ESP32/issues/90)
+- rename `fastheatupfactor` to `fastheatup` and add percent [#122](https://github.com/emsesp/EMS-ESP32/issues/122)
+- "unit" renamed to "uom" in API call to recall a Device Value
+- initial backend React changes to replace the class components (HOCs) with React Hooks
+- Use program-names instead of numbers
+- Boiler's maintenancemessage always published in MQTT (to prevent HA missing entity)
+- Unit of Measure 'times' added to MQTT Fails, Rx fails, Rx received, Tx fails, Tx reads & Tx writes
+- Improved API. Restful HTTP API works in the same way as MQTT calls
+- Removed settings for MQTT subscribe format [#173](https://github.com/emsesp/EMS-ESP32/issues/173)
+- Improve Nefit Moduline 200 functionality [#183](https://github.com/emsesp/EMS-ESP32/issues/183)
+- `status` in the MQTT heartbeat renamed to `bus_status`
+- Layout changes in the WebUI, showing stripped table rows in Dashboard
+- Alternative font for log window [#219](https://github.com/emsesp/EMS-ESP32/issues/219)
+
+## **BREAKING CHANGES**
+
+- API: "unit" renamed to "uom" in API call to recall a Device Value
+- HA: `sensor.boiler_boiler_temperature` renamed to `sensor.actual_boiler_temperature`
+- HA: `binary_sensor.boiler_ww_disinfecting` renamed to `binary_sensor.boiler_ww_disinfection`
+- HA: # removed from counts in MQTT Fails, Rx fails, Rx received, Tx fails, Tx reads & Tx writes
+- `txread` renamed to `txreads` and `txwrite` renamed to `txwrites` in MQTT heartbeat payload
+- 'dallas sensors' in api/system/info moved to the "System" section. Renamed "uptime (seconds)" and "reset reason"
+- `status` in the MQTT heartbeat renamed to `bus_status`
+
+# [3.2.1] August 8 2021
+
+## Added
+
+- json body in API can now take device, name, cmd, hc and id
+- added example of how to use API directly to control values from Home Assistant
+- API calls are shown in debug log (For troubleshooting)
+
+## Fixed
+
+- fixed issue with Home Assistant entity naming where boiler's ww was duplicated in entity name
+- fixed issue where wwSetTemp was written too instead of wwSelTemp
+
+## Changed
+
+- fixed case on mqtt names, like 'wwtankmiddletemp'
+- renamed Product ID to 'EMS Product ID' in Home Assistant
+- removed brackets around tags, e.g. (hc1) selected room temperature" is now just "hc1 selected room temperature"
+
 # [3.2.0] August 6 2021
 
 ## Added
@@ -43,7 +413,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # [3.1.1] June 26 2021
 
-## Changed
+## Added
 
 - new command called `commands` which lists all available commands. `ems-esp/api/{device}/commands`
 - More Home Assistant icons to match the UOMs
@@ -65,7 +435,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # [3.1.0] May 4 2021
 
-## Changed
+## Added
 
 - Mock API to simulate an ESP, for testing web
 - Able to write values from the Web UI
@@ -91,51 +461,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Added
 
-- power settings, disabling BLE and turning off Wifi sleep
-- Rx and Tx counts to Heartbeat MQTT payload
-- ethernet support
-- id to info command to show only a heatingcircuit
-- add sending devices that are not listed to 0x07
-- extra MQTT boolean option for "ON" and "OFF"
-- support for chunked MQTT payloads to allow large data sets > 2kb
-- external Button support (#708) for resetting to factory defaults and other actions
-- new console set command in `system`, `set board_profile <profile>` for quickly enabling cabled ethernet connections without using the captive wifi portal
-- added in MQTT nested mode, for thermostat and mixer, like we had back in v2
-- cascade MC400 (product-id 210) (3.0.0b6), power values for heating sources (3.0.1b1)
-- values for wwMaxPower, wwFlowtempOffset
-- RC300 `thermostat temp -1` to clear temporary setpoint in auto mode
-- syslog port selectable (#744)
 - individual mqtt commands (#31)
 - board Profiles (#11)
 
 ## Fixed
 
-- telegrams matched to masterthermostat 0x18
-- multiple roomcontrollers
-- readback after write with delay (give ems-devices time to set the value)
-- thermostat ES72/RC20 device 66 to command-set RC20_2
-- MQTT payloads not adding to queue when MQTT is re-connecting (fixes #369)
-- fix for HA topics with invalid command formats (#728)
-- wrong position of values #723, #732
-- OTA Upload via Web on OSX
 - Rx and Tx quality % would sometimes show > 100
 
 ## Changed
 
-- changed how telegram parameters are rendered for mqtt, console and web (#632)
-- split `show values` in smaller packages (edited)
-- extended length of IP/hostname from 32 to 48 chars (#676)
-- check flowsensor for `tap_water_active`
-- mqtt prefixed with `Base`
-- count Dallas sensor fails
-- switch from SPIFFS to LITTLEFS
-- added ID to MQTT payloads which is the Device's product ID and used in HA to identify a unique HA device
-- increased MQTT buffer and reduced wait time between publishes
-- updated to the latest ArduinoJson library
-- some names of mqtt-tags like in v2.2.1
-- new ESP32 partition side to allow for smoother OTA and fallback
-- network Gateway IP is optional (#682)emsesp/EMS-ESP
-- moved to a new GitHub repo https://github.com/emsesp/EMS-ESP32
 - invert LED changed to Hide LED. Default is off.
 - renamed Scan Network to Scan WiFi Network
 - added version to cmd=settings
@@ -190,4 +524,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - some names of mqtt-tags like in v2.2.1
 - new ESP32 partition side to allow for smoother OTA and fallback
 - Network Gateway IP is optional (#682)emsesp/EMS-ESP
-- moved to a new GitHub repo https://github.com/emsesp/EMS-ESP32
+- moved to a new GitHub repo <https://github.com/emsesp/EMS-ESP32>

CHANGELOG_LATEST.md

@@ -1,7 +1,22 @@
 # Changelog
 
+## [3.6.1]
+
+## **IMPORTANT! BREAKING CHANGES**
+
+- `shower_data` MQTT topic shows duration is seconds (was previously a full english sentence)
+
 ## Added
 
+- show WiFi rssi in Network Status Page, show quality as color
+
 ## Fixed
 
+- Issue in espMqttClient causing a memory leak when MQTT broker is disconnected due to network unavailability [#1264](https://github.com/emsesp/EMS-ESP32/issues/1264)
+- Using MQTT enum values correctly formatted in MQTT Discovery [#1280](https://github.com/emsesp/EMS-ESP32/issues/1280)
+
 ## Changed
+
+- mqtt free mem check set to 60 kb
+- small cosmetic changes to Searching in Customization web page
+- updated to espressif32@6.4.0

CONTRIBUTING.md

@@ -1,5 +1,3 @@
-<img src="/media/EMS-ESP_logo_dark.png" alt="Logo" align="right" height="76"/>
-
 # Contributing
 
 **Any contribution helps EMS-ESP get better for the entire community!**
@@ -32,8 +30,8 @@ This document describes rules that are in effect for this repository, meant for
 6. Issues with feature requests should be discussed for viability/desirability.
 7. Feature requests or changes that are meant to address a very specific/limited use case, especially if at the expense of increased code complexity, may be denied, or may be required to be redesigned, generalized, or simplified.
 8. Feature requests that are not accompanied by a PR:
-    - could be closed immediately (denied).
+   - could be closed immediately (denied).
-    - could be closed after some predetermined period of time (left as candidate for somebody to pick up).
+   - could be closed after some predetermined period of time (left as candidate for somebody to pick up).
 9. In some cases, feedback may be requested from the issue reporter, either as additional info for clarification, additional testing, or other. If no feedback is provided, the issue may be closed by a contributor or after 40 days by the STALE bot.
 
 ## Pull requests
@@ -94,7 +92,7 @@ References:
 
 - <https://www.conventionalcommits.org/>
 
---------------------------------------
+---
 
 ## Contributor License Agreement (CLA)
 
@@ -123,7 +121,7 @@ By making a contribution to this project, I certify that:
 
 This Contributor License Agreement (CLA) was adopted on April 1st, 2019.
 
-The text of this license is available under the [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/).  It is based on the Linux [Developer Certificate Of Origin](http://elinux.org/Developer_Certificate_Of_Origin), but is modified to explicitly use the GPL-3.0 license and not mention sign-off (due to GitHub.com keeps an historial, with your user name, of PRs' commits and all editions on PR's comments).
+The text of this license is available under the [Creative Commons Attribution-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/). It is based on the Linux [Developer Certificate Of Origin](http://elinux.org/Developer_Certificate_Of_Origin), but is modified to explicitly use the GPL-3.0 license and not mention sign-off (due to GitHub.com keeps an historial, with your user name, of PRs' commits and all editions on PR's comments).
 
 **Why a CLA ?**
 
@@ -133,9 +131,9 @@ A CLA is a legal document in which you state _you are entitled to contribute the
 
 CLA is a safety because it also ensures that once you have provided a contribution, you cannot try to withdraw permission for its use at a later date. People can therefore use that software, confident that they will not be asked to stop using pieces of the code at a later date.
 
-A __license__ grants "outbound" rights to the user of project.
+A **license** grants "outbound" rights to the user of project.
 
-A __CLA__ enables a contributor to grant "inbound" rights to a project.
+A **CLA** enables a contributor to grant "inbound" rights to a project.
 
 <Other>
 <A table should be maintained for relating maintainers and components. When triaging, this is essential to figure out if someone in particular should be consulted about specific changes.>

Makefile

@@ -1,7 +1,7 @@
 #
 # GNUMakefile for EMS-ESP
-# (c) 2020 Paul Derbyshire
 #
+
 NUMJOBS=${NUMJOBS:-" -j4 "}
 MAKEFLAGS+="j "
 #----------------------------------------------------------------------
@@ -17,23 +17,32 @@ MAKEFLAGS+="j "
 #TARGET    := $(notdir $(CURDIR))
 TARGET    := emsesp
 BUILD     := build
-SOURCES   := src src/* lib_standalone lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src src/devices lib/ArduinoJson/src lib/PButton
+SOURCES   := src src/* lib_standalone lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src src/devices lib/ArduinoJson/src lib/PButton lib/semver lib/espMqttClient/src lib/espMqttClient/src/*
-INCLUDES  := src lib_standalone lib/ArduinoJson/src  lib/uuid-common/src lib/uuid-console/src lib/uuid-log/src lib/uuid-telnet/src lib/uuid-syslog/src lib/* src/devices
+INCLUDES  := src lib_standalone 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 lib/semver lib/* src/devices
-LIBRARIES := 
+LIBRARIES :=
 
 CPPCHECK = cppcheck
+# CHECKFLAGS = -q --force --std=c++17
 CHECKFLAGS = -q --force --std=c++11
 
 #----------------------------------------------------------------------
 # Languages Standard
 #----------------------------------------------------------------------
-C_STANDARD   := -std=c11
+C_STANDARD   := -std=c17
-CXX_STANDARD := -std=c++11
+# CXX_STANDARD := -std=c++17
+CXX_STANDARD := -std=gnu++11
+
+# C_STANDARD   := -std=c11
+# CXX_STANDARD := -std=c++11
 
 #----------------------------------------------------------------------
 # Defined Symbols
 #----------------------------------------------------------------------
-DEFINES += -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_DEFAULT_BOARD_PROFILE=\"LOLIN\"
+DEFINES += -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0
+DEFINES += -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST -D__linux__ -DEMC_RX_BUFFER_SIZE=1500
+DEFINES += $(ARGS)
+
+DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 
 #----------------------------------------------------------------------
 # Sources & Files
@@ -45,7 +54,7 @@ CSOURCES   := $(foreach dir,$(SOURCES),$(wildcard $(dir)/*.c))
 CXXSOURCES := $(foreach dir,$(SOURCES),$(wildcard $(dir)/*.cpp))
 
 OBJS       := $(patsubst %,$(BUILD)/%.o,$(basename $(CSOURCES)) $(basename $(CXXSOURCES)) )
-DEPS       := $(patsubst %,$(BUILD)/%.d,$(basename $(CSOURCES)) $(basename $(CXXSOURCES)) ) 
+DEPS       := $(patsubst %,$(BUILD)/%.d,$(basename $(CSOURCES)) $(basename $(CXXSOURCES)) )
 
 INCLUDE    += $(addprefix -I,$(foreach dir,$(INCLUDES), $(wildcard $(dir))))
 INCLUDE    += $(addprefix -I,$(foreach dir,$(LIBRARIES),$(wildcard $(dir)/include)))
@@ -66,15 +75,13 @@ CXX := /usr/bin/g++
 # CXXFLAGS  C++ Compiler Flags
 # LDFLAGS   Linker Flags
 #----------------------------------------------------------------------
-CPPFLAGS  += $(DEFINES) $(INCLUDE)
+CPPFLAGS  += $(DEFINES) $(DEFAULTS) $(INCLUDE)
 CPPFLAGS  += -ggdb
 CPPFLAGS  += -g3
 CPPFLAGS  += -Os
 
 CFLAGS    += $(CPPFLAGS)
-CFLAGS    += -Wall
+CFLAGS    += -Wall -Wextra -Werror -Wswitch-enum -Wno-unused-parameter -Wno-inconsistent-missing-override -Wno-missing-braces -Wno-unused-lambda-capture
-CFLAGS    += -Wno-unused -Wno-restrict
-CFLAGS    += -Wextra
 
 CXXFLAGS  += $(CFLAGS) -MMD
 
@@ -113,6 +120,9 @@ COMPILE.cpp = $(CXX) $(CXX_STANDARD) $(CXXFLAGS) $(DEPFLAGS) -c $< -o $@
 #----------------------------------------------------------------------
 # Targets
 #----------------------------------------------------------------------
+.PHONY: all
+.SILENT: $(OUTPUT)
+
 all: $(OUTPUT)
 
 $(OUTPUT): $(OBJS)
@@ -138,11 +148,12 @@ cppcheck: $(SOURCES)
 run: $(OUTPUT)
 	@$<
 
+.PHONY: clean
 clean:
-	@$(RM) -r $(BUILD) $(OUTPUT)
+	@$(RM) -rf $(BUILD) $(OUTPUT)
 
 help:
 	@echo available targets: all run clean
 	@echo $(OUTPUT)
 
--include $(DEPS)
+-include $(DEPS)

README.md

@@ -1,52 +1,61 @@
 # ![logo](media/EMS-ESP_logo_dark.png)
 
-**EMS-ESP** is an open-source firmware for the Espressif ESP8266 and ESP32 microcontroller that communicates with **EMS** (Energy Management System) based equipment from manufacturers like Bosch, Buderus, Nefit, Junkers, Worcester and Sieger.
-
-This project is the specifically for the ESP32. Compared with the previous ESP8266 (version 2) release it has the following enhancements:
-
-- Ethernet Support
-- Pre-configured circuit board layouts
-- Supports writing EMS values directly from within Web UI
-- Mock API server for faster offline development and testing
-- Improved API and MQTT commands
-- Improvements to Dallas temperature sensors
-- Embedded log tracing in the Web UI
-
 [![version](https://img.shields.io/github/release/emsesp/EMS-ESP32.svg?label=Latest%20Release)](https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md)
 [![release-date](https://img.shields.io/github/release-date/emsesp/EMS-ESP32.svg?label=Released)](https://github.com/emsesp/EMS-ESP32/commits/main)
 [![license](https://img.shields.io/github/license/emsesp/EMS-ESP32.svg)](LICENSE)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=emsesp_EMS-ESP32&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=emsesp_EMS-ESP32)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9441142f49424ef891e8f5251866ee6b)](https://www.codacy.com/gh/emsesp/EMS-ESP32/dashboard?utm_source=github.com&utm_medium=referral&utm_content=emsesp/EMS-ESP32&utm_campaign=Badge_Grade)
 [![downloads](https://img.shields.io/github/downloads/emsesp/EMS-ESP32/total.svg)](https://github.com/emsesp/EMS-ESP32/releases)
 [![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/3J3GgnzpyT)
 
-If you like **EMS-ESP**, please give it a star, or fork it and contribute!
-
 [![GitHub stars](https://img.shields.io/github/stars/emsesp/EMS-ESP32.svg?style=social&label=Star)](https://github.com/emsesp/EMS-ESP32/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/emsesp/EMS-ESP32.svg?style=social&label=Fork)](https://github.com/emsesp/EMS-ES32P/network)
 [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.com/paypalme/prderbyshire/2)
 
-Note, EMS-ESP requires a small hardware circuit that can convert the EMS bus data to be read by the microcontroller. These can be ordered at <https://bbqkees-electronics.nl> or contact the contributors that can provide the schematic and designs.
+**EMS-ESP** is an open-source firmware for the Espressif ESP32 microcontroller that communicates with **EMS** (Energy Management System) based equipment from manufacturers like Bosch, Buderus, Nefit, Junkers, Worcester and Sieger. It requires a small gateway circuit to interface with the EMS bus which can be purchased from <https://bbqkees-electronics.nl> or custom built.
 
-<img src="media/gateway-integration.jpg" width=40%>
+## **Features**
 
----
+- A multi-user, multi-language secure web interface to change settings and monitor incoming data
-
+- A console, accessible via Serial and Telnet for more advanced monitoring
-# **Features**
+- Native support for Home Assistant, Domoticz and openHAB via [MQTT Discovery](https://www.home-assistant.io/docs/mqtt/discovery/)
-
-- A multi-user secure web interface to change settings and monitor the data
-- A console, accessible via Serial and Telnet for more monitoring
-- Native support for Home Assistant via [MQTT Discovery](https://www.home-assistant.io/docs/mqtt/discovery/)
 - Can run standalone as an independent WiFi Access Point or join an existing WiFi network
 - Easy first-time configuration via a web Captive Portal
-- Support for more than [80 EMS devices](https://emsesp.github.io/docs/#/Supported-EMS-Devices) (boilers, thermostats, solar modules, mixer modules, heat pumps, gateways)
+- Support for more than [110+ EMS devices](https://emsesp.github.io/docs/All-Devices/) (boilers, thermostats, solar modules, mixer modules, heat pumps, gateways, switches, heat sources)
+
+## **Documentation**
+
+For the complete documentation on how to install, configure and get support visit the [EMS-ESP Wiki](https://emsesp.github.io/docs).
+
+## **Support**
+
+To chat with the community reach out on our [Discord Server](https://discord.gg/3J3GgnzpyT).
+
+If you like **EMS-ESP**, please give it a star, or fork it and contribute or offer a small donation!
 
 ## **Demo**
 
-See a live demo [here](https://ems-esp.derbyshire.nl) using fake data. Log in with any username/password.
+For a live demo of the Web UI click [here](https://ems-esp.derbyshire.nl) and log in with any username/password.
 
-# **Screenshots**
+## **Contributors ✨**
 
-## Web Interface
+EMS-ESP is a project owned and maintained by [proddy](https://github.com/proddy) and [MichaelDvP](https://github.com/MichaelDvP).
+
+## **Libraries used**
+
+- [esp8266-react](https://github.com/rjwats/esp8266-react) by @rjwats for the framework that provides the core of the Web UI
+- [uuid-\*](https://github.com/nomis/mcu-uuid-console) from @nomis. The console, syslog, telnet and logging are based off these open source libraries
+- [ArduinoJson](https://github.com/bblanchon/ArduinoJson) for all the JSON
+- [espMqttClient](https://github.com/bertmelis/espMqttClient) for the MQTT client, with custom modifications from @MichaelDvP and @proddy
+- ESPAsyncWebServer and AsyncTCP for the Web server and TCP backends, with custom modifications for performance
+
+## **License**
+
+This program is licensed under GPL-3.0
+
+## **Screenshots**
+
+### Web Interface
 
 |                                    |                                  |
 | ---------------------------------- | -------------------------------- |
@@ -54,75 +63,10 @@ See a live demo [here](https://ems-esp.derbyshire.nl) using fake data. Log in wi
 | <img src="media/web_devices.png">  | <img src="media/web_mqtt.png">   |
 | <img src="media/web_edit.png">     | <img src="media/web_log.png">    |
 
-## Telnet Console
+### Telnet Console
 
-<img src="media/console.png" width=80% height=80%>
+<img src="media/console0.png" width=80% height=80%>
 
-## In Home Assistant
+### In Home Assistant
 
 <img src="media/ha_lovelace.png" width=80% height=80%>
-  
-# **Installing**
-
-Refer to the [official documentation](https://emsesp.github.io/docs) to how to install the firmware and configure it. The documentation is being constantly updated as new features and settings are added.
-
-You can choose to use an pre-built firmware image or compile the code yourself:
-
-- [Uploading a pre-built firmware build](https://emsesp.github.io/docs/#/Uploading-firmware)
-- [Building the firmware from source code and flashing manually](https://emsesp.github.io/docs/#/Building-firmware)
-
-# **Support Information**
-
-If you're looking for support on **EMS-ESP** there are some options available:
-
-## Documentation
-
-- [Official EMS-ESP Documentation](https://emsesp.github.io/docs): For information on how to build and upload the firmware
-- [FAQ and Troubleshooting](https://emsesp.github.io/docs/#/Troubleshooting): For information on common problems and solutions. See also [BBQKees's wiki](https://bbqkees-electronics.nl/wiki/gateway/troubleshooting.html)
-
-## Support Community
-
-- [Discord Server](https://discord.gg/3J3GgnzpyT): For support, troubleshooting and general questions. You have better chances to get fast answers from members of the community
-- [Search in Issues](https://github.com/emsesp/EMS-ESP32/issues): You might find an answer to your question by searching current or closed issues
-
-## Developer's Community
-
-- [Bug Report](https://github.com/emsesp/EMS-ESP32/issues/new?template=bug_report.md): For reporting Bugs
-- [Feature Request](https://github.com/emsesp/EMS-ESP32/issues/new?template=feature_request.md): For requesting features/functions
-- [Troubleshooting](https://github.com/emsesp/EMS-ESP32/issues/new?template=questions---troubleshooting.md): As a last resort, you can open new _Troubleshooting & Question_ issue on GitHub if the solution could not be found using the other channels. Just remember: the more info you provide the more chances you'll have to get an accurate answer
-
-# **Contributors ✨**
-
-EMS-ESP is a project originally created and owned by [proddy](https://github.com/proddy). Key contributors are:
-
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<table>
-  <tr>
-    <td align="center">
-    <a href="https://github.com/MichaelDvP"><img src="https://avatars.githubusercontent.com/u/59284019?v=3?s=100" width="100px;" alt=""/><br /><sub><b>MichaelDvP</b></sub></a><br /></a> <a href="https://github.com/emsesp/EMS-ESP/commits?author=MichaelDvP" title="v2 Commits">v2</a>
-    <a href="https://github.com/emsesp/EMS-ESP32/commits?author=MichaelDvP" title="v3 Commits">v3</a>
-    </td>
-
-  </tr>
-</table>
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-
-You can also contribute to EMS-ESP by
-
-- providing Pull Requests (Features, Fixes, suggestions)
-- testing new released features and report issues on your EMS equipment
-- contributing to missing [Documentation](https://emsesp.github.io/docs)
-
-# **Libraries used**
-
-- [esp8266-react](https://github.com/rjwats/esp8266-react) by @rjwats for the framework that provides the core of the Web UI
-- [uuid-\*](https://github.com/nomis/mcu-uuid-console) from @nomis. The console, syslog, telnet and logging are based off these open source libraries
-- [ArduinoJson](https://github.com/bblanchon/ArduinoJson) for JSON
-- [AsyncMqttClient](https://github.com/marvinroger/async-mqtt-client) for the MQTT client, with custom modifications from @bertmelis and @proddy
-- ESPAsyncWebServer and AsyncTCP for the Web server and TCP backends, with custom modifications for performance
-
-# **License**
-
-This program is licensed under GPL-3.0

RELEASENOTES.md

@@ -1,6 +0,0 @@
-# ![logo](https://github.com/emsesp/EMS-ESP32/blob/main/media/EMS-ESP_logo_dark.png)
-
-# Firmware Installation
-
-Follow the instructions in the [documentation](https://emsesp.github.io/docs) on how to install the firmware binaries in the Assets below.
-

RELEASENOTES_DEV.md

@@ -1,8 +0,0 @@
-# ![logo](https://github.com/emsesp/EMS-ESP32/blob/main/media/EMS-ESP_logo_dark.png)
-
-This is a snapshot of the current "beta" development code and firmware binaries for the ESP32. It has all the latest features and fixes but please be aware that this is still experimental firmware used for testing and thus may contain the odd bug. Use at your own risk and remember to report an issue if you find something unusual.
-
-# Firmware Installation
-
-Follow the instructions in the [documentation](https://emsesp.github.io/docs) on how to install the firmware binaries in the Assets below.
-

esp32_asym_partition_4M.csv

@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,   Size,    Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     ,         0x2000,
+app0,     app,  ota_0,   ,         0x2A0000,
+app1,     app,  ota_1,   ,         0x140000,
+spiffs,   data, spiffs,  ,         64K,

esp32_partition_16M.csv

@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,   Size,    Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     ,         0x2000,
+app0,     app,  ota_0,   ,         0x7F0000,
+app1,     app,  ota_1,   ,         0x7F0000,
+spiffs,   data, spiffs,  ,         64K,

esp32_partition_4M.csv

@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,   Size,    Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     ,         0x2000,
+app0,     app,  ota_0,   ,         0x1F0000,
+app1,     app,  ota_1,   ,         0x1F0000,
+spiffs,   data, spiffs,  ,         64K,

esp32_partition_app1984k_spiffs64k.csv

@@ -1,6 +0,0 @@
-# Name,   Type, SubType, Offset,   Size,    Flags
-nvs,      data, nvs,     0x9000,   0x5000,
-otadata,  data, ota,     0xE000,   0x2000,
-app0,     app,  ota_0,   0x10000,  0x1F0000,
-app1,     app,  ota_1,   0x200000, 0x1F0000,
-spiffs,   data, spiffs,  0x3F0000, 0x10000,

factory_settings.ini

@@ -7,8 +7,8 @@ build_flags =
 
 	; Access point settings
     -D FACTORY_AP_PROVISION_MODE=AP_MODE_DISCONNECTED
-    -D FACTORY_AP_SSID=\"ems-esp\" ; 1-64 characters
+    -D FACTORY_AP_SSID=\"ems-esp\"
-    -D FACTORY_AP_PASSWORD=\"ems-esp-neo\" ; 8-64 characters
+    -D FACTORY_AP_PASSWORD=\"ems-esp-neo\"
     -D FACTORY_AP_LOCAL_IP=\"192.168.4.1\"
     -D FACTORY_AP_GATEWAY_IP=\"192.168.4.1\"
     -D FACTORY_AP_SUBNET_MASK=\"255.255.255.0\"
@@ -28,17 +28,17 @@ build_flags =
     ; OTA settings
     -D FACTORY_OTA_PORT=8266
     -D FACTORY_OTA_PASSWORD=\"ems-esp-neo\"
-    -D FACTORY_OTA_ENABLED=true
+    -D FACTORY_OTA_ENABLED=false
 
     ; MQTT settings
     -D FACTORY_MQTT_ENABLED=false
-    -D FACTORY_MQTT_HOST=\"test.mosquitto.org\"
+    -D FACTORY_MQTT_HOST=\"\"
     -D FACTORY_MQTT_PORT=1883
     -D FACTORY_MQTT_USERNAME=\"\"
     -D FACTORY_MQTT_PASSWORD=\"\"
     -D FACTORY_MQTT_CLIENT_ID=\"ems-esp\"
     -D FACTORY_MQTT_KEEP_ALIVE=60
-    -D FACTORY_MQTT_CLEAN_SESSION=true
+    -D FACTORY_MQTT_CLEAN_SESSION=false
     -D FACTORY_MQTT_MAX_TOPIC_LENGTH=128
 
     ; JWT Secret

interface/.env

@@ -1,5 +0,0 @@
-# This is the name of your project. It appears on the sign-in page and in the menu bar.
-REACT_APP_PROJECT_NAME=EMS-ESP
-
-# This is the url path your project will be exposed under.
-REACT_APP_PROJECT_PATH=ems-esp

interface/.env.development

@@ -1,5 +1,2 @@
-# Change the IP address to that of your ESP device to enable local development of the UI
+VITE_ALOVA_TIPS=0
-
+REACT_APP_ALOVA_TIPS=0
-# REACT_APP_HTTP_ROOT=http://localhost:3000
-# REACT_APP_WEB_SOCKET_ROOT=ws://localhost:3000
-

interface/.env.hosted

@@ -1,3 +0,0 @@
-GENERATE_SOURCEMAP=false
-
-REACT_APP_HOSTED=true

interface/.env.production

@@ -1 +0,0 @@
-GENERATE_SOURCEMAP=false

interface/.eslintignore

@@ -1,2 +1,12 @@
-# don't ever lint node_modules
+node_modules/
-node_modules
+build/
+dist/
+.yarn/
+
+.prettierrc
+.eslintrc*
+env.d.ts
+progmem-generator.js
+unpack.ts
+vite.config.ts
+package.json

interface/.eslintrc

@@ -1,27 +0,0 @@
-{
-    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "plugins": [
-      "@typescript-eslint",
-      "prettier"
-    ],
-    "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/eslint-recommended",
-      "plugin:@typescript-eslint/recommended",
-      "prettier"
-    ],
-    "rules": {
-      // 0 = ignore, 1 = warning, 2 = error
-      "no-console": 0,       
-      "prettier/prettier": ["error", { endOfLine: "auto" }],
-      "explicit-function-return-type": 0,
-      "@typescript-eslint/explicit-module-boundary-types": 0,
-      "@typescript-eslint/no-var-requires": 0,
-      "@typescript-eslint/ban-types": 0,
-      "@typescript-eslint/no-non-null-asserted-optional-chain": 0,
-      "@typescript-eslint/no-non-null-assertion": 0,
-      "@typescript-eslint/no-explicit-any": 0
-    }
-  }
-  

interface/.eslintrc.json

@@ -0,0 +1,108 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "airbnb/hooks",
+    "airbnb-typescript",
+    "plugin:react/recommended",
+    "plugin:react/jsx-runtime",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/recommended-requiring-type-checking",
+    "plugin:prettier/recommended",
+    "plugin:import/recommended"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": "latest",
+    "sourceType": "module",
+    "tsconfigRootDir": ".",
+    "project": ["tsconfig.json"]
+  },
+  "plugins": ["react", "@typescript-eslint", "autofix", "react-hooks"],
+  "settings": {
+    "import/resolver": {
+      "typescript": {
+        "project": "./tsconfig.json"
+      }
+    },
+    "react": {
+      "version": "18.x"
+    }
+  },
+  "rules": {
+    "object-shorthand": "error",
+    "no-console": "warn",
+    "@typescript-eslint/consistent-type-definitions": ["off", "type"],
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/no-unsafe-call": "off",
+    "@typescript-eslint/no-unsafe-enum-comparison": "off",
+    "@typescript-eslint/no-unsafe-assignment": "off",
+    "@typescript-eslint/no-unsafe-return": "off",
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/naming-convention": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-unsafe-argument": "off",
+    "@typescript-eslint/restrict-plus-operands": "off",
+    "@typescript-eslint/no-unused-expressions": "off",
+    "@typescript-eslint/no-implied-eval": "off",
+    "@typescript-eslint/no-misused-promises": "off",
+    "arrow-body-style": ["error", "as-needed"],
+    "react-hooks/exhaustive-deps": "warn",
+    "@typescript-eslint/consistent-type-imports": [
+      "error",
+      {
+        "prefer": "type-imports"
+      }
+    ],
+    "import/order": [
+      "warn",
+      {
+        "groups": ["builtin", "external", "parent", "sibling", "index", "object", "type"],
+        "pathGroups": [
+          {
+            "pattern": "@/**/**",
+            "group": "parent",
+            "position": "before"
+          }
+        ],
+        "alphabetize": { "order": "asc" }
+      }
+    ],
+    // "autofix/no-unused-vars": [
+    //   "error",
+    //   {
+    //     "argsIgnorePattern": "^_",
+    //     "ignoreRestSiblings": true,
+    //     "destructuredArrayIgnorePattern": "^_"
+    //   }
+    // ],
+    "react/self-closing-comp": [
+      "error",
+      {
+        "component": true,
+        "html": true
+      }
+    ],
+    "@typescript-eslint/ban-types": [
+      "error",
+      {
+        "extendDefaults": true,
+        "types": {
+          "{}": false
+        }
+      }
+    ],
+    "prettier/prettier": [
+      "error",
+      {
+        "endOfLine": "auto"
+      }
+    ]
+  }
+}

interface/.gitignore

@@ -0,0 +1,7 @@
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

interface/.prettierignore

@@ -0,0 +1,6 @@
+node_modules/
+build/
+dist/
+.prettierrc
+.yarn/
+.typesafe-i18n.json

interface/.typesafe-i18n.json

@@ -0,0 +1,5 @@
+{
+   "adapter": "react",
+   "baseLocale": "pl",
+   "$schema": "https://unpkg.com/typesafe-i18n@5.26.2/schema/typesafe-i18n.json"
+}

interface/.yarn/sdks/eslint/bin/eslint.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require eslint/bin/eslint.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real eslint/bin/eslint.js your application uses
+module.exports = absRequire(`eslint/bin/eslint.js`);

interface/.yarn/sdks/eslint/lib/api.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require eslint
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real eslint your application uses
+module.exports = absRequire(`eslint`);

interface/.yarn/sdks/eslint/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "eslint",
+  "version": "8.36.0-sdk",
+  "main": "./lib/api.js",
+  "type": "commonjs"
+}

interface/.yarn/sdks/integrations.yml

@@ -0,0 +1,5 @@
+# This file is automatically generated by @yarnpkg/sdks.
+# Manual changes might be lost!
+
+integrations:
+  - vscode

interface/.yarn/sdks/prettier/index.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require prettier/index.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real prettier/index.js your application uses
+module.exports = absRequire(`prettier/index.js`);

interface/.yarn/sdks/prettier/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "prettier",
+  "version": "2.8.7-sdk",
+  "main": "./index.js",
+  "type": "commonjs"
+}

interface/.yarn/sdks/typescript/bin/tsc

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/bin/tsc
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/bin/tsc your application uses
+module.exports = absRequire(`typescript/bin/tsc`);

interface/.yarn/sdks/typescript/bin/tsserver

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/bin/tsserver
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/bin/tsserver your application uses
+module.exports = absRequire(`typescript/bin/tsserver`);

interface/.yarn/sdks/typescript/lib/tsc.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsc.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/tsc.js your application uses
+module.exports = absRequire(`typescript/lib/tsc.js`);

interface/.yarn/sdks/typescript/lib/tsserver.js

@@ -0,0 +1,223 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+const moduleWrapper = tsserver => {
+  if (!process.versions.pnp) {
+    return tsserver;
+  }
+
+  const {isAbsolute} = require(`path`);
+  const pnpApi = require(`pnpapi`);
+
+  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+  const isPortal = str => str.startsWith("portal:/");
+  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
+
+  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
+    return `${locator.name}@${locator.reference}`;
+  }));
+
+  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
+  // doesn't understand. This layer makes sure to remove the protocol
+  // before forwarding it to TS, and to add it back on all returned paths.
+
+  function toEditorPath(str) {
+    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
+    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
+      // We also take the opportunity to turn virtual paths into physical ones;
+      // this makes it much easier to work with workspaces that list peer
+      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
+      // file instances instead of the real ones.
+      //
+      // We only do this to modules owned by the the dependency tree roots.
+      // This avoids breaking the resolution when jumping inside a vendor
+      // with peer dep (otherwise jumping into react-dom would show resolution
+      // errors on react).
+      //
+      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
+      if (resolved) {
+        const locator = pnpApi.findPackageLocator(resolved);
+        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
+          str = resolved;
+        }
+      }
+
+      str = normalize(str);
+
+      if (str.match(/\.zip\//)) {
+        switch (hostInfo) {
+          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
+          // VSCode only adds it automatically for supported schemes,
+          // so we have to do it manually for the `zip` scheme.
+          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
+          //
+          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+          //
+          // 2021-10-08: VSCode changed the format in 1.61.
+          // Before | ^zip:/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          // 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
+          // 2022-05-06: VSCode changed the format in 1.68
+          // Before | ^/zip/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          case `vscode <1.61`: {
+            str = `^zip:${str}`;
+          } break;
+
+          case `vscode <1.66`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          case `vscode <1.68`: {
+            str = `^/zip${str}`;
+          } break;
+
+          case `vscode`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          // To make "go to definition" work,
+          // We have to resolve the actual file system path from virtual path
+          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
+          case `coc-nvim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = resolve(`zipfile:${str}`);
+          } break;
+
+          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
+          // We have to resolve the actual file system path from virtual path,
+          // everything else is up to neovim
+          case `neovim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = `zipfile://${str}`;
+          } break;
+
+          default: {
+            str = `zip:${str}`;
+          } break;
+        }
+      }
+    }
+
+    return str;
+  }
+
+  function fromEditorPath(str) {
+    switch (hostInfo) {
+      case `coc-nvim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
+        // So in order to convert it back, we use .* to match all the thing
+        // before `zipfile:`
+        return process.platform === `win32`
+          ? str.replace(/^.*zipfile:\//, ``)
+          : str.replace(/^.*zipfile:/, ``);
+      } break;
+
+      case `neovim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
+        return str.replace(/^zipfile:\/\//, ``);
+      } break;
+
+      case `vscode`:
+      default: {
+        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
+      } break;
+    }
+  }
+
+  // Force enable 'allowLocalPluginLoads'
+  // TypeScript tries to resolve plugins using a path relative to itself
+  // which doesn't work when using the global cache
+  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
+  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
+  // TypeScript already does local loads and if this code is running the user trusts the workspace
+  // https://github.com/microsoft/vscode/issues/45856
+  const ConfiguredProject = tsserver.server.ConfiguredProject;
+  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
+  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
+    this.projectService.allowLocalPluginLoads = true;
+    return originalEnablePluginsWithOptions.apply(this, arguments);
+  };
+
+  // And here is the point where we hijack the VSCode <-> TS communications
+  // by adding ourselves in the middle. We locate everything that looks
+  // like an absolute path of ours and normalize it.
+
+  const Session = tsserver.server.Session;
+  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
+  let hostInfo = `unknown`;
+
+  Object.assign(Session.prototype, {
+    onMessage(/** @type {string | object} */ message) {
+      const isStringMessage = typeof message === 'string';
+      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
+
+      if (
+        parsedMessage != null &&
+        typeof parsedMessage === `object` &&
+        parsedMessage.arguments &&
+        typeof parsedMessage.arguments.hostInfo === `string`
+      ) {
+        hostInfo = parsedMessage.arguments.hostInfo;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
+            // The RegExp from https://semver.org/ but without the caret at the start
+            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+          ) ?? []).map(Number)
+
+          if (major === 1) {
+            if (minor < 61) {
+              hostInfo += ` <1.61`;
+            } else if (minor < 66) {
+              hostInfo += ` <1.66`;
+            } else if (minor < 68) {
+              hostInfo += ` <1.68`;
+            }
+          }
+        }
+      }
+
+      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
+        return typeof value === 'string' ? fromEditorPath(value) : value;
+      });
+
+      return originalOnMessage.call(
+        this,
+        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
+      );
+    },
+
+    send(/** @type {any} */ msg) {
+      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
+        return typeof value === `string` ? toEditorPath(value) : value;
+      })));
+    }
+  });
+
+  return tsserver;
+};
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsserver.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/tsserver.js your application uses
+module.exports = moduleWrapper(absRequire(`typescript/lib/tsserver.js`));

interface/.yarn/sdks/typescript/lib/tsserverlibrary.js

@@ -0,0 +1,223 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+const moduleWrapper = tsserver => {
+  if (!process.versions.pnp) {
+    return tsserver;
+  }
+
+  const {isAbsolute} = require(`path`);
+  const pnpApi = require(`pnpapi`);
+
+  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+  const isPortal = str => str.startsWith("portal:/");
+  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
+
+  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
+    return `${locator.name}@${locator.reference}`;
+  }));
+
+  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
+  // doesn't understand. This layer makes sure to remove the protocol
+  // before forwarding it to TS, and to add it back on all returned paths.
+
+  function toEditorPath(str) {
+    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
+    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
+      // We also take the opportunity to turn virtual paths into physical ones;
+      // this makes it much easier to work with workspaces that list peer
+      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
+      // file instances instead of the real ones.
+      //
+      // We only do this to modules owned by the the dependency tree roots.
+      // This avoids breaking the resolution when jumping inside a vendor
+      // with peer dep (otherwise jumping into react-dom would show resolution
+      // errors on react).
+      //
+      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
+      if (resolved) {
+        const locator = pnpApi.findPackageLocator(resolved);
+        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
+          str = resolved;
+        }
+      }
+
+      str = normalize(str);
+
+      if (str.match(/\.zip\//)) {
+        switch (hostInfo) {
+          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
+          // VSCode only adds it automatically for supported schemes,
+          // so we have to do it manually for the `zip` scheme.
+          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
+          //
+          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+          //
+          // 2021-10-08: VSCode changed the format in 1.61.
+          // Before | ^zip:/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          // 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
+          // 2022-05-06: VSCode changed the format in 1.68
+          // Before | ^/zip/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          case `vscode <1.61`: {
+            str = `^zip:${str}`;
+          } break;
+
+          case `vscode <1.66`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          case `vscode <1.68`: {
+            str = `^/zip${str}`;
+          } break;
+
+          case `vscode`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          // To make "go to definition" work,
+          // We have to resolve the actual file system path from virtual path
+          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
+          case `coc-nvim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = resolve(`zipfile:${str}`);
+          } break;
+
+          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
+          // We have to resolve the actual file system path from virtual path,
+          // everything else is up to neovim
+          case `neovim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = `zipfile://${str}`;
+          } break;
+
+          default: {
+            str = `zip:${str}`;
+          } break;
+        }
+      }
+    }
+
+    return str;
+  }
+
+  function fromEditorPath(str) {
+    switch (hostInfo) {
+      case `coc-nvim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
+        // So in order to convert it back, we use .* to match all the thing
+        // before `zipfile:`
+        return process.platform === `win32`
+          ? str.replace(/^.*zipfile:\//, ``)
+          : str.replace(/^.*zipfile:/, ``);
+      } break;
+
+      case `neovim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
+        return str.replace(/^zipfile:\/\//, ``);
+      } break;
+
+      case `vscode`:
+      default: {
+        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
+      } break;
+    }
+  }
+
+  // Force enable 'allowLocalPluginLoads'
+  // TypeScript tries to resolve plugins using a path relative to itself
+  // which doesn't work when using the global cache
+  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
+  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
+  // TypeScript already does local loads and if this code is running the user trusts the workspace
+  // https://github.com/microsoft/vscode/issues/45856
+  const ConfiguredProject = tsserver.server.ConfiguredProject;
+  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
+  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
+    this.projectService.allowLocalPluginLoads = true;
+    return originalEnablePluginsWithOptions.apply(this, arguments);
+  };
+
+  // And here is the point where we hijack the VSCode <-> TS communications
+  // by adding ourselves in the middle. We locate everything that looks
+  // like an absolute path of ours and normalize it.
+
+  const Session = tsserver.server.Session;
+  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
+  let hostInfo = `unknown`;
+
+  Object.assign(Session.prototype, {
+    onMessage(/** @type {string | object} */ message) {
+      const isStringMessage = typeof message === 'string';
+      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
+
+      if (
+        parsedMessage != null &&
+        typeof parsedMessage === `object` &&
+        parsedMessage.arguments &&
+        typeof parsedMessage.arguments.hostInfo === `string`
+      ) {
+        hostInfo = parsedMessage.arguments.hostInfo;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
+            // The RegExp from https://semver.org/ but without the caret at the start
+            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+          ) ?? []).map(Number)
+
+          if (major === 1) {
+            if (minor < 61) {
+              hostInfo += ` <1.61`;
+            } else if (minor < 66) {
+              hostInfo += ` <1.66`;
+            } else if (minor < 68) {
+              hostInfo += ` <1.68`;
+            }
+          }
+        }
+      }
+
+      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
+        return typeof value === 'string' ? fromEditorPath(value) : value;
+      });
+
+      return originalOnMessage.call(
+        this,
+        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
+      );
+    },
+
+    send(/** @type {any} */ msg) {
+      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
+        return typeof value === `string` ? toEditorPath(value) : value;
+      })));
+    }
+  });
+
+  return tsserver;
+};
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsserverlibrary.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/tsserverlibrary.js your application uses
+module.exports = moduleWrapper(absRequire(`typescript/lib/tsserverlibrary.js`));

interface/.yarn/sdks/typescript/lib/typescript.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = createRequire(absPnpApiPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/typescript.js
+    require(absPnpApiPath).setup();
+  }
+}
+
+// Defer to the real typescript/lib/typescript.js your application uses
+module.exports = absRequire(`typescript/lib/typescript.js`);

interface/.yarn/sdks/typescript/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "typescript",
+  "version": "5.0.2-sdk",
+  "main": "./lib/typescript.js",
+  "type": "commonjs"
+}

interface/.yarnrc.yml

@@ -0,0 +1,14 @@
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
+    spec: '@yarnpkg/plugin-typescript'
+
+yarnPath: .yarn/releases/yarn-3.4.1.cjs
+
+# uing pnp
+# nodeLinker: pnp
+
+# use these if not using PnP and have node_modules
+nodeLinker: node-modules
+compressionLevel: 0
+nmMode: hardlinks-local
+enableGlobalCache: true

interface/config-overrides.js

@@ -1,52 +0,0 @@
-const ManifestPlugin = require('webpack-manifest-plugin');
-const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CompressionPlugin = require('compression-webpack-plugin');
-const ProgmemGenerator = require('./progmem-generator.js');
-
-module.exports = function override(config, env) {
-  const hosted = process.env.REACT_APP_HOSTED;
-
-  if (env === 'production' && !hosted) {
-    console.log('Custom webpack...');
-
-    // rename the output file, we need it's path to be short for LittleFS
-    config.output.filename = 'js/[id].[chunkhash:4].js';
-    config.output.chunkFilename = 'js/[id].[chunkhash:4].js';
-
-    // take out the manifest and service worker plugins
-    config.plugins = config.plugins.filter(
-      (plugin) => !(plugin instanceof ManifestPlugin)
-    );
-    config.plugins = config.plugins.filter(
-      (plugin) => !(plugin instanceof WorkboxWebpackPlugin.GenerateSW)
-    );
-
-    // shorten css filenames
-    const miniCssExtractPlugin = config.plugins.find(
-      (plugin) => plugin instanceof MiniCssExtractPlugin
-    );
-    miniCssExtractPlugin.options.filename = 'css/[id].[contenthash:4].css';
-    miniCssExtractPlugin.options.chunkFilename =
-      'css/[id].[contenthash:4].c.css';
-
-    // build progmem data files
-    config.plugins.push(
-      new ProgmemGenerator({
-        outputPath: '../lib/framework/WWWData.h',
-        bytesPerLine: 20
-      })
-    );
-
-    // add compression plugin, compress javascript
-    config.plugins.push(
-      new CompressionPlugin({
-        filename: '[path].gz[query]',
-        algorithm: 'gzip',
-        test: /\.(js)$/,
-        deleteOriginalAssets: true
-      })
-    );
-  }
-  return config;
-};

interface/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width" />
+    <link rel="stylesheet" href="/css/roboto.css" />
+    <link rel="manifest" href="/app/manifest.json" />
+    <title>EMS-ESP</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/index.tsx"></script>
+  </body>
+</html>

interface/package.json

@@ -1,71 +1,78 @@
 {
-  "name": "emsesp-react",
+  "name": "EMS-ESP",
-  "version": "0.1.0",
+  "version": "3.6.0",
+  "description": "build EMS-ESP WebUI",
+  "homepage": "https://emsesp.github.io/docs",
+  "author": "proddy",
+  "license": "MIT",
   "private": true,
-  "dependencies": {
-    "@material-ui/core": "^4.11.4",
-    "@material-ui/icons": "^4.11.2",
-    "@msgpack/msgpack": "^2.7.0",
-    "@types/lodash": "^4.14.168",
-    "@types/node": "^15.0.1",
-    "@types/react": "^17.0.4",
-    "@types/react-dom": "^17.0.3",
-    "@types/react-material-ui-form-validator": "^2.1.0",
-    "@types/react-router": "^5.1.13",
-    "@types/react-router-dom": "^5.1.7",
-    "compression-webpack-plugin": "^5.0.2",
-    "env-cmd": "^10.1.0",
-    "express": "^4.17.1",
-    "jwt-decode": "^3.1.2",
-    "lodash": "^4.17.21",
-    "mime-types": "^2.1.30",
-    "notistack": "^1.0.6",
-    "parse-ms": "^3.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-dropzone": "^11.3.2",
-    "react-form-validator-core": "^1.1.1",
-    "react-material-ui-form-validator": "^2.1.4",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
-    "react-scripts": "4.0.3",
-    "sockette": "^2.0.6",
-    "typescript": "4.2.4",
-    "zlib": "^1.0.5"
-  },
   "scripts": {
-    "start": "react-app-rewired start",
+    "dev": "vite",
-    "build": "react-app-rewired build",
+    "build": "vite build",
+    "build-hosted": "vite build --mode hosted",
+    "preview": "vite preview",
+    "preview-standalone": "npm-run-all -p preview typesafe-i18n mock-api",
+    "mock-api": "node --watch ../mock-api ../mock-api/server.js",
+    "standalone": "npm-run-all -p dev typesafe-i18n mock-api",
+    "typesafe-i18n": "typesafe-i18n",
     "format": "prettier --write '**/*.{ts,tsx,js,css,json,md}'",
-    "build-hosted": "env-cmd -f .env.hosted npm run build",
+    "lint": "eslint . --cache --fix"
-    "build-localhost": "PUBLIC_URL=/ react-app-rewired build",
-    "mock-api": "nodemon --watch ../mock-api ../mock-api/server.js",
-    "standalone": "npm-run-all -p start mock-api",
-    "lint": "eslint . --ext .ts,.tsx"
   },
-  "eslintConfig": {
+  "dependencies": {
-    "extends": "react-app"
+    "@alova/adapter-xhr": "^1.0.1",
-  },
+    "@emotion/react": "^11.11.1",
-  "browserslist": {
+    "@emotion/styled": "^11.11.0",
-    "production": [
+    "@mui/icons-material": "^5.14.8",
-      ">0.2%",
+    "@mui/material": "^5.14.8",
-      "not dead",
+    "@preact/compat": "^17.1.2",
-      "not op_mini all"
+    "@prefresh/vite": "^2.4.1",
-    ],
+    "@table-library/react-table-library": "4.1.7",
-    "development": [
+    "@types/lodash-es": "^4.17.9",
-      "last 1 chrome version",
+    "@types/node": "^20.6.0",
-      "last 1 firefox version",
+    "@types/react": "^18.2.21",
-      "last 1 safari version"
+    "@types/react-dom": "^18.2.7",
-    ]
+    "@types/react-router-dom": "^5.3.3",
+    "alova": "^2.11.1",
+    "async-validator": "^4.2.5",
+    "history": "^5.3.0",
+    "jwt-decode": "^3.1.2",
+    "lodash-es": "^4.17.21",
+    "mime-types": "^2.1.35",
+    "preact": "^10.17.1",
+    "react": "latest",
+    "react-dom": "latest",
+    "react-dropzone": "^14.2.3",
+    "react-icons": "^4.11.0",
+    "react-router-dom": "^6.15.0",
+    "react-toastify": "^9.1.3",
+    "sockette": "^2.0.6",
+    "typesafe-i18n": "^5.26.2",
+    "typescript": "^5.2.2"
   },
   "devDependencies": {
-    "concurrently": "^6.0.1",
+    "@babel/core": "^7.22.17",
-    "eslint-config-prettier": "^8.3.0",
+    "@preact/preset-vite": "^2.5.0",
-    "eslint-plugin-prettier": "^3.4.0",
+    "@types/babel__core": "^7",
-    "http-proxy-middleware": "^1.1.1",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "nodemon": "^2.0.7",
+    "@typescript-eslint/parser": "^6.6.0",
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-typescript": "^3.6.0",
+    "eslint-plugin-autofix": "^1.1.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-prettier": "alpha",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.0.5",
+    "prettier": "^3.0.3",
-    "react-app-rewired": "^2.1.8"
+    "rollup-plugin-visualizer": "^5.9.2",
-  }
+    "terser": "^5.19.4",
+    "vite": "^4.4.9",
+    "vite-plugin-svgr": "^3.2.0",
+    "vite-tsconfig-paths": "^4.2.0"
+  },
+  "packageManager": "yarn@3.4.1"
 }

interface/progmem-generator.js

@@ -1,15 +1,10 @@
+const { readdirSync, existsSync, unlinkSync, readFileSync, createWriteStream } = require('fs');
 const { resolve, relative, sep } = require('path');
-const {
-  readdirSync,
-  existsSync,
-  unlinkSync,
-  readFileSync,
-  createWriteStream
-} = require('fs');
 var zlib = require('zlib');
 var mime = require('mime-types');
 
 const ARDUINO_INCLUDES = '#include <Arduino.h>\n\n';
+const INDENT = '  ';
 
 function getFilesSync(dir, files = []) {
   readdirSync(dir, { withFileTypes: true }).forEach((entry) => {
@@ -23,9 +18,9 @@ function getFilesSync(dir, files = []) {
   return files;
 }
 
-function coherseToBuffer(input) {
+// function coherseToBuffer(input) {
-  return Buffer.isBuffer(input) ? input : Buffer.from(input);
+//   return Buffer.isBuffer(input) ? input : Buffer.from(input);
-}
+// }
 
 function cleanAndOpen(path) {
   if (existsSync(path)) {
@@ -34,115 +29,90 @@ function cleanAndOpen(path) {
   return createWriteStream(path, { flags: 'w+' });
 }
 
-class ProgmemGenerator {
+export default function ProgmemGenerator({ outputPath = './WWWData.h', bytesPerLine = 20 }) {
-  constructor(options = {}) {
+  return {
-    const {
+    name: 'ProgmemGenerator',
-      outputPath,
+    writeBundle: () => {
-      bytesPerLine = 20,
+      console.log('Generating ' + outputPath);
-      indent = '  ',
+      const includes = ARDUINO_INCLUDES;
-      includes = ARDUINO_INCLUDES
+      const indent = INDENT;
-    } = options;
+      const fileInfo = [];
-    this.options = { outputPath, bytesPerLine, indent, includes };
+      const writeStream = cleanAndOpen(resolve(outputPath));
-  }
 
-  apply(compiler) {
+      try {
-    compiler.hooks.emit.tapAsync(
+        const writeIncludes = () => {
-      { name: 'ProgmemGenerator' },
+          writeStream.write(includes);
-      (compilation, callback) => {
+        };
-        const { outputPath, bytesPerLine, indent, includes } = this.options;
-        const fileInfo = [];
-        const writeStream = cleanAndOpen(
-          resolve(compilation.options.context, outputPath)
-        );
-        try {
-          const writeIncludes = () => {
-            writeStream.write(includes);
-          };
 
-          const writeFile = (relativeFilePath, buffer) => {
+        const writeFile = (relativeFilePath, buffer) => {
-            const variable = 'ESP_REACT_DATA_' + fileInfo.length;
+          const variable = 'ESP_REACT_DATA_' + fileInfo.length;
-            const mimeType = mime.lookup(relativeFilePath);
+          const mimeType = mime.lookup(relativeFilePath);
-            var size = 0;
+          var size = 0;
-            writeStream.write('const uint8_t ' + variable + '[] PROGMEM = {');
+          writeStream.write('const uint8_t ' + variable + '[] = {');
-            const zipBuffer = zlib.gzipSync(buffer);
+          // const zipBuffer = zlib.brotliCompressSync(buffer, { quality: 1 });
-            zipBuffer.forEach((b) => {
+          const zipBuffer = zlib.gzipSync(buffer);
-              if (!(size % bytesPerLine)) {
+          zipBuffer.forEach((b) => {
-                writeStream.write('\n');
+            if (!(size % bytesPerLine)) {
-                writeStream.write(indent);
-              }
-              writeStream.write(
-                '0x' + ('00' + b.toString(16).toUpperCase()).substr(-2) + ','
-              );
-              size++;
-            });
-            if (size % bytesPerLine) {
               writeStream.write('\n');
+              writeStream.write(indent);
             }
-            writeStream.write('};\n\n');
+            writeStream.write('0x' + ('00' + b.toString(16).toUpperCase()).substr(-2) + ',');
-            fileInfo.push({
+            size++;
-              uri: '/' + relativeFilePath.replace(sep, '/'),
+          });
-              mimeType,
+          if (size % bytesPerLine) {
-              variable,
+            writeStream.write('\n');
-              size
+          }
-            });
+          writeStream.write('};\n\n');
-          };
+          fileInfo.push({
+            uri: '/' + relativeFilePath.replace(sep, '/'),
+            mimeType,
+            variable,
+            size
+          });
+        };
 
-          const writeFiles = () => {
+        const writeFiles = () => {
-            // process static files
+          // process static files
-            const buildPath = compilation.options.output.path;
+          const buildPath = resolve('build');
-            for (const filePath of getFilesSync(buildPath)) {
+          for (const filePath of getFilesSync(buildPath)) {
-              const readStream = readFileSync(filePath);
+            const readStream = readFileSync(filePath);
-              const relativeFilePath = relative(buildPath, filePath);
+            const relativeFilePath = relative(buildPath, filePath);
-              writeFile(relativeFilePath, readStream);
+            writeFile(relativeFilePath, readStream);
-            }
+          }
-            // process assets
-            const { assets } = compilation;
-            Object.keys(assets).forEach((relativeFilePath) => {
-              writeFile(
-                relativeFilePath,
-                coherseToBuffer(assets[relativeFilePath].source())
-              );
-            });
-          };
 
-          const generateWWWClass = () => {
+          // process assets
-            return `typedef std::function<void(const String& uri, const String& contentType, const uint8_t * content, size_t len)> RouteRegistrationHandler;          
+          // const { assets } = compilation;
+          // Object.keys(assets).forEach((relativeFilePath) => {
+          //   writeFile(relativeFilePath, coherseToBuffer(assets[relativeFilePath].source()));
+          // });
+        };
+
+        const generateWWWClass = () =>
+          `typedef std::function<void(const String& uri, const String& contentType, const uint8_t * content, size_t len)> RouteRegistrationHandler;
 
 class WWWData {
 ${indent}public:
-${indent.repeat(
+${indent.repeat(2)}static void registerRoutes(RouteRegistrationHandler handler) {
-  2
-)}static void registerRoutes(RouteRegistrationHandler handler) {
 ${fileInfo
-  .map(
+  .map((file) => `${indent.repeat(3)}handler("${file.uri}", "${file.mimeType}", ${file.variable}, ${file.size});`)
-    (file) =>
-      `${indent.repeat(3)}handler("${file.uri}", "${file.mimeType}", ${
-        file.variable
-      }, ${file.size});`
-  )
   .join('\n')}
 ${indent.repeat(2)}}
 };
 `;
-          };
+        const writeWWWClass = () => {
+          writeStream.write(generateWWWClass());
+        };
 
-          const writeWWWClass = () => {
+        writeIncludes();
-            writeStream.write(generateWWWClass());
+        writeFiles();
-          };
+        writeWWWClass();
 
-          writeIncludes();
+        writeStream.on('finish', () => {
-          writeFiles();
+          // callback();
-          writeWWWClass();
+        });
-
+      } finally {
-          writeStream.on('finish', () => {
+        writeStream.end();
-            callback();
-          });
-        } finally {
-          writeStream.end();
-        }
       }
-    );
+    }
-  }
+  };
 }
-
-module.exports = ProgmemGenerator;

interface/public/css/roboto.css

@@ -1,28 +1,18 @@
-/* Just supporting latin due to size constrains on the esp chip */
+/*
-@font-face {
+* Uses font-size 400 (normal) only and Latin (plus extra unicode chars) to keep flash memory to a minimum
-  font-family: 'Roboto';
+* View fonts on https://fonts.google.com/
-  font-style: normal;
+* Download woff2 using e.g. https://fonts.googleapis.com/css2?family=Lato or https://fonts.googleapis.com/css2?family=Roboto
-  font-weight: 300;
+*/
-  src: local('Roboto Light'), local('Roboto-Light'),
-    url(../fonts/li.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215;
-}
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 400;
-  src: local('Roboto'), local('Roboto-Regular'),
+  /* src: url(https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2'); */
+  src:
+    local('Roboto'),
+    local('Roboto-Regular'),
     url(../fonts/re.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+  unicode-range: U+0000-00FF, U+0104-0107, U+0118-0119, U+011E-011F, U+0130-0131, U+0141-0144, U+0152-0153, U+015A-015B,
-    U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215;
+    U+015E-015F, U+0179-017C, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193,
-}
+    U+2212, U+2215, U+FEFF, U+FFFD;
-@font-face {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: 500;
-  src: local('Roboto Medium'), local('Roboto-Medium'),
-    url(../fonts/me.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
-    U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215;
 }

interface/public/index.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="stylesheet" href="%PUBLIC_URL%/css/roboto.css">
-    <link rel="manifest" href="%PUBLIC_URL%/app/manifest.json">
-    <title>EMS-ESP</title>
-  </head>
-  <body>
-    <noscript>
-      You need to enable JavaScript to run this app.
-    </noscript>
-    <div id="root"></div>
-  </body>
-</html>

interface/src/App.tsx

@@ -1,57 +1,52 @@
-import React, { Component, RefObject } from 'react';
+import { useEffect, useState } from 'react';
-import { Redirect, Route, Switch } from 'react-router';
+import { ToastContainer, Slide } from 'react-toastify';
-import { SnackbarProvider } from 'notistack';
 
-import { IconButton } from '@material-ui/core';
+import 'react-toastify/dist/ReactToastify.min.css';
-import CloseIcon from '@material-ui/icons/Close';
 
-import AppRouting from './AppRouting';
+import { localStorageDetector } from 'typesafe-i18n/detectors';
-import CustomMuiTheme from './CustomMuiTheme';
+import { FeaturesLoader } from './contexts/features';
-import { PROJECT_NAME } from './api';
+import type { FC } from 'react';
-import FeaturesWrapper from './features/FeaturesWrapper';
+import AppRouting from 'AppRouting';
+import CustomTheme from 'CustomTheme';
 
-// this redirect forces a call to authenticationContext.refresh() which invalidates the JWT if it is invalid.
+import TypesafeI18n from 'i18n/i18n-react';
-const unauthorizedRedirect = () => <Redirect to="/" />;
+import { detectLocale } from 'i18n/i18n-util';
+import { loadLocaleAsync } from 'i18n/i18n-util.async';
 
-class App extends Component {
+const detectedLocale = detectLocale(localStorageDetector);
-  notistackRef: RefObject<any> = React.createRef();
 
-  componentDidMount() {
+const App: FC = () => {
-    document.title = PROJECT_NAME;
+  const [wasLoaded, setWasLoaded] = useState(false);
-  }
 
-  onClickDismiss = (key: string | number | undefined) => () => {
+  useEffect(() => {
-    this.notistackRef.current.closeSnackbar(key);
+    void loadLocaleAsync(detectedLocale).then(() => setWasLoaded(true));
-  };
+  }, []);
 
-  render() {
+  if (!wasLoaded) return null;
-    return (
+
-      <CustomMuiTheme>
+  return (
-        <SnackbarProvider
+    <TypesafeI18n locale={detectedLocale}>
-          autoHideDuration={3000}
+      <CustomTheme>
-          maxSnack={3}
+        <FeaturesLoader>
-          anchorOrigin={{ vertical: 'bottom', horizontal: 'left' }}
+          <AppRouting />
-          ref={this.notistackRef}
+        </FeaturesLoader>
-          action={(key) => (
+        <ToastContainer
-            <IconButton onClick={this.onClickDismiss(key)} size="small">
+          position="bottom-left"
-              <CloseIcon />
+          autoClose={3000}
-            </IconButton>
+          hideProgressBar={false}
-          )}
+          newestOnTop={false}
-        >
+          closeOnClick={true}
-          <FeaturesWrapper>
+          rtl={false}
-            <Switch>
+          pauseOnFocusLoss={false}
-              <Route
+          draggable={false}
-                exact
+          pauseOnHover={false}
-                path="/unauthorized"
+          transition={Slide}
-                component={unauthorizedRedirect}
+          closeButton={false}
-              />
+          theme="light"
-              <Route component={AppRouting} />
+        />
-            </Switch>
+      </CustomTheme>
-          </FeaturesWrapper>
+    </TypesafeI18n>
-        </SnackbarProvider>
+  );
-      </CustomMuiTheme>
+};
-    );
-  }
-}
 
 export default App;

interface/src/AppRouting.tsx

@@ -1,67 +1,73 @@
-import React, { Component } from 'react';
+import { useContext, useEffect } from 'react';
-import { Switch, Redirect } from 'react-router';
 
-import * as Authentication from './authentication/Authentication';
+import { Route, Routes, Navigate, useLocation } from 'react-router-dom';
-import AuthenticationWrapper from './authentication/AuthenticationWrapper';
-import UnauthenticatedRoute from './authentication/UnauthenticatedRoute';
-import AuthenticatedRoute from './authentication/AuthenticatedRoute';
 
-import SignIn from './SignIn';
+import { toast } from 'react-toastify';
-import ProjectRouting from './project/ProjectRouting';
+import type { FC } from 'react';
-import NetworkConnection from './network/NetworkConnection';
-import AccessPoint from './ap/AccessPoint';
-import NetworkTime from './ntp/NetworkTime';
-import Security from './security/Security';
-import System from './system/System';
 
-import { PROJECT_PATH } from './api';
+import AuthenticatedRouting from 'AuthenticatedRouting';
-import Mqtt from './mqtt/Mqtt';
+import SignIn from 'SignIn';
-import { withFeatures, WithFeaturesProps } from './features/FeaturesContext';
+import { RequireAuthenticated, RequireUnauthenticated } from 'components';
-import { Features } from './features/types';
 
-export const getDefaultRoute = (features: Features) =>
+import { Authentication, AuthenticationContext } from 'contexts/authentication';
-  features.project ? `/${PROJECT_PATH}/` : '/network/';
+import { useI18nContext } from 'i18n/i18n-react';
-class AppRouting extends Component<WithFeaturesProps> {
-  componentDidMount() {
-    Authentication.clearLoginRedirect();
-  }
 
-  render() {
+interface SecurityRedirectProps {
-    const { features } = this.props;
+  message: string;
-    return (
+  signOut?: boolean;
-      <AuthenticationWrapper>
-        <Switch>
-          {features.security && (
-            <UnauthenticatedRoute exact path="/" component={SignIn} />
-          )}
-          {features.project && (
-            <AuthenticatedRoute
-              exact
-              path={`/${PROJECT_PATH}/*`}
-              component={ProjectRouting}
-            />
-          )}
-          <AuthenticatedRoute
-            exact
-            path="/network/*"
-            component={NetworkConnection}
-          />
-          <AuthenticatedRoute exact path="/ap/*" component={AccessPoint} />
-          {features.ntp && (
-            <AuthenticatedRoute exact path="/ntp/*" component={NetworkTime} />
-          )}
-          {features.mqtt && (
-            <AuthenticatedRoute exact path="/mqtt/*" component={Mqtt} />
-          )}
-          {features.security && (
-            <AuthenticatedRoute exact path="/security/*" component={Security} />
-          )}
-          <AuthenticatedRoute exact path="/system/*" component={System} />
-          <Redirect to={getDefaultRoute(features)} />
-        </Switch>
-      </AuthenticationWrapper>
-    );
-  }
 }
 
-export default withFeatures(AppRouting);
+const RootRedirect: FC<SecurityRedirectProps> = ({ message, signOut }) => {
+  const authenticationContext = useContext(AuthenticationContext);
+  useEffect(() => {
+    signOut && authenticationContext.signOut(false);
+    toast.success(message);
+  }, [message, signOut, authenticationContext]);
+  return <Navigate to="/" />;
+};
+
+export const RemoveTrailingSlashes = () => {
+  const location = useLocation();
+  return (
+    location.pathname.match('/.*/$') && (
+      <Navigate
+        to={{
+          pathname: location.pathname.replace(/\/+$/, ''),
+          search: location.search
+        }}
+      />
+    )
+  );
+};
+
+const AppRouting: FC = () => {
+  const { LL } = useI18nContext();
+
+  return (
+    <Authentication>
+      <RemoveTrailingSlashes />
+      <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>
+  );
+};
+
+export default AppRouting;

interface/src/AuthenticatedRouting.tsx

@@ -0,0 +1,64 @@
+import { Navigate, Routes, Route } from 'react-router-dom';
+import Dashboard from './project/Dashboard';
+import Help from './project/Help';
+import Settings from './project/Settings';
+import type { FC } from 'react';
+
+import { Layout, RequireAdmin } from 'components';
+import AccessPoint from 'framework/ap/AccessPoint';
+import Mqtt from 'framework/mqtt/Mqtt';
+import NetworkConnection from 'framework/network/NetworkConnection';
+import NetworkTime from 'framework/ntp/NetworkTime';
+import Security from 'framework/security/Security';
+import System from 'framework/system/System';
+
+const AuthenticatedRouting: FC = () => (
+  // const location = useLocation();
+  // const navigate = useNavigate();
+  // const handleApiResponseError = useCallback(
+  //   (error: AxiosError) => {
+  //     if (error.response && error.response.status === 401) {
+  //       AuthenticationApi.storeLoginRedirect(location);
+  //       navigate('/unauthorized');
+  //     }
+  //     return Promise.reject(error);
+  //   },
+  //   [location, navigate]
+  // );
+  // useEffect(() => {
+  //   const axiosHandlerId = AXIOS.interceptors.response.use((response) => response, handleApiResponseError);
+  //   return () => AXIOS.interceptors.response.eject(axiosHandlerId);
+  // }, [handleApiResponseError]);
+
+  <Layout>
+    <Routes>
+      <Route path="/dashboard/*" element={<Dashboard />} />
+      <Route
+        path="/settings/*"
+        element={
+          <RequireAdmin>
+            <Settings />
+          </RequireAdmin>
+        }
+      />
+      <Route path="/help/*" element={<Help />} />
+
+      <Route path="/network/*" element={<NetworkConnection />} />
+      <Route path="/ap/*" element={<AccessPoint />} />
+      <Route path="/ntp/*" element={<NetworkTime />} />
+      <Route path="/mqtt/*" element={<Mqtt />} />
+      <Route
+        path="/security/*"
+        element={
+          <RequireAdmin>
+            <Security />
+          </RequireAdmin>
+        }
+      />
+      <Route path="/system/*" element={<System />} />
+      <Route path="/*" element={<Navigate to="/" />} />
+    </Routes>
+  </Layout>
+);
+
+export default AuthenticatedRouting;

interface/src/CustomMuiTheme.tsx

@@ -1,46 +0,0 @@
-import { Component } from 'react';
-
-import { CssBaseline } from '@material-ui/core';
-import {
-  MuiThemeProvider,
-  createMuiTheme,
-  StylesProvider
-} from '@material-ui/core/styles';
-import { blueGrey, orange, red, green } from '@material-ui/core/colors';
-
-const theme = createMuiTheme({
-  palette: {
-    type: 'dark',
-    primary: {
-      main: '#33bfff'
-    },
-    secondary: {
-      main: '#3d5afe'
-    },
-    info: {
-      main: blueGrey[500]
-    },
-    warning: {
-      main: orange[500]
-    },
-    error: {
-      main: red[500]
-    },
-    success: {
-      main: green[500]
-    }
-  }
-});
-
-export default class CustomMuiTheme extends Component {
-  render() {
-    return (
-      <StylesProvider>
-        <MuiThemeProvider theme={theme}>
-          <CssBaseline />
-          {this.props.children}
-        </MuiThemeProvider>
-      </StylesProvider>
-    );
-  }
-}

interface/src/CustomTheme.tsx

@@ -0,0 +1,41 @@
+import { CssBaseline } from '@mui/material';
+import { createTheme, responsiveFontSizes, ThemeProvider } from '@mui/material/styles';
+import type { FC } from 'react';
+
+import type { RequiredChildrenProps } from 'utils';
+
+export const dialogStyle = {
+  '& .MuiDialog-paper': {
+    borderRadius: '8px',
+    borderColor: '#565656',
+    borderStyle: 'solid',
+    borderWidth: '1px'
+  },
+  backdropFilter: 'blur(1px)'
+};
+
+const theme = responsiveFontSizes(
+  createTheme({
+    typography: {
+      fontSize: 13
+    },
+    palette: {
+      mode: 'dark',
+      secondary: {
+        main: '#2196f3' // blue[500]
+      },
+      info: {
+        main: '#607d8b' // blueGrey[500]
+      }
+    }
+  })
+);
+
+const CustomTheme: FC<RequiredChildrenProps> = ({ children }) => (
+  <ThemeProvider theme={theme}>
+    <CssBaseline />
+    {children}
+  </ThemeProvider>
+);
+
+export default CustomTheme;

interface/src/SignIn.tsx

@@ -1,165 +1,193 @@
-import React, { Component } from 'react';
+import ForwardIcon from '@mui/icons-material/Forward';
-import { withSnackbar, WithSnackbarProps } from 'notistack';
+import { Box, Paper, Typography, MenuItem, TextField, Button } from '@mui/material';
-import { TextValidator, ValidatorForm } from 'react-material-ui-form-validator';
+import { useRequest } from 'alova';
+import { useContext, useState } from 'react';
+import { toast } from 'react-toastify';
+import { FeaturesContext } from './contexts/features';
+import type { ValidateFieldsError } from 'async-validator';
 
-import {
+import type { Locales } from 'i18n/i18n-types';
-  withStyles,
+import type { ChangeEventHandler, FC } from 'react';
-  createStyles,
+import type { SignInRequest } from 'types';
-  Theme,
+import * as AuthenticationApi from 'api/authentication';
-  WithStyles
+import { PROJECT_NAME } from 'api/env';
-} from '@material-ui/core/styles';
-import { Paper, Typography, Fab } from '@material-ui/core';
-import ForwardIcon from '@material-ui/icons/Forward';
 
-import {
+import { ValidatedPasswordField, ValidatedTextField } from 'components';
-  withAuthenticationContext,
+import { AuthenticationContext } from 'contexts/authentication';
-  AuthenticationContextProps
-} from './authentication/AuthenticationContext';
-import { PasswordValidator } from './components';
-import { PROJECT_NAME, SIGN_IN_ENDPOINT } from './api';
 
-const styles = (theme: Theme) =>
+import { ReactComponent as DEflag } from 'i18n/DE.svg';
-  createStyles({
+import { ReactComponent as FRflag } from 'i18n/FR.svg';
-    signInPage: {
+import { ReactComponent as GBflag } from 'i18n/GB.svg';
-      display: 'flex',
+import { ReactComponent as ITflag } from 'i18n/IT.svg';
-      height: '100vh',
+import { ReactComponent as NLflag } from 'i18n/NL.svg';
-      margin: 'auto',
+import { ReactComponent as NOflag } from 'i18n/NO.svg';
-      padding: theme.spacing(2),
+import { ReactComponent as PLflag } from 'i18n/PL.svg';
-      justifyContent: 'center',
+import { ReactComponent as SVflag } from 'i18n/SV.svg';
-      flexDirection: 'column',
+import { ReactComponent as TRflag } from 'i18n/TR.svg';
-      maxWidth: theme.breakpoints.values.sm
+import { I18nContext } from 'i18n/i18n-react';
-    },
+import { loadLocaleAsync } from 'i18n/i18n-util.async';
-    signInPanel: {
+import { onEnterCallback, updateValue } from 'utils';
-      textAlign: 'center',
+import { SIGN_IN_REQUEST_VALIDATOR, validate } from 'validators';
-      padding: theme.spacing(2),
+
-      paddingTop: '200px',
+const SignIn: FC = () => {
-      backgroundImage: 'url("/app/icon.png")',
+  const authenticationContext = useContext(AuthenticationContext);
-      backgroundRepeat: 'no-repeat',
+
-      backgroundPosition: '50% ' + theme.spacing(2) + 'px',
+  const { LL, setLocale, locale } = useContext(I18nContext);
-      backgroundSize: 'auto 150px',
+
-      width: '100%'
+  const { features } = useContext(FeaturesContext);
-    },
+
-    extendedIcon: {
+  const [signInRequest, setSignInRequest] = useState<SignInRequest>({
-      marginRight: theme.spacing(0.5)
+    username: '',
-    },
+    password: ''
-    button: {
+  });
-      marginRight: theme.spacing(2),
+  const [processing, setProcessing] = useState<boolean>(false);
-      marginTop: theme.spacing(2)
+  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
+
+  const { send: callSignIn, onSuccess } = useRequest((request: SignInRequest) => AuthenticationApi.signIn(request), {
+    immediate: false
+  });
+
+  onSuccess((response) => {
+    if (response.data) {
+      authenticationContext.signIn(response.data.access_token);
     }
   });
 
-type SignInProps = WithSnackbarProps &
+  const updateLoginRequestValue = updateValue(setSignInRequest);
-  WithStyles<typeof styles> &
-  AuthenticationContextProps;
 
-interface SignInState {
+  const signIn = async () => {
-  username: string;
+    await callSignIn(signInRequest).catch((event) => {
-  password: string;
+      if (event.message === 'Unauthorized') {
-  processing: boolean;
+        toast.warning(LL.INVALID_LOGIN());
-}
+      } else {
-
+        toast.error(LL.ERROR() + ' ' + event.message);
-class SignIn extends Component<SignInProps, SignInState> {
+      }
-  constructor(props: SignInProps) {
+      setProcessing(false);
-    super(props);
+    });
-    this.state = {
-      username: '',
-      password: '',
-      processing: false
-    };
-  }
-
-  updateInputElement = (event: React.ChangeEvent<HTMLInputElement>): void => {
-    const { name, value } = event.currentTarget;
-    this.setState((prevState) => ({
-      ...prevState,
-      [name]: value
-    }));
   };
 
-  onSubmit = () => {
+  const validateAndSignIn = async () => {
-    const { username, password } = this.state;
+    setProcessing(true);
-    const { authenticationContext } = this.props;
+    SIGN_IN_REQUEST_VALIDATOR.messages({
-    this.setState({ processing: true });
+      required: LL.IS_REQUIRED('%s')
-    fetch(SIGN_IN_ENDPOINT, {
+    });
-      method: 'POST',
+    try {
-      body: JSON.stringify({ username, password }),
+      await validate(SIGN_IN_REQUEST_VALIDATOR, signInRequest);
-      headers: new Headers({
+      await signIn();
-        'Content-Type': 'application/json'
+    } catch (errors: any) {
-      })
+      setFieldErrors(errors);
-    })
+      setProcessing(false);
-      .then((response) => {
+    }
-        if (response.status === 200) {
-          return response.json();
-        } else if (response.status === 401) {
-          throw Error('Invalid credentials.');
-        } else {
-          throw Error('Invalid status code: ' + response.status);
-        }
-      })
-      .then((json) => {
-        authenticationContext.signIn(json.access_token);
-      })
-      .catch((error) => {
-        this.props.enqueueSnackbar(error.message, {
-          variant: 'warning'
-        });
-        this.setState({ processing: false });
-      });
   };
 
-  render() {
+  const submitOnEnter = onEnterCallback(signIn);
-    const { username, password, processing } = this.state;
-    const { classes } = this.props;
-    return (
-      <div className={classes.signInPage}>
-        <Paper className={classes.signInPanel}>
-          <Typography variant="h4">{PROJECT_NAME}</Typography>
-          <ValidatorForm onSubmit={this.onSubmit}>
-            <TextValidator
-              disabled={processing}
-              validators={['required']}
-              errorMessages={['Username is required']}
-              name="username"
-              label="Username"
-              fullWidth
-              variant="outlined"
-              value={username}
-              onChange={this.updateInputElement}
-              margin="normal"
-              inputProps={{
-                autoCapitalize: 'none',
-                autoCorrect: 'off'
-              }}
-            />
-            <PasswordValidator
-              disabled={processing}
-              validators={['required']}
-              errorMessages={['Password is required']}
-              name="password"
-              label="Password"
-              fullWidth
-              variant="outlined"
-              value={password}
-              onChange={this.updateInputElement}
-              margin="normal"
-            />
-            <Fab
-              variant="extended"
-              color="primary"
-              className={classes.button}
-              type="submit"
-              disabled={processing}
-            >
-              <ForwardIcon className={classes.extendedIcon} />
-              Sign In
-            </Fab>
-          </ValidatorForm>
-        </Paper>
-      </div>
-    );
-  }
-}
 
-export default withAuthenticationContext(
+  const onLocaleSelected: ChangeEventHandler<HTMLInputElement> = async ({ target }) => {
-  withSnackbar(withStyles(styles)(SignIn))
+    const loc = target.value as Locales;
-);
+    localStorage.setItem('lang', loc);
+    await loadLocaleAsync(loc);
+    setLocale(loc);
+  };
+
+  return (
+    <Box
+      display="flex"
+      height="100vh"
+      margin="auto"
+      padding={2}
+      justifyContent="center"
+      flexDirection="column"
+      maxWidth={(theme) => theme.breakpoints.values.sm}
+    >
+      <Paper
+        sx={(theme) => ({
+          textAlign: 'center',
+          padding: theme.spacing(2),
+          paddingTop: '172px',
+          backgroundImage: 'url("/app/icon.png")',
+          backgroundRepeat: 'no-repeat',
+          backgroundPosition: '50% ' + theme.spacing(2),
+          width: '100%'
+        })}
+      >
+        <Typography variant="h4">{PROJECT_NAME}</Typography>
+        <Typography variant="subtitle2">{features.version}</Typography>
+
+        <TextField name="locale" variant="outlined" value={locale} onChange={onLocaleSelected} size="small" select>
+          <MenuItem key="de" value="de">
+            <DEflag style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;DE
+          </MenuItem>
+          <MenuItem key="en" value="en">
+            <GBflag style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;EN
+          </MenuItem>
+          <MenuItem key="fr" value="fr">
+            <FRflag style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;FR
+          </MenuItem>
+          <MenuItem key="it" value="it">
+            <ITflag style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;IT
+          </MenuItem>
+          <MenuItem key="nl" value="nl">
+            <NLflag style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;NL
+          </MenuItem>
+          <MenuItem key="no" value="no">
+            <NOflag style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;NO
+          </MenuItem>
+          <MenuItem key="pl" value="pl">
+            <PLflag style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;PL
+          </MenuItem>
+          <MenuItem key="sv" value="sv">
+            <SVflag style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;SV
+          </MenuItem>
+          <MenuItem key="tr" value="tr">
+            <TRflag style={{ width: 16, verticalAlign: 'middle' }} />
+            &nbsp;TR
+          </MenuItem>
+        </TextField>
+
+        <Box display="flex" flexDirection="column" alignItems="center">
+          <ValidatedTextField
+            fieldErrors={fieldErrors}
+            disabled={processing}
+            sx={{
+              width: 240
+            }}
+            name="username"
+            label={LL.USERNAME(0)}
+            value={signInRequest.username}
+            onChange={updateLoginRequestValue}
+            margin="normal"
+            variant="outlined"
+          />
+          <ValidatedPasswordField
+            fieldErrors={fieldErrors}
+            disabled={processing}
+            sx={{
+              width: 240
+            }}
+            name="password"
+            label={LL.PASSWORD()}
+            value={signInRequest.password}
+            onChange={updateLoginRequestValue}
+            onKeyDown={submitOnEnter}
+            variant="outlined"
+          />
+        </Box>
+
+        <Button variant="contained" color="primary" sx={{ mt: 2 }} onClick={validateAndSignIn} disabled={processing}>
+          <ForwardIcon sx={{ mr: 1 }} />
+          {LL.SIGN_IN()}
+        </Button>
+      </Paper>
+    </Box>
+  );
+};
+
+export default SignIn;

interface/src/ap/APModes.ts

@@ -1,8 +0,0 @@
-import { APSettings, APProvisionMode } from './types';
-
-export const isAPEnabled = ({ provision_mode }: APSettings) => {
-  return (
-    provision_mode === APProvisionMode.AP_MODE_ALWAYS ||
-    provision_mode === APProvisionMode.AP_MODE_DISCONNECTED
-  );
-};

interface/src/ap/APSettingsController.tsx

@@ -1,33 +0,0 @@
-import { Component } from 'react';
-
-import { AP_SETTINGS_ENDPOINT } from '../api';
-import {
-  restController,
-  RestControllerProps,
-  RestFormLoader,
-  SectionContent
-} from '../components';
-
-import APSettingsForm from './APSettingsForm';
-import { APSettings } from './types';
-
-type APSettingsControllerProps = RestControllerProps<APSettings>;
-
-class APSettingsController extends Component<APSettingsControllerProps> {
-  componentDidMount() {
-    this.props.loadData();
-  }
-
-  render() {
-    return (
-      <SectionContent title="Access Point Settings" titleGutter>
-        <RestFormLoader
-          {...this.props}
-          render={(formProps) => <APSettingsForm {...formProps} />}
-        />
-      </SectionContent>
-    );
-  }
-}
-
-export default restController(AP_SETTINGS_ENDPOINT, APSettingsController);

interface/src/ap/APSettingsForm.tsx

@@ -1,134 +0,0 @@
-import React, { Fragment } from 'react';
-import {
-  TextValidator,
-  ValidatorForm,
-  SelectValidator
-} from 'react-material-ui-form-validator';
-
-import MenuItem from '@material-ui/core/MenuItem';
-import SaveIcon from '@material-ui/icons/Save';
-
-import {
-  PasswordValidator,
-  RestFormProps,
-  FormActions,
-  FormButton
-} from '../components';
-
-import { isAPEnabled } from './APModes';
-import { APSettings, APProvisionMode } from './types';
-import { isIP } from '../validators';
-
-type APSettingsFormProps = RestFormProps<APSettings>;
-
-class APSettingsForm extends React.Component<APSettingsFormProps> {
-  componentDidMount() {
-    ValidatorForm.addValidationRule('isIP', isIP);
-  }
-
-  render() {
-    const { data, handleValueChange, saveData } = this.props;
-    return (
-      <ValidatorForm onSubmit={saveData} ref="APSettingsForm">
-        <SelectValidator
-          name="provision_mode"
-          label="Provide Access Point&hellip;"
-          value={data.provision_mode}
-          fullWidth
-          variant="outlined"
-          onChange={handleValueChange('provision_mode')}
-          margin="normal"
-        >
-          <MenuItem value={APProvisionMode.AP_MODE_ALWAYS}>Always</MenuItem>
-          <MenuItem value={APProvisionMode.AP_MODE_DISCONNECTED}>
-            When Network Disconnected
-          </MenuItem>
-          <MenuItem value={APProvisionMode.AP_NEVER}>Never</MenuItem>
-        </SelectValidator>
-        {isAPEnabled(data) && (
-          <Fragment>
-            <TextValidator
-              validators={['required', 'matchRegexp:^.{1,32}$']}
-              errorMessages={[
-                'Access Point SSID is required',
-                'Access Point SSID must be 32 characters or less'
-              ]}
-              name="ssid"
-              label="Access Point SSID"
-              fullWidth
-              variant="outlined"
-              value={data.ssid}
-              onChange={handleValueChange('ssid')}
-              margin="normal"
-            />
-            <PasswordValidator
-              validators={['required', 'matchRegexp:^.{8,64}$']}
-              errorMessages={[
-                'Access Point Password is required',
-                'Access Point Password must be 8-64 characters'
-              ]}
-              name="password"
-              label="Access Point Password"
-              fullWidth
-              variant="outlined"
-              value={data.password}
-              onChange={handleValueChange('password')}
-              margin="normal"
-            />
-            <TextValidator
-              validators={['required', 'isIP']}
-              errorMessages={['Local IP is required', 'Must be an IP address']}
-              name="local_ip"
-              label="Local IP"
-              fullWidth
-              variant="outlined"
-              value={data.local_ip}
-              onChange={handleValueChange('local_ip')}
-              margin="normal"
-            />
-            <TextValidator
-              validators={['required', 'isIP']}
-              errorMessages={[
-                'Gateway IP is required',
-                'Must be an IP address'
-              ]}
-              name="gateway_ip"
-              label="Gateway"
-              fullWidth
-              variant="outlined"
-              value={data.gateway_ip}
-              onChange={handleValueChange('gateway_ip')}
-              margin="normal"
-            />
-            <TextValidator
-              validators={['required', 'isIP']}
-              errorMessages={[
-                'Subnet mask is required',
-                'Must be an IP address'
-              ]}
-              name="subnet_mask"
-              label="Subnet"
-              fullWidth
-              variant="outlined"
-              value={data.subnet_mask}
-              onChange={handleValueChange('subnet_mask')}
-              margin="normal"
-            />
-          </Fragment>
-        )}
-        <FormActions>
-          <FormButton
-            startIcon={<SaveIcon />}
-            variant="contained"
-            color="primary"
-            type="submit"
-          >
-            Save
-          </FormButton>
-        </FormActions>
-      </ValidatorForm>
-    );
-  }
-}
-
-export default APSettingsForm;

interface/src/ap/APStatus.ts

@@ -1,28 +0,0 @@
-import { Theme } from '@material-ui/core';
-import { APStatus, APNetworkStatus } from './types';
-
-export const apStatusHighlight = ({ status }: APStatus, theme: Theme) => {
-  switch (status) {
-    case APNetworkStatus.ACTIVE:
-      return theme.palette.success.main;
-    case APNetworkStatus.INACTIVE:
-      return theme.palette.info.main;
-    case APNetworkStatus.LINGERING:
-      return theme.palette.warning.main;
-    default:
-      return theme.palette.warning.main;
-  }
-};
-
-export const apStatus = ({ status }: APStatus) => {
-  switch (status) {
-    case APNetworkStatus.ACTIVE:
-      return 'Active';
-    case APNetworkStatus.INACTIVE:
-      return 'Inactive';
-    case APNetworkStatus.LINGERING:
-      return 'Lingering until idle';
-    default:
-      return 'Unknown';
-  }
-};

interface/src/ap/APStatusController.tsx

@@ -1,33 +0,0 @@
-import { Component } from 'react';
-
-import {
-  restController,
-  RestControllerProps,
-  RestFormLoader,
-  SectionContent
-} from '../components';
-import { AP_STATUS_ENDPOINT } from '../api';
-
-import APStatusForm from './APStatusForm';
-import { APStatus } from './types';
-
-type APStatusControllerProps = RestControllerProps<APStatus>;
-
-class APStatusController extends Component<APStatusControllerProps> {
-  componentDidMount() {
-    this.props.loadData();
-  }
-
-  render() {
-    return (
-      <SectionContent title="Access Point Status">
-        <RestFormLoader
-          {...this.props}
-          render={(formProps) => <APStatusForm {...formProps} />}
-        />
-      </SectionContent>
-    );
-  }
-}
-
-export default restController(AP_STATUS_ENDPOINT, APStatusController);

interface/src/ap/APStatusForm.tsx

@@ -1,91 +0,0 @@
-import React, { Component, Fragment } from 'react';
-
-import { WithTheme, withTheme } from '@material-ui/core/styles';
-import {
-  Avatar,
-  Divider,
-  List,
-  ListItem,
-  ListItemAvatar,
-  ListItemText
-} from '@material-ui/core';
-
-import SettingsInputAntennaIcon from '@material-ui/icons/SettingsInputAntenna';
-import DeviceHubIcon from '@material-ui/icons/DeviceHub';
-import ComputerIcon from '@material-ui/icons/Computer';
-import RefreshIcon from '@material-ui/icons/Refresh';
-
-import {
-  RestFormProps,
-  FormActions,
-  FormButton,
-  HighlightAvatar
-} from '../components';
-import { apStatusHighlight, apStatus } from './APStatus';
-import { APStatus } from './types';
-
-type APStatusFormProps = RestFormProps<APStatus> & WithTheme;
-
-class APStatusForm extends Component<APStatusFormProps> {
-  createListItems() {
-    const { data, theme } = this.props;
-    return (
-      <Fragment>
-        <ListItem>
-          <ListItemAvatar>
-            <HighlightAvatar color={apStatusHighlight(data, theme)}>
-              <SettingsInputAntennaIcon />
-            </HighlightAvatar>
-          </ListItemAvatar>
-          <ListItemText primary="Status" secondary={apStatus(data)} />
-        </ListItem>
-        <Divider variant="inset" component="li" />
-        <ListItem>
-          <ListItemAvatar>
-            <Avatar>IP</Avatar>
-          </ListItemAvatar>
-          <ListItemText primary="IP Address" secondary={data.ip_address} />
-        </ListItem>
-        <Divider variant="inset" component="li" />
-        <ListItem>
-          <ListItemAvatar>
-            <Avatar>
-              <DeviceHubIcon />
-            </Avatar>
-          </ListItemAvatar>
-          <ListItemText primary="MAC Address" secondary={data.mac_address} />
-        </ListItem>
-        <Divider variant="inset" component="li" />
-        <ListItem>
-          <ListItemAvatar>
-            <Avatar>
-              <ComputerIcon />
-            </Avatar>
-          </ListItemAvatar>
-          <ListItemText primary="AP Clients" secondary={data.station_num} />
-        </ListItem>
-        <Divider variant="inset" component="li" />
-      </Fragment>
-    );
-  }
-
-  render() {
-    return (
-      <Fragment>
-        <List>{this.createListItems()}</List>
-        <FormActions>
-          <FormButton
-            startIcon={<RefreshIcon />}
-            variant="contained"
-            color="secondary"
-            onClick={this.props.loadData}
-          >
-            Refresh
-          </FormButton>
-        </FormActions>
-      </Fragment>
-    );
-  }
-}
-
-export default withTheme(APStatusForm);

interface/src/ap/AccessPoint.tsx

@@ -1,57 +0,0 @@
-import { Component } from 'react';
-import { Redirect, Switch, RouteComponentProps } from 'react-router-dom';
-
-import { Tabs, Tab } from '@material-ui/core';
-
-import {
-  AuthenticatedContextProps,
-  withAuthenticatedContext,
-  AuthenticatedRoute
-} from '../authentication';
-import { MenuAppBar } from '../components';
-
-import APSettingsController from './APSettingsController';
-import APStatusController from './APStatusController';
-
-type AccessPointProps = AuthenticatedContextProps & RouteComponentProps;
-
-class AccessPoint extends Component<AccessPointProps> {
-  handleTabChange = (path: string) => {
-    this.props.history.push(path);
-  };
-
-  render() {
-    const { authenticatedContext } = this.props;
-    return (
-      <MenuAppBar sectionTitle="Access Point">
-        <Tabs
-          value={this.props.match.url}
-          onChange={(e, path) => this.handleTabChange(path)}
-          variant="fullWidth"
-        >
-          <Tab value="/ap/status" label="Access Point Status" />
-          <Tab
-            value="/ap/settings"
-            label="Access Point Settings"
-            disabled={!authenticatedContext.me.admin}
-          />
-        </Tabs>
-        <Switch>
-          <AuthenticatedRoute
-            exact
-            path="/ap/status"
-            component={APStatusController}
-          />
-          <AuthenticatedRoute
-            exact
-            path="/ap/settings"
-            component={APSettingsController}
-          />
-          <Redirect to="/ap/status" />
-        </Switch>
-      </MenuAppBar>
-    );
-  }
-}
-
-export default withAuthenticatedContext(AccessPoint);

interface/src/api/Endpoints.ts

@@ -1,24 +0,0 @@
-import { ENDPOINT_ROOT } from './Env';
-
-export const FEATURES_ENDPOINT = ENDPOINT_ROOT + 'features';
-export const NTP_STATUS_ENDPOINT = ENDPOINT_ROOT + 'ntpStatus';
-export const NTP_SETTINGS_ENDPOINT = ENDPOINT_ROOT + 'ntpSettings';
-export const TIME_ENDPOINT = ENDPOINT_ROOT + 'time';
-export const AP_SETTINGS_ENDPOINT = ENDPOINT_ROOT + 'apSettings';
-export const AP_STATUS_ENDPOINT = ENDPOINT_ROOT + 'apStatus';
-export const SCAN_NETWORKS_ENDPOINT = ENDPOINT_ROOT + 'scanNetworks';
-export const LIST_NETWORKS_ENDPOINT = ENDPOINT_ROOT + 'listNetworks';
-export const NETWORK_SETTINGS_ENDPOINT = ENDPOINT_ROOT + 'networkSettings';
-export const NETWORK_STATUS_ENDPOINT = ENDPOINT_ROOT + 'networkStatus';
-export const OTA_SETTINGS_ENDPOINT = ENDPOINT_ROOT + 'otaSettings';
-export const UPLOAD_FIRMWARE_ENDPOINT = ENDPOINT_ROOT + 'uploadFirmware';
-export const MQTT_SETTINGS_ENDPOINT = ENDPOINT_ROOT + 'mqttSettings';
-export const MQTT_STATUS_ENDPOINT = ENDPOINT_ROOT + 'mqttStatus';
-export const SYSTEM_STATUS_ENDPOINT = ENDPOINT_ROOT + 'systemStatus';
-export const SIGN_IN_ENDPOINT = ENDPOINT_ROOT + 'signIn';
-export const VERIFY_AUTHORIZATION_ENDPOINT =
-  ENDPOINT_ROOT + 'verifyAuthorization';
-export const SECURITY_SETTINGS_ENDPOINT = ENDPOINT_ROOT + 'securitySettings';
-export const GENERATE_TOKEN_ENDPOINT = ENDPOINT_ROOT + 'generateToken';
-export const RESTART_ENDPOINT = ENDPOINT_ROOT + 'restart';
-export const FACTORY_RESET_ENDPOINT = ENDPOINT_ROOT + 'factoryReset';

interface/src/api/Env.ts

@@ -1,26 +0,0 @@
-export const PROJECT_NAME = process.env.REACT_APP_PROJECT_NAME!;
-export const PROJECT_PATH = process.env.REACT_APP_PROJECT_PATH!;
-
-export const ENDPOINT_ROOT = calculateEndpointRoot('/rest/');
-export const WEB_SOCKET_ROOT = calculateWebSocketRoot('/ws/');
-export const EVENT_SOURCE_ROOT = calculateEndpointRoot('/es/');
-export const API_ENDPOINT_ROOT = calculateEndpointRoot('/api/');
-
-function calculateEndpointRoot(endpointPath: string) {
-  const httpRoot = process.env.REACT_APP_HTTP_ROOT;
-  if (httpRoot) {
-    return httpRoot + endpointPath;
-  }
-  const location = window.location;
-  return location.protocol + '//' + location.host + endpointPath;
-}
-
-function calculateWebSocketRoot(webSocketPath: string) {
-  const webSocketRoot = process.env.REACT_APP_WEB_SOCKET_ROOT;
-  if (webSocketRoot) {
-    return webSocketRoot + webSocketPath;
-  }
-  const location = window.location;
-  const webProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-  return webProtocol + '//' + location.host + webSocketPath;
-}

interface/src/api/ap.ts

@@ -0,0 +1,7 @@
+import { alovaInstance } from './endpoints';
+
+import type { APSettings, APStatus } from 'types';
+
+export const readAPStatus = () => alovaInstance.Get<APStatus>('/rest/apStatus');
+export const readAPSettings = () => alovaInstance.Get<APSettings>('/rest/apSettings');
+export const updateAPSettings = (data: APSettings) => alovaInstance.Post<APSettings>('/rest/apSettings', data);

interface/src/api/authentication.ts

@@ -0,0 +1,51 @@
+import jwtDecode from 'jwt-decode';
+import { ACCESS_TOKEN, alovaInstance } from './endpoints';
+import type * as H from 'history';
+import type { Path } from 'react-router-dom';
+
+import type { Me, SignInRequest, SignInResponse } from 'types';
+
+export const SIGN_IN_PATHNAME = 'loginPathname';
+export const SIGN_IN_SEARCH = 'loginSearch';
+
+export const verifyAuthorization = () => alovaInstance.Get('/rest/verifyAuthorization');
+export const signIn = (request: SignInRequest) => alovaInstance.Post<SignInResponse>('/rest/signIn', request);
+
+export function getStorage() {
+  return localStorage || sessionStorage;
+}
+
+export function storeLoginRedirect(location?: H.Location) {
+  if (location) {
+    getStorage().setItem(SIGN_IN_PATHNAME, location.pathname);
+    getStorage().setItem(SIGN_IN_SEARCH, location.search);
+  }
+}
+
+export function clearLoginRedirect() {
+  getStorage().removeItem(SIGN_IN_PATHNAME);
+  getStorage().removeItem(SIGN_IN_SEARCH);
+}
+
+export function fetchLoginRedirect(): Partial<Path> {
+  const signInPathname = getStorage().getItem(SIGN_IN_PATHNAME);
+  const signInSearch = getStorage().getItem(SIGN_IN_SEARCH);
+  clearLoginRedirect();
+  return {
+    pathname: signInPathname || `/dashboard`,
+    search: (signInPathname && signInSearch) || undefined
+  };
+}
+
+export const clearAccessToken = () => localStorage.removeItem(ACCESS_TOKEN);
+export const decodeMeJWT = (accessToken: string): Me => jwtDecode(accessToken);
+
+export function addAccessTokenParameter(url: string) {
+  const accessToken = getStorage().getItem(ACCESS_TOKEN);
+  if (!accessToken) {
+    return url;
+  }
+  const parsedUrl = new URL(url);
+  parsedUrl.searchParams.set(ACCESS_TOKEN, accessToken);
+  return parsedUrl.toString();
+}

interface/src/api/endpoints.ts

@@ -0,0 +1,60 @@
+import { xhrRequestAdapter } from '@alova/adapter-xhr';
+import { createAlova } from 'alova';
+import ReactHook from 'alova/react';
+import { unpack } from '../api/unpack';
+
+export const ACCESS_TOKEN = 'access_token';
+
+const host = window.location.host;
+export const WEB_SOCKET_ROOT = 'ws://' + host + '/ws/';
+export const EVENT_SOURCE_ROOT = 'http://' + host + '/es/';
+
+export const alovaInstance = createAlova({
+  statesHook: ReactHook,
+  timeout: 3000, // 3 seconds but throwing a timeout error
+  localCache: null,
+  // localCache: {
+  //   GET: {
+  //     mode: 'placeholder', // see https://alova.js.org/learning/response-cache/#cache-replaceholder-mode
+  //     expire: 2000
+  //   }
+  // },
+  requestAdapter: xhrRequestAdapter(),
+  beforeRequest(method) {
+    if (localStorage.getItem(ACCESS_TOKEN)) {
+      method.config.headers.Authorization = 'Bearer ' + localStorage.getItem(ACCESS_TOKEN);
+    }
+  },
+
+  responded: {
+    onSuccess: async (response) => {
+      // if (response.status === 202) {
+      //   throw new Error('Wait'); // wifi scan in progress
+      // } else
+      if (response.status === 205) {
+        throw new Error('Reboot required');
+      } else if (response.status === 400) {
+        throw new Error('Request Failed');
+      } else if (response.status >= 400) {
+        throw new Error(response.statusText);
+      }
+      const data = await response.data;
+      if (response.data instanceof ArrayBuffer) {
+        return unpack(data);
+      }
+      return data;
+    }
+
+    // Interceptor for request failure. This interceptor will be entered when the request is wrong.
+    // http errors like 401 (unauthorized) are handled either in the methods or AuthenticatedRouting()
+    // onError: (error, method) => {
+    //   alert(error.message);
+    // }
+  }
+});
+
+export const alovaInstanceGH = createAlova({
+  baseURL: 'https://api.github.com/repos/emsesp/EMS-ESP32/releases',
+  statesHook: ReactHook,
+  requestAdapter: xhrRequestAdapter()
+});

interface/src/api/env.ts

@@ -0,0 +1 @@
+export const PROJECT_NAME = 'EMS-ESP';

interface/src/api/features.ts

@@ -0,0 +1,5 @@
+import { alovaInstance } from './endpoints';
+
+import type { Features } from 'types';
+
+export const readFeatures = () => alovaInstance.Get<Features>('/rest/features');

interface/src/api/index.ts

@@ -1,2 +0,0 @@
-export * from './Env';
-export * from './Endpoints';

interface/src/api/mqtt.ts

@@ -0,0 +1,6 @@
+import { alovaInstance } from './endpoints';
+import type { MqttSettings, MqttStatus } from 'types';
+
+export const readMqttStatus = () => alovaInstance.Get<MqttStatus>('/rest/mqttStatus');
+export const readMqttSettings = () => alovaInstance.Get<MqttSettings>('/rest/mqttSettings');
+export const updateMqttSettings = (data: MqttSettings) => alovaInstance.Post<MqttSettings>('/rest/mqttSettings', data);

interface/src/api/network.ts

@@ -0,0 +1,15 @@
+import { alovaInstance } from './endpoints';
+
+import type { WiFiNetworkList, NetworkSettings, NetworkStatus } from 'types';
+
+export const readNetworkStatus = () => alovaInstance.Get<NetworkStatus>('/rest/networkStatus');
+export const scanNetworks = () => alovaInstance.Get('/rest/scanNetworks');
+export const listNetworks = () =>
+  alovaInstance.Get<WiFiNetworkList>('/rest/listNetworks', {
+    name: 'listNetworks',
+    timeout: 20000 // timeout 20 seconds
+  });
+export const readNetworkSettings = () =>
+  alovaInstance.Get<NetworkSettings>('/rest/networkSettings', { name: 'networkSettings' });
+export const updateNetworkSettings = (wifiSettings: NetworkSettings) =>
+  alovaInstance.Post<NetworkSettings>('/rest/networkSettings', wifiSettings);

interface/src/api/ntp.ts

@@ -0,0 +1,11 @@
+import { alovaInstance } from './endpoints';
+import type { NTPSettings, NTPStatus, Time } from 'types';
+
+export const readNTPStatus = () => alovaInstance.Get<NTPStatus>('/rest/ntpStatus');
+export const readNTPSettings = () =>
+  alovaInstance.Get<NTPSettings>('/rest/ntpSettings', {
+    name: 'ntpSettings'
+  });
+export const updateNTPSettings = (data: NTPSettings) => alovaInstance.Post<NTPSettings>('/rest/ntpSettings', data);
+
+export const updateTime = (data: Time) => alovaInstance.Post<Time>('/rest/time', data);

interface/src/api/security.ts

@@ -0,0 +1,13 @@
+import { alovaInstance } from './endpoints';
+
+import type { SecuritySettings, Token } from 'types';
+
+export const readSecuritySettings = () => alovaInstance.Get<SecuritySettings>('/rest/securitySettings');
+
+export const updateSecuritySettings = (securitySettings: SecuritySettings) =>
+  alovaInstance.Post('/rest/securitySettings', securitySettings);
+
+export const generateToken = (username?: string) =>
+  alovaInstance.Get<Token>('/rest/generateToken', {
+    params: { username }
+  });

interface/src/api/system.ts

@@ -0,0 +1,42 @@
+import { alovaInstance, alovaInstanceGH } from './endpoints';
+import type { OTASettings, SystemStatus, LogSettings } from 'types';
+
+// SystemStatus - also used to ping in Restart monitor for pinging
+export const readSystemStatus = () => alovaInstance.Get<SystemStatus>('/rest/systemStatus');
+
+// commands
+export const restart = () => alovaInstance.Post('/rest/restart');
+export const partition = () => alovaInstance.Post('/rest/partition');
+export const factoryReset = () => alovaInstance.Post('/rest/factoryReset');
+
+// OTA
+export const readOTASettings = () => alovaInstance.Get<OTASettings>(`/rest/otaSettings`);
+export const updateOTASettings = (data: any) => alovaInstance.Post('/rest/otaSettings', data);
+
+// SystemLog
+export const readLogSettings = () => alovaInstance.Get<LogSettings>(`/rest/logSettings`);
+export const updateLogSettings = (data: any) => alovaInstance.Post('/rest/logSettings', data);
+export const fetchLog = () => alovaInstance.Post('/rest/fetchLog');
+
+// Get versions from github
+export const getStableVersion = () =>
+  alovaInstanceGH.Get('latest', {
+    transformData(response: any) {
+      return response.data.name.substring(1);
+    }
+  });
+export const getDevVersion = () =>
+  alovaInstanceGH.Get('tags/latest', {
+    transformData(response: any) {
+      return response.data.name.split(/\s+/).splice(-1)[0].substring(1);
+    }
+  });
+
+export const uploadFile = (file: File) => {
+  const formData = new FormData();
+  formData.append('file', file);
+  return alovaInstance.Post('/rest/uploadFile', formData, {
+    timeout: 60000, // override timeout for uploading firmware - 1 minute
+    enableUpload: true
+  });
+};

interface/src/authentication/AuthenticatedRoute.tsx

@@ -1,56 +0,0 @@
-import * as React from 'react';
-import {
-  Redirect,
-  Route,
-  RouteProps,
-  RouteComponentProps
-} from 'react-router-dom';
-import { withSnackbar, WithSnackbarProps } from 'notistack';
-
-import * as Authentication from './Authentication';
-import {
-  withAuthenticationContext,
-  AuthenticationContextProps,
-  AuthenticatedContext,
-  AuthenticatedContextValue
-} from './AuthenticationContext';
-
-interface AuthenticatedRouteProps
-  extends RouteProps,
-    WithSnackbarProps,
-    AuthenticationContextProps {
-  component:
-    | React.ComponentType<RouteComponentProps<any>>
-    | React.ComponentType<any>;
-}
-
-type RenderComponent = (props: RouteComponentProps<any>) => React.ReactNode;
-
-export class AuthenticatedRoute extends React.Component<AuthenticatedRouteProps> {
-  render() {
-    const {
-      enqueueSnackbar,
-      authenticationContext,
-      component: Component,
-      ...rest
-    } = this.props;
-    const { location } = this.props;
-    const renderComponent: RenderComponent = (props) => {
-      if (authenticationContext.me) {
-        return (
-          <AuthenticatedContext.Provider
-            value={authenticationContext as AuthenticatedContextValue}
-          >
-            <Component {...props} />
-          </AuthenticatedContext.Provider>
-        );
-      }
-      Authentication.storeLoginRedirect(location);
-      enqueueSnackbar('Please sign in to continue', { variant: 'info' });
-      return <Redirect to="/" />;
-    };
-    return <Route {...rest} render={renderComponent} />;
-  }
-}
-
-export default withSnackbar(withAuthenticationContext(AuthenticatedRoute));

interface/src/authentication/Authentication.ts

@@ -1,129 +0,0 @@
-import * as H from 'history';
-
-import history from '../history';
-import { Features } from '../features/types';
-import { getDefaultRoute } from '../AppRouting';
-
-export const ACCESS_TOKEN = 'access_token';
-export const SIGN_IN_PATHNAME = 'signInPathname';
-export const SIGN_IN_SEARCH = 'signInSearch';
-
-/**
- * Fallback to sessionStorage if localStorage is absent. WebView may not have local storage enabled.
- */
-export function getStorage() {
-  return localStorage || sessionStorage;
-}
-
-export function storeLoginRedirect(location?: H.Location) {
-  if (location) {
-    getStorage().setItem(SIGN_IN_PATHNAME, location.pathname);
-    getStorage().setItem(SIGN_IN_SEARCH, location.search);
-  }
-}
-
-export function clearLoginRedirect() {
-  getStorage().removeItem(SIGN_IN_PATHNAME);
-  getStorage().removeItem(SIGN_IN_SEARCH);
-}
-
-export function fetchLoginRedirect(
-  features: Features
-): H.LocationDescriptorObject {
-  const signInPathname = getStorage().getItem(SIGN_IN_PATHNAME);
-  const signInSearch = getStorage().getItem(SIGN_IN_SEARCH);
-  clearLoginRedirect();
-  return {
-    pathname: signInPathname || getDefaultRoute(features),
-    search: (signInPathname && signInSearch) || undefined
-  };
-}
-
-/**
- * Wraps the normal fetch routine with one with provides the access token if present.
- */
-export function authorizedFetch(
-  url: RequestInfo,
-  params?: RequestInit
-): Promise<Response> {
-  const accessToken = getStorage().getItem(ACCESS_TOKEN);
-  if (accessToken) {
-    params = params || {};
-    params.credentials = 'include';
-    params.headers = {
-      ...params.headers,
-      Authorization: 'Bearer ' + accessToken
-    };
-  }
-  return fetch(url, params);
-}
-
-/**
- * fetch() does not yet support upload progress, this wrapper allows us to configure the xhr request
- * for a single file upload and takes care of adding the Authorization header and redirecting on
- * authorization errors as we do for normal fetch operations.
- */
-export function redirectingAuthorizedUpload(
-  xhr: XMLHttpRequest,
-  url: string,
-  file: File,
-  onProgress: (event: ProgressEvent<EventTarget>) => void
-): Promise<void> {
-  return new Promise((resolve, reject) => {
-    xhr.open('POST', url, true);
-    const accessToken = getStorage().getItem(ACCESS_TOKEN);
-    if (accessToken) {
-      xhr.withCredentials = true;
-      xhr.setRequestHeader('Authorization', 'Bearer ' + accessToken);
-    }
-    xhr.upload.onprogress = onProgress;
-    xhr.onload = function () {
-      if (xhr.status === 401 || xhr.status === 403) {
-        history.push('/unauthorized');
-      } else {
-        resolve();
-      }
-    };
-    xhr.onerror = function () {
-      reject(new DOMException('Error', 'UploadError'));
-    };
-    xhr.onabort = function () {
-      reject(new DOMException('Aborted', 'AbortError'));
-    };
-    const formData = new FormData();
-    formData.append('file', file);
-    xhr.send(formData);
-  });
-}
-
-/**
- * Wraps the normal fetch routine which redirects on 401 response.
- */
-export function redirectingAuthorizedFetch(
-  url: RequestInfo,
-  params?: RequestInit
-): Promise<Response> {
-  return new Promise<Response>((resolve, reject) => {
-    authorizedFetch(url, params)
-      .then((response) => {
-        if (response.status === 401 || response.status === 403) {
-          history.push('/unauthorized');
-        } else {
-          resolve(response);
-        }
-      })
-      .catch((error) => {
-        reject(error);
-      });
-  });
-}
-
-export function addAccessTokenParameter(url: string) {
-  const accessToken = getStorage().getItem(ACCESS_TOKEN);
-  if (!accessToken) {
-    return url;
-  }
-  const parsedUrl = new URL(url);
-  parsedUrl.searchParams.set(ACCESS_TOKEN, accessToken);
-  return parsedUrl.toString();
-}

interface/src/authentication/AuthenticationContext.tsx

@@ -1,77 +0,0 @@
-import * as React from 'react';
-
-export interface Me {
-  username: string;
-  admin: boolean;
-}
-
-export interface AuthenticationContextValue {
-  refresh: () => void;
-  signIn: (accessToken: string) => void;
-  signOut: () => void;
-  me?: Me;
-}
-
-const AuthenticationContextDefaultValue = {} as AuthenticationContextValue;
-export const AuthenticationContext = React.createContext(
-  AuthenticationContextDefaultValue
-);
-
-export interface AuthenticationContextProps {
-  authenticationContext: AuthenticationContextValue;
-}
-
-export function withAuthenticationContext<T extends AuthenticationContextProps>(
-  Component: React.ComponentType<T>
-) {
-  return class extends React.Component<
-    Omit<T, keyof AuthenticationContextProps>
-  > {
-    render() {
-      return (
-        <AuthenticationContext.Consumer>
-          {(authenticationContext) => (
-            <Component
-              {...(this.props as T)}
-              authenticationContext={authenticationContext}
-            />
-          )}
-        </AuthenticationContext.Consumer>
-      );
-    }
-  };
-}
-
-export interface AuthenticatedContextValue extends AuthenticationContextValue {
-  me: Me;
-}
-
-const AuthenticatedContextDefaultValue = {} as AuthenticatedContextValue;
-export const AuthenticatedContext = React.createContext(
-  AuthenticatedContextDefaultValue
-);
-
-export interface AuthenticatedContextProps {
-  authenticatedContext: AuthenticatedContextValue;
-}
-
-export function withAuthenticatedContext<T extends AuthenticatedContextProps>(
-  Component: React.ComponentType<T>
-) {
-  return class extends React.Component<
-    Omit<T, keyof AuthenticatedContextProps>
-  > {
-    render() {
-      return (
-        <AuthenticatedContext.Consumer>
-          {(authenticatedContext) => (
-            <Component
-              {...(this.props as T)}
-              authenticatedContext={authenticatedContext}
-            />
-          )}
-        </AuthenticatedContext.Consumer>
-      );
-    }
-  };
-}

interface/src/authentication/AuthenticationWrapper.tsx

@@ -1,135 +0,0 @@
-import * as React from 'react';
-import { withSnackbar, WithSnackbarProps } from 'notistack';
-import jwtDecode from 'jwt-decode';
-
-import history from '../history';
-import { VERIFY_AUTHORIZATION_ENDPOINT } from '../api';
-import { ACCESS_TOKEN, authorizedFetch, getStorage } from './Authentication';
-import {
-  AuthenticationContext,
-  AuthenticationContextValue,
-  Me
-} from './AuthenticationContext';
-import FullScreenLoading from '../components/FullScreenLoading';
-import { withFeatures, WithFeaturesProps } from '../features/FeaturesContext';
-
-export const decodeMeJWT = (accessToken: string): Me =>
-  jwtDecode(accessToken) as Me;
-
-interface AuthenticationWrapperState {
-  context: AuthenticationContextValue;
-  initialized: boolean;
-}
-
-type AuthenticationWrapperProps = WithSnackbarProps & WithFeaturesProps;
-
-class AuthenticationWrapper extends React.Component<
-  AuthenticationWrapperProps,
-  AuthenticationWrapperState
-> {
-  constructor(props: AuthenticationWrapperProps) {
-    super(props);
-    this.state = {
-      context: {
-        refresh: this.refresh,
-        signIn: this.signIn,
-        signOut: this.signOut
-      },
-      initialized: false
-    };
-  }
-
-  componentDidMount() {
-    this.refresh();
-  }
-
-  render() {
-    return (
-      <React.Fragment>
-        {this.state.initialized
-          ? this.renderContent()
-          : this.renderContentLoading()}
-      </React.Fragment>
-    );
-  }
-
-  renderContent() {
-    return (
-      <AuthenticationContext.Provider value={this.state.context}>
-        {this.props.children}
-      </AuthenticationContext.Provider>
-    );
-  }
-
-  renderContentLoading() {
-    return <FullScreenLoading />;
-  }
-
-  refresh = () => {
-    // commented out, always need security - proddy
-    // if (!this.props.features.security) {
-    //   this.setState({ initialized: true, context: { ...this.state.context, me: { admin: true, username: "admin" } } });
-    //   return;
-    // }
-    const accessToken = getStorage().getItem(ACCESS_TOKEN);
-    if (accessToken) {
-      authorizedFetch(VERIFY_AUTHORIZATION_ENDPOINT)
-        .then((response) => {
-          const me =
-            response.status === 200 ? decodeMeJWT(accessToken) : undefined;
-          this.setState({
-            initialized: true,
-            context: { ...this.state.context, me }
-          });
-        })
-        .catch((error) => {
-          this.setState({
-            initialized: true,
-            context: { ...this.state.context, me: undefined }
-          });
-          this.props.enqueueSnackbar(
-            'Error verifying authorization: ' + error.message,
-            {
-              variant: 'error'
-            }
-          );
-        });
-    } else {
-      this.setState({
-        initialized: true,
-        context: { ...this.state.context, me: undefined }
-      });
-    }
-  };
-
-  signIn = (accessToken: string) => {
-    try {
-      getStorage().setItem(ACCESS_TOKEN, accessToken);
-      const me: Me = decodeMeJWT(accessToken);
-      this.setState({ context: { ...this.state.context, me } });
-      this.props.enqueueSnackbar(`Logged in as ${me.username}`, {
-        variant: 'success'
-      });
-    } catch (err) {
-      this.setState({
-        initialized: true,
-        context: { ...this.state.context, me: undefined }
-      });
-      throw new Error('Failed to parse JWT ' + err.message);
-    }
-  };
-
-  signOut = () => {
-    getStorage().removeItem(ACCESS_TOKEN);
-    this.setState({
-      context: {
-        ...this.state.context,
-        me: undefined
-      }
-    });
-    this.props.enqueueSnackbar('You have signed out', { variant: 'success' });
-    history.push('/');
-  };
-}
-
-export default withFeatures(withSnackbar(AuthenticationWrapper));

interface/src/authentication/UnauthenticatedRoute.tsx

@@ -1,47 +0,0 @@
-import * as React from 'react';
-import {
-  Redirect,
-  Route,
-  RouteProps,
-  RouteComponentProps
-} from 'react-router-dom';
-
-import {
-  withAuthenticationContext,
-  AuthenticationContextProps
-} from './AuthenticationContext';
-import * as Authentication from './Authentication';
-import { WithFeaturesProps, withFeatures } from '../features/FeaturesContext';
-
-interface UnauthenticatedRouteProps
-  extends RouteProps,
-    AuthenticationContextProps,
-    WithFeaturesProps {
-  component:
-    | React.ComponentType<RouteComponentProps<any>>
-    | React.ComponentType<any>;
-}
-
-type RenderComponent = (props: RouteComponentProps<any>) => React.ReactNode;
-
-class UnauthenticatedRoute extends Route<UnauthenticatedRouteProps> {
-  public render() {
-    const {
-      authenticationContext,
-      component: Component,
-      features,
-      ...rest
-    } = this.props;
-    const renderComponent: RenderComponent = (props) => {
-      if (authenticationContext.me) {
-        return <Redirect to={Authentication.fetchLoginRedirect(features)} />;
-      }
-      if (Component) {
-        return <Component {...props} />;
-      }
-    };
-    return <Route {...rest} render={renderComponent} />;
-  }
-}
-
-export default withFeatures(withAuthenticationContext(UnauthenticatedRoute));

interface/src/authentication/index.ts

@@ -1,6 +0,0 @@
-export { default as AuthenticatedRoute } from './AuthenticatedRoute';
-export { default as AuthenticationWrapper } from './AuthenticationWrapper';
-export { default as UnauthenticatedRoute } from './UnauthenticatedRoute';
-
-export * from './Authentication';
-export * from './AuthenticationContext';

interface/src/components/ApplicationError.tsx

@@ -1,59 +0,0 @@
-import React, { FC } from 'react';
-import { makeStyles } from '@material-ui/styles';
-import { Paper, Typography, Box, CssBaseline } from '@material-ui/core';
-import WarningIcon from '@material-ui/icons/Warning';
-
-const styles = makeStyles({
-  siteErrorPage: {
-    display: 'flex',
-    height: '100vh',
-    justifyContent: 'center',
-    flexDirection: 'column'
-  },
-  siteErrorPagePanel: {
-    textAlign: 'center',
-    padding: '280px 0 40px 0',
-    backgroundImage: 'url("/app/icon.png")',
-    backgroundRepeat: 'no-repeat',
-    backgroundPosition: '50% 40px',
-    backgroundSize: '200px auto',
-    width: '100%'
-  }
-});
-
-interface ApplicationErrorProps {
-  error?: string;
-}
-
-const ApplicationError: FC<ApplicationErrorProps> = ({ error }) => {
-  const classes = styles();
-  return (
-    <div className={classes.siteErrorPage}>
-      <CssBaseline />
-      <Paper className={classes.siteErrorPagePanel} elevation={10}>
-        <Box
-          display="flex"
-          flexDirection="row"
-          justifyContent="center"
-          alignItems="center"
-          mb={2}
-        >
-          <WarningIcon fontSize="large" color="error" />
-          <Box ml={2}>
-            <Typography variant="h4">Application error</Typography>
-          </Box>
-        </Box>
-        <Typography variant="subtitle1" gutterBottom>
-          Failed to configure the application, please refresh to try again.
-        </Typography>
-        {error && (
-          <Typography variant="subtitle2" gutterBottom>
-            Error: {error}
-          </Typography>
-        )}
-      </Paper>
-    </div>
-  );
-};
-
-export default ApplicationError;

interface/src/components/ButtonRow.tsx

@@ -0,0 +1,25 @@
+import { Box } from '@mui/material';
+import type { BoxProps } from '@mui/material';
+import type { FC } from 'react';
+
+const ButtonRow: FC<BoxProps> = ({ children, ...rest }) => (
+  <Box
+    sx={{
+      '& button, & a, & .MuiCard-root': {
+        mt: 2,
+        mx: 0.6,
+        '&:last-child': {
+          mr: 0
+        },
+        '&:first-of-type': {
+          ml: 0
+        }
+      }
+    }}
+    {...rest}
+  >
+    {children}
+  </Box>
+);
+
+export default ButtonRow;

interface/src/components/ErrorButton.tsx

@@ -1,11 +0,0 @@
-import { Button, styled } from '@material-ui/core';
-
-const ErrorButton = styled(Button)(({ theme }) => ({
-  color: theme.palette.getContrastText(theme.palette.error.main),
-  backgroundColor: theme.palette.error.main,
-  '&:hover': {
-    backgroundColor: theme.palette.error.dark
-  }
-}));
-
-export default ErrorButton;