Update dependency @mui/icons-material to v6.1.8

central_backend/Cargo.lock

@@ -492,24 +492,34 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.90"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+
+[[package]]
+name = "arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+dependencies = [
+ "derive_arbitrary",
+]
 
 [[package]]
 name = "asn1"
-version = "0.17.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a10032de7d9e6f21c3f1cb1c9c0f94cf30ef67f38310588fe6cfa53e0d3f0"
+checksum = "18d97d0d2e60ad0595a73b82264dcd46c2f96769b0f555ae71c14122f0679f65"
 dependencies = [
  "asn1_derive",
+ "itoa",
 ]
 
 [[package]]
 name = "asn1_derive"
-version = "0.17.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3df30ecdcaf8338675a1413460a1b11df89789e1fcc6a10dc52f6e38b6982aa2"
+checksum = "00cec5ab4e9217b82bdd194bf6a4c74890a7e6d530159546bd83684f42211b8a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -644,10 +654,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "cc"
+name = "bzip2"
-version = "1.1.30"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
+dependencies = [
+ "bzip2-sys",
+ "libc",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.11+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
 dependencies = [
  "jobserver",
  "libc",
@@ -656,7 +687,7 @@ dependencies = [
 
 [[package]]
 name = "central_backend"
-version = "0.1.0"
+version = "1.0.2"
 dependencies = [
  "actix",
  "actix-cors",
@@ -692,10 +723,12 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yml",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tokio_schedule",
  "uuid",
+ "walkdir",
+ "zip",
 ]
 
 [[package]]
@@ -730,9 +763,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.20"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -740,9 +773,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.20"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
  "anstream",
  "anstyle",
@@ -774,6 +807,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
+[[package]]
+name = "constant_time_eq"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -823,6 +862,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crc"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
 [[package]]
 name = "crc32fast"
 version = "1.4.2"
@@ -923,6 +977,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "deflate64"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
+
 [[package]]
 name = "deranged"
 version = "0.3.11"
@@ -932,6 +992,17 @@ dependencies = [
  "powerfmt",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.18"
@@ -998,6 +1069,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -1106,9 +1188,9 @@ dependencies = [
 
 [[package]]
 name = "fs4"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec6fcfb3c0c1d71612528825042261419d5dade9678c39a781e05b63677d9b32"
+checksum = "e871a4cfa68bb224863b53149d973df1ac8d1ed2fa1d1bfc37ac1bb65dd37207"
 dependencies = [
  "rustix",
  "windows-sys 0.52.0",
@@ -1387,9 +1469,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1498,9 +1580,9 @@ dependencies = [
 
 [[package]]
 name = "impl-more"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d"
+checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0"
 
 [[package]]
 name = "indexmap"
@@ -1620,9 +1702,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
 
 [[package]]
 name = "libredox"
@@ -1677,12 +1759,28 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
 version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
+[[package]]
+name = "lzma-rs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e"
+dependencies = [
+ "byteorder",
+ "crc",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.4"
@@ -1878,6 +1976,16 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest",
+ "hmac",
+]
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -1955,9 +2063,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.87"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
  "unicode-ident",
 ]
@@ -2018,7 +2126,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2058,9 +2166,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.8"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -2178,9 +2286,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.14"
+version = "0.23.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
+checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
@@ -2200,9 +2308,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
@@ -2285,18 +2393,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2305,9 +2413,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.129"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbcf9b78a125ee667ae19388837dd12294b858d101fdd393cb9d5501ef09eb2"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -2388,6 +2496,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "simple_asn1"
 version = "0.6.2"
@@ -2396,7 +2510,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
 dependencies = [
  "num-bigint",
  "num-traits",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -2445,9 +2559,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2510,18 +2624,38 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+dependencies = [
+ "thiserror-impl 2.0.3",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2576,9 +2710,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2698,12 +2832,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
-dependencies = [
- "version_check",
-]
 
 [[package]]
 name = "unicode-bidi"
@@ -2773,9 +2904,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
  "serde",
@@ -3079,6 +3210,63 @@ name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zip"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
+dependencies = [
+ "aes",
+ "arbitrary",
+ "bzip2",
+ "constant_time_eq",
+ "crc32fast",
+ "crossbeam-utils",
+ "deflate64",
+ "displaydoc",
+ "flate2",
+ "hmac",
+ "indexmap",
+ "lzma-rs",
+ "memchr",
+ "pbkdf2",
+ "rand",
+ "sha1",
+ "thiserror 1.0.69",
+ "time",
+ "zeroize",
+ "zopfli",
+ "zstd",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
+]
 
 [[package]]
 name = "zstd"

central_backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "central_backend"
-version = "0.1.0"
+version = "1.0.2"
 edition = "2021"
 
 [dependencies]
@@ -10,26 +10,26 @@ lazy_static = "1.5.0"
 dotenvy = "0.15.7"
 clap = { version = "4.5.20", features = ["derive", "env"] }
 anyhow = "1.0.89"
-thiserror = "1.0.64"
+thiserror = "2.0.3"
 openssl = { version = "0.10.66" }
 openssl-sys = "0.9.102"
 libc = "0.2.159"
 foreign-types-shared = "0.1.1"
-asn1 = "0.17"
+asn1 = "0.19"
 actix-web = { version = "4", features = ["openssl"] }
 futures = "0.3.31"
-serde = { version = "1.0.210", features = ["derive"] }
+serde = { version = "1.0.215", features = ["derive"] }
 reqwest = { version = "0.12.7", features = ["json"] }
-serde_json = "1.0.128"
+serde_json = "1.0.131"
 rand = "0.8.5"
 actix = "0.13.5"
 actix-identity = "0.8.0"
 actix-session = { version = "0.10.1", features = ["cookie-session"] }
 actix-cors = "0.7.0"
-actix-multipart = { version ="0.7.2", features = ["derive"] }
+actix-multipart = { version = "0.7.2", features = ["derive"] }
 actix-remote-ip = "0.1.0"
 futures-util = "0.3.31"
-uuid = { version = "1.10.0", features = ["v4", "serde"] }
+uuid = { version = "1.11.0", features = ["v4", "serde"] }
 semver = { version = "1.0.23", features = ["serde"] }
 lazy-regex = "3.3.0"
 tokio = { version = "1.40.0", features = ["full"] }
@@ -41,4 +41,6 @@ prettytable-rs = "0.10.0"
 chrono = "0.4.38"
 serde_yml = "0.0.12"
 bincode = "=2.0.0-rc.3"
-fs4 = { version = "0.10.0", features = ["sync"] }
+fs4 = { version = "0.11.0", features = ["sync"] }
+zip = { version = "2.2.0", features = ["bzip2"] }
+walkdir = "2.5.0"

central_backend/src/app_config.rs

@@ -10,7 +10,7 @@ pub enum ConsumptionHistoryType {
 }
 
 /// Electrical consumption fetcher backend
-#[derive(Subcommand, Debug, Clone)]
+#[derive(Subcommand, Debug, Clone, serde::Serialize)]
 pub enum ConsumptionBackend {
     /// Constant consumption value
     Constant {
@@ -49,7 +49,7 @@ pub enum ConsumptionBackend {
 }
 
 /// Solar system central backend
-#[derive(Parser, Debug)]
+#[derive(Parser, Debug, serde::Serialize)]
 #[command(version, about, long_about = None)]
 pub struct AppConfig {
     /// Read arguments from env file
@@ -110,6 +110,18 @@ pub struct AppConfig {
     #[arg(short('f'), long, env, default_value_t = 5)]
     pub energy_fetch_interval: u64,
 
+    /// Custom current consumption title in dashboard
+    #[arg(long, env)]
+    pub dashboard_custom_current_consumption_title: Option<String>,
+
+    /// Custom relays consumption title in dashboard
+    #[arg(long, env)]
+    pub dashboard_custom_relays_consumption_title: Option<String>,
+
+    /// Custom cached consumption title in dashboard
+    #[arg(long, env)]
+    pub dashboard_custom_cached_consumption_title: Option<String>,
+
     /// Consumption backend provider
     #[clap(subcommand)]
     pub consumption_backend: Option<ConsumptionBackend>,

central_backend/src/energy/consumption.rs

@@ -71,7 +71,11 @@ pub async fn get_curr_consumption() -> anyhow::Result<EnergyConsumption> {
             let response = match curl {
                 false => reqwest::get(url).await?.json::<FroniusResponse>().await?,
                 true => {
-                    let res = std::process::Command::new("curl").arg(url).output()?;
+                    let res = std::process::Command::new("curl")
+                        .arg("--connect-timeout")
+                        .arg("1.5")
+                        .arg(url)
+                        .output()?;
 
                     if !res.status.success() {
                         return Err(ConsumptionError::CurlReqFailed.into());

central_backend/src/energy/energy_actor.rs

@@ -25,7 +25,14 @@ impl EnergyActor {
     pub async fn new() -> anyhow::Result<Self> {
         let consumption_cache_size =
             AppConfig::get().refresh_interval / AppConfig::get().energy_fetch_interval;
-        let curr_consumption = consumption::get_curr_consumption().await?;
+        let curr_consumption = match consumption::get_curr_consumption().await {
+            Ok(v) => v,
+            Err(e) => {
+                log::warn!("Failed to fetch consumption, using default value! {e}");
+                constants::FALLBACK_PRODUCTION_VALUE
+            }
+        };
+        log::info!("Initial consumption value: {curr_consumption}");
         let mut consumption_cache = ConsumptionCache::new(consumption_cache_size as usize);
         consumption_cache.add_value(curr_consumption);
 

central_backend/src/server/custom_error.rs

@@ -4,6 +4,7 @@ use actix_web::HttpResponse;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
 use std::io::ErrorKind;
+use zip::result::ZipError;
 
 /// Custom error to ease controller writing
 #[derive(Debug)]
@@ -109,6 +110,18 @@ impl From<openssl::error::ErrorStack> for HttpErr {
     }
 }
 
+impl From<ZipError> for HttpErr {
+    fn from(value: ZipError) -> Self {
+        HttpErr::Err(std::io::Error::new(ErrorKind::Other, value.to_string()).into())
+    }
+}
+
+impl From<walkdir::Error> for HttpErr {
+    fn from(value: walkdir::Error) -> Self {
+        HttpErr::Err(std::io::Error::new(ErrorKind::Other, value.to_string()).into())
+    }
+}
+
 impl From<HttpResponse> for HttpErr {
     fn from(value: HttpResponse) -> Self {
         HttpErr::HTTPResponse(value)

central_backend/src/server/servers.rs

@@ -243,6 +243,11 @@ pub async fn secure_server(energy_actor: EnergyActorAddr) -> anyhow::Result<()>
                 "/web_api/relay/{id}/status",
                 web::get().to(relays_controller::status_single),
             )
+            // Management API
+            .route(
+                "/web_api/management/download_storage",
+                web::get().to(management_controller::download_storage),
+            )
             // Devices API
             .route(
                 "/devices_api/utils/time",

central_backend/src/server/web_api/energy_controller.rs

@@ -9,14 +9,20 @@ use actix_web::HttpResponse;
 
 #[derive(serde::Serialize)]
 struct Consumption {
-    consumption: i32,
+    consumption: Option<i32>,
 }
 
 /// Get current energy consumption
 pub async fn curr_consumption() -> HttpResult {
-    let consumption = consumption::get_curr_consumption().await?;
+    Ok(match consumption::get_curr_consumption().await {
-
+        Ok(v) => HttpResponse::Ok().json(Consumption {
-    Ok(HttpResponse::Ok().json(Consumption { consumption }))
+            consumption: Some(v),
+        }),
+        Err(e) => {
+            log::error!("Failed to fetch current consumption! {e}");
+            HttpResponse::Ok().json(Consumption { consumption: None })
+        }
+    })
 }
 
 /// Get curr consumption history
@@ -34,7 +40,9 @@ pub async fn curr_consumption_history() -> HttpResult {
 pub async fn cached_consumption(energy_actor: WebEnergyActor) -> HttpResult {
     let consumption = energy_actor.send(energy_actor::GetCurrConsumption).await?;
 
-    Ok(HttpResponse::Ok().json(Consumption { consumption }))
+    Ok(HttpResponse::Ok().json(Consumption {
+        consumption: Some(consumption),
+    }))
 }
 
 /// Get current relays consumption
@@ -42,7 +50,9 @@ pub async fn relays_consumption(energy_actor: WebEnergyActor) -> HttpResult {
     let consumption =
         energy_actor.send(energy_actor::RelaysConsumption).await? as EnergyConsumption;
 
-    Ok(HttpResponse::Ok().json(Consumption { consumption }))
+    Ok(HttpResponse::Ok().json(Consumption {
+        consumption: Some(consumption),
+    }))
 }
 
 pub async fn relays_consumption_history() -> HttpResult {

central_backend/src/server/web_api/management_controller.rs

@@ -0,0 +1,66 @@
+use crate::app_config::AppConfig;
+use crate::server::custom_error::HttpResult;
+use crate::utils::time_utils::current_day;
+use actix_web::HttpResponse;
+use anyhow::Context;
+use std::fs::File;
+use std::io::{Cursor, Read, Write};
+use walkdir::WalkDir;
+use zip::write::SimpleFileOptions;
+
+/// Download a full copy of the storage data
+pub async fn download_storage() -> HttpResult {
+    let mut zip_buff = Cursor::new(Vec::new());
+    let mut zip = zip::ZipWriter::new(&mut zip_buff);
+
+    let options = SimpleFileOptions::default()
+        .compression_method(zip::CompressionMethod::Bzip2)
+        .unix_permissions(0o700);
+
+    let storage = AppConfig::get().storage_path();
+
+    let mut file_buff = Vec::new();
+    for entry in WalkDir::new(&storage) {
+        let entry = entry?;
+
+        let path = entry.path();
+        let name = path.strip_prefix(&storage).unwrap();
+        let path_as_string = name
+            .to_str()
+            .map(str::to_owned)
+            .with_context(|| format!("{name:?} Is a Non UTF-8 Path"))?;
+
+        // Write file or directory explicitly
+        // Some unzip tools unzip files with directory paths correctly, some do not!
+        if path.is_file() {
+            log::debug!("adding file {path:?} as {name:?} ...");
+            zip.start_file(path_as_string, options)?;
+            let mut f = File::open(path)?;
+
+            f.read_to_end(&mut file_buff)?;
+            zip.write_all(&file_buff)?;
+            file_buff.clear();
+        } else if !name.as_os_str().is_empty() {
+            // Only if not root! Avoids path spec / warning
+            // and mapname conversion failed error on unzip
+            log::debug!("adding dir {path_as_string:?} as {name:?} ...");
+            zip.add_directory(path_as_string, options)?;
+        }
+    }
+
+    // Inject runtime configuration
+    zip.start_file("/app_config.json", options)?;
+    zip.write_all(&serde_json::to_vec_pretty(&AppConfig::get())?)?;
+
+    zip.finish()?;
+
+    let filename = format!("storage-{}.zip", current_day());
+
+    Ok(HttpResponse::Ok()
+        .content_type("application/zip")
+        .insert_header((
+            "content-disposition",
+            format!("attachment; filename=\"{filename}\""),
+        ))
+        .body(zip_buff.into_inner()))
+}

central_backend/src/server/web_api/mod.rs

@@ -2,6 +2,7 @@ pub mod auth_controller;
 pub mod devices_controller;
 pub mod energy_controller;
 pub mod logging_controller;
+pub mod management_controller;
 pub mod ota_controller;
 pub mod relays_controller;
 pub mod server_controller;

central_backend/src/server/web_api/server_controller.rs

@@ -13,6 +13,10 @@ struct ServerConfig {
     auth_disabled: bool,
     constraints: StaticConstraints,
     unsecure_origin: String,
+    backend_version: &'static str,
+    dashboard_custom_current_consumption_title: Option<&'static str>,
+    dashboard_custom_relays_consumption_title: Option<&'static str>,
+    dashboard_custom_cached_consumption_title: Option<&'static str>,
 }
 
 impl Default for ServerConfig {
@@ -21,6 +25,16 @@ impl Default for ServerConfig {
             auth_disabled: AppConfig::get().unsecure_disable_login,
             constraints: Default::default(),
             unsecure_origin: AppConfig::get().unsecure_origin(),
+            backend_version: env!("CARGO_PKG_VERSION"),
+            dashboard_custom_current_consumption_title: AppConfig::get()
+                .dashboard_custom_current_consumption_title
+                .as_deref(),
+            dashboard_custom_relays_consumption_title: AppConfig::get()
+                .dashboard_custom_relays_consumption_title
+                .as_deref(),
+            dashboard_custom_cached_consumption_title: AppConfig::get()
+                .dashboard_custom_cached_consumption_title
+                .as_deref(),
         }
     }
 }

central_backend/src/utils/time_utils.rs

@@ -41,6 +41,12 @@ pub fn time_start_of_day() -> anyhow::Result<u64> {
     Ok(local.timestamp() as u64)
 }
 
+/// Get formatted string containing current day information
+pub fn current_day() -> String {
+    let dt = Local::now();
+    format!("{}-{:0>2}-{:0>2}", dt.year(), dt.month(), dt.day())
+}
+
 #[cfg(test)]
 mod test {
     use crate::utils::time_utils::day_number;

central_frontend/package.json

@@ -15,10 +15,10 @@
     "@fontsource/roboto": "^5.1.0",
     "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
-    "@mui/icons-material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
-    "@mui/x-charts": "^7.20.0",
+    "@mui/x-charts": "^7.21.0",
-    "@mui/x-date-pickers": "^7.20.0",
+    "@mui/x-date-pickers": "^7.21.0",
     "@types/semver": "^7.5.8",
     "date-and-time": "^3.6.0",
     "dayjs": "^1.11.13",
@@ -31,13 +31,13 @@
   "devDependencies": {
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.1",
-    "@typescript-eslint/eslint-plugin": "^8.8.0",
+    "@typescript-eslint/eslint-plugin": "^8.15.0",
-    "@typescript-eslint/parser": "^8.8.0",
+    "@typescript-eslint/parser": "^8.10.0",
     "@vitejs/plugin-react": "^4.3.2",
-    "eslint": "^8.57.1",
+    "eslint": "^9.0.0",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.12",
     "typescript": "^5.6.3",
-    "vite": "^5.4.8"
+    "vite": "^5.4.9"
   }
 }

central_frontend/src/App.tsx

@@ -16,6 +16,7 @@ import { PendingDevicesRoute } from "./routes/PendingDevicesRoute";
 import { RelaysListRoute } from "./routes/RelaysListRoute";
 import { BaseAuthenticatedPage } from "./widgets/BaseAuthenticatedPage";
 import { OTARoute } from "./routes/OTARoute";
+import { ManagementRoute } from "./routes/ManagementRoute";
 
 export function App() {
   if (!AuthApi.SignedIn && !ServerApi.Config.auth_disabled)
@@ -31,6 +32,7 @@ export function App() {
         <Route path="relays" element={<RelaysListRoute />} />
         <Route path="ota" element={<OTARoute />} />
         <Route path="logs" element={<LogsRoute />} />
+        <Route path="management" element={<ManagementRoute />} />
         <Route path="*" element={<NotFoundRoute />} />
       </Route>
     )

central_frontend/src/api/ServerApi.ts

@@ -4,6 +4,10 @@ export interface ServerConfig {
   auth_disabled: boolean;
   constraints: ServerConstraint;
   unsecure_origin: string;
+  backend_version: string;
+  dashboard_custom_current_consumption_title?: string;
+  dashboard_custom_relays_consumption_title?: string;
+  dashboard_custom_cached_consumption_title?: string;
 }
 
 export interface ServerConstraint {

central_frontend/src/routes/DevicesRoute.tsx

@@ -81,7 +81,7 @@ function ValidatedDevicesList(p: {
       <Table sx={{ minWidth: 650 }} aria-label="simple table">
         <TableHead>
           <TableRow>
-            <TableCell>#</TableCell>
+            <TableCell>Name</TableCell>
             <TableCell align="center">Model</TableCell>
             <TableCell align="center">Version</TableCell>
             <TableCell align="center">Max relays</TableCell>
@@ -99,7 +99,7 @@ function ValidatedDevicesList(p: {
               onDoubleClick={() => navigate(DeviceURL(dev))}
             >
               <TableCell component="th" scope="row">
-                {dev.id}
+                {dev.name}
               </TableCell>
               <TableCell align="center">{dev.info.reference}</TableCell>
               <TableCell align="center">{dev.info.version}</TableCell>

central_frontend/src/routes/HomeRoute/CachedConsumptionWidget.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import { EnergyApi } from "../../api/EnergyApi";
 import { useSnackbar } from "../../hooks/context_providers/SnackbarProvider";
 import StatCard from "../../widgets/StatCard";
+import { ServerApi } from "../../api/ServerApi";
 
 export function CachedConsumptionWidget(): React.ReactElement {
   const snackbar = useSnackbar();
@@ -26,6 +27,12 @@ export function CachedConsumptionWidget(): React.ReactElement {
   });
 
   return (
-    <StatCard title="Cached consumption" value={val?.toString() ?? "Loading"} />
+    <StatCard
+      title={
+        ServerApi.Config.dashboard_custom_cached_consumption_title ??
+        "Cached consumption"
+      }
+      value={val?.toString() ?? "Loading"}
+    />
   );
 }

central_frontend/src/routes/HomeRoute/CurrConsumptionWidget.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import { EnergyApi } from "../../api/EnergyApi";
 import { useSnackbar } from "../../hooks/context_providers/SnackbarProvider";
 import StatCard from "../../widgets/StatCard";
+import { ServerApi } from "../../api/ServerApi";
 
 export function CurrConsumptionWidget(): React.ReactElement {
   const snackbar = useSnackbar();
@@ -29,7 +30,10 @@ export function CurrConsumptionWidget(): React.ReactElement {
 
   return (
     <StatCard
-      title="Current consumption"
+      title={
+        ServerApi.Config.dashboard_custom_current_consumption_title ??
+        "Current consumption"
+      }
       data={history ?? []}
       interval="Last day"
       value={val?.toString() ?? "Loading"}

central_frontend/src/routes/HomeRoute/RelayConsumptionWidget.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import { EnergyApi } from "../../api/EnergyApi";
 import { useSnackbar } from "../../hooks/context_providers/SnackbarProvider";
 import StatCard from "../../widgets/StatCard";
+import { ServerApi } from "../../api/ServerApi";
 
 export function RelayConsumptionWidget(): React.ReactElement {
   const snackbar = useSnackbar();
@@ -29,7 +30,10 @@ export function RelayConsumptionWidget(): React.ReactElement {
 
   return (
     <StatCard
-      title="Relays consumption"
+      title={
+        ServerApi.Config.dashboard_custom_relays_consumption_title ??
+        "Relays consumption"
+      }
       data={history ?? []}
       interval="Last day"
       value={val?.toString() ?? "Loading"}

central_frontend/src/routes/ManagementRoute.tsx

@@ -0,0 +1,31 @@
+import { Button } from "@mui/material";
+import { useConfirm } from "../hooks/context_providers/ConfirmDialogProvider";
+import { SolarEnergyRouteContainer } from "../widgets/SolarEnergyRouteContainer";
+import { APIClient } from "../api/ApiClient";
+
+export function ManagementRoute(): React.ReactElement {
+  const confirm = useConfirm();
+
+  const downloadBackup = async () => {
+    try {
+      if (
+        !(await confirm(
+          `Do you really want to download a copy of the storage? It will contain sensitive information!`
+        ))
+      )
+        return;
+
+      location.href = APIClient.backendURL() + "/management/download_storage";
+    } catch (e) {
+      console.error(`Failed to donwload a backup of the storage! Error: ${e}`);
+    }
+  };
+
+  return (
+    <SolarEnergyRouteContainer label="Management">
+      <Button variant="outlined" onClick={downloadBackup}>
+        Download a backup of storage
+      </Button>
+    </SolarEnergyRouteContainer>
+  );
+}

central_frontend/src/widgets/SolarEnergyNavList.tsx

@@ -1,5 +1,6 @@
 import {
   mdiChip,
+  mdiCog,
   mdiElectricSwitch,
   mdiHome,
   mdiMonitorArrowDown,
@@ -12,9 +13,11 @@ import {
   ListItemButton,
   ListItemIcon,
   ListItemText,
+  Typography,
 } from "@mui/material";
 import { useLocation } from "react-router-dom";
 import { RouterLink } from "./RouterLink";
+import { ServerApi } from "../api/ServerApi";
 
 export function SolarEnergyNavList(): React.ReactElement {
   return (
@@ -52,6 +55,18 @@ export function SolarEnergyNavList(): React.ReactElement {
         uri="/logs"
         icon={<Icon path={mdiNotebookMultiple} size={1} />}
       />
+      <NavLink
+        label="Management"
+        uri="/management"
+        icon={<Icon path={mdiCog} size={1} />}
+      />
+      <Typography
+        variant="caption"
+        component="div"
+        style={{ textAlign: "center", width: "100%", marginTop: "30px" }}
+      >
+        Version {ServerApi.Config.backend_version}
+      </Typography>
     </List>
   );
 }

central_frontend/src/widgets/TimeWidget.tsx

@@ -21,7 +21,7 @@ export function timeDiff(a: number, b: number): string {
   diff = Math.floor(diff / 60);
 
   if (diff === 1) return "1 minute";
-  if (diff < 24) {
+  if (diff < 60) {
     return `${diff} minutes`;
   }
 

custom_consumption/Cargo.toml

@@ -7,6 +7,6 @@ edition = "2021"
 env_logger = "0.11.5"
 log = "0.4.22"
 clap = { version = "4.5.18", features = ["derive", "env"] }
-egui = "0.28.1"
+egui = "0.29.1"
-eframe = "0.28.1"
+eframe = "0.29.1"
 lazy_static = "1.5.0"

docs/SETUP_PROD.md

@@ -1,5 +1,7 @@
 # Configure project for production
 
+Note: This guide assumes that you use the default hostname, `central.internal` as hostname for your central system.
+
 ## Create production build
 
 ### Central
@@ -44,6 +46,70 @@ The OTA update is then located in `build/main.bin`
 * A server running a recent Linux (Debian / Ubuntu preferred) with `central` as hostname
 * DHCP configured on the network
 
+## Configure DNS server
+
+If you need to setup a DNS server / proxy to point `central.internal` to the central server IP, you can follow this guide.
+
+### Retrieve DNS server binary
+Use [DNSProxy](https://gitlab.com/pierre42100/dnsproxy) as DNS server. Get and compile the sources:
+
+```bash
+git clone https://gitlab.com/pierre42100/dnsproxy
+cd dnsproxy
+cargo build --release
+scp target/release/dns_proxy USER@CENTRAL_IP:/home/USER
+```
+
+Then, on the target server, install the binary to its final destination:
+
+```bash
+sudo mv dns_proxy /usr/local/bin/
+```
+
+### Configure DNS server
+Configure the server as a service `/etc/systemd/system/dns.service`:
+
+```conf
+[Unit]
+Description=DNS server
+After=syslog.target
+After=network.target
+
+[Service]
+RestartSec=2s
+Type=simple
+User=root
+Group=root
+WorkingDirectory=/tmp
+ExecStart=/usr/local/bin/dns_proxy -l "CENTRAL_IP:53" -c "central.internal. A CENTRAL_IP"
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Enable and start the new service:
+
+```bash
+sudo systemctl enable dns
+sudo systemctl start dns
+```
+
+Check that it works correctly:
+
+```bash
+dig central.internal. @CENTRAL_IP
+```
+
+You should get an entry like this if it works:
+
+```
+;; ANSWER SECTION:
+central.internal.	0	IN	A	CENTRAL_IP
+```
+
+Then, in your DHCP service, define the central as the DNS server.
+
 ## Configure server
 
 ### Create a user dedicated to the central
@@ -82,7 +148,7 @@ COOKIE_SECURE=true
 LISTEN_ADDRESS=0.0.0.0:443
 ADMIN_USERNAME=admin
 ADMIN_PASSWORD=FIXME
-HOSTNAME=central.local
+HOSTNAME=central.internal
 STORAGE=/home/central/storage
 FRONIUS_ORIG=http://10.0.0.10
 ```

esp32_device/main/constants.h

@@ -8,7 +8,7 @@
 /**
  * Backend unsecure API URL
  */
-#define BACKEND_UNSECURE_URL "http://devweb.internal:8080"
+#define BACKEND_UNSECURE_URL "http://central.internal:8080"
 
 /**
  * Device name len

esp32_device/version.txt

@@ -1 +1 @@
-1.0.0
+1.0.2-b1