feat(jsbattle): list recent league battles

Author: jamro

packages/jsbattle-docs/docs/img/puml/ai.png

@@ -291,12 +291,9 @@
     "scriptName": "nihnae",
     "joinedAt": "2020-02-23T08:27:42.940Z",
     "rank": 1,
-    "fights": {
-      "total": 343,
-      "won": 128,
-      "lose": 223,
-      "error": 43
-    },
+    "fights_total": 343,
+    "fights_win": 128,
+    "fights_lose": 43,
     "score": 1092
   },
   "user,league": {
@@ -308,12 +305,9 @@
       "scriptName": "nihnae",
       "joinedAt": "2020-02-23T08:27:42.940Z",
       "rank": 1,
-      "fights": {
-        "total": 343,
-        "won": 128,
-        "lose": 223,
-        "error": 43
-      },
+      "fights_total": 343,
+      "fights_win": 128,
+      "fights_lose": 43,
       "score": 1092
     },
     "ranktable": [
@@ -325,13 +319,10 @@
         "scriptName": "killa-8",
         "joinedAt": "2020-01-28T10:27:42.940Z",
         "rank": 1,
-        "fights": {
-          "total": 642,
-          "won": 561,
-          "lose": 213,
-          "error": 1
-        },
-        "score": 1872
+        "fights_total": 343,
+        "fights_win": 128,
+        "fights_lose": 43,
+        "score": 1092
       },
       {
         "id": "U7aO66layk0yEqwg",
@@ -341,12 +332,9 @@
         "scriptName": "nihnae",
         "joinedAt": "2020-02-23T08:27:42.940Z",
         "rank": 2,
-        "fights": {
-          "total": 343,
-          "won": 128,
-          "lose": 223,
-          "error": 43
-        },
+        "fights_total": 342,
+        "fights_win": 50,
+        "fights_lose": 122,
         "score": 1092
       },
       {
@@ -357,14 +345,125 @@
         "scriptName": "3ll3a",
         "joinedAt": "2020-04-01T12:34:42.940Z",
         "rank": 3,
-        "fights": {
-          "total": 123,
-          "won": 120,
-          "lose": 2,
-          "error": 1
-        },
-        "score": 993
+        "fights_total": 354,
+        "fights_win": 128,
+        "fights_lose": 43,
+        "score": 1092
       }
