Improve player connection and disconnection logic

core/log-parser/index.js

@@ -76,7 +76,7 @@ export default class LogParser extends EventEmitter {
         delete this.eventStore.disconnected[player.steamID];
       }
     }
-    this.eventStore.matchData = {};
+    this.eventStore.session = {};
   }
 
   getRules() {

squad-server/log-parser/client-connected.js

@@ -0,0 +1,19 @@
+export default {
+  regex:
+    /^\[([0-9.:-]+)]\[([ 0-9]*)]LogNet: AddClientConnection: Added client connection: \[UNetConnection\] RemoteAddr: ([0-9]{17}):[0-9]+, Name: (SteamNetConnection_[0-9]+), Driver: GameNetDriver (SteamNetDriver_[0-9]+), IsServer: YES, PC: NULL, Owner: NULL, UniqueId: INVALID/,
+  onMatch: (args, logParser) => {
+    const data = {
+      raw: args[0],
+      time: args[1],
+      chainID: args[2],
+      steamID: args[3],
+      connection: args[4],
+      driver: args[5]
+    };
+    /* This is Called when unreal engine adds a client connection
+      First Step in Adding a Player to server
+      */
+    logParser.eventStore.clients[args[4]] = args[3];
+    logParser.emit('CLIENT_CONNECTED', data);
+  }
+};

squad-server/log-parser/client-login.js

@@ -0,0 +1,20 @@
+export default {
+  regex:
+    /^\[([0-9.:-]+)]\[([ 0-9]*)]LogSquad: Login: NewPlayer: SteamNetConnection \/Engine\/Transient\.(SteamNetConnection_[0-9]+)/,
+  onMatch: (args, logParser) => {
+    const data = {
+      raw: args[0],
+      time: args[1],
+      chainID: args[2],
+      connection: args[3]
+    };
+    /* This is Called when a player begins the Login process
+      We use this to get a SteamID into playerConnected.
+      2nd Step in player connected path
+      */
+
+    logParser.eventStore['steamid-connected'] = logParser.eventStore.clients[args[3]];
+    delete logParser.eventStore.clients[args[3]];
+    logParser.emit('CLIENT_LOGIN', data);
+  }
+};

squad-server/log-parser/index.js

@@ -4,6 +4,7 @@ import AdminBroadcast from './admin-broadcast.js';
 import DeployableDamaged from './deployable-damaged.js';
 import NewGame from './new-game.js';
 import PlayerConnected from './player-connected.js';
+import PlayerControllerConnected from './playercontroller-connected.js';
 import PlayerDisconnected from './player-disconnected.js';
 import PlayerDamaged from './player-damaged.js';
 import PlayerDied from './player-died.js';
@@ -13,7 +14,9 @@ import PlayerUnPossess from './player-un-possess.js';
 import PlayerWounded from './player-wounded.js';
 import RoundWinner from './round-winner.js';
 import ServerTickRate from './server-tick-rate.js';
-import SteamIDConnected from './steamid-connected.js';
+import ClientConnected from './client-connected.js';
+import ClientLogin from './client-login.js';
+import PendingConnectionDestroyed from './pending-connection-destroyed.js';
 import SquadCreated from './squad-created.js';
 
 export default class SquadLogParser extends LogParser {
@@ -27,6 +30,7 @@ export default class SquadLogParser extends LogParser {
       DeployableDamaged,
       NewGame,
       PlayerConnected,
+      PlayerControllerConnected,
       PlayerDisconnected,
       PlayerDamaged,
       PlayerDied,
@@ -36,7 +40,9 @@ export default class SquadLogParser extends LogParser {
       PlayerWounded,
       RoundWinner,
       ServerTickRate,
-      SteamIDConnected,
+      ClientConnected,
+      ClientLogin,
+      PendingConnectionDestroyed,
       SquadCreated
     ];
   }

squad-server/log-parser/new-game.js

@@ -18,5 +18,6 @@ export default {
     delete logParser.eventStore.WON;
 
     logParser.emit('NEW_GAME', data);
+    logParser.clearEventStore();
   }
 };

squad-server/log-parser/pending-connection-destroyed.js

@@ -0,0 +1,20 @@
+export default {
+  regex:
+    /^\[([0-9.:-]+)]\[([ 0-9]*)]LogNet: UNetConnection::PendingConnectionLost\. \[UNetConnection\] RemoteAddr: ([0-9]{17}):[0-9]+, Name: (SteamNetConnection_[0-9]+), Driver: GameNetDriver (SteamNetDriver_[0-9]+), IsServer: YES, PC: NULL, Owner: NULL, UniqueId: (?:Steam:UNKNOWN \[.+\]|INVALID) bPendingDestroy=0/,
+  onMatch: (args, logParser) => {
+    const data = {
+      raw: args[0],
+      time: args[1],
+      chainID: args[2],
+      steamID: args[3],
+      connection: args[4],
+      driver: args[5]
+    };
+    /* This is Called when a pending client fails
+        Only used to cleanup clients in eventstore
+      */
+
+    delete logParser.eventStore.clients[args[4]];
+    logParser.emit('PENDING_CONNECTION_DESTROYED', data);
+  }
+};

squad-server/log-parser/player-connected.js

@@ -6,9 +6,22 @@ export default {
       time: args[1],
       chainID: args[2],
       playerSuffix: args[3],
-      steamID: logParser.eventStore['steamid-connected']
+      steamID: logParser.eventStore['steamid-connected'], // player connected
+      controller: logParser.eventStore['player-controller'] // playercontroller connected
     };
 
+    delete logParser.eventStore['steamid-connected'];
+    delete logParser.eventStore['player-controller'];
+
+    // Handle Reconnecting players
+    if (logParser.eventStore.disconnected[data.steamID]) {
+      delete logParser.eventStore.disconnected[data.steamID];
+    }
     logParser.emit('PLAYER_CONNECTED', data);
+    logParser.eventStore.players[data.steamID] = {
+      steamID: data.steamID,
+      suffix: data.playerSuffix,
+      controller: data.controller
+    };
   }
 };

