Add Peer collection dropping after corruption (#67)

Author: matsakiv

Beacon.Sdk/BeaconClients/Abstract/IWalletBeaconClient.cs

@@ -7,7 +7,7 @@ namespace Beacon.Sdk.BeaconClients.Abstract
 
     public interface IWalletBeaconClient : IBaseBeaconClient
     {
-        Task AddPeerAsync(P2PPairingRequest pairingRequest, bool sendPairingResponse = true);
+        Task<bool> AddPeerAsync(P2PPairingRequest pairingRequest, bool sendPairingResponse = true);
         Task<PermissionInfo?> TryReadPermissionInfo(string sourceAddress, string senderId, Network network);
         P2PPairingRequest GetPairingRequest(string pairingData);
     }

Beacon.Sdk/BeaconClients/WalletBeaconClient.cs

@@ -53,12 +53,12 @@ public WalletBeaconClient(
             _peerFactory = peerFactory;
         }
 
-        public async Task AddPeerAsync(P2PPairingRequest pairingRequest, bool sendPairingResponse = true)
+        public async Task<bool> AddPeerAsync(P2PPairingRequest pairingRequest, bool sendPairingResponse = true)
         {
             if (!HexString.TryParse(pairingRequest.PublicKey, out var peerHexPublicKey))
             {
                 _logger.LogError("Can not parse receiver public key");
-                return;
+                return false;
             }
 
             var peer = _peerFactory.Create(
@@ -68,11 +68,28 @@ public async Task AddPeerAsync(P2PPairingRequest pairingRequest, bool sendPairin
                 pairingRequest.RelayServer
             );
 
-            peer = PeerRepository.CreateAsync(peer).Result;
+            var createdPeer = await PeerRepository.CreateAsync(peer);
+
+            if (createdPeer == null)
+            {
+                _logger.LogWarning("Peers collection corrupted. Trying drop and create again");
+
+                await PeerRepository.DropAsync();
+
+                createdPeer = await PeerRepository.CreateAsync(peer);
+
+                if (createdPeer == null)
+                {
+                    _logger?.LogError("Can't create peer");
+                    return false;
+                }
+            }
 
             if (sendPairingResponse)
                 await P2PCommunicationService
-                    .SendChannelOpeningMessageAsync(peer, pairingRequest.Id, AppName, AppUrl, IconUrl);
+                    .SendChannelOpeningMessageAsync(createdPeer, pairingRequest.Id, AppName, AppUrl, IconUrl);
+
+            return true;
         }
 
         protected override async Task OnP2PMessagesReceived(object? sender, P2PMessageEventArgs e)

Beacon.Sdk/Core/Domain/Interfaces/Data/IPeerRepository.cs

@@ -13,5 +13,6 @@ public interface IPeerRepository
         Task<List<Peer>> GetAll();
         Task Delete(Peer peer);
         Task MarkAllInactive();
+        Task DropAsync();
     }
 }

Beacon.Sdk/Core/Infrastructure/Repositories/BaseLiteDbRepository.cs

@@ -3,6 +3,7 @@ namespace Beacon.Sdk.Core.Infrastructure.Repositories
     using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
+
     using LiteDB;
     using Microsoft.Extensions.Logging;
 
@@ -55,9 +56,29 @@ protected Task<T> InConnection(string collectionName, Func<LiteCollection<T>, Ta
                 _logger.LogError(e, "error in repository");
             }
 
-            return new Task<T>(() => default!);
+            return Task.FromResult<T>(default!);
+        }
+
+        protected Task InConnection(string collectionName, Action<LiteDatabase, LiteCollection<T>> func)
+        {
+            try
+            {
+                lock (_syncRoot)
+                {
+                    using var db = new LiteDatabase(_connectionString);
+                    LiteCollection<T> col = db.GetCollection<T>(collectionName);
+
+                    func(db, col);
+                }
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "error in repository");
+            }
+
+            return Task.CompletedTask;
         }
-        
+
         protected Task<T?> InConnectionNullable(string collectionName, Func<LiteCollection<T>, Task<T?>> func)
         {
             try
@@ -75,7 +96,7 @@ protected Task<T> InConnection(string collectionName, Func<LiteCollection<T>, Ta
                 _logger.LogError(e, "error in repository");
             }
 
-            return new Task<T?>(() => default);
+            return Task.FromResult<T?>(default);
         }
 
         protected Task<T[]?> InConnectionNullable(string collectionName, Func<LiteCollection<T>, Task<T[]?>> func)
@@ -95,7 +116,7 @@ protected Task<T> InConnection(string collectionName, Func<LiteCollection<T>, Ta
                 _logger.LogError(e, "error in repository");
             }
 
-            return new Task<T[]?>(() => default);
+            return Task.FromResult<T[]?>(default);
         }
 
         protected Task<List<T>> InConnection(string collectionName, Func<LiteCollection<T>, Task<List<T>>> func)
@@ -115,7 +136,7 @@ protected Task<List<T>> InConnection(string collectionName, Func<LiteCollection<
                 _logger.LogError(e, "error in repository");
             }
 
-            return new Task<List<T>>(() => default);
+            return Task.FromResult<List<T>>(default!);
         }
     }
 }

Beacon.Sdk/Core/Infrastructure/Repositories/LiteDbPeerRepository.cs

@@ -60,5 +60,10 @@ public Task MarkAllInactive() => InConnectionAction(CollectionName, col =>
                 col.Update(peer);
             }
         });
+
+        public Task DropAsync() => InConnection(CollectionName, (db, col) =>
+        {
+            db.DropCollection(col.Name);
+        });
     }
 }