Websocket refactoring (#155)

Websocket refactoring
JKorf · Feb 24, 2024 · 68c45ef · 68c45ef
1 parent f45f272
commit 68c45ef
Show file tree

Hide file tree

Showing 52 changed files with 1,460 additions and 1,360 deletions.
diff --git a/Bitfinex.Net.UnitTests/BitfinexClientTests.cs b/Bitfinex.Net.UnitTests/BitfinexClientTests.cs
@@ -13,6 +13,8 @@
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Sockets;
 using Bitfinex.Net.Clients;
+using Bitfinex.Net.ExtensionMethods;
+using CryptoExchange.Net.Objects.Sockets;
 
 namespace Bitfinex.Net.UnitTests
 {

diff --git a/Bitfinex.Net.UnitTests/BitfinexSocketClientTests.cs b/Bitfinex.Net.UnitTests/BitfinexSocketClientTests.cs
diff --git a/Bitfinex.Net.UnitTests/TestImplementations/TestHelpers.cs b/Bitfinex.Net.UnitTests/TestImplementations/TestHelpers.cs
@@ -14,6 +14,7 @@
 using Bitfinex.Net.Objects.Options;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects.Sockets;
 using CryptoExchange.Net.Sockets;
 using Microsoft.Extensions.Logging;
 using Moq;

diff --git a/Bitfinex.Net.UnitTests/TestImplementations/TestSocket.cs b/Bitfinex.Net.UnitTests/TestImplementations/TestSocket.cs
@@ -1,4 +1,6 @@
 using System;
+using System.IO;
+using System.Net.WebSockets;
 using System.Security.Authentication;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,18 +12,18 @@ namespace Binance.Net.UnitTests.TestImplementations
 {
     public class TestSocket: IWebsocket
     {
-        public bool CanConnect { get; set; }
+        public bool CanConnect { get; set; } = true;
         public bool Connected { get; set; }
 
-#pragma warning disable 8618
-        public event Action OnClose;
-        public event Action<string> OnMessage;
-        public event Action<Exception> OnError;
-        public event Action OnOpen;
-        public event Action OnReconnecting;
-        public event Action<int> OnRequestSent;
-        public event Action OnReconnected;
-#pragma warning restore 8618
+        public event Func<Task> OnClose;
+#pragma warning disable 0067
+        public event Func<Task> OnReconnected;
+        public event Func<Task> OnReconnecting;
+#pragma warning restore 0067
+        public event Func<int, Task> OnRequestSent;
+        public event Func<WebSocketMessageType, Stream, Task> OnStreamMessage;
+        public event Func<Exception, Task> OnError;
+        public event Func<Task> OnOpen;
 
         public int Id { get; }
         public bool ShouldReconnect { get; set; }
@@ -98,14 +100,16 @@ public void InvokeOpen()
             OnOpen?.Invoke();
         }
 
-        public void InvokeMessage(string data)
+        public async Task InvokeMessage(string data)
         {
-            OnMessage?.Invoke(data);
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(data));
+            await OnStreamMessage?.Invoke(WebSocketMessageType.Text, stream);
         }
 
-        public void InvokeMessage<T>(T data)
+        public async Task InvokeMessage<T>(T data)
         {
-            OnMessage?.Invoke(JsonConvert.SerializeObject(data));
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(data)));
+            await OnStreamMessage?.Invoke(WebSocketMessageType.Text, stream);
         }
 
         public void InvokeError(Exception error)
@@ -121,9 +125,9 @@ public async Task ProcessAsync()
 
         public async Task ReconnectAsync()
         {
-            OnReconnecting();
+            await OnReconnecting();
             await Task.Delay(10);
-            OnReconnected();
+            await OnReconnected();
         }
     }
 }
diff --git a/Bitfinex.Net/Bitfinex.Net.csproj b/Bitfinex.Net/Bitfinex.Net.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Nullable>enable</Nullable>
@@ -7,9 +7,9 @@
   <PropertyGroup>
     <PackageId>Bitfinex.Net</PackageId>
     <Authors>JKorf</Authors>
-    <PackageVersion>7.0.5</PackageVersion>
-    <AssemblyVersion>7.0.5</AssemblyVersion>
-    <FileVersion>7.0.5</FileVersion>
+    <PackageVersion>7.1.0-beta2</PackageVersion>
+    <AssemblyVersion>7.1.0</AssemblyVersion>
+    <FileVersion>7.1.0</FileVersion>
     <Description>Bitfinex.Net is a .Net wrapper for the Bitfinex API. It includes all features the API provides, REST API and Websocket, using clear and readable objects including but not limited to Reading market info, Placing and managing orders and Reading balances and funds</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>Bitfinex Bitfinex.Net C# .Net CryptoCurrency Exchange API wrapper</PackageTags>
@@ -21,7 +21,7 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <NeutralLanguage>en</NeutralLanguage>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageReleaseNotes>7.0.5 - Updated CryptoExchange.Net</PackageReleaseNotes>
+    <PackageReleaseNotes>7.1.0-beta2 - Fixed socket authentication</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup>
     <DocumentationFile>Bitfinex.Net.xml</DocumentationFile>
@@ -51,8 +51,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CryptoExchange.Net" Version="6.2.3" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+    <PackageReference Include="CryptoExchange.Net" Version="7.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>