Use custom observer pattern and add toggleRole and toggleReady request (#7)
This commit is contained in:
1 parent
89b2554763
commit
93ce8285d4
3 files changed
+51
-23
No files matched your search
@@ -1,7 +1,7 @@
|
|||||||
import * as ex from 'excalibur';
|
|
||||||
import { GameState } from './GameState';
|
import { GameState } from './GameState';
|
||||||
|
import { log } from './utils/debugUtils';
|
||||||
|
|
||||||
type Action = "join";
|
type Action = "join" | "toggleRole" | "toggleReady";
|
||||||
|
|
||||||
interface Request {
|
interface Request {
|
||||||
action: Action,
|
action: Action,
|
||||||
@@ -12,49 +12,48 @@ interface JoinRequest {
|
|||||||
name: string,
|
name: string,
|
||||||
}
|
}
|
||||||
|
|
||||||
type ConnectionEvents = {
|
interface ToggleRoleRequest {
|
||||||
message: GameMessageEvent;
|
action: "toggleRole"
|
||||||
}
|
}
|
||||||
|
|
||||||
export class GameMessageEvent extends ex.GameEvent<GameState> {
|
interface ToggleReadyRequest {
|
||||||
constructor(public gameState: GameState) {
|
action: "toggleReady"
|
||||||
super();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ConnectionEvents = {
|
export class GameMessageEvent {
|
||||||
GameMessage: "game-message"
|
constructor(public gameState: GameState) { }
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Connection extends ex.Actor {
|
export class Connection {
|
||||||
private _socket: WebSocket | null = null;
|
private _socket: WebSocket | null = null;
|
||||||
|
private _observer: ((event: GameMessageEvent) => void)[] = [];
|
||||||
public override events = new ex.EventEmitter<ex.ActorEvents & ConnectionEvents>();
|
|
||||||
|
|
||||||
private get _connected(): boolean {
|
private get _connected(): boolean {
|
||||||
const { _socket } = this;
|
const { _socket } = this;
|
||||||
return _socket !== null && !_socket.CLOSING && !_socket?.CLOSED && _socket.OPEN;
|
return _socket !== null && _socket.readyState === _socket.OPEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
connect(): void {
|
connect(): void {
|
||||||
this._socket = new WebSocket("ws://127.0.0.1:8888");
|
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.onmessage = (event) => this._onMessage(event);
|
||||||
this._socket.onerror = (event) => console.log(event);
|
this._socket.onerror = (event) => log("Connection", event);
|
||||||
this._socket.onclose = (event) => console.log(event);
|
this._socket.onclose = (event) => log("Connection", event);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _onMessage(event: MessageEvent): void {
|
private _onMessage(event: MessageEvent): void {
|
||||||
|
log("Connection", "received", event)
|
||||||
|
|
||||||
const messageObject = JSON.parse(event.data);
|
const messageObject = JSON.parse(event.data);
|
||||||
const gameState = messageObject.gamestate;
|
const gameState = messageObject.gamestate;
|
||||||
|
const gameMessage = new GameMessageEvent(gameState)
|
||||||
console.log(messageObject);
|
this.emitOnMessage(gameMessage);
|
||||||
this.events.emit(ConnectionEvents.GameMessage, new GameMessageEvent(gameState));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private _send(request: Request): void {
|
private _send(request: Request): void {
|
||||||
if (!this._connected) {
|
if (!this._connected) {
|
||||||
//return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const message = JSON.stringify(request);
|
const message = JSON.stringify(request);
|
||||||
@@ -69,4 +68,29 @@ export class Connection extends ex.Actor {
|
|||||||
|
|
||||||
this._send(joinRequest);
|
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));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -39,8 +39,7 @@ export class LobbyScene extends GameStateScene {
|
|||||||
|
|
||||||
constructor(private _connection: Connection) {
|
constructor(private _connection: Connection) {
|
||||||
super();
|
super();
|
||||||
|
this._connection.onMessage((e: GameMessageEvent) => this.updateFromGameState(e.gameState))
|
||||||
this._connection.on("game-message", (e: GameMessageEvent) => this.updateFromGameState(e.gameState))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onInitialize(engine: ex.Engine): void {
|
onInitialize(engine: ex.Engine): void {
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
export type LogSource = "Connection";
|
||||||
|
|
||||||
|
export function log(source: LogSource, ...data: any[]): void {
|
||||||
|
console.log(`${source}: `, ...data);
|
||||||
|
}
|
||||||
Reference in new issue
Block a user