ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup HTTP API, remove unused options.

Browse source
This commit is contained in:
Ottermandias 2023-02-21 16:30:09 +01:00
parent 0a47ae5b18
commit 7ee80c7d48
7 changed files with 140 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Penumbra/Penumbra.cs
View file

@ -6,8 +6,6 @@ using System.Reflection;
using System.Text;
using Dalamud.Interface.Windowing;
using Dalamud.Plugin;
using EmbedIO;
using EmbedIO.WebApi;
using ImGuiNET;
using Lumina.Excel.GeneratedSheets;
using OtterGui;
@ -81,6 +79,7 @@ public class Penumbra : IDalamudPlugin
public readonly ObjectReloader ObjectReloader;
public readonly ModFileSystem ModFileSystem;
public readonly PenumbraApi Api;
public readonly HttpApi HttpApi;
public readonly PenumbraIpcProviders IpcProviders;
private readonly ConfigWindow _configWindow;
private readonly LaunchButton _launchButton;
@ -89,14 +88,6 @@ public class Penumbra : IDalamudPlugin
private readonly CommandHandler _commandHandler;
private readonly ResourceWatcher _resourceWatcher;
internal WebServer? WebServer;
private static void Timed( StartTimeType type, Action action )
{
using var t = StartTimer.Measure( type );
action();
}
public Penumbra( DalamudPluginInterface pluginInterface )
{
using var time = StartTimer.Measure( StartTimeType.Total );
@ -158,21 +149,22 @@ public class Penumbra : IDalamudPlugin
PathResolver.Enable();
}
if( Config.EnableHttpApi )
{
CreateWebServer();
}
if( Config.DebugMode )
{
ResourceLoader.EnableDebug();
_configWindow.IsOpen = true;
}
using( var tAPI = StartTimer.Measure( StartTimeType.Api ) )
using( var tApi = StartTimer.Measure( StartTimeType.Api ) )
{
Api = new PenumbraApi( this );
IpcProviders = new PenumbraIpcProviders( Dalamud.PluginInterface, Api );
HttpApi = new HttpApi( Api );
if( Config.EnableHttpApi )
{
HttpApi.CreateWebServer();
}
SubscribeItemLinks();
}
@ -290,38 +282,12 @@ public class Penumbra : IDalamudPlugin
};
}
public void CreateWebServer()
{
const string prefix = "http://localhost:42069/";
ShutdownWebServer();
WebServer = new WebServer( o => o
.WithUrlPrefix( prefix )
.WithMode( HttpListenerMode.EmbedIO ) )
.WithCors( prefix )
.WithWebApi( "/api", m => m
.WithController( () => new ModsController( this ) )
.WithController( () => new RedrawController( this ) )
.WithController( () => new ReloadController( this ) ) );
WebServer.StateChanged += ( _, e ) => Log.Information( $"WebServer New State - {e.NewState}" );
WebServer.RunAsync();
}
public void ShutdownWebServer()
{
WebServer?.Dispose();
WebServer = null;
}
private short ResolveCutscene( ushort index )
=> ( short )PathResolver.CutsceneActor( index );
public void Dispose()
{
ShutdownWebServer();
HttpApi?.Dispose();
IpcProviders?.Dispose();
Api?.Dispose();
_commandHandler?.Dispose();