Merge branch 'master' of ssh://gitea.communiquons.org:52001/pierre/SolarEnergy

central_backend/Cargo.lock

@@ -492,9 +492,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
 
 [[package]]
 name = "asn1"
@@ -670,6 +670,7 @@ dependencies = [
  "bincode",
  "chrono",
  "clap",
+ "dotenvy",
  "env_logger",
  "foreign-types-shared",
  "fs4",
@@ -997,6 +998,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
 [[package]]
 name = "encode_unicode"
 version = "1.0.0"
@@ -2298,9 +2305,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.131"
+version = "1.0.129"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3"
+checksum = "6dbcf9b78a125ee667ae19388837dd12294b858d101fdd393cb9d5501ef09eb2"
 dependencies = [
  "itoa",
  "memchr",

central_backend/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 log = "0.4.22"
 env_logger = "0.11.5"
 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"

central_backend/src/app_config.rs

@@ -39,8 +39,12 @@ pub enum ConsumptionBackend {
     /// Fronius inverter consumption
     Fronius {
         /// The origin of the domain where the webserver of the Fronius Symo can be reached
-        #[clap(short, long, env = "FRONIUS_ORIG")]
+        #[clap(short, long, env)]
-        origin: String,
+        fronius_orig: String,
+
+        /// Use cURL instead of reqwest to perform request
+        #[clap(short, long)]
+        curl: bool,
     },
 }
 

central_backend/src/energy/consumption.rs

@@ -9,6 +9,8 @@ pub enum ConsumptionError {
     NonExistentFile,
     #[error("The file that should contain the consumption has an invalid content!")]
     FileInvalidContent(#[source] ParseIntError),
+    #[error("Failed to execute cURL request!")]
+    CurlReqFailed,
 }
 
 pub type EnergyConsumption = i32;
@@ -63,9 +65,21 @@ pub async fn get_curr_consumption() -> anyhow::Result<EnergyConsumption> {
                 .map_err(ConsumptionError::FileInvalidContent)?)
         }
 
-        ConsumptionBackend::Fronius { origin } => {
+        ConsumptionBackend::Fronius { fronius_orig, curl } => {
-            let url = format!("{origin}/solar_api/v1/GetPowerFlowRealtimeData.fcgi");
+            let url = format!("{fronius_orig}/solar_api/v1/GetPowerFlowRealtimeData.fcgi");
-            let response = reqwest::get(url).await?.json::<FroniusResponse>().await?;
+
+            let response = match curl {
+                false => reqwest::get(url).await?.json::<FroniusResponse>().await?,
+                true => {
+                    let res = std::process::Command::new("curl").arg(url).output()?;
+
+                    if !res.status.success() {
+                        return Err(ConsumptionError::CurlReqFailed.into());
+                    }
+
+                    serde_json::from_slice::<FroniusResponse>(&res.stdout)?
+                }
+            };
 
             Ok(response.body.data.site.grid_production as i32)
         }

docs/SETUP_PROD.md

@@ -91,7 +91,7 @@ FRONIUS_ORIG=http://10.0.0.10
 Run the following command to check if the configuration is working:
 
 ```bash
-sudo -u central central_backend -c /home/central/config.yaml
+sudo -u central central_backend -c /home/central/config.yaml fronius -c
 ```
 
 ### Create systemd unit file
@@ -109,7 +109,7 @@ Type=simple
 User=central
 Group=central
 WorkingDirectory=/home/central
-ExecStart=/usr/local/bin/central_backend -c /home/central/config.yaml
+ExecStart=/usr/local/bin/central_backend -c /home/central/config.yaml fronius -c
 Restart=always
 Environment=USER=central 
 HOME=/home/central