Skip to content

chore: restore backend & game server log panels #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NathanFlurry wants to merge 1 commit into from
Closed

chore: restore backend & game server log panels #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions Assets/Rivet/Editor/Task.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,23 @@ public RivetTask(string name, JObject input)

var inputJson = _input.ToString(Newtonsoft.Json.Formatting.None);

RivetLogger.Log($"[{_name}] Request: {inputJson}");
RivetLogger.Log($"[{name}] Request: {inputJson}");
Task.Run(() => Run(name, inputJson));
}

private void Run(string name, string inputJson)
{
_taskId = RivetToolchain.RunTask(name, inputJson, OnOutputEvent);
RivetLogger.Log($"task id {_taskId}");
}

private void OnOutputEvent(ulong taskId, IntPtr eventJsonPtr)
{
string eventJson = RivetToolchain.PtrToString(eventJsonPtr);
RivetLogger.Log($"received event {eventJson}");
EditorApplication.delayCall += () => HandleOnOutputEvent(eventJson);
}

private void HandleOnOutputEvent(string eventJson)
{
RivetLogger.Log($"output event {_taskId}");
var eventObj = JObject.Parse(eventJson);
if (eventObj.ContainsKey("log"))
{
Expand All @@ -69,14 +66,20 @@ private void HandleOnOutputEvent(string eventJson)
_logResult = eventObj["result"] as JObject;
OnFinish();
}
else if (eventObj.ContainsKey("set_backend_port"))
else if (eventObj.ContainsKey("port_update"))
{
var port = eventObj["set_backend_port"]["port"].Value<int>();
var backendPort = eventObj["port_update"]["backend_port"].Value<int>();
var editorPort = eventObj["port_update"]["editor_port"].Value<int>();
// TODO:
// Assuming you have a similar configuration saving mechanism
// RivetPluginBridge.Instance.LocalBackendPort = port;
// RivetPluginBridge.Instance.SaveConfiguration();
RivetLogger.Log($"Set backend port {port}");
RivetLogger.Log($"Set backend port {backendPort} {editorPort}");
}
else if (eventObj.ContainsKey("backend_config_update"))
{
var updateEvent = eventObj["backend_config_update"].Value<JObject>();
// TODO:
}
else
{
Expand Down
104 changes: 72 additions & 32 deletions Assets/Rivet/Editor/TaskManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,59 +37,58 @@ public LogEntry(string message, LogType type)
}
}

public delegate Task<TaskConfig?> GetTaskConfigDelegate();
public delegate Task<TaskConfig?> GetStartConfigDelegate();
public delegate Task<TaskConfig?> GetStopConfigDelegate();
public delegate TaskPanelWindow? GetTaskPanelDelegate();
public delegate void StateChangeHandler(bool running);

// Config
private GetTaskConfigDelegate _getTaskConfig;
private GetStartConfigDelegate _getStartConfig;
private GetStopConfigDelegate _getStopConfig;
private GetTaskPanelDelegate _getTaskPanel;
private bool _autoRestart = false;
private bool _taskStopping = false;

// Events
public event StateChangeHandler StateChange;

// State
private readonly object _taskLock = new();
private RivetTask _task;
private RivetTask? _task;
private RivetTask? _stopTask;
public List<LogEntry> LogEntries = new();

public TaskManager(string initMessage, GetTaskConfigDelegate getTaskConfig, GetTaskPanelDelegate getTaskPanel, bool autoRestart = false)
public TaskManager(string initMessage, GetStartConfigDelegate getStartConfig, GetStopConfigDelegate getStopConfig, GetTaskPanelDelegate getTaskPanel, bool autoRestart = false)
{
_getTaskConfig = getTaskConfig;
_getStartConfig = getStartConfig;
_getStopConfig = getStopConfig;
_getTaskPanel = getTaskPanel;
_autoRestart = autoRestart;

LogEntries.Add(new LogEntry(initMessage, LogType.META));
}

public async Task StartTask(bool restart = true)
public async Task StartTask()
{
lock (_taskLock)
{
// Do nothing if already stopping another task
if (_taskStopping)
return;

// Do nothing if task already running
if (!restart && _task != null)
if (_task != null || _stopTask != null)
return;
}

// Kill old task
StopTask();

// Start task
var config = await _getTaskConfig();
// Start new task
var config = await _getStartConfig();
if (config == null)
{
RivetLogger.Log("No task config provided.");
return;
}
lock (_taskLock)
{
_task = new RivetTask(config.Value.Name, config.Value.Input);
_taskStopping = false;
_task.TaskLog += OnTaskLog;
OnStateChange();
}
Expand All @@ -98,8 +97,19 @@ public async Task StartTask(bool restart = true)

// Run task
var output = await _task.RunAsync();

await OnTaskOutput(output, _task);
}

private async Task OnTaskOutput(Result<JObject> output, RivetTask sourceTask)
{
lock (_taskLock)
{
if (_task != sourceTask)
{
return;
}

_task = null;
OnStateChange();
}
Expand All @@ -115,32 +125,62 @@ public async Task StartTask(bool restart = true)
break;
}

// TODO: Re-enable task restarting
// // Restart if task was not stopped
// bool shouldRestart;
// lock (_taskLock) shouldRestart = _autoRestart && _task == null && !_taskStopping;
// if (shouldRestart)
// {
// AddLogLine("Restarting in 2 seconds", LogType.META);
// await Task.Delay(2000);
// await StartTask();
// }
// Restart if task was not stopped
if (_autoRestart)
{
AddLogLine("Restarting in 2 seconds", LogType.META);
await Task.Delay(2000);
await StartTask();
}

}

