api: Re-enable spawner and get rid of all the asyncs.

Author: freezy

VisualPinball.Engine.Mpf.Test/Program.cs

@@ -17,29 +17,31 @@
 
 namespace MpfTest
 {
-	class Program
+	public static class Program
 	{
-		static async Task Main(string[] args)
+		public static void Main(string[] args)
 		{
-			Console.WriteLine("Starting...");
-			var client = new MpfClient();
-			client.Connect();
-			client.Play();
-			Console.WriteLine("Description = " + client.GetMachineDescription());
-			Console.WriteLine("Done!");
-
-
-			/*var s = Stopwatch.StartNew();
+			// Console.WriteLine("Starting...");
+			// var client = new MpfClient();
+			// client.Connect();
+			// client.StartGame(new Dictionary<string, bool> {
+			// 	{ "sw11", true }
+			// });
+			// Console.WriteLine("Description = " + client.GetMachineDescription());
+			// Console.WriteLine("Done!");
+
+
+			var s = Stopwatch.StartNew();
 			var mpfApi = new MpfApi(@"../../../VisualPinball.Engine.Mpf/machine");
 
-			await mpfApi.Launch();
+			mpfApi.Launch();
 
-			mpfApi.Start(new Dictionary<string, bool> {
+			mpfApi.StartGame(new Dictionary<string, bool> {
 				{"sw_11", false},
 			});
 
-			var descr = await mpfApi.GetMachineDescription();
-			Console.WriteLine($"Description: {descr} in {s.ElapsedMilliseconds}ms");*/
+			var descr = mpfApi.GetMachineDescription();
+			Console.WriteLine($"Description: {descr} in {s.ElapsedMilliseconds}ms");
 		}
 	}
 }

VisualPinball.Engine.Mpf/MpfApi.cs

@@ -25,39 +25,39 @@ public class MpfApi : IDisposable
 		public MpfApi(string machineFolder)
 		{
 			_spawner = new MpfSpawner(Path.GetFullPath(machineFolder));
-		}
-
-		/*/// <summary>
+		}
+
+		/// <summary>
 		/// Launches MPF in the background and connects to it via gRPC.
 		/// </summary>
 		/// <param name="port">gRPC port to use for MPC/VPE communication</param>
 		/// <returns></returns>
-		public async Task Launch(int port = 50051)
+		public void Launch(int port = 50051)
 		{
-			await _spawner.Spawn();
-			await _client.Connect($"localhost:{port}");
+			_spawner.Spawn();
+			_client.Connect($"localhost:{port}");
 		}
 
 		/// <summary>
 		/// Starts MPF, i.e. it will start polling for switches and sending events.
 		/// </summary>
 		/// <param name="initialSwitches">Initial switch states of the machine</param>
-		public void Start(Dictionary<string, bool> initialSwitches = null)
+		public void StartGame(Dictionary<string, bool> initialSwitches = null)
 		{
-			_client.Start(initialSwitches ?? new Dictionary<string, bool>());
+			_client.StartGame(initialSwitches ?? new Dictionary<string, bool>());
 		}
 
 		/// <summary>
 		/// Returns the machine description.
 		/// </summary>
-		public async Task<MachineDescription> GetMachineDescription()
+		public MachineDescription GetMachineDescription()
 		{
-			return await _client.GetMachineDescription();
+			return _client.GetMachineDescription();
 		}
-		*/
+
 		public void Dispose()
 		{
-			//_client?.Dispose();
+			_client?.Shutdown();
 		}
 	}
 }

VisualPinball.Engine.Mpf/MpfClient.cs

@@ -18,22 +18,26 @@
 
 namespace VisualPinball.Engine.Mpf
 {
+	/// <summary>
+	/// A wrapper with a nicer API than the proto-generated one.
+	/// </summary>
 	public class MpfClient
 	{
 		private Channel _channel;
 		private MpfHardwareService.MpfHardwareServiceClient _client;
-		private readonly string _server = "127.0.0.1:50051";
 
-		public void Connect()
+		public void Connect(string serverIpPort = "127.0.0.1:50051")
 		{
-			_channel = new Channel(_server, ChannelCredentials.Insecure);
+			_channel = new Channel(serverIpPort, ChannelCredentials.Insecure);
 			_client = new MpfHardwareService.MpfHardwareServiceClient(_channel);
 		}
 
-		public void Play()
+		public void StartGame(Dictionary<string, bool> initialSwitches)
 		{
 			var ms = new MachineState();
-			ms.InitialSwitchStates.Add("sw11", true);
+			foreach (var sw in initialSwitches.Keys) {
+				ms.InitialSwitchStates.Add(sw, initialSwitches[sw]);
+			}
 			_client.Start(ms);
 		}
 
@@ -42,7 +46,7 @@ public MachineDescription GetMachineDescription()
 			return _client.GetMachineDescription(new EmptyRequest());
 		}
 
-		private void OnDisable() {
+		public void Shutdown() {
 			_channel.ShutdownAsync().Wait();
 		}
 	}

VisualPinball.Engine.Mpf/MpfSpawner.cs

@@ -14,11 +14,10 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace VisualPinball.Engine.Mpf
 {
-	public class MpfSpawner
+	internal class MpfSpawner
 	{
 		private Thread _thread;
 		private readonly string _pwd;
@@ -32,7 +31,7 @@ public MpfSpawner(string machineFolder)
 			_machineFolder = Path.GetFileName(machineFolder);
 		}
 
-		public async Task Spawn()
+		public void Spawn()
 		{
 			var mpfExe = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "mpf.exe" : "mpf";
 			var mpfExePath = GetFullPath(mpfExe);
@@ -44,8 +43,9 @@ public async Task Spawn()
 				Thread.CurrentThread.IsBackground = true;
 				RunMpf(mpfExePath);
 			});
+
 			_thread.Start();
-			await _ready.WaitAsync();
+			_ready.Wait();
 		}
 
 		private void RunMpf(string mpfExePath)
@@ -58,22 +58,28 @@ private void RunMpf(string mpfExePath)
 				RedirectStandardOutput = true,
 			};
 
-			using (var process = Process.Start(info)) {
-				using (var reader = process.StandardOutput) {
-					_ready.Release();
-					var result = reader.ReadToEnd();
-					Console.Write(result);
-					process.WaitForExit();
-				}
+			using (var process = Process.Start(info))
+			using (var reader = process.StandardOutput) {
+				_ready.Release();
+				var result = reader.ReadToEnd();
+				Console.Write(result);
+				process.WaitForExit();
 			}
 		}
 
+		/// <summary>
+		/// Goes through the OS's PATHs to find the provided executable.
+		/// </summary>
+		/// <param name="fileName">Executable filename</param>
+		/// <returns>Full path or null of not found.</returns>
 		private static string GetFullPath(string fileName)
 		{
+			// in current working directory?
 			if (File.Exists(fileName)) {
 				return Path.GetFullPath(fileName);
 			}
 
+			// go through all PATHs
 			var values = Environment.GetEnvironmentVariable("PATH");
 			foreach (var path in values.Split(Path.PathSeparator)) {
 				var fullPath = Path.Combine(path, fileName);