Fix dependencies conflict

.drone.yml

@@ -46,6 +46,11 @@ steps:
         path: /usr/local/cargo/registry
       - name: web_app
         path: /tmp/web_build
+      - name: releases
+        path: /tmp/releases
+    when:
+      event:
+        - tag
     depends_on:
       - backend_check
       - web_build
@@ -54,13 +59,41 @@ steps:
       - mv /tmp/web_build/dist static
       - cargo build --release
       - ls -lah target/release/central_backend
+      - mv target/release/central_backend /tmp/releases/central_backend
 
+  # Build ESP32 program
   - name: esp32_compile
     image: espressif/idf:v5.5.1
+    volumes:
+      - name: releases
+        path: /tmp/releases
     commands:
       - cd esp32_device
       - /opt/esp/entrypoint.sh idf.py build
       - ls -lah build/main.bin
+      - cp build/main.bin /tmp/releases/wt32-eth01.bin
+
+  # Auto-release to Gitea
+  - name: gitea_release
+    image: plugins/gitea-release
+    depends_on:
+    - backend_compile
+    - esp32_compile
+    when:
+      event:
+        - tag
+    volumes:
+      - name: releases
+        path: /tmp/releases
+    environment:
+      PLUGIN_API_KEY:
+        from_secret: GITEA_API_KEY # needs permission write:repository
+    settings:
+      base_url: https://gitea.communiquons.org
+      files:
+        - /tmp/releases/central_backend
+        - /tmp/releases/wt32-eth01.bin
+      checksum: sha512
 
 
 volumes:
@@ -68,3 +101,5 @@ volumes:
     temp: {}
   - name: web_app
     temp: {}
+  - name: releases
+    temp: {}

central_backend/Cargo.toml

@@ -1,27 +1,27 @@
 [package]
 name = "central_backend"
-version = "1.0.2"
+version = "1.0.3"
 edition = "2024"
 
 [dependencies]
-log = "0.4.28"
+log = "0.4.29"
 env_logger = "0.11.8"
 lazy_static = "1.5.0"
 dotenvy = "0.15.7"
-clap = { version = "4.5.50", features = ["derive", "env"] }
+clap = { version = "4.5.53", features = ["derive", "env"] }
 anyhow = "1.0.100"
 thiserror = "2.0.17"
-openssl = { version = "0.10.74" }
-openssl-sys = "0.9.110"
-libc = "0.2.177"
+openssl = { version = "0.10.75" }
+openssl-sys = "0.9.111"
+libc = "0.2.178"
 foreign-types-shared = "0.1.1"
 asn1 = "0.23.0"
-actix-web = { version = "4.11.0", features = ["openssl"] }
+actix-web = { version = "4.12.1", features = ["openssl"] }
 futures = "0.3.31"
 serde = { version = "1.0.228", features = ["derive"] }
 reqwest = { version = "0.12.24", features = ["json"] }
 serde_json = "1.0.145"
-rand = "0.10.0-rc.0"
+rand = "0.10.0-rc.5"
 actix = "0.13.5"
 actix-identity = "0.9.0"
 actix-session = { version = "0.11.0", features = ["cookie-session"] }
@@ -29,14 +29,14 @@ actix-cors = "0.7.1"
 actix-multipart = { version = "0.7.2", features = ["derive"] }
 actix-remote-ip = "0.1.0"
 futures-util = "0.3.31"
-uuid = { version = "1.18.1", features = ["v4", "serde"] }
+uuid = { version = "1.19.0", features = ["v4", "serde"] }
 semver = { version = "1.0.27", features = ["serde"] }
-lazy-regex = "3.4.1"
+lazy-regex = "3.4.2"
 tokio = { version = "1.48.0", features = ["full"] }
 tokio_schedule = "0.3.2"
 mime_guess = "2.0.5"
-rust-embed = "8.8.0"
-jsonwebtoken = { version = "10.1.0", features = ["use_pem", "rust_crypto"] }
+rust-embed = "8.9.0"
+jsonwebtoken = { version = "10.2.0", features = ["use_pem", "rust_crypto"] }
 prettytable-rs = "0.10.0"
 chrono = "0.4.42"
 serde_yml = "0.0.12"

central_backend/src/energy/energy_actor.rs

