Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

refactor some event handling

Browse Source 
add concept of blocking events
This commit is contained in:
RaidMax 2019-10-18 13:39:21 -05:00
parent b992f4d910
commit 96e434213f
15 changed files with 199 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Application/EventParsers/BaseEventParser.cs
View File

@ -105,6 +105,7 @@ namespace IW4MAdmin.Application.EventParsers
Data = message, Data = message,
Origin = new EFClient() { NetworkId = originId }, Origin = new EFClient() { NetworkId = originId },
Message = message, Message = message,
Extra = logLine,
RequiredEntity = GameEvent.EventRequiredEntity.Origin RequiredEntity = GameEvent.EventRequiredEntity.Origin
}; };
} }
@ -115,6 +116,7 @@ namespace IW4MAdmin.Application.EventParsers
Data = message, Data = message,
Origin = new EFClient() { NetworkId = originId }, Origin = new EFClient() { NetworkId = originId },
Message = message, Message = message,
Extra = logLine,
RequiredEntity = GameEvent.EventRequiredEntity.Origin RequiredEntity = GameEvent.EventRequiredEntity.Origin
}; };
} }
@ -181,7 +183,8 @@ namespace IW4MAdmin.Application.EventParsers
ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()), ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
State = EFClient.ClientState.Connecting, State = EFClient.ClientState.Connecting,
}, },
RequiredEntity = GameEvent.EventRequiredEntity.None RequiredEntity = GameEvent.EventRequiredEntity.None,
IsBlocking = true
}; };
} }
} }
@ -205,7 +208,8 @@ namespace IW4MAdmin.Application.EventParsers
ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()), ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
State = EFClient.ClientState.Disconnecting State = EFClient.ClientState.Disconnecting
}, },
RequiredEntity = GameEvent.EventRequiredEntity.Origin RequiredEntity = GameEvent.EventRequiredEntity.None,
IsBlocking = true
}; };
} }
} }
@ -215,7 +219,7 @@ namespace IW4MAdmin.Application.EventParsers
return new GameEvent() return new GameEvent()
{ {
Type = GameEvent.EventType.MapEnd, Type = GameEvent.EventType.MapEnd,
Data = lineSplit[0], Data = logLine,
Origin = Utilities.IW4MAdminClient(), Origin = Utilities.IW4MAdminClient(),
Target = Utilities.IW4MAdminClient(), Target = Utilities.IW4MAdminClient(),
RequiredEntity = GameEvent.EventRequiredEntity.None RequiredEntity = GameEvent.EventRequiredEntity.None
@ -229,7 +233,7 @@ namespace IW4MAdmin.Application.EventParsers
return new GameEvent() return new GameEvent()
{ {
Type = GameEvent.EventType.MapChange, Type = GameEvent.EventType.MapChange,
Data = lineSplit[0], Data = logLine,
Origin = Utilities.IW4MAdminClient(), Origin = Utilities.IW4MAdminClient(),
Target = Utilities.IW4MAdminClient(), Target = Utilities.IW4MAdminClient(),
Extra = dump.DictionaryFromKeyValue(), Extra = dump.DictionaryFromKeyValue(),

55
Application/IO/GameLogEventDetection.cs
View File

@ -1,7 +1,7 @@
using SharedLibraryCore; using SharedLibraryCore;
using SharedLibraryCore.Interfaces; using SharedLibraryCore.Interfaces;
using System; using System;
using System.Threading; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace IW4MAdmin.Application.IO namespace IW4MAdmin.Application.IO
@ -12,6 +12,7 @@ namespace IW4MAdmin.Application.IO
private readonly Server _server; private readonly Server _server;
private readonly IGameLogReader _reader; private readonly IGameLogReader _reader;
private readonly string _gameLogFile; private readonly string _gameLogFile;
private readonly bool _ignoreBots;
class EventState class EventState
{ {
@ -24,6 +25,7 @@ namespace IW4MAdmin.Application.IO
_gameLogFile = gameLogPath; _gameLogFile = gameLogPath;
_reader = gameLogServerUri != null ? new GameLogReaderHttp(gameLogServerUri, gameLogPath, server.EventParser) : _reader = new GameLogReader(gameLogPath, server.EventParser); _reader = gameLogServerUri != null ? new GameLogReaderHttp(gameLogServerUri, gameLogPath, server.EventParser) : _reader = new GameLogReader(gameLogPath, server.EventParser);
_server = server; _server = server;
_ignoreBots = server.Manager.GetApplicationSettings().Configuration().IgnoreBots;
} }
public async Task PollForChanges() public async Task PollForChanges()
@ -67,9 +69,56 @@ namespace IW4MAdmin.Application.IO
var events = await _reader.ReadEventsFromLog(_server, fileDiff, previousFileSize); var events = await _reader.ReadEventsFromLog(_server, fileDiff, previousFileSize);
foreach (var ev in events) foreach (var gameEvent in events)
{ {
_server.Manager.GetEventHandler().AddEvent(ev); try
{
#if DEBUG
_server.Logger.WriteVerbose(gameEvent.Data);
#endif
// we don't want to add the event if ignoreBots is on and the event comes from a bot
if (!_ignoreBots || (_ignoreBots && !((gameEvent.Origin?.IsBot ?? false) || (gameEvent.Target?.IsBot ?? false))))
{
gameEvent.Owner = _server;
if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Origin) == GameEvent.EventRequiredEntity.Origin && gameEvent.Origin.NetworkId != 1)
{
gameEvent.Origin = _server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Origin?.NetworkId);
}
if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Target) == GameEvent.EventRequiredEntity.Target)
{
gameEvent.Target = _server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Target?.NetworkId);
}
if (gameEvent.Origin != null)
{
gameEvent.Origin.CurrentServer = _server;
}
if (gameEvent.Target != null)
{
gameEvent.Target.CurrentServer = _server;
}
_server.Manager.GetEventHandler().AddEvent(gameEvent);
if (gameEvent.IsBlocking)
{
await gameEvent.WaitAsync(Utilities.DefaultCommandTimeout, _server.Manager.CancellationToken);
}
}
}
catch (InvalidOperationException)
{
if (!_ignoreBots)
{
_server.Logger.WriteWarning("Could not find client in client list when parsing event line");
_server.Logger.WriteDebug(gameEvent.Data);
}
}
} }
previousFileSize = fileSize; previousFileSize = fileSize;

