diff --git a/server.js b/server.js deleted file mode 100644 index 0e0c900..0000000 --- a/server.js +++ /dev/null @@ -1,19 +0,0 @@ -const express = require("express"); -const path = require("path"); -const http = require("http"); -const { Server } = require("socket.io"); - -const { PORT } = require("./config"); -const { registerSocketHandlers } = require("./socketHandlers"); - -const app = express(); -const server = http.createServer(app); -const wSS = new Server(server); // wSS pour webSocketServer - -app.use(express.static(path.join(__dirname, "..", "client"))); - -wSS.on("connection", (socket) => registerSocketHandlers(wSS, socket)); - -server.listen(PORT, () => { - console.log(`serveur demarre sur http://localhost:${PORT}`); -}); diff --git a/server/doorLogic.js b/server/doorLogic.js index 665afd6..724a4df 100644 --- a/server/doorLogic.js +++ b/server/doorLogic.js @@ -11,7 +11,7 @@ const { correctDoor, startPosition } = require("./maze"); const { DOORS_TO_WIN } = require("./config"); -fonction handleDoorReached(wSS, socket, position) { +function handleDoorReached(wSS, socket, position) { const pairState = socket.data.pairState; if(!pairState || pairState.gameOver) return; // partie deja terminee diff --git a/server/server.js b/server/server.js index 47ec520..83aa07c 100644 --- a/server/server.js +++ b/server/server.js @@ -9,4 +9,17 @@ const path = require("path"); const http = require("http"); const { Server } = require("socket.io"); -const { PORT } = require("./config.js"); +const { PORT } = require("./config"); +const { registerSocketHandlers } = require("./socketHandler"); + +const app = express(); +const server = http.createServer(app); +const io = new Server(server); + +app.use(express.static(path.join(__dirname, "..", "client"))); + +io.on("connection", (socket) => registerSocketHandlers(io, socket)); + +server.listen(PORT, () => { + console.log(`Serveur démarré sur http://localhost:${PORT}`); +}); diff --git a/server/socketHandler.js b/server/socketHandler.js index b98fc08..1746aa0 100644 --- a/server/socketHandler.js +++ b/server/socketHandler.js @@ -57,7 +57,7 @@ function registerSocketHandlers(io, socket) { partnerSocket.emit("status", "Ton partenaire s'est deconnecte"); } } - )}; + }); } module.exports = { registerSocketHandlers }; diff --git a/server/timer.js b/server/timer.js index f60560d..1a295c5 100644 --- a/server/timer.js +++ b/server/timer.js @@ -4,9 +4,9 @@ minuteur autoritaire cote serveur */ -const GAME_DURATION = {"./config"}; +const GAME_DURATION = require("./config"); -fonction startTimer(socket, partnerSocket, pairState) { +function startTimer(socket, partnerSocket, pairState) { const interval = setInterval(() => { if (pairState.gameOver) { clearInterval(interval);