Use maps instead of objects for begin/end turns

games/game1-v2.7.0/src/game.test.ts

@@ -22,7 +22,7 @@ test("happy path", () => {
   match.makeMove(p0, "roll");
   match.makeMove(p1, "roll");
   match.makeMove(p2, "roll");
-  expect(() => match.makeMove(p1, "roll")).toThrowError("not your turn");
+  expect(() => match.makeMove(p1, "roll")).toThrow("not your turn");
   match.makeMove(p0, "roll");
   match.makeMove(p1, "roll");
 

packages/dev-server/src/backend.ts

@@ -392,11 +392,11 @@ class Backend extends EventTarget {
     }
 
     // Also cancel move expiry timeouts for users whose turn has ended.
-    for (const userId of Object.keys(result.endTurn)) {
+    for (const userId of result.endTurn.keys()) {
       this._removeDelayedMoveForUser(userId);
     }
 
-    for (const userId of Object.keys(result.beginTurn)) {
+    for (const userId of result.beginTurn.keys()) {
       this._removeDelayedMoveForUser(userId);
     }
 

packages/game/src/execution.ts

@@ -188,8 +188,8 @@ export function executePlayerMove<GS extends GameStateBase>(
 
   // For expiration moves, if the player's turn was not explicitely begun,
   // it means their turn should end.
-  if (isExpiration && sideEffectResults.beginTurn[userId] === undefined) {
-    sideEffectResults.endTurn[userId] = null;
+  if (isExpiration && !sideEffectResults.beginTurn.has(userId)) {
+    sideEffectResults.endTurn.set(userId, null);
   }
 
   const allPatches: Patch[] = [];
@@ -282,8 +282,8 @@ export function executePlayerMove<GS extends GameStateBase>(
   };
 }
 
-type BeginTurn = Record<UserId, { expiresAt?: number }>;
-type EndTurn = Record<UserId, null>;
+export type BeginTurn = Map<UserId, { expiresAt?: number }>;
+export type EndTurn = Map<UserId, null>;
 
 type SideEffectResults = {
   matchHasEnded: boolean;
@@ -314,8 +314,8 @@ function defineMoveSideEffects<GS extends GameStateBase>({
 }): { sideEffectResults: SideEffectResults; moveSideEffects: MoveSideEffects } {
   const sideEffectResults: SideEffectResults = {
     matchHasEnded: false,
-    beginTurn: {},
-    endTurn: {},
+    beginTurn: new Map(),
+    endTurn: new Map(),
     delayedMoves: [],
     stats: [],
   };
@@ -325,8 +325,8 @@ function defineMoveSideEffects<GS extends GameStateBase>({
   };
 
   const endTurnForUser = (userId: UserId) => {
-    delete sideEffectResults.beginTurn[userId];
-    sideEffectResults.endTurn[userId] = null;
+    sideEffectResults.beginTurn.delete(userId);
+    sideEffectResults.endTurn.set(userId, null);
 
     // Note that this is not very efficient because we need to loop through all
     // delayed moves, and we call this for all users.
@@ -376,8 +376,8 @@ function defineMoveSideEffects<GS extends GameStateBase>({
     }
 
     for (const userId of userIds) {
-      sideEffectResults.beginTurn[userId] = { expiresAt };
-      delete sideEffectResults.endTurn[userId];
+      sideEffectResults.beginTurn.set(userId, { expiresAt });
+      sideEffectResults.endTurn.delete(userId);
     }
 
     return { expiresAt };
@@ -553,7 +553,7 @@ export function updateMetaWithTurnInfo({
     (draft: { meta: Meta }) => {
       const { meta } = draft;
 
-      for (const [userId, { expiresAt }] of Object.entries(beginTurn)) {
+      for (const [userId, { expiresAt }] of beginTurn.entries()) {
         metaBeginTurn({
           meta,
           beginsAt: now,
@@ -562,7 +562,7 @@ export function updateMetaWithTurnInfo({
         });
       }
 
-      for (const userId of Object.keys(endTurn)) {
+      for (const userId of endTurn.keys()) {
         metaEndTurn({
           meta,
           userId,

packages/game/src/testing.test.ts

@@ -115,7 +115,7 @@
     match.fastForward(500);
 
     expect(match.board.me).toBe(2);
     expect(match.board.bot).toBe(2);
 
     // Auto move triggered 1s after the last move.
     match.fastForward(500);
@@ -167,7 +167,7 @@
     expect(match.hasTurn(userId)).toBe(false);
     match.makeMove(userId, "go", {});
     expect(match.board.expiresAt).toEqual(1000);
     expect(match.hasTurn(userId)).toBe(true);
   });
 
   test("double begin turn: only the latest counts", () => {
@@ -207,7 +207,7 @@
     match.makeMove(userId, "begin", { onExpire: "b" });
     match.makeMove(userId, "begin", { onExpire: "c" });
     match.fastForward(20);
     expect(match.board.x).toBe("ac");
   });
 
   // In a given `execute*` function, `turns.begin(userId, {...}); turns.end(userId)` has no effect.
@@ -415,7 +415,7 @@
 
     match.makeMove(userId, "move");
 
     expect(match.hasTurn(userId)).toBe(true);
 
     match.fastForward(9);
 
@@ -606,7 +606,7 @@
 
   expect(() => {
     match.makeMove(userId, "incrementWithError");
-  }).toThrowError("error");
+  }).toThrow("error");
 
   expect(match.board.x).toBe(0);
 });
@@ -637,7 +637,7 @@
 
   expect(() => {
     match.makeMove(userId, "go", null, { canFail: false });
-  }).toThrowError("error");
+  }).toThrow("error");
 
   expect(match.board.x).toBe(0);
 });

packages/game/src/testing.ts

@@ -14,7 +14,9 @@ import {
 import { IfAnyNull } from "@lefun/core";
 
 import {
+  BeginTurn,
   DelayedMove,
+  EndTurn,
   executeBoardMove,
   executePlayerMove,
   Stat,
@@ -391,8 +393,8 @@ export class MatchTester<GS extends GameStateBase, G extends Game<GS>> {
     stats,
   }: {
     matchHasEnded: boolean;
-    beginTurn: Record<UserId, { expiresAt?: number }>;
-    endTurn: Record<UserId, null>;
+    beginTurn: BeginTurn;
+    endTurn: EndTurn;
     delayedMoves: DelayedMove[];
     stats: Stat[];
   }) {