From 412fe8f1c323f6a30926c7ffab1aa0d02d70e28e Mon Sep 17 00:00:00 2001 From: Thomas Chazot Date: Wed, 11 Jan 2023 14:46:57 +0100 Subject: [PATCH] encore --- bob_party/server.js | 23 +++++------------------ bob_party/socketConfig.js | 2 +- bob_party/tsconfig.json | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/bob_party/server.js b/bob_party/server.js index 168a935..37a475c 100644 --- a/bob_party/server.js +++ b/bob_party/server.js @@ -1,18 +1,6 @@ -const express = require('express'); -const http = require('http'); -const { Server } = require("socket.io"); - - - -const app = express(); -const server = http.createServer(app); -const io = new Server(server); - - -server.get('/server', function (req, res) { - res.send('hello'); -}) +const httpServer = require("http").createServer(); +const io = require("socket.io")(httpServer, {}); io.on('connection', (socket) => { console.log(socket.id); @@ -26,7 +14,7 @@ io.on('connection', (socket) => { }); socket.on('quitConv', (conv) => { - socket.off("C" + conv); + socket.off("C" + conv.id); }); socket.on("messageSent", (conv) =>{ @@ -59,6 +47,5 @@ io.on('connection', (socket) => { }); }); -server.listen( 3000, () => { - console.log('listening on *:3000'); -}); \ No newline at end of file +httpServer.listen(3000); + diff --git a/bob_party/socketConfig.js b/bob_party/socketConfig.js index caf87a3..828e7f6 100644 --- a/bob_party/socketConfig.js +++ b/bob_party/socketConfig.js @@ -1,4 +1,4 @@ const { io } = require("socket.io-client"); -export const socket = io("https://codefirst.iut.uca.fr/containers/BOB_PARTEAM-server-bobParty"); \ No newline at end of file +export const socket = io("http://172.20.10.2:3000"); \ No newline at end of file diff --git a/bob_party/tsconfig.json b/bob_party/tsconfig.json index 7e06e77..9d79331 100644 --- a/bob_party/tsconfig.json +++ b/bob_party/tsconfig.json @@ -22,6 +22,6 @@ "include": [ "**/*.ts", "**/*.tsx" -, "socketConfig.js", "server.js", "src/Games/BlackJack/blackJack.js", "src/Games/BlackJack/blackJack.js" ], +, "socketConfig.js", "server.ts", "src/Games/BlackJack/blackJack.js", "src/Games/BlackJack/blackJack.js" ], "extends": "expo/tsconfig.base" }