Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: how to respond to too many users

Browse source
This commit is contained in:
arp 2020-10-21 17:43:00 +02:00
parent 664e699fd3
commit 326c2e4183
5 changed files with 61 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
front/src/Connexion/ConnectionManager.ts
View file

@ -9,6 +9,11 @@ import {Room} from "./Room";
const URL_ROOM_STARTED = '/Floor0/floor0.json';
export enum connexionErrorTypes {
serverError = 1,
tooManyUsers,
}
class ConnectionManager {
private localUser!:LocalUser;
@ -90,8 +95,12 @@ class ConnectionManager {
return new Promise<RoomConnection>((resolve, reject) => {
const connection = new RoomConnection(this.localUser.jwtToken, roomId, name, characterLayers, position, viewport);
connection.onConnectError((error: object) => {
console.log('An error occurred while connecting to socket server. Retrying');
reject(error);
console.log(error);
if (false) { //todo: how to check error type?
reject(connexionErrorTypes.tooManyUsers);
} else {
reject(connexionErrorTypes.serverError);
}
});
connection.onConnect(() => {
resolve(connection);
@ -99,6 +108,8 @@ class ConnectionManager {
}).catch((err) => {
// Let's retry in 4-6 seconds
return new Promise<RoomConnection>((resolve, reject) => {
if (err === connexionErrorTypes.tooManyUsers) return reject(err);
console.log('An error occurred while connecting to socket server. Retrying');
setTimeout(() => {
//todo: allow a way to break recurrsion?
this.connectToRoomSocket(roomId, name, characterLayers, position, viewport).then((connection) => resolve(connection));

28
front/src/Phaser/Game/GameScene.ts
View file

@ -48,13 +48,14 @@ import {ActionableItem} from "../Items/ActionableItem";
import {UserInputManager} from "../UserInput/UserInputManager";
import {UserMovedMessage} from "../../Messages/generated/messages_pb";
import {ProtobufClientUtils} from "../../Network/ProtobufClientUtils";
import {connectionManager} from "../../Connexion/ConnectionManager";
import {connectionManager, connexionErrorTypes} from "../../Connexion/ConnectionManager";
import {RoomConnection} from "../../Connexion/RoomConnection";
import {GlobalMessageManager} from "../../Administration/GlobalMessageManager";
import {UserMessageManager} from "../../Administration/UserMessageManager";
import {ConsoleGlobalMessageManager} from "../../Administration/ConsoleGlobalMessageManager";
import {ResizableScene} from "../Login/ResizableScene";
import {Room} from "../../Connexion/Room";
import {MessageUI} from "../../Logger/MessageUI";
export enum Textures {
@ -122,6 +123,7 @@ export class GameScene extends ResizableScene implements CenterListener {
// A promise that will resolve when the "create" method is called (signaling loading is ended)
private createPromise: Promise<void>;
private createPromiseResolve!: (value?: void | PromiseLike<void>) => void;
private offlineMode: boolean = false;
MapKey: string;
MapUrlFile: string;
@ -426,7 +428,7 @@ export class GameScene extends ResizableScene implements CenterListener {
if (this.connection === undefined) {
// Let's wait 0.5 seconds before printing the "connecting" screen to avoid blinking
setTimeout(() => {
if (this.connection === undefined) {
if (this.connection === undefined && !this.offlineMode) {
this.scene.sleep();
this.scene.launch(ReconnectingSceneName);
}
@ -629,6 +631,11 @@ export class GameScene extends ResizableScene implements CenterListener {
this.scene.sleep(ReconnectingSceneName);
return connection;
}).catch(error => {
if (error === connexionErrorTypes.tooManyUsers) {
this.offlineMode = true;
MessageUI.warningMessage('Too many users. You switched to offline mode. Please try to connect again later.');
}
});
}
@ -956,14 +963,19 @@ export class GameScene extends ResizableScene implements CenterListener {
const nextSceneKey = this.checkToExit();
if (nextSceneKey) {
// We are completely destroying the current scene to avoid using a half-backed instance when coming back to the same map.
this.connection.closeConnection();
this.simplePeer.unregister();
this.scene.stop();
this.scene.remove(this.scene.key);
this.scene.start(nextSceneKey.key);
this.goToNextScene(nextSceneKey.key);
}
}
private goToNextScene(nextSceneKey: string): void {
// We are completely destroying the current scene to avoid using a half-backed instance when coming back to the same map.
this.connection.closeConnection();
this.simplePeer.unregister();
this.scene.stop();
this.scene.remove(this.scene.key);
this.scene.start(nextSceneKey);
}
private checkToExit(): {key: string, hash: string} | null {
const x = Math.floor(this.CurrentPlayer.x / 32);