replace SingleInstanceApplication by Mutex and PipeClient/PipeServer

Valkirie · Dec 9, 2021 · b71bfb8 · b71bfb8
1 parent f6f4943
commit b71bfb8
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 128 deletions.
diff --git a/ControllerCommon/PipeClient.cs b/ControllerCommon/PipeClient.cs
@@ -12,6 +12,9 @@ public class PipeClient
         public readonly NamedPipeClient<PipeMessage> client;
         private readonly ILogger logger;
 
+        public event ConnectedEventHandler Connected;
+        public delegate void ConnectedEventHandler(Object sender);
+
         public event DisconnectedEventHandler Disconnected;
         public delegate void DisconnectedEventHandler(Object sender);
 
@@ -23,10 +26,8 @@ public class PipeClient
 
         public bool connected;
 
-        public PipeClient(string pipeName, ILogger logger)
+        public PipeClient(string pipeName)
         {
-            this.logger = logger;
-
             m_queue = new ConcurrentQueue<PipeMessage>();
 
             // monitors processes and settings
@@ -41,9 +42,14 @@ public PipeClient(string pipeName, ILogger logger)
             client.Error += OnError;
         }
 
+        public PipeClient(string pipeName, ILogger logger) : this(pipeName)
+        {
+            this.logger = logger;
+        }
+
         private void OnClientDisconnected(NamedPipeConnection<PipeMessage, PipeMessage> connection)
         {
-            logger.LogInformation("Client {0} disconnected", connection.Id);
+            logger?.LogInformation("Client {0} disconnected", connection.Id);
             Disconnected?.Invoke(this);
 
             connected = false;
@@ -55,7 +61,7 @@ public void Start()
                 return;
 
             client.Start();
-            logger.LogInformation($"Pipe Client has started");
+            logger?.LogInformation($"Pipe Client has started");
         }
 
         public void Stop()
@@ -64,26 +70,27 @@ public void Stop()
                 return;
 
             client.Stop();
-            logger.LogInformation($"Pipe Client has stopped");
+            logger?.LogInformation($"Pipe Client has stopped");
         }
 
         private void OnServerMessage(NamedPipeConnection<PipeMessage, PipeMessage> connection, PipeMessage message)
         {
-            logger.LogDebug("Client {0} opcode: {1} says: {2}", connection.Id, message.code, string.Join(" ", message.ToString()));
+            logger?.LogDebug("Client {0} opcode: {1} says: {2}", connection.Id, message.code, string.Join(" ", message.ToString()));
             ServerMessage?.Invoke(this, message);
 
             switch (message.code)
             {
                 case PipeCode.SERVER_PING:
                     connected = true;
-                    logger.LogInformation("Client {0} is now connected!", connection.Id);
+                    Connected?.Invoke(this);
+                    logger?.LogInformation("Client {0} is now connected!", connection.Id);
                     break;
             }
         }
 
         private void OnError(Exception exception)
         {
-            logger.LogError("PipClient failed. {0}", exception.Message);
+            logger?.LogError("PipClient failed. {0}", exception.Message);
         }
 
         public void SendMessage(PipeMessage message)

diff --git a/ControllerCommon/PipeMessage.cs b/ControllerCommon/PipeMessage.cs
@@ -117,5 +117,25 @@ public PipeClientHidder()
             code = PipeCode.CLIENT_HIDDER;
         }
     }
+
+    [Serializable]
+    public class PipeConsoleArgs : PipeMessage
+    {
+        public string[] args;
+
+        public PipeConsoleArgs()
+        {
+            code = PipeCode.CLIENT_CONSOLE;
+        }
+    }
+
+    [Serializable]
+    public class PipeServerShutdown : PipeMessage
+    {
+        public PipeServerShutdown()
+        {
+            code = PipeCode.SERVER_SHUTDOWN;
+        }
+    }
     #endregion
 }
diff --git a/ControllerCommon/PipeServer.cs b/ControllerCommon/PipeServer.cs
@@ -36,6 +36,12 @@ public enum PipeCode
 
         CLIENT_SCREEN = 11,                 // Sent to server to update screen details
                                             // args: width, height
+
+        CLIENT_CONSOLE = 12,                // Sent from client to client to pass parameters
+                                            // args: string[] parameters
+
+        SERVER_SHUTDOWN = 13,               // Sent to client to halt process
+                                            // args: ...
     }
 
     public class PipeServer
@@ -57,10 +63,8 @@ public class PipeServer
 
         public bool connected;
 
-        public PipeServer(string pipeName, ILogger logger)
+        public PipeServer(string pipeName)
         {
-            this.logger = logger;
-
             m_queue = new ConcurrentQueue<PipeMessage>();
 
             // monitors processes and settings
@@ -79,13 +83,18 @@ public PipeServer(string pipeName, ILogger logger)
             server.Error += OnError;
         }
 
+        public PipeServer(string pipeName, ILogger logger) : this(pipeName)
+        {
+            this.logger = logger;
+        }
+
         public void Start()
         {
             if (server == null)
                 return;
 
             server.Start();
-            logger.LogInformation($"Pipe Server has started");
+            logger?.LogInformation($"Pipe Server has started");
         }
 
         public void Stop()
@@ -94,12 +103,12 @@ public void Stop()
                 return;
 
             server = null;
-            logger.LogInformation($"Pipe Server has stopped");
+            logger?.LogInformation($"Pipe Server has stopped");
         }
 
         private void OnClientConnected(NamedPipeConnection<PipeMessage, PipeMessage> connection)
         {
-            logger.LogInformation("Client {0} is now connected!", connection.Id);
+            logger?.LogInformation("Client {0} is now connected!", connection.Id);
             Connected?.Invoke(this);
 
             connected = true;
@@ -110,21 +119,21 @@ private void OnClientConnected(NamedPipeConnection<PipeMessage, PipeMessage> con
 
         private void OnClientDisconnected(NamedPipeConnection<PipeMessage, PipeMessage> connection)
         {
-            logger.LogInformation("Client {0} disconnected", connection.Id);
+            logger?.LogInformation("Client {0} disconnected", connection.Id);
             Disconnected?.Invoke(this);
 
             connected = false;
         }
 
         private void OnClientMessage(NamedPipeConnection<PipeMessage, PipeMessage> connection, PipeMessage message)
         {
-            logger.LogDebug("Client {0} opcode: {1} says: {2}", connection.Id, message.code, string.Join(" ", message.ToString()));
+            logger?.LogDebug("Client {0} opcode: {1} says: {2}", connection.Id, message.code, string.Join(" ", message.ToString()));
             ClientMessage?.Invoke(this, message);
         }
 
         private void OnError(Exception exception)
         {
-            logger.LogError("PipeServer failed. {0}", exception.Message);
+            logger?.LogError("PipeServer failed. {0}", exception.Message);
         }
 
         public void SendMessage(PipeMessage message)

diff --git a/ControllerHelper/ControllerHelper.cs b/ControllerHelper/ControllerHelper.cs
@@ -56,10 +56,6 @@ public partial class ControllerHelper : Form
 
         private readonly ILogger logger;
 
-        public ControllerHelper()
-        {
-        }
-
         public ControllerHelper(ILogger logger)
         {
             InitializeComponent();