From 486accd4eb06b29195f67db918db3b1fb1ae5ac8 Mon Sep 17 00:00:00 2001 From: CHIBOUB Chakib Date: Mon, 22 Jul 2024 19:01:19 +0200 Subject: [PATCH 1/7] commit --- README.md | 107 ------------------------------------------------------ 1 file changed, 107 deletions(-) diff --git a/README.md b/README.md index 9cc4390..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,107 +0,0 @@ -# Installing Docker and Docker Compose on Ubuntu - -This guide will help you install Docker and Docker Compose on an Ubuntu system. - -## Prerequisites - -- A system running Ubuntu (preferably 20.04 LTS or later) -- A user account with `sudo` privileges - -## Installing Docker - -1. **Update the package index:** - - ```bash - sudo apt update - ``` - -2. **Install required packages:** - - ```bash - sudo apt install apt-transport-https ca-certificates curl software-properties-common - ``` - -3. **Add Docker's official GPG key:** - - ```bash - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - ``` - -4. **Set up the Docker repository:** - - ```bash - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - ``` - -5. **Update the package index again:** - - ```bash - sudo apt update - ``` - -6. **Install Docker CE:** - - ```bash - sudo apt install docker-ce - ``` - -7. **Check the Docker service status:** - - ```bash - sudo systemctl status docker - ``` - -8. **Add your user to the `docker` group to run Docker commands without `sudo`:** - - ```bash - sudo usermod -aG docker $USER - ``` - -9. **Log out and log back in to apply the group changes.** - -## Installing Docker Compose - -1. **Download Docker Compose:** - - ```bash - sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - ``` - -2. **Apply executable permissions to the Docker Compose binary:** - - ```bash - sudo chmod +x /usr/local/bin/docker-compose - ``` - -3. **Verify the installation:** - - ```bash - docker-compose --version - ``` - -## Verifying Docker and Docker Compose Installation - -1. **Run a simple Docker container:** - - ```bash - docker run hello-world - ``` - - This command downloads a test image and runs it in a container. When the container runs, it prints a confirmation message. - -2. **Check Docker Compose version:** - - ```bash - docker-compose --version - ``` - - This command outputs the version of Docker Compose installed. - -Congratulations! You have successfully installed Docker and Docker Compose on your Ubuntu system. - -## Additional Resources - -- [Docker Documentation](https://docs.docker.com/) -- [Docker Compose Documentation](https://docs.docker.com/compose/) - - From 4bd8d3d8990eff9c393ed9843077b9ef3d9cd003 Mon Sep 17 00:00:00 2001 From: Adrien Audebert Date: Tue, 23 Jul 2024 18:16:54 +0200 Subject: [PATCH 2/7] create db-shell --- makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefile b/makefile index 755c103..30c4fcb 100644 --- a/makefile +++ b/makefile @@ -31,6 +31,9 @@ logs: ps: $(COMPOSE) ps +db-shell: + $(COMPOSE) exec db psql -U 42student players_db + help: @echo "Usage:" @echo " make build [c=service] # Build images" From 685173df7ed6617af9470f021e67ad92f7ff02f4 Mon Sep 17 00:00:00 2001 From: CHIBOUB Chakib Date: Tue, 23 Jul 2024 18:25:46 +0200 Subject: [PATCH 3/7] fixed some game logic --- pong/game/game.py | 57 +++++++++++++++++++++++++++++++-------------- pong/static/game.js | 2 +- pong/urls.py | 3 ++- 3 files changed, 42 insertions(+), 20 deletions(-) diff --git a/pong/game/game.py b/pong/game/game.py index 2b2af26..b447d02 100644 --- a/pong/game/game.py +++ b/pong/game/game.py @@ -12,13 +12,14 @@ class Game: self.game_state = { 'player1_name': player1.user.username, 'player2_name': player2.user.username, - 'player1_position': 200, # middle of the game field - 'player2_position': 200, - 'ball_position': {'x': 400, 'y': 300}, # middle of the game field + 'player1_position': 150, + 'player2_position': 150, + 'ball_position': {'x': 390, 'y': 190}, 'ball_velocity': {'x': random.choice([-5, 5]), 'y': random.choice([-5, 5])}, 'player1_score': 0, 'player2_score': 0 } + self.speed = 1 self.game_loop_task = None async def start_game(self): @@ -37,28 +38,48 @@ class Game: self.game_state['ball_position']['y'] += self.game_state['ball_velocity']['y'] # Check for collisions with top and bottom walls - if self.game_state['ball_position']['y'] <= 0 or self.game_state['ball_position']['y'] >= 600: + if self.game_state['ball_position']['y'] <= 10 or self.game_state['ball_position']['y'] >= 390: self.game_state['ball_velocity']['y'] *= -1 # Check for scoring - if self.game_state['ball_position']['x'] <= 0: + if self.game_state['ball_position']['x'] <= 10: self.game_state['player2_score'] += 1 self.reset_ball() - elif self.game_state['ball_position']['x'] >= 800: + elif self.game_state['ball_position']['x'] >= 790: self.game_state['player1_score'] += 1 self.reset_ball() # Check for collisions with paddles if self.game_state['ball_position']['x'] <= 20 and \ - self.game_state['player1_position'] - 50 <= self.game_state['ball_position']['y'] <= self.game_state['player1_position'] + 50: + self.game_state['player1_position'] <= self.game_state['ball_position']['y'] <= self.game_state['player1_position'] + 80: + self.update_ball_velocity() self.game_state['ball_velocity']['x'] *= -1 - elif self.game_state['ball_position']['x'] >= 780 and \ - self.game_state['player2_position'] - 50 <= self.game_state['ball_position']['y'] <= self.game_state['player2_position'] + 50: + elif self.game_state['ball_position']['x'] >= 760 and \ + self.game_state['player2_position'] <= self.game_state['ball_position']['y'] <= self.game_state['player2_position'] + 80: + self.update_ball_velocity() self.game_state['ball_velocity']['x'] *= -1 def reset_ball(self): - self.game_state['ball_position'] = {'x': 400, 'y': 300} + self.game_state['ball_position'] = {'x': 390, 'y': 190} self.game_state['ball_velocity'] = {'x': random.choice([-5, 5]), 'y': random.choice([-5, 5])} + self.speed = 1 + + def update_ball_velocity(self): + self.speed += 0.05 + if self.speed > 2: + self.speed = 2 + else: + print(f"Ball velocity: {self.speed}") + self.game_state['ball_velocity']['x'] *= self.speed + if self.game_state['ball_velocity']['x'] < -10: + self.game_state['ball_velocity']['x'] = -10 + elif self.game_state['ball_velocity']['x'] > 10: + self.game_state['ball_velocity']['x'] = 10 + self.game_state['ball_velocity']['y'] *= self.speed + if self.game_state['ball_velocity']['y'] < -10: + self.game_state['ball_velocity']['y'] = -10 + elif self.game_state['ball_velocity']['y'] > 10: + self.game_state['ball_velocity']['y'] = 10 async def send_game_state(self): message = json.dumps({ @@ -70,15 +91,15 @@ class Game: async def handle_key_press(self, player, key): if player == self.player1: - if key == 'arrowup' and self.game_state['player1_position'] > 0: - self.game_state['player1_position'] -= 10 - elif key == 'arrowdown' and self.game_state['player1_position'] < 550: - self.game_state['player1_position'] += 10 + if key == 'arrowup' and self.game_state['player1_position'] >= 25: + self.game_state['player1_position'] -= 25 + elif key == 'arrowdown' and self.game_state['player1_position'] <= 275: + self.game_state['player1_position'] += 25 elif player == self.player2: - if key == 'arrowup' and self.game_state['player2_position'] > 0: - self.game_state['player2_position'] -= 10 - elif key == 'arrowdown' and self.game_state['player2_position'] < 550: - self.game_state['player2_position'] += 10 + if key == 'arrowup' and self.game_state['player2_position'] >= 25: + self.game_state['player2_position'] -= 25 + elif key == 'arrowdown' and self.game_state['player2_position'] <= 275: + self.game_state['player2_position'] += 25 async def end_game(self): if self.game_loop_task: diff --git a/pong/static/game.js b/pong/static/game.js index 4c985aa..c86aac7 100644 --- a/pong/static/game.js +++ b/pong/static/game.js @@ -164,7 +164,7 @@ document.addEventListener('DOMContentLoaded', () => { } function handleKeyDown(event) { - if (event.key === 'ArrowUp' || event.key === 'ArrowDown') { + if (event.key === 'ArrowUp' || event.key === 'ArrowDown' || event.key === '+') { sendKeyPress(event.key.toLowerCase()); } } diff --git a/pong/urls.py b/pong/urls.py index 665ace0..1b40160 100644 --- a/pong/urls.py +++ b/pong/urls.py @@ -6,7 +6,8 @@ from django.conf import settings from django.conf.urls.static import static urlpatterns = [ - path('admin/', admin.site.urls), + # Disable the admin page + # path('admin/', admin.site.urls), path('api/', include('pong.game.urls')), path('', include('pong.game.urls')), ] From f94083810c504682fcc4f48fbf6ffad268669a01 Mon Sep 17 00:00:00 2001 From: CHIBOUB Chakib Date: Wed, 24 Jul 2024 18:46:33 +0200 Subject: [PATCH 4/7] fixed my branch --- .env | 4 ++-- .gitignore | 5 ----- makefile | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 224e164..baaf744 100644 --- a/.env +++ b/.env @@ -11,5 +11,5 @@ POSTGRES_PASSWORD=qwerty DB_HOST=db DB_PORT=5432 -PROJECT_PATH=${PWD}/pong -POSTGRES_DATA_PATH=${PWD}/data/db +PROJECT_PATH=/home/mchiboub/42cursus/transcendence/pong +POSTGRES_DATA_PATH=/home/mchiboub/42cursus/transcendence/data/db diff --git a/.gitignore b/.gitignore index 495985a..3adaaf8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ -.env - -# virtualenv venv/ - __pycache__/ - data/ diff --git a/makefile b/makefile index 30c4fcb..01c2990 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ COMPOSE=docker compose -f $(COMPOSE_FILE) CONTAINER=$(c) up: - sudo mkdir -p $$PWD/data/db + sudo mkdir -p data/db $(COMPOSE) build $(COMPOSE) up $(CONTAINER) @@ -21,7 +21,7 @@ down: destroy: $(COMPOSE) down -v --rmi all - sudo rm -rf $$PWD/data/db + sudo rm -rf data #sudo lsof -i :5432 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true #sudo lsof -i :80 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true From 63ee8bc75b3c8ee5d89c9d9017f49196bd9c7bcf Mon Sep 17 00:00:00 2001 From: CHIBOUB Chakib Date: Wed, 24 Jul 2024 20:37:23 +0200 Subject: [PATCH 5/7] autofocus and key handling in the frontend forms --- pong/game/game.py | 16 ++++++++++++---- pong/static/game.js | 34 ++++++++++++++++++++++++++++++++-- pong/static/index.html | 2 +- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/pong/game/game.py b/pong/game/game.py index b447d02..6162d6b 100644 --- a/pong/game/game.py +++ b/pong/game/game.py @@ -91,15 +91,23 @@ class Game: async def handle_key_press(self, player, key): if player == self.player1: - if key == 'arrowup' and self.game_state['player1_position'] >= 25: + if key == 'arrowup': self.game_state['player1_position'] -= 25 - elif key == 'arrowdown' and self.game_state['player1_position'] <= 275: + if self.game_state['player1_position'] < 0: + self.game_state['player1_position'] = 0 + elif key == 'arrowdown': self.game_state['player1_position'] += 25 + if self.game_state['player1_position'] > 300: + self.game_state['player1_position'] = 300 elif player == self.player2: - if key == 'arrowup' and self.game_state['player2_position'] >= 25: + if key == 'arrowup': self.game_state['player2_position'] -= 25 - elif key == 'arrowdown' and self.game_state['player2_position'] <= 275: + if self.game_state['player2_position'] < 0: + self.game_state['player2_position'] = 0 + elif key == 'arrowdown': self.game_state['player2_position'] += 25 + if self.game_state['player2_position'] > 300: + self.game_state['player2_position'] = 300 async def end_game(self): if self.game_loop_task: diff --git a/pong/static/game.js b/pong/static/game.js index c86aac7..6f83af0 100644 --- a/pong/static/game.js +++ b/pong/static/game.js @@ -15,6 +15,15 @@ document.addEventListener('DOMContentLoaded', () => { let token; let gameState; + // Auto-focus and key handling for AUTH-FORM + nicknameInput.focus(); + nicknameInput.addEventListener('keypress', function(event) { + if (event.key === 'Enter') { + event.preventDefault(); + checkNicknameButton.click(); + } + }); + checkNicknameButton.addEventListener('click', handleCheckNickname); registerButton.addEventListener('click', handleRegister); loginButton.addEventListener('click', handleLogin); @@ -27,9 +36,30 @@ document.addEventListener('DOMContentLoaded', () => { if (exists) { authForm.style.display = 'none'; loginForm.style.display = 'block'; + // Auto-focus and key handling for LOGIN-FORM + loginPasswordInput.focus(); + loginPasswordInput.addEventListener('keypress', function(event) { + if (event.key === 'Enter') { + event.preventDefault(); + loginButton.click(); + } + }); } else { authForm.style.display = 'none'; registerForm.style.display = 'block'; + // Auto-focus and key handling for REGISTER-FORM + passwordInput.focus(); + passwordInput.addEventListener('keypress', function(event) { + if (event.key === 'Enter') { + confirmPasswordInput.focus(); + confirmPasswordInput.addEventListener('keypress', function(event) { + if (event.key === 'Enter') { + event.preventDefault(); + registerButton.click(); + } + }); + } + }); } } catch (error) { console.error('Error checking user existence:', error); @@ -134,7 +164,7 @@ document.addEventListener('DOMContentLoaded', () => { if (data.type === 'authenticated') { console.log('Authentication successful'); } else if (data.type === 'waiting_room') { - console.log('Entered the waiting room'); + console.log('Entered the WAITING ROOM'); } else if (data.type === 'game_start') { console.log('Game started:', data.game_id, '(', data.player1, 'vs', data.player2, ')'); startGame(data.game_id, data.player1, data.player2); @@ -164,7 +194,7 @@ document.addEventListener('DOMContentLoaded', () => { } function handleKeyDown(event) { - if (event.key === 'ArrowUp' || event.key === 'ArrowDown' || event.key === '+') { + if (event.key === 'ArrowUp' || event.key === 'ArrowDown') { sendKeyPress(event.key.toLowerCase()); } } diff --git a/pong/static/index.html b/pong/static/index.html index 1aad5b6..4f6c773 100644 --- a/pong/static/index.html +++ b/pong/static/index.html @@ -37,6 +37,6 @@
- + From e7797eac2cbbf1f6f196e922eae52f9364cc4240 Mon Sep 17 00:00:00 2001 From: CHIBOUB Chakib Date: Wed, 24 Jul 2024 22:29:48 +0200 Subject: [PATCH 6/7] added a BOT player, and some fixes in the game logic --- README.md | 0 makefile | 4 +-- pong/game/game.py | 48 ++++++++++++++++++------------ pong/game/matchmaking.py | 63 +++++++++++++++++++++++++++++----------- 4 files changed, 78 insertions(+), 37 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/makefile b/makefile index 01c2990..c4059e1 100644 --- a/makefile +++ b/makefile @@ -2,12 +2,12 @@ COMPOSE_FILE=docker-compose.yaml COMPOSE=docker compose -f $(COMPOSE_FILE) CONTAINER=$(c) -up: +up: down sudo mkdir -p data/db $(COMPOSE) build $(COMPOSE) up $(CONTAINER) -build: +build: $(COMPOSE) build $(CONTAINER) start: diff --git a/pong/game/game.py b/pong/game/game.py index 6162d6b..f6eef12 100644 --- a/pong/game/game.py +++ b/pong/game/game.py @@ -9,9 +9,10 @@ class Game: self.game_id = game_id self.player1 = player1 self.player2 = player2 + self.botgame = player2 is None self.game_state = { 'player1_name': player1.user.username, - 'player2_name': player2.user.username, + 'player2_name': player2.user.username if player2 else 'BOT', 'player1_position': 150, 'player2_position': 150, 'ball_position': {'x': 390, 'y': 190}, @@ -28,37 +29,49 @@ class Game: async def game_loop(self): while True: + if self.botgame: + await self.update_bot_position() self.update_game_state() await self.send_game_state() - await asyncio.sleep(1/60) # 60 FPS + await asyncio.sleep(1/60) # Around 60 FPS + + # The amazing AI BOT player + async def update_bot_position(self): + target_y = self.game_state['ball_position']['y'] + if self.game_state['player2_position'] < target_y < self.game_state['player2_position'] + 80: + pass + elif self.game_state['player2_position'] < target_y: + self.game_state['player2_position'] = min(self.game_state['player2_position'] + (5 * self.speed), 300) + elif self.game_state['player2_position'] + 80 > target_y: + self.game_state['player2_position'] = max(self.game_state['player2_position'] - (5 * self.speed), 0) def update_game_state(self): # Update ball position self.game_state['ball_position']['x'] += self.game_state['ball_velocity']['x'] self.game_state['ball_position']['y'] += self.game_state['ball_velocity']['y'] - # Check for collisions with top and bottom walls if self.game_state['ball_position']['y'] <= 10 or self.game_state['ball_position']['y'] >= 390: self.game_state['ball_velocity']['y'] *= -1 - + # Check for collisions with paddles + if self.game_state['ball_position']['x'] <= 20 and \ + self.game_state['player1_position'] - 10 <= self.game_state['ball_position']['y'] <= self.game_state['player1_position'] + 90: + if self.game_state['ball_velocity']['x'] < 0: + self.game_state['ball_velocity']['x'] *= -1 + self.update_ball_velocity() + elif self.game_state['ball_position']['x'] >= 760 and \ + self.game_state['player2_position'] - 10 <= self.game_state['ball_position']['y'] <= self.game_state['player2_position'] + 90: + if self.game_state['ball_velocity']['x'] > 0: + self.game_state['ball_velocity']['x'] *= -1 + self.update_ball_velocity() # Check for scoring if self.game_state['ball_position']['x'] <= 10: self.game_state['player2_score'] += 1 self.reset_ball() elif self.game_state['ball_position']['x'] >= 790: self.game_state['player1_score'] += 1 + print(f"*** Ball in position ({self.game_state['ball_position']['x']},{self.game_state['ball_position']['y']}) with a speed ratio of {self.speed}") self.reset_ball() - # Check for collisions with paddles - if self.game_state['ball_position']['x'] <= 20 and \ - self.game_state['player1_position'] <= self.game_state['ball_position']['y'] <= self.game_state['player1_position'] + 80: - self.update_ball_velocity() - self.game_state['ball_velocity']['x'] *= -1 - elif self.game_state['ball_position']['x'] >= 760 and \ - self.game_state['player2_position'] <= self.game_state['ball_position']['y'] <= self.game_state['player2_position'] + 80: - self.update_ball_velocity() - self.game_state['ball_velocity']['x'] *= -1 - def reset_ball(self): self.game_state['ball_position'] = {'x': 390, 'y': 190} self.game_state['ball_velocity'] = {'x': random.choice([-5, 5]), 'y': random.choice([-5, 5])} @@ -68,8 +81,6 @@ class Game: self.speed += 0.05 if self.speed > 2: self.speed = 2 - else: - print(f"Ball velocity: {self.speed}") self.game_state['ball_velocity']['x'] *= self.speed if self.game_state['ball_velocity']['x'] < -10: self.game_state['ball_velocity']['x'] = -10 @@ -87,7 +98,8 @@ class Game: 'game_state': self.game_state }) await self.player1.send(message) - await self.player2.send(message) + if not self.botgame: + await self.player2.send(message) async def handle_key_press(self, player, key): if player == self.player1: @@ -99,7 +111,7 @@ class Game: self.game_state['player1_position'] += 25 if self.game_state['player1_position'] > 300: self.game_state['player1_position'] = 300 - elif player == self.player2: + elif not self.botgame and player == self.player2: if key == 'arrowup': self.game_state['player2_position'] -= 25 if self.game_state['player2_position'] < 0: diff --git a/pong/game/matchmaking.py b/pong/game/matchmaking.py index bd96aa2..5c41298 100644 --- a/pong/game/matchmaking.py +++ b/pong/game/matchmaking.py @@ -9,6 +9,8 @@ class MatchMaker: self.waiting_players = [] self.active_games = {} self.matching_task = None + self.timer = 0 + self.botgame = False async def add_player(self, player): if player not in self.waiting_players: @@ -27,10 +29,17 @@ class MatchMaker: player1 = self.waiting_players.pop(0) player2 = self.waiting_players.pop(0) print(f"MATCH FOUND: {player1.user.username} vs {player2.user.username}") - game_id = await self.create_game(player1, player2) + await self.create_game(player1, player2) else: - # No players to match, wait for a short time before checking again await asyncio.sleep(1) + self.timer += 1 + # Waiting for more than 30s -> BOT game + if self.timer >= 30: + player1 = self.waiting_players.pop(0) + print(f"MATCH FOUND: {player1.user.username} vs BOT") + self.botgame = True + self.timer = 0 + await self.create_bot_game(player1) async def create_game(self, player1, player2): game_id = len(self.active_games) + 1 @@ -39,27 +48,47 @@ class MatchMaker: self.active_games[game_id] = new_game await self.notify_players(player1, player2, game_id) asyncio.create_task(new_game.start_game()) - return game_id + + async def create_bot_game(self, player1): + game_id = len(self.active_games) + 1 + print(f"- Creating BOT game: {game_id}") + new_game = Game(game_id, player1, None) + self.active_games[game_id] = new_game + await self.notify_players(player1, None, game_id) + asyncio.create_task(new_game.start_game()) + async def notify_players(self, player1, player2, game_id): - await player1.send(json.dumps({ - 'type': 'game_start', - 'game_id': game_id, - 'player1': player1.user.username, - 'player2': player2.user.username - })) - await player2.send(json.dumps({ - 'type': 'game_start', - 'game_id': game_id, - 'player1': player1.user.username, - 'player2': player2.user.username - })) + if player2: + await player1.send(json.dumps({ + 'type': 'game_start', + 'game_id': game_id, + 'player1': player1.user.username, + 'player2': player2.user.username + })) + await player2.send(json.dumps({ + 'type': 'game_start', + 'game_id': game_id, + 'player1': player1.user.username, + 'player2': player2.user.username + })) + else: + await player1.send(json.dumps({ + 'type': 'game_start', + 'game_id': game_id, + 'player1': player1.user.username, + 'player2': 'BOT' + })) async def handle_key_press(self, player, key): for game in self.active_games.values(): - if player in [game.player1, game.player2]: + if not self.botgame: + if player in [game.player1, game.player2]: + await game.handle_key_press(player, key) + break + else: await game.handle_key_press(player, key) - break + break # Instance of the class match_maker = MatchMaker() From 18c6580ae3129df6ee00d70679cb3bfa2e314328 Mon Sep 17 00:00:00 2001 From: CHIBOUB Chakib Date: Sun, 28 Jul 2024 23:09:09 +0200 Subject: [PATCH 7/7] Server now can handle multiple games at once, and closes game routine when someone disconnects --- pong/game/consumers.py | 16 +++++++++--- pong/game/game.py | 53 ++++++++++++++++++++++++++-------------- pong/game/matchmaking.py | 28 ++++++++++++--------- pong/static/game.js | 4 +++ 4 files changed, 67 insertions(+), 34 deletions(-) diff --git a/pong/game/consumers.py b/pong/game/consumers.py index 8495636..b473ece 100644 --- a/pong/game/consumers.py +++ b/pong/game/consumers.py @@ -4,20 +4,23 @@ import json from channels.generic.websocket import AsyncWebsocketConsumer from django.contrib.auth.models import User from channels.db import database_sync_to_async -from .matchmaking import match_maker # Import the match_maker instance +from .matchmaking import match_maker class GameConsumer(AsyncWebsocketConsumer): async def connect(self): await self.accept() + self.game = None print("User connected") async def receive(self, text_data): data = json.loads(text_data) - #print(f"MESSAGE RECEIVED: {data['type']}") if data['type'] == 'authenticate': await self.authenticate(data['token']) elif data['type'] == 'key_press': - await match_maker.handle_key_press(self, data['key']) + if self.game: + await self.game.handle_key_press(self, data['key']) + else: + await match_maker.handle_key_press(self, data['key']) async def authenticate(self, token): user = await self.get_user_from_token(token) @@ -43,5 +46,10 @@ class GameConsumer(AsyncWebsocketConsumer): await match_maker.add_player(self) async def disconnect(self, close_code): + if self.game: + await self.game.end_game(disconnected_player=self) await match_maker.remove_player(self) - print(f"User {self.user} disconnected") + print(f"User {self.user.username if hasattr(self, 'user') else 'Unknown'} disconnected") + + async def set_game(self, game): + self.game = game diff --git a/pong/game/game.py b/pong/game/game.py index f6eef12..d7244f9 100644 --- a/pong/game/game.py +++ b/pong/game/game.py @@ -22,9 +22,10 @@ class Game: } self.speed = 1 self.game_loop_task = None + self.ended = False async def start_game(self): - print(f"- Game {self.game_id} START") + print(f"- Game #{self.game_id} STARTED") self.game_loop_task = asyncio.create_task(self.game_loop()) async def game_loop(self): @@ -35,7 +36,6 @@ class Game: await self.send_game_state() await asyncio.sleep(1/60) # Around 60 FPS - # The amazing AI BOT player async def update_bot_position(self): target_y = self.game_state['ball_position']['y'] if self.game_state['player2_position'] < target_y < self.game_state['player2_position'] + 80: @@ -69,7 +69,6 @@ class Game: self.reset_ball() elif self.game_state['ball_position']['x'] >= 790: self.game_state['player1_score'] += 1 - print(f"*** Ball in position ({self.game_state['ball_position']['x']},{self.game_state['ball_position']['y']}) with a speed ratio of {self.speed}") self.reset_ball() def reset_ball(self): @@ -93,6 +92,8 @@ class Game: self.game_state['ball_velocity']['y'] = 10 async def send_game_state(self): + if self.ended: + return message = json.dumps({ 'type': 'game_state_update', 'game_state': self.game_state @@ -102,26 +103,40 @@ class Game: await self.player2.send(message) async def handle_key_press(self, player, key): + if self.ended: + return if player == self.player1: if key == 'arrowup': - self.game_state['player1_position'] -= 25 - if self.game_state['player1_position'] < 0: - self.game_state['player1_position'] = 0 + self.game_state['player1_position'] = max(self.game_state['player1_position'] - 25, 0) elif key == 'arrowdown': - self.game_state['player1_position'] += 25 - if self.game_state['player1_position'] > 300: - self.game_state['player1_position'] = 300 + self.game_state['player1_position'] = min(self.game_state['player1_position'] + 25, 300) elif not self.botgame and player == self.player2: if key == 'arrowup': - self.game_state['player2_position'] -= 25 - if self.game_state['player2_position'] < 0: - self.game_state['player2_position'] = 0 + self.game_state['player2_position'] = max(self.game_state['player2_position'] - 25, 0) elif key == 'arrowdown': - self.game_state['player2_position'] += 25 - if self.game_state['player2_position'] > 300: - self.game_state['player2_position'] = 300 + self.game_state['player2_position'] = min(self.game_state['player2_position'] + 25, 300) - async def end_game(self): - if self.game_loop_task: - self.game_loop_task.cancel() - # Add any cleanup code here \ No newline at end of file + async def end_game(self, disconnected_player=None): + if not self.ended: + self.ended = True + if self.game_loop_task: + self.game_loop_task.cancel() + print(f"- Game #{self.game_id} ENDED") + # Notify that one player left the game + if disconnected_player: + remaining_player = self.player2 if disconnected_player == self.player1 else self.player1 + disconnected_name = disconnected_player.user.username + message = json.dumps({ + 'type': 'player_disconnected', + 'player': disconnected_name + }) + if not self.botgame: + await remaining_player.send(message) + # Notify both players that the game has ended + end_message = json.dumps({ + 'type': 'game_ended', + 'game_id': self.game_id + }) + await self.player1.send(end_message) + if not self.botgame: + await self.player2.send(end_message) diff --git a/pong/game/matchmaking.py b/pong/game/matchmaking.py index 5c41298..ab6b21e 100644 --- a/pong/game/matchmaking.py +++ b/pong/game/matchmaking.py @@ -22,42 +22,52 @@ class MatchMaker: async def remove_player(self, player): if player in self.waiting_players: self.waiting_players.remove(player) + + for game in self.active_games.values(): + if player in [game.player1, game.player2]: + await game.end_game(disconnected_player=player) + del self.active_games[game.game_id] + break async def match_loop(self): while True: if len(self.waiting_players) >= 2: player1 = self.waiting_players.pop(0) player2 = self.waiting_players.pop(0) - print(f"MATCH FOUND: {player1.user.username} vs {player2.user.username}") + print(f"*** MATCH FOUND: {player1.user.username} vs {player2.user.username}") await self.create_game(player1, player2) else: await asyncio.sleep(1) self.timer += 1 # Waiting for more than 30s -> BOT game - if self.timer >= 30: + if self.timer >= 30 and self.waiting_players: player1 = self.waiting_players.pop(0) - print(f"MATCH FOUND: {player1.user.username} vs BOT") + print(f"*** MATCH FOUND: {player1.user.username} vs BOT") self.botgame = True self.timer = 0 await self.create_bot_game(player1) + if not self.waiting_players: + break async def create_game(self, player1, player2): game_id = len(self.active_games) + 1 - print(f"- Creating game: {game_id}") + print(f"- Creating game: #{game_id}") new_game = Game(game_id, player1, player2) self.active_games[game_id] = new_game + await player1.set_game(new_game) + await player2.set_game(new_game) await self.notify_players(player1, player2, game_id) asyncio.create_task(new_game.start_game()) async def create_bot_game(self, player1): game_id = len(self.active_games) + 1 - print(f"- Creating BOT game: {game_id}") + print(f"- Creating BOT game: #{game_id}") new_game = Game(game_id, player1, None) self.active_games[game_id] = new_game + await player1.set_game(new_game) await self.notify_players(player1, None, game_id) asyncio.create_task(new_game.start_game()) - async def notify_players(self, player1, player2, game_id): if player2: await player1.send(json.dumps({ @@ -82,11 +92,7 @@ class MatchMaker: async def handle_key_press(self, player, key): for game in self.active_games.values(): - if not self.botgame: - if player in [game.player1, game.player2]: - await game.handle_key_press(player, key) - break - else: + if player in [game.player1, game.player2]: await game.handle_key_press(player, key) break diff --git a/pong/static/game.js b/pong/static/game.js index 6f83af0..7338ecc 100644 --- a/pong/static/game.js +++ b/pong/static/game.js @@ -170,6 +170,10 @@ document.addEventListener('DOMContentLoaded', () => { startGame(data.game_id, data.player1, data.player2); } else if (data.type === 'game_state_update') { updateGameState(data.game_state); + } else if (data.type === 'player_disconnected') { + console.log("Player disconnected:", data.player); + } else if (data.type === 'game_ended') { + console.log("Game ended:", data.game_id); } else if (data.type === 'error') { console.error(data.message); } else {