Update CryptoExchange.Net version to 8.5.0, added SetOptions on clients, added setting of DefaultProxyCredentials to CredentialCache.DefaultCredentials on the DI http client, improved websocket disconnect detection, updated dotnet versions to 9.0

JKorf · JKorf · commit 07845bf193f1 · 2024-12-23T15:04:00.000+01:00
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Set GitHub package source
       run: dotnet nuget add source --username JKorf --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/JKorf/index.json"
     - name: Restore dependencies
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Set GitHub package source
       run: dotnet nuget add source --username JKorf --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/JKorf/index.json"
     - name: Restore dependencies
diff --git a/HTX.Net.UnitTests/HTX.Net.UnitTests.csproj b/HTX.Net.UnitTests/HTX.Net.UnitTests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/HTX.Net.UnitTests/TestImplementations/TestSocket.cs b/HTX.Net.UnitTests/TestImplementations/TestSocket.cs
@@ -9,7 +9,7 @@
 
 namespace HTX.Net.UnitTests.TestImplementations
 {
-    public class TestSocket: IWebsocket
+    public class TestSocket : IWebsocket
     {
         public bool CanConnect { get; set; } = true;
         public bool Connected { get; set; }
@@ -120,5 +120,7 @@ public Task ReconnectAsync()
         {
             throw new NotImplementedException();
         }
+
+        public void UpdateProxy(ApiProxy proxy) => throw new NotImplementedException();
     }
 }
diff --git a/HTX.Net/Clients/HTXRestClient.cs b/HTX.Net/Clients/HTXRestClient.cs
@@ -6,6 +6,7 @@
 using HTX.Net.Interfaces.Clients.UsdtFuturesApi;
 using HTX.Net.Clients.UsdtFutures;
 using Microsoft.Extensions.Options;
