From fd8435b6321fcc72a062527069ea91780881986f Mon Sep 17 00:00:00 2001
From: batche <chebadad@lilo.org>
Date: Wed, 14 Dec 2022 11:01:11 +0100
Subject: [PATCH] travail avec lucky - suite

---
 srcs/docker-compose.yml                          |  2 +-
 srcs/requirements/game_server/Dockerfile         |  4 ++--
 .../game_server/game_back/src/server/server.ts   | 16 ----------------
 .../game_server/game_back/src/server/wsServer.ts |  2 +-
 srcs/requirements/nginx/conf/default.conf        |  7 ++-----
 5 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 srcs/requirements/game_server/game_back/src/server/server.ts

diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml
index 344e148a..0104cabc 100644
--- a/srcs/docker-compose.yml
+++ b/srcs/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       NODE_ENV: "${NODE_ENV}"
     restart: unless-stopped
     ports:
-      - "8080:8080"
+      - "8042:8042"
     depends_on:
       - backend_dev
 
diff --git a/srcs/requirements/game_server/Dockerfile b/srcs/requirements/game_server/Dockerfile
index 7606e6d0..72857a78 100644
--- a/srcs/requirements/game_server/Dockerfile
+++ b/srcs/requirements/game_server/Dockerfile
@@ -10,6 +10,6 @@ RUN npx tsc
 
 WORKDIR /usr/app/src/server
 
-EXPOSE 8080
+EXPOSE 8042
 
-CMD [ "node", "server.js"]
+CMD [ "node", "wsServer.js"]
diff --git a/srcs/requirements/game_server/game_back/src/server/server.ts b/srcs/requirements/game_server/game_back/src/server/server.ts
deleted file mode 100644
index ad07430d..00000000
--- a/srcs/requirements/game_server/game_back/src/server/server.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-
-import http from "http";
-import url from "url";
-import fs from "fs";
-import path from "path";
-
-import {wsServer} from "./wsServer.js"; wsServer; // no-op, just for loading
-
-const hostname = "0.0.0.0";
-const port = 8080;
-
-const server = http.createServer();
-
-server.listen(port, hostname, () => {
-	console.log(`Pong running at http://${hostname}:${port}/pong.html`);
-});
diff --git a/srcs/requirements/game_server/game_back/src/server/wsServer.ts b/srcs/requirements/game_server/game_back/src/server/wsServer.ts
index 93a9623c..c11015f2 100644
--- a/srcs/requirements/game_server/game_back/src/server/wsServer.ts
+++ b/srcs/requirements/game_server/game_back/src/server/wsServer.ts
@@ -17,7 +17,7 @@ import { gameSessionIdPLACEHOLDER } from "./constants.js";
 
 // pas indispensable d'avoir un autre port si le WebSocket est relié à un serveur http préexistant ?
 const wsPort = 8042;
-export const wsServer = new WebSocketServer<WebSocket>({port: wsPort, path: "/pong"});
+export const wsServer = new WebSocketServer<WebSocket>({host: "0.0.0.0", port: wsPort, path: "/pong"});
 const clientsMap: Map<string, Client> = new Map; // socket.id/Client
 const matchmakingPlayersMap: Map<string, ClientPlayer> = new Map; // socket.id/ClientPlayer (duplicates with clientsMap)
 const gameSessionsMap: Map<string, GameSession> = new Map; // GameSession.id(url)/GameSession
diff --git a/srcs/requirements/nginx/conf/default.conf b/srcs/requirements/nginx/conf/default.conf
index d64f1df6..4a5e5a32 100644
--- a/srcs/requirements/nginx/conf/default.conf
+++ b/srcs/requirements/nginx/conf/default.conf
@@ -1,9 +1,6 @@
-upstream pong {
-	server http://game_server:8042/pong;
-}
-
 server {
 	listen 8080 default_server;
+	listen 8042;
 	listen [::]:8080 default_server;
 	server_name transcendance;
 
@@ -22,7 +19,7 @@ server {
 		proxy_pass http://frontend_dev:8080;
 	}
 	location /pong {
-		http://game_server:8080;
+		http://game_server:8042/pong;
 		proxy_http_version 1.1;
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection $connection_upgrade;