+    ],
+    "history": [
+        {
+            "id": "p0lYXgSL6l8QcRLc",
+            "createdAt": "2020-04-01T12:34:49.940Z",
+            "players": [
+                {
+                    "id": "DmYdtErQJnZGpp9y",
+                    "name": "jsbattle/crawler",
+                    "winner": true
+                },
+                {
+                    "id": "wEnX0XSEfAIPmyOi",
+                    "name": "jsbattle/chicken",
+                    "winner": false
+                }
+            ]
+        },
+        {
+            "id": "ORhzc8LFEoUhZg2N",
+            "createdAt": "2020-04-01T12:34:48.940Z",
+            "players": [
+                {
+                    "id": "pMaaEfDjmw65gQKR",
+                    "name": "jsbattle/dodge",
+                    "winner": true
+                },
+                {
+                    "id": "DmYdtErQJnZGpp9y",
+                    "name": "jsbattle/crawler",
+                    "winner": false
+                }
+            ]
+        },
+        {
+            "id": "QokqNqarUwI1lxpo",
+            "createdAt": "2020-04-01T12:34:47.940Z",
+            "players": [
+                {
+                    "id": "iVl94fUAOiXXGm3H",
+                    "name": "jsbattle/sniper",
+                    "winner": false
+                },
+                {
+                    "id": "ME1DpnV8uHet6tjl",
+                    "name": "jsbattle/kamikaze",
+                    "winner": true
+                }
+            ]
+        },
+        {
+            "id": "misNbE35uRlw43kM",
+            "createdAt": "2020-04-01T12:34:46.940Z",
+            "players": [
+                {
+                    "id": "pMaaEfDjmw65gQKR",
+                    "name": "jsbattle/dodge",
+                    "winner": true
+                },
+                {
+                    "id": "wEnX0XSEfAIPmyOi",
+                    "name": "jsbattle/chicken",
+                    "winner": false
+                }
+            ]
+        },
+        {
+            "id": "op6qpAicpDB88qq5",
+            "createdAt": "2020-04-01T12:34:45.940Z",
+            "players": [
+                {
+                    "id": "13zCqjrThAGrw2vf",
+                    "name": "jsbattle/jamro",
+                    "winner": false
+                },
+                {
+                    "id": "pMaaEfDjmw65gQKR",
+                    "name": "jsbattle/dodge",
+                    "winner": false
+                }
+            ]
+        },
+        {
+            "id": "sVFjmG406YnTSUa5",
+            "createdAt": "2020-04-01T12:34:44.940Z",
+            "players": [
+                {
+                    "id": "iVl94fUAOiXXGm3H",
+                    "name": "jsbattle/sniper",
+                    "winner": true
+                },
+                {
+                    "id": "DmYdtErQJnZGpp9y",
+                    "name": "jsbattle/crawler",
+                    "winner": false
+                }
+            ]
+        },
+        {
+            "id": "RTS41R2bY2XBaRb5",
+            "createdAt": "2020-04-01T12:34:43.940Z",
+            "players": [
+                {
+                    "id": "DmYdtErQJnZGpp9y",
+                    "name": "jsbattle/crawler",
+                    "winner": true
+                },
+                {
+                    "id": "Q4W23fZ49j84nRQa",
+                    "name": "jsbattle/crazy",
+                    "winner": false
+                }
+            ]
+        }
     ]
   },
   "authMethods": {

packages/jsbattle-docs/docs/img/puml/infrastructure.png

@@ -99,7 +99,11 @@ module.exports = {
         "max-classes-per-file": "error",
         "max-depth": "error",
         "max-len": "off",
-        "max-lines": "error",
+        "max-lines": ["error", {
+          "max": 300,
+          "skipBlankLines": true,
+          "skipComments": true
+        }],
         "max-lines-per-function": "off",
         "max-nested-callbacks": "error",
         "max-params": "off",

packages/jsbattle-docs/docs/img/puml/microservices.png

@@ -21,15 +21,17 @@ class BattleStoreService extends Service {
           "createdAt",
           "expiresAt",
           "ubd",
-          "description"
+          "description",
+          "meta"
         ]
       },
       entityValidator: {
         ubd: { type: "string", min: 2 },
         description: { type: "string", max: 128 },
         createdAt: "date",
         expiresAt: "date",
-        expiresIn: "number"
+        expiresIn: "number",
+        meta: "object",
       },
       dependencies: ['ubdValidator'],
       actions: {
@@ -53,6 +55,7 @@ class BattleStoreService extends Service {
               }
               ctx.params.createdAt = new Date();
               ctx.params.expiresAt = ctx.params.expiresAt || defaultExpires;
+              ctx.params.meta = ctx.params.meta || {};
               ctx.params = _.omit(ctx.params, ['id']);
               return ctx;
             }
@@ -114,7 +117,7 @@ class BattleStoreService extends Service {
     this.logger.info(`Publishing UBD`);
     let response = await this._create(ctx, ctx.params);
 
-    return response
+    return response;
   }
 
 }

packages/jsbattle-docs/docs/img/puml/overview.png

@@ -5,7 +5,7 @@ const _ = require('lodash');
 const getDbAdapterConfig = require("../lib/getDbAdapterConfig.js");
 const fs = require('fs');
 const path = require('path');
