diff --git a/api/admin.go b/api/admin.go index 1834bf4..f066fe0 100644 --- a/api/admin.go +++ b/api/admin.go @@ -143,6 +143,7 @@ func (a *Admin) ServeReset(w http.ResponseWriter, r *http.Request) { if !a.authorizePost(w, r) { return } + a.sockets.BroadcastShutDown(CMD_RESET) changed := a.players.ResetNonLeaders() a.sockets.ClearOfflineLocations() for _, player := range changed { diff --git a/api/admin_socket.go b/api/admin_socket.go index b083ad3..7e0691d 100644 --- a/api/admin_socket.go +++ b/api/admin_socket.go @@ -11,6 +11,8 @@ const ( AdminEventSnapshot = "snapshot" AdminEventUpsert = "upsert" AdminEventFlag = "flag" + AdminEventShutdown = "shutdown" // server is shutting down gracefully; admin should reconnect + AdminEventReset = "reset" // game was reset; admin should reconnect ) type AdminSocketMessage struct { diff --git a/api/admin_test.go b/api/admin_test.go index e6bc556..1744e11 100644 --- a/api/admin_test.go +++ b/api/admin_test.go @@ -274,6 +274,12 @@ func TestAdminResetClearsOfflineLocationsButPreservesActiveCoordinates(t *testin if coordinate := sockets.hub.coordinates[activeID]; coordinate != activeCoordinate { t.Errorf("active coordinate after reset = %#v, want %#v", coordinate, activeCoordinate) } + // ServeReset now broadcasts CMD_RESET before wiping state so that + // connected players know to re-register. Consume that message first. + resetMsg := receiveTestMessage(t, viewer) + if resetMsg.Command != CMD_RESET { + t.Errorf("expected reset signal first, got command = %q", resetMsg.Command) + } message := receiveTestMessage(t, viewer) if message.Command != CMD_REMOVE || message.Data != string(offlineID) { t.Errorf("Admin reset location removal = %#v", message) diff --git a/api/etc.go b/api/etc.go index 15c1b9e..867d0d3 100644 --- a/api/etc.go +++ b/api/etc.go @@ -21,6 +21,8 @@ const ( CMD_INFORM = "inform" // inform another player change/connection CMD_REMOVE = "remove" // remove a player marker without disclosing a location CMD_STATE = "state" // inform clients of shared game state + CMD_SHUTDOWN = "shutdown" // inform clients of server shutdown + CMD_RESET = "reset" // inform clients of server reset // player type TypeHidden PlayerType = 0 diff --git a/api/hub.go b/api/hub.go index b55b4b7..da34e5a 100644 --- a/api/hub.go +++ b/api/hub.go @@ -23,6 +23,12 @@ type Hub struct { inform chan PlayerID state chan GameState clearOffline chan chan struct{} + shutdown chan shutdownEvent +} + +type shutdownEvent struct { + command string + done chan struct{} } func NewHub(players *Players, games ...*Game) *Hub { @@ -38,6 +44,7 @@ func NewHub(players *Players, games ...*Game) *Hub { inform: make(chan PlayerID), state: make(chan GameState), clearOffline: make(chan chan struct{}), + shutdown: make(chan shutdownEvent), } if len(games) > 0 { hub.game = games[0] @@ -61,8 +68,11 @@ func (h *Hub) Run() { case done := <-h.clearOffline: h.clearOfflineLocations() close(done) + case event := <-h.shutdown: + h.broadcastShutDown(event.command) + close(event.done) } - } + } } func isPrivateMapRole(playerType PlayerType) bool { @@ -420,3 +430,13 @@ func (h *Hub) clearOfflineLocations() { h.broadcastRemove(playerID, onlyViewers, nil) } } + +func (h *Hub) broadcastShutDown(command string) { + message, err := json.Marshal(Message{Command: command}) + if err != nil { + return + } + for connection := range h.connections { + h.enqueue(connection, message) + } +} \ No newline at end of file diff --git a/api/socket.go b/api/socket.go index 89c777e..3685fe1 100644 --- a/api/socket.go +++ b/api/socket.go @@ -36,6 +36,15 @@ type Sockets struct { hub *Hub } +// BroadcastShutDown signals every client.. +// CMD_RESET keeps socket open so players can re-register. +// CMD_SHUTDOWN closes everything. +func (s *Sockets) BroadcastShutDown(command string) { + done := make(chan struct{}) + s.hub.shutdown <- shutdownEvent{command: command, done: done} + <-done +} + func (s *Sockets) Init(players *Players, games ...*Game) { s.players = players s.hub = NewHub(players, games...) diff --git a/frontend/src/app/core/credentials.service.spec.ts b/frontend/src/app/core/credentials.service.spec.ts index 3b3ddae..f168d58 100644 --- a/frontend/src/app/core/credentials.service.spec.ts +++ b/frontend/src/app/core/credentials.service.spec.ts @@ -1,4 +1,8 @@ -import { readCookie } from './credentials.service'; +import { DOCUMENT } from '@angular/common'; +import { TestBed } from '@angular/core/testing'; + +import { PAC_WINDOW } from './browser-window.token'; +import { CredentialsService, readCookie } from './credentials.service'; describe('readCookie', () => { it('reads and decodes an exact cookie name', () => { @@ -10,3 +14,133 @@ describe('readCookie', () => { expect(readCookie('theme=dark', 'id')).toBe(''); }); }); + +describe('CredentialsService', () => { + let service: CredentialsService; + let mockDocument: { cookie: string }; + let mockStorage: Record; + let mockWindow: { + location: { protocol: string }; + localStorage: { + getItem: (key: string) => string | null; + setItem: (key: string, value: string) => void; + }; + }; + + beforeEach(() => { + mockDocument = { cookie: '' }; + mockStorage = {}; + mockWindow = { + location: { protocol: 'http:' }, + localStorage: { + getItem: (key) => mockStorage[key] ?? null, + setItem: (key, value) => { + mockStorage[key] = value; + }, + }, + }; + + TestBed.configureTestingModule({ + providers: [ + CredentialsService, + { provide: DOCUMENT, useValue: mockDocument }, + { provide: PAC_WINDOW, useValue: mockWindow }, + ], + }); + service = TestBed.inject(CredentialsService); + }); + + it.each(['http:', 'https:'] as const)('expires the id cookie over %s', (protocol) => { + mockWindow.location.protocol = protocol; + mockDocument.cookie = 'id=ABC; theme=dark'; + + service.clear(); + + const secure = protocol === 'https:' ? '; Secure' : ''; + expect(mockDocument.cookie).toBe(`id=; Path=/; SameSite=Lax${secure}; Max-Age=0`); + }); + + it('leaves the cookie untouched when PAC_WINDOW is null', () => { + TestBed.resetTestingModule(); + TestBed.configureTestingModule({ + providers: [ + CredentialsService, + { provide: DOCUMENT, useValue: mockDocument }, + { provide: PAC_WINDOW, useValue: null }, + ], + }); + service = TestBed.inject(CredentialsService); + mockDocument.cookie = 'id=ABC'; + + service.clear(); + + expect(mockDocument.cookie).toBe('id=ABC'); + }); + + it('saves and retrieves the player name for auto re-registration', () => { + service.savePlayerName('Odin'); + + expect(service.getPlayerName()).toBe('Odin'); + }); + + it('returns an empty player name when localStorage throws on get', () => { + TestBed.resetTestingModule(); + const throwingWindow = { + location: { protocol: 'http:' }, + localStorage: { + getItem: () => { + throw new Error('unavailable'); + }, + setItem: () => undefined, + }, + }; + TestBed.configureTestingModule({ + providers: [ + CredentialsService, + { provide: DOCUMENT, useValue: mockDocument }, + { provide: PAC_WINDOW, useValue: throwingWindow }, + ], + }); + service = TestBed.inject(CredentialsService); + + expect(service.getPlayerName()).toBe(''); + }); + + it('silently ignores localStorage errors when saving the player name', () => { + TestBed.resetTestingModule(); + const throwingWindow = { + location: { protocol: 'http:' }, + localStorage: { + getItem: () => null, + setItem: () => { + throw new Error('quota exceeded'); + }, + }, + }; + TestBed.configureTestingModule({ + providers: [ + CredentialsService, + { provide: DOCUMENT, useValue: mockDocument }, + { provide: PAC_WINDOW, useValue: throwingWindow }, + ], + }); + service = TestBed.inject(CredentialsService); + + expect(() => service.savePlayerName('Odin')).not.toThrow(); + }); + + it('returns an empty player name and ignores saves when PAC_WINDOW is null', () => { + TestBed.resetTestingModule(); + TestBed.configureTestingModule({ + providers: [ + CredentialsService, + { provide: DOCUMENT, useValue: mockDocument }, + { provide: PAC_WINDOW, useValue: null }, + ], + }); + service = TestBed.inject(CredentialsService); + + expect(service.getPlayerName()).toBe(''); + expect(() => service.savePlayerName('Odin')).not.toThrow(); + }); +}); diff --git a/frontend/src/app/core/credentials.service.ts b/frontend/src/app/core/credentials.service.ts index 1c0b881..e7fba9f 100644 --- a/frontend/src/app/core/credentials.service.ts +++ b/frontend/src/app/core/credentials.service.ts @@ -4,6 +4,8 @@ import { inject, Service } from '@angular/core'; import { PAC_WINDOW } from './browser-window.token'; import { Credentials } from './game.models'; +const PLAYER_NAME_KEY = 'playerName'; + export function readCookie(cookieHeader: string, name: string): string { const prefix = `${name}=`; const value = cookieHeader @@ -47,4 +49,29 @@ export class CredentialsService { const attributes = `; Path=/; SameSite=Lax${secure}`; this.document.cookie = `id=${encodeURIComponent(credentials.id)}${attributes}`; } + + getPlayerName(): string { + try { + return this.browserWindow?.localStorage.getItem(PLAYER_NAME_KEY) ?? ''; + } catch { + return ''; + } + } + + savePlayerName(name: string): void { + try { + this.browserWindow?.localStorage.setItem(PLAYER_NAME_KEY, name); + } catch { + // Local storage may be unavailable or full; re-registration can fall back to the form. + } + } + + clear(): void { + if (!this.browserWindow) { + return; + } + + const secure = this.browserWindow.location.protocol === 'https:' ? '; Secure' : ''; + this.document.cookie = `id=; Path=/; SameSite=Lax${secure}; Max-Age=0`; + } } diff --git a/frontend/src/app/core/game.models.ts b/frontend/src/app/core/game.models.ts index 54a801c..681aa1b 100644 --- a/frontend/src/app/core/game.models.ts +++ b/frontend/src/app/core/game.models.ts @@ -52,7 +52,7 @@ export interface LivePlayer { export interface SocketMessage { coordinate?: Coordinate; - command: 'inform' | 'move' | 'remove' | 'state' | string; + command: 'inform' | 'move' | 'remove' | 'state' | 'shutdown' | 'reset' | string; data: string; } diff --git a/frontend/src/app/core/sockets/game-socket.service.spec.ts b/frontend/src/app/core/sockets/game-socket.service.spec.ts index e0b6040..ea6e3bb 100644 --- a/frontend/src/app/core/sockets/game-socket.service.spec.ts +++ b/frontend/src/app/core/sockets/game-socket.service.spec.ts @@ -297,4 +297,92 @@ describe('GameSocketService', () => { expect(service.state()).toBe('error'); expect(service.status()).toContain('Register as admin again in this browser'); }); + + it('reconnects after two failures and expires the session after the third', () => { + vi.useFakeTimers(); + vi.spyOn(console, 'log').mockImplementation(() => undefined); + vi.spyOn(console, 'warn').mockImplementation(() => undefined); + const onSessionExpired = vi.fn(); + service.start('ABCD', () => undefined, onSessionExpired); + + MockGameWebSocket.instances[0].serverClose(false); + vi.advanceTimersByTime(1000); + MockGameWebSocket.instances[1].serverClose(false); + vi.advanceTimersByTime(2000); + + expect(service.sessionExpired()).toBe(false); + expect(service.state()).toBe('connecting'); + expect(MockGameWebSocket.instances).toHaveLength(3); + expect(onSessionExpired).not.toHaveBeenCalled(); + + MockGameWebSocket.instances[2].serverClose(false); + vi.runAllTimers(); + + expect(service.sessionExpired()).toBe(true); + expect(service.state()).toBe('error'); + expect(service.status()).toContain('Session has expired as game server restarted.'); + expect(MockGameWebSocket.instances).toHaveLength(3); + expect(onSessionExpired).toHaveBeenCalledOnce(); + }); + + it('resets the failure counter when a player connection succeeds', () => { + vi.useFakeTimers(); + vi.spyOn(console, 'log').mockImplementation(() => undefined); + vi.spyOn(console, 'warn').mockImplementation(() => undefined); + service.start('ABCD', () => undefined); + + MockGameWebSocket.instances[0].serverClose(false); + vi.advanceTimersByTime(1000); + MockGameWebSocket.instances[1].serverClose(false); + vi.advanceTimersByTime(2000); + + MockGameWebSocket.instances[2].open(); + MockGameWebSocket.instances[2].serverClose(false); + vi.advanceTimersByTime(4000); + MockGameWebSocket.instances[3].serverClose(false); + vi.runAllTimers(); + + expect(service.sessionExpired()).toBe(false); + expect(MockGameWebSocket.instances).toHaveLength(5); + }); + + it('never expires the session for a viewer socket', () => { + vi.useFakeTimers(); + vi.spyOn(console, 'log').mockImplementation(() => undefined); + vi.spyOn(console, 'warn').mockImplementation(() => undefined); + service.startViewer(); + + MockGameWebSocket.instances[0].serverClose(false); + vi.advanceTimersByTime(1000); + MockGameWebSocket.instances[1].serverClose(false); + vi.advanceTimersByTime(2000); + MockGameWebSocket.instances[2].serverClose(false); + vi.runAllTimers(); + + expect(service.sessionExpired()).toBe(false); + expect(MockGameWebSocket.instances.length).toBeGreaterThan(3); + }); + + it('start and stop clear an expired session', () => { + vi.useFakeTimers(); + vi.spyOn(console, 'log').mockImplementation(() => undefined); + vi.spyOn(console, 'warn').mockImplementation(() => undefined); + service.start('ABCD', () => undefined); + + MockGameWebSocket.instances[0].serverClose(false); + vi.advanceTimersByTime(1000); + MockGameWebSocket.instances[1].serverClose(false); + vi.advanceTimersByTime(2000); + MockGameWebSocket.instances[2].serverClose(false); + vi.runAllTimers(); + + expect(service.sessionExpired()).toBe(true); + + service.stop(); + expect(service.sessionExpired()).toBe(false); + + service.start('ABCD', () => undefined); + expect(service.sessionExpired()).toBe(false); + expect(MockGameWebSocket.instances).toHaveLength(4); + }); }); diff --git a/frontend/src/app/core/sockets/game-socket.service.ts b/frontend/src/app/core/sockets/game-socket.service.ts index 15a74f8..64e0c97 100644 --- a/frontend/src/app/core/sockets/game-socket.service.ts +++ b/frontend/src/app/core/sockets/game-socket.service.ts @@ -29,18 +29,25 @@ export class GameSocketService extends WebSocketService { private playerId: string | null = null; private mode: SocketMode | null = null; private onConnected: (() => void) | null = null; + private onSessionExpired: (() => void) | null = null; private reconnecting = false; private suspendedReason = 'Paused while the browser is offline.'; + private consecutiveFailures = 0; private readonly statusMessage = signal(null); readonly players = signal>({}); readonly isFlagFound = signal(false); + readonly sessionExpired = signal(false); + readonly MAX_FAILED_ATTEMPTS = 3; - start(id: string, onConnected: () => void): void { + start(id: string, onConnected: () => void, onSessionExpired: () => void = () => undefined): void { this.stop(); this.mode = 'player'; this.playerId = id; this.onConnected = onConnected; + this.onSessionExpired = onSessionExpired; + this.consecutiveFailures = 0; + this.sessionExpired.set(false); this.resume(); } @@ -72,8 +79,11 @@ export class GameSocketService extends WebSocketService { this.mode = null; this.playerId = null; this.onConnected = null; + this.onSessionExpired = null; this.reconnecting = false; this.statusMessage.set(null); + this.consecutiveFailures = 0; + this.sessionExpired.set(false); this.disconnect(); } @@ -96,6 +106,7 @@ export class GameSocketService extends WebSocketService { this.players.set({}); this.reconnecting = false; this.statusMessage.set(null); + this.consecutiveFailures = 0; this.onConnected?.(); } @@ -103,6 +114,24 @@ export class GameSocketService extends WebSocketService { this.reconnecting = true; } + protected override shouldReconnect(closeEvent: CloseEvent): boolean { + if (this.mode !== 'player') { + return true; + } + + this.consecutiveFailures++; + + if (this.consecutiveFailures >= this.MAX_FAILED_ATTEMPTS) { + this.sessionExpired.set(true); + this.statusMessage.set( + 'Session has expired as game server restarted.', + ); + this.onSessionExpired?.(); + return false; + } + return true; + } + protected override onSocketError(): void { this.statusMessage.set( this.mode === 'viewer' @@ -170,6 +199,21 @@ export class GameSocketService extends WebSocketService { return; } + if (message.command === 'shutdown') { + // Server is restarting cleanly — let the existing retry pipeline + // reconnect automatically. Just show a friendly status message. + this.statusMessage.set('Server is restarting. Reconnecting automatically…'); + return; + } + + if (message.command === 'reset') { + // Game was reset — this player's ID is no longer valid. + this.statusMessage.set('The game was reset. Redirecting to registration…'); + this.sessionExpired.set(true); + this.onSessionExpired?.(); + return; + } + if (message.command === 'remove') { this.players.update((players) => { if (!(message.data in players)) { @@ -232,6 +276,8 @@ function isSocketMessage(value: unknown): value is SocketMessage { switch (value['command']) { case 'remove': + case 'shutdown': + case 'reset': return true; case 'inform': case 'move': diff --git a/frontend/src/app/pages/game-page/game-page.component.spec.ts b/frontend/src/app/pages/game-page/game-page.component.spec.ts index 5d040de..be8b3f1 100644 --- a/frontend/src/app/pages/game-page/game-page.component.spec.ts +++ b/frontend/src/app/pages/game-page/game-page.component.spec.ts @@ -1,7 +1,7 @@ import { signal } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; import { ApiService } from '../../core/api.service'; import { CredentialsService } from '../../core/credentials.service'; @@ -11,50 +11,89 @@ import { MapInfo, PlayerStatus, PlayerType } from '../../core/game.models'; import { WakeLockService } from '../../core/wake-lock.service'; import { GamePageComponent } from './game-page.component'; +const map: MapInfo = { + min: { latitude: 49.27, longitude: -122.92 }, + max: { latitude: 49.28, longitude: -122.9 }, + width: 32, + height: 32, + isFlagFound: false, +}; +const api = { + getMap: vi.fn(() => of(map)), + registerPlayer: vi.fn(() => of({ id: 'NEWID' })), +}; +const credentials = { + get: vi.fn(() => ({ id: 'SELF' })), + save: vi.fn(), + getPlayerName: vi.fn(() => ''), + savePlayerName: vi.fn(), + clear: vi.fn(), +}; +const router = { navigateByUrl: vi.fn() }; +let triggerSessionExpired: (() => void) | null = null; +const gameSocket = { + players: signal({ + SELF: { + coordinate: { latitude: 49.275, longitude: -122.91 }, + player: { + id: 'SELF', + name: 'Leader', + type: PlayerType.Ghost, + status: PlayerStatus.Connected, + }, + }, + }), + status: signal('Connected.'), + isFlagFound: signal(false), + sessionExpired: signal(false), + start: vi.fn((_id: string, _onConnected: () => void, onSessionExpired: () => void) => { + triggerSessionExpired = onSessionExpired; + gameSocket.sessionExpired.set(false); + }), + stop: vi.fn(() => gameSocket.sessionExpired.set(false)), + resume: vi.fn(), + suspend: vi.fn(), + sendCoordinate: vi.fn(), + setInitialState: vi.fn(), +}; +const geolocation = { + status: signal('Ready.'), + start: vi.fn(), + stop: vi.fn(), +}; +const wakeLock = { + supported: signal(true), + enabled: signal(false), + status: signal('Screen wake lock is off.'), + initialize: vi.fn(), + setEnabled: vi.fn(async () => undefined), + handleVisibilityChange: vi.fn(async () => undefined), + release: vi.fn(async () => undefined), +}; + +async function configureTestBed(): Promise { + await TestBed.configureTestingModule({ + imports: [GamePageComponent], + providers: [ + { provide: ApiService, useValue: api }, + { provide: CredentialsService, useValue: credentials }, + { provide: Router, useValue: router }, + ], + }) + .overrideComponent(GamePageComponent, { + set: { + providers: [ + { provide: GameSocketService, useValue: gameSocket }, + { provide: GeolocationService, useValue: geolocation }, + { provide: WakeLockService, useValue: wakeLock }, + ], + }, + }) + .compileComponents(); +} + describe('GamePageComponent leader link', () => { let fixture: ComponentFixture; - const map: MapInfo = { - min: { latitude: 49.27, longitude: -122.92 }, - max: { latitude: 49.28, longitude: -122.9 }, - width: 32, - height: 32, - isFlagFound: false, - }; - const gameSocket = { - players: signal({ - SELF: { - coordinate: { latitude: 49.275, longitude: -122.91 }, - player: { - id: 'SELF', - name: 'Leader', - type: PlayerType.Ghost, - status: PlayerStatus.Connected, - }, - }, - }), - status: signal('Connected.'), - isFlagFound: signal(false), - start: vi.fn(), - stop: vi.fn(), - resume: vi.fn(), - suspend: vi.fn(), - sendCoordinate: vi.fn(), - setInitialState: vi.fn(), - }; - const geolocation = { - status: signal('Ready.'), - start: vi.fn(), - stop: vi.fn(), - }; - const wakeLock = { - supported: signal(true), - enabled: signal(false), - status: signal('Screen wake lock is off.'), - initialize: vi.fn(), - setEnabled: vi.fn(async () => undefined), - handleVisibilityChange: vi.fn(async () => undefined), - release: vi.fn(async () => undefined), - }; beforeEach(async () => { gameSocket.players.update((players) => ({ @@ -65,24 +104,7 @@ describe('GamePageComponent leader link', () => { }, })); - await TestBed.configureTestingModule({ - imports: [GamePageComponent], - providers: [ - { provide: ApiService, useValue: { getMap: vi.fn(() => of(map)) } }, - { provide: CredentialsService, useValue: { get: () => ({ id: 'SELF' }) } }, - { provide: Router, useValue: { navigateByUrl: vi.fn() } }, - ], - }) - .overrideComponent(GamePageComponent, { - set: { - providers: [ - { provide: GameSocketService, useValue: gameSocket }, - { provide: GeolocationService, useValue: geolocation }, - { provide: WakeLockService, useValue: wakeLock }, - ], - }, - }) - .compileComponents(); + await configureTestBed(); }); async function render(playerType: PlayerType): Promise { @@ -110,6 +132,95 @@ describe('GamePageComponent leader link', () => { it('does not show the leader link to a non-leader', async () => { const page = await render(PlayerType.Ghost); - expect(page.querySelector('.game-page__leader-link')).toBeNull(); + const link = page.querySelector('.game-page__leader-link a'); + expect(link?.style.visibility).toBe('hidden'); + }); +}); + +describe('GamePageComponent re-registration', () => { + let fixture: ComponentFixture; + + beforeEach(async () => { + vi.clearAllMocks(); + gameSocket.sessionExpired.set(false); + triggerSessionExpired = null; + await configureTestBed(); + }); + + async function render(): Promise { + fixture = TestBed.createComponent(GamePageComponent); + fixture.detectChanges(); + await new Promise((resolve) => setTimeout(resolve, 0)); + fixture.detectChanges(); + return fixture.nativeElement as HTMLElement; + } + + async function flushReRegistration(): Promise { + fixture.detectChanges(); + await new Promise((resolve) => setTimeout(resolve, 0)); + fixture.detectChanges(); + } + + it('clears credentials and redirects to /register when no name is saved', async () => { + credentials.getPlayerName.mockReturnValue(''); + await render(); + + triggerSessionExpired?.(); + await flushReRegistration(); + + expect(credentials.clear).toHaveBeenCalled(); + expect(gameSocket.stop).toHaveBeenCalled(); + expect(router.navigateByUrl).toHaveBeenCalledWith('/register'); + }); + + it('re-registers with the saved name and reconnects', async () => { + credentials.getPlayerName.mockReturnValue('Odin'); + api.registerPlayer.mockReturnValue(of({ id: 'NEWID' })); + const page = await render(); + + triggerSessionExpired?.(); + await flushReRegistration(); + + expect(api.registerPlayer).toHaveBeenCalledWith('Odin'); + expect(credentials.save).toHaveBeenCalledWith({ id: 'NEWID' }); + expect(credentials.clear).not.toHaveBeenCalled(); + expect(page.textContent).toContain('Re-registered. Reconnecting…'); + + const startCalls = gameSocket.start.mock.calls; + const onConnected = startCalls[startCalls.length - 1][1] as () => void; + expect(startCalls[startCalls.length - 1][0]).toBe('NEWID'); + onConnected(); + fixture.detectChanges(); + + expect(geolocation.start).toHaveBeenCalledWith(expect.any(Function)); + expect(page.textContent).toContain('Connected to PacMacro.'); + }); + + it('clears credentials and redirects when re-registration fails', async () => { + credentials.getPlayerName.mockReturnValue('Odin'); + api.registerPlayer.mockReturnValue(throwError(() => new Error('API is down'))); + const page = await render(); + + triggerSessionExpired?.(); + await flushReRegistration(); + + expect(credentials.clear).toHaveBeenCalled(); + expect(gameSocket.stop).toHaveBeenCalled(); + expect(router.navigateByUrl).toHaveBeenCalledWith('/register'); + expect(page.textContent).toContain('Could not re-register. Redirecting…'); + }); + + it('treats an empty player ID from the API as a failure', async () => { + credentials.getPlayerName.mockReturnValue('Odin'); + api.registerPlayer.mockReturnValue(of({ id: ' ' })); + const page = await render(); + + triggerSessionExpired?.(); + await flushReRegistration(); + + expect(credentials.clear).toHaveBeenCalled(); + expect(gameSocket.stop).toHaveBeenCalled(); + expect(router.navigateByUrl).toHaveBeenCalledWith('/register'); + expect(page.textContent).toContain('Could not re-register. Redirecting…'); }); }); diff --git a/frontend/src/app/pages/game-page/game-page.component.ts b/frontend/src/app/pages/game-page/game-page.component.ts index b435cb3..106a960 100644 --- a/frontend/src/app/pages/game-page/game-page.component.ts +++ b/frontend/src/app/pages/game-page/game-page.component.ts @@ -41,6 +41,7 @@ export class GamePageComponent { protected readonly map = signal(null); protected readonly selfId = signal(''); protected readonly pageStatus = signal('Loading the game map…'); + protected readonly selfSummary = computed(() => { const player = this.socket.players()[this.selfId()]?.player; return player ? `${player.name} (${player.id}) is ${typeLabel(player.type)}` : ''; @@ -68,6 +69,36 @@ export class GamePageComponent { await this.wakeLock.setEnabled((event.target as HTMLInputElement).checked); } + private async autoReregister(): Promise { + const name = this.credentials.getPlayerName(); + if (!name) { + this.credentials.clear(); + this.socket.stop(); + await this.router.navigateByUrl('/register'); + return; + } + + this.pageStatus.set('Re-registering…'); + + try { + const response = await firstValueFrom(this.api.registerPlayer(name)); + const id = response.id.trim(); + if (!id) { + throw new Error('The API returned an empty player ID.'); + } + + this.credentials.save({ id }); + this.selfId.set(id); + this.pageStatus.set('Re-registered. Reconnecting…'); + this.connectAs(id); + } catch { + this.credentials.clear(); + this.socket.stop(); + this.pageStatus.set('Could not re-register. Redirecting…'); + await this.router.navigateByUrl('/register'); + } + } + private async initialize(): Promise { if (!this.browserWindow) { return; @@ -96,10 +127,18 @@ export class GamePageComponent { this.browserWindow.document.addEventListener('visibilitychange', this.onVisibilityChange); this.browserWindow.addEventListener('online', this.onOnline); this.browserWindow.addEventListener('offline', this.onOffline); - this.socket.start(credentials.id, () => { - this.pageStatus.set('Connected to PacMacro.'); - this.geolocation.start((coordinate) => this.socket.sendCoordinate(coordinate)); - }); + this.connectAs(credentials.id); + } + + private connectAs(id: string): void { + this.socket.start( + id, + () => { + this.pageStatus.set('Connected to PacMacro.'); + this.geolocation.start((coordinate) => this.socket.sendCoordinate(coordinate)); + }, + () => void this.autoReregister(), + ); } private cleanup(): void { diff --git a/frontend/src/app/pages/register-page/register-page.component.spec.ts b/frontend/src/app/pages/register-page/register-page.component.spec.ts index e560a89..353517c 100644 --- a/frontend/src/app/pages/register-page/register-page.component.spec.ts +++ b/frontend/src/app/pages/register-page/register-page.component.spec.ts @@ -12,7 +12,7 @@ describe('RegisterPageComponent', () => { registerAdmin: vi.fn(() => of(void 0)), registerPlayer: vi.fn(() => of({ id: 'ABCD' })), }; - const credentials = { save: vi.fn() }; + const credentials = { save: vi.fn(), savePlayerName: vi.fn() }; const router = { navigateByUrl: vi.fn(() => Promise.resolve(true)) }; beforeEach(() => { @@ -39,6 +39,7 @@ describe('RegisterPageComponent', () => { expect(api.registerPlayer).toHaveBeenCalledWith('Test2'); expect(api.registerAdmin).not.toHaveBeenCalled(); expect(credentials.save).toHaveBeenCalledWith({ id: 'ABCD' }); + expect(credentials.savePlayerName).toHaveBeenCalledWith('Test2'); expect(router.navigateByUrl).toHaveBeenCalledWith('/'); }); @@ -52,6 +53,8 @@ describe('RegisterPageComponent', () => { await component.submit(submitEvent()); expect(api.registerPlayer).not.toHaveBeenCalled(); + expect(credentials.save).not.toHaveBeenCalled(); + expect(credentials.savePlayerName).not.toHaveBeenCalled(); }); }); diff --git a/frontend/src/app/pages/register-page/register-page.component.ts b/frontend/src/app/pages/register-page/register-page.component.ts index c04ca41..6330212 100644 --- a/frontend/src/app/pages/register-page/register-page.component.ts +++ b/frontend/src/app/pages/register-page/register-page.component.ts @@ -62,6 +62,7 @@ export class RegisterPageComponent { throw new Error('The API returned an empty player ID.'); } this.credentials.save({ id }); + this.credentials.savePlayerName(trimmedName); await this.router.navigateByUrl('/'); } catch (error) { this.status.set('Registration failed. Check your details and the API connection.'); diff --git a/main.go b/main.go index 5531ddb..3905dbb 100644 --- a/main.go +++ b/main.go @@ -5,6 +5,9 @@ import ( "log" "net/http" "os" + "os/signal" + "syscall" + "time" "github.com/joho/godotenv" "pacmacro/api" @@ -81,5 +84,21 @@ func main() { // PacMacro API is served on port 49152. // this should be proxied inside the web server used. - log.Fatal(http.ListenAndServe(port, nil)) + go func() { + if err := http.ListenAndServe(port, nil); err != nil && err != http.ErrServerClosed { + log.Fatal(err) + } + }() + + // Block until SIGINT (Ctrl+C) or SIGTERM (systemd stop/restart). + quit := make(chan os.Signal, 1) + signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM) + <-quit + + fmt.Println("Shutdown signal received. Notifying players...") + sock.BroadcastShutDown(api.CMD_SHUTDOWN) + + // Give write pumps ~1 second to flush the shutdown message before exiting. + time.Sleep(1 * time.Second) + fmt.Println("Server exiting.") }