X-Git-Url: https://git.auder.net/images/diag_mark.svg?a=blobdiff_plain;f=sockets.js;h=21742d1dbb662440cc07bfba4fb6643dee5c9ace;hb=d44df0b01732d1948525daef5df62211ea6e1f64;hp=11fe91ccc8079e07c91e899c7c62608b1d217fcb;hpb=a48ee8b80ae4902f1e70629a608396fe3ff046d0;p=vchess.git

diff --git a/sockets.js b/sockets.js
index 11fe91cc..21742d1d 100644
--- a/sockets.js
+++ b/sockets.js
@@ -13,13 +13,16 @@ function getJsonFromUrl(url) {
 	return result;
 }
 
+// TODO: empêcher multi-log du même user (envoyer le user ID + secret en même temps que name et...)
+// --> si secret ne matche pas celui trouvé en DB, stop
+
 module.exports = function(wss) {
 	db.serialize(function() {
 		db.all("SELECT * FROM Variants", (err,variants) => {
 			let clients = { "index": {} };
 			let games = {}; //pending games (player sid)
 			for (const v of variants)
-				clients[v.name] = {};
+				clients[v.id] = {};
 			// No-op function as a callback when sending messages
 			const noop = () => { };
 			wss.on("connection", (socket, req) => {
@@ -41,7 +44,7 @@ module.exports = function(wss) {
 					// Send counting info
 					const countings = {};
 					for (const v of variants)
-						countings[v.name] = Object.keys(clients[v.name]).length;
+						countings[v.id] = Object.keys(clients[v.id]).length;
 					socket.send(JSON.stringify({code:"counts",counts:countings}));
 				}
 				else
@@ -49,7 +52,7 @@ module.exports = function(wss) {
 					// Send to every client connected on index an update message for counts
 					Object.keys(clients["index"]).forEach( k => {
 						clients["index"][k].send(
-							JSON.stringify({code:"increase",vname:page}), noop);
+							JSON.stringify({code:"increase",vid:page}), noop);
 					});
 					// Also notify potential opponents:
 					// hit all clients which check if sid corresponds
@@ -100,20 +103,21 @@ module.exports = function(wss) {
 									// Start a new game
 									const oppId = games[page]["id"];
 									const fen = games[page]["fen"];
+									const gameId = games[page]["gameid"];
 									delete games[page];
-									const mycolor = Math.random() < 0.5 ? 'w' : 'b';
+									const mycolor = (Math.random() < 0.5 ? 'w' : 'b');
 									socket.send(JSON.stringify(
-										{code:"newgame",fen:fen,oppid:oppId,color:mycolor}));
+										{code:"newgame",fen:fen,oppid:oppId,color:mycolor,gameid:gameId}));
 									if (!!clients[page][oppId])
 									{
 										clients[page][oppId].send(
 											JSON.stringify(
-												{code:"newgame",fen:fen,oppid:sid,color:mycolor=="w"?"b":"w"}),
+												{code:"newgame",fen:fen,oppid:sid,color:mycolor=="w"?"b":"w",gameid:gameId}),
 											noop);
 									}
 								}
 								else
-									games[page] = {id:sid, fen:obj.fen}; //wait for opponent
+									games[page] = {id:sid, fen:obj.fen, gameid:obj.gameid}; //wait for opponent
 								break;
 							case "cancelnewgame": //if a user cancel his seek
 								delete games[page];
@@ -135,7 +139,7 @@ module.exports = function(wss) {
 						// Send to every client connected on index an update message for counts
 						Object.keys(clients["index"]).forEach( k => {
 							clients["index"][k].send(
-								JSON.stringify({code:"decrease",vname:page}), noop);
+								JSON.stringify({code:"decrease",vid:page}), noop);
 						});
 					}
 					// Also notify potential opponents: