X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fsockets.js;h=c2b41e88c3ede21b381593db92d819916988f8d3;hp=e791293e11175cab3f6a9dd4d8ae1f3b36ad0fdd;hb=bae751bc6bc548791772c3ff5883a03deeb77264;hpb=2c5d7b20742b802d9c47916915c1114bcfc9a9c3

diff --git a/server/sockets.js b/server/sockets.js
index e791293e..c2b41e88 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -1,7 +1,7 @@
-const url = require('url');
+const Discord = require('discord.js');
+const { token, channel } = require('./config/discord.json');
 
 // Node version in Ubuntu 16.04 does not know about URL class
-// NOTE: url is already transformed, without ?xxx=yyy... parts
 function getJsonFromUrl(url) {
   const query = url.substr(2); //starts with "/?"
   let result = {};
@@ -27,6 +27,14 @@ module.exports = function(wss) {
   // NOTE: only purpose of sidToPages = know when to delete keys in idToSid
   let sidToPages = {};
   let idToSid = {};
+  const discordClient = new Discord.Client();
+  let discordChannel = null;
+  if (token.length > 0) {
+    discordClient.login(token);
+    discordClient.once("ready", () => {
+      discordChannel = discordClient.channels.cache.get(channel);
+    });
+  }
   wss.on("connection", (socket, req) => {
     const query = getJsonFromUrl(req.url);
     const sid = query["sid"];
@@ -90,36 +98,6 @@ module.exports = function(wss) {
           // When page changes:
           doDisconnect();
           break;
-        case "killme": {
-          // Self multi-connect: manual removal + disconnect
-          const doKill = (pg) => {
-            Object.keys(clients[pg][obj.sid]).forEach(x => {
-              send(clients[pg][obj.sid][x].socket, { code: "killed" });
-            });
-            delete clients[pg][obj.sid];
-          };
-          const disconnectFromOtherConnexion = (pg,code,o={}) => {
-            Object.keys(clients[pg]).forEach(k => {
-              if (k != obj.sid) {
-                Object.keys(clients[pg][k]).forEach(x => {
-                  send(
-                    clients[pg][k][x].socket,
-                    Object.assign({ code: code, from: obj.sid }, o)
-                  );
-                });
-              }
-            });
-          };
-          Object.keys(clients).forEach(pg => {
-            if (clients[pg][obj.sid]) {
-              doKill(pg);
-              disconnectFromOtherConnexion(pg, "disconnect");
-              if (pg.indexOf("/game/") >= 0 && clients["/"])
-                disconnectFromOtherConnexion("/", "gdisconnect", { page: pg });
-            }
-          });
-          break;
-        }
         case "pollclients": {
           // From Game
           let sockIds = {};
@@ -240,6 +218,21 @@ module.exports = function(wss) {
         case "rematchoffer":
         case "draw":
           // "newgame" message can provide a page (corr Game --> Hall)
+          if (obj.code == "newchallenge") {
+            // Filter out targeted challenges and correspondance games:
+            if (!obj.data.to && obj.data.cadence.indexOf('d') < 0) {
+              const challMsg = (
+                (obj.data.sender || "@nonymous") + " : " +
+                "**" + obj.data.vname + "** " +
+                "[" + obj.data.cadence + "] "
+              );
+              if (!!discordChannel) discordChannel.send(challMsg);
+              else
+                // Log when running locally (dev, debug):
+                console.log(challMsg);
+            }
+            delete obj.data["sender"];
+          }
           notifyRoom(
             obj.page || page, obj.code, {data: obj.data}, obj.excluded);
           break;
@@ -319,7 +312,13 @@ module.exports = function(wss) {
 
         case "getfocus":
         case "losefocus":
-          clients[page][sid][tmpId].focus = (obj.code == "getfocus");
+          if (
+            !!clients[page] &&
+            !!clients[page][sid] &&
+            !!clients[page][sid][tmpId]
+          ) {
+            clients[page][sid][tmpId].focus = (obj.code == "getfocus");
+          }
           if (page == "/") notifyRoom("/", obj.code, { page: "/" }, [sid]);
           else {
             // Notify game room + Hall: