From e0151c3cde357ca8fc42aca27fbcb41d3cc8f84a Mon Sep 17 00:00:00 2001 From: Paul van Tilburg Date: Sun, 15 Jan 2023 14:48:24 +0100 Subject: [PATCH] Set last updated field to what is returned by API In Hoymiles, the date of the last update is part of the API response. Parse it and use that in `Status` instead of the timestamp provided by the update loop. Add a depend on the `chrono` crate for this. --- Cargo.lock | 191 +++++++++++++++++++++++++++++++++++++-- Cargo.toml | 1 + src/services/hoymiles.rs | 22 ++++- 3 files changed, 206 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 393126d..4ba1e7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,6 +52,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "async-stream" version = "0.3.3" @@ -182,6 +191,22 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + [[package]] name = "cipher" version = "0.4.3" @@ -192,6 +217,16 @@ dependencies = [ "inout", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "color-eyre" version = "0.6.2" @@ -233,7 +268,7 @@ dependencies = [ "rand", "sha2", "subtle", - "time", + "time 0.3.17", "version_check", ] @@ -249,7 +284,7 @@ dependencies = [ "publicsuffix", "serde", "serde_json", - "time", + "time 0.3.17", "url", ] @@ -298,6 +333,50 @@ dependencies = [ "cipher", ] +[[package]] +name = "cxx" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "devise" version = "0.3.1" @@ -528,7 +607,7 @@ checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -685,6 +764,30 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "idna" version = "0.2.3" @@ -780,6 +883,15 @@ version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + [[package]] name = "lock_api" version = "0.4.9" @@ -867,7 +979,7 @@ checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys", ] @@ -919,6 +1031,25 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + [[package]] name = "num_cpus" version = "1.15.0" @@ -1310,7 +1441,7 @@ dependencies = [ "serde_json", "state", "tempfile", - "time", + "time 0.3.17", "tokio", "tokio-stream", "tokio-util", @@ -1357,7 +1488,7 @@ dependencies = [ "smallvec", "stable-pattern", "state", - "time", + "time 0.3.17", "tokio", "uncased", ] @@ -1401,6 +1532,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + [[package]] name = "security-framework" version = "2.7.0" @@ -1525,6 +1662,7 @@ dependencies = [ name = "solar-grabber" version = "0.2.0" dependencies = [ + "chrono", "color-eyre", "enum_dispatch", "md-5", @@ -1591,6 +1729,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + [[package]] name = "thread_local" version = "1.1.4" @@ -1600,6 +1747,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + [[package]] name = "time" version = "0.3.17" @@ -1846,6 +2004,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + [[package]] name = "unicode-xid" version = "0.2.4" @@ -1901,6 +2065,12 @@ dependencies = [ "try-lock", ] +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1999,6 +2169,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index 6bd831a..e8914b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,7 @@ repository = "https://git.luon.net/paul/solar-grabber" license = "MIT" [dependencies] +chrono = { version = "0.4.23", features = ["serde"] } color-eyre = "0.6.2" enum_dispatch = "0.3.9" md-5 = "0.10.5" diff --git a/src/services/hoymiles.rs b/src/services/hoymiles.rs index a1d3617..8ab4e82 100644 --- a/src/services/hoymiles.rs +++ b/src/services/hoymiles.rs @@ -6,6 +6,7 @@ use std::sync::Arc; +use chrono::{DateTime, Local, TimeZone}; use md5::{Digest, Md5}; use reqwest::{cookie::Jar as CookieJar, Client, ClientBuilder, Url}; use rocket::async_trait; @@ -17,6 +18,9 @@ use crate::Status; /// The base URL of Hoymiles API gateway. const BASE_URL: &str = "https://global.hoymiles.com/platform/api/gateway"; +/// The date/time format used by the Hoymiles API. +const DATE_TIME_FORMAT: &str = "%Y-%m-%d %H:%M:%S"; + /// The interval between data polls (in seconds). const POLL_INTERVAL: u64 = 300; @@ -101,6 +105,18 @@ where } } +/// Deserialize a string ([`&str`]) into a date/time ([`DateTime`]). +fn from_date_time_str<'de, D>(deserializer: D) -> Result, D::Error> +where +D: Deserializer<'de>, +D::Error: serde::de::Error { + use serde::de::Error; + + let s = <&str>::deserialize(deserializer)?; + Local.datetime_from_str(s, DATE_TIME_FORMAT) + .map_err(D::Error::custom) +} + /// Deserializes a string ([`&str`]) into a float ([`f32`]). /// /// This is used for the API responses where the value is a float put into a string. @@ -237,7 +253,8 @@ struct ApiDataResponseData { // co2_emission_reducation: f32, // plant_tree: u32, // data_time: String, - // last_data_time: String, + #[serde(deserialize_with = "from_date_time_str")] + last_data_time: DateTime, // capacitor: f32, // is_balance: bool, // is_reflux: bool, @@ -289,7 +306,7 @@ impl super::Service for Service { /// It needs the cookies from the login to be able to perform the action. /// It uses a endpoint to construct the [`Status`] struct, but it needs to summarize the today /// value with the total value because Hoymiles only includes it after the day has finished. - async fn update(&mut self, last_updated: u64) -> Result { + async fn update(&mut self, _last_updated: u64) -> Result { let api_url = api_url().expect("valid API power URL"); let api_data_request = ApiDataRequest::new(self.config.sid); let api_response = self @@ -308,6 +325,7 @@ impl super::Service for Service { }; let current_w = api_data.real_power; let mut total_kwh = (api_data.total_eq + api_data.today_eq) / 1000.0; + let last_updated = api_data.last_data_time.timestamp() as u64; // Sometimes it can be that `today_eq` is reset when the day switches but it has not been // added to `total_eq` yet. The `total_eq` should always be non-decreasing, so return the