1 files changed, 20 insertions, 16 deletions

diff --git a/mumd/src/command.rs b/mumd/src/command.rs
index a035a26..075bfaf 100644
--- a/mumd/src/command.rs
+++ b/mumd/src/command.rs
@@ -1,10 +1,11 @@
-use crate::state::{State, StatePhase};
+use crate::state::State;
 
 use ipc_channel::ipc::IpcSender;
 use log::*;
 use mumlib::command::{Command, CommandResponse};
 use std::sync::{Arc, Mutex};
-use tokio::sync::mpsc;
+use tokio::sync::{mpsc, oneshot};
+use crate::network::tcp::{TcpEvent, TcpEventCallback};
 
 pub async fn handle(
     state: Arc<Mutex<State>>,
@@ -12,23 +13,26 @@ pub async fn handle(
         Command,
         IpcSender<mumlib::error::Result<Option<CommandResponse>>>,
     )>,
+    tcp_event_register_sender: mpsc::UnboundedSender<(TcpEvent, TcpEventCallback)>,
 ) {
     debug!("Begin listening for commands");
-    while let Some(command) = command_receiver.recv().await {
-        debug!("Received command {:?}", command.0);
+    while let Some((command, response_sender)) = command_receiver.recv().await {
+        debug!("Received command {:?}", command);
         let mut state = state.lock().unwrap();
-        let (wait_for_connected, command_response) = state.handle_command(command.0).await;
-        if wait_for_connected {
-            let mut watcher = state.phase_receiver();
-            drop(state);
-            while !matches!(watcher.recv().await.unwrap(), StatePhase::Connected) {}
+        let (event, generator) = state.handle_command(command).await;
+        drop(state);
+        if let Some(event) = event {
+            let (tx, rx) = oneshot::channel();
+            //TODO handle this error
+            let _ = tcp_event_register_sender.send((event, Box::new(move |e| {
+                let response = generator(Some(e));
+                response_sender.send(response).unwrap();
+                tx.send(()).unwrap();
+            })));
+
+            rx.await.unwrap();
+        } else {
+            response_sender.send(generator(None)).unwrap();
         }
-        command.1.send(command_response).unwrap();
     }
-    //TODO err if not connected
-    //while let Some(command) = command_receiver.recv().await {
-    //    debug!("Parsing command {:?}", command);
-    //}
-
-    //debug!("Finished handling commands");
 }