From b3f4a814e3e323e25de8e36a8cf128ae25620565 Mon Sep 17 00:00:00 2001
From: NathanFlurry <git@nathanflurry.com>
Date: Mon, 26 Aug 2024 17:53:44 +0000
Subject: [PATCH] chore: re-impl deploys (#45)

---
 .dockerignore                                 |  2 +
 Assets/Backend/Client/ApiClient.cs            |  3 +
 Assets/Examples/LobbiesServers/Scripts/UI.cs  |  7 +-
 Assets/Rivet/Editor/BuildPipeline.cs          | 13 ++-
 Assets/Rivet/Editor/PluginSettings.cs         |  8 +-
 Assets/Rivet/Editor/Task.cs                   | 12 ++-
 Assets/Rivet/Editor/UI/RivetPlugin.cs         | 14 ++++
 .../Editor/UI/Screens/LoginController.cs      |  3 +
 .../Rivet/Editor/UI/Screens/MainController.cs | 19 +++--
 .../Rivet/Editor/UI/Tabs/DeployController.cs  | 60 +++++++++----
 Assets/Rivet/Editor/UI/Tabs/Develop.uxml      |  4 +-
 .../Rivet/Editor/UI/Tabs/DevelopController.cs | 12 ++-
 Assets/Rivet/Editor/UI/Tabs/Settings.uxml     |  4 +-
 .../Editor/UI/Tabs/SettingsController.cs      | 40 ++++++++-
 Assets/Rivet/Editor/UI/Tabs/Setup.uxml        |  3 +-
 .../Editor/UI/TaskPopup/TaskPopupWindow.cs    | 13 +--
 Assets/Rivet/Editor/Util/Builder.cs           | 84 +++++++++----------
 Dockerfile                                    | 20 +++++
 backend.json                                  | 22 ++++-
 19 files changed, 246 insertions(+), 97 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..1e27ddd
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+*
+!Builds/Release/DedicatedServer/
diff --git a/Assets/Backend/Client/ApiClient.cs b/Assets/Backend/Client/ApiClient.cs
index 188b3c9..c18eeab 100644
--- a/Assets/Backend/Client/ApiClient.cs
+++ b/Assets/Backend/Client/ApiClient.cs
@@ -423,6 +423,9 @@ private async Task<ApiResponse<T>> ExecAsync<T>(
                     await tsc.Task;
                 }
                 
+                // Log the path and response
+                Debug.Log($"Backend request {request.method} {path} ({request.responseCode}): {request.downloadHandler.text}");
+
                 if (request.result == UnityWebRequest.Result.ConnectionError ||
                     request.result == UnityWebRequest.Result.DataProcessingError)
                 {
diff --git a/Assets/Examples/LobbiesServers/Scripts/UI.cs b/Assets/Examples/LobbiesServers/Scripts/UI.cs
index 42b39a7..eb18978 100644
--- a/Assets/Examples/LobbiesServers/Scripts/UI.cs
+++ b/Assets/Examples/LobbiesServers/Scripts/UI.cs
@@ -33,6 +33,11 @@ private BackendClient TEMPBackendClient()
         return new BackendClient(config.BackendEndpoint);
     }
 
+    private string TEMPGameVersion() {
+        var config = new Configuration();
+        return config.GameVersion;
+    }
+
     private void Start()
     {
         _networkManager = FindObjectOfType<NetworkManager>();
@@ -61,7 +66,7 @@ public async void OnClick_Find()
         joinMenuPanel.SetActive(false);
 
         var response = await TEMPBackendClient().Lobbies.FindOrCreate(new Backend.Model.Lobbies.FindOrCreateRequest(
-            varVersion: "default",
+            varVersion: TEMPGameVersion(),
             regions: new List<string> { "local" },
             tags: new Dictionary<string, string>
             {
diff --git a/Assets/Rivet/Editor/BuildPipeline.cs b/Assets/Rivet/Editor/BuildPipeline.cs
index d73090a..61be1a7 100644
--- a/Assets/Rivet/Editor/BuildPipeline.cs
+++ b/Assets/Rivet/Editor/BuildPipeline.cs
@@ -35,11 +35,16 @@ public void OnPreprocessBuild(BuildReport report)
 
         public void OnPostprocessBuild(BuildReport report)
         {
-            // Delete asset file
-            string filePath = Path.Combine(Application.streamingAssetsPath, "rivet_config.json");
-            if (File.Exists(filePath))
+            string jsonFilePath = Path.Combine(Application.streamingAssetsPath, "rivet_config.json");
+            if (File.Exists(jsonFilePath))
+            {
+                File.Delete(jsonFilePath);
+            }
+
+            string metaFilePath = jsonFilePath + ".meta";
+            if (File.Exists(metaFilePath))
             {
-                File.Delete(filePath);
+                File.Delete(metaFilePath);
             }
         }
     }
diff --git a/Assets/Rivet/Editor/PluginSettings.cs b/Assets/Rivet/Editor/PluginSettings.cs
index 60a4042..af0ce09 100644
--- a/Assets/Rivet/Editor/PluginSettings.cs
+++ b/Assets/Rivet/Editor/PluginSettings.cs
@@ -119,7 +119,8 @@ public static string GameVersion
             set => SetAndSave(ref gameVersion, value, "GameVersion");
         }
 
-        public static void LoadSettings() {
+        public static void LoadSettings()
+        {
             backendEndpoint = PlayerPrefs.GetString("BackendEndpoint");
             gameVersion = PlayerPrefs.GetString("GameVersion");
         }
@@ -144,10 +145,9 @@ public static void UpdateFromPlugin()
                     _ => throw new System.NotImplementedException(),
                 };
 
-                // TODO:
-                GameVersion = "TODO";
+                GameVersion = plugin.GameVersion ?? "unknown";
 
-                RivetLogger.Log($"Update Shared Settings: BackendEndpoint={BackendEndpoint} GameVersion={GameVersion}");
+                RivetLogger.Log($"Update Shared Settings [BackendEndpoint={BackendEndpoint} GameVersion={GameVersion}]");
             }
         }
     }
