Merge pull request #1 from s1hofmann/develop

Release v1.2.3

.github/workflows/main.yml → .github/workflows/deploy.yml

@@ -7,8 +7,6 @@ name: Bundle & Deploy
 on:
   push:
     branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -27,6 +25,7 @@ jobs:
           node-version: 12.16.1
       - run: npm ci
       - run: npm run bundle
+      - run: npm --prefix=packages/zahlenspiel-backend test
       - name: ssh deploy
         uses: easingthemes/[email protected]
         env:

.github/workflows/test.yml

@@ -0,0 +1,30 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Test
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      - name: Setup Node.js environment
+        uses: actions/[email protected]
+        with:
+          node-version: 12.16.1
+      - run: npm ci
+      - run: npm run bundle
+      - run: npm --prefix=packages/zahlenspiel-backend test

lerna.json

@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.2.2"
+  "version": "1.2.3"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zahlenspiel",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Zahlenspiel",
   "main": "index.js",
   "scripts": {

packages/zahlenspiel-backend/index.ts

@@ -5,7 +5,7 @@ import {Server} from "colyseus";
 import {monitor} from "@colyseus/monitor";
 // import socialRoutes from "@colyseus/social/express"
 
-import {ZahlenspielRoom} from "./rooms/zahlenspiel-room";
+import {ZahlenspielRoom} from "./src/rooms/zahlenspiel-room";
 import {join} from "path";
 
 const port = Number(process.env.PORT || 2567);

packages/zahlenspiel-backend/jest.config.js

@@ -1,17 +1,11 @@
 module.exports = {
-  collectCoverageFrom: [
-    "index.ts",
-    "lib/**/*.ts",
-    "!lib/**/*.spec.ts",
-    "!<rootDir>/node_modules/",
-  ],
   preset: "ts-jest",
+  rootDir: "./src",
   testEnvironment: "node",
-  testMatch: process.env.E2E_TEST ?
-    ["**/__tests__/?(e2e)/**/*.[jt]s?(x)", "**/?(*.)?(e2e.)+(spec|test).[jt]s?(x)"] :
-    ["**/__tests__/!(e2e)/**/*.[jt]s?(x)", "**/!(*.e2e.*)+(spec|test).[jt]s?(x)"],
+  testMatch: [ "**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)" ],
   testPathIgnorePatterns: [
     "/node_modules/",
     "/dist/",
   ],
+  verbose: true
 };

packages/zahlenspiel-backend/package.json

@@ -1,13 +1,14 @@
 {
   "name": "zahlenspiel-backend",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Zahlenspiel Backend",
   "main": "dist/index",
   "types": "dist/index",
   "scripts": {
     "start": "node dist/index.js",
     "build:dev": "tsc",
-    "build": "npm run build:dev && webpack"
+    "build": "npm run build:dev && webpack",
+    "test": "jest"
   },
   "author": "Simon Hofmann <[email protected]>",
   "devDependencies": {
@@ -34,8 +35,9 @@
     "cors": "^2.8.5",
     "express": "^4.16.4",
     "express-jwt": "^5.3.1",
+    "sneer": "^1.0.1",
     "uuid": "^7.0.2",
     "winston": "^3.2.1",
-    "zahlenspiel-shared-entities": "1.2.2"
+    "zahlenspiel-shared-entities": "1.2.3"
   }
 }

packages/zahlenspiel-backend/game-rules/next-card-is-valid.spec.ts → packages/zahlenspiel-backend/src/game-rules/next-card-is-valid.spec.ts

@@ -11,7 +11,7 @@ describe('NextCardValidator', () => {
             const SUT = () => ascendingCardIsValid(current, next);
 
             // THEN
-            expect(SUT).toBeTruthy();
+            expect(SUT()).toBeTruthy();
         });
 
         it('should fail a lower card when ascending', () => {
@@ -23,7 +23,7 @@ describe('NextCardValidator', () => {
             const SUT = () => ascendingCardIsValid(current, next);
 
             // THEN
-            expect(SUT).toBeFalsy();
+            expect(SUT()).toBeFalsy();
         });
 
         it('should approve a lower card when ascending if it is exactly 10 lower than current', () => {
@@ -35,7 +35,7 @@ describe('NextCardValidator', () => {
             const SUT = () => ascendingCardIsValid(current, next);
 
             // THEN
-            expect(SUT).toBeTruthy();
+            expect(SUT()).toBeTruthy();
         })
     });
 
@@ -49,7 +49,7 @@ describe('NextCardValidator', () => {
             const SUT = () => descendingCardIsValid(current, next);
 
             // THEN
-            expect(SUT).toBeTruthy();
+            expect(SUT()).toBeTruthy();
         });
 
         it('should fail a higher card when descending', () => {
@@ -61,7 +61,7 @@ describe('NextCardValidator', () => {
             const SUT = () => descendingCardIsValid(current, next);
 
             // THEN
-            expect(SUT).toBeFalsy();
+            expect(SUT()).toBeFalsy();
         });
 
         it('should approve a higher card when descending if it is exactly 10 higher than current', () => {
@@ -73,7 +73,7 @@ describe('NextCardValidator', () => {
             const SUT = () => descendingCardIsValid(current, next);
 
             // THEN
-            expect(SUT).toBeTruthy();
+            expect(SUT()).toBeTruthy();
         })
     });
 });

packages/zahlenspiel-backend/src/states/game-state.spec.ts

@@ -0,0 +1,25 @@
+import {Client} from "colyseus";
+import {mockPartial} from "sneer";
+import {GameState} from "./game-state";
+import {Card} from "zahlenspiel-shared-entities";
+
+describe("GameState", () => {
+    describe("nextPlayer", () => {
+        it("should skip players with no leftover cards", () => {
+            // GIVEN
+            const clientMock = mockPartial<Client>({});
+            const gameState = new GameState("pw");
+            ["first", "second", "third"].forEach(playerName => gameState.addNewPlayer(clientMock, playerName));
+            const testCard = new Card(42);
+            gameState.players[0].cards.push(testCard);
+            gameState.players[2].cards.push(testCard);
+            gameState.setCurrentPlayer(gameState.players[0]);
+
+            // WHEN
+            gameState.nextPlayer();
+
+            // THEN
+            expect(gameState.currentPlayer).toEqual(gameState.players[2]);
+        });
+    });
+});

packages/zahlenspiel-backend/states/game-state.ts → packages/zahlenspiel-backend/src/states/game-state.ts

@@ -92,6 +92,9 @@ export class GameState extends Schema {
     nextPlayer() {
         const nextPlayerOrdinal = (this.currentPlayer.order + 1) % this.players.length;
         this.currentPlayer = this.players.find((player: Player) => player.order === nextPlayerOrdinal);
+        if (this.currentPlayer.cards.length === 0) {
+            this.nextPlayer();
+        }
     }
 
     handoutCardsToPlayers() {

packages/zahlenspiel-shared-entities/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zahlenspiel-shared-entities",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Zahlenspiel Shared Entities",
   "main": "dist/index",
   "types": "dist/index",

packages/zahlenspiel-shared-entities/src/messages/base-message.ts

@@ -44,5 +44,5 @@ export abstract class BaseMessage {
 }
 
 export const createTypeGuard = <T>(identifier: MessageType) => {
-    return (possibleTarget: any) => ("type" in possibleTarget && (possibleTarget as BaseMessage).type === identifier);
+    return (possibleTarget: any): possibleTarget is T => ("type" in possibleTarget && (possibleTarget as BaseMessage).type === identifier);
 };

packages/zahlenspiel-shared-entities/src/messages/drop-card.ts

@@ -1,7 +1,7 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 import {Card} from "../entities";
 
-export const isDropCardMessage = createTypeGuard("drop-card");
+export const isDropCardMessage = createTypeGuard<DropCardMessage>("drop-card");
 
 export class DropCardMessage extends BaseMessage {
     type: MessageType = "drop-card";

packages/zahlenspiel-shared-entities/src/messages/finish-turn.ts

@@ -1,6 +1,6 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 
-export const isFinishTurnMessage = createTypeGuard("finish-turn");
+export const isFinishTurnMessage = createTypeGuard<FinishTurnMessage>("finish-turn");
 
 export class FinishTurnMessage extends BaseMessage {
     type: MessageType = "finish-turn";

packages/zahlenspiel-shared-entities/src/messages/game-lost.ts

@@ -1,6 +1,6 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 
-export const isGameLostMessage = createTypeGuard("game-lost");
+export const isGameLostMessage = createTypeGuard<GameLostMessage>("game-lost");
 
 export class GameLostMessage extends BaseMessage {
     type: MessageType = "game-lost";

packages/zahlenspiel-shared-entities/src/messages/game-started.ts

@@ -1,6 +1,6 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 
-export const isGameStartedMessage = createTypeGuard("game-started");
+export const isGameStartedMessage = createTypeGuard<GameStartedMessage>("game-started");
 
 export class GameStartedMessage extends BaseMessage {
     type: MessageType = "game-started";

packages/zahlenspiel-shared-entities/src/messages/game-won.ts

@@ -1,6 +1,6 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 
-export const isGameWonMessage = createTypeGuard("game-won");
+export const isGameWonMessage = createTypeGuard<GameWonMessage>("game-won");
 
 export class GameWonMessage extends BaseMessage {
     type: MessageType = "game-won";

packages/zahlenspiel-shared-entities/src/messages/join-error.ts

@@ -1,6 +1,6 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 
-export const isJoinErrorMessage = createTypeGuard("join-error");
+export const isJoinErrorMessage = createTypeGuard<JoinErrorMessage>("join-error");
 
 export class JoinErrorMessage extends BaseMessage {
     type: MessageType = "join-error";

packages/zahlenspiel-shared-entities/src/messages/join-success.ts

@@ -1,7 +1,7 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 import {Player} from "../entities";
 
-export const isJoinSuccessMessage = createTypeGuard("join-success");
+export const isJoinSuccessMessage = createTypeGuard<JoinSuccessMessage>("join-success");
 
 export class JoinSuccessMessage extends BaseMessage {
     type: MessageType = "join-success";

packages/zahlenspiel-shared-entities/src/messages/move-card.ts

@@ -1,7 +1,7 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 import {Card} from "../entities";
 
-export const isMoveCardMessage = createTypeGuard("move-card");
+export const isMoveCardMessage = createTypeGuard<MoveCardMessage>("move-card");
 
 export class MoveCardMessage extends BaseMessage {
     type : MessageType = "move-card";

packages/zahlenspiel-shared-entities/src/messages/new-card-stack.ts

@@ -1,7 +1,7 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 import {CardStack} from "../entities";
 
-export const isNewCardStackMessage = createTypeGuard("new-card-stack");
+export const isNewCardStackMessage = createTypeGuard<NewCardStackMessage>("new-card-stack");
 
 export class NewCardStackMessage extends BaseMessage {
     type : MessageType = "new-card-stack";

packages/zahlenspiel-shared-entities/src/messages/new-card.ts

@@ -1,7 +1,7 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 import {Card} from "../entities";
 
-export const isNewCardMessage = createTypeGuard("new-card");
+export const isNewCardMessage = createTypeGuard<NewCardMessage>("new-card");
 
 export class NewCardMessage extends BaseMessage {
     type : MessageType = "new-card";

packages/zahlenspiel-shared-entities/src/messages/player-join.ts

@@ -1,7 +1,7 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 import {Player} from "../entities";
 
-export const isPlayerJoinMessage = createTypeGuard("player-join");
+export const isPlayerJoinMessage = createTypeGuard<PlayerJoinMessage>("player-join");
 
 export class PlayerJoinMessage extends BaseMessage {
     type: MessageType = "player-join";

packages/zahlenspiel-shared-entities/src/messages/player-leave.ts

@@ -1,7 +1,7 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 import {Player} from "../entities";
 
-export const isPlayerLeaveMessage = createTypeGuard("player-leave");
+export const isPlayerLeaveMessage = createTypeGuard<PlayerLeaveMessage>("player-leave");
 
 export class PlayerLeaveMessage extends BaseMessage {
     type: MessageType = "player-leave";

packages/zahlenspiel-shared-entities/src/messages/player-switch.ts

@@ -1,7 +1,7 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 import {Player} from "../entities";
 
-export const isPlayerSwitchMessage = createTypeGuard("player-switch");
+export const isPlayerSwitchMessage = createTypeGuard<PlayerSwitchMessage>("player-switch");
 
 export class PlayerSwitchMessage extends BaseMessage {
     type: MessageType = "player-switch";

packages/zahlenspiel-shared-entities/src/messages/setup-finished.ts

@@ -1,6 +1,6 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 
-export const isSetupFinishedMessage = createTypeGuard("setup-finished");
+export const isSetupFinishedMessage = createTypeGuard<SetupFinishedMessage>("setup-finished");
 
 export class SetupFinishedMessage extends BaseMessage {
     type: MessageType = "setup-finished";

packages/zahlenspiel-shared-entities/src/messages/start-game.ts

@@ -1,6 +1,6 @@
 import {BaseMessage, createTypeGuard, MessageType} from "./base-message";
 
-export const isStartGameMessage = createTypeGuard("start-game");
+export const isStartGameMessage = createTypeGuard<StartGameMessage>("start-game");
 
 export class StartGameMessage extends BaseMessage {
     type: MessageType = "start-game";