+using CryptoExchange.Net.Objects.Options;
 
 namespace HTX.Net.Clients
 {
@@ -49,6 +50,14 @@ public HTXRestClient(HttpClient? httpClient, ILoggerFactory? loggerFactory, IOpt
         #endregion
 
         #region methods
+
+        /// <inheritdoc />
+        public void SetOptions(UpdateOptions options)
+        {
+            SpotApi.SetOptions(options);
+            UsdtFuturesApi.SetOptions(options);
+        }
+
         /// <summary>
         /// Set the default options to be used when creating new clients
         /// </summary>
diff --git a/HTX.Net/Clients/HTXSocketClient.cs b/HTX.Net/Clients/HTXSocketClient.cs
@@ -1,4 +1,5 @@
 ﻿using CryptoExchange.Net.Clients;
+using CryptoExchange.Net.Objects.Options;
 using HTX.Net.Clients.SpotApi;
 using HTX.Net.Clients.UsdtFutures;
 using HTX.Net.Interfaces.Clients;
@@ -45,6 +46,14 @@ public HTXSocketClient(IOptions<HTXSocketOptions> options, ILoggerFactory? logge
         #endregion
 
         #region methods
+
+        /// <inheritdoc />
+        public void SetOptions(UpdateOptions options)
+        {
+            SpotApi.SetOptions(options);
+            UsdtFuturesApi.SetOptions(options);
+        }
+
         /// <summary>
         /// Set the default options to be used when creating new clients
         /// </summary>
diff --git a/HTX.Net/ExtensionMethods/ServiceCollectionExtensions.cs b/HTX.Net/ExtensionMethods/ServiceCollectionExtensions.cs
@@ -110,6 +110,7 @@ private static IServiceCollection AddHTXCore(
                 try
                 {
                     handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+                    handler.DefaultProxyCredentials = CredentialCache.DefaultCredentials;
                 }
                 catch (PlatformNotSupportedException)
                 { }
diff --git a/HTX.Net/HTX.Net.csproj b/HTX.Net/HTX.Net.csproj
@@ -48,7 +48,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CryptoExchange.Net" Version="8.4.4" />
+    <PackageReference Include="CryptoExchange.Net" Version="8.5.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/HTX.Net/HTX.Net.xml b/HTX.Net/HTX.Net.xml
@@ -27,6 +27,9 @@
             <param name="loggerFactory">The logger factory</param>
             <param name="httpClient">Http client for this client</param>
         </member>
+        <member name="M:HTX.Net.Clients.HTXRestClient.SetOptions(CryptoExchange.Net.Objects.Options.UpdateOptions)">
+            <inheritdoc />
+        </member>
         <member name="M:HTX.Net.Clients.HTXRestClient.SetDefaultOptions(System.Action{HTX.Net.Objects.Options.HTXRestOptions})">
             <summary>
             Set the default options to be used when creating new clients
@@ -58,6 +61,9 @@
             <param name="loggerFactory">The logger factory</param>
             <param name="options">Option configuration</param>
         </member>
+        <member name="M:HTX.Net.Clients.HTXSocketClient.SetOptions(CryptoExchange.Net.Objects.Options.UpdateOptions)">
+            <inheritdoc />
+        </member>
         <member name="M:HTX.Net.Clients.HTXSocketClient.SetDefaultOptions(System.Action{HTX.Net.Objects.Options.HTXSocketOptions})">
             <summary>
             Set the default options to be used when creating new clients
@@ -3495,6 +3501,12 @@
             Usdt futures endpoints
             </summary>
         </member>
+        <member name="M:HTX.Net.Interfaces.Clients.IHTXRestClient.SetOptions(CryptoExchange.Net.Objects.Options.UpdateOptions)">
+            <summary>
+            Update specific options
+            </summary>
+            <param name="options">Options to update. Only specific options are changable after the client has been created</param>
+        </member>
         <member name="M:HTX.Net.Interfaces.Clients.IHTXRestClient.SetApiCredentials(CryptoExchange.Net.Authentication.ApiCredentials)">
             <summary>
             Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
@@ -3516,6 +3528,12 @@
             Usdt futures streams
             </summary>
         </member>
+        <member name="M:HTX.Net.Interfaces.Clients.IHTXSocketClient.SetOptions(CryptoExchange.Net.Objects.Options.UpdateOptions)">
+            <summary>
+            Update specific options
+            </summary>
+            <param name="options">Options to update. Only specific options are changable after the client has been created</param>
+        </member>
         <member name="M:HTX.Net.Interfaces.Clients.IHTXSocketClient.SetApiCredentials(CryptoExchange.Net.Authentication.ApiCredentials)">
             <summary>
             Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
diff --git a/HTX.Net/Interfaces/Clients/IHTXRestClient.cs b/HTX.Net/Interfaces/Clients/IHTXRestClient.cs
@@ -1,4 +1,5 @@
-﻿using HTX.Net.Interfaces.Clients.SpotApi;
+﻿using CryptoExchange.Net.Objects.Options;
+using HTX.Net.Interfaces.Clients.SpotApi;
 using HTX.Net.Interfaces.Clients.UsdtFuturesApi;
 
 namespace HTX.Net.Interfaces.Clients
@@ -17,6 +18,12 @@ public interface IHTXRestClient : IRestClient
         /// </summary>
         IHTXRestClientUsdtFuturesApi UsdtFuturesApi { get; }
 
+        /// <summary>
+        /// Update specific options
+        /// </summary>
+        /// <param name="options">Options to update. Only specific options are changable after the client has been created</param>
+        void SetOptions(UpdateOptions options);
+
         /// <summary>
         /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
         /// </summary>
diff --git a/HTX.Net/Interfaces/Clients/IHTXSocketClient.cs b/HTX.Net/Interfaces/Clients/IHTXSocketClient.cs
@@ -1,4 +1,5 @@
-﻿using HTX.Net.Interfaces.Clients.SpotApi;
+﻿using CryptoExchange.Net.Objects.Options;
+using HTX.Net.Interfaces.Clients.SpotApi;
 using HTX.Net.Interfaces.Clients.UsdtFuturesApi;
 
 namespace HTX.Net.Interfaces.Clients
@@ -17,6 +18,12 @@ public interface IHTXSocketClient : ISocketClient
         /// </summary>
         public IHTXSocketClientUsdtFuturesApi UsdtFuturesApi { get; }
 
+        /// <summary>
+        /// Update specific options
+        /// </summary>
+        /// <param name="options">Options to update. Only specific options are changable after the client has been created</param>
+        void SetOptions(UpdateOptions options);
+
         /// <summary>
         /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
         /// </summary>
diff --git a/HTX.Net/Objects/Options/HTXSocketOptions.cs b/HTX.Net/Objects/Options/HTXSocketOptions.cs
@@ -13,7 +13,8 @@ public class HTXSocketOptions : SocketExchangeOptions<HTXEnvironment>
         internal static HTXSocketOptions Default { get; set; } = new HTXSocketOptions
         {
             Environment = HTXEnvironment.Live,
-            SocketSubscriptionsCombineTarget = 10
+            SocketSubscriptionsCombineTarget = 10,
+            SocketNoDataTimeout = TimeSpan.FromSeconds(30)
         };
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace HTX.Net.UnitTests.TestImplementations`
`11`	`11`	`{`
`12`		`- public class TestSocket: IWebsocket`
	`12`	`+ public class TestSocket : IWebsocket`
`13`	`13`	`{`
`14`	`14`	`public bool CanConnect { get; set; } = true;`
`15`	`15`	`public bool Connected { get; set; }`
`@@ -120,5 +120,7 @@ public Task ReconnectAsync()`
`120`	`120`	`{`
`121`	`121`	`throw new NotImplementedException();`
`122`	`122`	`}`
	`123`	`+`
	`124`	`+ public void UpdateProxy(ApiProxy proxy) => throw new NotImplementedException();`
`123`	`125`	`}`
`124`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ private static IServiceCollection AddHTXCore(`
`110`	`110`	`try`
`111`	`111`	`{`
`112`	`112`	`handler.AutomaticDecompression = DecompressionMethods.GZip \| DecompressionMethods.Deflate;`
	`113`	`+ handler.DefaultProxyCredentials = CredentialCache.DefaultCredentials;`
`113`	`114`	`}`
`114`	`115`	`catch (PlatformNotSupportedException)`
`115`	`116`	`{ }`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ public class HTXSocketOptions : SocketExchangeOptions<HTXEnvironment>`
`13`	`13`	`internal static HTXSocketOptions Default { get; set; } = new HTXSocketOptions`
`14`	`14`	`{`
`15`	`15`	`Environment = HTXEnvironment.Live,`
`16`		`- SocketSubscriptionsCombineTarget = 10`
	`16`	`+ SocketSubscriptionsCombineTarget = 10,`
	`17`	`+ SocketNoDataTimeout = TimeSpan.FromSeconds(30)`
`17`	`18`	`};`
`18`	`19`
`19`	`20`	`/// <summary>`