diff --git a/Assets/Rivet/Editor/Task.cs b/Assets/Rivet/Editor/Task.cs
index a09ae3f..0f515f4 100644
--- a/Assets/Rivet/Editor/Task.cs
+++ b/Assets/Rivet/Editor/Task.cs
@@ -23,6 +23,7 @@ public enum LogType { STDOUT, STDERR }
 
         // State
         public bool IsRunning { get; private set; } = false;
+        public bool IsFinished { get; private set; } = false;
         private StateFiles _stateFiles;
         private CancellationTokenSource _cts;
         private FileStream _logFileStream;
@@ -74,6 +75,7 @@ public async Task<Result<JObject>> RunAsync(CancellationToken cancellationToken
                 var logPollingTask = StartLogPolling(_cts.Token);
                 var result = await Task.Run(() => RunTask(_name, _input, runConfig), _cts.Token);
                 IsRunning = false;
+                IsFinished = true;
 
                 // Read end of logs immediately. Log polling task will cancel
                 // itself.
@@ -84,6 +86,7 @@ public async Task<Result<JObject>> RunAsync(CancellationToken cancellationToken
             finally
             {
                 IsRunning = false;
+                IsFinished = true;
                 FinishLogs();
                 Dispose();  // Self-dispose after the task is complete
             }
@@ -244,6 +247,11 @@ private StateFiles GenerateStateFilesDir()
             }
         }
 
+        private string StripAnsiCodes(string input)
+        {
+            return System.Text.RegularExpressions.Regex.Replace(input, @"\x1b\[[0-9;]*m", string.Empty);
+        }
+
         private void ReadLogTail()
         {
             if (_logFileStream == null)
@@ -269,11 +277,11 @@ private void ReadLogTail()
                         var parsed = JsonConvert.DeserializeObject<Dictionary<string, string>>(line);
                         if (parsed.ContainsKey("Stdout"))
                         {
-                            OnLog?.Invoke(parsed["Stdout"], LogType.STDOUT);
+                            OnLog?.Invoke(StripAnsiCodes(parsed["Stdout"]), LogType.STDOUT);
                         }
                         else if (parsed.ContainsKey("Stderr"))
                         {
-                            OnLog?.Invoke(parsed["Stderr"], LogType.STDERR);
+                            OnLog?.Invoke(StripAnsiCodes(parsed["Stderr"]), LogType.STDERR);
                         }
                     }
                     catch (JsonException)
diff --git a/Assets/Rivet/Editor/UI/RivetPlugin.cs b/Assets/Rivet/Editor/UI/RivetPlugin.cs
index 8150007..b3d4af2 100644
--- a/Assets/Rivet/Editor/UI/RivetPlugin.cs
+++ b/Assets/Rivet/Editor/UI/RivetPlugin.cs
@@ -48,6 +48,9 @@ public int LocalBackendPort {
             }
         }
 
+        // MARK: Deployed
+        public string? GameVersion;
+
         // MARK: Tasks
         public TaskManager LocalGameServerManager;
         public TaskManager BackendManager;
@@ -94,6 +97,17 @@ public void SetScreen(Screen screen)
             _screen = screen;
             _screenLogin.style.display = screen == Screen.Login ? DisplayStyle.Flex : DisplayStyle.None;
             _screenMain.style.display = screen == Screen.Main ? DisplayStyle.Flex : DisplayStyle.None;
+
+            // Notify the appropriate controller
+            switch (screen)
+            {
+                case Screen.Login:
+                    LoginController.OnShow();
+                    break;
+                case Screen.Main:
+                    MainController.OnShow();
+                    break;
+            }
         }
 
         public void OnEnable()
