diff --git a/InnoSetup/Elite Observatory.iss b/InnoSetup/Elite Observatory.iss deleted file mode 100644 index a72efa1..0000000 --- a/InnoSetup/Elite Observatory.iss +++ /dev/null @@ -1,336 +0,0 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -#define MyAppName "Elite Observatory" -#define MyAppPublisher "Jonathan Miller" -#define MyAppURL "https://github.com/xjph/ObservatoryCore" -#define MyAppExeName "ObservatoryCore.exe" -#define MyAppVersion GetVersionNumbersString('..\ObservatoryCore\bin\Release\net6.0\publish\framework-dependent\ObservatoryCore.exe') - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{025F6049-430E-45D9-833E-30F0F5D998F5} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={autopf}\{#MyAppName} -DisableDirPage=false -DefaultGroupName={#MyAppName} -AllowNoIcons=yes -LicenseFile=C:\Users\Xjph\Repos\MIT.txt -; Uncomment the following line to run in non administrative install mode (install for current user only.) -;PrivilegesRequired=lowest -PrivilegesRequiredOverridesAllowed=dialog -OutputDir=. -OutputBaseFilename=ObservatorySetup -SetupIconFile=..\ObservatoryCore\Assets\EOCIcon-Presized.ico -Compression=lzma -SolidCompression=yes -WizardStyle=modern -ArchitecturesInstallIn64BitMode=x64 -ChangesAssociations=yes - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Types] -Name: "Full"; Description: "Full installation" -Name: "Custom"; Description: "Custom installation"; Flags: iscustom - -[CustomMessages] -TelegramDescription=Telegram: Plugin for sending notifications via Telegram instant messages.%nProvided by Matt-G (mgraham-dev). - -[Components] -Name: "Core"; Description: "Core Elite Observatory Application"; Flags: fixed; Types: Full Custom -Name: "Plugins"; Description: "Optional Observatory Plugins"; Types: Full -Name: "Plugins\Explorer"; Description: "Explorer: Plugin for finding interesting objects while exploring."; Types: Full -Name: "Plugins\Botanist"; Description: "Botanist: Plugin for tracking surface biological signals scanned while on foot."; Types: Full -Name: "Plugins\Herald"; Description: "Herald: Plugin for cloud-based high quality speech notifications via Microsoft Azure Cognitive Services."; Types: Full -Name: "Plugins\Telegram"; Description: "{cm:TelegramDescription}"; Types: Full - -[Dirs] -Name: "{app}\plugins"; Permissions: users-modify - -[Files] -Source: "..\ObservatoryCore\bin\Release\net6.0\publish\framework-dependent\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\ObservatoryCore\bin\Release\net6.0\publish\framework-dependent\*"; Excludes: "\plugins\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "..\ObservatoryCore\bin\Release\net6.0\plugins\ObservatoryExplorer.dll"; DestDir: "{app}\plugins"; Components: Plugins\Explorer -Source: "..\ObservatoryCore\bin\Release\net6.0\plugins\deps\lua54.dll"; DestDir: "{app}\plugins\deps"; Components: Plugins\Explorer -Source: "..\ObservatoryCore\bin\Release\net6.0\plugins\deps\KeraLua.dll"; DestDir: "{app}\plugins\deps"; Components: Plugins\Explorer -Source: "..\ObservatoryCore\bin\Release\net6.0\plugins\deps\NLua.dll"; DestDir: "{app}\plugins\deps"; Components: Plugins\Explorer -Source: "..\ObservatoryCore\bin\Release\net6.0\plugins\ObservatoryHerald.dll"; DestDir: "{app}\plugins"; Components: Plugins\Herald -Source: "..\ObservatoryCore\bin\Release\net6.0\plugins\ObservatoryBotanist.dll"; DestDir: "{app}\plugins"; Components: Plugins\Botanist -Source: "..\ObservatoryCore\bin\Release\net6.0\plugins\ObservatoryTelegram.dll"; DestDir: "{app}\plugins"; Components: Plugins\Telegram -Source: ".\netcorecheck.exe"; Flags: dontcopy noencryption -Source: ".\netcorecheck_x64.exe"; Flags: dontcopy noencryption - -[Icons] -Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon - -[Run] -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent - -[Registry] -Root: HKA; Subkey: "Software\Classes\.eop\OpenWithProgids"; ValueType: string; ValueName: "ObservatoryPlugin.eop"; ValueData: ""; Flags: uninsdeletevalue -Root: HKA; Subkey: "Software\Classes\ObservatoryPlugin.eop"; ValueType: string; ValueName: ""; ValueData: "Elite Observatory Plugin"; Flags: uninsdeletekey -Root: HKA; Subkey: "Software\Classes\ObservatoryPlugin.eop\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0" -Root: HKA; Subkey: "Software\Classes\ObservatoryPlugin.eop\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1""" -Root: HKA; Subkey: "Software\Classes\Applications\{#MyAppExeName}\SupportedTypes"; ValueType: string; ValueName: ".eop"; ValueData: "" - -[Code] - -type - TDependency_Entry = record - Filename: String; - Parameters: String; - Title: String; - URL: String; - Checksum: String; - ForceSuccess: Boolean; - RestartAfter: Boolean; - end; - -var - Dependency_Memo: String; - Dependency_List: array of TDependency_Entry; - Dependency_NeedRestart, Dependency_ForceX86: Boolean; - Dependency_DownloadPage: TDownloadWizardPage; - -procedure InitializeWizard; -begin - Dependency_DownloadPage := CreateDownloadPage(SetupMessage(msgWizardPreparing), SetupMessage(msgPreparingDesc), nil); -end; - -function Dependency_PrepareToInstall(var NeedsRestart: Boolean): String; -var - DependencyCount, DependencyIndex, ResultCode: Integer; - Retry: Boolean; - TempValue: String; -begin - DependencyCount := GetArrayLength(Dependency_List); - - if DependencyCount > 0 then begin - Dependency_DownloadPage.Show; - - for DependencyIndex := 0 to DependencyCount - 1 do begin - if Dependency_List[DependencyIndex].URL <> '' then begin - Dependency_DownloadPage.Clear; - Dependency_DownloadPage.Add(Dependency_List[DependencyIndex].URL, Dependency_List[DependencyIndex].Filename, Dependency_List[DependencyIndex].Checksum); - - Retry := True; - while Retry do begin - Retry := False; - - try - Dependency_DownloadPage.Download; - except - if Dependency_DownloadPage.AbortedByUser then begin - Result := Dependency_List[DependencyIndex].Title; - DependencyIndex := DependencyCount; - end else begin - case SuppressibleMsgBox(AddPeriod(GetExceptionMessage), mbError, MB_ABORTRETRYIGNORE, IDIGNORE) of - IDABORT: begin - Result := Dependency_List[DependencyIndex].Title; - DependencyIndex := DependencyCount; - end; - IDRETRY: begin - Retry := True; - end; - end; - end; - end; - end; - end; - end; - - if Result = '' then begin - for DependencyIndex := 0 to DependencyCount - 1 do begin - Dependency_DownloadPage.SetText(Dependency_List[DependencyIndex].Title, ''); - Dependency_DownloadPage.SetProgress(DependencyIndex + 1, DependencyCount + 1); - - while True do begin - ResultCode := 0; - if ShellExec('', ExpandConstant('{tmp}{\}') + Dependency_List[DependencyIndex].Filename, Dependency_List[DependencyIndex].Parameters, '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode) then begin - if Dependency_List[DependencyIndex].RestartAfter then begin - if DependencyIndex = DependencyCount - 1 then begin - Dependency_NeedRestart := True; - end else begin - NeedsRestart := True; - Result := Dependency_List[DependencyIndex].Title; - end; - break; - end else if (ResultCode = 0) or Dependency_List[DependencyIndex].ForceSuccess then begin // ERROR_SUCCESS (0) - break; - end else if ResultCode = 1641 then begin // ERROR_SUCCESS_REBOOT_INITIATED (1641) - NeedsRestart := True; - Result := Dependency_List[DependencyIndex].Title; - break; - end else if ResultCode = 3010 then begin // ERROR_SUCCESS_REBOOT_REQUIRED (3010) - Dependency_NeedRestart := True; - break; - end; - end; - - case SuppressibleMsgBox(FmtMessage(SetupMessage(msgErrorFunctionFailed), [Dependency_List[DependencyIndex].Title, IntToStr(ResultCode)]), mbError, MB_ABORTRETRYIGNORE, IDIGNORE) of - IDABORT: begin - Result := Dependency_List[DependencyIndex].Title; - break; - end; - IDIGNORE: begin - break; - end; - end; - end; - - if Result <> '' then begin - break; - end; - end; - - if NeedsRestart then begin - TempValue := '"' + ExpandConstant('{srcexe}') + '" /restart=1 /LANG="' + ExpandConstant('{language}') + '" /DIR="' + WizardDirValue + '" /GROUP="' + WizardGroupValue + '" /TYPE="' + WizardSetupType(False) + '" /COMPONENTS="' + WizardSelectedComponents(False) + '" /TASKS="' + WizardSelectedTasks(False) + '"'; - if WizardNoIcons then begin - TempValue := TempValue + ' /NOICONS'; - end; - RegWriteStringValue(HKA, 'SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce', '{#SetupSetting("AppName")}', TempValue); - end; - end; - - Dependency_DownloadPage.Hide; - end; -end; - -function PrepareToInstall(var NeedsRestart: Boolean): String; -begin - Result := Dependency_PrepareToInstall(NeedsRestart); -end; - -function NeedRestart: Boolean; -begin - Result := Dependency_NeedRestart; -end; - -function Dependency_UpdateReadyMemo(const Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String; -begin - Result := ''; - if MemoUserInfoInfo <> '' then begin - Result := Result + MemoUserInfoInfo + Newline + NewLine; - end; - if MemoDirInfo <> '' then begin - Result := Result + MemoDirInfo + Newline + NewLine; - end; - if MemoTypeInfo <> '' then begin - Result := Result + MemoTypeInfo + Newline + NewLine; - end; - if MemoComponentsInfo <> '' then begin - Result := Result + MemoComponentsInfo + Newline + NewLine; - end; - if MemoGroupInfo <> '' then begin - Result := Result + MemoGroupInfo + Newline + NewLine; - end; - if MemoTasksInfo <> '' then begin - Result := Result + MemoTasksInfo; - end; - - if Dependency_Memo <> '' then begin - if MemoTasksInfo = '' then begin - Result := Result + SetupMessage(msgReadyMemoTasks); - end; - Result := Result + FmtMessage(Dependency_Memo, [Space]); - end; -end; - -function UpdateReadyMemo(const Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String; -begin - Result := Dependency_UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo); -end; - -function Dependency_IsX64: Boolean; -begin - Result := not Dependency_ForceX86 and Is64BitInstallMode; -end; - -function Dependency_String(const x86, x64: String): String; -begin - if Dependency_IsX64 then begin - Result := x64; - end else begin - Result := x86; - end; -end; - -function Dependency_ArchSuffix: String; -begin - Result := Dependency_String('', '_x64'); -end; - -function Dependency_ArchTitle: String; -begin - Result := Dependency_String(' (x86)', ' (x64)'); -end; - -function Dependency_IsNetCoreInstalled(const Version: String): Boolean; -var - ResultCode: Integer; -begin - // source code: https://github.com/dotnet/deployment-tools/tree/master/src/clickonce/native/projects/NetCoreCheck - if not FileExists(ExpandConstant('{tmp}{\}') + 'netcorecheck' + Dependency_ArchSuffix + '.exe') then begin - ExtractTemporaryFile('netcorecheck' + Dependency_ArchSuffix + '.exe'); - end; - Result := ShellExec('', ExpandConstant('{tmp}{\}') + 'netcorecheck' + Dependency_ArchSuffix + '.exe', Version, '', SW_HIDE, ewWaitUntilTerminated, ResultCode) and (ResultCode = 0); -end; - -procedure Dependency_Add(const Filename, Parameters, Title, URL, Checksum: String; const ForceSuccess, RestartAfter: Boolean); -var - Dependency: TDependency_Entry; - DependencyCount: Integer; -begin - Dependency_Memo := Dependency_Memo + #13#10 + '%1' + Title; - - Dependency.Filename := Filename; - Dependency.Parameters := Parameters; - Dependency.Title := Title; - - if FileExists(ExpandConstant('{tmp}{\}') + Filename) then begin - Dependency.URL := ''; - end else begin - Dependency.URL := URL; - end; - - Dependency.Checksum := Checksum; - Dependency.ForceSuccess := ForceSuccess; - Dependency.RestartAfter := RestartAfter; - - DependencyCount := GetArrayLength(Dependency_List); - SetArrayLength(Dependency_List, DependencyCount + 1); - Dependency_List[DependencyCount] := Dependency; -end; - -procedure Dependency_AddDotNet60Desktop; -begin - // https://dotnet.microsoft.com/download/dotnet/5.0 - if not Dependency_IsNetCoreInstalled('Microsoft.WindowsDesktop.App 6.0.11') then begin - Dependency_Add('dotnet50desktop' + Dependency_ArchSuffix + '.exe', - '/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart', - '.NET Desktop Runtime 6.0.11' + Dependency_ArchTitle, - Dependency_String('https://download.visualstudio.microsoft.com/download/pr/2a392287-fd51-4ee8-9c15-a672ab9bc55d/03d4784b3a543a0fb9ce5677ed13a9a3/windowsdesktop-runtime-6.0.11-win-x86.exe', 'https://download.visualstudio.microsoft.com/download/pr/0192a249-3ec8-4374-a827-e186dd58d55d/cec046575f3eb2247a10ba3d50f5cf6c/windowsdesktop-runtime-6.0.11-win-x64.exe'), - '', False, False); - end; -end; - -function InitializeSetup: Boolean; -begin - // add the dependencies you need - Dependency_AddDotNet60Desktop; - // ... - Result := true; -end; \ No newline at end of file diff --git a/InnoSetup/netcorecheck.exe b/InnoSetup/netcorecheck.exe deleted file mode 100644 index 5f4e825..0000000 Binary files a/InnoSetup/netcorecheck.exe and /dev/null differ diff --git a/InnoSetup/netcorecheck_x64.exe b/InnoSetup/netcorecheck_x64.exe deleted file mode 100644 index 6e7441d..0000000 Binary files a/InnoSetup/netcorecheck_x64.exe and /dev/null differ diff --git a/LICENSE b/LICENSE index 865a9f8..a425d51 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 Jonathan Miller +Copyright (c) 2021-2024 Elite Observatory Contributors & Others Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/ObservatoryFramework/Files/Converters/PipConverter.cs b/ObservatoryFramework/Files/Converters/PipConverter.cs index 731e41a..27020d2 100644 --- a/ObservatoryFramework/Files/Converters/PipConverter.cs +++ b/ObservatoryFramework/Files/Converters/PipConverter.cs @@ -7,13 +7,13 @@ class PipConverter : JsonConverter<(int Sys, int Eng, int Wep)> { public override (int Sys, int Eng, int Wep) Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - var values = (int[])JsonSerializer.Deserialize(ref reader, typeof(int[])); + var values = JsonSerializer.Deserialize(ref reader); return (Sys: values[0], Eng: values[1], Wep: values[2]); } public override void Write(Utf8JsonWriter writer, (int Sys, int Eng, int Wep) value, JsonSerializerOptions options) { - throw new NotImplementedException(); + JsonSerializer.Serialize(writer, new[] { value.Sys, value.Eng, value.Wep }); } } \ No newline at end of file diff --git a/ObservatoryFramework/Files/Status.cs b/ObservatoryFramework/Files/Status.cs index e84f033..8c35edc 100644 --- a/ObservatoryFramework/Files/Status.cs +++ b/ObservatoryFramework/Files/Status.cs @@ -18,84 +18,84 @@ public class Status : JournalBase /// Additional set of flags representing current player state. /// Added in later versions of Elite Dangerous. /// - public StatusFlags2 Flags2 { get; init; } + public StatusFlags2? Flags2 { get; init; } /// /// Current allocation of power distribution (pips) between SYS, ENG, and WEP, in "half pip" increments. /// [JsonConverter(typeof(PipConverter))] - public (int Sys, int Eng, int Wep) Pips { get; init; } + public (int Sys, int Eng, int Wep)? Pips { get; init; } /// /// Currently selected fire group. /// - public int Firegroup { get; init; } + public int? Firegroup { get; init; } /// /// UI component currently focused by the player. /// - public FocusStatus GuiFocus { get; init; } + public FocusStatus? GuiFocus { get; init; } /// /// Fuel remaining in the current ship. /// - public FuelType Fuel { get; init; } + public FuelType? Fuel { get; init; } /// /// Amount of cargo currently carried. /// - public float Cargo { get; init; } + public float? Cargo { get; init; } /// /// Legal status in the current jurisdiction. /// [JsonConverter(typeof(JsonStringEnumConverter))] - public LegalStatus LegalState { get; init; } + public LegalStatus? LegalState { get; init; } /// /// Current altitude. /// Check if RadialAltitude is set in StatusFlags to determine if altitude is based on planetary radius (set) or raycast to ground (unset). /// - public int Altitude { get; init; } + public int? Altitude { get; init; } /// /// Latitude of current surface location. /// - public double Latitude { get; init; } + public double? Latitude { get; init; } /// /// Longitude of current surface location. /// - public double Longitude { get; init; } + public double? Longitude { get; init; } /// /// Current heading for surface direction. /// - public int Heading { get; init; } + public int? Heading { get; init; } /// /// Body name of current location. /// - public string BodyName { get; init; } + public string? BodyName { get; init; } /// /// Radius of current planet. /// - public double PlanetRadius { get; init; } + public double? PlanetRadius { get; init; } /// /// Oxygen remaining on foot, range from 0.0 - 1.0. /// - public float Oxygen { get; init; } + public float? Oxygen { get; init; } /// /// Health remaining on foot, range from 0.0 - 1.0. /// - public float Health { get; init; } + public float? Health { get; init; } /// /// Current environmental temperature in K while on foot. /// - public float Temperature { get; init; } + public float? Temperature { get; init; } /// /// Name of currently selected personal weapon. /// - public string SelectedWeapon { get; init; } + public string? SelectedWeapon { get; init; } /// /// Current strength of gravity while on foot, in g. /// - public float Gravity { get; init; } + public float? Gravity { get; init; } /// /// Current credit balance of player. /// - public long Balance { get; init; } + public long? Balance { get; init; } /// /// Currently set destination. /// - public Destination Destination { get; init; } + public Destination? Destination { get; init; } } \ No newline at end of file diff --git a/Pulsar/Features/EventsHub.cs b/Pulsar/Features/EventsHub.cs index 6121b1e..3c4813a 100644 --- a/Pulsar/Features/EventsHub.cs +++ b/Pulsar/Features/EventsHub.cs @@ -4,7 +4,7 @@ using Observatory.Framework.Files; using Observatory.Framework.Files.Journal; using Microsoft.AspNetCore.SignalR; -public class EventsHub : Hub +public class EventsHub : Hub { public async Task StatusUpdated(Observatory.Framework.Files.Status status) => await Clients.All.StatusUpdated(status); @@ -27,7 +27,7 @@ public class EventsHub : Hub public async Task BackpackUpdated(BackpackFile backpack) => await Clients.All.BackpackUpdated(backpack); } -public interface IEventHub +public interface IEventsHub { Task StatusUpdated(Observatory.Framework.Files.Status status); diff --git a/Pulsar/Features/Status/StatusController.cs b/Pulsar/Features/Status/StatusController.cs index 20487c3..f3c984c 100644 --- a/Pulsar/Features/Status/StatusController.cs +++ b/Pulsar/Features/Status/StatusController.cs @@ -1,12 +1,32 @@ +using Microsoft.AspNetCore.SignalR; + namespace Pulsar.Features.Status; [ApiController] [Route("api/status")] -public class StatusController : Controller +public class StatusController(IOptions pulsarOptions, IHubContext hub) : ControllerBase { [HttpGet] - public IActionResult Get() + public async Task Get() { - return Ok(); + // TODO: put in service + var journalDir = pulsarOptions.Value.JournalDirectory; + var dir = new DirectoryInfo(journalDir); + + if (!dir.Exists) + return Problem("Journal directory does not exist."); + + var files = dir.GetFiles(); + + var statusFile = files.FirstOrDefault(f => + string.Equals(f.Name, "status.json", StringComparison.InvariantCultureIgnoreCase)); + + if (statusFile == null) + return Problem("Status file not found."); + + await using var file = System.IO.File.Open(statusFile.FullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); + var status = await JsonSerializer.DeserializeAsync(file); + await hub.Clients.All.StatusUpdated(status); + return Ok(status); } } \ No newline at end of file diff --git a/Pulsar/Global.Usings.cs b/Pulsar/Global.Usings.cs index cc04e2d..c688c13 100644 --- a/Pulsar/Global.Usings.cs +++ b/Pulsar/Global.Usings.cs @@ -5,3 +5,5 @@ global using System.Text.Json; global using System.Text.Json.Nodes; global using System.Text.Json.Serialization; global using Microsoft.AspNetCore.Mvc; +global using Microsoft.Extensions.Options; + diff --git a/Pulsar/Program.cs b/Pulsar/Program.cs index 6565583..3208dfd 100644 --- a/Pulsar/Program.cs +++ b/Pulsar/Program.cs @@ -1,18 +1,34 @@ using Lamar.Microsoft.DependencyInjection; +using Microsoft.AspNetCore.Cors.Infrastructure; +using Pulsar.Features; var builder = WebApplication.CreateBuilder(args); builder.Services.AddLamar(); -builder.Services.AddControllers(); -builder.Services.AddSignalR(); +builder.Services.AddControllersWithViews(); +builder.Services.AddCors(options => +{ + options.AddDefaultPolicy(new CorsPolicy() + { Origins = { "http://localhost:5000" }, Headers = { "*" }, Methods = { "*" } }); +}); +builder.Services.AddSignalR().AddJsonProtocol(options => + options.PayloadSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull); builder.Services.AddDbContext(); builder.Services.Configure(builder.Configuration.GetSection(nameof(Pulsar))); +builder.Services.Configure(options => + options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull); +builder.Services.AddReverseProxy().LoadFromConfig(builder.Configuration.GetSection("ReverseProxy")); +builder.Services.AddSpaYarp(); var app = builder.Build(); -await app.RunAsync(); +app.UseRouting(); +app.MapReverseProxy(); +app.MapControllers(); +app.MapDefaultControllerRoute(); +app.UseWebSockets(); +app.MapHub("api/events"); +app.UseSpaYarp(); +app.MapFallbackToFile("index.html"); -public class PulsarConfiguration -{ - public string JournalDirectory { get; set; } -} \ No newline at end of file +await app.RunAsync(); \ No newline at end of file diff --git a/Pulsar/Pulsar.csproj b/Pulsar/Pulsar.csproj index b1ec4de..8df4c3e 100644 --- a/Pulsar/Pulsar.csproj +++ b/Pulsar/Pulsar.csproj @@ -7,6 +7,8 @@ enable Pulsar latest + WebApp/ + http://localhost:5173 @@ -14,11 +16,13 @@ + + \ No newline at end of file diff --git a/Pulsar/PulsarConfiguration.cs b/Pulsar/PulsarConfiguration.cs new file mode 100644 index 0000000..aecab51 --- /dev/null +++ b/Pulsar/PulsarConfiguration.cs @@ -0,0 +1,6 @@ +namespace Pulsar; + +public class PulsarConfiguration +{ + public string JournalDirectory { get; set; } +} \ No newline at end of file diff --git a/Pulsar/WebApp/package-lock.json b/Pulsar/WebApp/package-lock.json index 64c5e39..7da4596 100644 --- a/Pulsar/WebApp/package-lock.json +++ b/Pulsar/WebApp/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.1", "devDependencies": { "@biomejs/biome": "1.6.4", + "@microsoft/signalr": "^8.0.0", "@playwright/test": "^1.28.1", "@sveltejs/adapter-static": "^3.0.1", "@sveltejs/kit": "^2.0.0", @@ -729,6 +730,19 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@microsoft/signalr": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-8.0.0.tgz", + "integrity": "sha512-K/wS/VmzRWePCGqGh8MU8OWbS1Zvu7DG7LSJS62fBB8rJUXwwj4axQtqrAAwKGUZHQF6CuteuQR9xMsVpM2JNA==", + "dev": true, + "dependencies": { + "abort-controller": "^3.0.0", + "eventsource": "^2.0.2", + "fetch-cookie": "^2.0.3", + "node-fetch": "^2.6.7", + "ws": "^7.4.5" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -1333,6 +1347,18 @@ "dev": true, "peer": true }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, "node_modules/acorn": { "version": "8.11.3", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", @@ -1991,6 +2017,24 @@ "node": ">=0.10.0" } }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/eventsource": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz", + "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==", + "dev": true, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -2049,6 +2093,16 @@ "reusify": "^1.0.4" } }, + "node_modules/fetch-cookie": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-2.2.0.tgz", + "integrity": "sha512-h9AgfjURuCgA2+2ISl8GbavpUdR+WGAM2McW/ovn4tVccegp8ZqCKWSBR8uRdM8dDNlx5WdKRWxBYUwteLDCNQ==", + "dev": true, + "dependencies": { + "set-cookie-parser": "^2.4.8", + "tough-cookie": "^4.0.0" + } + }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -2614,6 +2668,26 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -2902,16 +2976,27 @@ "node": ">= 0.8.0" } }, + "node_modules/psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "peer": true, "engines": { "node": ">=6" } }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -2944,6 +3029,12 @@ "node": ">=8.10.0" } }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -3405,6 +3496,27 @@ "node": ">=6" } }, + "node_modules/tough-cookie": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", + "dev": true, + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "dev": true + }, "node_modules/ts-api-utils": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", @@ -3488,6 +3600,15 @@ } } }, + "node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -3498,6 +3619,16 @@ "punycode": "^2.1.0" } }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -3587,6 +3718,22 @@ } } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "dev": true + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dev": true, + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -3609,6 +3756,27 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, + "node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "dev": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", diff --git a/Pulsar/WebApp/package.json b/Pulsar/WebApp/package.json index 0e6af99..e46c578 100644 --- a/Pulsar/WebApp/package.json +++ b/Pulsar/WebApp/package.json @@ -18,6 +18,7 @@ "@sveltejs/kit": "^2.0.0", "@sveltejs/vite-plugin-svelte": "^3.0.0", "@types/eslint": "^8.56.7", + "@microsoft/signalr": "^8.0.0", "eslint-plugin-svelte": "^2.36.0", "globals": "^15.0.0", "sass": "^1.75.0", diff --git a/Pulsar/WebApp/src/routes/+page.svelte b/Pulsar/WebApp/src/routes/+page.svelte index d894a76..5401452 100644 --- a/Pulsar/WebApp/src/routes/+page.svelte +++ b/Pulsar/WebApp/src/routes/+page.svelte @@ -1,13 +1,56 @@

