X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fsockets.js;h=e146ca5f1d6c314420b34dc2960169d841945604;hp=c05293e3f82a99fcde78176da9d3c59090d680b0;hb=bb7dd7db3df3d1a0445dcd5e0840a2ce79b53297;hpb=052d17ea6e199533cefb11f1ef51020b55cb1382

diff --git a/server/sockets.js b/server/sockets.js
index c05293e3..e146ca5f 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -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", () => {