More tests (#7)

* starting gameState tests

* copy shared to client before build

* a couple more tests

* fix exchange bug

* more tests

* more tests

client/package.json

@@ -29,7 +29,7 @@
     "copy-shared": "rm -rf ./src/shared && cp -r ../shared ./src/shared",
     "lint": "pnpm eslint",
     "start": "pnpm copy-shared && react-scripts start",
-    "build": "react-scripts build",
+    "build": "pnpm copy-shared && react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

client/src/shared/types/game.ts

@@ -16,7 +16,7 @@ export enum Actions {
   Exchange = 'Exchange'
 }
 
-type ColorMode = 'light' | 'dark';
+type ColorMode = 'light' | 'dark'
 
 export const InfluenceAttributes: {
   [influence in Influences]: {
@@ -161,19 +161,19 @@ export const ResponseAttributes: {
 }
 
 export type Player = {
-  influences: Influences[],
   coins: number
-  name: string
-  id: string
   color: string
+  id: string
+  influences: Influences[]
+  name: string
 }
 
 export type PublicPlayer = Omit<Player, 'id' | 'influences'> & {
   influenceCount: number
-};
+}
 
 export type GameState = {
-  deadCards: Influences[],
+  deadCards: Influences[]
   deck: Influences[]
   eventLogs: string[]
   isStarted: boolean

server/index.ts

@@ -2,7 +2,7 @@ import http from 'http'
 import express from 'express'
 import { json } from 'body-parser'
 import cors from 'cors'
-import { addPlayerToGame, createNewGame, drawCardFromDeck, getGameState, getNextPlayerTurn, getPublicGameState, promptPlayerToLoseInfluence, logEvent, mutateGameState, processPendingAction, resetGame, shuffle, startGame, killPlayerInfluence } from './utilities/gameState'
+import { addPlayerToGame, createNewGame, drawCardFromDeck, getGameState, moveTurnToNextPlayer, getPublicGameState, promptPlayerToLoseInfluence, logEvent, mutateGameState, processPendingAction, resetGame, startGame, killPlayerInfluence, shuffleDeck } from './utilities/gameState'
 import { generateRoomId } from './utilities/identifiers'
 import { ActionAttributes, Actions, InfluenceAttributes, Influences, Responses } from '../shared/types/game'
 
@@ -270,7 +270,7 @@ app.post('/action', async (req, res) => {
         } else if (action === Actions.Income) {
             await mutateGameState(roomId, (state) => {
                 state.players.find(({ id }) => id === playerId).coins += 1
-                state.turnPlayer = getNextPlayerTurn(state)
+                moveTurnToNextPlayer(state)
                 logEvent(state, `${player.name} used ${action}`)
             })
         }
@@ -458,7 +458,7 @@ app.post('/actionChallengeResponse', async (req, res) => {
                 actionPlayer.influences.findIndex((i) => i === influence),
                 1
             )[0])
-            state.deck = shuffle(state.deck)
+            shuffleDeck(state)
             actionPlayer.influences.push(drawCardFromDeck(state))
             delete state.pendingActionChallenge
             state.pendingAction.claimConfirmed = true
@@ -486,7 +486,7 @@ app.post('/actionChallengeResponse', async (req, res) => {
             const challengePlayer = state.players.find(({ name }) => name === state.pendingActionChallenge.sourcePlayer)
             logEvent(state, `${challengePlayer.name} successfully challenged ${state.turnPlayer}`)
             killPlayerInfluence(state, actionPlayer.name, influence)
-            state.turnPlayer = getNextPlayerTurn(state)
+            moveTurnToNextPlayer(state)
             delete state.pendingActionChallenge
             delete state.pendingAction
         })
@@ -557,7 +557,7 @@ app.post('/blockResponse', async (req, res) => {
                     state.players.find(({ name }) => name === state.turnPlayer).coins
                         -= ActionAttributes.Assassinate.coinsRequired
                 }
-                state.turnPlayer = getNextPlayerTurn(state)
+                moveTurnToNextPlayer(state)
                 delete state.pendingBlock
                 delete state.pendingActionChallenge
                 delete state.pendingAction
@@ -628,7 +628,7 @@ app.post('/blockChallengeResponse', async (req, res) => {
                 blockPlayer.influences.findIndex((i) => i === influence),
                 1
             )[0])
-            state.deck = shuffle(state.deck)
+            shuffleDeck(state)
             blockPlayer.influences.push(drawCardFromDeck(state))
             logEvent(state, `${blockPlayer.name} revealed and replaced ${influence}`)
             logEvent(state, `${blockPlayer.name} successfully blocked ${state.turnPlayer}`)
@@ -697,29 +697,30 @@ app.post('/loseInfluence', async (req, res) => {
     }
 
     await mutateGameState(roomId, (state) => {
-        if (state.pendingInfluenceLoss[player.name][0].putBackInDeck) {
-            const removedInfluence = player.influences.splice(
-                player.influences.findIndex((i) => i === influence),
+        const losingPlayer = state.players.find(({ id }) => id === playerId)
+        if (state.pendingInfluenceLoss[losingPlayer.name][0].putBackInDeck) {
+            const removedInfluence = losingPlayer.influences.splice(
+                losingPlayer.influences.findIndex((i) => i === influence),
                 1
             )[0]
             state.deck.unshift(removedInfluence)
         } else {
-            killPlayerInfluence(state, player.name, influence)
+            killPlayerInfluence(state, losingPlayer.name, influence)
         }
 
-        if (state.pendingInfluenceLoss[player.name].length > 1) {
-            state.pendingInfluenceLoss[player.name].splice(0, 1)
+        if (state.pendingInfluenceLoss[losingPlayer.name].length > 1) {
+            state.pendingInfluenceLoss[losingPlayer.name].splice(0, 1)
         } else {
-            delete state.pendingInfluenceLoss[player.name]
+            delete state.pendingInfluenceLoss[losingPlayer.name]
         }
 
         if (!Object.keys(state.pendingInfluenceLoss).length && !state.pendingAction) {
-            state.turnPlayer = getNextPlayerTurn(state)
+            moveTurnToNextPlayer(state)
         }
 
-        if (!player.influences.length) {
-            logEvent(state, `${player.name} is out!`)
-            delete state.pendingInfluenceLoss[player.name]
+        if (!losingPlayer.influences.length) {
+            logEvent(state, `${losingPlayer.name} is out!`)
+            delete state.pendingInfluenceLoss[losingPlayer.name]
         }
     })
 

server/package.json

@@ -27,11 +27,13 @@
   "devDependencies": {
     "@eslint/js": "^9.9.1",
     "@types/body-parser": "^1.19.5",
+    "@types/chance": "^1.1.6",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
     "@types/node": "^22.5.1",
     "@types/redis": "^4.0.11",
+    "chance": "^1.1.12",
     "eslint": "^9.9.1",
     "globals": "^15.9.0",
     "jest": "^29.7.0",

server/utilities/array.spec.ts

@@ -0,0 +1,20 @@
+import { Chance } from "chance"
+import { shuffle } from "./array"
+
+const chance = new Chance()
+
+describe('array', () => {
+  it('should throw if input is not iterable', () => {
+    expect(() => shuffle(null)).toThrow()
+  })
+
+  it('should shuffle original array', () => {
+    const original = Array.from({ length: 100 }, () => chance.natural())
+    const shuffled = shuffle(original)
+    expect(shuffled).not.toEqual(original)
+    expect(shuffled.length).toBe(original.length)
+    shuffled.forEach((elementS) => {
+      expect(original.find((elementO) => elementO === elementS)).not.toBeNull()
+    })
+  })
+})

server/utilities/array.ts

@@ -0,0 +1,10 @@
+export const shuffle = <T>(array: T[]): T[] => {
+  const unShuffled = [...array]
+  const shuffled: T[] = []
+
+  while (unShuffled.length) {
+    shuffled.push(unShuffled.splice(Math.floor(Math.random() * unShuffled.length), 1)[0])
+  }
+
+  return shuffled
+}