Revize 49e751db

Re #8900 - Implement client reconnection

deltarobot-vr/Assets/DeltaRobotVr/Client.cs

@@ -4 +4 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using UnityEngine;
 
 namespace DeltaRobotVr
 {
@@ -55 +56 @@
 
         private const UInt32 PointLength = 12;
 
+        private const int ReconnectPollMillis = 200;
+        private const int ReconnectTimeMillis = 3000;
+
         
         private Thread _thread;
         
@@ -77 +81 @@
         private volatile bool _isConnected;
         private volatile string _eotMsg;
 
+        private readonly object _reconnectTimeLock = new object();
+        private DateTime _reconnectTime = DateTime.Now;
+
         static Client()
         {
         }
@@ -217 +224 @@
             }
         }
 
+        public DateTime ReconnectTime
+        {
+            get
+            {
+                lock (_reconnectTimeLock)
+                {
+                    return _reconnectTime;
+                }
+            }
+            private set
+            {
+                lock (_reconnectTimeLock)
+                {
+                    _reconnectTime = value;
+                }
+            }
+        }
+
         private void ThreadProcedure()
         {
-            try
+            while (IsRunning)
             {
-                var client = new TcpClient(DefaultServer, DefaultPort);
-                var stream = client.GetStream();
-                BinaryReader reader = new BinaryReader(stream);
-                BinaryWriter writer = new BinaryWriter(stream);
-                IsConnected = true;
-                
-                writer.Write(ProtocolMagicId);
-                writer.Write(ProtocolMagicValue);
-                writer.Write(ProtocolVersionId);
-                writer.Write(ProtocolVersionValue);
-                
                 try
                 {
+                    using var client = new TcpClient(DefaultServer, DefaultPort);
+                    using var stream = client.GetStream();
+                    BinaryReader reader = new BinaryReader(stream);
+                    BinaryWriter writer = new BinaryWriter(stream);
+                    IsConnected = true;
+
+                    SendProtocolPreamble(writer);
+
+                    // main message reception loop
                     while (IsRunning && IsConnected)
                     {
-                        var messageIdentifier = reader.ReadUInt16();
-                        switch (messageIdentifier)
-                        {
-                            case ProtocolMagicId:
-                                ProcessProtocolMagic(reader);
-                                break;
-                            case ProtocolVersionId:
-                                ProcessProtocolVersion(reader);
-                                break;
-                            case PingId:
-                                ProcessPing(reader, writer);
-                                break;
-                            case EotId:
-                                ProcessEot(reader);
-                                break;
-                            case CurrentActuatorPositionId:
-                                ProcessCurrentActuatorPosition(reader);
-                                break;
-                            case CurrentDirectionVectorId:
-                                ProcessCurrentDirectionVector(reader);
-                                break;
-                            case DesiredDirectionVectorId:
-                                ProcessDesiredDirectionVector(reader);
-                                break;
-                            case CurveId:
-                                ProcessCurve(reader);
-                                break;
-                            default: //client tuto zpravu nezna
-                                var sizeIdentifier = (UInt16) (messageIdentifier & 0xF000);
-                                switch (sizeIdentifier)
-                                {
-                                    case Size8:
-                                        Skip8(reader);
-                                        break;
-                                    case Size16:
-                                        Skip16(reader);
-                                        break;
-                                    case Size32:
-                                        Skip32(reader);
-                                        break;
-                                    case Size64:
-                                        Skip64(reader);
-                                        break;
-                                    case Size128:
-                                        Skip128(reader);
-                                        break;
-                                    case SizeVariable:
-                                        SkipVariableLength(reader);
-                                        break;
-                                }
-
-                                break;
-                        }
+                        ReadMessages(reader, writer);
                     }
                 }
-                finally
+                catch (Exception e)
                 {
-                    stream.Close();
-                    client.Close();
-                    IsConnected = true;
+                    if (e is SocketException || e is IOException)
+                    {
+                        Debug.LogWarning($"Connection error:\n{e}");
+                    }
+                    else
+                    {
+                        Debug.LogError($"Exception in communication thread:\n{e}");
+                    }
+                }
+                
+                // wait before reconnection - short polls to prevent blocking if application is closed
+                ReconnectTime = DateTime.Now.AddMilliseconds(ReconnectTimeMillis);
+                while (IsRunning && DateTime.Now < ReconnectTime)
+                {
+                    Thread.Sleep(ReconnectPollMillis);
                 }
             }
-            catch (Exception)
+        }
+
+
+        private void ReadMessages(BinaryReader reader, BinaryWriter writer)
+        {
+            var messageIdentifier = reader.ReadUInt16();
+            switch (messageIdentifier)
             {
-                Console.WriteLine("failed to connect");
+                case ProtocolMagicId:
+                    ProcessProtocolMagic(reader);
+                    break;
+                case ProtocolVersionId:
+                    ProcessProtocolVersion(reader);
+                    break;
+                case PingId:
+                    ProcessPing(reader, writer);
+                    break;
+                case EotId:
+                    ProcessEot(reader);
+                    break;
+                case CurrentActuatorPositionId:
+                    ProcessCurrentActuatorPosition(reader);
+                    break;
+                case CurrentDirectionVectorId:
+                    ProcessCurrentDirectionVector(reader);
+                    break;
+                case DesiredDirectionVectorId:
+                    ProcessDesiredDirectionVector(reader);
+                    break;
+                case CurveId:
+                    ProcessCurve(reader);
+                    break;
+                default: // unknown message
+                    var sizeIdentifier = (UInt16) (messageIdentifier & 0xF000);
+                    switch (sizeIdentifier)
+                    {
+                        case Size8:
+                            Skip8(reader);
+                            break;
+                        case Size16:
+                            Skip16(reader);
+                            break;
+                        case Size32:
+                            Skip32(reader);
+                            break;
+                        case Size64:
+                            Skip64(reader);
+                            break;
+                        case Size128:
+                            Skip128(reader);
+                            break;
+                        case SizeVariable:
+                            SkipVariableLength(reader);
+                            break;
+                    }
+
+                    break;
             }
         }
 
+        private void SendProtocolPreamble(BinaryWriter writer)
+        {
+            writer.Write(ProtocolMagicId);
+            writer.Write(ProtocolMagicValue);
+            writer.Write(ProtocolVersionId);
+            writer.Write(ProtocolVersionValue);
+        }
 
         private void Skip8(BinaryReader reader)
         {