Merge pull request #1709 from notaphplover/feat/update-game-page-to-subscribe-to-game-events

Update game page to subscribe to game events

Author: notaphplover

packages/backend/apps/game/backend-game-application/src/games/application/handlers/GameUpdatedEventHandler.ts

@@ -161,10 +161,14 @@ export class GameUpdatedEventHandler
 
   async #sendGameTurnEndSignal(game: Game): Promise<void> {
     if (game.state.status !== GameStatus.active) {
-      throw new AppError(
-        AppErrorKind.unknown,
-        'Unexpected non active game when sending game turn end signal',
-      );
+      this.#logger
+        .warn(`Unexpected non active game when sending game turn end signal:
+
+${JSON.stringify(game)}
+
+No end turn signal will be delivered`);
+
+      return;
     }
 
     if (this.#gameTurnEndSignalMessageSendOutputPort !== undefined) {

packages/backend/tools/backend-dev-apache-pulsar/docker-compose.yml

@@ -2,98 +2,18 @@ networks:
   pulsar:
     driver: bridge
 services:
-  # Start zookeeper
-  zookeeper:
+  standalone:
     image: apachepulsar/pulsar:3.3.2
-    container_name: zookeeper
-    restart: on-failure
-    networks:
-      - pulsar
-    volumes:
-      - ./data/zookeeper:/pulsar/data/zookeeper
-      - ./scripts/zookeper_health:/pulsar/bin/zookeper_health
-    environment:
-      - metadataStoreUrl=zk:zookeeper:2181
-      - PULSAR_MEM=-Xms256m -Xmx256m -XX:MaxDirectMemorySize=256m
-    command: >
-      bash -c "bin/apply-config-from-env.py conf/zookeeper.conf && \
-             bin/generate-zookeeper-config.sh conf/zookeeper.conf && \
-             exec bin/pulsar zookeeper"
-    healthcheck:
-    # The script is broken in the latest version, waiting for a new release
-    #  test: ["CMD", "bin/pulsar-zookeeper-ruok.sh"]
-      test: ["CMD", "bin/zookeper_health"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-
-  # Init cluster metadata
-  pulsar-init:
-    container_name: pulsar-init
-    hostname: pulsar-init
-    image: apachepulsar/pulsar:3.3.2
-    networks:
-      - pulsar
-    command: >
-      bin/pulsar initialize-cluster-metadata \
-               --cluster cluster-a \
-               --zookeeper zookeeper:2181 \
-               --configuration-store zookeeper:2181 \
-               --web-service-url http://broker:8080 \
-               --broker-service-url pulsar://broker:6650
-    depends_on:
-      zookeeper:
-        condition: service_healthy
-
-  # Start bookie
-  bookie:
-    image: apachepulsar/pulsar:3.3.2
-    container_name: bookie
-    restart: on-failure
-    networks:
-      - pulsar
-    environment:
-      - clusterName=cluster-a
-      - zkServers=zookeeper:2181
-      - metadataServiceUri=metadata-store:zk:zookeeper:2181
-      # otherwise every time we run docker compose uo or down we fail to start due to Cookie
-      # See: https://github.com/apache/bookkeeper/blob/405e72acf42bb1104296447ea8840d805094c787/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java#L57-68
-      - advertisedAddress=bookie
-      - BOOKIE_MEM=-Xms512m -Xmx512m -XX:MaxDirectMemorySize=256m
-    depends_on:
-      zookeeper:
-        condition: service_healthy
-      pulsar-init:
-        condition: service_completed_successfully
-    # Map the local directory to the container to avoid bookie startup failure due to insufficient container disks.
-    volumes:
-      - ./data/bookkeeper:/pulsar/data/bookkeeper
-    command: bash -c "bin/apply-config-from-env.py conf/bookkeeper.conf && exec bin/pulsar bookie"
-
-  # Start broker
-  broker:
-    image: apachepulsar/pulsar:3.3.2
-    container_name: broker
-    hostname: broker
-    restart: on-failure
-    networks:
-      - pulsar
-    environment:
-      - metadataStoreUrl=zk:zookeeper:2181
-      - zookeeperServers=zookeeper:2181
-      - clusterName=cluster-a
-      - managedLedgerDefaultEnsembleSize=1
-      - managedLedgerDefaultWriteQuorum=1
-      - managedLedgerDefaultAckQuorum=1
-      - advertisedAddress=broker
-      - advertisedListeners=external:pulsar://127.0.0.1:6650
-      - PULSAR_MEM=-Xms512m -Xmx512m -XX:MaxDirectMemorySize=256m
-    depends_on:
-      zookeeper:
-        condition: service_healthy
-      bookie:
-        condition: service_started
+    command: bin/pulsar standalone
     ports:
       - "6650:6650"
       - "8080:8080"
-    command: bash -c "bin/apply-config-from-env.py conf/broker.conf && exec bin/pulsar broker"
+    volumes:
+      - pulsardata:/pulsar/data
+      - pulsarconf:/pulsar/conf
+
+volumes:
+  pulsardata:
+    name: pulsardata
+  pulsarconf:
+    name: pulsarconf

packages/frontend/web-ui/src/game/helpers/getGameSlotIndex.spec.ts

@@ -35,7 +35,7 @@ describe(getGameSlotIndex.name, () => {
       });
 
       it('should return expected result', () => {
-        expect(result).toBeNull();
+        expect(result).toBeUndefined();
       });
     });
   });
@@ -74,7 +74,7 @@ describe(getGameSlotIndex.name, () => {
       });
 
       it('should return expected result', () => {
-        expect(result).toBe('0');
+        expect(result).toBe(0);
       });
     });
   });

packages/frontend/web-ui/src/game/helpers/getGameSlotIndex.ts

@@ -3,9 +3,9 @@ import { models as apiModels } from '@cornie-js/api-models';
 export function getGameSlotIndex(
   game: apiModels.GameV1 | undefined,
   user: apiModels.UserV1,
-): string | null {
+): number | undefined {
   if (game === undefined) {
-    return null;
+    return undefined;
   }
 
   for (let i: number = 0; i < game.state.slots.length; ++i) {
@@ -15,9 +15,9 @@ export function getGameSlotIndex(
         | apiModels.FinishedGameSlotV1;
 
     if (gameSlot.userId === user.id) {
-      return i.toString();
+      return i;
     }
   }
 
-  return null;
+  return undefined;
 }