@@ -389,7 +389,7 @@ impl Handler<SynchronizeDevice> for EnergyActor {
 pub struct ResDevState {
     pub id: DeviceId,
     last_ping: u64,
-    online: bool,
+    pub online: bool,
 }
 
 /// Get the state of devices

central_backend/src/server/servers.rs

@@ -48,6 +48,10 @@ pub async fn unsecure_server(energy_actor: EnergyActorAddr) -> anyhow::Result<()
                 "/relay/{id}/legacy_state",
                 web::get().to(unsecure_relay_controller::legacy_state),
             )
+            .route(
+                "/relay/relays_full_state",
+                web::get().to(unsecure_relay_controller::relays_full_state),
+            )
     })
     .bind(&AppConfig::get().unsecure_listen_address)?
     .run()

central_backend/src/server/unsecure_server/unsecure_relay_controller.rs

@@ -1,5 +1,6 @@
 use crate::devices::device::DeviceRelayID;
-use crate::energy::{energy_actor, relay_state_history};
+use crate::energy::engine::RelayForcedState;
+use crate::energy::{consumption, energy_actor, relay_state_history};
 use crate::server::WebEnergyActor;
 use crate::server::custom_error::HttpResult;
 use actix_web::{HttpResponse, web};
@@ -58,3 +59,78 @@ pub async fn legacy_state(
         required_uptime: relay.daily_runtime.map(|r| r.min_runtime).unwrap_or(0),
     }))
 }
+
+#[derive(serde::Serialize)]
+pub struct FullRelayState {
+    /// Indicates if the relay (or its parent device) is enabled or not
+    enabled: bool,
+    /// Indicate if the device is online or not
+    online: bool,
+    /// Indicates if relay is on or off
+    is_on: bool,
+    /// Relay name
+    name: String,
+    /// Relay priority (0 = lowest)
+    priority: usize,
+    /// Duration since last change of state
+    r#for: usize,
+    /// Total uptime since last reset
+    total_uptime: usize,
+    /// Required uptime during a day (in seconds)
+    daily_requirement: Option<usize>,
+    /// Forced relay state
+    relay_forced_state: RelayForcedState,
+}
+
+#[derive(serde::Serialize)]
+pub struct RelaysFullState {
+    /// Current global consumption, if successful
+    curr_consumption: Option<i32>,
+    /// Cached consumption
+    cached_consumption: i32,
+    /// Total relays consumptions
+    relays_consumption: usize,
+    /// Individual relays state
+    relays: Vec<FullRelayState>,
+}
+
+pub async fn relays_full_state(energy_actor: WebEnergyActor) -> HttpResult {
+    let cached_consumption = energy_actor.send(energy_actor::GetCurrConsumption).await?;
+    let relays_consumption = energy_actor.send(energy_actor::RelaysConsumption).await?;
+    let curr_consumption = consumption::get_curr_consumption().await.ok();
+    let devices = energy_actor.send(energy_actor::GetDeviceLists).await?;
+    let devices_state = energy_actor.send(energy_actor::GetDevicesState).await?;
+    let mut relays = energy_actor.send(energy_actor::GetRelaysList).await?;
+    relays.sort_by_key(|r| -(r.priority as i64));
+    let relays_state = energy_actor.send(energy_actor::GetAllRelaysState).await?;
+
+    Ok(HttpResponse::Ok().json(RelaysFullState {
+        curr_consumption,
+        cached_consumption,
+        relays_consumption,
+        relays: relays
+            .into_iter()
+            .map(|r| {
+                let device = devices
+                    .iter()
+                    .find(|d| d.relays.iter().any(|sr| sr.id == r.id))
+                    .expect("All relay shall have an associated device!");
+                let device_state = devices_state.iter().find(|s| s.id == device.id);
+                let relay_state = relays_state.iter().find(|s| s.id == r.id);
+                FullRelayState {
+                    enabled: r.enabled && device.enabled,
+                    online: device_state.map(|d| d.online).unwrap_or(false),
+                    is_on: relay_state.map(|s| s.on).unwrap_or(false),
+                    name: r.name,
+                    priority: r.priority,
+                    r#for: relay_state.map(|s| s.r#for).unwrap_or(0),
+                    total_uptime: 0,
+                    daily_requirement: r.daily_runtime.map(|r| r.min_runtime),
+                    relay_forced_state: relay_state
+                        .map(|s| s.forced_state.clone())
+                        .unwrap_or_default(),
+                }
+            })
+            .collect(),
+    }))
+}