76
Application/IO/GameLogReader.cs
View File

@ -11,32 +11,26 @@ namespace IW4MAdmin.Application.IO
{ {
class GameLogReader : IGameLogReader class GameLogReader : IGameLogReader
{ {
IEventParser Parser; private readonly IEventParser _parser;
readonly string LogFile; private readonly string _logFile;
private bool? ignoreBots;
public long Length => new FileInfo(LogFile).Length; public long Length => new FileInfo(_logFile).Length;
public int UpdateInterval => 300; public int UpdateInterval => 300;
public GameLogReader(string logFile, IEventParser parser) public GameLogReader(string logFile, IEventParser parser)
{ {
LogFile = logFile; _logFile = logFile;
Parser = parser; _parser = parser;
} }
public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition) public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition)
{ {
if (!ignoreBots.HasValue)
{
ignoreBots = server.Manager.GetApplicationSettings().Configuration().IgnoreBots;
}
// allocate the bytes for the new log lines // allocate the bytes for the new log lines
List<string> logLines = new List<string>(); List<string> logLines = new List<string>();
// open the file as a stream // open the file as a stream
using (FileStream fs = new FileStream(LogFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) using (FileStream fs = new FileStream(_logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{ {
byte[] buff = new byte[fileSizeDiff]; byte[] buff = new byte[fileSizeDiff];
fs.Seek(startPosition, SeekOrigin.Begin); fs.Seek(startPosition, SeekOrigin.Begin);
@ -67,57 +61,19 @@ namespace IW4MAdmin.Application.IO
List<GameEvent> events = new List<GameEvent>(); List<GameEvent> events = new List<GameEvent>();
// parse each line // parse each line
foreach (string eventLine in logLines) foreach (string eventLine in logLines.Where(_line => _line.Length > 0))
{ {
if (eventLine.Length > 0) try
{ {
try var gameEvent = _parser.GenerateGameEvent(eventLine);
{ events.Add(gameEvent);
var gameEvent = Parser.GenerateGameEvent(eventLine); }
// we don't want to add the event if ignoreBots is on and the event comes from a bot
if (!ignoreBots.Value || (ignoreBots.Value && !((gameEvent.Origin?.IsBot ?? false) || (gameEvent.Target?.IsBot ?? false))))
{
gameEvent.Owner = server;
if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Origin) == GameEvent.EventRequiredEntity.Origin && gameEvent.Origin.NetworkId != 1) catch (Exception e)
{ {
gameEvent.Origin = server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Origin?.NetworkId); server.Logger.WriteWarning("Could not properly parse event line");
} server.Logger.WriteDebug(e.Message);
server.Logger.WriteDebug(eventLine);
if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Target) == GameEvent.EventRequiredEntity.Target)
{
gameEvent.Target = server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Target?.NetworkId);
}
if (gameEvent.Origin != null)
{
gameEvent.Origin.CurrentServer = server;
}
if (gameEvent.Target != null)
{
gameEvent.Target.CurrentServer = server;
}
events.Add(gameEvent);
}
}
catch (InvalidOperationException)
{
if (!ignoreBots.Value)
{
server.Logger.WriteWarning("Could not find client in client list when parsing event line");
server.Logger.WriteDebug(eventLine);
}
}
catch (Exception e)
{
server.Logger.WriteWarning("Could not properly parse event line");
server.Logger.WriteDebug(e.Message);
server.Logger.WriteDebug(eventLine);
}
} }
} }

71
Application/IO/GameLogReaderHttp.cs
View File

@ -19,7 +19,6 @@ namespace IW4MAdmin.Application.IO
readonly IEventParser Parser; readonly IEventParser Parser;
readonly IGameLogServer Api; readonly IGameLogServer Api;
readonly string logPath; readonly string logPath;
private bool? ignoreBots;
private string lastKey = "next"; private string lastKey = "next";
public GameLogReaderHttp(Uri gameLogServerUri, string logPath, IEventParser parser) public GameLogReaderHttp(Uri gameLogServerUri, string logPath, IEventParser parser)
@ -35,11 +34,6 @@ namespace IW4MAdmin.Application.IO
public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition) public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition)
{ {
if (!ignoreBots.HasValue)
{
ignoreBots = server.Manager.GetApplicationSettings().Configuration().IgnoreBots;
}
var events = new List<GameEvent>(); var events = new List<GameEvent>();
string b64Path = logPath; string b64Path = logPath;
var response = await Api.Log(b64Path, lastKey); var response = await Api.Log(b64Path, lastKey);
@ -53,64 +47,25 @@ namespace IW4MAdmin.Application.IO
else if (!string.IsNullOrWhiteSpace(response.Data)) else if (!string.IsNullOrWhiteSpace(response.Data))
{ {
#if DEBUG
server.Manager.GetLogger(0).WriteInfo(response.Data);
#endif
// parse each line // parse each line
foreach (string eventLine in response.Data.Split(Environment.NewLine)) foreach (string eventLine in response.Data
.Split(Environment.NewLine)
.Where(_line => _line.Length > 0))
{ {
if (eventLine.Length > 0) try
{ {
try var gameEvent = Parser.GenerateGameEvent(eventLine);
{ events.Add(gameEvent);
var gameEvent = Parser.GenerateGameEvent(eventLine);
// we don't want to add the event if ignoreBots is on and the event comes from a bot
if (!ignoreBots.Value || (ignoreBots.Value && !((gameEvent.Origin?.IsBot ?? false) || (gameEvent.Target?.IsBot ?? false))))
{
gameEvent.Owner = server;
if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Origin) == GameEvent.EventRequiredEntity.Origin && gameEvent.Origin.NetworkId != 1)
{
gameEvent.Origin = server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Origin?.NetworkId);
}
if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Target) == GameEvent.EventRequiredEntity.Target)
{
gameEvent.Target = server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Target?.NetworkId);
}
if (gameEvent.Origin != null)
{
gameEvent.Origin.CurrentServer = server;
}
if (gameEvent.Target != null)
{
gameEvent.Target.CurrentServer = server;
}
events.Add(gameEvent);
}
#if DEBUG == true #if DEBUG == true
server.Logger.WriteDebug($"Parsed event with id {gameEvent.Id} from http"); server.Logger.WriteDebug($"Parsed event with id {gameEvent.Id} from http");
#endif #endif
} }
catch (InvalidOperationException) catch (Exception e)
{ {
if (!ignoreBots.Value) server.Logger.WriteError("Could not properly parse event line from http");
{ server.Logger.WriteDebug(e.Message);
server.Logger.WriteWarning("Could not find client in client list when parsing event line"); server.Logger.WriteDebug(eventLine);
server.Logger.WriteDebug(eventLine);
}
}
catch (Exception e)
{
server.Logger.WriteWarning("Could not properly parse remote event line");
server.Logger.WriteDebug(e.Message);
server.Logger.WriteDebug(eventLine);
}
} }
} }
} }

