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

possible improvements for game interface rcon operations

Browse Source
This commit is contained in:
RaidMax 2022-10-13 13:51:34 -05:00
parent 7b869a3f43
commit 76925a78d4
3 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Application/Misc/ScriptPlugin.cs
View File

@ -112,13 +112,16 @@ namespace IW4MAdmin.Application.Misc
} }
_scriptEngine = new Engine(cfg => _scriptEngine = new Engine(cfg =>
cfg.AllowClr(new[] cfg.AddExtensionMethods(typeof(Utilities), typeof(Enumerable), typeof(Queryable))
.AllowClr(new[]
{ {
typeof(System.Net.Http.HttpClient).Assembly, typeof(System.Net.Http.HttpClient).Assembly,
typeof(EFClient).Assembly, typeof(EFClient).Assembly,
typeof(Utilities).Assembly, typeof(Utilities).Assembly,
typeof(Encoding).Assembly, typeof(Encoding).Assembly,
typeof(CancellationTokenSource).Assembly typeof(CancellationTokenSource).Assembly,
typeof(Data.Models.Client.EFClient).Assembly,
typeof(IW4MAdmin.Plugins.Stats.Plugin).Assembly
}) })
.CatchClrExceptions() .CatchClrExceptions()
.AddObjectConverter(new PermissionLevelToStringConverter())); .AddObjectConverter(new PermissionLevelToStringConverter()));
@ -392,6 +395,11 @@ namespace IW4MAdmin.Application.Misc
string name = dynamicCommand.name; string name = dynamicCommand.name;
string alias = dynamicCommand.alias; string alias = dynamicCommand.alias;
string description = dynamicCommand.description; string description = dynamicCommand.description;
if (dynamicCommand.permission is Data.Models.Client.EFClient.Permission perm)
{
dynamicCommand.permission = perm.ToString();
}
string permission = dynamicCommand.permission; string permission = dynamicCommand.permission;
List<Server.Game> supportedGames = null; List<Server.Game> supportedGames = null;
var targetRequired = false; var targetRequired = false;
@ -475,7 +483,6 @@ namespace IW4MAdmin.Application.Misc
throw new PluginException("An error occured while executing action for script plugin"); throw new PluginException("An error occured while executing action for script plugin");
} }
finally finally
{ {
if (_onProcessing.CurrentCount == 0) if (_onProcessing.CurrentCount == 0)
@ -499,11 +506,6 @@ namespace IW4MAdmin.Application.Misc
try try
{ {
var (success, value) = (ValueTuple<bool, string>)result.AsyncState; var (success, value) = (ValueTuple<bool, string>)result.AsyncState;
_logger.LogDebug("Waiting for onDvarActionComplete -> get");
_onDvarActionComplete.Wait();
_logger.LogDebug("Completed wait for onDvarActionComplete -> get");
onCompleted.DynamicInvoke(JsValue.Undefined, onCompleted.DynamicInvoke(JsValue.Undefined,
new[] new[]
{ {
@ -517,7 +519,7 @@ namespace IW4MAdmin.Application.Misc
{ {
using (LogContext.PushProperty("Server", server.ToString())) using (LogContext.PushProperty("Server", server.ToString()))
{ {
_logger.LogError(ex, "Could complete BeginGetDvar for {Filename} {@Location}", _logger.LogError(ex, "Could not complete BeginGetDvar for {Filename} {@Location}",
Path.GetFileName(_fileName), ex.Location); Path.GetFileName(_fileName), ex.Location);
} }
} }
@ -525,17 +527,10 @@ namespace IW4MAdmin.Application.Misc
{ {
_logger.LogError(ex, "Could not complete {BeginGetDvar} for {Class}", nameof(BeginGetDvar), Name); _logger.LogError(ex, "Could not complete {BeginGetDvar} for {Class}", nameof(BeginGetDvar), Name);
} }
finally
{
if (_onDvarActionComplete.CurrentCount == 0)
{
_onDvarActionComplete.Release();
}
}
} }
var tokenSource = new CancellationTokenSource(); var tokenSource = new CancellationTokenSource();
tokenSource.CancelAfter(TimeSpan.FromSeconds(15)); tokenSource.CancelAfter(TimeSpan.FromSeconds(5));
server.BeginGetDvar(dvarName, result => server.BeginGetDvar(dvarName, result =>
{ {
@ -561,17 +556,13 @@ namespace IW4MAdmin.Application.Misc
private void BeginSetDvar(Server server, string dvarName, string dvarValue, Delegate onCompleted) private void BeginSetDvar(Server server, string dvarName, string dvarValue, Delegate onCompleted)
{ {
var tokenSource = new CancellationTokenSource(); var tokenSource = new CancellationTokenSource();
tokenSource.CancelAfter(TimeSpan.FromSeconds(15)); tokenSource.CancelAfter(TimeSpan.FromSeconds(5));
void OnComplete(IAsyncResult result) void OnComplete(IAsyncResult result)
{ {
try try
{ {
var success = (bool)result.AsyncState; var success = (bool)result.AsyncState;
_logger.LogDebug("Waiting for onDvarActionComplete -> set");
_onDvarActionComplete.Wait();
_logger.LogDebug("Completed wait for onDvarActionComplete -> set");
onCompleted.DynamicInvoke(JsValue.Undefined, onCompleted.DynamicInvoke(JsValue.Undefined,
new[] new[]
{ {
@ -593,13 +584,6 @@ namespace IW4MAdmin.Application.Misc
{ {
_logger.LogError(ex, "Could not complete {BeginSetDvar} for {Class}", nameof(BeginSetDvar), Name); _logger.LogError(ex, "Could not complete {BeginSetDvar} for {Class}", nameof(BeginSetDvar), Name);
} }
finally
{
if (_onDvarActionComplete.CurrentCount == 0)
{
_onDvarActionComplete.Release();
}
}
} }
server.BeginSetDvar(dvarName, dvarValue, result => server.BeginSetDvar(dvarName, dvarValue, result =>

2
Application/RConParsers/BaseRConParser.cs
View File

@ -147,7 +147,7 @@ namespace IW4MAdmin.Application.RConParsers
{ {
GetDvarAsync<string>(connection, dvarName, token: token).ContinueWith(action => GetDvarAsync<string>(connection, dvarName, token: token).ContinueWith(action =>
{ {
if (action.Exception is null && !action.IsCanceled) if (action.IsCompletedSuccessfully)
{ {
callback?.Invoke(new AsyncResult callback?.Invoke(new AsyncResult
{ {

6
Integrations/Cod/CodRConConnection.cs
View File

@ -243,7 +243,11 @@ namespace Integrations.Cod
CancellationToken = token CancellationToken = token
}; };
connectionState.ConnectionAttempts++; if (!token.IsCancellationRequested)
{
connectionState.ConnectionAttempts++;
}
connectionState.BytesReadPerSegment.Clear(); connectionState.BytesReadPerSegment.Clear();
_log.LogDebug( _log.LogDebug(