Fight Timeouts

DMXControl · Dec 28, 2023 · 7ae706b · 7ae706b
1 parent 6c68987
commit 7ae706b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/ArtNetSharp/Communication/AbstractInstance.cs b/ArtNetSharp/Communication/AbstractInstance.cs
@@ -645,9 +645,8 @@ async Task add()
             catch (Exception ex) { Logger.LogError(ex); }
             semaphoreSlimAddRemoteClient.Release();
 
-            var now = DateTime.UtcNow;
-            var deadline = now.AddSeconds(-6); // Spec 1.4dd page 12, doubled to allow one lost reply
-            var timoutedClients = remoteClients.Where(p => p.Value.LastSeen < deadline);
+            var deadline = 7500; // Spec 1.4dd page 12, doubled to allow one lost reply (6s is allowad, for some delay i add 1500 ms)
+            var timoutedClients = remoteClients.Where(p => (DateTime.UtcNow-p.Value.LastSeen).TotalMilliseconds > deadline);
             if (timoutedClients.Count() != 0)
             {
                 timoutedClients = timoutedClients.ToList();

diff --git a/ArtNetSharp/Communication/RemoteClient.cs b/ArtNetSharp/Communication/RemoteClient.cs
@@ -255,9 +255,13 @@ public RemoteClient(in ArtPollReply artPollReply)
             ID = getIDOf(artPollReply);
             MacAddress = artPollReply.MAC;
             IpAddress = artPollReply.OwnIp;
-            LastSeen = DateTime.UtcNow;
+            seen();
             processArtPollReply(artPollReply);
         }
+        private void seen()
+        {
+            LastSeen = DateTime.UtcNow;
+        }
 
         public static string getIDOf(ArtPollReply artPollReply)
         {
@@ -274,6 +278,8 @@ public void processArtPollReply(ArtPollReply artPollReply)
 
             if (artPollReply.Ports == 0)
                 return;
+
+            seen();
             try
             {
                 for (byte portIndex = 0; portIndex < artPollReply.Ports; portIndex++)
@@ -298,9 +304,8 @@ public void processArtPollReply(ArtPollReply artPollReply)
                 Logger.LogError(ex);
             }
 
-            LastSeen = DateTime.UtcNow;
-            var deadline = LastSeen.AddSeconds(-6); // Spec 1.4dd page 12, doubled to allow one lost reply
-            var timoutedPorts = ports.Where(p => p.Value.LastSeen < deadline);
+            var deadline = 7500; // Spec 1.4dd page 12, doubled to allow one lost reply (6s is allowad, for some delay i add 1500 ms)
+            var timoutedPorts = ports.Where(p => (DateTime.UtcNow - p.Value.LastSeen).TotalMilliseconds > deadline);
             if (timoutedPorts.Count() != 0)
             {
                 timoutedPorts = timoutedPorts.ToList();
@@ -314,7 +319,8 @@ public void processArtPollReply(ArtPollReply artPollReply)
         }
         public async Task processArtDataReply(ArtDataReply artDataReply)
         {
-            if(artDataReply.Request == EDataRequest.Poll)
+            LastSeen = DateTime.UtcNow;
+            if (artDataReply.Request == EDataRequest.Poll)
             {
                 await QueryArtData();
                 return;

diff --git a/ArtNetSharp/Communication/RemoteClientPort.cs b/ArtNetSharp/Communication/RemoteClientPort.cs
@@ -185,6 +185,7 @@ public void processArtPollReply(ArtPollReply artPollReply)
                 return;
 
             ArtPollReply = artPollReply;
+            LastSeen = DateTime.UtcNow;
 
             PortType = artPollReply.PortTypes[PortIndex];
             GoodOutput = artPollReply.GoodOutput[PortIndex];
@@ -212,8 +213,6 @@ public void processArtPollReply(ArtPollReply artPollReply)
             }
             else
                 InputPortAddress = null;
-
-            LastSeen = DateTime.UtcNow;
         }
         internal void AddRdmUIDs(params RDMUID[] rdmuids)
         {
@@ -256,6 +255,7 @@ internal void ProcessArtRDM(ArtRDM artRDM)
             if (!KnownRDMUIDs.Any(k => k.Uid.Equals(artRDM.Source)))
                 return;
 
+            LastSeen = DateTime.UtcNow;
             AddRdmUIDs(artRDM.Source);
             RDMMessageReceived?.Invoke(this, artRDM.Data);
         }