flyzto 3 месяцев назад
Родитель
Сommit
4d6e8cf4d2
2 измененных файлов с 11 добавлено и 11 удалено
  1. 8 2
      server/models/GamesPs.js
  2. 3 9
      server/triangle/eventsMatch.js

+ 8 - 2
server/models/GamesPs.js

@@ -672,7 +672,7 @@ const compareCpr = (cpr1, cpr2) => {
   return key1 === key2;
 }
 
-const updateSolutions = (solutions) => {
+const updateSolutions = (solutions, eventsLogsMap) => {
 
   if (solutions?.length) {
     const solutionsHistory = GAMES.Solutions;
@@ -716,6 +716,12 @@ const updateSolutions = (solutions) => {
       }
     });
 
+    Logs.out('invalid events, expire %d, remove %d, no ps %d',
+      eventsLogsMap.expireEvents.length,
+      eventsLogsMap.removeEvents.length,
+      eventsLogsMap.noPsRelations.length,
+    );
+
     Logs.out('solutions add %d, update %d, retain %d, remove %d',
       solutionUpdate.add.length, solutionUpdate.update.length, solutionUpdate.retain.length, solutionUpdate.remove.length);
 
@@ -894,7 +900,7 @@ events_child.on('message', async (message) => {
   }
   else if (method == 'post') {
     if (type == 'updateSolutions') {
-      updateSolutions(data);
+      updateSolutions(data.solutions, data.eventsLogsMap);
     }
   }
   else if (method == 'response' && id && callbacks[id]) {

+ 3 - 9
server/triangle/eventsMatch.js

@@ -71,8 +71,8 @@ const getGamesRelation = () => {
   });
 }
 
-const updateSolutions = (solutions) => {
-  postDataToParent('updateSolutions', solutions);
+const updateSolutions = (solutions, eventsLogsMap) => {
+  postDataToParent('updateSolutions', { solutions, eventsLogsMap });
 }
 
 const extractOdds = ({ evtime, events, sptime, special }) => {
@@ -175,17 +175,11 @@ const eventMatch = () => {
     })
     .filter(item => item.info);
 
-    Logs.out('invalid events, expire %d, remove %d, no ps %d',
-      eventsLogsMap.expireEvents.length,
-      eventsLogsMap.removeEvents.length,
-      eventsLogsMap.noPsRelations.length,
-    );
-
     const solutions = eventsCombination(passableEvents);
 
     // Logs.out('eventMatch solutions', solutions);
     if (solutions?.length) {
-      updateSolutions(solutions);
+      updateSolutions(solutions, eventsLogsMap);
     }
   })
   .finally(() => {