Can create, send and accept challenge. Next step: targetted, launch game

[vchess.git] / server / sockets.js

diff --git a/server/sockets.js b/server/sockets.js
index 333fe77..e146ca5 100644 (file)
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -33,7 +33,7 @@ module.exports = function(wss) {
        wss.on("connection", (socket, req) => {
                const query = getJsonFromUrl(req.url);
                const sid = query["sid"];
-               // Ignore duplicate connections (on the same live game that we play):
+    // Ignore duplicate connections (on the same live game that we play):
                if (!!clients[sid])
                        return socket.send(JSON.stringify({code:"duplicate"}));
                clients[sid] = socket;
@@ -49,23 +49,37 @@ module.exports = function(wss) {
       //console.log(obj.code);
                        switch (obj.code)
                        {
-        case "askclients":
-          socket.send(JSON.stringify({code:"clients", sockIds:Object.keys(clients).filter(k => k != sid)}));
+        case "pollclients":
+          socket.send(JSON.stringify({code:"pollclients",
+            sockIds:Object.keys(clients).filter(k => k != sid)}));
           break;
         case "askidentity":
-          clients[obj.target].send(JSON.stringify({code:"identify",from:sid}));
+          clients[obj.target].send(
+            JSON.stringify({code:"askidentity",from:sid}));
+          break;
+        case "askchallenge":
+          clients[obj.target].send(
+            JSON.stringify({code:"askchallenge",from:sid}));
+          break;
+        case "askgame":
+          clients[obj.target].send(
+            JSON.stringify({code:"askgame",from:sid}));
           break;
         case "identity":
-          clients[obj.target].send(JSON.stringify({code:"identity",user:obj.user}));
+          clients[obj.target].send(
+            JSON.stringify({code:"identity",user:obj.user}));
           break;
-        case "askchallenges":
-          // TODO: ask directly to people (webRTC)
-          // TODO... + clarify socket system
+        case "challenge":
+          // Relay challenge to other player
+          clients[obj.target].send(
+            JSON.stringify({code:"challenge", chall:obj.chall, from:sid}));
           break;
-        case "newchallenge":
-          clients[obj.target].send(JSON.stringify({code:"newchallenge",chall:obj.chall}));
-        case "askgames":
-          // TODO: ask directly to people (webRTC)
+        case "acceptchallenge":
+          clients[obj.target].send(
+            JSON.stringify({code:"acceptchallenge", cid:obj.cid, from:sid}));
+          break;
+        case "game":
+          // TODO: relay (live) game to other player
           break;
                                case "newchat":
           clients[obj.target].send(JSON.stringify({code:"newchat",msg:obj.msg}));
@@ -98,11 +112,6 @@ module.exports = function(wss) {
                                        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
-        case "newchallenge":
-          console.log("challenge received");
-          console.log(obj.sender);
-          console.log(obj);
-          break;
                        }
                });
                socket.on("close", () => {