change server destination

fix raspberry mesure temp command
pass clippy
2024-09-15 22:06:36 +02:00 · 2024-08-26 08:28:29 +02:00 · 2024-08-24 15:37:20 +02:00 · 2024-08-24 14:35:01 +02:00 · 2024-08-24 14:24:42 +02:00 · 2024-08-24 14:15:14 +02:00
10 changed files with 579 additions and 259 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,16 +1,69 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"

 [[package]]
 name = "cc"
-version = "1.0.68"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]

 [[package]]
 name = "cfg-if"
@@ -19,44 +72,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
-name = "cmake"
-version = "0.1.45"
+name = "core-foundation"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
- "cc",
+ "core-foundation-sys",
+ "libc",
 ]

+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
 [[package]]
 name = "device"
 version = "0.1.0"
 dependencies = [
- "paho-mqtt",
+ "rumqttc",
 ]

 [[package]]
-name = "futures"
-version = "0.3.15"
+name = "flume"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
 "futures-core",
 "futures-sink",
+ "spin",
 ]

 [[package]]
@@ -65,36 +111,6 @@ version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"

-[[package]]
-name = "futures-executor"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121"
-dependencies = [
- "autocfg",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "futures-sink"
 version = "0.3.15"
@@ -107,12 +123,6 @@ version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"

-[[package]]
-name = "futures-timer"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-
 [[package]]
 name = "futures-util"
 version = "0.3.15"
@@ -120,25 +130,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
 dependencies = [
 "autocfg",
- "futures-channel",
 "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
 "futures-task",
- "memchr",
 "pin-project-lite",
 "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
 "slab",
 ]

 [[package]]
-name = "libc"
-version = "0.2.95"
+name = "getrandom"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]

 [[package]]
 name = "log"
@@ -151,52 +181,50 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.4.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"

 [[package]]
-name = "openssl-sys"
-version = "0.9.63"
+name = "miniz_oxide"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
- "autocfg",
- "cc",
 "libc",
- "pkg-config",
- "vcpkg",
+ "wasi",
+ "windows-sys 0.48.0",
 ]

 [[package]]
-name = "paho-mqtt"
-version = "0.9.1"
+name = "object"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82fea0990fe54e75d575bbd9bc2ee5919fd10cc0b4a95f1967528083129fc4b"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
- "futures",
- "futures-timer",
- "libc",
- "log",
- "paho-mqtt-sys",
- "thiserror",
+ "memchr",
 ]

 [[package]]
-name = "paho-mqtt-sys"
-version = "0.5.0"
+name = "openssl-probe"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad9ac6a77a7e7c70cd51262b94ab666c9e4c38fb0f4201dba8d7f8589aa8ce4"
-dependencies = [
- "cmake",
- "openssl-sys",
-]
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

 [[package]]
 name = "pin-project-lite"
-version = "0.2.6"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"

 [[package]]
 name = "pin-utils"
@@ -204,48 +232,178 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

-[[package]]
-name = "pkg-config"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.9"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
 "proc-macro2",
 ]

