tools: support concurrent editor and runtime instances

Author: dbartolini

tools/level_editor/level_editor.vala

@@ -23,6 +23,68 @@ public const string PANEL_EDITOR = "panel-editor";
 public const string PANEL_PROJECTS_LIST = "panel-projects-list";
 public const string PANEL_NEW_PROJECT = "panel-new-project";
 
+public bool parse_port_from_string(out uint16 port, string str)
+{
+	port = 0;
+
+	string trimmed = str.strip();
+	if (trimmed == "")
+		return false;
+
+	for (int i = 0; i < trimmed.length; ++i) {
+		if (trimmed[i] < '0' || trimmed[i] > '9')
+			return false;
+	}
+
+	int parsed = int.parse(trimmed);
+	if (parsed < 1 || parsed > 65535)
+		return false;
+
+	port = (uint16)parsed;
+	return true;
+}
+
+public bool wait_port_file(out uint16 port, string file_path, int num_tries, int interval)
+{
+	port = 0;
+	for (int tries = 0; tries < num_tries; ++tries) {
+		try {
+			string contents = null;
+			GLib.FileUtils.get_contents(file_path, out contents);
+			if (parse_port_from_string(out port, contents))
+				return true;
+		} catch (FileError e) {
+		}
+
+		GLib.Thread.usleep(interval*1000);
+	}
+
+	return false;
+}
+
+public bool create_port_file_path(out string file_path, string prefix)
+{
+	file_path = "";
+
+	try {
+		string dir_path = GLib.DirUtils.make_tmp("crown_%s_port_XXXXXX".printf(prefix));
+		file_path = GLib.Path.build_filename(dir_path, "console_port");
+		return true;
+	} catch (FileError e) {
+		loge("Could not create temporary directory for `%s`: %s".printf(prefix, e.message));
+		return false;
+	}
+}
+
+public void cleanup_port_file_path(string file_path)
+{
+	try {
+		GLib.File.new_for_path(file_path).delete();
+	} catch (Error e) {
+		// Ignore.
+	}
+}
+
 public bool widget_activate_action_variant(Gtk.Widget widget, string name, GLib.Variant? args = null)
 {
 #if CROWN_GTK3
@@ -760,7 +822,7 @@ public class LevelEditorApplication : Gtk.Application
 	public LevelEditorApplication()
 	{
 		Object(application_id: "org.crownengine.Crown"
-			, flags: GLib.ApplicationFlags.FLAGS_NONE
+			, flags: GLib.ApplicationFlags.NON_UNIQUE
 			);
 
 		GLib.Environment.set_prgname(this.application_id); // FIXME: Drop after GTK4 port.
@@ -1571,6 +1633,10 @@ public class LevelEditorApplication : Gtk.Application
 	{
 		yield stop_backend();
 
+		string port_file;
+		if (!create_port_file_path(out port_file, "data_compiler"))
+			return false;
+
 		// Spawn the data compiler.
 		string args[] =
 		{
@@ -1582,6 +1648,8 @@ public class LevelEditorApplication : Gtk.Application
 			"--map-source-dir",
 			"core",
 			_project.toolchain_dir(),
+			"--port-file",
+			port_file,
 			"--server",
 			"--wait-console"
 		};
@@ -1596,8 +1664,20 @@ public class LevelEditorApplication : Gtk.Application
 		_editor_stack.set_visible_child_name(COMPILER_CONNECTING);
 		_inspector_stack.set_visible_child_name(COMPILER_CONNECTING);
 
+		uint16 data_compiler_port = 0;
+		bool has_port = wait_port_file(out data_compiler_port
+			, port_file
+			, DATA_COMPILER_CONNECTION_TRIES
+			, DATA_COMPILER_CONNECTION_INTERVAL
+			);
+		cleanup_port_file_path(port_file);
+		if (!has_port) {
+			loge("Cannot read data_compiler port");
+			return false;
+		}
+
 		int tries = yield _compiler.connect_async(DATA_COMPILER_ADDRESS
-			, DATA_COMPILER_TCP_PORT
+			, data_compiler_port
 			, DATA_COMPILER_CONNECTION_TRIES
 			, DATA_COMPILER_CONNECTION_INTERVAL
 			);
@@ -1689,14 +1769,18 @@ public class LevelEditorApplication : Gtk.Application
 			return;
 		}
 
+		string port_file;
+		if (!create_port_file_path(out port_file, "game"))
+			return;
+
 		// Spawn the game.
 		string args[] =
 		{
 			ENGINE_EXE,
 			"--data-dir",
 			_project.data_dir(),
-			"--console-port",
-			GAME_TCP_PORT.to_string(),
+			"--port-file",
+			port_file,
 			"--wait-console",
 			"--lua-string",
 			sg == StartGame.TEST ? "TEST=true" : ""
@@ -1708,9 +1792,21 @@ public class LevelEditorApplication : Gtk.Application
 			loge(e.message);
 		}
 
+		uint16 game_port = 0;
+		bool has_port = wait_port_file(out game_port
+			, port_file
+			, GAME_CONNECTION_TRIES
+			, GAME_CONNECTION_INTERVAL
+			);
+		cleanup_port_file_path(port_file);
+		if (!has_port) {
+			loge("Cannot read game port");
+			return;
+		}
+
 		// Try to connect to the game.
 		int tries = yield _game.connect_async(GAME_ADDRESS
-			, GAME_TCP_PORT
+			, game_port
 			, GAME_CONNECTION_TRIES
 			, GAME_CONNECTION_INTERVAL
 			);
@@ -1722,15 +1818,19 @@ public class LevelEditorApplication : Gtk.Application
 
 	public async void start_thumbnail()
 	{
+		string port_file;
+		if (!create_port_file_path(out port_file, "thumbnail"))
+			return;
+
 		string args[] =
 		{
 			ENGINE_EXE,
 			"--data-dir",
 			_project.data_dir(),
 			"--boot-dir",
 			THUMBNAIL_BOOT_DIR,
-			"--console-port",
-			THUMBNAIL_TCP_PORT.to_string(),
+			"--port-file",
+			port_file,
 			"--wait-console",
 			"--pumped",
 			"--hidden"
@@ -1742,9 +1842,21 @@ public class LevelEditorApplication : Gtk.Application
 			loge(e.message);
 		}
 
+		uint16 thumbnail_port = 0;
+		bool has_port = wait_port_file(out thumbnail_port
+			, port_file
+			, THUMBNAIL_CONNECTION_TRIES
+			, THUMBNAIL_CONNECTION_INTERVAL
+			);
+		cleanup_port_file_path(port_file);
+		if (!has_port) {
+			loge("Cannot read thumbnail port");
+			return;
+		}
+
 		// Try to connect to the game.
 		int tries = yield _thumbnail.connect_async(THUMBNAIL_ADDRESS
-			, THUMBNAIL_TCP_PORT
+			, thumbnail_port
 			, THUMBNAIL_CONNECTION_TRIES
 			, THUMBNAIL_CONNECTION_INTERVAL
 			);

tools/widgets/editor_viewport.vala

@@ -85,6 +85,10 @@ public class EditorViewport : Gtk.Bin
 			return;
 
 		// Spawn the level editor.
+		string port_file;
+		if (!create_port_file_path(out port_file, _runtime._name))
+			return;
+
 		string args[] =
 		{
 			ENGINE_EXE,
@@ -94,8 +98,8 @@ public class EditorViewport : Gtk.Bin
 			_boot_dir,
 			"--parent-window",
 			window_xid.to_string(),
-			"--console-port",
-			_console_port.to_string(),
+			"--port-file",
+			port_file,
 			"--wait-console",
 			_render_mode == ViewportRenderMode.PUMPED ? "--pumped" : "",
 			"--window-rect", "0", "0", width.to_string(), height.to_string(),
@@ -107,9 +111,21 @@ public class EditorViewport : Gtk.Bin
 			loge(e.message);
 		}
 
+		uint16 console_port = 0;
+		bool has_port = wait_port_file(out console_port
+			, port_file
+			, EDITOR_CONNECTION_TRIES
+			, EDITOR_CONNECTION_INTERVAL
+			);
+		cleanup_port_file_path(port_file);
+		if (!has_port) {
+			loge("Cannot read console port for %s".printf(_runtime._name));
+			return;
+		}
+
 		// Try to connect to the level editor.
 		int tries = yield _runtime.connect_async(_console_address
-			, _console_port
+			, console_port
 			, EDITOR_CONNECTION_TRIES
 			, EDITOR_CONNECTION_INTERVAL
 			);