From d3045b70f533fdf6d0d9fe0b57f890c2bfa435ed Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 4 Jan 2023 15:46:07 +0100 Subject: [PATCH 1/6] essai --- WEB/Controller/UserController.php | 2 +- WEB/server.js | 27 --------------------------- WEB/server.php | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 WEB/server.js create mode 100644 WEB/server.php diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index e38daadc..87b4762d 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -205,7 +205,7 @@ class UserController $model = new UserModel(); $model->addToQueue(); $userGroup = $model->findUserGroup(); - $io = get_io(); + $io = getenv('io'); $io->to($userGroup)->emit("launchGame"); } catch (Exception $e) { $error = $e->getMessage(); diff --git a/WEB/server.js b/WEB/server.js deleted file mode 100644 index 0ed47547..00000000 --- a/WEB/server.js +++ /dev/null @@ -1,27 +0,0 @@ -//const io = require('socket.io')('http://localhost:3000'); -//modules -module = '/usr/local/lib/node_modules/'; -console.log('module'); -const express = require(module + "express"); -console.log('express'); -const socketIO = require(module +"socket.io");//('http://82.165.180.114:3000'); -console.log('socketIO'); -const app = express(); -console.log('app'); -const server = app.listen(3000); -const io =socketIO(server); -io.on('connection', socket => { - console.log("connection de l'utilisateur à l'id ". socket.id); -}) -console.log('ioOnConnection'); - -io.on('launchGame' , function () { - console.log('launch the game'); - location.reload(); -}) - -module.exports = { - io: io - }; - -console.log('iolisten'); \ No newline at end of file diff --git a/WEB/server.php b/WEB/server.php new file mode 100644 index 00000000..ff87bb21 --- /dev/null +++ b/WEB/server.php @@ -0,0 +1,27 @@ +listen(3000); + +// Créer l'objet socket.io en lui passant le serveur +$io = require('/usr/local/lib/node_modules/socket.io')($server); + +// Quand un utilisateur se connecte +$io->on('connection', function ($socket) { + echo "connection de l'utilisateur à l'id " . $socket->id; +}); + +// Quand un utilisateur lance le jeu +$io->on('launchGame', function () { + echo 'launch the game'; + header('Location: index.php'); +}); + +// Exporter l'objet socket.io +putenv("io=$io"); + +echo 'iolisten'; +?> \ No newline at end of file From dbc726452425f92561589866c824276c9ad108c7 Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 4 Jan 2023 16:25:26 +0100 Subject: [PATCH 2/6] test --- WEB/Controller/UserController.php | 3 ++- WEB/server.js | 30 ++++++++++++++++++++++++++++++ WEB/server.php | 27 --------------------------- 3 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 WEB/server.js delete mode 100644 WEB/server.php diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index 07b14095..c2c0e7af 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -114,7 +114,8 @@ class UserController $model = new UserModel(); $model->addToQueue(); $userGroup = $model->findUserGroup(); - $io = getenv('io'); + $io = require '/usr/local/lib/node_modules/socket.io-client'; + $socket = $io('http://82.165.180.114:3000'); $io->to($userGroup)->emit("launchGame"); } catch (Exception $e) { $error = $e->getMessage(); diff --git a/WEB/server.js b/WEB/server.js new file mode 100644 index 00000000..d62779bb --- /dev/null +++ b/WEB/server.js @@ -0,0 +1,30 @@ +// Modules +const express = require('express'); +const socketIO = require('socket.io'); + +// Créer l'application express +const app = express(); + +// Créer le serveur +const server = app.listen(3000); + +// Créer l'objet socket.io en lui passant le serveur +const io = socketIO(server); + +// Quand un utilisateur se connecte +io.on('connection', socket => { +console.log("connection de l'utilisateur à l'id "+ socket.id); +}); + +// Quand un utilisateur lance le jeu +io.on('launchGame', () => { +console.log('launch the game'); +location.reload(); +}); + +// Exporter l'objet socket.io +module.exports = { +io: io +}; + +console.log('iolisten'); \ No newline at end of file diff --git a/WEB/server.php b/WEB/server.php deleted file mode 100644 index ff87bb21..00000000 --- a/WEB/server.php +++ /dev/null @@ -1,27 +0,0 @@ -listen(3000); - -// Créer l'objet socket.io en lui passant le serveur -$io = require('/usr/local/lib/node_modules/socket.io')($server); - -// Quand un utilisateur se connecte -$io->on('connection', function ($socket) { - echo "connection de l'utilisateur à l'id " . $socket->id; -}); - -// Quand un utilisateur lance le jeu -$io->on('launchGame', function () { - echo 'launch the game'; - header('Location: index.php'); -}); - -// Exporter l'objet socket.io -putenv("io=$io"); - -echo 'iolisten'; -?> \ No newline at end of file From dad93aa0e8511ded567fd20e3dbdc1af90d215fc Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 4 Jan 2023 16:28:05 +0100 Subject: [PATCH 3/6] correction du chemin des modules --- WEB/server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WEB/server.js b/WEB/server.js index d62779bb..38b94479 100644 --- a/WEB/server.js +++ b/WEB/server.js @@ -1,6 +1,6 @@ // Modules -const express = require('express'); -const socketIO = require('socket.io'); +const express = require('/usr/local/lib/node_modules/express'); +const socketIO = require('/usr/local/lib/node_modules/socket.io'); // Créer l'application express const app = express(); From 79712e730bca2595a3ae0dce5dae65640d77d82f Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 4 Jan 2023 16:32:39 +0100 Subject: [PATCH 4/6] correction --- WEB/server.js | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/WEB/server.js b/WEB/server.js index 38b94479..aa174cd1 100644 --- a/WEB/server.js +++ b/WEB/server.js @@ -1,30 +1,19 @@ -// Modules -const express = require('/usr/local/lib/node_modules/express'); -const socketIO = require('/usr/local/lib/node_modules/socket.io'); - -// Créer l'application express +module = '/usr/local/lib/node_modules/'; +console.log('module'); +const express = require(module + "express"); +console.log('express'); +const socketIO = require(module +"socket.io");//('http://82.165.180.114:3000'); +console.log('socketIO'); const app = express(); - -// Créer le serveur +console.log('app'); const server = app.listen(3000); - -// Créer l'objet socket.io en lui passant le serveur -const io = socketIO(server); - -// Quand un utilisateur se connecte +const io =socketIO(server); io.on('connection', socket => { -console.log("connection de l'utilisateur à l'id "+ socket.id); -}); - -// Quand un utilisateur lance le jeu -io.on('launchGame', () => { -console.log('launch the game'); -location.reload(); -}); - -// Exporter l'objet socket.io -module.exports = { -io: io -}; + console.log("connection de l'utilisateur à l'id ". socket.id); +}) +console.log('ioOnConnection'); -console.log('iolisten'); \ No newline at end of file +io.on('launchGame' , function () { + console.log('launch the game'); + location.reload(); +}) \ No newline at end of file From efd991c0dab7a7f0a87621709324ec3b7d6a6ef3 Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 4 Jan 2023 16:41:58 +0100 Subject: [PATCH 5/6] a --- WEB/Controller/UserController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index c2c0e7af..46aa6e78 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -114,9 +114,9 @@ class UserController $model = new UserModel(); $model->addToQueue(); $userGroup = $model->findUserGroup(); - $io = require '/usr/local/lib/node_modules/socket.io-client'; - $socket = $io('http://82.165.180.114:3000'); - $io->to($userGroup)->emit("launchGame"); + //$io = require '/usr/local/lib/node_modules/socket.io-client'; + //$socket = $io('http://82.165.180.114:3000'); + //$io->to($userGroup)->emit("launchGame"); } catch (Exception $e) { $error = $e->getMessage(); require($rep . $vues['erreur']); From aa302d75decf0bd20becf1447000717a09393bc9 Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 4 Jan 2023 16:46:34 +0100 Subject: [PATCH 6/6] test --- WEB/Controller/UserController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index 46aa6e78..c2c0e7af 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -114,9 +114,9 @@ class UserController $model = new UserModel(); $model->addToQueue(); $userGroup = $model->findUserGroup(); - //$io = require '/usr/local/lib/node_modules/socket.io-client'; - //$socket = $io('http://82.165.180.114:3000'); - //$io->to($userGroup)->emit("launchGame"); + $io = require '/usr/local/lib/node_modules/socket.io-client'; + $socket = $io('http://82.165.180.114:3000'); + $io->to($userGroup)->emit("launchGame"); } catch (Exception $e) { $error = $e->getMessage(); require($rep . $vues['erreur']);