central_frontend/package.json

@@ -12,34 +12,34 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@fontsource/roboto": "^5.2.8",
+    "@fontsource/roboto": "^5.2.9",
     "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
-    "@mui/icons-material": "^7.3.4",
-    "@mui/material": "^7.3.4",
-    "@mui/x-charts": "^8.15.0",
-    "@mui/x-date-pickers": "^8.15.0",
-    "date-and-time": "^4.1.0",
-    "dayjs": "^1.11.18",
+    "@mui/icons-material": "^7.3.6",
+    "@mui/material": "^7.3.6",
+    "@mui/x-charts": "^8.21.0",
+    "@mui/x-date-pickers": "^8.21.0",
+    "date-and-time": "^4.1.1",
+    "dayjs": "^1.11.19",
     "filesize": "^11.0.13",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
-    "react-router-dom": "^7.9.4",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
+    "react-router-dom": "^7.10.1",
     "semver": "^7.7.3"
   },
   "devDependencies": {
-    "@types/react": "^19.2.2",
-    "@types/react-dom": "^19.2.2",
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
     "@types/semver": "^7.7.1",
-    "@typescript-eslint/eslint-plugin": "^8.46.2",
-    "@typescript-eslint/parser": "^8.46.2",
-    "@vitejs/plugin-react": "^5.1.0",
-    "eslint": "^9.38.0",
+    "@typescript-eslint/eslint-plugin": "^8.49.0",
+    "@typescript-eslint/parser": "^8.49.0",
+    "@vitejs/plugin-react": "^5.1.2",
+    "eslint": "^9.39.1",
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-react-refresh": "^0.4.24",
-    "globals": "^16.4.0",
+    "globals": "^16.5.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.2",
-    "vite": "^7.1.12"
+    "typescript-eslint": "^8.49.0",
+    "vite": "^7.2.7"
   }
 }

central_frontend/src/api/RelayApi.ts

@@ -1,10 +1,19 @@
 import { APIClient } from "./ApiClient";
 import { Device, DeviceRelay } from "./DeviceApi";
 
+export type RelayForcedState =
+  | { type: "None" }
+  | { type: "Off" | "On"; until: number };
+
+export type SetRelayForcedState =
+  | { type: "None" }
+  | { type: "Off" | "On"; for_secs: number };
+
 export interface RelayStatus {
   id: string;
   on: boolean;
   for: number;
+  forced_state: RelayForcedState;
 }
 
 export type RelaysStatus = Map<string, RelayStatus>;
@@ -48,6 +57,20 @@ export class RelayApi {
     });
   }
 
+  /**
+   * Set relay forced state
+   */
+  static async SetForcedState(
+    relay: DeviceRelay,
+    forced: SetRelayForcedState
+  ): Promise<void> {
+    await APIClient.exec({
+      method: "PUT",
+      uri: `/relay/${relay.id}/forced_state`,
+      jsonData: forced,
+    });
+  }
+
   /**
    * Delete a relay configuration
    */

central_frontend/src/dialogs/SelectForcedStateDurationDialog.tsx