+[[package]]
+name = "ring"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+dependencies = [
+ "cc",
+ "getrandom",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rumqttc"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d8941c6791801b667d52bfe9ff4fc7c968d4f3f9ae8ae7abdaaa1c966feafc8"
+dependencies = [
+ "bytes",
+ "flume",
+ "futures-util",
+ "log",
+ "rustls-native-certs",
+ "rustls-pemfile",
+ "rustls-webpki",
+ "thiserror",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustls"
+version = "0.21.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"

+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.72"
@@ -257,6 +415,17 @@ dependencies = [
 "unicode-xid",
 ]

+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.25"
@@ -274,9 +443,52 @@ checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.72",
 ]

+[[package]]
+name = "tokio"
+version = "1.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.2"
@@ -284,7 +496,145 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"

 [[package]]
-name = "vcpkg"
-version = "0.2.13"
+name = "untrusted"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,8 +3,9 @@ name = "device"
 version = "0.1.0"
 authors = ["Romulus21 <romain@delanoe.pro>"]
 edition = "2018"
+description = "Send metrics to MQTT server"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-paho-mqtt = "0.9"
+rumqttc = "0.23.0"
--- a/7
+++ b/7
@@ -0,0 +1,7 @@
+deploy:
+	cargo build --release
+	ssh raspiwork 'cd /home/pi/Scripts/rust_device && git pull && make build'
+	scp raspiwork:/home/pi/Scripts/rust_device/target/release/device raspiweb:/home/pi/Scripts/device
+
+build:
+	cargo build --release
--- a/README.md
+++ b/README.md
@@ -0,0 +1,4 @@
+to run, add this line to crontab:
+```
+*/5 * * * * cd /path/to/folder && ./device
+```
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,5 +0,0 @@
-git pull origin master
-cargo build --release
-cp target/release/device /home/pi/Scripts/
-rsync -avz target/release/device raspigladys:/home/pi/Scripts/
-
--- a/0
+++ b/0
--- a/src/device_var.rs
+++ b/src/device_var.rs
@@ -5,33 +5,29 @@ use std::io::{self, BufRead};
 use std::path::Path;

 pub fn read_env_var() {
-    let filename = "device.env";
-    let mut path = env::var("PWD").unwrap().to_string();
-    path.push('/');
-    path.push_str(filename);
-    println!("{}", path);
-
-    fs::read_to_string(path.clone())
-        .expect("Something went wrong reading the file : device.env");
+    let path = "device.env";
+    fs::read_to_string(path).expect("Something went wrong reading the file : device.env");

    if let Ok(lines) = read_lines(path) {
-        for line in lines {
-            if let Ok(var) = line {
-                let new_var: Vec<&str> = var.split('=').collect();
-                env::set_var(new_var[0], new_var[1]);
-            }
+        for var in lines.map_while(Result::ok) {
+            let new_var: Vec<&str> = var.split('=').collect();
+            env::set_var(new_var[0], new_var[1]);
        }
    }

-    // println!("\n");
-    // for (key, value) in env::vars() {
-    //     println!("{}: {}", key, value);
-    // }
-    // println!("\n");
+    /*
+        println!("\n");
+        for (key, value) in env::vars() {
+            println!("{}: {}", key, value);
+        }
+        println!("\n");
+    */
 }

 fn read_lines<P>(filename: P) -> io::Result<io::Lines<io::BufReader<File>>>
-where P: AsRef<Path>, {
+where
+    P: AsRef<Path>,
+{
    let file = File::open(filename)?;
    Ok(io::BufReader::new(file).lines())
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,25 +1,28 @@
-mod mqtt_pub;
-mod system_values;
-mod device_var;
-
 use std::env;

-extern crate paho_mqtt as mqtt;
+mod device_var;
+mod mqtt_pub;
+mod system_values;

 fn main() {
-
    device_var::read_env_var();

-    let mut cli = mqtt_pub::init_cli();
+    let mut count = 3;
+    let (mut cli, connection) = mqtt_pub::init_cli();

-    cli = mqtt_pub::publish_message(cli, "temperature", &system_values::get_temperature().to_string());
-    cli = mqtt_pub::publish_message(cli, "storage", &system_values::get_storage().to_string());
-    cli = mqtt_pub::publish_message(cli, "mem", &system_values::get_mem().to_string());
+    cli = mqtt_pub::publish_message(
+        cli,
+        "temperature",
+        system_values::get_temperature().to_string(),
+    );
+    cli = mqtt_pub::publish_message(cli, "storage", system_values::get_storage().to_string());
+    cli = mqtt_pub::publish_message(cli, "mem", system_values::get_mem().to_string());

    let battery = env::var("BATTERY").unwrap().to_string();
    if battery == "true" {
-        cli = mqtt_pub::publish_message(cli, "battery", &system_values::get_battery().to_string());
+        count = 4;
+        mqtt_pub::publish_message(cli, "battery", system_values::get_battery().to_string());
    }

-    mqtt_pub::disconnect(cli);
+    mqtt_pub::disconnect(connection, count);
 }
--- a/src/mqtt_pub.rs
+++ b/src/mqtt_pub.rs
@@ -1,75 +1,47 @@
-use std::{
-    env,
-    process,
-    time::Duration
-};
+use rumqttc::{Client, Connection, MqttOptions, QoS};
+use std::{env, time::Duration};

-// Define the qos.
-const QOS:i32 = 1;
+pub fn init_cli() -> (Client, Connection) {
+    let mut mqttoptions =
+        MqttOptions::new("test-1", env::var("MQTT_HOST").unwrap().to_string(), 1883);
+    mqttoptions.set_keep_alive(Duration::from_secs(1));
+    let (client, connection) = Client::new(mqttoptions, 10);

-pub fn init_cli() -> mqtt::Client {
-
-    let host = env::args().nth(1).unwrap_or_else(||
-        env::var("BROKER_ADDRESS").unwrap().to_string()
-    );
-
-    // Define the set of options for the create.
-    // Use an ID for a persistent session.
-    let create_opts = mqtt::CreateOptionsBuilder::new()
-        .server_uri(host)
-        .client_id(env::var("BROKER_CLIENT").unwrap().to_string())
-        .finalize();
-
-    // Create a client.
-    let cli = mqtt::Client::new(create_opts).unwrap_or_else(|err| {
-        println!("Error creating the client: {:?}", err);
-        process::exit(1);
-    });
-
-    // Define the set of options for the connection.
-    let conn_opts = mqtt::ConnectOptionsBuilder::new()
-        .keep_alive_interval(Duration::from_secs(20))
-        .clean_session(true)
-        .finalize();
-
-    // Connect and wait for it to complete or fail.
-    if let Err(e) = cli.connect(conn_opts) {
-        println!("Unable to connect:\n\t{:?}", e);
-        process::exit(1);
-    }
-
-    return cli;
+    (client, connection)
 }

-pub fn publish_message(cli: mqtt::Client, topic: &str, message: &str) -> mqtt::Client {
-    // let topic = get_topic_name(topic);
-    let msg = mqtt::Message::new(get_topic_name(topic), message, QOS);
-    let tok = cli.publish(msg);
-
-    if let Err(e) = tok {
-        println!("Error sending message: {:?}", e);
-    }
-
-    println!("{} : {}", topic, message);
-
-    return cli;
+pub fn publish_message(mut client: Client, topic: &str, payload: String) -> Client {
+    client
+        .publish(get_topic_name(topic), QoS::AtLeastOnce, true, payload)
+        .unwrap();
+    client
 }

-pub fn disconnect(cli: mqtt::Client) {
+pub fn disconnect(mut connection: Connection, count: usize) {
    // Disconnect from the broker.
-    let tok = cli.disconnect(None);
-    println!("Disconnect from the broker");
-    tok.unwrap();
+    for (i, notification) in connection.iter().enumerate() {
+        match notification {
+            Ok(notif) => {
+                println!("{i}. Notification = {notif:?}");
+                if i > count {
+                    return;
+                }
+            }
+            Err(error) => {
+                println!("{i}. Notification ERROR = {error:?}");
+                return;
+            }
+        }
+    }
 }

 pub fn get_topic_name(types: &str) -> String {
-
    let mut topic = env::var("SERVICE").unwrap().to_string();
    topic.push('/');
    let capteur = env::var("CAPTEUR").unwrap().to_string();
    topic.push_str(&capteur);
    topic.push('/');
-    topic.push_str(&types);
+    topic.push_str(types);

-    return topic;
-}
+    topic
+}
--- a/src/system_values.rs
+++ b/src/system_values.rs
@@ -1,68 +1,59 @@
-use std::{
-    env,
-    process::Command,
-};
+use std::{env, process::Command};

 pub fn get_temperature() -> f32 {
-
    let mut temperature = 0.0;
    let system = env::var("SYSTEM").unwrap().to_string();

    if system == "ubuntu" {
        let temperature_command = Command::new("cat")
            .arg("/sys/class/thermal/thermal_zone1/temp")
-            .output().unwrap_or_else(|e| {
-                panic!("failed to execute process: {}", e)
-        });
+            .output()
+            .unwrap_or_else(|e| panic!("failed to execute process: {}", e));

        let temperature_string = &String::from_utf8_lossy(&temperature_command.stdout)[..5];
        temperature = temperature_string.parse::<f32>().unwrap();
-        temperature = temperature / 1000.0;
+        temperature /= 1000.0;
    } else {
-        let temperature_command = Command::new("sudo")
-            .arg("/opt/vc/bin/vcgencmd")
+        let temperature_command = Command::new("/usr/bin/vcgencmd")
            .arg("measure_temp")
-            .output().unwrap_or_else(|e| {
-                panic!("failed to execute process: {}", e)
-        });
+            .output()
+            .unwrap_or_else(|e| panic!("failed to execute process: {}", e));

        let mut temperature_string = &String::from_utf8_lossy(&temperature_command.stdout)[5..];
        temperature_string = &temperature_string[..temperature_string.len() - 3];
        temperature += temperature_string.parse::<f32>().unwrap();
    }

-    return temperature;
+    temperature
 }

 pub fn get_storage() -> i8 {
    let storage_command = Command::new("df")
        .arg("-h")
        .arg("/")
-        .output().unwrap_or_else(|e| {
-            panic!("failed to execute process: {}", e)
-        });
+        .output()
+        .unwrap_or_else(|e| panic!("failed to execute process: {}", e));

    let storage_string = &String::from_utf8_lossy(&storage_command.stdout);
-    let vec_storage : Vec<&str> = storage_string.split_whitespace().collect();
-    let storage = (vec_storage[vec_storage.len() - 2][..2]).parse::<i8>().unwrap();
+    let vec_storage: Vec<&str> = storage_string.split_whitespace().collect();
+    let mut value = vec_storage[vec_storage.len() - 2].to_string();
+    value.pop();

-    return storage;
+    value.parse::<i8>().unwrap()
 }

 pub fn get_mem() -> i8 {
    let mem_command = Command::new("free")
-    .arg("-m")
-    .output().unwrap_or_else(|e| {
-        panic!("failed to execute process: {}", e)
-    });
+        .arg("-m")
+        .output()
+        .unwrap_or_else(|e| panic!("failed to execute process: {}", e));

    let mem_string = &String::from_utf8_lossy(&mem_command.stdout);
-    let vec_mem : Vec<&str> = mem_string.split_whitespace().collect();
-    let total =  vec_mem[7].parse::<f32>().unwrap();
-    let mem_use =  vec_mem[8].parse::<f32>().unwrap();
-    let result = (mem_use / total * 100.0) as i8;
+    let vec_mem: Vec<&str> = mem_string.split_whitespace().collect();
+    let total = vec_mem[7].parse::<f32>().unwrap();
+    let mem_use = vec_mem[8].parse::<f32>().unwrap();

-    return result;
+    (mem_use / total * 100.0) as i8
 }

 pub fn get_battery() -> i8 {
@@ -71,14 +62,15 @@ pub fn get_battery() -> i8 {

    if system == "ubuntu" {
        let battery_command = Command::new("cat")
-        .arg("/sys/class/power_supply/BAT0/capacity")
-        .output().unwrap_or_else(|e| {
-            panic!("failed to execute process: {}", e)
-        });
+            .arg("/sys/class/power_supply/BAT1/capacity")
+            .output()
+            .unwrap_or_else(|e| panic!("failed to execute process: {}", e));

        let battery_string = &String::from_utf8_lossy(&battery_command.stdout);
-        battery = (&battery_string[..battery_string.len() - 1]).parse::<i8>().unwrap();
+        battery = (battery_string[..battery_string.len() - 1])
+            .parse::<i8>()
+            .unwrap();
    }

-    return battery;
+    battery
 }
Author	SHA1	Message	Date
Romulus21	0fc8f81c7a	change server destination	2024-09-15 22:06:36 +02:00
Romulus21	9276925e8b	fix raspberry mesure temp command	2024-08-26 08:28:29 +02:00
Romulus21	261a29d3bf	pass clippy	2024-08-24 15:37:20 +02:00
Romulus21	7518a715ba	finish new deploy	2024-08-24 14:35:01 +02:00
Romulus21	ccca8d05a0	test new deploy	2024-08-24 14:24:42 +02:00
Romulus21	244c6f6ca6	fix env file call	2024-08-24 14:15:14 +02:00
Romulus21	03f888c4a7	test gitea	2024-02-22 08:35:19 +01:00
Romulus21	23f53d39a2	finish with rumqtt	2024-02-17 23:25:21 +01:00
Romulus21	664e57cead	up request	2022-03-14 22:13:01 +01:00
Romulus21	76185d4327	partial device.env path	2021-06-05 22:01:40 +02:00