Update link

UI/event

.github/workflows/dispatcher.yml

@@ -77,7 +77,7 @@ jobs:
 
 
   release:
-    needs: test-data-upload
+    needs: [engine, server, ui]
     if: github.ref == 'refs/heads/master'
     uses: ./.github/workflows/release.yml
     secrets: inherit

.github/workflows/release.yml

@@ -12,9 +12,6 @@ jobs:
     name: Build and release (master only)
     runs-on: self-hosted
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: Build Engine for Linux
         run: |
           cd $(git rev-parse --show-toplevel)

engine/src/bitboard.rs

@@ -8,3 +8,4 @@ mod movegen;
 pub mod board;
 pub(in super) mod bitmove;
 pub(in super) mod movebuffer;
+pub(in super) mod makemove;

engine/src/bitboard/board.rs

@@ -1,3 +1,5 @@
+use crate::bitboard::utils::notation_from_square_number;
+
 use super::utils::try_get_square_number_from_notation;
 
 pub struct Board {
@@ -12,6 +14,7 @@ pub struct Board {
 }
 
 impl Board {
+  pub const EMPTY_SQUARE: u8 = 12;
 
   pub fn new_clear() -> Self {
     let mut bit_board: Self = Self {
@@ -159,6 +162,57 @@ impl Board {
     return if self.side_to_move == 0 { self.bitboards[5].trailing_zeros() } else { self.bitboards[11].trailing_zeros() };
   }
 
+  pub fn fen(&self) -> String {
+    let mut fen = String::new();
+
+    for row in (0..8).rev() {
+      let mut empty = 0;
+      for col in 0..8 {
+        let sq = row * 8 + col;
+        if let Some(piece) = self.get_piece_character(sq) {
+          if empty > 0 {
+            fen.push_str(&empty.to_string());
+            empty = 0;
+          }
+          fen.push(piece);
+        } else {
+          empty += 1;
+          if col == 7 {
+            fen.push_str(&empty.to_string());
+          }
+        }
+      }
+      if row > 0 {
+        fen.push('/');
+      }
+    }
+
+    fen.push(' ');
+    if self.side_to_move() == 0 { fen.push('w'); } else { fen.push('b'); }
+
+    fen.push(' ');
+    if self.castling_rights() == 0 {
+      fen.push('-');
+    } else {
+      if self.castling_rights() & (1 << 3) != 0 { fen.push('K'); }
+      if self.castling_rights() & (1 << 2) != 0 { fen.push('Q'); }
+      if self.castling_rights() & (1 << 1) != 0 { fen.push('k'); }
+      if self.castling_rights() & (1 << 0) != 0 { fen.push('q'); }
+    }
+
+    fen.push(' ');
+    if self.en_passant_square() == 0 {
+      fen.push('-');
+    } else {
+      let sq = self.en_passant_square().trailing_zeros();
+      fen.push_str(&notation_from_square_number(sq as u8));
+    }
+
+    fen.push_str(" 0 1");
+
+    return fen;
+  }
+
   fn calc_occupancy(&mut self) {
     self.occupancy = [0u64; 3];
     for b in 0..6 {
@@ -196,4 +250,46 @@ impl Board {
        _  => ()
     }
   }
+  pub fn get_piece_character(&self, index: i32) -> Option<char> {
+    let sq = 1 << index;
+
+    if (self.bitboards[0] & sq) != 0 {
+      return Some('P');
+    }
+    if (self.bitboards[1] & sq) != 0 {
+      return Some('N');
+    }
+    if (self.bitboards[2] & sq) != 0 {
+      return Some('B');
+    }
+    if (self.bitboards[3] & sq) != 0 {
+      return Some('R');
+    }
+    if (self.bitboards[4] & sq) != 0 {
+      return Some('Q');
+    }
+    if (self.bitboards[5] & sq) != 0 {
+      return Some('K');
+    }
+    if (self.bitboards[6] & sq) != 0 {
+      return Some('p');
+    }
+    if (self.bitboards[7] & sq) != 0 {
+      return Some('n');
+    }
+    if (self.bitboards[8] & sq) != 0 {
+      return Some('b');
+    }
+    if (self.bitboards[9] & sq) != 0 {
+      return Some('r');
+    }
+    if (self.bitboards[10] & sq) != 0 {
+      return Some('q');
+    }
+    if (self.bitboards[11] & sq) != 0 {
+      return Some('k');
+    }
+
+    return None;
+  }
 }

engine/src/bitboard/makemove.rs

@@ -0,0 +1,38 @@
+mod quiets;
+mod captures;
+mod castles;
+
+use super::bitmove::BitMoveType;
+use super::bitmove::BitMove;
+use super::board::Board;
+
+impl Board {
+
+  #[inline]
+  pub fn make_move(&mut self, played_move: &BitMove) {
+    let move_type = played_move.move_type();
+
+    match move_type {
+      BitMoveType::Quiet => {
+        self.make_quiet(played_move);
+      }
+      BitMoveType::Capture => {
+        self.make_capture(played_move);
+      }
+      BitMoveType::Castle => {
+        self.make_castle(played_move);
+      }
+      BitMoveType::EnPassant => {
+        
+      }
+    }
+
+    self.occupancy[2] = self.occupancy[0] | self.occupancy[1];
+
+    if self.en_passant_square != 0 {
+      self.en_passant_square = 0u64;
+    }
+
+    self.side_to_move = 1 - self.side_to_move;
+  }
+}

engine/src/bitboard/makemove/captures.rs

@@ -0,0 +1,82 @@
+use super::*;
+
+impl Board {
+  pub fn make_capture(&mut self, played_move: &BitMove) {
+    let main_from: usize = played_move.from_square() as usize;
+    let main_to: usize = played_move.to_square() as usize;
+    let main_piece: usize = self.piece_board(main_from as u8) as usize;
+    let friendly_occupancy = main_piece/6;
+
+    let color_offset = self.side_to_move * 6;
+    let castling_offset = 2 - 2 * self.side_to_move as usize;
+    let castling_rights = self.castling_rights >> castling_offset;
+
+    let mut taken_piece = 0u8;
+
+    taken_piece = self.piece_board(main_to as u8);
+    let secondary_piece = taken_piece as usize;
+    let secondary_from = main_to;
+
+    let opponent_castling_offset = 2 * self.side_to_move as usize;
+    let opponent_castling_rights = self.castling_rights >> opponent_castling_offset;
+
+    let opponent_occupancy = 1 - self.side_to_move as usize;
+        
+    self.bitboards[main_piece] &= !(1 << main_from);
+    self.occupancy[friendly_occupancy] &= !(1 << main_from);
+    self.piece_board[main_from] = Self::EMPTY_SQUARE;
+
+    self.bitboards[secondary_piece] &= !(1 << secondary_from);
+    self.occupancy[opponent_occupancy] &= !(1 << secondary_from);
+    self.piece_board[secondary_from] = Self::EMPTY_SQUARE;
+
+    if opponent_castling_rights != 0
+      && secondary_piece == 9 - color_offset as usize{
+
+      let back_rank_offset = 56 - 56 * self.side_to_move as usize;
+      if opponent_castling_rights & 0b01 != 0
+        && secondary_from == back_rank_offset {
+          self.castling_rights &= !(1 << opponent_castling_offset);
+      }
+      else if opponent_castling_rights & 0b10 != 0
+        && secondary_from == 7 + back_rank_offset {
+          self.castling_rights &= !(2 << opponent_castling_offset);
+      }
+    }
+
+    if let Some(promotion_piece) = played_move.promotion_piece() {
+      let promotion_piece = (color_offset + promotion_piece) as usize;
+      self.bitboards[promotion_piece] |= 1 << main_to;
+      self.occupancy[friendly_occupancy] |= 1 << main_to;
+      self.piece_board[main_to] = promotion_piece as u8;
+    }
+    else {
+      self.bitboards[main_piece] |= 1 << main_to;
+      self.occupancy[friendly_occupancy] |= 1 << main_to;
+      self.piece_board[main_to] = main_piece as u8;
+
+      if main_piece == 5 + color_offset as usize 
+            && castling_rights != 0 {
+        if castling_rights & 0b1 != 0 {
+          self.castling_rights &= !(1 << castling_offset);
+        }
+        if castling_rights & 0b10 != 0 {
+          self.castling_rights &= !(2 << castling_offset);
+        }
+      }
+      else if main_piece == 3 + color_offset as usize
+            && castling_rights != 0 {
+        let back_rank_offset = 56 * self.side_to_move as usize;
+
+        if castling_rights & 0b10 != 0
+              && main_from == 7 + back_rank_offset {
+          self.castling_rights &= !(2 << castling_offset);
+        }
+        else if castling_rights & 0b1 != 0
+              && main_from == back_rank_offset {
+          self.castling_rights &= !(1 << castling_offset);
+        }
+      }
+    }
+  }
+}

engine/src/bitboard/makemove/castles.rs

@@ -0,0 +1,35 @@
+use super::*;
+
+impl Board {
+  pub fn make_castle(&mut self, played_move: &BitMove) {
+    let main_from: usize = played_move.from_square() as usize;
+    let main_to: usize = played_move.to_square() as usize;
+    let main_piece: usize = self.piece_board(main_from as u8) as usize;
+    let friendly_occupancy = main_piece/6;
+
+    let castling_offset = 2 - 2 * self.side_to_move as usize;
+
+    let secondary_piece: usize = main_piece - 2;
+    let is_kingside = main_to%8 > 4;
+    let secondary_from: usize = if is_kingside { main_to + 1 } else { main_to - 2 };
+    let secondary_to: usize = if is_kingside { main_to - 1 } else { main_to + 1 };
+
+    self.bitboards[main_piece] |= 1 << main_to;
+    self.occupancy[friendly_occupancy] |= 1 << main_to;
+    self.piece_board[main_to] = main_piece as u8;
+
+    self.bitboards[main_piece] &= !(1 << main_from);
+    self.occupancy[friendly_occupancy] &= !(1 << main_from);
+    self.piece_board[main_from] = Self::EMPTY_SQUARE;
+
+    self.bitboards[secondary_piece] |= 1 << secondary_to;
+    self.occupancy[friendly_occupancy] |= 1 << secondary_to;
+    self.piece_board[secondary_to] = secondary_piece as u8;
+
+    self.bitboards[secondary_piece] &= !(1 << secondary_from);
+    self.occupancy[friendly_occupancy] &= !(1 << secondary_from);
+    self.piece_board[secondary_from] = Self::EMPTY_SQUARE;
+
+    self.castling_rights &= !(3 << castling_offset);
+  }
+}

engine/src/bitboard/makemove/quiets.rs

@@ -0,0 +1,61 @@
+use super::*;
+
+impl Board {
+  pub fn make_quiet(&mut self, played_move: &BitMove) {
+    let main_from: usize = played_move.from_square() as usize;
+    let main_to: usize = played_move.to_square() as usize;
+    let main_piece: usize = self.piece_board(main_from as u8) as usize;
+    let friendly_occupancy = main_piece/6;
+
+    let color_offset = self.side_to_move * 6;
+    let castling_offset = 2 - 2 * self.side_to_move as usize;
+    let castling_rights = self.castling_rights >> castling_offset;
+
+    self.bitboards[main_piece] &= !(1 << main_from);
+    self.occupancy[friendly_occupancy] &= !(1 << main_from);
+    self.piece_board[main_from] = Self::EMPTY_SQUARE;
+
+    if let Some(promotion_piece) = played_move.promotion_piece() {
+      let promotion_piece = (color_offset + promotion_piece) as usize;
+      self.bitboards[promotion_piece] |= 1 << main_to;
+      self.occupancy[friendly_occupancy] |= 1 << main_to;
+      self.piece_board[main_to] = promotion_piece as u8;
+    }
+    else {
+      self.bitboards[main_piece] |= 1 << main_to;
+      self.occupancy[friendly_occupancy] |= 1 << main_to;
+      self.piece_board[main_to] = main_piece as u8;
+
+      if main_piece == 0 && (main_to - main_from) == 16 {
+        let new_en_passant = main_to - 8;
+        self.en_passant_square = 1 << new_en_passant;
+      }
+      else if main_piece == 6 && (main_from - main_to) == 16 {
+        let new_en_passant = main_to + 8;
+        self.en_passant_square = 1 << new_en_passant;
+      }
+      else if main_piece == 5 + color_offset as usize 
+            && castling_rights != 0 {
+        if castling_rights & 0b1 != 0 {
+          self.castling_rights &= !(1 << castling_offset);
+        }
+        if castling_rights & 0b10 != 0 {
+          self.castling_rights &= !(2 << castling_offset);
+        }
+      }
+      else if main_piece == 3 + color_offset as usize
+            && castling_rights != 0 {
+        let back_rank_offset = 56 * self.side_to_move as usize;
+            
+        if castling_rights & 0b10 != 0
+              && main_from == 7 + back_rank_offset {
+          self.castling_rights &= !(2 << castling_offset);
+        }
+        else if castling_rights & 0b1 != 0
+              && main_from == back_rank_offset {
+          self.castling_rights &= !(1 << castling_offset);
+        }
+      }
+    }
+  }
+}

engine/src/boardsquare.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct BoardSquare {
     pub x: usize,
     pub y: usize,
@@ -28,7 +28,7 @@ impl BoardSquare {
         return Self { x: x, y: y };
     }
 
-    pub(in super) fn from_index(idx: u8) -> Self {
+    pub(super) fn from_index(idx: u8) -> Self {
         let file = idx % 8;
         let rank = idx / 8;
 
@@ -39,10 +39,12 @@ impl BoardSquare {
             }
         }
 
-        return Self {x: file as usize, y: rank as usize};
+        return Self {
+            x: file as usize,
+            y: rank as usize,
+        };
     }
-    pub(in super) fn to_index(&self) -> u8 {
+    pub(super) fn to_index(&self) -> u8 {
         return (8 * self.y + self.x) as u8;
     }
 }
-

engine/src/chessmove.rs

@@ -1,10 +1,13 @@
-use crate::{bitboard::{bitmove::{BitMove, BitMoveType}, board::Board}};
+use crate::bitboard::{
+    bitmove::{BitMove, BitMoveType},
+    board::Board,
+};
 
 use super::boardsquare::BoardSquare;
 use super::piecetype::PieceType;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 /*pub struct ChessMove {
     pub move_type: MoveType,
     pub piece_type: PieceType,
@@ -19,14 +22,14 @@ pub enum ChessMove {
         piece_type: PieceType,
         from_square: BoardSquare,
         to_square: BoardSquare,
-        promotion_piece: Option<PieceType>
+        promotion_piece: Option<PieceType>,
     },
     Capture {
         piece_type: PieceType,
         from_square: BoardSquare,
         to_square: BoardSquare,
         captured_piece: PieceType,
-        promotion_piece: Option<PieceType>
+        promotion_piece: Option<PieceType>,
     },
     Castle {
         king_type: PieceType,
@@ -34,15 +37,15 @@ pub enum ChessMove {
         king_to: BoardSquare,
         rook_type: PieceType,
         rook_from: BoardSquare,
-        rook_to: BoardSquare
+        rook_to: BoardSquare,
     },
     EnPassant {
         pawn_type: PieceType,
         from_square: BoardSquare,
         to_square: BoardSquare,
         captured_piece: PieceType,
-        captured_from: BoardSquare
-    }
+        captured_from: BoardSquare,
+    },
 }
 
 impl ChessMove {
@@ -56,7 +59,7 @@ impl ChessMove {
             piece_type,
             from_square,
             to_square,
-            promotion_piece
+            promotion_piece,
         };
     }
 
@@ -72,7 +75,7 @@ impl ChessMove {
             from_square,
             to_square,
             captured_piece,
-            promotion_piece
+            promotion_piece,
         };
     }
 
@@ -90,11 +93,11 @@ impl ChessMove {
             king_to,
             rook_type,
             rook_from,
-            rook_to
+            rook_to,
         };
     }
 
-    pub(in super) fn from_bitmove(bitmove: &BitMove, board: &Board) -> Self {
+    pub(super) fn from_bitmove(bitmove: &BitMove, board: &Board) -> Self {
         match bitmove.move_type() {
             BitMoveType::Quiet => {
                 let from_square_index = bitmove.from_square();
@@ -103,11 +106,16 @@ impl ChessMove {
                 let to_square = BoardSquare::from_index(bitmove.to_square());
                 let promotion_piece = match bitmove.promotion_piece() {
                     Some(piece) => Some(PieceType::from_index(piece)),
-                    None => None
+                    None => None,
                 };
 
-                return ChessMove::Quiet { piece_type, from_square, to_square, promotion_piece }
-            },
+                return ChessMove::Quiet {
+                    piece_type,
+                    from_square,
+                    to_square,
+                    promotion_piece,
+                };
+            }
             BitMoveType::Capture => {
                 let from_square_index = bitmove.from_square();
                 let to_square_index = bitmove.to_square();
@@ -117,18 +125,28 @@ impl ChessMove {
                 let captured_piece = PieceType::from_index(board.piece_board(to_square_index));
                 let promotion_piece = match bitmove.promotion_piece() {
                     Some(piece) => Some(PieceType::from_index(piece)),
-                    None => None
+                    None => None,
                 };
 
-                return ChessMove::Capture { piece_type, from_square, to_square, captured_piece, promotion_piece }
-            },
+                return ChessMove::Capture {
+                    piece_type,
+                    from_square,
+                    to_square,
+                    captured_piece,
+                    promotion_piece,
+                };
+            }
             BitMoveType::Castle => {
                 let from_square_index = bitmove.from_square();
                 let to_square_index = bitmove.to_square();
                 let king_type = PieceType::from_index(board.piece_board(from_square_index));
                 let king_from = BoardSquare::from_index(from_square_index);
                 let king_to = BoardSquare::from_index(to_square_index);
-                let rook_type = if bitmove.from_square() < 32 { PieceType::WhiteRook } else { PieceType::BlackRook };
+                let rook_type = if bitmove.from_square() < 32 {
+                    PieceType::WhiteRook
+                } else {
+                    PieceType::BlackRook
+                };
                 let rook_from_index = if bitmove.to_square() > bitmove.from_square() {
                     bitmove.from_square() + 3
                 } else {
@@ -142,47 +160,79 @@ impl ChessMove {
                 };
                 let rook_to = BoardSquare::from_index(rook_to_index);
 
-                return ChessMove::Castle { king_type, king_from, king_to, rook_type, rook_from, rook_to }
-            },
+                return ChessMove::Castle {
+                    king_type,
+                    king_from,
+                    king_to,
+                    rook_type,
+                    rook_from,
+                    rook_to,
+                };
+            }
             BitMoveType::EnPassant => {
                 panic!("ChessMove::from_bitmove was left unimplemented");
             }
         }
     }
-    pub(in super) fn to_bitmove(&self) -> BitMove {
+    pub(super) fn to_bitmove(&self) -> BitMove {
         let bitmove = match self {
-            ChessMove::Quiet { piece_type, from_square, to_square, promotion_piece } => {
+            ChessMove::Quiet {
+                piece_type,
+                from_square,
+                to_square,
+                promotion_piece,
+            } => {
                 let promotion_piece = match promotion_piece {
                     Some(piece) => Some(piece.to_index()),
-                    None => None
+                    None => None,
                 };
                 return BitMove::quiet(
                     from_square.to_index(),
                     to_square.to_index(),
-                    promotion_piece
+                    promotion_piece,
                 );
-            },
-            ChessMove::Capture { piece_type, from_square, to_square, captured_piece, promotion_piece } => {
+            }
+            ChessMove::Capture {
+                piece_type,
+                from_square,
+                to_square,
+                captured_piece,
+                promotion_piece,
+            } => {
                 let promotion_piece = match promotion_piece {
                     Some(piece) => Some(piece.to_index()),
-                    None => None
+                    None => None,
                 };
                 return BitMove::capture(
                     from_square.to_index(),
                     to_square.to_index(),
-                    promotion_piece
+                    promotion_piece,
                 );
-            },
-            ChessMove::Castle { king_type, king_from, king_to, rook_type, rook_from, rook_to } => {
-                return BitMove::castle(
-                    king_from.to_index(),
-                    king_to.to_index()
-                );
-            },
-            ChessMove::EnPassant { pawn_type, from_square, to_square, captured_piece, captured_from } => {
+            }
+            ChessMove::Castle {
+                king_type,
+                king_from,
+                king_to,
+                rook_type,
+                rook_from,
+                rook_to,
+            } => {
+                return BitMove::castle(king_from.to_index(), king_to.to_index());
+            }
+            ChessMove::EnPassant {
+                pawn_type,
+                from_square,
+                to_square,
+                captured_piece,
+                captured_from,
+            } => {
                 panic!("ChessMove::to_bitmove was left unimplemented");
             }
         };
         return bitmove;
     }
+
+    pub fn notation(&self) -> String {
+        return self.to_bitmove().uci_notation();
+    }
 }

engine/src/gameend.rs

@@ -1,9 +1,8 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Deserialize, Serialize, Debug)]
+#[derive(Deserialize, Serialize, Debug, Clone, PartialEq)]
 pub enum GameEnd {
     WhiteWon(String),
     BlackWon(String),
     Draw(String),
 }
-

engine/src/lib.rs

@@ -1,14 +1,14 @@
 mod bitboard;
-pub mod chessmove;
-pub mod piecetype;
 pub mod boardsquare;
-pub mod movetype;
+pub mod chessmove;
 pub mod gameend;
+pub mod movetype;
+pub mod piecetype;
 
-use chessmove::ChessMove;
-use gameend::GameEnd;
 use bitboard::board::Board;
 use bitboard::movebuffer::MoveBuffer;
+use chessmove::ChessMove;
+use gameend::GameEnd;
 
 pub fn get_available_moves(fen: &str) -> Vec<ChessMove> {
     let mut board = Board::build(fen);
@@ -22,7 +22,10 @@ pub fn get_available_moves(fen: &str) -> Vec<ChessMove> {
         generated_moves.push(ChessMove::from_bitmove(buffer.get(idx), &board));
     }
 
-  println!("get_available_moves resulted in {} moves", generated_moves.len());
+    println!(
+        "get_available_moves resulted in {} moves",
+        generated_moves.len()
+    );
     return generated_moves;
 }
 
@@ -39,19 +42,28 @@ pub fn is_game_over(fen: &str) -> Option<GameEnd> {
     if !in_check {
         return Some(GameEnd::Draw("".to_string()));
     }
-  return if board.side_to_move() == 0 { Some(GameEnd::BlackWon("".to_string())) } else { Some(GameEnd::WhiteWon("".to_string())) };
+    return if board.side_to_move() == 0 {
+        Some(GameEnd::BlackWon("".to_string()))
+    } else {
+        Some(GameEnd::WhiteWon("".to_string()))
+    };
 }
 
 pub fn get_board_after_move(fen: &str, chess_move: &ChessMove) -> String {
+    let mut board = Board::build(fen);
+    let played_move = chess_move.to_bitmove();
+
     println!("get_board_after_move answered");
-  return String::from("rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1");
+    board.make_move(&played_move);
+
+    return board.fen();
 }
 
 #[cfg(test)]
 mod tests {
     use crate::boardsquare::BoardSquare;
-  use crate::piecetype::PieceType::*;
     use crate::gameend::GameEnd;
+    use crate::piecetype::PieceType::*;
 
     use super::*;
 
@@ -60,9 +72,7 @@ mod tests {
             canonical(self) == canonical(other)
         }
     }
-  impl Eq for ChessMove {
-
-  }
+    impl Eq for ChessMove {}
     impl Ord for ChessMove {
         fn cmp(&self, other: &Self) -> std::cmp::Ordering {
             let lhs = canonical(self);
@@ -76,27 +86,36 @@ mod tests {
         }
     }
 
-  impl PartialEq for GameEnd {
-    fn eq(&self, other: &Self) -> bool {
-    match (self, other) {
-      (GameEnd::WhiteWon(a), GameEnd::WhiteWon(b)) => a == b,
-      (GameEnd::BlackWon(a), GameEnd::BlackWon(b)) => a == b,
-      (GameEnd::Draw(a),     GameEnd::Draw(b))     => a == b,
-      _ => false,
-    }
-  }
-}
-
     fn canonical(m: &ChessMove) -> (u8, u8, u8) {
         match m {
-      ChessMove::Quiet { piece_type, from_square, to_square, promotion_piece } =>
-      (0, from_square.to_index(), to_square.to_index()),
-      ChessMove::Capture { piece_type, from_square, to_square, captured_piece, promotion_piece } =>
-      (1, from_square.to_index(), to_square.to_index()),
-      ChessMove::Castle { king_type, king_from, king_to, rook_type, rook_from, rook_to } =>
-      (2, king_from.to_index(), king_to.to_index()),
-      ChessMove::EnPassant { pawn_type, from_square, to_square, captured_piece, captured_from } =>
-      (3, from_square.to_index(), to_square.to_index()),
+            ChessMove::Quiet {
+                piece_type,
+                from_square,
+                to_square,
+                promotion_piece,
+            } => (0, from_square.to_index(), to_square.to_index()),
+            ChessMove::Capture {
+                piece_type,
+                from_square,
+                to_square,
+                captured_piece,
+                promotion_piece,
+            } => (1, from_square.to_index(), to_square.to_index()),
+            ChessMove::Castle {
+                king_type,
+                king_from,
+                king_to,
+                rook_type,
+                rook_from,
+                rook_to,
+            } => (2, king_from.to_index(), king_to.to_index()),
+            ChessMove::EnPassant {
+                pawn_type,
+                from_square,
+                to_square,
+                captured_piece,
+                captured_from,
+            } => (3, from_square.to_index(), to_square.to_index()),
         }
     }
 
@@ -104,78 +123,387 @@ mod tests {
     fn get_available_moves_test() {
         let boards: [&str; 2] = [
             "rnbqkbnr/pppppppp/8/1B6/4P3/5P1N/PPPP2PP/RNBQK2R w KQkq e6 0 1",
-      "6Bn/B2Pk3/8/p1r3NK/3p4/b6P/3p2n1/2R5 w - - 0 1"
+            "6Bn/B2Pk3/8/p1r3NK/3p4/b6P/3p2n1/2R5 w - - 0 1",
         ];
         let mut expected_moves: Vec<Vec<ChessMove>> = vec![
             vec![
-        ChessMove::capture(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(3, 6), BlackPawn, None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(0, 1), BoardSquare::from_coord(0, 2), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(0, 1), BoardSquare::from_coord(0, 3), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(1, 1), BoardSquare::from_coord(1, 2), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(1, 1), BoardSquare::from_coord(1, 3), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(2, 1), BoardSquare::from_coord(2, 2), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(2, 1), BoardSquare::from_coord(2, 3), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 1), BoardSquare::from_coord(3, 2), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 1), BoardSquare::from_coord(3, 3), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(4, 3), BoardSquare::from_coord(4, 4), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(5, 2), BoardSquare::from_coord(5, 3), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(6, 1), BoardSquare::from_coord(6, 2), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(6, 1), BoardSquare::from_coord(6, 3), None),
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(1, 0), BoardSquare::from_coord(0, 2), None),
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(1, 0), BoardSquare::from_coord(2, 2), None),
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(6, 0), None),
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(5, 1), None),
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(5, 3), None),
-        ChessMove::quiet(WhiteKnight, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(6, 4), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(5, 0), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(4, 1), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(3, 2), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(2, 3), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(0, 3), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(0, 5), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(1, 4), BoardSquare::from_coord(2, 5), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(7, 0), BoardSquare::from_coord(6, 0), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(7, 0), BoardSquare::from_coord(5, 0), None),
-        ChessMove::quiet(WhiteQueen, BoardSquare::from_coord(3, 0), BoardSquare::from_coord(4, 1), None),
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(4, 0), BoardSquare::from_coord(4, 1), None),
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(4, 0), BoardSquare::from_coord(5, 1), None),
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(4, 0), BoardSquare::from_coord(5, 0), None),
-        ChessMove::castle(WhiteKing, BoardSquare::from_coord(4, 0), BoardSquare::from_coord(6, 0), WhiteRook, BoardSquare::from_coord(7, 0), BoardSquare::from_coord(5, 0))
+                ChessMove::capture(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(3, 6),
+                    BlackPawn,
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(0, 1),
+                    BoardSquare::from_coord(0, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(0, 1),
+                    BoardSquare::from_coord(0, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(1, 1),
+                    BoardSquare::from_coord(1, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(1, 1),
+                    BoardSquare::from_coord(1, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(2, 1),
+                    BoardSquare::from_coord(2, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(2, 1),
+                    BoardSquare::from_coord(2, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 1),
+                    BoardSquare::from_coord(3, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 1),
+                    BoardSquare::from_coord(3, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(4, 3),
+                    BoardSquare::from_coord(4, 4),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(5, 2),
+                    BoardSquare::from_coord(5, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(6, 1),
+                    BoardSquare::from_coord(6, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(6, 1),
+                    BoardSquare::from_coord(6, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(1, 0),
+                    BoardSquare::from_coord(0, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(1, 0),
+                    BoardSquare::from_coord(2, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(7, 2),
+                    BoardSquare::from_coord(6, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(7, 2),
+                    BoardSquare::from_coord(5, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(7, 2),
+                    BoardSquare::from_coord(5, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKnight,
+                    BoardSquare::from_coord(7, 2),
+                    BoardSquare::from_coord(6, 4),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(5, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(4, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(3, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(2, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(0, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(0, 5),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(1, 4),
+                    BoardSquare::from_coord(2, 5),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(7, 0),
+                    BoardSquare::from_coord(6, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(7, 0),
+                    BoardSquare::from_coord(5, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteQueen,
+                    BoardSquare::from_coord(3, 0),
+                    BoardSquare::from_coord(4, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(4, 0),
+                    BoardSquare::from_coord(4, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(4, 0),
+                    BoardSquare::from_coord(5, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(4, 0),
+                    BoardSquare::from_coord(5, 0),
+                    None,
+                ),
+                ChessMove::castle(
+                    WhiteKing,
+                    BoardSquare::from_coord(4, 0),
+                    BoardSquare::from_coord(6, 0),
+                    WhiteRook,
+                    BoardSquare::from_coord(7, 0),
+                    BoardSquare::from_coord(5, 0),
+                ),
             ],
             vec![
-        ChessMove::capture(WhiteBishop, BoardSquare::from_coord(0, 6), BoardSquare::from_coord(2, 4), BlackRook, None),
-        ChessMove::capture(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(2, 4), BlackRook, None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(7, 2), BoardSquare::from_coord(7, 3), None),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 6), BoardSquare::from_coord(3, 7), Some(WhiteQueen)),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 6), BoardSquare::from_coord(3, 7), Some(WhiteRook)),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 6), BoardSquare::from_coord(3, 7), Some(WhiteBishop)),
-        ChessMove::quiet(WhitePawn, BoardSquare::from_coord(3, 6), BoardSquare::from_coord(3, 7), Some(WhiteKnight)),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(0, 6), BoardSquare::from_coord(1, 5), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(0, 6), BoardSquare::from_coord(1, 7), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(7, 6), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(5, 6), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(4, 5), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(3, 4), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(2, 3), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(1, 2), None),
-        ChessMove::quiet(WhiteBishop, BoardSquare::from_coord(6, 7), BoardSquare::from_coord(0, 1), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(0, 0), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(1, 0), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(3, 0), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(4, 0), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(5, 0), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(6, 0), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(7, 0), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(2, 1), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(2, 2), None),
-        ChessMove::quiet(WhiteRook, BoardSquare::from_coord(2, 0), BoardSquare::from_coord(2, 3), None),
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(7, 4), BoardSquare::from_coord(6, 3), None),
-        ChessMove::quiet(WhiteKing, BoardSquare::from_coord(7, 4), BoardSquare::from_coord(7, 5), None)
-      ]
+                ChessMove::capture(
+                    WhiteBishop,
+                    BoardSquare::from_coord(0, 6),
+                    BoardSquare::from_coord(2, 4),
+                    BlackRook,
+                    None,
+                ),
+                ChessMove::capture(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(2, 4),
+                    BlackRook,
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(7, 2),
+                    BoardSquare::from_coord(7, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 6),
+                    BoardSquare::from_coord(3, 7),
+                    Some(WhiteQueen),
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 6),
+                    BoardSquare::from_coord(3, 7),
+                    Some(WhiteRook),
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 6),
+                    BoardSquare::from_coord(3, 7),
+                    Some(WhiteBishop),
+                ),
+                ChessMove::quiet(
+                    WhitePawn,
+                    BoardSquare::from_coord(3, 6),
+                    BoardSquare::from_coord(3, 7),
+                    Some(WhiteKnight),
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(0, 6),
+                    BoardSquare::from_coord(1, 5),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(0, 6),
+                    BoardSquare::from_coord(1, 7),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(7, 6),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(5, 6),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(4, 5),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(3, 4),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(2, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(1, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteBishop,
+                    BoardSquare::from_coord(6, 7),
+                    BoardSquare::from_coord(0, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(0, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(1, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(3, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(4, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(5, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(6, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(7, 0),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(2, 1),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(2, 2),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteRook,
+                    BoardSquare::from_coord(2, 0),
+                    BoardSquare::from_coord(2, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(7, 4),
+                    BoardSquare::from_coord(6, 3),
+                    None,
+                ),
+                ChessMove::quiet(
+                    WhiteKing,
+                    BoardSquare::from_coord(7, 4),
+                    BoardSquare::from_coord(7, 5),
+                    None,
+                ),
+            ],
         ];
 
         for case in 0..2 {
-
             let mut generated_moves = get_available_moves(boards[case]);
 
             generated_moves.sort();
@@ -187,18 +515,17 @@ mod tests {
 
     #[test]
     fn is_game_over_test() {
-
         let boards: [&str; 4] = [
             "2k5/3pn3/2pP4/1R1P3B/1Np5/3RPp2/1B6/6Kb w - - 0 1",
             "2K3B1/4P3/8/7p/4pPn1/1N1P1p1p/4bp2/2Rk4 b - - 0 1",
             "6N1/B2PP3/pR1b4/3P2nb/6P1/3P1k2/2p5/4r1K1 w - - 0 1",
-      "3n1K2/p2k1p2/5P2/b1p2P2/P7/8/3p2r1/8 w - - 0 1"
+            "3n1K2/p2k1p2/5P2/b1p2P2/P7/8/3p2r1/8 w - - 0 1",
         ];
         let expected_results: [Option<GameEnd>; 4] = [
             None,
             Some(GameEnd::WhiteWon("".to_string())),
             Some(GameEnd::BlackWon("".to_string())),
-      Some(GameEnd::Draw("".to_string()))
+            Some(GameEnd::Draw("".to_string())),
         ];
 
         for case in 0..4 {
@@ -208,3 +535,4 @@ mod tests {
         }
     }
 }
+

engine/src/piecetype.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Clone, Serialize, Deserialize, Debug)]
 pub enum PieceType {
     WhitePawn,
     WhiteKnight,
@@ -17,8 +17,7 @@ pub enum PieceType {
 }
 
 impl PieceType {
-
-    pub(in super) fn from_index(idx: u8) -> Self {
+    pub(super) fn from_index(idx: u8) -> Self {
         return match idx {
             0 => PieceType::WhitePawn,
             1 => PieceType::WhiteKnight,
@@ -32,10 +31,10 @@ impl PieceType {
             9 => PieceType::BlackRook,
             10 => PieceType::BlackQueen,
             11 => PieceType::BlackKing,
-            _ => panic!("invalid piece index! should NEVER appear")
+            _ => panic!("invalid piece index! should NEVER appear"),
+        };
     }
-    }
-    pub(in super) fn to_index(&self) -> u8 {
+    pub(super) fn to_index(&self) -> u8 {
         return match self {
             &PieceType::WhitePawn => 0,
             &PieceType::WhiteKnight => 1,
@@ -48,7 +47,8 @@ impl PieceType {
             &PieceType::BlackBishop => 8,
             &PieceType::BlackRook => 9,
             &PieceType::BlackQueen => 10,
-            &PieceType::BlackKing => 11
-        }
+            &PieceType::BlackKing => 11,
+        };
     }
 }
+

link

@@ -0,0 +1 @@
+https://docs.google.com/presentation/d/16Niob9Z0Y8RPFdfZfuh8XyRbdUf83NaPepvQiLAnCIU/edit?usp=drivesdk

server/Cargo.lock

@@ -768,7 +768,6 @@ dependencies = [
  "env_logger",
  "futures-util",
  "log",
- "futures-util",
  "rand 0.9.2",
  "serde",
  "serde_json",

server/src/connection.rs

@@ -39,24 +39,6 @@ pub fn new_waiting_queue() -> WaitingQueue {
     Arc::new(Mutex::new(VecDeque::new()))
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct Step {
-    pub from: String,
-    pub to: String,
-}
-
-/*#[derive(Serialize, Deserialize, Debug)]
-struct ServerMessage {
-    #[serde(rename = "type")]
-    message_type: String,
-    player_id: Option<Uuid>,
-    match_id: Option<Uuid>,
-    opponent: Option<Uuid>,
-    color: Option<String>,
-    reason: Option<String>,
-    response: Option<String>,
-}*/
-
 #[derive(Serialize, Deserialize)]
 pub enum ServerMessage2 {
     GameEnd {
@@ -64,12 +46,17 @@ pub enum ServerMessage2 {
     },
     UIUpdate {
         fen: String,
+        turn_player: String,
+        move_history: Vec<String>,
     },
     MatchFound {
         match_id: Uuid,
         color: String,
         opponent_name: String,
     },
+    LegalMoves {
+        moves: Vec<ChessMove>,
+    },
     Ok {
         response: Result<(), String>,
     },
@@ -78,12 +65,22 @@ pub enum ServerMessage2 {
 #[derive(Serialize, Deserialize)]
 #[serde(tag = "type")]
 enum ClientEvent {
-    Join { username: String },
+    Join {
+        username: String,
+    },
     FindMatch,
-    Move { step: ChessMove },
+    Move {
+        step: ChessMove,
+        turn_player: String,
+    },
     Resign,
-    Chat { text: String },
-    RequestLegalMoves { fen: String },
+    Chat {
+        text: String,
+    },
+    RequestLegalMoves {
+        fen: String,
+    },
+    CloseConnection,
 }
 
 #[derive(Debug)]
@@ -100,7 +97,7 @@ pub struct GameMatch {
     pub player_white: Uuid,
     pub player_black: Uuid,
     pub board_state: String,
-    pub move_history: Vec<Step>,
+    pub move_history: Vec<String>,
 }
 
 // Message sending utilities
@@ -191,6 +188,13 @@ pub async fn handle_connection(
 
     info!("id: {}", &player_id);
 
+    println!("\n\n\n");
+    println!(
+        "{:?}",
+        engine::get_available_moves("rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1")
+    );
+    println!("\n\n\n");
+
     // Message processing loop
     while let Some(Ok(message)) = read.next().await {
         if message.is_text() {
@@ -225,7 +229,7 @@ pub async fn handle_connection(
                     info!("Appended {} to the waiting queue", player_id);
                     info!("queue {:?}", wait_queue);
                 }
-                Move { step } => {
+                Move { step, turn_player } => {
                     let match_id = connections
                         .lock()
                         .await
@@ -234,6 +238,8 @@ pub async fn handle_connection(
                         .current_match
                         .unwrap();
 
+                    println!("\n\nstep: {:?}\n", step);
+
                     {
                         info!("updating board state in match: {}", &match_id);
                         let mut matches = matches.lock().await;
@@ -242,15 +248,29 @@ pub async fn handle_connection(
                                 &matches.get(&match_id).unwrap().board_state,
                                 &step,
                             );
-                    }
-                    let message = ServerMessage2::UIUpdate {
-                        fen: matches
-                            .lock()
-                            .await
-                            .get(&match_id)
+
+                        info!(
+                            "board after engine fn: {}",
+                            matches.get_mut(&match_id).unwrap().board_state.clone()
+                        );
+
+                        matches
+                            .get_mut(&match_id)
                             .unwrap()
-                            .board_state
-                            .clone(),
+                            .move_history
+                            .push(step.clone().notation());
+                    }
+
+                    let message = ServerMessage2::UIUpdate {
+                        fen: {
+                            let mut matches = matches.lock().await;
+                            matches.get(&match_id).unwrap().board_state.clone()
+                        },
+                        turn_player: turn_player,
+                        move_history: {
+                            let mut matches = matches.lock().await;
+                            matches.get(&match_id).unwrap().move_history.clone()
+                        },
                     };
 
                     let _ = broadcast_to_match(
@@ -277,7 +297,7 @@ pub async fn handle_connection(
                                     &serde_json::to_string(&message).unwrap(),
                                 )
                                 .await;
-                                clean_up_match(&matches, &match_id);
+                                clean_up_match(&matches, &match_id).await;
                             }
                             None => {
                                 info!("No winner match continues. Id: {}", &match_id);
@@ -288,9 +308,10 @@ pub async fn handle_connection(
                 RequestLegalMoves { fen } => {
                     info!("Requesting legal moves player: {}", &player_id);
                     let moves = get_available_moves(&fen);
+                    let message = ServerMessage2::LegalMoves { moves };
                     let _ = send_message_to_player_connection(
                         connections.lock().await.get_mut(&player_id),
-                        &serde_json::to_string(&moves).unwrap(),
+                        &serde_json::to_string(&message).unwrap(),
                     )
                     .await;
                     info!("Sent moves to player: {}", player_id);
@@ -341,20 +362,18 @@ pub async fn handle_connection(
                         }
                     };
 
-                    broadcast_to_match(
+                    let _ = broadcast_to_match(
                         &connections,
                         &matches,
-                        connections
-                            .lock()
-                            .await
-                            .get(&player_id)
-                            .unwrap()
-                            .current_match
-                            .unwrap(),
+                        fuck_id.clone(),
                         &serde_json::to_string(&fuck).unwrap(),
                     )
                     .await;
-                    clean_up_match(&matches, fuck_id);
+                    clean_up_match(&matches, fuck_id).await;
+                }
+                CloseConnection => {
+                    warn!("Closing connection for: {}", &player_id);
+                    break;
                 }
                 _ => {
                     warn!("Not known client event");

server/src/matchmaking.rs

@@ -1,5 +1,5 @@
 use crate::connection::ServerMessage2;
-use crate::connection::{ConnectionMap, GameMatch, MatchMap, WaitingQueue, broadcast_to_match};
+use crate::connection::{ConnectionMap, GameMatch, MatchMap, WaitingQueue};
 use log::{error, info, warn};
 use rand::random;
 use uuid::Uuid;
@@ -119,7 +119,7 @@ impl MatchmakingSystem {
             };
 
             let _ = crate::connection::send_message_to_player_connection(
-                conn_map.get_mut(&white),
+                conn_map.get_mut(&black),
                 &serde_json::to_string(&message).unwrap(),
             )
             .await;

ui/src/connection.rs

@@ -1,16 +1,19 @@
 use engine::{chessmove::ChessMove, gameend::GameEnd};
-use futures_util::StreamExt;
+use futures_util::{SinkExt, StreamExt};
 use local_ip_address::local_ip;
 use log::{error, info, warn};
 use serde::{Deserialize, Serialize};
 use std::{
-    error::Error,
     net::{IpAddr, Ipv4Addr},
+    sync::{Arc, Mutex},
 };
 use tokio_tungstenite::connect_async;
+use tungstenite::Message;
 use url::Url;
 use uuid::Uuid;
 
+use crate::{ChessApp, ClientEvent, SharedGameState};
+
 #[derive(Serialize, Deserialize)]
 pub enum ServerMessage2 {
     GameEnd {
@@ -46,7 +49,11 @@ fn get_ip_address() -> IpAddr {
     ip
 }
 
-pub async fn handle_connection(server_port: &str) -> anyhow::Result<()> {
+pub async fn handle_connection(
+    server_port: &str,
+    shared_state: SharedGameState,
+    ui_events: Arc<Mutex<Vec<ClientEvent>>>,
+) -> anyhow::Result<()> {
     let address = get_ip_address();
 
     //start main loop
@@ -61,7 +68,7 @@ pub async fn handle_connection(server_port: &str) -> anyhow::Result<()> {
     let (ws_stream, _) = connect_async(url).await?;
     let (mut write, mut read) = ws_stream.split();
 
-    let read_handle = while let Some(message) = read.next().await {
+    while let Some(message) = read.next().await {
         info!("connection");
         match message {
             Ok(msg) => {
@@ -69,7 +76,7 @@ pub async fn handle_connection(server_port: &str) -> anyhow::Result<()> {
                     let text = msg.to_text().unwrap();
                     info!("text: {}", text);
 
-                    if let Ok(parsed) = serde_json::from_str::<ServerMessage2>(text) {
+                    /*if let Ok(parsed) = serde_json::from_str::<ServerMessage2>(text) {
                         match parsed {
                             ServerMessage2::GameEnd { winner } => {}
                             ServerMessage2::UIUpdate { fen } => {}
@@ -77,12 +84,26 @@ pub async fn handle_connection(server_port: &str) -> anyhow::Result<()> {
                                 match_id,
                                 color,
                                 opponent_name,
-                            } => {}
+                            } => {
+                                //chess_app.player_color = Some(color);
+                            }
                             ServerMessage2::Ok { response } => {}
                             _ => {
                                 error!("Received unkown servermessage2");
                             }
                         }
+                    }*/
+
+                    if let Ok(parsed) = serde_json::from_str::<ServerMessage2>(text) {
+                        // Update shared state with server message
+                        shared_state.update_from_server_message(parsed);
+                    }
+
+                    // Send UI events to server
+                    let events = ui_events.lock().unwrap().drain(..).collect::<Vec<_>>();
+                    for event in events {
+                        let message = serde_json::to_string(&event)?;
+                        write.send(Message::Text(message)).await?;
                     }
                 }
             }
@@ -90,7 +111,7 @@ pub async fn handle_connection(server_port: &str) -> anyhow::Result<()> {
                 error!("Error receiving message: {}", e);
             }
         }
-    };
+    }
 
     Ok(())
 }