Extract client screen planning helpers

Author: rgilks

src/client/game-client-screen.test.ts

@@ -0,0 +1,75 @@
+import { describe, expect, it } from 'vitest';
+
+import type { ClientState } from './game-client-phase';
+import { deriveClientScreenPlan } from './game-client-screen';
+
+describe('game-client-screen', () => {
+  it('maps menu, connecting, fleet building, and game over states', () => {
+    expect(deriveClientScreenPlan('menu', null, null, null, 'https://delta-v.example')).toEqual({
+      kind: 'menu',
+    });
+    expect(deriveClientScreenPlan('connecting', null, null, null, 'https://delta-v.example')).toEqual({
+      kind: 'connecting',
+    });
+    expect(deriveClientScreenPlan('playing_fleetBuilding', null, null, null, 'https://delta-v.example')).toEqual({
+      kind: 'fleetBuilding',
+    });
+    expect(deriveClientScreenPlan('gameOver', 'ABCDE', null, 'invite', 'https://delta-v.example')).toEqual({
+      kind: 'none',
+    });
+  });
+
+  it('maps all active play states to the HUD screen', () => {
+    const states: ClientState[] = [
+      'playing_astrogation',
+      'playing_ordnance',
+      'playing_combat',
+      'playing_movementAnim',
+      'playing_opponentTurn',
+    ];
+
+    for (const state of states) {
+      expect(deriveClientScreenPlan(state, null, null, null, 'https://delta-v.example')).toEqual({
+        kind: 'hud',
+      });
+    }
+  });
+
+  it('recovers or preserves invite links on the waiting screen', () => {
+    expect(deriveClientScreenPlan(
+      'waitingForOpponent',
+      'ABCDE',
+      null,
+      'invite-token',
+      'https://delta-v.example',
+    )).toEqual({
+      kind: 'waiting',
+      code: 'ABCDE',
+      inviteLink: 'https://delta-v.example/?code=ABCDE&playerToken=invite-token',
+    });
+
+    expect(deriveClientScreenPlan(
+      'waitingForOpponent',
+      'ABCDE',
+      'https://saved.example/invite',
+      'invite-token',
+      'https://delta-v.example',
+    )).toEqual({
+      kind: 'waiting',
+      code: 'ABCDE',
+      inviteLink: 'https://saved.example/invite',
+    });
+
+    expect(deriveClientScreenPlan(
+      'waitingForOpponent',
+      null,
+      null,
+      null,
+      'https://delta-v.example',
+    )).toEqual({
+      kind: 'waiting',
+      code: '',
+      inviteLink: null,
+    });
+  });
+});

src/client/game-client-screen.ts

@@ -0,0 +1,49 @@
+import type { ClientState } from './game-client-phase';
+import { buildInviteLink } from './game-client-session';
+
+export type ClientScreenPlan =
+  | { kind: 'menu' }
+  | { kind: 'connecting' }
+  | { kind: 'waiting'; code: string; inviteLink: string | null }
+  | { kind: 'fleetBuilding' }
+  | { kind: 'hud' }
+  | { kind: 'none' };
+
+const HUD_STATES = new Set<ClientState>([
+  'playing_astrogation',
+  'playing_ordnance',
+  'playing_combat',
+  'playing_movementAnim',
+  'playing_opponentTurn',
+]);
+
+export function deriveClientScreenPlan(
+  state: ClientState,
+  gameCode: string | null,
+  inviteLink: string | null,
+  storedInviteToken: string | null,
+  origin: string,
+): ClientScreenPlan {
+  switch (state) {
+    case 'menu':
+      return { kind: 'menu' };
+    case 'connecting':
+      return { kind: 'connecting' };
+    case 'waitingForOpponent':
+      return {
+        kind: 'waiting',
+        code: gameCode ?? '',
+        inviteLink: inviteLink
+          ?? (gameCode && storedInviteToken ? buildInviteLink(origin, gameCode, storedInviteToken) : null),
+      };
+    case 'playing_fleetBuilding':
+      return { kind: 'fleetBuilding' };
+    case 'gameOver':
+      return { kind: 'none' };
+    default:
+      if (HUD_STATES.has(state)) {
+        return { kind: 'hud' };
+      }
+      return { kind: 'none' };
+  }
+}

src/client/main.ts

@@ -53,6 +53,7 @@ import {
 import { deriveKeyboardAction, type KeyboardAction } from './game-client-keyboard';
 import { deriveGameOverPlan } from './game-client-endgame';
 import { deriveClientMessagePlan } from './game-client-messages';
+import { deriveClientScreenPlan } from './game-client-screen';
 import { initAudio, playSelect, playConfirm, playThrust, playCombat, playExplosion, playPhaseChange, playVictory, playDefeat, playWarning, isMuted, setMuted } from './audio';
 
 class GameClient {
@@ -186,8 +187,15 @@ class GameClient {
     this.tooltipEl.style.display = 'none';
 
     const entryPlan = deriveClientStateEntryPlan(newState, this.gameState, this.playerId);
+    const screenPlan = deriveClientScreenPlan(
+      newState,
+      this.gameCode,
+      this.inviteLink,
+      this.gameCode ? this.getStoredInviteToken(this.gameCode) : null,
+      window.location.origin,
+    );
 
-    switch (newState) {
+    switch (screenPlan.kind) {
       case 'menu':
         this.ui.showMenu();
         break;
@@ -196,27 +204,18 @@ class GameClient {
         this.ui.showConnecting();
         break;
 
-      case 'waitingForOpponent':
-        if (!this.inviteLink && this.gameCode) {
-          const storedInviteToken = this.getStoredInviteToken(this.gameCode);
-          if (storedInviteToken) {
-            this.inviteLink = buildInviteLink(window.location.origin, this.gameCode, storedInviteToken);
-          }
-        }
-        this.ui.showWaiting(this.gameCode ?? '', this.inviteLink);
+      case 'waiting':
+        this.inviteLink = screenPlan.inviteLink;
+        this.ui.showWaiting(screenPlan.code, screenPlan.inviteLink);
         break;
 
-      case 'playing_fleetBuilding':
+      case 'fleetBuilding':
         this.ui.showFleetBuilding(this.gameState!, this.playerId);
         break;
-      case 'playing_astrogation':
-      case 'playing_ordnance':
-      case 'playing_combat':
-      case 'playing_movementAnim':
-      case 'playing_opponentTurn':
+      case 'hud':
         this.ui.showHUD();
         break;
-      case 'gameOver':
+      case 'none':
         break;
     }