Beta (#63)

Websocket refactoring
JKorf · Feb 24, 2024 · 744dea6 · 744dea6
1 parent 7805dba
commit 744dea6
Show file tree

Hide file tree

Showing 33 changed files with 765 additions and 559 deletions.
diff --git a/CoinEx.Net.UnitTests/CoinExClientTests.cs b/CoinEx.Net.UnitTests/CoinExClientTests.cs
@@ -17,6 +17,8 @@
 using CryptoExchange.Net.Sockets;
 using CoinEx.Net.Clients;
 using CoinEx.Net.Clients.SpotApi;
+using CoinEx.Net.ExtensionMethods;
+using CryptoExchange.Net.Objects.Sockets;
 
 namespace CoinEx.Net.UnitTests
 {

diff --git a/CoinEx.Net/Clients/CoinExRestClient.cs b/CoinEx.Net/Clients/CoinExRestClient.cs
@@ -23,14 +23,7 @@ public class CoinExRestClient : BaseRestClient, ICoinExRestClient
         /// Create a new instance of the CoinExRestClient using provided options
         /// </summary>
         /// <param name="optionsDelegate">Option configuration delegate</param>
-        public CoinExRestClient(Action<CoinExRestOptions> optionsDelegate) : this(null, null, optionsDelegate)
-        {
-        }
-
-        /// <summary>
-        /// Create a new instance of the CoinExRestClient using default options
-        /// </summary>
-        public CoinExRestClient(ILoggerFactory? loggerFactory = null, HttpClient? httpClient = null) : this(httpClient, loggerFactory, null)
+        public CoinExRestClient(Action<CoinExRestOptions>? optionsDelegate = null) : this(null, null, optionsDelegate)
         {
         }
 

diff --git a/CoinEx.Net/Clients/CoinExSocketClient.cs b/CoinEx.Net/Clients/CoinExSocketClient.cs
@@ -1,5 +1,4 @@
-using CoinEx.Net.Objects;
-using CryptoExchange.Net;
+using CryptoExchange.Net;
 using CoinEx.Net.Interfaces.Clients;
 using CoinEx.Net.Interfaces.Clients.SpotApi;
 using CoinEx.Net.Clients.SpotApi;

diff --git a/CoinEx.Net/Clients/SpotApi/CoinExRestClientSpotApi.cs b/CoinEx.Net/Clients/SpotApi/CoinExRestClientSpotApi.cs
@@ -1,5 +1,4 @@
-using CoinEx.Net.Objects;
-using CryptoExchange.Net;
+using CryptoExchange.Net;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/CoinEx.Net/Clients/SpotApi/CoinExRestClientSpotApiExchangeData.cs b/CoinEx.Net/Clients/SpotApi/CoinExRestClientSpotApiExchangeData.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using CoinEx.Net.Objects.Models;
 using CoinEx.Net.Interfaces.Clients.SpotApi;
+using CoinEx.Net.ExtensionMethods;
 
 namespace CoinEx.Net.Clients.SpotApi
 {

diff --git a/CoinEx.Net/Clients/SpotApi/CoinExRestClientSpotApiTrading.cs b/CoinEx.Net/Clients/SpotApi/CoinExRestClientSpotApiTrading.cs
@@ -12,6 +12,7 @@
 using CoinEx.Net.Objects.Models;
 using CoinEx.Net.Interfaces.Clients.SpotApi;
 using CryptoExchange.Net.CommonObjects;
+using CoinEx.Net.ExtensionMethods;
 
 namespace CoinEx.Net.Clients.SpotApi
 {

diff --git a/CoinEx.Net/Clients/SpotApi/CoinExSocketClientSpotApi.cs b/CoinEx.Net/Clients/SpotApi/CoinExSocketClientSpotApi.cs
diff --git a/CoinEx.Net/CoinEx.Net.csproj b/CoinEx.Net/CoinEx.Net.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
@@ -7,9 +7,9 @@
   <PropertyGroup>
     <PackageId>CoinEx.Net</PackageId>
     <Authors>JKorf</Authors>
-    <PackageVersion>6.0.6</PackageVersion>
-    <AssemblyVersion>6.0.6</AssemblyVersion>
-    <FileVersion>6.0.6</FileVersion>
+    <PackageVersion>6.1.0-beta1</PackageVersion>
+    <AssemblyVersion>6.1.0</AssemblyVersion>
+    <FileVersion>6.1.0</FileVersion>
     <Description>CoinEx.Net is a .Net wrapper for the CoinEx 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>CoinEx CoinEx.Net C# .Net CryptoCurrency Exchange API wrapper</PackageTags>
@@ -21,7 +21,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <NeutralLanguage>en</NeutralLanguage>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageReleaseNotes>6.0.6 - Updated CryptoExchange.Net</PackageReleaseNotes>
+    <PackageReleaseNotes>6.1.0-beta1 - Updated CryptoExchange.Net and implemented reworked websocket message handling. For release notes for the CryptoExchange.Net base library see: https://github.com/JKorf/CryptoExchange.Net/tree/beta?tab=readme-ov-file#release-notes, Fixed issue in DI registration causing http client to not be correctly injected, Made various parameters in CoinExSocketClient optional, Removed excessive constructor overload for CoinExRestClient</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup>
     <DocumentationFile>CoinEx.Net.xml</DocumentationFile>
@@ -49,10 +49,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Crc32.NET" Version="1.2.0" />
-    <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>
-    <PackageReference Include="CryptoExchange.Net" Version="6.2.3" />
   </ItemGroup>
 </Project>