X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Fsockets.js;h=4907965d041a38575ee7a2959b547b9fe9dac2ab;hb=059228c9fd737361dc97de69811daed5abbd6254;hp=c8f3c7f80bd8fae9cbd3cb3eefcc6ca5df077bc8;hpb=28b32b4fc7c23b1c72bed68e1897576c5be46c3d;p=vchess.git

diff --git a/server/sockets.js b/server/sockets.js
index c8f3c7f8..4907965d 100644
--- a/server/sockets.js
+++ b/server/sockets.js
@@ -32,24 +32,13 @@ module.exports = function(wss) {
     const id = query["id"];
     const tmpId = query["tmpId"];
     const page = query["page"];
-    const notifyRoom = (page,code,obj={}) => {
-      if (!clients[page]) return;
-      Object.keys(clients[page]).forEach(k => {
-        Object.keys(clients[page][k]).forEach(x => {
-          if (k == sid && x == tmpId) return;
-          send(
-            clients[page][k][x].socket,
-            Object.assign({ code: code, from: sid }, obj)
-          );
-        });
-      });
-    };
-    // For focus events: no need to target self
-    const notifyAllBut = (page,code,obj={},except) => {
+    const notifyRoom = (page, code, obj={}, except) => {
       if (!clients[page]) return;
+      except = except || [];
       Object.keys(clients[page]).forEach(k => {
         if (except.includes(k)) return;
         Object.keys(clients[page][k]).forEach(x => {
+          if (k == sid && x == tmpId) return;
           send(
             clients[page][k][x].socket,
             Object.assign({ code: code, from: sid }, obj)
@@ -208,17 +197,16 @@ module.exports = function(wss) {
         case "drawoffer":
         case "rematchoffer":
         case "draw":
-          if (!!obj.oppsid)
-            // "newgame" message from Hall: do not target players
-            notifyAllBut(page, "newgame", {data: obj.data}, [sid, obj.oppsid]);
-          else notifyRoom(page, obj.code, {data: obj.data});
+          notifyRoom(page, obj.code, {data: obj.data}, obj.excluded);
           break;
 
         case "rnewgame":
-          // A rematch game started: players are already informed
-          notifyAllBut(page, "newgame", {data: obj.data}, [sid]);
-          notifyAllBut("/", "newgame", {data: obj.data}, [sid, obj.oppsid]);
-          notifyRoom("/mygames", "newgame", {data: obj.data});
+          // A rematch game started:
+          notifyRoom(page, "newgame", {data: obj.data});
+          // Explicitely notify Hall if gametype == corr.
+          // Live games will be polled from Hall after gconnect event.
+          if (obj.data.cadence.indexOf('d') >= 0)
+            notifyRoom("/", "newgame", {data: obj.data});
           break;
 
         case "newmove": {
@@ -272,7 +260,7 @@ module.exports = function(wss) {
         case "notifynewgame":
           if (!!clients["/mygames"]) {
             obj.targets.forEach(t => {
-              const k = t.sid || idToSid[t.uid];
+              const k = t.sid || idToSid[t.id];
               if (!!clients["/mygames"][k]) {
                 Object.keys(clients["/mygames"][k]).forEach(x => {
                   send(
@@ -287,11 +275,11 @@ module.exports = function(wss) {
 
         case "getfocus":
         case "losefocus":
-          if (page == "/") notifyAllBut("/", obj.code, { page: "/" }, [sid]);
+          if (page == "/") notifyRoom("/", obj.code, { page: "/" }, [sid]);
           else {
             // Notify game room + Hall:
-            notifyAllBut(page, obj.code, {}, [sid]);
-            notifyAllBut("/", obj.code, { page: page }, [sid]);
+            notifyRoom(page, obj.code, {}, [sid]);
+            notifyRoom("/", obj.code, { page: page }, [sid]);
           }
           break;