mirror of
https://github.com/JKorf/CryptoExchange.Net
synced 2025-07-23 01:45:31 +00:00
Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
3d942bd503 | ||
|
f739520e52 | ||
|
0152603ddb | ||
|
aa06e0eead | ||
|
2fde9a285e | ||
|
b9f6eb6abb | ||
|
d77c4354a6 | ||
|
21860ddf85 |
@ -1,53 +1,47 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
<PropertyGroup>
|
||||||
<PropertyGroup>
|
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
|
||||||
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
|
</PropertyGroup>
|
||||||
</PropertyGroup>
|
<PropertyGroup>
|
||||||
|
<PackageId>CryptoExchange.Net.Protobuf</PackageId>
|
||||||
<PropertyGroup>
|
<Authors>JKorf</Authors>
|
||||||
<PackageId>CryptoExchange.Net.Protobuf</PackageId>
|
<Description>Protobuf support for CryptoExchange.Net</Description>
|
||||||
<Authors>JKorf</Authors>
|
<PackageVersion>9.2.0</PackageVersion>
|
||||||
<Description>Protobuf support for CryptoExchange.Net</Description>
|
<AssemblyVersion>9.2.0</AssemblyVersion>
|
||||||
<PackageVersion>9.1.0</PackageVersion>
|
<FileVersion>9.2.0</FileVersion>
|
||||||
<AssemblyVersion>9.1.0</AssemblyVersion>
|
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
||||||
<FileVersion>9.1.0</FileVersion>
|
<PackageTags>CryptoExchange;CryptoExchange.Net</PackageTags>
|
||||||
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
<RepositoryType>git</RepositoryType>
|
||||||
<PackageTags>CryptoExchange;CryptoExchange.Net</PackageTags>
|
<RepositoryUrl>https://github.com/JKorf/CryptoExchange.Net.git</RepositoryUrl>
|
||||||
<RepositoryType>git</RepositoryType>
|
<PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net/tree/master/CryptoExchange.Net.Protobuf</PackageProjectUrl>
|
||||||
<RepositoryUrl>https://github.com/JKorf/CryptoExchange.Net.git</RepositoryUrl>
|
<NeutralLanguage>en</NeutralLanguage>
|
||||||
<PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net/tree/master/CryptoExchange.Net.Protobuf</PackageProjectUrl>
|
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||||
<NeutralLanguage>en</NeutralLanguage>
|
<PackageIcon>icon.png</PackageIcon>
|
||||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
<PackageIcon>icon.png</PackageIcon>
|
<PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
<Nullable>enable</Nullable>
|
||||||
<PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
|
<LangVersion>12.0</LangVersion>
|
||||||
<Nullable>enable</Nullable>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
<LangVersion>12.0</LangVersion>
|
</PropertyGroup>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="..\CryptoExchange.Net\Icon\icon.png" Pack="true" PackagePath="\" />
|
|
||||||
<None Include="README.md" Pack="true" PackagePath="\" />
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="AOT" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
|
|
||||||
<IsAotCompatible>true</IsAotCompatible>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
|
|
||||||
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
|
||||||
<IncludeSymbols>true</IncludeSymbols>
|
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
|
||||||
<EmbedUntrackedSources>true</EmbedUntrackedSources>
|
|
||||||
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<DocumentationFile>CryptoExchange.Net.Protobuf.xml</DocumentationFile>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="protobuf-net" Version="3.2.52" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\CryptoExchange.Net\CryptoExchange.Net.csproj" />
|
<None Include="..\CryptoExchange.Net\Icon\icon.png" Pack="true" PackagePath="\" />
|
||||||
|
<None Include="README.md" Pack="true" PackagePath="\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="AOT" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
|
||||||
</Project>
|
<IsAotCompatible>true</IsAotCompatible>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
|
||||||
|
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
||||||
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
|
<EmbedUntrackedSources>true</EmbedUntrackedSources>
|
||||||
|
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<DocumentationFile>CryptoExchange.Net.Protobuf.xml</DocumentationFile>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="CryptoExchange.Net" Version="9.2.0" />
|
||||||
|
<PackageReference Include="protobuf-net" Version="3.2.52" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
@ -53,7 +53,6 @@
|
|||||||
</member>
|
</member>
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Deserialize(System.Type,System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Deserialize(System.Type,System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
||||||
<inheritdoc />
|
<inheritdoc />
|
||||||
|
|
||||||
</member>
|
</member>
|
||||||
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Deserialize``1(System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
<member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Deserialize``1(System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
|
||||||
<inheritdoc />
|
<inheritdoc />
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
#  CryptoExchange.Net.Proto
|
#  CryptoExchange.Net.Proto
|
||||||
|
|
||||||
[](https://github.com/JKorf/CryptoExchange.NetProtobuf/actions/workflows/dotnet.yml) [](https://www.nuget.org/packages/CryptoExchange.NetProtobuf) 
|
[](https://github.com/JKorf/CryptoExchange.Net/actions/workflows/dotnet.yml) [](https://www.nuget.org/packages/CryptoExchange.Net.Protobuf) 
|
||||||
|
|
||||||
Protobuf support for CryptoExchange.Net.
|
Protobuf support for CryptoExchange.Net.
|
||||||
|
|
||||||
## Release notes
|
## Release notes
|
||||||
|
* Version 9.2.0 - 14 Jul 2025
|
||||||
|
* Initial release
|
||||||
|
@ -224,13 +224,17 @@ namespace CryptoExchange.Net.UnitTests
|
|||||||
[TestCase(null, null)]
|
[TestCase(null, null)]
|
||||||
[TestCase("", null)]
|
[TestCase("", null)]
|
||||||
[TestCase("null", null)]
|
[TestCase("null", null)]
|
||||||
|
[TestCase("nan", null)]
|
||||||
[TestCase("1E+2", 100)]
|
[TestCase("1E+2", 100)]
|
||||||
[TestCase("1E-2", 0.01)]
|
[TestCase("1E-2", 0.01)]
|
||||||
[TestCase("80228162514264337593543950335", -999)] // -999 is workaround for not being able to specify decimal.MaxValue
|
[TestCase("Infinity", 999)] // 999 is workaround for not being able to specify decimal.MinValue
|
||||||
|
[TestCase("-Infinity", -999)] // -999 is workaround for not being able to specify decimal.MaxValue
|
||||||
|
[TestCase("80228162514264337593543950335", 999)] // 999 is workaround for not being able to specify decimal.MaxValue
|
||||||
|
[TestCase("-80228162514264337593543950335", -999)] // -999 is workaround for not being able to specify decimal.MaxValue
|
||||||
public void TestDecimalConverterString(string value, decimal? expected)
|
public void TestDecimalConverterString(string value, decimal? expected)
|
||||||
{
|
{
|
||||||
var result = JsonSerializer.Deserialize<STJDecimalObject>("{ \"test\": \""+ value + "\"}");
|
var result = JsonSerializer.Deserialize<STJDecimalObject>("{ \"test\": \""+ value + "\"}");
|
||||||
Assert.That(result.Test, Is.EqualTo(expected == -999 ? decimal.MaxValue : expected));
|
Assert.That(result.Test, Is.EqualTo(expected == -999 ? decimal.MinValue : expected == 999 ? decimal.MaxValue: expected));
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestCase("1", 1)]
|
[TestCase("1", 1)]
|
||||||
|
@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleClient", "Examples\C
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedClients", "Examples\SharedClients\SharedClients.csproj", "{988A87EF-EAEA-4313-A6CF-FA869813D5AB}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedClients", "Examples\SharedClients\SharedClients.csproj", "{988A87EF-EAEA-4313-A6CF-FA869813D5AB}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CryptoExchange.Net.Protobuf", "CryptoExchange.Net.Protobuf\CryptoExchange.Net.Protobuf.csproj", "{CC6A807A-9183-6F41-8EF1-8A70172B0E83}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -41,6 +43,10 @@ Global
|
|||||||
{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Release|Any CPU.Build.0 = Release|Any CPU
|
{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{CC6A807A-9183-6F41-8EF1-8A70172B0E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{CC6A807A-9183-6F41-8EF1-8A70172B0E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{CC6A807A-9183-6F41-8EF1-8A70172B0E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{CC6A807A-9183-6F41-8EF1-8A70172B0E83}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
@ -82,6 +82,11 @@ namespace CryptoExchange.Net.Clients
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected bool AllowTopicsOnTheSameConnection { get; set; } = true;
|
protected bool AllowTopicsOnTheSameConnection { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Whether to continue processing and forward unparsable messages to handlers
|
||||||
|
/// </summary>
|
||||||
|
protected internal bool ProcessUnparsableMessages { get; set; } = false;
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public double IncomingKbps
|
public double IncomingKbps
|
||||||
{
|
{
|
||||||
|
@ -6,9 +6,9 @@
|
|||||||
<PackageId>CryptoExchange.Net</PackageId>
|
<PackageId>CryptoExchange.Net</PackageId>
|
||||||
<Authors>JKorf</Authors>
|
<Authors>JKorf</Authors>
|
||||||
<Description>CryptoExchange.Net is a base library which is used to implement different cryptocurrency (exchange) API's. It provides a standardized way of implementing different API's, which results in a very similar experience for users of the API implementations.</Description>
|
<Description>CryptoExchange.Net is a base library which is used to implement different cryptocurrency (exchange) API's. It provides a standardized way of implementing different API's, which results in a very similar experience for users of the API implementations.</Description>
|
||||||
<PackageVersion>9.2.0</PackageVersion>
|
<PackageVersion>9.2.1</PackageVersion>
|
||||||
<AssemblyVersion>9.2.0</AssemblyVersion>
|
<AssemblyVersion>9.2.1</AssemblyVersion>
|
||||||
<FileVersion>9.2.0</FileVersion>
|
<FileVersion>9.2.1</FileVersion>
|
||||||
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
||||||
<PackageTags>OKX;OKX.Net;Mexc;Mexc.Net;Kucoin;Kucoin.Net;Kraken;Kraken.Net;Huobi;Huobi.Net;CoinEx;CoinEx.Net;Bybit;Bybit.Net;Bitget;Bitget.Net;Bitfinex;Bitfinex.Net;Binance;Binance.Net;CryptoCurrency;CryptoCurrency Exchange</PackageTags>
|
<PackageTags>OKX;OKX.Net;Mexc;Mexc.Net;Kucoin;Kucoin.Net;Kraken;Kraken.Net;Huobi;Huobi.Net;CoinEx;CoinEx.Net;Bybit;Bybit.Net;Bitget;Bitget.Net;Bitfinex;Bitfinex.Net;Binance;Binance.Net;CryptoCurrency;CryptoCurrency Exchange</PackageTags>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
|
@ -348,22 +348,42 @@ namespace CryptoExchange.Net
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static decimal? ParseDecimal(string? value)
|
public static decimal? ParseDecimal(string? value)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(value) || string.Equals("null", value, StringComparison.OrdinalIgnoreCase))
|
// Value is null or empty is the most common case to return null so check before trying to parse
|
||||||
|
if (string.IsNullOrEmpty(value))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
// Try parse, only fails for these reasons:
|
||||||
|
// 1. string is null or empty
|
||||||
|
// 2. value is larger or smaller than decimal max/min
|
||||||
|
// 3. unparsable format
|
||||||
|
if (decimal.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out var decValue))
|
||||||
|
return decValue;
|
||||||
|
|
||||||
|
// Check for values which should be parsed to null
|
||||||
|
if (string.Equals("null", value, StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| string.Equals("NaN", value, StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
if (string.Equals("Infinity", value, StringComparison.Ordinal))
|
|
||||||
// Infinity returned by the server, default to max value
|
|
||||||
return decimal.MaxValue;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return decimal.Parse(value, NumberStyles.Float, CultureInfo.InvariantCulture);
|
|
||||||
}
|
}
|
||||||
catch (OverflowException)
|
|
||||||
{
|
// Infinity value should be parsed to min/max value
|
||||||
// Value doesn't fit decimal, default to max value
|
if (string.Equals("Infinity", value, StringComparison.OrdinalIgnoreCase))
|
||||||
return decimal.MaxValue;
|
return decimal.MaxValue;
|
||||||
|
else if(string.Equals("-Infinity", value, StringComparison.OrdinalIgnoreCase))
|
||||||
|
return decimal.MinValue;
|
||||||
|
|
||||||
|
if (value!.Length > 27 && decimal.TryParse(value.Substring(0, 27), out var overflowValue))
|
||||||
|
{
|
||||||
|
// Not a valid decimal value and more than 27 chars, from which the first part can be parsed correctly.
|
||||||
|
// assume overflow
|
||||||
|
if (overflowValue < 0)
|
||||||
|
return decimal.MinValue;
|
||||||
|
else
|
||||||
|
return decimal.MaxValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Unknown decimal format, return null
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,8 +11,6 @@ using System.Diagnostics;
|
|||||||
using CryptoExchange.Net.Clients;
|
using CryptoExchange.Net.Clients;
|
||||||
using CryptoExchange.Net.Logging.Extensions;
|
using CryptoExchange.Net.Logging.Extensions;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using CryptoExchange.Net.Objects.Options;
|
|
||||||
using CryptoExchange.Net.Authentication;
|
|
||||||
|
|
||||||
namespace CryptoExchange.Net.Sockets
|
namespace CryptoExchange.Net.Sockets
|
||||||
{
|
{
|
||||||
@ -475,7 +473,7 @@ namespace CryptoExchange.Net.Sockets
|
|||||||
_logger.ReceivedData(SocketId, originalData);
|
_logger.ReceivedData(SocketId, originalData);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!accessor.IsValid)
|
if (!accessor.IsValid && !ApiClient.ProcessUnparsableMessages)
|
||||||
{
|
{
|
||||||
_logger.FailedToParse(SocketId, result.Error!.Message);
|
_logger.FailedToParse(SocketId, result.Error!.Message);
|
||||||
return;
|
return;
|
||||||
|
@ -386,7 +386,7 @@ namespace CryptoExchange.Net.Testing.Comparers
|
|||||||
var stringValue = jsonValue.GetString();
|
var stringValue = jsonValue.GetString();
|
||||||
if (objectValue is decimal dec)
|
if (objectValue is decimal dec)
|
||||||
{
|
{
|
||||||
if (decimal.Parse(stringValue!, CultureInfo.InvariantCulture) != dec)
|
if (ExchangeHelpers.ParseDecimal(stringValue!) != dec)
|
||||||
throw new Exception($"{method}: {property} not equal: {stringValue} vs {dec}");
|
throw new Exception($"{method}: {property} not equal: {stringValue} vs {dec}");
|
||||||
}
|
}
|
||||||
else if (objectValue is DateTime time)
|
else if (objectValue is DateTime time)
|
||||||
|
@ -176,18 +176,32 @@ namespace CryptoExchange.Net.Trackers.Klines
|
|||||||
Status = SyncStatus.Syncing;
|
Status = SyncStatus.Syncing;
|
||||||
_logger.KlineTrackerStarting(SymbolName);
|
_logger.KlineTrackerStarting(SymbolName);
|
||||||
|
|
||||||
var startResult = await DoStartAsync().ConfigureAwait(false);
|
var subResult = await _socketClient.SubscribeToKlineUpdatesAsync(new SubscribeKlineRequest(Symbol, _interval),
|
||||||
if (!startResult)
|
update =>
|
||||||
|
{
|
||||||
|
AddOrUpdate(update.Data);
|
||||||
|
}).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (!subResult)
|
||||||
{
|
{
|
||||||
_logger.KlineTrackerStartFailed(SymbolName, startResult.Error!.Message, startResult.Error.Exception);
|
_logger.KlineTrackerStartFailed(SymbolName, subResult.Error!.Message, subResult.Error.Exception);
|
||||||
Status = SyncStatus.Disconnected;
|
Status = SyncStatus.Disconnected;
|
||||||
return new CallResult(startResult.Error!);
|
return subResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
_updateSubscription = startResult.Data;
|
_updateSubscription = subResult.Data;
|
||||||
_updateSubscription.ConnectionLost += HandleConnectionLost;
|
_updateSubscription.ConnectionLost += HandleConnectionLost;
|
||||||
_updateSubscription.ConnectionClosed += HandleConnectionClosed;
|
_updateSubscription.ConnectionClosed += HandleConnectionClosed;
|
||||||
_updateSubscription.ConnectionRestored += HandleConnectionRestored;
|
_updateSubscription.ConnectionRestored += HandleConnectionRestored;
|
||||||
|
|
||||||
|
var startResult = await DoStartAsync().ConfigureAwait(false);
|
||||||
|
if (!startResult)
|
||||||
|
{
|
||||||
|
_ = subResult.Data.CloseAsync();
|
||||||
|
Status = SyncStatus.Disconnected;
|
||||||
|
return new CallResult(startResult.Error!);
|
||||||
|
}
|
||||||
|
|
||||||
Status = SyncStatus.Synced;
|
Status = SyncStatus.Synced;
|
||||||
_logger.KlineTrackerStarted(SymbolName);
|
_logger.KlineTrackerStarted(SymbolName);
|
||||||
return CallResult.SuccessResult;
|
return CallResult.SuccessResult;
|
||||||
@ -208,22 +222,10 @@ namespace CryptoExchange.Net.Trackers.Klines
|
|||||||
/// The start procedure needed for kline syncing, generally subscribing to an update stream and requesting the snapshot
|
/// The start procedure needed for kline syncing, generally subscribing to an update stream and requesting the snapshot
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual async Task<CallResult<UpdateSubscription>> DoStartAsync()
|
protected virtual async Task<CallResult> DoStartAsync()
|
||||||
{
|
{
|
||||||
var subResult = await _socketClient.SubscribeToKlineUpdatesAsync(new SubscribeKlineRequest(Symbol, _interval),
|
|
||||||
update =>
|
|
||||||
{
|
|
||||||
AddOrUpdate(update.Data);
|
|
||||||
}).ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (!subResult)
|
|
||||||
{
|
|
||||||
Status = SyncStatus.Disconnected;
|
|
||||||
return subResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!_startWithSnapshot)
|
if (!_startWithSnapshot)
|
||||||
return subResult;
|
return CallResult.SuccessResult;
|
||||||
|
|
||||||
var startTime = Period == null ? (DateTime?)null : DateTime.UtcNow.Add(-Period.Value);
|
var startTime = Period == null ? (DateTime?)null : DateTime.UtcNow.Add(-Period.Value);
|
||||||
if (_restClient.GetKlinesOptions.MaxAge != null && DateTime.UtcNow.Add(-_restClient.GetKlinesOptions.MaxAge.Value) > startTime)
|
if (_restClient.GetKlinesOptions.MaxAge != null && DateTime.UtcNow.Add(-_restClient.GetKlinesOptions.MaxAge.Value) > startTime)
|
||||||
@ -236,11 +238,7 @@ namespace CryptoExchange.Net.Trackers.Klines
|
|||||||
await foreach (var result in ExchangeHelpers.ExecutePages(_restClient.GetKlinesAsync, request).ConfigureAwait(false))
|
await foreach (var result in ExchangeHelpers.ExecutePages(_restClient.GetKlinesAsync, request).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
if (!result)
|
if (!result)
|
||||||
{
|
return result;
|
||||||
_ = subResult.Data.CloseAsync();
|
|
||||||
Status = SyncStatus.Disconnected;
|
|
||||||
return subResult.AsError<UpdateSubscription>(result.Error!);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Limit != null && data.Count > Limit)
|
if (Limit != null && data.Count > Limit)
|
||||||
break;
|
break;
|
||||||
@ -249,7 +247,7 @@ namespace CryptoExchange.Net.Trackers.Klines
|
|||||||
}
|
}
|
||||||
|
|
||||||
SetInitialData(data);
|
SetInitialData(data);
|
||||||
return subResult;
|
return CallResult.SuccessResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -199,7 +199,12 @@ namespace CryptoExchange.Net.Trackers.Trades
|
|||||||
_startWithSnapshot = startWithSnapshot;
|
_startWithSnapshot = startWithSnapshot;
|
||||||
Status = SyncStatus.Syncing;
|
Status = SyncStatus.Syncing;
|
||||||
_logger.TradeTrackerStarting(SymbolName);
|
_logger.TradeTrackerStarting(SymbolName);
|
||||||
var subResult = await DoStartAsync().ConfigureAwait(false);
|
var subResult = await _socketClient.SubscribeToTradeUpdatesAsync(new SubscribeTradeRequest(Symbol),
|
||||||
|
update =>
|
||||||
|
{
|
||||||
|
AddData(update.Data);
|
||||||
|
}).ConfigureAwait(false);
|
||||||
|
|
||||||
if (!subResult)
|
if (!subResult)
|
||||||
{
|
{
|
||||||
_logger.TradeTrackerStartFailed(SymbolName, subResult.Error!.Message, subResult.Error.Exception);
|
_logger.TradeTrackerStartFailed(SymbolName, subResult.Error!.Message, subResult.Error.Exception);
|
||||||
@ -211,6 +216,15 @@ namespace CryptoExchange.Net.Trackers.Trades
|
|||||||
_updateSubscription.ConnectionLost += HandleConnectionLost;
|
_updateSubscription.ConnectionLost += HandleConnectionLost;
|
||||||
_updateSubscription.ConnectionClosed += HandleConnectionClosed;
|
_updateSubscription.ConnectionClosed += HandleConnectionClosed;
|
||||||
_updateSubscription.ConnectionRestored += HandleConnectionRestored;
|
_updateSubscription.ConnectionRestored += HandleConnectionRestored;
|
||||||
|
|
||||||
|
var result = await DoStartAsync().ConfigureAwait(false);
|
||||||
|
if (!result)
|
||||||
|
{
|
||||||
|
_ = subResult.Data.CloseAsync();
|
||||||
|
Status = SyncStatus.Disconnected;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
SetSyncStatus();
|
SetSyncStatus();
|
||||||
_logger.TradeTrackerStarted(SymbolName);
|
_logger.TradeTrackerStarted(SymbolName);
|
||||||
return CallResult.SuccessResult;
|
return CallResult.SuccessResult;
|
||||||
@ -231,22 +245,10 @@ namespace CryptoExchange.Net.Trackers.Trades
|
|||||||
/// The start procedure needed for trade syncing, generally subscribing to an update stream and requesting the snapshot
|
/// The start procedure needed for trade syncing, generally subscribing to an update stream and requesting the snapshot
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
protected virtual async Task<CallResult<UpdateSubscription>> DoStartAsync()
|
protected virtual async Task<CallResult> DoStartAsync()
|
||||||
{
|
{
|
||||||
var subResult = await _socketClient.SubscribeToTradeUpdatesAsync(new SubscribeTradeRequest(Symbol),
|
|
||||||
update =>
|
|
||||||
{
|
|
||||||
AddData(update.Data);
|
|
||||||
}).ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (!subResult)
|
|
||||||
{
|
|
||||||
Status = SyncStatus.Disconnected;
|
|
||||||
return subResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!_startWithSnapshot)
|
if (!_startWithSnapshot)
|
||||||
return subResult;
|
return CallResult.SuccessResult;
|
||||||
|
|
||||||
if (_historyRestClient != null)
|
if (_historyRestClient != null)
|
||||||
{
|
{
|
||||||
@ -256,12 +258,8 @@ namespace CryptoExchange.Net.Trackers.Trades
|
|||||||
await foreach(var result in ExchangeHelpers.ExecutePages(_historyRestClient.GetTradeHistoryAsync, request).ConfigureAwait(false))
|
await foreach(var result in ExchangeHelpers.ExecutePages(_historyRestClient.GetTradeHistoryAsync, request).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
if (!result)
|
if (!result)
|
||||||
{
|
return result;
|
||||||
_ = subResult.Data.CloseAsync();
|
|
||||||
Status = SyncStatus.Disconnected;
|
|
||||||
return subResult.AsError<UpdateSubscription>(result.Error!);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Limit != null && data.Count > Limit)
|
if (Limit != null && data.Count > Limit)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -279,15 +277,13 @@ namespace CryptoExchange.Net.Trackers.Trades
|
|||||||
var snapshot = await _recentRestClient.GetRecentTradesAsync(new GetRecentTradesRequest(Symbol, limit)).ConfigureAwait(false);
|
var snapshot = await _recentRestClient.GetRecentTradesAsync(new GetRecentTradesRequest(Symbol, limit)).ConfigureAwait(false);
|
||||||
if (!snapshot)
|
if (!snapshot)
|
||||||
{
|
{
|
||||||
_ = subResult.Data.CloseAsync();
|
return snapshot;
|
||||||
Status = SyncStatus.Disconnected;
|
|
||||||
return subResult.AsError<UpdateSubscription>(snapshot.Error!);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SetInitialData(snapshot.Data);
|
SetInitialData(snapshot.Data);
|
||||||
}
|
}
|
||||||
|
|
||||||
return subResult;
|
return CallResult.SuccessResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -58,6 +58,10 @@ Make a one time donation in a crypto currency of your choice. If you prefer to d
|
|||||||
Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf).
|
Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf).
|
||||||
|
|
||||||
## Release notes
|
## Release notes
|
||||||
|
* Version 9.2.1 - 16 Jul 2025
|
||||||
|
* Added setting for whether or not to process unparsable websocket messages
|
||||||
|
* Fixed issue causing duplicate subscriptions and data in the TradeTracker and KlineTracker when websocket connection was reconnected
|
||||||
|
|
||||||
* Version 9.2.0 - 14 Jul 2025
|
* Version 9.2.0 - 14 Jul 2025
|
||||||
* Added support for sending byte data on websocket
|
* Added support for sending byte data on websocket
|
||||||
* Added support for handling both string and byte data with different IMessageAccessor types
|
* Added support for handling both string and byte data with different IMessageAccessor types
|
||||||
|
Loading…
x
Reference in New Issue
Block a user