From 11f7ccb7934b97abe770a29b5187b1253e3ee520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=A5=D1=83=D1=85=D0=BB=D0=B0=D0=B5=D0=B2?=
 <sancheolz@gmail.com>
Date: Sun, 29 Dec 2024 09:56:18 +0300
Subject: [PATCH 1/2] Fix partial header receive by WatsonTCP. Fixes #75

---
 CoreRemoting/CoreRemoting.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CoreRemoting/CoreRemoting.csproj b/CoreRemoting/CoreRemoting.csproj
index d2bbbd6..8c65002 100644
--- a/CoreRemoting/CoreRemoting.csproj
+++ b/CoreRemoting/CoreRemoting.csproj
@@ -59,7 +59,7 @@
       <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
       <PackageReference Include="System.Security.Cryptography.OpenSsl" Version="5.0.0" />
       <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
-      <PackageReference Include="WatsonTcp" Version="6.0.6" />
+      <PackageReference Include="WatsonTcp" Version="6.0.8" />
     </ItemGroup>
 
     <ItemGroup>

From 44a5cd96ce752c8d2efc0e1366ec14a203b57ae0 Mon Sep 17 00:00:00 2001
From: yallie <yallie@yandex.ru>
Date: Thu, 9 Jan 2025 21:50:03 +0300
Subject: [PATCH 2/2] Revert commit fedfd5d094cd154584f933cb8bea56012eda655c to
 avoid the deadlock (when WatsonTcpClient.DataReceive task is waiting for the
 OnMessage event handler to complete).

---
 CoreRemoting/RemotingClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CoreRemoting/RemotingClient.cs b/CoreRemoting/RemotingClient.cs
index 90ec7f9..2886d23 100644
--- a/CoreRemoting/RemotingClient.cs
+++ b/CoreRemoting/RemotingClient.cs
@@ -443,7 +443,7 @@ await _authenticationCompletedTaskSource.Task.Timeout(
         /// Called when a message is received from server.
         /// </summary>
         /// <param name="rawMessage">Raw message data</param>
-        private void OnMessage(byte[] rawMessage)
+        private void OnMessage(byte[] rawMessage) => Task.Run(() =>
         {
             var message = TryDeserialize(rawMessage);
 
@@ -472,7 +472,7 @@ private void OnMessage(byte[] rawMessage)
                     // A wire message could have been tampered with and couldn't be deserialized
                     break;
             }
-        }
+        });
 
         private WireMessage TryDeserialize(byte[] rawMessage)
         {