Implement new GUI and CLI, fix misc. smaller issues (#22)
* Initial commit of new UI c# component * Initial commit of new UI frontend component * target WinExe to hide console window in release mode, move ui exe into resources * force single file publishing and add initial gh workflow for publishing ui * fix workflow errors * update dependencies and remove cxxdemangler, as it was outdated * fix c# single file output due to invalid output path * smaller tweaks, hack around loops in cpp type layouting * process other queued exports even if one fails and show error message * add basic support for processing LC_DYLD_CHAINED_FIXUPS * ELF loading should not use the file offset for loading the dynamic section * fix symbol table loading in some modified elfs * add "start export" button on format selection screen, clear all toasts after selecting an export format * embed ui executable directly into c# assembly * only build tauri component in c# release builds * add il2cpp file (binary, metadata) export to advanced tab * fix and enable binary ninja fake string segment support * add support for metadata * unify logic for getting element type index * fix new ui not allowing script exports other than ida * new ui: clear out loaded binary if no IL2CPP images could be loaded * fix toAddr calls in ghidra script target * remove dependency on a section being named .text in loaded pe files * tweak symbol reading a bit and remove sht relocation reading * add initial support for required forward references in il2cpp types, also fix issues with type names clashing with il2cpp api types * reduce clang errors for header file, fix better array size struct, emit required forward definitions in header * expose forward definitions in AppModel, fix issue with method-only used types not being emitted * remove debug log line * fix spelling mistakes in gui outputs * fix il2cpp_array_size_t not being an actual type for later method definitions * change the default port for new ui dev to 5000 * show current version and hash in new ui footer * seperate redux ui impl into FrontendCore project * make inspector version a server api, split up output subtypes and tweak some option names * add redux CLI based on redux GUI output formats * replace all Console.WriteLine calls in core inspector with AnsiConsole calls * add workflow for new cli and add back old gui workflow * disable aot publish and enable single file for redux cli
This commit is contained in:
136
Il2CppInspector.Redux.CLI/CliClient.cs
Normal file
136
Il2CppInspector.Redux.CLI/CliClient.cs
Normal file
@@ -0,0 +1,136 @@
|
||||
using System.Threading.Channels;
|
||||
using Il2CppInspector.Redux.FrontendCore;
|
||||
using Microsoft.AspNetCore.SignalR.Client;
|
||||
using Spectre.Console;
|
||||
|
||||
namespace Il2CppInspector.Redux.CLI;
|
||||
|
||||
public class CliClient : IDisposable
|
||||
{
|
||||
public bool ImportCompleted { get; private set; }
|
||||
|
||||
private volatile int _finishedLoadingCount = 0;
|
||||
|
||||
private readonly HubConnection _connection;
|
||||
private readonly List<IDisposable> _commandListeners = [];
|
||||
|
||||
private Channel<string>? _logMessageChannel;
|
||||
|
||||
public CliClient(HubConnection connection)
|
||||
{
|
||||
_connection = connection;
|
||||
|
||||
_commandListeners.Add(_connection.On<string>(nameof(UiClient.ShowLogMessage), ShowLogMessage));
|
||||
_commandListeners.Add(_connection.On(nameof(UiClient.BeginLoading), BeginLoading));
|
||||
_commandListeners.Add(_connection.On(nameof(UiClient.FinishLoading), FinishLoading));
|
||||
_commandListeners.Add(_connection.On<string>(nameof(UiClient.ShowInfoToast), ShowInfoToast));
|
||||
_commandListeners.Add(_connection.On<string>(nameof(UiClient.ShowSuccessToast), ShowSuccessToast));
|
||||
_commandListeners.Add(_connection.On<string>(nameof(UiClient.ShowErrorToast), ShowErrorToast));
|
||||
_commandListeners.Add(_connection.On(nameof(UiClient.OnImportCompleted), OnImportCompleted));
|
||||
}
|
||||
|
||||
public async ValueTask OnUiLaunched(CancellationToken cancellationToken = default)
|
||||
{
|
||||
await _connection.InvokeAsync(nameof(Il2CppHub.OnUiLaunched), cancellationToken);
|
||||
}
|
||||
|
||||
public async ValueTask SubmitInputFiles(List<string> inputFiles, CancellationToken cancellationToken = default)
|
||||
{
|
||||
await _connection.InvokeAsync(nameof(Il2CppHub.SubmitInputFiles), inputFiles, cancellationToken);
|
||||
}
|
||||
|
||||
public async ValueTask QueueExport(string exportTypeId, string outputDirectory, Dictionary<string, string> settings,
|
||||
CancellationToken cancellationToken = default)
|
||||
{
|
||||
await _connection.InvokeAsync(nameof(Il2CppHub.QueueExport), exportTypeId, outputDirectory, settings, cancellationToken);
|
||||
}
|
||||
|
||||
public async ValueTask StartExport(CancellationToken cancellationToken = default)
|
||||
{
|
||||
await _connection.InvokeAsync(nameof(Il2CppHub.StartExport), cancellationToken);
|
||||
}
|
||||
|
||||
public async ValueTask<List<string>> GetPotentialUnityVersions(CancellationToken cancellationToken = default)
|
||||
=> await _connection.InvokeAsync<List<string>>(nameof(Il2CppHub.GetPotentialUnityVersions), cancellationToken);
|
||||
|
||||
public async ValueTask ExportIl2CppFiles(string outputDirectory, CancellationToken cancellationToken = default)
|
||||
{
|
||||
await _connection.InvokeAsync(nameof(Il2CppHub.ExportIl2CppFiles), outputDirectory, cancellationToken);
|
||||
}
|
||||
|
||||
public async ValueTask<string> GetInspectorVersion(CancellationToken cancellationToken = default)
|
||||
=> await _connection.InvokeAsync<string>(nameof(Il2CppHub.GetInspectorVersion), cancellationToken);
|
||||
|
||||
public async ValueTask WaitForLoadingToFinishAsync(CancellationToken cancellationToken = default)
|
||||
{
|
||||
var currentLoadingCount = _finishedLoadingCount;
|
||||
while (_finishedLoadingCount == currentLoadingCount)
|
||||
await Task.Delay(10, cancellationToken);
|
||||
}
|
||||
|
||||
private async Task ShowLogMessage(string message)
|
||||
{
|
||||
if (_logMessageChannel == null)
|
||||
{
|
||||
AnsiConsole.MarkupLine($"[white bold]{message}[/]");
|
||||
return;
|
||||
}
|
||||
|
||||
await _logMessageChannel.Writer.WriteAsync(message);
|
||||
}
|
||||
|
||||
private void BeginLoading()
|
||||
{
|
||||
_logMessageChannel = Channel.CreateUnbounded<string>(new UnboundedChannelOptions
|
||||
{
|
||||
SingleReader = true,
|
||||
SingleWriter = true,
|
||||
AllowSynchronousContinuations = true
|
||||
});
|
||||
|
||||
AnsiConsole.Status()
|
||||
.Spinner(Spinner.Known.Triangle)
|
||||
.StartAsync("Loading", async ctx =>
|
||||
{
|
||||
await foreach (var newLogMessage in _logMessageChannel.Reader.ReadAllAsync())
|
||||
{
|
||||
ctx.Status(newLogMessage);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void FinishLoading()
|
||||
{
|
||||
_logMessageChannel?.Writer.Complete();
|
||||
Interlocked.Increment(ref _finishedLoadingCount);
|
||||
}
|
||||
|
||||
private static void ShowInfoToast(string message)
|
||||
{
|
||||
AnsiConsole.MarkupLineInterpolated($"[bold white]INFO: {message}[/]");
|
||||
}
|
||||
|
||||
private static void ShowSuccessToast(string message)
|
||||
{
|
||||
AnsiConsole.MarkupLineInterpolated($"[bold][green]SUCCESS: [/] [white]{message}[/][/]");
|
||||
}
|
||||
|
||||
private static void ShowErrorToast(string message)
|
||||
{
|
||||
AnsiConsole.MarkupLineInterpolated($"[bold][red]ERROR: [/] [white]{message}[/][/]");
|
||||
}
|
||||
|
||||
private void OnImportCompleted()
|
||||
{
|
||||
ImportCompleted = true;
|
||||
}
|
||||
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
GC.SuppressFinalize(this);
|
||||
|
||||
foreach (var listener in _commandListeners)
|
||||
listener.Dispose();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user