friendly disconnect

PCC.DevServer/DevServerApp.cs

@@ -23,11 +23,13 @@ internal class DevServerApp(
         logger.LogInformation("init");
         eventBus.Subscript<TrustedPeerManager.TPM_EVT_PEER_IX>(OnIncome);
         eventBus.Subscript<TrustedPeerManager.TPM_EVT_PEER_RX>(OnRx);
+        eventBus.Subscript<TrustedPeerManager.TPM_EVT_PEER_DX>(OnDx);
 
     }
 
 
 
+
     public void Start()
     {
         logger.LogInformation("starting...");
@@ -73,7 +75,6 @@ internal class DevServerApp(
         {
             try
             {
-
                 await _tcpServer.StartAsync();
             }
             catch (Exception e)
@@ -88,6 +89,7 @@ internal class DevServerApp(
         logger.LogInformation("Income:" + obj.PeerId);
     }
 
+
     private void OnRx(TrustedPeerManager.TPM_EVT_PEER_RX obj)
     {
         logger.LogInformation($"Rx from <{obj.PeerId}>");
@@ -95,6 +97,10 @@ internal class DevServerApp(
         tpm.SendToPeer(obj.PeerId, SHA256.HashData(obj.block));
     }
 
+    private void OnDx(TrustedPeerManager.TPM_EVT_PEER_DX obj)
+    {
+        logger.LogInformation("Disconnected:" + obj.PeerId);
+    }
 
     public void Stop()
     {

PCC.Shared/App/Networking/TcpPeer.cs

@@ -1,10 +1,11 @@
 using System.Buffers;
+using System.Net.Sockets;
 using Microsoft.AspNetCore.Connections;
 using PCC.App.BinaryFormatter;
 
 namespace PCC.App.Networking;
 
-public class TcpPeer(ConnectionContext context)
+public class TcpPeer(ConnectionContext context, Socket? sck)
 {
     public async Task SendBlockAsync(ReadOnlyMemory<byte> block)
     {
@@ -64,6 +65,7 @@ public class TcpPeer(ConnectionContext context)
 
     public void Disconnect()
     {
-        context.Abort(new ConnectionAbortedException("Disconnect"));
+        if (sck != null) sck.Disconnect(false);
+        else context.Abort(new ConnectionAbortedException("Disconnect"));
     }
 }

PCC.Shared/App/TrustedPeerManager.cs

@@ -94,7 +94,7 @@ public abstract class TrustedPeerManager
                 await sck.ConnectAsync(peerInfo.host, peerInfo.port);
 
                 var conn = _connectionContextFactory.Create(sck);
-                var peer = new TcpPeer(conn);
+                var peer = new TcpPeer(conn, sck);
 
                 // handshake as client
 
@@ -102,7 +102,11 @@ public abstract class TrustedPeerManager
                 await ep.SendBlock(_myPeerId); //send handshake 1
 
                 var blockAck = await ep.RxBlockAsync(new CancellationTokenSource(TimeSpan.FromSeconds(10)).Token);
-                if (blockAck?.SequenceEqual(SHA256.HashData(_myPeerId.Span)) != true) return;
+                if (blockAck?.SequenceEqual(SHA256.HashData(_myPeerId.Span)) != true)
+                {
+                    peer.Disconnect();
+                    return;
+                }
 
                 // register as connected
                 //TODO: replace exist connection
@@ -133,7 +137,7 @@ public abstract class TrustedPeerManager
         string? peerId = null;
         try
         {
-            var peer = new TcpPeer(connection);
+            var peer = new TcpPeer(connection, null);
 
             // handshake as server
             var eb = await peer.RxBlockAsync(new CancellationTokenSource(TimeSpan.FromSeconds(10)).Token);