split messages up based on state, refactored backend to decouple states more

frontend/src/context.rs

@@ -1,7 +1,6 @@
 use ewebsock::WsEvent;
 use macroquad::prelude::{error, info};
-
-use crate::model::{ClientMessage, ClientRequest, GameResponse};
+use serde::{Serialize, de::DeserializeOwned};
 
 pub struct Context {
     pub sender: ewebsock::WsSender,
@@ -22,16 +21,12 @@ impl Context {
         }
     }
 
-    pub fn send_msg(&mut self, msg: &ClientMessage) {
-        let request = ClientRequest {
-            token: self.token.clone(),
-            msg: msg.clone(),
-        };
-        let msg = serde_json::to_string(&request).unwrap();
+    pub fn send_msg<T: Serialize>(&mut self, msg: &T) {
+        let msg = serde_json::to_string(msg).unwrap();
         self.sender.send(ewebsock::WsMessage::Text(msg));
     }
 
-    pub fn recv_msg(&mut self) -> Option<GameResponse> {
+    pub fn recv_msg<T: DeserializeOwned>(&mut self) -> Option<T> {
         if let Some(msg) = self.reciever.try_recv() {
             match msg {
                 WsEvent::Opened => {
@@ -40,7 +35,7 @@ impl Context {
                 }
                 WsEvent::Message(ws_message) => match ws_message {
                     ewebsock::WsMessage::Text(msg) => {
-                        let game_resp: GameResponse = serde_json::from_str(&msg).unwrap();
+                        let game_resp: T = serde_json::from_str(&msg).unwrap();
 
                         Some(game_resp)
                     }