From 8c61a7e3b5491fb005f8efbb6f83c181f5b4ae45 Mon Sep 17 00:00:00 2001
From: Pat Hartl <pat@pathar.tl>
Date: Mon, 30 Oct 2023 18:45:11 -0500
Subject: [PATCH] Allow customization of the address that gets broadcast by the
 beacon

---
 .../Views/Authentication.xaml.cs              |  5 +-
 LANCommander/Models/Settings.cs               |  8 ++-
 LANCommander/Pages/Settings/Beacon.razor      | 49 +++++++++++++++++++
 LANCommander/Pages/Settings/General.razor     |  6 ---
 .../Pages/Settings/SettingsLayout.razor       |  1 +
 LANCommander/Program.cs                       |  2 +-
 LANCommander/Services/BeaconService.cs        |  2 +-
 7 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 LANCommander/Pages/Settings/Beacon.razor

diff --git a/LANCommander.Playnite.Extension/Views/Authentication.xaml.cs b/LANCommander.Playnite.Extension/Views/Authentication.xaml.cs
index 4155727..6b3db4f 100644
--- a/LANCommander.Playnite.Extension/Views/Authentication.xaml.cs
+++ b/LANCommander.Playnite.Extension/Views/Authentication.xaml.cs
@@ -40,7 +40,10 @@ namespace LANCommander.PlaynitePlugin.Views
             {
                 var beacon = beacons.First();
 
-                Context.ServerAddress = $"http://{beacon.Address.Address}:{beacon.Address.Port}";
+                if (!String.IsNullOrWhiteSpace(beacon.Data) && Uri.TryCreate(beacon.Data, UriKind.Absolute, out var beaconUri))
+                    Context.ServerAddress = beaconUri.ToString();
+                else
+                    Context.ServerAddress = $"http://{beacon.Address.Address}:{beacon.Address.Port}";
 
                 this.ServerAddress.Text = Context.ServerAddress;
 
diff --git a/LANCommander/Models/Settings.cs b/LANCommander/Models/Settings.cs
index fc10f1c..a8f0aa9 100644
--- a/LANCommander/Models/Settings.cs
+++ b/LANCommander/Models/Settings.cs
@@ -9,18 +9,24 @@
     public class LANCommanderSettings
     {
         public int Port { get; set; } = 1337;
-        public bool Beacon { get; set; } = true;
         public string DatabaseConnectionString { get; set; } = "Data Source=LANCommander.db;Cache=Shared";
         public string IGDBClientId { get; set; } = "";
         public string IGDBClientSecret { get; set; } = "";
         public LANCommanderTheme Theme { get; set; } = LANCommanderTheme.Light;
 
+        public LANCommanderBeaconSettings Beacon { get; set; } = new LANCommanderBeaconSettings();
         public LANCommanderAuthenticationSettings Authentication { get; set; } = new LANCommanderAuthenticationSettings();
         public LANCommanderUserSaveSettings UserSaves { get; set; } = new LANCommanderUserSaveSettings();
         public LANCommanderArchiveSettings Archives { get; set; } = new LANCommanderArchiveSettings();
         public LANCommanderIPXRelaySettings IPXRelay { get; set; } = new LANCommanderIPXRelaySettings();
     }
 
+    public class LANCommanderBeaconSettings
+    {
+        public bool Enabled { get; set; } = true;
+        public string Address { get; set; } = "";
+    }
+
     public class LANCommanderAuthenticationSettings
     {
         public bool RequireApproval { get; set; } = false;
diff --git a/LANCommander/Pages/Settings/Beacon.razor b/LANCommander/Pages/Settings/Beacon.razor
new file mode 100644
index 0000000..bdef90d
--- /dev/null
+++ b/LANCommander/Pages/Settings/Beacon.razor
@@ -0,0 +1,49 @@
+@page "/Settings/Beacon"
+@using LANCommander.Models;
+@layout SettingsLayout
+@inject SettingService SettingService
+@inject IPXRelayService IPXRelayService
+@inject IMessageService MessageService
+@attribute [Authorize(Roles = "Administrator")]
+
+<PageHeader Title="Beacon" />
+
+<div style="padding: 0 24px;">
+    <Form Model="Settings" Layout="@FormLayout.Vertical">
+        <FormItem Label="Enable">
+            <Text Type="@TextElementType.Secondary">Enabling the beacon will allow clients on the same network to auto-discover the LANCommander address.</Text>
+            <Switch @bind-Checked="context.Beacon.Enabled" />
+        </FormItem>
+
+        <FormItem Label="Address">
+            <Text Type="@TextElementType.Secondary">Use this to customize the address that is broadcasted to clients. Default: http://&lt;Server IP&gt;:@context.Port</Text>
+            <Input @bind-Value="Settings.Beacon.Address" />
+        </FormItem>
+
+        <FormItem>
+            <Button OnClick="Save" Type="@ButtonType.Primary">Save</Button>
+        </FormItem>
+    </Form>
+</div>
+
+@code {
+    LANCommanderSettings Settings;
+
+    protected override async Task OnInitializedAsync()
+    {
+        Settings = SettingService.GetSettings();
+    }
+
+    private void Save()
+    {
+        try
+        {
+            SettingService.SaveSettings(Settings);
+            MessageService.Success("Settings saved!");
+        }
+        catch
+        {
+            MessageService.Error("An unknown error occurred.");
+        }
+    }
+}
diff --git a/LANCommander/Pages/Settings/General.razor b/LANCommander/Pages/Settings/General.razor
index 480e5fb..1b51e76 100644
--- a/LANCommander/Pages/Settings/General.razor
+++ b/LANCommander/Pages/Settings/General.razor
@@ -12,12 +12,6 @@
 
 <div style="padding: 0 24px;">
     <Form Model="Settings" Layout="@FormLayout.Vertical">
-        <FormItem Label="Beacon">
-            <Switch @bind-Checked="context.Beacon" />
-        </FormItem>
-
-        <Text Type="@TextElementType.Secondary">Enabling the beacon will allow clients on the same network to auto-discover the LANCommander address.</Text>
-
         <FormItem Label="Theme">
             <Select @bind-Value="context.Theme" TItem="LANCommanderTheme" TItemValue="LANCommanderTheme" DataSource="Enum.GetValues<LANCommanderTheme>()">
                 <LabelTemplate Context="Value">@Value.GetDisplayName()</LabelTemplate>
diff --git a/LANCommander/Pages/Settings/SettingsLayout.razor b/LANCommander/Pages/Settings/SettingsLayout.razor
index 4c39d67..335e07b 100644
--- a/LANCommander/Pages/Settings/SettingsLayout.razor
+++ b/LANCommander/Pages/Settings/SettingsLayout.razor
@@ -11,6 +11,7 @@
             <MenuItem RouterLink="/Settings/UserSaves">User Saves</MenuItem>
             <MenuItem RouterLink="/Settings/Archives">Archives</MenuItem>
             <MenuItem RouterLink="/Settings/IPXRelay">IPX Relay</MenuItem>
+            <MenuItem RouterLink="/Settings/Beacon">Beacon</MenuItem>
             <MenuItem RouterLink="/Settings/Tools" RouterMatch="@NavLinkMatch.Prefix">Tools</MenuItem>
         </Menu>
     </Sider>
diff --git a/LANCommander/Program.cs b/LANCommander/Program.cs
index 6f787fb..38c0192 100644
--- a/LANCommander/Program.cs
+++ b/LANCommander/Program.cs
@@ -146,7 +146,7 @@ namespace LANCommander
             builder.Services.AddSingleton<ServerProcessService>();
             builder.Services.AddSingleton<IPXRelayService>();
 
-            if (settings.Beacon)
+            if (settings.Beacon?.Enabled ?? false)
             {
                 Logger.Debug("The beacons have been lit! LANCommander calls for players!");
                 builder.Services.AddHostedService<BeaconService>();
diff --git a/LANCommander/Services/BeaconService.cs b/LANCommander/Services/BeaconService.cs
index 250c9b5..9632046 100644
--- a/LANCommander/Services/BeaconService.cs
+++ b/LANCommander/Services/BeaconService.cs
@@ -20,7 +20,7 @@ namespace LANCommander.Services
 
         public Task StartAsync(CancellationToken cancellationToken)
         {
-            Beacon.BeaconData = "Acknowledged HQ";
+            Beacon.BeaconData = Settings.Beacon?.Address;
             Beacon.Start();
 
             return Task.CompletedTask;