3
Application/IW4MServer.cs
View File

@ -668,7 +668,8 @@ namespace IW4MAdmin
{ {
Type = GameEvent.EventType.PreConnect, Type = GameEvent.EventType.PreConnect,
Origin = client, Origin = client,
Owner = this Owner = this,
IsBlocking = true
}; };
Manager.GetEventHandler().AddEvent(e); Manager.GetEventHandler().AddEvent(e);

6
Application/RconParsers/BaseRConParser.cs
View File

@ -103,6 +103,12 @@ namespace IW4MAdmin.Application.RconParsers
public virtual async Task<List<EFClient>> GetStatusAsync(Connection connection) public virtual async Task<List<EFClient>> GetStatusAsync(Connection connection)
{ {
string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS); string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS);
#if DEBUG
foreach (var line in response)
{
Console.WriteLine(line);
}
#endif
return ClientsFromStatus(response); return ClientsFromStatus(response);
} }

2
Plugins/Stats/Commands/ResetStats.cs
View File

@ -36,7 +36,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
clientStats.EloRating = 200.0; clientStats.EloRating = 200.0;
// reset the cached version // reset the cached version
Plugin.Manager.ResetStats(E.Origin.ClientId, serverId); Plugin.Manager.ResetStats(E.Origin);
// fixme: this doesn't work properly when another context exists // fixme: this doesn't work properly when another context exists
await ctx.SaveChangesAsync(); await ctx.SaveChangesAsync();

4
Plugins/Stats/Commands/ViewStats.cs
View File