diff --git a/Assets/Rivet/Editor/UI/Screens/LoginController.cs b/Assets/Rivet/Editor/UI/Screens/LoginController.cs
index 3e76ebd..e739582 100644
--- a/Assets/Rivet/Editor/UI/Screens/LoginController.cs
+++ b/Assets/Rivet/Editor/UI/Screens/LoginController.cs
@@ -22,7 +22,10 @@ public LoginController(RivetPlugin window, VisualElement root)
             _root = root;
 
             InitUI();
+        }
 
+        public void OnShow()
+        {
             _ = CheckLoginState();
         }
 
diff --git a/Assets/Rivet/Editor/UI/Screens/MainController.cs b/Assets/Rivet/Editor/UI/Screens/MainController.cs
index 3fe2d03..c3d6fc1 100644
--- a/Assets/Rivet/Editor/UI/Screens/MainController.cs
+++ b/Assets/Rivet/Editor/UI/Screens/MainController.cs
@@ -75,10 +75,10 @@ public RivetEnvironment? RemoteEnvironment
         {
             get
             {
-                return BootstrapData?.Environments[RemoteEnvironmentIndex];
+                return RemoteEnvironmentIndex != null ? BootstrapData?.Environments[RemoteEnvironmentIndex.Value] : null;
             }
         }
-        public int RemoteEnvironmentIndex
+        public int? RemoteEnvironmentIndex
         {
             get
             {
@@ -94,9 +94,9 @@ public int RemoteEnvironmentIndex
             }
             set
             {
-                if (value >= 0 && value < BootstrapData?.Environments.Count)
+                if (value != null && value >= 0 && value < BootstrapData?.Environments.Count)
                 {
-                    RemoteEnvironmentId = BootstrapData?.Environments[value].Id;
+                    RemoteEnvironmentId = BootstrapData?.Environments[value.Value].EnvironmentId;
                 }
             }
         }
@@ -109,7 +109,9 @@ public MainController(RivetPlugin window, VisualElement root)
             // UI
             InitUI();
             SetTab(MainTab.Setup);
+        }
 
+        public void OnShow() {
             // Fetch data
             _ = GetBootstrapData();
         }
@@ -157,7 +159,7 @@ void SetTab(MainTab tab)
             _settingsTabBody.style.display = tab == MainTab.Settings ? DisplayStyle.Flex : DisplayStyle.None;
         }
 
-        private async Task GetBootstrapData()
+        public async Task GetBootstrapData()
         {
             var result = await new RivetTask("get_bootstrap_data", new JObject()).RunAsync();
             if (result is ResultErr<JObject> err)
@@ -168,6 +170,7 @@ private async Task GetBootstrapData()
             var data = result.Data.ToObject<BootstrapData>(); ;
             BootstrapData = data;
 
+<<<<<<< HEAD
             try
             {
                 var data = result.Data.ToObject<BootstrapData>();
@@ -182,6 +185,12 @@ private async Task GetBootstrapData()
                 RivetLogger.Error($"Exception in GetBootstrapData: {ex.Message}");
                 RivetLogger.Error($"Stack trace: {ex.StackTrace}");
             }
+=======
+            _developController.OnBootstrap(data);
+            _deployController.OnBootstrap(data);
+
+            SharedSettings.UpdateFromPlugin();
+>>>>>>> 3ace6b6 (chore: re-impl deploys)
         }
 
         /// <summary>
