add reconnect timeout

Vaiz · Oct 16, 2021 · 04164fb · 04164fb
1 parent 6f0a37f
commit 04164fb
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 11 deletions.
diff --git a/HsReconnectTool/DeckTrackerReconnectPlugin/FloatReconnectButton.cs b/HsReconnectTool/DeckTrackerReconnectPlugin/FloatReconnectButton.cs
@@ -95,7 +95,7 @@ protected override void SetVisibleCore(bool value)
         {
             if (value)
             {
-                UpdateButtonState(HsHelper.Instance.UpdateHsState().RemoteConnectionCount == 0);
+                UpdateButtonState(!HsHelper.Instance.IsConnectedToServer);
                 updateTimer.Start();
             }
             else
@@ -112,7 +112,7 @@ protected override void OnClosing(CancelEventArgs e)
 
         void UpdateButtonOnTimer(object sender, EventArgs e)
         {
-            UpdateButtonState(HsHelper.Instance.UpdateHsState().RemoteConnectionCount == 0);
+            UpdateButtonState(!HsHelper.Instance.IsConnectedToServer);
         }
         void UpdateButtonState(bool disconnected)
         {

diff --git a/HsReconnectTool/HsReconnectTool/FloatReconnectButton.cs b/HsReconnectTool/HsReconnectTool/FloatReconnectButton.cs
@@ -95,7 +95,7 @@ protected override void SetVisibleCore(bool value)
         {
             if (value)
             {
-                UpdateButtonState(HsHelper.Instance.UpdateHsState().RemoteConnectionCount == 0);
+                UpdateButtonState(!HsHelper.Instance.IsConnectedToServer);
                 updateTimer.Start();
             }
             else
@@ -112,7 +112,7 @@ protected override void OnClosing(CancelEventArgs e)
 
         void UpdateButtonOnTimer(object sender, EventArgs e)
         {
-            UpdateButtonState(HsHelper.Instance.UpdateHsState().RemoteConnectionCount == 0);
+            UpdateButtonState(!HsHelper.Instance.IsConnectedToServer);
         }
         void UpdateButtonState(bool disconnected)
         {

diff --git a/HsReconnectTool/UtilLib/HsHelper.cs b/HsReconnectTool/UtilLib/HsHelper.cs
@@ -9,8 +9,11 @@ namespace UtilLib
 {
     public class HsHelper
     {
-        private static readonly HsHelper singletonInst = new HsHelper();
+        static readonly HsHelper singletonInst = new HsHelper();
+        static readonly int DisconnectTimeoutMs = 4000;
+
         Firewall firewall;
+        bool isForceDisconnected = false;
 
         public static HsHelper Instance
         {
@@ -55,15 +58,31 @@ public HsState UpdateHsState()
 
             return state;
         }
+        public bool IsConnectedToServer
+        {
+            get
+            {
+                if (isForceDisconnected)
+                    return false;
+                return UpdateHsState().IsConnectedToServer;
+            }
+        }
 
         void DisconnectViaFirewall()
         {
+            isForceDisconnected = true;
+
             firewall.EnableRule();
-            System.Threading.Thread.Sleep(4000);
+            System.Threading.Thread.Sleep(DisconnectTimeoutMs);
             firewall.DisableRule();
+
+            isForceDisconnected = false;
         }
-        void DisconnectViaTcpMessage(HsState state)
+        void DisconnectViaTcpMessage()
         {
+            HsState state = UpdateHsState();
+            isForceDisconnected = true;
+
             foreach (var c in state.Connections)
             {
                 if (!Util.IsRemoteConnection(c))
@@ -74,19 +93,21 @@ void DisconnectViaTcpMessage(HsState state)
                 if (null != error)
                     MessageBox.Show(String.Format("Cannot close connection {0}\r\nError: {1}", c, error));
             }
+
+            System.Threading.Thread.Sleep(DisconnectTimeoutMs);
+            isForceDisconnected = false;
         }
         public void CloseConnectionsToServer()
         {
-            HsState state = UpdateHsState();
-            Console.WriteLine("Closing connections... HS running: {0}", state.IsRunning);
+            Console.WriteLine("Closing connections...");
 
             if (firewall != null)
             {
                 Task.Factory.StartNew(DisconnectViaFirewall);
             }
             else
             {
-                DisconnectViaTcpMessage(state);
+                Task.Factory.StartNew(DisconnectViaTcpMessage);
             }
         }
 

diff --git a/HsReconnectTool/UtilLib/HsState.cs b/HsReconnectTool/UtilLib/HsState.cs
@@ -36,7 +36,14 @@ public int ConnectionCount
                 return connections.Count;
             }
         }
-        public int RemoteConnectionCount
+        public bool IsConnectedToServer
+        {
+            get
+            {
+                return RemoteConnectionCount > 0;
+            }
+        }
+        int RemoteConnectionCount
         {
             get
             {