public void StopTask()
public async Task StopTask()
{
bool shouldStop;
lock (_taskLock)
{
if (_task != null)
{
_taskStopping = true;
_task.Kill();
_task = null;
shouldStop = _task != null && _stopTask == null;
}

if (shouldStop)
{
// Abort running task
var localTask = _task;
_task = null;
localTask.Kill();

AddLogLine("Stop", LogType.META);
AddLogLine("Stopping", LogType.META);

// Run stop task
//
// Save in global scope so it doesn't get dropped before getting called
var config = await _getStopConfig();
if (config == null)
{
RivetLogger.Log("No task config provided.");
return;
}
lock (_taskLock)
{
_stopTask = new RivetTask(config.Value.Name, config.Value.Input);
OnStateChange();
}

await _stopTask.RunAsync();

OnStopFinish();
}
}

private void OnStopFinish()
{
AddLogLine("Stopped", LogType.META);

lock (_taskLock)
{
_stopTask = null;
OnStateChange();
}
}

Expand Down
64 changes: 30 additions & 34 deletions Assets/Rivet/Editor/UI/Dock/Dock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ public class Dock : EditorWindow
[SerializeField]
private VisualTreeAsset m_VisualTreeAsset;

private VisualElement _root {
get {
private VisualElement _root
{
get
{
return rootVisualElement;
}
}
Expand Down Expand Up @@ -204,13 +206,13 @@ public void OnEnable()
// Task managers
LocalGameServerManager = new(
initMessage: "Open \"Develop\" and press \"Start\" to start game server.",
getTaskConfig: async () =>
getStartConfig: async () =>
{
if (LocalGameServerExecutablePath != null)
{
return new TaskConfig
{
Name = "exec_command",
Name = "game_server.start",
Input = new JObject
{
["cwd"] = Builder.ProjectRoot(),
Expand All @@ -224,55 +226,54 @@ public void OnEnable()
return null;
}
},
getStopConfig: async () =>
{
return new TaskConfig
{
Name = "game_server.stop",
Input = new JObject { }
};
},
getTaskPanel: () => GameServerWindow.GetWindowIfExists()
);

BackendManager = new(
initMessage: "Auto-started by Rivet plugin.",
getTaskConfig: async () =>
getStartConfig: async () =>
{
// Choose port to run on. This is to avoid potential conflicts with
// multiple projects running at the same time.
var chooseRes = await new RivetTask("backend_choose_local_port", new JObject()).RunAsync();
int port;
switch (chooseRes)
{
case ResultOk<JObject> ok:
port = (int)ok.Data["port"];
LocalBackendPort = port;
break;
case ResultErr<JObject> err:
RivetLogger.Error($"Failed to choose port: {err}");
return null;
default:
return null;
}


return new TaskConfig
{
Name = "backend_dev",
Name = "backend.start",
Input = new JObject
{
["port"] = port,
["cwd"] = Builder.ProjectRoot(),
}
};
},
getStopConfig: async () =>
{
return new TaskConfig
{
Name = "backend.stop",
Input = new JObject { }
};
},
getTaskPanel: () => BackendWindow.GetWindowIfExists(),
autoRestart: true
);

// Shut down on reload
AssemblyReloadEvents.beforeAssemblyReload += () => {
AssemblyReloadEvents.beforeAssemblyReload += () =>
{
RivetLogger.Log("Before Assembly Reload");
ShutdownPlugin();
};

// // Start backend
// _ = BackendManager.StartTask();

// Bootstrap
_ = GetBootstrapData();

// Start backend
// _ = BackendManager.StartTask();
}

public void OnDisable()
Expand All @@ -292,11 +293,6 @@ private void ShutdownPlugin()
BackendManager.StopTask();
}

public void OnShow() {
// Fetch data
_ = GetBootstrapData();
}

void SetTab(MainTab tab)
{
_tab = tab;
Expand Down
9 changes: 1 addition & 8 deletions Assets/Rivet/Editor/UI/Dock/Tabs/DevelopController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,7 @@ private void OnLocalGameServerStart()

_dock.LocalGameServerExecutablePath = serverPath;

// _ = _dock.LocalGameServerManager.StartTask();

// _ = new RivetTask("show_term", new JObject
// {
// ["command"] = _dock.LocalGameServerExecutablePath,
// // ["args"] = new JArray { "-batchmode", "-nographics", "-logFile", logPath, "-server" },
// ["args"] = new JArray { "-batchmode", "-nographics", "-server" },
// }).RunAsync();
_ = _dock.LocalGameServerManager.StartTask();
}

private void OnPlayerStart()
Expand Down
2 changes: 1 addition & 1 deletion Assets/Rivet/Editor/UI/Dock/Tabs/Settings.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<ui:Button text="Stop" parse-escape-sequences="true" display-tooltip-when-elided="true" name="StopButton" style="flex-shrink: 1; flex-grow: 1;" />
<ui:Button text="Restart" parse-escape-sequences="true" display-tooltip-when-elided="true" name="RestartButton" style="flex-shrink: 1; flex-grow: 1;" />
</ui:VisualElement>
<ui:Label tabindex="-1" text="&lt;u&gt;Show Logs&lt;/u&gt;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="LogsButton" style="-unity-text-align: upper-center; display: none;" />
<ui:Label tabindex="-1" text="&lt;u&gt;Show Logs&lt;/u&gt;" parse-escape-sequences="true" display-tooltip-when-elided="true" name="LogsButton" style="-unity-text-align: upper-center; display: flex;" />
</ui:VisualElement>
<ui:Instance template="Separator" name="Separator" />
<ui:Instance template="Header" name="SourceHeader">
Expand Down
Loading