Welcome to Pulsar

- + {x} + +
+ + diff --git a/Pulsar/appsettings.development.json b/Pulsar/appsettings.development.json new file mode 100644 index 0000000..36d4735 --- /dev/null +++ b/Pulsar/appsettings.development.json @@ -0,0 +1,29 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information", + "Microsoft.AspNetCore": "Debug" + } + }, + "ReverseProxy": { + "Routes": { + "spaDevRoute": { + "ClusterId": "spaDevCluster", + "Match": { + "Path": "{**catch-all}" + } + } + }, + "Clusters": { + "spaDev": { + "Destinations": { + "spaDevServer": { + "Address": "http://localhost:5173" + } + } + } + } + } +} \ No newline at end of file diff --git a/Pulsar/appSettings.json b/Pulsar/appsettings.json similarity index 100% rename from Pulsar/appSettings.json rename to Pulsar/appsettings.json diff --git a/README.md b/README.md index d67bcb1..8593843 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,34 @@ # Elite Pulsar -A Service for monitoring Elite Dangerous Journals & Events & A Web UI viewing information -Forked from Elite Observatory Core. +A Work In Progress Application For Presenting Game Data In Realtime From Elite Dangerous Journals & Events. + +A Cross Platform Fork of Elite Observatory Core. ## Planned Feature - [ ] Read the Journal + - [x] Read Status File - [ ] Show Journal information ( Current Ship, Station, etc. ) + - [ ] Realtime API - [ ] Realtime Journal Updates - [ ] System Exploration Value - [ ] System Exobiology Value + - [ ] Fuel/Jump Warning + - [ ] Commodities Targets/Alerts (Commodity Above/Below value at current station) + - [ ] Outfitting Targets (does this station have wanted parts for build) - [ ] CAPI Integration - [ ] EDDN Submission + - [ ] Must be easilty disableable for sneaky business - [ ] IGAU Submission - [ ] Plugin System - - [ ] Tray Icon + - [ ] Overlay + - [ ] Tay Icon - ## How To Use +TODO: make easy - -## Building - + - Build the web app + - install the service (web app must be served from the backend) + - configure journal directory in appsettings.json + - load the application