@ -52,7 +52,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
if (E.Owner.GetClientsAsList().Any(_client => _client.Equals(E.Target))) if (E.Owner.GetClientsAsList().Any(_client => _client.Equals(E.Target)))
{ {
pStats = Plugin.Manager.GetClientStats(E.Target.ClientId, serverId); pStats = E.Target.GetAdditionalProperty<EFClientStatistics>(StatManager.CLIENT_STATS_KEY);
} }
else else
@ -72,7 +72,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
if (E.Owner.GetClientsAsList().Any(_client => _client.Equals(E.Origin))) if (E.Owner.GetClientsAsList().Any(_client => _client.Equals(E.Origin)))
{ {
pStats = Plugin.Manager.GetClientStats(E.Origin.ClientId, serverId); pStats = E.Origin.GetAdditionalProperty<EFClientStatistics>(StatManager.CLIENT_STATS_KEY);
} }
else else

23
Plugins/Stats/Helpers/ServerStats.cs
View File

@ -1,5 +1,7 @@
using IW4MAdmin.Plugins.Stats.Cheat; using IW4MAdmin.Plugins.Stats.Cheat;
using IW4MAdmin.Plugins.Stats.Models; using IW4MAdmin.Plugins.Stats.Models;
using SharedLibraryCore;
using SharedLibraryCore.Database.Models;
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
@ -7,33 +9,36 @@ using System.Linq;
namespace IW4MAdmin.Plugins.Stats.Helpers namespace IW4MAdmin.Plugins.Stats.Helpers
{ {
class ServerStats { class ServerStats
public ConcurrentDictionary<int, EFClientStatistics> PlayerStats { get; set; } {
public ConcurrentDictionary<int, Detection> PlayerDetections { get; set; }
public IList<EFClientKill> HitCache { get; private set; } public IList<EFClientKill> HitCache { get; private set; }
public EFServerStatistics ServerStatistics { get; private set; } public EFServerStatistics ServerStatistics { get; private set; }
public EFServer Server { get; private set; } public EFServer Server { get; private set; }
private readonly Server _server;
public bool IsTeamBased { get; set; } public bool IsTeamBased { get; set; }
public ServerStats(EFServer sv, EFServerStatistics st) public ServerStats(EFServer sv, EFServerStatistics st, Server server)
{ {
PlayerStats = new ConcurrentDictionary<int, EFClientStatistics>();
PlayerDetections = new ConcurrentDictionary<int, Detection>();
HitCache = new List<EFClientKill>(); HitCache = new List<EFClientKill>();
ServerStatistics = st; ServerStatistics = st;
Server = sv; Server = sv;
_server = server;
} }
public int TeamCount(IW4Info.Team teamName) public int TeamCount(IW4Info.Team teamName)
{ {
if (PlayerStats.Count(p => p.Value.Team == IW4Info.Team.None) / (double)PlayerStats.Count <= 0.25) var PlayerStats = _server.GetClientsAsList()
.Select(_c => _c.GetAdditionalProperty<EFClientStatistics>(StatManager.CLIENT_STATS_KEY))
.Where(_c => _c != null);
if (PlayerStats.Count(p => p.Team == IW4Info.Team.None) / (double)PlayerStats.Count() <= 0.25)
{ {
return IsTeamBased ? Math.Max(PlayerStats.Count(p => p.Value.Team == teamName), 1) : Math.Max(PlayerStats.Count - 1, 1); return IsTeamBased ? Math.Max(PlayerStats.Count(p => p.Team == teamName), 1) : Math.Max(PlayerStats.Count() - 1, 1);
} }
else else
{ {
return IsTeamBased ? (int)Math.Max(Math.Floor(PlayerStats.Count / 2.0), 1) : Math.Max(PlayerStats.Count - 1, 1); return IsTeamBased ? (int)Math.Max(Math.Floor(PlayerStats.Count() / 2.0), 1) : Math.Max(PlayerStats.Count() - 1, 1);
} }
} }
} }

194
Plugins/Stats/Helpers/StatManager.cs
View File

@ -23,6 +23,8 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
private readonly ConcurrentDictionary<long, ServerStats> _servers; private readonly ConcurrentDictionary<long, ServerStats> _servers;
private readonly ILogger _log; private readonly ILogger _log;
private static List<EFServer> serverModels; private static List<EFServer> serverModels;
public static string CLIENT_STATS_KEY = "ClientStats";
public static string CLIENT_DETECTIONS_KEY = "ClientDetections";
public StatManager(IManager mgr) public StatManager(IManager mgr)
{ {
@ -38,11 +40,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
} }
} }
public EFClientStatistics GetClientStats(int clientId, long serverId)
{
return _servers[serverId].PlayerStats[clientId];
}
public static Expression<Func<EFRating, bool>> GetRankingFunc(long? serverId = null) public static Expression<Func<EFRating, bool>> GetRankingFunc(long? serverId = null)
{ {
var fifteenDaysAgo = DateTime.UtcNow.AddDays(-15); var fifteenDaysAgo = DateTime.UtcNow.AddDays(-15);
@ -248,7 +245,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
// check to see if the stats have ever been initialized // check to see if the stats have ever been initialized
var serverStats = InitializeServerStats(server.ServerId); var serverStats = InitializeServerStats(server.ServerId);
_servers.TryAdd(serverId, new ServerStats(server, serverStats) _servers.TryAdd(serverId, new ServerStats(server, serverStats, sv)
{ {
IsTeamBased = sv.Gametype != "dm" IsTeamBased = sv.Gametype != "dm"
}); });
@ -278,15 +275,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
return null; return null;
} }
var playerStats = _servers[serverId].PlayerStats;
var detectionStats = _servers[serverId].PlayerDetections;
if (playerStats.ContainsKey(pl.ClientId))
{
_log.WriteWarning($"Duplicate ClientId in stats {pl.ClientId}");
return playerStats[pl.ClientId];
}
// get the client's stats from the database if it exists, otherwise create and attach a new one // get the client's stats from the database if it exists, otherwise create and attach a new one
// if this fails we want to throw an exception // if this fails we want to throw an exception
@ -322,20 +310,9 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
// insert if they've not been added // insert if they've not been added
clientStats = clientStatsSet.Add(clientStats).Entity; clientStats = clientStatsSet.Add(clientStats).Entity;
await ctx.SaveChangesAsync(); await ctx.SaveChangesAsync();
if (!playerStats.TryAdd(clientStats.ClientId, clientStats))
{
_log.WriteWarning("Adding new client to stats failed");
}
} }
else pl.SetAdditionalProperty(CLIENT_STATS_KEY, clientStats);
{
if (!playerStats.TryAdd(clientStats.ClientId, clientStats))
{
_log.WriteWarning("Adding pre-existing client to stats failed");
}
}
// migration for previous existing stats // migration for previous existing stats
if (clientStats.HitLocations.Count == 0) if (clientStats.HitLocations.Count == 0)
@ -370,12 +347,8 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
clientStats.SessionScore = pl.Score; clientStats.SessionScore = pl.Score;
clientStats.LastScore = pl.Score; clientStats.LastScore = pl.Score;
if (!detectionStats.TryAdd(pl.ClientId, new Detection(_log, clientStats))) pl.SetAdditionalProperty(CLIENT_DETECTIONS_KEY, new Detection(_log, clientStats));
{ pl.CurrentServer.Logger.WriteInfo($"Added {pl} to stats");
_log.WriteWarning("Could not add client to detection");
}
pl.CurrentServer.Logger.WriteInfo($"Adding {pl} to stats");
} }
return clientStats; return clientStats;
@ -400,30 +373,14 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
pl.CurrentServer.Logger.WriteInfo($"Removing {pl} from stats"); pl.CurrentServer.Logger.WriteInfo($"Removing {pl} from stats");
long serverId = GetIdForServer(pl.CurrentServer); long serverId = GetIdForServer(pl.CurrentServer);
var playerStats = _servers[serverId].PlayerStats;
var detectionStats = _servers[serverId].PlayerDetections;
var serverStats = _servers[serverId].ServerStatistics; var serverStats = _servers[serverId].ServerStatistics;
if (!playerStats.ContainsKey(pl.ClientId))
{
pl.CurrentServer.Logger.WriteWarning($"Client disconnecting not in stats {pl}");
// remove the client from the stats dictionary as they're leaving
playerStats.TryRemove(pl.ClientId, out _);
detectionStats.TryRemove(pl.ClientId, out _);
return;
}
// get individual client's stats // get individual client's stats
var clientStats = playerStats[pl.ClientId]; var clientStats = pl.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
// sync their stats before they leave // sync their stats before they leave
clientStats = UpdateStats(clientStats); clientStats = UpdateStats(clientStats);
await SaveClientStats(clientStats); await SaveClientStats(clientStats);
// remove the client from the stats dictionary as they're leaving
playerStats.TryRemove(pl.ClientId, out _);
detectionStats.TryRemove(pl.ClientId, out _);
// increment the total play time // increment the total play time
serverStats.TotalPlayTime += pl.ConnectionLength; serverStats.TotalPlayTime += pl.ConnectionLength;
} }
@ -516,19 +473,8 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
return; return;
} }
// incase the add player event get delayed var clientDetection = attacker.GetAdditionalProperty<Detection>(CLIENT_DETECTIONS_KEY);
if (!_servers[serverId].PlayerStats.ContainsKey(attacker.ClientId)) var clientStats = attacker.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
{
await AddPlayer(attacker);
}
if (!isDamage)
{
await AddStandardKill(attacker, victim);
}
var clientDetection = _servers[serverId].PlayerDetections[attacker.ClientId];
var clientStats = _servers[serverId].PlayerStats[attacker.ClientId];
waiter = clientStats.ProcessingHit; waiter = clientStats.ProcessingHit;
await waiter.WaitAsync(); await waiter.WaitAsync();
@ -591,12 +537,16 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
} }
} }
} }
#if DEBUG
await Sync(attacker.CurrentServer);
#endif
} }
catch (Exception ex) catch (Exception ex)
{ {
_log.WriteError("Could not save hit or AC info"); _log.WriteError("Could not save hit or AC info");
_log.WriteDebug(ex.GetExceptionInfo()); _log.WriteDebug(ex.GetExceptionInfo());
_log.WriteDebug($"Attacker: {attacker} Victim: {victim}, ServerId {serverId}");
} }
finally finally
@ -672,32 +622,12 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
{ {
long serverId = GetIdForServer(attacker.CurrentServer); long serverId = GetIdForServer(attacker.CurrentServer);
EFClientStatistics attackerStats = null; var attackerStats = attacker.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
if (!_servers[serverId].PlayerStats.ContainsKey(attacker.ClientId)) var victimStats = victim.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
{
attackerStats = await AddPlayer(attacker);
}
else
{
attackerStats = _servers[serverId].PlayerStats[attacker.ClientId];
}
EFClientStatistics victimStats = null;
if (!_servers[serverId].PlayerStats.ContainsKey(victim.ClientId))
{
victimStats = await AddPlayer(victim);
}
else
{
victimStats = _servers[serverId].PlayerStats[victim.ClientId];
}
#if DEBUG #if DEBUG
_log.WriteDebug("Calculating standard kill"); _log.WriteDebug("Processing standard kill");
#endif #endif
// update the total stats // update the total stats
_servers[serverId].ServerStatistics.TotalKills += 1; _servers[serverId].ServerStatistics.TotalKills += 1;
@ -955,47 +885,44 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
// process the attacker's stats after the kills // process the attacker's stats after the kills
attackerStats = UpdateStats(attackerStats); attackerStats = UpdateStats(attackerStats);
// calulate elo #region DEPRECATED
if (_servers[attackerStats.ServerId].PlayerStats.Count > 1) /* var validAttackerLobbyRatings = Servers[attackerStats.ServerId].PlayerStats
{ .Where(cs => cs.Value.ClientId != attackerStats.ClientId)
#region DEPRECATED .Where(cs =>
/* var validAttackerLobbyRatings = Servers[attackerStats.ServerId].PlayerStats Servers[attackerStats.ServerId].IsTeamBased ?
.Where(cs => cs.Value.ClientId != attackerStats.ClientId) cs.Value.Team != attackerStats.Team :
.Where(cs => cs.Value.Team != IW4Info.Team.Spectator)
Servers[attackerStats.ServerId].IsTeamBased ? .Where(cs => cs.Value.Team != IW4Info.Team.Spectator);
cs.Value.Team != attackerStats.Team :
cs.Value.Team != IW4Info.Team.Spectator)
.Where(cs => cs.Value.Team != IW4Info.Team.Spectator);
double attackerLobbyRating = validAttackerLobbyRatings.Count() > 0 ? double attackerLobbyRating = validAttackerLobbyRatings.Count() > 0 ?
validAttackerLobbyRatings.Average(cs => cs.Value.EloRating) : validAttackerLobbyRatings.Average(cs => cs.Value.EloRating) :
attackerStats.EloRating; attackerStats.EloRating;
var validVictimLobbyRatings = Servers[victimStats.ServerId].PlayerStats var validVictimLobbyRatings = Servers[victimStats.ServerId].PlayerStats
.Where(cs => cs.Value.ClientId != victimStats.ClientId) .Where(cs => cs.Value.ClientId != victimStats.ClientId)
.Where(cs => .Where(cs =>
Servers[attackerStats.ServerId].IsTeamBased ? Servers[attackerStats.ServerId].IsTeamBased ?
cs.Value.Team != victimStats.Team : cs.Value.Team != victimStats.Team :
cs.Value.Team != IW4Info.Team.Spectator) cs.Value.Team != IW4Info.Team.Spectator)
.Where(cs => cs.Value.Team != IW4Info.Team.Spectator); .Where(cs => cs.Value.Team != IW4Info.Team.Spectator);
double victimLobbyRating = validVictimLobbyRatings.Count() > 0 ? double victimLobbyRating = validVictimLobbyRatings.Count() > 0 ?
validVictimLobbyRatings.Average(cs => cs.Value.EloRating) : validVictimLobbyRatings.Average(cs => cs.Value.EloRating) :
victimStats.EloRating;*/ victimStats.EloRating;*/
#endregion #endregion
double attackerEloDifference = Math.Log(Math.Max(1, victimStats.EloRating)) - Math.Log(Math.Max(1, attackerStats.EloRating)); // calculate elo
double winPercentage = 1.0 / (1 + Math.Pow(10, attackerEloDifference / Math.E)); double attackerEloDifference = Math.Log(Math.Max(1, victimStats.EloRating)) - Math.Log(Math.Max(1, attackerStats.EloRating));
double winPercentage = 1.0 / (1 + Math.Pow(10, attackerEloDifference / Math.E));
// double victimEloDifference = Math.Log(Math.Max(1, attackerStats.EloRating)) - Math.Log(Math.Max(1, victimStats.EloRating)); // double victimEloDifference = Math.Log(Math.Max(1, attackerStats.EloRating)) - Math.Log(Math.Max(1, victimStats.EloRating));
// double lossPercentage = 1.0 / (1 + Math.Pow(10, victimEloDifference/ Math.E)); // double lossPercentage = 1.0 / (1 + Math.Pow(10, victimEloDifference/ Math.E));
attackerStats.EloRating += 6.0 * (1 - winPercentage); attackerStats.EloRating += 6.0 * (1 - winPercentage);
victimStats.EloRating -= 6.0 * (1 - winPercentage); victimStats.EloRating -= 6.0 * (1 - winPercentage);
attackerStats.EloRating = Math.Max(0, Math.Round(attackerStats.EloRating, 2)); attackerStats.EloRating = Math.Max(0, Math.Round(attackerStats.EloRating, 2));
victimStats.EloRating = Math.Max(0, Math.Round(victimStats.EloRating, 2)); victimStats.EloRating = Math.Max(0, Math.Round(victimStats.EloRating, 2));
}
// update after calculation // update after calculation
attackerStats.TimePlayed += (int)(DateTime.UtcNow - attackerStats.LastActive).TotalSeconds; attackerStats.TimePlayed += (int)(DateTime.UtcNow - attackerStats.LastActive).TotalSeconds;
@ -1113,19 +1040,18 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
return serverStats; return serverStats;
} }
public void ResetKillstreaks(long serverId) public void ResetKillstreaks(Server sv)
{ {
var serverStats = _servers[serverId]; foreach (var stat in sv.GetClientsAsList()
.Select(_client => _client.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY)))
foreach (var stat in serverStats.PlayerStats.Values)
{ {
stat.StartNewSession(); stat.StartNewSession();
} }
} }
public void ResetStats(int clientId, long serverId) public void ResetStats(EFClient client)
{ {
var stats = _servers[serverId].PlayerStats[clientId]; var stats = client.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY);
stats.Kills = 0; stats.Kills = 0;
stats.Deaths = 0; stats.Deaths = 0;
stats.SPM = 0; stats.SPM = 0;
@ -1160,22 +1086,18 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
{ {
long serverId = GetIdForServer(sv); long serverId = GetIdForServer(sv);
using (var ctx = new DatabaseContext(disableTracking: true)) using (var ctx = new DatabaseContext())
{ {
var serverSet = ctx.Set<EFServer>();
serverSet.Update(_servers[serverId].Server);
var serverStatsSet = ctx.Set<EFServerStatistics>(); var serverStatsSet = ctx.Set<EFServerStatistics>();
serverStatsSet.Update(_servers[serverId].ServerStatistics); serverStatsSet.Update(_servers[serverId].ServerStatistics);
await ctx.SaveChangesAsync();
} }
foreach (var client in sv.GetClientsAsList()) foreach (var stats in sv.GetClientsAsList()
.Select(_client => _client.GetAdditionalProperty<EFClientStatistics>(CLIENT_STATS_KEY))
.Where(_stats => _stats != null))
{ {
var stats = GetClientStats(client.ClientId, serverId); await SaveClientStats(stats);
if (stats != null)
{
await SaveClientStats(stats);
}
} }
await SaveHitCache(serverId); await SaveHitCache(serverId);

6
Plugins/Stats/Plugin.cs
View File

@ -58,7 +58,7 @@ namespace IW4MAdmin.Plugins.Stats
break; break;
case GameEvent.EventType.MapChange: case GameEvent.EventType.MapChange:
Manager.SetTeamBased(StatManager.GetIdForServer(E.Owner), E.Owner.Gametype != "dm"); Manager.SetTeamBased(StatManager.GetIdForServer(E.Owner), E.Owner.Gametype != "dm");
Manager.ResetKillstreaks(StatManager.GetIdForServer(E.Owner)); Manager.ResetKillstreaks(E.Owner);
await Manager.Sync(E.Owner); await Manager.Sync(E.Owner);
break; break;
case GameEvent.EventType.MapEnd: case GameEvent.EventType.MapEnd:
@ -104,7 +104,7 @@ namespace IW4MAdmin.Plugins.Stats
} }
break; break;
case GameEvent.EventType.Kill: case GameEvent.EventType.Kill:
if (!E.Owner.CustomCallback && !ShouldIgnoreEvent(E.Origin, E.Target)) if (!ShouldIgnoreEvent(E.Origin, E.Target))
{ {
// this treats "world" damage as self damage // this treats "world" damage as self damage
if (IsWorldDamage(E.Origin)) if (IsWorldDamage(E.Origin))
@ -116,7 +116,7 @@ namespace IW4MAdmin.Plugins.Stats
} }
break; break;
case GameEvent.EventType.Damage: case GameEvent.EventType.Damage:
if (!E.Owner.CustomCallback && !ShouldIgnoreEvent(E.Origin, E.Target)) if (!ShouldIgnoreEvent(E.Origin, E.Target))
{ {
// this treats "world" damage as self damage // this treats "world" damage as self damage
if (IsWorldDamage(E.Origin)) if (IsWorldDamage(E.Origin))

7
SharedLibraryCore/Commands/UnlinkClientCommand.cs
View File

@ -3,6 +3,13 @@ using System.Threading.Tasks;
namespace SharedLibraryCore.Commands namespace SharedLibraryCore.Commands
{ {
/// <summary>
/// Provides a way for administrators to "unlink" linked accounts
/// This problem is common in IW4x where the client identifier is a file
/// that is commonly transmitted when uploading and sharing the game files
/// This command creates a new link and assigns the guid, and all aliases with the current IP
/// associated to the provided client ID to the new link
/// </summary>
public class UnlinkClientCommand : Command public class UnlinkClientCommand : Command
{ {
public UnlinkClientCommand() : public UnlinkClientCommand() :

4
SharedLibraryCore/Events/GameEvent.cs
View File

@ -224,6 +224,10 @@ namespace SharedLibraryCore
public long Id { get; private set; } public long Id { get; private set; }
public EventFailReason FailReason { get; set; } public EventFailReason FailReason { get; set; }
public bool Failed => FailReason != EventFailReason.None; public bool Failed => FailReason != EventFailReason.None;
/// <summary>
/// Indicates if the event should block until it is complete
/// </summary>
public bool IsBlocking { get; set; }
/// <summary> /// <summary>
/// asynchronously wait for GameEvent to be processed /// asynchronously wait for GameEvent to be processed

62
SharedLibraryCore/Migrations/20191004172550_RenameClientHitLocationCountColumns.cs
View File

@ -77,6 +77,13 @@ PRAGMA foreign_keys = 1;
", true); ", true);
} }
else if (migrationBuilder.ActiveProvider == "Pomelo.EntityFrameworkCore.MySql")
{
migrationBuilder.Sql("ALTER TABLE `EFHitLocationCounts` CHANGE `EFClientStatistics_ClientId` `EFClientStatisticsClientId` INT(11) NOT NULL;");
migrationBuilder.Sql("ALTER TABLE `EFHitLocationCounts` CHANGE `EFClientStatistics_ServerId` `EFClientStatisticsServerId` INT(11) NOT NULL;");
migrationBuilder.Sql("CREATE INDEX `IX_EFClientStatisticsClientId_EFClientStatisticsServerId` ON `EFHitLocationCounts` (`EFClientStatisticsClientId`, `EFClientStatisticsServerId`);");
}
else else
{ {
migrationBuilder.DropForeignKey( migrationBuilder.DropForeignKey(
@ -139,61 +146,6 @@ PRAGMA foreign_keys = 1;
protected override void Down(MigrationBuilder migrationBuilder) protected override void Down(MigrationBuilder migrationBuilder)
{ {
migrationBuilder.DropForeignKey(
name: "FK_EFHitLocationCounts_EFClients_EFClientStatisticsClientId",
table: "EFHitLocationCounts");
migrationBuilder.DropForeignKey(
name: "FK_EFHitLocationCounts_EFServers_EFClientStatisticsServerId",
table: "EFHitLocationCounts");
migrationBuilder.DropForeignKey(
name: "FK_EFHitLocationCounts_EFClientStatistics_EFClientStatisticsClientId_EFClientStatisticsServerId",
table: "EFHitLocationCounts");
migrationBuilder.RenameColumn(
name: "EFClientStatisticsServerId",
table: "EFHitLocationCounts",
newName: "EFClientStatistics_ServerId");
migrationBuilder.RenameColumn(
name: "EFClientStatisticsClientId",
table: "EFHitLocationCounts",
newName: "EFClientStatistics_ClientId");
migrationBuilder.RenameIndex(
name: "IX_EFHitLocationCounts_EFClientStatisticsClientId_EFClientStatisticsServerId",
table: "EFHitLocationCounts",
newName: "IX_EFHitLocationCounts_EFClientStatistics_ClientId_EFClientStatistics_ServerId");
migrationBuilder.RenameIndex(
name: "IX_EFHitLocationCounts_EFClientStatisticsServerId",
table: "EFHitLocationCounts",
newName: "IX_EFHitLocationCounts_EFClientStatistics_ServerId");
migrationBuilder.AddForeignKey(
name: "FK_EFHitLocationCounts_EFClients_EFClientStatistics_ClientId",
table: "EFHitLocationCounts",
column: "EFClientStatistics_ClientId",
principalTable: "EFClients",
principalColumn: "ClientId",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_EFHitLocationCounts_EFServers_EFClientStatistics_ServerId",
table: "EFHitLocationCounts",
column: "EFClientStatistics_ServerId",
principalTable: "EFServers",
principalColumn: "ServerId",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_EFHitLocationCounts_EFClientStatistics_EFClientStatistics_ClientId_EFClientStatistics_ServerId",
table: "EFHitLocationCounts",
columns: new[] { "EFClientStatistics_ClientId", "EFClientStatistics_ServerId" },
principalTable: "EFClientStatistics",
principalColumns: new[] { "ClientId", "ServerId" },
onDelete: ReferentialAction.Cascade);
} }
} }
} }

5
SharedLibraryCore/PartialEntities/EFClient.cs
View File

@ -376,6 +376,11 @@ namespace SharedLibraryCore.Database.Models
e.FailReason = GameEvent.EventFailReason.Permission; e.FailReason = GameEvent.EventFailReason.Permission;
} }
if (Level == Permission.Banned)
{
e.FailReason = GameEvent.EventFailReason.Invalid;
}
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e); sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
return e; return e;
} }