First draft of game balancing solution after reconnect

[vchess.git] / sockets.js

diff --git a/sockets.js b/sockets.js
index f3d479d..8548e2f 100644 (file)
--- a/sockets.js
+++ b/sockets.js
@@ -1,16 +1,6 @@
-//const url = require('url');
+const url = require('url');
 const Variants = require("./variants");
 
-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;
-}
-
 module.exports = function(wss) {
 
        let clients = { "index": {} };
@@ -18,21 +8,10 @@ module.exports = function(wss) {
        for (const v of Variants)
                clients[v.name] = {};
 
-       // (resign, newgame, newmove). See https://github.com/websockets/ws/blob/master/lib/websocket.js around line 313
-       // TODO: awaiting newmove, resign, (+newgame?) :: in memory structure (use Redis ?)
-       let newmoves = {};
-       let newresign = {};
-       for (const v of Variants)
-       {
-               newmoves[v.name] = {};
-               newresign[v.name] = {};
-       }
-
        wss.on("connection", (socket, req) => {
-               //const params = new URL("http://localhost" + req.url).searchParams;
-               var query = getJsonFromUrl(req.url);
-               const sid = query["sid"]; //params.get("sid");
-               const page = query["page"]; //params.get("page");
+               const params = new URL("http://localhost" + req.url).searchParams;
+               const sid = params.get("sid");
+               const page = params.get("page");
                clients[page][sid] = socket;
                if (page == "index")
                {
@@ -52,30 +31,22 @@ module.exports = function(wss) {
                        Object.keys(clients[page]).forEach( k => {
                                clients[page][k].send(JSON.stringify({code:"connect",id:sid}));
                        });
-                       if (!!newmoves[page][sid])
-                       {
-                               socket.send(JSON.stringify({code:"newmove",move:newmoves[page][sid]}));
-                               delete newmoves[page][sid];
-                       }
-                       if (!!newresign[page][sid])
-                       {
-                               socket.send(JSON.stringify({code:"resign"}));
-                               delete newresign[page][sid];
-                       }
                        socket.on("message", objtxt => {
                                let obj = JSON.parse(objtxt);
                                switch (obj.code)
                                {
                                        case "newmove":
-                                               if (!!clients[page][obj.oppid]) // && clients[page][obj.oppid].readyState == WebSocket.OPEN)
+                                               if (!!clients[page][obj.oppid])
                                                        clients[page][obj.oppid].send(JSON.stringify({code:"newmove",move:obj.move}));
-                                               else
-                                                       newmoves[page][obj.oppid] = obj.move;
                                                break;
                                        case "ping":
-                                               if (!!clients[page][obj.oppid]) // && clients[page][obj.oppid].readyState == WebSocket.OPEN)
+                                               if (!!clients[page][obj.oppid])
                                                        socket.send(JSON.stringify({code:"pong"}));
                                                break;
+                                       case "lastate":
+                                               if (!!clients[page][obj.oppid])
+                                                       clients[page][obj.oppid].send(objtxt);
+                                               break;
                                        case "newgame":
                                                if (!!games[page])
                                                {
@@ -85,16 +56,15 @@ module.exports = function(wss) {
                                                        delete games[page];
                                                        const mycolor = Math.random() < 0.5 ? 'w' : 'b';
                                                        socket.send(JSON.stringify({code:"newgame",fen:fen,oppid:oppId,color:mycolor}));
-                                                       clients[page][oppId].send(JSON.stringify({code:"newgame",fen:fen,oppid:sid,color:mycolor=="w"?"b":"w"}));
+                                                       if (!!clients[page][oppId])
+                                                               clients[page][oppId].send(JSON.stringify({code:"newgame",fen:fen,oppid:sid,color:mycolor=="w"?"b":"w"}));
                                                }
                                                else
                                                        games[page] = {id:sid, fen:obj.fen}; //wait for opponent
                                                break;
                                        case "resign":
-                                               if (!!clients[page][obj.oppid]) // && clients[page][obj.oppid].readyState == WebSocket.OPEN)
+                                               if (!!clients[page][obj.oppid])
                                                        clients[page][obj.oppid].send(JSON.stringify({code:"resign"}));
-                                               else
-                                                       newresign[page][obj.oppid] = true;
                                                break;
                                }
                        });