tangent128/base2020
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Break up client & server message handling logic into their own functions for better readability.

Browse source
This commit is contained in:
Tangent Wantwight 2020-05-09 19:33:19 -04:00
parent 6427361d7b
commit 7c06ab473d
2 changed files with 57 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/Net/LockstepClient.ts
View file

@ -55,6 +55,7 @@ export abstract class LockstepClient<LocalInput, GlobalInput, State> {
private playerNumber = -1;
private state: LockstepState<LocalInput, GlobalInput, State>;
private serverTalkback: Server<LocalInput, GlobalInput, State> | null = null;
public constructor(
public readonly engine: LockstepProcessor<LocalInput, GlobalInput, State>,
@ -69,31 +70,47 @@ export abstract class LockstepClient<LocalInput, GlobalInput, State> {
/**
* Connect to a [perhaps emulated] server and return a disconnect callback
*
* Only call this once or things will break.
*/
public connect(server: Server<LocalInput, GlobalInput, State>): () => void {
let serverTalkback: Server<LocalInput, GlobalInput, State> | null = null;
const sampleInput = () => {
if (serverTalkback) {
const input = this.gatherInput();
if(this.playerNumber >= 0) {
this.state.addLocalInput(this.playerNumber, input);
serverTalkback(1, { t: MessageTypes.INPUT, i: input });
}
setTimeout(sampleInput, INPUT_FREQUENCY);
}
};
// connect to server
server(0, (mode: number, data: Server<LocalInput, GlobalInput, State> | ServerMessage<GlobalInput, State>) => {
if (mode == 0) {
serverTalkback = data as Server<LocalInput, GlobalInput, State>;
this.serverTalkback = data as Server<LocalInput, GlobalInput, State>;
// kickoff input sender
setTimeout(sampleInput, INPUT_FREQUENCY);
setTimeout(this.sampleInput, INPUT_FREQUENCY);
} else if (mode == 1) {
// server message
const message = data as ServerMessage<GlobalInput, State>;
this.processMessage(message);
} else if (mode == 2) {
// disconnected
console.log("Disconnected from server", data);
this.serverTalkback = null;
}
});
// disposal
return () => {
this.serverTalkback?.(2);
this.serverTalkback = null;
};
}
private sampleInput = () => {
if (this.serverTalkback) {
const input = this.gatherInput();
if(this.playerNumber >= 0) {
this.state.addLocalInput(this.playerNumber, input);
this.serverTalkback(1, { t: MessageTypes.INPUT, i: input });
}
setTimeout(this.sampleInput, INPUT_FREQUENCY);
}
};
private processMessage(message: ServerMessage<GlobalInput, State>) {
switch (message.t) {
case MessageTypes.SET_STATE:
const resetState = this.initState(message.s);
@ -104,18 +121,6 @@ export abstract class LockstepClient<LocalInput, GlobalInput, State> {
this.state.addCanonInput(message.i);
break;
}
} else if (mode == 2) {
// disconnected
console.log("Disconnected from server", data);
serverTalkback = null;
}
});
// disposal
return () => {
serverTalkback?.(2);
serverTalkback = null;
};
}
public renderFrames = pipe(

20
src/Net/LoopbackServer.ts
View file

@ -4,9 +4,7 @@ import share from "callbag-share";
import { INPUT_FREQUENCY } from "../Ecs/Lockstep";
import { catchTalkback, defer, interval, makeSubject, map, merge } from "../Utilities/Callbag";
import { ClientMessage, MessageTypes, Server, ServerMessage } from "./LockstepClient";
type Client<LocalInput, State> = Callbag<ServerMessage<LocalInput[], State>, ClientMessage<LocalInput, State>>;
import { ClientMessage, MessageTypes, ServerMessage } from "./LockstepClient";
/** Stub loopback server that handles multiple clients, for schemes where GlobalInput = LocalInput[] */
export class LoopbackServer<LocalInput, State> {
@ -29,7 +27,12 @@ export class LoopbackServer<LocalInput, State> {
const playerNumber = this.nextClientId++;
return pipe(
this.serverFeed,
catchTalkback<ServerMessage<LocalInput[], State>, ClientMessage<LocalInput, State>>(message => {
catchTalkback((message: ClientMessage<LocalInput, State>) => this.processMessage(playerNumber, message)),
map(message => this.postprocessResponse(playerNumber, message))
);
});
private processMessage(playerNumber: number, message: ClientMessage<LocalInput, State>) {
switch (message.t) {
case MessageTypes.INPUT:
if (playerNumber >= 0) {
@ -37,8 +40,9 @@ export class LoopbackServer<LocalInput, State> {
}
break;
}
}),
map(message => {
}
private postprocessResponse(playerNumber: number, message: ServerMessage<LocalInput[], State>): ServerMessage<LocalInput[], State> {
if (message.t === MessageTypes.SET_STATE && playerNumber >= 0) {
return {
...message,
@ -47,9 +51,7 @@ export class LoopbackServer<LocalInput, State> {
} else {
return message;
}
})
);
});
}
public resetState(newState: Partial<State>) {
this.broadcast(1, { t: MessageTypes.SET_STATE, u: -1, s: newState });