mirror of
https://github.com/RaidMax/IW4M-Admin.git
synced 2025-06-10 15:20:48 -05:00
Initial .net 6 upgrades
This commit is contained in:
@ -1,38 +1,35 @@
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.Filters;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Dtos;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Security.Claims;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Context;
|
||||
using Data.Models;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.Filters;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Dtos;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using SharedLibraryCore.Localization;
|
||||
|
||||
namespace SharedLibraryCore
|
||||
{
|
||||
public class BaseController : Controller
|
||||
{
|
||||
/// <summary>
|
||||
/// life span in months
|
||||
/// life span in months
|
||||
/// </summary>
|
||||
private const int COOKIE_LIFESPAN = 3;
|
||||
|
||||
public IManager Manager { get; private set; }
|
||||
protected readonly DatabaseContext Context;
|
||||
protected bool Authorized { get; set; }
|
||||
protected Localization.TranslationLookup Localization { get; private set; }
|
||||
protected EFClient Client { get; private set; }
|
||||
private static readonly byte[] LocalHost = { 127, 0, 0, 1 };
|
||||
private static string SocialLink;
|
||||
private static string SocialTitle;
|
||||
protected readonly DatabaseContext Context;
|
||||
protected List<Page> Pages;
|
||||
protected ApplicationConfiguration AppConfig { get; }
|
||||
|
||||
public BaseController(IManager manager)
|
||||
{
|
||||
@ -46,7 +43,7 @@ namespace SharedLibraryCore
|
||||
SocialTitle = AppConfig.SocialLinkTitle;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Pages = Manager.GetPageList().Pages
|
||||
.Select(page => new Page
|
||||
{
|
||||
@ -59,23 +56,30 @@ namespace SharedLibraryCore
|
||||
ViewBag.EnableColorCodes = AppConfig.EnableColorCodes;
|
||||
ViewBag.Language = Utilities.CurrentLocalization.Culture.TwoLetterISOLanguageName;
|
||||
|
||||
Client ??= new EFClient()
|
||||
Client ??= new EFClient
|
||||
{
|
||||
ClientId = -1,
|
||||
Level = EFClient.Permission.Banned,
|
||||
CurrentAlias = new EFAlias() { Name = "Webfront Guest" }
|
||||
Level = Data.Models.Client.EFClient.Permission.Banned,
|
||||
CurrentAlias = new EFAlias { Name = "Webfront Guest" }
|
||||
};
|
||||
}
|
||||
|
||||
public IManager Manager { get; }
|
||||
protected bool Authorized { get; set; }
|
||||
protected TranslationLookup Localization { get; }
|
||||
protected EFClient Client { get; }
|
||||
protected ApplicationConfiguration AppConfig { get; }
|
||||
|
||||
protected async Task SignInAsync(ClaimsPrincipal claimsPrinciple)
|
||||
{
|
||||
await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple, new AuthenticationProperties()
|
||||
{
|
||||
AllowRefresh = true,
|
||||
ExpiresUtc = DateTime.UtcNow.AddMonths(COOKIE_LIFESPAN),
|
||||
IsPersistent = true,
|
||||
IssuedUtc = DateTime.UtcNow
|
||||
});
|
||||
await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple,
|
||||
new AuthenticationProperties
|
||||
{
|
||||
AllowRefresh = true,
|
||||
ExpiresUtc = DateTime.UtcNow.AddMonths(COOKIE_LIFESPAN),
|
||||
IsPersistent = true,
|
||||
IssuedUtc = DateTime.UtcNow
|
||||
});
|
||||
}
|
||||
|
||||
public override void OnActionExecuting(ActionExecutingContext context)
|
||||
@ -84,21 +88,27 @@ namespace SharedLibraryCore
|
||||
{
|
||||
try
|
||||
{
|
||||
int clientId = Convert.ToInt32(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid)?.Value ?? "-1");
|
||||
var clientId =
|
||||
Convert.ToInt32(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid)?.Value ?? "-1");
|
||||
|
||||
if (clientId > 0)
|
||||
{
|
||||
Client.ClientId = clientId;
|
||||
Client.NetworkId = clientId == 1 ? 0 : User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value.ConvertGuidToLong(System.Globalization.NumberStyles.HexNumber);
|
||||
Client.Level = (EFClient.Permission)Enum.Parse(typeof(EFClient.Permission), User.Claims.First(c => c.Type == ClaimTypes.Role).Value);
|
||||
Client.CurrentAlias = new EFAlias() { Name = User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value };
|
||||
Client.NetworkId = clientId == 1
|
||||
? 0
|
||||
: User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value
|
||||
.ConvertGuidToLong(NumberStyles.HexNumber);
|
||||
Client.Level = (Data.Models.Client.EFClient.Permission)Enum.Parse(
|
||||
typeof(Data.Models.Client.EFClient.Permission),
|
||||
User.Claims.First(c => c.Type == ClaimTypes.Role).Value);
|
||||
Client.CurrentAlias = new EFAlias
|
||||
{ Name = User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value };
|
||||
Authorized = Client.ClientId >= 0;
|
||||
}
|
||||
}
|
||||
|
||||
catch (InvalidOperationException)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
catch (KeyNotFoundException)
|
||||
@ -112,25 +122,25 @@ namespace SharedLibraryCore
|
||||
else if (!HttpContext.Request.Headers.ContainsKey("X-Forwarded-For"))
|
||||
{
|
||||
Client.ClientId = 1;
|
||||
Client.Level = EFClient.Permission.Console;
|
||||
Client.CurrentAlias = new EFAlias() { Name = "IW4MAdmin" };
|
||||
Client.Level = Data.Models.Client.EFClient.Permission.Console;
|
||||
Client.CurrentAlias = new EFAlias { Name = "IW4MAdmin" };
|
||||
Authorized = true;
|
||||
var claims = new[]
|
||||
{
|
||||
new Claim(ClaimTypes.NameIdentifier, Client.CurrentAlias.Name),
|
||||
new Claim(ClaimTypes.Role, Client.Level.ToString()),
|
||||
new Claim(ClaimTypes.Sid, Client.ClientId.ToString()),
|
||||
new Claim(ClaimTypes.PrimarySid, Client.NetworkId.ToString("X"))
|
||||
new Claim(ClaimTypes.Role, Client.Level.ToString()),
|
||||
new Claim(ClaimTypes.Sid, Client.ClientId.ToString()),
|
||||
new Claim(ClaimTypes.PrimarySid, Client.NetworkId.ToString("X"))
|
||||
};
|
||||
var claimsIdentity = new ClaimsIdentity(claims, "login");
|
||||
SignInAsync(new ClaimsPrincipal(claimsIdentity)).Wait();
|
||||
}
|
||||
|
||||
var communityName = AppConfig.CommunityInformation?.Name;
|
||||
var shouldUseCommunityName = !string.IsNullOrWhiteSpace(communityName)
|
||||
&& !communityName.Contains("IW4MAdmin")
|
||||
var shouldUseCommunityName = !string.IsNullOrWhiteSpace(communityName)
|
||||
&& !communityName.Contains("IW4MAdmin")
|
||||
&& AppConfig.CommunityInformation.IsEnabled;
|
||||
|
||||
|
||||
ViewBag.Authorized = Authorized;
|
||||
ViewBag.Url = AppConfig.WebfrontUrl;
|
||||
ViewBag.User = Client;
|
||||
@ -150,4 +160,4 @@ namespace SharedLibraryCore
|
||||
base.OnActionExecuting(context);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,9 +1,9 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Commands;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using static SharedLibraryCore.Server;
|
||||
using ILogger = Microsoft.Extensions.Logging.ILogger;
|
||||
@ -11,13 +11,17 @@ using ILogger = Microsoft.Extensions.Logging.ILogger;
|
||||
namespace SharedLibraryCore
|
||||
{
|
||||
/// <summary>
|
||||
/// Abstract class for command
|
||||
/// Abstract class for command
|
||||
/// </summary>
|
||||
public abstract class Command : IManagerCommand
|
||||
{
|
||||
protected readonly CommandConfiguration _config;
|
||||
protected readonly ITranslationLookup _translationLookup;
|
||||
private string alias;
|
||||
protected ILogger logger;
|
||||
private string name;
|
||||
private EFClient.Permission permission;
|
||||
private Game[] supportedGames;
|
||||
|
||||
public Command(CommandConfiguration config, ITranslationLookup layout)
|
||||
{
|
||||
@ -27,14 +31,25 @@ namespace SharedLibraryCore
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Executes the command
|
||||
/// Helper property to determine the number of required args
|
||||
/// </summary>
|
||||
public int RequiredArgumentCount => Arguments.Count(c => c.Required);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Argument list for the command
|
||||
/// </summary>
|
||||
public CommandArgument[] Arguments { get; protected set; } = new CommandArgument[0];
|
||||
|
||||
/// <summary>
|
||||
/// Executes the command
|
||||
/// </summary>
|
||||
/// <param name="gameEvent"></param>
|
||||
/// <returns></returns>
|
||||
abstract public Task ExecuteAsync(GameEvent gameEvent);
|
||||
public abstract Task ExecuteAsync(GameEvent gameEvent);
|
||||
|
||||
/// <summary>
|
||||
/// Specifies the name and string that triggers the command
|
||||
/// Specifies the name and string that triggers the command
|
||||
/// </summary>
|
||||
public string Name
|
||||
{
|
||||
@ -52,20 +67,20 @@ namespace SharedLibraryCore
|
||||
}
|
||||
}
|
||||
}
|
||||
private string name;
|
||||
|
||||
/// <summary>
|
||||
/// Specifies the command description
|
||||
/// Specifies the command description
|
||||
/// </summary>
|
||||
public string Description { get; protected set; }
|
||||
|
||||
/// <summary>
|
||||
/// Helper property to provide the syntax of the command
|
||||
/// Helper property to provide the syntax of the command
|
||||
/// </summary>
|
||||
public string Syntax => $"{_translationLookup["COMMAND_HELP_SYNTAX"]} {_config.CommandPrefix ?? "!"}{Alias} {string.Join(" ", Arguments.Select(a => $"<{(a.Required ? "" : _translationLookup["COMMAND_HELP_OPTIONAL"] + " ")}{a.Name}>"))}";
|
||||
public string Syntax =>
|
||||
$"{_translationLookup["COMMAND_HELP_SYNTAX"]} {_config.CommandPrefix ?? "!"}{Alias} {string.Join(" ", Arguments.Select(a => $"<{(a.Required ? "" : _translationLookup["COMMAND_HELP_OPTIONAL"] + " ")}{a.Name}>"))}";
|
||||
|
||||
/// <summary>
|
||||
/// Alternate name for this command to be executed by
|
||||
/// Alternate name for this command to be executed by
|
||||
/// </summary>
|
||||
public string Alias
|
||||
{
|
||||
@ -83,20 +98,14 @@ namespace SharedLibraryCore
|
||||
}
|
||||
}
|
||||
}
|
||||
private string alias;
|
||||
|
||||
/// <summary>
|
||||
/// Helper property to determine the number of required args
|
||||
/// </summary>
|
||||
public int RequiredArgumentCount => Arguments.Count(c => c.Required);
|
||||
|
||||
/// <summary>
|
||||
/// Indicates if the command requires a target to execute on
|
||||
/// Indicates if the command requires a target to execute on
|
||||
/// </summary>
|
||||
public bool RequiresTarget { get; protected set; }
|
||||
|
||||
/// <summary>
|
||||
/// Minimum permission level to execute command
|
||||
/// Minimum permission level to execute command
|
||||
/// </summary>
|
||||
public EFClient.Permission Permission
|
||||
{
|
||||
@ -114,7 +123,6 @@ namespace SharedLibraryCore
|
||||
}
|
||||
}
|
||||
}
|
||||
private EFClient.Permission permission;
|
||||
|
||||
public Game[] SupportedGames
|
||||
{
|
||||
@ -124,7 +132,7 @@ namespace SharedLibraryCore
|
||||
try
|
||||
{
|
||||
var savedGames = _config?.Commands[GetType().Name].SupportedGames;
|
||||
supportedGames = savedGames?.Length != 0 ? savedGames : value;
|
||||
supportedGames = savedGames?.Length != 0 ? savedGames : value;
|
||||
}
|
||||
|
||||
catch (KeyNotFoundException)
|
||||
@ -133,19 +141,12 @@ namespace SharedLibraryCore
|
||||
}
|
||||
}
|
||||
}
|
||||
private Game[] supportedGames;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Argument list for the command
|
||||
/// </summary>
|
||||
public CommandArgument[] Arguments { get; protected set; } = new CommandArgument[0];
|
||||
|
||||
/// <summary>
|
||||
/// indicates if this command allows impersonation (run as)
|
||||
/// indicates if this command allows impersonation (run as)
|
||||
/// </summary>
|
||||
public bool AllowImpersonation { get; set; }
|
||||
|
||||
public bool IsBroadcast { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,8 +1,8 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
@ -10,7 +10,8 @@ namespace SharedLibraryCore.Commands
|
||||
{
|
||||
private readonly IMetaService _metaService;
|
||||
|
||||
public AddClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
|
||||
public AddClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
|
||||
base(config, layout)
|
||||
{
|
||||
Name = "addclienttag";
|
||||
Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"];
|
||||
@ -19,7 +20,7 @@ namespace SharedLibraryCore.Commands
|
||||
RequiresTarget = false;
|
||||
Arguments = new[]
|
||||
{
|
||||
new CommandArgument()
|
||||
new CommandArgument
|
||||
{
|
||||
Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
|
||||
Required = true
|
||||
@ -31,8 +32,8 @@ namespace SharedLibraryCore.Commands
|
||||
|
||||
public override async Task ExecuteAsync(GameEvent gameEvent)
|
||||
{
|
||||
await _metaService.AddPersistentMeta(EFMeta.ClientTagName, gameEvent.Data);
|
||||
gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
|
||||
await _metaService.AddPersistentMeta(EFMeta.ClientTagName, gameEvent.Data);
|
||||
gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,18 +1,18 @@
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
/// <summary>
|
||||
/// Holds information about command args
|
||||
/// Holds information about command args
|
||||
/// </summary>
|
||||
public class CommandArgument
|
||||
{
|
||||
/// <summary>
|
||||
/// Name of the argument
|
||||
/// Name of the argument
|
||||
/// </summary>
|
||||
public string Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Indicates if the argument is required
|
||||
/// Indicates if the argument is required
|
||||
/// </summary>
|
||||
public bool Required { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,13 +1,15 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
public static class CommandExtensions
|
||||
{
|
||||
public static bool IsTargetingSelf(this GameEvent gameEvent) => gameEvent.Origin?.Equals(gameEvent.Target) ?? false;
|
||||
public static bool IsTargetingSelf(this GameEvent gameEvent)
|
||||
{
|
||||
return gameEvent.Origin?.Equals(gameEvent.Target) ?? false;
|
||||
}
|
||||
|
||||
public static bool CanPerformActionOnTarget(this GameEvent gameEvent) => gameEvent.Origin?.Level > gameEvent.Target?.Level;
|
||||
public static bool CanPerformActionOnTarget(this GameEvent gameEvent)
|
||||
{
|
||||
return gameEvent.Origin?.Level > gameEvent.Target?.Level;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,36 +1,35 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Exceptions;
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Exceptions;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
public class CommandProcessing
|
||||
{
|
||||
public static async Task<Command> ValidateCommand(GameEvent E, ApplicationConfiguration appConfig, CommandConfiguration commandConfig)
|
||||
public static async Task<Command> ValidateCommand(GameEvent E, ApplicationConfiguration appConfig,
|
||||
CommandConfiguration commandConfig)
|
||||
{
|
||||
var loc = Utilities.CurrentLocalization.LocalizationIndex;
|
||||
var Manager = E.Owner.Manager;
|
||||
bool isBroadcast = E.Data.StartsWith(appConfig.BroadcastCommandPrefix);
|
||||
int prefixLength = isBroadcast ? appConfig.BroadcastCommandPrefix.Length : appConfig.CommandPrefix.Length;
|
||||
var isBroadcast = E.Data.StartsWith(appConfig.BroadcastCommandPrefix);
|
||||
var prefixLength = isBroadcast ? appConfig.BroadcastCommandPrefix.Length : appConfig.CommandPrefix.Length;
|
||||
|
||||
string CommandString = E.Data.Substring(prefixLength, E.Data.Length - prefixLength).Split(' ')[0];
|
||||
var CommandString = E.Data.Substring(prefixLength, E.Data.Length - prefixLength).Split(' ')[0];
|
||||
E.Message = E.Data;
|
||||
|
||||
Command C = null;
|
||||
foreach (Command cmd in Manager.GetCommands()
|
||||
.Where(c => c.Name != null))
|
||||
{
|
||||
if (cmd.Name.Equals(CommandString, StringComparison.OrdinalIgnoreCase) ||
|
||||
.Where(c => c.Name != null))
|
||||
if (cmd.Name.Equals(CommandString, StringComparison.OrdinalIgnoreCase) ||
|
||||
(cmd.Alias ?? "").Equals(CommandString, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
C = cmd;
|
||||
}
|
||||
}
|
||||
|
||||
if (C == null)
|
||||
{
|
||||
@ -43,7 +42,7 @@ namespace SharedLibraryCore.Commands
|
||||
var allowImpersonation = commandConfig?.Commands?.ContainsKey(C.GetType().Name) ?? false
|
||||
? commandConfig.Commands[C.GetType().Name].AllowImpersonation
|
||||
: C.AllowImpersonation;
|
||||
|
||||
|
||||
if (!allowImpersonation && E.ImpersonationOrigin != null)
|
||||
{
|
||||
E.ImpersonationOrigin.Tell(loc["COMMANDS_RUN_AS_FAIL"]);
|
||||
@ -51,7 +50,7 @@ namespace SharedLibraryCore.Commands
|
||||
}
|
||||
|
||||
E.Data = E.Data.RemoveWords(1);
|
||||
String[] Args = E.Data.Trim().Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
var Args = E.Data.Trim().Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
// todo: the code below can be cleaned up
|
||||
|
||||
if (E.Origin.Level < C.Permission)
|
||||
@ -60,7 +59,7 @@ namespace SharedLibraryCore.Commands
|
||||
throw new CommandException($"{E.Origin} does not have access to \"{C.Name}\"");
|
||||
}
|
||||
|
||||
if (Args.Length < (C.RequiredArgumentCount))
|
||||
if (Args.Length < C.RequiredArgumentCount)
|
||||
{
|
||||
E.Origin.Tell(loc["COMMAND_MISSINGARGS"]);
|
||||
E.Origin.Tell(C.Syntax);
|
||||
@ -71,14 +70,14 @@ namespace SharedLibraryCore.Commands
|
||||
{
|
||||
if (Args.Length > 0)
|
||||
{
|
||||
if (!Int32.TryParse(Args[0], out int cNum))
|
||||
if (!int.TryParse(Args[0], out var cNum))
|
||||
{
|
||||
cNum = -1;
|
||||
}
|
||||
|
||||
if (Args[0][0] == '@') // user specifying target by database ID
|
||||
{
|
||||
int.TryParse(Args[0].Substring(1, Args[0].Length - 1), out int dbID);
|
||||
int.TryParse(Args[0].Substring(1, Args[0].Length - 1), out var dbID);
|
||||
|
||||
var found = await Manager.GetClientService().Get(dbID);
|
||||
if (found != null)
|
||||
@ -90,12 +89,13 @@ namespace SharedLibraryCore.Commands
|
||||
}
|
||||
}
|
||||
|
||||
else if (Args[0].Length < 3 && cNum > -1 && cNum < E.Owner.MaxClients) // user specifying target by client num
|
||||
else if (Args[0].Length < 3 && cNum > -1 && cNum < E.Owner.MaxClients
|
||||
) // user specifying target by client num
|
||||
{
|
||||
if (E.Owner.Clients[cNum] != null)
|
||||
{
|
||||
E.Target = E.Owner.Clients[cNum];
|
||||
E.Data = String.Join(" ", Args.Skip(1));
|
||||
E.Data = string.Join(" ", Args.Skip(1));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -111,11 +111,11 @@ namespace SharedLibraryCore.Commands
|
||||
throw new CommandException($"{E.Origin} had multiple players found for {C.Name}");
|
||||
}
|
||||
|
||||
else if (matchingPlayers.Count == 1)
|
||||
if (matchingPlayers.Count == 1)
|
||||
{
|
||||
E.Target = matchingPlayers.First();
|
||||
|
||||
string escapedName = Regex.Escape(E.Target.CleanedName);
|
||||
var escapedName = Regex.Escape(E.Target.CleanedName);
|
||||
var reg = new Regex($"(\"{escapedName}\")|({escapedName})", RegexOptions.IgnoreCase);
|
||||
E.Data = reg.Replace(E.Data, "", 1).Trim();
|
||||
|
||||
@ -135,23 +135,21 @@ namespace SharedLibraryCore.Commands
|
||||
{
|
||||
E.Origin.Tell(loc["COMMAND_TARGET_MULTI"]);
|
||||
foreach (var p in matchingPlayers)
|
||||
{
|
||||
E.Origin.Tell($"[(Color::Yellow){p.ClientNumber}(Color::White)] {p.Name}");
|
||||
}
|
||||
throw new CommandException($"{E.Origin} had multiple players found for {C.Name}");
|
||||
}
|
||||
|
||||
else if (matchingPlayers.Count == 1)
|
||||
if (matchingPlayers.Count == 1)
|
||||
{
|
||||
E.Target = matchingPlayers.First();
|
||||
|
||||
string escapedName = Regex.Escape(E.Target.CleanedName);
|
||||
string escapedArg = Regex.Escape(Args[0]);
|
||||
var escapedName = Regex.Escape(E.Target.CleanedName);
|
||||
var escapedArg = Regex.Escape(Args[0]);
|
||||
var reg = new Regex($"({escapedName})|({escapedArg})", RegexOptions.IgnoreCase);
|
||||
E.Data = reg.Replace(E.Data, "", 1).Trim();
|
||||
|
||||
if ((E.Data.Trim() == E.Target.CleanedName.ToLower().Trim() ||
|
||||
E.Data == String.Empty) &&
|
||||
E.Data == string.Empty) &&
|
||||
C.RequiresTarget)
|
||||
{
|
||||
E.Origin.Tell(loc["COMMAND_MISSINGARGS"]);
|
||||
@ -172,4 +170,4 @@ namespace SharedLibraryCore.Commands
|
||||
return C;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,27 +1,25 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
|
||||
public class ListClientTags : Command
|
||||
{
|
||||
private readonly IMetaService _metaService;
|
||||
|
||||
public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
|
||||
public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
|
||||
config, layout)
|
||||
{
|
||||
Name = "listclienttags";
|
||||
Description = layout["COMMANDS_LIST_CLIENT_TAGS_DESC"];
|
||||
Alias = "lct";
|
||||
Permission = EFClient.Permission.Owner;
|
||||
RequiresTarget = false;
|
||||
|
||||
|
||||
_metaService = metaService;
|
||||
}
|
||||
|
||||
@ -31,4 +29,4 @@ namespace SharedLibraryCore.Commands
|
||||
gameEvent.Origin.Tell(tags.Select(tag => tag.Value));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
File diff suppressed because it is too large
Load Diff
@ -1,16 +1,16 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using static SharedLibraryCore.Server;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
public class PrivateMessageAdminsCommand : Command
|
||||
{
|
||||
public PrivateMessageAdminsCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config, lookup)
|
||||
public PrivateMessageAdminsCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config,
|
||||
lookup)
|
||||
{
|
||||
Name = "privatemessageadmin";
|
||||
Description = lookup["COMMANDS_PMADMINS_DESC"];
|
||||
@ -21,12 +21,14 @@ namespace SharedLibraryCore.Commands
|
||||
|
||||
public override Task ExecuteAsync(GameEvent E)
|
||||
{
|
||||
bool isGameSupported = _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames.Length > 0 &&
|
||||
_config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames.Contains(E.Owner.GameName);
|
||||
var isGameSupported = _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames.Length > 0 &&
|
||||
_config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames
|
||||
.Contains(E.Owner.GameName);
|
||||
|
||||
if (!isGameSupported)
|
||||
{
|
||||
E.Origin.Tell(_translationLookup["COMMANDS_GAME_NOT_SUPPORTED"].FormatExt(nameof(PrivateMessageAdminsCommand)));
|
||||
E.Origin.Tell(_translationLookup["COMMANDS_GAME_NOT_SUPPORTED"]
|
||||
.FormatExt(nameof(PrivateMessageAdminsCommand)));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@ -34,4 +36,4 @@ namespace SharedLibraryCore.Commands
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,8 +1,8 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
@ -10,7 +10,8 @@ namespace SharedLibraryCore.Commands
|
||||
{
|
||||
private readonly IMetaService _metaService;
|
||||
|
||||
public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
|
||||
public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
|
||||
config, layout)
|
||||
{
|
||||
Name = "removeclienttag";
|
||||
Description = layout["COMMANDS_REMOVE_CLIENT_TAG_DESC"];
|
||||
@ -19,7 +20,7 @@ namespace SharedLibraryCore.Commands
|
||||
RequiresTarget = false;
|
||||
Arguments = new[]
|
||||
{
|
||||
new CommandArgument()
|
||||
new CommandArgument
|
||||
{
|
||||
Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
|
||||
Required = true
|
||||
@ -35,4 +36,4 @@ namespace SharedLibraryCore.Commands
|
||||
gameEvent.Origin.Tell(_translationLookup["COMMANDS_REMOVE_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,12 +1,12 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
/// <summary>
|
||||
/// Generates a token for use in webfront login
|
||||
/// Generates a token for use in webfront login
|
||||
/// </summary>
|
||||
public class RequestTokenCommand : Command
|
||||
{
|
||||
@ -22,9 +22,10 @@ namespace SharedLibraryCore.Commands
|
||||
public override Task ExecuteAsync(GameEvent E)
|
||||
{
|
||||
var state = E.Owner.Manager.TokenAuthenticator.GenerateNextToken(E.Origin.NetworkId);
|
||||
E.Origin.Tell(string.Format(_translationLookup["COMMANDS_GENERATETOKEN_SUCCESS"], state.Token, $"{state.RemainingTime} {_translationLookup["GLOBAL_MINUTES"]}", E.Origin.ClientId));
|
||||
E.Origin.Tell(string.Format(_translationLookup["COMMANDS_GENERATETOKEN_SUCCESS"], state.Token,
|
||||
$"{state.RemainingTime} {_translationLookup["GLOBAL_MINUTES"]}", E.Origin.ClientId));
|
||||
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,8 +1,8 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System.Linq;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
@ -17,7 +17,7 @@ namespace SharedLibraryCore.Commands
|
||||
RequiresTarget = true;
|
||||
Arguments = new[]
|
||||
{
|
||||
new CommandArgument()
|
||||
new CommandArgument
|
||||
{
|
||||
Name = lookup["COMMANDS_ARGS_COMMANDS"],
|
||||
Required = true
|
||||
@ -40,7 +40,7 @@ namespace SharedLibraryCore.Commands
|
||||
}
|
||||
|
||||
var cmd = $"{Utilities.CommandPrefix}{gameEvent.Data}";
|
||||
var impersonatedCommandEvent = new GameEvent()
|
||||
var impersonatedCommandEvent = new GameEvent
|
||||
{
|
||||
Type = GameEvent.EventType.Command,
|
||||
Origin = gameEvent.Target,
|
||||
@ -52,7 +52,8 @@ namespace SharedLibraryCore.Commands
|
||||
};
|
||||
gameEvent.Owner.Manager.AddEvent(impersonatedCommandEvent);
|
||||
|
||||
var result = await impersonatedCommandEvent.WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
|
||||
var result = await impersonatedCommandEvent.WaitAsync(Utilities.DefaultCommandTimeout,
|
||||
gameEvent.Owner.Manager.CancellationToken);
|
||||
await result.WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
|
||||
|
||||
// remove the added command response
|
||||
@ -61,11 +62,10 @@ namespace SharedLibraryCore.Commands
|
||||
.Where(ev => ev.Value.CorrelationId == impersonatedCommandEvent.CorrelationId)
|
||||
.SelectMany(ev => ev.Value.Output)
|
||||
.ToList();
|
||||
|
||||
|
||||
foreach (var output in responses)
|
||||
{
|
||||
await gameEvent.Origin.Tell(_translationLookup["COMMANDS_RUN_AS_SUCCESS"].FormatExt(output)).WaitAsync();
|
||||
}
|
||||
await gameEvent.Origin.Tell(_translationLookup["COMMANDS_RUN_AS_SUCCESS"].FormatExt(output))
|
||||
.WaitAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,9 +1,9 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System.Linq;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
@ -12,7 +12,8 @@ namespace SharedLibraryCore.Commands
|
||||
private readonly IMetaService _metaService;
|
||||
|
||||
|
||||
public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
|
||||
public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
|
||||
base(config, layout)
|
||||
{
|
||||
Name = "setclienttag";
|
||||
Description = layout["COMMANDS_SET_CLIENT_TAG_DESC"];
|
||||
@ -21,7 +22,7 @@ namespace SharedLibraryCore.Commands
|
||||
RequiresTarget = true;
|
||||
Arguments = new[]
|
||||
{
|
||||
new CommandArgument()
|
||||
new CommandArgument
|
||||
{
|
||||
Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
|
||||
Required = true
|
||||
@ -47,4 +48,4 @@ namespace SharedLibraryCore.Commands
|
||||
gameEvent.Origin.Tell(_translationLookup["COMMANDS_SET_CLIENT_TAG_SUCCESS"].FormatExt(matchingTag.Value));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,16 +1,16 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
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
|
||||
/// 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
|
||||
{
|
||||
@ -29,4 +29,4 @@ namespace SharedLibraryCore.Commands
|
||||
E.Origin.Tell(_translationLookup["COMMANDS_UNLINK_CLIENT_SUCCESS"].FormatExt(E.Target));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,9 +1,8 @@
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading.Tasks;
|
||||
using Data.Models;
|
||||
using Data.Models.Client;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Commands
|
||||
{
|
||||
@ -12,7 +11,8 @@ namespace SharedLibraryCore.Commands
|
||||
private readonly IMetaService _metaService;
|
||||
|
||||
|
||||
public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
|
||||
public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
|
||||
base(config, layout)
|
||||
{
|
||||
Name = "unsetclienttag";
|
||||
Description = layout["COMMANDS_UNSET_CLIENT_TAG_DESC"];
|
||||
@ -21,7 +21,7 @@ namespace SharedLibraryCore.Commands
|
||||
RequiresTarget = true;
|
||||
Arguments = new[]
|
||||
{
|
||||
new CommandArgument()
|
||||
new CommandArgument
|
||||
{
|
||||
Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
|
||||
Required = true
|
||||
@ -38,4 +38,4 @@ namespace SharedLibraryCore.Commands
|
||||
gameEvent.Origin.Tell(_translationLookup["COMMANDS_UNSET_CLIENT_TAG_SUCCESS"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,10 +1,10 @@
|
||||
using SharedLibraryCore.Configuration.Attributes;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using Newtonsoft.Json;
|
||||
using SharedLibraryCore.Configuration.Attributes;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using static Data.Models.Client.EFClient;
|
||||
|
||||
namespace SharedLibraryCore.Configuration
|
||||
@ -12,8 +12,9 @@ namespace SharedLibraryCore.Configuration
|
||||
public class ApplicationConfiguration : IBaseConfiguration
|
||||
{
|
||||
[ConfigurationIgnore]
|
||||
public CommunityInformationConfiguration CommunityInformation { get; set; } = new CommunityInformationConfiguration();
|
||||
|
||||
public CommunityInformationConfiguration CommunityInformation { get; set; } =
|
||||
new CommunityInformationConfiguration();
|
||||
|
||||
[LocalizedDisplayName("SETUP_ENABLE_WEBFRONT")]
|
||||
[ConfigurationLinked("WebfrontBindUrl", "ManualWebfrontUrl", "WebfrontPrimaryColor", "WebfrontSecondaryColor",
|
||||
"WebfrontCustomBranding")]
|
||||
@ -38,8 +39,7 @@ namespace SharedLibraryCore.Configuration
|
||||
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_CUSTOM_BRANDING")]
|
||||
public string WebfrontCustomBranding { get; set; }
|
||||
|
||||
[ConfigurationIgnore]
|
||||
public WebfrontConfiguration Webfront { get; set; } = new WebfrontConfiguration();
|
||||
[ConfigurationIgnore] public WebfrontConfiguration Webfront { get; set; } = new WebfrontConfiguration();
|
||||
|
||||
[LocalizedDisplayName("SETUP_ENABLE_MULTIOWN")]
|
||||
public bool EnableMultipleOwners { get; set; }
|
||||
@ -116,8 +116,7 @@ namespace SharedLibraryCore.Configuration
|
||||
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_ENABLE_COLOR_CODES")]
|
||||
public bool EnableColorCodes { get; set; }
|
||||
|
||||
[ConfigurationIgnore]
|
||||
public string IngameAccentColorKey { get; set; } = "Cyan";
|
||||
[ConfigurationIgnore] public string IngameAccentColorKey { get; set; } = "Cyan";
|
||||
|
||||
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_AUTOMESSAGE_PERIOD")]
|
||||
public int AutoMessagePeriod { get; set; }
|
||||
@ -135,7 +134,8 @@ namespace SharedLibraryCore.Configuration
|
||||
public int MapChangeDelaySeconds { get; set; } = 5;
|
||||
|
||||
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_BAN_DURATIONS")]
|
||||
public TimeSpan[] BanDurations { get; set; } = {
|
||||
public TimeSpan[] BanDurations { get; set; } =
|
||||
{
|
||||
TimeSpan.FromHours(1),
|
||||
TimeSpan.FromHours(6),
|
||||
TimeSpan.FromDays(1),
|
||||
@ -147,36 +147,38 @@ namespace SharedLibraryCore.Configuration
|
||||
[ConfigurationIgnore]
|
||||
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_PRESET_BAN_REASONS")]
|
||||
public Dictionary<string, string> PresetPenaltyReasons { get; set; } = new Dictionary<string, string>
|
||||
{{"afk", "Away from keyboard"}, {"ci", "Connection interrupted. Reconnect"}};
|
||||
[LocalizedDisplayName(("WEBFRONT_CONFIGURATION_ENABLE_PRIVILEGED_USER_PRIVACY"))]
|
||||
{ { "afk", "Away from keyboard" }, { "ci", "Connection interrupted. Reconnect" } };
|
||||
|
||||
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_ENABLE_PRIVILEGED_USER_PRIVACY")]
|
||||
public bool EnablePrivilegedUserPrivacy { get; set; }
|
||||
|
||||
[ConfigurationIgnore]
|
||||
public bool EnableImplicitAccountLinking { get; set; } = false;
|
||||
[ConfigurationIgnore] public bool EnableImplicitAccountLinking { get; set; } = false;
|
||||
|
||||
[ConfigurationIgnore]
|
||||
public TimeSpan MaxClientHistoryTime { get; set; } = TimeSpan.FromHours(12);
|
||||
[ConfigurationIgnore] public TimeSpan MaxClientHistoryTime { get; set; } = TimeSpan.FromHours(12);
|
||||
|
||||
[ConfigurationIgnore]
|
||||
public TimeSpan ServerDataCollectionInterval { get; set; } = TimeSpan.FromMinutes(5);
|
||||
[ConfigurationIgnore] public TimeSpan ServerDataCollectionInterval { get; set; } = TimeSpan.FromMinutes(5);
|
||||
|
||||
public int ServerConnectionAttempts { get; set; } = 6;
|
||||
|
||||
|
||||
[ConfigurationIgnore]
|
||||
public Dictionary<Permission, string> OverridePermissionLevelNames { get; set; } = Enum
|
||||
.GetValues(typeof(Permission))
|
||||
.Cast<Permission>()
|
||||
.ToDictionary(perm => perm, perm => perm.ToString());
|
||||
[UIHint("ServerConfiguration")]
|
||||
public ServerConfiguration[] Servers { get; set; }
|
||||
|
||||
[UIHint("ServerConfiguration")] public ServerConfiguration[] Servers { get; set; }
|
||||
|
||||
[ConfigurationIgnore] public int MinimumNameLength { get; set; } = 3;
|
||||
[ConfigurationIgnore] public string Id { get; set; }
|
||||
[ConfigurationIgnore] public string SubscriptionId { get; set; }
|
||||
|
||||
[Obsolete("Moved to DefaultSettings")]
|
||||
[ConfigurationIgnore] public MapConfiguration[] Maps { get; set; }
|
||||
[ConfigurationIgnore]
|
||||
public MapConfiguration[] Maps { get; set; }
|
||||
|
||||
[Obsolete("Moved to DefaultSettings")]
|
||||
[ConfigurationIgnore] public QuickMessageConfiguration[] QuickMessages { get; set; }
|
||||
[ConfigurationIgnore]
|
||||
public QuickMessageConfiguration[] QuickMessages { get; set; }
|
||||
|
||||
[ConfigurationIgnore]
|
||||
[JsonIgnore]
|
||||
@ -192,30 +194,30 @@ namespace SharedLibraryCore.Configuration
|
||||
var loc = Utilities.CurrentLocalization.LocalizationIndex;
|
||||
Id = Guid.NewGuid().ToString();
|
||||
|
||||
EnableWebFront = Utilities.PromptBool(loc["SETUP_ENABLE_WEBFRONT"]);
|
||||
EnableMultipleOwners = Utilities.PromptBool(loc["SETUP_ENABLE_MULTIOWN"]);
|
||||
EnableSteppedHierarchy = Utilities.PromptBool(loc["SETUP_ENABLE_STEPPEDPRIV"]);
|
||||
EnableCustomSayName = Utilities.PromptBool(loc["SETUP_ENABLE_CUSTOMSAY"]);
|
||||
EnableWebFront = loc["SETUP_ENABLE_WEBFRONT"].PromptBool();
|
||||
EnableMultipleOwners = loc["SETUP_ENABLE_MULTIOWN"].PromptBool();
|
||||
EnableSteppedHierarchy = loc["SETUP_ENABLE_STEPPEDPRIV"].PromptBool();
|
||||
EnableCustomSayName = loc["SETUP_ENABLE_CUSTOMSAY"].PromptBool();
|
||||
|
||||
bool useCustomParserEncoding = Utilities.PromptBool(loc["SETUP_USE_CUSTOMENCODING"]);
|
||||
var useCustomParserEncoding = loc["SETUP_USE_CUSTOMENCODING"].PromptBool();
|
||||
if (useCustomParserEncoding)
|
||||
{
|
||||
CustomParserEncoding = Utilities.PromptString(loc["SETUP_ENCODING_STRING"]);
|
||||
CustomParserEncoding = loc["SETUP_ENCODING_STRING"].PromptString();
|
||||
}
|
||||
|
||||
WebfrontBindUrl = "http://0.0.0.0:1624";
|
||||
|
||||
if (EnableCustomSayName)
|
||||
{
|
||||
CustomSayName = Utilities.PromptString(loc["SETUP_SAY_NAME"]);
|
||||
CustomSayName = loc["SETUP_SAY_NAME"].PromptString();
|
||||
}
|
||||
|
||||
EnableSocialLink = Utilities.PromptBool(loc["SETUP_DISPLAY_SOCIAL"]);
|
||||
EnableSocialLink = loc["SETUP_DISPLAY_SOCIAL"].PromptBool();
|
||||
|
||||
if (EnableSocialLink)
|
||||
{
|
||||
SocialLinkTitle = Utilities.PromptString(loc["SETUP_SOCIAL_TITLE"]);
|
||||
SocialLinkAddress = Utilities.PromptString(loc["SETUP_SOCIAL_LINK"]);
|
||||
SocialLinkTitle = loc["SETUP_SOCIAL_TITLE"].PromptString();
|
||||
SocialLinkAddress = loc["SETUP_SOCIAL_LINK"].PromptString();
|
||||
}
|
||||
|
||||
RConPollRate = 5000;
|
||||
|
@ -1,11 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Configuration.Attributes
|
||||
{
|
||||
[AttributeUsage(AttributeTargets.Property, Inherited = false)]
|
||||
[AttributeUsage(AttributeTargets.Property)]
|
||||
public class ConfigurationIgnore : Attribute
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
@ -2,14 +2,14 @@
|
||||
|
||||
namespace SharedLibraryCore.Configuration.Attributes
|
||||
{
|
||||
[AttributeUsage(AttributeTargets.Property, Inherited = false)]
|
||||
[AttributeUsage(AttributeTargets.Property)]
|
||||
public class ConfigurationLinked : Attribute
|
||||
{
|
||||
public string[] LinkedPropertyNames { get; set; }
|
||||
|
||||
public ConfigurationLinked(params string[] linkedPropertyNames)
|
||||
{
|
||||
LinkedPropertyNames = linkedPropertyNames;
|
||||
}
|
||||
|
||||
public string[] LinkedPropertyNames { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,11 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Configuration.Attributes
|
||||
{
|
||||
[AttributeUsage(AttributeTargets.Property, Inherited = false)]
|
||||
[AttributeUsage(AttributeTargets.Property)]
|
||||
public class ConfigurationOptional : Attribute
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
@ -1,13 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Text;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace SharedLibraryCore.Configuration.Attributes
|
||||
{
|
||||
class LocalizedDisplayName : DisplayNameAttribute
|
||||
internal class LocalizedDisplayName : DisplayNameAttribute
|
||||
{
|
||||
private readonly string _localizationKey;
|
||||
|
||||
public LocalizedDisplayName(string localizationKey)
|
||||
{
|
||||
_localizationKey = localizationKey;
|
||||
@ -15,4 +13,4 @@ namespace SharedLibraryCore.Configuration.Attributes
|
||||
|
||||
public override string DisplayName => Utilities.CurrentLocalization.LocalizationIndex[_localizationKey];
|
||||
}
|
||||
}
|
||||
}
|
@ -1,28 +1,29 @@
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text.Json.Serialization;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Configuration
|
||||
{
|
||||
/// <summary>
|
||||
/// Basic command configuration
|
||||
/// Basic command configuration
|
||||
/// </summary>
|
||||
public class CommandConfiguration : IBaseConfiguration
|
||||
{
|
||||
/// <summary>
|
||||
/// Dict of command class names mapped to configurable properties
|
||||
/// Dict of command class names mapped to configurable properties
|
||||
/// </summary>
|
||||
public Dictionary<string, CommandProperties> Commands { get; set; } = new Dictionary<string, CommandProperties>();
|
||||
public Dictionary<string, CommandProperties> Commands { get; set; } =
|
||||
new Dictionary<string, CommandProperties>();
|
||||
|
||||
/// <summary>
|
||||
/// prefix indicated the chat message is a command
|
||||
/// prefix indicated the chat message is a command
|
||||
/// </summary>
|
||||
[JsonIgnore]
|
||||
public string CommandPrefix { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// prefix indicating that the chat message is a broadcast command
|
||||
/// prefix indicating that the chat message is a broadcast command
|
||||
/// </summary>
|
||||
[JsonIgnore]
|
||||
public string BroadcastCommandPrefix { get; set; }
|
||||
@ -32,6 +33,9 @@ namespace SharedLibraryCore.Configuration
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public string Name() => nameof(CommandConfiguration);
|
||||
public string Name()
|
||||
{
|
||||
return nameof(CommandConfiguration);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -6,35 +6,35 @@ using static SharedLibraryCore.Server;
|
||||
namespace SharedLibraryCore.Configuration
|
||||
{
|
||||
/// <summary>
|
||||
/// Config driven command properties
|
||||
/// Config driven command properties
|
||||
/// </summary>
|
||||
public class CommandProperties
|
||||
{
|
||||
/// <summary>
|
||||
/// Specifies the command name
|
||||
/// Specifies the command name
|
||||
/// </summary>
|
||||
public string Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Alias of this command
|
||||
/// Alias of this command
|
||||
/// </summary>
|
||||
public string Alias { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Specifies the minimum permission level needed to execute the
|
||||
/// Specifies the minimum permission level needed to execute the
|
||||
/// </summary>
|
||||
[JsonConverter(typeof(StringEnumConverter))]
|
||||
public Permission MinimumPermission { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Indicates if the command can be run by another user (impersonation)
|
||||
/// Indicates if the command can be run by another user (impersonation)
|
||||
/// </summary>
|
||||
public bool AllowImpersonation { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Specifies the games supporting the functionality of the command
|
||||
/// Specifies the games supporting the functionality of the command
|
||||
/// </summary>
|
||||
[JsonProperty(ItemConverterType = typeof(StringEnumConverter))]
|
||||
public Game[] SupportedGames { get; set; } = new Game[0];
|
||||
}
|
||||
}
|
||||
}
|
@ -1,12 +1,12 @@
|
||||
using System.Linq;
|
||||
|
||||
namespace SharedLibraryCore.Configuration
|
||||
namespace SharedLibraryCore.Configuration
|
||||
{
|
||||
public class CommunityInformationConfiguration
|
||||
{
|
||||
public string Name { get; set; } = "IW4MAdmin - Configure In IW4MAdminSettings.json";
|
||||
|
||||
public string Description { get; set; } =
|
||||
"IW4MAdmin is an administration tool for IW4x, Pluto T6, Pluto IW5, CoD4x, TeknoMW3, and most Call of Duty® dedicated servers. It allows complete control of your server; from changing maps, to banning players, IW4MAdmin monitors and records activity on your server(s). With plugin support, extending its functionality is a breeze.";
|
||||
|
||||
public bool EnableBanner { get; set; } = true;
|
||||
|
||||
public SocialAccountConfiguration[] SocialAccounts { get; set; } =
|
||||
|
@ -8,12 +8,18 @@ namespace SharedLibraryCore.Configuration
|
||||
public string[] GlobalRules { get; set; }
|
||||
public MapConfiguration[] Maps { get; set; }
|
||||
public GametypeConfiguration[] Gametypes { get; set; }
|
||||
public QuickMessageConfiguration[] QuickMessages {get; set;}
|
||||
public QuickMessageConfiguration[] QuickMessages { get; set; }
|
||||
public string[] DisallowedClientNames { get; set; }
|
||||
public GameStringConfiguration GameStrings { get; set; }
|
||||
|
||||
public IBaseConfiguration Generate() => this;
|
||||
public IBaseConfiguration Generate()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
public string Name() => "DefaultConfiguration";
|
||||
public string Name()
|
||||
{
|
||||
return "DefaultConfiguration";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.NetworkInformation;
|
||||
using System.Net.Sockets;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text.RegularExpressions;
|
||||
using Microsoft.Win32;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
@ -43,6 +43,11 @@ namespace SharedLibraryCore.Configuration.Extensions
|
||||
string searchPath = null;
|
||||
var isRegistryKey = parser.Configuration.DefaultInstallationDirectoryHint.Contains("HKEY_");
|
||||
|
||||
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (isRegistryKey)
|
||||
@ -51,10 +56,10 @@ namespace SharedLibraryCore.Configuration.Extensions
|
||||
|
||||
if (result == null)
|
||||
{
|
||||
return new (string, string)[0];
|
||||
return Array.Empty<(string, string)>();
|
||||
}
|
||||
|
||||
searchPath = Path.Combine(result.ToString().Split(Path.DirectorySeparatorChar)
|
||||
searchPath = Path.Combine(result.ToString()!.Split(Path.DirectorySeparatorChar)
|
||||
.Where(p => !p.Contains(".exe"))
|
||||
.Select(p => p.Replace("\"", "")).ToArray());
|
||||
}
|
||||
@ -72,14 +77,14 @@ namespace SharedLibraryCore.Configuration.Extensions
|
||||
|
||||
if (string.IsNullOrEmpty(searchPath))
|
||||
{
|
||||
return new (string, string)[0];
|
||||
return Array.Empty<(string, string)>();
|
||||
}
|
||||
|
||||
var possibleFiles = Directory.GetFiles(searchPath, "*.cfg", SearchOption.AllDirectories);
|
||||
|
||||
if (!possibleFiles.Any())
|
||||
{
|
||||
return new (string, string)[0];
|
||||
return Array.Empty<(string, string)>();
|
||||
}
|
||||
|
||||
var possiblePasswords = possibleFiles.SelectMany(File.ReadAllLines)
|
||||
@ -95,8 +100,8 @@ namespace SharedLibraryCore.Configuration.Extensions
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new (string, string)[0];
|
||||
return Array.Empty<(string, string)>();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -5,4 +5,4 @@
|
||||
public Server.Game Game { get; set; }
|
||||
public Gametype[] Gametypes { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -5,4 +5,4 @@
|
||||
public Server.Game Game { get; set; }
|
||||
public Map[] Maps { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,6 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Collections.Generic;
|
||||
using static SharedLibraryCore.Server;
|
||||
|
||||
namespace SharedLibraryCore.Configuration
|
||||
@ -10,4 +8,4 @@ namespace SharedLibraryCore.Configuration
|
||||
public Game Game { get; set; }
|
||||
public Dictionary<string, string> Messages { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,14 +1,24 @@
|
||||
using SharedLibraryCore.Configuration.Attributes;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using SharedLibraryCore.Configuration.Attributes;
|
||||
using SharedLibraryCore.Configuration.Extensions;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Configuration
|
||||
{
|
||||
public class ServerConfiguration : IBaseConfiguration
|
||||
{
|
||||
private readonly IList<IRConParser> _rconParsers;
|
||||
private IRConParser _selectedParser;
|
||||
|
||||
public ServerConfiguration()
|
||||
{
|
||||
_rconParsers = new List<IRConParser>();
|
||||
Rules = new string[0];
|
||||
AutoMessages = new string[0];
|
||||
}
|
||||
|
||||
[LocalizedDisplayName("WEBFRONT_CONFIGURATION_SERVER_IP")]
|
||||
public string IPAddress { get; set; }
|
||||
|
||||
@ -45,14 +55,74 @@ namespace SharedLibraryCore.Configuration
|
||||
[ConfigurationOptional]
|
||||
public string CustomHostname { get; set; }
|
||||
|
||||
private readonly IList<IRConParser> _rconParsers;
|
||||
private IRConParser _selectedParser;
|
||||
|
||||
public ServerConfiguration()
|
||||
public IBaseConfiguration Generate()
|
||||
{
|
||||
_rconParsers = new List<IRConParser>();
|
||||
Rules = new string[0];
|
||||
ModifyParsers();
|
||||
var loc = Utilities.CurrentLocalization.LocalizationIndex;
|
||||
var shouldTryFindIp = loc["SETUP_SERVER_IP_AUTO"].PromptBool(defaultValue: true);
|
||||
|
||||
if (shouldTryFindIp)
|
||||
{
|
||||
this.TrySetIpAddress();
|
||||
Console.WriteLine(loc["SETUP_SERVER_IP_AUTO_RESULT"].FormatExt(IPAddress));
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
while (string.IsNullOrEmpty(IPAddress))
|
||||
{
|
||||
var input = loc["SETUP_SERVER_IP"].PromptString();
|
||||
IPAddress = input;
|
||||
}
|
||||
}
|
||||
|
||||
var defaultPort = _selectedParser.Configuration.DefaultRConPort;
|
||||
Port = loc["SETUP_SERVER_PORT"].PromptInt(null, 1, ushort.MaxValue, defaultPort);
|
||||
|
||||
if (!string.IsNullOrEmpty(_selectedParser.Configuration.DefaultInstallationDirectoryHint))
|
||||
{
|
||||
var shouldTryFindPassword = loc["SETUP_RCON_PASSWORD_AUTO"].PromptBool(defaultValue: true);
|
||||
|
||||
if (shouldTryFindPassword)
|
||||
{
|
||||
var passwords = _selectedParser.TryGetRConPasswords();
|
||||
if (passwords.Length > 1)
|
||||
{
|
||||
var (index, value) =
|
||||
loc["SETUP_RCON_PASSWORD_PROMPT"].PromptSelection(loc["SETUP_RCON_PASSWORD_MANUAL"], null,
|
||||
passwords.Select(pw =>
|
||||
$"{pw.Item1}{(string.IsNullOrEmpty(pw.Item2) ? "" : " " + pw.Item2)}")
|
||||
.ToArray());
|
||||
|
||||
if (index > 0)
|
||||
{
|
||||
Password = passwords[index - 1].Item1;
|
||||
}
|
||||
}
|
||||
|
||||
else if (passwords.Length > 0)
|
||||
{
|
||||
Password = passwords[0].Item1;
|
||||
Console.WriteLine(loc["SETUP_RCON_PASSWORD_RESULT"].FormatExt(Password));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(Password))
|
||||
{
|
||||
Password = loc["SETUP_SERVER_RCON"].PromptString();
|
||||
}
|
||||
|
||||
AutoMessages = new string[0];
|
||||
Rules = new string[0];
|
||||
ManualLogPath = null;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public string Name()
|
||||
{
|
||||
return "ServerConfiguration";
|
||||
}
|
||||
|
||||
public void AddRConParser(IRConParser parser)
|
||||
@ -88,74 +158,5 @@ namespace SharedLibraryCore.Configuration
|
||||
Console.WriteLine(loc["SETUP_SERVER_NO_LOG"]);
|
||||
ManualLogPath = loc["SETUP_SERVER_LOG_PATH"].PromptString();
|
||||
}
|
||||
|
||||
public IBaseConfiguration Generate()
|
||||
{
|
||||
ModifyParsers();
|
||||
var loc = Utilities.CurrentLocalization.LocalizationIndex;
|
||||
var shouldTryFindIp = loc["SETUP_SERVER_IP_AUTO"].PromptBool(defaultValue: true);
|
||||
|
||||
if (shouldTryFindIp)
|
||||
{
|
||||
this.TrySetIpAddress();
|
||||
Console.WriteLine(loc["SETUP_SERVER_IP_AUTO_RESULT"].FormatExt(IPAddress));
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
while (string.IsNullOrEmpty(IPAddress))
|
||||
{
|
||||
var input = loc["SETUP_SERVER_IP"].PromptString();
|
||||
IPAddress = input;
|
||||
}
|
||||
}
|
||||
|
||||
var defaultPort = _selectedParser.Configuration.DefaultRConPort;
|
||||
Port = loc["SETUP_SERVER_PORT"].PromptInt(null, 1, ushort.MaxValue, defaultValue:defaultPort);
|
||||
|
||||
if (!string.IsNullOrEmpty(_selectedParser.Configuration.DefaultInstallationDirectoryHint))
|
||||
{
|
||||
var shouldTryFindPassword = loc["SETUP_RCON_PASSWORD_AUTO"].PromptBool(defaultValue: true);
|
||||
|
||||
if (shouldTryFindPassword)
|
||||
{
|
||||
var passwords = _selectedParser.TryGetRConPasswords();
|
||||
if (passwords.Length > 1)
|
||||
{
|
||||
var (index, value) =
|
||||
loc["SETUP_RCON_PASSWORD_PROMPT"].PromptSelection(loc["SETUP_RCON_PASSWORD_MANUAL"], null,
|
||||
passwords.Select(pw =>
|
||||
$"{pw.Item1}{(string.IsNullOrEmpty(pw.Item2) ? "" : " " + pw.Item2)}").ToArray());
|
||||
|
||||
if (index > 0)
|
||||
{
|
||||
Password = passwords[index - 1].Item1;
|
||||
}
|
||||
}
|
||||
|
||||
else if (passwords.Length > 0)
|
||||
{
|
||||
Password = passwords[0].Item1;
|
||||
Console.WriteLine(loc["SETUP_RCON_PASSWORD_RESULT"].FormatExt(Password));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(Password))
|
||||
{
|
||||
Password = loc["SETUP_SERVER_RCON"].PromptString();
|
||||
}
|
||||
|
||||
AutoMessages = new string[0];
|
||||
Rules = new string[0];
|
||||
ManualLogPath = null;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public string Name()
|
||||
{
|
||||
return "ServerConfiguration";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,11 +1,12 @@
|
||||
using FluentValidation;
|
||||
using System;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using FluentValidation;
|
||||
|
||||
namespace SharedLibraryCore.Configuration.Validation
|
||||
{
|
||||
/// <summary>
|
||||
/// Validation class for main application configuration
|
||||
/// Validation class for main application configuration
|
||||
/// </summary>
|
||||
public class ApplicationConfigurationValidator : AbstractValidator<ApplicationConfiguration>
|
||||
{
|
||||
@ -23,27 +24,27 @@ namespace SharedLibraryCore.Configuration.Validation
|
||||
.When(_app => _app.EnableSocialLink);
|
||||
|
||||
RuleFor(_app => _app.SocialLinkTitle)
|
||||
.NotEmpty()
|
||||
.When(_app => _app.EnableSocialLink);
|
||||
.NotEmpty()
|
||||
.When(_app => _app.EnableSocialLink);
|
||||
|
||||
RuleFor(_app => _app.CustomParserEncoding)
|
||||
.NotEmpty()
|
||||
.When(_app => _app.EnableCustomParserEncoding);
|
||||
.NotEmpty()
|
||||
.When(_app => _app.EnableCustomParserEncoding);
|
||||
|
||||
RuleFor(_app => _app.WebfrontConnectionWhitelist)
|
||||
.NotEmpty()
|
||||
.When(_app => _app.EnableWebfrontConnectionWhitelist);
|
||||
|
||||
RuleForEach(_app => _app.WebfrontConnectionWhitelist)
|
||||
.Must(_address => System.Net.IPAddress.TryParse(_address, out _));
|
||||
.Must(_address => IPAddress.TryParse(_address, out _));
|
||||
|
||||
RuleFor(_app => _app.CustomLocale)
|
||||
.NotEmpty()
|
||||
.When(_app => _app.EnableCustomLocale);
|
||||
.NotEmpty()
|
||||
.When(_app => _app.EnableCustomLocale);
|
||||
|
||||
RuleFor(_app => _app.DatabaseProvider)
|
||||
.NotEmpty()
|
||||
.Must(_provider => new[] { "sqlite", "mysql", "postgresql" }.Contains(_provider));
|
||||
.NotEmpty()
|
||||
.Must(_provider => new[] { "sqlite", "mysql", "postgresql" }.Contains(_provider));
|
||||
|
||||
RuleFor(_app => _app.ConnectionString)
|
||||
.NotEmpty()
|
||||
@ -79,4 +80,4 @@ namespace SharedLibraryCore.Configuration.Validation
|
||||
.SetValidator(new ServerConfigurationValidator());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,10 +1,9 @@
|
||||
using FluentValidation;
|
||||
using System.Net;
|
||||
|
||||
namespace SharedLibraryCore.Configuration.Validation
|
||||
{
|
||||
/// <summary>
|
||||
/// Validation class for server configuration
|
||||
/// Validation class for server configuration
|
||||
/// </summary>
|
||||
public class ServerConfigurationValidator : AbstractValidator<ServerConfiguration>
|
||||
{
|
||||
@ -30,4 +29,4 @@ namespace SharedLibraryCore.Configuration.Validation
|
||||
.MaximumLength(128);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -3,55 +3,65 @@
|
||||
namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
/// <summary>
|
||||
/// data transfer class for audit information
|
||||
/// data transfer class for audit information
|
||||
/// </summary>
|
||||
public class AuditInfo
|
||||
{
|
||||
private string newValue;
|
||||
|
||||
private string oldValue;
|
||||
|
||||
/// <summary>
|
||||
/// name of the origin entity
|
||||
/// name of the origin entity
|
||||
/// </summary>
|
||||
public string OriginName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// id of the origin entity
|
||||
/// id of the origin entity
|
||||
/// </summary>
|
||||
public int OriginId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// name of the target entity
|
||||
/// name of the target entity
|
||||
/// </summary>
|
||||
public string TargetName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// id of the target entity
|
||||
/// id of the target entity
|
||||
/// </summary>
|
||||
public int? TargetId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// when the audit event occured
|
||||
/// when the audit event occured
|
||||
/// </summary>
|
||||
public DateTime When { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// what audit action occured
|
||||
/// what audit action occured
|
||||
/// </summary>
|
||||
public string Action { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// additional comment data about the audit event
|
||||
/// additional comment data about the audit event
|
||||
/// </summary>
|
||||
public string Data { get; set; }
|
||||
|
||||
private string oldValue;
|
||||
/// <summary>
|
||||
/// previous value
|
||||
/// previous value
|
||||
/// </summary>
|
||||
public string OldValue { get => oldValue ?? "--"; set => oldValue = value; }
|
||||
public string OldValue
|
||||
{
|
||||
get => oldValue ?? "--";
|
||||
set => oldValue = value;
|
||||
}
|
||||
|
||||
private string newValue;
|
||||
/// <summary>
|
||||
/// new value
|
||||
/// new value
|
||||
/// </summary>
|
||||
public string NewValue { get => newValue ?? "--"; set => newValue = value; }
|
||||
public string NewValue
|
||||
{
|
||||
get => newValue ?? "--";
|
||||
set => newValue = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,10 +1,12 @@
|
||||
namespace SharedLibraryCore.Dtos
|
||||
using Data.Models.Client;
|
||||
|
||||
namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
public class ClientInfo
|
||||
{
|
||||
public string Name { get; set; }
|
||||
public int ClientId { get; set; }
|
||||
public int LinkId { get; set; }
|
||||
public Database.Models.EFClient.Permission Level { get; set; }
|
||||
public EFClient.Permission Level { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,14 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Dtos
|
||||
namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
public class CommandResponseInfo
|
||||
{
|
||||
public string Response { get; set; }
|
||||
public int ClientId { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,15 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Dtos
|
||||
namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
/// <summary>
|
||||
/// This class holds the basic info for api entities
|
||||
/// This class holds the basic info for api entities
|
||||
/// </summary>
|
||||
public class EntityInfo
|
||||
{
|
||||
public long Id { get; set; }
|
||||
public string Name { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -3,13 +3,13 @@
|
||||
public class ErrorResponse
|
||||
{
|
||||
/// <summary>
|
||||
/// todo: type of error
|
||||
/// todo: type of error
|
||||
/// </summary>
|
||||
public string Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// relevant error messages
|
||||
/// relevant error messages
|
||||
/// </summary>
|
||||
public string[] Messages { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,10 +1,9 @@
|
||||
using System;
|
||||
using static SharedLibraryCore.GameEvent;
|
||||
|
||||
namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
/// <summary>
|
||||
/// This class wraps the information related to a generated event for the API
|
||||
/// This class wraps the information related to a generated event for the API
|
||||
/// </summary>
|
||||
public class EventInfo
|
||||
{
|
||||
@ -15,6 +14,6 @@ namespace SharedLibraryCore.Dtos
|
||||
public EntityInfo OwnerEntity { get; set; }
|
||||
public DateTime EventTime { get; set; }
|
||||
public string ExtraInfo { get; set; }
|
||||
public string Id { get; private set; } = Guid.NewGuid().ToString();
|
||||
public string Id { get; } = Guid.NewGuid().ToString();
|
||||
}
|
||||
}
|
@ -3,15 +3,18 @@
|
||||
public class FindClientRequest : PaginationRequest
|
||||
{
|
||||
/// <summary>
|
||||
/// name of client
|
||||
/// name of client
|
||||
/// </summary>
|
||||
public string Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// network id of client
|
||||
/// network id of client
|
||||
/// </summary>
|
||||
public string Xuid { get; set; }
|
||||
|
||||
public string ToDebugString() => $"[Name={Name}, Xuid={Xuid}]";
|
||||
public string ToDebugString()
|
||||
{
|
||||
return $"[Name={Name}, Xuid={Xuid}]";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -3,18 +3,18 @@
|
||||
public class FindClientResult
|
||||
{
|
||||
/// <summary>
|
||||
/// client identifier
|
||||
/// client identifier
|
||||
/// </summary>
|
||||
public int ClientId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// networkid of client
|
||||
/// networkid of client
|
||||
/// </summary>
|
||||
public string Xuid { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// name of client
|
||||
/// name of client
|
||||
/// </summary>
|
||||
public string Name { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -13,13 +13,13 @@ namespace SharedLibraryCore.Dtos
|
||||
public DateTime MaxConcurrentClientsTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// specifies the game name filter
|
||||
/// specifies the game name filter
|
||||
/// </summary>
|
||||
public Game? Game { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// collection of unique game names being monitored
|
||||
/// collection of unique game names being monitored
|
||||
/// </summary>
|
||||
public Game[] ActiveServerGames { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,11 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Dtos.Meta.Requests
|
||||
namespace SharedLibraryCore.Dtos.Meta.Requests
|
||||
{
|
||||
public class BaseClientMetaRequest : PaginationRequest
|
||||
{
|
||||
public int ClientId { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,11 +1,6 @@
|
||||
using SharedLibraryCore.QueryHelper;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Dtos.Meta.Requests
|
||||
namespace SharedLibraryCore.Dtos.Meta.Requests
|
||||
{
|
||||
public class ReceivedPenaltyRequest : BaseClientMetaRequest
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
@ -1,10 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Dtos.Meta.Responses
|
||||
namespace SharedLibraryCore.Dtos.Meta.Responses
|
||||
{
|
||||
public class AdministeredPenaltyResponse : ReceivedPenaltyResponse
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
@ -1,17 +1,17 @@
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Dtos.Meta.Responses
|
||||
{
|
||||
public class BaseMetaResponse : IClientMeta, IClientMetaResponse
|
||||
{
|
||||
public long MetaId { get; set; }
|
||||
public int ClientId { get; set; }
|
||||
public MetaType Type { get; set; }
|
||||
public DateTime When { get; set; }
|
||||
public bool IsSensitive { get; set; }
|
||||
public bool ShouldDisplay { get; set; }
|
||||
public int? Column { get; set; }
|
||||
public int? Order { get; set; }
|
||||
public long MetaId { get; set; }
|
||||
public int ClientId { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,9 +1,4 @@
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Dtos.Meta.Responses
|
||||
namespace SharedLibraryCore.Dtos.Meta.Responses
|
||||
{
|
||||
public class InformationResponse : BaseMetaResponse
|
||||
{
|
||||
@ -11,4 +6,4 @@ namespace SharedLibraryCore.Dtos.Meta.Responses
|
||||
public string Value { get; set; }
|
||||
public string ToolTipText { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -9,30 +9,30 @@ namespace SharedLibraryCore.Dtos.Meta.Responses
|
||||
public bool IsHidden { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// name of the client
|
||||
/// name of the client
|
||||
/// </summary>
|
||||
public string ClientName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// hostname of the server
|
||||
/// hostname of the server
|
||||
/// </summary>
|
||||
public string ServerName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// specifies the game the chat occured on
|
||||
/// specifies the game the chat occured on
|
||||
/// </summary>
|
||||
public Server.Game GameName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// indicates if the chat message is a quick message phrase
|
||||
/// indicates if the chat message is a quick message phrase
|
||||
/// </summary>
|
||||
public bool IsQuickMessage { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// indicates if the message was sent ingame
|
||||
/// indicates if the message was sent ingame
|
||||
/// </summary>
|
||||
public bool SentIngame { get; set; }
|
||||
|
||||
public string HiddenMessage => string.Concat(Enumerable.Repeat('●', Message.Length));
|
||||
}
|
||||
}
|
||||
}
|
@ -14,9 +14,16 @@ namespace SharedLibraryCore.Dtos.Meta.Responses
|
||||
public string Offense { get; set; }
|
||||
public string AutomatedOffense { get; set; }
|
||||
public DateTime? ExpirationDate { get; set; }
|
||||
public string ExpiresInText => ExpirationDate.HasValue && ExpirationDate.Value > DateTime.UtcNow ? (ExpirationDate - DateTime.UtcNow).Value.HumanizeForCurrentCulture() : "";
|
||||
public string LengthText => ExpirationDate.HasValue ? (ExpirationDate.Value.AddMinutes(1) - When).HumanizeForCurrentCulture() : "";
|
||||
|
||||
public string ExpiresInText => ExpirationDate.HasValue && ExpirationDate.Value > DateTime.UtcNow
|
||||
? (ExpirationDate - DateTime.UtcNow).Value.HumanizeForCurrentCulture()
|
||||
: "";
|
||||
|
||||
public string LengthText => ExpirationDate.HasValue
|
||||
? (ExpirationDate.Value.AddMinutes(1) - When).HumanizeForCurrentCulture()
|
||||
: "";
|
||||
|
||||
public bool IsLinked { get; set; }
|
||||
public int LinkedClientId { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -15,6 +15,9 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
public override int GetHashCode() => $"{Name.StripColors()}{IPAddress}".GetStableHashCode();
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return $"{Name.StripColors()}{IPAddress}".GetStableHashCode();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,8 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Dtos.Meta
|
||||
namespace SharedLibraryCore.Dtos.Meta
|
||||
{
|
||||
public class WebfrontTranslationHelper
|
||||
{
|
||||
@ -10,4 +6,4 @@ namespace SharedLibraryCore.Dtos.Meta
|
||||
public string MatchValue { get; set; }
|
||||
public string TranslationValue { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -5,4 +5,4 @@
|
||||
public string Name { get; set; }
|
||||
public string Location { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -3,27 +3,27 @@
|
||||
namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
/// <summary>
|
||||
/// pagination information holder class
|
||||
/// pagination information holder class
|
||||
/// </summary>
|
||||
public class PaginationRequest
|
||||
{
|
||||
/// <summary>
|
||||
/// how many items to skip
|
||||
/// how many items to skip
|
||||
/// </summary>
|
||||
public int Offset { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// how many itesm to take
|
||||
/// how many itesm to take
|
||||
/// </summary>
|
||||
public int Count { get; set; } = 100;
|
||||
|
||||
/// <summary>
|
||||
/// filter query
|
||||
/// filter query
|
||||
/// </summary>
|
||||
public string Filter { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// direction of ordering
|
||||
/// direction of ordering
|
||||
/// </summary>
|
||||
public SortDirection Direction { get; set; } = SortDirection.Descending;
|
||||
|
||||
@ -35,4 +35,4 @@ namespace SharedLibraryCore.Dtos
|
||||
Ascending,
|
||||
Descending
|
||||
}
|
||||
}
|
||||
}
|
@ -22,11 +22,20 @@ namespace SharedLibraryCore.Dtos
|
||||
public string PenaltyTypeText => PenaltyType.ToString();
|
||||
public DateTime TimePunished { get; set; }
|
||||
public string TimePunishedString => TimePunished.HumanizeForCurrentCulture();
|
||||
public string TimeRemaining => DateTime.UtcNow > Expires ? "" : $"{((Expires ?? DateTime.MaxValue).Year == DateTime.MaxValue.Year ? TimePunishedString : ((Expires ?? DateTime.MaxValue) - DateTime.UtcNow).HumanizeForCurrentCulture())}";
|
||||
|
||||
public string TimeRemaining => DateTime.UtcNow > Expires
|
||||
? ""
|
||||
: $"{((Expires ?? DateTime.MaxValue).Year == DateTime.MaxValue.Year ? TimePunishedString : ((Expires ?? DateTime.MaxValue) - DateTime.UtcNow).HumanizeForCurrentCulture())}";
|
||||
|
||||
public bool Expired => Expires.HasValue && Expires <= DateTime.UtcNow;
|
||||
public DateTime? Expires { get; set; }
|
||||
public override bool Sensitive => PenaltyType == EFPenalty.PenaltyType.Flag || PenaltyType == EFPenalty.PenaltyType.Unflag;
|
||||
|
||||
public override bool Sensitive =>
|
||||
PenaltyType == EFPenalty.PenaltyType.Flag || PenaltyType == EFPenalty.PenaltyType.Unflag;
|
||||
|
||||
public bool IsEvade { get; set; }
|
||||
public string AdditionalPenaltyInformation => $"{(!string.IsNullOrEmpty(AutomatedOffense) ? $" ({AutomatedOffense})" : "")}{(IsEvade ? $" ({Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_EVADE"]})" : "")}";
|
||||
|
||||
public string AdditionalPenaltyInformation =>
|
||||
$"{(!string.IsNullOrEmpty(AutomatedOffense) ? $" ({AutomatedOffense})" : "")}{(IsEvade ? $" ({Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_EVADE"]})" : "")}";
|
||||
}
|
||||
}
|
||||
}
|
@ -1,8 +1,8 @@
|
||||
using SharedLibraryCore.Dtos.Meta.Responses;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Data.Models;
|
||||
using SharedLibraryCore.Dtos.Meta.Responses;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
@ -30,4 +30,4 @@ namespace SharedLibraryCore.Dtos
|
||||
public MetaType? MetaFilterType { get; set; }
|
||||
public double? ZScore { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,8 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using SharedLibraryCore.Helpers;
|
||||
|
||||
namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
@ -16,7 +15,7 @@ namespace SharedLibraryCore.Dtos
|
||||
public int MaxClients { get; set; }
|
||||
public List<ChatInfo> ChatHistory { get; set; }
|
||||
public List<PlayerInfo> Players { get; set; }
|
||||
public Helpers.PlayerHistory[] PlayerHistory { get; set; }
|
||||
public PlayerHistory[] PlayerHistory { get; set; }
|
||||
public List<ClientCountSnapshot> ClientCountHistory { get; set; }
|
||||
public long ID { get; set; }
|
||||
public bool Online { get; set; }
|
||||
@ -31,7 +30,7 @@ namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
var valid = Players.Where(player => player.ZScore != null && player.ZScore != 0)
|
||||
.ToList();
|
||||
|
||||
|
||||
if (!valid.Any())
|
||||
{
|
||||
return null;
|
||||
|
@ -1,5 +1,4 @@
|
||||
|
||||
namespace SharedLibraryCore.Dtos
|
||||
namespace SharedLibraryCore.Dtos
|
||||
{
|
||||
public class SharedInfo
|
||||
{
|
||||
|
@ -8,4 +8,4 @@
|
||||
public T LatchedValue { get; set; }
|
||||
public string Domain { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,5 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using SharedLibraryCore.Dtos;
|
||||
|
||||
@ -7,8 +6,8 @@ namespace SharedLibraryCore.Events
|
||||
{
|
||||
public class EventApi
|
||||
{
|
||||
const int MaxEvents = 25;
|
||||
static ConcurrentQueue<EventInfo> RecentEvents = new ConcurrentQueue<EventInfo>();
|
||||
private const int MaxEvents = 25;
|
||||
private static readonly ConcurrentQueue<EventInfo> RecentEvents = new ConcurrentQueue<EventInfo>();
|
||||
|
||||
public static IEnumerable<EventInfo> GetEvents(bool shouldConsume)
|
||||
{
|
||||
@ -28,32 +27,38 @@ namespace SharedLibraryCore.Events
|
||||
var E = gameEvent;
|
||||
// don't want to clog up the api with unknown events
|
||||
if (E.Type == GameEvent.EventType.Unknown)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var apiEvent = new EventInfo()
|
||||
var apiEvent = new EventInfo
|
||||
{
|
||||
ExtraInfo = E.Extra?.ToString() ?? E.Data,
|
||||
GameInfo = new EntityInfo()
|
||||
GameInfo = new EntityInfo
|
||||
{
|
||||
Name = E.Owner.GameName.ToString(),
|
||||
Id = (int)E.Owner.GameName
|
||||
},
|
||||
OwnerEntity = new EntityInfo()
|
||||
OwnerEntity = new EntityInfo
|
||||
{
|
||||
Name = E.Owner.Hostname,
|
||||
Id = E.Owner.EndPoint
|
||||
},
|
||||
OriginEntity = E.Origin == null ? null : new EntityInfo()
|
||||
{
|
||||
Id = E.Origin.ClientId,
|
||||
Name = E.Origin.Name
|
||||
},
|
||||
TargetEntity = E.Target == null ? null : new EntityInfo()
|
||||
{
|
||||
Id = E.Target.ClientId,
|
||||
Name = E.Target.Name
|
||||
},
|
||||
EventType = new EntityInfo()
|
||||
OriginEntity = E.Origin == null
|
||||
? null
|
||||
: new EntityInfo
|
||||
{
|
||||
Id = E.Origin.ClientId,
|
||||
Name = E.Origin.Name
|
||||
},
|
||||
TargetEntity = E.Target == null
|
||||
? null
|
||||
: new EntityInfo
|
||||
{
|
||||
Id = E.Target.ClientId,
|
||||
Name = E.Target.Name
|
||||
},
|
||||
EventType = new EntityInfo
|
||||
{
|
||||
Id = (int)E.Type,
|
||||
Name = E.Type.ToString()
|
||||
@ -66,16 +71,18 @@ namespace SharedLibraryCore.Events
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Adds event to the list and removes first added if reached max capacity
|
||||
/// Adds event to the list and removes first added if reached max capacity
|
||||
/// </summary>
|
||||
/// <param name="info">EventInfo to add</param>
|
||||
private static void AddNewEvent(EventInfo info)
|
||||
{
|
||||
// remove the first added event
|
||||
if (RecentEvents.Count >= MaxEvents)
|
||||
{
|
||||
RecentEvents.TryDequeue(out _);
|
||||
}
|
||||
|
||||
RecentEvents.Enqueue(info);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,11 +1,10 @@
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using SharedLibraryCore.Events;
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Serilog.Context;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
|
||||
namespace SharedLibraryCore
|
||||
{
|
||||
@ -14,189 +13,38 @@ namespace SharedLibraryCore
|
||||
public enum EventFailReason
|
||||
{
|
||||
/// <summary>
|
||||
/// event execution did not fail
|
||||
/// event execution did not fail
|
||||
/// </summary>
|
||||
None,
|
||||
|
||||
/// <summary>
|
||||
/// an internal exception prevented the event
|
||||
/// from executing
|
||||
/// an internal exception prevented the event
|
||||
/// from executing
|
||||
/// </summary>
|
||||
Exception,
|
||||
|
||||
/// <summary>
|
||||
/// event origin didn't have the necessary privileges
|
||||
/// to execute the command
|
||||
/// event origin didn't have the necessary privileges
|
||||
/// to execute the command
|
||||
/// </summary>
|
||||
Permission,
|
||||
|
||||
/// <summary>
|
||||
/// executing the event would cause an invalid state
|
||||
/// executing the event would cause an invalid state
|
||||
/// </summary>
|
||||
Invalid,
|
||||
|
||||
/// <summary>
|
||||
/// client is doing too much of something
|
||||
/// client is doing too much of something
|
||||
/// </summary>
|
||||
Throttle,
|
||||
|
||||
/// <summary>
|
||||
/// the event timed out before completion
|
||||
/// the event timed out before completion
|
||||
/// </summary>
|
||||
Timeout
|
||||
}
|
||||
|
||||
public enum EventType
|
||||
{
|
||||
/// <summary>
|
||||
/// the event wasn't parsed properly
|
||||
/// </summary>
|
||||
Unknown,
|
||||
|
||||
// events "generated" by the server
|
||||
/// <summary>
|
||||
/// a server started being monitored
|
||||
/// </summary>
|
||||
Start,
|
||||
/// <summary>
|
||||
/// a server stopped being monitored
|
||||
/// </summary>
|
||||
Stop,
|
||||
/// <summary>
|
||||
/// a client was detecting as connecting via log
|
||||
/// </summary>
|
||||
Connect,
|
||||
/// <summary>
|
||||
/// a client was detecting joining by RCon
|
||||
/// </summary>
|
||||
Join,
|
||||
/// <summary>
|
||||
/// a client was detected leaving via log
|
||||
/// </summary>
|
||||
Quit,
|
||||
/// <summary>
|
||||
/// a client was detected leaving by RCon
|
||||
/// </summary>
|
||||
Disconnect,
|
||||
/// <summary>
|
||||
/// the current map ended
|
||||
/// </summary>
|
||||
MapEnd,
|
||||
/// <summary>
|
||||
/// the current map changed
|
||||
/// </summary>
|
||||
MapChange,
|
||||
/// <summary>
|
||||
/// a client was detected as starting to connect
|
||||
/// </summary>
|
||||
PreConnect,
|
||||
/// <summary>
|
||||
/// a client was detecting as starting to disconnect
|
||||
/// </summary>
|
||||
PreDisconnect,
|
||||
/// <summary>
|
||||
/// a client's information was updated
|
||||
/// </summary>
|
||||
Update,
|
||||
/// <summary>
|
||||
/// connection was lost to a server (the server has not responded after a number of attempts)
|
||||
/// </summary>
|
||||
ConnectionLost,
|
||||
/// <summary>
|
||||
/// connection was restored to a server (the server began responding again)
|
||||
/// </summary>
|
||||
ConnectionRestored,
|
||||
|
||||
// events "generated" by clients
|
||||
/// <summary>
|
||||
/// a client sent a message
|
||||
/// </summary>
|
||||
Say = 100,
|
||||
/// <summary>
|
||||
/// a client was warned
|
||||
/// </summary>
|
||||
Warn = 101,
|
||||
/// <summary>
|
||||
/// all warnings for a client were cleared
|
||||
/// </summary>
|
||||
WarnClear = 102,
|
||||
/// <summary>
|
||||
/// a client was reported
|
||||
/// </summary>
|
||||
Report = 103,
|
||||
/// <summary>
|
||||
/// a client was flagged
|
||||
/// </summary>
|
||||
Flag = 104,
|
||||
/// <summary>
|
||||
/// a client was unflagged
|
||||
/// </summary>
|
||||
Unflag = 105,
|
||||
/// <summary>
|
||||
/// a client was kicked
|
||||
/// </summary>
|
||||
Kick = 106,
|
||||
/// <summary>
|
||||
/// a client was tempbanned
|
||||
/// </summary>
|
||||
TempBan = 107,
|
||||
/// <summary>
|
||||
/// a client was banned
|
||||
/// </summary>
|
||||
Ban = 108,
|
||||
/// <summary>
|
||||
/// a client was unbanned
|
||||
/// </summary>
|
||||
Unban = 109,
|
||||
/// <summary>
|
||||
/// a client entered a command
|
||||
/// </summary>
|
||||
Command = 110,
|
||||
/// <summary>
|
||||
/// a client's permission was changed
|
||||
/// </summary>
|
||||
ChangePermission = 111,
|
||||
/// <summary>
|
||||
/// client logged in to webfront
|
||||
/// </summary>
|
||||
Login = 112,
|
||||
/// <summary>
|
||||
/// client logged out of webfront
|
||||
/// </summary>
|
||||
Logout = 113,
|
||||
|
||||
// events "generated" by IW4MAdmin
|
||||
/// <summary>
|
||||
/// a message is sent to all clients
|
||||
/// </summary>
|
||||
Broadcast = 200,
|
||||
/// <summary>
|
||||
/// a message is sent to a specific client
|
||||
/// </summary>
|
||||
Tell = 201,
|
||||
|
||||
// events "generated" by script/log
|
||||
/// <summary>
|
||||
/// AC Damage Log
|
||||
/// </summary>
|
||||
ScriptDamage = 300,
|
||||
/// <summary>
|
||||
/// AC Kill Log
|
||||
/// </summary>
|
||||
ScriptKill = 301,
|
||||
/// <summary>
|
||||
/// damage info printed out by game script
|
||||
/// </summary>
|
||||
Damage = 302,
|
||||
/// <summary>
|
||||
/// kill info printed out by game script
|
||||
/// </summary>
|
||||
Kill = 303,
|
||||
/// <summary>
|
||||
/// team info printed out by game script
|
||||
/// </summary>
|
||||
JoinTeam = 304,
|
||||
/// <summary>
|
||||
/// used for community generated plugin events
|
||||
/// </summary>
|
||||
Other
|
||||
}
|
||||
|
||||
[Flags]
|
||||
public enum EventRequiredEntity
|
||||
{
|
||||
@ -213,12 +61,203 @@ namespace SharedLibraryCore
|
||||
Internal
|
||||
}
|
||||
|
||||
static long NextEventId;
|
||||
static long GetNextEventId()
|
||||
public enum EventType
|
||||
{
|
||||
return Interlocked.Increment(ref NextEventId);
|
||||
/// <summary>
|
||||
/// the event wasn't parsed properly
|
||||
/// </summary>
|
||||
Unknown,
|
||||
|
||||
// events "generated" by the server
|
||||
/// <summary>
|
||||
/// a server started being monitored
|
||||
/// </summary>
|
||||
Start,
|
||||
|
||||
/// <summary>
|
||||
/// a server stopped being monitored
|
||||
/// </summary>
|
||||
Stop,
|
||||
|
||||
/// <summary>
|
||||
/// a client was detecting as connecting via log
|
||||
/// </summary>
|
||||
Connect,
|
||||
|
||||
/// <summary>
|
||||
/// a client was detecting joining by RCon
|
||||
/// </summary>
|
||||
Join,
|
||||
|
||||
/// <summary>
|
||||
/// a client was detected leaving via log
|
||||
/// </summary>
|
||||
Quit,
|
||||
|
||||
/// <summary>
|
||||
/// a client was detected leaving by RCon
|
||||
/// </summary>
|
||||
Disconnect,
|
||||
|
||||
/// <summary>
|
||||
/// the current map ended
|
||||
/// </summary>
|
||||
MapEnd,
|
||||
|
||||
/// <summary>
|
||||
/// the current map changed
|
||||
/// </summary>
|
||||
MapChange,
|
||||
|
||||
/// <summary>
|
||||
/// a client was detected as starting to connect
|
||||
/// </summary>
|
||||
PreConnect,
|
||||
|
||||
/// <summary>
|
||||
/// a client was detecting as starting to disconnect
|
||||
/// </summary>
|
||||
PreDisconnect,
|
||||
|
||||
/// <summary>
|
||||
/// a client's information was updated
|
||||
/// </summary>
|
||||
Update,
|
||||
|
||||
/// <summary>
|
||||
/// connection was lost to a server (the server has not responded after a number of attempts)
|
||||
/// </summary>
|
||||
ConnectionLost,
|
||||
|
||||
/// <summary>
|
||||
/// connection was restored to a server (the server began responding again)
|
||||
/// </summary>
|
||||
ConnectionRestored,
|
||||
|
||||
// events "generated" by clients
|
||||
/// <summary>
|
||||
/// a client sent a message
|
||||
/// </summary>
|
||||
Say = 100,
|
||||
|
||||
/// <summary>
|
||||
/// a client was warned
|
||||
/// </summary>
|
||||
Warn = 101,
|
||||
|
||||
/// <summary>
|
||||
/// all warnings for a client were cleared
|
||||
/// </summary>
|
||||
WarnClear = 102,
|
||||
|
||||
/// <summary>
|
||||
/// a client was reported
|
||||
/// </summary>
|
||||
Report = 103,
|
||||
|
||||
/// <summary>
|
||||
/// a client was flagged
|
||||
/// </summary>
|
||||
Flag = 104,
|
||||
|
||||
/// <summary>
|
||||
/// a client was unflagged
|
||||
/// </summary>
|
||||
Unflag = 105,
|
||||
|
||||
/// <summary>
|
||||
/// a client was kicked
|
||||
/// </summary>
|
||||
Kick = 106,
|
||||
|
||||
/// <summary>
|
||||
/// a client was tempbanned
|
||||
/// </summary>
|
||||
TempBan = 107,
|
||||
|
||||
/// <summary>
|
||||
/// a client was banned
|
||||
/// </summary>
|
||||
Ban = 108,
|
||||
|
||||
/// <summary>
|
||||
/// a client was unbanned
|
||||
/// </summary>
|
||||
Unban = 109,
|
||||
|
||||
/// <summary>
|
||||
/// a client entered a command
|
||||
/// </summary>
|
||||
Command = 110,
|
||||
|
||||
/// <summary>
|
||||
/// a client's permission was changed
|
||||
/// </summary>
|
||||
ChangePermission = 111,
|
||||
|
||||
/// <summary>
|
||||
/// client logged in to webfront
|
||||
/// </summary>
|
||||
Login = 112,
|
||||
|
||||
/// <summary>
|
||||
/// client logged out of webfront
|
||||
/// </summary>
|
||||
Logout = 113,
|
||||
|
||||
// events "generated" by IW4MAdmin
|
||||
/// <summary>
|
||||
/// a message is sent to all clients
|
||||
/// </summary>
|
||||
Broadcast = 200,
|
||||
|
||||
/// <summary>
|
||||
/// a message is sent to a specific client
|
||||
/// </summary>
|
||||
Tell = 201,
|
||||
|
||||
// events "generated" by script/log
|
||||
/// <summary>
|
||||
/// AC Damage Log
|
||||
/// </summary>
|
||||
ScriptDamage = 300,
|
||||
|
||||
/// <summary>
|
||||
/// AC Kill Log
|
||||
/// </summary>
|
||||
ScriptKill = 301,
|
||||
|
||||
/// <summary>
|
||||
/// damage info printed out by game script
|
||||
/// </summary>
|
||||
Damage = 302,
|
||||
|
||||
/// <summary>
|
||||
/// kill info printed out by game script
|
||||
/// </summary>
|
||||
Kill = 303,
|
||||
|
||||
/// <summary>
|
||||
/// team info printed out by game script
|
||||
/// </summary>
|
||||
JoinTeam = 304,
|
||||
|
||||
/// <summary>
|
||||
/// used for community generated plugin events
|
||||
/// </summary>
|
||||
Other
|
||||
}
|
||||
|
||||
private static long NextEventId;
|
||||
private readonly ManualResetEvent _eventFinishedWaiter;
|
||||
public string Data; // Data is usually the message sent by player
|
||||
public string Message;
|
||||
public EFClient Origin;
|
||||
public Server Owner;
|
||||
public EFClient Target;
|
||||
|
||||
public EventType Type;
|
||||
|
||||
public GameEvent()
|
||||
{
|
||||
_eventFinishedWaiter = new ManualResetEvent(false);
|
||||
@ -226,44 +265,46 @@ namespace SharedLibraryCore
|
||||
Id = GetNextEventId();
|
||||
}
|
||||
|
||||
~GameEvent()
|
||||
{
|
||||
_eventFinishedWaiter.Set();
|
||||
_eventFinishedWaiter.Dispose();
|
||||
}
|
||||
|
||||
public EventType Type;
|
||||
public EventSource Source { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// suptype of the event for more detailed classification
|
||||
/// suptype of the event for more detailed classification
|
||||
/// </summary>
|
||||
public string Subtype { get; set; }
|
||||
|
||||
public EventRequiredEntity RequiredEntity { get; set; }
|
||||
public string Data; // Data is usually the message sent by player
|
||||
public string Message;
|
||||
|
||||
/// <summary>
|
||||
/// Specifies the game time offset as printed in the log
|
||||
/// Specifies the game time offset as printed in the log
|
||||
/// </summary>
|
||||
public long? GameTime { get; set; }
|
||||
public EFClient Origin;
|
||||
public EFClient Target;
|
||||
|
||||
public EFClient ImpersonationOrigin { get; set; }
|
||||
public Server Owner;
|
||||
public bool IsRemote { get; set; }
|
||||
public object Extra { get; set; }
|
||||
private readonly ManualResetEvent _eventFinishedWaiter;
|
||||
public DateTime Time { get; set; }
|
||||
public long Id { get; private set; }
|
||||
public long Id { get; }
|
||||
public EventFailReason FailReason { get; set; }
|
||||
public bool Failed => FailReason != EventFailReason.None;
|
||||
public Guid CorrelationId { get; set; } = Guid.NewGuid();
|
||||
public List<string> Output { get; set; } = new List<string>();
|
||||
|
||||
/// <summary>
|
||||
/// Indicates if the event should block until it is complete
|
||||
/// Indicates if the event should block until it is complete
|
||||
/// </summary>
|
||||
public bool IsBlocking { get; set; }
|
||||
|
||||
private static long GetNextEventId()
|
||||
{
|
||||
return Interlocked.Increment(ref NextEventId);
|
||||
}
|
||||
|
||||
~GameEvent()
|
||||
{
|
||||
_eventFinishedWaiter.Set();
|
||||
_eventFinishedWaiter.Dispose();
|
||||
}
|
||||
|
||||
public void Complete()
|
||||
{
|
||||
_eventFinishedWaiter.Set();
|
||||
@ -275,12 +316,12 @@ namespace SharedLibraryCore
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// asynchronously wait for GameEvent to be processed
|
||||
/// asynchronously wait for GameEvent to be processed
|
||||
/// </summary>
|
||||
/// <returns>waitable task </returns>
|
||||
public async Task<GameEvent> WaitAsync(TimeSpan timeSpan, CancellationToken token)
|
||||
{
|
||||
bool processed = false;
|
||||
var processed = false;
|
||||
Utilities.DefaultLogger.LogDebug("Begin wait for event {Id}", Id);
|
||||
try
|
||||
{
|
||||
@ -294,9 +335,10 @@ namespace SharedLibraryCore
|
||||
|
||||
if (!processed)
|
||||
{
|
||||
using(LogContext.PushProperty("Server", Owner?.ToString()))
|
||||
using (LogContext.PushProperty("Server", Owner?.ToString()))
|
||||
{
|
||||
Utilities.DefaultLogger.LogError("Waiting for event to complete timed out {@eventData}", new { Event = this, Message, Origin = Origin?.ToString(), Target = Target?.ToString()});
|
||||
Utilities.DefaultLogger.LogError("Waiting for event to complete timed out {@eventData}",
|
||||
new { Event = this, Message, Origin = Origin?.ToString(), Target = Target?.ToString() });
|
||||
}
|
||||
}
|
||||
|
||||
@ -305,4 +347,4 @@ namespace SharedLibraryCore
|
||||
return this;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,23 +1,21 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace SharedLibraryCore.Events
|
||||
{
|
||||
/// <summary>
|
||||
/// represents the state of a game event for event processing
|
||||
/// represents the state of a game event for event processing
|
||||
/// </summary>
|
||||
public class GameEventArgs : System.ComponentModel.AsyncCompletedEventArgs
|
||||
public class GameEventArgs : AsyncCompletedEventArgs
|
||||
{
|
||||
|
||||
public GameEventArgs(Exception error, bool cancelled, GameEvent userState) : base(error, cancelled, userState)
|
||||
{
|
||||
Event = userState;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Game event that occured on a server
|
||||
/// Game event that occured on a server
|
||||
/// </summary>
|
||||
public GameEvent Event { get; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,11 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Exceptions
|
||||
{
|
||||
public class AuthorizationException : Exception
|
||||
{
|
||||
public AuthorizationException(string message) : base (message) { }
|
||||
public AuthorizationException(string message) : base(message)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,15 +1,12 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Exceptions
|
||||
namespace SharedLibraryCore.Exceptions
|
||||
{
|
||||
public class CommandException : ServerException
|
||||
{
|
||||
public CommandException(string msg) : base(msg) { }
|
||||
public CommandException(string msg) : base(msg)
|
||||
{
|
||||
}
|
||||
|
||||
// .data contains
|
||||
// "command_name"
|
||||
}
|
||||
}
|
||||
}
|
@ -4,9 +4,11 @@ namespace SharedLibraryCore.Exceptions
|
||||
{
|
||||
public class ConfigurationException : Exception
|
||||
{
|
||||
public ConfigurationException(string message) : base(message)
|
||||
{
|
||||
}
|
||||
|
||||
public string[] Errors { get; set; }
|
||||
public string ConfigurationFileName { get; set; }
|
||||
|
||||
public ConfigurationException(string message) : base(message) { }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,13 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Exceptions
|
||||
{
|
||||
public class DatabaseException : Exception
|
||||
{
|
||||
public DatabaseException(string msg) : base(msg) { }
|
||||
public DatabaseException(string msg) : base(msg)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,13 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Exceptions
|
||||
namespace SharedLibraryCore.Exceptions
|
||||
{
|
||||
public class DvarException : ServerException
|
||||
{
|
||||
public DvarException(string msg) : base(msg) { }
|
||||
public DvarException(string msg) : base(msg)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,18 +1,16 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net.Sockets;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Net.Sockets;
|
||||
|
||||
namespace SharedLibraryCore.Exceptions
|
||||
{
|
||||
public class NetworkException : ServerException
|
||||
{
|
||||
public NetworkException(string msg) : base(msg) { }
|
||||
public NetworkException(string msg) : base(msg)
|
||||
{
|
||||
}
|
||||
|
||||
public NetworkException(string msg, Socket s) : base(msg)
|
||||
{
|
||||
this.Data.Add("socket", s);
|
||||
Data.Add("socket", s);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -4,8 +4,10 @@ namespace SharedLibraryCore.Exceptions
|
||||
{
|
||||
public class PluginException : Exception
|
||||
{
|
||||
public PluginException(string message) : base(message) { }
|
||||
public PluginException(string message) : base(message)
|
||||
{
|
||||
}
|
||||
|
||||
public string PluginFile { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,13 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Exceptions
|
||||
{
|
||||
public class SerializeException : Exception
|
||||
{
|
||||
public SerializeException(string msg) : base(msg) { }
|
||||
public SerializeException(string msg) : base(msg)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,13 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Exceptions
|
||||
{
|
||||
public class ServerException : Exception
|
||||
{
|
||||
public ServerException(string msg) : base(msg) { }
|
||||
public ServerException(string msg) : base(msg)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -21,6 +21,5 @@ namespace SharedLibraryCore.Formatting
|
||||
|
||||
public class ColorCodeMapping : Dictionary<string, string>
|
||||
{
|
||||
|
||||
}
|
||||
}
|
@ -5,4 +5,4 @@
|
||||
public string Name { get; set; }
|
||||
public string Alias { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -5,6 +5,9 @@
|
||||
public string Name { get; set; }
|
||||
public string Alias { get; set; }
|
||||
|
||||
public override string ToString() => Alias;
|
||||
public override string ToString()
|
||||
{
|
||||
return Alias;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -6,12 +6,41 @@ namespace SharedLibraryCore.Helpers
|
||||
{
|
||||
public class BuildNumber : IComparable
|
||||
{
|
||||
private BuildNumber()
|
||||
{
|
||||
}
|
||||
|
||||
public int Major { get; private set; }
|
||||
public int Minor { get; private set; }
|
||||
public int Build { get; private set; }
|
||||
public int Revision { get; private set; }
|
||||
|
||||
private BuildNumber() { }
|
||||
public int CompareTo(object obj)
|
||||
{
|
||||
if (obj == null)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
var buildNumber = obj as BuildNumber;
|
||||
if (buildNumber == null)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (ReferenceEquals(this, buildNumber))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return Major == buildNumber.Major
|
||||
? Minor == buildNumber.Minor
|
||||
? Build == buildNumber.Build
|
||||
? Revision.CompareTo(buildNumber.Revision)
|
||||
: Build.CompareTo(buildNumber.Build)
|
||||
: Minor.CompareTo(buildNumber.Minor)
|
||||
: Major.CompareTo(buildNumber.Major);
|
||||
}
|
||||
|
||||
public static bool TryParse(string input, out BuildNumber buildNumber)
|
||||
{
|
||||
@ -28,23 +57,32 @@ namespace SharedLibraryCore.Helpers
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Parses a build number string into a BuildNumber class
|
||||
/// Parses a build number string into a BuildNumber class
|
||||
/// </summary>
|
||||
/// <param name="buildNumber">The build number string to parse</param>
|
||||
/// <returns>A new BuildNumber class set from the buildNumber string</returns>
|
||||
/// <exception cref="ArgumentException">Thrown if there are less than 2 or
|
||||
/// more than 4 version parts to the build number</exception>
|
||||
/// <exception cref="FormatException">Thrown if string cannot be parsed
|
||||
/// to a series of integers</exception>
|
||||
/// <exception cref="ArgumentOutOfRangeException">Thrown if any version
|
||||
/// integer is less than zero</exception>
|
||||
/// <exception cref="ArgumentException">
|
||||
/// Thrown if there are less than 2 or
|
||||
/// more than 4 version parts to the build number
|
||||
/// </exception>
|
||||
/// <exception cref="FormatException">
|
||||
/// Thrown if string cannot be parsed
|
||||
/// to a series of integers
|
||||
/// </exception>
|
||||
/// <exception cref="ArgumentOutOfRangeException">
|
||||
/// Thrown if any version
|
||||
/// integer is less than zero
|
||||
/// </exception>
|
||||
public static BuildNumber Parse(string buildNumber)
|
||||
{
|
||||
if (buildNumber == null) throw new ArgumentNullException("buildNumber");
|
||||
if (buildNumber == null)
|
||||
{
|
||||
throw new ArgumentNullException("buildNumber");
|
||||
}
|
||||
|
||||
var versions = buildNumber
|
||||
.Split(new[] { '.' },
|
||||
StringSplitOptions.RemoveEmptyEntries)
|
||||
StringSplitOptions.RemoveEmptyEntries)
|
||||
.Select(v => v.Trim())
|
||||
.ToList();
|
||||
|
||||
@ -90,39 +128,23 @@ namespace SharedLibraryCore.Helpers
|
||||
public override string ToString()
|
||||
{
|
||||
return string.Format("{0}.{1}{2}{3}", Major, Minor,
|
||||
Build < 0 ? "" : "." + Build,
|
||||
Revision < 0 ? "" : "." + Revision);
|
||||
}
|
||||
|
||||
public int CompareTo(object obj)
|
||||
{
|
||||
if (obj == null) return 1;
|
||||
var buildNumber = obj as BuildNumber;
|
||||
if (buildNumber == null) return 1;
|
||||
if (ReferenceEquals(this, buildNumber)) return 0;
|
||||
|
||||
return (Major == buildNumber.Major)
|
||||
? (Minor == buildNumber.Minor)
|
||||
? (Build == buildNumber.Build)
|
||||
? Revision.CompareTo(buildNumber.Revision)
|
||||
: Build.CompareTo(buildNumber.Build)
|
||||
: Minor.CompareTo(buildNumber.Minor)
|
||||
: Major.CompareTo(buildNumber.Major);
|
||||
Build < 0 ? "" : "." + Build,
|
||||
Revision < 0 ? "" : "." + Revision);
|
||||
}
|
||||
|
||||
public static bool operator >(BuildNumber first, BuildNumber second)
|
||||
{
|
||||
return (first.CompareTo(second) > 0);
|
||||
return first.CompareTo(second) > 0;
|
||||
}
|
||||
|
||||
public static bool operator <(BuildNumber first, BuildNumber second)
|
||||
{
|
||||
return (first.CompareTo(second) < 0);
|
||||
return first.CompareTo(second) < 0;
|
||||
}
|
||||
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
return (CompareTo(obj) == 0);
|
||||
return CompareTo(obj) == 0;
|
||||
}
|
||||
|
||||
public override int GetHashCode()
|
||||
@ -138,4 +160,4 @@ namespace SharedLibraryCore.Helpers
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,10 +1,10 @@
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace SharedLibraryCore.Helpers
|
||||
{
|
||||
/// <summary>
|
||||
/// JSON converter for the build number
|
||||
/// JSON converter for the build number
|
||||
/// </summary>
|
||||
public class BuildNumberJsonConverter : JsonConverter
|
||||
{
|
||||
@ -13,7 +13,8 @@ namespace SharedLibraryCore.Helpers
|
||||
return objectType == typeof(string);
|
||||
}
|
||||
|
||||
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
||||
public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
|
||||
JsonSerializer serializer)
|
||||
{
|
||||
return BuildNumber.Parse(reader.Value.ToString());
|
||||
}
|
||||
@ -23,4 +24,4 @@ namespace SharedLibraryCore.Helpers
|
||||
writer.WriteValue(value.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,37 +1,36 @@
|
||||
using SharedLibraryCore.Interfaces;
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Collections.Concurrent;
|
||||
|
||||
namespace SharedLibraryCore.Helpers
|
||||
{
|
||||
/// <summary>
|
||||
/// This class provides a way to keep track of changes to an entity
|
||||
/// This class provides a way to keep track of changes to an entity
|
||||
/// </summary>
|
||||
/// <typeparam name="T">Type of entity to keep track of changes to</typeparam>
|
||||
public class ChangeTracking<T>
|
||||
{
|
||||
ConcurrentQueue<T> Values;
|
||||
private readonly ConcurrentQueue<T> Values;
|
||||
|
||||
public ChangeTracking()
|
||||
{
|
||||
Values = new ConcurrentQueue<T>();
|
||||
}
|
||||
|
||||
public bool HasChanges => Values.Count > 0;
|
||||
|
||||
public void OnChange(T value)
|
||||
{
|
||||
if (Values.Count > 30)
|
||||
Values.TryDequeue(out T throwAway);
|
||||
{
|
||||
Values.TryDequeue(out var throwAway);
|
||||
}
|
||||
|
||||
Values.Enqueue(value);
|
||||
}
|
||||
|
||||
public T GetNextChange()
|
||||
{
|
||||
bool itemDequeued = Values.TryDequeue(out T val);
|
||||
return itemDequeued ? val : default(T);
|
||||
var itemDequeued = Values.TryDequeue(out var val);
|
||||
return itemDequeued ? val : default;
|
||||
}
|
||||
|
||||
public bool HasChanges => Values.Count > 0;
|
||||
}
|
||||
}
|
||||
}
|
@ -5,13 +5,12 @@ namespace SharedLibraryCore.Helpers
|
||||
public class Hashing
|
||||
{
|
||||
/// <summary>
|
||||
/// Generate password hash and salt
|
||||
/// Generate password hash and salt
|
||||
/// </summary>
|
||||
/// <param name="password">plaintext password</param>
|
||||
/// <returns></returns>
|
||||
public static string[] Hash(string password, string saltStr = null)
|
||||
{
|
||||
|
||||
string hash;
|
||||
string salt;
|
||||
var CryptoSvc = new PBKDF2();
|
||||
@ -21,22 +20,19 @@ namespace SharedLibraryCore.Helpers
|
||||
{
|
||||
hash = CryptoSvc.Compute(password);
|
||||
salt = CryptoSvc.Salt;
|
||||
return new string[]
|
||||
return new[]
|
||||
{
|
||||
hash,
|
||||
salt
|
||||
};
|
||||
}
|
||||
|
||||
else
|
||||
hash = CryptoSvc.Compute(password, saltStr);
|
||||
return new[]
|
||||
{
|
||||
hash = CryptoSvc.Compute(password, saltStr);
|
||||
return new string[]
|
||||
{
|
||||
hash,
|
||||
""
|
||||
};
|
||||
}
|
||||
hash,
|
||||
""
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,12 +1,10 @@
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Helpers
|
||||
{
|
||||
public class MessageToken
|
||||
{
|
||||
public string Name { get; private set; }
|
||||
private readonly Func<Server, Task<string>> _asyncValue;
|
||||
|
||||
|
||||
@ -16,10 +14,12 @@ namespace SharedLibraryCore.Helpers
|
||||
_asyncValue = Value;
|
||||
}
|
||||
|
||||
public string Name { get; }
|
||||
|
||||
public async Task<string> ProcessAsync(Server server)
|
||||
{
|
||||
string result = await _asyncValue(server);
|
||||
var result = await _asyncValue(server);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -13,8 +13,8 @@ namespace SharedLibraryCore.Helpers
|
||||
|
||||
catch (Exception)
|
||||
{
|
||||
return (T)(Enum.GetValues(type).GetValue(0));
|
||||
return (T)Enum.GetValues(type).GetValue(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -6,8 +6,8 @@ namespace SharedLibraryCore.Interfaces
|
||||
public sealed class ParserRegex
|
||||
{
|
||||
/// <summary>
|
||||
/// represents the logical mapping of information provided by
|
||||
/// game logs, get status, and get dvar information
|
||||
/// represents the logical mapping of information provided by
|
||||
/// game logs, get status, and get dvar information
|
||||
/// </summary>
|
||||
public enum GroupType
|
||||
{
|
||||
@ -43,11 +43,18 @@ namespace SharedLibraryCore.Interfaces
|
||||
AdditionalGroup = 200
|
||||
}
|
||||
|
||||
public IParserPatternMatcher PatternMatcher { get; private set; }
|
||||
|
||||
private string pattern;
|
||||
|
||||
public ParserRegex(IParserPatternMatcher pattern)
|
||||
{
|
||||
GroupMapping = new Dictionary<GroupType, int>();
|
||||
PatternMatcher = pattern;
|
||||
}
|
||||
|
||||
public IParserPatternMatcher PatternMatcher { get; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the regular expression groups that will be mapped to group types
|
||||
/// stores the regular expression groups that will be mapped to group types
|
||||
/// </summary>
|
||||
public string Pattern
|
||||
{
|
||||
@ -60,20 +67,20 @@ namespace SharedLibraryCore.Interfaces
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// stores the mapping from group type to group index in the regular expression
|
||||
/// stores the mapping from group type to group index in the regular expression
|
||||
/// </summary>
|
||||
public Dictionary<GroupType, int> GroupMapping { get; private set; }
|
||||
public Dictionary<GroupType, int> GroupMapping { get; }
|
||||
|
||||
/// <summary>
|
||||
/// helper method to enable script parsers to app regex mapping
|
||||
/// the first parameter specifies the group type contained in the regex pattern
|
||||
/// the second parameter specifies the group index to retrieve in the matched regex pattern
|
||||
/// helper method to enable script parsers to app regex mapping
|
||||
/// the first parameter specifies the group type contained in the regex pattern
|
||||
/// the second parameter specifies the group index to retrieve in the matched regex pattern
|
||||
/// </summary>
|
||||
/// <param name="mapKey">group type</param>
|
||||
/// <param name="mapValue">group index</param>
|
||||
public void AddMapping(object mapKey, object mapValue)
|
||||
{
|
||||
if (int.TryParse(mapKey.ToString(), out int key) && int.TryParse(mapValue.ToString(), out int value))
|
||||
if (int.TryParse(mapKey.ToString(), out var key) && int.TryParse(mapValue.ToString(), out var value))
|
||||
{
|
||||
if (GroupMapping.ContainsKey((GroupType)key))
|
||||
{
|
||||
@ -88,8 +95,8 @@ namespace SharedLibraryCore.Interfaces
|
||||
|
||||
if (mapKey.GetType() == typeof(GroupType) && mapValue.GetType().ToString() == "System.Int32")
|
||||
{
|
||||
GroupType k = (GroupType)Enum.Parse(typeof(GroupType), mapKey.ToString());
|
||||
int v = int.Parse(mapValue.ToString());
|
||||
var k = (GroupType)Enum.Parse(typeof(GroupType), mapKey.ToString());
|
||||
var v = int.Parse(mapValue.ToString());
|
||||
|
||||
if (GroupMapping.ContainsKey(k))
|
||||
{
|
||||
@ -102,11 +109,5 @@ namespace SharedLibraryCore.Interfaces
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public ParserRegex(IParserPatternMatcher pattern)
|
||||
{
|
||||
GroupMapping = new Dictionary<GroupType, int>();
|
||||
PatternMatcher = pattern;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -8,28 +8,23 @@ namespace SharedLibraryCore.Helpers
|
||||
// how many minutes between updates
|
||||
public static readonly int UpdateInterval = 5;
|
||||
|
||||
private readonly DateTime When;
|
||||
|
||||
public PlayerHistory(int cNum)
|
||||
{
|
||||
DateTime t = DateTime.UtcNow;
|
||||
When = new DateTime(t.Year, t.Month, t.Day, t.Hour, Math.Min(59, UpdateInterval * (int)Math.Round(t.Minute / (float)UpdateInterval)), 0);
|
||||
var t = DateTime.UtcNow;
|
||||
When = new DateTime(t.Year, t.Month, t.Day, t.Hour,
|
||||
Math.Min(59, UpdateInterval * (int)Math.Round(t.Minute / (float)UpdateInterval)), 0);
|
||||
y = cNum;
|
||||
}
|
||||
|
||||
private DateTime When;
|
||||
|
||||
/// <summary>
|
||||
/// Used by CanvasJS as a point on the x axis
|
||||
/// Used by CanvasJS as a point on the x axis
|
||||
/// </summary>
|
||||
public string x
|
||||
{
|
||||
get
|
||||
{
|
||||
return When.ToString("yyyy-MM-ddTHH:mm:ssZ");
|
||||
}
|
||||
}
|
||||
public string x => When.ToString("yyyy-MM-ddTHH:mm:ssZ");
|
||||
|
||||
/// <summary>
|
||||
/// Used by CanvasJS as a point on the y axis
|
||||
/// Used by CanvasJS as a point on the y axis
|
||||
/// </summary>
|
||||
public int y { get; }
|
||||
|
||||
@ -42,4 +37,4 @@ namespace SharedLibraryCore.Helpers
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,9 +1,4 @@
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Helpers
|
||||
{
|
||||
@ -11,6 +6,6 @@ namespace SharedLibraryCore.Helpers
|
||||
{
|
||||
public EFClient Target { get; set; }
|
||||
public EFClient Origin { get; set; }
|
||||
public string Reason { get; set; }
|
||||
public string Reason { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,28 +1,26 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using SharedLibraryCore.Dtos.Meta.Responses;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace SharedLibraryCore.Helpers
|
||||
{
|
||||
/// <summary>
|
||||
/// generic class for passing information about a resource query
|
||||
/// generic class for passing information about a resource query
|
||||
/// </summary>
|
||||
/// <typeparam name="QueryResultType">Type of query result</typeparam>
|
||||
public class ResourceQueryHelperResult<QueryResultType>
|
||||
{
|
||||
/// <summary>
|
||||
/// indicates the total number of results found
|
||||
/// indicates the total number of results found
|
||||
/// </summary>
|
||||
public long TotalResultCount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// indicates the total number of results retrieved
|
||||
/// indicates the total number of results retrieved
|
||||
/// </summary>
|
||||
public int RetrievedResultCount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// collection of results
|
||||
/// collection of results
|
||||
/// </summary>
|
||||
public IEnumerable<QueryResultType> Results { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,6 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Helpers
|
||||
{
|
||||
@ -10,6 +8,8 @@ namespace SharedLibraryCore.Helpers
|
||||
public DateTime RequestTime { get; set; } = DateTime.Now;
|
||||
public TimeSpan TokenDuration { get; set; }
|
||||
public string Token { get; set; }
|
||||
public string RemainingTime => Math.Round(-(DateTime.Now - RequestTime).Subtract(TokenDuration).TotalMinutes, 1).ToString();
|
||||
|
||||
public string RemainingTime => Math.Round(-(DateTime.Now - RequestTime).Subtract(TokenDuration).TotalMinutes, 1)
|
||||
.ToString();
|
||||
}
|
||||
}
|
||||
}
|
@ -1,19 +1,19 @@
|
||||
using SharedLibraryCore.Dtos;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using SharedLibraryCore.Dtos;
|
||||
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// describes the capabilities of the audit info repository
|
||||
/// describes the capabilities of the audit info repository
|
||||
/// </summary>
|
||||
public interface IAuditInformationRepository
|
||||
{
|
||||
/// <summary>
|
||||
/// retrieves a list of audit information for given pagination params
|
||||
/// retrieves a list of audit information for given pagination params
|
||||
/// </summary>
|
||||
/// <param name="paginationInfo">pagination info</param>
|
||||
/// <returns></returns>
|
||||
Task<IList<AuditInfo>> ListAuditInformation(PaginationRequest paginationInfo);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,14 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
public interface IBaseConfiguration
|
||||
{
|
||||
string Name();
|
||||
IBaseConfiguration Generate();
|
||||
}
|
||||
}
|
||||
}
|
@ -1,14 +1,14 @@
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// defines the capabilities for providing a base path
|
||||
/// unused as of now, will be used later during refactorying
|
||||
/// defines the capabilities for providing a base path
|
||||
/// unused as of now, will be used later during refactorying
|
||||
/// </summary>
|
||||
public interface IBasePathProvider
|
||||
{
|
||||
/// <summary>
|
||||
/// working directory of IW4MAdmin
|
||||
/// working directory of IW4MAdmin
|
||||
/// </summary>
|
||||
string BasePath { get; }
|
||||
}
|
||||
}
|
||||
}
|
@ -3,7 +3,7 @@
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// describes all the base attributes of a client meta object
|
||||
/// describes all the base attributes of a client meta object
|
||||
/// </summary>
|
||||
public interface IClientMeta
|
||||
{
|
||||
@ -29,4 +29,4 @@ namespace SharedLibraryCore.Interfaces
|
||||
QuickMessage,
|
||||
ConnectionHistory
|
||||
}
|
||||
}
|
||||
}
|
@ -1,12 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
public interface IClientMetaResponse
|
||||
{
|
||||
int ClientId { get;}
|
||||
int ClientId { get; }
|
||||
long MetaId { get; }
|
||||
}
|
||||
}
|
||||
}
|
@ -5,12 +5,13 @@ namespace SharedLibraryCore.Interfaces
|
||||
public interface IClientNoticeMessageFormatter
|
||||
{
|
||||
/// <summary>
|
||||
/// builds a game formatted notice message
|
||||
/// builds a game formatted notice message
|
||||
/// </summary>
|
||||
/// <param name="currentPenalty">current penalty the message is for</param>
|
||||
/// <param name="originalPenalty">previous penalty the current penalty relates to</param>
|
||||
/// <param name="config">RCon parser config</param>
|
||||
/// <returns></returns>
|
||||
string BuildFormattedMessage(IRConParserConfiguration config, EFPenalty currentPenalty, EFPenalty originalPenalty = null);
|
||||
string BuildFormattedMessage(IRConParserConfiguration config, EFPenalty currentPenalty,
|
||||
EFPenalty originalPenalty = null);
|
||||
}
|
||||
}
|
@ -1,17 +1,13 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
public interface IConfigurationHandler<T> where T : IBaseConfiguration
|
||||
{
|
||||
string FileName { get; }
|
||||
Task Save();
|
||||
void Build();
|
||||
T Configuration();
|
||||
void Set(T config);
|
||||
string FileName { get; }
|
||||
}
|
||||
}
|
||||
}
|
@ -1,17 +1,17 @@
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// defines the capabilities of the configuration handler factory
|
||||
/// used to generate new instance of configuration handlers
|
||||
/// defines the capabilities of the configuration handler factory
|
||||
/// used to generate new instance of configuration handlers
|
||||
/// </summary>
|
||||
public interface IConfigurationHandlerFactory
|
||||
{
|
||||
/// <summary>
|
||||
/// generates a new configuration handler
|
||||
/// generates a new configuration handler
|
||||
/// </summary>
|
||||
/// <typeparam name="T">base configuration type</typeparam>
|
||||
/// <param name="name">file name of configuration</param>
|
||||
/// <returns>new configuration handler instance</returns>
|
||||
IConfigurationHandler<T> GetConfigurationHandler<T>(string name) where T : IBaseConfiguration;
|
||||
}
|
||||
}
|
||||
}
|
@ -1,8 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
@ -16,4 +13,4 @@ namespace SharedLibraryCore.Interfaces
|
||||
Task<T> GetUnique(long entityProperty);
|
||||
Task<IList<T>> Find(Func<T, bool> expression);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,15 +1,15 @@
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// handles games events (from log, manual events, etc)
|
||||
/// handles games events (from log, manual events, etc)
|
||||
/// </summary>
|
||||
public interface IEventHandler
|
||||
{
|
||||
/// <summary>
|
||||
/// Add a game event event to the queue to be processed
|
||||
/// Add a game event event to the queue to be processed
|
||||
/// </summary>
|
||||
/// <param name="manager">application manager instance</param>
|
||||
/// <param name="gameEvent">game event</param>
|
||||
void HandleEvent(IManager manager, GameEvent gameEvent);
|
||||
}
|
||||
}
|
||||
}
|
@ -6,44 +6,46 @@ namespace SharedLibraryCore.Interfaces
|
||||
public interface IEventParser
|
||||
{
|
||||
/// <summary>
|
||||
/// Generates a game event based on log line input
|
||||
/// </summary>
|
||||
/// <param name="logLine">single log line string</param>
|
||||
/// <returns></returns>
|
||||
/// todo: make this integrate without needing the server
|
||||
GameEvent GenerateGameEvent(string logLine);
|
||||
/// <summary>
|
||||
/// Get game specific folder prefix for log files
|
||||
/// Get game specific folder prefix for log files
|
||||
/// </summary>
|
||||
/// <returns>Game directory prefix</returns>
|
||||
IEventParserConfiguration Configuration { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the game/client specific version (usually the value of the "version" DVAR)
|
||||
/// stores the game/client specific version (usually the value of the "version" DVAR)
|
||||
/// </summary>
|
||||
string Version { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// specifies the game name (usually the internal studio iteration ie: IW4, T5 etc...)
|
||||
/// specifies the game name (usually the internal studio iteration ie: IW4, T5 etc...)
|
||||
/// </summary>
|
||||
Game GameName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// specifies the connect URI used to join game servers via web browser
|
||||
/// specifies the connect URI used to join game servers via web browser
|
||||
/// </summary>
|
||||
string URLProtocolFormat { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// specifies the text name of the game the parser is for
|
||||
/// specifies the text name of the game the parser is for
|
||||
/// </summary>
|
||||
string Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// registers a custom event subtype to be triggered when a value is detected
|
||||
/// Generates a game event based on log line input
|
||||
/// </summary>
|
||||
/// <param name="logLine">single log line string</param>
|
||||
/// <returns></returns>
|
||||
/// todo: make this integrate without needing the server
|
||||
GameEvent GenerateGameEvent(string logLine);
|
||||
|
||||
/// <summary>
|
||||
/// registers a custom event subtype to be triggered when a value is detected
|
||||
/// </summary>
|
||||
/// <param name="eventSubtype">subtype assigned to the event when generated</param>
|
||||
/// <param name="eventTriggerValue">event keyword to trigger an event generation</param>
|
||||
/// <param name="eventModifier">function pointer that modifies the generated game event</param>
|
||||
void RegisterCustomEvent(string eventSubtype, string eventTriggerValue, Func<string, IEventParserConfiguration, GameEvent, GameEvent> eventModifier);
|
||||
void RegisterCustomEvent(string eventSubtype, string eventTriggerValue,
|
||||
Func<string, IEventParserConfiguration, GameEvent, GameEvent> eventModifier);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,63 +1,62 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Globalization;
|
||||
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
public interface IEventParserConfiguration
|
||||
{
|
||||
/// <summary>
|
||||
/// stores the fs_game directory (this folder may vary between different clients)
|
||||
/// stores the fs_game directory (this folder may vary between different clients)
|
||||
/// </summary>
|
||||
string GameDirectory { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the regex information for a say event printed in the game log
|
||||
/// stores the regex information for a say event printed in the game log
|
||||
/// </summary>
|
||||
ParserRegex Say { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the regex information for a join event printed in the game log
|
||||
/// stores the regex information for a join event printed in the game log
|
||||
/// </summary>
|
||||
ParserRegex Join { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the regex information for a quit event printed in the game log
|
||||
/// stores the regex information for a quit event printed in the game log
|
||||
/// </summary>
|
||||
ParserRegex Quit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the regex information for a kill event printed in the game log
|
||||
/// stores the regex information for a kill event printed in the game log
|
||||
/// </summary>
|
||||
ParserRegex Kill { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the regex information for a damage event printed in the game log
|
||||
/// stores the regex information for a damage event printed in the game log
|
||||
/// </summary>
|
||||
ParserRegex Damage { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the regex information for an action event printed in the game log
|
||||
/// stores the regex information for an action event printed in the game log
|
||||
/// </summary>
|
||||
ParserRegex Action { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the regex information for the time prefix in game log
|
||||
/// stores the regex information for the time prefix in game log
|
||||
/// </summary>
|
||||
ParserRegex Time { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// stores the regex information for the map change game log
|
||||
/// stores the regex information for the map change game log
|
||||
/// </summary>
|
||||
ParserRegex MapChange { get; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// stores the regex information for the map end game log
|
||||
/// stores the regex information for the map end game log
|
||||
/// </summary>
|
||||
ParserRegex MapEnd { get; }
|
||||
|
||||
/// <summary>
|
||||
/// indicates the format expected for parsed guids
|
||||
/// indicates the format expected for parsed guids
|
||||
/// </summary>
|
||||
NumberStyles GuidNumberStyle { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
@ -4,26 +4,26 @@ using System.Threading.Tasks;
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// represents the abstraction of game log reading
|
||||
/// represents the abstraction of game log reading
|
||||
/// </summary>
|
||||
public interface IGameLogReader
|
||||
{
|
||||
/// <summary>
|
||||
/// get new events that have occured since the last poll
|
||||
/// how long the log file is
|
||||
/// </summary>
|
||||
long Length { get; }
|
||||
|
||||
/// <summary>
|
||||
/// how often to poll the log file
|
||||
/// </summary>
|
||||
int UpdateInterval { get; }
|
||||
|
||||
/// <summary>
|
||||
/// get new events that have occured since the last poll
|
||||
/// </summary>
|
||||
/// <param name="fileSizeDiff"></param>
|
||||
/// <param name="startPosition"></param>
|
||||
/// <returns></returns>
|
||||
Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition);
|
||||
|
||||
/// <summary>
|
||||
/// how long the log file is
|
||||
/// </summary>
|
||||
long Length { get; }
|
||||
|
||||
/// <summary>
|
||||
/// how often to poll the log file
|
||||
/// </summary>
|
||||
int UpdateInterval { get; }
|
||||
}
|
||||
}
|
||||
}
|
@ -3,16 +3,16 @@
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// factory interface to create game log readers based on the log file uri
|
||||
/// factory interface to create game log readers based on the log file uri
|
||||
/// </summary>
|
||||
public interface IGameLogReaderFactory
|
||||
{
|
||||
/// <summary>
|
||||
/// generates a new game log reader based on the provided Uri
|
||||
/// generates a new game log reader based on the provided Uri
|
||||
/// </summary>
|
||||
/// <param name="logUris">collection of log uri used to generate the log reader</param>
|
||||
/// <param name="eventParser">event parser for the log reader</param>
|
||||
/// <returns></returns>
|
||||
IGameLogReader CreateGameLogReader(Uri[] logUris, IEventParser eventParser);
|
||||
}
|
||||
}
|
||||
}
|
@ -7,7 +7,7 @@ namespace SharedLibraryCore.Interfaces
|
||||
public interface IGameServer
|
||||
{
|
||||
/// <summary>
|
||||
/// kicks target on behalf of origin for given reason
|
||||
/// kicks target on behalf of origin for given reason
|
||||
/// </summary>
|
||||
/// <param name="reason">reason client is being kicked</param>
|
||||
/// <param name="target">client to kick</param>
|
||||
|
@ -3,16 +3,16 @@
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
/// <summary>
|
||||
/// defines the capabilities of game server instance factory
|
||||
/// defines the capabilities of game server instance factory
|
||||
/// </summary>
|
||||
public interface IGameServerInstanceFactory
|
||||
{
|
||||
/// <summary>
|
||||
/// creates the instance of a game server
|
||||
/// creates the instance of a game server
|
||||
/// </summary>
|
||||
/// <param name="config">server configuration</param>
|
||||
/// <param name="manager">application manager</param>
|
||||
/// <returns></returns>
|
||||
Server CreateServer(ServerConfiguration config, IManager manager);
|
||||
}
|
||||
}
|
||||
}
|
@ -12,4 +12,4 @@ namespace SharedLibraryCore.Interfaces
|
||||
void WriteError(string msg);
|
||||
void WriteAssert(bool condition, string msg);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,93 +1,106 @@
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using SharedLibraryCore.Services;
|
||||
using SharedLibraryCore.Configuration;
|
||||
using SharedLibraryCore.Database.Models;
|
||||
using System.Threading;
|
||||
using System.Collections;
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using SharedLibraryCore.Helpers;
|
||||
using SharedLibraryCore.Services;
|
||||
|
||||
namespace SharedLibraryCore.Interfaces
|
||||
{
|
||||
public interface IManager
|
||||
{
|
||||
IReadOnlyList<IManagerCommand> Commands { get; }
|
||||
|
||||
/// <summary>
|
||||
/// enumerates the registered plugin instances
|
||||
/// </summary>
|
||||
IEnumerable<IPlugin> Plugins { get; }
|
||||
|
||||
IList<IRConParser> AdditionalRConParsers { get; }
|
||||
IList<IEventParser> AdditionalEventParsers { get; }
|
||||
IMiddlewareActionHandler MiddlewareActionHandler { get; }
|
||||
string Version { get; }
|
||||
ITokenAuthentication TokenAuthenticator { get; }
|
||||
string ExternalIPAddress { get; }
|
||||
CancellationToken CancellationToken { get; }
|
||||
bool IsRestartRequested { get; }
|
||||
bool IsRunning { get; }
|
||||
ConcurrentDictionary<long, GameEvent> ProcessingEvents { get; }
|
||||
Task Init();
|
||||
Task Start();
|
||||
void Stop();
|
||||
void Restart();
|
||||
|
||||
[Obsolete]
|
||||
ILogger GetLogger(long serverId);
|
||||
|
||||
IList<Server> GetServers();
|
||||
IList<IManagerCommand> GetCommands();
|
||||
IReadOnlyList<IManagerCommand> Commands { get; }
|
||||
IList<Helpers.MessageToken> GetMessageTokens();
|
||||
IList<MessageToken> GetMessageTokens();
|
||||
IList<EFClient> GetActiveClients();
|
||||
EFClient FindActiveClient(EFClient client);
|
||||
IConfigurationHandler<ApplicationConfiguration> GetApplicationSettings();
|
||||
ClientService GetClientService();
|
||||
PenaltyService GetPenaltyService();
|
||||
|
||||
/// <summary>
|
||||
/// enumerates the registered plugin instances
|
||||
/// </summary>
|
||||
IEnumerable<IPlugin> Plugins { get; }
|
||||
/// <summary>
|
||||
/// provides a page list to add and remove from
|
||||
/// provides a page list to add and remove from
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
IPageList GetPageList();
|
||||
IList<IRConParser> AdditionalRConParsers { get; }
|
||||
IList<IEventParser> AdditionalEventParsers { get; }
|
||||
|
||||
/// <summary>
|
||||
/// provides a method to execute database operations by name without exposing the
|
||||
/// service level methods
|
||||
/// todo: this could be made obsolete by creating a seperate service library with more concrete definitions
|
||||
/// provides a method to execute database operations by name without exposing the
|
||||
/// service level methods
|
||||
/// todo: this could be made obsolete by creating a seperate service library with more concrete definitions
|
||||
/// </summary>
|
||||
/// <param name="operationName"></param>
|
||||
/// <returns></returns>
|
||||
Task<IList<T>> ExecuteSharedDatabaseOperation<T>(string operationName);
|
||||
|
||||
void RegisterSharedDatabaseOperation(Task<IList> operation, string operationName);
|
||||
IMiddlewareActionHandler MiddlewareActionHandler { get; }
|
||||
|
||||
/// <summary>
|
||||
/// generates an rcon parser that can be configured by script plugins
|
||||
/// generates an rcon parser that can be configured by script plugins
|
||||
/// </summary>
|
||||
/// <param name="name">name of the RCon parser</param>
|
||||
/// <returns>new rcon parser instance</returns>
|
||||
IRConParser GenerateDynamicRConParser(string name);
|
||||
|
||||
/// <summary>
|
||||
/// Generates an event parser that can be configured by script plugins
|
||||
/// Generates an event parser that can be configured by script plugins
|
||||
/// </summary>
|
||||
/// <param name="name">name of the event parser</param>
|
||||
/// <returns>new event parser instance</returns>
|
||||
IEventParser GenerateDynamicEventParser(string name);
|
||||
string Version { get;}
|
||||
ITokenAuthentication TokenAuthenticator { get; }
|
||||
string ExternalIPAddress { get; }
|
||||
CancellationToken CancellationToken { get; }
|
||||
bool IsRestartRequested { get; }
|
||||
bool IsRunning { get; }
|
||||
|
||||
Task ExecuteEvent(GameEvent gameEvent);
|
||||
|
||||
/// <summary>
|
||||
/// queues an event for processing
|
||||
/// queues an event for processing
|
||||
/// </summary>
|
||||
/// <param name="gameEvent">event to be processed</param>
|
||||
void AddEvent(GameEvent gameEvent);
|
||||
|
||||
/// <summary>
|
||||
/// adds an additional (script) command to the command list
|
||||
/// adds an additional (script) command to the command list
|
||||
/// </summary>
|
||||
/// <param name="command"></param>
|
||||
void AddAdditionalCommand(IManagerCommand command);
|
||||
|
||||
/// <summary>
|
||||
/// removes a command by its name
|
||||
/// removes a command by its name
|
||||
/// </summary>
|
||||
/// <param name="name">name of command</param>
|
||||
void RemoveCommandByName(string name);
|
||||
|
||||
/// <summary>
|
||||
/// event executed when event has finished executing
|
||||
/// event executed when event has finished executing
|
||||
/// </summary>
|
||||
event EventHandler<GameEvent> OnGameEventExecuted;
|
||||
ConcurrentDictionary<long, GameEvent> ProcessingEvents { get; }
|
||||
}
|
||||
}
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user