Merge branch 'develop'

Author: Perlkonig

api/abstractplay.ts

@@ -3388,12 +3388,23 @@ function resign(userid: any, engine: GameBase, game: FullGame) {
     throw new Error(`${userid} isn't playing in this game!`);
   engine.resign(player + 1);
   game.state = engine.serialize();
-  game.toMove = "";
-  game.winner = engine.winner;
-  game.numMoves = engine.state().stack.length - 1; // stack has an entry for the board before any moves are made
+  game.state = engine.serialize();
+  if (engine.gameover) {
+    game.toMove = "";
+    game.winner = engine.winner;
+    game.numMoves = engine.state().stack.length - 1; // stack has an entry for the board before any moves are made
+  } else {
+    const flags = gameinfo.get(game.metaGame).flags;
+    const simultaneous = flags !== undefined && flags.includes('simultaneous');
+    if (simultaneous) {
+        applySimultaneousMove(userid, "resign", engine as GameBaseSimultaneous, game);
+    } else {
+        applyMove(userid, "resign", engine, game, flags);
+    }
+  }
 }
 
-function timeout(userid: string, engine: GameBase, game: FullGame) {
+function timeout(userid: string, engine: GameBase|GameBaseSimultaneous, game: FullGame) {
   if (game.toMove === '')
     throw new Error("Can't timeout a game that has already ended");
   // Find player that timed out
@@ -3421,9 +3432,20 @@ function timeout(userid: string, engine: GameBase, game: FullGame) {
   }
   engine.timeout(loser + 1);
   game.state = engine.serialize();
-  game.toMove = "";
-  game.winner = engine.winner;
-  game.numMoves = engine.state().stack.length - 1; // stack has an entry for the board before any moves are made
+  if (engine.gameover) {
+    game.toMove = "";
+    game.winner = engine.winner;
+    game.numMoves = engine.state().stack.length - 1; // stack has an entry for the board before any moves are made
+  } else {
+    const loserid = game.players[loser].id;
+    const flags = gameinfo.get(game.metaGame).flags;
+    const simultaneous = flags !== undefined && flags.includes('simultaneous');
+    if (simultaneous) {
+        applySimultaneousMove(loserid, "timeout", engine as GameBaseSimultaneous, game);
+    } else {
+        applyMove(loserid, "timeout", engine, game, flags);
+    }
+  }
 }
 
 function drawaccepted(userid: string, engine: GameBase, game: FullGame, simultaneous: boolean) {

serverless.yml

@@ -239,5 +239,5 @@ functions:
           name: abstractplay-${self:provider.stage}-starttournaments
           description: Checks if any tournaments are ready to start (and starts or cancels them)
           enabled: ${self:custom.scheduleEnabled.${self:provider.stage}}
-          # 10am UTC every morning
+          # 10am and 10pm UTC every morning
           schedule: cron(0 10,22 * * ? *)

utils/records-manifest.ts

@@ -1,79 +1,13 @@
 'use strict';
 
-import { S3Client, GetObjectCommand, ListObjectsV2Command, PutObjectCommand, type _Object } from "@aws-sdk/client-s3";
+import { S3Client, ListObjectsV2Command, PutObjectCommand, type _Object } from "@aws-sdk/client-s3";
+import { CloudFrontClient, CreateInvalidationCommand, type CreateInvalidationCommandInput } from "@aws-sdk/client-cloudfront";
 import { Handler } from "aws-lambda";
-import { GameFactory } from '@abstractplay/gameslib';
-import { type APGameRecord } from '@abstractplay/recranks';
-import { gunzipSync, strFromU8 } from "fflate";
-import { load } from "ion-js";
 
 const REGION = "us-east-1";
 const s3 = new S3Client({region: REGION});
-const DUMP_BUCKET = "abstractplay-db-dump";
 const REC_BUCKET = "records.abstractplay.com";
-
-type BasicRec = {
-    Item: {
-        pk: string;
-        sk: string;
-        [key: string]: any;
-    }
-}
-
-type GameRec = {
-    pk: string;
-    sk: string;
-    id: string;
-    metaGame: string;
-    state: string;
-    pieInvoked?: boolean;
-    players: {
-        name: string;
-        id: string;
-        time: number;
-    }[];
-    tournament?: string;
-    event?: string;
-    [key: string]: any;
-}
-
-type Tournament = {
-    pk: string;
-    sk: string;
-    id: string;
-    metaGame: string;
-    variants: string[];
-    number: number;
-    started: boolean;
-    dateCreated: number;
-    datePreviousEnded: number; // 0 means either the first tournament or a restart of the series (after it stopped because not enough participants), 3000000000000 means previous tournament still running.
-    [key: string]: any;
-};
-
-type OrgEvent = {
-    pk: "ORGEVENT";
-    sk: string;             // <eventid>
-    name: string;
-    description: string;
-    organizer: string;
-    dateStart: number;
-    dateEnd?: number;
-    winner?: string[];
-    visible: boolean;
-}
-
-type OrgEventGame = {
-    pk: "ORGEVENTGAME";
-    sk: string;             // <eventid>#<gameid>
-    metaGame: string;
-    variants?: string[];
-    round: number;
-    gameid: string;
-    player1: string;
-    player2: string;
-    winner?: number[];
-    arbitrated?: boolean;
-};
+const cloudfront = new CloudFrontClient({region: REGION});
 
 export const handler: Handler = async (event: any, context?: any) => {
     // generate file listing
@@ -109,5 +43,23 @@ export const handler: Handler = async (event: any, context?: any) => {
     }
     console.log("Manifest generated");
 
+    // invalidate CloudFront distribution
+    const cfParams: CreateInvalidationCommandInput = {
+        DistributionId: "EM4FVU08T5188",
+        InvalidationBatch: {
+            CallerReference: Date.now().toString(),
+            Paths: {
+                Quantity: 1,
+                Items: ["/*"],
+            },
+        },
+    };
+    const cfCmd = new CreateInvalidationCommand(cfParams);
+    const cfResponse = await cloudfront.send(cfCmd);
+    if (cfResponse["$metadata"].httpStatusCode !== 200) {
+        console.log(cfResponse);
+    }
+    console.log("Invalidation sent");
+
     console.log("ALL DONE");
 };

utils/records-ttm.ts

@@ -36,44 +36,6 @@ type GameRec = {
     [key: string]: any;
 }
 
-type Tournament = {
-    pk: string;
-    sk: string;
-    id: string;
-    metaGame: string;
-    variants: string[];
-    number: number;
-    started: boolean;
-    dateCreated: number;
-    datePreviousEnded: number; // 0 means either the first tournament or a restart of the series (after it stopped because not enough participants), 3000000000000 means previous tournament still running.
-    [key: string]: any;
-};
-
-type OrgEvent = {
-    pk: "ORGEVENT";
-    sk: string;             // <eventid>
-    name: string;
-    description: string;
-    organizer: string;
-    dateStart: number;
-    dateEnd?: number;
-    winner?: string[];
-    visible: boolean;
-}
-
-type OrgEventGame = {
-    pk: "ORGEVENTGAME";
-    sk: string;             // <eventid>#<gameid>
-    metaGame: string;
-    variants?: string[];
-    round: number;
-    gameid: string;
-    player1: string;
-    player2: string;
-    winner?: number[];
-    arbitrated?: boolean;
-};
-
 export const handler: Handler = async (event: any, context?: any) => {
     // scan bucket for data folder
     const command = new ListObjectsV2Command({

utils/summarize.ts

@@ -1,6 +1,5 @@
 // tslint:disable: no-console
 import { S3Client, GetObjectCommand, PutObjectCommand } from "@aws-sdk/client-s3";
-import { CloudFrontClient, CreateInvalidationCommand, type CreateInvalidationCommandInput } from "@aws-sdk/client-cloudfront";
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient, QueryCommand } from '@aws-sdk/lib-dynamodb';
 import { isoToCountryCode } from "../lib/isoToCountryCode";
@@ -11,7 +10,6 @@ import { replacer } from "@abstractplay/gameslib/build/src/common";
 
 const REGION = "us-east-1";
 const s3 = new S3Client({region: REGION});
-const cloudfront = new CloudFrontClient({region: REGION});
 const REC_BUCKET = "records.abstractplay.com";
 const clnt = new DynamoDBClient({ region: REGION });
 const marshallOptions = {
@@ -728,23 +726,5 @@ export const handler: Handler = async (event: any, context?: any) => {
         }
 
         console.log("Analysis complete");
-
-        // invalidate CloudFront distribution
-        const cfParams: CreateInvalidationCommandInput = {
-            DistributionId: "EM4FVU08T5188",
-            InvalidationBatch: {
-                CallerReference: Date.now().toString(),
-                Paths: {
-                    Quantity: 1,
-                    Items: ["/*"],
-                },
-            },
-        };
-        const cfCmd = new CreateInvalidationCommand(cfParams);
-        const cfResponse = await cloudfront.send(cfCmd);
-        if (cfResponse["$metadata"].httpStatusCode !== 200) {
-            console.log(cfResponse);
-        }
-        console.log("Invalidation sent");
     }
 }