X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=sockets.js;h=1ebd521280375502cfbe6b2de4e8e8582d8d3164;hb=b955c65b942d09d24b5c3bed0d755d4f2f8f71f1;hp=c130dd78d76681ecf48cf2acc26899e467aba0b8;hpb=56a683cd685eceeff44560c060c9c97605429ee1;p=vchess.git

diff --git a/sockets.js b/sockets.js
index c130dd78..1ebd5212 100644
--- a/sockets.js
+++ b/sockets.js
@@ -1,134 +1,154 @@
 const url = require('url');
-const sqlite3 = require('sqlite3');
-const db = new sqlite3.Database('db/vchess.sqlite');
+const VariantModel = require("./models/Variant");
+
+// Node version in Ubuntu 16.04 does not know about URL class
+function getJsonFromUrl(url) {
+	var query = url.substr(2); //starts with "/?"
+	var result = {};
+	query.split("&").forEach(function(part) {
+		var item = part.split("=");
+		result[item[0]] = decodeURIComponent(item[1]);
+	});
+	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
+
+// TODO: this file in the end will be much simpler, just tracking connect/disconnect
+// (everything else using WebRTC)
 
 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] = {};
-			// No-op function as a callback when sending messages
-			const noop = () => { };
-			wss.on("connection", (socket, req) => {
-				const params = new URL("http://localhost" + req.url).searchParams;
-				const sid = params.get("sid");
-				const page = params.get("page");
-				// Ignore duplicate connections:
-				if (!!clients[page][sid])
-				{
-					socket.send(JSON.stringify({code:"duplicate"}));
-					return;
-				}
-				clients[page][sid] = socket;
-				if (page == "index")
-				{
-					// Send counting info
-					const countings = {};
-					for (const v of variants)
-						countings[v.name] = Object.keys(clients[v.name]).length;
-					socket.send(JSON.stringify({code:"counts",counts:countings}));
-				}
-				else
+	VariantModel.getAll((err,variants) => {
+		let clients = { "index": {} };
+		let games = {}; //pending games (player sid)
+		for (const v of variants)
+			clients[v.id] = {};
+		// No-op function as a callback when sending messages
+		const noop = () => { };
+		wss.on("connection", (socket, req) => {
+//				const params = new URL("http://localhost" + req.url).searchParams;
+//				const sid = params.get("sid");
+//				const page = params.get("page");
+			var query = getJsonFromUrl(req.url);
+			const sid = query["sid"];
+			const page = query["page"];
+			// Ignore duplicate connections:
+			if (!!clients[page][sid])
+			{
+				socket.send(JSON.stringify({code:"duplicate"}));
+				return;
+			}
+			clients[page][sid] = socket;
+			if (page == "index")
+			{
+				// Send counting info
+				const countings = {};
+				for (const v of variants)
+					countings[v.id] = Object.keys(clients[v.id]).length;
+				socket.send(JSON.stringify({code:"counts",counts:countings}));
+			}
+			else
+			{
+				// 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",vid:page}), noop);
+				});
+				// Also notify potential opponents:
+				// hit all clients which check if sid corresponds
+				Object.keys(clients[page]).forEach( k => {
+					clients[page][k].send(JSON.stringify({code:"connect",id:sid}), noop);
+				});
+				socket.on("message", objtxt => {
+					let obj = JSON.parse(objtxt);
+					switch (obj.code)
+					{
+						case "newchat":
+							if (!!clients[page][obj.oppid])
+							{
+								clients[page][obj.oppid].send(
+									JSON.stringify({code:"newchat",msg:obj.msg}), noop);
+							}
+							break;
+						case "newmove":
+							if (!!clients[page][obj.oppid])
+							{
+								clients[page][obj.oppid].send(
+									JSON.stringify({code:"newmove",move:obj.move}), noop);
+							}
+							break;
+						case "ping":
+							if (!!clients[page][obj.oppid])
+								socket.send(JSON.stringify({code:"pong",gameId:obj.gameId}));
+							break;
+						case "myname":
+							// Reveal my username to opponent
+							if (!!clients[page][obj.oppid])
+							{
+								clients[page][obj.oppid].send(JSON.stringify({
+									code:"oppname", name:obj.name}));
+							}
+							break;
+						case "lastate":
+							if (!!clients[page][obj.oppid])
+							{
+								const oppId = obj.oppid;
+								obj.oppid = sid; //I'm oppid for my opponent
+								clients[page][oppId].send(JSON.stringify(obj), noop);
+							}
+							break;
+						case "newgame":
+							if (!!games[page])
+							{
+								// 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');
+								socket.send(JSON.stringify(
+									{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",gameid:gameId}),
+										noop);
+								}
+							}
+							else
+								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];
+							break;
+						case "resign":
+							if (!!clients[page][obj.oppid])
+								clients[page][obj.oppid].send(JSON.stringify({code:"resign"}), noop);
+							break;
+						// TODO: case "challenge" (get ID) --> send to all, "acceptchallenge" (with ID) --> send to all, "cancelchallenge" --> send to all
+						// also, "sendgame" (give current game info, if any) --> to new connections, "sendchallenges" (same for challenges) --> to new connections
+					}
+				});
+			}
+			socket.on("close", () => {
+				delete clients[page][sid];
+				// Remove potential pending game
+				if (!!games[page] && games[page]["id"] == sid)
+					delete games[page];
+				if (page != "index")
 				{
 					// 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);
-					});
-					// Also notify potential opponents:
-					// hit all clients which check if sid corresponds
-					Object.keys(clients[page]).forEach( k => {
-						clients[page][k].send(JSON.stringify({code:"connect",id:sid}), noop);
-					});
-					socket.on("message", objtxt => {
-						let obj = JSON.parse(objtxt);
-						switch (obj.code)
-						{
-							case "newchat":
-								if (!!clients[page][obj.oppid])
-								{
-									clients[page][obj.oppid].send(
-										JSON.stringify({code:"newchat",msg:obj.msg}), noop);
-								}
-								break;
-							case "newmove":
-								if (!!clients[page][obj.oppid])
-								{
-									clients[page][obj.oppid].send(
-										JSON.stringify({code:"newmove",move:obj.move}), noop);
-								}
-								break;
-							case "ping":
-								if (!!clients[page][obj.oppid])
-									socket.send(JSON.stringify({code:"pong",gameId:obj.gameId}));
-								break;
-							case "myname":
-								// Reveal my username to opponent
-								if (!!clients[page][obj.oppid])
-								{
-									clients[page][obj.oppid].send(JSON.stringify({
-										code:"oppname", name:obj.name}));
-								}
-								break;
-							case "lastate":
-								if (!!clients[page][obj.oppid])
-								{
-									const oppId = obj.oppid;
-									obj.oppid = sid; //I'm oppid for my opponent
-									clients[page][oppId].send(JSON.stringify(obj), noop);
-								}
-								break;
-							case "newgame":
-								if (!!games[page])
-								{
-									// Start a new game
-									const oppId = games[page]["id"];
-									const fen = games[page]["fen"];
-									delete games[page];
-									const mycolor = Math.random() < 0.5 ? 'w' : 'b';
-									socket.send(JSON.stringify(
-										{code:"newgame",fen:fen,oppid:oppId,color:mycolor}));
-									if (!!clients[page][oppId])
-									{
-										clients[page][oppId].send(
-											JSON.stringify(
-												{code:"newgame",fen:fen,oppid:sid,color:mycolor=="w"?"b":"w"}),
-											noop);
-									}
-								}
-								else
-									games[page] = {id:sid, fen:obj.fen}; //wait for opponent
-								break;
-							case "cancelnewgame": //if a user cancel his seek
-								delete games[page];
-								break;
-							case "resign":
-								if (!!clients[page][obj.oppid])
-									clients[page][obj.oppid].send(JSON.stringify({code:"resign"}), noop);
-								break;
-						}
+							JSON.stringify({code:"decrease",vid:page}), noop);
 					});
 				}
-				socket.on("close", () => {
-					delete clients[page][sid];
-					// Remove potential pending game
-					if (!!games[page] && games[page]["id"] == sid)
-						delete games[page];
-					if (page != "index")
-					{
-						// 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);
-						});
-					}
-					// Also notify potential opponents:
-					// hit all clients which check if sid corresponds
-					Object.keys(clients[page]).forEach( k => {
-						clients[page][k].send(JSON.stringify({code:"disconnect",id:sid}), noop);
-					});
+				// Also notify potential opponents:
+				// hit all clients which check if sid corresponds
+				Object.keys(clients[page]).forEach( k => {
+					clients[page][k].send(JSON.stringify({code:"disconnect",id:sid}), noop);
 				});
 			});
 		});