1.08 BugFix

StackExplode · Mar 29, 2022 · fafa0b3 · fafa0b3
1 parent e9b4b38
commit fafa0b3
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 12 deletions.
diff --git a/ReservoirServer/AMQCommunicator.cs b/ReservoirServer/AMQCommunicator.cs
@@ -33,7 +33,7 @@ public void Initialization()
         {
             Dispose();
             _sender = new SimpleQueueSender(queue_name, uri);
-            _subscriber = new SimpleTopicSubscriber(topic_name, uri, "xxx", "zzz", null);
+            _subscriber = new SimpleTopicSubscriber(topic_name, uri, "client_"+ platform_id, "consumer_"+ platform_id, null);
             _subscriber.OnMessageReceived += _subscriber_OnMessageReceived;
         }
 

diff --git a/ReservoirServer/Driver/BoxTCPDriver.cs b/ReservoirServer/Driver/BoxTCPDriver.cs
@@ -14,7 +14,20 @@ public Task SendDataAsync(IComClient client, byte[] data)
             BoxTCPClient carclient = client as BoxTCPClient;
             NetworkStream ns = carclient.Client.GetStream();
             ns.WriteTimeout = TransmitTimeout;
-            var task = ns.WriteAsync(data, 0, data.Length);
+            Task task = null;
+            try
+            {
+                task = ns.WriteAsync(data, 0, data.Length);
+            }
+            catch(System.IO.IOException)
+            {
+                client.Disconnected();
+            }
+            catch(SocketException)
+            {
+                client.Disconnected();
+            }
+
             return task;
             //task.ContinueWith((t) => { this.OnComDataSent?.Invoke(client, data.Length); });
 

diff --git a/ReservoirServer/Driver/IComClient.cs b/ReservoirServer/Driver/IComClient.cs
@@ -56,6 +56,7 @@ public void Disconnect()
         {
             Client.Close();
             IsAlive = false;
+            OnDisconnected?.Invoke();
         }
 
         public void Disconnected()

diff --git a/ReservoirServer/Driver/SimpleAMQSamples.cs b/ReservoirServer/Driver/SimpleAMQSamples.cs
@@ -89,6 +89,7 @@ public SimpleTopicSubscriber(string topicName, string brokerUri, string clientId
         public void OnMessage(IMessage message)
         {
             ITextMessage textMessage = message as ITextMessage;
+            //Console.WriteLine(textMessage);
             if (this.OnMessageReceived != null)
             {
                 this.OnMessageReceived(textMessage.Text);

diff --git a/ReservoirServer/Driver/TCPDriver.cs b/ReservoirServer/Driver/TCPDriver.cs
@@ -104,7 +104,7 @@ protected virtual void HandleAsyncConnection(IAsyncResult res)
                 client.ReceiveTimeout = TransmitTimeout;
                 byte[] buff = new byte[client.ReceiveBufferSize];
                 client.GetStream().ReadTimeout = TransmitTimeout;
-                BoxTCPClient carclient = new BoxTCPClient(client);
+                BoxTCPClient carclient = new BoxTCPClient(client) { IsAlive = true };
                 RecState state = new RecState { Client = carclient, Buffer = buff };
                 this.OnComClientConnected?.Invoke(carclient);
                 state.Stream.BeginRead(state.Buffer, 0, state.Buffer.Length, HandleClientAsyncRec, state);
@@ -118,16 +118,18 @@ protected virtual void HandleClientAsyncRec(IAsyncResult res)
                 return;
             RecState state = (RecState)res.AsyncState;
             TcpClient client = state.Client.Client;
-            byte[] oldbuff = state.Buffer;
-            NetworkStream ns = state.Stream;
             if (client == null)
                 return;
-            if(client.Connected == false)
+
+            byte[] oldbuff = state.Buffer;
+
+            if(client.Connected == false )
             {
                 this.OnComClientDisconneted?.Invoke(state.Client);
                 state.Client.Disconnected();
+                return;
             }
-                
+            NetworkStream ns = state.Stream;
 
             int b2r = 0;
             try
@@ -139,6 +141,10 @@ protected virtual void HandleClientAsyncRec(IAsyncResult res)
             {
                 b2r = 0;
             }
+            catch(SocketException)
+            {
+                b2r = 0;
+            }
             catch(ObjectDisposedException)
             {
                 return;
@@ -160,7 +166,8 @@ protected virtual void HandleClientAsyncRec(IAsyncResult res)
 
             else
             {
-                if(AsyncRecBuffer)
+                state.Client.IsAlive = true;
+                if (AsyncRecBuffer)
                 {
                     byte[] buffer = new byte[b2r];
                     Buffer.BlockCopy(state.Buffer, 0, buffer, 0, b2r);

diff --git a/ReservoirServer/Enterty/Box.cs b/ReservoirServer/Enterty/Box.cs
@@ -35,9 +35,9 @@ public Box(string id,IComClient client)
             {
                 comClient.OnDisconnected += () =>
                 {
-                    locker.EnterWriteLock();
+                    //locker.EnterWriteLock();
                     State = BoxState.Offline;
-                    locker.ExitWriteLock();
+                    //locker.ExitWriteLock();
                 };
             }
         }

diff --git a/ReservoirServer/Program.cs b/ReservoirServer/Program.cs
@@ -16,7 +16,7 @@ namespace ReservoirServer
     class Program
     {
         //TODO: Log file, Safety(Encryption), JSON error catch, system service
-        public static readonly string version = "1.07";
+        public static readonly string version = "1.08";
 
 #if DEBUG
         public static string VERSION => version + "a";

diff --git a/ReservoirServer/SimpleBoxAdapter.cs b/ReservoirServer/SimpleBoxAdapter.cs
@@ -105,12 +105,15 @@ public void SimpleBoxDataSubscribeHandler(string json)
                 Box box = _list[bid];
                 if (box != null)
                 {
+                    bool online = false;
                     boxdata.DeviceN = bid;
                     string senddata = JsonConvert.SerializeObject(boxdata, jsonSettings);
                     box.locker.EnterReadLock();
                     var client = box.ComClient;
+                    online = (box.State == BoxState.Online);
                     box.locker.ExitReadLock();
-                    _server.SendPack(client, senddata);
+                    if(online)
+                        _server.SendPack(client, senddata);
                 }
             }
         }