Update the RetryFailedMessages() method

Update the RetryFailedMessages() method in the AstarteMqttV1Transport class to accommodate the interface mapping type'retention': 'volatile'. After reconnecting on the Astarte device, resend the message and remove it from the cache memory. Signed-off-by: Osman Hadzic <osman.hadzic@secomind.com>
astarte-platform · Feb 7, 2024 · 0a492e1 · 0a492e1
1 parent 396d7a0
commit 0a492e1
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 0 deletions.
diff --git a/AstarteDeviceSDKCSharp/Data/AstarteFailedMessageStorage.cs b/AstarteDeviceSDKCSharp/Data/AstarteFailedMessageStorage.cs
@@ -106,5 +106,41 @@ public void RejectFirst()
 
             _astarteDbContext.SaveChanges();
         }
+
+        public bool IsCashEmpty()
+        {
+            return !_astarteFailedMessageVolatile.Any();
+        }
+
+        public AstarteFailedMessageEntry? PeekFirstCash()
+        {
+            return _astarteFailedMessageVolatile
+            .OrderBy(x => x.Id)
+            .FirstOrDefault();
+        }
+
+        public void RejectFirstCash()
+        {
+            var failedMessages = _astarteFailedMessageVolatile
+            .OrderBy(x => x.Id)
+            .ToList();
+
+            if (failedMessages.Count() > 0)
+            {
+                _astarteDbContext.AstarteFailedMessages.Remove(failedMessages.First());
+            }
+        }
+
+        public void AckFirstCash()
+        {
+            var failedMessages = _astarteFailedMessageVolatile
+            .OrderBy(x => x.Id)
+            .ToList();
+
+            if (failedMessages.Count() > 0)
+            {
+                _astarteFailedMessageVolatile.Remove(failedMessages.First());
+            }
+        }
     }
 }
diff --git a/AstarteDeviceSDKCSharp/Data/IAstarteFailedMessageStorage.cs b/AstarteDeviceSDKCSharp/Data/IAstarteFailedMessageStorage.cs
@@ -32,10 +32,18 @@ public interface IAstarteFailedMessageStorage
 
         bool IsEmpty();
 
+        bool IsCashEmpty();
+
         AstarteFailedMessageEntry? PeekFirst();
 
+        AstarteFailedMessageEntry? PeekFirstCash();
+
         void AckFirst();
 
+        void AckFirstCash();
+
         void RejectFirst();
+
+        void RejectFirstCash();
     }
 }
diff --git a/AstarteDeviceSDKCSharp/Transport/MQTT/AstarteMqttV1Transport.cs b/AstarteDeviceSDKCSharp/Transport/MQTT/AstarteMqttV1Transport.cs
@@ -201,6 +201,32 @@ public override void RetryFailedMessages()
                 }
                 _failedMessageStorage.AckFirst();
             }
+
+            while (!_failedMessageStorage.IsCashEmpty())
+            {
+                IAstarteFailedMessage? failedMessage = _failedMessageStorage.PeekFirstCash();
+                if (failedMessage is null)
+                {
+                    return;
+                }
+
+                if (failedMessage.IsExpired())
+                {
+                    // No need to send this anymore, drop it
+                    _failedMessageStorage.RejectFirstCash();
+                    continue;
+                }
+
+                try
+                {
+                    Task.Run(async () => await DoSendMessage(failedMessage));
+                }
+                catch (MqttCommunicationException e)
+                {
+                    throw new AstarteTransportException(e.Message);
+                }
+                _failedMessageStorage.AckFirstCash();
+            }
         }
 
         private async Task DoSendMessage(IAstarteFailedMessage failedMessage)