From 2e24fa706c4e7ba0b95a985e5c40385c61f7d180 Mon Sep 17 00:00:00 2001 From: Jordan Geurtsen Date: Thu, 23 Mar 2023 21:15:53 +0100 Subject: [PATCH 1/7] workflow shizzle --- .github/workflows/main.yml | 14 +++++++++----- docker-compose.yml | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1696544..44f8694 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,20 +1,18 @@ -name: Build & Test +name: El Tigre - MauMau Server on: push: branches: - mauster - - developmaunt pull_request: branches: - mauster - - developmaunt workflow_dispatch: concurrency: group: mau cancel-in-progress: true - + env: DOTNET_INSTALL_DIR: "./.dotnet" @@ -35,4 +33,10 @@ jobs: - name: Build run: dotnet build --configuration Release --no-restore - name: Test - run: dotnet test --no-restore --verbosity normal \ No newline at end of file + run: dotnet test --no-restore --verbosity normal + - name: Build and push Docker images + uses: docker/build-push-action@v4.0.0 + with: + context: ../../ + file: Dockerfile + target: final \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 85e360b..da24f6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: . dockerfile: Dockerfile - #target: final + target: final container_name: 'MauMau-Server' restart: always ports: From 974d687d2db91554c08320d48ed82e2d560de6ad Mon Sep 17 00:00:00 2001 From: Jordan Geurtsen Date: Thu, 23 Mar 2023 21:21:28 +0100 Subject: [PATCH 2/7] workflow shizzle --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 44f8694..920db00 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,6 +34,10 @@ jobs: run: dotnet build --configuration Release --no-restore - name: Test run: dotnet test --no-restore --verbosity normal + - name: Docker Setup QEMU + uses: docker/setup-qemu-action@v2.1.0 + - name: Docker Setup Buildx + uses: docker/setup-buildx-action@v2.5.0 - name: Build and push Docker images uses: docker/build-push-action@v4.0.0 with: From 4b896eb5f5b247ff4698beab355d58553bbe77d1 Mon Sep 17 00:00:00 2001 From: DTieman Date: Fri, 24 Mar 2023 17:30:44 +0100 Subject: [PATCH 3/7] test --- .github/workflows/main.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 920db00..2d7fc04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,13 +34,5 @@ jobs: run: dotnet build --configuration Release --no-restore - name: Test run: dotnet test --no-restore --verbosity normal - - name: Docker Setup QEMU - uses: docker/setup-qemu-action@v2.1.0 - - name: Docker Setup Buildx - uses: docker/setup-buildx-action@v2.5.0 - - name: Build and push Docker images - uses: docker/build-push-action@v4.0.0 - with: - context: ../../ - file: Dockerfile - target: final \ No newline at end of file + - name: Docker Test + run: docker run hello-world \ No newline at end of file From b05cac01c897f0a2bf3c90e44565cd19aef7c8a8 Mon Sep 17 00:00:00 2001 From: DTieman Date: Fri, 24 Mar 2023 17:34:04 +0100 Subject: [PATCH 4/7] test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d7fc04..8411c2c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,4 +35,4 @@ jobs: - name: Test run: dotnet test --no-restore --verbosity normal - name: Docker Test - run: docker run hello-world \ No newline at end of file + run: sudo docker run hello-world \ No newline at end of file From 3c5a2ba1a000941857d88ca66aba6518f843330a Mon Sep 17 00:00:00 2001 From: DTieman Date: Fri, 24 Mar 2023 17:43:54 +0100 Subject: [PATCH 5/7] test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8411c2c..2d7fc04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,4 +35,4 @@ jobs: - name: Test run: dotnet test --no-restore --verbosity normal - name: Docker Test - run: sudo docker run hello-world \ No newline at end of file + run: docker run hello-world \ No newline at end of file From 4adb6d600ef0fc3fab18821ce4494b09dac4f4d5 Mon Sep 17 00:00:00 2001 From: DTieman Date: Fri, 24 Mar 2023 17:50:12 +0100 Subject: [PATCH 6/7] workflow? --- .github/workflows/main.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d7fc04..8c58139 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: El Tigre - MauMau Server +name: Build Mau & Deploy Mau on: push: @@ -34,5 +34,14 @@ jobs: run: dotnet build --configuration Release --no-restore - name: Test run: dotnet test --no-restore --verbosity normal - - name: Docker Test - run: docker run hello-world \ No newline at end of file + deploy: + runs-on: self-hosted + needs: build + steps: + - name: Checkout + uses: actions/checkout@main + with: + fetch-depth: 0 + - name: Docker Compose + run: docker compose up -d --build + \ No newline at end of file From cf13f07f98ee6c668e25421e6ac604cb967378f3 Mon Sep 17 00:00:00 2001 From: DTieman <104771901+DTieman@users.noreply.github.com> Date: Fri, 24 Mar 2023 18:30:45 +0100 Subject: [PATCH 7/7] Automatic room closing (#6) * Ace now lets you play again if there are two players * 1 line if :o * Better Ace * Feature/automautic room closing (#5) * Room now closes when nobody is in the room * cleanup --- Controllers/MauController.cs | 21 --------------- Controllers/RoomController.cs | 7 ----- Mau/Game.cs | 7 +++-- Websockets/Room.cs | 48 +++++++++++++++++++++++++++-------- Websockets/RoomManager.cs | 11 +------- 5 files changed, 44 insertions(+), 50 deletions(-) delete mode 100644 Controllers/MauController.cs diff --git a/Controllers/MauController.cs b/Controllers/MauController.cs deleted file mode 100644 index 7f713e0..0000000 --- a/Controllers/MauController.cs +++ /dev/null @@ -1,21 +0,0 @@ -using MauMau_Server.Mau; -using Microsoft.AspNetCore.Mvc; - -namespace MauMau_Server.Controllers; - -[ApiController] -[Route("[controller]")] -public class MauController : ControllerBase -{ - [HttpGet("deck")] - public IActionResult GetDeck() - { - return Ok(new Deck().GetUnusedDeck().Select(card => card.ToString()).ToList()); - } - - [HttpGet("hand")] - public IActionResult GetHand() - { - return Ok(new Deck().DrawCards(8).Select(card => card.ToString()).ToList()); - } -} \ No newline at end of file diff --git a/Controllers/RoomController.cs b/Controllers/RoomController.cs index ea63f33..85fe489 100644 --- a/Controllers/RoomController.cs +++ b/Controllers/RoomController.cs @@ -52,11 +52,4 @@ public class RoomController : ControllerBase var id = _roomManager.CreateRoom(); return Ok(JsonSerializer.Serialize(id)); } - - [HttpDelete] - public IActionResult Delete() - { - _roomManager.RemoveAllRooms(); - return NoContent(); - } } \ No newline at end of file diff --git a/Mau/Game.cs b/Mau/Game.cs index 35e2231..e9c8084 100644 --- a/Mau/Game.cs +++ b/Mau/Game.cs @@ -83,8 +83,11 @@ public class Game CurrentPlayer = GetNextPlayer(2); break; case CardValue.ACE: - TurnDirection *= -1; - CurrentPlayer = GetNextPlayer(); + if (Players.Count > 2) + { + TurnDirection *= -1; + CurrentPlayer = GetNextPlayer(); + } break; case CardValue.THREE: case CardValue.FOUR: diff --git a/Websockets/Room.cs b/Websockets/Room.cs index 6705cd2..6673bb9 100644 --- a/Websockets/Room.cs +++ b/Websockets/Room.cs @@ -7,9 +7,18 @@ namespace MauMau_Server.Websockets; public class Room { + private readonly IRoomManager _roomManager; + private readonly string _roomId; private readonly Dictionary _connections = new(); + private string _host; private readonly Game _game = new(); + public Room(IRoomManager roomManager, string roomId) + { + _roomManager = roomManager; + _roomId = roomId; + } + public async Task InstantiateConnection(WebSocket socket) { var socketId = AddConnection(socket); @@ -30,41 +39,46 @@ public class Room buffer = EmptyBuffer(); result = await ReceiveAsync(socket, buffer); } + await socket.CloseAsync(result.CloseStatus.Value, result.CloseStatusDescription, CancellationToken.None); - RemoveConnection(socketId); - _game.RemovePlayer(socketId); + HandleDisconnect(socketId); } private string AddConnection(WebSocket socket) { var socketId = Guid.NewGuid().ToString(); + if (_connections.Count == 0) + { + _host = socketId; + } + _connections.Add(socketId, socket); _game.AddPlayerToGame(socketId, socket); return socketId; } - + public WebSocket GetConnection(string socketId) { return _connections[socketId]; } - + public Dictionary GetAllConnections() { return _connections; } - + public void RemoveConnection(string socketId) { _connections.Remove(socketId); } - + private static async Task ReceiveAsync(WebSocket webSocket, byte[] buffer) { var arraySegment = new ArraySegment(buffer); var result = await webSocket.ReceiveAsync(arraySegment, CancellationToken.None); return result; } - + private void BroadcastGameState() { foreach (var (id, socket) in GetAllConnections()) @@ -74,7 +88,7 @@ public class Room SendAsync(socket, message); } } - + private void BroadcastAsync(string message) { foreach (var (id, socket) in GetAllConnections()) @@ -82,7 +96,7 @@ public class Room SendAsync(socket, message); } } - + private static void SendAsync(WebSocket socket, string message) { var bytes = Encoding.Default.GetBytes(message); @@ -90,11 +104,25 @@ public class Room socket.SendAsync(arraySegment, WebSocketMessageType.Text, true, CancellationToken.None); } + private void HandleDisconnect(string socketId) + { + RemoveConnection(socketId); + _game.RemovePlayer(socketId); + if (IsEmpty()) + { + _roomManager.RemoveRoom(_roomId); + } + else if (socketId == _host) + { + _host = _connections.First().Key; + } + } + private static byte[] EmptyBuffer() { return new byte[4096]; } - + public bool IsEmpty() { return _connections.Count == 0; diff --git a/Websockets/RoomManager.cs b/Websockets/RoomManager.cs index fd14d28..2280be2 100644 --- a/Websockets/RoomManager.cs +++ b/Websockets/RoomManager.cs @@ -7,7 +7,7 @@ public class RoomManager : IRoomManager public string CreateRoom() { var roomId = Guid.NewGuid().ToString(); - var room = new Room(); + var room = new Room(this, roomId); Rooms.Add(roomId, room); return roomId; } @@ -31,14 +31,6 @@ public class RoomManager : IRoomManager { return Rooms.ContainsKey(roomId); } - - public void RemoveAllRooms() - { - foreach (var room in Rooms.Where(room => room.Value.IsEmpty())) - { - Rooms.Remove(room.Key); - } - } } public interface IRoomManager @@ -48,5 +40,4 @@ public interface IRoomManager public List GetAllRooms(); public void RemoveRoom(string roomId); public bool RoomExists(string roomId); - public void RemoveAllRooms(); } \ No newline at end of file