diff --git a/src/frontend/src/Connection.ts b/src/frontend/src/Connection.ts index 200066c..a890110 100644 --- a/src/frontend/src/Connection.ts +++ b/src/frontend/src/Connection.ts @@ -1,7 +1,7 @@ -import * as ex from 'excalibur'; import { GameState } from './GameState'; +import { log } from './utils/debugUtils'; -type Action = "join"; +type Action = "join" | "toggleRole" | "toggleReady"; interface Request { action: Action, @@ -12,49 +12,48 @@ interface JoinRequest { name: string, } -type ConnectionEvents = { - message: GameMessageEvent; +interface ToggleRoleRequest { + action: "toggleRole" } -export class GameMessageEvent extends ex.GameEvent { - constructor(public gameState: GameState) { - super(); - } +interface ToggleReadyRequest { + action: "toggleReady" } -export const ConnectionEvents = { - GameMessage: "game-message" +export class GameMessageEvent { + constructor(public gameState: GameState) { } } -export class Connection extends ex.Actor { +export class Connection { private _socket: WebSocket | null = null; + private _observer: ((event: GameMessageEvent) => void)[] = []; - public override events = new ex.EventEmitter(); - private get _connected(): boolean { const { _socket } = this; - return _socket !== null && !_socket.CLOSING && !_socket?.CLOSED && _socket.OPEN; + return _socket !== null && _socket.readyState === _socket.OPEN; } connect(): void { this._socket = new WebSocket("ws://127.0.0.1:8888"); - this._socket.onopen = () => console.log("Heureka"); + + this._socket.onopen = () => log("Connection", "Connected to game server."); this._socket.onmessage = (event) => this._onMessage(event); - this._socket.onerror = (event) => console.log(event); - this._socket.onclose = (event) => console.log(event); + this._socket.onerror = (event) => log("Connection", event); + this._socket.onclose = (event) => log("Connection", event); } private _onMessage(event: MessageEvent): void { + log("Connection", "received", event) + const messageObject = JSON.parse(event.data); const gameState = messageObject.gamestate; - - console.log(messageObject); - this.events.emit(ConnectionEvents.GameMessage, new GameMessageEvent(gameState)); + const gameMessage = new GameMessageEvent(gameState) + this.emitOnMessage(gameMessage); } private _send(request: Request): void { if (!this._connected) { - //return; + return; } const message = JSON.stringify(request); @@ -69,4 +68,29 @@ export class Connection extends ex.Actor { this._send(joinRequest); } + + toggleRole(): void { + const toggleRoleRequest = { + action: "toggleRole" + } as ToggleRoleRequest; + + this._send(toggleRoleRequest) + } + + toggleReady(): void { + const toggleReadyRequest = { + action: "toggleReady" + } as ToggleReadyRequest; + + this._send(toggleReadyRequest) + + } + + onMessage(handler: (event: GameMessageEvent) => void) { + this._observer.push(handler); + } + + emitOnMessage(event: GameMessageEvent): void { + this._observer.forEach(observer => observer(event)); + } } \ No newline at end of file diff --git a/src/frontend/src/Scenes/LobbyScene.ts b/src/frontend/src/Scenes/LobbyScene.ts index f0188aa..e8c0d92 100644 --- a/src/frontend/src/Scenes/LobbyScene.ts +++ b/src/frontend/src/Scenes/LobbyScene.ts @@ -39,8 +39,7 @@ export class LobbyScene extends GameStateScene { constructor(private _connection: Connection) { super(); - - this._connection.on("game-message", (e: GameMessageEvent) => this.updateFromGameState(e.gameState)) + this._connection.onMessage((e: GameMessageEvent) => this.updateFromGameState(e.gameState)) } onInitialize(engine: ex.Engine): void { diff --git a/src/frontend/src/utils/debugUtils.ts b/src/frontend/src/utils/debugUtils.ts new file mode 100644 index 0000000..cdde0fc --- /dev/null +++ b/src/frontend/src/utils/debugUtils.ts @@ -0,0 +1,5 @@ +export type LogSource = "Connection"; + +export function log(source: LogSource, ...data: any[]): void { + console.log(`${source}: `, ...data); +}