fix: save cmd channel into hook context to avoid desync

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dbclient"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2021"
 
 [dependencies]

src/ui4/app_state.rs

@@ -2,9 +2,9 @@ use std::{sync::Arc, time::Duration};
 
 use iocraft::{
     component,
-    components::{Text, View},
+    components::View,
     element,
-    hooks::{UseFuture, UseState, UseTerminalEvents, UseTerminalSize},
+    hooks::{UseFuture, UseState, UseTerminalSize},
     AnyElement, Hooks, Props,
 };
 use tokio::sync::Mutex;
@@ -115,8 +115,6 @@ pub fn AppContainer(
                             queries_client: props.queries_client.clone(),
                             objects_client: props.objects_client.clone(),
                             state: props.state.clone(),
-                            query_result_cmd_pipe: props.query_result_cmd_pipe.clone(),
-                            query_result_cmd_receiver: props.query_result_cmd_receiver.take(),
                         )
                     }
                 },

src/ui4/components/table_view.rs

@@ -5,8 +5,7 @@ use iocraft::{
     components::{BorderStyle, ScrollView, ScrollViewHandle, Text, View},
     element,
     hooks::{UseRef, UseState},
-    AnyElement, Color, Edges, FlexDirection, Hooks, KeyCode, KeyEventKind, KeyModifiers,
-    Props,
+    AnyElement, Color, Edges, FlexDirection, Hooks, KeyCode, KeyEventKind, KeyModifiers, Props,
 };
 
 use crate::{core::proto::common::db_field::Field, ui4::control::UseHotkeys};

src/ui4/query_area.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use iocraft::{component, components::View, element, AnyElement, Props};
+use iocraft::{component, components::View, element, hooks::UseState, AnyElement, Hooks, Props};
 use tokio::sync::Mutex;
 
 use crate::{
@@ -17,12 +17,22 @@ pub struct QueryAreaProps {
     pub objects_client: Option<Arc<dyn proto::objects::ObjectsService + Send + Sync>>,
     pub queries_client: Option<Arc<dyn proto::queries::QueriesService + Send + Sync>>,
     pub state: Arc<Mutex<AppState>>,
-    pub query_result_cmd_pipe: Option<tokio::sync::mpsc::Sender<QueryResultCmd>>,
-    pub query_result_cmd_receiver: Option<tokio::sync::mpsc::Receiver<QueryResultCmd>>,
 }
 
 #[component]
-pub fn QueryArea(props: &mut QueryAreaProps) -> impl Into<AnyElement<'static>> {
+pub async fn QueryArea(
+    props: &mut QueryAreaProps,
+    mut hooks: Hooks,
+) -> impl Into<AnyElement<'static>> {
+    let chan = hooks.use_state(|| {
+        let (query_result_cmd_sender, query_result_cmd_reader) =
+            tokio::sync::mpsc::channel::<QueryResultCmd>(10);
+        return (
+            query_result_cmd_sender,
+            Arc::new(Mutex::new(query_result_cmd_reader)),
+        );
+    });
+
     element! {
         View (
             width: 100pct,
@@ -31,7 +41,7 @@ pub fn QueryArea(props: &mut QueryAreaProps) -> impl Into<AnyElement<'static>> {
             View (width: 30pct) {
                 DbObjects(
                     objects_client: props.objects_client.clone(),
-                    cmd_pipe: props.query_result_cmd_pipe.clone(),
+                    cmd_pipe: Some(chan.read().0.clone()),
                     state: props.state.clone()
                 )
             }
@@ -41,8 +51,8 @@ pub fn QueryArea(props: &mut QueryAreaProps) -> impl Into<AnyElement<'static>> {
                     queries_client: props.queries_client.clone(),
                     objects_client: props.objects_client.clone(),
                     state: props.state.clone(),
-                    cmd_pipe: props.query_result_cmd_pipe.clone(),
-                    cmd_receiver: props.query_result_cmd_receiver.take(),
+                    cmd_pipe: Some(chan.read().0.clone()),
+                    cmd_receiver: Some(chan.read().1.clone()),
                 )
             }
         }

src/ui4/query_result.rs

@@ -36,7 +36,7 @@ pub struct QueryResultProps {
     pub objects_client: Option<Arc<dyn proto::objects::ObjectsService + Send + Sync>>,
     pub state: Arc<Mutex<AppState>>,
     pub cmd_pipe: Option<tokio::sync::mpsc::Sender<QueryResultCmd>>,
-    pub cmd_receiver: Option<tokio::sync::mpsc::Receiver<QueryResultCmd>>,
+    pub cmd_receiver: Option<Arc<Mutex<tokio::sync::mpsc::Receiver<QueryResultCmd>>>>,
 }
 
 #[component]
@@ -58,15 +58,19 @@ pub fn QueryResult(
             View
         };
     };
-    let cmd_receiver = props.cmd_receiver.take();
-    hooks.use_future(async move {
-        let Some(mut cmd_receiver) = cmd_receiver else {
-            return;
+    let Some(cmd_receiver) = props.cmd_receiver.clone() else {
+        // TODO: maybe log this branch
+        return element! {
+            View
         };
+    };
+    hooks.use_future(async move {
         loop {
-            tokio::time::sleep(Duration::from_millis(50)).await; // TODO: move to channels instead
-                                                                 // of shared state
-            match cmd_receiver.recv().await {
+            let cmd = {
+                let mut receiver = cmd_receiver.lock().await;
+                receiver.recv().await
+            };
+            match cmd {
                 Some(QueryResultCmd::ExecuteRawQuery) => {
                     todo!()
                 }