ExMods/TBConsole
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Not waiting for the response, command list endpoint

Browse source 
Returning the response right after the command is executed, most of the time that's enough, long polling should be used in addition
This commit is contained in:
Norbi Peti 2021-05-25 00:49:50 +02:00
parent f909fce1b7
commit 7a6cc79e61
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
3 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
TBConsole/TBConsoleMod.cs
View file

@ -19,15 +19,15 @@ namespace TBConsole
public override void OnApplicationStart()
{
TechbloxModdingAPI.Main.Init();
_server = new WebServer(CommandReceived);
_server = new WebServer(CommandReceived, GetCommandList);
_server.Start();
}
private async Task<string> CommandReceived(string command)
private string CommandReceived(string command)
{
if (_logHandler == null)
Debug.unityLogger.logHandler = _logHandler = new UnityLogHandler(Debug.unityLogger.logHandler);
var logTask = _logHandler.CollectLogMessages();
_logHandler.StartCollectingLogMessages();
bool inString = false;
var cmdparts = new List<string>();
command = command.Trim();
@ -62,10 +62,16 @@ namespace TBConsole
return "Too many arguments! Maximum for default commands is 3";
}
string result = await logTask;
string result = _logHandler.FinishCollectingLogMessages();
return $"Got it: {command}\n{result}";
}
public string GetCommandList()
{
return ExistingCommands.GetCommandNamesAndDescriptions()
.Select(command => command.Name + " - " + command.Description).Aggregate((a, b) => a + "\n" + b);
}
public override void OnApplicationQuit()
{
_server.Stop();
@ -75,7 +81,7 @@ namespace TBConsole
public static void Main(string[] args)
{
var mod = new TBConsoleMod();
mod._server = new WebServer(mod.CommandReceived);
mod._server = new WebServer(mod.CommandReceived, mod.GetCommandList);
mod._server.Start();
Console.ReadLine();
}

6
TBConsole/UnityLogHandler.cs
View file

@ -23,10 +23,10 @@ namespace TBConsole
_original.LogException(exception, context);
}
public async Task<string> CollectLogMessages()
public void StartCollectingLogMessages() => _collectedLog = "";
public string FinishCollectingLogMessages()
{
_collectedLog = "";
await Task.Delay(1000);
string ret = _collectedLog;
_collectedLog = null;
return ret;

27
TBConsole/WebServer.cs
View file

@ -9,9 +9,15 @@ namespace TBConsole
{
private bool _running;
private readonly HttpListener _listener = new HttpListener();
private Func<string, Task<string>> _receiver;
public WebServer(Func<string, Task<string>> receiver) => _receiver = receiver;
private readonly Func<string, string> _commandReceiver;
private readonly Func<string> _commandsListSender;
public WebServer(Func<string, string> commandReceiver, Func<string> commandsListSender)
{
_commandReceiver = commandReceiver;
_commandsListSender = commandsListSender;
}
public void Start()
{
_running = true;
@ -33,7 +39,20 @@ namespace TBConsole
try
{
var context = await _listener.GetContextAsync();
string resp = await _receiver(await new StreamReader(context.Request.InputStream).ReadToEndAsync());
string request = await new StreamReader(context.Request.InputStream).ReadToEndAsync();
string resp;
switch (context.Request.Url.AbsolutePath)
{
case "/command":
resp = _commandReceiver(request);
break;
case "/commands":
resp = _commandsListSender();
break;
default:
resp = "<img src=\"https://http.cat/404\">";
break;
}
string origin = context.Request.Headers["Origin"];
if (origin == "http://localhost:4200" || origin == "https://tbconsole.web.app")
context.Response.AddHeader("Access-Control-Allow-Origin", origin);