From 3c21e9c0eb1faa20b96cf22ab4666dcf4963d75a Mon Sep 17 00:00:00 2001
From: Sahas Subramanian <sahas.subramanian@proton.me>
Date: Mon, 1 Sep 2025 17:06:22 +0200
Subject: [PATCH 1/2] Keep retrying on client connection error

When a streaming method was returning immediately, the client exited
leading to the logical meter exiting as well.

This commit fixes it.

Signed-off-by: Sahas Subramanian <sahas.subramanian@proton.me>
---
 src/client/microgrid_client_actor.rs | 35 ++++++++++++----------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/client/microgrid_client_actor.rs b/src/client/microgrid_client_actor.rs
index 51355ea..75a1fb8 100644
--- a/src/client/microgrid_client_actor.rs
+++ b/src/client/microgrid_client_actor.rs
@@ -148,7 +148,7 @@ async fn handle_instruction(
                 tx,
                 stream_status_tx,
             )
-            .await?;
+            .await;
 
             response_tx.send(rx).map_err(|_| {
                 tracing::error!("failed to send response");
@@ -220,7 +220,7 @@ async fn handle_retry_timer(
                     tx,
                     stream_status_tx.clone(),
                 )
-                .await?;
+                .await;
             } else {
                 tracing::error!("Component stream not found for retry: {component_id}");
                 return Err(Error::internal(format!(
@@ -239,7 +239,7 @@ async fn start_electrical_component_telemetry_stream(
     electrical_component_id: u64,
     tx: broadcast::Sender<ElectricalComponentTelemetry>,
     stream_status_tx: mpsc::Sender<StreamStatus>,
-) -> Result<(), Error> {
+) {
     let stream = match client
         .receive_electrical_component_telemetry_stream(
             ReceiveElectricalComponentTelemetryStreamRequest {
@@ -251,28 +251,24 @@ async fn start_electrical_component_telemetry_stream(
     {
         Ok(s) => s.into_inner(),
         Err(e) => {
-            stream_status_tx
+            let _ = stream_status_tx
                 .send(StreamStatus::Failed(electrical_component_id))
-                .await
-                .map_err(|e| {
-                    Error::connection_failure(format!(
-                        "receive_component_data_stream failed for {electrical_component_id}: {e}",
-                    ))
-                })?;
-            return Err(Error::connection_failure(format!(
-                "receive_component_data_stream failed for {electrical_component_id}: {e}",
-            )));
+                .await;
+
+            tracing::debug!("Failed to start telemetry stream for {electrical_component_id}: {e}",);
+            return;
         }
     };
 
-    stream_status_tx
+    if let Err(e) = stream_status_tx
         .send(StreamStatus::Connected(electrical_component_id))
         .await
-        .map_err(|e| {
-            Error::connection_failure(format!(
-                "Failed to send stream recovered message for {electrical_component_id}: {e}",
-            ))
-        })?;
+    {
+        tracing::error!(
+            "Failed to send stream connected message for {electrical_component_id}: {e}",
+        );
+        return;
+    }
 
     // create a task to fetch data from the stream in a loop and put into a channel.
     tokio::spawn(
@@ -284,7 +280,6 @@ async fn start_electrical_component_telemetry_stream(
         )
         .in_current_span(),
     );
-    Ok(())
 }
 
 async fn run_electrical_component_telemetry_stream(

From a773d051937499ede1a71c6da6645b1a8e1575b1 Mon Sep 17 00:00:00 2001
From: Sahas Subramanian <sahas.subramanian@proton.me>
Date: Mon, 1 Sep 2025 18:35:48 +0200
Subject: [PATCH 2/2] Allow `dead_code` in generated protobuf files

Signed-off-by: Sahas Subramanian <sahas.subramanian@proton.me>
---
 src/proto.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/proto.rs b/src/proto.rs
index d39985e..14afa2d 100644
--- a/src/proto.rs
+++ b/src/proto.rs
@@ -5,7 +5,11 @@
 
 mod graph;
 
-#[allow(clippy::doc_lazy_continuation, clippy::doc_overindented_list_items)]
+#[allow(
+    clippy::doc_lazy_continuation,
+    clippy::doc_overindented_list_items,
+    dead_code
+)]
 pub mod common {
     pub mod v1alpha8 {
         pub mod grid {
@@ -40,7 +44,11 @@ pub mod common {
     }
 }
 
-#[allow(clippy::doc_lazy_continuation, clippy::doc_overindented_list_items)]
+#[allow(
+    clippy::doc_lazy_continuation,
+    clippy::doc_overindented_list_items,
+    dead_code
+)]
 pub mod microgrid {
     pub mod v1alpha18 {
         #![allow(clippy::derive_partial_eq_without_eq)]