@@ -0,0 +1,53 @@
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+  TextField,
+} from "@mui/material";
+import { DeviceRelay } from "../api/DeviceApi";
+import React from "react";
+
+export function SelectForcedStateDurationDialog(p: {
+  relay: DeviceRelay;
+  forcedState: string;
+  onCancel: () => void;
+  onSubmit: (duration: number) => void;
+}): React.ReactElement {
+  const [duration, setDuration] = React.useState(60);
+
+  return (
+    <Dialog open onClose={p.onCancel}>
+      <DialogTitle>Set forced relay state</DialogTitle>
+      <DialogContent>
+        <DialogContentText>
+          Please specify the number of minutes the relay <i>{p.relay.name}</i>{" "}
+          will remain in forced state <i>{p.forcedState}</i>:
+        </DialogContentText>
+
+        <TextField
+          label="Duration (min)"
+          variant="standard"
+          value={Math.floor(duration / 60)}
+          onChange={(e) => {
+            const val = Number.parseInt(e.target.value);
+            setDuration((Number.isNaN(val) ? 1 : val) * 60);
+          }}
+          fullWidth
+          style={{ marginTop: "5px" }}
+        />
+
+        <p>Equivalent in seconds: {duration} secs</p>
+        <p>Equivalent in hours: {duration / 3600} hours</p>
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={p.onCancel}>Cancel</Button>
+        <Button onClick={() => p.onSubmit(duration)} autoFocus>
+          Start timer
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+}

central_frontend/src/routes/DeviceRoute/DeviceRelays.tsx

@@ -10,16 +10,16 @@ import {
 } from "@mui/material";
 import React from "react";
 import { Device, DeviceRelay } from "../../api/DeviceApi";
+import { RelayApi, RelayStatus } from "../../api/RelayApi";
 import { EditDeviceRelaysDialog } from "../../dialogs/EditDeviceRelaysDialog";
-import { DeviceRouteCard } from "./DeviceRouteCard";
+import { useAlert } from "../../hooks/context_providers/AlertDialogProvider";
 import { useConfirm } from "../../hooks/context_providers/ConfirmDialogProvider";
 import { useLoadingMessage } from "../../hooks/context_providers/LoadingMessageProvider";
-import { RelayApi, RelayStatus } from "../../api/RelayApi";
 import { useSnackbar } from "../../hooks/context_providers/SnackbarProvider";
-import { useAlert } from "../../hooks/context_providers/AlertDialogProvider";
 import { AsyncWidget } from "../../widgets/AsyncWidget";
-import { TimeWidget } from "../../widgets/TimeWidget";
 import { BoolText } from "../../widgets/BoolText";
+import { TimeWidget } from "../../widgets/TimeWidget";
+import { DeviceRouteCard } from "./DeviceRouteCard";
 
 export function DeviceRelays(p: {
   device: Device;
@@ -145,7 +145,8 @@ function RelayEntryStatus(
       errMsg="Failed to load relay status!"
       build={() => (
         <>
-          <BoolText val={state!.on} positive="ON" negative="OFF" /> for{" "}
+          <BoolText val={state!.on} positive="ON" negative="OFF" />{" "}
+          {state?.forced_state.type !== "None" && <b>Forced</b>} for{" "}
           <TimeWidget diff time={state!.for} />
         </>
       )}

central_frontend/src/routes/RelaysListRoute.tsx

@@ -16,12 +16,13 @@ import React from "react";
 import { useNavigate } from "react-router-dom";
 import { Device, DeviceApi, DeviceRelay, DeviceURL } from "../api/DeviceApi";
 import { RelayApi, RelaysStatus } from "../api/RelayApi";
+import { ServerApi } from "../api/ServerApi";
 import { AsyncWidget } from "../widgets/AsyncWidget";
 import { BoolText } from "../widgets/BoolText";
+import { CopyToClipboard } from "../widgets/CopyToClipboard";
+import { RelayForcedState } from "../widgets/RelayForcedState";
 import { SolarEnergyRouteContainer } from "../widgets/SolarEnergyRouteContainer";
 import { TimeWidget } from "../widgets/TimeWidget";
-import { CopyToClipboard } from "../widgets/CopyToClipboard";
-import { ServerApi } from "../api/ServerApi";
 
 export function RelaysListRoute(p: {
   homeWidget?: boolean;
@@ -104,6 +105,7 @@ function RelaysList(p: {
             <TableCell>Priority</TableCell>
             <TableCell>Consumption</TableCell>
             <TableCell>Status</TableCell>
+            <TableCell>Forced state</TableCell>
             <TableCell></TableCell>
           </TableRow>
         </TableHead>
@@ -129,6 +131,13 @@ function RelaysList(p: {
                 />{" "}
                 for <TimeWidget diff time={p.status.get(row.id)!.for} />
               </TableCell>
+              <TableCell>
+                <RelayForcedState
+                  relay={row}
+                  state={p.status.get(row.id)!}
+                  onUpdated={p.onReload}
+                />
+              </TableCell>
               <TableCell>
                 <Tooltip title="Copy legacy api status">
                   <CopyToClipboard

central_frontend/src/widgets/RelayForcedState.tsx

@@ -0,0 +1,79 @@
+import { MenuItem, Select, SelectChangeEvent } from "@mui/material";
+import { DeviceRelay } from "../api/DeviceApi";
+import { RelayApi, RelayStatus, SetRelayForcedState } from "../api/RelayApi";
+import { TimeWidget } from "./TimeWidget";
+import { useLoadingMessage } from "../hooks/context_providers/LoadingMessageProvider";
+import { useAlert } from "../hooks/context_providers/AlertDialogProvider";
+import { useSnackbar } from "../hooks/context_providers/SnackbarProvider";
+import React from "react";
+import { SelectForcedStateDurationDialog } from "../dialogs/SelectForcedStateDurationDialog";
+
+export function RelayForcedState(p: {
+  relay: DeviceRelay;
+  state: RelayStatus;
+  onUpdated: () => void;
+}): React.ReactElement {
+  const loadingMessage = useLoadingMessage();
+  const alert = useAlert();
+  const snackbar = useSnackbar();
+
+  const [futureStateType, setFutureStateType] = React.useState<
+    string | undefined
+  >();
+
+  const handleChange = (event: SelectChangeEvent) => {
+    if (event.target.value == "None") {
+      submitChange({ type: "None" });
+    } else {
+      setFutureStateType(event.target.value);
+    }
+  };
+
+  const submitChange = async (state: SetRelayForcedState) => {
+    try {
+      loadingMessage.show("Setting forced state...");
+      await RelayApi.SetForcedState(p.relay, state);
+      p.onUpdated();
+      snackbar("Forced state successfully updated!");
+    } catch (e) {
+      console.error(`Failed to set relay forced state! ${e}`);
+      alert(`Failed to set loading state for relay! ${e}`);
+    } finally {
+      loadingMessage.hide();
+    }
+  };
+
+  return (
+    <>
+      <Select
+        value={p.state.forced_state.type}
+        onChange={handleChange}
+        size="small"
+        variant="standard"
+      >
+        <MenuItem value={"None"}>None</MenuItem>
+        <MenuItem value={"Off"}>Off</MenuItem>
+        <MenuItem value={"On"}>On</MenuItem>
+      </Select>
+      {p.state.forced_state.type !== "None" && (
+        <>
+          <TimeWidget future time={p.state.forced_state.until} /> left
+        </>
+      )}
+
+      {futureStateType !== undefined && (
+        <SelectForcedStateDurationDialog
+          {...p}
+          forcedState={futureStateType}
+          onCancel={() => setFutureStateType(undefined)}
+          onSubmit={(d) =>
+            submitChange({
+              type: futureStateType as any,
+              for_secs: d,
+            })
+          }
+        />
+      )}
+    </>
+  );
+}

central_frontend/src/widgets/TimeWidget.tsx

@@ -51,13 +51,14 @@ export function timeDiff(a: number, b: number): string {
   return `${diffYears} years`;
 }
 
-export function timeDiffFromNow(t: number): string {
-  return timeDiff(t, time());
+export function timeDiffFromNow(t: number, future?: boolean): string {
+  return future ? timeDiff(time(), t) : timeDiff(t, time());
 }
 
 export function TimeWidget(p: {
   time?: number;
   diff?: boolean;
+  future?: boolean;
 }): React.ReactElement {
   if (!p.time) return <></>;
   return (
@@ -65,7 +66,9 @@ export function TimeWidget(p: {
       title={formatDate(p.diff ? new Date().getTime() / 1000 - p.time : p.time)}
       arrow
     >
-      <span>{p.diff ? timeDiff(0, p.time) : timeDiffFromNow(p.time)}</span>
+      <span>
+        {p.diff ? timeDiff(0, p.time) : timeDiffFromNow(p.time, p.future)}
+      </span>
     </Tooltip>
   );
 }

custom_consumption/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2024"
 
 [dependencies]
 env_logger = "0.11.8"
-log = "0.4.28"
-clap = { version = "4.5.50", features = ["derive", "env"] }
-egui = "0.32.3"
-eframe = "0.32.3"
+log = "0.4.29"
+clap = { version = "4.5.53", features = ["derive", "env"] }
+egui = "0.33.2"
+eframe = "0.33.2"
 lazy_static = "1.5.0"

esp32_device/version.txt

@@ -1 +1 @@
-1.0.2
+1.0.3