We can now fetch games

Kapsyloffer · Jan 22, 2024 · c3bb009 · c3bb009
1 parent a9be07d
commit c3bb009
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 6 deletions.
diff --git a/html/game.html b/html/game.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <title>Hello, world!</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1" />
+  <meta name="description" content="" />
+  <link rel="icon" href="favicon.png">
+  <script>
+    var url = window.location.href;
+    var res = url.split("/");
+    var pos = res.indexOf('game');
+    var gameUrl = res[pos+1];
+    alert(gameUrl);
+    const ws = new WebSocket("ws://localhost:3000/ws");
+    let current_game = null;
+    ws.onopen = (event) => {
+      {
+          const fetchGameMsg = {
+          type: "FetchGame",
+          url: gameUrl
+        };
+        ws.send(JSON.stringify(fetchGameMsg));
+      }
+    };
+
+    ws.onmessage = (event) => {
+      const msg = JSON.parse(event.data);
+      console.log(event.data);
+    }
+  </script>
+</head>
+
+<body>
+  <h1>Hello, world!</h1>
+</body>
+</html>
diff --git a/src/api/tests.rs b/src/api/tests.rs
@@ -6,4 +6,4 @@
         [3,0][3,1][3,2][3,3] <--- Black start
 
         Så vi tar cur_pos och flyttar till new_pos
-*/
+*/
diff --git a/src/api/web_sockets.rs b/src/api/web_sockets.rs
@@ -22,6 +22,9 @@ enum GamePacket {
     GameCreated {
         id: String,
     },
+    FetchGame{
+        url: String
+    }
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
@@ -36,7 +39,7 @@ struct Action {
 }
 
 pub async fn handler(ws: WebSocketUpgrade, State(state): State<GameHodler>) -> Response {
-    ws.on_upgrade(|socket| handle_socket(socket, state))
+    return ws.on_upgrade(|socket| handle_socket(socket, state));
 }
 
 pub async fn handle_socket(mut socket: WebSocket, game_hodler: GameHodler) {
@@ -76,6 +79,21 @@ pub async fn handle_socket(mut socket: WebSocket, game_hodler: GameHodler) {
                         return;
                     }
                 }
+                GamePacket::FetchGame { url } =>
+                {
+                    let mut games = game_hodler.games.lock().unwrap().clone();
+                    let Some(game) = games.get_mut(&url) else {
+                        return;
+                    };
+                    let state: String = serde_json::to_string(game).unwrap();
+                    if socket
+                        .send(Message::Text(state))
+                        .await
+                        .is_err()
+                    {
+                        return;
+                    }
+                }
                 GamePacket::Action { id, move_p, move_a } => {
                     let mut games = game_hodler.games.lock().unwrap();
                     let Some(game) = games.get_mut(&id) else {
@@ -87,14 +105,14 @@ pub async fn handle_socket(mut socket: WebSocket, game_hodler: GameHodler) {
                         .unwrap();
                     let moved_p: bool =
                         Tile::passive_move(board_p, (move_p.x1, move_p.y1), (move_p.x2, move_p.y2));
-                    //println!("moved_p: {moved_p}");
+                    println!("moved_p: {moved_p}");
 
                     let board_a = game
                         .get_board(move_a.home_colour, move_a.board_colour)
                         .unwrap();
                     let moved_a: bool =
                         Tile::passive_move(board_a, (move_a.x1, move_a.y1), (move_a.x2, move_a.y2));
-                    //println!("moved_a: {moved_a}");
+                    println!("moved_a: {moved_a}");
 
                     if moved_p && moved_a {
                         game.next_turn();
@@ -110,4 +128,4 @@ pub async fn handle_socket(mut socket: WebSocket, game_hodler: GameHodler) {
             }
         }
     }
-}
+}
diff --git a/src/main.rs b/src/main.rs
@@ -10,7 +10,7 @@ async fn main() {
     let app = Router::new()
         .route("/", get(root))
         .route("/ws", get(handler))
-        .route("/game/:id", get(handler)) //Join a game using URL
+        .route("/game/:id", get(fetch_game)) //Join a game using URL
         .with_state(GameHodler::new());
 
     let listener = tokio::net::TcpListener::bind("localhost:3000")
@@ -22,3 +22,9 @@ async fn main() {
 async fn root() -> impl IntoResponse {
     Html(include_str!("../html/index.html"))
 }
+
+
+async fn fetch_game() -> impl IntoResponse {
+    Html(include_str!("../html/game.html"))
+}
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ @@
             [3,0][3,1][3,2][3,3] <--- Black start
             Så vi tar cur_pos och flyttar till new_pos
-    */
+    */