-const RankTable = require('./league/RankTable.js');
+const RankTable = require('./league/lib/RankTable.js');
 
 class LeagueService extends Service {
 
@@ -48,11 +48,15 @@ class LeagueService extends Service {
         score: "number",
         code: { type: "string", min: 0, max: 65536 },
       },
-      dependencies: ['scriptStore'],
+      dependencies: [
+        'scriptStore',
+        'battleStore'
+      ],
       actions: {
         pickRandomOpponents: this.pickRandomOpponents,
         seedLeague: this.seedLeague,
         getUserSubmission: this.getUserSubmission,
+        getHistory: this.getHistory,
         joinLeague: this.joinLeague,
         leaveLeague: this.leaveLeague,
         getLeagueSummary: this.getLeagueSummary,
@@ -102,6 +106,29 @@ class LeagueService extends Service {
     });
   }
 
+  async getHistory(ctx) {
+    let items = await ctx.call('battleStore.find', {
+      sort: '-createdAt',
+      limit: 7,
+      fields: [
+        "id",
+        "description",
+        "meta",
+        "createdAt"
+      ]
+    });
+    items = items.map((item) => ({
+      id: item.id,
+      createdAt: item.createdAt,
+      players: item.meta.map((player) => ({
+        id: player.id,
+        name: player.name,
+        winner: player.winner
+      }))
+    }))
+    return items;
+  }
+
   async updateRank(ctx) {
     if(!ctx || !ctx.params || ctx.params.id === undefined) {
       throw new ValidationError('id parameter is required!');
@@ -287,7 +314,8 @@ class LeagueService extends Service {
 
     return {
       submission,
-      ranktable: this.ranktable.slice(submission.id, 7)
+      ranktable: this.ranktable.slice(submission.id, 7),
+      history: await ctx.call('league.getHistory', {})
     }
   }
 }

packages/jsbattle-docs/docs/img/puml/packages.png

@@ -61,14 +61,34 @@ class LeagueScheduler extends Service {
     if(!teamList || teamList.length != 2) {
       throw new Error('teamList must have exactly 2 elements');
     }
+
+    let winner = teamList.reduce((best, current) => {
+      if(current.score > best.score) {
+        return current;
+      } else {
+        return best;
+      }
+    }, teamList[0]);
+    let loser = teamList.reduce((worst, current) => {
+      if(current.score < worst.score) {
+        return current;
+      } else {
+        return worst;
+      }
+    }, teamList[0]);
+    if(winner == loser) {
+      winner = null;
+    }
+
     teamList = teamList.map((team) => {
       if(!refData || !refData[team.name]) {
         throw new Error('no team mapping in refData for: ' + team.name);
       }
       return {
         id: refData[team.name],
         name: team.name,
-        battleScore: team.score
+        battleScore: team.score,
+        winner: team == winner
       }
     });
 
@@ -78,24 +98,17 @@ class LeagueScheduler extends Service {
     await ctx.call('battleStore.create', {
       ubd: ubd,
       expiresIn: this.config.historyDuration,
-      description: description
-    })
-
-    let winner = teamList.reduce((best, current) => {
-      if(current.battleScore > best.battleScore) {
-        return current;
-      } else {
-        return best;
-      }
-    }, teamList[0]);
+      description: description,
+      meta: teamList
+    });
 
     let updateCalls = teamList.map((team) => new Promise(async (resolve) => {
       try {
         await ctx.call('league.updateRank', {
           id: team.id,
           name: team.name,
           battleScore: team.battleScore,
-          winner: team == winner
+          winner: team.winner
         });
       } catch (err) {
         this.logger.warn('Unable to store battle results of ' + team.name + ': ' + err.message);

packages/jsbattle-docs/docs/img/puml/renderer.png

@@ -81,7 +81,7 @@ class UbdPlayer extends Service {
             const element = await page.$("#output");
             const text = await page.evaluate((element) => element.innerHTML, element);
             await page.close();
-            const jsonResult = JSON.parse(text)
+            const jsonResult = JSON.parse(text);
             jsonResult.ubd = ubd;
             if(task.refData) {
               jsonResult.refData = task.refData;