diff --git a/Assets/Rivet/Editor/UI/Tabs/DeployController.cs b/Assets/Rivet/Editor/UI/Tabs/DeployController.cs
index 0944911..be0a768 100644
--- a/Assets/Rivet/Editor/UI/Tabs/DeployController.cs
+++ b/Assets/Rivet/Editor/UI/Tabs/DeployController.cs
@@ -12,6 +12,7 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
+using Rivet.Editor.UI.TaskPopup;
 
 namespace Rivet.UI.Tabs
 {
@@ -21,6 +22,7 @@ public class DeployController
         private MainController _mainController;
         private readonly VisualElement _root;
 
+        private VisualElement _refreshButton;
         private DropdownField _environmentDropdown;
         private Button _buildDeployButton;
         private DropdownField _stepsDropdown;
@@ -37,11 +39,14 @@ public DeployController(RivetPlugin window, MainController mainController, Visua
         void InitUI()
         {
             // Query
+            _refreshButton = _root.Q("DeployHeader").Q("Header").Q("Action");
             _environmentDropdown = _root.Q<DropdownField>("EnvironmentDropdown");
             _buildDeployButton = _root.Q("BuildDeployButton").Q<Button>("Button");
             _stepsDropdown = _root.Q<DropdownField>("StepsDropdown");
 
             // Callbacks
+            _refreshButton.RegisterCallback<ClickEvent>(ev => { _ = _mainController.GetBootstrapData(); });
+
             _environmentDropdown.RegisterValueChangedCallback(ev =>
             {
                 _mainController.EnvironmentType = EnvironmentType.Remote;
@@ -74,7 +79,7 @@ public void OnBootstrap(BootstrapData data)
 
         public void OnSelectedEnvironmentChange()
         {
-            _environmentDropdown.index = _mainController.RemoteEnvironmentIndex;
+            _environmentDropdown.index = _mainController.RemoteEnvironmentIndex ?? -1;
         }
 
         private void OnBuildAndDeploy()
@@ -83,33 +88,52 @@ private void OnBuildAndDeploy()
             _mainController.EnvironmentType = EnvironmentType.Remote;
             _mainController.OnSelectedEnvironmentChange();
 
-            string? serverPath = Builder.BuildReleaseDedicatedServer();
-            if (serverPath == null)
+            // Get the selected environment ID
+            string environmentId = _mainController.RemoteEnvironmentId;
+            if (environmentId == null)
             {
-                EditorUtility.DisplayDialog("Server Build Failed", "See Unity console for details.", "Dismiss");
-                return;
+                throw new System.Exception("Could not get ID for remote env");
             }
 
-            // Get the selected environment ID
-            string environmentId = _mainController.RemoteEnvironment?.NameId ?? "";
-
             // Get the selected steps
             int stepsIndex = _stepsDropdown.index;
             bool deployGameServer = stepsIndex == 0 || stepsIndex == 1;
             bool deployBackend = stepsIndex == 0 || stepsIndex == 2;
 
-            // Run deploy with CLI
-            _ = new RivetTask(
-                "deploy",
-                new JObject
+            string? serverPath = null;
+            if (deployGameServer)
+            {
+                serverPath = Builder.BuildReleaseDedicatedServer();
+                if (serverPath == null)
                 {
-                    ["cwd"] = Path.GetDirectoryName(serverPath),
-                    ["environment_id"] = environmentId,
-                    ["game_server"] = deployGameServer,
-                    ["backend"] = deployBackend,
+                    EditorUtility.DisplayDialog("Server Build Failed", "See Unity console for details.", "Dismiss");
+                    return;
                 }
-            ).RunAsync();
-        }
+            }
 
+            // Run deploy with CLI using TaskPopupWindow
+            var task = TaskPopupWindow.RunTask("Build & Deploy", "deploy", new JObject
+            {
+                ["cwd"] = serverPath != null ? Path.GetDirectoryName(serverPath) : Builder.ProjectRoot(),
+                ["environment_id"] = environmentId,
+                ["game_server"] = deployGameServer,
+                ["backend"] = deployBackend,
+            });
+
+            // Save version
+            task.OnTaskOutput += output =>
+            {
+                if (output is ResultOk<JObject> ok)
+                {
+                    var version = ok.Data["version"]?.ToString();
+                    if (!string.IsNullOrEmpty(version))
+                    {
+                        RivetPlugin.Singleton.GameVersion = ok.Data["version"].ToString();
+                        SharedSettings.UpdateFromPlugin();
+                        Debug.Log($"New game version: {RivetPlugin.Singleton.GameVersion}");
+                    }
+                }
+            };
+        }
     }
 }
\ No newline at end of file
diff --git a/Assets/Rivet/Editor/UI/Tabs/Develop.uxml b/Assets/Rivet/Editor/UI/Tabs/Develop.uxml
index 89910b0..333346b 100644
--- a/Assets/Rivet/Editor/UI/Tabs/Develop.uxml
+++ b/Assets/Rivet/Editor/UI/Tabs/Develop.uxml
@@ -7,8 +7,8 @@
         <AttributeOverrides element-name="Title" text="Environment" />
     </ui:Instance>
     <ui:VisualElement name="EnvironmentBody" style="flex-grow: 0; flex-shrink: 0;">
-        <ui:Label tabindex="-1" text="Configure which backend to connect to." parse-escape-sequences="true" display-tooltip-when-elided="true" style="margin-top: 0; margin-bottom: 4px; opacity: 1; white-space: normal;" />
-        <ui:DropdownField choices="Local,Remote" index="0" name="TypeDropdown" label="Type" style="height: 19px; margin-bottom: 4px;" />
+        <ui:Label tabindex="-1" text="Specify which backend to connect to." parse-escape-sequences="true" display-tooltip-when-elided="true" style="margin-top: 0; margin-bottom: 4px; opacity: 1; white-space: normal;" />
+        <ui:DropdownField choices="Local (Development),Remote (Live Servers)" index="0" name="TypeDropdown" label="Type" style="height: 19px; margin-bottom: 4px;" />
         <ui:DropdownField name="EnvironmentDropdown" label="Environment" index="0" style="height: 19px;" />
     </ui:VisualElement>
     <ui:Instance template="Separator" name="Separator" />
diff --git a/Assets/Rivet/Editor/UI/Tabs/DevelopController.cs b/Assets/Rivet/Editor/UI/Tabs/DevelopController.cs
index e9ba949..737310a 100644
--- a/Assets/Rivet/Editor/UI/Tabs/DevelopController.cs
+++ b/Assets/Rivet/Editor/UI/Tabs/DevelopController.cs
@@ -27,6 +27,7 @@ public class DevelopController
         private readonly MainController _mainController;
         private readonly VisualElement _root;
 
+        private VisualElement _refreshButton;
         private DropdownField _environmentTypeDropdown;
         private DropdownField _remoteEnvironmentDropdown;
 
@@ -53,6 +54,7 @@ public DevelopController(RivetPlugin window, MainController mainController, Visu
         void InitUI()
         {
             // Query
+            _refreshButton = _root.Q("EnvironmentHeader").Q("Header").Q("Action");
             _environmentTypeDropdown = _root.Q("EnvironmentBody").Q<DropdownField>("TypeDropdown");
             _remoteEnvironmentDropdown = _root.Q("EnvironmentBody").Q<DropdownField>("EnvironmentDropdown");
 
@@ -67,10 +69,13 @@ void InitUI()
             _backendGenerateSdk = _root.Q("BackendBody").Q("GenerateSdkButton").Q<Button>("Button");
             _backendEditConfig = _root.Q("BackendBody").Q("EditConfigButton").Q<Button>("Button");
 
+
             // Callbacks
             _pluginWindow.LocalGameServerManager.StateChange += OnLocalGameServerStateChange;
             OnLocalGameServerStateChange(false);
 
+            _refreshButton.RegisterCallback<ClickEvent>(ev => { _ = _mainController.GetBootstrapData(); });
+
             _environmentTypeDropdown.RegisterValueChangedCallback(ev =>
             {
                 _mainController.EnvironmentType = (EnvironmentType)_environmentTypeDropdown.index;
@@ -82,7 +87,7 @@ void InitUI()
                 {
                     // Open URL and reset index
                     Application.OpenURL($"https://hub.rivet.gg/games/{bootstrapData.GameId}/backend?modal=create-environment");
-                    _remoteEnvironmentDropdown.index = _mainController.RemoteEnvironmentIndex;
+                    _remoteEnvironmentDropdown.index = _mainController.RemoteEnvironmentIndex ?? -1;
                 }
                 else
                 {
@@ -92,7 +97,6 @@ void InitUI()
                 }
             });
 
-
             _lgsStart.RegisterCallback<ClickEvent>(ev => { OnLocalGameServerStart(); });
             _lgsStop.RegisterCallback<ClickEvent>(ev => _pluginWindow.LocalGameServerManager.StopTask());
             _lgsRestart.RegisterCallback<ClickEvent>(ev => { OnLocalGameServerStart(); });
@@ -124,7 +128,7 @@ public void OnBootstrap(BootstrapData data)
         public void OnSelectedEnvironmentChange()
         {
             _environmentTypeDropdown.index = (int)_mainController.EnvironmentType;
-            _remoteEnvironmentDropdown.index = _mainController.RemoteEnvironmentIndex;
+            _remoteEnvironmentDropdown.index = _mainController.RemoteEnvironmentIndex ?? -1;
             _remoteEnvironmentDropdown.style.display = _environmentTypeDropdown.index == (int)EnvironmentType.Local ? DisplayStyle.None : DisplayStyle.Flex;
         }
 
@@ -177,4 +181,4 @@ private void OnBackendEditConfig()
             EditorUtility.OpenWithDefaultApp(Path.Combine(Builder.ProjectRoot(), "backend.json"));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Rivet/Editor/UI/Tabs/Settings.uxml b/Assets/Rivet/Editor/UI/Tabs/Settings.uxml
index 783e8ad..b55dc39 100644
--- a/Assets/Rivet/Editor/UI/Tabs/Settings.uxml
+++ b/Assets/Rivet/Editor/UI/Tabs/Settings.uxml
@@ -11,8 +11,8 @@
     <ui:Instance template="Header" name="PluginHeader">
         <AttributeOverrides element-name="Title" text="Plugin" />
     </ui:Instance>
-    <ui:VisualElement style="flex-grow: 0; flex-shrink: 0;">
-        <ui:VisualElement style="flex-grow: 0; flex-shrink: 0; flex-direction: row;">
+    <ui:VisualElement name="PluginBody" style="flex-grow: 0; flex-shrink: 0;">
+        <ui:VisualElement name="ButtonRow" style="flex-grow: 0; flex-shrink: 0; flex-direction: row;">
             <ui:Button text="Edit User" parse-escape-sequences="true" display-tooltip-when-elided="true" name="EditUserButton" style="flex-shrink: 1; flex-grow: 1;" />
             <ui:Button text="Edit Project" parse-escape-sequences="true" display-tooltip-when-elided="true" name="EditProjectButton" style="flex-shrink: 1; flex-grow: 1;" />
         </ui:VisualElement>
diff --git a/Assets/Rivet/Editor/UI/Tabs/SettingsController.cs b/Assets/Rivet/Editor/UI/Tabs/SettingsController.cs
index 022096a..ae52685 100644
--- a/Assets/Rivet/Editor/UI/Tabs/SettingsController.cs
+++ b/Assets/Rivet/Editor/UI/Tabs/SettingsController.cs
@@ -25,6 +25,16 @@ public class SettingsController
         private Button _backendRestart;
         private VisualElement _backendShowLogs;
 
+        private Button _editUserButton;
+        private Button _editProjectButton;
+
+        // Add enum definition
+        private enum SettingsType
+        {
+            User,
+            Project
+        }
+
         public SettingsController(RivetPlugin window, MainController mainController, VisualElement root)
         {
             _pluginWindow = window;
@@ -42,6 +52,10 @@ void InitUI()
             _backendRestart = _root.Q("BackendBody").Q("ButtonRow").Q<Button>("RestartButton");
             _backendShowLogs = _root.Q("BackendBody").Q("LogsButton");
 
+            // Query new buttons
+            _editUserButton = _root.Q("PluginBody").Q("ButtonRow").Q<Button>("EditUserButton");
+            _editProjectButton = _root.Q("PluginBody").Q("ButtonRow").Q<Button>("EditProjectButton");
+
             // Callbacks
             _pluginWindow.BackendManager.StateChange += OnBackendStateChange;
             OnBackendStateChange(false);
@@ -53,6 +67,10 @@ void InitUI()
             // _backendRestart.RegisterCallback<ClickEvent>(ev => { _ = _pluginWindow.BackendManager.StartTask(); });
             _backendStart.RegisterCallback<ClickEvent>(ev => { _ = OnStartBackend(); });  // TODO: Remove
             _backendShowLogs.RegisterCallback<ClickEvent>(ev => BackendWindow.ShowBackend());
+
+            // Update callbacks
+            _editUserButton.RegisterCallback<ClickEvent>(ev => { _ = OnEditSettings(SettingsType.User); });
+            _editProjectButton.RegisterCallback<ClickEvent>(ev => { _ = OnEditSettings(SettingsType.Project); });
         }
 
         private async Task OnStartBackend()
@@ -97,5 +115,25 @@ private void OnBackendStateChange(bool running)
             _backendStop.style.display = running ? DisplayStyle.Flex : DisplayStyle.None;
             _backendRestart.style.display = running ? DisplayStyle.Flex : DisplayStyle.None;
         }
+
+        private async Task OnEditSettings(SettingsType type)
+        {
+            var pathsResult = await new RivetTask("get_settings_path", new JObject()).RunAsync();
+            
+            string path;
+            switch (pathsResult)
+            {
+                case ResultOk<JObject> ok:
+                    path = type == SettingsType.Project ? (string)ok.Data["project_path"] : (string)ok.Data["user_path"];
+                    break;
+                case ResultErr<JObject> err:
+                    RivetLogger.Error($"Failed to get settings paths: {err}");
+                    return;
+                default:
+                    return;
+            }
+
+            await new RivetTask("open", new JObject { ["path"] = path }).RunAsync();
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Rivet/Editor/UI/Tabs/Setup.uxml b/Assets/Rivet/Editor/UI/Tabs/Setup.uxml
index 5385ae1..55c6d89 100644
--- a/Assets/Rivet/Editor/UI/Tabs/Setup.uxml
+++ b/Assets/Rivet/Editor/UI/Tabs/Setup.uxml
@@ -1,7 +1,8 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:VisualElement name="VisualElement" style="flex-grow: 0; flex-shrink: 0; flex-direction: row;">
+    <ui:VisualElement name="VisualElement" style="flex-grow: 0; flex-shrink: 0; flex-direction: row; display: none; visibility: visible;">
         <ui:VisualElement style="flex-grow: 0; background-image: url(&quot;project://database/Assets/Rivet/Editor/Images/FontAwesome/wrench.svg?fileID=7388822144124034973&amp;guid=3b4edff0fd4a14f62be12a7aafc33fb2&amp;type=3#wrench&quot;); -unity-background-scale-mode: scale-to-fit; flex-shrink: 0; width: 16px; height: 16px;" />
         <ui:Label tabindex="-1" text="Step 1: Create Game &amp; Backend Configs" parse-escape-sequences="true" display-tooltip-when-elided="true" style="flex-grow: 1; flex-shrink: 1;" />
         <ui:Button text="Setup" parse-escape-sequences="true" display-tooltip-when-elided="true" />
     </ui:VisualElement>
+    <ui:Label tabindex="-1" text="WIP" parse-escape-sequences="true" display-tooltip-when-elided="true" />
 </ui:UXML>
diff --git a/Assets/Rivet/Editor/UI/TaskPopup/TaskPopupWindow.cs b/Assets/Rivet/Editor/UI/TaskPopup/TaskPopupWindow.cs
index 12a8b65..be54909 100644
--- a/Assets/Rivet/Editor/UI/TaskPopup/TaskPopupWindow.cs
+++ b/Assets/Rivet/Editor/UI/TaskPopup/TaskPopupWindow.cs
@@ -4,6 +4,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
+using UnityEditor.PackageManager.UI;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -44,9 +45,9 @@ public class TaskPopupWindow : EditorWindow
         private RivetTask _task;
 
         // Events
-        public event Action<object> TaskOutput;
+        public event Action<object> OnTaskOutput;
 
-        public static void RunTask(string title, string taskName, JObject taskInput)
+        public static TaskPopupWindow RunTask(string title, string taskName, JObject taskInput)
         {
             var window = CreateInstance<TaskPopupWindow>();
             window.TaskName = taskName;
@@ -66,6 +67,8 @@ public static void RunTask(string title, string taskName, JObject taskInput)
             window.ShowUtility();
 
             window.InitializeAndStartTask();
+
+            return window;
         }
 
         public void CreateGUI()
@@ -111,7 +114,7 @@ private async void InitializeAndStartTask()
             _task.OnLog += OnTaskLog;
 
             AddLogLine("Starting task...", LogType.META);
-            UpdateUI();
+            EditorApplication.delayCall += () => UpdateUI();
 
             try
             {
@@ -127,17 +130,17 @@ private async void InitializeAndStartTask()
 
         private void UpdateUI()
         {
-            bool running = _task != null && _task.IsRunning;
+            bool running = _task != null && !_task.IsFinished;
             _doneButton.text = running ? "Cancel" : "Close";
         }
 
         private void OnTaskCompleted(Result<JObject> output)
         {
+            OnTaskOutput.Invoke(output);
             switch (output)
             {
                 case ResultOk<JObject> ok:
                     EditorApplication.delayCall += () => AddLogLine($"Exited with {ok.Data.ToString(Formatting.None)}", LogType.META);
-
                     break;
                 case ResultErr<JObject> err:
                     AddLogLine(err.Message, LogType.STDERR);
diff --git a/Assets/Rivet/Editor/Util/Builder.cs b/Assets/Rivet/Editor/Util/Builder.cs
index 8ddf3a1..b475e70 100644
--- a/Assets/Rivet/Editor/Util/Builder.cs
+++ b/Assets/Rivet/Editor/Util/Builder.cs
@@ -68,7 +68,7 @@ public static BuildTarget GetPlayerBuildTarget()
             var buildPlayerOptions = new BuildPlayerOptions
             {
                 scenes = GetScenePaths(),
-                locationPathName = Path.Combine(ProjectRoot(), "Builds", "DevPlayer", GetBuildName("DevPlayer")),
+                locationPathName = Path.Combine(ProjectRoot(), "Builds", "Development", "Player", GetPlatformArchFolder(GetPlayerBuildTarget()), GetBuildName("Player", GetPlayerBuildTarget())),
                 target = GetPlayerBuildTarget(),
                 options = BuildOptions.Development | BuildOptions.AllowDebugging
             };
@@ -164,31 +164,12 @@ public static BuildTarget GetGameServerBuildTarget()
             var buildPlayerOptions = new BuildPlayerOptions
             {
                 scenes = GetScenePaths(),
-                locationPathName = Path.Combine(ProjectRoot(), "Builds", "DevDedicatedServer", GetBuildName("DevDedicatedServer")),
+                locationPathName = Path.Combine(ProjectRoot(), "Builds", "Development", "DedicatedServer", GetPlatformArchFolder(GetGameServerBuildTarget()), GetBuildName("DedicatedServer", GetGameServerBuildTarget(), true)),
                 target = GetGameServerBuildTarget(),
-                options = BuildOptions.Development | BuildOptions.CompressWithLz4,
+                options = BuildOptions.Development | BuildOptions.CompressWithLz4 | BuildOptions.EnableHeadlessMode,
                 subtarget = (int)StandaloneBuildSubtarget.Server
             };
 
-            // // Speed up builds for development
-            // var devOptimizations = true;
-            // if (devOptimizations)
-            // {
-            //     buildPlayerOptions.options |= BuildOptions.Development;
-            //     buildPlayerOptions.options |= BuildOptions.CompressWithLz4;
-            //     EditorUserBuildSettings.compressFilesInPackage = false;
-
-            //     // TODO: Is this right?
-            //     buildPlayerOptions.options &= ~BuildOptions.StrictMode;
-
-            //     // buildPlayerOptions.options |= BuildOptions.BuildScriptsOnly;
-
-            //     // TODO: Is this right?
-            //     // Disable error checking for faster builds
-            //     buildPlayerOptions.extraScriptingDefines = new string[] { "DISABLE_IMPLICIT_CHECKS", "DISABLE_WARNINGS" };
-            // }
-
-
             // Build the server
             RivetLogger.Log("Building dedicated server...");
             var report = BuildPipeline.BuildPlayer(buildPlayerOptions);
@@ -232,9 +213,9 @@ public static BuildTarget GetGameServerBuildTarget()
             var buildPlayerOptions = new BuildPlayerOptions
             {
                 scenes = GetScenePaths(),
-                locationPathName = Path.Combine(ProjectRoot(), "Builds", "ReleaseDedicatedServer", GetBuildName("ReleaseDedicatedServer")),
+                locationPathName = Path.Combine(ProjectRoot(), "Builds", "Release", "DedicatedServer", GetPlatformArchFolder(BuildTarget.StandaloneLinux64), GetBuildName("DedicatedServer", BuildTarget.StandaloneLinux64, true)),
                 target = BuildTarget.StandaloneLinux64,
-                options = BuildOptions.CompressWithLz4HC,
+                options = BuildOptions.CompressWithLz4HC | BuildOptions.EnableHeadlessMode,
                 subtarget = (int)StandaloneBuildSubtarget.Server
             };
 
@@ -263,7 +244,13 @@ public static string FindServerExecutablePath(string serverPath, BuildTarget bui
             switch (buildTarget)
             {
                 case BuildTarget.StandaloneOSX:
-                    executableFile = Path.Combine(serverPath, productName, productName);
+                    // Check for .app bundle first
+                    executableFile = Path.Combine(serverPath, "Contents", "MacOS", productName);
+                    if (!File.Exists(executableFile))
+                    {
+                        // If .app bundle doesn't exist, check for standalone executable
+                        executableFile = Path.Combine(serverPath, productName);
+                    }
                     break;
                 case BuildTarget.StandaloneLinux64:
                     executableFile = serverPath;
@@ -291,13 +278,15 @@ public static string FindPlayerExecutablePath(string buildPath, BuildTarget buil
 
             if (buildTarget == BuildTarget.StandaloneOSX)
             {
-                string lastPathComponent = Path.GetFileName(buildPath);
-                executablePath = Path.Combine($"{buildPath}.app", "Contents", "MacOS", productName);
+                executablePath = Path.Combine(buildPath, "Contents", "MacOS", productName);
             }
             else
             {
-                // For other platforms, use the existing logic
                 executablePath = Path.Combine(buildPath, productName);
+                if (buildTarget == BuildTarget.StandaloneWindows || buildTarget == BuildTarget.StandaloneWindows64)
+                {
+                    executablePath += ".exe";
+                }
             }
 
             if (!File.Exists(executablePath))
@@ -318,23 +307,30 @@ public static string[] GetScenePaths()
             return scenes;
         }
 
-        public static string GetBuildName(string baseName)
+        public static string GetBuildName(string baseName, BuildTarget target, bool isServer = false)
+        {
+            if (target == BuildTarget.StandaloneOSX && !isServer)
+            {
+                return baseName + ".app";
+            }
+            return baseName;
+        }
+
+        private static string GetPlatformArchFolder(BuildTarget target)
         {
-            // TODO: Check that we don't need .exe for Windows
-            var buildName = baseName;
-            return buildName;
-            // switch (GetGameServerBuildTarget())
-            // {
-            //     case BuildTarget.StandaloneWindows:
-            //     case BuildTarget.StandaloneWindows64:
-            //         return $"{buildName}.exe";
-            //     case BuildTarget.StandaloneOSX:
-            //         return $"{buildName}.app";
-            //     case BuildTarget.StandaloneLinux64:
-            //         return $"{buildName}";
-            //     default:
-            //         return buildName;
-            // }
+            switch (target)
+            {
+                case BuildTarget.StandaloneWindows:
+                    return "Windows_x86_32";
+                case BuildTarget.StandaloneWindows64:
+                    return "Windows_x86_64";
+                case BuildTarget.StandaloneOSX:
+                    return "macOS_Universal";
+                case BuildTarget.StandaloneLinux64:
+                    return "Linux_x86_64";
+                default:
+                    return "Unknown";
+            }
         }
 
         // MARK: Utils
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..6e2bfb6
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,20 @@
+FROM debian:12
+WORKDIR /app
+
+# Define the build path and binary name arguments
+ARG BUILD_PATH=./Builds/Release/DedicatedServer/Linux_x86_64/
+ARG BINARY_NAME=DedicatedServer
+
+# Install necessary libraries for Unity
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    && update-ca-certificates \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -ms /bin/bash rivet
+
+# Copy the precompiled Unity server files using the BUILD_PATH argument
+COPY ${BUILD_PATH} /app
+RUN ls /app && chmod +x /app/${BINARY_NAME}
+
+USER rivet
+ENTRYPOINT ["/app/${BINARY_NAME}", "-server", "-batchmode", "-nographics"]
diff --git a/backend.json b/backend.json
index fdaa85e..10f53d3 100644
--- a/backend.json
+++ b/backend.json
@@ -13,12 +13,26 @@
 		"lobbies": {
 			"config": {
 				"lobbies": {
-					"regions": ["local"],
+					"regions": [
+						"atl"
+					],
 					"backend": {
-						"localDevelopment": {
-							"tags": { "test": "5" },
+						"server": {
+							"environment": {
+								"SERVER_HOSTNAME": "0.0.0.0"
+							},
+							"tags": {
+
+							},
 							"ports": {
-								"game": { "protocol": "udp", "port": 7777 }
+								"game": {
+									"protocol": "udp",
+									"serverPort": 7777
+								}
+							},
+							"resources": {
+								"cpu": 1000,
+								"memory": 1000
 							}
 						}
 					}