42/42_INT_14_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

travail avec lucky - suite

Browse Source
This commit is contained in:
batche
2022-12-14 11:01:11 +01:00
parent f1f94cb9bc
commit fd8435b632
5 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
srcs/docker-compose.yml
View File

@@ -24,7 +24,7 @@ services:
NODE_ENV: "${NODE_ENV}" NODE_ENV: "${NODE_ENV}"
restart: unless-stopped restart: unless-stopped
ports: ports:
- "8080:8080" - "8042:8042"
depends_on: depends_on:
- backend_dev - backend_dev

4
srcs/requirements/game_server/Dockerfile
View File

@@ -10,6 +10,6 @@ RUN npx tsc
WORKDIR /usr/app/src/server WORKDIR /usr/app/src/server
EXPOSE 8080 EXPOSE 8042
CMD [ "node", "server.js"] CMD [ "node", "wsServer.js"]

16
srcs/requirements/game_server/game_back/src/server/server.ts
View File

@@ -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`);
});

2
srcs/requirements/game_server/game_back/src/server/wsServer.ts
View File

@@ -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 ? // pas indispensable d'avoir un autre port si le WebSocket est relié à un serveur http préexistant ?
const wsPort = 8042; 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 clientsMap: Map<string, Client> = new Map; // socket.id/Client
const matchmakingPlayersMap: Map<string, ClientPlayer> = new Map; // socket.id/ClientPlayer (duplicates with clientsMap) const matchmakingPlayersMap: Map<string, ClientPlayer> = new Map; // socket.id/ClientPlayer (duplicates with clientsMap)
const gameSessionsMap: Map<string, GameSession> = new Map; // GameSession.id(url)/GameSession const gameSessionsMap: Map<string, GameSession> = new Map; // GameSession.id(url)/GameSession

7
srcs/requirements/nginx/conf/default.conf
View File

@@ -1,9 +1,6 @@
upstream pong {
server http://game_server:8042/pong;
}
server { server {
listen 8080 default_server; listen 8080 default_server;
listen 8042;
listen [::]:8080 default_server; listen [::]:8080 default_server;
server_name transcendance; server_name transcendance;
@@ -22,7 +19,7 @@ server {
proxy_pass http://frontend_dev:8080; proxy_pass http://frontend_dev:8080;
} }
location /pong { location /pong {
http://game_server:8080; http://game_server:8042/pong;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection $connection_upgrade;