INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-07 13:48:00 -05:00
Code Issues Releases Wiki Activity

Refactor PromptClientInput to accept string array for prompt (#336)

Browse Source 
* Refactor PromptClientInput to accept string array for prompt

Updated the `PromptClientInput` method to accept a string array instead of a single string. This change ensures that multiple prompts can be handled, improving input flexibility and client communication. Additionally, modified related method calls to maintain consistency with the new input type.

* Refactor PromptClientInput to support parsed result and errors

Updated PromptClientInput to handle parsed input results and return error messages instead of raw strings. Introduced ParsedInputResult<TResult> class to encapsulate parsing results and errors, enhancing client validation and feedback mechanism.
This commit is contained in:
Amos 2024-08-05 16:09:50 +01:00 committed by GitHub
parent 83f80b4fd2
commit 4d1e7c2692
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SharedLibraryCore/Helpers/ParsedInputResult.cs Normal file
View File

@ -0,0 +1,16 @@
using System.Collections.Generic;
namespace SharedLibraryCore.Helpers;
public class ParsedInputResult<TResult>
{
public TResult? Result { get; set; }
public string? RawInput { get; set; }
public List<string> ErrorMessages { get; set; } = [];
public ParsedInputResult<TResult> WithError(string errorMessage)
{
ErrorMessages.Add(errorMessage);
return this;
}
}

29
SharedLibraryCore/Utilities.cs
View File

@ -1375,28 +1375,32 @@ namespace SharedLibraryCore
public static void ExecuteAfterDelay(this Func<CancellationToken, Task> action, int delayMs,
CancellationToken token = default) => ExecuteAfterDelay(delayMs, action, token);
public static async Task<string> PromptClientInput(this EFClient client, string prompt, Func<string, Task<bool>> validator,
CancellationToken token = default)
public static async Task<ParsedInputResult<TResult>> PromptClientInput<TResult>(this EFClient client, string[] prompts,
Func<string, Task<ParsedInputResult<TResult>>> parser, string tokenExpiredMessage, CancellationToken token = default)
{
var clientResponse = new ManualResetEventSlim(false);
string response = null;
ParsedInputResult<TResult>? response = null;
try
{
IGameEventSubscriptions.ClientMessaged += OnResponse;
await client.TellAsync([prompt], token);
await client.TellAsync(prompts, token);
using var tokenSource = new CancellationTokenSource(DefaultCommandTimeout);
using var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(tokenSource.Token, token);
clientResponse.Wait(linkedTokenSource.Token);
try
{
clientResponse.Wait(linkedTokenSource.Token);
}
catch (OperationCanceledException)
{
await client.TellAsync([tokenExpiredMessage], token);
return new ParsedInputResult<TResult> { ErrorMessages = [tokenExpiredMessage] };
}
return response;
}
catch (OperationCanceledException)
{
return null;
}
finally
{
IGameEventSubscriptions.ClientMessaged -= OnResponse;
@ -1410,16 +1414,17 @@ namespace SharedLibraryCore
return;
}
response = messageEvent.Message;
response = await parser(messageEvent.Message);
response.RawInput = messageEvent.Message;
if (await validator(response))
if (response.ErrorMessages.Count is 0)
{
// ReSharper disable once AccessToDisposedClosure
clientResponse.Set();
}
else
{
await client.TellAsync([prompt], cancellationToken);
await client.TellAsync(response.ErrorMessages.Concat(prompts), cancellationToken);
}
}
}