squad-server/log-parser/player-disconnected.js

@@ -1,14 +1,16 @@
 export default {
   regex:
-    /^\[([0-9.:-]+)]\[([ 0-9]*)]LogEasyAntiCheatServer: \[[0-9:]+] \[[A-z]+] \[EAC Server] \[Info] \[UnregisterClient] Client: ([A-z0-9]+) PlayerGUID: ([0-9]{17})/,
+    /^\[([0-9.:-]+)]\[([ 0-9]*)]LogNet: UNetConnection::Close: \[UNetConnection\] RemoteAddr: ([0-9]{17}):[0-9]+, Name: SteamNetConnection_[0-9]+, Driver: GameNetDriver SteamNetDriver_[0-9]+, IsServer: YES, PC: (BP_PlayerController_C_[0-9]+), Owner: BP_PlayerController_C_[0-9]+, UniqueId: Steam:UNKNOWN \[.*\], Channels: [0-9]+, Time: [0-9.:-]+/,
   onMatch: (args, logParser) => {
     const data = {
       raw: args[0],
       time: args[1],
       chainID: args[2],
-      steamID: args[4]
+      steamID: args[3],
+      playerController: args[4]
     };
 
+    logParser.eventStore.disconnected[data.steamID] = true;
     logParser.emit('PLAYER_DISCONNECTED', data);
   }
 };

squad-server/log-parser/playercontroller-connected.js

@@ -0,0 +1,16 @@
+export default {
+  regex:
+    /^\[([0-9.:-]+)]\[([ 0-9]*)]LogSquad: PostLogin: NewPlayer: BP_PlayerController_C .+(BP_PlayerController_C_[0-9]+)/,
+  onMatch: (args, logParser) => {
+    const data = {
+      raw: args[0],
+      time: args[1],
+      chainID: args[2],
+      controller: args[3]
+    };
+
+    logParser.eventStore['player-controller'] = args[3];
+
+    logParser.emit('PLAYER_CONTROLLER_CONNECTED', data);
+  }
+};