force disconnect player if invalid lobby is provided, so they don't get locked out for 60 seconds

Author: gyorokpeter

packages/server/src/lobby/LobbyManager.ts

@@ -57,6 +57,13 @@ export class LobbyManager {
                 },
                 player: data.player,
             });
+            this.pubSub.publish(Events.PlayerShouldDisconnect, {
+                event: LegacyEvents.EVENTS.LOBBY_EXCEPTION,
+                payload: {
+                    error: "Unable to join lobby, ensure token is correct",
+                },
+                player: data.player,
+            });
         }
     }
 

packages/server/src/pub-sub/Events.ts

@@ -13,4 +13,5 @@ export enum Events {
   LobbyPlayerBan = "LobbyPlayerBan",
   LobbyPlayerKick = "LobbyPlayerKick",
   PlayerDisconnected = "PlayerDisconnected",
+  PlayerShouldDisconnect = "PlayerShouldDisconnect",
 }

packages/server/src/socket/SocketServer.ts

@@ -74,6 +74,7 @@ export class SocketServer {
     this.pubSub.subscribe(PubSubEvents.BroadcastNamespaced, this.sendMessageToNamespace);
     this.pubSub.subscribe(PubSubEvents.AddPlayerToNamespace, this.addPlayerToNamespace);
     this.pubSub.subscribe(PubSubEvents.GameList, this.sendGameListToEveryone);
+    this.pubSub.subscribe(PubSubEvents.PlayerShouldDisconnect, this.disconnectPlayer);
   }
 
   private addPlayerToNamespace = (data: Messages.ADD_PLAYER_TO_NAMESPACE_MESSAGE) => {
@@ -136,6 +137,15 @@ export class SocketServer {
     }
   }
 
+  private disconnectPlayer = (data: Messages.ADD_PLAYER_TO_NAMESPACE_MESSAGE) => {
+    if (!this.playerSockets[data.player]) {
+      debug("Error disconnecting player (%s), player socket does not exist", data.player);
+      return;
+    }
+    debug("Disconnecting player (%s)", data.player);
+    this.playerSockets[data.player].disconnect();
+  }
+
   private onPlayerDisconnect = (player: Player) => () => {
     debug("Removing player (%s) from server", player);
     delete this.playerSockets[player];

packages/ui/src/components/Lobby/Tournament/index.js

@@ -80,7 +80,7 @@ export default class MatchPage extends React.PureComponent {
     return (
       <Button
         icon='play'
-        content={this.props.tournament.matches.length > 0 ? 'Play Next Match' : 'Start Tournament'}
+        content={this.props.tournament.matches == null ? 'no matches' : this.props.tournament.matches.length > 0 ? 'Play Next Match' : 'Start Tournament'}
         onClick={this.props.continueMatches}
         disabled={ disabled }
         size='tiny'

packages/ui/src/components/Lobby/Tournament/types/Brackets/parseStats.js

@@ -7,6 +7,7 @@
 export const parseStats = stats => {
   const matches = stats.matches;
   const brackets = [];
+  if (!matches) return brackets;
   // Prepare a map of matches for quick reference
   const matchesRef = {};
   matches.forEach(match => {